Revert "Update README.md"

This reverts commit 68e151b2bd.

.github/copilot-instructions.md

@@ -1,94 +0,0 @@
-# GitHub Copilot Instructions for Perplexica
-
-This file provides context and guidance for GitHub Copilot when working with the Perplexica codebase.
-
-## Project Overview
-
-Perplexica is an open-source AI-powered search engine that uses advanced machine learning to provide intelligent search results. It combines web search capabilities with LLM-based processing to understand and answer user questions, similar to Perplexity AI but fully open source.
-
-## Key Components
-
-- **Frontend**: Next.js application with React components (in `/src/components` and `/src/app`)
-- **Backend Logic**: Node.js backend with API routes (in `/src/app/api`) and library code (in `/src/lib`)
-- **Search Engine**: Uses SearXNG as a metadata search engine
-- **LLM Integration**: Supports multiple models including OpenAI, Anthropic, Groq, Ollama (local models)
-- **Database**: SQLite database managed with Drizzle ORM
-
-## Architecture
-
-The system works through these main steps:
-
-- User submits a query
-- The system determines if web search is needed
-- If needed, it searches the web using SearXNG
-- Results are ranked using embedding-based similarity search
-- LLMs are used to generate a comprehensive response with cited sources
-
-## Key Technologies
-
-- **Frontend**: React, Next.js, Tailwind CSS
-- **Backend**: Node.js
-- **Database**: SQLite with Drizzle ORM
-- **AI/ML**: LangChain for orchestration, various LLM providers
-- **Search**: SearXNG integration
-- **Embedding Models**: For re-ranking search results
-
-## Project Structure
-
-- `/src/app`: Next.js app directory with page components and API routes
-- `/src/components`: Reusable UI components
-- `/src/lib`: Backend functionality
-  - `/lib/search`: Search functionality and meta search agent
-  - `/lib/db`: Database schema and operations
-  - `/lib/providers`: LLM and embedding model integrations
-  - `/lib/prompts`: Prompt templates for LLMs
-  - `/lib/chains`: LangChain chains for various operations
-
-## Focus Modes
-
-Perplexica supports multiple specialized search modes:
-
-- All Mode: General web search
-- Local Research Mode: Research and interact with local files with citations
-- Chat Mode: Have a creative conversation
-- Academic Search Mode: For academic research
-- YouTube Search Mode: For video content
-- Wolfram Alpha Search Mode: For calculations and data analysis
-- Reddit Search Mode: For community discussions
-
-## Development Workflow
-
-- Use `npm run dev` for local development
-- Format code with `npm run format:write` before committing
-- Database migrations: `npm run db:push`
-- Build for production: `npm run build`
-- Start production server: `npm run start`
-
-## Configuration
-
-The application uses a `config.toml` file (created from `sample.config.toml`) for configuration, including:
-
-- API keys for various LLM providers
-- Database settings
-- Search engine configuration
-- Similarity measure settings
-
-## Common Tasks
-
-When working on this codebase, you might need to:
-
-- Add new API endpoints in `/src/app/api`
-- Modify UI components in `/src/components`
-- Extend search functionality in `/src/lib/search`
-- Add new LLM providers in `/src/lib/providers`
-- Update database schema in `/src/lib/db/schema.ts`
-- Create new prompt templates in `/src/lib/prompts`
-- Build new chains in `/src/lib/chains`
-
-## AI Behavior
-
-- Avoid conciliatory language
-- It is not necessary to apologize
-- If you don't know the answer, ask for clarification
-- Do not add additional packages or dependencies unless explicitly requested
-- Only make changes to the code that are relevant to the task at hand

README.md

@@ -1,5 +1,21 @@
 # 🚀 Perplexica - An AI-powered search engine 🔎 <!-- omit in toc -->
 
+<div align="center" markdown="1">
+   <sup>Special thanks to:</sup>
+   <br>
+   <br>
+   <a href="https://www.warp.dev/perplexica">
+      <img alt="Warp sponsorship" width="400" src="https://github.com/user-attachments/assets/775dd593-9b5f-40f1-bf48-479faff4c27b">
+   </a>
+
+### [Warp, the AI Devtool that lives in your terminal](https://www.warp.dev/perplexica)
+
+[Available for MacOS, Linux, & Windows](https://www.warp.dev/perplexica)
+
+</div>
+
+<hr/>
+
 [![Discord](https://dcbadge.vercel.app/api/server/26aArMy8tT?style=flat&compact=true)](https://discord.gg/26aArMy8tT)
 
 ![preview](.assets/perplexica-screenshot.png?)
@@ -41,10 +57,9 @@ Want to know more about its architecture and how it works? You can read it [here
 - **Two Main Modes:**
   - **Copilot Mode:** (In development) Boosts search by generating different queries to find more relevant internet sources. Like normal search instead of just using the context by SearxNG, it visits the top matches and tries to find relevant sources to the user's query directly from the page.
   - **Normal Mode:** Processes your query and performs a web search.
-- **Focus Modes:** Special modes to better answer specific types of questions. Perplexica currently has 7 focus modes:
+- **Focus Modes:** Special modes to better answer specific types of questions. Perplexica currently has 6 focus modes:
   - **All Mode:** Searches the entire web to find the best results.
-  - **Local Research Mode:** Research and interact with local files with citations.
-  - **Chat Mode:** Have a truly creative conversation without web search.
+  - **Writing Assistant Mode:** Helpful for writing tasks that do not require searching the web.
   - **Academic Search Mode:** Finds articles and papers, ideal for academic research.
   - **YouTube Search Mode:** Finds YouTube videos based on the search query.
   - **Wolfram Alpha Search Mode:** Answers queries that need calculations or data analysis using Wolfram Alpha.
@@ -140,40 +155,6 @@ For more details, check out the full documentation [here](https://github.com/Itz
 
 Perplexica runs on Next.js and handles all API requests. It works right away on the same network and stays accessible even with port forwarding.
 
-### Running Behind a Reverse Proxy
-
-When running Perplexica behind a reverse proxy (like Nginx, Apache, or Traefik), follow these steps to ensure proper functionality:
-
-1. **Configure the BASE_URL setting**:
-
-   - In `config.toml`, set the `BASE_URL` parameter under the `[GENERAL]` section to your public-facing URL (e.g., `https://perplexica.yourdomain.com`)
-
-2. **Ensure proper headers forwarding**:
-
-   - Your reverse proxy should forward the following headers:
-     - `X-Forwarded-Host`
-     - `X-Forwarded-Proto`
-     - `X-Forwarded-Port` (if using non-standard ports)
-
-3. **Example Nginx configuration**:
-
-   ```nginx
-   server {
-     listen 80;
-     server_name perplexica.yourdomain.com;
-
-     location / {
-       proxy_pass http://localhost:3000;
-       proxy_set_header Host $host;
-       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-       proxy_set_header X-Forwarded-Proto $scheme;
-       proxy_set_header X-Forwarded-Host $host;
-     }
-   }
-   ```
-
-This ensures that OpenSearch descriptions, browser integrations, and all URLs work properly when accessing Perplexica through your reverse proxy.
-
 ## One-Click Deployment
 
 [![Deploy to Sealos](https://raw.githubusercontent.com/labring-actions/templates/main/Deploy-on-Sealos.svg)](https://usw.sealos.io/?openapp=system-template%3FtemplateName%3Dperplexica)

docs/API/SEARCH.md

@@ -55,7 +55,7 @@ The API accepts a JSON object in the request body, where you define the focus mo
 
 - **`focusMode`** (string, required): Specifies which focus mode to use. Available modes:
 
-  - `webSearch`, `academicSearch`, `localResearch`, `chat`, `wolframAlphaSearch`, `youtubeSearch`, `redditSearch`.
+  - `webSearch`, `academicSearch`, `writingAssistant`, `wolframAlphaSearch`, `youtubeSearch`, `redditSearch`.
 
 - **`optimizationMode`** (string, optional): Specifies the optimization mode to control the balance between performance and quality. Available modes:
 

package.json

@@ -4,7 +4,7 @@
   "license": "MIT",
   "author": "ItzCrazyKns",
   "scripts": {
-    "dev": "next dev --turbopack",
+    "dev": "next dev",
     "build": "npm run db:push && next build",
     "start": "next start",
     "lint": "next lint",
@@ -19,11 +19,9 @@
     "@langchain/community": "^0.3.36",
     "@langchain/core": "^0.3.42",
     "@langchain/google-genai": "^0.1.12",
-    "@langchain/ollama": "^0.2.0",
     "@langchain/openai": "^0.0.25",
     "@langchain/textsplitters": "^0.1.0",
     "@tailwindcss/typography": "^0.5.12",
-    "@types/react-syntax-highlighter": "^15.5.13",
     "@xenova/transformers": "^2.17.2",
     "axios": "^1.8.3",
     "better-sqlite3": "^11.9.1",
@@ -40,7 +38,6 @@
     "pdf-parse": "^1.1.1",
     "react": "^18",
     "react-dom": "^18",
-    "react-syntax-highlighter": "^15.6.1",
     "react-text-to-speech": "^0.14.5",
     "react-textarea-autosize": "^8.5.3",
     "sonner": "^1.4.41",

sample.config.toml

@@ -1,7 +1,6 @@
 [GENERAL]
 SIMILARITY_MEASURE = "cosine" # "cosine" or "dot"
 KEEP_ALIVE = "5m" # How long to keep Ollama models loaded into memory. (Instead of using -1 use "-1m")
-BASE_URL = "" # Optional. When set, overrides detected URL for OpenSearch and other public URLs
 
 [MODELS.OPENAI]
 API_KEY = ""

src/app/api/chat/route.ts

@@ -1,23 +1,26 @@
+import prompts from '@/lib/prompts';
+import MetaSearchAgent from '@/lib/search/metaSearchAgent';
+import crypto from 'crypto';
+import { AIMessage, BaseMessage, HumanMessage } from '@langchain/core/messages';
+import { EventEmitter } from 'stream';
+import {
+  chatModelProviders,
+  embeddingModelProviders,
+  getAvailableChatModelProviders,
+  getAvailableEmbeddingModelProviders,
+} from '@/lib/providers';
+import db from '@/lib/db';
+import { chats, messages as messagesSchema } from '@/lib/db/schema';
+import { and, eq, gt } from 'drizzle-orm';
+import { getFileDetails } from '@/lib/utils/files';
+import { BaseChatModel } from '@langchain/core/language_models/chat_models';
+import { ChatOpenAI } from '@langchain/openai';
 import {
   getCustomOpenaiApiKey,
   getCustomOpenaiApiUrl,
   getCustomOpenaiModelName,
 } from '@/lib/config';
-import db from '@/lib/db';
-import { chats, messages as messagesSchema } from '@/lib/db/schema';
-import {
-  getAvailableChatModelProviders,
-  getAvailableEmbeddingModelProviders,
-} from '@/lib/providers';
 import { searchHandlers } from '@/lib/search';
-import { getFileDetails } from '@/lib/utils/files';
-import { BaseChatModel } from '@langchain/core/language_models/chat_models';
-import { AIMessage, BaseMessage, HumanMessage } from '@langchain/core/messages';
-import { ChatOllama } from '@langchain/ollama';
-import { ChatOpenAI } from '@langchain/openai';
-import crypto from 'crypto';
-import { and, eq, gte } from 'drizzle-orm';
-import { EventEmitter } from 'stream';
 
 export const runtime = 'nodejs';
 export const dynamic = 'force-dynamic';
@@ -31,7 +34,6 @@ type Message = {
 type ChatModel = {
   provider: string;
   name: string;
-  ollamaContextWindow?: number;
 };
 
 type EmbeddingModel = {
@@ -50,23 +52,15 @@ type Body = {
   systemInstructions: string;
 };
 
-type ModelStats = {
-  modelName: string;
-  responseTime?: number;
-};
-
 const handleEmitterEvents = async (
   stream: EventEmitter,
   writer: WritableStreamDefaultWriter,
   encoder: TextEncoder,
   aiMessageId: string,
   chatId: string,
-  startTime: number,
 ) => {
   let recievedMessage = '';
   let sources: any[] = [];
-  let searchQuery: string | undefined;
-  let searchUrl: string | undefined;
 
   stream.on('data', (data) => {
     const parsedData = JSON.parse(data);
@@ -83,22 +77,12 @@ const handleEmitterEvents = async (
 
       recievedMessage += parsedData.data;
     } else if (parsedData.type === 'sources') {
-      // Capture the search query if available
-      if (parsedData.searchQuery) {
-        searchQuery = parsedData.searchQuery;
-      }
-      if (parsedData.searchUrl) {
-        searchUrl = parsedData.searchUrl;
-      }
-
       writer.write(
         encoder.encode(
           JSON.stringify({
             type: 'sources',
             data: parsedData.data,
-            searchQuery: parsedData.searchQuery,
             messageId: aiMessageId,
-            searchUrl: searchUrl,
           }) + '\n',
         ),
       );
@@ -106,34 +90,12 @@ const handleEmitterEvents = async (
       sources = parsedData.data;
     }
   });
-  let modelStats: ModelStats = {
-    modelName: '',
-  };
-
-  stream.on('stats', (data) => {
-    const parsedData = JSON.parse(data);
-    if (parsedData.type === 'modelStats') {
-      modelStats = parsedData.data;
-    }
-  });
-
   stream.on('end', () => {
-    const endTime = Date.now();
-    const duration = endTime - startTime;
-
-    modelStats = {
-      ...modelStats,
-      responseTime: duration,
-    };
-
     writer.write(
       encoder.encode(
         JSON.stringify({
           type: 'messageEnd',
           messageId: aiMessageId,
-          modelStats: modelStats,
-          searchQuery: searchQuery,
-          searchUrl: searchUrl,
         }) + '\n',
       ),
     );
@@ -148,9 +110,6 @@ const handleEmitterEvents = async (
         metadata: JSON.stringify({
           createdAt: new Date(),
           ...(sources && sources.length > 0 && { sources }),
-          ...(searchQuery && { searchQuery }),
-          modelStats: modelStats,
-          ...(searchUrl && { searchUrl }),
         }),
       })
       .execute();
@@ -214,7 +173,7 @@ const handleHistorySave = async (
       .delete(messagesSchema)
       .where(
         and(
-          gte(messagesSchema.id, messageExists.id),
+          gt(messagesSchema.id, messageExists.id),
           eq(messagesSchema.chatId, message.chatId),
         ),
       )
@@ -224,7 +183,6 @@ const handleHistorySave = async (
 
 export const POST = async (req: Request) => {
   try {
-    const startTime = Date.now();
     const body = (await req.json()) as Body;
     const { message } = body;
 
@@ -274,11 +232,6 @@ export const POST = async (req: Request) => {
       }) as unknown as BaseChatModel;
     } else if (chatModelProvider && chatModel) {
       llm = chatModel.model;
-
-      // Set context window size for Ollama models
-      if (llm instanceof ChatOllama && body.chatModel?.provider === 'ollama') {
-        llm.numCtx = body.chatModel.ollamaContextWindow || 2048;
-      }
     }
 
     if (!llm) {
@@ -333,14 +286,7 @@ export const POST = async (req: Request) => {
     const writer = responseStream.writable.getWriter();
     const encoder = new TextEncoder();
 
-    handleEmitterEvents(
-      stream,
-      writer,
-      encoder,
-      aiMessageId,
-      message.chatId,
-      startTime,
-    );
+    handleEmitterEvents(stream, writer, encoder, aiMessageId, message.chatId);
     handleHistorySave(message, humanMessageId, body.focusMode, body.files);
 
     return new Response(responseStream.readable, {

src/app/api/config/route.ts

@@ -1,6 +1,5 @@
 import {
   getAnthropicApiKey,
-  getBaseUrl,
   getCustomOpenaiApiKey,
   getCustomOpenaiApiUrl,
   getCustomOpenaiModelName,
@@ -61,7 +60,6 @@ export const GET = async (req: Request) => {
     config['customOpenaiApiUrl'] = getCustomOpenaiApiUrl();
     config['customOpenaiApiKey'] = getCustomOpenaiApiKey();
     config['customOpenaiModelName'] = getCustomOpenaiModelName();
-    config['baseUrl'] = getBaseUrl();
 
     return Response.json({ ...config }, { status: 200 });
   } catch (err) {

src/app/api/images/route.ts

@@ -7,13 +7,11 @@ import {
 import { getAvailableChatModelProviders } from '@/lib/providers';
 import { BaseChatModel } from '@langchain/core/language_models/chat_models';
 import { AIMessage, BaseMessage, HumanMessage } from '@langchain/core/messages';
-import { ChatOllama } from '@langchain/ollama';
 import { ChatOpenAI } from '@langchain/openai';
 
 interface ChatModel {
   provider: string;
   model: string;
-  ollamaContextWindow?: number;
 }
 
 interface ImageSearchBody {
@@ -60,10 +58,6 @@ export const POST = async (req: Request) => {
       }) as unknown as BaseChatModel;
     } else if (chatModelProvider && chatModel) {
       llm = chatModel.model;
-      // Set context window size for Ollama models
-      if (llm instanceof ChatOllama && body.chatModel?.provider === 'ollama') {
-        llm.numCtx = body.chatModel.ollamaContextWindow || 2048;
-      }
     }
 
     if (!llm) {

src/app/api/opensearch/route.ts

@@ -1,69 +0,0 @@
-import { NextResponse } from 'next/server';
-import { getBaseUrl } from '@/lib/config';
-
-/**
- * Creates an OpenSearch XML response with the given origin URL
- */
-function generateOpenSearchResponse(origin: string): NextResponse {
-  const opensearchXml = `<?xml version="1.0" encoding="utf-8"?>
-<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" xmlns:moz="http://www.mozilla.org/2006/browser/search/">
-  <ShortName>Perplexica</ShortName>
-  <LongName>Search with Perplexica AI</LongName>
-  <Description>Perplexica is a powerful AI-driven search engine that understands your queries and delivers relevant results.</Description>
-  <InputEncoding>UTF-8</InputEncoding>
-  <Image width="16" height="16" type="image/x-icon">${origin}/favicon.ico</Image>
-  <Url type="text/html" template="${origin}/?q={searchTerms}"/>
-  <Url type="application/opensearchdescription+xml" rel="self" template="${origin}/api/opensearch"/>
-</OpenSearchDescription>`;
-
-  return new NextResponse(opensearchXml, {
-    headers: {
-      'Content-Type': 'application/opensearchdescription+xml',
-    },
-  });
-}
-
-export async function GET(request: Request) {
-  // Check if a BASE_URL is explicitly configured
-  const configBaseUrl = getBaseUrl();
-
-  // If BASE_URL is configured, use it, otherwise detect from request
-  if (configBaseUrl) {
-    // Remove any trailing slashes for consistency
-    let origin = configBaseUrl.replace(/\/+$/, '');
-    return generateOpenSearchResponse(origin);
-  }
-
-  // Detect the correct origin, taking into account reverse proxy headers
-  const url = new URL(request.url);
-  let origin = url.origin;
-
-  // Extract headers
-  const headers = Object.fromEntries(request.headers);
-
-  // Check for X-Forwarded-Host and related headers to handle reverse proxies
-  if (headers['x-forwarded-host']) {
-    // Determine protocol: prefer X-Forwarded-Proto, fall back to original or https
-    const protocol =
-      headers['x-forwarded-proto'] || url.protocol.replace(':', '');
-    // Build the correct public-facing origin
-    origin = `${protocol}://${headers['x-forwarded-host']}`;
-
-    // Handle non-standard ports if specified in X-Forwarded-Port
-    if (headers['x-forwarded-port']) {
-      const port = headers['x-forwarded-port'];
-      // Don't append standard ports (80 for HTTP, 443 for HTTPS)
-      if (
-        !(
-          (protocol === 'http' && port === '80') ||
-          (protocol === 'https' && port === '443')
-        )
-      ) {
-        origin = `${origin}:${port}`;
-      }
-    }
-  }
-
-  // Generate and return the OpenSearch response
-  return generateOpenSearchResponse(origin);
-}

src/app/api/search/route.ts

@@ -13,14 +13,12 @@ import {
   getCustomOpenaiModelName,
 } from '@/lib/config';
 import { searchHandlers } from '@/lib/search';
-import { ChatOllama } from '@langchain/ollama';
 
 interface chatModel {
   provider: string;
   name: string;
   customOpenAIKey?: string;
   customOpenAIBaseURL?: string;
-  ollamaContextWindow?: number;
 }
 
 interface embeddingModel {
@@ -99,10 +97,6 @@ export const POST = async (req: Request) => {
         .model as unknown as BaseChatModel | undefined;
     }
 
-    if (llm instanceof ChatOllama && body.chatModel?.provider === 'ollama') {
-      llm.numCtx = body.chatModel.ollamaContextWindow || 2048;
-    }
-
     if (
       embeddingModelProviders[embeddingModelProvider] &&
       embeddingModelProviders[embeddingModelProvider][embeddingModel]

src/app/api/suggestions/route.ts

@@ -8,12 +8,10 @@ import { getAvailableChatModelProviders } from '@/lib/providers';
 import { BaseChatModel } from '@langchain/core/language_models/chat_models';
 import { AIMessage, BaseMessage, HumanMessage } from '@langchain/core/messages';
 import { ChatOpenAI } from '@langchain/openai';
-import { ChatOllama } from '@langchain/ollama';
 
 interface ChatModel {
   provider: string;
   model: string;
-  ollamaContextWindow?: number;
 }
 
 interface SuggestionsGenerationBody {
@@ -59,10 +57,6 @@ export const POST = async (req: Request) => {
       }) as unknown as BaseChatModel;
     } else if (chatModelProvider && chatModel) {
       llm = chatModel.model;
-      // Set context window size for Ollama models
-      if (llm instanceof ChatOllama && body.chatModel?.provider === 'ollama') {
-        llm.numCtx = body.chatModel.ollamaContextWindow || 2048;
-      }
     }
 
     if (!llm) {

src/app/api/videos/route.ts

@@ -7,13 +7,11 @@ import {
 import { getAvailableChatModelProviders } from '@/lib/providers';
 import { BaseChatModel } from '@langchain/core/language_models/chat_models';
 import { AIMessage, BaseMessage, HumanMessage } from '@langchain/core/messages';
-import { ChatOllama } from '@langchain/ollama';
 import { ChatOpenAI } from '@langchain/openai';
 
 interface ChatModel {
   provider: string;
   model: string;
-  ollamaContextWindow?: number;
 }
 
 interface VideoSearchBody {
@@ -60,10 +58,6 @@ export const POST = async (req: Request) => {
       }) as unknown as BaseChatModel;
     } else if (chatModelProvider && chatModel) {
       llm = chatModel.model;
-      // Set context window size for Ollama models
-      if (llm instanceof ChatOllama && body.chatModel?.provider === 'ollama') {
-        llm.numCtx = body.chatModel.ollamaContextWindow || 2048;
-      }
     }
 
     if (!llm) {

src/app/layout.tsx

@@ -26,14 +26,6 @@ export default function RootLayout({
 }>) {
   return (
     <html className="h-full" lang="en" suppressHydrationWarning>
-      <head>
-        <link
-          rel="search"
-          type="application/opensearchdescription+xml"
-          title="Perplexica Search"
-          href="/api/opensearch"
-        />
-      </head>
       <body className={cn('h-full', montserrat.className)}>
         <ThemeProvider>
           <Sidebar>{children}</Sidebar>

src/app/settings/page.tsx

@@ -5,7 +5,7 @@ import { useEffect, useState } from 'react';
 import { cn } from '@/lib/utils';
 import { Switch } from '@headlessui/react';
 import ThemeSwitcher from '@/components/theme/Switcher';
-import { ImagesIcon, VideoIcon, Layers3 } from 'lucide-react';
+import { ImagesIcon, VideoIcon } from 'lucide-react';
 import Link from 'next/link';
 import { PROVIDER_METADATA } from '@/lib/providers';
 
@@ -26,7 +26,6 @@ interface SettingsType {
   customOpenaiApiKey: string;
   customOpenaiApiUrl: string;
   customOpenaiModelName: string;
-  ollamaContextWindow: number;
 }
 
 interface InputProps extends React.InputHTMLAttributes<HTMLInputElement> {
@@ -145,14 +144,10 @@ const Page = () => {
     string | null
   >(null);
   const [isLoading, setIsLoading] = useState(false);
-  const [automaticSuggestions, setAutomaticSuggestions] = useState(true);
+  const [automaticImageSearch, setAutomaticImageSearch] = useState(false);
+  const [automaticVideoSearch, setAutomaticVideoSearch] = useState(false);
   const [systemInstructions, setSystemInstructions] = useState<string>('');
   const [savingStates, setSavingStates] = useState<Record<string, boolean>>({});
-  const [contextWindowSize, setContextWindowSize] = useState(2048);
-  const [isCustomContextWindow, setIsCustomContextWindow] = useState(false);
-  const predefinedContextSizes = [
-    1024, 2048, 3072, 4096, 8192, 16384, 32768, 65536, 131072,
-  ];
 
   useEffect(() => {
     const fetchConfig = async () => {
@@ -164,7 +159,6 @@ const Page = () => {
       });
 
       const data = (await res.json()) as SettingsType;
-
       setConfig(data);
 
       const chatModelProvidersKeys = Object.keys(data.chatModelProviders || {});
@@ -207,15 +201,11 @@ const Page = () => {
       setChatModels(data.chatModelProviders || {});
       setEmbeddingModels(data.embeddingModelProviders || {});
 
-      setAutomaticSuggestions(
-        localStorage.getItem('autoSuggestions') !== 'false', // default to true if not set
+      setAutomaticImageSearch(
+        localStorage.getItem('autoImageSearch') === 'true',
       );
-      const storedContextWindow = parseInt(
-        localStorage.getItem('ollamaContextWindow') ?? '2048',
-      );
-      setContextWindowSize(storedContextWindow);
-      setIsCustomContextWindow(
-        !predefinedContextSizes.includes(storedContextWindow),
+      setAutomaticVideoSearch(
+        localStorage.getItem('autoVideoSearch') === 'true',
       );
 
       setSystemInstructions(localStorage.getItem('systemInstructions')!);
@@ -364,8 +354,10 @@ const Page = () => {
         setConfig(data);
       }
 
-      if (key === 'automaticSuggestions') {
-        localStorage.setItem('autoSuggestions', value.toString());
+      if (key === 'automaticImageSearch') {
+        localStorage.setItem('autoImageSearch', value.toString());
+      } else if (key === 'automaticVideoSearch') {
+        localStorage.setItem('autoVideoSearch', value.toString());
       } else if (key === 'chatModelProvider') {
         localStorage.setItem('chatModelProvider', value);
       } else if (key === 'chatModel') {
@@ -374,8 +366,6 @@ const Page = () => {
         localStorage.setItem('embeddingModelProvider', value);
       } else if (key === 'embeddingModel') {
         localStorage.setItem('embeddingModel', value);
-      } else if (key === 'ollamaContextWindow') {
-        localStorage.setItem('ollamaContextWindow', value.toString());
       } else if (key === 'systemInstructions') {
         localStorage.setItem('systemInstructions', value);
       }
@@ -440,28 +430,29 @@ const Page = () => {
                 <div className="flex items-center justify-between p-3 bg-light-secondary dark:bg-dark-secondary rounded-lg hover:bg-light-200 dark:hover:bg-dark-200 transition-colors">
                   <div className="flex items-center space-x-3">
                     <div className="p-2 bg-light-200 dark:bg-dark-200 rounded-lg">
-                      <Layers3
+                      <ImagesIcon
                         size={18}
                         className="text-black/70 dark:text-white/70"
                       />
                     </div>
                     <div>
                       <p className="text-sm text-black/90 dark:text-white/90 font-medium">
-                        Automatic Suggestions
+                        Automatic Image Search
                       </p>
                       <p className="text-xs text-black/60 dark:text-white/60 mt-0.5">
-                        Automatically show related suggestions after responses
+                        Automatically search for relevant images in chat
+                        responses
                       </p>
                     </div>
                   </div>
                   <Switch
-                    checked={automaticSuggestions}
+                    checked={automaticImageSearch}
                     onChange={(checked) => {
-                      setAutomaticSuggestions(checked);
-                      saveConfig('automaticSuggestions', checked);
+                      setAutomaticImageSearch(checked);
+                      saveConfig('automaticImageSearch', checked);
                     }}
                     className={cn(
-                      automaticSuggestions
+                      automaticImageSearch
                         ? 'bg-[#24A0ED]'
                         : 'bg-light-200 dark:bg-dark-200',
                       'relative inline-flex h-6 w-11 items-center rounded-full transition-colors focus:outline-none',
@@ -469,7 +460,49 @@ const Page = () => {
                   >
                     <span
                       className={cn(
-                        automaticSuggestions
+                        automaticImageSearch
+                          ? 'translate-x-6'
+                          : 'translate-x-1',
+                        'inline-block h-4 w-4 transform rounded-full bg-white transition-transform',
+                      )}
+                    />
+                  </Switch>
+                </div>
+
+                <div className="flex items-center justify-between p-3 bg-light-secondary dark:bg-dark-secondary rounded-lg hover:bg-light-200 dark:hover:bg-dark-200 transition-colors">
+                  <div className="flex items-center space-x-3">
+                    <div className="p-2 bg-light-200 dark:bg-dark-200 rounded-lg">
+                      <VideoIcon
+                        size={18}
+                        className="text-black/70 dark:text-white/70"
+                      />
+                    </div>
+                    <div>
+                      <p className="text-sm text-black/90 dark:text-white/90 font-medium">
+                        Automatic Video Search
+                      </p>
+                      <p className="text-xs text-black/60 dark:text-white/60 mt-0.5">
+                        Automatically search for relevant videos in chat
+                        responses
+                      </p>
+                    </div>
+                  </div>
+                  <Switch
+                    checked={automaticVideoSearch}
+                    onChange={(checked) => {
+                      setAutomaticVideoSearch(checked);
+                      saveConfig('automaticVideoSearch', checked);
+                    }}
+                    className={cn(
+                      automaticVideoSearch
+                        ? 'bg-[#24A0ED]'
+                        : 'bg-light-200 dark:bg-dark-200',
+                      'relative inline-flex h-6 w-11 items-center rounded-full transition-colors focus:outline-none',
+                    )}
+                  >
+                    <span
+                      className={cn(
+                        automaticVideoSearch
                           ? 'translate-x-6'
                           : 'translate-x-1',
                         'inline-block h-4 w-4 transform rounded-full bg-white transition-transform',
@@ -566,78 +599,6 @@ const Page = () => {
                                 ];
                           })()}
                         />
-                        {selectedChatModelProvider === 'ollama' && (
-                          <div className="flex flex-col space-y-1">
-                            <p className="text-black/70 dark:text-white/70 text-sm">
-                              Chat Context Window Size
-                            </p>
-                            <Select
-                              value={
-                                isCustomContextWindow
-                                  ? 'custom'
-                                  : contextWindowSize.toString()
-                              }
-                              onChange={(e) => {
-                                const value = e.target.value;
-                                if (value === 'custom') {
-                                  setIsCustomContextWindow(true);
-                                } else {
-                                  setIsCustomContextWindow(false);
-                                  const numValue = parseInt(value);
-                                  setContextWindowSize(numValue);
-                                  setConfig((prev) => ({
-                                    ...prev!,
-                                    ollamaContextWindow: numValue,
-                                  }));
-                                  saveConfig('ollamaContextWindow', numValue);
-                                }
-                              }}
-                              options={[
-                                ...predefinedContextSizes.map((size) => ({
-                                  value: size.toString(),
-                                  label: `${size.toLocaleString()} tokens`,
-                                })),
-                                { value: 'custom', label: 'Custom...' },
-                              ]}
-                            />
-                            {isCustomContextWindow && (
-                              <div className="mt-2">
-                                <Input
-                                  type="number"
-                                  min={512}
-                                  value={contextWindowSize}
-                                  placeholder="Custom context window size (minimum 512)"
-                                  isSaving={savingStates['ollamaContextWindow']}
-                                  onChange={(e) => {
-                                    // Allow any value to be typed
-                                    const value =
-                                      parseInt(e.target.value) ||
-                                      contextWindowSize;
-                                    setContextWindowSize(value);
-                                  }}
-                                  onSave={(value) => {
-                                    // Validate only when saving
-                                    const numValue = Math.max(
-                                      512,
-                                      parseInt(value) || 2048,
-                                    );
-                                    setContextWindowSize(numValue);
-                                    setConfig((prev) => ({
-                                      ...prev!,
-                                      ollamaContextWindow: numValue,
-                                    }));
-                                    saveConfig('ollamaContextWindow', numValue);
-                                  }}
-                                />
-                              </div>
-                            )}
-                            <p className="text-xs text-black/60 dark:text-white/60 mt-0.5">
-                              {isCustomContextWindow
-                                ? 'Adjust the context window size for Ollama models (minimum 512 tokens)'
-                                : 'Adjust the context window size for Ollama models'}
-                            </p>
-                          </div>
-                        )}
                       </div>
                     )}
                 </div>

src/components/Chat.tsx

@@ -1,116 +1,52 @@
 'use client';
 
 import { Fragment, useEffect, useRef, useState } from 'react';
+import MessageInput from './MessageInput';
 import { File, Message } from './ChatWindow';
 import MessageBox from './MessageBox';
 import MessageBoxLoading from './MessageBoxLoading';
-import MessageInput from './MessageInput';
 
 const Chat = ({
   loading,
   messages,
   sendMessage,
-  scrollTrigger,
+  messageAppeared,
   rewrite,
   fileIds,
   setFileIds,
   files,
   setFiles,
-  optimizationMode,
-  setOptimizationMode,
-  focusMode,
-  setFocusMode,
 }: {
   messages: Message[];
-  sendMessage: (
-    message: string,
-    options?: {
-      messageId?: string;
-      rewriteIndex?: number;
-      suggestions?: string[];
-    },
-  ) => void;
+  sendMessage: (message: string) => void;
   loading: boolean;
-  scrollTrigger: number;
+  messageAppeared: boolean;
   rewrite: (messageId: string) => void;
   fileIds: string[];
   setFileIds: (fileIds: string[]) => void;
   files: File[];
   setFiles: (files: File[]) => void;
-  optimizationMode: string;
-  setOptimizationMode: (mode: string) => void;
-  focusMode: string;
-  setFocusMode: (mode: string) => void;
 }) => {
-  const [isAtBottom, setIsAtBottom] = useState(true);
-  const [manuallyScrolledUp, setManuallyScrolledUp] = useState(false);
-  const [inputStyle, setInputStyle] = useState<React.CSSProperties>({});
+  const [dividerWidth, setDividerWidth] = useState(0);
+  const dividerRef = useRef<HTMLDivElement | null>(null);
   const messageEnd = useRef<HTMLDivElement | null>(null);
-  const containerRef = useRef<HTMLDivElement | null>(null);
-  const SCROLL_THRESHOLD = 250; // pixels from bottom to consider "at bottom"
 
-  // Check if user is at bottom of page
   useEffect(() => {
-    const checkIsAtBottom = () => {
-      const position = window.innerHeight + window.scrollY;
-      const height = document.body.scrollHeight;
-      const atBottom = position >= height - SCROLL_THRESHOLD;
-
-      setIsAtBottom(atBottom);
-    };
-
-    // Initial check
-    checkIsAtBottom();
-
-    // Add scroll event listener
-    window.addEventListener('scroll', checkIsAtBottom);
-
-    return () => {
-      window.removeEventListener('scroll', checkIsAtBottom);
-    };
-  }, []);
-
-  // Detect wheel and touch events to identify user's scrolling direction
-  useEffect(() => {
-    const checkIsAtBottom = () => {
-      const position = window.innerHeight + window.scrollY;
-      const height = document.body.scrollHeight;
-      const atBottom = position >= height - SCROLL_THRESHOLD;
-
-      // If user scrolls to bottom, reset the manuallyScrolledUp flag
-      if (atBottom) {
-        setManuallyScrolledUp(false);
-      }
-
-      setIsAtBottom(atBottom);
-    };
-
-    const handleWheel = (e: WheelEvent) => {
-      // Positive deltaY means scrolling down, negative means scrolling up
-      if (e.deltaY < 0) {
-        // User is scrolling up
-        setManuallyScrolledUp(true);
-      } else if (e.deltaY > 0) {
-        checkIsAtBottom();
+    const updateDividerWidth = () => {
+      if (dividerRef.current) {
+        setDividerWidth(dividerRef.current.scrollWidth);
       }
     };
 
-    const handleTouchStart = (e: TouchEvent) => {
-      // Immediately stop auto-scrolling on any touch interaction
-      setManuallyScrolledUp(true);
-    };
+    updateDividerWidth();
 
-    // Add event listeners
-    window.addEventListener('wheel', handleWheel, { passive: true });
-    window.addEventListener('touchstart', handleTouchStart, { passive: true });
+    window.addEventListener('resize', updateDividerWidth);
 
     return () => {
-      window.removeEventListener('wheel', handleWheel);
-      window.removeEventListener('touchstart', handleTouchStart);
+      window.removeEventListener('resize', updateDividerWidth);
     };
-  }, [isAtBottom]);
+  });
 
-  // Scroll when user sends a message
   useEffect(() => {
     const scroll = () => {
       messageEnd.current?.scrollIntoView({ behavior: 'smooth' });
@@ -120,52 +56,13 @@ const Chat = ({
       document.title = `${messages[0].content.substring(0, 30)} - Perplexica`;
     }
 
-    // Always scroll when user sends a message
-    if (messages[messages.length - 1]?.role === 'user') {
+    if (messages[messages.length - 1]?.role == 'user') {
       scroll();
-      setIsAtBottom(true); // Reset to true when user sends a message
-      setManuallyScrolledUp(false); // Reset manually scrolled flag when user sends a message
     }
   }, [messages]);
 
-  // Auto-scroll for assistant responses only if user is at bottom and hasn't manually scrolled up
-  useEffect(() => {
-    const position = window.innerHeight + window.scrollY;
-    const height = document.body.scrollHeight;
-    const atBottom = position >= height - SCROLL_THRESHOLD;
-    setIsAtBottom(atBottom);
-
-    if (isAtBottom && !manuallyScrolledUp && messages.length > 0) {
-      messageEnd.current?.scrollIntoView({ behavior: 'smooth' });
-    }
-  }, [scrollTrigger, isAtBottom, messages.length, manuallyScrolledUp]);
-
-  // Sync input width with main container width
-  useEffect(() => {
-    const updateInputStyle = () => {
-      if (containerRef.current) {
-        const rect = containerRef.current.getBoundingClientRect();
-        setInputStyle({
-          width: rect.width,
-          left: rect.left,
-          right: window.innerWidth - rect.right,
-        });
-      }
-    };
-
-    // Initial calculation
-    updateInputStyle();
-
-    // Update on resize
-    window.addEventListener('resize', updateInputStyle);
-
-    return () => {
-      window.removeEventListener('resize', updateInputStyle);
-    };
-  }, []);
-
   return (
-    <div ref={containerRef} className="space-y-6 pt-8 pb-48 sm:mx-4 md:mx-8">
+    <div className="flex flex-col space-y-6 pt-8 pb-44 lg:pb-32 sm:mx-4 md:mx-8">
       {messages.map((msg, i) => {
         const isLast = i === messages.length - 1;
 
@@ -177,6 +74,7 @@ const Chat = ({
               messageIndex={i}
               history={messages}
               loading={loading}
+              dividerRef={isLast ? dividerRef : undefined}
               isLast={isLast}
               rewrite={rewrite}
               sendMessage={sendMessage}
@@ -187,53 +85,23 @@ const Chat = ({
           </Fragment>
         );
       })}
-      {loading && <MessageBoxLoading />}
-      <div className="fixed bottom-24 lg:bottom-10 z-40" style={inputStyle}>
-        {/* Scroll to bottom button - appears above the MessageInput when user has scrolled up */}
-        {manuallyScrolledUp && !isAtBottom && (
-          <div className="absolute -top-14 right-2 z-10">
-            <button
-              onClick={() => {
-                setManuallyScrolledUp(false);
-                setIsAtBottom(true);
-                messageEnd.current?.scrollIntoView({ behavior: 'smooth' });
-              }}
-              className="bg-[#24A0ED] text-white hover:bg-opacity-85 transition duration-100 rounded-full px-4 py-2 shadow-lg flex items-center justify-center"
-              aria-label="Scroll to bottom"
-            >
-              <svg
-                xmlns="http://www.w3.org/2000/svg"
-                className="h-5 w-5 mr-1"
-                viewBox="0 0 20 20"
-                fill="currentColor"
-              >
-                <path
-                  fillRule="evenodd"
-                  d="M14.707 12.707a1 1 0 01-1.414 0L10 9.414l-3.293 3.293a1 1 0 01-1.414-1.414l4-4a1 1 0 011.414 0l4 4a1 1 0 010 1.414z"
-                  clipRule="evenodd"
-                  transform="rotate(180 10 10)"
-                />
-              </svg>
-              <span className="text-sm">Scroll to bottom</span>
-            </button>
-          </div>
-        )}
-
-        <MessageInput
-          firstMessage={messages.length === 0}
-          loading={loading}
-          sendMessage={sendMessage}
-          fileIds={fileIds}
-          setFileIds={setFileIds}
-          files={files}
-          setFiles={setFiles}
-          optimizationMode={optimizationMode}
-          setOptimizationMode={setOptimizationMode}
-          focusMode={focusMode}
-          setFocusMode={setFocusMode}
-        />
-      </div>
+      {loading && !messageAppeared && <MessageBoxLoading />}
       <div ref={messageEnd} className="h-0" />
+      {dividerWidth > 0 && (
+        <div
+          className="bottom-24 lg:bottom-10 fixed z-40"
+          style={{ width: dividerWidth }}
+        >
+          <MessageInput
+            loading={loading}
+            sendMessage={sendMessage}
+            fileIds={fileIds}
+            setFileIds={setFileIds}
+            files={files}
+            setFiles={setFiles}
+          />
+        </div>
+      )}
     </div>
   );
 };

src/components/ChatWindow.tsx

@@ -13,11 +13,6 @@ import { Settings } from 'lucide-react';
 import Link from 'next/link';
 import NextError from 'next/error';
 
-export type ModelStats = {
-  modelName: string;
-  responseTime?: number;
-};
-
 export type Message = {
   messageId: string;
   chatId: string;
@@ -26,9 +21,6 @@ export type Message = {
   role: 'user' | 'assistant';
   suggestions?: string[];
   sources?: Document[];
-  modelStats?: ModelStats;
-  searchQuery?: string;
-  searchUrl?: string;
 };
 
 export interface File {
@@ -59,6 +51,17 @@ const checkConfig = async (
     let embeddingModel = localStorage.getItem('embeddingModel');
     let embeddingModelProvider = localStorage.getItem('embeddingModelProvider');
 
+    const autoImageSearch = localStorage.getItem('autoImageSearch');
+    const autoVideoSearch = localStorage.getItem('autoVideoSearch');
+
+    if (!autoImageSearch) {
+      localStorage.setItem('autoImageSearch', 'true');
+    }
+
+    if (!autoVideoSearch) {
+      localStorage.setItem('autoVideoSearch', 'false');
+    }
+
     const providers = await fetch(`/api/models`, {
       headers: {
         'Content-Type': 'application/json',
@@ -269,7 +272,7 @@ const ChatWindow = ({ id }: { id?: string }) => {
   }, []);
 
   const [loading, setLoading] = useState(false);
-  const [scrollTrigger, setScrollTrigger] = useState(0);
+  const [messageAppeared, setMessageAppeared] = useState(false);
 
   const [chatHistory, setChatHistory] = useState<[string, string][]>([]);
   const [messages, setMessages] = useState<Message[]>([]);
@@ -284,16 +287,6 @@ const ChatWindow = ({ id }: { id?: string }) => {
 
   const [notFound, setNotFound] = useState(false);
 
-  useEffect(() => {
-    const savedOptimizationMode = localStorage.getItem('optimizationMode');
-
-    if (savedOptimizationMode !== null) {
-      setOptimizationMode(savedOptimizationMode);
-    } else {
-      localStorage.setItem('optimizationMode', optimizationMode);
-    }
-  }, []);
-
   useEffect(() => {
     if (
       chatId &&
@@ -334,28 +327,7 @@ const ChatWindow = ({ id }: { id?: string }) => {
     }
   }, [isMessagesLoaded, isConfigReady]);
 
-  const sendMessage = async (
-    message: string,
-    options?: {
-      messageId?: string;
-      rewriteIndex?: number;
-      suggestions?: string[];
-    },
-  ) => {
-    setScrollTrigger((x) => (x === 0 ? -1 : 0));
-    // Special case: If we're just updating an existing message with suggestions
-    if (options?.suggestions && options.messageId) {
-      setMessages((prev) =>
-        prev.map((msg) => {
-          if (msg.messageId === options.messageId) {
-            return { ...msg, suggestions: options.suggestions };
-          }
-          return msg;
-        }),
-      );
-      return;
-    }
-
+  const sendMessage = async (message: string, messageId?: string) => {
     if (loading) return;
     if (!isConfigReady) {
       toast.error('Cannot send message before the configuration is ready');
@@ -363,29 +335,13 @@ const ChatWindow = ({ id }: { id?: string }) => {
     }
 
     setLoading(true);
+    setMessageAppeared(false);
 
     let sources: Document[] | undefined = undefined;
     let recievedMessage = '';
     let added = false;
-    let messageChatHistory = chatHistory;
 
-    if (options?.rewriteIndex !== undefined) {
-      const rewriteIndex = options.rewriteIndex;
-      setMessages((prev) => {
-        return [...prev.slice(0, messages.length > 2 ? rewriteIndex - 1 : 0)];
-      });
-
-      messageChatHistory = chatHistory.slice(
-        0,
-        messages.length > 2 ? rewriteIndex - 1 : 0,
-      );
-      setChatHistory(messageChatHistory);
-
-      setScrollTrigger((prev) => prev + 1);
-    }
-
-    const messageId =
-      options?.messageId ?? crypto.randomBytes(7).toString('hex');
+    messageId = messageId ?? crypto.randomBytes(7).toString('hex');
 
     setMessages((prevMessages) => [
       ...prevMessages,
@@ -416,14 +372,12 @@ const ChatWindow = ({ id }: { id?: string }) => {
               chatId: chatId!,
               role: 'assistant',
               sources: sources,
-              searchQuery: data.searchQuery,
-              searchUrl: data.searchUrl,
               createdAt: new Date(),
             },
           ]);
           added = true;
-          setScrollTrigger((prev) => prev + 1);
         }
+        setMessageAppeared(true);
       }
 
       if (data.type === 'message') {
@@ -437,9 +391,6 @@ const ChatWindow = ({ id }: { id?: string }) => {
               role: 'assistant',
               sources: sources,
               createdAt: new Date(),
-              modelStats: {
-                modelName: data.modelName,
-              },
             },
           ]);
           added = true;
@@ -456,7 +407,7 @@ const ChatWindow = ({ id }: { id?: string }) => {
         );
 
         recievedMessage += data.data;
-        setScrollTrigger((prev) => prev + 1);
+        setMessageAppeared(true);
       }
 
       if (data.type === 'messageEnd') {
@@ -466,36 +417,30 @@ const ChatWindow = ({ id }: { id?: string }) => {
           ['assistant', recievedMessage],
         ]);
 
-        // Always update the message, adding modelStats if available
-        setMessages((prev) =>
-          prev.map((message) => {
-            if (message.messageId === data.messageId) {
-              return {
-                ...message,
-                // Include model stats if available, otherwise null
-                modelStats: data.modelStats || null,
-                // Make sure the searchQuery is preserved (if available in the message data)
-                searchQuery: message.searchQuery || data.searchQuery,
-                searchUrl: message.searchUrl || data.searchUrl,
-              };
-            }
-            return message;
-          }),
-        );
-
         setLoading(false);
-        setScrollTrigger((prev) => prev + 1);
 
         const lastMsg = messagesRef.current[messagesRef.current.length - 1];
 
-        const autoSuggestions = localStorage.getItem('autoSuggestions');
+        const autoImageSearch = localStorage.getItem('autoImageSearch');
+        const autoVideoSearch = localStorage.getItem('autoVideoSearch');
+
+        if (autoImageSearch === 'true') {
+          document
+            .getElementById(`search-images-${lastMsg.messageId}`)
+            ?.click();
+        }
+
+        if (autoVideoSearch === 'true') {
+          document
+            .getElementById(`search-videos-${lastMsg.messageId}`)
+            ?.click();
+        }
 
         if (
           lastMsg.role === 'assistant' &&
           lastMsg.sources &&
           lastMsg.sources.length > 0 &&
-          !lastMsg.suggestions &&
-          autoSuggestions !== 'false' // Default to true if not set
+          !lastMsg.suggestions
         ) {
           const suggestions = await getSuggestions(messagesRef.current);
           setMessages((prev) =>
@@ -510,18 +455,6 @@ const ChatWindow = ({ id }: { id?: string }) => {
       }
     };
 
-    const ollamaContextWindow =
-      localStorage.getItem('ollamaContextWindow') || '2048';
-
-    // Get the latest model selection from localStorage
-    const currentChatModelProvider = localStorage.getItem('chatModelProvider');
-    const currentChatModel = localStorage.getItem('chatModel');
-
-    // Use the most current model selection from localStorage, falling back to the state if not available
-    const modelProvider =
-      currentChatModelProvider || chatModelProvider.provider;
-    const modelName = currentChatModel || chatModelProvider.name;
-
     const res = await fetch('/api/chat', {
       method: 'POST',
       headers: {
@@ -538,13 +471,10 @@ const ChatWindow = ({ id }: { id?: string }) => {
         files: fileIds,
         focusMode: focusMode,
         optimizationMode: optimizationMode,
-        history: messageChatHistory,
+        history: chatHistory,
         chatModel: {
-          name: modelName,
-          provider: modelProvider,
-          ...(chatModelProvider.provider === 'ollama' && {
-            ollamaContextWindow: parseInt(ollamaContextWindow),
-          }),
+          name: chatModelProvider.name,
+          provider: chatModelProvider.provider,
         },
         embeddingModel: {
           name: embeddingModelProvider.name,
@@ -582,14 +512,20 @@ const ChatWindow = ({ id }: { id?: string }) => {
   };
 
   const rewrite = (messageId: string) => {
-    const messageIndex = messages.findIndex(
-      (msg) => msg.messageId === messageId,
-    );
-    if (messageIndex == -1) return;
-    sendMessage(messages[messageIndex - 1].content, {
-      messageId: messageId,
-      rewriteIndex: messageIndex,
+    const index = messages.findIndex((msg) => msg.messageId === messageId);
+
+    if (index === -1) return;
+
+    const message = messages[index - 1];
+
+    setMessages((prev) => {
+      return [...prev.slice(0, messages.length > 2 ? index - 1 : 0)];
     });
+    setChatHistory((prev) => {
+      return [...prev.slice(0, messages.length > 2 ? index - 1 : 0)];
+    });
+
+    sendMessage(message.content, message.messageId);
   };
 
   useEffect(() => {
@@ -628,16 +564,12 @@ const ChatWindow = ({ id }: { id?: string }) => {
               loading={loading}
               messages={messages}
               sendMessage={sendMessage}
-              scrollTrigger={scrollTrigger}
+              messageAppeared={messageAppeared}
               rewrite={rewrite}
               fileIds={fileIds}
               setFileIds={setFileIds}
               files={files}
               setFiles={setFiles}
-              optimizationMode={optimizationMode}
-              setOptimizationMode={setOptimizationMode}
-              focusMode={focusMode}
-              setFocusMode={setFocusMode}
             />
           </>
         ) : (

src/components/EmptyChat.tsx

@@ -1,8 +1,8 @@
 import { Settings } from 'lucide-react';
+import EmptyChatMessageInput from './EmptyChatMessageInput';
 import { useState } from 'react';
 import { File } from './ChatWindow';
 import Link from 'next/link';
-import MessageInput from './MessageInput';
 
 const EmptyChat = ({
   sendMessage,
@@ -38,9 +38,7 @@ const EmptyChat = ({
         <h2 className="text-black/70 dark:text-white/70 text-3xl font-medium -mt-8">
           Research begins here.
         </h2>
-        <MessageInput
-          firstMessage={true}
-          loading={false}
+        <EmptyChatMessageInput
           sendMessage={sendMessage}
           focusMode={focusMode}
           setFocusMode={setFocusMode}

src/components/EmptyChatMessageInput.tsx

@@ -0,0 +1,114 @@
+import { ArrowRight } from 'lucide-react';
+import { useEffect, useRef, useState } from 'react';
+import TextareaAutosize from 'react-textarea-autosize';
+import CopilotToggle from './MessageInputActions/Copilot';
+import Focus from './MessageInputActions/Focus';
+import Optimization from './MessageInputActions/Optimization';
+import Attach from './MessageInputActions/Attach';
+import { File } from './ChatWindow';
+
+const EmptyChatMessageInput = ({
+  sendMessage,
+  focusMode,
+  setFocusMode,
+  optimizationMode,
+  setOptimizationMode,
+  fileIds,
+  setFileIds,
+  files,
+  setFiles,
+}: {
+  sendMessage: (message: string) => void;
+  focusMode: string;
+  setFocusMode: (mode: string) => void;
+  optimizationMode: string;
+  setOptimizationMode: (mode: string) => void;
+  fileIds: string[];
+  setFileIds: (fileIds: string[]) => void;
+  files: File[];
+  setFiles: (files: File[]) => void;
+}) => {
+  const [copilotEnabled, setCopilotEnabled] = useState(false);
+  const [message, setMessage] = useState('');
+
+  const inputRef = useRef<HTMLTextAreaElement | null>(null);
+
+  useEffect(() => {
+    const handleKeyDown = (e: KeyboardEvent) => {
+      const activeElement = document.activeElement;
+
+      const isInputFocused =
+        activeElement?.tagName === 'INPUT' ||
+        activeElement?.tagName === 'TEXTAREA' ||
+        activeElement?.hasAttribute('contenteditable');
+
+      if (e.key === '/' && !isInputFocused) {
+        e.preventDefault();
+        inputRef.current?.focus();
+      }
+    };
+
+    document.addEventListener('keydown', handleKeyDown);
+
+    inputRef.current?.focus();
+
+    return () => {
+      document.removeEventListener('keydown', handleKeyDown);
+    };
+  }, []);
+
+  return (
+    <form
+      onSubmit={(e) => {
+        e.preventDefault();
+        sendMessage(message);
+        setMessage('');
+      }}
+      onKeyDown={(e) => {
+        if (e.key === 'Enter' && !e.shiftKey) {
+          e.preventDefault();
+          sendMessage(message);
+          setMessage('');
+        }
+      }}
+      className="w-full"
+    >
+      <div className="flex flex-col bg-light-secondary dark:bg-dark-secondary px-5 pt-5 pb-2 rounded-lg w-full border border-light-200 dark:border-dark-200">
+        <TextareaAutosize
+          ref={inputRef}
+          value={message}
+          onChange={(e) => setMessage(e.target.value)}
+          minRows={2}
+          className="bg-transparent placeholder:text-black/50 dark:placeholder:text-white/50 text-sm text-black dark:text-white resize-none focus:outline-none w-full max-h-24 lg:max-h-36 xl:max-h-48"
+          placeholder="Ask anything..."
+        />
+        <div className="flex flex-row items-center justify-between mt-4">
+          <div className="flex flex-row items-center space-x-2 lg:space-x-4">
+            <Focus focusMode={focusMode} setFocusMode={setFocusMode} />
+            <Attach
+              fileIds={fileIds}
+              setFileIds={setFileIds}
+              files={files}
+              setFiles={setFiles}
+              showText
+            />
+          </div>
+          <div className="flex flex-row items-center space-x-1 sm:space-x-4">
+            <Optimization
+              optimizationMode={optimizationMode}
+              setOptimizationMode={setOptimizationMode}
+            />
+            <button
+              disabled={message.trim().length === 0}
+              className="bg-[#24A0ED] text-white disabled:text-black/50 dark:disabled:text-white/50 disabled:bg-[#e0e0dc] dark:disabled:bg-[#ececec21] hover:bg-opacity-85 transition duration-100 rounded-full p-2"
+            >
+              <ArrowRight className="bg-background" size={17} />
+            </button>
+          </div>
+        </div>
+      </div>
+    </form>
+  );
+};
+
+export default EmptyChatMessageInput;

src/components/MessageActions/ModelInfo.tsx

@@ -1,82 +0,0 @@
-'use client';
-
-import React, { useState, useEffect, useRef } from 'react';
-import { Info } from 'lucide-react';
-import { ModelStats } from '../ChatWindow';
-import { cn } from '@/lib/utils';
-
-interface ModelInfoButtonProps {
-  modelStats: ModelStats | null;
-}
-
-const ModelInfoButton: React.FC<ModelInfoButtonProps> = ({ modelStats }) => {
-  const [showPopover, setShowPopover] = useState(false);
-  const popoverRef = useRef<HTMLDivElement>(null);
-  const buttonRef = useRef<HTMLButtonElement>(null);
-
-  // Always render, using "Unknown" as fallback if model info isn't available
-  const modelName = modelStats?.modelName || 'Unknown';
-
-  useEffect(() => {
-    const handleClickOutside = (event: MouseEvent) => {
-      if (
-        popoverRef.current &&
-        !popoverRef.current.contains(event.target as Node) &&
-        buttonRef.current &&
-        !buttonRef.current.contains(event.target as Node)
-      ) {
-        setShowPopover(false);
-      }
-    };
-
-    document.addEventListener('mousedown', handleClickOutside);
-    return () => {
-      document.removeEventListener('mousedown', handleClickOutside);
-    };
-  }, []);
-
-  return (
-    <div className="relative">
-      <button
-        ref={buttonRef}
-        className="p-1 ml-1 text-black/70 dark:text-white/70 rounded-full hover:bg-light-secondary dark:hover:bg-dark-secondary transition duration-200 hover:text-black dark:hover:text-white"
-        onClick={() => setShowPopover(!showPopover)}
-        aria-label="Show model information"
-      >
-        <Info size={18} />
-      </button>
-      {showPopover && (
-        <div
-          ref={popoverRef}
-          className="absolute z-10 left-6 top-0 w-64 rounded-md shadow-lg bg-white dark:bg-dark-secondary border border-light-200 dark:border-dark-200"
-        >
-          <div className="py-2 px-3">
-            <h4 className="text-sm font-medium mb-2 text-black dark:text-white">
-              Model Information
-            </h4>
-            <div className="space-y-1 text-xs">
-              <div className="flex justify-between">
-                <span className="text-black/70 dark:text-white/70">Model:</span>
-                <span className="text-black dark:text-white font-medium">
-                  {modelName}
-                </span>
-              </div>
-              {modelStats?.responseTime && (
-                <div className="flex justify-between">
-                  <span className="text-black/70 dark:text-white/70">
-                    Response time:
-                  </span>
-                  <span className="text-black dark:text-white font-medium">
-                    {(modelStats.responseTime / 1000).toFixed(2)}s
-                  </span>
-                </div>
-              )}
-            </div>
-          </div>
-        </div>
-      )}
-    </div>
-  );
-};
-
-export default ModelInfoButton;

src/components/MessageBox.tsx

@@ -1,87 +1,36 @@
-import { cn } from '@/lib/utils';
-import { CheckCheck, CopyIcon } from 'lucide-react';
-import { useState } from 'react';
-import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter';
-import { oneDark } from 'react-syntax-highlighter/dist/cjs/styles/prism';
+'use client';
+
+/* eslint-disable @next/next/no-img-element */
+import React, { MutableRefObject, useEffect, useState } from 'react';
 import { Message } from './ChatWindow';
-import MessageTabs from './MessageTabs';
+import { cn } from '@/lib/utils';
+import {
+  BookCopy,
+  Disc3,
+  Volume2,
+  StopCircle,
+  Layers3,
+  Plus,
+} from 'lucide-react';
+import Markdown, { MarkdownToJSX } from 'markdown-to-jsx';
+import Copy from './MessageActions/Copy';
+import Rewrite from './MessageActions/Rewrite';
+import MessageSources from './MessageSources';
+import SearchImages from './SearchImages';
+import SearchVideos from './SearchVideos';
+import { useSpeech } from 'react-text-to-speech';
 import ThinkBox from './ThinkBox';
 
 const ThinkTagProcessor = ({ children }: { children: React.ReactNode }) => {
   return <ThinkBox content={children as string} />;
 };
 
-const CodeBlock = ({
-  className,
-  children,
-}: {
-  className?: string;
-  children: React.ReactNode;
-}) => {
-  // Extract language from className (format could be "language-javascript" or "lang-javascript")
-  let language = '';
-  if (className) {
-    if (className.startsWith('language-')) {
-      language = className.replace('language-', '');
-    } else if (className.startsWith('lang-')) {
-      language = className.replace('lang-', '');
-    }
-  }
-
-  const content = children as string;
-
-  const [isCopied, setIsCopied] = useState(false);
-
-  const handleCopyCode = () => {
-    navigator.clipboard.writeText(content);
-    setIsCopied(true);
-    setTimeout(() => setIsCopied(false), 2000);
-  };
-
-  console.log('Code block language:', language, 'Class name:', className); // For debugging
-
-  return (
-    <div className="rounded-md overflow-hidden my-4 relative group border border-dark-secondary">
-      <div className="flex justify-between items-center px-4 py-2 bg-dark-200 border-b border-dark-secondary text-xs text-white/70 font-mono">
-        <span>{language}</span>
-        <button
-          onClick={handleCopyCode}
-          className="p-1 rounded-md hover:bg-dark-secondary transition duration-200"
-          aria-label="Copy code to clipboard"
-        >
-          {isCopied ? (
-            <CheckCheck size={14} className="text-green-500" />
-          ) : (
-            <CopyIcon size={14} className="text-white/70" />
-          )}
-        </button>
-      </div>
-      <SyntaxHighlighter
-        language={language || 'text'}
-        style={oneDark}
-        customStyle={{
-          margin: 0,
-          padding: '1rem',
-          borderRadius: 0,
-          backgroundColor: '#1c1c1c',
-        }}
-        wrapLines={true}
-        wrapLongLines={true}
-        showLineNumbers={language !== '' && content.split('\n').length > 1}
-        useInlineStyles={true}
-        PreTag="div"
-      >
-        {content}
-      </SyntaxHighlighter>
-    </div>
-  );
-};
-
 const MessageBox = ({
   message,
   messageIndex,
   history,
   loading,
+  dividerRef,
   isLast,
   rewrite,
   sendMessage,
@@ -90,17 +39,82 @@ const MessageBox = ({
   messageIndex: number;
   history: Message[];
   loading: boolean;
+  dividerRef?: MutableRefObject<HTMLDivElement | null>;
   isLast: boolean;
   rewrite: (messageId: string) => void;
-  sendMessage: (
-    message: string,
-    options?: {
-      messageId?: string;
-      rewriteIndex?: number;
-      suggestions?: string[];
-    },
-  ) => void;
+  sendMessage: (message: string) => void;
 }) => {
+  const [parsedMessage, setParsedMessage] = useState(message.content);
+  const [speechMessage, setSpeechMessage] = useState(message.content);
+
+  useEffect(() => {
+    const citationRegex = /\[([^\]]+)\]/g;
+    const regex = /\[(\d+)\]/g;
+    let processedMessage = message.content;
+
+    if (message.role === 'assistant' && message.content.includes('<think>')) {
+      const openThinkTag = processedMessage.match(/<think>/g)?.length || 0;
+      const closeThinkTag = processedMessage.match(/<\/think>/g)?.length || 0;
+
+      if (openThinkTag > closeThinkTag) {
+        processedMessage += '</think> <a> </a>'; // The extra <a> </a> is to prevent the the think component from looking bad
+      }
+    }
+
+    if (
+      message.role === 'assistant' &&
+      message?.sources &&
+      message.sources.length > 0
+    ) {
+      setParsedMessage(
+        processedMessage.replace(
+          citationRegex,
+          (_, capturedContent: string) => {
+            const numbers = capturedContent
+              .split(',')
+              .map((numStr) => numStr.trim());
+
+            const linksHtml = numbers
+              .map((numStr) => {
+                const number = parseInt(numStr);
+
+                if (isNaN(number) || number <= 0) {
+                  return `[${numStr}]`;
+                }
+
+                const source = message.sources?.[number - 1];
+                const url = source?.metadata?.url;
+
+                if (url) {
+                  return `<a href="${url}" target="_blank" className="bg-light-secondary dark:bg-dark-secondary px-1 rounded ml-1 no-underline text-xs text-black/70 dark:text-white/70 relative">${numStr}</a>`;
+                } else {
+                  return `[${numStr}]`;
+                }
+              })
+              .join('');
+
+            return linksHtml;
+          },
+        ),
+      );
+      setSpeechMessage(message.content.replace(regex, ''));
+      return;
+    }
+
+    setSpeechMessage(message.content.replace(regex, ''));
+    setParsedMessage(processedMessage);
+  }, [message.content, message.sources, message.role]);
+
+  const { speechStatus, start, stop } = useSpeech({ text: speechMessage });
+
+  const markdownOverrides: MarkdownToJSX.Options = {
+    overrides: {
+      think: {
+        component: ThinkTagProcessor,
+      },
+    },
+  };
+
   return (
     <div>
       {message.role === 'user' && (
@@ -118,16 +132,128 @@ const MessageBox = ({
       )}
 
       {message.role === 'assistant' && (
-        <MessageTabs
-          query={history[messageIndex - 1].content}
-          chatHistory={history.slice(0, messageIndex - 1)}
-          messageId={message.messageId}
-          message={message}
-          isLast={isLast}
-          loading={loading}
-          rewrite={rewrite}
-          sendMessage={sendMessage}
-        />
+        <div className="flex flex-col space-y-9 lg:space-y-0 lg:flex-row lg:justify-between lg:space-x-9">
+          <div
+            ref={dividerRef}
+            className="flex flex-col space-y-6 w-full lg:w-9/12"
+          >
+            {message.sources && message.sources.length > 0 && (
+              <div className="flex flex-col space-y-2">
+                <div className="flex flex-row items-center space-x-2">
+                  <BookCopy className="text-black dark:text-white" size={20} />
+                  <h3 className="text-black dark:text-white font-medium text-xl">
+                    Sources
+                  </h3>
+                </div>
+                <MessageSources sources={message.sources} />
+              </div>
+            )}
+            <div className="flex flex-col space-y-2">
+              <div className="flex flex-row items-center space-x-2">
+                <Disc3
+                  className={cn(
+                    'text-black dark:text-white',
+                    isLast && loading ? 'animate-spin' : 'animate-none',
+                  )}
+                  size={20}
+                />
+                <h3 className="text-black dark:text-white font-medium text-xl">
+                  Answer
+                </h3>
+              </div>
+
+              <Markdown
+                className={cn(
+                  'prose prose-h1:mb-3 prose-h2:mb-2 prose-h2:mt-6 prose-h2:font-[800] prose-h3:mt-4 prose-h3:mb-1.5 prose-h3:font-[600] dark:prose-invert prose-p:leading-relaxed prose-pre:p-0 font-[400]',
+                  'max-w-none break-words text-black dark:text-white',
+                )}
+                options={markdownOverrides}
+              >
+                {parsedMessage}
+              </Markdown>
+              {loading && isLast ? null : (
+                <div className="flex flex-row items-center justify-between w-full text-black dark:text-white py-4 -mx-2">
+                  <div className="flex flex-row items-center space-x-1">
+                    {/*  <button className="p-2 text-black/70 dark:text-white/70 rounded-xl hover:bg-light-secondary dark:hover:bg-dark-secondary transition duration-200 hover:text-black text-black dark:hover:text-white">
+                      <Share size={18} />
+                    </button> */}
+                    <Rewrite rewrite={rewrite} messageId={message.messageId} />
+                  </div>
+                  <div className="flex flex-row items-center space-x-1">
+                    <Copy initialMessage={message.content} message={message} />
+                    <button
+                      onClick={() => {
+                        if (speechStatus === 'started') {
+                          stop();
+                        } else {
+                          start();
+                        }
+                      }}
+                      className="p-2 text-black/70 dark:text-white/70 rounded-xl hover:bg-light-secondary dark:hover:bg-dark-secondary transition duration-200 hover:text-black dark:hover:text-white"
+                    >
+                      {speechStatus === 'started' ? (
+                        <StopCircle size={18} />
+                      ) : (
+                        <Volume2 size={18} />
+                      )}
+                    </button>
+                  </div>
+                </div>
+              )}
+              {isLast &&
+                message.suggestions &&
+                message.suggestions.length > 0 &&
+                message.role === 'assistant' &&
+                !loading && (
+                  <>
+                    <div className="h-px w-full bg-light-secondary dark:bg-dark-secondary" />
+                    <div className="flex flex-col space-y-3 text-black dark:text-white">
+                      <div className="flex flex-row items-center space-x-2 mt-4">
+                        <Layers3 />
+                        <h3 className="text-xl font-medium">Related</h3>
+                      </div>
+                      <div className="flex flex-col space-y-3">
+                        {message.suggestions.map((suggestion, i) => (
+                          <div
+                            className="flex flex-col space-y-3 text-sm"
+                            key={i}
+                          >
+                            <div className="h-px w-full bg-light-secondary dark:bg-dark-secondary" />
+                            <div
+                              onClick={() => {
+                                sendMessage(suggestion);
+                              }}
+                              className="cursor-pointer flex flex-row justify-between font-medium space-x-2 items-center"
+                            >
+                              <p className="transition duration-200 hover:text-[#24A0ED]">
+                                {suggestion}
+                              </p>
+                              <Plus
+                                size={20}
+                                className="text-[#24A0ED] flex-shrink-0"
+                              />
+                            </div>
+                          </div>
+                        ))}
+                      </div>
+                    </div>
+                  </>
+                )}
+            </div>
+          </div>
+          <div className="lg:sticky lg:top-20 flex flex-col items-center space-y-3 w-full lg:w-3/12 z-30 h-full pb-4">
+            <SearchImages
+              query={history[messageIndex - 1].content}
+              chatHistory={history.slice(0, messageIndex - 1)}
+              messageId={message.messageId}
+            />
+            <SearchVideos
+              chatHistory={history.slice(0, messageIndex - 1)}
+              query={history[messageIndex - 1].content}
+              messageId={message.messageId}
+            />
+          </div>
+        </div>
       )}
     </div>
   );

src/components/MessageInput.tsx

@@ -1,11 +1,11 @@
-import { ArrowRight, ArrowUp } from 'lucide-react';
+import { cn } from '@/lib/utils';
+import { ArrowUp } from 'lucide-react';
 import { useEffect, useRef, useState } from 'react';
 import TextareaAutosize from 'react-textarea-autosize';
-import { File } from './ChatWindow';
 import Attach from './MessageInputActions/Attach';
-import Focus from './MessageInputActions/Focus';
-import ModelSelector from './MessageInputActions/ModelSelector';
-import Optimization from './MessageInputActions/Optimization';
+import CopilotToggle from './MessageInputActions/Copilot';
+import { File } from './ChatWindow';
+import AttachSmall from './MessageInputActions/AttachSmall';
 
 const MessageInput = ({
   sendMessage,
@@ -14,11 +14,6 @@ const MessageInput = ({
   setFileIds,
   files,
   setFiles,
-  optimizationMode,
-  setOptimizationMode,
-  focusMode,
-  setFocusMode,
-  firstMessage,
 }: {
   sendMessage: (message: string) => void;
   loading: boolean;
@@ -26,123 +21,118 @@ const MessageInput = ({
   setFileIds: (fileIds: string[]) => void;
   files: File[];
   setFiles: (files: File[]) => void;
-  optimizationMode: string;
-  setOptimizationMode: (mode: string) => void;
-  focusMode: string;
-  setFocusMode: (mode: string) => void;
-  firstMessage: boolean;
 }) => {
+  const [copilotEnabled, setCopilotEnabled] = useState(false);
   const [message, setMessage] = useState('');
-  const [selectedModel, setSelectedModel] = useState<{
-    provider: string;
-    model: string;
-  } | null>(null);
+  const [textareaRows, setTextareaRows] = useState(1);
+  const [mode, setMode] = useState<'multi' | 'single'>('single');
 
   useEffect(() => {
-    // Load saved model preferences from localStorage
-    const chatModelProvider = localStorage.getItem('chatModelProvider');
-    const chatModel = localStorage.getItem('chatModel');
-
-    if (chatModelProvider && chatModel) {
-      setSelectedModel({
-        provider: chatModelProvider,
-        model: chatModel,
-      });
+    if (textareaRows >= 2 && message && mode === 'single') {
+      setMode('multi');
+    } else if (!message && mode === 'multi') {
+      setMode('single');
     }
-  }, []);
+  }, [textareaRows, mode, message]);
 
   const inputRef = useRef<HTMLTextAreaElement | null>(null);
 
   useEffect(() => {
     const handleKeyDown = (e: KeyboardEvent) => {
       const activeElement = document.activeElement;
+
       const isInputFocused =
         activeElement?.tagName === 'INPUT' ||
         activeElement?.tagName === 'TEXTAREA' ||
         activeElement?.hasAttribute('contenteditable');
+
       if (e.key === '/' && !isInputFocused) {
         e.preventDefault();
         inputRef.current?.focus();
       }
     };
+
     document.addEventListener('keydown', handleKeyDown);
+
     return () => {
       document.removeEventListener('keydown', handleKeyDown);
     };
   }, []);
 
-  // Function to handle message submission
-  const handleSubmitMessage = () => {
-    // Only submit if we have a non-empty message and not currently loading
-    if (loading || message.trim().length === 0) return;
-
-    // Make sure the selected model is used when sending a message
-    if (selectedModel) {
-      localStorage.setItem('chatModelProvider', selectedModel.provider);
-      localStorage.setItem('chatModel', selectedModel.model);
-    }
-
-    sendMessage(message);
-    setMessage('');
-  };
-
   return (
     <form
       onSubmit={(e) => {
+        if (loading) return;
         e.preventDefault();
-        handleSubmitMessage();
+        sendMessage(message);
+        setMessage('');
       }}
       onKeyDown={(e) => {
-        if (e.key === 'Enter' && !e.shiftKey) {
+        if (e.key === 'Enter' && !e.shiftKey && !loading) {
           e.preventDefault();
-          handleSubmitMessage();
+          sendMessage(message);
+          setMessage('');
         }
       }}
-      className="w-full"
+      className={cn(
+        'bg-light-secondary dark:bg-dark-secondary p-4 flex items-center overflow-hidden border border-light-200 dark:border-dark-200',
+        mode === 'multi' ? 'flex-col rounded-lg' : 'flex-row rounded-full',
+      )}
     >
-      <div className="flex flex-col bg-light-secondary dark:bg-dark-secondary px-5 pt-5 pb-2 rounded-lg w-full border border-light-200 dark:border-dark-200">
-        <TextareaAutosize
-          ref={inputRef}
-          value={message}
-          onChange={(e) => setMessage(e.target.value)}
-          minRows={2}
-          className="bg-transparent placeholder:text-black/50 dark:placeholder:text-white/50 text-sm text-black dark:text-white resize-none focus:outline-none w-full max-h-24 lg:max-h-36 xl:max-h-48"
-          placeholder={firstMessage ? 'Ask anything...' : 'Ask a follow-up'}
+      {mode === 'single' && (
+        <AttachSmall
+          fileIds={fileIds}
+          setFileIds={setFileIds}
+          files={files}
+          setFiles={setFiles}
         />
-        <div className="flex flex-row items-center justify-between mt-4">
-          <div className="flex flex-row items-center space-x-2 lg:space-x-4">
-            <Focus focusMode={focusMode} setFocusMode={setFocusMode} />
-            <Attach
-              fileIds={fileIds}
-              setFileIds={setFileIds}
-              files={files}
-              setFiles={setFiles}
-              showText={firstMessage}
-            />
-            <ModelSelector
-              selectedModel={selectedModel}
-              setSelectedModel={setSelectedModel}
-            />
-          </div>
-          <div className="flex flex-row items-center space-x-1 sm:space-x-4">
-            <Optimization
-              optimizationMode={optimizationMode}
-              setOptimizationMode={setOptimizationMode}
+      )}
+      <TextareaAutosize
+        ref={inputRef}
+        value={message}
+        onChange={(e) => setMessage(e.target.value)}
+        onHeightChange={(height, props) => {
+          setTextareaRows(Math.ceil(height / props.rowHeight));
+        }}
+        className="transition bg-transparent dark:placeholder:text-white/50 placeholder:text-sm text-sm dark:text-white resize-none focus:outline-none w-full px-2 max-h-24 lg:max-h-36 xl:max-h-48 flex-grow flex-shrink"
+        placeholder="Ask a follow-up"
+      />
+      {mode === 'single' && (
+        <div className="flex flex-row items-center space-x-4">
+          <CopilotToggle
+            copilotEnabled={copilotEnabled}
+            setCopilotEnabled={setCopilotEnabled}
+          />
+          <button
+            disabled={message.trim().length === 0 || loading}
+            className="bg-[#24A0ED] text-white disabled:text-black/50 dark:disabled:text-white/50 hover:bg-opacity-85 transition duration-100 disabled:bg-[#e0e0dc79] dark:disabled:bg-[#ececec21] rounded-full p-2"
+          >
+            <ArrowUp className="bg-background" size={17} />
+          </button>
+        </div>
+      )}
+      {mode === 'multi' && (
+        <div className="flex flex-row items-center justify-between w-full pt-2">
+          <AttachSmall
+            fileIds={fileIds}
+            setFileIds={setFileIds}
+            files={files}
+            setFiles={setFiles}
+          />
+          <div className="flex flex-row items-center space-x-4">
+            <CopilotToggle
+              copilotEnabled={copilotEnabled}
+              setCopilotEnabled={setCopilotEnabled}
             />
             <button
-              disabled={message.trim().length === 0}
-              className="bg-[#24A0ED] text-white disabled:text-black/50 dark:disabled:text-white/50 disabled:bg-[#e0e0dc] dark:disabled:bg-[#ececec21] hover:bg-opacity-85 transition duration-100 rounded-full p-2"
-              type="submit"
+              disabled={message.trim().length === 0 || loading}
+              className="bg-[#24A0ED] text-white text-black/50 dark:disabled:text-white/50 hover:bg-opacity-85 transition duration-100 disabled:bg-[#e0e0dc79] dark:disabled:bg-[#ececec21] rounded-full p-2"
             >
-              {firstMessage ? (
-                <ArrowRight className="bg-background" size={17} />
-              ) : (
-                <ArrowUp className="bg-background" size={17} />
-              )}
+              <ArrowUp className="bg-background" size={17} />
             </button>
           </div>
         </div>
-      </div>
+      )}
     </form>
   );
 };

src/components/MessageInputActions/Attach.tsx

@@ -5,7 +5,7 @@ import {
   PopoverPanel,
   Transition,
 } from '@headlessui/react';
-import { File, LoaderCircle, Paperclip, Plus, Trash } from 'lucide-react';
+import { CopyPlus, File, LoaderCircle, Plus, Trash } from 'lucide-react';
 import { Fragment, useRef, useState } from 'react';
 import { File as FileType } from '../ChatWindow';
 
@@ -176,10 +176,8 @@ const Attach = ({
         multiple
         hidden
       />
-      <Paperclip size="18" />
-      {showText && (
-        <p className="text-xs font-medium pl-[1px] hidden lg:block">Attach</p>
-      )}
+      <CopyPlus size={showText ? 18 : undefined} />
+      {showText && <p className="text-xs font-medium pl-[1px]">Attach</p>}
     </button>
   );
 };

src/components/MessageInputActions/Focus.tsx

@@ -2,7 +2,6 @@ import {
   BadgePercent,
   ChevronDown,
   Globe,
-  MessageCircle,
   Pencil,
   ScanEye,
   SwatchBook,
@@ -31,23 +30,11 @@ const focusModes = [
     icon: <SwatchBook size={20} />,
   },
   {
-    key: 'chat',
-    title: 'Chat',
-    description: 'Have a creative conversation',
-    icon: <MessageCircle size={16} />,
-  },
-  {
-    key: 'localResearch',
-    title: 'Local Research',
-    description: 'Research and interact with local files with citations',
+    key: 'writingAssistant',
+    title: 'Writing',
+    description: 'Chat without searching the web',
     icon: <Pencil size={16} />,
   },
-  {
-    key: 'redditSearch',
-    title: 'Reddit',
-    description: 'Search for discussions and opinions',
-    icon: <SiReddit className="h-5 w-auto mr-0.5" />,
-  },
   {
     key: 'wolframAlphaSearch',
     title: 'Wolfram Alpha',
@@ -60,6 +47,12 @@ const focusModes = [
     description: 'Search and watch videos',
     icon: <SiYoutube className="h-5 w-auto mr-0.5" />,
   },
+  {
+    key: 'redditSearch',
+    title: 'Reddit',
+    description: 'Search for discussions and opinions',
+    icon: <SiReddit className="h-5 w-auto mr-0.5" />,
+  },
 ];
 
 const Focus = ({
@@ -93,13 +86,13 @@ const Focus = ({
       <Transition
         as={Fragment}
         enter="transition ease-out duration-150"
-        enterFrom="opacity-0 -translate-y-1"
+        enterFrom="opacity-0 translate-y-1"
         enterTo="opacity-100 translate-y-0"
         leave="transition ease-in duration-150"
         leaveFrom="opacity-100 translate-y-0"
-        leaveTo="opacity-0 -translate-y-1"
+        leaveTo="opacity-0 translate-y-1"
       >
-        <PopoverPanel className="absolute z-10 w-64 md:w-[500px] left-0 bottom-full mb-2">
+        <PopoverPanel className="absolute z-10 w-64 md:w-[500px] left-0">
           <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-2 bg-light-primary dark:bg-dark-primary border rounded-lg border-light-200 dark:border-dark-200 w-full p-4 max-h-[200px] md:max-h-none overflow-y-auto">
             {focusModes.map((mode, i) => (
               <PopoverButton

src/components/MessageInputActions/ModelSelector.tsx

@@ -1,305 +0,0 @@
-import { useEffect, useState } from 'react';
-import { Cpu, ChevronDown, ChevronRight } from 'lucide-react';
-import { cn } from '@/lib/utils';
-import {
-  Popover,
-  PopoverButton,
-  PopoverPanel,
-  Transition,
-} from '@headlessui/react';
-import { Fragment } from 'react';
-
-interface ModelOption {
-  provider: string;
-  model: string;
-  displayName: string;
-}
-
-interface ProviderModelMap {
-  [provider: string]: {
-    displayName: string;
-    models: ModelOption[];
-  };
-}
-
-const ModelSelector = ({
-  selectedModel,
-  setSelectedModel,
-}: {
-  selectedModel: { provider: string; model: string } | null;
-  setSelectedModel: (model: { provider: string; model: string }) => void;
-}) => {
-  const [providerModels, setProviderModels] = useState<ProviderModelMap>({});
-  const [providersList, setProvidersList] = useState<string[]>([]);
-  const [loading, setLoading] = useState(true);
-  const [selectedModelDisplay, setSelectedModelDisplay] = useState<string>('');
-  const [selectedProviderDisplay, setSelectedProviderDisplay] =
-    useState<string>('');
-  const [expandedProviders, setExpandedProviders] = useState<
-    Record<string, boolean>
-  >({});
-
-  useEffect(() => {
-    const fetchModels = async () => {
-      try {
-        const response = await fetch('/api/models', {
-          headers: {
-            'Content-Type': 'application/json',
-          },
-        });
-
-        if (!response.ok) {
-          throw new Error(`Failed to fetch models: ${response.status}`);
-        }
-
-        const data = await response.json();
-        const providersData: ProviderModelMap = {};
-
-        // Organize models by provider
-        Object.entries(data.chatModelProviders).forEach(
-          ([provider, models]: [string, any]) => {
-            const providerDisplayName =
-              provider.charAt(0).toUpperCase() + provider.slice(1);
-            providersData[provider] = {
-              displayName: providerDisplayName,
-              models: [],
-            };
-
-            Object.entries(models).forEach(
-              ([modelKey, modelData]: [string, any]) => {
-                providersData[provider].models.push({
-                  provider,
-                  model: modelKey,
-                  displayName: modelData.displayName || modelKey,
-                });
-              },
-            );
-          },
-        );
-
-        // Filter out providers with no models
-        Object.keys(providersData).forEach((provider) => {
-          if (providersData[provider].models.length === 0) {
-            delete providersData[provider];
-          }
-        });
-
-        // Sort providers by name (only those that have models)
-        const sortedProviders = Object.keys(providersData).sort();
-        setProvidersList(sortedProviders);
-
-        // Initialize expanded state for all providers
-        const initialExpandedState: Record<string, boolean> = {};
-        sortedProviders.forEach((provider) => {
-          initialExpandedState[provider] = selectedModel?.provider === provider;
-        });
-
-        // Expand the first provider if none is selected
-        if (sortedProviders.length > 0 && !selectedModel) {
-          initialExpandedState[sortedProviders[0]] = true;
-        }
-
-        setExpandedProviders(initialExpandedState);
-        setProviderModels(providersData);
-
-        // Find the current model in our options to display its name
-        if (selectedModel) {
-          const provider = providersData[selectedModel.provider];
-          if (provider) {
-            const currentModel = provider.models.find(
-              (option) => option.model === selectedModel.model,
-            );
-
-            if (currentModel) {
-              setSelectedModelDisplay(currentModel.displayName);
-              setSelectedProviderDisplay(provider.displayName);
-            }
-          }
-        }
-
-        setLoading(false);
-      } catch (error) {
-        console.error('Error fetching models:', error);
-        setLoading(false);
-      }
-    };
-
-    fetchModels();
-  }, [selectedModel, setSelectedModel]);
-
-  const toggleProviderExpanded = (provider: string) => {
-    setExpandedProviders((prev) => ({
-      ...prev,
-      [provider]: !prev[provider],
-    }));
-  };
-
-  const handleSelectModel = (option: ModelOption) => {
-    setSelectedModel({
-      provider: option.provider,
-      model: option.model,
-    });
-
-    setSelectedModelDisplay(option.displayName);
-    setSelectedProviderDisplay(
-      providerModels[option.provider]?.displayName || option.provider,
-    );
-
-    // Save to localStorage for persistence
-    localStorage.setItem('chatModelProvider', option.provider);
-    localStorage.setItem('chatModel', option.model);
-  };
-
-  const getDisplayText = () => {
-    if (loading) return 'Loading...';
-    if (!selectedModelDisplay) return 'Select model';
-
-    return `${selectedModelDisplay} (${selectedProviderDisplay})`;
-  };
-
-  return (
-    <Popover className="relative">
-      {({ open }) => (
-        <>
-          <div className="relative">
-            <PopoverButton className="group flex items-center justify-center text-black/50 dark:text-white/50 rounded-xl hover:bg-light-secondary dark:hover:bg-dark-secondary active:scale-95 transition duration-200 hover:text-black dark:hover:text-white">
-              <Cpu size={18} />
-              <span className="mx-2 text-xs font-medium overflow-hidden text-ellipsis whitespace-nowrap max-w-44 hidden lg:block">
-                {getDisplayText()}
-              </span>
-              <ChevronDown
-                size={16}
-                className={cn(
-                  'transition-transform',
-                  open ? 'rotate-180' : 'rotate-0',
-                )}
-              />
-            </PopoverButton>
-          </div>
-
-          <Transition
-            as={Fragment}
-            enter="transition ease-out duration-200"
-            enterFrom="opacity-0 translate-y-1"
-            enterTo="opacity-100 translate-y-0"
-            leave="transition ease-in duration-150"
-            leaveFrom="opacity-100 translate-y-0"
-            leaveTo="opacity-0 translate-y-1"
-          >
-            <PopoverPanel className="absolute z-10 w-72 transform bottom-full mb-2">
-              <div className="overflow-hidden rounded-lg shadow-lg ring-1 ring-black/5 dark:ring-white/5 bg-white dark:bg-dark-secondary divide-y divide-light-200 dark:divide-dark-200">
-                <div className="px-4 py-3">
-                  <h3 className="text-sm font-medium text-black/90 dark:text-white/90">
-                    Select Model
-                  </h3>
-                  <p className="text-xs text-black/60 dark:text-white/60 mt-1">
-                    Choose a provider and model for your conversation
-                  </p>
-                </div>
-                <div className="max-h-72 overflow-y-auto">
-                  {loading ? (
-                    <div className="px-4 py-3 text-sm text-black/70 dark:text-white/70">
-                      Loading available models...
-                    </div>
-                  ) : providersList.length === 0 ? (
-                    <div className="px-4 py-3 text-sm text-black/70 dark:text-white/70">
-                      No models available
-                    </div>
-                  ) : (
-                    <div className="py-1">
-                      {providersList.map((providerKey) => {
-                        const provider = providerModels[providerKey];
-                        const isExpanded = expandedProviders[providerKey];
-
-                        return (
-                          <div
-                            key={providerKey}
-                            className="border-t border-light-200 dark:border-dark-200 first:border-t-0"
-                          >
-                            {/* Provider header */}
-                            <button
-                              className={cn(
-                                'w-full flex items-center justify-between px-4 py-2 text-sm text-left',
-                                'hover:bg-light-100 dark:hover:bg-dark-100',
-                                selectedModel?.provider === providerKey
-                                  ? 'bg-light-50 dark:bg-dark-50'
-                                  : '',
-                              )}
-                              onClick={() =>
-                                toggleProviderExpanded(providerKey)
-                              }
-                            >
-                              <div className="font-medium flex items-center">
-                                <Cpu
-                                  size={14}
-                                  className="mr-2 text-black/70 dark:text-white/70"
-                                />
-                                {provider.displayName}
-                                {selectedModel?.provider === providerKey && (
-                                  <span className="ml-2 text-xs text-[#24A0ED]">
-                                    (active)
-                                  </span>
-                                )}
-                              </div>
-                              <ChevronRight
-                                size={14}
-                                className={cn(
-                                  'transition-transform',
-                                  isExpanded ? 'rotate-90' : '',
-                                )}
-                              />
-                            </button>
-
-                            {/* Models list */}
-                            {isExpanded && (
-                              <div className="pl-6">
-                                {provider.models.map((modelOption) => (
-                                  <PopoverButton
-                                    key={`${modelOption.provider}-${modelOption.model}`}
-                                    className={cn(
-                                      'w-full text-left px-4 py-2 text-sm flex items-center',
-                                      selectedModel?.provider ===
-                                        modelOption.provider &&
-                                        selectedModel?.model ===
-                                          modelOption.model
-                                        ? 'bg-light-100 dark:bg-dark-100 text-black dark:text-white'
-                                        : 'text-black/70 dark:text-white/70 hover:bg-light-100 dark:hover:bg-dark-100',
-                                    )}
-                                    onClick={() =>
-                                      handleSelectModel(modelOption)
-                                    }
-                                  >
-                                    <div className="flex flex-col flex-1">
-                                      <span className="font-medium">
-                                        {modelOption.displayName}
-                                      </span>
-                                    </div>
-                                    {/* Active indicator */}
-                                    {selectedModel?.provider ===
-                                      modelOption.provider &&
-                                      selectedModel?.model ===
-                                        modelOption.model && (
-                                        <div className="ml-auto bg-[#24A0ED] text-white text-xs px-1.5 py-0.5 rounded">
-                                          Active
-                                        </div>
-                                      )}
-                                  </PopoverButton>
-                                ))}
-                              </div>
-                            )}
-                          </div>
-                        );
-                      })}
-                    </div>
-                  )}
-                </div>
-              </div>
-            </PopoverPanel>
-          </Transition>
-        </>
-      )}
-    </Popover>
-  );
-};
-
-export default ModelSelector;

src/components/MessageInputActions/Optimization.tsx

@@ -1,4 +1,4 @@
-import { ChevronDown, Minimize2, Sliders, Star, Zap } from 'lucide-react';
+import { ChevronDown, Sliders, Star, Zap } from 'lucide-react';
 import { cn } from '@/lib/utils';
 import {
   Popover,
@@ -7,6 +7,7 @@ import {
   Transition,
 } from '@headlessui/react';
 import { Fragment } from 'react';
+
 const OptimizationModes = [
   {
     key: 'speed',
@@ -40,13 +41,8 @@ const Optimization = ({
   optimizationMode: string;
   setOptimizationMode: (mode: string) => void;
 }) => {
-  const handleOptimizationChange = (mode: string) => {
-    setOptimizationMode(mode);
-    localStorage.setItem('optimizationMode', mode);
-  };
-
   return (
-    <Popover className="relative">
+    <Popover className="relative w-full max-w-[15rem] md:max-w-md lg:max-w-lg">
       <PopoverButton
         type="button"
         className="p-2 text-black/50 dark:text-white/50 rounded-xl hover:bg-light-secondary dark:hover:bg-dark-secondary active:scale-95 transition duration-200 hover:text-black dark:hover:text-white"
@@ -56,12 +52,12 @@ const Optimization = ({
             OptimizationModes.find((mode) => mode.key === optimizationMode)
               ?.icon
           }
-          {/* <p className="text-xs font-medium hidden lg:block">
+          <p className="text-xs font-medium">
             {
               OptimizationModes.find((mode) => mode.key === optimizationMode)
                 ?.title
             }
-          </p> */}
+          </p>
           <ChevronDown size={20} />
         </div>
       </PopoverButton>
@@ -74,11 +70,11 @@ const Optimization = ({
         leaveFrom="opacity-100 translate-y-0"
         leaveTo="opacity-0 translate-y-1"
       >
-        <PopoverPanel className="absolute z-10 bottom-[100%] mb-2 left-1/2 transform -translate-x-1/2">
-          <div className="flex flex-col gap-2 bg-light-primary dark:bg-dark-primary border rounded-lg border-light-200 dark:border-dark-200 w-max max-w-[300px] p-4 max-h-[200px] md:max-h-none overflow-y-auto">
+        <PopoverPanel className="absolute z-10 w-64 md:w-[250px] right-0">
+          <div className="flex flex-col gap-2 bg-light-primary dark:bg-dark-primary border rounded-lg border-light-200 dark:border-dark-200 w-full p-4 max-h-[200px] md:max-h-none overflow-y-auto">
             {OptimizationModes.map((mode, i) => (
               <PopoverButton
-                onClick={() => handleOptimizationChange(mode.key)}
+                onClick={() => setOptimizationMode(mode.key)}
                 key={i}
                 disabled={mode.key === 'quality'}
                 className={cn(

src/components/MessageSources.tsx

@@ -1,11 +1,31 @@
 /* eslint-disable @next/next/no-img-element */
+import {
+  Dialog,
+  DialogPanel,
+  DialogTitle,
+  Transition,
+  TransitionChild,
+} from '@headlessui/react';
 import { Document } from '@langchain/core/documents';
 import { File } from 'lucide-react';
+import { Fragment, useState } from 'react';
 
 const MessageSources = ({ sources }: { sources: Document[] }) => {
+  const [isDialogOpen, setIsDialogOpen] = useState(false);
+
+  const closeModal = () => {
+    setIsDialogOpen(false);
+    document.body.classList.remove('overflow-hidden-scrollable');
+  };
+
+  const openModal = () => {
+    setIsDialogOpen(true);
+    document.body.classList.add('overflow-hidden-scrollable');
+  };
+
   return (
     <div className="grid grid-cols-2 lg:grid-cols-4 gap-2">
-      {sources.map((source, i) => (
+      {sources.slice(0, 3).map((source, i) => (
         <a
           className="bg-light-100 hover:bg-light-200 dark:bg-dark-100 dark:hover:bg-dark-200 transition duration-200 rounded-lg p-3 flex flex-col space-y-2 font-medium"
           key={i}
@@ -41,6 +61,101 @@ const MessageSources = ({ sources }: { sources: Document[] }) => {
           </div>
         </a>
       ))}
+      {sources.length > 3 && (
+        <button
+          onClick={openModal}
+          className="bg-light-100 hover:bg-light-200 dark:bg-dark-100 dark:hover:bg-dark-200 transition duration-200 rounded-lg p-3 flex flex-col space-y-2 font-medium"
+        >
+          <div className="flex flex-row items-center space-x-1">
+            {sources.slice(3, 6).map((source, i) => {
+              return source.metadata.url === 'File' ? (
+                <div
+                  key={i}
+                  className="bg-dark-200 hover:bg-dark-100 transition duration-200 flex items-center justify-center w-6 h-6 rounded-full"
+                >
+                  <File size={12} className="text-white/70" />
+                </div>
+              ) : (
+                <img
+                  key={i}
+                  src={`https://s2.googleusercontent.com/s2/favicons?domain_url=${source.metadata.url}`}
+                  width={16}
+                  height={16}
+                  alt="favicon"
+                  className="rounded-lg h-4 w-4"
+                />
+              );
+            })}
+          </div>
+          <p className="text-xs text-black/50 dark:text-white/50">
+            View {sources.length - 3} more
+          </p>
+        </button>
+      )}
+      <Transition appear show={isDialogOpen} as={Fragment}>
+        <Dialog as="div" className="relative z-50" onClose={closeModal}>
+          <div className="fixed inset-0 overflow-y-auto">
+            <div className="flex min-h-full items-center justify-center p-4 text-center">
+              <TransitionChild
+                as={Fragment}
+                enter="ease-out duration-200"
+                enterFrom="opacity-0 scale-95"
+                enterTo="opacity-100 scale-100"
+                leave="ease-in duration-100"
+                leaveFrom="opacity-100 scale-200"
+                leaveTo="opacity-0 scale-95"
+              >
+                <DialogPanel className="w-full max-w-md transform rounded-2xl bg-light-secondary dark:bg-dark-secondary border border-light-200 dark:border-dark-200 p-6 text-left align-middle shadow-xl transition-all">
+                  <DialogTitle className="text-lg font-medium leading-6 dark:text-white">
+                    Sources
+                  </DialogTitle>
+                  <div className="grid grid-cols-2 gap-2 overflow-auto max-h-[300px] mt-2 pr-2">
+                    {sources.map((source, i) => (
+                      <a
+                        className="bg-light-secondary hover:bg-light-200 dark:bg-dark-secondary dark:hover:bg-dark-200 border border-light-200 dark:border-dark-200 transition duration-200 rounded-lg p-3 flex flex-col space-y-2 font-medium"
+                        key={i}
+                        href={source.metadata.url}
+                        target="_blank"
+                      >
+                        <p className="dark:text-white text-xs overflow-hidden whitespace-nowrap text-ellipsis">
+                          {source.metadata.title}
+                        </p>
+                        <div className="flex flex-row items-center justify-between">
+                          <div className="flex flex-row items-center space-x-1">
+                            {source.metadata.url === 'File' ? (
+                              <div className="bg-dark-200 hover:bg-dark-100 transition duration-200 flex items-center justify-center w-6 h-6 rounded-full">
+                                <File size={12} className="text-white/70" />
+                              </div>
+                            ) : (
+                              <img
+                                src={`https://s2.googleusercontent.com/s2/favicons?domain_url=${source.metadata.url}`}
+                                width={16}
+                                height={16}
+                                alt="favicon"
+                                className="rounded-lg h-4 w-4"
+                              />
+                            )}
+                            <p className="text-xs text-black/50 dark:text-white/50 overflow-hidden whitespace-nowrap text-ellipsis">
+                              {source.metadata.url.replace(
+                                /.+\/\/|www.|\..+/g,
+                                '',
+                              )}
+                            </p>
+                          </div>
+                          <div className="flex flex-row items-center space-x-1 text-black/50 dark:text-white/50 text-xs">
+                            <div className="bg-black/50 dark:bg-white/50 h-[4px] w-[4px] rounded-full" />
+                            <span>{i + 1}</span>
+                          </div>
+                        </div>
+                      </a>
+                    ))}
+                  </div>
+                </DialogPanel>
+              </TransitionChild>
+            </div>
+          </div>
+        </Dialog>
+      </Transition>
     </div>
   );
 };

src/components/MessageTabs.tsx

@@ -1,535 +0,0 @@
-/* eslint-disable @next/next/no-img-element */
-'use client';
-
-import { getSuggestions } from '@/lib/actions';
-import { cn } from '@/lib/utils';
-import {
-  BookCopy,
-  CheckCheck,
-  Copy as CopyIcon,
-  Disc3,
-  ImagesIcon,
-  Layers3,
-  Plus,
-  Sparkles,
-  StopCircle,
-  VideoIcon,
-  Volume2,
-} from 'lucide-react';
-import Markdown, { MarkdownToJSX } from 'markdown-to-jsx';
-import { useEffect, useState } from 'react';
-import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter';
-import { oneDark } from 'react-syntax-highlighter/dist/cjs/styles/prism';
-import { useSpeech } from 'react-text-to-speech';
-import { Message } from './ChatWindow';
-import Copy from './MessageActions/Copy';
-import ModelInfoButton from './MessageActions/ModelInfo';
-import Rewrite from './MessageActions/Rewrite';
-import MessageSources from './MessageSources';
-import SearchImages from './SearchImages';
-import SearchVideos from './SearchVideos';
-import ThinkBox from './ThinkBox';
-
-const ThinkTagProcessor = ({ children }: { children: React.ReactNode }) => {
-  return <ThinkBox content={children as string} />;
-};
-
-const CodeBlock = ({
-  className,
-  children,
-}: {
-  className?: string;
-  children: React.ReactNode;
-}) => {
-  // Extract language from className (format could be "language-javascript" or "lang-javascript")
-  let language = '';
-  if (className) {
-    if (className.startsWith('language-')) {
-      language = className.replace('language-', '');
-    } else if (className.startsWith('lang-')) {
-      language = className.replace('lang-', '');
-    }
-  }
-
-  const content = children as string;
-  const [isCopied, setIsCopied] = useState(false);
-
-  const handleCopyCode = () => {
-    navigator.clipboard.writeText(content);
-    setIsCopied(true);
-    setTimeout(() => setIsCopied(false), 2000);
-  };
-
-  return (
-    <div className="rounded-md overflow-hidden my-4 relative group border border-dark-secondary">
-      <div className="flex justify-between items-center px-4 py-2 bg-dark-200 border-b border-dark-secondary text-xs text-white/70 font-mono">
-        <span>{language}</span>
-        <button
-          onClick={handleCopyCode}
-          className="p-1 rounded-md hover:bg-dark-secondary transition duration-200"
-          aria-label="Copy code to clipboard"
-        >
-          {isCopied ? (
-            <CheckCheck size={14} className="text-green-500" />
-          ) : (
-            <CopyIcon size={14} className="text-white/70" />
-          )}
-        </button>
-      </div>
-      <SyntaxHighlighter
-        language={language || 'text'}
-        style={oneDark}
-        customStyle={{
-          margin: 0,
-          padding: '1rem',
-          borderRadius: 0,
-          backgroundColor: '#1c1c1c',
-        }}
-        wrapLines={true}
-        wrapLongLines={true}
-        showLineNumbers={language !== '' && content.split('\n').length > 1}
-        useInlineStyles={true}
-        PreTag="div"
-      >
-        {content}
-      </SyntaxHighlighter>
-    </div>
-  );
-};
-
-type TabType = 'text' | 'sources' | 'images' | 'videos';
-
-interface SearchTabsProps {
-  chatHistory: Message[];
-  query: string;
-  messageId: string;
-  message: Message;
-  isLast: boolean;
-  loading: boolean;
-  rewrite: (messageId: string) => void;
-  sendMessage: (
-    message: string,
-    options?: {
-      messageId?: string;
-      rewriteIndex?: number;
-      suggestions?: string[];
-    },
-  ) => void;
-}
-
-const MessageTabs = ({
-  chatHistory,
-  query,
-  messageId,
-  message,
-  isLast,
-  loading,
-  rewrite,
-  sendMessage,
-}: SearchTabsProps) => {
-  const [activeTab, setActiveTab] = useState<TabType>('text');
-  const [imageCount, setImageCount] = useState(0);
-  const [videoCount, setVideoCount] = useState(0);
-  const [parsedMessage, setParsedMessage] = useState(message.content);
-  const [speechMessage, setSpeechMessage] = useState(message.content);
-  const [loadingSuggestions, setLoadingSuggestions] = useState(false);
-  const { speechStatus, start, stop } = useSpeech({ text: speechMessage });
-
-  // Callback functions to update counts
-  const updateImageCount = (count: number) => {
-    setImageCount(count);
-  };
-
-  const updateVideoCount = (count: number) => {
-    setVideoCount(count);
-  };
-
-  // Load suggestions handling
-  const handleLoadSuggestions = async () => {
-    if (
-      loadingSuggestions ||
-      (message?.suggestions && message.suggestions.length > 0)
-    )
-      return;
-
-    setLoadingSuggestions(true);
-    try {
-      const suggestions = await getSuggestions([...chatHistory, message]);
-      // Update the message.suggestions property through parent component
-      sendMessage('', { messageId: message.messageId, suggestions });
-    } catch (error) {
-      console.error('Error loading suggestions:', error);
-    } finally {
-      setLoadingSuggestions(false);
-    }
-  };
-
-  // Process message content
-  useEffect(() => {
-    const citationRegex = /\[([^\]]+)\]/g;
-    const regex = /\[(\d+)\]/g;
-    let processedMessage = message.content;
-
-    if (message.role === 'assistant' && message.content.includes('<think>')) {
-      const openThinkTag = processedMessage.match(/<think>/g)?.length || 0;
-      const closeThinkTag = processedMessage.match(/<\/think>/g)?.length || 0;
-
-      if (openThinkTag > closeThinkTag) {
-        processedMessage += '</think> <a> </a>'; // The extra <a> </a> is to prevent the think component from looking bad
-      }
-    }
-
-    if (
-      message.role === 'assistant' &&
-      message?.sources &&
-      message.sources.length > 0
-    ) {
-      setParsedMessage(
-        processedMessage.replace(
-          citationRegex,
-          (_, capturedContent: string) => {
-            const numbers = capturedContent
-              .split(',')
-              .map((numStr) => numStr.trim());
-
-            const linksHtml = numbers
-              .map((numStr) => {
-                const number = parseInt(numStr);
-
-                if (isNaN(number) || number <= 0) {
-                  return `[${numStr}]`;
-                }
-
-                const source = message.sources?.[number - 1];
-                const url = source?.metadata?.url;
-
-                if (url) {
-                  return `<a href="${url}" target="_blank" className="bg-light-secondary dark:bg-dark-secondary px-1 rounded ml-1 no-underline text-xs text-black/70 dark:text-white/70 relative">${numStr}</a>`;
-                } else {
-                  return `[${numStr}]`;
-                }
-              })
-              .join('');
-
-            return linksHtml;
-          },
-        ),
-      );
-      setSpeechMessage(message.content.replace(regex, ''));
-      return;
-    }
-
-    setSpeechMessage(message.content.replace(regex, ''));
-    setParsedMessage(processedMessage);
-  }, [message.content, message.sources, message.role]);
-
-  // Auto-suggest effect (similar to MessageBox)
-  useEffect(() => {
-    const autoSuggestions = localStorage.getItem('autoSuggestions');
-    if (
-      isLast &&
-      message.role === 'assistant' &&
-      !loading &&
-      autoSuggestions === 'true'
-    ) {
-      handleLoadSuggestions();
-    }
-  }, [isLast, loading, message.role]);
-
-  // Markdown formatting options
-  const markdownOverrides: MarkdownToJSX.Options = {
-    overrides: {
-      think: {
-        component: ThinkTagProcessor,
-      },
-      code: {
-        component: ({ className, children }) => {
-          // Check if it's an inline code block or a fenced code block
-          if (className) {
-            // This is a fenced code block (```code```)
-            return <CodeBlock className={className}>{children}</CodeBlock>;
-          }
-          // This is an inline code block (`code`)
-          return (
-            <code className="px-1.5 py-0.5 rounded bg-dark-secondary text-white font-mono text-sm">
-              {children}
-            </code>
-          );
-        },
-      },
-      pre: {
-        component: ({ children }) => children,
-      },
-    },
-  };
-
-  return (
-    <div className="flex flex-col w-full">
-      {/* Tabs */}
-      <div className="flex border-b border-light-200 dark:border-dark-200 overflow-x-auto no-scrollbar sticky top-0 bg-light-primary dark:bg-dark-primary z-10 -mx-4 px-4 mb-2 shadow-sm">
-        <button
-          onClick={() => setActiveTab('text')}
-          className={cn(
-            'flex items-center px-4 py-3 text-sm font-medium transition-all duration-200 relative',
-            activeTab === 'text'
-              ? 'border-b-2 border-[#24A0ED] text-[#24A0ED] bg-light-100 dark:bg-dark-100'
-              : 'text-black/70 dark:text-white/70 hover:text-black dark:hover:text-white hover:bg-light-100 dark:hover:bg-dark-100',
-          )}
-          aria-selected={activeTab === 'text'}
-          role="tab"
-        >
-          <Disc3 size={16} className="mr-2" />
-          <span className="whitespace-nowrap">Answer</span>
-        </button>
-
-        {message.sources && message.sources.length > 0 && (
-          <button
-            onClick={() => setActiveTab('sources')}
-            className={cn(
-              'flex items-center space-x-2 px-4 py-3 text-sm font-medium transition-all duration-200 relative',
-              activeTab === 'sources'
-                ? 'border-b-2 border-[#24A0ED] text-[#24A0ED] bg-light-100 dark:bg-dark-100'
-                : 'text-black/70 dark:text-white/70 hover:text-black dark:hover:text-white hover:bg-light-100 dark:hover:bg-dark-100',
-            )}
-            aria-selected={activeTab === 'sources'}
-            role="tab"
-          >
-            <BookCopy size={16} />
-            <span className="whitespace-nowrap">Sources</span>
-            <span
-              className={cn(
-                'ml-1.5 px-1.5 py-0.5 text-xs rounded-full',
-                activeTab === 'sources'
-                  ? 'bg-[#24A0ED]/20 text-[#24A0ED]'
-                  : 'bg-light-200 dark:bg-dark-200 text-black/70 dark:text-white/70',
-              )}
-            >
-              {message.sources.length}
-            </span>
-          </button>
-        )}
-
-        <button
-          onClick={() => setActiveTab('images')}
-          className={cn(
-            'flex items-center space-x-2 px-4 py-3 text-sm font-medium transition-all duration-200 relative',
-            activeTab === 'images'
-              ? 'border-b-2 border-[#24A0ED] text-[#24A0ED] bg-light-100 dark:bg-dark-100'
-              : 'text-black/70 dark:text-white/70 hover:text-black dark:hover:text-white hover:bg-light-100 dark:hover:bg-dark-100',
-          )}
-          aria-selected={activeTab === 'images'}
-          role="tab"
-        >
-          <ImagesIcon size={16} />
-          <span className="whitespace-nowrap">Images</span>
-          {imageCount > 0 && (
-            <span
-              className={cn(
-                'ml-1.5 px-1.5 py-0.5 text-xs rounded-full',
-                activeTab === 'images'
-                  ? 'bg-[#24A0ED]/20 text-[#24A0ED]'
-                  : 'bg-light-200 dark:bg-dark-200 text-black/70 dark:text-white/70',
-              )}
-            >
-              {imageCount}
-            </span>
-          )}
-        </button>
-
-        <button
-          onClick={() => setActiveTab('videos')}
-          className={cn(
-            'flex items-center space-x-2 px-4 py-3 text-sm font-medium transition-all duration-200 relative',
-            activeTab === 'videos'
-              ? 'border-b-2 border-[#24A0ED] text-[#24A0ED] bg-light-100 dark:bg-dark-100'
-              : 'text-black/70 dark:text-white/70 hover:text-black dark:hover:text-white hover:bg-light-100 dark:hover:bg-dark-100',
-          )}
-          aria-selected={activeTab === 'videos'}
-          role="tab"
-        >
-          <VideoIcon size={16} />
-          <span className="whitespace-nowrap">Videos</span>
-          {videoCount > 0 && (
-            <span
-              className={cn(
-                'ml-1.5 px-1.5 py-0.5 text-xs rounded-full',
-                activeTab === 'videos'
-                  ? 'bg-[#24A0ED]/20 text-[#24A0ED]'
-                  : 'bg-light-200 dark:bg-dark-200 text-black/70 dark:text-white/70',
-              )}
-            >
-              {videoCount}
-            </span>
-          )}
-        </button>
-      </div>
-
-      {/* Tab content */}
-      <div
-        className="min-h-[150px] transition-all duration-200 ease-in-out"
-        role="tabpanel"
-      >
-        {/* Answer Tab */}
-        {activeTab === 'text' && (
-          <div className="flex flex-col space-y-4 animate-fadeIn">
-            <Markdown
-              className={cn(
-                'prose prose-h1:mb-3 prose-h2:mb-2 prose-h2:mt-6 prose-h2:font-[800] prose-h3:mt-4 prose-h3:mb-1.5 prose-h3:font-[600] prose-invert prose-p:leading-relaxed prose-pre:p-0 font-[400]',
-                'prose-code:bg-transparent prose-code:p-0 prose-code:text-inherit prose-code:font-normal prose-code:before:content-none prose-code:after:content-none',
-                'prose-pre:bg-transparent prose-pre:border-0 prose-pre:m-0 prose-pre:p-0',
-                'max-w-none break-words px-4 text-black dark:text-white',
-              )}
-              options={markdownOverrides}
-            >
-              {parsedMessage}
-            </Markdown>
-
-            {loading && isLast ? null : (
-              <div className="flex flex-row items-center justify-between w-full text-black dark:text-white px-4 py-4">
-                <div className="flex flex-row items-center space-x-1">
-                  <Rewrite rewrite={rewrite} messageId={message.messageId} />
-                  {message.modelStats && (
-                    <ModelInfoButton modelStats={message.modelStats} />
-                  )}
-                </div>
-                <div className="flex flex-row items-center space-x-1">
-                  <Copy initialMessage={message.content} message={message} />
-                  <button
-                    onClick={() => {
-                      if (speechStatus === 'started') {
-                        stop();
-                      } else {
-                        start();
-                      }
-                    }}
-                    className="p-2 text-black/70 dark:text-white/70 rounded-xl hover:bg-light-secondary dark:hover:bg-dark-secondary transition duration-200 hover:text-black dark:hover:text-white"
-                  >
-                    {speechStatus === 'started' ? (
-                      <StopCircle size={18} />
-                    ) : (
-                      <Volume2 size={18} />
-                    )}
-                  </button>
-                </div>
-              </div>
-            )}
-
-            {isLast && message.role === 'assistant' && !loading && (
-              <>
-                <div className="border-t border-light-secondary dark:border-dark-secondary px-4 pt-4 mt-4">
-                  <div className="flex flex-row items-center space-x-2 mb-3">
-                    <Layers3 size={20} />
-                    <h3 className="text-xl font-medium">Related</h3>
-
-                    {(!message.suggestions ||
-                      message.suggestions.length === 0) && (
-                      <button
-                        onClick={handleLoadSuggestions}
-                        disabled={loadingSuggestions}
-                        className="px-4 py-2 flex flex-row items-center justify-center space-x-2 rounded-lg bg-light-secondary dark:bg-dark-secondary hover:bg-light-200 dark:hover:bg-dark-200 transition duration-200 text-black/70 dark:text-white/70 hover:text-black dark:hover:text-white"
-                      >
-                        {loadingSuggestions ? (
-                          <div className="w-4 h-4 border-2 border-t-transparent border-gray-400 dark:border-gray-500 rounded-full animate-spin" />
-                        ) : (
-                          <Sparkles size={16} />
-                        )}
-                        <span>
-                          {loadingSuggestions
-                            ? 'Loading suggestions...'
-                            : 'Load suggestions'}
-                        </span>
-                      </button>
-                    )}
-                  </div>
-
-                  {message.suggestions && message.suggestions.length > 0 && (
-                    <div className="flex flex-col space-y-3 mt-2">
-                      {message.suggestions.map((suggestion, i) => (
-                        <div
-                          className="flex flex-col space-y-3 text-sm"
-                          key={i}
-                        >
-                          <div className="h-px w-full bg-light-secondary dark:bg-dark-secondary" />
-                          <div
-                            onClick={() => {
-                              sendMessage(suggestion);
-                            }}
-                            className="cursor-pointer flex flex-row justify-between font-medium space-x-2 items-center"
-                          >
-                            <p className="transition duration-200 hover:text-[#24A0ED]">
-                              {suggestion}
-                            </p>
-                            <Plus
-                              size={20}
-                              className="text-[#24A0ED] flex-shrink-0"
-                            />
-                          </div>
-                        </div>
-                      ))}
-                    </div>
-                  )}
-                </div>
-              </>
-            )}
-          </div>
-        )}
-
-        {/* Sources Tab */}
-        {activeTab === 'sources' &&
-          message.sources &&
-          message.sources.length > 0 && (
-            <div className="p-4 animate-fadeIn">
-              {message.searchQuery && (
-                <div className="mb-4 text-sm bg-light-secondary dark:bg-dark-secondary rounded-lg p-3">
-                  <span className="font-medium text-black/70 dark:text-white/70">
-                    Search query:
-                  </span>{' '}
-                  {message.searchUrl ? (
-                    <a
-                      href={message.searchUrl}
-                      target="_blank"
-                      rel="noopener noreferrer"
-                      className="dark:text-white text-black hover:underline"
-                    >
-                      {message.searchQuery}
-                    </a>
-                  ) : (
-                    <span className="text-black dark:text-white">
-                      {message.searchQuery}
-                    </span>
-                  )}
-                </div>
-              )}
-              <MessageSources sources={message.sources} />
-            </div>
-          )}
-
-        {/* Images Tab */}
-        {activeTab === 'images' && (
-          <div className="p-3 animate-fadeIn">
-            <SearchImages
-              query={query}
-              chatHistory={chatHistory}
-              messageId={messageId}
-              onImagesLoaded={updateImageCount}
-            />
-          </div>
-        )}
-
-        {/* Videos Tab */}
-        {activeTab === 'videos' && (
-          <div className="p-3 animate-fadeIn">
-            <SearchVideos
-              query={query}
-              chatHistory={chatHistory}
-              messageId={messageId}
-              onVideosLoaded={updateVideoCount}
-            />
-          </div>
-        )}
-      </div>
-    </div>
-  );
-};
-
-export default MessageTabs;

src/components/SearchImages.tsx

@@ -1,5 +1,6 @@
 /* eslint-disable @next/next/no-img-element */
-import { useEffect, useRef, useState } from 'react';
+import { ImagesIcon, PlusIcon } from 'lucide-react';
+import { useState } from 'react';
 import Lightbox from 'yet-another-react-lightbox';
 import 'yet-another-react-lightbox/styles.css';
 import { Message } from './ChatWindow';
@@ -14,98 +15,71 @@ const SearchImages = ({
   query,
   chatHistory,
   messageId,
-  onImagesLoaded,
 }: {
   query: string;
   chatHistory: Message[];
   messageId: string;
-  onImagesLoaded?: (count: number) => void;
 }) => {
   const [images, setImages] = useState<Image[] | null>(null);
-  const [loading, setLoading] = useState(true);
+  const [loading, setLoading] = useState(false);
   const [open, setOpen] = useState(false);
   const [slides, setSlides] = useState<any[]>([]);
-  const [displayLimit, setDisplayLimit] = useState(10); // Initially show only 10 images
-  const loadedMessageIdsRef = useRef<Set<string>>(new Set());
-
-  // Function to show more images when the Show More button is clicked
-  const handleShowMore = () => {
-    // If we're already showing all images, don't do anything
-    if (images && displayLimit >= images.length) return;
-    
-    // Otherwise, increase the display limit by 10, or show all images
-    setDisplayLimit(prev => images ? Math.min(prev + 10, images.length) : prev);
-  };
-
-  useEffect(() => {
-    // Skip fetching if images are already loaded for this message
-    if (loadedMessageIdsRef.current.has(messageId)) {
-      return;
-    }
-
-    const fetchImages = async () => {
-      // Mark as loaded to prevent refetching
-      loadedMessageIdsRef.current.add(messageId);
-      setLoading(true);
-
-      const chatModelProvider = localStorage.getItem('chatModelProvider');
-      const chatModel = localStorage.getItem('chatModel');
-      const customOpenAIBaseURL = localStorage.getItem('openAIBaseURL');
-      const customOpenAIKey = localStorage.getItem('openAIApiKey');
-      const ollamaContextWindow =
-        localStorage.getItem('ollamaContextWindow') || '2048';
-
-      try {
-        const res = await fetch(`/api/images`, {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-          },
-          body: JSON.stringify({
-            query: query,
-            chatHistory: chatHistory,
-            chatModel: {
-              provider: chatModelProvider,
-              model: chatModel,
-              ...(chatModelProvider === 'custom_openai' && {
-                customOpenAIBaseURL: customOpenAIBaseURL,
-                customOpenAIKey: customOpenAIKey,
-              }),
-              ...(chatModelProvider === 'ollama' && {
-                ollamaContextWindow: parseInt(ollamaContextWindow),
-              }),
-            },
-          }),
-        });
-
-        const data = await res.json();
-
-        const images = data.images ?? [];
-        setImages(images);
-        setSlides(
-          images.map((image: Image) => {
-            return {
-              src: image.img_src,
-            };
-          }),
-        );
-        if (onImagesLoaded && images.length > 0) {
-          onImagesLoaded(images.length);
-        }
-        
-      } catch (error) {
-        console.error('Error fetching images:', error);
-      } finally {
-        setLoading(false);
-      }
-    };
-
-    fetchImages();
-
-  }, [query, messageId, chatHistory, onImagesLoaded]);
 
   return (
     <>
+      {!loading && images === null && (
+        <button
+          id={`search-images-${messageId}`}
+          onClick={async () => {
+            setLoading(true);
+
+            const chatModelProvider = localStorage.getItem('chatModelProvider');
+            const chatModel = localStorage.getItem('chatModel');
+
+            const customOpenAIBaseURL = localStorage.getItem('openAIBaseURL');
+            const customOpenAIKey = localStorage.getItem('openAIApiKey');
+
+            const res = await fetch(`/api/images`, {
+              method: 'POST',
+              headers: {
+                'Content-Type': 'application/json',
+              },
+              body: JSON.stringify({
+                query: query,
+                chatHistory: chatHistory,
+                chatModel: {
+                  provider: chatModelProvider,
+                  model: chatModel,
+                  ...(chatModelProvider === 'custom_openai' && {
+                    customOpenAIBaseURL: customOpenAIBaseURL,
+                    customOpenAIKey: customOpenAIKey,
+                  }),
+                },
+              }),
+            });
+
+            const data = await res.json();
+
+            const images = data.images ?? [];
+            setImages(images);
+            setSlides(
+              images.map((image: Image) => {
+                return {
+                  src: image.img_src,
+                };
+              }),
+            );
+            setLoading(false);
+          }}
+          className="border border-dashed border-light-200 dark:border-dark-200 hover:bg-light-200 dark:hover:bg-dark-200 active:scale-95 duration-200 transition px-4 py-2 flex flex-row items-center justify-between rounded-lg dark:text-white text-sm w-full"
+        >
+          <div className="flex flex-row items-center space-x-2">
+            <ImagesIcon size={17} />
+            <p>Search images</p>
+          </div>
+          <PlusIcon className="text-[#24A0ED]" size={17} />
+        </button>
+      )}
       {loading && (
         <div className="grid grid-cols-2 gap-2">
           {[...Array(4)].map((_, i) => (
@@ -118,35 +92,61 @@ const SearchImages = ({
       )}
       {images !== null && images.length > 0 && (
         <>
-          <div className="grid grid-cols-2 gap-2" key={`image-results-${messageId}`}>
-            {images.slice(0, displayLimit).map((image, i) => (
-              <img
-                onClick={() => {
-                  setOpen(true);
-                  setSlides([
-                    slides[i],
-                    ...slides.slice(0, i),
-                    ...slides.slice(i + 1),
-                  ]);
-                }}
-                key={i}
-                src={image.img_src}
-                alt={image.title}
-                className="h-full w-full aspect-video object-cover rounded-lg transition duration-200 active:scale-95 hover:scale-[1.02] cursor-zoom-in"
-              />
-            ))}
-          </div>
-          {images.length > displayLimit && (
-            <div className="flex justify-center mt-4">
+          <div className="grid grid-cols-2 gap-2">
+            {images.length > 4
+              ? images.slice(0, 3).map((image, i) => (
+                  <img
+                    onClick={() => {
+                      setOpen(true);
+                      setSlides([
+                        slides[i],
+                        ...slides.slice(0, i),
+                        ...slides.slice(i + 1),
+                      ]);
+                    }}
+                    key={i}
+                    src={image.img_src}
+                    alt={image.title}
+                    className="h-full w-full aspect-video object-cover rounded-lg transition duration-200 active:scale-95 hover:scale-[1.02] cursor-zoom-in"
+                  />
+                ))
+              : images.map((image, i) => (
+                  <img
+                    onClick={() => {
+                      setOpen(true);
+                      setSlides([
+                        slides[i],
+                        ...slides.slice(0, i),
+                        ...slides.slice(i + 1),
+                      ]);
+                    }}
+                    key={i}
+                    src={image.img_src}
+                    alt={image.title}
+                    className="h-full w-full aspect-video object-cover rounded-lg transition duration-200 active:scale-95 hover:scale-[1.02] cursor-zoom-in"
+                  />
+                ))}
+            {images.length > 4 && (
               <button
-                onClick={handleShowMore}
-                className="px-4 py-2 bg-light-secondary dark:bg-dark-secondary hover:bg-light-200 dark:hover:bg-dark-200 text-black/70 dark:text-white/70 hover:text-black dark:hover:text-white rounded-md transition duration-200 flex items-center space-x-2"
+                onClick={() => setOpen(true)}
+                className="bg-light-100 hover:bg-light-200 dark:bg-dark-100 dark:hover:bg-dark-200 transition duration-200 active:scale-95 hover:scale-[1.02] h-auto w-full rounded-lg flex flex-col justify-between text-white p-2"
               >
-                <span>Show More Images</span> 
-                <span className="text-sm opacity-75">({displayLimit} of {images.length})</span>
+                <div className="flex flex-row items-center space-x-1">
+                  {images.slice(3, 6).map((image, i) => (
+                    <img
+                      key={i}
+                      src={image.img_src}
+                      alt={image.title}
+                      className="h-6 w-12 rounded-md lg:h-3 lg:w-6 lg:rounded-sm aspect-video object-cover"
+                    />
+                  ))}
+                </div>
+                <p className="text-black/70 dark:text-white/70 text-xs">
+                  View {images.length - 3} more
+                </p>
               </button>
-            </div>
-          )}
+            )}
+          </div>
           <Lightbox open={open} close={() => setOpen(false)} slides={slides} />
         </>
       )}

src/components/SearchVideos.tsx

@@ -1,6 +1,6 @@
 /* eslint-disable @next/next/no-img-element */
-import { PlayCircle } from 'lucide-react';
-import { useEffect, useRef, useState } from 'react';
+import { PlayCircle, PlayIcon, PlusIcon, VideoIcon } from 'lucide-react';
+import { useRef, useState } from 'react';
 import Lightbox, { GenericSlide, VideoSlide } from 'yet-another-react-lightbox';
 import 'yet-another-react-lightbox/styles.css';
 import { Message } from './ChatWindow';
@@ -28,101 +28,75 @@ const Searchvideos = ({
   query,
   chatHistory,
   messageId,
-  onVideosLoaded,
 }: {
   query: string;
   chatHistory: Message[];
   messageId: string;
-  onVideosLoaded?: (count: number) => void;
 }) => {
   const [videos, setVideos] = useState<Video[] | null>(null);
-  const [loading, setLoading] = useState(true);
+  const [loading, setLoading] = useState(false);
   const [open, setOpen] = useState(false);
   const [slides, setSlides] = useState<VideoSlide[]>([]);
   const [currentIndex, setCurrentIndex] = useState(0);
-  const [displayLimit, setDisplayLimit] = useState(10); // Initially show only 10 videos
   const videoRefs = useRef<(HTMLIFrameElement | null)[]>([]);
-  const loadedMessageIdsRef = useRef<Set<string>>(new Set());
-
-  // Function to show more videos when the Show More button is clicked
-  const handleShowMore = () => {
-    // If we're already showing all videos, don't do anything
-    if (videos && displayLimit >= videos.length) return;
-    
-    // Otherwise, increase the display limit by 10, or show all videos
-    setDisplayLimit(prev => videos ? Math.min(prev + 10, videos.length) : prev);
-  };
-
-  useEffect(() => {
-    // Skip fetching if videos are already loaded for this message
-    if (loadedMessageIdsRef.current.has(messageId)) {
-      return;
-    }
-
-    const fetchVideos = async () => {
-      setLoading(true);
-
-      const chatModelProvider = localStorage.getItem('chatModelProvider');
-      const chatModel = localStorage.getItem('chatModel');
-      const customOpenAIBaseURL = localStorage.getItem('openAIBaseURL');
-      const customOpenAIKey = localStorage.getItem('openAIApiKey');
-      const ollamaContextWindow =
-        localStorage.getItem('ollamaContextWindow') || '2048';
-
-      try {
-        const res = await fetch(`/api/videos`, {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-          },
-          body: JSON.stringify({
-            query: query,
-            chatHistory: chatHistory,
-            chatModel: {
-              provider: chatModelProvider,
-              model: chatModel,
-              ...(chatModelProvider === 'custom_openai' && {
-                customOpenAIBaseURL: customOpenAIBaseURL,
-                customOpenAIKey: customOpenAIKey,
-              }),
-              ...(chatModelProvider === 'ollama' && {
-                ollamaContextWindow: parseInt(ollamaContextWindow),
-              }),
-            },
-          }),
-        });
-
-        const data = await res.json();
-
-        const videos = data.videos ?? [];
-        setVideos(videos);
-        setSlides(
-          videos.map((video: Video) => {
-            return {
-              type: 'video-slide',
-              iframe_src: video.iframe_src,
-              src: video.img_src,
-            };
-          }),
-        );
-        if (onVideosLoaded && videos.length > 0) {
-          onVideosLoaded(videos.length);
-        }
-        // Mark as loaded to prevent refetching
-        loadedMessageIdsRef.current.add(messageId);
-      } catch (error) {
-        console.error('Error fetching videos:', error);
-      } finally {
-        setLoading(false);
-      }
-    };
-
-    fetchVideos();
-
-  }, [query, messageId, chatHistory, onVideosLoaded]);
 
   return (
     <>
+      {!loading && videos === null && (
+        <button
+          id={`search-videos-${messageId}`}
+          onClick={async () => {
+            setLoading(true);
+
+            const chatModelProvider = localStorage.getItem('chatModelProvider');
+            const chatModel = localStorage.getItem('chatModel');
+
+            const customOpenAIBaseURL = localStorage.getItem('openAIBaseURL');
+            const customOpenAIKey = localStorage.getItem('openAIApiKey');
+
+            const res = await fetch(`/api/videos`, {
+              method: 'POST',
+              headers: {
+                'Content-Type': 'application/json',
+              },
+              body: JSON.stringify({
+                query: query,
+                chatHistory: chatHistory,
+                chatModel: {
+                  provider: chatModelProvider,
+                  model: chatModel,
+                  ...(chatModelProvider === 'custom_openai' && {
+                    customOpenAIBaseURL: customOpenAIBaseURL,
+                    customOpenAIKey: customOpenAIKey,
+                  }),
+                },
+              }),
+            });
+
+            const data = await res.json();
+
+            const videos = data.videos ?? [];
+            setVideos(videos);
+            setSlides(
+              videos.map((video: Video) => {
+                return {
+                  type: 'video-slide',
+                  iframe_src: video.iframe_src,
+                  src: video.img_src,
+                };
+              }),
+            );
+            setLoading(false);
+          }}
+          className="border border-dashed border-light-200 dark:border-dark-200 hover:bg-light-200 dark:hover:bg-dark-200 active:scale-95 duration-200 transition px-4 py-2 flex flex-row items-center justify-between rounded-lg dark:text-white text-sm w-full"
+        >
+          <div className="flex flex-row items-center space-x-2">
+            <VideoIcon size={17} />
+            <p>Search videos</p>
+          </div>
+          <PlusIcon className="text-[#24A0ED]" size={17} />
+        </button>
+      )}
       {loading && (
         <div className="grid grid-cols-2 gap-2">
           {[...Array(4)].map((_, i) => (
@@ -135,43 +109,77 @@ const Searchvideos = ({
       )}
       {videos !== null && videos.length > 0 && (
         <>
-          <div className="grid grid-cols-2 gap-2" key={`video-results-${messageId}`}>
-            {videos.slice(0, displayLimit).map((video, i) => (
-              <div
-                onClick={() => {
-                  setOpen(true);
-                  setSlides([
-                    slides[i],
-                    ...slides.slice(0, i),
-                    ...slides.slice(i + 1),
-                  ]);
-                }}
-                className="relative transition duration-200 active:scale-95 hover:scale-[1.02] cursor-pointer"
-                key={i}
-              >
-                <img
-                  src={video.img_src}
-                  alt={video.title}
-                  className="relative h-full w-full aspect-video object-cover rounded-lg"
-                />
-                <div className="absolute bg-white/70 dark:bg-black/70 text-black/70 dark:text-white/70 px-2 py-1 flex flex-row items-center space-x-1 bottom-1 right-1 rounded-md">
-                  <PlayCircle size={15} />
-                  <p className="text-xs">Video</p>
-                </div>
-              </div>
-            ))}
-          </div>
-          {videos.length > displayLimit && (
-            <div className="flex justify-center mt-4">
+          <div className="grid grid-cols-2 gap-2">
+            {videos.length > 4
+              ? videos.slice(0, 3).map((video, i) => (
+                  <div
+                    onClick={() => {
+                      setOpen(true);
+                      setSlides([
+                        slides[i],
+                        ...slides.slice(0, i),
+                        ...slides.slice(i + 1),
+                      ]);
+                    }}
+                    className="relative transition duration-200 active:scale-95 hover:scale-[1.02] cursor-pointer"
+                    key={i}
+                  >
+                    <img
+                      src={video.img_src}
+                      alt={video.title}
+                      className="relative h-full w-full aspect-video object-cover rounded-lg"
+                    />
+                    <div className="absolute bg-white/70 dark:bg-black/70 text-black/70 dark:text-white/70 px-2 py-1 flex flex-row items-center space-x-1 bottom-1 right-1 rounded-md">
+                      <PlayCircle size={15} />
+                      <p className="text-xs">Video</p>
+                    </div>
+                  </div>
+                ))
+              : videos.map((video, i) => (
+                  <div
+                    onClick={() => {
+                      setOpen(true);
+                      setSlides([
+                        slides[i],
+                        ...slides.slice(0, i),
+                        ...slides.slice(i + 1),
+                      ]);
+                    }}
+                    className="relative transition duration-200 active:scale-95 hover:scale-[1.02] cursor-pointer"
+                    key={i}
+                  >
+                    <img
+                      src={video.img_src}
+                      alt={video.title}
+                      className="relative h-full w-full aspect-video object-cover rounded-lg"
+                    />
+                    <div className="absolute bg-white/70 dark:bg-black/70 text-black/70 dark:text-white/70 px-2 py-1 flex flex-row items-center space-x-1 bottom-1 right-1 rounded-md">
+                      <PlayCircle size={15} />
+                      <p className="text-xs">Video</p>
+                    </div>
+                  </div>
+                ))}
+            {videos.length > 4 && (
               <button
-                onClick={handleShowMore}
-                className="px-4 py-2 bg-light-secondary dark:bg-dark-secondary hover:bg-light-200 dark:hover:bg-dark-200 text-black/70 dark:text-white/70 hover:text-black dark:hover:text-white rounded-md transition duration-200 flex items-center space-x-2"
+                onClick={() => setOpen(true)}
+                className="bg-light-100 hover:bg-light-200 dark:bg-dark-100 dark:hover:bg-dark-200 transition duration-200 active:scale-95 hover:scale-[1.02] h-auto w-full rounded-lg flex flex-col justify-between text-white p-2"
               >
-                <span>Show More Videos</span> 
-                <span className="text-sm opacity-75">({displayLimit} of {videos.length})</span>
+                <div className="flex flex-row items-center space-x-1">
+                  {videos.slice(3, 6).map((video, i) => (
+                    <img
+                      key={i}
+                      src={video.img_src}
+                      alt={video.title}
+                      className="h-6 w-12 rounded-md lg:h-3 lg:w-6 lg:rounded-sm aspect-video object-cover"
+                    />
+                  ))}
+                </div>
+                <p className="text-black/70 dark:text-white/70 text-xs">
+                  View {videos.length - 3} more
+                </p>
               </button>
-            </div>
-          )}
+            )}
+          </div>
           <Lightbox
             open={open}
             close={() => setOpen(false)}

src/lib/actions.ts

@@ -6,8 +6,6 @@ export const getSuggestions = async (chatHisory: Message[]) => {
 
   const customOpenAIKey = localStorage.getItem('openAIApiKey');
   const customOpenAIBaseURL = localStorage.getItem('openAIBaseURL');
-  const ollamaContextWindow =
-    localStorage.getItem('ollamaContextWindow') || '2048';
 
   const res = await fetch(`/api/suggestions`, {
     method: 'POST',
@@ -23,9 +21,6 @@ export const getSuggestions = async (chatHisory: Message[]) => {
           customOpenAIKey,
           customOpenAIBaseURL,
         }),
-        ...(chatModelProvider === 'ollama' && {
-          ollamaContextWindow: parseInt(ollamaContextWindow),
-        }),
       },
     }),
   });

src/lib/chains/imageSearchAgent.ts

@@ -6,73 +6,29 @@ import {
 import { PromptTemplate } from '@langchain/core/prompts';
 import formatChatHistoryAsString from '../utils/formatHistory';
 import { BaseMessage } from '@langchain/core/messages';
-import LineOutputParser from '../outputParsers/lineOutputParser';
+import { StringOutputParser } from '@langchain/core/output_parsers';
 import { searchSearxng } from '../searxng';
 import type { BaseChatModel } from '@langchain/core/language_models/chat_models';
 
 const imageSearchChainPrompt = `
-# Instructions
-- You will be given a question from a user and a conversation history
-- Rephrase the question based on the conversation so it is a standalone question that can be used to search for images that are relevant to the question
-- Ensure the rephrased question agrees with the conversation and is relevant to the conversation
-- If you are thinking or reasoning, use <think> tags to indicate your thought process
-- If you are thinking or reasoning, do not use <answer> and </answer> tags in your thinking. Those tags should only be used in the final output
-- Use the provided date to ensure the rephrased question is relevant to the current date and time if applicable
+You will be given a conversation below and a follow up question. You need to rephrase the follow-up question so it is a standalone question that can be used by the LLM to search the web for images.
+You need to make sure the rephrased question agrees with the conversation and is relevant to the conversation.
 
-# Data locations
-- The history is contained in the <conversation> tag after the <examples> below
-- The user question is contained in the <question> tag after the <examples> below
-- Output your answer in an <answer> tag
-- Current date & time in ISO format (UTC timezone) is: {date}
-- Do not include any other text in your answer
-  
-<examples>
-## Example 1 input
-<conversation>
-  Who won the last F1 race?\nAyrton Senna won the Monaco Grand Prix. It was a tight race with lots of overtakes. Alain Prost was in the lead for most of the race until the last lap when Senna overtook them.
-</conversation>
-<question>
-  What were the highlights of the race?
-</question>
+Example:
+1. Follow up question: What is a cat?
+Rephrased: A cat
 
-## Example 1 output
-<answer>
-  F1 Monaco Grand Prix highlights
-</answer>
+2. Follow up question: What is a car? How does it works?
+Rephrased: Car working
 
-## Example 2 input
-<conversation>
-  What is the theory of relativity?
-</conversation>
-<question>
-  What is the theory of relativity?
-</question>
+3. Follow up question: How does an AC work?
+Rephrased: AC working
 
-## Example 2 output
-<answer>
-  Theory of relativity
-</answer>
-
-## Example 3 input
-<conversation>
-  I'm looking for a nice vacation spot. Where do you suggest?\nI suggest you go to Hawaii. It's a beautiful place with lots of beaches and activities to do.\nI love the beach! What are some activities I can do there?\nYou can go surfing, snorkeling, or just relax on the beach.
-</conversation>
-<question>
-  What are some activities I can do in Hawaii?
-</question>
-
-## Example 3 output
-<answer>
-  Hawaii activities
-</answer>
-</examples>
-
-<conversation>
+Conversation:
 {chat_history}
-</conversation>
-<question>
-{query}
-</question>
+
+Follow up question: {query}
+Rephrased question:
 `;
 
 type ImageSearchChainInput = {
@@ -86,9 +42,7 @@ interface ImageSearchResult {
   title: string;
 }
 
-const outputParser = new LineOutputParser({
-  key: 'answer',
-});
+const strParser = new StringOutputParser();
 
 const createImageSearchChain = (llm: BaseChatModel) => {
   return RunnableSequence.from([
@@ -99,13 +53,14 @@ const createImageSearchChain = (llm: BaseChatModel) => {
       query: (input: ImageSearchChainInput) => {
         return input.query;
       },
-      date: () => new Date().toISOString(),
     }),
     PromptTemplate.fromTemplate(imageSearchChainPrompt),
     llm,
-    outputParser,
-    RunnableLambda.from(async (searchQuery: string) => {
-      const res = await searchSearxng(searchQuery, {
+    strParser,
+    RunnableLambda.from(async (input: string) => {
+      input = input.replace(/<think>.*?<\/think>/g, '');
+
+      const res = await searchSearxng(input, {
         engines: ['bing images', 'google images'],
       });
 
@@ -121,7 +76,7 @@ const createImageSearchChain = (llm: BaseChatModel) => {
         }
       });
 
-      return images;
+      return images.slice(0, 10);
     }),
   ]);
 };

src/lib/chains/suggestionGeneratorAgent.ts

@@ -10,7 +10,6 @@ const suggestionGeneratorPrompt = `
 You are an AI suggestion generator for an AI powered search engine. You will be given a conversation below. You need to generate 4-5 suggestions based on the conversation. The suggestion should be relevant to the conversation that can be used by the user to ask the chat model for more information.
 You need to make sure the suggestions are relevant to the conversation and are helpful to the user. Keep a note that the user might use these suggestions to ask a chat model for more information. 
 Make sure the suggestions are medium in length and are informative and relevant to the conversation.
-If you are a thinking or reasoning AI, you should avoid using \`<suggestions>\` and \`</suggestions>\` tags in your thinking. Those tags should only be used in the final output.
 
 Provide these suggestions separated by newlines between the XML tags <suggestions> and </suggestions>. For example:
 

src/lib/chains/videoSearchAgent.ts

@@ -6,74 +6,30 @@ import {
 import { PromptTemplate } from '@langchain/core/prompts';
 import formatChatHistoryAsString from '../utils/formatHistory';
 import { BaseMessage } from '@langchain/core/messages';
-import LineOutputParser from '../outputParsers/lineOutputParser';
+import { StringOutputParser } from '@langchain/core/output_parsers';
 import { searchSearxng } from '../searxng';
 import type { BaseChatModel } from '@langchain/core/language_models/chat_models';
 
 const VideoSearchChainPrompt = `
-# Instructions
-- You will be given a question from a user and a conversation history
-- Rephrase the question based on the conversation so it is a standalone question that can be used to search Youtube for videos
-- Ensure the rephrased question agrees with the conversation and is relevant to the conversation
-- If you are thinking or reasoning, use <think> tags to indicate your thought process
-- If you are thinking or reasoning, do not use <answer> and </answer> tags in your thinking. Those tags should only be used in the final output
-- Use the provided date to ensure the rephrased question is relevant to the current date and time if applicable
-
-# Data locations
-- The history is contained in the <conversation> tag after the <examples> below
-- The user question is contained in the <question> tag after the <examples> below
-- Output your answer in an <answer> tag
-- Current date & time in ISO format (UTC timezone) is: {date}
-- Do not include any other text in your answer
+  You will be given a conversation below and a follow up question. You need to rephrase the follow-up question so it is a standalone question that can be used by the LLM to search Youtube for videos.
+  You need to make sure the rephrased question agrees with the conversation and is relevant to the conversation.
   
-<examples>
-## Example 1 input
-<conversation>
-  Who won the last F1 race?\nAyrton Senna won the Monaco Grand Prix. It was a tight race with lots of overtakes. Alain Prost was in the lead for most of the race until the last lap when Senna overtook them.
-</conversation>
-<question>
-  What were the highlights of the race?
-</question>
-
-## Example 1 output
-<answer>
-  F1 Monaco Grand Prix highlights
-</answer>
-
-## Example 2 input
-<conversation>
-  What is the theory of relativity?
-</conversation>
-<question>
-  What is the theory of relativity?
-</question>
-
-## Example 2 output
-<answer>
-  What is the theory of relativity?
-</answer>
-
-## Example 3 input
-<conversation>
-  I'm looking for a nice vacation spot. Where do you suggest?\nI suggest you go to Hawaii. It's a beautiful place with lots of beaches and activities to do.\nI love the beach! What are some activities I can do there?\nYou can go surfing, snorkeling, or just relax on the beach.
-</conversation>
-<question>
-  What are some activities I can do in Hawaii?
-</question>
-
-## Example 3 output
-<answer>
-  Activities to do in Hawaii
-</answer>
-</examples>
-
-<conversation>
-{chat_history}
-</conversation>
-<question>
-{query}
-</question>
-`;
+  Example:
+  1. Follow up question: How does a car work?
+  Rephrased: How does a car work?
+  
+  2. Follow up question: What is the theory of relativity?
+  Rephrased: What is theory of relativity
+  
+  3. Follow up question: How does an AC work?
+  Rephrased: How does an AC work
+  
+  Conversation:
+  {chat_history}
+  
+  Follow up question: {query}
+  Rephrased question:
+  `;
 
 type VideoSearchChainInput = {
   chat_history: BaseMessage[];
@@ -87,9 +43,7 @@ interface VideoSearchResult {
   iframe_src: string;
 }
 
-const answerParser = new LineOutputParser({
-  key: 'answer',
-});
+const strParser = new StringOutputParser();
 
 const createVideoSearchChain = (llm: BaseChatModel) => {
   return RunnableSequence.from([
@@ -100,13 +54,14 @@ const createVideoSearchChain = (llm: BaseChatModel) => {
       query: (input: VideoSearchChainInput) => {
         return input.query;
       },
-      date: () => new Date().toISOString(),
     }),
     PromptTemplate.fromTemplate(VideoSearchChainPrompt),
     llm,
-    answerParser,
-    RunnableLambda.from(async (searchQuery: string) => {
-      const res = await searchSearxng(searchQuery, {
+    strParser,
+    RunnableLambda.from(async (input: string) => {
+      input = input.replace(/<think>.*?<\/think>/g, '');
+
+      const res = await searchSearxng(input, {
         engines: ['youtube'],
       });
 
@@ -128,7 +83,7 @@ const createVideoSearchChain = (llm: BaseChatModel) => {
         }
       });
 
-      return videos;
+      return videos.slice(0, 10);
     }),
   ]);
 };

src/lib/config.ts

@@ -15,7 +15,6 @@ interface Config {
   GENERAL: {
     SIMILARITY_MEASURE: string;
     KEEP_ALIVE: string;
-    BASE_URL?: string;
   };
   MODELS: {
     OPENAI: {
@@ -71,8 +70,6 @@ export const getSimilarityMeasure = () =>
 
 export const getKeepAlive = () => loadConfig().GENERAL.KEEP_ALIVE;
 
-export const getBaseUrl = () => loadConfig().GENERAL.BASE_URL;
-
 export const getOpenaiApiKey = () => loadConfig().MODELS.OPENAI.API_KEY;
 
 export const getGroqApiKey = () => loadConfig().MODELS.GROQ.API_KEY;

src/lib/outputParsers/lineOutputParser.ts

@@ -21,10 +21,6 @@ class LineOutputParser extends BaseOutputParser<string> {
   async parse(text: string): Promise<string> {
     text = text.trim() || '';
 
-    // First, remove all <think>...</think> blocks to avoid parsing tags inside thinking content
-    // This might be a little aggressive. Prompt massaging might be all we need, but this is a guarantee and should rarely mess anything up.
-    text = this.removeThinkingBlocks(text);
-
     const regex = /^(\s*(-|\*|\d+\.\s|\d+\)\s|\u2022)\s*)+/;
     const startKeyIndex = text.indexOf(`<${this.key}>`);
     const endKeyIndex = text.indexOf(`</${this.key}>`);
@@ -44,17 +40,6 @@ class LineOutputParser extends BaseOutputParser<string> {
     return line;
   }
 
-  /**
-   * Removes all content within <think>...</think> blocks
-   * @param text The input text containing thinking blocks
-   * @returns The text with all thinking blocks removed
-   */
-  private removeThinkingBlocks(text: string): string {
-    // Use regex to identify and remove all <think>...</think> blocks
-    // Using the 's' flag to make dot match newlines
-    return text.replace(/<think>[\s\S]*?<\/think>/g, '').trim();
-  }
-
   getFormatInstructions(): string {
     throw new Error('Not implemented.');
   }

src/lib/outputParsers/listLineOutputParser.ts

@@ -21,10 +21,6 @@ class LineListOutputParser extends BaseOutputParser<string[]> {
   async parse(text: string): Promise<string[]> {
     text = text.trim() || '';
 
-    // First, remove all <think>...</think> blocks to avoid parsing tags inside thinking content
-    // This might be a little aggressive. Prompt massaging might be all we need, but this is a guarantee and should rarely mess anything up.
-    text = this.removeThinkingBlocks(text);
-
     const regex = /^(\s*(-|\*|\d+\.\s|\d+\)\s|\u2022)\s*)+/;
     const startKeyIndex = text.indexOf(`<${this.key}>`);
     const endKeyIndex = text.indexOf(`</${this.key}>`);
@@ -46,17 +42,6 @@ class LineListOutputParser extends BaseOutputParser<string[]> {
     return lines;
   }
 
-  /**
-   * Removes all content within <think>...</think> blocks
-   * @param text The input text containing thinking blocks
-   * @returns The text with all thinking blocks removed
-   */
-  private removeThinkingBlocks(text: string): string {
-    // Use regex to identify and remove all <think>...</think> blocks
-    // Using [\s\S] pattern to match all characters including newlines
-    return text.replace(/<think>[\s\S]*?<\/think>/g, '').trim();
-  }
-
   getFormatInstructions(): string {
     throw new Error('Not implemented.');
   }

src/lib/prompts/chat.ts

@@ -1,19 +0,0 @@
-export const chatPrompt = `
-You are Perplexica, an AI model who is expert at having creative conversations with users. You are currently set on focus mode 'Chat', which means you will engage in a truly creative conversation without searching the web or citing sources.
-
-In Chat mode, you should be:
-- Creative and engaging in your responses
-- Helpful and informative based on your internal knowledge
-- Conversational and natural in your tone
-- Willing to explore ideas, hypothetical scenarios, and creative topics
-
-Since you are in Chat mode, you would not perform web searches or cite sources. If the user asks a question that would benefit from web search or specific data, you can suggest they switch to a different focus mode like 'All Mode' for general web search or another specialized mode.
-
-### User instructions
-These instructions are shared to you by the user and not by the system. You will have to follow them but give them less priority than the above instructions. If the user has provided specific instructions or preferences, incorporate them into your response while adhering to the overall guidelines.
-{systemInstructions}
-
-<context>
-{context}
-</context>
-`;

src/lib/prompts/index.ts

@@ -11,8 +11,7 @@ import {
   wolframAlphaSearchResponsePrompt,
   wolframAlphaSearchRetrieverPrompt,
 } from './wolframAlpha';
-import { localResearchPrompt } from './localResearch';
-import { chatPrompt } from './chat';
+import { writingAssistantPrompt } from './writingAssistant';
 import {
   youtubeSearchResponsePrompt,
   youtubeSearchRetrieverPrompt,
@@ -27,8 +26,7 @@ export default {
   redditSearchRetrieverPrompt,
   wolframAlphaSearchResponsePrompt,
   wolframAlphaSearchRetrieverPrompt,
-  localResearchPrompt,
-  chatPrompt,
+  writingAssistantPrompt,
   youtubeSearchResponsePrompt,
   youtubeSearchRetrieverPrompt,
 };

src/lib/prompts/webSearch.ts

@@ -1,131 +1,64 @@
 export const webSearchRetrieverPrompt = `
-# Instructions
-- You are an AI question rephraser
-- You will be given a conversation and a user question
-- Rephrase the question so it is appropriate for web search
-- Only add additional information or change the meaning of the question if it is necessary for clarity or relevance to the conversation
-- Condense the question to its essence and remove any unnecessary details
-- Ensure the question is grammatically correct and free of spelling errors
-- If it is a simple writing task or a greeting (unless the greeting contains a question after it) like Hi, Hello, How are you, etc. than a question then you need to return \`not_needed\` as the response in the <answer> XML block
-- If the user includes URLs or a PDF in their question, return the URLs or PDF links inside the <links> XML block and the question inside the <answer> XML block
-- If the user wants to you to summarize the webpage or the PDF, return summarize inside the <answer> XML block in place of a question and the URLs to summarize in the <links> XML block
-- If you are a thinking or reasoning AI, do not use <answer> and </answer> or <links> and </links> tags in your thinking. Those tags should only be used in the final output
-- If applicable, use the provided date to ensure the rephrased question is relevant to the current date and time
+You are an AI question rephraser. You will be given a conversation and a follow-up question,  you will have to rephrase the follow up question so it is a standalone question and can be used by another LLM to search the web for information to answer it.
+If it is a simple writing task or a greeting (unless the greeting contains a question after it) like Hi, Hello, How are you, etc. than a question then you need to return \`not_needed\` as the response (This is because the LLM won't need to search the web for finding information on this topic).
+If the user asks some question from some URL or wants you to summarize a PDF or a webpage (via URL) you need to return the links inside the \`links\` XML block and the question inside the \`question\` XML block. If the user wants to you to summarize the webpage or the PDF you need to return \`summarize\` inside the \`question\` XML block in place of a question and the link to summarize in the \`links\` XML block.
+You must always return the rephrased question inside the \`question\` XML block, if there are no links in the follow-up question then don't insert a \`links\` XML block in your response.
 
-# Data
-- The history is contained in the <conversation> tag after the <examples> below
-- The user question is contained in the <question> tag after the <examples> below
-- You must always return the rephrased question inside an <answer> XML block, if there are no links in the follow-up question then don't insert a <links> XML block in your response
-- Current date & time in ISO format (UTC timezone) is: {date}
-- Do not include any other text in your answer
-
-There are several examples attached for your reference inside the below examples XML block
+There are several examples attached for your reference inside the below \`examples\` XML block
 
 <examples>
-## Example 1 input
-<conversation>
-Who won the last F1 race?\nAyrton Senna won the Monaco Grand Prix. It was a tight race with lots of overtakes. Alain Prost was in the lead for most of the race until the last lap when Senna overtook them.
-</conversation>
+1. Follow up question: What is the capital of France
+Rephrased question:\`
 <question>
-What were the highlights of the race?
+Capital of france
 </question>
+\`
 
-## Example 1 output
-<answer>
-F1 Monaco Grand Prix highlights
-</answer>
-
-## Example 2 input
-<conversation>
-</conversation>
+2. Hi, how are you?
+Rephrased question\`
 <question>
-What is the capital of France
-</question>
-
-## Example 2 output
-<answer>
-Capital of France
-</answer>
-
-## Example 3 input
-<conversation>
-</conversation>
-<question>
-Hi, how are you?
-</question>
-
-## Example 3 output
-<answer>
 not_needed
-</answer>
-
-## Example 4 input
-<conversation>
-</conversation>
-<question>
-Can you tell me what is X from https://example.com
 </question>
+\`
 
-## Example 4 output
-<answer>
-Can you tell me what is X
-</answer>
+3. Follow up question: What is Docker?
+Rephrased question: \`
+<question>
+What is Docker
+</question>
+\`
+
+4. Follow up question: Can you tell me what is X from https://example.com
+Rephrased question: \`
+<question>
+Can you tell me what is X?
+</question>
 
 <links>
 https://example.com
 </links>
+\`
 
-## Example 5 input
-<conversation>
-</conversation>
+5. Follow up question: Summarize the content from https://example.com
+Rephrased question: \`
 <question>
-Summarize the content from https://example.com
-</question>
-
-## Example 5 output
-<answer>
 summarize
-</answer>
+</question>
 
 <links>
 https://example.com
 </links>
-
-## Example 6 input
-<conversation>
-</conversation>
-<question>
-Get the current F1 constructor standings and return the results in a table
-</question>
-
-## Example 6 output
-<answer>
-{date} F1 constructor standings
-</answer>
-
-## Example 7 input
-<conversation>
-</conversation>
-<question>
-What are the top 10 restaurants in New York? Show the results in a table and include a short description of each restaurant
-</question>
-
-## Example 7 output
-<answer>
-Top 10 restaurants in New York on {date}
-</answer>
-
+\`
 </examples>
 
-Everything below is the part of the actual conversation
+Anything below is the part of the actual conversation and you need to use conversation and the follow-up question to rephrase the follow-up question as a standalone question based on the guidelines shared above.
 
 <conversation>
 {chat_history}
 </conversation>
 
-<question>
-{query}
-</question>
+Follow up question: {query}
+Rephrased question:
 `;
 
 export const webSearchResponsePrompt = `

src/lib/prompts/writingAssistant.ts

@@ -1,6 +1,6 @@
-export const localResearchPrompt = `
-You are Perplexica, an AI model who is expert at searching the web and answering user's queries. You are currently set on focus mode 'Local Research', this means you will be helping the user research and interact with local files with citations. 
-Since you are in local research mode, you would not perform web searches. If you think you lack information to answer the query, you can ask the user for more information or suggest them to switch to a different focus mode.
+export const writingAssistantPrompt = `
+You are Perplexica, an AI model who is expert at searching the web and answering user's queries. You are currently set on focus mode 'Writing Assistant', this means you will be helping the user write a response to a given query. 
+Since you are a writing assistant, you would not perform web searches. If you think you lack information to answer the query, you can ask the user for more information or suggest them to switch to a different focus mode.
 You will be shared a context that can contain information from files user has uploaded to get answers from. You will have to generate answers upon that.
 
 You have to cite the answer using [number] notation. You must cite the sentences with their relevent context number. You must cite each and every part of the answer so the user can know where the information is coming from.

src/lib/providers/index.ts

@@ -96,14 +96,7 @@ export const getAvailableChatModelProviders = async () => {
   for (const provider in chatModelProviders) {
     const providerModels = await chatModelProviders[provider]();
     if (Object.keys(providerModels).length > 0) {
-      // Sort models alphabetically by their keys
-      const sortedModels: Record<string, ChatModel> = {};
-      Object.keys(providerModels)
-        .sort()
-        .forEach((key) => {
-          sortedModels[key] = providerModels[key];
-        });
-      models[provider] = sortedModels;
+      models[provider] = providerModels;
     }
   }
 
@@ -138,14 +131,7 @@ export const getAvailableEmbeddingModelProviders = async () => {
   for (const provider in embeddingModelProviders) {
     const providerModels = await embeddingModelProviders[provider]();
     if (Object.keys(providerModels).length > 0) {
-      // Sort embedding models alphabetically by their keys
-      const sortedModels: Record<string, EmbeddingModel> = {};
-      Object.keys(providerModels)
-        .sort()
-        .forEach((key) => {
-          sortedModels[key] = providerModels[key];
-        });
-      models[provider] = sortedModels;
+      models[provider] = providerModels;
     }
   }
 

src/lib/providers/ollama.ts

@@ -6,8 +6,8 @@ export const PROVIDER_INFO = {
   key: 'ollama',
   displayName: 'Ollama',
 };
-import { ChatOllama } from '@langchain/ollama';
-import { OllamaEmbeddings } from '@langchain/ollama';
+import { ChatOllama } from '@langchain/community/chat_models/ollama';
+import { OllamaEmbeddings } from '@langchain/community/embeddings/ollama';
 
 export const loadOllamaChatModels = async () => {
   const ollamaApiEndpoint = getOllamaApiEndpoint();

src/lib/search/index.ts

@@ -13,35 +13,26 @@ export const searchHandlers: Record<string, MetaSearchAgent> = {
   }),
   academicSearch: new MetaSearchAgent({
     activeEngines: ['arxiv', 'google scholar', 'pubmed'],
-    queryGeneratorPrompt: prompts.webSearchRetrieverPrompt,
-    responsePrompt: prompts.webSearchResponsePrompt,
+    queryGeneratorPrompt: prompts.academicSearchRetrieverPrompt,
+    responsePrompt: prompts.academicSearchResponsePrompt,
     rerank: true,
     rerankThreshold: 0,
     searchWeb: true,
     summarizer: false,
   }),
-  localResearch: new MetaSearchAgent({
+  writingAssistant: new MetaSearchAgent({
     activeEngines: [],
     queryGeneratorPrompt: '',
-    responsePrompt: prompts.localResearchPrompt,
+    responsePrompt: prompts.writingAssistantPrompt,
     rerank: true,
     rerankThreshold: 0,
     searchWeb: false,
     summarizer: false,
   }),
-  chat: new MetaSearchAgent({
-    activeEngines: [],
-    queryGeneratorPrompt: '',
-    responsePrompt: prompts.chatPrompt,
-    rerank: false,
-    rerankThreshold: 0,
-    searchWeb: false,
-    summarizer: false,
-  }),
   wolframAlphaSearch: new MetaSearchAgent({
     activeEngines: ['wolframalpha'],
-    queryGeneratorPrompt: prompts.webSearchRetrieverPrompt,
-    responsePrompt: prompts.webSearchResponsePrompt,
+    queryGeneratorPrompt: prompts.wolframAlphaSearchRetrieverPrompt,
+    responsePrompt: prompts.wolframAlphaSearchResponsePrompt,
     rerank: false,
     rerankThreshold: 0,
     searchWeb: true,
@@ -49,21 +40,20 @@ export const searchHandlers: Record<string, MetaSearchAgent> = {
   }),
   youtubeSearch: new MetaSearchAgent({
     activeEngines: ['youtube'],
-    queryGeneratorPrompt: prompts.webSearchRetrieverPrompt,
-    responsePrompt: prompts.webSearchResponsePrompt,
+    queryGeneratorPrompt: prompts.youtubeSearchRetrieverPrompt,
+    responsePrompt: prompts.youtubeSearchResponsePrompt,
     rerank: true,
     rerankThreshold: 0.3,
     searchWeb: true,
     summarizer: false,
   }),
   redditSearch: new MetaSearchAgent({
-    activeEngines: [],
-    queryGeneratorPrompt: prompts.webSearchRetrieverPrompt,
-    responsePrompt: prompts.webSearchResponsePrompt,
+    activeEngines: ['reddit'],
+    queryGeneratorPrompt: prompts.redditSearchRetrieverPrompt,
+    responsePrompt: prompts.redditSearchResponsePrompt,
     rerank: true,
     rerankThreshold: 0.3,
     searchWeb: true,
     summarizer: false,
-    additionalSearchCriteria: "site:reddit.com",
   }),
 };

src/lib/search/metaSearchAgent.ts

@@ -45,7 +45,6 @@ interface Config {
   queryGeneratorPrompt: string;
   responsePrompt: string;
   activeEngines: string[];
-  additionalSearchCriteria?: string;
 }
 
 type BasicChainInput = {
@@ -56,8 +55,6 @@ type BasicChainInput = {
 class MetaSearchAgent implements MetaSearchAgentType {
   private config: Config;
   private strParser = new StringOutputParser();
-  private searchQuery?: string;
-  private searxngUrl?: string;
 
   constructor(config: Config) {
     this.config = config;
@@ -71,19 +68,18 @@ class MetaSearchAgent implements MetaSearchAgentType {
       llm,
       this.strParser,
       RunnableLambda.from(async (input: string) => {
-        //console.log(`LLM response for initial web search:"${input}"`);
         const linksOutputParser = new LineListOutputParser({
           key: 'links',
         });
 
         const questionOutputParser = new LineOutputParser({
-          key: 'answer',
+          key: 'question',
         });
 
         const links = await linksOutputParser.parse(input);
-        let question = await questionOutputParser.parse(input);
-
-        //console.log('question', question);
+        let question = this.config.summarizer
+          ? await questionOutputParser.parse(input)
+          : input;
 
         if (question === 'not_needed') {
           return { query: '', docs: [] };
@@ -207,20 +203,14 @@ class MetaSearchAgent implements MetaSearchAgentType {
 
           return { query: question, docs: docs };
         } else {
-          
-          if (this.config.additionalSearchCriteria) {
-            question = `${question} ${this.config.additionalSearchCriteria}`;
-          }
+          question = question.replace(/<think>.*?<\/think>/g, '');
 
-          const searxngResult = await searchSearxng(question, {
+          const res = await searchSearxng(question, {
             language: 'en',
             engines: this.config.activeEngines,
           });
 
-          // Store the SearXNG URL for later use in emitting to the client
-          this.searxngUrl = searxngResult.searchUrl;
-
-          const documents = searxngResult.results.map(
+          const documents = res.results.map(
             (result) =>
               new Document({
                 pageContent:
@@ -236,7 +226,7 @@ class MetaSearchAgent implements MetaSearchAgentType {
               }),
           );
 
-          return { query: question, docs: documents, searchQuery: question };
+          return { query: question, docs: documents };
         }
       }),
     ]);
@@ -249,7 +239,6 @@ class MetaSearchAgent implements MetaSearchAgentType {
     optimizationMode: 'speed' | 'balanced' | 'quality',
     systemInstructions: string,
   ) {
-   
     return RunnableSequence.from([
       RunnableMap.from({
         systemInstructions: () => systemInstructions,
@@ -267,20 +256,14 @@ class MetaSearchAgent implements MetaSearchAgentType {
           if (this.config.searchWeb) {
             const searchRetrieverChain =
               await this.createSearchRetrieverChain(llm);
-            var date = new Date().toISOString();
+
             const searchRetrieverResult = await searchRetrieverChain.invoke({
               chat_history: processedHistory,
               query,
-              date,
             });
 
             query = searchRetrieverResult.query;
             docs = searchRetrieverResult.docs;
-
-            // Store the search query in the context for emitting to the client
-            if (searchRetrieverResult.searchQuery) {
-              this.searchQuery = searchRetrieverResult.searchQuery;
-            }
           }
 
           const sortedDocs = await this.rerankDocs(
@@ -451,30 +434,17 @@ class MetaSearchAgent implements MetaSearchAgentType {
   private async handleStream(
     stream: AsyncGenerator<StreamEvent, any, any>,
     emitter: eventEmitter,
-    llm: BaseChatModel,
   ) {
     for await (const event of stream) {
       if (
         event.event === 'on_chain_end' &&
         event.name === 'FinalSourceRetriever'
       ) {
-        const sourcesData = event.data.output;
-        if (this.searchQuery) {
-          emitter.emit(
-            'data',
-            JSON.stringify({
-              type: 'sources',
-              data: sourcesData,
-              searchQuery: this.searchQuery,
-              searchUrl: this.searxngUrl,
-            }),
-          );
-        } else {
-          emitter.emit(
-            'data',
-            JSON.stringify({ type: 'sources', data: sourcesData }),
-          );
-        }
+        ``;
+        emitter.emit(
+          'data',
+          JSON.stringify({ type: 'sources', data: event.data.output }),
+        );
       }
       if (
         event.event === 'on_chain_stream' &&
@@ -489,50 +459,6 @@ class MetaSearchAgent implements MetaSearchAgentType {
         event.event === 'on_chain_end' &&
         event.name === 'FinalResponseGenerator'
       ) {
-        // Get model name safely with better detection
-        let modelName = 'Unknown';
-        try {
-          // @ts-ignore - Different LLM implementations have different properties
-          if (llm.modelName) {
-            // @ts-ignore
-            modelName = llm.modelName;
-            // @ts-ignore
-          } else if (llm._llm && llm._llm.modelName) {
-            // @ts-ignore
-            modelName = llm._llm.modelName;
-            // @ts-ignore
-          } else if (llm.model && llm.model.modelName) {
-            // @ts-ignore
-            modelName = llm.model.modelName;
-          } else if ('model' in llm) {
-            // @ts-ignore
-            const model = llm.model;
-            if (typeof model === 'string') {
-              modelName = model;
-              // @ts-ignore
-            } else if (model && model.modelName) {
-              // @ts-ignore
-              modelName = model.modelName;
-            }
-          } else if (llm.constructor && llm.constructor.name) {
-            // Last resort: use the class name
-            modelName = llm.constructor.name;
-          }
-        } catch (e) {
-          console.error('Failed to get model name:', e);
-        }
-
-        // Send model info before ending
-        emitter.emit(
-          'stats',
-          JSON.stringify({
-            type: 'modelStats',
-            data: {
-              modelName,
-            },
-          }),
-        );
-
         emitter.emit('end');
       }
     }
@@ -567,7 +493,7 @@ class MetaSearchAgent implements MetaSearchAgentType {
       },
     );
 
-    this.handleStream(stream, emitter, llm);
+    this.handleStream(stream, emitter);
 
     return emitter;
   }

src/lib/searxng.ts

@@ -19,12 +19,6 @@ interface SearxngSearchResult {
   iframe_src?: string;
 }
 
-interface SearxngResponse {
-  results: SearxngSearchResult[];
-  suggestions: string[];
-  searchUrl: string;
-}
-
 export const searchSearxng = async (
   query: string,
   opts?: SearxngSearchOptions,
@@ -50,16 +44,5 @@ export const searchSearxng = async (
   const results: SearxngSearchResult[] = res.data.results;
   const suggestions: string[] = res.data.suggestions;
 
-  // Create a URL for viewing the search results in the SearXNG web interface
-  const searchUrl = new URL(searxngURL);
-  searchUrl.pathname = '/search';
-  searchUrl.searchParams.append('q', query);
-  if (opts?.engines?.length) {
-    searchUrl.searchParams.append('engines', opts.engines.join(','));
-  }
-  if (opts?.language) {
-    searchUrl.searchParams.append('language', opts.language);
-  }
-
-  return { results, suggestions, searchUrl: searchUrl.toString() };
+  return { results, suggestions };
 };