From 2ac840e3f2b1dbcc93f027a6930ba6d8f296f3be Mon Sep 17 00:00:00 2001
From: Debanjum <debanjum@gmail.com>
Date: Mon, 28 Oct 2024 16:26:23 -0700
Subject: [PATCH 01/33] Make cursor in chat input take on selected agent color

---
 src/interface/web/app/common/colorUtils.ts             |  7 +++++++
 .../web/app/components/chatInputArea/chatInputArea.tsx | 10 +++++++---
 src/interface/web/tailwind.config.ts                   |  5 +++++
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/interface/web/app/common/colorUtils.ts b/src/interface/web/app/common/colorUtils.ts
index 6cd57a649..a7eabb031 100644
--- a/src/interface/web/app/common/colorUtils.ts
+++ b/src/interface/web/app/common/colorUtils.ts
@@ -42,6 +42,13 @@ export function converColorToBgGradient(color: string) {
     return `${convertToBGGradientClass(color)} dark:border dark:border-neutral-700`;
 }
 
+export function convertColorToCaretClass(color: string | undefined) {
+    if (color && tailwindColors.includes(color)) {
+        return `caret-${color}-500`;
+    }
+    return `caret-orange-500`;
+}
+
 export function convertColorToRingClass(color: string | undefined) {
     if (color && tailwindColors.includes(color)) {
         return `focus-visible:ring-${color}-500`;
diff --git a/src/interface/web/app/components/chatInputArea/chatInputArea.tsx b/src/interface/web/app/components/chatInputArea/chatInputArea.tsx
index b60228df4..7d3490814 100644
--- a/src/interface/web/app/components/chatInputArea/chatInputArea.tsx
+++ b/src/interface/web/app/components/chatInputArea/chatInputArea.tsx
@@ -37,7 +37,11 @@ import { Popover, PopoverContent } from "@/components/ui/popover";
 import { PopoverTrigger } from "@radix-ui/react-popover";
 import { Textarea } from "@/components/ui/textarea";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
-import { convertColorToTextClass, convertToBGClass } from "@/app/common/colorUtils";
+import {
+    convertColorToCaretClass,
+    convertColorToTextClass,
+    convertToBGClass,
+} from "@/app/common/colorUtils";
 
 import LoginPrompt from "../loginPrompt/loginPrompt";
 import { uploadDataForIndexing } from "../../common/chatFunctions";
@@ -494,8 +498,8 @@ export const ChatInputArea = forwardRef<HTMLTextAreaElement, ChatInputProps>((pr
                         </div>
                         <Textarea
                             ref={chatInputRef}
-                            className={`border-none focus:border-none
-                                focus:outline-none focus-visible:ring-transparent
+                            className={`border-none focus:border-none focus:outline-none focus-visible:ring-transparent
+                                animate-carate-blink ${convertColorToCaretClass(props.agentColor)}
                                 w-full h-16 min-h-16 max-h-[128px] md:py-4 rounded-lg resize-none dark:bg-neutral-700
                                 ${props.isMobileWidth ? "text-md" : "text-lg"}`}
                             placeholder="Type / to see a list of commands"
diff --git a/src/interface/web/tailwind.config.ts b/src/interface/web/tailwind.config.ts
index cea53e8ed..32e66d3b3 100644
--- a/src/interface/web/tailwind.config.ts
+++ b/src/interface/web/tailwind.config.ts
@@ -32,6 +32,11 @@ const config = {
                 /ring-(blue|yellow|green|pink|purple|orange|red|slate|gray|zinc|neutral|stone|amber|lime|green|emerald|teal|cyan|sky|blue|indigo|violet|fuchsia|rose)-(50|100|200|400|500|950)/,
             variants: ["focus-visible", "dark"],
         },
+        {
+            pattern:
+                /caret-(blue|yellow|green|pink|purple|orange|red|slate|gray|zinc|neutral|stone|amber|lime|green|emerald|teal|cyan|sky|blue|indigo|violet|fuchsia|rose)-(50|100|200|400|500|950)/,
+            variants: ["focus", "dark"],
+        },
     ],
     darkMode: ["class"],
     content: [

From 358a6ce95d2cd657ee542a1ecc2c3729d46e6412 Mon Sep 17 00:00:00 2001
From: Debanjum <debanjum@gmail.com>
Date: Mon, 28 Oct 2024 20:49:01 -0700
Subject: [PATCH 02/33] Defer turning cursor color to selected agents color for
 later

Capability exists but idea needs to be investigated further
---
 .../web/app/components/chatInputArea/chatInputArea.tsx | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/interface/web/app/components/chatInputArea/chatInputArea.tsx b/src/interface/web/app/components/chatInputArea/chatInputArea.tsx
index 7d3490814..b60228df4 100644
--- a/src/interface/web/app/components/chatInputArea/chatInputArea.tsx
+++ b/src/interface/web/app/components/chatInputArea/chatInputArea.tsx
@@ -37,11 +37,7 @@ import { Popover, PopoverContent } from "@/components/ui/popover";
 import { PopoverTrigger } from "@radix-ui/react-popover";
 import { Textarea } from "@/components/ui/textarea";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
-import {
-    convertColorToCaretClass,
-    convertColorToTextClass,
-    convertToBGClass,
-} from "@/app/common/colorUtils";
+import { convertColorToTextClass, convertToBGClass } from "@/app/common/colorUtils";
 
 import LoginPrompt from "../loginPrompt/loginPrompt";
 import { uploadDataForIndexing } from "../../common/chatFunctions";
@@ -498,8 +494,8 @@ export const ChatInputArea = forwardRef<HTMLTextAreaElement, ChatInputProps>((pr
                         </div>
                         <Textarea
                             ref={chatInputRef}
-                            className={`border-none focus:border-none focus:outline-none focus-visible:ring-transparent
-                                animate-carate-blink ${convertColorToCaretClass(props.agentColor)}
+                            className={`border-none focus:border-none
+                                focus:outline-none focus-visible:ring-transparent
                                 w-full h-16 min-h-16 max-h-[128px] md:py-4 rounded-lg resize-none dark:bg-neutral-700
                                 ${props.isMobileWidth ? "text-md" : "text-lg"}`}
                             placeholder="Type / to see a list of commands"

From d44e68ba01346c90f518bce2996c1903f18ecabd Mon Sep 17 00:00:00 2001
From: Debanjum <debanjum@gmail.com>
Date: Tue, 29 Oct 2024 13:15:47 -0700
Subject: [PATCH 03/33] Improve handling embedding model config from admin
 interface

- Allow server to start if loading embedding model fails with an error.
  This allows fixing the embedding model config via admin panel.

  Previously server failed to start if embedding model was configured
  incorrectly. This prevented fixing the model config via admin panel.

- Convert boolean string in config json to actual booleans when passed
  via admin panel as json before passing to model, query configs

- Only create default model if no search model configured by admin.
  Return first created search model if its been configured by admin.
---
 src/khoj/configure.py                  | 2 +-
 src/khoj/database/adapters/__init__.py | 5 +++--
 src/khoj/processor/embeddings.py       | 8 ++++----
 src/khoj/utils/helpers.py              | 9 +++++++++
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/khoj/configure.py b/src/khoj/configure.py
index 1454b1645..df0760fbb 100644
--- a/src/khoj/configure.py
+++ b/src/khoj/configure.py
@@ -262,7 +262,7 @@ def configure_server(
             initialize_content(regenerate, search_type, user)
 
     except Exception as e:
-        raise e
+        logger.error(f"Failed to load some search models: {e}", exc_info=True)
 
 
 def setup_default_agent(user: KhojUser):
diff --git a/src/khoj/database/adapters/__init__.py b/src/khoj/database/adapters/__init__.py
index 5db857eeb..f102648b4 100644
--- a/src/khoj/database/adapters/__init__.py
+++ b/src/khoj/database/adapters/__init__.py
@@ -476,10 +476,11 @@ def get_default_search_model() -> SearchModelConfig:
 
     if default_search_model:
         return default_search_model
+    elif SearchModelConfig.objects.count() > 0:
+        return SearchModelConfig.objects.first()
     else:
         SearchModelConfig.objects.create()
-
-    return SearchModelConfig.objects.first()
+        return SearchModelConfig.objects.filter(name="default").first()
 
 
 def get_user_default_search_model(user: KhojUser = None) -> SearchModelConfig:
diff --git a/src/khoj/processor/embeddings.py b/src/khoj/processor/embeddings.py
index a19d85fad..b224e7f51 100644
--- a/src/khoj/processor/embeddings.py
+++ b/src/khoj/processor/embeddings.py
@@ -13,7 +13,7 @@
 )
 from torch import nn
 
-from khoj.utils.helpers import get_device, merge_dicts, timer
+from khoj.utils.helpers import fix_json_dict, get_device, merge_dicts, timer
 from khoj.utils.rawconfig import SearchResponse
 
 logger = logging.getLogger(__name__)
@@ -31,9 +31,9 @@ def __init__(
     ):
         default_query_encode_kwargs = {"show_progress_bar": False, "normalize_embeddings": True}
         default_docs_encode_kwargs = {"show_progress_bar": True, "normalize_embeddings": True}
-        self.query_encode_kwargs = merge_dicts(query_encode_kwargs, default_query_encode_kwargs)
-        self.docs_encode_kwargs = merge_dicts(docs_encode_kwargs, default_docs_encode_kwargs)
-        self.model_kwargs = merge_dicts(model_kwargs, {"device": get_device()})
+        self.query_encode_kwargs = merge_dicts(fix_json_dict(query_encode_kwargs), default_query_encode_kwargs)
+        self.docs_encode_kwargs = merge_dicts(fix_json_dict(docs_encode_kwargs), default_docs_encode_kwargs)
+        self.model_kwargs = merge_dicts(fix_json_dict(model_kwargs), {"device": get_device()})
         self.model_name = model_name
         self.inference_endpoint = embeddings_inference_endpoint
         self.api_key = embeddings_inference_endpoint_api_key
diff --git a/src/khoj/utils/helpers.py b/src/khoj/utils/helpers.py
index 664bbde9f..6bfb3594e 100644
--- a/src/khoj/utils/helpers.py
+++ b/src/khoj/utils/helpers.py
@@ -101,6 +101,15 @@ def merge_dicts(priority_dict: dict, default_dict: dict):
     return merged_dict
 
 
+def fix_json_dict(json_dict: dict) -> dict:
+    for k, v in json_dict.items():
+        if v == "True" or v == "False":
+            json_dict[k] = v == "True"
+        if isinstance(v, dict):
+            json_dict[k] = fix_json_dict(v)
+    return json_dict
+
+
 def get_file_type(file_type: str, file_content: bytes) -> tuple[str, str]:
     "Get file type from file mime type"
 

From b3a63017b53b0f8c1577714d96834a12fafa4151 Mon Sep 17 00:00:00 2001
From: Debanjum <debanjum@gmail.com>
Date: Wed, 30 Oct 2024 02:20:38 -0700
Subject: [PATCH 04/33] Support setting seed for reproducible LLM response
 generation

Anthropic models do not support seed. But offline, gemini and openai
models do. Use these to debug and test Khoj via KHOJ_LLM_SEED env var
---
 pyproject.toml                                        | 2 +-
 src/khoj/processor/conversation/google/utils.py       | 1 +
 src/khoj/processor/conversation/offline/chat_model.py | 9 ++++++++-
 src/khoj/processor/conversation/openai/utils.py       | 7 +++++++
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 12c7789c5..ed57f55ad 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -87,7 +87,7 @@ dependencies = [
     "django_apscheduler == 0.6.2",
     "anthropic == 0.26.1",
     "docx2txt == 0.8",
-    "google-generativeai == 0.7.2"
+    "google-generativeai == 0.8.3"
 ]
 dynamic = ["version"]
 
diff --git a/src/khoj/processor/conversation/google/utils.py b/src/khoj/processor/conversation/google/utils.py
index 7b8483244..ccde33d15 100644
--- a/src/khoj/processor/conversation/google/utils.py
+++ b/src/khoj/processor/conversation/google/utils.py
@@ -1,4 +1,5 @@
 import logging
+import os
 import random
 from threading import Thread
 
diff --git a/src/khoj/processor/conversation/offline/chat_model.py b/src/khoj/processor/conversation/offline/chat_model.py
index fbde7a98f..cbfea6fd4 100644
--- a/src/khoj/processor/conversation/offline/chat_model.py
+++ b/src/khoj/processor/conversation/offline/chat_model.py
@@ -1,5 +1,6 @@
 import json
 import logging
+import os
 from datetime import datetime, timedelta
 from threading import Thread
 from typing import Any, Iterator, List, Optional, Union
@@ -265,8 +266,14 @@ def send_message_to_model_offline(
     assert loaded_model is None or isinstance(loaded_model, Llama), "loaded_model must be of type Llama, if configured"
     offline_chat_model = loaded_model or download_model(model, max_tokens=max_prompt_size)
     messages_dict = [{"role": message.role, "content": message.content} for message in messages]
+    seed = int(os.getenv("KHOJ_LLM_SEED")) if os.getenv("KHOJ_LLM_SEED") else None
     response = offline_chat_model.create_chat_completion(
-        messages_dict, stop=stop, stream=streaming, temperature=temperature, response_format={"type": response_type}
+        messages_dict,
+        stop=stop,
+        stream=streaming,
+        temperature=temperature,
+        response_format={"type": response_type},
+        seed=seed,
     )
 
     if streaming:
diff --git a/src/khoj/processor/conversation/openai/utils.py b/src/khoj/processor/conversation/openai/utils.py
index 6e519f5ad..36ebc679d 100644
--- a/src/khoj/processor/conversation/openai/utils.py
+++ b/src/khoj/processor/conversation/openai/utils.py
@@ -1,4 +1,5 @@
 import logging
+import os
 from threading import Thread
 from typing import Dict
 
@@ -60,6 +61,9 @@ def completion_with_backoff(
         model_kwargs.pop("stop", None)
         model_kwargs.pop("response_format", None)
 
+    if os.getenv("KHOJ_LLM_SEED"):
+        model_kwargs["seed"] = int(os.getenv("KHOJ_LLM_SEED"))
+
     chat = client.chat.completions.create(
         stream=stream,
         messages=formatted_messages,  # type: ignore
@@ -157,6 +161,9 @@ def llm_thread(
             model_kwargs.pop("stop", None)
             model_kwargs.pop("response_format", None)
 
+        if os.getenv("KHOJ_LLM_SEED"):
+            model_kwargs["seed"] = int(os.getenv("KHOJ_LLM_SEED"))
+
         chat = client.chat.completions.create(
             stream=stream,
             messages=formatted_messages,

From f64f5b3b6e7256d1bb1951accce73ca4c89015cb Mon Sep 17 00:00:00 2001
From: Debanjum <debanjum@gmail.com>
Date: Wed, 30 Oct 2024 02:23:34 -0700
Subject: [PATCH 05/33] Handle add/delete file filter operation on non-existent
 conversation

---
 src/khoj/database/adapters/__init__.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/khoj/database/adapters/__init__.py b/src/khoj/database/adapters/__init__.py
index f102648b4..3bbb1e310 100644
--- a/src/khoj/database/adapters/__init__.py
+++ b/src/khoj/database/adapters/__init__.py
@@ -1320,6 +1320,8 @@ async def aset_user_text_to_image_model(user: KhojUser, text_to_image_model_conf
     def add_files_to_filter(user: KhojUser, conversation_id: str, files: List[str]):
         conversation = ConversationAdapters.get_conversation_by_user(user, conversation_id=conversation_id)
         file_list = EntryAdapters.get_all_filenames_by_source(user, "computer")
+        if not conversation:
+            return []
         for filename in files:
             if filename in file_list and filename not in conversation.file_filters:
                 conversation.file_filters.append(filename)
@@ -1333,6 +1335,8 @@ def add_files_to_filter(user: KhojUser, conversation_id: str, files: List[str]):
     @staticmethod
     def remove_files_from_filter(user: KhojUser, conversation_id: str, files: List[str]):
         conversation = ConversationAdapters.get_conversation_by_user(user, conversation_id=conversation_id)
+        if not conversation:
+            return []
         for filename in files:
             if filename in conversation.file_filters:
                 conversation.file_filters.remove(filename)

From ba15686682cb2533f79be3dc171ba2996423c6d7 Mon Sep 17 00:00:00 2001
From: Debanjum <debanjum@gmail.com>
Date: Wed, 30 Oct 2024 04:21:58 -0700
Subject: [PATCH 06/33] Store turn id with each chat message. Expose API to
 delete chat turn

Each chat turn is a user query, khoj response message pair
---
 src/khoj/database/adapters/__init__.py   | 11 +++++++++++
 src/khoj/processor/conversation/utils.py |  4 ++++
 src/khoj/routers/api_chat.py             | 14 ++++++++++++++
 src/khoj/routers/helpers.py              |  5 +++++
 4 files changed, 34 insertions(+)

diff --git a/src/khoj/database/adapters/__init__.py b/src/khoj/database/adapters/__init__.py
index 3bbb1e310..bfabc17ad 100644
--- a/src/khoj/database/adapters/__init__.py
+++ b/src/khoj/database/adapters/__init__.py
@@ -1348,6 +1348,17 @@ def remove_files_from_filter(user: KhojUser, conversation_id: str, files: List[s
         conversation.save()
         return conversation.file_filters
 
+    @staticmethod
+    def delete_message_by_turn_id(user: KhojUser, conversation_id: str, turn_id: str):
+        conversation = ConversationAdapters.get_conversation_by_user(user, conversation_id=conversation_id)
+        if not conversation:
+            return False
+        conversation_log = conversation.conversation_log
+        updated_log = [msg for msg in conversation_log if msg.get("turnId") != turn_id]
+        conversation.conversation_log = updated_log
+        conversation.save()
+        return True
+
 
 class FileObjectAdapters:
     @staticmethod
diff --git a/src/khoj/processor/conversation/utils.py b/src/khoj/processor/conversation/utils.py
index b4db71d93..dd4208817 100644
--- a/src/khoj/processor/conversation/utils.py
+++ b/src/khoj/processor/conversation/utils.py
@@ -4,6 +4,7 @@
 import mimetypes
 import os
 import queue
+import uuid
 from dataclasses import dataclass
 from datetime import datetime
 from enum import Enum
@@ -232,12 +233,14 @@ def save_to_conversation_log(
     train_of_thought: List[Any] = [],
 ):
     user_message_time = user_message_time or datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+    turn_id = tracer.get("mid") or str(uuid.uuid4())
     updated_conversation = message_to_log(
         user_message=q,
         chat_response=chat_response,
         user_message_metadata={
             "created": user_message_time,
             "images": query_images,
+            "turnId": turn_id,
         },
         khoj_message_metadata={
             "context": compiled_references,
@@ -246,6 +249,7 @@ def save_to_conversation_log(
             "codeContext": code_results,
             "automationId": automation_id,
             "trainOfThought": train_of_thought,
+            "turnId": turn_id,
         },
         conversation_log=meta_log.get("chat", []),
         train_of_thought=train_of_thought,
diff --git a/src/khoj/routers/api_chat.py b/src/khoj/routers/api_chat.py
index e9d60a1b6..92c024e92 100644
--- a/src/khoj/routers/api_chat.py
+++ b/src/khoj/routers/api_chat.py
@@ -38,6 +38,7 @@
     ChatRequestBody,
     CommonQueryParams,
     ConversationCommandRateLimiter,
+    DeleteMessageRequestBody,
     agenerate_chat_response,
     aget_relevant_information_sources,
     aget_relevant_output_modes,
@@ -534,6 +535,19 @@ async def set_conversation_title(
     )
 
 
+@api_chat.delete("/conversation/message", response_class=Response)
+@requires(["authenticated"])
+def delete_message(request: Request, delete_request: DeleteMessageRequestBody) -> Response:
+    user = request.user.object
+    success = ConversationAdapters.delete_message_by_turn_id(
+        user, delete_request.conversation_id, delete_request.turn_id
+    )
+    if success:
+        return Response(content=json.dumps({"status": "ok"}), media_type="application/json", status_code=200)
+    else:
+        return Response(content=json.dumps({"status": "error", "message": "Message not found"}), status_code=404)
+
+
 @api_chat.post("")
 @requires(["authenticated"])
 async def chat(
diff --git a/src/khoj/routers/helpers.py b/src/khoj/routers/helpers.py
index 1cb322b0c..6aa25c5e9 100644
--- a/src/khoj/routers/helpers.py
+++ b/src/khoj/routers/helpers.py
@@ -1264,6 +1264,11 @@ class ChatRequestBody(BaseModel):
     create_new: Optional[bool] = False
 
 
+class DeleteMessageRequestBody(BaseModel):
+    conversation_id: str
+    turn_id: str
+
+
 class ApiUserRateLimiter:
     def __init__(self, requests: int, subscribed_requests: int, window: int, slug: str):
         self.requests = requests

From ca5a6831b69b06492fa0d8c52e74c8d661215fd4 Mon Sep 17 00:00:00 2001
From: Debanjum <debanjum@gmail.com>
Date: Wed, 30 Oct 2024 04:24:22 -0700
Subject: [PATCH 07/33] Add ability to delete messages from the web app

---
 .../components/chatHistory/chatHistory.tsx    | 26 +++++++++++++
 .../components/chatMessage/chatMessage.tsx    | 37 +++++++++++++++++++
 src/interface/web/app/factchecker/page.tsx    | 10 +++++
 src/khoj/database/adapters/__init__.py        |  6 +--
 4 files changed, 76 insertions(+), 3 deletions(-)

diff --git a/src/interface/web/app/components/chatHistory/chatHistory.tsx b/src/interface/web/app/components/chatHistory/chatHistory.tsx
index 9e1561425..5075f3825 100644
--- a/src/interface/web/app/components/chatHistory/chatHistory.tsx
+++ b/src/interface/web/app/components/chatHistory/chatHistory.tsx
@@ -278,6 +278,16 @@ export default function ChatHistory(props: ChatHistoryProps) {
         return data.agent?.persona;
     }
 
+    const handleDeleteMessage = (turnId?: string) => {
+        setData((prevData) => {
+            if (!prevData || !turnId) return prevData;
+            return {
+                ...prevData,
+                chat: prevData.chat.filter((msg) => msg.turnId !== turnId),
+            };
+        });
+    };
+
     if (!props.conversationId && !props.publicConversationSlug) {
         return null;
     }
@@ -312,6 +322,8 @@ export default function ChatHistory(props: ChatHistoryProps) {
                                     customClassName="fullHistory"
                                     borderLeftColor={`${data?.agent?.color}-500`}
                                     isLastMessage={index === data.chat.length - 1}
+                                    onDeleteMessage={handleDeleteMessage}
+                                    conversationId={props.conversationId}
                                 />
                                 {chatMessage.trainOfThought && chatMessage.by === "khoj" && (
                                     <TrainOfThoughtComponent
@@ -342,9 +354,14 @@ export default function ChatHistory(props: ChatHistoryProps) {
                                             by: "you",
                                             automationId: "",
                                             images: message.images,
+                                            conversationId: props.conversationId,
+                                            turnId: message.turnId,
+                                            onDeleteMessage: handleDeleteMessage,
                                         }}
                                         customClassName="fullHistory"
                                         borderLeftColor={`${data?.agent?.color}-500`}
+                                        onDeleteMessage={handleDeleteMessage}
+                                        conversationId={props.conversationId}
                                     />
                                     {message.trainOfThought && (
                                         <TrainOfThoughtComponent
@@ -373,7 +390,12 @@ export default function ChatHistory(props: ChatHistoryProps) {
                                                 "memory-type": "",
                                                 "inferred-queries": message.inferredQueries || [],
                                             },
+                                            conversationId: props.conversationId,
+                                            turnId: message.turnId,
+                                            onDeleteMessage: handleDeleteMessage,
                                         }}
+                                        conversationId={props.conversationId}
+                                        onDeleteMessage={handleDeleteMessage}
                                         customClassName="fullHistory"
                                         borderLeftColor={`${data?.agent?.color}-500`}
                                         isLastMessage={true}
@@ -393,7 +415,11 @@ export default function ChatHistory(props: ChatHistoryProps) {
                                 created: new Date().getTime().toString(),
                                 by: "you",
                                 automationId: "",
+                                conversationId: props.conversationId,
+                                onDeleteMessage: handleDeleteMessage,
                             }}
+                            conversationId={props.conversationId}
+                            onDeleteMessage={handleDeleteMessage}
                             customClassName="fullHistory"
                             borderLeftColor={`${data?.agent?.color}-500`}
                             isLastMessage={true}
diff --git a/src/interface/web/app/components/chatMessage/chatMessage.tsx b/src/interface/web/app/components/chatMessage/chatMessage.tsx
index 6d82fe1d9..8f94db25e 100644
--- a/src/interface/web/app/components/chatMessage/chatMessage.tsx
+++ b/src/interface/web/app/components/chatMessage/chatMessage.tsx
@@ -29,6 +29,7 @@ import {
     Check,
     Code,
     Shapes,
+    Trash,
 } from "@phosphor-icons/react";
 
 import DOMPurify from "dompurify";
@@ -146,6 +147,9 @@ export interface SingleChatMessage {
     intent?: Intent;
     agent?: AgentData;
     images?: string[];
+    conversationId: string;
+    turnId?: string;
+    onDeleteMessage: (turnId: string) => void;
 }
 
 export interface StreamMessage {
@@ -161,6 +165,7 @@ export interface StreamMessage {
     images?: string[];
     intentType?: string;
     inferredQueries?: string[];
+    turnId?: string;
 }
 
 export interface ChatHistoryData {
@@ -242,6 +247,8 @@ interface ChatMessageProps {
     borderLeftColor?: string;
     isLastMessage?: boolean;
     agent?: AgentData;
+    onDeleteMessage: (turnId?: string) => void;
+    conversationId: string;
 }
 
 interface TrainOfThoughtProps {
@@ -654,6 +661,26 @@ const ChatMessage = forwardRef<HTMLDivElement, ChatMessageProps>((props, ref) =>
         });
     }
 
+    const deleteMessage = async (message: SingleChatMessage) => {
+        const response = await fetch("/api/chat/conversation/message", {
+            method: "DELETE",
+            headers: {
+                "Content-Type": "application/json",
+            },
+            body: JSON.stringify({
+                conversation_id: props.conversationId,
+                turn_id: message.turnId,
+            }),
+        });
+
+        if (response.ok) {
+            // Update the UI after successful deletion
+            props.onDeleteMessage(message.turnId);
+        } else {
+            console.error("Failed to delete message");
+        }
+    };
+
     const allReferences = constructAllReferences(
         props.chatMessage.context,
         props.chatMessage.onlineContext,
@@ -737,6 +764,16 @@ const ChatMessage = forwardRef<HTMLDivElement, ChatMessageProps>((props, ref) =>
                                     />
                                 )}
                             </button>
+                            <button
+                                title="Delete"
+                                className={`${styles.deleteButton}`}
+                                onClick={() => deleteMessage(props.chatMessage)}
+                            >
+                                <Trash
+                                    alt="Delete Message"
+                                    className="hsl(var(--muted-foreground)) hover:text-red-500"
+                                />
+                            </button>
                             {props.chatMessage.by === "khoj" &&
                                 (props.chatMessage.intent ? (
                                     <FeedbackButtons
diff --git a/src/interface/web/app/factchecker/page.tsx b/src/interface/web/app/factchecker/page.tsx
index 8f5538f65..3caed53f1 100644
--- a/src/interface/web/app/factchecker/page.tsx
+++ b/src/interface/web/app/factchecker/page.tsx
@@ -195,8 +195,13 @@ function ReferenceVerification(props: ReferenceVerificationProps) {
                     created: new Date().toISOString(),
                     onlineContext: {},
                     codeContext: {},
+                    conversationId: props.conversationId,
+                    turnId: "",
+                    onDeleteMessage: (turnId?: string) => {},
                 }}
                 isMobileWidth={isMobileWidth}
+                onDeleteMessage={(turnId?: string) => {}}
+                conversationId={props.conversationId}
             />
         </div>
     );
@@ -626,7 +631,12 @@ export default function FactChecker() {
                                         created: new Date().toISOString(),
                                         onlineContext: {},
                                         codeContext: {},
+                                        conversationId: conversationID,
+                                        turnId: "",
+                                        onDeleteMessage: (turnId?: string) => {},
                                     }}
+                                    conversationId={conversationID}
+                                    onDeleteMessage={(turnId?: string) => {}}
                                     isMobileWidth={isMobileWidth}
                                 />
                             </div>
diff --git a/src/khoj/database/adapters/__init__.py b/src/khoj/database/adapters/__init__.py
index bfabc17ad..d8d8e644b 100644
--- a/src/khoj/database/adapters/__init__.py
+++ b/src/khoj/database/adapters/__init__.py
@@ -1351,11 +1351,11 @@ def remove_files_from_filter(user: KhojUser, conversation_id: str, files: List[s
     @staticmethod
     def delete_message_by_turn_id(user: KhojUser, conversation_id: str, turn_id: str):
         conversation = ConversationAdapters.get_conversation_by_user(user, conversation_id=conversation_id)
-        if not conversation:
+        if not conversation or not conversation.conversation_log or not conversation.conversation_log.get("chat"):
             return False
         conversation_log = conversation.conversation_log
-        updated_log = [msg for msg in conversation_log if msg.get("turnId") != turn_id]
-        conversation.conversation_log = updated_log
+        updated_log = [msg for msg in conversation_log["chat"] if msg.get("turnId") != turn_id]
+        conversation.conversation_log["chat"] = updated_log
         conversation.save()
         return True
 

From cb90abc660111fb4daaa6b7d829df2153755907d Mon Sep 17 00:00:00 2001
From: Debanjum <debanjum@gmail.com>
Date: Wed, 30 Oct 2024 05:03:36 -0700
Subject: [PATCH 08/33] Resolve train of thought component needs unique key id
 error on web app

---
 .../web/app/components/chatHistory/chatHistory.tsx          | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/interface/web/app/components/chatHistory/chatHistory.tsx b/src/interface/web/app/components/chatHistory/chatHistory.tsx
index 5075f3825..2abe9632c 100644
--- a/src/interface/web/app/components/chatHistory/chatHistory.tsx
+++ b/src/interface/web/app/components/chatHistory/chatHistory.tsx
@@ -45,7 +45,7 @@ interface TrainOfThoughtComponentProps {
     trainOfThought: string[];
     lastMessage: boolean;
     agentColor: string;
-    key: string;
+    keyId: string;
     completed?: boolean;
 }
 
@@ -56,7 +56,7 @@ function TrainOfThoughtComponent(props: TrainOfThoughtComponentProps) {
     return (
         <div
             className={`${!collapsed ? styles.trainOfThought + " shadow-sm" : ""}`}
-            key={props.key}
+            key={props.keyId}
         >
             {!props.completed && <InlineLoading className="float-right" />}
             {props.completed &&
@@ -333,6 +333,7 @@ export default function ChatHistory(props: ChatHistoryProps) {
                                         lastMessage={false}
                                         agentColor={data?.agent?.color || "orange"}
                                         key={`${index}trainOfThought`}
+                                        keyId={`${index}trainOfThought`}
                                         completed={true}
                                     />
                                 )}
@@ -369,6 +370,7 @@ export default function ChatHistory(props: ChatHistoryProps) {
                                             lastMessage={index === incompleteIncomingMessageIndex}
                                             agentColor={data?.agent?.color || "orange"}
                                             key={`${index}trainOfThought`}
+                                            keyId={`${index}trainOfThought`}
                                             completed={message.completed}
                                         />
                                     )}

From e8e6ead39f3fe165f020f1c3bba7af1556246b33 Mon Sep 17 00:00:00 2001
From: Debanjum <debanjum@gmail.com>
Date: Wed, 30 Oct 2024 18:10:43 -0700
Subject: [PATCH 09/33] Fix deleting new messages generated after conversation
 load

---
 src/interface/web/app/chat/page.tsx           |  3 ++
 src/interface/web/app/common/chatFunctions.ts |  8 ++++++
 .../components/chatHistory/chatHistory.tsx    | 28 +++++++++++++++----
 .../components/chatMessage/chatMessage.tsx    | 27 +++++++++---------
 src/interface/web/app/factchecker/page.tsx    |  2 --
 src/khoj/processor/conversation/utils.py      |  1 +
 src/khoj/routers/api_chat.py                  | 19 +++++++------
 src/khoj/routers/helpers.py                   |  1 +
 8 files changed, 60 insertions(+), 29 deletions(-)

diff --git a/src/interface/web/app/chat/page.tsx b/src/interface/web/app/chat/page.tsx
index deb261058..c3d5ff37b 100644
--- a/src/interface/web/app/chat/page.tsx
+++ b/src/interface/web/app/chat/page.tsx
@@ -29,6 +29,7 @@ interface ChatBodyDataProps {
     onConversationIdChange?: (conversationId: string) => void;
     setQueryToProcess: (query: string) => void;
     streamedMessages: StreamMessage[];
+    setStreamedMessages: (messages: StreamMessage[]) => void;
     setUploadedFiles: (files: string[]) => void;
     isMobileWidth?: boolean;
     isLoggedIn: boolean;
@@ -118,6 +119,7 @@ function ChatBodyData(props: ChatBodyDataProps) {
                     setAgent={setAgentMetadata}
                     pendingMessage={processingMessage ? message : ""}
                     incomingMessages={props.streamedMessages}
+                    setIncomingMessages={props.setStreamedMessages}
                     customClassName={chatHistoryCustomClassName}
                 />
             </div>
@@ -351,6 +353,7 @@ export default function Chat() {
                         <ChatBodyData
                             isLoggedIn={authenticatedData !== null}
                             streamedMessages={messages}
+                            setStreamedMessages={setMessages}
                             chatOptionsData={chatOptionsData}
                             setTitle={setTitle}
                             setQueryToProcess={setQueryToProcess}
diff --git a/src/interface/web/app/common/chatFunctions.ts b/src/interface/web/app/common/chatFunctions.ts
index 8c016c1af..a42dde405 100644
--- a/src/interface/web/app/common/chatFunctions.ts
+++ b/src/interface/web/app/common/chatFunctions.ts
@@ -11,6 +11,11 @@ export interface RawReferenceData {
     codeContext?: CodeContext;
 }
 
+export interface MessageMetadata {
+    conversationId: string;
+    turnId: string;
+}
+
 export interface ResponseWithIntent {
     intentType: string;
     response: string;
@@ -90,6 +95,9 @@ export function processMessageChunk(
         if (references.onlineContext) onlineContext = references.onlineContext;
         if (references.codeContext) codeContext = references.codeContext;
         return { context, onlineContext, codeContext };
+    } else if (chunk.type === "metadata") {
+        const messageMetadata = chunk.data as MessageMetadata;
+        currentMessage.turnId = messageMetadata.turnId;
     } else if (chunk.type === "message") {
         const chunkData = chunk.data;
         // Here, handle if the response is a JSON response with an image, but the intentType is excalidraw
diff --git a/src/interface/web/app/components/chatHistory/chatHistory.tsx b/src/interface/web/app/components/chatHistory/chatHistory.tsx
index 2abe9632c..dac579174 100644
--- a/src/interface/web/app/components/chatHistory/chatHistory.tsx
+++ b/src/interface/web/app/components/chatHistory/chatHistory.tsx
@@ -34,8 +34,9 @@ interface ChatHistory {
 interface ChatHistoryProps {
     conversationId: string;
     setTitle: (title: string) => void;
-    incomingMessages?: StreamMessage[];
     pendingMessage?: string;
+    incomingMessages?: StreamMessage[];
+    setIncomingMessages?: (incomingMessages: StreamMessage[]) => void;
     publicConversationSlug?: string;
     setAgent: (agent: AgentData) => void;
     customClassName?: string;
@@ -97,6 +98,7 @@ export default function ChatHistory(props: ChatHistoryProps) {
     const [data, setData] = useState<ChatHistoryData | null>(null);
     const [currentPage, setCurrentPage] = useState(0);
     const [hasMoreMessages, setHasMoreMessages] = useState(true);
+    const [currentTurnId, setCurrentTurnId] = useState<string | null>(null);
     const sentinelRef = useRef<HTMLDivElement | null>(null);
     const scrollAreaRef = useRef<HTMLDivElement | null>(null);
     const latestUserMessageRef = useRef<HTMLDivElement | null>(null);
@@ -177,6 +179,10 @@ export default function ChatHistory(props: ChatHistoryProps) {
             if (lastMessage && !lastMessage.completed) {
                 setIncompleteIncomingMessageIndex(props.incomingMessages.length - 1);
                 props.setTitle(lastMessage.rawQuery);
+                // Store the turnId when we get it
+                if (lastMessage.turnId) {
+                    setCurrentTurnId(lastMessage.turnId);
+                }
             }
         }
     }, [props.incomingMessages]);
@@ -279,6 +285,8 @@ export default function ChatHistory(props: ChatHistoryProps) {
     }
 
     const handleDeleteMessage = (turnId?: string) => {
+        if (!turnId) return;
+
         setData((prevData) => {
             if (!prevData || !turnId) return prevData;
             return {
@@ -286,6 +294,13 @@ export default function ChatHistory(props: ChatHistoryProps) {
                 chat: prevData.chat.filter((msg) => msg.turnId !== turnId),
             };
         });
+
+        // Update incoming messages if they exist
+        if (props.incomingMessages && props.setIncomingMessages) {
+            props.setIncomingMessages(
+                props.incomingMessages.filter((msg) => msg.turnId !== turnId),
+            );
+        }
     };
 
     if (!props.conversationId && !props.publicConversationSlug) {
@@ -341,6 +356,7 @@ export default function ChatHistory(props: ChatHistoryProps) {
                         ))}
                     {props.incomingMessages &&
                         props.incomingMessages.map((message, index) => {
+                            const messageTurnId = message.turnId ?? currentTurnId ?? undefined;
                             return (
                                 <React.Fragment key={`incomingMessage${index}`}>
                                     <ChatMessage
@@ -356,13 +372,13 @@ export default function ChatHistory(props: ChatHistoryProps) {
                                             automationId: "",
                                             images: message.images,
                                             conversationId: props.conversationId,
-                                            turnId: message.turnId,
-                                            onDeleteMessage: handleDeleteMessage,
+                                            turnId: messageTurnId,
                                         }}
                                         customClassName="fullHistory"
                                         borderLeftColor={`${data?.agent?.color}-500`}
                                         onDeleteMessage={handleDeleteMessage}
                                         conversationId={props.conversationId}
+                                        turnId={messageTurnId}
                                     />
                                     {message.trainOfThought && (
                                         <TrainOfThoughtComponent
@@ -393,10 +409,10 @@ export default function ChatHistory(props: ChatHistoryProps) {
                                                 "inferred-queries": message.inferredQueries || [],
                                             },
                                             conversationId: props.conversationId,
-                                            turnId: message.turnId,
-                                            onDeleteMessage: handleDeleteMessage,
+                                            turnId: messageTurnId,
                                         }}
                                         conversationId={props.conversationId}
+                                        turnId={messageTurnId}
                                         onDeleteMessage={handleDeleteMessage}
                                         customClassName="fullHistory"
                                         borderLeftColor={`${data?.agent?.color}-500`}
@@ -418,7 +434,7 @@ export default function ChatHistory(props: ChatHistoryProps) {
                                 by: "you",
                                 automationId: "",
                                 conversationId: props.conversationId,
-                                onDeleteMessage: handleDeleteMessage,
+                                turnId: undefined,
                             }}
                             conversationId={props.conversationId}
                             onDeleteMessage={handleDeleteMessage}
diff --git a/src/interface/web/app/components/chatMessage/chatMessage.tsx b/src/interface/web/app/components/chatMessage/chatMessage.tsx
index 8f94db25e..222ccaea1 100644
--- a/src/interface/web/app/components/chatMessage/chatMessage.tsx
+++ b/src/interface/web/app/components/chatMessage/chatMessage.tsx
@@ -149,7 +149,6 @@ export interface SingleChatMessage {
     images?: string[];
     conversationId: string;
     turnId?: string;
-    onDeleteMessage: (turnId: string) => void;
 }
 
 export interface StreamMessage {
@@ -249,6 +248,7 @@ interface ChatMessageProps {
     agent?: AgentData;
     onDeleteMessage: (turnId?: string) => void;
     conversationId: string;
+    turnId?: string;
 }
 
 interface TrainOfThoughtProps {
@@ -662,6 +662,7 @@ const ChatMessage = forwardRef<HTMLDivElement, ChatMessageProps>((props, ref) =>
     }
 
     const deleteMessage = async (message: SingleChatMessage) => {
+        const turnId = message.turnId || props.turnId;
         const response = await fetch("/api/chat/conversation/message", {
             method: "DELETE",
             headers: {
@@ -669,13 +670,13 @@ const ChatMessage = forwardRef<HTMLDivElement, ChatMessageProps>((props, ref) =>
             },
             body: JSON.stringify({
                 conversation_id: props.conversationId,
-                turn_id: message.turnId,
+                turn_id: turnId,
             }),
         });
 
         if (response.ok) {
             // Update the UI after successful deletion
-            props.onDeleteMessage(message.turnId);
+            props.onDeleteMessage(turnId);
         } else {
             console.error("Failed to delete message");
         }
@@ -743,6 +744,16 @@ const ChatMessage = forwardRef<HTMLDivElement, ChatMessageProps>((props, ref) =>
                                         />
                                     </button>
                                 ))}
+                            <button
+                                title="Delete"
+                                className={`${styles.deleteButton}`}
+                                onClick={() => deleteMessage(props.chatMessage)}
+                            >
+                                <Trash
+                                    alt="Delete Message"
+                                    className="hsl(var(--muted-foreground)) hover:text-red-500"
+                                />
+                            </button>
                             <button
                                 title="Copy"
                                 className={`${styles.copyButton}`}
@@ -764,16 +775,6 @@ const ChatMessage = forwardRef<HTMLDivElement, ChatMessageProps>((props, ref) =>
                                     />
                                 )}
                             </button>
-                            <button
-                                title="Delete"
-                                className={`${styles.deleteButton}`}
-                                onClick={() => deleteMessage(props.chatMessage)}
-                            >
-                                <Trash
-                                    alt="Delete Message"
-                                    className="hsl(var(--muted-foreground)) hover:text-red-500"
-                                />
-                            </button>
                             {props.chatMessage.by === "khoj" &&
                                 (props.chatMessage.intent ? (
                                     <FeedbackButtons
diff --git a/src/interface/web/app/factchecker/page.tsx b/src/interface/web/app/factchecker/page.tsx
index 3caed53f1..fc79f3c8d 100644
--- a/src/interface/web/app/factchecker/page.tsx
+++ b/src/interface/web/app/factchecker/page.tsx
@@ -197,7 +197,6 @@ function ReferenceVerification(props: ReferenceVerificationProps) {
                     codeContext: {},
                     conversationId: props.conversationId,
                     turnId: "",
-                    onDeleteMessage: (turnId?: string) => {},
                 }}
                 isMobileWidth={isMobileWidth}
                 onDeleteMessage={(turnId?: string) => {}}
@@ -633,7 +632,6 @@ export default function FactChecker() {
                                         codeContext: {},
                                         conversationId: conversationID,
                                         turnId: "",
-                                        onDeleteMessage: (turnId?: string) => {},
                                     }}
                                     conversationId={conversationID}
                                     onDeleteMessage={(turnId?: string) => {}}
diff --git a/src/khoj/processor/conversation/utils.py b/src/khoj/processor/conversation/utils.py
index dd4208817..241ed783f 100644
--- a/src/khoj/processor/conversation/utils.py
+++ b/src/khoj/processor/conversation/utils.py
@@ -186,6 +186,7 @@ class ChatEvent(Enum):
     MESSAGE = "message"
     REFERENCES = "references"
     STATUS = "status"
+    METADATA = "metadata"
 
 
 def message_to_log(
diff --git a/src/khoj/routers/api_chat.py b/src/khoj/routers/api_chat.py
index 92c024e92..83dd0c24a 100644
--- a/src/khoj/routers/api_chat.py
+++ b/src/khoj/routers/api_chat.py
@@ -569,6 +569,7 @@ async def chat(
     stream = body.stream
     title = body.title
     conversation_id = body.conversation_id
+    turn_id = str(body.turn_id or uuid.uuid4())
     city = body.city
     region = body.region
     country = body.country or get_country_name_from_timezone(body.timezone)
@@ -588,7 +589,7 @@ async def event_generator(q: str, images: list[str]):
         nonlocal conversation_id
 
         tracer: dict = {
-            "mid": f"{uuid.uuid4()}",
+            "mid": turn_id,
             "cid": conversation_id,
             "uid": user.id,
             "khoj_version": state.khoj_version,
@@ -621,7 +622,7 @@ async def send_event(event_type: ChatEvent, data: str | dict):
 
                 if event_type == ChatEvent.MESSAGE:
                     yield data
-                elif event_type == ChatEvent.REFERENCES or stream:
+                elif event_type == ChatEvent.REFERENCES or ChatEvent.METADATA or stream:
                     yield json.dumps({"type": event_type.value, "data": data}, ensure_ascii=False)
             except asyncio.CancelledError as e:
                 connection_alive = False
@@ -665,6 +666,11 @@ def collect_telemetry():
                 metadata=chat_metadata,
             )
 
+        if is_query_empty(q):
+            async for result in send_llm_response("Please ask your query to get started."):
+                yield result
+            return
+
         conversation_commands = [get_conversation_command(query=q, any_references=True)]
 
         conversation = await ConversationAdapters.aget_conversation_by_user(
@@ -680,6 +686,9 @@ def collect_telemetry():
             return
         conversation_id = conversation.id
 
+        async for event in send_event(ChatEvent.METADATA, {"conversationId": str(conversation_id), "turnId": turn_id}):
+            yield event
+
         agent: Agent | None = None
         default_agent = await AgentAdapters.aget_default_agent()
         if conversation.agent and conversation.agent != default_agent:
@@ -691,17 +700,11 @@ def collect_telemetry():
             agent = default_agent
 
         await is_ready_to_chat(user)
-
         user_name = await aget_user_name(user)
         location = None
         if city or region or country or country_code:
             location = LocationData(city=city, region=region, country=country, country_code=country_code)
 
-        if is_query_empty(q):
-            async for result in send_llm_response("Please ask your query to get started."):
-                yield result
-            return
-
         user_message_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
 
         meta_log = conversation.conversation_log
diff --git a/src/khoj/routers/helpers.py b/src/khoj/routers/helpers.py
index 6aa25c5e9..f1b8fe2b4 100644
--- a/src/khoj/routers/helpers.py
+++ b/src/khoj/routers/helpers.py
@@ -1255,6 +1255,7 @@ class ChatRequestBody(BaseModel):
     stream: Optional[bool] = False
     title: Optional[str] = None
     conversation_id: Optional[str] = None
+    turn_id: Optional[str] = None
     city: Optional[str] = None
     region: Optional[str] = None
     country: Optional[str] = None

From e17dc9f7b50a50926e6566674387e5db736e1ee4 Mon Sep 17 00:00:00 2001
From: Debanjum <debanjum@gmail.com>
Date: Thu, 31 Oct 2024 02:24:53 -0700
Subject: [PATCH 10/33] Put train of thought ui before Khoj response on web app

---
 .../components/chatHistory/chatHistory.tsx    | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/interface/web/app/components/chatHistory/chatHistory.tsx b/src/interface/web/app/components/chatHistory/chatHistory.tsx
index dac579174..772f1d352 100644
--- a/src/interface/web/app/components/chatHistory/chatHistory.tsx
+++ b/src/interface/web/app/components/chatHistory/chatHistory.tsx
@@ -318,6 +318,18 @@ export default function ChatHistory(props: ChatHistoryProps) {
                         data.chat &&
                         data.chat.map((chatMessage, index) => (
                             <>
+                                {chatMessage.trainOfThought && chatMessage.by === "khoj" && (
+                                    <TrainOfThoughtComponent
+                                        trainOfThought={chatMessage.trainOfThought?.map(
+                                            (train) => train.data,
+                                        )}
+                                        lastMessage={false}
+                                        agentColor={data?.agent?.color || "orange"}
+                                        key={`${index}trainOfThought`}
+                                        keyId={`${index}trainOfThought`}
+                                        completed={true}
+                                    />
+                                )}
                                 <ChatMessage
                                     key={`${index}fullHistory`}
                                     ref={
@@ -340,18 +352,6 @@ export default function ChatHistory(props: ChatHistoryProps) {
                                     onDeleteMessage={handleDeleteMessage}
                                     conversationId={props.conversationId}
                                 />
-                                {chatMessage.trainOfThought && chatMessage.by === "khoj" && (
-                                    <TrainOfThoughtComponent
-                                        trainOfThought={chatMessage.trainOfThought?.map(
-                                            (train) => train.data,
-                                        )}
-                                        lastMessage={false}
-                                        agentColor={data?.agent?.color || "orange"}
-                                        key={`${index}trainOfThought`}
-                                        keyId={`${index}trainOfThought`}
-                                        completed={true}
-                                    />
-                                )}
                             </>
                         ))}
                     {props.incomingMessages &&

From a13760640c8996b8088c3f9f6182010f3481e50f Mon Sep 17 00:00:00 2001
From: sabaimran <narmiabas@gmail.com>
Date: Thu, 31 Oct 2024 13:19:16 -0700
Subject: [PATCH 11/33] Only show trash can when turnId is present

---
 .../components/chatMessage/chatMessage.tsx    | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/interface/web/app/components/chatMessage/chatMessage.tsx b/src/interface/web/app/components/chatMessage/chatMessage.tsx
index 222ccaea1..d05d98291 100644
--- a/src/interface/web/app/components/chatMessage/chatMessage.tsx
+++ b/src/interface/web/app/components/chatMessage/chatMessage.tsx
@@ -744,16 +744,18 @@ const ChatMessage = forwardRef<HTMLDivElement, ChatMessageProps>((props, ref) =>
                                         />
                                     </button>
                                 ))}
-                            <button
-                                title="Delete"
-                                className={`${styles.deleteButton}`}
-                                onClick={() => deleteMessage(props.chatMessage)}
-                            >
-                                <Trash
-                                    alt="Delete Message"
-                                    className="hsl(var(--muted-foreground)) hover:text-red-500"
-                                />
-                            </button>
+                            {props.chatMessage.turnId && (
+                                <button
+                                    title="Delete"
+                                    className={`${styles.deleteButton}`}
+                                    onClick={() => deleteMessage(props.chatMessage)}
+                                >
+                                    <Trash
+                                        alt="Delete Message"
+                                        className="hsl(var(--muted-foreground)) hover:text-red-500"
+                                    />
+                                </button>
+                            )}
                             <button
                                 title="Copy"
                                 className={`${styles.copyButton}`}

From 559601dd0aa66442b26c82f0d81ee36d379b418f Mon Sep 17 00:00:00 2001
From: sabaimran <narmiabas@gmail.com>
Date: Thu, 31 Oct 2024 13:51:10 -0700
Subject: [PATCH 12/33] Do not exit if/else loop in research loop when notes
 not found

---
 src/khoj/routers/research.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/khoj/routers/research.py b/src/khoj/routers/research.py
index 6001bdc5f..43552691e 100644
--- a/src/khoj/routers/research.py
+++ b/src/khoj/routers/research.py
@@ -191,18 +191,18 @@ async def execute_information_collection(
                     document_results = result[0]
                     this_iteration.context += document_results
 
-        if not is_none_or_empty(document_results):
-            try:
-                distinct_files = {d["file"] for d in document_results}
-                distinct_headings = set([d["compiled"].split("\n")[0] for d in document_results if "compiled" in d])
-                # Strip only leading # from headings
-                headings_str = "\n- " + "\n- ".join(distinct_headings).replace("#", "")
-                async for result in send_status_func(
-                    f"**Found {len(distinct_headings)} Notes Across {len(distinct_files)} Files**: {headings_str}"
-                ):
-                    yield result
-            except Exception as e:
-                logger.error(f"Error extracting document references: {e}", exc_info=True)
+            if not is_none_or_empty(document_results):
+                try:
+                    distinct_files = {d["file"] for d in document_results}
+                    distinct_headings = set([d["compiled"].split("\n")[0] for d in document_results if "compiled" in d])
+                    # Strip only leading # from headings
+                    headings_str = "\n- " + "\n- ".join(distinct_headings).replace("#", "")
+                    async for result in send_status_func(
+                        f"**Found {len(distinct_headings)} Notes Across {len(distinct_files)} Files**: {headings_str}"
+                    ):
+                        yield result
+                except Exception as e:
+                    logger.error(f"Error extracting document references: {e}", exc_info=True)
 
         elif this_iteration.tool == ConversationCommand.Online:
             async for result in search_online(

From 5b15176e2031e445d28639a6be2901d7cdf0ecaa Mon Sep 17 00:00:00 2001
From: Debanjum <debanjum@gmail.com>
Date: Thu, 31 Oct 2024 18:02:55 -0700
Subject: [PATCH 13/33] Only add /research prefix in research mode if not
 already in user query

---
 .../web/app/components/chatInputArea/chatInputArea.tsx          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/interface/web/app/components/chatInputArea/chatInputArea.tsx b/src/interface/web/app/components/chatInputArea/chatInputArea.tsx
index b60228df4..59152684d 100644
--- a/src/interface/web/app/components/chatInputArea/chatInputArea.tsx
+++ b/src/interface/web/app/components/chatInputArea/chatInputArea.tsx
@@ -149,7 +149,7 @@ export const ChatInputArea = forwardRef<HTMLTextAreaElement, ChatInputProps>((pr
         }
 
         let messageToSend = message.trim();
-        if (useResearchMode) {
+        if (useResearchMode && !messageToSend.startsWith("/research")) {
             messageToSend = `/research ${messageToSend}`;
         }
 

From 89597aefe9d090e5fc411f7419afe2dcda9929c8 Mon Sep 17 00:00:00 2001
From: Debanjum <debanjum@gmail.com>
Date: Thu, 31 Oct 2024 18:04:43 -0700
Subject: [PATCH 14/33] Json dump contents in prompt tracer to make structure
 discernable

---
 src/khoj/processor/conversation/utils.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/khoj/processor/conversation/utils.py b/src/khoj/processor/conversation/utils.py
index 241ed783f..e6d380f68 100644
--- a/src/khoj/processor/conversation/utils.py
+++ b/src/khoj/processor/conversation/utils.py
@@ -1,4 +1,5 @@
 import base64
+import json
 import logging
 import math
 import mimetypes
@@ -501,15 +502,12 @@ def commit_conversation_trace(
     Returns the path to the repository.
     """
     # Serialize session, system message and response to yaml
-    system_message_yaml = yaml.dump(system_message, allow_unicode=True, sort_keys=False, default_flow_style=False)
-    response_yaml = yaml.dump(response, allow_unicode=True, sort_keys=False, default_flow_style=False)
+    system_message_yaml = json.dumps(system_message, ensure_ascii=False, sort_keys=False)
+    response_yaml = json.dumps(response, ensure_ascii=False, sort_keys=False)
     formatted_session = [{"role": message.role, "content": message.content} for message in session]
-    session_yaml = yaml.dump(formatted_session, allow_unicode=True, sort_keys=False, default_flow_style=False)
+    session_yaml = json.dumps(formatted_session, ensure_ascii=False, sort_keys=False)
     query = (
-        yaml.dump(session[-1].content, allow_unicode=True, sort_keys=False, default_flow_style=False)
-        .strip()
-        .removeprefix("'")
-        .removesuffix("'")
+        json.dumps(session[-1].content, ensure_ascii=False, sort_keys=False).strip().removeprefix("'").removesuffix("'")
     )  # Extract serialized query from chat session
 
     # Extract chat metadata for session

From 52163fe2997f01216faed58d6aaa17f72072e7dc Mon Sep 17 00:00:00 2001
From: Debanjum <debanjum@gmail.com>
Date: Thu, 31 Oct 2024 18:15:58 -0700
Subject: [PATCH 15/33] Improve research planner prompt to reduce looping

---
 src/khoj/processor/conversation/prompts.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/khoj/processor/conversation/prompts.py b/src/khoj/processor/conversation/prompts.py
index 7a1463593..b422aa132 100644
--- a/src/khoj/processor/conversation/prompts.py
+++ b/src/khoj/processor/conversation/prompts.py
@@ -641,25 +641,25 @@
 {personality_context}
 
 # Instructions
-- Ask detailed queries to the tool AIs provided below, one at a time, to discover required information or run calculations. Their response will be shown to you in the next iteration.
-- Break down your research process into independent, self-contained steps that can be executed sequentially to answer the user's query. Write your step-by-step plan in the scratchpad.
-- Ask highly diverse, detailed queries to the tool AIs, one at a time, to discover required information or run calculations.
-- NEVER repeat the same query across iterations.
-- Ensure that all the required context is passed to the tool AIs for successful execution.
-- Ensure that you go deeper when possible and try more broad, creative strategies when a path is not yielding useful results. Build on the results of the previous iterations.
+- Ask highly diverse, detailed queries to the tool AIs, one tool AI at a time, to discover required information or run calculations. Their response will be shown to you in the next iteration.
+- Break down your research process into independent, self-contained steps that can be executed sequentially using the available tool AIs to answer the user's query. Write your step-by-step plan in the scratchpad.
+- Always ask a new query that was not asked to the tool AI in a previous iteration. Build on the results of the previous iterations.
+- Ensure that all required context is passed to the tool AIs for successful execution. They only know the context provided in your query.
+- Think step by step to come up with creative strategies when the previous iteration did not yield useful results.
 - You are allowed upto {max_iterations} iterations to use the help of the provided tool AIs to answer the user's question.
 - Stop when you have the required information by returning a JSON object with an empty "tool" field. E.g., {{scratchpad: "I have all I need", tool: "", query: ""}}
 
 # Examples
 Assuming you can search the user's notes and the internet.
-- When they ask for the population of their hometown
+- When the user asks for the population of their hometown
   1. Try look up their hometown in their notes. Ask the note search AI to search for their birth certificate, childhood memories, school, resume etc.
   2. If not found in their notes, try infer their hometown from their online social media profiles. Ask the online search AI to look for {username}'s biography, school, resume on linkedin, facebook, website etc.
   3. Only then try find the latest population of their hometown by reading official websites with the help of the online search and web page reading AI.
-- When user for their computer's specs
+- When the user asks for their computer's specs
   1. Try find their computer model in their notes.
-  2. Now find webpages with their computer model's spec online and read them.
-- When I ask what clothes to carry for their upcoming trip
+  2. Now find webpages with their computer model's spec online.
+  3. Ask the the webpage tool AI to extract the required information from the relevant webpages.
+- When the user asks what clothes to carry for their upcoming trip
   1. Find the itinerary of their upcoming trip in their notes.
   2. Next find the weather forecast at the destination online.
   3. Then find if they mentioned what clothes they own in their notes.

From 302bd51d177b72bafb227e044e9c2cbac42859f5 Mon Sep 17 00:00:00 2001
From: Debanjum <debanjum@gmail.com>
Date: Thu, 31 Oct 2024 17:56:06 -0700
Subject: [PATCH 16/33] Improve online chat actor prompt for research and
 normal mode

- Match the online query generator prompt to match the formatting of
  extract questions
- Separate iteration results by newline
- Improve webpage and online tool descriptions
---
 src/khoj/processor/conversation/prompts.py | 52 +++++++++++-----------
 src/khoj/processor/conversation/utils.py   |  5 ++-
 src/khoj/routers/research.py               |  8 ++--
 src/khoj/utils/helpers.py                  |  4 +-
 4 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/src/khoj/processor/conversation/prompts.py b/src/khoj/processor/conversation/prompts.py
index b422aa132..91469f4cf 100644
--- a/src/khoj/processor/conversation/prompts.py
+++ b/src/khoj/processor/conversation/prompts.py
@@ -814,8 +814,8 @@
 online_search_conversation_subqueries = PromptTemplate.from_template(
     """
 You are Khoj, an advanced web search assistant. You are tasked with constructing **up to three** google search queries to answer the user's question.
-- You will receive the conversation history as context.
-- Add as much context from the previous questions and answers as required into your search queries.
+- You will receive the actual chat history as context.
+- Add as much context from the chat history as required into your search queries.
 - Break messages into multiple search queries when required to retrieve the relevant information.
 - Use site: google search operator when appropriate
 - You have access to the the whole internet to retrieve information.
@@ -828,58 +828,56 @@
 {username}
 
 Here are some examples:
-History:
+Example Chat History:
 User: I like to use Hacker News to get my tech news.
+Khoj: {{queries: ["what is Hacker News?", "Hacker News website for tech news"]}}
 AI: Hacker News is an online forum for sharing and discussing the latest tech news. It is a great place to learn about new technologies and startups.
 
-Q: Summarize the top posts on HackerNews
+User: Summarize the top posts on HackerNews
 Khoj: {{"queries": ["top posts on HackerNews"]}}
 
-History:
-
-Q: Tell me the latest news about the farmers protest in Colombia and China on Reuters
+Example Chat History:
+User: Tell me the latest news about the farmers protest in Colombia and China on Reuters
 Khoj: {{"queries": ["site:reuters.com farmers protest Colombia", "site:reuters.com farmers protest China"]}}
 
-History:
+Example Chat History:
 User: I'm currently living in New York but I'm thinking about moving to San Francisco.
+Khoj: {{"queries": ["New York city vs San Francisco life", "San Francisco living cost", "New York city living cost"]}}
 AI: New York is a great city to live in. It has a lot of great restaurants and museums. San Francisco is also a great city to live in. It has good access to nature and a great tech scene.
 
-Q: What is the climate like in those cities?
-Khoj: {{"queries": ["climate in new york city", "climate in san francisco"]}}
+User: What is the climate like in those cities?
+Khoj: {{"queries": ["climate in New York city", "climate in San Francisco"]}}
 
-History:
-AI: Hey, how is it going?
-User: Going well. Ananya is in town tonight!
+Example Chat History:
+User: Hey, Ananya is in town tonight!
+Khoj: {{"queries": ["events in {location} tonight", "best restaurants in {location}", "places to visit in {location}"]}}
 AI: Oh that's awesome! What are your plans for the evening?
 
-Q: She wants to see a movie. Any decent sci-fi movies playing at the local theater?
+User: She wants to see a movie. Any decent sci-fi movies playing at the local theater?
 Khoj: {{"queries": ["new sci-fi movies in theaters near {location}"]}}
 
-History:
+Example Chat History:
 User: Can I chat with you over WhatsApp?
-AI: Yes, you can chat with me using WhatsApp.
-
-Q: How
 Khoj: {{"queries": ["site:khoj.dev chat with Khoj on Whatsapp"]}}
+AI: Yes, you can chat with me using WhatsApp.
 
-History:
-
-
-Q: How do I share my files with you?
+Example Chat History:
+User: How do I share my files with Khoj?
 Khoj: {{"queries": ["site:khoj.dev sync files with Khoj"]}}
 
-History:
+Example Chat History:
 User: I need to transport a lot of oranges to the moon. Are there any rockets that can fit a lot of oranges?
+Khoj: {{"queries": ["current rockets with large cargo capacity", "rocket rideshare cost by cargo capacity"]}}
 AI: NASA's Saturn V rocket frequently makes lunar trips and has a large cargo capacity.
 
-Q: How many oranges would fit in NASA's Saturn V rocket?
-Khoj: {{"queries": ["volume of an orange", "volume of saturn v rocket"]}}
+User: How many oranges would fit in NASA's Saturn V rocket?
+Khoj: {{"queries": ["volume of an orange", "volume of Saturn V rocket"]}}
 
 Now it's your turn to construct Google search queries to answer the user's question. Provide them as a list of strings in a JSON object. Do not say anything else.
-History:
+Actual Chat History:
 {chat_history}
 
-Q: {query}
+User: {query}
 Khoj:
 """.strip()
 )
diff --git a/src/khoj/processor/conversation/utils.py b/src/khoj/processor/conversation/utils.py
index e6d380f68..e54d4486b 100644
--- a/src/khoj/processor/conversation/utils.py
+++ b/src/khoj/processor/conversation/utils.py
@@ -136,7 +136,10 @@ def construct_chat_history(conversation_history: dict, n: int = 4, agent_name="A
     for chat in conversation_history.get("chat", [])[-n:]:
         if chat["by"] == "khoj" and chat["intent"].get("type") in ["remember", "reminder", "summarize"]:
             chat_history += f"User: {chat['intent']['query']}\n"
-            chat_history += f"{agent_name}: {chat['message']}\n"
+            chat_history += (
+                f'Khoj: {{"queries": {chat["intent"].get("inferred-queries") or list([chat["intent"]["query"]])}}}\n'
+            )
+            chat_history += f"{agent_name}: {chat['message']}\n\n"
         elif chat["by"] == "khoj" and ("text-to-image" in chat["intent"].get("type")):
             chat_history += f"User: {chat['intent']['query']}\n"
             chat_history += f"{agent_name}: [generated image redacted for space]\n"
diff --git a/src/khoj/routers/research.py b/src/khoj/routers/research.py
index 43552691e..0a37eb481 100644
--- a/src/khoj/routers/research.py
+++ b/src/khoj/routers/research.py
@@ -306,13 +306,13 @@ async def execute_information_collection(
         if document_results or online_results or code_results or summarize_files:
             results_data = f"**Results**:\n"
             if document_results:
-                results_data += f"**Document References**: {yaml.dump(document_results, allow_unicode=True, sort_keys=False, default_flow_style=False)}\n"
+                results_data += f"**Document References**:\n{yaml.dump(document_results, allow_unicode=True, sort_keys=False, default_flow_style=False)}\n"
             if online_results:
-                results_data += f"**Online Results**: {yaml.dump(online_results, allow_unicode=True, sort_keys=False, default_flow_style=False)}\n"
+                results_data += f"**Online Results**:\n{yaml.dump(online_results, allow_unicode=True, sort_keys=False, default_flow_style=False)}\n"
             if code_results:
-                results_data += f"**Code Results**: {yaml.dump(code_results, allow_unicode=True, sort_keys=False, default_flow_style=False)}\n"
+                results_data += f"**Code Results**:\n{yaml.dump(code_results, allow_unicode=True, sort_keys=False, default_flow_style=False)}\n"
             if summarize_files:
-                results_data += f"**Summarized Files**: {yaml.dump(summarize_files, allow_unicode=True, sort_keys=False, default_flow_style=False)}\n"
+                results_data += f"**Summarized Files**:\n{yaml.dump(summarize_files, allow_unicode=True, sort_keys=False, default_flow_style=False)}\n"
 
             # intermediate_result = await extract_relevant_info(this_iteration.query, results_data, agent)
             this_iteration.summarizedResult = results_data
diff --git a/src/khoj/utils/helpers.py b/src/khoj/utils/helpers.py
index 6bfb3594e..828a6bcb9 100644
--- a/src/khoj/utils/helpers.py
+++ b/src/khoj/utils/helpers.py
@@ -369,8 +369,8 @@ class ConversationCommand(str, Enum):
 
 function_calling_description_for_llm = {
     ConversationCommand.Notes: "To search the user's personal knowledge base. Especially helpful if the question expects context from the user's notes or documents.",
-    ConversationCommand.Online: "To search the internet for information. Provide all relevant context to ensure new searches, not previously run, are performed.",
-    ConversationCommand.Webpage: "To extract information from a webpage. Useful for more detailed research from the internet. Usually used when you know the webpage links to refer to. Share the webpage link and information to extract in your query.",
+    ConversationCommand.Online: "To search the internet for information. Useful to get a quick, broad overview from the internet. Provide all relevant context to ensure new searches, not in previous iterations, are performed.",
+    ConversationCommand.Webpage: "To extract information from webpages. Useful for more detailed research from the internet. Usually used when you know the webpage links to refer to. Share the webpage links and information to extract in your query.",
     ConversationCommand.Code: "To run Python code in a Pyodide sandbox with no network access. Helpful when need to parse information, run complex calculations, create documents and charts for user. Matplotlib, bs4, pandas, numpy, etc. are available.",
 }
 

From 21858acccc1e5553acbbdc27a78f5305022b7292 Mon Sep 17 00:00:00 2001
From: sabaimran <narmiabas@gmail.com>
Date: Thu, 31 Oct 2024 20:27:38 -0700
Subject: [PATCH 17/33] Remove conversation command always in query, filter out
 inferred queries that were not with selected tool when going through tool
 selection iterations

---
 src/khoj/processor/conversation/utils.py | 3 ++-
 src/khoj/routers/api_chat.py             | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/khoj/processor/conversation/utils.py b/src/khoj/processor/conversation/utils.py
index e54d4486b..990c7c27f 100644
--- a/src/khoj/processor/conversation/utils.py
+++ b/src/khoj/processor/conversation/utils.py
@@ -174,7 +174,8 @@ def construct_tool_chat_history(
                 "by": "khoj",
                 "intent": {
                     "type": "remember",
-                    "inferred-queries": inferred_query_extractor(iteration),
+                    # Only include inferred-queries for the specific tool that's being used in this iteration.
+                    "inferred-queries": inferred_query_extractor(iteration) if iteration.tool == tool else [],
                     "query": iteration.query,
                 },
                 "message": iteration.summarizedResult,
diff --git a/src/khoj/routers/api_chat.py b/src/khoj/routers/api_chat.py
index 83dd0c24a..0e7dd4485 100644
--- a/src/khoj/routers/api_chat.py
+++ b/src/khoj/routers/api_chat.py
@@ -738,6 +738,10 @@ def collect_telemetry():
             if mode not in conversation_commands:
                 conversation_commands.append(mode)
 
+        for cmd in conversation_commands:
+            await conversation_command_rate_limiter.update_and_check_if_valid(request, cmd)
+            q = q.replace(f"/{cmd.value}", "").strip()
+
         if conversation_commands == [ConversationCommand.Research]:
             async for research_result in execute_information_collection(
                 request=request,
@@ -774,10 +778,6 @@ def collect_telemetry():
 
             pending_research = False
 
-        for cmd in conversation_commands:
-            await conversation_command_rate_limiter.update_and_check_if_valid(request, cmd)
-            q = q.replace(f"/{cmd.value}", "").strip()
-
         used_slash_summarize = conversation_commands == [ConversationCommand.Summarize]
         file_filters = conversation.file_filters if conversation else []
         # Skip trying to summarize if

From 149cbe10195ed85d420f7a3bb271c56b51fb7f81 Mon Sep 17 00:00:00 2001
From: sabaimran <narmiabas@gmail.com>
Date: Thu, 31 Oct 2024 20:40:38 -0700
Subject: [PATCH 18/33] Use bottom anchor for the commandbar popover

---
 .../web/app/components/chatInputArea/chatInputArea.tsx          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/interface/web/app/components/chatInputArea/chatInputArea.tsx b/src/interface/web/app/components/chatInputArea/chatInputArea.tsx
index 59152684d..218bd9087 100644
--- a/src/interface/web/app/components/chatInputArea/chatInputArea.tsx
+++ b/src/interface/web/app/components/chatInputArea/chatInputArea.tsx
@@ -398,7 +398,7 @@ export const ChatInputArea = forwardRef<HTMLTextAreaElement, ChatInputProps>((pr
                         <PopoverContent
                             onOpenAutoFocus={(e) => e.preventDefault()}
                             className={`${props.isMobileWidth ? "w-[100vw]" : "w-full"} rounded-md`}
-                            side="top"
+                            side="bottom"
                             align="center"
                             /* Offset below text area on home page (i.e where conversationId is unset) */
                             sideOffset={props.conversationId ? 0 : 80}

From 3ea94ac97255778a8c71733a5fc4ae443558e77a Mon Sep 17 00:00:00 2001
From: sabaimran <narmiabas@gmail.com>
Date: Thu, 31 Oct 2024 22:01:41 -0700
Subject: [PATCH 19/33] Only include inferred-queries in chat history when
 present

---
 src/khoj/processor/conversation/utils.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/khoj/processor/conversation/utils.py b/src/khoj/processor/conversation/utils.py
index 990c7c27f..baabf0eb1 100644
--- a/src/khoj/processor/conversation/utils.py
+++ b/src/khoj/processor/conversation/utils.py
@@ -136,9 +136,10 @@ def construct_chat_history(conversation_history: dict, n: int = 4, agent_name="A
     for chat in conversation_history.get("chat", [])[-n:]:
         if chat["by"] == "khoj" and chat["intent"].get("type") in ["remember", "reminder", "summarize"]:
             chat_history += f"User: {chat['intent']['query']}\n"
-            chat_history += (
-                f'Khoj: {{"queries": {chat["intent"].get("inferred-queries") or list([chat["intent"]["query"]])}}}\n'
-            )
+
+            if chat["intent"].get("inferred-queries"):
+                chat_history += f'Khoj: {{"queries": {chat["intent"].get("inferred-queries")}}}\n'
+
             chat_history += f"{agent_name}: {chat['message']}\n\n"
         elif chat["by"] == "khoj" and ("text-to-image" in chat["intent"].get("type")):
             chat_history += f"User: {chat['intent']['query']}\n"
@@ -174,8 +175,7 @@ def construct_tool_chat_history(
                 "by": "khoj",
                 "intent": {
                     "type": "remember",
-                    # Only include inferred-queries for the specific tool that's being used in this iteration.
-                    "inferred-queries": inferred_query_extractor(iteration) if iteration.tool == tool else [],
+                    "inferred-queries": inferred_query_extractor(iteration),
                     "query": iteration.query,
                 },
                 "message": iteration.summarizedResult,

From 0145b2a366a59e448ad59ee6fe43af3b537d74ef Mon Sep 17 00:00:00 2001
From: sabaimran <narmiabas@gmail.com>
Date: Fri, 1 Nov 2024 10:29:33 -0700
Subject: [PATCH 20/33] Set usage limits on the research mode

---
 src/khoj/routers/api_chat.py | 6 +++---
 src/khoj/routers/helpers.py  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/khoj/routers/api_chat.py b/src/khoj/routers/api_chat.py
index 0e7dd4485..b5561a822 100644
--- a/src/khoj/routers/api_chat.py
+++ b/src/khoj/routers/api_chat.py
@@ -76,7 +76,7 @@
 # Initialize Router
 logger = logging.getLogger(__name__)
 conversation_command_rate_limiter = ConversationCommandRateLimiter(
-    trial_rate_limit=100, subscribed_rate_limit=6000, slug="command"
+    trial_rate_limit=20, subscribed_rate_limit=75, slug="command"
 )
 
 
@@ -555,10 +555,10 @@ async def chat(
     common: CommonQueryParams,
     body: ChatRequestBody,
     rate_limiter_per_minute=Depends(
-        ApiUserRateLimiter(requests=60, subscribed_requests=200, window=60, slug="chat_minute")
+        ApiUserRateLimiter(requests=5, subscribed_requests=20, window=60, slug="chat_minute")
     ),
     rate_limiter_per_day=Depends(
-        ApiUserRateLimiter(requests=600, subscribed_requests=6000, window=60 * 60 * 24, slug="chat_day")
+        ApiUserRateLimiter(requests=100, subscribed_requests=600, window=60 * 60 * 24, slug="chat_day")
     ),
     image_rate_limiter=Depends(ApiImageRateLimiter(max_images=10, max_combined_size_mb=20)),
 ):
diff --git a/src/khoj/routers/helpers.py b/src/khoj/routers/helpers.py
index f1b8fe2b4..239e646f2 100644
--- a/src/khoj/routers/helpers.py
+++ b/src/khoj/routers/helpers.py
@@ -1372,7 +1372,7 @@ def __init__(self, trial_rate_limit: int, subscribed_rate_limit: int, slug: str)
         self.slug = slug
         self.trial_rate_limit = trial_rate_limit
         self.subscribed_rate_limit = subscribed_rate_limit
-        self.restricted_commands = [ConversationCommand.Online, ConversationCommand.Image]
+        self.restricted_commands = [ConversationCommand.Research]
 
     async def update_and_check_if_valid(self, request: Request, conversation_command: ConversationCommand):
         if state.billing_enabled is False:

From 33d36ee58cb60a23c9213d827c5b6a6109e810d1 Mon Sep 17 00:00:00 2001
From: sabaimran <narmiabas@gmail.com>
Date: Fri, 1 Nov 2024 11:00:27 -0700
Subject: [PATCH 21/33] Add experimental notice to research mode tooltip

---
 .../web/app/components/chatInputArea/chatInputArea.tsx        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/interface/web/app/components/chatInputArea/chatInputArea.tsx b/src/interface/web/app/components/chatInputArea/chatInputArea.tsx
index 218bd9087..74e155235 100644
--- a/src/interface/web/app/components/chatInputArea/chatInputArea.tsx
+++ b/src/interface/web/app/components/chatInputArea/chatInputArea.tsx
@@ -590,8 +590,8 @@ export const ChatInputArea = forwardRef<HTMLTextAreaElement, ChatInputProps>((pr
                             </Button>
                         </TooltipTrigger>
                         <TooltipContent className="text-xs">
-                            Research Mode allows you to get more deeply researched, detailed
-                            responses. Response times may be longer.
+                            (Experimental) Research Mode allows you to get more deeply researched,
+                            detailed responses. Response times may be longer.
                         </TooltipContent>
                     </Tooltip>
                 </TooltipProvider>

From 1fc280db35e2e46918313b57ca4a9cd806c86d8a Mon Sep 17 00:00:00 2001
From: sabaimran <narmiabas@gmail.com>
Date: Fri, 1 Nov 2024 11:41:32 -0700
Subject: [PATCH 22/33] Handle case where infer_webpage_url returns no valid
 urls

---
 src/khoj/routers/helpers.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/khoj/routers/helpers.py b/src/khoj/routers/helpers.py
index 239e646f2..d3de3aad4 100644
--- a/src/khoj/routers/helpers.py
+++ b/src/khoj/routers/helpers.py
@@ -478,6 +478,9 @@ async def infer_webpage_urls(
         valid_unique_urls = {str(url).strip() for url in urls["links"] if is_valid_url(url)}
         if is_none_or_empty(valid_unique_urls):
             raise ValueError(f"Invalid list of urls: {response}")
+        if len(valid_unique_urls) == 0:
+            logger.error(f"No valid URLs found in response: {response}")
+            return []
         return list(valid_unique_urls)
     except Exception:
         raise ValueError(f"Invalid list of urls: {response}")

From ffa7f95559ffae957e6c89a8587d8be529809c6d Mon Sep 17 00:00:00 2001
From: sabaimran <narmiabas@gmail.com>
Date: Fri, 1 Nov 2024 11:50:58 -0700
Subject: [PATCH 23/33] Add template for a code sandbox to the docker-compose
 configuration

---
 docker-compose.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 3c5fe9f4d..3333c0660 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,6 +14,10 @@ services:
       interval: 30s
       timeout: 10s
       retries: 5
+  sandbox:
+    image: ghcr.io/khoj-ai/terrarium:latest
+    ports:
+      - "8080:8080"
   server:
     depends_on:
       database:

From 23a49b6b951d33197a6c65b50e01faa1c58aad9b Mon Sep 17 00:00:00 2001
From: sabaimran <narmiabas@gmail.com>
Date: Fri, 1 Nov 2024 12:14:33 -0700
Subject: [PATCH 24/33] Add documentation for python code execution capability

---
 documentation/docs/features/chat.md           |  3 ++
 documentation/docs/features/code_execution.md | 30 +++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 documentation/docs/features/code_execution.md

diff --git a/documentation/docs/features/chat.md b/documentation/docs/features/chat.md
index 86c720984..a438bf5ff 100644
--- a/documentation/docs/features/chat.md
+++ b/documentation/docs/features/chat.md
@@ -43,3 +43,6 @@ Slash commands allows you to change what Khoj uses to respond to your query
 - **/image**: Generate an image in response to your query.
 - **/help**: Use /help to get all available commands and general information about Khoj
 - **/summarize**: Can be used to summarize 1 selected file filter for that conversation. Refer to [File Summarization](summarization) for details.
+- **/diagram**: Generate a diagram in response to your query. This is built on [Excalidraw](https://excalidraw.com/).
+- **/code**: Generate and run very simple Python code snippets. Refer to [Code Generation](code_generation) for details.
+- **/research**: Go deeper in a topic for more accurate, in-depth responses.
diff --git a/documentation/docs/features/code_execution.md b/documentation/docs/features/code_execution.md
new file mode 100644
index 000000000..8403d466e
--- /dev/null
+++ b/documentation/docs/features/code_execution.md
@@ -0,0 +1,30 @@
+---
+---
+
+# Code Execution
+
+Khoj can generate and run very simple Python code snippets as well. This is useful if you want to generate a plot, run a simple calculation, or do some basic data manipulation. LLMs by default aren't skilled at complex quantitative tasks. Code generation & execution can come in handy for such tasks.
+
+Just use `/code` in your chat command.
+
+### Setup (Self-Hosting)
+Run [Cohere's Terrarium](https://github.com/cohere-ai/cohere-terrarium) on your machine to enable code generation and execution.
+
+Check the [instructions](https://github.com/cohere-ai/cohere-terrarium?tab=readme-ov-file#development) for running from source.
+
+For running with Docker, you can use our [docker-compose.yml](https://github.com/khoj-ai/khoj/blob/master/docker-compose.yml), or start it manually like this:
+
+```bash
+docker pull ghcr.io/khoj-ai/terrarium:latest
+docker run -d -p 8080:8080 ghcr.io/khoj-ai/terrarium:latest
+```
+
+#### Verify
+Verify that it's running, by evaluating a simple Python expression:
+
+```bash
+curl -X POST -H "Content-Type: application/json" \
+--url http://localhost:8080 \
+--data-raw '{"code": "1 + 1"}' \
+--no-buffer
+```

From b3dad1f3936b0d222df7c79be0f8fb1b48688ef3 Mon Sep 17 00:00:00 2001
From: sabaimran <narmiabas@gmail.com>
Date: Fri, 1 Nov 2024 12:21:09 -0700
Subject: [PATCH 25/33] Standardize rate limits to 1/6 ratio

---
 src/khoj/routers/api_chat.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/khoj/routers/api_chat.py b/src/khoj/routers/api_chat.py
index b5561a822..b1b074dbd 100644
--- a/src/khoj/routers/api_chat.py
+++ b/src/khoj/routers/api_chat.py
@@ -167,10 +167,10 @@ async def text_to_speech(
     common: CommonQueryParams,
     text: str,
     rate_limiter_per_minute=Depends(
-        ApiUserRateLimiter(requests=20, subscribed_requests=20, window=60, slug="chat_minute")
+        ApiUserRateLimiter(requests=10, subscribed_requests=60, window=60, slug="chat_minute")
     ),
     rate_limiter_per_day=Depends(
-        ApiUserRateLimiter(requests=50, subscribed_requests=300, window=60 * 60 * 24, slug="chat_day")
+        ApiUserRateLimiter(requests=100, subscribed_requests=600, window=60 * 60 * 24, slug="chat_day")
     ),
 ) -> Response:
     voice_model = await ConversationAdapters.aget_voice_model_config(request.user.object)

From ac21b10dd5143fb3d7f3f9af0b77ba5462adb0bd Mon Sep 17 00:00:00 2001
From: Debanjum <debanjum@gmail.com>
Date: Fri, 1 Nov 2024 15:14:00 -0700
Subject: [PATCH 26/33] Simplify logic to get default search model. Remove
 unused import

---
 src/khoj/database/adapters/__init__.py          | 6 ++----
 src/khoj/processor/conversation/google/utils.py | 1 -
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/khoj/database/adapters/__init__.py b/src/khoj/database/adapters/__init__.py
index d8d8e644b..afcaa9f04 100644
--- a/src/khoj/database/adapters/__init__.py
+++ b/src/khoj/database/adapters/__init__.py
@@ -476,11 +476,9 @@ def get_default_search_model() -> SearchModelConfig:
 
     if default_search_model:
         return default_search_model
-    elif SearchModelConfig.objects.count() > 0:
-        return SearchModelConfig.objects.first()
-    else:
+    elif SearchModelConfig.objects.count() == 0:
         SearchModelConfig.objects.create()
-        return SearchModelConfig.objects.filter(name="default").first()
+    return SearchModelConfig.objects.first()
 
 
 def get_user_default_search_model(user: KhojUser = None) -> SearchModelConfig:
diff --git a/src/khoj/processor/conversation/google/utils.py b/src/khoj/processor/conversation/google/utils.py
index ccde33d15..7b8483244 100644
--- a/src/khoj/processor/conversation/google/utils.py
+++ b/src/khoj/processor/conversation/google/utils.py
@@ -1,5 +1,4 @@
 import logging
-import os
 import random
 from threading import Thread
 

From 9c7b36dc69a726735d36ea83584077d76d5ad6d0 Mon Sep 17 00:00:00 2001
From: Debanjum <debanjum@gmail.com>
Date: Fri, 1 Nov 2024 16:15:09 -0700
Subject: [PATCH 27/33] Use standard per minute rate limits across user types

---
 src/khoj/routers/api_chat.py | 4 ++--
 src/khoj/routers/research.py | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/khoj/routers/api_chat.py b/src/khoj/routers/api_chat.py
index 6f44854cf..f4a751145 100644
--- a/src/khoj/routers/api_chat.py
+++ b/src/khoj/routers/api_chat.py
@@ -167,7 +167,7 @@ async def text_to_speech(
     common: CommonQueryParams,
     text: str,
     rate_limiter_per_minute=Depends(
-        ApiUserRateLimiter(requests=10, subscribed_requests=60, window=60, slug="chat_minute")
+        ApiUserRateLimiter(requests=30, subscribed_requests=30, window=60, slug="chat_minute")
     ),
     rate_limiter_per_day=Depends(
         ApiUserRateLimiter(requests=100, subscribed_requests=600, window=60 * 60 * 24, slug="chat_day")
@@ -555,7 +555,7 @@ async def chat(
     common: CommonQueryParams,
     body: ChatRequestBody,
     rate_limiter_per_minute=Depends(
-        ApiUserRateLimiter(requests=5, subscribed_requests=20, window=60, slug="chat_minute")
+        ApiUserRateLimiter(requests=20, subscribed_requests=20, window=60, slug="chat_minute")
     ),
     rate_limiter_per_day=Depends(
         ApiUserRateLimiter(requests=100, subscribed_requests=600, window=60 * 60 * 24, slug="chat_day")
diff --git a/src/khoj/routers/research.py b/src/khoj/routers/research.py
index 0a37eb481..4f9c6b4ec 100644
--- a/src/khoj/routers/research.py
+++ b/src/khoj/routers/research.py
@@ -1,12 +1,11 @@
 import json
 import logging
 from datetime import datetime
-from typing import Any, Callable, Dict, List, Optional
+from typing import Callable, Dict, List, Optional
 
 import yaml
 from fastapi import Request
 
-from khoj.database.adapters import ConversationAdapters, EntryAdapters
 from khoj.database.models import Agent, KhojUser
 from khoj.processor.conversation import prompts
 from khoj.processor.conversation.utils import (

From b79a9ec36dddd65710feedb3bdb395219b535f2b Mon Sep 17 00:00:00 2001
From: sabaimran <narmiabas@gmail.com>
Date: Fri, 1 Nov 2024 16:47:27 -0700
Subject: [PATCH 28/33] Clarify description of the code evaluation environment:
 not for document creation

---
 src/khoj/utils/helpers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/khoj/utils/helpers.py b/src/khoj/utils/helpers.py
index e6b6c10b1..173a1a730 100644
--- a/src/khoj/utils/helpers.py
+++ b/src/khoj/utils/helpers.py
@@ -370,7 +370,7 @@ class ConversationCommand(str, Enum):
     ConversationCommand.Notes: "To search the user's personal knowledge base. Especially helpful if the question expects context from the user's notes or documents.",
     ConversationCommand.Online: "To search the internet for information. Useful to get a quick, broad overview from the internet. Provide all relevant context to ensure new searches, not in previous iterations, are performed.",
     ConversationCommand.Webpage: "To extract information from webpages. Useful for more detailed research from the internet. Usually used when you know the webpage links to refer to. Share the webpage links and information to extract in your query.",
-    ConversationCommand.Code: "To run Python code in a Pyodide sandbox with no network access. Helpful when need to parse information, run complex calculations, create documents and charts for user. Matplotlib, bs4, pandas, numpy, etc. are available.",
+    ConversationCommand.Code: "To run Python code in a Pyodide sandbox with no network access. Helpful when need to parse information, run complex calculations, create charts for user. Matplotlib, bs4, pandas, numpy, etc. are available.",
 }
 
 mode_descriptions_for_llm = {

From 327fcb8f62ddf98d2a16afac2992695dc331dfa5 Mon Sep 17 00:00:00 2001
From: sabaimran <narmiabas@gmail.com>
Date: Fri, 1 Nov 2024 16:48:03 -0700
Subject: [PATCH 29/33] create defiltered query after conversation command is
 extracted

---
 src/khoj/routers/api_chat.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/khoj/routers/api_chat.py b/src/khoj/routers/api_chat.py
index 6f44854cf..cee238a22 100644
--- a/src/khoj/routers/api_chat.py
+++ b/src/khoj/routers/api_chat.py
@@ -716,7 +716,6 @@ def collect_telemetry():
         ## Extract Document References
         compiled_references: List[Any] = []
         inferred_queries: List[Any] = []
-        defiltered_query = defilter_query(q)
 
         if conversation_commands == [ConversationCommand.Default] or is_automated_task:
             conversation_commands = await aget_relevant_information_sources(
@@ -751,6 +750,8 @@ def collect_telemetry():
             await conversation_command_rate_limiter.update_and_check_if_valid(request, cmd)
             q = q.replace(f"/{cmd.value}", "").strip()
 
+        defiltered_query = defilter_query(q)
+
         if conversation_commands == [ConversationCommand.Research]:
             async for research_result in execute_information_collection(
                 request=request,

From a213b593e89aca6c0d0115631915dc66d8aa462e Mon Sep 17 00:00:00 2001
From: sabaimran <narmiabas@gmail.com>
Date: Fri, 1 Nov 2024 16:48:36 -0700
Subject: [PATCH 30/33] Limit the number of urls the webscraper can extract for
 scraping

---
 src/khoj/processor/tools/online_search.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/khoj/processor/tools/online_search.py b/src/khoj/processor/tools/online_search.py
index 329ca2eac..a6f6e7f74 100644
--- a/src/khoj/processor/tools/online_search.py
+++ b/src/khoj/processor/tools/online_search.py
@@ -54,6 +54,7 @@
 }
 
 DEFAULT_MAX_WEBPAGES_TO_READ = 1
+MAX_WEBPAGES_TO_INFER = 10
 
 
 async def search_online(
@@ -157,6 +158,7 @@ async def read_webpages(
     query_images: List[str] = None,
     agent: Agent = None,
     tracer: dict = {},
+    max_webpages_to_read: int = DEFAULT_MAX_WEBPAGES_TO_READ,
 ):
     "Infer web pages to read from the query and extract relevant information from them"
     logger.info(f"Inferring web pages to read")
@@ -165,6 +167,9 @@ async def read_webpages(
             yield {ChatEvent.STATUS: event}
     urls = await infer_webpage_urls(query, conversation_history, location, user, query_images)
 
+    # Get the top 10 web pages to read
+    urls = urls[:max_webpages_to_read]
+
     logger.info(f"Reading web pages at: {urls}")
     if send_status_func:
         webpage_links_str = "\n- " + "\n- ".join(list(urls))

From 1a83bbcc945d2138bc7932d07bee20ce731a783c Mon Sep 17 00:00:00 2001
From: Debanjum <debanjum@gmail.com>
Date: Fri, 1 Nov 2024 17:31:43 -0700
Subject: [PATCH 31/33] Clean API chat router. Move FeedbackData response type
 to router helper

---
 src/khoj/routers/api_chat.py | 13 ++-----------
 src/khoj/routers/helpers.py  |  6 ++++++
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/khoj/routers/api_chat.py b/src/khoj/routers/api_chat.py
index 7aacf9db5..a20982ea6 100644
--- a/src/khoj/routers/api_chat.py
+++ b/src/khoj/routers/api_chat.py
@@ -31,6 +31,7 @@
 from khoj.processor.tools.online_search import read_webpages, search_online
 from khoj.processor.tools.run_code import run_code
 from khoj.routers.api import extract_references_and_questions
+from khoj.routers.email import send_query_feedback
 from khoj.routers.helpers import (
     ApiImageRateLimiter,
     ApiUserRateLimiter,
@@ -39,13 +40,13 @@
     CommonQueryParams,
     ConversationCommandRateLimiter,
     DeleteMessageRequestBody,
+    FeedbackData,
     agenerate_chat_response,
     aget_relevant_information_sources,
     aget_relevant_output_modes,
     construct_automation_created_message,
     create_automation,
     extract_relevant_info,
-    extract_relevant_summary,
     generate_excalidraw_diagram,
     generate_summary_from_files,
     get_conversation_command,
@@ -82,10 +83,6 @@
 
 api_chat = APIRouter()
 
-from pydantic import BaseModel
-
-from khoj.routers.email import send_query_feedback
-
 
 @api_chat.get("/conversation/file-filters/{conversation_id}", response_class=Response)
 @requires(["authenticated"])
@@ -147,12 +144,6 @@ def remove_file_filter(request: Request, filter: FileFilterRequest) -> Response:
     return Response(content=json.dumps(file_filters), media_type="application/json", status_code=200)
 
 
-class FeedbackData(BaseModel):
-    uquery: str
-    kquery: str
-    sentiment: str
-
-
 @api_chat.post("/feedback")
 @requires(["authenticated"])
 async def sendfeedback(request: Request, data: FeedbackData):
diff --git a/src/khoj/routers/helpers.py b/src/khoj/routers/helpers.py
index d3de3aad4..990fa33fa 100644
--- a/src/khoj/routers/helpers.py
+++ b/src/khoj/routers/helpers.py
@@ -1273,6 +1273,12 @@ class DeleteMessageRequestBody(BaseModel):
     turn_id: str
 
 
+class FeedbackData(BaseModel):
+    uquery: str
+    kquery: str
+    sentiment: str
+
+
 class ApiUserRateLimiter:
     def __init__(self, requests: int, subscribed_requests: int, window: int, slug: str):
         self.requests = requests

From ab321dc518c5f53550944e7a8becbffe1f6484e1 Mon Sep 17 00:00:00 2001
From: Debanjum <debanjum@gmail.com>
Date: Fri, 1 Nov 2024 17:48:35 -0700
Subject: [PATCH 32/33] Expect query before tool in response to give think
 space in research prompt

---
 src/khoj/processor/conversation/prompts.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/khoj/processor/conversation/prompts.py b/src/khoj/processor/conversation/prompts.py
index de57d6d8f..864b864e1 100644
--- a/src/khoj/processor/conversation/prompts.py
+++ b/src/khoj/processor/conversation/prompts.py
@@ -666,7 +666,7 @@
 
 Return the next tool AI to use and the query to ask it. Your response should always be a valid JSON object. Do not say anything else.
 Response format:
-{{"scratchpad": "<your_scratchpad_to_reason_about_which_tool_to_use>", "tool": "<name_of_tool_ai>", "query": "<your_detailed_query_for_the_tool_ai>"}}
+{{"scratchpad": "<your_scratchpad_to_reason_about_which_tool_to_use>", "query": "<your_detailed_query_for_the_tool_ai>", "tool": "<name_of_tool_ai>"}}
 """.strip()
 )
 

From 14e453039d3320f286b4b02f5a3d3489a7532683 Mon Sep 17 00:00:00 2001
From: Debanjum <debanjum@gmail.com>
Date: Fri, 1 Nov 2024 18:03:52 -0700
Subject: [PATCH 33/33] Add prompt tracing, agent personality to infer webpage
 urls chat actor

---
 src/khoj/processor/tools/online_search.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/khoj/processor/tools/online_search.py b/src/khoj/processor/tools/online_search.py
index a6f6e7f74..c6fc7c200 100644
--- a/src/khoj/processor/tools/online_search.py
+++ b/src/khoj/processor/tools/online_search.py
@@ -162,10 +162,9 @@ async def read_webpages(
 ):
     "Infer web pages to read from the query and extract relevant information from them"
     logger.info(f"Inferring web pages to read")
-    if send_status_func:
-        async for event in send_status_func(f"**Inferring web pages to read**"):
-            yield {ChatEvent.STATUS: event}
-    urls = await infer_webpage_urls(query, conversation_history, location, user, query_images)
+    urls = await infer_webpage_urls(
+        query, conversation_history, location, user, query_images, agent=agent, tracer=tracer
+    )
 
     # Get the top 10 web pages to read
     urls = urls[:max_webpages_to_read]