@aglyn/plugins-ai 1.0.0-beta.242 → 1.0.0-beta.243

package/src/lib/jobs/ai-layout-stock-photos.js

@@ -106,6 +106,16 @@ import { aiStorefrontSays } from "../layout-language/ai-layout-storefront.js";
  *    searches, and then — a product or a hero only — reuses an on-topic photo
  *    the job already shows rather than take a starter. Every slot of a
  *    craft's site tries the craft's broad searches last.
+ * 7. **A product takes the surest photo, even a borrowed one** (the beta.242
+ *    Tidewater Soap Works start: a sauna for "Bath Gift Set", colognes for
+ *    "Natural Body Lotion", a bathroom shelf for "Soap Bar Trio" and a soap
+ *    dispenser for its starter size, while the collection tiles beside them
+ *    were good). A product's searches are ranked by how sure they are: its
+ *    own photo (the head noun or its kin among the first tags), then a photo
+ *    OF its category, new or one the job already shows, then a weak hit of
+ *    its own. No product shows a room or a scene, a fragrance bottle, or what
+ *    its kin shuns (a pump for a bar) unless it names it; "bath" in a bath
+ *    gift set is what the set is for; a size is never the product.
  *
  * A slot nothing acceptable answered — the library down, refusing, or out
  * of time — is left `null` for the starter photos. A named object is never
@@ -149,6 +159,47 @@ const words = (list)=>new Set(list.trim().split(/\s+/));
  * an empty frame on the page (the Juniper Clay hero), a template or a
  * graphic is not a photo of anything.
  */ const REJECTED_TAGS = words('mockup mock-up mock blank template templates clipart clip-art illustration vector logo icon ' + 'ai-generated generated render rendering 3d');
+/**
+ * Rooms and scenes, never a product (AGL-3660): the beta.242 Tidewater Soap
+ * Works start put a wooden sauna under "Bath Gift Set" and a bathroom shelf of
+ * baskets under "Soap Bar Trio". A product's hit whose first tags name one of
+ * these is turned down unless the product or the brief names it too.
+ */ const PRODUCT_SCENES = new Set([
+    'sauna',
+    'bathroom',
+    'bathtub',
+    'shower',
+    'toilet',
+    'sink',
+    'washbasin',
+    'faucet',
+    'tap',
+    'shelf',
+    'shelves',
+    'interior',
+    'bedroom',
+    'kitchen',
+    'room',
+    'livingroom',
+    'hotel',
+    'lobby'
+].map(aiStockStem));
+/**
+ * A fragrance's bottle, never a lotion, a cream or a soap (AGL-3660): the same
+ * start's "Natural Body Lotion" showed blue cologne bottles tagged "perfume,
+ * bottle, lotion". Turned down among a product's first tags unless the
+ * product or the brief is a fragrance.
+ */ const FRAGRANCE_BOTTLES = new Set([
+    'perfume',
+    'perfumes',
+    'perfumery',
+    'cologne',
+    'colognes',
+    'parfum',
+    'eau',
+    'atomizer',
+    'fragrance'
+].map(aiStockStem));
 /**
  * Topics a business's photos never carry unless its own words name them
  * (AGL-3660, the beta.239 Ember & Oak start, whose "Gifts for melt fans" tile
@@ -316,6 +367,7 @@ const words = (list)=>new Set(list.trim().split(/\s+/));
     },
     {
         // Tobacco and drugs.
+        // "cbd" and "cannabinoid": a hemp cream tube was the next "body lotion" answer (Tidewater, 2026-10-11).
         words: [
             'cigarette',
             'smoking',
@@ -323,7 +375,10 @@ const words = (list)=>new Set(list.trim().split(/\s+/));
             'cannabis',
             'marijuana',
             'drug',
-            'drugs'
+            'drugs',
+            'cbd',
+            'cannabinoid',
+            'thc'
         ],
         allow: [
             'dispensary',
@@ -510,6 +565,100 @@ const words = (list)=>new Set(list.trim().split(/\s+/));
         queries: [
             'soap bars',
             'handmade soap bar'
+        ],
+        // A bar is never a pump or a liquid soap (the beta.242 Tidewater start).
+        shun: [
+            'pump',
+            'pumps',
+            'liquid',
+            'dispenser',
+            'dispensers'
+        ]
+    },
+    {
+        // "Bath" in "bath gift set", "bath bomb" or "bath salts" is what the
+        // products are for, never the room: the beta.242 Tidewater Soap Works
+        // start (2026-10-11) put a wooden sauna under "Bath Gift Set", its tags
+        // "sauna, steam, bath". A bath set is named by soap and bath products,
+        // and searched with soap.
+        objects: [
+            'bath'
+        ],
+        within: [
+            'soap',
+            'soapmaker',
+            'skincare',
+            'spa',
+            'cosmetic'
+        ],
+        qualifier: 'soap',
+        after: true,
+        kin: [
+            'soap',
+            'soaps',
+            'soap bar',
+            'soap bars',
+            'handmade soap',
+            'bath bomb',
+            'bath bombs',
+            'bath salt',
+            'bath salts',
+            'bath product',
+            'bath products',
+            'bath set',
+            'toiletries'
+        ],
+        queries: [
+            'soap gift set',
+            'bath products',
+            'bath bombs'
+        ],
+        shun: [
+            'pump',
+            'pumps',
+            'liquid',
+            'dispenser',
+            'dispensers'
+        ]
+    },
+    {
+        // A lotion is any cream for the skin; a perfume bottle tagged "lotion"
+        // is not one (the same start's "Natural Body Lotion" showed colognes).
+        objects: [
+            'lotion',
+            'moisturizer',
+            'moisturiser'
+        ],
+        within: [
+            'soap',
+            'soapmaker',
+            'skincare',
+            'lotion',
+            'cosmetic',
+            'beauty',
+            'spa'
+        ],
+        kin: [
+            'lotion',
+            'lotions',
+            'body lotion',
+            'hand lotion',
+            'cream',
+            'creams',
+            'hand cream',
+            'body cream',
+            'skin cream',
+            'face cream',
+            'cream jar',
+            'body butter',
+            'moisturizer',
+            'moisturiser'
+        ],
+        queries: [
+            'body lotion',
+            'hand cream',
+            'cream jar',
+            'moisturizer'
         ]
     }
 ];
@@ -683,7 +832,11 @@ const words = (list)=>new Set(list.trim().split(/\s+/));
                 'spa',
                 'artisan'
             ]
-        }
+        },
+        shun: [
+            'dispenser',
+            'dispensers'
+        ]
     },
     {
         match: [
@@ -958,7 +1111,10 @@ const words = (list)=>new Set(list.trim().split(/\s+/));
     const core = new Set(craft ? [
         craft
     ] : []);
+    const shun = new Set();
     for (const group of groups){
+        var _group_shun;
+        for (const word of (_group_shun = group.shun) != null ? _group_shun : [])shun.add(aiStockStem(word));
         for (const word of group.match)core.add(aiStockStem(word));
         for (const word of group.kin)domain.add(aiStockStem(word));
         broad.push(...group.broad);
@@ -987,6 +1143,9 @@ const words = (list)=>new Set(list.trim().split(/\s+/));
         rivals,
         core: [
             ...core
+        ],
+        shun: [
+            ...shun
         ]
     };
 }
@@ -1038,6 +1197,11 @@ const clip = (query)=>query.replace(/\s+/g, ' ').trim().slice(0, STOCK_PHOTO_QUE
 /** An object's kin phrases as stems, or none. */ const kinStems = (entry)=>entry ? [
         ...new Set(entry.kin.map((phrase)=>stemList(phrase).join(' ')))
     ] : [];
+/**
+ * A size never names a product (AGL-3660): the Tidewater start searched
+ * "soap set starter size" for "Bath Gift Set Starter Size", its head noun
+ * read as "size", and took a soap dispenser.
+ */ const PRODUCT_SIZES = /\b(?:(?:starter|travel|trial|sample|mini|full|half|family|value|jumbo|large|small|regular|standard|big)[- ])?sized?s?\b/gi;
 /** The wrapper words a gift is named by, searched with the craft: "soap gift box". */ const GIFT_WRAPPERS = words('gift gifts box boxes basket baskets hamper hampers');
 /**
  * A product's searches (AGL-3676), most specific first: each of its subjects
@@ -1061,18 +1225,31 @@ const clip = (query)=>query.replace(/\s+/g, ' ').trim().slice(0, STOCK_PHOTO_QUE
  * back to its own craft (AGL-3660). The Saltmarsh Soap Co start (2026-10-10)
  * found no hit naming "bar" or "box" among the first tags, and four of its
  * five products took the starter photos — a laptop and roses, a living room
- * of plants. So, in order:
+ * of plants. And the beta.242 Tidewater Soap Works start (2026-10-11) showed
+ * that the head noun anywhere is not enough: its own weak hits put a sauna
+ * under "Bath Gift Set", colognes under "Natural Body Lotion", a bathroom
+ * shelf under "Soap Bar Trio" and a soap dispenser under its starter size,
+ * while the collection tiles beside them, searched for the category, were
+ * good. So the searches are ranked by how sure they are ({@link AiStockSearch.tier}):
  *
- * 1. The same searches again, the head noun named anywhere among the tags
- *    (no extra search: the page remembers its answers), and a gift's own
- *    wrapper with the craft ("soap gift box").
- * 2. The site's broad searches ("handmade soap", "natural skincare"), any hit
- *    naming the craft itself ({@link AiStockSiteTerms.core}).
+ * 1. Its own: the head noun (or its kin) among the first tags, as above.
+ * 2. `borrow`: a photo OF its category — the category alone, then the craft's
+ *    broad searches ("handmade soap", "natural skincare"), one of the
+ *    product's kin or the craft's own names among the first tags. A product
+ *    may repeat one the job already shows, a collection tile's photo or
+ *    another product's ({@link aiLayoutStockPhotoSource}): a borrowed
+ *    on-topic photo beats a weak specific one.
+ * 3. `weak`: the same searches again, the head noun named anywhere among the
+ *    tags (no extra search: the page remembers its answers), a gift's own
+ *    wrapper with the craft ("soap gift box"), and the craft's broad searches,
+ *    any hit naming the craft itself ({@link AiStockSiteTerms.core}).
  *
- * The source then reuses an on-topic photo another slot of the job already
- * shows before it gives up ({@link aiLayoutStockPhotoSource}).
+ * Every one of them turns down a room or a scene, a fragrance bottle, and
+ * what the product's kin shuns (a pump for a bar of soap), unless the
+ * product names it. A size never names the product: "Bath Gift Set Starter
+ * Size" is a bath gift set.
  */ export function aiStockProductSearches(slot, craft, domain = [], fallback = {}) {
-    var _ref, _subjects_, _fallback_broad, _fallback_core;
+    var _ref, _subjects_, _fallback_core, _ref1, _fallback_broad, _fallback_broad1;
     var _slot_product;
     const orientation = aiStockOrientation(slot.aspect);
     const size = orientation === 'vertical' ? {
@@ -1085,7 +1262,7 @@ const clip = (query)=>query.replace(/\s+/g, ' ').trim().slice(0, STOCK_PHOTO_QUE
         ...domain,
         ...craftStems
     ]);
-    const subjects = ((_ref = (_slot_product = slot.product) == null ? void 0 : _slot_product.subjects) != null ? _ref : []).map((raw)=>aiStockSubjectWords(raw, '')).filter(Boolean);
+    const subjects = ((_ref = (_slot_product = slot.product) == null ? void 0 : _slot_product.subjects) != null ? _ref : []).map((raw)=>aiStockSubjectWords(raw.replace(PRODUCT_SIZES, ' '), '')).filter(Boolean);
     // The product's head noun is its name's: "candle" of "Hand-Poured Soy Candle".
     const own = (_subjects_ = subjects[0]) != null ? _subjects_ : '';
     const object = aiStockObjectWord(own);
@@ -1102,10 +1279,19 @@ const clip = (query)=>query.replace(/\s+/g, ' ').trim().slice(0, STOCK_PHOTO_QUE
         ...craftStems,
         ...ownWorld
     ] : [];
+    const core = [
+        ...new Set([
+            ...craftStems,
+            ...(_fallback_core = fallback.core) != null ? _fallback_core : []
+        ])
+    ];
+    const shun = ((_ref1 = kin == null ? void 0 : kin.shun) != null ? _ref1 : []).map(aiStockStem);
     const queries = [];
     for (const subject of subjects){
+        var _ref2;
         const stems = stemList(subject);
-        const query = kin ? stems.includes(aiStockStem(kin.qualifier)) ? subject : `${kin.qualifier} ${subject}` : craft && !stems.some((stem)=>world.has(stem)) ? `${craft} ${subject}` : subject;
+        const qualifier = (_ref2 = kin == null ? void 0 : kin.qualifier) != null ? _ref2 : '';
+        const query = kin ? !qualifier || stems.includes(aiStockStem(qualifier)) ? subject : kin.after ? `${subject} ${qualifier}` : `${qualifier} ${subject}` : craft && !stems.some((stem)=>world.has(stem)) ? `${craft} ${subject}` : subject;
         queries.push({
             query,
             subject,
@@ -1133,13 +1319,25 @@ const clip = (query)=>query.replace(/\s+/g, ' ').trim().slice(0, STOCK_PHOTO_QUE
         query: craft,
         subject: own || craft,
         object: craft,
-        lead: true
+        lead: true,
+        tier: 'borrow'
     });
-    // 1. The head noun anywhere among the tags, by the same searches.
-    for (const entry of [
+    const held = [
         ...queries
-    ])queries.push(_extends({}, entry, {
-        lead: false
+    ];
+    // 2. A photo OF its category, which may be one the job already shows.
+    for (const query of (_fallback_broad = fallback.broad) != null ? _fallback_broad : [])queries.push({
+        query,
+        subject: own,
+        object: '',
+        lead: true,
+        broad: true,
+        tier: 'borrow'
+    });
+    // 3. The head noun anywhere among the tags, by the same searches.
+    for (const entry of held)queries.push(_extends({}, entry, {
+        lead: false,
+        tier: 'weak'
     }));
     // A gift is its craft's: "bath gift box" asks for a "soap gift box".
     const wrapped = own.split(/\s+/).filter((word)=>WRAPPERS.has(word) && aiStockStem(word) !== object);
@@ -1148,47 +1346,60 @@ const clip = (query)=>query.replace(/\s+/g, ' ').trim().slice(0, STOCK_PHOTO_QUE
         query: `${craft} ${wrapped.join(' ')}`,
         subject: own,
         object: aiStockStem(gift),
-        lead: false
+        lead: false,
+        tier: 'weak'
     });
-    // 2. The craft's own broad searches, any hit naming the craft.
-    for (const query of (_fallback_broad = fallback.broad) != null ? _fallback_broad : [])queries.push({
+    // The craft's own broad searches, any hit naming the craft.
+    for (const query of (_fallback_broad1 = fallback.broad) != null ? _fallback_broad1 : [])queries.push({
         query,
         subject: own,
         object: '',
         lead: false,
-        broad: true
+        broad: true,
+        tier: 'weak'
     });
-    const core = [
-        ...new Set([
-            ...craftStems,
-            ...(_fallback_core = fallback.core) != null ? _fallback_core : []
-        ])
-    ];
+    // What a borrowed photo is OF: the product's kin, its own word of the shop's world, else the craft.
+    const borrowed = kinPhrases.length ? kinPhrases : ownWorld.length ? ownWorld : core;
     const seen = new Set();
     const searches = [];
     for (const entry of queries){
+        var _entry_tier;
         const query = clip(entry.query);
-        const key = `${query}|${entry.lead}|${entry.object}|${entry.broad === true}`;
+        const key = `${query}|${entry.lead}|${entry.object}|${entry.broad === true}|${(_entry_tier = entry.tier) != null ? _entry_tier : ''}`;
         if (!query || seen.has(key)) continue;
         seen.add(key);
+        const common = _extends({
+            query,
+            orientation
+        }, size, {
+            subject: entry.subject,
+            product: true
+        }, entry.tier ? {
+            tier: entry.tier
+        } : {}, shun.length ? {
+            shun
+        } : {});
         if (entry.broad) {
-            searches.push(_extends({
-                query,
-                orientation
-            }, size, {
-                broad: true,
-                subject: entry.subject
-            }, core.length ? {
+            const heldTo = [
+                ...new Set([
+                    ...core,
+                    ...ownWorld
+                ])
+            ];
+            searches.push(_extends({}, common, {
+                broad: true
+            }, entry.lead ? _extends({
+                leadAny: borrowed
+            }, kinPhrases.length ? {
+                kin: kinPhrases
+            } : {}, heldTo.length ? {
+                category: heldTo
+            } : {}) : core.length ? {
                 category: core
             } : {}));
             continue;
         }
-        searches.push(_extends({
-            query,
-            orientation
-        }, size, {
-            subject: entry.subject
-        }, entry.lead ? {
+        searches.push(_extends({}, common, entry.lead ? {
             lead: true
         } : {
             leadWorld: true
@@ -1328,7 +1539,7 @@ const clip = (query)=>query.replace(/\s+/g, ' ').trim().slice(0, STOCK_PHOTO_QUE
     }
 }
 /** A hit's words: the first few (what it is OF), every one, and each tag's phrase. */ function hitWords(photo) {
-    var _photo_tags, _photo_alt, _photo_alt1, _photo_alt2;
+    var _photo_tags, _photo_alt, _photo_alt1, _tags_, _photo_alt2;
     const slug = pageSlug(photo.pageUrl);
     const tags = ((_photo_tags = photo.tags) != null ? _photo_tags : []).map((tag)=>tag.toLowerCase().trim()).filter(Boolean);
     const lead = new Set(stemList([
@@ -1349,6 +1560,7 @@ const clip = (query)=>query.replace(/\s+/g, ' ').trim().slice(0, STOCK_PHOTO_QUE
         ...tags.slice(0, 3).map((tag)=>stemList(tag).join(' ')),
         stemList(slug).join(' ')
     ];
+    /** The first tag: what the photo is most of all. */ const firstPhrase = stemList((_tags_ = tags[0]) != null ? _tags_ : '').join(' ');
     const rejected = tags.some((tag)=>REJECTED_TAGS.has(tag) || tag.split(/\s+/).some((word)=>REJECTED_TAGS.has(word)));
     // Whole words only, a hyphenated one kept whole: "cross-stitch" is not a cross.
     const words = new Set([
@@ -1360,6 +1572,7 @@ const clip = (query)=>query.replace(/\s+/g, ' ').trim().slice(0, STOCK_PHOTO_QUE
         all,
         phrases,
         leadPhrases,
+        firstPhrase,
         rejected,
         words
     };
@@ -1388,12 +1601,33 @@ const clip = (query)=>query.replace(/\s+/g, ' ').trim().slice(0, STOCK_PHOTO_QUE
  * the subject's two-word phrase 3, each of its other words 1, and the
  * site's world 1, plus a quarter when it is among the first tags.
  */ export function aiStockRelevance(photo, judgement) {
-    var _judgement_rivals, _judgement_kin, _judgement_requires, _judgement_category, _judgement_subject, _judgement_object, _judgement_domain;
+    var _judgement_rivals, _judgement_subject, _judgement_named, _judgement_shun, _judgement_leadAny, _judgement_kin, _judgement_requires, _judgement_category, _judgement_object, _judgement_domain;
     const hit = hitWords(photo);
     if (hit.rejected) return 0;
     if (aiStockSensitive(photo, judgement.named)) return 0;
     // Glass art is not pottery: a rival craft's photo names this craft's own words.
     for (const rival of (_judgement_rivals = judgement.rivals) != null ? _judgement_rivals : [])if (rival.words.some((word)=>hit.all.has(word)) && !rival.core.some((word)=>hit.all.has(word))) return 0;
+    const subject = stemList((_judgement_subject = judgement.subject) != null ? _judgement_subject : '');
+    // What the slot or the brief names lets a shunned word, a room or a fragrance in.
+    const owned = new Set([
+        ...subject,
+        ...(_judgement_named = judgement.named) != null ? _judgement_named : []
+    ]);
+    // A dispenser is not a soapmaker's, nor a pump a bar's (AGL-3660).
+    if (((_judgement_shun = judgement.shun) != null ? _judgement_shun : []).some((word)=>hit.all.has(word) && !owned.has(word))) return 0;
+    if (judgement.product) {
+        // A sauna, a bathroom shelf: a room is never the product.
+        for (const word of hit.lead)if (PRODUCT_SCENES.has(word) && !owned.has(word)) return 0;
+        // Colognes are not a lotion: a fragrance's bottle only for a fragrance.
+        if (![
+            ...FRAGRANCE_BOTTLES
+        ].some((word)=>owned.has(word)) && [
+            ...hit.lead
+        ].some((word)=>FRAGRANCE_BOTTLES.has(word))) return 0;
+    }
+    // A borrowed photo is OF the product's category.
+    const leadAny = (_judgement_leadAny = judgement.leadAny) != null ? _judgement_leadAny : [];
+    if (leadAny.length && !leadAny.some((phrase)=>among(hit.leadPhrases, phrase))) return 0;
     const kin = (_judgement_kin = judgement.kin) != null ? _judgement_kin : [];
     const kinNamed = kin.some((phrase)=>among(hit.phrases, phrase));
     const kinLead = kin.some((phrase)=>among(hit.leadPhrases, phrase));
@@ -1409,7 +1643,6 @@ const clip = (query)=>query.replace(/\s+/g, ' ').trim().slice(0, STOCK_PHOTO_QUE
     const meets = anyOf.length ? anyOf.some((stem)=>hit.all.has(stem)) : required.every((stem)=>hit.all.has(stem));
     // An object's kin stands for the category: a wax melt is the candle shop's.
     if (demanded && !kinNamed && !meets) return 0;
-    const subject = stemList((_judgement_subject = judgement.subject) != null ? _judgement_subject : '');
     const object = (_judgement_object = judgement.object) != null ? _judgement_object : judgement.subject ? aiStockObjectWord(judgement.subject) : '';
     const domain = ((_judgement_domain = judgement.domain) != null ? _judgement_domain : []).filter((stem)=>stem !== object);
     // A hit naming the word it must name is of the site's world: a product's
@@ -1417,6 +1650,10 @@ const clip = (query)=>query.replace(/\s+/g, ' ').trim().slice(0, STOCK_PHOTO_QUE
     const world = demanded || kinNamed || domain.some((stem)=>hit.all.has(stem));
     const worldLead = (anyOf.length ? anyOf.some((stem)=>hit.lead.has(stem)) : required.length > 0 && required.every((stem)=>hit.lead.has(stem))) || kinLead || domain.some((stem)=>hit.lead.has(stem));
     if (judgement.leadWorld && !worldLead) return 0;
+    // What the photo is most of all: its first tag names the object, its kin or what it must be OF.
+    const firstNamed = (phrases)=>phrases.some((phrase)=>Boolean(phrase) && among([
+                hit.firstPhrase
+            ], phrase));
     const pair = subject.length >= 2 ? subject.slice(-2).join(' ') : '';
     const phrased = Boolean(pair) && among(hit.phrases, pair);
     let score = 0;
@@ -1430,9 +1667,13 @@ const clip = (query)=>query.replace(/\s+/g, ' ').trim().slice(0, STOCK_PHOTO_QUE
         if (domain.length && !world && !phrased) return 0;
         score += leading ? 4 : 2;
         if (kinNamed) score += 3;
+        if (firstNamed(kin.length ? kin : [
+            object
+        ])) score += 1;
     } else if (domain.length) {
         if (!world) return 0;
     }
+    if (leadAny.length && firstNamed(leadAny)) score += 1;
     if (phrased) score += 3;
     for (const word of new Set(subject))if (word !== object && hit.all.has(word)) score += 1;
     if (world) score += worldLead ? 1.25 : 1;
@@ -1645,14 +1886,26 @@ const EXTENSIONS = {
             return null;
         };
         /** How a search's hits are judged for a slot. */ const judgementFor = (slot, request, subject)=>{
-            var _request_subject;
+            var _request_subject, _request_shun;
+            var _request_shun1, _request_leadAny;
             return _extends({
                 subject: (_request_subject = request.subject) != null ? _request_subject : request.broad ? '' : subject,
                 domain: terms.domain,
                 strict: slot.role === 'gallery' && !request.broad || !!request.requires,
                 named: terms.named,
                 rivals: terms.rivals
-            }, request.requires ? {
+            }, terms.shun.length || ((_request_shun1 = request.shun) == null ? void 0 : _request_shun1.length) ? {
+                shun: [
+                    ...new Set([
+                        ...terms.shun,
+                        ...(_request_shun = request.shun) != null ? _request_shun : []
+                    ])
+                ]
+            } : {}, request.product ? {
+                product: true
+            } : {}, ((_request_leadAny = request.leadAny) == null ? void 0 : _request_leadAny.length) ? {
+                leadAny: request.leadAny
+            } : {}, request.requires ? {
                 requires: request.requires
             } : {}, request.category ? {
                 category: request.category
@@ -1686,7 +1939,10 @@ const EXTENSIONS = {
                 }, size, {
                     broad: true,
                     category: terms.core
-                }));
+                }, slot.product ? {
+                    product: true,
+                    tier: 'weak'
+                } : {}));
         };
         // 1. Choose, slot by slot, so the page's choices never collide: each
         //    slot claims its best accepted hit before the next slot looks.
@@ -1720,34 +1976,57 @@ const EXTENSIONS = {
                 }
                 return aiStockRank(found, blocked, `${input.seed}:${index}:${request.query}`, judgementFor(slot, request, subject));
             };
-            for (const request of requests){
-                if (choice || signal.aborted) break;
-                const ranked = await accepted(request, false);
-                if (ranked === null) break;
-                if (!ranked.length) continue;
-                const first = ranked[0];
-                claimed.add(stockPhotoSourceKey(first));
-                choice = {
-                    candidates: ranked.slice(0, AI_LAYOUT_STOCK_TRIES_PER_SLOT),
-                    query: request.query
-                };
-            }
-            // 2. Nothing new of its own: a product or a hero reuses an on-topic
-            //    photo another slot of the job already shows (a product may repeat
-            //    a collection tile's photo) before the starters' desk or living
-            //    room fills it (AGL-3660). Only the searches already answered are
-            //    asked again, from memory. Any other picture keeps "never twice".
-            if (!choice && (slot.product || slot.role === 'hero')) {
-                for (const request of requests){
-                    if (choice || signal.aborted) break;
-                    const ranked = await accepted(request, true);
+            /** The first of these searches with a hit to take: a new one, or one the job already shows. */ const choose = async (tried, repeat)=>{
+                for (const request of tried){
+                    if (signal.aborted) return null;
+                    // Spent searches answer nothing; those already asked still answer from memory.
+                    const ranked = await accepted(request, repeat);
                     if (!(ranked == null ? void 0 : ranked.length)) continue;
-                    choice = {
+                    if (!repeat) claimed.add(stockPhotoSourceKey(ranked[0]));
+                    return _extends({
                         candidates: ranked.slice(0, AI_LAYOUT_STOCK_TRIES_PER_SLOT),
-                        query: request.query,
+                        query: request.query
+                    }, repeat ? {
                         repeat: true
-                    };
+                    } : {});
                 }
+                return null;
+            };
+            // 2. Nothing new of its own: a product or a hero reuses an on-topic
+            //    photo another slot of the job already shows (a product may repeat
+            //    a collection tile's photo, or another product's) before the
+            //    starters' desk or living room fills it (AGL-3660). Any other
+            //    picture keeps "never twice". A product goes by how sure each
+            //    search is: its own and its category's photos, new and then
+            //    repeated, before a weak hit of its own (the Tidewater sauna).
+            const repeats = Boolean(slot.product) || slot.role === 'hero';
+            const sure = slot.product ? requests.filter((request)=>request.tier !== 'weak') : requests;
+            const unsure = slot.product ? requests.filter((request)=>request.tier === 'weak') : [];
+            const phases = [
+                [
+                    sure,
+                    false
+                ],
+                ...repeats ? [
+                    [
+                        sure,
+                        true
+                    ]
+                ] : [],
+                ...unsure.length ? [
+                    [
+                        unsure,
+                        false
+                    ],
+                    [
+                        unsure,
+                        true
+                    ]
+                ] : []
+            ];
+            for (const [tried, repeat] of phases){
+                if (choice || signal.aborted) break;
+                choice = await choose(tried, repeat);
             }
             choices.push(choice);
         }