v7: lead Catalogue AI matches for cabinet-hardware queries (khóa/tay nắm/thùng rác/kệ...)

index.ts

@@ -838,9 +838,9 @@ async function serverSearchProducts(q: string, limit: number): Promise<any[]> {
   scored.sort((a, b) => b.s - a.s);
   const ranked = scored.slice(0, limit).map(x => formatProduct(x.p, x.p._idx ?? 0));
   // Catalogue AI (Malloca/Imudex/H2) fallback: VAIX lacks Imudex products, so
-  // queries like "khóa điện tử" / "tay nắm" / "thùng rác" must also surface
-  // Imudex items. Merge CATAI hits, then interleave strong CATAI matches to the
-  // top when the query looks like an Imudex-family keyword.
+  // queries like "khóa điện tử" / "tay nắm" / "thùng rác" must surface Imudex
+  // items. If the query matches an Imudex-family keyword or VAIX had no strong
+  // hit, lead with the Catalogue AI matches (deduped) and keep VAIX as tail.
   const cat = await serverSearchCatai(q, limit);
   if (cat.length) {
     const seen = new Set(ranked.map(r => String(r.sku || "") + String(r.name || "")));
@@ -850,14 +850,18 @@ async function serverSearchProducts(q: string, limit: number): Promise<any[]> {
       if (seen.has(k)) continue;
       added.push(c);
       seen.add(k);
-      if (ranked.length + added.length >= limit * 2) break;
+      if (added.length >= limit) break;
+    }
+    if (added.length) {
+      // Prefer dedicated Imudex-family matches for cabinet-hardware queries.
+      const fam = /khoa|khoá|taynam|banle|ray|thungrac|giagiavi|giatri|kegia|kexi|kedao|kechen|kebat|kexoong|chot|moc|lock|smart|nangha|nang hạ/i.test(qNorm)
+        || /khoa|khóa|kệ|tay nắm|bản lề|thùng rác|giá gia vị|chốt|móc|ray|nâng hạ|ổ khóa|khóa điện tử/i.test(q);
+      // When the query is clearly cabinet hardware, Imudex (specific) should
+      // come before generic Malloca/Grob matches.
+      const familia = fam || cat.length >= Math.min(limit, 3);
+      const final = familia ? [...added, ...ranked] : [...ranked, ...added];
+      return final.slice(0, limit).map((p: any, i: number) => ({ ...p, _idx: i }));
     }
-    // Imudex-family keywords: prefer exact CATAI name matches on top of VAIX noise.
-    const fam = /khoa|khoá|kenangha|taynam|banle|ray|thungrac|giag|giatri|giavi|ke[ -]?gia|ke[ -]?xi|ke[ -]?dao|ke[ -]?chen|ke[ -]?bat|ke[ -]?xoong|dia|chen|bat|combo|lock|smart/i.test(qNorm);
-    const boosted = added.filter(c => fam);
-    const rest = added.filter(c => !fam);
-    for (const c of boosted) ranked.unshift(c);
-    for (const c of rest) ranked.push(c);
   }
   return ranked.slice(0, limit);
 }