@runwell/shopify-toolkit 0.23.0 → 0.24.1

package/modules/runwell-bundle-system/admin-metafields.json

@@ -9,7 +9,7 @@
       { "key": "bundle_pricing_model", "name": "Bundle pricing model", "type": "single_line_text_field", "validations": [{ "name": "choices", "value": "[\"tier_quantity\",\"fixed_price\",\"fixed_bundle_price\",\"percent_off_subtotal\",\"dollar_off_subtotal\"]" }] },
       { "key": "bundle_pricing_value", "name": "Bundle pricing value (JSON)", "type": "json", "description": "Shape varies by pricing_model. See spec.md section 2.2." },
       { "key": "bundle_components", "name": "Bundle components (JSON)", "type": "json", "description": "Required for multi_product / mix_match. Array of {product_handle, qty}." },
-      { "key": "bundle_quantity_tiers", "name": "Bundle quantity tiers (JSON)", "type": "json", "description": "Required for quantity_tiers. Array of {qty, discount_pct}. Mirrors quantity_breaks schema." },
+      { "key": "bundle_quantity_tiers", "name": "Bundle quantity tiers (JSON)", "type": "json", "description": "Required for quantity_tiers. Array of {qty, discount_pct, label?, popular?, free_shipping?, free_gift?}. label is the visible row label (e.g. '2x Sculpting Brush'); falls back to '{qty}x {product.title}' when absent. popular adds the MOST POPULAR badge. free_shipping shows the FREE SHIPPING tag on that tier. free_gift means buying this tier appends the bundle_free_gift_handle product as a $0 line item via ATC." },
       { "key": "bundle_show_in_catalog", "name": "Show in main catalog", "type": "boolean", "default": true },
       { "key": "bundle_surfaces_enabled", "name": "Surfaces enabled (JSON)", "type": "json", "description": "Per-bundle surface allowlist. Array of 1..6. Absent = all enabled at tenant level." },
       { "key": "bundle_copy", "name": "Per-surface copy (JSON)", "type": "json", "description": "Per-surface eyebrow/heading/cta overrides." },
@@ -21,6 +21,9 @@
       { "key": "bundle_cross_supplier", "name": "Cross-supplier", "type": "boolean", "default": false },
       { "key": "bundle_supplier_count", "name": "Supplier count", "type": "number_integer" },
       { "key": "bundle_savings_pct", "name": "Computed savings percent", "type": "number_decimal", "description": "Precomputed for fast banner / card render. Recomputed by runwell-shopify rebuild-bundle-index." },
+      { "key": "bundle_sale_prefix", "name": "Sale prefix (Mode A)", "type": "single_line_text_field", "description": "Subheading copy displayed under the product title on Mode A quantity-tier surfaces. Example: 'Spring Sculpting Sale: Ends June 5'." },
+      { "key": "bundle_rating_score", "name": "Rating score display", "type": "single_line_text_field", "description": "Rating string shown above the title (e.g. '4.8/5'). Display-only; not wired to a review provider for v1." },
+      { "key": "bundle_rating_count", "name": "Rating count display", "type": "single_line_text_field", "description": "Review count string shown next to the rating score (e.g. '2,400+ Reviews')." },
       { "key": "bundle_byob_candidates", "name": "BYOB candidates", "type": "list.product_reference", "description": "Mode C only. Pool of candidate products the customer can pick from.", "v1_5": true },
       { "key": "bundle_byob_min_picks", "name": "BYOB min picks", "type": "number_integer", "description": "Mode C only. Minimum required selections before ATC enables.", "v1_5": true },
       { "key": "bundle_byob_max_picks", "name": "BYOB max picks", "type": "number_integer", "description": "Mode C only. Maximum allowed selections.", "v1_5": true },

package/modules/runwell-bundle-system/assets/runwell-bundle-quantity-builder.css

@@ -0,0 +1,383 @@
+.runwell-bundle-quantity-builder__grid {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  gap: 2.4rem;
+  align-items: start;
+}
+
+/* Slideshow Gallery */
+.runwell-bundle-quantity-builder__slideshow {
+  position: relative;
+  border-radius: 12px;
+  overflow: hidden;
+  background: #E8D5C4;
+}
+
+.runwell-bundle-quantity-builder__slide {
+  display: none;
+}
+
+.runwell-bundle-quantity-builder__slide--active {
+  display: block;
+}
+
+.runwell-bundle-quantity-builder__img {
+  width: 100%;
+  height: auto;
+  display: block;
+  aspect-ratio: 1 / 1;
+  object-fit: cover;
+  max-height: calc(100vh - 260px);
+}
+
+/* Thumbnail Strip - ALWAYS visible including mobile */
+.runwell-bundle-quantity-builder__thumbnails {
+  display: flex;
+  gap: 8px;
+  margin-top: 12px;
+  overflow-x: auto;
+  scrollbar-width: thin;
+  scrollbar-color: #EADFD4 transparent;
+  padding-bottom: 4px;
+  -webkit-overflow-scrolling: touch;
+}
+
+.runwell-bundle-quantity-builder__thumbnails::-webkit-scrollbar {
+  height: 4px;
+}
+
+.runwell-bundle-quantity-builder__thumbnails::-webkit-scrollbar-thumb {
+  background: #EADFD4;
+  border-radius: 2px;
+}
+
+.runwell-bundle-quantity-builder__thumb {
+  flex: 0 0 72px;
+  height: 72px;
+  border-radius: 8px;
+  overflow: hidden;
+  border: 2px solid transparent;
+  cursor: pointer;
+  padding: 0;
+  background: #E8D5C4;
+  transition: border-color 0.2s, opacity 0.2s;
+  opacity: 0.7;
+}
+
+.runwell-bundle-quantity-builder__thumb--active {
+  border-color: #3F5B4C;
+  opacity: 1;
+}
+
+.runwell-bundle-quantity-builder__thumb:hover {
+  opacity: 1;
+}
+
+.runwell-bundle-quantity-builder__thumb img {
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+}
+
+/* Rating */
+.runwell-bundle-quantity-builder__rating {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  margin-bottom: 0;
+}
+
+.runwell-bundle-quantity-builder__stars {
+  color: #E8B931;
+  font-size: calc(var(--font-body-scale) * 1.6rem);
+  letter-spacing: 1px;
+}
+
+.runwell-bundle-quantity-builder__rating-text {
+  font-size: calc(var(--font-body-scale) * 1.4rem);
+  font-weight: 600;
+  font-style: italic;
+}
+
+/* Title */
+.runwell-bundle-quantity-builder__title {
+  margin-top: 0.4rem;
+  margin-bottom: 1rem;
+}
+
+/* Sale heading */
+.runwell-bundle-quantity-builder__sale-heading {
+  display: flex;
+  align-items: center;
+  gap: 1.2rem;
+  margin-bottom: 1.2rem;
+}
+
+.runwell-bundle-quantity-builder__sale-line {
+  flex: 1;
+  height: 1px;
+  background: #2A2622;
+}
+
+.runwell-bundle-quantity-builder__sale-text {
+  font-weight: 700;
+  font-size: calc(var(--font-body-scale) * 1.5rem);
+  white-space: nowrap;
+}
+
+/* Scarcity indicator */
+.runwell-bundle-quantity-builder__scarcity {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  font-size: calc(var(--font-body-scale) * 1.3rem);
+  font-weight: 500;
+  color: #b45309;
+  margin-bottom: 1rem;
+}
+
+.runwell-bundle-quantity-builder__scarcity-dot {
+  width: 8px;
+  height: 8px;
+  border-radius: 50%;
+  background: #b45309;
+  animation: scarcity-pulse 2s ease-in-out infinite;
+}
+
+@keyframes scarcity-pulse {
+  0%, 100% { opacity: 1; }
+  50% { opacity: 0.4; }
+}
+
+/* Options */
+.runwell-bundle-quantity-builder__options {
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+  margin-bottom: 1.2rem;
+}
+
+.runwell-bundle-quantity-builder__option {
+  display: flex;
+  align-items: flex-start;
+  gap: 12px;
+  padding: 14px 18px;
+  border: 2px solid #EADFD4;
+  border-radius: 10px;
+  cursor: pointer;
+  transition: border-color 0.2s, box-shadow 0.2s;
+  position: relative;
+}
+
+.runwell-bundle-quantity-builder__option:hover {
+  border-color: #3F5B4C;
+}
+
+.runwell-bundle-quantity-builder__option--selected {
+  border-color: #2A2622;
+  box-shadow: 0 0 0 1px #2A2622;
+}
+
+.runwell-bundle-quantity-builder__option--popular {
+  border-color: #3F5B4C;
+  position: relative;
+}
+
+.runwell-bundle-quantity-builder__popular-badge {
+  position: absolute;
+  top: -10px;
+  right: 16px;
+  background: #3F5B4C;
+  color: #fff;
+  font-size: var(--runwell-body-size);
+  font-weight: 700;
+  padding: 2px 10px;
+  border-radius: 4px;
+  letter-spacing: 0.06em;
+  text-transform: uppercase;
+}
+
+.runwell-bundle-quantity-builder__option input {
+  position: absolute;
+  opacity: 0;
+  pointer-events: none;
+}
+
+.runwell-bundle-quantity-builder__option-radio {
+  width: 22px;
+  height: 22px;
+  border-radius: 50%;
+  border: 2px solid #EADFD4;
+  flex-shrink: 0;
+  margin-top: 2px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  transition: border-color 0.2s;
+}
+
+.runwell-bundle-quantity-builder__option--selected .runwell-bundle-quantity-builder__option-radio {
+  border-color: #2A2622;
+}
+
+.runwell-bundle-quantity-builder__option--selected .runwell-bundle-quantity-builder__option-radio::after {
+  content: '';
+  width: 12px;
+  height: 12px;
+  border-radius: 50%;
+  background: #2A2622;
+}
+
+.runwell-bundle-quantity-builder__option-content {
+  flex: 1;
+}
+
+.runwell-bundle-quantity-builder__option-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: baseline;
+  gap: 12px;
+}
+
+.runwell-bundle-quantity-builder__option-title {
+  font-weight: 700;
+  font-size: calc(var(--font-heading-scale) * 1.5rem);
+}
+
+.runwell-bundle-quantity-builder__option-pricing {
+  display: flex;
+  align-items: baseline;
+  gap: 8px;
+  flex-shrink: 0;
+}
+
+.runwell-bundle-quantity-builder__option-price {
+  font-weight: 700;
+  font-size: calc(var(--font-body-scale) * 1.8rem);
+}
+
+.runwell-bundle-quantity-builder__option-compare {
+  font-size: calc(var(--font-body-scale) * 1.3rem);
+  text-decoration: line-through;
+  opacity: 0.5;
+}
+
+.runwell-bundle-quantity-builder__option-badges {
+  display: flex;
+  gap: 6px;
+  margin-top: 6px;
+  flex-wrap: wrap;
+}
+
+.runwell-bundle-quantity-builder__badge {
+  font-size: calc(var(--font-body-scale) * 1.1rem);
+  font-weight: 700;
+  padding: 2px 8px;
+  border-radius: 4px;
+  text-transform: uppercase;
+  letter-spacing: 0.03em;
+}
+
+.runwell-bundle-quantity-builder__badge--save {
+  background: #3F5B4C;
+  color: #fff;
+}
+
+.runwell-bundle-quantity-builder__badge--shipping {
+  color: #3F5B4C;
+  font-weight: 600;
+}
+
+.runwell-bundle-quantity-builder__free-gift {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  margin-top: 8px;
+  padding: 8px 12px;
+  background: rgba(63, 91, 76, 0.06);
+  border-radius: 6px;
+  font-size: calc(var(--font-body-scale) * 1.3rem);
+  font-weight: 600;
+}
+
+.runwell-bundle-quantity-builder__gift-icon {
+  font-size: calc(var(--font-body-scale) * 1.6rem);
+}
+
+/* ATC Button */
+.runwell-bundle-quantity-builder__atc {
+  width: 100%;
+  padding: 1.6rem;
+  font-size: calc(var(--font-body-scale) * 1.6rem);
+  font-weight: 700;
+  letter-spacing: 0.06em;
+  text-transform: uppercase;
+  background: #2A2622;
+  color: #fff;
+  border: none;
+  border-radius: 8px;
+  cursor: pointer;
+  transition: background 0.2s;
+  margin-bottom: 1.2rem;
+}
+
+.runwell-bundle-quantity-builder__atc:hover {
+  background: #3F5B4C;
+}
+
+/* Trust badges */
+.runwell-bundle-quantity-builder__trust {
+  display: flex;
+  justify-content: center;
+  gap: 2rem;
+  font-size: calc(var(--font-body-scale) * 1.3rem);
+  opacity: 0.7;
+  flex-wrap: wrap;
+}
+
+/* Sticky ATC on mobile */
+@media screen and (max-width: 989px) {
+  .runwell-bundle-quantity-builder__grid {
+    grid-template-columns: 1fr;
+    gap: 2rem;
+  }
+
+  .runwell-bundle-quantity-builder__atc-wrap {
+    position: sticky;
+    bottom: 0;
+    z-index: 10;
+    background: #fff;
+    padding: 12px 0 max(12px, env(safe-area-inset-bottom));
+    box-shadow: 0 -2px 12px rgba(0, 0, 0, 0.08);
+    margin: 0 -1.5rem;
+    padding-left: 1.5rem;
+    padding-right: 1.5rem;
+  }
+}
+
+@media screen and (max-width: 749px) {
+  .runwell-bundle-quantity-builder__option-header {
+    flex-direction: column;
+    gap: 4px;
+  }
+
+  .runwell-bundle-quantity-builder__trust {
+    flex-direction: column;
+    align-items: center;
+    gap: 0.6rem;
+  }
+}
+
+/* Runwell additions: placeholder states when gallery is empty */
+.runwell-bundle-quantity-builder__img--placeholder,
+.runwell-bundle-quantity-builder__thumb-img--placeholder {
+  width: 100%;
+  height: 100%;
+  min-height: 320px;
+  background: linear-gradient(135deg, var(--runwell-oat, #F5F0EE), var(--runwell-cream, #EDE6D8));
+  display: block;
+}
+.runwell-bundle-quantity-builder__thumb-img--placeholder {
+  min-height: 0;
+}

package/modules/runwell-bundle-system/assets/runwell-bundle-system.js

@@ -72,6 +72,204 @@
       });
   }
 
+  /* -------------------------------------------------------------------
+   * Mode A quantity builder
+   *
+   * Per-tier radio selection state + image thumbnail swap + ATC.
+   * ATC handles two cases:
+   *   1. Plain tier: standard product form POST.
+   *   2. free_gift tier: intercept the submit, build a multi-line
+   *      /cart/add.js POST with the bundle qty + 1 of the free gift
+   *      product (read from data-free-gift-variant-id on the section).
+   * After success: open Dawn cart drawer + dispatch cart:updated so any
+   * downstream xsell listeners refresh.
+   * ----------------------------------------------------------------- */
+  function initQuantityBuilder() {
+    document
+      .querySelectorAll('[data-runwell-bundle-quantity-builder]')
+      .forEach(function (section) {
+        // Tier selection visual state
+        section
+          .querySelectorAll('[data-runwell-tier-radio]')
+          .forEach(function (radio) {
+            radio.addEventListener('change', function () {
+              section
+                .querySelectorAll('.runwell-bundle-quantity-builder__option')
+                .forEach(function (label) {
+                  const input = label.querySelector('[data-runwell-tier-radio]');
+                  label.classList.toggle(
+                    'runwell-bundle-quantity-builder__option--selected',
+                    input ? input.checked : false
+                  );
+                });
+            });
+          });
+
+        // Thumbnail swap (image gallery)
+        section.querySelectorAll('[data-thumb]').forEach(function (btn) {
+          btn.addEventListener('click', function () {
+            const idx = btn.dataset.thumb;
+            section
+              .querySelectorAll('.runwell-bundle-quantity-builder__slide')
+              .forEach(function (s) {
+                s.classList.toggle(
+                  'runwell-bundle-quantity-builder__slide--active',
+                  s.dataset.slide === idx
+                );
+              });
+            section
+              .querySelectorAll('.runwell-bundle-quantity-builder__thumb')
+              .forEach(function (t) {
+                t.classList.toggle(
+                  'runwell-bundle-quantity-builder__thumb--active',
+                  t === btn
+                );
+              });
+          });
+        });
+
+        // ATC handler
+        const form = section.querySelector('[data-runwell-bundle-form]');
+        if (!form) return;
+        const atc = form.querySelector('[data-runwell-bundle-atc]');
+        const giftVariantId = section.dataset.freeGiftVariantId || '';
+
+        form.addEventListener('submit', function (e) {
+          e.preventDefault();
+          const selected = form.querySelector(
+            '.runwell-bundle-quantity-builder__option--selected'
+          );
+          if (!selected) return;
+          const qty = parseInt(selected.dataset.tierQty || '1', 10);
+          const wantsGift = selected.dataset.tierFreeGift === 'true' && giftVariantId !== '';
+          const variantId = form.querySelector('input[name="id"]').value;
+
+          setAtcState(atc, 'loading');
+
+          const items = [{ id: parseInt(variantId, 10), quantity: qty }];
+          if (wantsGift) {
+            items.push({ id: parseInt(giftVariantId, 10), quantity: 1 });
+          }
+
+          fetch('/cart/add.js', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json', Accept: 'application/json' },
+            body: JSON.stringify({ items: items }),
+          })
+            .then(function (r) {
+              if (!r.ok) throw new Error('add failed');
+              return r.json();
+            })
+            .then(function () {
+              setAtcState(atc, 'added');
+              document.dispatchEvent(new CustomEvent('cart:updated', { bubbles: true }));
+              // Open Dawn cart drawer if present
+              const drawer = document.querySelector('cart-drawer');
+              if (drawer && typeof drawer.open === 'function') drawer.open();
+              setTimeout(function () {
+                setAtcState(atc, 'idle');
+              }, 2000);
+            })
+            .catch(function () {
+              setAtcState(atc, 'idle');
+            });
+        });
+      });
+  }
+
+  function setAtcState(atc, state) {
+    if (!atc) return;
+    const textEl = atc.querySelector('.runwell-bundle-quantity-builder__atc-text');
+    const loadEl = atc.querySelector('.runwell-bundle-quantity-builder__atc-loading');
+    if (!textEl || !loadEl) return;
+    if (state === 'loading') {
+      textEl.style.display = 'none';
+      loadEl.style.display = 'inline';
+      atc.disabled = true;
+    } else if (state === 'added') {
+      loadEl.style.display = 'none';
+      textEl.textContent = 'ADDED';
+      textEl.style.display = 'inline';
+    } else {
+      loadEl.style.display = 'none';
+      textEl.textContent = 'ADD TO CART';
+      textEl.style.display = 'inline';
+      atc.disabled = false;
+    }
+  }
+
+  /* -------------------------------------------------------------------
+   * Cart-drawer xsell refresh
+   *
+   * The cart drawer is server-rendered once. When customers add or
+   * change items via async fetch (PDP ATC, qty controls, remove), the
+   * bundle xsell area would otherwise stay stale. We hook fetch() to
+   * detect cart mutations, then re-render #CartDrawer-XsellSlot from
+   * the current page's cart-drawer section via Section Rendering API.
+   *
+   * Tenants opt in by adding <div id="CartDrawer-XsellSlot"> around the
+   * bundle xsell in their cart-drawer snippet (or by using the
+   * snippets/runwell-bundle-cart-xsell.liquid wrapper which does this).
+   * If the slot isn't present, this is a no-op.
+   * ----------------------------------------------------------------- */
+  function initCartMutationRefresh() {
+    if (window.__runwellBundleCartRefreshInstalled) return;
+    window.__runwellBundleCartRefreshInstalled = true;
+
+    const MUTATION_RE = /\/cart\/(add|change|update|clear)(?:\.js)?(?:[?#]|$)/;
+    let pending = null;
+
+    function scheduleRefresh() {
+      if (pending) return;
+      pending = setTimeout(function () {
+        pending = null;
+        refresh();
+      }, 120);
+    }
+
+    function refresh() {
+      const slot = document.getElementById('CartDrawer-XsellSlot');
+      if (!slot) return;
+      const url =
+        window.location.pathname +
+        (window.location.search ? window.location.search + '&' : '?') +
+        'sections=cart-drawer';
+      fetch(url, { credentials: 'same-origin' })
+        .then(function (r) {
+          return r.json();
+        })
+        .then(function (data) {
+          const html = data && data['cart-drawer'];
+          if (!html) return;
+          const doc = new DOMParser().parseFromString(html, 'text/html');
+          const fresh = doc.getElementById('CartDrawer-XsellSlot');
+          if (!fresh) return;
+          slot.innerHTML = fresh.innerHTML;
+        })
+        .catch(function () {
+          /* silent; keep current xsell */
+        });
+    }
+
+    const origFetch = window.fetch;
+    window.fetch = function () {
+      const args = arguments;
+      const p = origFetch.apply(this, args);
+      try {
+        const first = args[0];
+        const url = typeof first === 'string' ? first : (first && first.url) || '';
+        if (MUTATION_RE.test(url)) {
+          p.then(scheduleRefresh, function () {});
+        }
+      } catch (e) {}
+      return p;
+    };
+
+    ['cart:updated', 'cart:refresh', 'cart-drawer:updated'].forEach(function (name) {
+      document.addEventListener(name, scheduleRefresh);
+    });
+  }
+
   function initFilterChip() {
     document
       .querySelectorAll('[data-runwell-bundle-filter-chip]')
@@ -433,6 +631,8 @@
       initFilterChip();
       initCartXsell();
       initByob();
+      initQuantityBuilder();
+      initCartMutationRefresh();
     });
   } else {
     initFomo();
@@ -440,5 +640,7 @@
     initFilterChip();
     initCartXsell();
     initByob();
+    initQuantityBuilder();
+    initCartMutationRefresh();
   }
 })();

package/modules/runwell-bundle-system/module.json

@@ -1,6 +1,6 @@
 {
   "name": "runwell-bundle-system",
-  "version": "0.3.0",
+  "version": "0.4.1",
   "category": "catalog",
   "source": "runwell",
   "base": "bundle-system",
@@ -13,10 +13,12 @@
       "sections/runwell-bundle-home-stacks.liquid",
       "sections/runwell-bundle-cart-xsell.liquid",
       "sections/runwell-bundle-pdp-banner.liquid",
-      "sections/runwell-bundle-collection.liquid"
+      "sections/runwell-bundle-collection.liquid",
+      "sections/runwell-bundle-quantity-builder.liquid"
     ],
     "snippets": [
       "snippets/runwell-bundle-card.liquid",
+      "snippets/runwell-bundle-cart-xsell.liquid",
       "snippets/runwell-bundle-quantity-tiers.liquid",
       "snippets/runwell-bundle-multi-product.liquid",
       "snippets/runwell-bundle-pricing.liquid",
@@ -32,7 +34,8 @@
     ],
     "assets": [
       "assets/runwell-bundle-system.css",
-      "assets/runwell-bundle-system.js"
+      "assets/runwell-bundle-system.js",
+      "assets/runwell-bundle-quantity-builder.css"
     ]
   },
   "config": {

package/modules/runwell-bundle-system/sections/runwell-bundle-cart-xsell.liquid

@@ -20,7 +20,8 @@
 {%- if settings.bundle_system__surface_4_cart_drawer_xsell_enabled == false -%}
   {%- comment -%} Tenant has disabled this surface. {%- endcomment -%}
 {%- else -%}
-  {%- assign bundle_index = shop.metaobjects.bundle_index.entries.value -%}
+  {%- assign bundle_index_instance = shop.metaobjects.bundle_index.values | first -%}
+  {%- assign bundle_index = bundle_index_instance.entries.value -%}
   {%- assign render_slot = false -%}
   {%- if bundle_index and bundle_index.products and bundle_index.bundles -%}
     {%- assign render_slot = true -%}

package/modules/runwell-bundle-system/sections/runwell-bundle-collection.liquid

@@ -11,15 +11,27 @@
 
 {%- assign mode = section.settings.mode | default: 'grid' -%}
 
-{%- comment -%} Build the bundles list from collection.products if present, otherwise scan all_products. {%- endcomment -%}
-{%- assign source_products = collection.products -%}
-{%- if source_products == blank or source_products.size == 0 -%}
-  {%- assign source_products = all_products -%}
+{%- comment -%}
+  Build the bundles list. Prefer the bundle_index shop metaobject when
+  populated (one read; deterministic). Fall back to scanning all_products
+  for products tagged 'bundle'.
+{%- endcomment -%}
+{%- assign bundle_index_instance = shop.metaobjects.bundle_index.values | first -%}
+{%- assign bundle_index = bundle_index_instance.entries.value -%}
+{%- assign bundles = '' | split: '' -%}
+{%- if bundle_index and bundle_index.bundles -%}
+  {%- for entry in bundle_index.bundles -%}
+    {%- assign bp = all_products[entry[0]] -%}
+    {%- if bp != blank and bp.handle != blank -%}
+      {%- assign bundles = bundles | concat: bp -%}
+    {%- endif -%}
+  {%- endfor -%}
 {%- endif -%}
-
-{%- assign bundles_meta = source_products | where: 'metafields.runwell.bundle_mode' -%}
-{%- assign bundles = bundles_meta -%}
-{%- if bundles == empty or bundles.size == 0 -%}
+{%- if bundles.size == 0 -%}
+  {%- assign source_products = collection.products -%}
+  {%- if source_products == blank or source_products.size == 0 -%}
+    {%- assign source_products = all_products -%}
+  {%- endif -%}
   {%- assign bundles = source_products | where: 'tags', 'bundle' -%}
 {%- endif -%}