From db652116d6b5d22f758837b4f803af6b000e5b70 Mon Sep 17 00:00:00 2001
From: "DESKTOP-RTLN3BA\\$punk" <vermarohanfinal@gmail.com>
Date: Mon, 9 Feb 2026 16:49:11 -0800
Subject: [PATCH] chore: linting

---
 .../app/agents/new_chat/chat_deepagent.py     |   2 +-
 .../app/agents/new_chat/tools/registry.py     |   4 +-
 .../agents/new_chat/tools/shared_memory.py    |   4 +-
 .../app/routes/documents_routes.py            |   2 +-
 .../app/routes/new_chat_routes.py             |   1 -
 surfsense_backend/app/schemas/__init__.py     |   2 +-
 .../app/tasks/chat/stream_new_chat.py         |   1 +
 surfsense_backend/app/utils/content_utils.py  |  11 +-
 .../(manage)/components/DocumentTypeIcon.tsx  |   4 +-
 .../components/DocumentsTableShell.tsx        |   2 +-
 .../[search_space_id]/more-pages/page.tsx     |   2 +-
 surfsense_web/components/UserDropdown.tsx     |   2 +-
 .../components/assistant-ui/thread.tsx        |  20 +-
 .../components/homepage/hero-section.tsx      |  22 +-
 .../components/json-metadata-viewer.tsx       |   2 +-
 .../layout/providers/LayoutDataProvider.tsx   |   3 +-
 .../layout/ui/icon-rail/SearchSpaceAvatar.tsx |   2 +-
 .../layout/ui/shell/LayoutShell.tsx           |  18 +-
 .../ui/sidebar/AllPrivateChatsSidebar.tsx     | 417 +++++++++---------
 .../ui/sidebar/AllSharedChatsSidebar.tsx      | 417 +++++++++---------
 .../layout/ui/sidebar/InboxSidebar.tsx        |   2 +-
 .../components/layout/ui/sidebar/Sidebar.tsx  |   2 +-
 .../ui/sidebar/SidebarSlideOutPanel.tsx       |   6 +-
 .../layout/ui/sidebar/SidebarUserProfile.tsx  |   2 +-
 .../public-chat/public-chat-view.tsx          |   2 +-
 .../settings/image-model-manager.tsx          |   2 +-
 .../lib/apis/documents-api.service.ts         |   7 +-
 .../lib/apis/image-gen-config-api.service.ts  |   6 +-
 28 files changed, 491 insertions(+), 476 deletions(-)

diff --git a/surfsense_backend/app/agents/new_chat/chat_deepagent.py b/surfsense_backend/app/agents/new_chat/chat_deepagent.py
index 97fe33f0c..d58a0fadb 100644
--- a/surfsense_backend/app/agents/new_chat/chat_deepagent.py
+++ b/surfsense_backend/app/agents/new_chat/chat_deepagent.py
@@ -228,7 +228,7 @@ async def create_surfsense_deep_agent(
         import logging
 
         logging.warning(f"Failed to discover available connectors/document types: {e}")
-        
+
     # Build dependencies dict for the tools registry
     visibility = thread_visibility or ChatVisibility.PRIVATE
     dependencies = {
diff --git a/surfsense_backend/app/agents/new_chat/tools/registry.py b/surfsense_backend/app/agents/new_chat/tools/registry.py
index 30201e8df..8092a6104 100644
--- a/surfsense_backend/app/agents/new_chat/tools/registry.py
+++ b/surfsense_backend/app/agents/new_chat/tools/registry.py
@@ -43,6 +43,8 @@ from typing import Any
 
 from langchain_core.tools import BaseTool
 
+from app.db import ChatVisibility
+
 from .display_image import create_display_image_tool
 from .generate_image import create_generate_image_tool
 from .knowledge_base import create_search_knowledge_base_tool
@@ -57,8 +59,6 @@ from .shared_memory import (
 )
 from .user_memory import create_recall_memory_tool, create_save_memory_tool
 
-from app.db import ChatVisibility
-
 # =============================================================================
 # Tool Definition
 # =============================================================================
diff --git a/surfsense_backend/app/agents/new_chat/tools/shared_memory.py b/surfsense_backend/app/agents/new_chat/tools/shared_memory.py
index aa4a738ce..8cd4148ba 100644
--- a/surfsense_backend/app/agents/new_chat/tools/shared_memory.py
+++ b/surfsense_backend/app/agents/new_chat/tools/shared_memory.py
@@ -126,7 +126,9 @@ async def recall_shared_memory(
             }
             for m in rows
         ]
-        created_by_ids = list({m["created_by_id"] for m in memory_list if m["created_by_id"]})
+        created_by_ids = list(
+            {m["created_by_id"] for m in memory_list if m["created_by_id"]}
+        )
         created_by_map: dict[str, str] = {}
         if created_by_ids:
             uuids = [UUID(uid) for uid in created_by_ids]
diff --git a/surfsense_backend/app/routes/documents_routes.py b/surfsense_backend/app/routes/documents_routes.py
index 52989d27f..c8aeac0c9 100644
--- a/surfsense_backend/app/routes/documents_routes.py
+++ b/surfsense_backend/app/routes/documents_routes.py
@@ -18,9 +18,9 @@ from app.db import (
 )
 from app.schemas import (
     DocumentRead,
+    DocumentsCreate,
     DocumentStatusBatchResponse,
     DocumentStatusItemRead,
-    DocumentsCreate,
     DocumentStatusSchema,
     DocumentTitleRead,
     DocumentTitleSearchResponse,
diff --git a/surfsense_backend/app/routes/new_chat_routes.py b/surfsense_backend/app/routes/new_chat_routes.py
index bfb5e109d..ecb1c2a6f 100644
--- a/surfsense_backend/app/routes/new_chat_routes.py
+++ b/surfsense_backend/app/routes/new_chat_routes.py
@@ -1326,4 +1326,3 @@ async def regenerate_response(
             status_code=500,
             detail=f"An unexpected error occurred during regeneration: {e!s}",
         ) from None
-
diff --git a/surfsense_backend/app/schemas/__init__.py b/surfsense_backend/app/schemas/__init__.py
index 7c363e41f..b015cf715 100644
--- a/surfsense_backend/app/schemas/__init__.py
+++ b/surfsense_backend/app/schemas/__init__.py
@@ -10,9 +10,9 @@ from .chunks import ChunkBase, ChunkCreate, ChunkRead, ChunkUpdate
 from .documents import (
     DocumentBase,
     DocumentRead,
+    DocumentsCreate,
     DocumentStatusBatchResponse,
     DocumentStatusItemRead,
-    DocumentsCreate,
     DocumentStatusSchema,
     DocumentTitleRead,
     DocumentTitleSearchResponse,
diff --git a/surfsense_backend/app/tasks/chat/stream_new_chat.py b/surfsense_backend/app/tasks/chat/stream_new_chat.py
index a8560ecba..31e67c7ff 100644
--- a/surfsense_backend/app/tasks/chat/stream_new_chat.py
+++ b/surfsense_backend/app/tasks/chat/stream_new_chat.py
@@ -36,6 +36,7 @@ from app.services.connector_service import ConnectorService
 from app.services.new_streaming_service import VercelStreamingService
 from app.utils.content_utils import bootstrap_history_from_db
 
+
 def format_mentioned_documents_as_context(documents: list[Document]) -> str:
     """
     Format mentioned documents as context for the agent.
diff --git a/surfsense_backend/app/utils/content_utils.py b/surfsense_backend/app/utils/content_utils.py
index 9a417075d..536e63851 100644
--- a/surfsense_backend/app/utils/content_utils.py
+++ b/surfsense_backend/app/utils/content_utils.py
@@ -9,11 +9,16 @@ Message content in new_chat_messages can be stored in various formats:
 These utilities help extract and transform content for different use cases.
 """
 
+from typing import TYPE_CHECKING
+
 from langchain_core.messages import AIMessage, HumanMessage
 from sqlalchemy import select
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm import selectinload
 
+if TYPE_CHECKING:
+    from app.db import ChatVisibility
+
 
 def extract_text_content(content: str | dict | list) -> str:
     """Extract plain text content from various message formats."""
@@ -39,7 +44,7 @@ def extract_text_content(content: str | dict | list) -> str:
 async def bootstrap_history_from_db(
     session: AsyncSession,
     thread_id: int,
-    thread_visibility: "ChatVisibility | None" = None,
+    thread_visibility: ChatVisibility | None = None,
 ) -> list[HumanMessage | AIMessage]:
     """
     Load message history from database and convert to LangChain format.
@@ -80,8 +85,8 @@ async def bootstrap_history_from_db(
         if msg.role == "user":
             if is_shared:
                 author_name = (
-                    (msg.author.display_name if msg.author else None) or "A team member"
-                )
+                    msg.author.display_name if msg.author else None
+                ) or "A team member"
                 text_content = f"**[{author_name}]:** {text_content}"
             langchain_messages.append(HumanMessage(content=text_content))
         elif msg.role == "assistant":
diff --git a/surfsense_web/app/dashboard/[search_space_id]/documents/(manage)/components/DocumentTypeIcon.tsx b/surfsense_web/app/dashboard/[search_space_id]/documents/(manage)/components/DocumentTypeIcon.tsx
index 1a3e343ac..dfd2c6d85 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/documents/(manage)/components/DocumentTypeIcon.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/documents/(manage)/components/DocumentTypeIcon.tsx
@@ -1,9 +1,9 @@
 "use client";
 
 import type React from "react";
-import { useRef, useState, useEffect } from "react";
-import { getConnectorIcon } from "@/contracts/enums/connectorIcons";
+import { useEffect, useRef, useState } from "react";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
+import { getConnectorIcon } from "@/contracts/enums/connectorIcons";
 
 export function getDocumentTypeIcon(type: string, className?: string): React.ReactNode {
 	return getConnectorIcon(type, className);
diff --git a/surfsense_web/app/dashboard/[search_space_id]/documents/(manage)/components/DocumentsTableShell.tsx b/surfsense_web/app/dashboard/[search_space_id]/documents/(manage)/components/DocumentsTableShell.tsx
index f7c8663e5..02c359be9 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/documents/(manage)/components/DocumentsTableShell.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/documents/(manage)/components/DocumentsTableShell.tsx
@@ -17,7 +17,7 @@ import {
 } from "lucide-react";
 import { motion } from "motion/react";
 import { useTranslations } from "next-intl";
-import React, { useRef, useState, useEffect, useCallback } from "react";
+import React, { useCallback, useEffect, useRef, useState } from "react";
 import { useDocumentUploadDialog } from "@/components/assistant-ui/document-upload-popup";
 import { JsonMetadataViewer } from "@/components/json-metadata-viewer";
 import { MarkdownViewer } from "@/components/markdown-viewer";
diff --git a/surfsense_web/app/dashboard/[search_space_id]/more-pages/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/more-pages/page.tsx
index f9dbf64ef..446e209a2 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/more-pages/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/more-pages/page.tsx
@@ -8,7 +8,6 @@ import Link from "next/link";
 import { useEffect } from "react";
 import { toast } from "sonner";
 import { Button } from "@/components/ui/button";
-import { Spinner } from "@/components/ui/spinner";
 import { Card, CardContent } from "@/components/ui/card";
 import {
 	Dialog,
@@ -20,6 +19,7 @@ import {
 } from "@/components/ui/dialog";
 import { Separator } from "@/components/ui/separator";
 import { Skeleton } from "@/components/ui/skeleton";
+import { Spinner } from "@/components/ui/spinner";
 import type { IncentiveTaskInfo } from "@/contracts/types/incentive-tasks.types";
 import { incentiveTasksApiService } from "@/lib/apis/incentive-tasks-api.service";
 import {
diff --git a/surfsense_web/components/UserDropdown.tsx b/surfsense_web/components/UserDropdown.tsx
index 39896825e..5b398ae0b 100644
--- a/surfsense_web/components/UserDropdown.tsx
+++ b/surfsense_web/components/UserDropdown.tsx
@@ -5,7 +5,6 @@ import { useRouter } from "next/navigation";
 import { useState } from "react";
 import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
 import { Button } from "@/components/ui/button";
-import { Spinner } from "@/components/ui/spinner";
 import {
 	DropdownMenu,
 	DropdownMenuContent,
@@ -15,6 +14,7 @@ import {
 	DropdownMenuSeparator,
 	DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
+import { Spinner } from "@/components/ui/spinner";
 import { logout } from "@/lib/auth-utils";
 import { cleanupElectric } from "@/lib/electric/client";
 import { resetUser, trackLogout } from "@/lib/posthog/events";
diff --git a/surfsense_web/components/assistant-ui/thread.tsx b/surfsense_web/components/assistant-ui/thread.tsx
index bc9755dfd..c8f00d02e 100644
--- a/surfsense_web/components/assistant-ui/thread.tsx
+++ b/surfsense_web/components/assistant-ui/thread.tsx
@@ -246,7 +246,9 @@ const Composer: FC = () => {
 	const [mentionedDocuments, setMentionedDocuments] = useAtom(mentionedDocumentsAtom);
 	const [showDocumentPopover, setShowDocumentPopover] = useState(false);
 	const [mentionQuery, setMentionQuery] = useState("");
-	const [uploadedMentionDocs, setUploadedMentionDocs] = useState<Record<number, UploadedMentionDoc>>({});
+	const [uploadedMentionDocs, setUploadedMentionDocs] = useState<
+		Record<number, UploadedMentionDoc>
+	>({});
 	const [isUploadingDocs, setIsUploadingDocs] = useState(false);
 	const editorRef = useRef<InlineMentionEditorRef>(null);
 	const editorContainerRef = useRef<HTMLDivElement>(null);
@@ -755,11 +757,7 @@ const ComposerAction: FC<ComposerActionProps> = ({
 
 			{blockingUploadedMentionsCount > 0 && (
 				<div className="flex items-center gap-1.5 text-muted-foreground text-xs">
-					{hasFailedUploadedMentions ? (
-						<FileWarning className="size-3" />
-					) : (
-						<Spinner size="xs" />
-					)}
+					{hasFailedUploadedMentions ? <FileWarning className="size-3" /> : <Spinner size="xs" />}
 					<span>
 						{hasFailedUploadedMentions
 							? "Remove or retry failed uploads"
@@ -788,11 +786,11 @@ const ComposerAction: FC<ComposerActionProps> = ({
 										? "Waiting for uploaded files to finish indexing"
 										: isUploadingDocs
 											? "Uploading documents..."
-								: !hasModelConfigured
-									? "Please select a model from the header to start chatting"
-									: isComposerEmpty
-											? "Enter a message to send"
-											: "Send message"
+											: !hasModelConfigured
+												? "Please select a model from the header to start chatting"
+												: isComposerEmpty
+													? "Enter a message to send"
+													: "Send message"
 						}
 						side="bottom"
 						type="submit"
diff --git a/surfsense_web/components/homepage/hero-section.tsx b/surfsense_web/components/homepage/hero-section.tsx
index a8f3ad47e..ef9a529c3 100644
--- a/surfsense_web/components/homepage/hero-section.tsx
+++ b/surfsense_web/components/homepage/hero-section.tsx
@@ -86,19 +86,19 @@ export function HeroSection() {
 
 			<h2 className="relative z-50 mx-auto mb-4 mt-4 max-w-4xl text-balance text-center text-3xl font-semibold tracking-tight text-gray-700 md:text-7xl dark:text-neutral-300">
 				<Balancer>
-				{isNotebookLMVariant ? (
-					<div className="relative mx-auto inline-block w-max filter-[drop-shadow(0px_1px_3px_rgba(27,37,80,0.14))]">
-						<div className="text-black [text-shadow:0_0_rgba(0,0,0,0.1)] dark:text-white">
-							<span className="">NotebookLM with Superpowers</span>
+					{isNotebookLMVariant ? (
+						<div className="relative mx-auto inline-block w-max filter-[drop-shadow(0px_1px_3px_rgba(27,37,80,0.14))]">
+							<div className="text-black [text-shadow:0_0_rgba(0,0,0,0.1)] dark:text-white">
+								<span className="">NotebookLM with Superpowers</span>
+							</div>
 						</div>
-					</div>
-				) : (
-					<div className="relative mx-auto inline-block w-max filter-[drop-shadow(0px_1px_3px_rgba(27,37,80,0.14))]">
-						<div className="text-black [text-shadow:0_0_rgba(0,0,0,0.1)] dark:text-white">
-							<span className="">NotebookLM for Teams</span>
+					) : (
+						<div className="relative mx-auto inline-block w-max filter-[drop-shadow(0px_1px_3px_rgba(27,37,80,0.14))]">
+							<div className="text-black [text-shadow:0_0_rgba(0,0,0,0.1)] dark:text-white">
+								<span className="">NotebookLM for Teams</span>
+							</div>
 						</div>
-					</div>
-				)}
+					)}
 				</Balancer>
 			</h2>
 			{/* // TODO:aCTUAL DESCRITION */}
diff --git a/surfsense_web/components/json-metadata-viewer.tsx b/surfsense_web/components/json-metadata-viewer.tsx
index 0438abfa0..cc87a75c5 100644
--- a/surfsense_web/components/json-metadata-viewer.tsx
+++ b/surfsense_web/components/json-metadata-viewer.tsx
@@ -2,7 +2,6 @@ import { FileJson } from "lucide-react";
 import React from "react";
 import { defaultStyles, JsonView } from "react-json-view-lite";
 import { Button } from "@/components/ui/button";
-import { Spinner } from "@/components/ui/spinner";
 import {
 	Dialog,
 	DialogContent,
@@ -10,6 +9,7 @@ import {
 	DialogTitle,
 	DialogTrigger,
 } from "@/components/ui/dialog";
+import { Spinner } from "@/components/ui/spinner";
 import "react-json-view-lite/dist/index.css";
 
 interface JsonMetadataViewerProps {
diff --git a/surfsense_web/components/layout/providers/LayoutDataProvider.tsx b/surfsense_web/components/layout/providers/LayoutDataProvider.tsx
index e40fe28ad..ed96b84ca 100644
--- a/surfsense_web/components/layout/providers/LayoutDataProvider.tsx
+++ b/surfsense_web/components/layout/providers/LayoutDataProvider.tsx
@@ -25,14 +25,15 @@ import { Input } from "@/components/ui/input";
 import { isPageLimitExceededMetadata } from "@/contracts/types/inbox.types";
 import { useInbox } from "@/hooks/use-inbox";
 import { searchSpacesApiService } from "@/lib/apis/search-spaces-api.service";
-import { deleteThread, fetchThreads, updateThread } from "@/lib/chat/thread-persistence";
 import { logout } from "@/lib/auth-utils";
+import { deleteThread, fetchThreads, updateThread } from "@/lib/chat/thread-persistence";
 import { cleanupElectric } from "@/lib/electric/client";
 import { resetUser, trackLogout } from "@/lib/posthog/events";
 import { cacheKeys } from "@/lib/query-client/cache-keys";
 import type { ChatItem, NavItem, SearchSpace } from "../types/layout.types";
 import { CreateSearchSpaceDialog } from "../ui/dialogs";
 import { LayoutShell } from "../ui/shell";
+
 interface LayoutDataProviderProps {
 	searchSpaceId: string;
 	children: React.ReactNode;
diff --git a/surfsense_web/components/layout/ui/icon-rail/SearchSpaceAvatar.tsx b/surfsense_web/components/layout/ui/icon-rail/SearchSpaceAvatar.tsx
index 1686f3a46..134c109dd 100644
--- a/surfsense_web/components/layout/ui/icon-rail/SearchSpaceAvatar.tsx
+++ b/surfsense_web/components/layout/ui/icon-rail/SearchSpaceAvatar.tsx
@@ -1,8 +1,8 @@
 "use client";
 
 import { Settings, Trash2, Users } from "lucide-react";
-import { useCallback, useRef, useState } from "react";
 import { useTranslations } from "next-intl";
+import { useCallback, useRef, useState } from "react";
 import {
 	ContextMenu,
 	ContextMenuContent,
diff --git a/surfsense_web/components/layout/ui/shell/LayoutShell.tsx b/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
index e3d608b82..2d5a3bba5 100644
--- a/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
+++ b/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
@@ -84,8 +84,16 @@ interface LayoutShellProps {
 	inbox?: InboxProps;
 	isLoadingChats?: boolean;
 	// All chats panel props
-	allSharedChatsPanel?: { open: boolean; onOpenChange: (open: boolean) => void; searchSpaceId: string };
-	allPrivateChatsPanel?: { open: boolean; onOpenChange: (open: boolean) => void; searchSpaceId: string };
+	allSharedChatsPanel?: {
+		open: boolean;
+		onOpenChange: (open: boolean) => void;
+		searchSpaceId: string;
+	};
+	allPrivateChatsPanel?: {
+		open: boolean;
+		onOpenChange: (open: boolean) => void;
+		searchSpaceId: string;
+	};
 }
 
 export function LayoutShell({
@@ -129,7 +137,11 @@ export function LayoutShell({
 	const isMobile = useIsMobile();
 	const [mobileMenuOpen, setMobileMenuOpen] = useState(false);
 	const { isCollapsed, setIsCollapsed, toggleCollapsed } = useSidebarState(defaultCollapsed);
-	const { sidebarWidth, handleMouseDown: onResizeMouseDown, isDragging: isResizing } = useSidebarResize();
+	const {
+		sidebarWidth,
+		handleMouseDown: onResizeMouseDown,
+		isDragging: isResizing,
+	} = useSidebarResize();
 
 	// Memoize context value to prevent unnecessary re-renders
 	const sidebarContextValue = useMemo(
diff --git a/surfsense_web/components/layout/ui/sidebar/AllPrivateChatsSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/AllPrivateChatsSidebar.tsx
index c78adfef1..3dd77ea1d 100644
--- a/surfsense_web/components/layout/ui/sidebar/AllPrivateChatsSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/AllPrivateChatsSidebar.tsx
@@ -204,217 +204,214 @@ export function AllPrivateChatsSidebar({
 			ariaLabel={t("chats") || "Private Chats"}
 		>
 			<div className="shrink-0 p-4 pb-2 space-y-3">
-							<div className="flex items-center gap-2">
-								<User className="h-5 w-5 text-primary" />
-								<h2 className="text-lg font-semibold">{t("chats") || "Private Chats"}</h2>
-							</div>
-
-							<div className="relative">
-								<Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
-								<Input
-									type="text"
-									placeholder={t("search_chats") || "Search chats..."}
-									value={searchQuery}
-									onChange={(e) => setSearchQuery(e.target.value)}
-									className="pl-9 pr-8 h-9"
-								/>
-								{searchQuery && (
-									<Button
-										variant="ghost"
-										size="icon"
-										className="absolute right-1 top-1/2 -translate-y-1/2 h-6 w-6"
-										onClick={handleClearSearch}
-									>
-										<X className="h-3.5 w-3.5" />
-										<span className="sr-only">{t("clear_search") || "Clear search"}</span>
-									</Button>
-								)}
-							</div>
-						</div>
-
-						{!isSearchMode && (
-							<Tabs
-								value={showArchived ? "archived" : "active"}
-								onValueChange={(value) => setShowArchived(value === "archived")}
-								className="shrink-0 mx-4"
-							>
-								<TabsList className="w-full h-auto p-0 bg-transparent rounded-none border-b">
-									<TabsTrigger
-										value="active"
-										className="flex-1 rounded-none border-b-2 border-transparent px-1 py-2 text-xs font-medium data-[state=active]:border-primary data-[state=active]:bg-transparent data-[state=active]:shadow-none"
-									>
-										<span className="w-full inline-flex items-center justify-center gap-1.5 px-3 py-1.5 rounded-lg hover:bg-muted transition-colors">
-											<MessageCircleMore className="h-4 w-4" />
-											<span>Active</span>
-											<span className="inline-flex items-center justify-center min-w-5 h-5 px-1.5 rounded-full bg-primary/20 text-muted-foreground text-xs font-medium">
-												{activeCount}
-											</span>
-										</span>
-									</TabsTrigger>
-									<TabsTrigger
-										value="archived"
-										className="flex-1 rounded-none border-b-2 border-transparent px-1 py-2 text-xs font-medium data-[state=active]:border-primary data-[state=active]:bg-transparent data-[state=active]:shadow-none"
-									>
-										<span className="w-full inline-flex items-center justify-center gap-1.5 px-3 py-1.5 rounded-lg hover:bg-muted transition-colors">
-											<ArchiveIcon className="h-4 w-4" />
-											<span>Archived</span>
-											<span className="inline-flex items-center justify-center min-w-5 h-5 px-1.5 rounded-full bg-primary/20 text-muted-foreground text-xs font-medium">
-												{archivedCount}
-											</span>
-										</span>
-									</TabsTrigger>
-								</TabsList>
-							</Tabs>
-						)}
-
-						<div className="flex-1 overflow-y-auto overflow-x-hidden p-2">
-							{isLoading ? (
-								<div className="space-y-1">
-									{[75, 90, 55, 80, 65, 85].map((titleWidth, i) => (
-										<div
-											key={`skeleton-${i}`}
-											className="flex items-center gap-2 rounded-md px-2 py-1.5"
-										>
-											<Skeleton className="h-4 w-4 shrink-0 rounded" />
-											<Skeleton className="h-4 rounded" style={{ width: `${titleWidth}%` }} />
-										</div>
-									))}
-								</div>
-							) : error ? (
-								<div className="text-center py-8 text-sm text-destructive">
-									{t("error_loading_chats") || "Error loading chats"}
-								</div>
-							) : threads.length > 0 ? (
-								<div className="space-y-1">
-									{threads.map((thread) => {
-										const isDeleting = deletingThreadId === thread.id;
-										const isArchiving = archivingThreadId === thread.id;
-										const isBusy = isDeleting || isArchiving;
-										const isActive = currentChatId === thread.id;
-
-										return (
-											<div
-												key={thread.id}
-												className={cn(
-													"group flex items-center gap-2 rounded-md px-2 py-1.5 text-sm",
-													"hover:bg-accent hover:text-accent-foreground",
-													"transition-colors cursor-pointer",
-													isActive && "bg-accent text-accent-foreground",
-													isBusy && "opacity-50 pointer-events-none"
-												)}
-											>
-												{isMobile ? (
-													<button
-														type="button"
-														onClick={() => handleThreadClick(thread.id)}
-														disabled={isBusy}
-														className="flex items-center gap-2 flex-1 min-w-0 text-left overflow-hidden"
-													>
-														<MessageCircleMore className="h-4 w-4 shrink-0 text-muted-foreground" />
-														<span className="truncate">{thread.title || "New Chat"}</span>
-													</button>
-												) : (
-													<Tooltip>
-														<TooltipTrigger asChild>
-															<button
-																type="button"
-																onClick={() => handleThreadClick(thread.id)}
-																disabled={isBusy}
-																className="flex items-center gap-2 flex-1 min-w-0 text-left overflow-hidden"
-															>
-																<MessageCircleMore className="h-4 w-4 shrink-0 text-muted-foreground" />
-																<span className="truncate">{thread.title || "New Chat"}</span>
-															</button>
-														</TooltipTrigger>
-														<TooltipContent side="bottom" align="start">
-															<p>
-																{t("updated") || "Updated"}:{" "}
-																{format(new Date(thread.updatedAt), "MMM d, yyyy 'at' h:mm a")}
-															</p>
-														</TooltipContent>
-													</Tooltip>
-												)}
-
-												<DropdownMenu
-													open={openDropdownId === thread.id}
-													onOpenChange={(isOpen) => setOpenDropdownId(isOpen ? thread.id : null)}
-												>
-													<DropdownMenuTrigger asChild>
-														<Button
-															variant="ghost"
-															size="icon"
-															className={cn(
-																"h-6 w-6 shrink-0",
-																"md:opacity-0 md:group-hover:opacity-100 md:focus:opacity-100",
-																"transition-opacity"
-															)}
-															disabled={isBusy}
-														>
-															{isDeleting ? (
-																<Spinner size="xs" />
-															) : (
-																<MoreHorizontal className="h-3.5 w-3.5 text-muted-foreground" />
-															)}
-															<span className="sr-only">{t("more_options") || "More options"}</span>
-														</Button>
-													</DropdownMenuTrigger>
-													<DropdownMenuContent align="end" className="w-40 z-80">
-														<DropdownMenuItem
-															onClick={() => handleToggleArchive(thread.id, thread.archived)}
-															disabled={isArchiving}
-														>
-															{thread.archived ? (
-																<>
-																	<RotateCcwIcon className="mr-2 h-4 w-4" />
-																	<span>{t("unarchive") || "Restore"}</span>
-																</>
-															) : (
-																<>
-																	<ArchiveIcon className="mr-2 h-4 w-4" />
-																	<span>{t("archive") || "Archive"}</span>
-																</>
-															)}
-														</DropdownMenuItem>
-														<DropdownMenuSeparator />
-														<DropdownMenuItem
-															onClick={() => handleDeleteThread(thread.id)}
-															className="text-destructive focus:text-destructive"
-														>
-															<Trash2 className="mr-2 h-4 w-4" />
-															<span>{t("delete") || "Delete"}</span>
-														</DropdownMenuItem>
-													</DropdownMenuContent>
-												</DropdownMenu>
-											</div>
-										);
-									})}
-								</div>
-							) : isSearchMode ? (
-								<div className="text-center py-8">
-									<Search className="h-12 w-12 mx-auto text-muted-foreground mb-3" />
-									<p className="text-sm text-muted-foreground">
-										{t("no_chats_found") || "No chats found"}
-									</p>
-									<p className="text-xs text-muted-foreground/70 mt-1">
-										{t("try_different_search") || "Try a different search term"}
-									</p>
-								</div>
-							) : (
-								<div className="text-center py-8">
-									<User className="h-12 w-12 mx-auto text-muted-foreground mb-3" />
-									<p className="text-sm text-muted-foreground">
-										{showArchived
-											? t("no_archived_chats") || "No archived chats"
-											: t("no_chats") || "No private chats"}
-									</p>
-									{!showArchived && (
-										<p className="text-xs text-muted-foreground/70 mt-1">
-											{t("start_new_chat_hint") || "Start a new chat from the chat page"}
-										</p>
-									)}
-								</div>
-							)}
+				<div className="flex items-center gap-2">
+					<User className="h-5 w-5 text-primary" />
+					<h2 className="text-lg font-semibold">{t("chats") || "Private Chats"}</h2>
 				</div>
+
+				<div className="relative">
+					<Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
+					<Input
+						type="text"
+						placeholder={t("search_chats") || "Search chats..."}
+						value={searchQuery}
+						onChange={(e) => setSearchQuery(e.target.value)}
+						className="pl-9 pr-8 h-9"
+					/>
+					{searchQuery && (
+						<Button
+							variant="ghost"
+							size="icon"
+							className="absolute right-1 top-1/2 -translate-y-1/2 h-6 w-6"
+							onClick={handleClearSearch}
+						>
+							<X className="h-3.5 w-3.5" />
+							<span className="sr-only">{t("clear_search") || "Clear search"}</span>
+						</Button>
+					)}
+				</div>
+			</div>
+
+			{!isSearchMode && (
+				<Tabs
+					value={showArchived ? "archived" : "active"}
+					onValueChange={(value) => setShowArchived(value === "archived")}
+					className="shrink-0 mx-4"
+				>
+					<TabsList className="w-full h-auto p-0 bg-transparent rounded-none border-b">
+						<TabsTrigger
+							value="active"
+							className="flex-1 rounded-none border-b-2 border-transparent px-1 py-2 text-xs font-medium data-[state=active]:border-primary data-[state=active]:bg-transparent data-[state=active]:shadow-none"
+						>
+							<span className="w-full inline-flex items-center justify-center gap-1.5 px-3 py-1.5 rounded-lg hover:bg-muted transition-colors">
+								<MessageCircleMore className="h-4 w-4" />
+								<span>Active</span>
+								<span className="inline-flex items-center justify-center min-w-5 h-5 px-1.5 rounded-full bg-primary/20 text-muted-foreground text-xs font-medium">
+									{activeCount}
+								</span>
+							</span>
+						</TabsTrigger>
+						<TabsTrigger
+							value="archived"
+							className="flex-1 rounded-none border-b-2 border-transparent px-1 py-2 text-xs font-medium data-[state=active]:border-primary data-[state=active]:bg-transparent data-[state=active]:shadow-none"
+						>
+							<span className="w-full inline-flex items-center justify-center gap-1.5 px-3 py-1.5 rounded-lg hover:bg-muted transition-colors">
+								<ArchiveIcon className="h-4 w-4" />
+								<span>Archived</span>
+								<span className="inline-flex items-center justify-center min-w-5 h-5 px-1.5 rounded-full bg-primary/20 text-muted-foreground text-xs font-medium">
+									{archivedCount}
+								</span>
+							</span>
+						</TabsTrigger>
+					</TabsList>
+				</Tabs>
+			)}
+
+			<div className="flex-1 overflow-y-auto overflow-x-hidden p-2">
+				{isLoading ? (
+					<div className="space-y-1">
+						{[75, 90, 55, 80, 65, 85].map((titleWidth, i) => (
+							<div key={`skeleton-${i}`} className="flex items-center gap-2 rounded-md px-2 py-1.5">
+								<Skeleton className="h-4 w-4 shrink-0 rounded" />
+								<Skeleton className="h-4 rounded" style={{ width: `${titleWidth}%` }} />
+							</div>
+						))}
+					</div>
+				) : error ? (
+					<div className="text-center py-8 text-sm text-destructive">
+						{t("error_loading_chats") || "Error loading chats"}
+					</div>
+				) : threads.length > 0 ? (
+					<div className="space-y-1">
+						{threads.map((thread) => {
+							const isDeleting = deletingThreadId === thread.id;
+							const isArchiving = archivingThreadId === thread.id;
+							const isBusy = isDeleting || isArchiving;
+							const isActive = currentChatId === thread.id;
+
+							return (
+								<div
+									key={thread.id}
+									className={cn(
+										"group flex items-center gap-2 rounded-md px-2 py-1.5 text-sm",
+										"hover:bg-accent hover:text-accent-foreground",
+										"transition-colors cursor-pointer",
+										isActive && "bg-accent text-accent-foreground",
+										isBusy && "opacity-50 pointer-events-none"
+									)}
+								>
+									{isMobile ? (
+										<button
+											type="button"
+											onClick={() => handleThreadClick(thread.id)}
+											disabled={isBusy}
+											className="flex items-center gap-2 flex-1 min-w-0 text-left overflow-hidden"
+										>
+											<MessageCircleMore className="h-4 w-4 shrink-0 text-muted-foreground" />
+											<span className="truncate">{thread.title || "New Chat"}</span>
+										</button>
+									) : (
+										<Tooltip>
+											<TooltipTrigger asChild>
+												<button
+													type="button"
+													onClick={() => handleThreadClick(thread.id)}
+													disabled={isBusy}
+													className="flex items-center gap-2 flex-1 min-w-0 text-left overflow-hidden"
+												>
+													<MessageCircleMore className="h-4 w-4 shrink-0 text-muted-foreground" />
+													<span className="truncate">{thread.title || "New Chat"}</span>
+												</button>
+											</TooltipTrigger>
+											<TooltipContent side="bottom" align="start">
+												<p>
+													{t("updated") || "Updated"}:{" "}
+													{format(new Date(thread.updatedAt), "MMM d, yyyy 'at' h:mm a")}
+												</p>
+											</TooltipContent>
+										</Tooltip>
+									)}
+
+									<DropdownMenu
+										open={openDropdownId === thread.id}
+										onOpenChange={(isOpen) => setOpenDropdownId(isOpen ? thread.id : null)}
+									>
+										<DropdownMenuTrigger asChild>
+											<Button
+												variant="ghost"
+												size="icon"
+												className={cn(
+													"h-6 w-6 shrink-0",
+													"md:opacity-0 md:group-hover:opacity-100 md:focus:opacity-100",
+													"transition-opacity"
+												)}
+												disabled={isBusy}
+											>
+												{isDeleting ? (
+													<Spinner size="xs" />
+												) : (
+													<MoreHorizontal className="h-3.5 w-3.5 text-muted-foreground" />
+												)}
+												<span className="sr-only">{t("more_options") || "More options"}</span>
+											</Button>
+										</DropdownMenuTrigger>
+										<DropdownMenuContent align="end" className="w-40 z-80">
+											<DropdownMenuItem
+												onClick={() => handleToggleArchive(thread.id, thread.archived)}
+												disabled={isArchiving}
+											>
+												{thread.archived ? (
+													<>
+														<RotateCcwIcon className="mr-2 h-4 w-4" />
+														<span>{t("unarchive") || "Restore"}</span>
+													</>
+												) : (
+													<>
+														<ArchiveIcon className="mr-2 h-4 w-4" />
+														<span>{t("archive") || "Archive"}</span>
+													</>
+												)}
+											</DropdownMenuItem>
+											<DropdownMenuSeparator />
+											<DropdownMenuItem
+												onClick={() => handleDeleteThread(thread.id)}
+												className="text-destructive focus:text-destructive"
+											>
+												<Trash2 className="mr-2 h-4 w-4" />
+												<span>{t("delete") || "Delete"}</span>
+											</DropdownMenuItem>
+										</DropdownMenuContent>
+									</DropdownMenu>
+								</div>
+							);
+						})}
+					</div>
+				) : isSearchMode ? (
+					<div className="text-center py-8">
+						<Search className="h-12 w-12 mx-auto text-muted-foreground mb-3" />
+						<p className="text-sm text-muted-foreground">
+							{t("no_chats_found") || "No chats found"}
+						</p>
+						<p className="text-xs text-muted-foreground/70 mt-1">
+							{t("try_different_search") || "Try a different search term"}
+						</p>
+					</div>
+				) : (
+					<div className="text-center py-8">
+						<User className="h-12 w-12 mx-auto text-muted-foreground mb-3" />
+						<p className="text-sm text-muted-foreground">
+							{showArchived
+								? t("no_archived_chats") || "No archived chats"
+								: t("no_chats") || "No private chats"}
+						</p>
+						{!showArchived && (
+							<p className="text-xs text-muted-foreground/70 mt-1">
+								{t("start_new_chat_hint") || "Start a new chat from the chat page"}
+							</p>
+						)}
+					</div>
+				)}
+			</div>
 		</SidebarSlideOutPanel>
 	);
 }
diff --git a/surfsense_web/components/layout/ui/sidebar/AllSharedChatsSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/AllSharedChatsSidebar.tsx
index ed22b819d..fae9fb05e 100644
--- a/surfsense_web/components/layout/ui/sidebar/AllSharedChatsSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/AllSharedChatsSidebar.tsx
@@ -204,217 +204,214 @@ export function AllSharedChatsSidebar({
 			ariaLabel={t("shared_chats") || "Shared Chats"}
 		>
 			<div className="shrink-0 p-4 pb-2 space-y-3">
-							<div className="flex items-center gap-2">
-								<Users className="h-5 w-5 text-primary" />
-								<h2 className="text-lg font-semibold">{t("shared_chats") || "Shared Chats"}</h2>
-							</div>
-
-							<div className="relative">
-								<Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
-								<Input
-									type="text"
-									placeholder={t("search_chats") || "Search chats..."}
-									value={searchQuery}
-									onChange={(e) => setSearchQuery(e.target.value)}
-									className="pl-9 pr-8 h-9"
-								/>
-								{searchQuery && (
-									<Button
-										variant="ghost"
-										size="icon"
-										className="absolute right-1 top-1/2 -translate-y-1/2 h-6 w-6"
-										onClick={handleClearSearch}
-									>
-										<X className="h-3.5 w-3.5" />
-										<span className="sr-only">{t("clear_search") || "Clear search"}</span>
-									</Button>
-								)}
-							</div>
-						</div>
-
-						{!isSearchMode && (
-							<Tabs
-								value={showArchived ? "archived" : "active"}
-								onValueChange={(value) => setShowArchived(value === "archived")}
-								className="shrink-0 mx-4"
-							>
-								<TabsList className="w-full h-auto p-0 bg-transparent rounded-none border-b">
-									<TabsTrigger
-										value="active"
-										className="flex-1 rounded-none border-b-2 border-transparent px-1 py-2 text-xs font-medium data-[state=active]:border-primary data-[state=active]:bg-transparent data-[state=active]:shadow-none"
-									>
-										<span className="w-full inline-flex items-center justify-center gap-1.5 px-3 py-1.5 rounded-lg hover:bg-muted transition-colors">
-											<MessageCircleMore className="h-4 w-4" />
-											<span>Active</span>
-											<span className="inline-flex items-center justify-center min-w-5 h-5 px-1.5 rounded-full bg-primary/20 text-muted-foreground text-xs font-medium">
-												{activeCount}
-											</span>
-										</span>
-									</TabsTrigger>
-									<TabsTrigger
-										value="archived"
-										className="flex-1 rounded-none border-b-2 border-transparent px-1 py-2 text-xs font-medium data-[state=active]:border-primary data-[state=active]:bg-transparent data-[state=active]:shadow-none"
-									>
-										<span className="w-full inline-flex items-center justify-center gap-1.5 px-3 py-1.5 rounded-lg hover:bg-muted transition-colors">
-											<ArchiveIcon className="h-4 w-4" />
-											<span>Archived</span>
-											<span className="inline-flex items-center justify-center min-w-5 h-5 px-1.5 rounded-full bg-primary/20 text-muted-foreground text-xs font-medium">
-												{archivedCount}
-											</span>
-										</span>
-									</TabsTrigger>
-								</TabsList>
-							</Tabs>
-						)}
-
-						<div className="flex-1 overflow-y-auto overflow-x-hidden p-2">
-							{isLoading ? (
-								<div className="space-y-1">
-									{[75, 90, 55, 80, 65, 85].map((titleWidth, i) => (
-										<div
-											key={`skeleton-${i}`}
-											className="flex items-center gap-2 rounded-md px-2 py-1.5"
-										>
-											<Skeleton className="h-4 w-4 shrink-0 rounded" />
-											<Skeleton className="h-4 rounded" style={{ width: `${titleWidth}%` }} />
-										</div>
-									))}
-								</div>
-							) : error ? (
-								<div className="text-center py-8 text-sm text-destructive">
-									{t("error_loading_chats") || "Error loading chats"}
-								</div>
-							) : threads.length > 0 ? (
-								<div className="space-y-1">
-									{threads.map((thread) => {
-										const isDeleting = deletingThreadId === thread.id;
-										const isArchiving = archivingThreadId === thread.id;
-										const isBusy = isDeleting || isArchiving;
-										const isActive = currentChatId === thread.id;
-
-										return (
-											<div
-												key={thread.id}
-												className={cn(
-													"group flex items-center gap-2 rounded-md px-2 py-1.5 text-sm",
-													"hover:bg-accent hover:text-accent-foreground",
-													"transition-colors cursor-pointer",
-													isActive && "bg-accent text-accent-foreground",
-													isBusy && "opacity-50 pointer-events-none"
-												)}
-											>
-												{isMobile ? (
-													<button
-														type="button"
-														onClick={() => handleThreadClick(thread.id)}
-														disabled={isBusy}
-														className="flex items-center gap-2 flex-1 min-w-0 text-left overflow-hidden"
-													>
-														<MessageCircleMore className="h-4 w-4 shrink-0 text-muted-foreground" />
-														<span className="truncate">{thread.title || "New Chat"}</span>
-													</button>
-												) : (
-													<Tooltip>
-														<TooltipTrigger asChild>
-															<button
-																type="button"
-																onClick={() => handleThreadClick(thread.id)}
-																disabled={isBusy}
-																className="flex items-center gap-2 flex-1 min-w-0 text-left overflow-hidden"
-															>
-																<MessageCircleMore className="h-4 w-4 shrink-0 text-muted-foreground" />
-																<span className="truncate">{thread.title || "New Chat"}</span>
-															</button>
-														</TooltipTrigger>
-														<TooltipContent side="bottom" align="start">
-															<p>
-																{t("updated") || "Updated"}:{" "}
-																{format(new Date(thread.updatedAt), "MMM d, yyyy 'at' h:mm a")}
-															</p>
-														</TooltipContent>
-													</Tooltip>
-												)}
-
-												<DropdownMenu
-													open={openDropdownId === thread.id}
-													onOpenChange={(isOpen) => setOpenDropdownId(isOpen ? thread.id : null)}
-												>
-													<DropdownMenuTrigger asChild>
-														<Button
-															variant="ghost"
-															size="icon"
-															className={cn(
-																"h-6 w-6 shrink-0",
-																"md:opacity-0 md:group-hover:opacity-100 md:focus:opacity-100",
-																"transition-opacity"
-															)}
-															disabled={isBusy}
-														>
-															{isDeleting ? (
-																<Spinner size="xs" />
-															) : (
-																<MoreHorizontal className="h-3.5 w-3.5 text-muted-foreground" />
-															)}
-															<span className="sr-only">{t("more_options") || "More options"}</span>
-														</Button>
-													</DropdownMenuTrigger>
-													<DropdownMenuContent align="end" className="w-40 z-80">
-														<DropdownMenuItem
-															onClick={() => handleToggleArchive(thread.id, thread.archived)}
-															disabled={isArchiving}
-														>
-															{thread.archived ? (
-																<>
-																	<RotateCcwIcon className="mr-2 h-4 w-4" />
-																	<span>{t("unarchive") || "Restore"}</span>
-																</>
-															) : (
-																<>
-																	<ArchiveIcon className="mr-2 h-4 w-4" />
-																	<span>{t("archive") || "Archive"}</span>
-																</>
-															)}
-														</DropdownMenuItem>
-														<DropdownMenuSeparator />
-														<DropdownMenuItem
-															onClick={() => handleDeleteThread(thread.id)}
-															className="text-destructive focus:text-destructive"
-														>
-															<Trash2 className="mr-2 h-4 w-4" />
-															<span>{t("delete") || "Delete"}</span>
-														</DropdownMenuItem>
-													</DropdownMenuContent>
-												</DropdownMenu>
-											</div>
-										);
-									})}
-								</div>
-							) : isSearchMode ? (
-								<div className="text-center py-8">
-									<Search className="h-12 w-12 mx-auto text-muted-foreground mb-3" />
-									<p className="text-sm text-muted-foreground">
-										{t("no_chats_found") || "No chats found"}
-									</p>
-									<p className="text-xs text-muted-foreground/70 mt-1">
-										{t("try_different_search") || "Try a different search term"}
-									</p>
-								</div>
-							) : (
-								<div className="text-center py-8">
-									<Users className="h-12 w-12 mx-auto text-muted-foreground mb-3" />
-									<p className="text-sm text-muted-foreground">
-										{showArchived
-											? t("no_archived_chats") || "No archived chats"
-											: t("no_shared_chats") || "No shared chats"}
-									</p>
-									{!showArchived && (
-										<p className="text-xs text-muted-foreground/70 mt-1">
-											Share a chat to collaborate with your team
-										</p>
-									)}
-								</div>
-							)}
+				<div className="flex items-center gap-2">
+					<Users className="h-5 w-5 text-primary" />
+					<h2 className="text-lg font-semibold">{t("shared_chats") || "Shared Chats"}</h2>
 				</div>
+
+				<div className="relative">
+					<Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
+					<Input
+						type="text"
+						placeholder={t("search_chats") || "Search chats..."}
+						value={searchQuery}
+						onChange={(e) => setSearchQuery(e.target.value)}
+						className="pl-9 pr-8 h-9"
+					/>
+					{searchQuery && (
+						<Button
+							variant="ghost"
+							size="icon"
+							className="absolute right-1 top-1/2 -translate-y-1/2 h-6 w-6"
+							onClick={handleClearSearch}
+						>
+							<X className="h-3.5 w-3.5" />
+							<span className="sr-only">{t("clear_search") || "Clear search"}</span>
+						</Button>
+					)}
+				</div>
+			</div>
+
+			{!isSearchMode && (
+				<Tabs
+					value={showArchived ? "archived" : "active"}
+					onValueChange={(value) => setShowArchived(value === "archived")}
+					className="shrink-0 mx-4"
+				>
+					<TabsList className="w-full h-auto p-0 bg-transparent rounded-none border-b">
+						<TabsTrigger
+							value="active"
+							className="flex-1 rounded-none border-b-2 border-transparent px-1 py-2 text-xs font-medium data-[state=active]:border-primary data-[state=active]:bg-transparent data-[state=active]:shadow-none"
+						>
+							<span className="w-full inline-flex items-center justify-center gap-1.5 px-3 py-1.5 rounded-lg hover:bg-muted transition-colors">
+								<MessageCircleMore className="h-4 w-4" />
+								<span>Active</span>
+								<span className="inline-flex items-center justify-center min-w-5 h-5 px-1.5 rounded-full bg-primary/20 text-muted-foreground text-xs font-medium">
+									{activeCount}
+								</span>
+							</span>
+						</TabsTrigger>
+						<TabsTrigger
+							value="archived"
+							className="flex-1 rounded-none border-b-2 border-transparent px-1 py-2 text-xs font-medium data-[state=active]:border-primary data-[state=active]:bg-transparent data-[state=active]:shadow-none"
+						>
+							<span className="w-full inline-flex items-center justify-center gap-1.5 px-3 py-1.5 rounded-lg hover:bg-muted transition-colors">
+								<ArchiveIcon className="h-4 w-4" />
+								<span>Archived</span>
+								<span className="inline-flex items-center justify-center min-w-5 h-5 px-1.5 rounded-full bg-primary/20 text-muted-foreground text-xs font-medium">
+									{archivedCount}
+								</span>
+							</span>
+						</TabsTrigger>
+					</TabsList>
+				</Tabs>
+			)}
+
+			<div className="flex-1 overflow-y-auto overflow-x-hidden p-2">
+				{isLoading ? (
+					<div className="space-y-1">
+						{[75, 90, 55, 80, 65, 85].map((titleWidth, i) => (
+							<div key={`skeleton-${i}`} className="flex items-center gap-2 rounded-md px-2 py-1.5">
+								<Skeleton className="h-4 w-4 shrink-0 rounded" />
+								<Skeleton className="h-4 rounded" style={{ width: `${titleWidth}%` }} />
+							</div>
+						))}
+					</div>
+				) : error ? (
+					<div className="text-center py-8 text-sm text-destructive">
+						{t("error_loading_chats") || "Error loading chats"}
+					</div>
+				) : threads.length > 0 ? (
+					<div className="space-y-1">
+						{threads.map((thread) => {
+							const isDeleting = deletingThreadId === thread.id;
+							const isArchiving = archivingThreadId === thread.id;
+							const isBusy = isDeleting || isArchiving;
+							const isActive = currentChatId === thread.id;
+
+							return (
+								<div
+									key={thread.id}
+									className={cn(
+										"group flex items-center gap-2 rounded-md px-2 py-1.5 text-sm",
+										"hover:bg-accent hover:text-accent-foreground",
+										"transition-colors cursor-pointer",
+										isActive && "bg-accent text-accent-foreground",
+										isBusy && "opacity-50 pointer-events-none"
+									)}
+								>
+									{isMobile ? (
+										<button
+											type="button"
+											onClick={() => handleThreadClick(thread.id)}
+											disabled={isBusy}
+											className="flex items-center gap-2 flex-1 min-w-0 text-left overflow-hidden"
+										>
+											<MessageCircleMore className="h-4 w-4 shrink-0 text-muted-foreground" />
+											<span className="truncate">{thread.title || "New Chat"}</span>
+										</button>
+									) : (
+										<Tooltip>
+											<TooltipTrigger asChild>
+												<button
+													type="button"
+													onClick={() => handleThreadClick(thread.id)}
+													disabled={isBusy}
+													className="flex items-center gap-2 flex-1 min-w-0 text-left overflow-hidden"
+												>
+													<MessageCircleMore className="h-4 w-4 shrink-0 text-muted-foreground" />
+													<span className="truncate">{thread.title || "New Chat"}</span>
+												</button>
+											</TooltipTrigger>
+											<TooltipContent side="bottom" align="start">
+												<p>
+													{t("updated") || "Updated"}:{" "}
+													{format(new Date(thread.updatedAt), "MMM d, yyyy 'at' h:mm a")}
+												</p>
+											</TooltipContent>
+										</Tooltip>
+									)}
+
+									<DropdownMenu
+										open={openDropdownId === thread.id}
+										onOpenChange={(isOpen) => setOpenDropdownId(isOpen ? thread.id : null)}
+									>
+										<DropdownMenuTrigger asChild>
+											<Button
+												variant="ghost"
+												size="icon"
+												className={cn(
+													"h-6 w-6 shrink-0",
+													"md:opacity-0 md:group-hover:opacity-100 md:focus:opacity-100",
+													"transition-opacity"
+												)}
+												disabled={isBusy}
+											>
+												{isDeleting ? (
+													<Spinner size="xs" />
+												) : (
+													<MoreHorizontal className="h-3.5 w-3.5 text-muted-foreground" />
+												)}
+												<span className="sr-only">{t("more_options") || "More options"}</span>
+											</Button>
+										</DropdownMenuTrigger>
+										<DropdownMenuContent align="end" className="w-40 z-80">
+											<DropdownMenuItem
+												onClick={() => handleToggleArchive(thread.id, thread.archived)}
+												disabled={isArchiving}
+											>
+												{thread.archived ? (
+													<>
+														<RotateCcwIcon className="mr-2 h-4 w-4" />
+														<span>{t("unarchive") || "Restore"}</span>
+													</>
+												) : (
+													<>
+														<ArchiveIcon className="mr-2 h-4 w-4" />
+														<span>{t("archive") || "Archive"}</span>
+													</>
+												)}
+											</DropdownMenuItem>
+											<DropdownMenuSeparator />
+											<DropdownMenuItem
+												onClick={() => handleDeleteThread(thread.id)}
+												className="text-destructive focus:text-destructive"
+											>
+												<Trash2 className="mr-2 h-4 w-4" />
+												<span>{t("delete") || "Delete"}</span>
+											</DropdownMenuItem>
+										</DropdownMenuContent>
+									</DropdownMenu>
+								</div>
+							);
+						})}
+					</div>
+				) : isSearchMode ? (
+					<div className="text-center py-8">
+						<Search className="h-12 w-12 mx-auto text-muted-foreground mb-3" />
+						<p className="text-sm text-muted-foreground">
+							{t("no_chats_found") || "No chats found"}
+						</p>
+						<p className="text-xs text-muted-foreground/70 mt-1">
+							{t("try_different_search") || "Try a different search term"}
+						</p>
+					</div>
+				) : (
+					<div className="text-center py-8">
+						<Users className="h-12 w-12 mx-auto text-muted-foreground mb-3" />
+						<p className="text-sm text-muted-foreground">
+							{showArchived
+								? t("no_archived_chats") || "No archived chats"
+								: t("no_shared_chats") || "No shared chats"}
+						</p>
+						{!showArchived && (
+							<p className="text-xs text-muted-foreground/70 mt-1">
+								Share a chat to collaborate with your team
+							</p>
+						)}
+					</div>
+				)}
+			</div>
 		</SidebarSlideOutPanel>
 	);
 }
diff --git a/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx
index c459141d6..ce64adae9 100644
--- a/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx
@@ -52,8 +52,8 @@ import {
 	isNewMentionMetadata,
 	isPageLimitExceededMetadata,
 } from "@/contracts/types/inbox.types";
-import type { InboxItem } from "@/hooks/use-inbox";
 import { useDebouncedValue } from "@/hooks/use-debounced-value";
+import type { InboxItem } from "@/hooks/use-inbox";
 import { useMediaQuery } from "@/hooks/use-media-query";
 import { notificationsApiService } from "@/lib/apis/notifications-api.service";
 import { cacheKeys } from "@/lib/query-client/cache-keys";
diff --git a/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx b/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
index f5589ba1c..aee98a290 100644
--- a/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
@@ -6,8 +6,8 @@ import { Button } from "@/components/ui/button";
 import { Skeleton } from "@/components/ui/skeleton";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { cn } from "@/lib/utils";
-import type { ChatItem, NavItem, PageUsage, SearchSpace, User } from "../../types/layout.types";
 import { SIDEBAR_MIN_WIDTH } from "../../hooks/useSidebarResize";
+import type { ChatItem, NavItem, PageUsage, SearchSpace, User } from "../../types/layout.types";
 import { ChatListItem } from "./ChatListItem";
 import { NavSection } from "./NavSection";
 import { PageUsageDisplay } from "./PageUsageDisplay";
diff --git a/surfsense_web/components/layout/ui/sidebar/SidebarSlideOutPanel.tsx b/surfsense_web/components/layout/ui/sidebar/SidebarSlideOutPanel.tsx
index 9d74c01f1..beb1c81c0 100644
--- a/surfsense_web/components/layout/ui/sidebar/SidebarSlideOutPanel.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/SidebarSlideOutPanel.tsx
@@ -1,8 +1,8 @@
 "use client";
 
 import { AnimatePresence, motion } from "motion/react";
-import { cn } from "@/lib/utils";
 import { useMediaQuery } from "@/hooks/use-media-query";
+import { cn } from "@/lib/utils";
 import { useSidebarContextSafe } from "../../hooks";
 
 const SIDEBAR_COLLAPSED_WIDTH = 60;
@@ -40,8 +40,8 @@ export function SidebarSlideOutPanel({
 		<AnimatePresence>
 			{open && (
 				<>
-				{/* Click-away layer - covers the full container including the sidebar */}
-				<motion.div
+					{/* Click-away layer - covers the full container including the sidebar */}
+					<motion.div
 						initial={{ opacity: 0 }}
 						animate={{ opacity: 1 }}
 						exit={{ opacity: 0 }}
diff --git a/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx b/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx
index 2ab0b0844..ea9b0189c 100644
--- a/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx
@@ -15,9 +15,9 @@ import {
 	DropdownMenuSubTrigger,
 	DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
+import { Spinner } from "@/components/ui/spinner";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { useLocaleContext } from "@/contexts/LocaleContext";
-import { Spinner } from "@/components/ui/spinner";
 import { cn } from "@/lib/utils";
 import type { User } from "../../types/layout.types";
 
diff --git a/surfsense_web/components/public-chat/public-chat-view.tsx b/surfsense_web/components/public-chat/public-chat-view.tsx
index 2755494f9..a1e6008ff 100644
--- a/surfsense_web/components/public-chat/public-chat-view.tsx
+++ b/surfsense_web/components/public-chat/public-chat-view.tsx
@@ -2,11 +2,11 @@
 
 import { AssistantRuntimeProvider } from "@assistant-ui/react";
 import { Navbar } from "@/components/homepage/navbar";
-import { Spinner } from "@/components/ui/spinner";
 import { DisplayImageToolUI } from "@/components/tool-ui/display-image";
 import { GeneratePodcastToolUI } from "@/components/tool-ui/generate-podcast";
 import { LinkPreviewToolUI } from "@/components/tool-ui/link-preview";
 import { ScrapeWebpageToolUI } from "@/components/tool-ui/scrape-webpage";
+import { Spinner } from "@/components/ui/spinner";
 import { usePublicChat } from "@/hooks/use-public-chat";
 import { usePublicChatRuntime } from "@/hooks/use-public-chat-runtime";
 import { PublicChatFooter } from "./public-chat-footer";
diff --git a/surfsense_web/components/settings/image-model-manager.tsx b/surfsense_web/components/settings/image-model-manager.tsx
index e87cc9a95..017bb5a79 100644
--- a/surfsense_web/components/settings/image-model-manager.tsx
+++ b/surfsense_web/components/settings/image-model-manager.tsx
@@ -73,8 +73,8 @@ import { Separator } from "@/components/ui/separator";
 import { Spinner } from "@/components/ui/spinner";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
 import {
-	IMAGE_GEN_PROVIDERS,
 	getImageGenModelsByProvider,
+	IMAGE_GEN_PROVIDERS,
 } from "@/contracts/enums/image-gen-providers";
 import type { ImageGenerationConfig } from "@/contracts/types/new-llm-config.types";
 import { cn } from "@/lib/utils";
diff --git a/surfsense_web/lib/apis/documents-api.service.ts b/surfsense_web/lib/apis/documents-api.service.ts
index c21d3efd2..c9d649c68 100644
--- a/surfsense_web/lib/apis/documents-api.service.ts
+++ b/surfsense_web/lib/apis/documents-api.service.ts
@@ -16,9 +16,9 @@ import {
 	getDocumentRequest,
 	getDocumentResponse,
 	getDocumentsRequest,
+	getDocumentsResponse,
 	getDocumentsStatusRequest,
 	getDocumentsStatusResponse,
-	getDocumentsResponse,
 	getDocumentTypeCountsRequest,
 	getDocumentTypeCountsResponse,
 	getSurfsenseDocsByChunkResponse,
@@ -151,7 +151,10 @@ class DocumentsApiService {
 			document_ids: document_ids.join(","),
 		});
 
-		return baseApiService.get(`/api/v1/documents/status?${params.toString()}`, getDocumentsStatusResponse);
+		return baseApiService.get(
+			`/api/v1/documents/status?${params.toString()}`,
+			getDocumentsStatusResponse
+		);
 	};
 
 	/**
diff --git a/surfsense_web/lib/apis/image-gen-config-api.service.ts b/surfsense_web/lib/apis/image-gen-config-api.service.ts
index 379edfa53..a9d444d21 100644
--- a/surfsense_web/lib/apis/image-gen-config-api.service.ts
+++ b/surfsense_web/lib/apis/image-gen-config-api.service.ts
@@ -2,12 +2,12 @@ import {
 	type CreateImageGenConfigRequest,
 	createImageGenConfigRequest,
 	createImageGenConfigResponse,
+	deleteImageGenConfigResponse,
+	getGlobalImageGenConfigsResponse,
+	getImageGenConfigsResponse,
 	type UpdateImageGenConfigRequest,
 	updateImageGenConfigRequest,
 	updateImageGenConfigResponse,
-	deleteImageGenConfigResponse,
-	getImageGenConfigsResponse,
-	getGlobalImageGenConfigsResponse,
 } from "@/contracts/types/new-llm-config.types";
 import { ValidationError } from "../error";
 import { baseApiService } from "./base-api.service";