@retrivora-ai/rag-engine 1.7.4 → 1.7.6

package/dist/{chunk-PKK7EEVP.mjs → chunk-XGVKIPNY.mjs}

@@ -829,7 +829,8 @@ ${context}`;
         stopSequences: options == null ? void 0 : options.stop
       }
     });
-    return (_f = response.text) != null ? _f : "";
+    const text = typeof response.text === "function" ? response.text() : (_f = response.text) != null ? _f : "";
+    return text;
   }
   chatStream(messages, context, options) {
     return __asyncGenerator(this, null, function* () {
@@ -863,7 +864,7 @@ ${context}`;
       try {
         for (var iter = __forAwait(stream), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
           const chunk = temp.value;
-          const text = chunk.text;
+          const text = typeof chunk.text === "function" ? chunk.text() : chunk.text;
           if (text) yield text;
         }
       } catch (temp) {
@@ -2361,11 +2362,14 @@ Classify the query into ONE of the following intents:
 
 ## 5. DATA RULES
 
-- NEVER hallucinate fields
+- NEVER hallucinate fields or data
 - ONLY use retrieved vector DB data
 - NO placeholders ("...", "N/A")
 - If image/link missing \u2192 REMOVE FIELD
 - Aggregate BEFORE rendering chart
+- IF NO DATA IS FOUND in the retrieved context:
+  \u2192 DO NOT output a \`\`\`ui\`\`\` block
+  \u2192 Instead, state clearly that no relevant products or data were found.
 
 ---
 
@@ -2445,7 +2449,10 @@ User: "distribution of products across categories"
 \`\`\`
 `;
     if (!((_a = this.config.llm.systemPrompt) == null ? void 0 : _a.includes(CHART_MARKER))) {
-      this.config.llm.systemPrompt = (this.config.llm.systemPrompt || "") + chartInstruction;
+      let cleanPrompt = this.config.llm.systemPrompt || "";
+      cleanPrompt = cleanPrompt.replace(/\n\n### UNIVERSAL UI PROTOCOL[\s\S]*?(?=\n\n|$)/g, "");
+      cleanPrompt = cleanPrompt.replace(/<!-- UI_PROTOCOL_V\d+ -->[\s\S]*?(?=\n\n|$)/g, "");
+      this.config.llm.systemPrompt = cleanPrompt.trim() + chartInstruction;
     }
     console.log(`[Pipeline] Initializing with provider: ${this.config.vectorDb.provider}...`);
     this.vectorDB = await ProviderRegistry.createVectorProvider(this.config.vectorDb);

package/dist/handlers/index.js

@@ -2437,7 +2437,8 @@ ${context}`;
         stopSequences: options == null ? void 0 : options.stop
       }
     });
-    return (_f = response.text) != null ? _f : "";
+    const text = typeof response.text === "function" ? response.text() : (_f = response.text) != null ? _f : "";
+    return text;
   }
   chatStream(messages, context, options) {
     return __asyncGenerator(this, null, function* () {
@@ -2471,7 +2472,7 @@ ${context}`;
       try {
         for (var iter = __forAwait(stream), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
           const chunk = temp.value;
-          const text = chunk.text;
+          const text = typeof chunk.text === "function" ? chunk.text() : chunk.text;
           if (text) yield text;
         }
       } catch (temp) {
@@ -3925,11 +3926,14 @@ Classify the query into ONE of the following intents:
 
 ## 5. DATA RULES
 
-- NEVER hallucinate fields
+- NEVER hallucinate fields or data
 - ONLY use retrieved vector DB data
 - NO placeholders ("...", "N/A")
 - If image/link missing \u2192 REMOVE FIELD
 - Aggregate BEFORE rendering chart
+- IF NO DATA IS FOUND in the retrieved context:
+  \u2192 DO NOT output a \`\`\`ui\`\`\` block
+  \u2192 Instead, state clearly that no relevant products or data were found.
 
 ---
 
@@ -4009,7 +4013,10 @@ User: "distribution of products across categories"
 \`\`\`
 `;
     if (!((_a = this.config.llm.systemPrompt) == null ? void 0 : _a.includes(CHART_MARKER))) {
-      this.config.llm.systemPrompt = (this.config.llm.systemPrompt || "") + chartInstruction;
+      let cleanPrompt = this.config.llm.systemPrompt || "";
+      cleanPrompt = cleanPrompt.replace(/\n\n### UNIVERSAL UI PROTOCOL[\s\S]*?(?=\n\n|$)/g, "");
+      cleanPrompt = cleanPrompt.replace(/<!-- UI_PROTOCOL_V\d+ -->[\s\S]*?(?=\n\n|$)/g, "");
+      this.config.llm.systemPrompt = cleanPrompt.trim() + chartInstruction;
     }
     console.log(`[Pipeline] Initializing with provider: ${this.config.vectorDb.provider}...`);
     this.vectorDB = await ProviderRegistry.createVectorProvider(this.config.vectorDb);

package/dist/handlers/index.mjs

@@ -10,7 +10,7 @@ import {
   sseMetaFrame,
   sseTextFrame,
   sseUIFrame
-} from "../chunk-PKK7EEVP.mjs";
+} from "../chunk-XGVKIPNY.mjs";
 import "../chunk-YLTMFW4M.mjs";
 import "../chunk-X4TOT24V.mjs";
 export {

package/dist/index.js

@@ -637,6 +637,11 @@ function normalizeTabularRows(rows, columns) {
   }).filter((row) => Object.keys(row).length > 0);
 }
 function resolveStructuredRows(config) {
+  var _a, _b, _c, _d;
+  if (((_a = config.carousel) == null ? void 0 : _a.items) && Array.isArray(config.carousel.items)) return config.carousel.items;
+  if (((_b = config.chart) == null ? void 0 : _b.data) && Array.isArray(config.chart.data)) return config.chart.data;
+  if (((_c = config.table) == null ? void 0 : _c.rows) && Array.isArray(config.table.rows)) return config.table.rows;
+  if (((_d = config.table) == null ? void 0 : _d.data) && Array.isArray(config.table.data)) return config.table.data;
   if (Array.isArray(config.data) && config.data.length > 0) return config.data;
   if (Array.isArray(config.items) && config.items.length > 0) return config.items;
   if (Array.isArray(config.products) && config.products.length > 0) return config.products;
@@ -652,6 +657,14 @@ function UIDispatcher({ rawContent, primaryColor, accentColor, isStreaming, onAd
       const clean = rawContent.replace(/^```[a-z]*\s*/i, "").replace(/```\s*$/, "").trim();
       const parsed = JSON.parse(sanitizeJson(extractLikelyJsonBlock(clean)));
       const config2 = __spreadValues({}, parsed);
+      if (config2.chart) {
+        if (!config2.chartType) config2.chartType = config2.chart.type;
+        if (!config2.xAxisKey) config2.xAxisKey = config2.chart.xKey;
+        if (!config2.dataKeys) config2.dataKeys = config2.chart.yKeys;
+      }
+      if (config2.table) {
+        if (!config2.columns) config2.columns = config2.table.columns;
+      }
       const resolvedRows = resolveStructuredRows(config2);
       const hasProductLikeData = resolvedRows.length > 0 && typeof resolvedRows[0] === "object" && resolvedRows[0] !== null && !Array.isArray(resolvedRows[0]) && (["price", "brand", "image", "link", "thumbnail"].some((key) => key in resolvedRows[0]) || Object.keys(resolvedRows[0]).length >= 4);
       const hasAggregationLikeData = resolvedRows.length > 0 && typeof resolvedRows[0] === "object" && resolvedRows[0] !== null && !Array.isArray(resolvedRows[0]) && (["value", "count", "total", "percentage"].some((key) => key in resolvedRows[0]) || Object.keys(resolvedRows[0]).length <= 3 && Object.values(resolvedRows[0]).some((v) => typeof v === "number"));

package/dist/index.mjs

@@ -600,6 +600,11 @@ function normalizeTabularRows(rows, columns) {
   }).filter((row) => Object.keys(row).length > 0);
 }
 function resolveStructuredRows(config) {
+  var _a, _b, _c, _d;
+  if (((_a = config.carousel) == null ? void 0 : _a.items) && Array.isArray(config.carousel.items)) return config.carousel.items;
+  if (((_b = config.chart) == null ? void 0 : _b.data) && Array.isArray(config.chart.data)) return config.chart.data;
+  if (((_c = config.table) == null ? void 0 : _c.rows) && Array.isArray(config.table.rows)) return config.table.rows;
+  if (((_d = config.table) == null ? void 0 : _d.data) && Array.isArray(config.table.data)) return config.table.data;
   if (Array.isArray(config.data) && config.data.length > 0) return config.data;
   if (Array.isArray(config.items) && config.items.length > 0) return config.items;
   if (Array.isArray(config.products) && config.products.length > 0) return config.products;
@@ -615,6 +620,14 @@ function UIDispatcher({ rawContent, primaryColor, accentColor, isStreaming, onAd
       const clean = rawContent.replace(/^```[a-z]*\s*/i, "").replace(/```\s*$/, "").trim();
       const parsed = JSON.parse(sanitizeJson(extractLikelyJsonBlock(clean)));
       const config2 = __spreadValues({}, parsed);
+      if (config2.chart) {
+        if (!config2.chartType) config2.chartType = config2.chart.type;
+        if (!config2.xAxisKey) config2.xAxisKey = config2.chart.xKey;
+        if (!config2.dataKeys) config2.dataKeys = config2.chart.yKeys;
+      }
+      if (config2.table) {
+        if (!config2.columns) config2.columns = config2.table.columns;
+      }
       const resolvedRows = resolveStructuredRows(config2);
       const hasProductLikeData = resolvedRows.length > 0 && typeof resolvedRows[0] === "object" && resolvedRows[0] !== null && !Array.isArray(resolvedRows[0]) && (["price", "brand", "image", "link", "thumbnail"].some((key) => key in resolvedRows[0]) || Object.keys(resolvedRows[0]).length >= 4);
       const hasAggregationLikeData = resolvedRows.length > 0 && typeof resolvedRows[0] === "object" && resolvedRows[0] !== null && !Array.isArray(resolvedRows[0]) && (["value", "count", "total", "percentage"].some((key) => key in resolvedRows[0]) || Object.keys(resolvedRows[0]).length <= 3 && Object.values(resolvedRows[0]).some((v) => typeof v === "number"));

package/dist/server.js

@@ -2482,7 +2482,8 @@ ${context}`;
         stopSequences: options == null ? void 0 : options.stop
       }
     });
-    return (_f = response.text) != null ? _f : "";
+    const text = typeof response.text === "function" ? response.text() : (_f = response.text) != null ? _f : "";
+    return text;
   }
   chatStream(messages, context, options) {
     return __asyncGenerator(this, null, function* () {
@@ -2516,7 +2517,7 @@ ${context}`;
       try {
         for (var iter = __forAwait(stream), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
           const chunk = temp.value;
-          const text = chunk.text;
+          const text = typeof chunk.text === "function" ? chunk.text() : chunk.text;
           if (text) yield text;
         }
       } catch (temp) {
@@ -4015,11 +4016,14 @@ Classify the query into ONE of the following intents:
 
 ## 5. DATA RULES
 
-- NEVER hallucinate fields
+- NEVER hallucinate fields or data
 - ONLY use retrieved vector DB data
 - NO placeholders ("...", "N/A")
 - If image/link missing \u2192 REMOVE FIELD
 - Aggregate BEFORE rendering chart
+- IF NO DATA IS FOUND in the retrieved context:
+  \u2192 DO NOT output a \`\`\`ui\`\`\` block
+  \u2192 Instead, state clearly that no relevant products or data were found.
 
 ---
 
@@ -4099,7 +4103,10 @@ User: "distribution of products across categories"
 \`\`\`
 `;
     if (!((_a = this.config.llm.systemPrompt) == null ? void 0 : _a.includes(CHART_MARKER))) {
-      this.config.llm.systemPrompt = (this.config.llm.systemPrompt || "") + chartInstruction;
+      let cleanPrompt = this.config.llm.systemPrompt || "";
+      cleanPrompt = cleanPrompt.replace(/\n\n### UNIVERSAL UI PROTOCOL[\s\S]*?(?=\n\n|$)/g, "");
+      cleanPrompt = cleanPrompt.replace(/<!-- UI_PROTOCOL_V\d+ -->[\s\S]*?(?=\n\n|$)/g, "");
+      this.config.llm.systemPrompt = cleanPrompt.trim() + chartInstruction;
     }
     console.log(`[Pipeline] Initializing with provider: ${this.config.vectorDb.provider}...`);
     this.vectorDB = await ProviderRegistry.createVectorProvider(this.config.vectorDb);
@@ -4923,6 +4930,16 @@ var MultiTablePostgresProvider = class extends BaseVectorProvider {
     ).map((hint) => hint.value.trim().toLowerCase()).filter(Boolean) : [];
     console.log(`[MultiTablePostgresProvider] queryText: "${queryText}"`);
     console.log(`[MultiTablePostgresProvider] entityHints: [${entityHints.join(", ")}]`);
+    const getDynamicKeywordQuery = () => {
+      if (entityHints.length > 0) {
+        return entityHints.map((h) => h.includes(" ") ? `"${h}"` : h).join(" & ");
+      }
+      if (queryText) {
+        return queryText.toLowerCase().replace(/\b(show|me|the|product[s]?|item[s]?|card[s]?|of|category|find|list|browse|what|are|display|all|under|for|in|with|about)\b/g, "").trim().replace(/\s+/g, " & ");
+      }
+      return "";
+    };
+    const dynamicKeywordQuery = getDynamicKeywordQuery();
     const queryPromises = this.tables.map(async (table) => {
       try {
         let sqlQuery = "";
@@ -4940,13 +4957,13 @@ var MultiTablePostgresProvider = class extends BaseVectorProvider {
           sqlQuery = `
             SELECT *, 
              (1 - (embedding <=> $1::vector)) AS vector_score,
-             COALESCE(ts_rank(to_tsvector('english', (to_jsonb(t) - 'embedding')::text), NULLIF(REPLACE(plainto_tsquery('english', $2)::text, '&', '|'), '')::tsquery), 0) AS keyword_score,
-             ((1 - (embedding <=> $1::vector)) + (COALESCE(ts_rank(to_tsvector('english', (to_jsonb(t) - 'embedding')::text), NULLIF(REPLACE(plainto_tsquery('english', $2)::text, '&', '|'), '')::tsquery), 0) * 2.0) ${exactNameScoreExpr}) AS hybrid_score
+             COALESCE(ts_rank(to_tsvector('english', (to_jsonb(t) - 'embedding')::text), to_tsquery('english', $2)), 0) AS keyword_score,
+             ((1 - (embedding <=> $1::vector)) + (COALESCE(ts_rank(to_tsvector('english', (to_jsonb(t) - 'embedding')::text), to_tsquery('english', $2)), 0) * 2.0) ${exactNameScoreExpr}) AS hybrid_score
             FROM "${table}" t
             ORDER BY hybrid_score DESC
             LIMIT 50
           `;
-          params = [vectorLiteral, queryText];
+          params = [vectorLiteral, dynamicKeywordQuery];
         } else {
           sqlQuery = `
             SELECT *, 

package/dist/server.mjs

@@ -39,7 +39,7 @@ import {
   sseFrame,
   sseMetaFrame,
   sseTextFrame
-} from "./chunk-PKK7EEVP.mjs";
+} from "./chunk-XGVKIPNY.mjs";
 import "./chunk-YLTMFW4M.mjs";
 import {
   PineconeProvider
@@ -325,6 +325,16 @@ var MultiTablePostgresProvider = class extends BaseVectorProvider {
     ).map((hint) => hint.value.trim().toLowerCase()).filter(Boolean) : [];
     console.log(`[MultiTablePostgresProvider] queryText: "${queryText}"`);
     console.log(`[MultiTablePostgresProvider] entityHints: [${entityHints.join(", ")}]`);
+    const getDynamicKeywordQuery = () => {
+      if (entityHints.length > 0) {
+        return entityHints.map((h) => h.includes(" ") ? `"${h}"` : h).join(" & ");
+      }
+      if (queryText) {
+        return queryText.toLowerCase().replace(/\b(show|me|the|product[s]?|item[s]?|card[s]?|of|category|find|list|browse|what|are|display|all|under|for|in|with|about)\b/g, "").trim().replace(/\s+/g, " & ");
+      }
+      return "";
+    };
+    const dynamicKeywordQuery = getDynamicKeywordQuery();
     const queryPromises = this.tables.map(async (table) => {
       try {
         let sqlQuery = "";
@@ -342,13 +352,13 @@ var MultiTablePostgresProvider = class extends BaseVectorProvider {
           sqlQuery = `
             SELECT *, 
              (1 - (embedding <=> $1::vector)) AS vector_score,
-             COALESCE(ts_rank(to_tsvector('english', (to_jsonb(t) - 'embedding')::text), NULLIF(REPLACE(plainto_tsquery('english', $2)::text, '&', '|'), '')::tsquery), 0) AS keyword_score,
-             ((1 - (embedding <=> $1::vector)) + (COALESCE(ts_rank(to_tsvector('english', (to_jsonb(t) - 'embedding')::text), NULLIF(REPLACE(plainto_tsquery('english', $2)::text, '&', '|'), '')::tsquery), 0) * 2.0) ${exactNameScoreExpr}) AS hybrid_score
+             COALESCE(ts_rank(to_tsvector('english', (to_jsonb(t) - 'embedding')::text), to_tsquery('english', $2)), 0) AS keyword_score,
+             ((1 - (embedding <=> $1::vector)) + (COALESCE(ts_rank(to_tsvector('english', (to_jsonb(t) - 'embedding')::text), to_tsquery('english', $2)), 0) * 2.0) ${exactNameScoreExpr}) AS hybrid_score
             FROM "${table}" t
             ORDER BY hybrid_score DESC
             LIMIT 50
           `;
-          params = [vectorLiteral, queryText];
+          params = [vectorLiteral, dynamicKeywordQuery];
         } else {
           sqlQuery = `
             SELECT *, 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@retrivora-ai/rag-engine",
-  "version": "1.7.4",
+  "version": "1.7.6",
   "description": "Retrivora AI is a plug-and-play AI engine for RAG chat experiences — generic vector DB + LLM provider, embeddable or standalone.",
   "author": "Abhinav Alkuchi",
   "license": "MIT",

package/src/components/MessageBubble.tsx

@@ -381,14 +381,46 @@ interface UIConfig {
   rows?: Record<string, unknown>[];
   products?: Record<string, unknown>[];
   results?: Record<string, unknown>[];
+
+  // V7 Protocol Fields
+  carousel?: {
+    items: Record<string, unknown>[];
+  };
+  chart?: {
+    type: 'pie' | 'bar' | 'line';
+    xKey: string;
+    yKeys: string[];
+    data: Record<string, unknown>[];
+  };
+  table?: {
+    columns: string[];
+    rows?: Record<string, unknown>[];
+    data?: Record<string, unknown>[];
+  };
 }
 
-interface RawUIConfig extends Omit<UIConfig, 'data' | 'items' | 'rows' | 'products' | 'results'> {
+interface RawUIConfig extends Omit<UIConfig, 'data' | 'items' | 'rows' | 'products' | 'results' | 'carousel' | 'chart' | 'table'> {
   data: Array<Record<string, unknown> | unknown[]>;
   items?: Array<Record<string, unknown> | unknown[]>;
   rows?: Array<Record<string, unknown> | unknown[]>;
   products?: Array<Record<string, unknown> | unknown[]>;
   results?: Array<Record<string, unknown> | unknown[]>;
+
+  // V7 Protocol Fields (Raw)
+  carousel?: {
+    items: Array<Record<string, unknown> | unknown[]>;
+  };
+  chart?: {
+    type: 'pie' | 'bar' | 'line';
+    xKey: string;
+    yKeys: string[];
+    data: Array<Record<string, unknown> | unknown[]>;
+  };
+  table?: {
+    columns: string[];
+    rows?: Array<Record<string, unknown> | unknown[]>;
+    data?: Array<Record<string, unknown> | unknown[]>;
+  };
 }
 
 function normalizeTabularRows(
@@ -420,6 +452,13 @@ function normalizeTabularRows(
 }
 
 function resolveStructuredRows(config: Partial<RawUIConfig> & Record<string, unknown>) {
+  // V7 Nested Structures
+  if (config.carousel?.items && Array.isArray(config.carousel.items)) return config.carousel.items;
+  if (config.chart?.data && Array.isArray(config.chart.data)) return config.chart.data;
+  if (config.table?.rows && Array.isArray(config.table.rows)) return config.table.rows;
+  if (config.table?.data && Array.isArray(config.table.data)) return config.table.data;
+
+  // V6 Flat Structures
   if (Array.isArray(config.data) && config.data.length > 0) return config.data;
   if (Array.isArray(config.items) && config.items.length > 0) return config.items;
   if (Array.isArray(config.products) && config.products.length > 0) return config.products;
@@ -445,6 +484,17 @@ function UIDispatcher({ rawContent, primaryColor, accentColor, isStreaming, onAd
         .trim();
       const parsed = JSON.parse(sanitizeJson(extractLikelyJsonBlock(clean)));
       const config = { ...parsed } as Partial<RawUIConfig> & Record<string, unknown>;
+      
+      // V7 Field Mapping
+      if (config.chart) {
+        if (!config.chartType) config.chartType = config.chart.type;
+        if (!config.xAxisKey) config.xAxisKey = config.chart.xKey;
+        if (!config.dataKeys) config.dataKeys = config.chart.yKeys;
+      }
+      if (config.table) {
+        if (!config.columns) config.columns = config.table.columns;
+      }
+
       const resolvedRows = resolveStructuredRows(config);
 
       // ─── Intent Healing & Auto-Detection ───────────────────────────────────

package/src/core/Pipeline.ts

@@ -203,11 +203,14 @@ Classify the query into ONE of the following intents:
 
 ## 5. DATA RULES
 
-- NEVER hallucinate fields
+- NEVER hallucinate fields or data
 - ONLY use retrieved vector DB data
 - NO placeholders ("...", "N/A")
 - If image/link missing → REMOVE FIELD
 - Aggregate BEFORE rendering chart
+- IF NO DATA IS FOUND in the retrieved context:
+  → DO NOT output a \`\`\`ui\`\`\` block
+  → Instead, state clearly that no relevant products or data were found.
 
 ---
 
@@ -287,7 +290,12 @@ User: "distribution of products across categories"
 \`\`\`
 `;
     if (!this.config.llm.systemPrompt?.includes(CHART_MARKER)) {
-      this.config.llm.systemPrompt = (this.config.llm.systemPrompt || '') + chartInstruction;
+      // Clean up ANY existing protocol markers (V1-V7) to avoid prompt bloat
+      let cleanPrompt = this.config.llm.systemPrompt || '';
+      cleanPrompt = cleanPrompt.replace(/\n\n### UNIVERSAL UI PROTOCOL[\s\S]*?(?=\n\n|$)/g, '');
+      cleanPrompt = cleanPrompt.replace(/<!-- UI_PROTOCOL_V\d+ -->[\s\S]*?(?=\n\n|$)/g, '');
+      
+      this.config.llm.systemPrompt = cleanPrompt.trim() + chartInstruction;
     }
 
     console.log(`[Pipeline] Initializing with provider: ${this.config.vectorDb.provider}...`);

package/src/llm/providers/GeminiProvider.ts

@@ -128,7 +128,10 @@ export class GeminiProvider implements ILLMProvider {
       },
     });
 
-    return response.text ?? '';
+    const text = typeof (response as { text: unknown }).text === 'function'
+      ? (response as { text: () => string }).text()
+      : (response.text ?? '');
+    return text;
   }
 
   async *chatStream(messages: ChatMessage[], context: string, options?: ChatOptions): AsyncIterable<string> {
@@ -162,7 +165,9 @@ export class GeminiProvider implements ILLMProvider {
     }
 
     for await (const chunk of stream) {
-      const text = chunk.text;
+      const text = typeof (chunk as { text: unknown }).text === 'function'
+        ? (chunk as { text: () => string }).text()
+        : (chunk as { text?: string }).text;
       if (text) yield text;
     }
   }

package/src/providers/vectordb/MultiTablePostgresProvider.ts

@@ -151,6 +151,28 @@ export class MultiTablePostgresProvider extends BaseVectorProvider {
     console.log(`[MultiTablePostgresProvider] queryText: "${queryText}"`);
     console.log(`[MultiTablePostgresProvider] entityHints: [${entityHints.join(', ')}]`);
 
+    // Dynamic Keyword Search: Prioritize intelligently extracted hints over raw text
+    const getDynamicKeywordQuery = () => {
+      if (entityHints.length > 0) {
+        // Use extracted entities as high-signal keywords
+        return entityHints
+          .map(h => h.includes(' ') ? `"${h}"` : h) // Wrap multi-word hints in quotes
+          .join(' & ');
+      }
+
+      if (queryText) {
+        // Fallback to cleaned raw text if no high-signal hints were extracted
+        return queryText
+          .toLowerCase()
+          .replace(/\b(show|me|the|product[s]?|item[s]?|card[s]?|of|category|find|list|browse|what|are|display|all|under|for|in|with|about)\b/g, '')
+          .trim()
+          .replace(/\s+/g, ' & ');
+      }
+      return '';
+    };
+
+    const dynamicKeywordQuery = getDynamicKeywordQuery();
+
     const queryPromises = this.tables.map(async (table) => {
       try {
         let sqlQuery = '';
@@ -173,13 +195,13 @@ export class MultiTablePostgresProvider extends BaseVectorProvider {
           sqlQuery = `
             SELECT *, 
              (1 - (embedding <=> $1::vector)) AS vector_score,
-             COALESCE(ts_rank(to_tsvector('english', (to_jsonb(t) - 'embedding')::text), NULLIF(REPLACE(plainto_tsquery('english', $2)::text, '&', '|'), '')::tsquery), 0) AS keyword_score,
-             ((1 - (embedding <=> $1::vector)) + (COALESCE(ts_rank(to_tsvector('english', (to_jsonb(t) - 'embedding')::text), NULLIF(REPLACE(plainto_tsquery('english', $2)::text, '&', '|'), '')::tsquery), 0) * 2.0) ${exactNameScoreExpr}) AS hybrid_score
+             COALESCE(ts_rank(to_tsvector('english', (to_jsonb(t) - 'embedding')::text), to_tsquery('english', $2)), 0) AS keyword_score,
+             ((1 - (embedding <=> $1::vector)) + (COALESCE(ts_rank(to_tsvector('english', (to_jsonb(t) - 'embedding')::text), to_tsquery('english', $2)), 0) * 2.0) ${exactNameScoreExpr}) AS hybrid_score
             FROM "${table}" t
             ORDER BY hybrid_score DESC
             LIMIT 50
           `;
-          params = [vectorLiteral, queryText];
+          params = [vectorLiteral, dynamicKeywordQuery];
         } else {
           // Fallback to Vector-only Search
           sqlQuery = `