@blamejs/blamejs-shop 0.3.45 → 0.3.46

package/CHANGELOG.md

@@ -8,6 +8,8 @@ upgrading across more than a few patches at a time.
 
 ## v0.3.x
 
+- v0.3.46 (2026-06-01) — **Storefront pages render in far fewer database round trips, and the search collection filter is consistent across cache tiers.** The dynamically rendered storefront (the path that serves returning, signed-in, or non-default-currency shoppers) re-derived product data with one database query per item — a home or search page could issue dozens to hundreds of round trips, where the cached edge already did the same work in a single batched query. The home grid, search results, product page, related-products rail, and cart now read product, variant, price, inventory, and media data in batched queries that mirror the edge exactly, so those pages render with far fewer round trips and identical output. As part of this, the search 'collection' filter now reflects manual collection membership consistently whether a page is served from the cache or rendered dynamically. **Changed:** *Batched product reads on storefront pages* — The home grid, search results, product detail, related-products rail, and cart now load product/variant/price/inventory/media data in batched database queries instead of one query per item. On a cache miss, a signed-in session, or a non-default currency the dynamic render path previously issued a query per product (and per variant); these pages now match the single-query shape the cached edge already used. Rendered pages are unchanged. · *Consistent search collection filter across cache tiers* — The 'collection' filter on the search page now reflects manual collection membership on both the cached and the dynamically rendered paths. Previously the dynamic path could additionally surface smart-collection rule matches in that filter, so a shopper could see different collection filter options depending on which path served the page. If you relied on smart (rule-based) collections appearing as search filters, they now appear only where a product is an explicit member; this aligns the two render paths.
+
 - v0.3.45 (2026-06-01) — **Tax, VAT, bulk price changes, and customer emails now compute money in exact integer arithmetic.** Several money calculations were performed with floating-point intermediates. On a large order subtotal the sales-tax math could lose a minor unit, and the customer-facing wishlist emails formatted prices by dividing by 100 — which is wrong for zero-decimal currencies like JPY (¥1,050 rendered as 10.5) and three-decimal currencies like BHD, and dropped trailing zeros ($10.00 shown as 10). All of these now run through the framework's exact BigInt money primitive: sales-tax and VAT/GST extraction, the per-rate owed figure on a tax filing, the admin bulk price-adjust, the wishlist price-drop and digest emails, and subscription monthly-revenue normalization. Prices in customer emails are now rendered with the correct currency exponent and symbol for every currency. **Changed:** *Bulk price-adjust rounds to even on exact half-unit ties* — The admin bulk price-adjust now rounds a price that lands exactly halfway between two minor units to the nearest even unit, matching the rounding used everywhere else in the money surface, instead of always rounding the half up. This only changes the result on an exact tie and by at most one minor unit (for example a price computed as 200.5 now becomes 200 rather than 201). If a pricing regime requires rounding halves up, that is a one-line option change. **Fixed:** *Exact sales-tax and VAT computation* — Sales tax, VAT-inclusive extraction, and VAT-exclusive addition are computed in exact integer arithmetic rather than with a floating-point intermediate, so the tax on a large order total is no longer off by a minor unit. The per-rate owed figure on a tax filing is likewise computed exactly, which matters when a filing window aggregates a very large taxable total. · *Currency-correct prices in wishlist emails* — Price-drop alert emails and the wishlist digest now format prices with each currency's own decimal places and symbol. Zero-decimal currencies (such as JPY) and three-decimal currencies (such as BHD) render correctly, and whole amounts keep their trailing zeros — for example $10.00 instead of 10. · *Exact subscription monthly-revenue normalization* — Normalizing a weekly or annual plan to a monthly figure for revenue reporting now uses exact rational arithmetic instead of a floating-point cadence factor, so the dashboard total is stable and does not drift by a cent between refreshes.
 
 - v0.3.44 (2026-05-31) — **Customers can rate a delivered order, and the admin console moderates and replies.** There was no way for a customer to give feedback on how an order was fulfilled, and no way for an operator to act on it. Customers can now rate one of their own delivered orders on shipping, packaging, and how likely they are to recommend you, with an optional comment. The admin console gets a Ratings screen with a moderation queue of every flagged comment plus the most recent ratings, where an operator can flag a comment or post one public reply that the customer then sees on their order page. A customer can only rate an order they own, and every comment and reply is HTML-escaped wherever it is shown, so feedback text can't inject markup into another shopper's or an operator's page. **Added:** *Order ratings* — A customer viewing one of their own orders can rate it on three axes — shipping, packaging, and likelihood to recommend (1 to 5) — and optionally leave a comment. Each order can be rated once. The rating, and any public reply from the store, appear on the customer's order page. A customer can only rate an order tied to their own account; the rating is always recorded against the signed-in customer, never a value taken from the request. · *Ratings moderation in the admin console* — A new Ratings screen lists recent ratings with their scores and comments, alongside a moderation queue that surfaces every flagged comment regardless of its score, so a flagged comment on an otherwise high rating is never hidden. An operator can flag a comment for moderation and post a single public reply to a rating, which is then shown to the customer. Comments and replies are HTML-escaped everywhere they are rendered.

package/lib/asset-manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.3.45",
+  "version": "0.3.46",
   "assets": {
     "css/admin.css": {
       "integrity": "sha384-1SIn6oAf1DjECbRfKENZasdKHJiywGdXR58wn0hsFGcdVHzUmvfgMkEz5ANIAZJ3",

package/lib/catalog.js

@@ -171,6 +171,23 @@ function _contentType(s) {
 function _genId() { return b.uuid.v7(); }
 function _now()   { return Date.now(); }
 
+// Build the LIKE pattern for a single term — lowercased + the
+// `\`-first metacharacter neutralisation so a term containing `%` /
+// `_` matches only the literal character (otherwise `100%` would
+// match every row). The `\\` substitution MUST run first, before the
+// `%` / `_` passes, so the `\` we insert in front of a wildcard
+// isn't itself re-escaped on the next pass and the wildcard survives
+// un-neutralised. `products.search` and `batch.searchDecorate` both
+// compose this so the escape can't drift between the two surfaces;
+// it mirrors the edge `_likePattern` (worker/data/catalog.js).
+function _likePattern(term) {
+  var escaped = String(term).toLowerCase()
+    .replace(/\\/g, "\\\\")
+    .replace(/%/g, "\\%")
+    .replace(/_/g, "\\_");
+  return "%" + escaped + "%";
+}
+
 // ---- factory -------------------------------------------------------------
 
 function create(opts) {
@@ -206,6 +223,13 @@ function create(opts) {
   // failure never rolls back the stock op that triggered it.
   var inventory = _inventoryModule(query, { onStockChange: opts.onStockChange || null });
   var media     = _mediaModule(query);
+  // Batched read helpers — one or a few `IN (...)` / window-function
+  // queries that replace the per-item loops the container storefront
+  // ran (N+1 over the D1 bridge). Each is ported from the named edge
+  // function in worker/data/catalog.js with the SAME SQL shape +
+  // output field names, so the dual-rendered HTML stays byte-identical
+  // across the edge + container substrates.
+  var batch     = _batchModule(query);
 
   return {
     products:  products,
@@ -213,6 +237,7 @@ function create(opts) {
     prices:    prices,
     inventory: inventory,
     media:     media,
+    batch:     batch,
   };
 }
 
@@ -381,17 +406,12 @@ function _productsModule(query, cursorSecret) {
       if (qTrim.length === 0) {
         return { rows: [], next_cursor: null };
       }
-      var qLower = qTrim.toLowerCase();
       // Neutralize LIKE metacharacters so a search containing `%`
       // or `_` matches only the literal character (otherwise `100%`
-      // would match every row). `\` is the escape character; it has
-      // to be escaped first so we don't double-escape the
-      // `\` we insert in front of `%` / `_`.
-      var qEscaped = qLower
-        .replace(/\\/g, "\\\\")
-        .replace(/%/g, "\\%")
-        .replace(/_/g, "\\_");
-      var pattern = "%" + qEscaped + "%";
+      // would match every row). The shared `_likePattern` lowercases
+      // and escapes `\` first so the wildcard neutralisation can't be
+      // re-escaped — the same helper `batch.searchDecorate` composes.
+      var pattern = _likePattern(qTrim);
       var cursorVals = null;
       if (opts.cursor != null) {
         if (typeof opts.cursor !== "string") {
@@ -851,6 +871,485 @@ function _mediaModule(query) {
   };
 }
 
+// ---- batch (N+1-collapsing read helpers) ---------------------------------
+//
+// These mirror worker/data/catalog.js — the edge worker already
+// produces, in one or a few `IN (...)` / window-function queries, what
+// the container storefront re-derived with per-item loops (each a
+// full D1-bridge hop). Porting the edge SQL verbatim keeps the two
+// substrates in lockstep: the field names + row shapes below are the
+// ones the storefront renderers already accept, so the rendered HTML /
+// JSON-LD is unchanged.
+//
+// Every helper composes the module's `query(sql, params)` closure +
+// the existing validators. Each is missing-table-resilient (catch
+// `/no such table/i` → empty) to match the edge + the never-500-the-
+// page stance, EXCEPT entry-point validation (a malformed id throws
+// TypeError, which the route catches → 404/empty). The IN(...) lists
+// use positional placeholders generated from array length, values
+// bound positionally — never interpolated.
+
+// First-variant / first-media decorated SELECT — ported verbatim from
+// the edge `DECORATED_SELECT` (worker/data/catalog.js). Window
+// functions pick the first variant (position ASC, created_at ASC) +
+// first media per product in one round trip; the price is joined off
+// the hero variant for the requested currency. `?1` is the currency.
+var _DECORATED_SELECT =
+  "SELECT p.*, " +
+  "       v.id        AS hero_variant_id, " +
+  "       pr.amount_minor AS starting_price_minor, " +
+  "       pr.currency     AS starting_price_currency, " +
+  "       m.r2_key    AS hero_r2_key, " +
+  "       m.alt_text  AS hero_alt_text " +
+  "FROM products p " +
+  "LEFT JOIN ( " +
+  "  SELECT iv.*, " +
+  "         ROW_NUMBER() OVER (PARTITION BY iv.product_id ORDER BY iv.position ASC, iv.created_at ASC) AS rn " +
+  "  FROM variants iv " +
+  ") v ON v.product_id = p.id AND v.rn = 1 " +
+  "LEFT JOIN prices pr ON pr.variant_id = v.id AND pr.currency = ?1 AND pr.effective_until IS NULL " +
+  "LEFT JOIN ( " +
+  "  SELECT im.*, " +
+  "         ROW_NUMBER() OVER (PARTITION BY im.product_id ORDER BY im.position ASC, im.created_at ASC) AS rn " +
+  "  FROM media im " +
+  "  WHERE im.product_id IS NOT NULL " +
+  ") m ON m.product_id = p.id AND m.rn = 1 ";
+
+// Shape a decorated row to the exact output `_shapeDecoratedRow`
+// produces at the edge (worker/data/catalog.js): the product columns
+// plus `starting_price_minor` / `starting_price_currency` /
+// `hero_media`. No arithmetic — `starting_price_minor` is the raw
+// integer minor-unit amount passed through.
+function _shapeDecoratedRow(r) {
+  var hero = (r.hero_r2_key != null)
+    ? { r2_key: r.hero_r2_key, alt_text: r.hero_alt_text || "" }
+    : null;
+  return {
+    id:                      r.id,
+    slug:                    r.slug,
+    title:                   r.title,
+    description:             r.description,
+    status:                  r.status,
+    created_at:              r.created_at,
+    updated_at:              r.updated_at,
+    starting_price_minor:    r.starting_price_minor != null ? r.starting_price_minor : null,
+    starting_price_currency: r.starting_price_currency || "USD",
+    hero_media:              hero,
+  };
+}
+
+function _batchModule(query) {
+  // Default to USD when an unset / wrong-shape currency reaches a
+  // helper, matching the edge's `(len === 3) ? cur : "USD"` guard.
+  function _ccy(c) {
+    return (typeof c === "string" && c.length === 3) ? c : "USD";
+  }
+
+  return {
+    // Decorate a set of product ids in one query (backs PERF-5 home
+    // grid + PERF-1 related). Returns `{ rows, byId }`: `rows` carries
+    // one decorated row per matching id in `created_at`-stable order
+    // and `byId` maps id → row so the caller can re-impose its own
+    // order. Mirrors the edge `DECORATED_SELECT` + `_shapeDecoratedRow`.
+    decoratedProducts: async function (productIds, currency) {
+      if (!Array.isArray(productIds) || productIds.length === 0) return { rows: [], byId: {} };
+      var ids = productIds.map(function (id) { return _id(id, "product id"); });
+      var cur = _ccy(currency);
+      var placeholders = ids.map(function (_v, n) { return "?" + (n + 2); }).join(", ");
+      var params = [cur].concat(ids);
+      var r = await query(
+        _DECORATED_SELECT +
+        "WHERE p.id IN (" + placeholders + ") " +
+        "ORDER BY p.created_at ASC, p.id ASC",
+        params,
+      );
+      var rows = [];
+      var byId = {};
+      for (var i = 0; i < r.rows.length; i += 1) {
+        var shaped = _shapeDecoratedRow(r.rows[i]);
+        rows.push(shaped);
+        byId[shaped.id] = shaped;
+      }
+      return { rows: rows, byId: byId };
+    },
+
+    // Active products decorated in one query (backs PERF-5 / UX-8 home
+    // grid). Mirrors the edge `listActiveProducts`: status='active',
+    // ORDER BY updated_at DESC, id DESC, LIMIT/OFFSET. Returns
+    // `{ rows }`.
+    decoratedActive: async function (opts) {
+      opts = opts || {};
+      var cur = _ccy(opts.currency);
+      var limit  = opts.limit  == null ? 24 : opts.limit;
+      var offset = opts.offset == null ? 0  : opts.offset;
+      _positiveInt(limit, "limit");
+      _nonNegInt(offset, "offset");
+      var r = await query(
+        _DECORATED_SELECT +
+        "WHERE p.status = 'active' " +
+        "ORDER BY p.updated_at DESC, p.id DESC " +
+        "LIMIT ?2 OFFSET ?3",
+        [cur, limit, offset],
+      );
+      var rows = [];
+      for (var i = 0; i < r.rows.length; i += 1) rows.push(_shapeDecoratedRow(r.rows[i]));
+      return { rows: rows };
+    },
+
+    // Variants + their current price for a product in one query (backs
+    // PERF-3 PDP). Mirrors the edge `listVariantsWithPrices`: LEFT JOIN
+    // the active price (effective_until IS NULL) for `currency`,
+    // ordered position ASC, created_at ASC. Returns `{ rows, prices }`:
+    //   - `rows`   — the variant rows shaped like `variants.listForProduct`
+    //                (options_json parsed to `options`), price columns dropped
+    //                so the shape is byte-identical to the per-item path.
+    //   - `prices` — { variantId: priceRow } for variants that HAVE a
+    //                price in `currency`, each priceRow shaped like
+    //                `prices.current` output.
+    variantsWithPrices: async function (productId, currency) {
+      _id(productId, "product_id");
+      var cur = _ccy(currency);
+      var r = await query(
+        "SELECT v.*, " +
+        "       pr.id              AS price_id, " +
+        "       pr.amount_minor    AS price_amount_minor, " +
+        "       pr.currency        AS price_currency, " +
+        "       pr.effective_from  AS price_effective_from, " +
+        "       pr.effective_until AS price_effective_until, " +
+        "       pr.created_at      AS price_created_at " +
+        "FROM variants v " +
+        "LEFT JOIN prices pr ON pr.variant_id = v.id AND pr.currency = ?1 AND pr.effective_until IS NULL " +
+        "WHERE v.product_id = ?2 " +
+        "ORDER BY v.position ASC, v.created_at ASC",
+        [cur, productId],
+      );
+      var rows = [];
+      var prices = {};
+      for (var i = 0; i < r.rows.length; i += 1) {
+        var raw = r.rows[i];
+        // Lift the joined price into the per-variant prices map, shaped
+        // exactly like `prices.current` output (only when a price for
+        // `currency` exists), then strip the joined price columns off
+        // the variant row so the row shape is byte-identical to
+        // `variants.listForProduct` (the variant columns + parsed
+        // `options`). Deleting the extra keys in place preserves the
+        // row's identity/prototype so the two paths deep-equal.
+        if (raw.price_amount_minor != null) {
+          prices[raw.id] = {
+            id:              raw.price_id,
+            variant_id:      raw.id,
+            currency:        raw.price_currency,
+            amount_minor:    raw.price_amount_minor,
+            effective_from:  raw.price_effective_from,
+            effective_until: raw.price_effective_until,
+            created_at:      raw.price_created_at,
+          };
+        }
+        delete raw.price_id;
+        delete raw.price_amount_minor;
+        delete raw.price_currency;
+        delete raw.price_effective_from;
+        delete raw.price_effective_until;
+        delete raw.price_created_at;
+        raw.options = JSON.parse(raw.options_json);
+        rows.push(raw);
+      }
+      return { rows: rows, prices: prices };
+    },
+
+    // Inventory rows for a set of SKUs in one query, keyed by SKU
+    // (backs PERF-6 cart-line stock). Mirrors the edge
+    // `listInventoryForSkus`: the trimmed `{ stock_on_hand, stock_held }`
+    // shape — sufficient for the cart, which derives its low-stock band
+    // from an operator config value, not the per-SKU column. A SKU with
+    // no inventory row is absent from the map (the renderer treats
+    // absence as available). Missing-table-resilient → {}.
+    inventoryForSkus: async function (skus) {
+      if (!Array.isArray(skus) || skus.length === 0) return {};
+      var out = {};
+      try {
+        var placeholders = skus.map(function (_s, i) { return "?" + (i + 1); }).join(", ");
+        var r = await query(
+          "SELECT sku, stock_on_hand, stock_held FROM inventory WHERE sku IN (" + placeholders + ")",
+          skus,
+        );
+        for (var i = 0; i < r.rows.length; i += 1) {
+          out[r.rows[i].sku] = { stock_on_hand: r.rows[i].stock_on_hand, stock_held: r.rows[i].stock_held };
+        }
+      } catch (e) {
+        if (e && /no such table/i.test(e.message || "")) return {};
+        throw e;
+      }
+      return out;
+    },
+
+    // Full inventory rows for a set of SKUs in one query, keyed by SKU
+    // (backs PERF-3 PDP availability). Returns the SAME full-row shape
+    // `inventory.get` does (`SELECT *` → sku, stock_on_hand, stock_held,
+    // low_stock_threshold, updated_at), keeping the PDP's per-SKU
+    // inventory map byte-identical to the prior per-variant
+    // `inventory.get` loop. The PDP's availability resolver reads
+    // `low_stock_threshold` to surface the "Only N left" nudge, so the
+    // PDP needs the full row — the trimmed `inventoryForSkus` above is
+    // for the cart, which doesn't. A SKU with no inventory row is absent
+    // (renderer treats absence as available). Missing-table-resilient
+    // → {}.
+    inventoryRowsForSkus: async function (skus) {
+      if (!Array.isArray(skus) || skus.length === 0) return {};
+      var out = {};
+      try {
+        var placeholders = skus.map(function (_s, i) { return "?" + (i + 1); }).join(", ");
+        var r = await query(
+          "SELECT * FROM inventory WHERE sku IN (" + placeholders + ")",
+          skus,
+        );
+        for (var i = 0; i < r.rows.length; i += 1) {
+          out[r.rows[i].sku] = r.rows[i];
+        }
+      } catch (e) {
+        if (e && /no such table/i.test(e.message || "")) return {};
+        throw e;
+      }
+      return out;
+    },
+
+    // The facetable product universe for a set of search terms (backs
+    // PERF-2). Ported from the edge `searchFacetableProducts`: one
+    // decorated SELECT with an OR-of-LIKE term clause, then a
+    // collection_members `IN` (MANUAL membership only — see PD-1) +
+    // a grouped-inventory `IN`. Terms are deduped case-insensitively.
+    // Returns `{ rows }` where each row is the decorated shape PLUS
+    // `collection` (array of slugs), `price_minor` (int|null), and
+    // `in_stock` (bool) — the shape the faceting walker + search-card
+    // renderer consume. The collection + inventory reads are
+    // missing-table-resilient (a partially-migrated deploy degrades to
+    // the fields it has rather than 500ing search).
+    searchDecorate: async function (opts) {
+      opts = opts || {};
+      var terms = Array.isArray(opts.terms) ? opts.terms : [];
+      var dedup = {};
+      var cleaned = [];
+      for (var ti = 0; ti < terms.length; ti += 1) {
+        var term = typeof terms[ti] === "string" ? terms[ti].trim() : "";
+        if (!term.length || dedup[term.toLowerCase()]) continue;
+        dedup[term.toLowerCase()] = true;
+        cleaned.push(term);
+      }
+      if (!cleaned.length) return { rows: [] };
+      var cur = _ccy(opts.currency);
+      // Cap the candidate universe wider than the page so facet counts
+      // reflect the full match set. MAX_LIMIT keeps the in-memory facet
+      // walk bounded — matches the edge's MAX_LIMIT (100) cap.
+      var universeLimit = 100;
+
+      // One OR-of-LIKE clause per term. Positional params: ?1 is the
+      // price currency, ?2 the universe limit; term patterns start at ?3.
+      var likeClauses = [];
+      var params = [cur, universeLimit];
+      var ph = 3;
+      for (var c = 0; c < cleaned.length; c += 1) {
+        var pat = _likePattern(cleaned[c]);
+        likeClauses.push("lower(p.title) LIKE ?" + ph + " ESCAPE '\\'");
+        params.push(pat);
+        ph += 1;
+        likeClauses.push("lower(p.description) LIKE ?" + ph + " ESCAPE '\\'");
+        params.push(pat);
+        ph += 1;
+      }
+      var r = await query(
+        _DECORATED_SELECT +
+        "WHERE p.status = 'active' AND (" + likeClauses.join(" OR ") + ") " +
+        "ORDER BY p.updated_at DESC, p.id DESC LIMIT ?2",
+        params,
+      );
+      var raw = r.rows;
+      if (!raw.length) return { rows: [] };
+
+      var ids = raw.map(function (row) { return row.id; });
+      var byId = {};
+      var rows = [];
+      for (var i = 0; i < raw.length; i += 1) {
+        var shaped = _shapeDecoratedRow(raw[i]);
+        shaped.collection = [];
+        shaped.price_minor = shaped.starting_price_minor != null ? shaped.starting_price_minor : null;
+        shaped.in_stock = false;
+        byId[shaped.id] = shaped;
+        rows.push(shaped);
+      }
+
+      var placeholders = ids.map(function (_v, n) { return "?" + (n + 1); }).join(", ");
+
+      // Collection memberships — categorical facet field `collection`.
+      // MANUAL membership only (collection_members joined to a live
+      // collection), matching the edge. Smart-collection rule matches
+      // are intentionally NOT included (PD-1 convergence).
+      try {
+        var cmRes = await query(
+          "SELECT cm.product_id AS pid, cm.collection_slug AS slug " +
+          "FROM collection_members cm " +
+          "JOIN collections col ON col.slug = cm.collection_slug AND col.archived_at IS NULL " +
+          "WHERE cm.product_id IN (" + placeholders + ")",
+          ids,
+        );
+        for (var cm = 0; cm < cmRes.rows.length; cm += 1) {
+          var pr1 = byId[cmRes.rows[cm].pid];
+          if (pr1 && cmRes.rows[cm].slug) pr1.collection.push(cmRes.rows[cm].slug);
+        }
+      } catch (e) {
+        if (!(e && /no such table/i.test(e.message || ""))) throw e;
+      }
+
+      // In-stock — true when any variant SKU has available stock
+      // (stock_on_hand > stock_held). Boolean facet field `in_stock`.
+      try {
+        var invRes = await query(
+          "SELECT v.product_id AS pid, " +
+          "       MAX(CASE WHEN (inv.stock_on_hand - inv.stock_held) > 0 THEN 1 ELSE 0 END) AS any_stock " +
+          "FROM variants v " +
+          "JOIN inventory inv ON inv.sku = v.sku " +
+          "WHERE v.product_id IN (" + placeholders + ") " +
+          "GROUP BY v.product_id",
+          ids,
+        );
+        for (var iv = 0; iv < invRes.rows.length; iv += 1) {
+          var pr2 = byId[invRes.rows[iv].pid];
+          if (pr2) pr2.in_stock = Number(invRes.rows[iv].any_stock) === 1;
+        }
+      } catch (e2) {
+        if (!(e2 && /no such table/i.test(e2.message || ""))) throw e2;
+      }
+
+      return { rows: rows };
+    },
+
+    // "You may also like" siblings for a product, decorated in one
+    // query (backs PERF-1). Ported from the edge `listRelatedProducts`
+    // sibling SELECT: the other active members of `collectionSlug`
+    // (self excluded), ordered membership position ASC then product id
+    // ASC, capped at `limit`, each carrying its first variant's current
+    // price + first media row. Returns the exact
+    // `{ slug, title, hero_r2_key, hero_alt_text, price_minor,
+    // price_currency }` shape the rail renderer consumes. NOTE: this is
+    // ONLY the sibling decoration — the primary-collection lookup stays
+    // in the caller (it already has it).
+    relatedSiblings: async function (collectionSlug, excludeProductId, currency, limit) {
+      _slug(collectionSlug);
+      _id(excludeProductId, "product_id");
+      var cur = _ccy(currency);
+      var n = (Number.isInteger(limit) && limit > 0) ? limit : 4;
+      var r = await query(
+        "SELECT p.id AS id, p.slug AS slug, p.title AS title, " +
+        "       pr.amount_minor AS price_amount_minor, " +
+        "       pr.currency     AS price_currency, " +
+        "       m.r2_key        AS hero_r2_key, " +
+        "       m.alt_text      AS hero_alt_text " +
+        "FROM collection_members cm " +
+        "JOIN products p ON p.id = cm.product_id " +
+        "LEFT JOIN ( " +
+        "  SELECT iv.*, " +
+        "         ROW_NUMBER() OVER (PARTITION BY iv.product_id ORDER BY iv.position ASC, iv.created_at ASC) AS rn " +
+        "  FROM variants iv " +
+        ") v ON v.product_id = p.id AND v.rn = 1 " +
+        "LEFT JOIN prices pr ON pr.variant_id = v.id AND pr.currency = ?1 AND pr.effective_until IS NULL " +
+        "LEFT JOIN ( " +
+        "  SELECT im.*, " +
+        "         ROW_NUMBER() OVER (PARTITION BY im.product_id ORDER BY im.position ASC, im.created_at ASC) AS rn " +
+        "  FROM media im " +
+        "  WHERE im.product_id IS NOT NULL " +
+        ") m ON m.product_id = p.id AND m.rn = 1 " +
+        "WHERE cm.collection_slug = ?2 AND cm.product_id != ?3 AND p.status = 'active' " +
+        "ORDER BY cm.position ASC, cm.product_id ASC LIMIT ?4",
+        [cur, collectionSlug, excludeProductId, n],
+      );
+      return r.rows.map(function (row) {
+        return {
+          slug:           row.slug,
+          title:          row.title,
+          hero_r2_key:    row.hero_r2_key != null ? row.hero_r2_key : null,
+          hero_alt_text:  row.hero_r2_key != null ? (row.hero_alt_text || row.title) : null,
+          price_minor:    row.price_amount_minor != null ? row.price_amount_minor : null,
+          price_currency: row.price_currency || "USD",
+        };
+      });
+    },
+
+    // Variants for a set of SKUs in one query, keyed by SKU (backs
+    // PERF-9 bundle member-title batching). Returns a map sku → variant
+    // row shaped like `variants.bySku` output (options_json parsed to
+    // `options`). Used to collect every bundle member's owning product
+    // id in one hop instead of a per-member `variants.bySku`.
+    variantsBySkus: async function (skus) {
+      if (!Array.isArray(skus) || skus.length === 0) return {};
+      var unique = [];
+      var seen = Object.create(null);
+      for (var s = 0; s < skus.length; s += 1) {
+        var sk = skus[s];
+        if (typeof sk !== "string" || seen[sk]) continue;
+        seen[sk] = true;
+        unique.push(sk);
+      }
+      if (!unique.length) return {};
+      var placeholders = unique.map(function (_v, n) { return "?" + (n + 1); }).join(", ");
+      var r = await query(
+        "SELECT * FROM variants WHERE sku IN (" + placeholders + ")",
+        unique,
+      );
+      var out = {};
+      for (var i = 0; i < r.rows.length; i += 1) {
+        var row = r.rows[i];
+        row.options = JSON.parse(row.options_json);
+        out[row.sku] = row;
+      }
+      return out;
+    },
+
+    // Variants for a set of variant ids in one query, keyed by id
+    // (backs PERF-6 cart reprice). Returns a map id → variant row
+    // shaped like `variants.get` output (options_json parsed to
+    // `options`) — the same value the prior per-line `variants.get`
+    // returned, keyed by the stable variant_id the cart line carries.
+    variantsByIds: async function (variantIds) {
+      if (!Array.isArray(variantIds) || variantIds.length === 0) return {};
+      var unique = [];
+      var seen = Object.create(null);
+      for (var n = 0; n < variantIds.length; n += 1) {
+        var vid = variantIds[n];
+        if (typeof vid !== "string" || !vid.length || seen[vid]) continue;
+        seen[vid] = true;
+        unique.push(_id(vid, "variant id"));
+      }
+      if (!unique.length) return {};
+      var placeholders = unique.map(function (_v, i) { return "?" + (i + 1); }).join(", ");
+      var r = await query(
+        "SELECT * FROM variants WHERE id IN (" + placeholders + ")",
+        unique,
+      );
+      var out = {};
+      for (var i = 0; i < r.rows.length; i += 1) {
+        var row = r.rows[i];
+        row.options = JSON.parse(row.options_json);
+        out[row.id] = row;
+      }
+      return out;
+    },
+
+    // Products for a set of ids in one query, keyed by id (backs PERF-9
+    // bundle member-title batching). Returns a map id → product row.
+    productsByIds: async function (productIds) {
+      if (!Array.isArray(productIds) || productIds.length === 0) return {};
+      var ids = productIds.map(function (id) { return _id(id, "product id"); });
+      var placeholders = ids.map(function (_v, n) { return "?" + (n + 1); }).join(", ");
+      var r = await query(
+        "SELECT * FROM products WHERE id IN (" + placeholders + ")",
+        ids,
+      );
+      var out = {};
+      for (var i = 0; i < r.rows.length; i += 1) out[r.rows[i].id] = r.rows[i];
+      return out;
+    },
+  };
+}
+
 module.exports = {
   create: create,
 };

package/lib/product-qa.js

@@ -652,6 +652,45 @@ function create(opts) {
     return rows;
   }
 
+  // Batched answersForQuestion — every approved answer under EACH of
+  // `questionIds`, grouped into a map keyed by question_id. One `IN`
+  // query replaces the per-question `answersForQuestion` loop the PDP
+  // ran (one D1-bridge hop per question). The approved-only filter and
+  // the (pinned DESC, vote_count DESC, occurred_at ASC, id ASC) order
+  // are byte-for-byte the single-question method's, so the stitched
+  // thread renders identically. `opts.limit` caps the answers PER
+  // question (validated like the single method) — applied
+  // application-side after the grouped read so a high-fan-out question
+  // can't starve another. Each id is validated at entry (a malformed
+  // id throws TypeError, which the route catches). An empty input or a
+  // question with no approved answers maps to an empty array.
+  async function answersForQuestions(questionIds, listOpts) {
+    if (!Array.isArray(questionIds) || questionIds.length === 0) return {};
+    listOpts = listOpts || {};
+    var limit = _limit(listOpts.limit);
+    var ids = [];
+    var byId = {};
+    for (var qi = 0; qi < questionIds.length; qi += 1) {
+      var id = _uuid(questionIds[qi], "question_id");
+      if (byId[id]) continue;
+      byId[id] = [];
+      ids.push(id);
+    }
+    var placeholders = ids.map(function (_v, n) { return "?" + (n + 1); }).join(", ");
+    var r = await query(
+      "SELECT * FROM product_qa_answers " +
+      "WHERE question_id IN (" + placeholders + ") AND status = 'approved' " +
+      "ORDER BY pinned DESC, vote_count DESC, occurred_at ASC, id ASC",
+      ids,
+    );
+    for (var i = 0; i < r.rows.length; i += 1) {
+      var ans = _decodeAnswer(r.rows[i]);
+      var bucket = byId[ans.question_id];
+      if (bucket && bucket.length < limit) bucket.push(ans);
+    }
+    return byId;
+  }
+
   // Every answer under a question regardless of status — the operator
   // moderation detail needs the pending / rejected answers too, which
   // answersForQuestion (approved-only, storefront-facing) hides. Pinned
@@ -808,6 +847,7 @@ function create(opts) {
     getQuestion:          getQuestion,
     topAnswerForQuestion: topAnswerForQuestion,
     answersForQuestion:   answersForQuestion,
+    answersForQuestions:  answersForQuestions,
     listAnswersForQuestion: listAnswersForQuestion,
     listQuestionsByStatus: listQuestionsByStatus,
     listAnswersByStatus:  listAnswersByStatus,

package/lib/storefront.js

@@ -8555,23 +8555,33 @@ function mount(router, deps) {
       currency_redirect_to: path,
     };
     var chosen = _readCurrencyCookie(req);
-    try {
-      var presenter = await currencyDisplayModule.loadPresenter({
-        fx:              deps.currencyDisplay,
-        rounding:        deps.currencyRounding || null,
-        baseCurrency:    base,
-        displayCurrency: chosen,
-      });
-      // The presenter only activates when the chosen currency is in the
-      // live allow-list AND has a usable rate. A cookie naming a currency
-      // the operator since removed from the list resolves to base.
-      if (presenter && presenter.active && options.indexOf(presenter.displayCurrency) !== -1) {
-        bundle.format_price      = presenter.format;
-        bundle.currency_selected = presenter.displayCurrency;
-        if (presenter.note) bundle.currency_note = presenter.note;
+    // Short-circuit the FX presenter hop for visitors who never picked a
+    // currency, or chose the live base: `loadPresenter` returns an
+    // INACTIVE base presenter in exactly those cases (currency-display:
+    // requested unset / === baseCurrency → base presenter), so the bundle
+    // is the base bundle above unchanged. Skipping the FX rate read +
+    // presenter build on every base-currency render is the common-case
+    // win — only resolve the presenter when the visitor chose a non-base
+    // currency that could actually convert.
+    if (chosen != null && chosen !== base) {
+      try {
+        var presenter = await currencyDisplayModule.loadPresenter({
+          fx:              deps.currencyDisplay,
+          rounding:        deps.currencyRounding || null,
+          baseCurrency:    base,
+          displayCurrency: chosen,
+        });
+        // The presenter only activates when the chosen currency is in the
+        // live allow-list AND has a usable rate. A cookie naming a currency
+        // the operator since removed from the list resolves to base.
+        if (presenter && presenter.active && options.indexOf(presenter.displayCurrency) !== -1) {
+          bundle.format_price      = presenter.format;
+          bundle.currency_selected = presenter.displayCurrency;
+          if (presenter.note) bundle.currency_note = presenter.note;
+        }
+      } catch (_e) {
+        // FX / rounding backend unavailable — fall back to base display.
       }
-    } catch (_e) {
-      // FX / rounding backend unavailable — fall back to base display.
     }
     return bundle;
   }
@@ -9229,37 +9239,16 @@ function mount(router, deps) {
         [productId],
       )).rows[0];
       if (!primary) return [];
-      var siblingRows = (await query(
-        "SELECT cm.product_id AS pid FROM collection_members cm " +
-        "JOIN products p ON p.id = cm.product_id " +
-        "WHERE cm.collection_slug = ?1 AND cm.product_id != ?2 AND p.status = 'active' " +
-        "ORDER BY cm.position ASC, cm.product_id ASC LIMIT ?3",
-        [primary.collection_slug, productId, limit],
-      )).rows;
-      var out = [];
-      for (var i = 0; i < siblingRows.length; i += 1) {
-        var pid = siblingRows[i].pid;
-        var prod = await deps.catalog.products.get(pid);
-        if (!prod || prod.status !== "active") continue;
-        var priceMinor = null;
-        var priceCurrency = "USD";
-        var variants = await deps.catalog.variants.listForProduct(pid);
-        if (variants.length) {
-          var pr = await deps.catalog.prices.current(variants[0].id, "USD");
-          if (pr) { priceMinor = pr.amount_minor; priceCurrency = pr.currency; }
-        }
-        var media = await deps.catalog.media.listForProduct(pid);
-        var hero = media.length ? media[0] : null;
-        out.push({
-          slug:          prod.slug,
-          title:         prod.title,
-          hero_r2_key:   hero ? hero.r2_key : null,
-          hero_alt_text: hero ? (hero.alt_text || prod.title) : null,
-          price_minor:   priceMinor,
-          price_currency: priceCurrency,
-        });
-      }
-      return out;
+      // The sibling decoration (price + hero media per pick) now lands
+      // in one batched query instead of per-sibling `products.get` +
+      // `variants.listForProduct` + `prices.current` +
+      // `media.listForProduct`. The helper returns the exact
+      // { slug, title, hero_r2_key, hero_alt_text, price_minor,
+      // price_currency } card shape the rail renderer consumes, in the
+      // same (membership position ASC, product_id ASC) order, self +
+      // inactive excluded, capped at limit — mirroring the edge
+      // listRelatedProducts.
+      return await deps.catalog.batch.relatedSiblings(primary.collection_slug, productId, "USD", limit);
     } catch (_e) {
       return [];
     }
@@ -9341,58 +9330,102 @@ function mount(router, deps) {
     var seen = Object.create(null);
     var offers = [];
     try {
+      // First pass: collect every distinct bundle reachable from the
+      // product's variant SKUs (deduped), preserving discovery order.
+      var bundles = [];
       for (var s = 0; s < variantSkus.length; s += 1) {
         var bundleList = await deps.bundles.bundlesForComponent(variantSkus[s]);
         for (var i = 0; i < bundleList.length; i += 1) {
-          var bundle = bundleList[i];
-          if (seen[bundle.bundle_sku]) continue;
-          seen[bundle.bundle_sku] = true;
-
-          // Decorate each member with a display title; flag unbuyable.
-          var componentsOut = [];
-          var allBuyable = true;
-          for (var j = 0; j < bundle.components.length; j += 1) {
-            var comp = bundle.components[j];
-            var buyable = await _skuBuyable(comp.sku);
-            if (!buyable) allBuyable = false;
-            var memberVariant = buyable || (await deps.catalog.variants.bySku(comp.sku));
-            var memberTitle = comp.sku;
-            if (memberVariant) {
-              var memberProduct = await deps.catalog.products.get(memberVariant.product_id);
-              memberTitle = (memberProduct && memberProduct.title) || memberVariant.title || comp.sku;
-            }
-            componentsOut.push({ sku: comp.sku, quantity: comp.quantity, title: memberTitle });
-          }
-
-          var priced = null;
-          try {
-            priced = await deps.bundles.priceBundle({ bundle_sku: bundle.bundle_sku, pricing: _skuPricer(currency) });
-          } catch (_e) {
-            // A missing member price / mixed currency makes the bundle
-            // unpriceable — surface it as unavailable rather than 500.
-            priced = null;
+          if (seen[bundleList[i].bundle_sku]) continue;
+          seen[bundleList[i].bundle_sku] = true;
+          bundles.push(bundleList[i]);
+        }
+      }
+      if (!bundles.length) return [];
+
+      // Member-title batching: resolve every member SKU's variant + its
+      // owning product in two batched reads instead of a per-member
+      // `variants.bySku` + `products.get`. (The full single-query bundle
+      // resolver the edge has — getBundlesForProduct — is deferred;
+      // member-title batching is the cheap win without touching the
+      // server-authoritative pricing path.)
+      var memberSkus = [];
+      for (var bi = 0; bi < bundles.length; bi += 1) {
+        var comps = bundles[bi].components || [];
+        for (var ci = 0; ci < comps.length; ci += 1) memberSkus.push(comps[ci].sku);
+      }
+      var memberVariantBySku = {};
+      var memberProductById = {};
+      if (deps.catalog.batch && typeof deps.catalog.batch.variantsBySkus === "function") {
+        memberVariantBySku = await deps.catalog.batch.variantsBySkus(memberSkus);
+        var memberProductIds = [];
+        var pidSeen = Object.create(null);
+        for (var ms in memberVariantBySku) {
+          if (!Object.prototype.hasOwnProperty.call(memberVariantBySku, ms)) continue;
+          var pid = memberVariantBySku[ms].product_id;
+          if (pid && !pidSeen[pid]) { pidSeen[pid] = true; memberProductIds.push(pid); }
+        }
+        if (memberProductIds.length && typeof deps.catalog.batch.productsByIds === "function") {
+          memberProductById = await deps.catalog.batch.productsByIds(memberProductIds);
+        }
+      }
+
+      for (var b2 = 0; b2 < bundles.length; b2 += 1) {
+        var bundle = bundles[b2];
+        // Decorate each member with a display title; flag unbuyable.
+        var componentsOut = [];
+        var allBuyable = true;
+        for (var j = 0; j < bundle.components.length; j += 1) {
+          var comp = bundle.components[j];
+          var buyable = await _skuBuyable(comp.sku);
+          if (!buyable) allBuyable = false;
+          // The prior path always read the member variant via bySku
+          // (regardless of buyability) for the title; the batched map is
+          // that same variant. Falls back to a per-SKU bySku only if the
+          // batch surface is absent.
+          var memberVariant = Object.prototype.hasOwnProperty.call(memberVariantBySku, comp.sku)
+            ? memberVariantBySku[comp.sku]
+            : (buyable || (await deps.catalog.variants.bySku(comp.sku)));
+          var memberTitle = comp.sku;
+          if (memberVariant) {
+            var memberProduct = Object.prototype.hasOwnProperty.call(memberProductById, memberVariant.product_id)
+              ? memberProductById[memberVariant.product_id]
+              : (deps.catalog.batch && typeof deps.catalog.batch.variantsBySkus === "function"
+                  ? null
+                  : await deps.catalog.products.get(memberVariant.product_id));
+            memberTitle = (memberProduct && memberProduct.title) || memberVariant.title || comp.sku;
           }
-
-          var available = allBuyable && priced != null;
-          var listMinor = priced ? priced.list_total_minor : 0;
-          var amountMinor = priced ? priced.amount_minor : 0;
-          var discountMinor = priced ? priced.discount_minor : 0;
-          var cur = (priced && priced.currency) || currency;
-          offers.push({
-            bundle_sku:         bundle.bundle_sku,
-            title:              bundle.title,
-            components:         componentsOut,
-            list_total_str:     fmt(listMinor, cur),
-            amount_str:         fmt(amountMinor, cur),
-            discount_str:       discountMinor > 0 ? fmt(discountMinor, cur) : null,
-            available:          available,
-            unavailable_reason: available
-              ? null
-              : (priced == null
-                  ? "Pricing for this bundle isn't available right now."
-                  : "One or more items in this bundle are out of stock."),
-          });
+          componentsOut.push({ sku: comp.sku, quantity: comp.quantity, title: memberTitle });
         }
+
+        var priced = null;
+        try {
+          priced = await deps.bundles.priceBundle({ bundle_sku: bundle.bundle_sku, pricing: _skuPricer(currency) });
+        } catch (_e) {
+          // A missing member price / mixed currency makes the bundle
+          // unpriceable — surface it as unavailable rather than 500.
+          priced = null;
+        }
+
+        var available = allBuyable && priced != null;
+        var listMinor = priced ? priced.list_total_minor : 0;
+        var amountMinor = priced ? priced.amount_minor : 0;
+        var discountMinor = priced ? priced.discount_minor : 0;
+        var cur = (priced && priced.currency) || currency;
+        offers.push({
+          bundle_sku:         bundle.bundle_sku,
+          title:              bundle.title,
+          components:         componentsOut,
+          list_total_str:     fmt(listMinor, cur),
+          amount_str:         fmt(amountMinor, cur),
+          discount_str:       discountMinor > 0 ? fmt(discountMinor, cur) : null,
+          available:          available,
+          unavailable_reason: available
+            ? null
+            : (priced == null
+                ? "Pricing for this bundle isn't available right now."
+                : "One or more items in this bundle are out of stock."),
+        });
       }
     } catch (_e) {
       // Bundles table not migrated / read failure — degrade to no rail.
@@ -9457,12 +9490,27 @@ function mount(router, deps) {
   // the cart total.
   async function _repriceCartLines(lines) {
     if (!deps.quantityDiscounts) return lines;
+    // The owning product_id per line drives the quantity-discount
+    // product-scope match. Resolve every line's variant in one batched
+    // id lookup instead of a per-line `variants.get`, keyed by the same
+    // stable variant_id the line carries (so the resolved product_id is
+    // byte-identical to the per-line read). Best-effort — a read failure
+    // leaves the map empty and each line falls back to no product scope,
+    // exactly as a per-line failure did before.
+    var variantById = {};
+    if (deps.catalog.batch && typeof deps.catalog.batch.variantsByIds === "function") {
+      try {
+        variantById = await deps.catalog.batch.variantsByIds(
+          lines.map(function (l) { return l.variant_id; }),
+        );
+      } catch (_e) { variantById = {}; }
+    }
     var out = [];
     for (var i = 0; i < lines.length; i += 1) {
       var l = lines[i];
       var unit = l.unit_amount_minor;
       try {
-        var variant = await deps.catalog.variants.get(l.variant_id);
+        var variant = variantById[l.variant_id] || null;
         var applied = await deps.quantityDiscounts.applyToLine({
           line: {
             sku:              l.sku,
@@ -9625,7 +9673,7 @@ function mount(router, deps) {
   // applied to available-on-hand (stock_on_hand − stock_held).
   async function _cartLineStock(lines) {
     var out = {};
-    if (!deps.catalog || !deps.catalog.inventory || typeof deps.catalog.inventory.get !== "function") {
+    if (!deps.catalog || !deps.catalog.batch || typeof deps.catalog.batch.inventoryForSkus !== "function") {
       return out;
     }
     var threshold = 5;
@@ -9635,19 +9683,24 @@ function mount(router, deps) {
         if (Number.isInteger(t) && t >= 0) threshold = t;
       } catch (_e) { /* keep the default */ }
     }
+    // One batched inventory read keyed by SKU instead of a per-line
+    // `inventory.get`. Drop-silent on a read failure — the empty map
+    // means every line reads "ok", matching the prior per-line stance.
+    var invBySku = {};
+    try {
+      invBySku = await deps.catalog.batch.inventoryForSkus(
+        lines.map(function (l) { return l.sku; }).filter(function (s) { return !!s; }),
+      );
+    } catch (_e) { invBySku = {}; /* a read failure never blocks the cart */ }
     for (var i = 0; i < lines.length; i += 1) {
       var vId = lines[i].variant_id;
       if (Object.prototype.hasOwnProperty.call(out, vId)) continue;
       var sku = lines[i].sku;
       if (!sku) { out[vId] = "ok"; continue; }
-      try {
-        var inv = await deps.catalog.inventory.get(sku);
-        if (!inv) { out[vId] = "ok"; continue; }
-        var avail = Number(inv.stock_on_hand || 0) - Number(inv.stock_held || 0);
-        out[vId] = avail <= 0 ? "out" : (avail <= threshold ? "low" : "ok");
-      } catch (_e) {
-        out[vId] = "ok";   // drop-silent — a read failure never blocks the cart
-      }
+      var inv = Object.prototype.hasOwnProperty.call(invBySku, sku) ? invBySku[sku] : null;
+      if (!inv) { out[vId] = "ok"; continue; }
+      var avail = Number(inv.stock_on_hand || 0) - Number(inv.stock_held || 0);
+      out[vId] = avail <= 0 ? "out" : (avail <= threshold ? "low" : "ok");
     }
     return out;
   }
@@ -9681,95 +9734,37 @@ function mount(router, deps) {
   }
 
   router.get("/", async function (req, res) {
-    var page = await deps.catalog.products.list({ status: "active", limit: 24 });
-    // Best-effort "starting price" + "hero media" lookup. Each
-    // product on the home grid carries its first variant's USD
-    // price (when one exists) and its first attached media row
-    // (when one exists). Both are best-effort — products without
-    // a price render `—`; products without media render the
-    // text-only PRODUCT_CARD fallback.
-    var products = [];
-    for (var i = 0; i < page.rows.length; i += 1) {
-      var p = page.rows[i];
-      var variants = await deps.catalog.variants.listForProduct(p.id);
-      var startingPrice = null;
-      if (variants.length) {
-        var price = await deps.catalog.prices.current(variants[0].id, "USD");
-        if (price) startingPrice = price;
-      }
-      var media = await deps.catalog.media.listForProduct(p.id);
-      var heroMedia = media.length ? media[0] : null;
-      products.push(Object.assign({}, p, {
-        starting_price_minor:    startingPrice ? startingPrice.amount_minor : null,
-        starting_price_currency: startingPrice ? startingPrice.currency      : "USD",
-        hero_media:              heroMedia,
-      }));
-    }
+    // One decorated query for the whole home grid: each active product
+    // carries its first variant's USD price (when one exists) and its
+    // first attached media row (when one exists), pre-joined via window
+    // functions — the same shape `renderHome` consumes (products
+    // without a price render `—`; products without media render the
+    // text-only PRODUCT_CARD fallback). Replaces the prior 1 + 24×3
+    // per-product fan-out over the D1 bridge. Order (updated_at DESC,
+    // id DESC) matches the prior `products.list` order.
+    var decorated = await deps.catalog.batch.decoratedActive({ currency: "USD", limit: 24 });
+    var products = decorated.rows;
     var ccy = await _currencyForReq(req);
     var html = renderHome(Object.assign({ products: products, shop_name: shopName, theme: theme }, _requestUrls(req), ccy));
     _send(res, 200, html);
   });
 
-  // Decorate one product row with the display columns the search
-  // cards need (first variant's price, first media) AND the facet
-  // fields the searchFacets primitive computes against: `collection`
-  // (array of collection slugs the product belongs to), `price_minor`
-  // (the starting price), and `in_stock` (any variant with available
-  // stock). Composes the wired catalog / collections primitives; a
-  // collection facet only populates when `deps.collections` is present.
-  async function _decorateForSearch(p) {
-    var variants = await deps.catalog.variants.listForProduct(p.id);
-    var startingPrice = null;
-    var inStock = false;
-    for (var vi = 0; vi < variants.length; vi += 1) {
-      if (vi === 0) {
-        var price = await deps.catalog.prices.current(variants[0].id, "USD");
-        if (price) startingPrice = price;
-      }
-      var inv = await deps.catalog.inventory.get(variants[vi].sku);
-      if (inv && (Number(inv.stock_on_hand) - Number(inv.stock_held)) > 0) inStock = true;
-    }
-    var media = await deps.catalog.media.listForProduct(p.id);
-    var heroMedia = media.length ? media[0] : null;
-    var collectionSlugs = [];
-    if (deps.collections && typeof deps.collections.collectionsForProduct === "function") {
-      var cols = await deps.collections.collectionsForProduct(p.id);
-      for (var ci = 0; ci < cols.length; ci += 1) {
-        if (cols[ci] && cols[ci].slug) collectionSlugs.push(cols[ci].slug);
-      }
-    }
-    return Object.assign({}, p, {
-      starting_price_minor:    startingPrice ? startingPrice.amount_minor : null,
-      starting_price_currency: startingPrice ? startingPrice.currency      : "USD",
-      hero_media:              heroMedia,
-      collection:              collectionSlugs,
-      price_minor:             startingPrice ? startingPrice.amount_minor : null,
-      in_stock:                inStock,
-    });
-  }
-
   // Pull the facetable universe for a set of search terms: every
   // active product matching ANY term (canonical query + synonym
   // expansions) on title / description, decorated once. The
   // searchFacets primitive consumes this through a `catalog.list`
   // adapter and walks the rows in-memory for counts; the route reuses
   // the same rows for the narrowed result grid (one decoration pass,
-  // no double round trip).
+  // no double round trip). One batched query (an OR-of-LIKE term clause
+  // + a collection_members `IN` + a grouped-inventory `IN`) replaces
+  // the prior per-term search + per-row decoration fan-out, and aligns
+  // the `collection` facet field with the edge: MANUAL collection
+  // membership only (smart-collection rule matches no longer populate
+  // the search facet — the edge has always faceted manual-only, so this
+  // removes the cross-substrate drift). Order (updated_at DESC, id DESC)
+  // matches the edge `searchFacetableProducts`.
   async function _facetableUniverse(terms) {
-    var byId = {};
-    var rows = [];
-    for (var ti = 0; ti < terms.length; ti += 1) {
-      var term = typeof terms[ti] === "string" ? terms[ti].trim() : "";
-      if (!term.length) continue;
-      var page = await deps.catalog.products.search({ q: term, status: "active", limit: 100 });
-      for (var i = 0; i < page.rows.length; i += 1) {
-        var p = page.rows[i];
-        if (byId[p.id]) continue;
-        byId[p.id] = true;
-        rows.push(await _decorateForSearch(p));
-      }
-    }
-    return rows;
+    return (await deps.catalog.batch.searchDecorate({ terms: terms, currency: "USD" })).rows;
   }
 
   router.get("/search", async function (req, res) {
@@ -9872,77 +9867,88 @@ function mount(router, deps) {
     if (!slug) return _send(res, 400, renderNotFound({ shop_name: shopName, theme: theme }));
     var product = await deps.catalog.products.bySlug(slug);
     if (!product) return _send(res, 404, renderNotFound({ shop_name: shopName, theme: theme }));
-    var variants = await deps.catalog.variants.listForProduct(product.id);
-    var prices = {};
+    // Variants + their current USD price in one query (the LEFT JOIN
+    // collapses the prior per-variant `prices.current` loop). `vwp.rows`
+    // is byte-identical to `variants.listForProduct` (options parsed),
+    // `vwp.prices` is the { variantId: priceRow } map the renderer +
+    // first-variant pricing read.
+    var vwp = await deps.catalog.batch.variantsWithPrices(product.id, "USD");
+    var variants = vwp.rows;
+    var prices = vwp.prices;
     // Per-SKU inventory map driving the truthful availability badge +
-    // JSON-LD. Best-effort: a SKU with no inventory row (or a read
-    // failure) is omitted from the map, which the renderer treats as
-    // available — the never-block-on-missing-inventory stance the
-    // cart-hold path already takes. Only populated when the operator has
-    // wired the inventory primitive.
+    // JSON-LD. One batched read keyed by SKU, full row (the availability
+    // resolver reads `low_stock_threshold` for the "Only N left" nudge).
+    // Best-effort: a SKU with no inventory row (or a read failure) is
+    // omitted from the map, which the renderer treats as available — the
+    // never-block-on-missing-inventory stance the cart-hold path already
+    // takes. Only populated when the operator has wired the inventory
+    // batch surface.
     var inventory = {};
-    for (var i = 0; i < variants.length; i += 1) {
-      var p = await deps.catalog.prices.current(variants[i].id, "USD");
-      if (p) prices[variants[i].id] = p;
-      if (deps.catalog.inventory && typeof deps.catalog.inventory.get === "function") {
-        try {
-          var invRow = await deps.catalog.inventory.get(variants[i].sku);
-          if (invRow) inventory[variants[i].sku] = invRow;
-        } catch (_e) { /* drop-silent — missing inventory reads as available */ }
-      }
+    if (variants.length && deps.catalog.batch && typeof deps.catalog.batch.inventoryRowsForSkus === "function") {
+      try {
+        inventory = await deps.catalog.batch.inventoryRowsForSkus(variants.map(function (v) { return v.sku; }));
+      } catch (_e) { inventory = {}; /* drop-silent — missing inventory reads as available */ }
     }
-    // Media — first row drives the hero image, the next three feed
-    // the thumbnail strip. `listForProduct` is product-level only;
-    // variant-level media (`listForVariant`) would feed a swap-on-
-    // variant-select interaction we don't ship yet.
-    var media = await deps.catalog.media.listForProduct(product.id);
     // Render cart count from the current session's cart, if any.
     var cartCount = await _cartCountForReq(req);
-    // Published reviews aggregate + list. A failed read (e.g. the
-    // reviews table not yet migrated) degrades to the empty state
-    // rather than 500-ing the whole PDP — reviews are supplementary
-    // to the buy path. Mirrors the edge renderer's missing-table
-    // resilience.
+    // The remaining supplementary PDP reads are independent of each
+    // other, so they run concurrently (mirroring the edge's Promise.all
+    // at worker/index.js). Each preserves its own degrade-to-empty
+    // guard so a missing/unmigrated table never 500s the buy path.
     var reviewSummary, reviewRows, reviewCta;
-    if (deps.reviews) {
-      try {
-        reviewSummary = await deps.reviews.summaryForProduct(product.id);
-        reviewRows    = (await deps.reviews.listForProduct(product.id, { limit: 10 })).rows;
-      } catch (_e) { reviewSummary = undefined; reviewRows = []; }
-      // The form route enforces auth + the verified-purchase gate, so
-      // the CTA links there unconditionally; logged-out shoppers get
-      // redirected to login, non-purchasers get a clear "not eligible".
-      reviewCta = "<a class=\"btn-secondary reviews__cta\" href=\"/products/" +
-        b.template.escapeHtml(product.slug) + "/review\">Write a review</a>";
-    }
-    // Wishlist social-proof count — degrades to 0 on a read failure
-    // (e.g. table not yet migrated) rather than 500-ing the PDP.
     var wishlistCount = 0;
-    if (deps.wishlist) {
-      try { wishlistCount = await deps.wishlist.countForProduct(product.id); }
-      catch (_e) { wishlistCount = 0; }
-    }
-    // Published Q&A — approved questions + their approved answers. A
-    // failed read (e.g. the product_qa tables not yet migrated) degrades
-    // to the empty state rather than 500-ing the PDP — Q&A is
-    // supplementary to the buy path, like reviews. Mirrors the edge
-    // renderer's missing-table resilience.
     var qaQuestions, qaCta;
-    if (deps.productQa) {
-      qaQuestions = [];
-      try {
-        var qList = (await deps.productQa.questionsForProduct({ product_id: product.id, limit: 20 })).rows;
-        for (var qi = 0; qi < qList.length; qi += 1) {
-          var qrow = qList[qi];
-          qrow.answers = await deps.productQa.answersForQuestion(qrow.id, { limit: 20 });
-          qaQuestions.push(qrow);
-        }
-      } catch (_e) { qaQuestions = []; }
-      // The form route enforces auth, so the CTA links there
-      // unconditionally; logged-out shoppers get redirected to login.
-      qaCta = "<a class=\"btn-secondary reviews__cta\" href=\"/products/" +
-        b.template.escapeHtml(product.slug) + "/question\">Ask a question</a>";
-    }
+    var media;
+    await Promise.all([
+      // Media — first row drives the hero image, the next three feed the
+      // thumbnail strip. `listForProduct` is product-level only.
+      (async function () {
+        media = await deps.catalog.media.listForProduct(product.id);
+      })(),
+      // Published reviews aggregate + list.
+      (async function () {
+        if (!deps.reviews) return;
+        try {
+          reviewSummary = await deps.reviews.summaryForProduct(product.id);
+          reviewRows    = (await deps.reviews.listForProduct(product.id, { limit: 10 })).rows;
+        } catch (_e) { reviewSummary = undefined; reviewRows = []; }
+        // The form route enforces auth + the verified-purchase gate, so
+        // the CTA links there unconditionally; logged-out shoppers get
+        // redirected to login, non-purchasers get a clear "not eligible".
+        reviewCta = "<a class=\"btn-secondary reviews__cta\" href=\"/products/" +
+          b.template.escapeHtml(product.slug) + "/review\">Write a review</a>";
+      })(),
+      // Wishlist social-proof count — degrades to 0 on a read failure.
+      (async function () {
+        if (!deps.wishlist) return;
+        try { wishlistCount = await deps.wishlist.countForProduct(product.id); }
+        catch (_e) { wishlistCount = 0; }
+      })(),
+      // Published Q&A — approved questions + their approved answers. The
+      // answers for ALL questions land in one batched
+      // `answersForQuestions` read (one D1 hop) instead of a per-question
+      // loop, then are stitched back onto each question in order.
+      (async function () {
+        if (!deps.productQa) return;
+        qaQuestions = [];
+        try {
+          var qList = (await deps.productQa.questionsForProduct({ product_id: product.id, limit: 20 })).rows;
+          var answersByQ = await deps.productQa.answersForQuestions(
+            qList.map(function (q) { return q.id; }),
+            { limit: 20 },
+          );
+          for (var qi = 0; qi < qList.length; qi += 1) {
+            var qrow = qList[qi];
+            qrow.answers = answersByQ[qrow.id] || [];
+            qaQuestions.push(qrow);
+          }
+        } catch (_e) { qaQuestions = []; }
+        // The form route enforces auth, so the CTA links there
+        // unconditionally; logged-out shoppers get redirected to login.
+        qaCta = "<a class=\"btn-secondary reviews__cta\" href=\"/products/" +
+          b.template.escapeHtml(product.slug) + "/question\">Ask a question</a>";
+      })(),
+    ]);
     // Log the view for a signed-in customer so it surfaces on their
     // "Recently viewed" account page. Drop-silent — a recording failure
     // (table not migrated, write contention) must never break the PDP

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blamejs/blamejs-shop",
-  "version": "0.3.45",
+  "version": "0.3.46",
   "description": "Open-source framework built on blamejs. Vendored stack, zero npm runtime deps, PQC-first crypto, security-on by default.",
   "main": "lib/index.js",
   "scripts": {