update the prompt

backend/api/services/agent_orchestrator.py

@@ -754,6 +754,18 @@ Response:"""
                                     "error": str(build_err),
                                 }
                             )
+                    elif not use_rag_for_admin:
+                        # No RAG results available - enhance the prompt to still provide best answer
+                        prompt_for_llm = (
+                            f"You are an assistant helping tenant {req.tenant_id}.\n\n"
+                            f"## User Question\n{req.message}\n\n"
+                            f"## Your Task\n"
+                            f"Provide the best possible answer to the user's question. "
+                            f"Be clear, accurate, comprehensive, and helpful. "
+                            f"Focus on giving the user exactly what they need—clear guidance, accurate facts, "
+                            f"and practical steps whenever possible. "
+                            f"If you're uncertain about tenant-specific details, acknowledge that and provide general guidance."
+                        )
 
                     llm_start = time.time()
                     llm_out = await self.llm.simple_call(prompt_for_llm, temperature=req.temperature)
@@ -886,18 +898,55 @@ Response:"""
 
     def _build_prompt_with_rag(self, req: AgentRequest, rag_resp: Dict[str, Any]) -> str:
         snippets = []
+        scores_info = []
         if isinstance(rag_resp, dict):
             hits = rag_resp.get("results") or rag_resp.get("hits") or []
-            for h in hits[:5]:
+            # Sort by score if available, take top 5
+            sorted_hits = sorted(
+                hits,
+                key=lambda h: float(h.get("score", h.get("similarity", 0.0))),
+                reverse=True
+            )[:5]
+            
+            for i, h in enumerate(sorted_hits, 1):
                 txt = h.get("text") or h.get("content") or str(h)
-                snippets.append(txt)
+                score = h.get("score") or h.get("similarity", 0.0)
+                snippets.append(f"[Source {i}] {txt}")
+                scores_info.append(f"Source {i}: relevance score {score:.3f}")
 
-        snippet_text = "\n---\n".join(snippets) or ""
-        prompt = (
-            f"You are an assistant helping tenant {req.tenant_id}. Use the following retrieved documents to answer the user's question.\n"
-            f"Documents:\n{snippet_text}\n\n"
-            f"User question: {req.message}\nProvide a concise, accurate answer and cite the source snippets where appropriate."
-        )
+        snippet_text = "\n\n".join(snippets) if snippets else ""
+        scores_text = "\n".join(scores_info) if scores_info else ""
+        
+        if not snippet_text:
+            prompt = (
+                f"You are an assistant helping tenant {req.tenant_id}.\n\n"
+                f"## User Question\n{req.message}\n\n"
+                f"## Context\n"
+                f"No relevant documents were found in the knowledge base for this question.\n\n"
+                f"## Your Task\n"
+                f"Provide the best possible answer based on your general knowledge. "
+                f"Be clear, accurate, and helpful. If you're uncertain about tenant-specific details, "
+                f"acknowledge that and provide general guidance."
+            )
+        else:
+            prompt = (
+                f"You are an assistant helping tenant {req.tenant_id}. "
+                f"Your goal is to provide the most accurate, comprehensive, and helpful answer possible.\n\n"
+                f"## Knowledge Base Documents\n"
+                f"The following documents were retrieved from the tenant's knowledge base as relevant to the user's question:\n\n"
+                f"{snippet_text}\n\n"
+                f"{'## Relevance Scores\n' + scores_text + '\n\n' if scores_text else ''}"
+                f"## User Question\n{req.message}\n\n"
+                f"## Your Task\n"
+                f"1. **Primary Goal**: Answer the user's question using the information from the knowledge base documents above.\n"
+                f"2. **Accuracy**: Base your answer primarily on the highest-scoring sources (most relevant documents).\n"
+                f"3. **Comprehensiveness**: If multiple sources provide complementary information, synthesize them into a complete answer.\n"
+                f"4. **Citation**: When referencing specific information, indicate which source(s) you used (e.g., 'According to Source 1...' or 'Sources 1 and 2 indicate...').\n"
+                f"5. **Completeness**: If the documents don't fully answer the question, clearly state what information is available and what is missing.\n"
+                f"6. **Clarity**: Write in a clear, professional, and easy-to-understand manner.\n"
+                f"7. **Directness**: Get straight to the point - provide the answer the user needs without unnecessary preamble.\n\n"
+                f"Provide your answer now:"
+            )
         return prompt
 
     async def _execute_multi_step(self, req: AgentRequest, steps: List[Dict[str, Any]], 
@@ -1260,21 +1309,39 @@ Response:"""
         # Otherwise, build the normal multi-step synthesis prompt.
         if data_section:
             prompt = (
-                f"You are an assistant helping tenant {req.tenant_id}.\n\n"
+                f"You are an assistant helping tenant {req.tenant_id}. "
+                f"Your goal is to provide the most accurate, comprehensive, and helpful answer possible.\n\n"
                 f"## Information Collected\n"
-                f"The following details have been gathered from multiple reliable sources:\n"
+                f"The following details have been gathered from multiple reliable sources (knowledge base, web search, etc.):\n\n"
                 f"{data_section}\n\n"
-                f"## User Request\n"
-                f"{req.message}\n\n"
+                f"## User Request\n{req.message}\n\n"
                 f"## Your Task\n"
-                f"Use the information above to directly address the user's request. "
-                f"Focus on giving the user exactly what they need—clear guidance, accurate facts, "
-                f"and practical steps whenever possible. If the information is incomplete, explain "
-                f"what can and cannot be concluded from the available data."
+                f"1. **Primary Goal**: Use the information above to directly and completely address the user's request.\n"
+                f"2. **Synthesis**: Combine information from different sources when they provide complementary details.\n"
+                f"3. **Prioritization**: If sources conflict, prioritize the most authoritative or recent information.\n"
+                f"4. **Completeness**: Provide a comprehensive answer that covers all aspects of the user's question.\n"
+                f"5. **Accuracy**: Base your answer on the provided information. If information is missing or uncertain, clearly state that.\n"
+                f"6. **Clarity**: Write in a clear, professional, and easy-to-understand manner.\n"
+                f"7. **Directness**: Get straight to the point - provide the answer the user needs without unnecessary preamble.\n"
+                f"8. **Actionability**: If the question requires steps or actions, provide clear, actionable guidance.\n"
+                f"9. **Citation**: When referencing specific sources, indicate which source(s) you used (e.g., '[RAG]', '[WEB]').\n\n"
+                f"If the information is incomplete, explain what can and cannot be concluded from the available data. "
+                f"Focus on giving the user exactly what they need—clear guidance, accurate facts, and practical steps whenever possible.\n\n"
+                f"Provide your comprehensive answer now:"
             )
         else:
-            # No data collected, just answer the question
-            prompt = req.message
+            # No data collected, provide best answer from general knowledge
+            prompt = (
+                f"You are an assistant helping tenant {req.tenant_id}.\n\n"
+                f"## User Question\n{req.message}\n\n"
+                f"## Context\n"
+                f"No specific information was found in the knowledge base or web search for this question.\n\n"
+                f"## Your Task\n"
+                f"Provide the best possible answer based on your general knowledge. "
+                f"Be clear, accurate, comprehensive, and helpful. "
+                f"If you're uncertain about tenant-specific details, acknowledge that and provide general guidance. "
+                f"Focus on giving the user exactly what they need—clear guidance, accurate facts, and practical steps whenever possible."
+            )
 
         # Final LLM synthesis
         try:
@@ -1761,27 +1828,47 @@ Rewritten message:"""
         snippets = []
         if isinstance(web_resp, dict):
             hits = web_resp.get("results") or web_resp.get("items") or []
-            for h in hits[:5]:
+            for i, h in enumerate(hits[:5], 1):
                 title = h.get("title") or h.get("headline") or ""
                 snippet = h.get("snippet") or h.get("summary") or h.get("text") or ""
                 url = h.get("url") or h.get("link") or ""
-                snippets.append(f"{title}\n{snippet}\nSource: {url}")
-
-        snippet_text = "\n---\n".join(snippets) or ""
-        # prompt = (
-        #     f"You are an assistant with access to recent web search results. Use the following results to answer.\n{snippet_text}\n\n"
-        #     f"User question: {req.message}\nAnswer succinctly and indicate which results you used."
-        # )
-        prompt = (
-            f"You are an assistant with access to recent web search results.\n\n"
-            f"## Search Results\n"
-            f"{snippet_text}\n\n"
-            f"## User Question\n"
-            f"{req.message}\n\n"
-            f"## Your Task\n"
-            f"Provide a clear, accurate, and succinct answer based on the search results above. "
-            f"Indicate which results you used in your reasoning."
-        )
+                display_link = h.get("displayLink") or h.get("display_link") or ""
+                source_info = display_link if display_link else url.split('/')[2] if url else "Unknown source"
+                snippets.append(f"[Result {i}] {title}\n{snippet}\nSource: {source_info} ({url})")
+
+        snippet_text = "\n\n".join(snippets) if snippets else ""
+        
+        if not snippet_text:
+            prompt = (
+                f"You are an assistant helping tenant {req.tenant_id}.\n\n"
+                f"## User Question\n{req.message}\n\n"
+                f"## Context\n"
+                f"No relevant web search results were found for this question.\n\n"
+                f"## Your Task\n"
+                f"Provide the best possible answer based on your general knowledge. "
+                f"Be clear, accurate, and helpful. If you're uncertain about specific details, "
+                f"acknowledge that and provide general guidance."
+            )
+        else:
+            prompt = (
+                f"You are an assistant helping tenant {req.tenant_id} with access to recent web search results. "
+                f"Your goal is to provide the most accurate, comprehensive, and helpful answer possible.\n\n"
+                f"## Web Search Results\n"
+                f"The following search results were found for the user's question:\n\n"
+                f"{snippet_text}\n\n"
+                f"## User Question\n{req.message}\n\n"
+                f"## Your Task\n"
+                f"1. **Primary Goal**: Answer the user's question using the information from the web search results above.\n"
+                f"2. **Accuracy**: Prioritize information from authoritative sources (recognized websites, official sources, etc.).\n"
+                f"3. **Synthesis**: If multiple results provide different perspectives or complementary information, synthesize them into a comprehensive answer.\n"
+                f"4. **Verification**: If results conflict, mention the discrepancy and provide the most reliable information.\n"
+                f"5. **Citation**: When referencing specific information, indicate which result(s) you used (e.g., 'According to Result 1...' or 'Results 1 and 2 indicate...').\n"
+                f"6. **Completeness**: If the search results don't fully answer the question, clearly state what information is available and what might be missing.\n"
+                f"7. **Clarity**: Write in a clear, professional, and easy-to-understand manner.\n"
+                f"8. **Directness**: Get straight to the point - provide the answer the user needs without unnecessary preamble.\n"
+                f"9. **Relevance**: Focus on information that directly addresses the user's question.\n\n"
+                f"Provide your answer now:"
+            )
 
         return prompt