From e60c5399af0d71fd83fcaec8c3ce80001f0121ee Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Tue, 28 Apr 2026 19:29:14 +0530
Subject: [PATCH 01/96] feat(icon-rail): integrate user profile component and
 enhance layout with user settings options

---
 .../layout/ui/icon-rail/IconRail.tsx          | 24 ++++++++++++--
 .../layout/ui/shell/LayoutShell.tsx           |  6 ++++
 .../components/layout/ui/sidebar/Sidebar.tsx  | 20 +++++++-----
 .../layout/ui/sidebar/SidebarUserProfile.tsx  | 32 +++++++++++++------
 4 files changed, 62 insertions(+), 20 deletions(-)

diff --git a/surfsense_web/components/layout/ui/icon-rail/IconRail.tsx b/surfsense_web/components/layout/ui/icon-rail/IconRail.tsx
index 062e8dcb7..756d6ffaf 100644
--- a/surfsense_web/components/layout/ui/icon-rail/IconRail.tsx
+++ b/surfsense_web/components/layout/ui/icon-rail/IconRail.tsx
@@ -6,6 +6,8 @@ import { ScrollArea } from "@/components/ui/scroll-area";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { cn } from "@/lib/utils";
 import type { SearchSpace } from "../../types/layout.types";
+import type { User } from "../../types/layout.types";
+import { SidebarUserProfile } from "../sidebar/SidebarUserProfile";
 import { SearchSpaceAvatar } from "./SearchSpaceAvatar";
 
 interface IconRailProps {
@@ -15,6 +17,11 @@ interface IconRailProps {
 	onSearchSpaceDelete?: (searchSpace: SearchSpace) => void;
 	onSearchSpaceSettings?: (searchSpace: SearchSpace) => void;
 	onAddSearchSpace: () => void;
+	user: User;
+	onUserSettings?: () => void;
+	onLogout?: () => void;
+	theme?: string;
+	setTheme?: (theme: "light" | "dark" | "system") => void;
 	className?: string;
 }
 
@@ -25,11 +32,16 @@ export function IconRail({
 	onSearchSpaceDelete,
 	onSearchSpaceSettings,
 	onAddSearchSpace,
+	user,
+	onUserSettings,
+	onLogout,
+	theme,
+	setTheme,
 	className,
 }: IconRailProps) {
 	return (
-		<div className={cn("flex h-full w-14 flex-col items-center", className)}>
-			<ScrollArea className="w-full">
+		<div className={cn("flex h-full w-14 min-h-0 flex-col items-center", className)}>
+			<ScrollArea className="w-full min-h-0 flex-1">
 				<div className="flex flex-col items-center gap-2 px-1.5 py-3">
 					{searchSpaces.map((searchSpace) => (
 						<SearchSpaceAvatar
@@ -65,6 +77,14 @@ export function IconRail({
 					</Tooltip>
 				</div>
 			</ScrollArea>
+			<SidebarUserProfile
+				user={user}
+				onUserSettings={onUserSettings}
+				onLogout={onLogout}
+				isCollapsed
+				theme={theme}
+				setTheme={setTheme}
+			/>
 		</div>
 	);
 }
diff --git a/surfsense_web/components/layout/ui/shell/LayoutShell.tsx b/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
index d41dd9e6d..4ef216bae 100644
--- a/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
+++ b/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
@@ -387,6 +387,11 @@ export function LayoutShell({
 							onSearchSpaceDelete={onSearchSpaceDelete}
 							onSearchSpaceSettings={onSearchSpaceSettings}
 							onAddSearchSpace={onAddSearchSpace}
+							user={user}
+							onUserSettings={onUserSettings}
+							onLogout={onLogout}
+							theme={theme}
+							setTheme={setTheme}
 						/>
 					</div>
 
@@ -423,6 +428,7 @@ export function LayoutShell({
 							pageUsage={pageUsage}
 							theme={theme}
 							setTheme={setTheme}
+							renderUserProfile={false}
 							className={cn(
 								"flex shrink-0 transition-[border-radius] duration-200",
 								anySlideOutOpen ? "rounded-l-xl delay-0" : "rounded-xl delay-150"
diff --git a/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx b/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
index adad52792..f00fcee81 100644
--- a/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
@@ -62,6 +62,7 @@ interface SidebarProps {
 	disableTooltips?: boolean;
 	sidebarWidth?: number;
 	isResizing?: boolean;
+	renderUserProfile?: boolean;
 }
 
 export function Sidebar({
@@ -95,6 +96,7 @@ export function Sidebar({
 	disableTooltips = false,
 	sidebarWidth = SIDEBAR_MIN_WIDTH,
 	isResizing = false,
+	renderUserProfile = true,
 }: SidebarProps) {
 	const t = useTranslations("sidebar");
 	const [openDropdownChatId, setOpenDropdownChatId] = useState<number | null>(null);
@@ -275,14 +277,16 @@ export function Sidebar({
 
 				<SidebarUsageFooter pageUsage={pageUsage} isCollapsed={isCollapsed} />
 
-				<SidebarUserProfile
-					user={user}
-					onUserSettings={onUserSettings}
-					onLogout={onLogout}
-					isCollapsed={isCollapsed}
-					theme={theme}
-					setTheme={setTheme}
-				/>
+				{renderUserProfile && (
+					<SidebarUserProfile
+						user={user}
+						onUserSettings={onUserSettings}
+						onLogout={onLogout}
+						isCollapsed={isCollapsed}
+						theme={theme}
+						setTheme={setTheme}
+					/>
+				)}
 			</div>
 		</div>
 	);
diff --git a/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx b/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx
index acece2d5c..ffd00ed14 100644
--- a/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx
@@ -113,19 +113,23 @@ function UserAvatar({
 	avatarUrl,
 	initials,
 	bgColor,
+	size = "sm",
 }: {
 	avatarUrl?: string;
 	initials: string;
 	bgColor: string;
+	size?: "sm" | "md";
 }) {
+	const sizeClass = size === "md" ? "h-9 w-9" : "h-8 w-8";
+
 	if (avatarUrl) {
 		return (
 			<Image
 				src={avatarUrl}
 				alt="User avatar"
-				width={32}
-				height={32}
-				className="h-8 w-8 shrink-0 rounded-lg object-cover select-none"
+				width={size === "md" ? 36 : 32}
+				height={size === "md" ? 36 : 32}
+				className={cn(sizeClass, "shrink-0 rounded-full object-cover select-none")}
 				referrerPolicy="no-referrer"
 				unoptimized
 			/>
@@ -134,7 +138,10 @@ function UserAvatar({
 
 	return (
 		<div
-			className="flex h-8 w-8 shrink-0 items-center justify-center rounded-lg text-xs font-semibold text-white select-none"
+			className={cn(
+				sizeClass,
+				"flex shrink-0 items-center justify-center rounded-full text-xs font-semibold text-white select-none"
+			)}
 			style={{ backgroundColor: bgColor }}
 		>
 			{initials}
@@ -181,24 +188,29 @@ export function SidebarUserProfile({
 	// Collapsed view - just show avatar with dropdown
 	if (isCollapsed) {
 		return (
-			<div className="border-t p-2">
+			<div className="border-t px-1.5 py-2">
 				<DropdownMenu>
 					<DropdownMenuTrigger asChild>
 						<button
 							type="button"
 							className={cn(
-								"flex h-10 w-full items-center justify-center rounded-md",
-								"hover:bg-accent transition-colors",
+								"mx-auto flex h-9 w-9 items-center justify-center rounded-full",
+								"transition-opacity hover:opacity-90",
 								"focus:outline-none focus-visible:outline-none",
-								"data-[state=open]:bg-transparent"
+								"data-[state=open]:opacity-90"
 							)}
 						>
-							<UserAvatar avatarUrl={user.avatarUrl} initials={initials} bgColor={bgColor} />
+							<UserAvatar
+								avatarUrl={user.avatarUrl}
+								initials={initials}
+								bgColor={bgColor}
+								size="md"
+							/>
 							<span className="sr-only">{displayName}</span>
 						</button>
 					</DropdownMenuTrigger>
 
-					<DropdownMenuContent className="w-48" side="right" align="center" sideOffset={8}>
+					<DropdownMenuContent className="w-48" side="right" align="end" sideOffset={8}>
 						<DropdownMenuLabel className="font-normal">
 							<div className="flex items-center gap-2">
 								<UserAvatar avatarUrl={user.avatarUrl} initials={initials} bgColor={bgColor} />

From 6231c08b8bdc6fb78f576854db755d4eecfcf1c3 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Tue, 28 Apr 2026 20:21:18 +0530
Subject: [PATCH 02/96] refactor(sidebar): standardize padding, font sizes, and
 icon dimensions across sidebar components for improved consistency

---
 .../announcements/AnnouncementsEmptyState.tsx |  10 +-
 .../ui/sidebar/AllPrivateChatsSidebar.tsx     | 183 ++++++++++--------
 .../ui/sidebar/AllSharedChatsSidebar.tsx      | 183 ++++++++++--------
 .../ui/sidebar/AnnouncementsSidebar.tsx       |   6 +-
 .../layout/ui/sidebar/ChatListItem.tsx        |   2 +-
 .../layout/ui/sidebar/InboxSidebar.tsx        |  38 ++--
 .../layout/ui/sidebar/NavSection.tsx          |   2 +-
 .../components/layout/ui/sidebar/Sidebar.tsx  |   6 +-
 .../layout/ui/sidebar/SidebarButton.tsx       |   6 +-
 .../layout/ui/sidebar/SidebarHeader.tsx       |   6 +-
 .../layout/ui/sidebar/SidebarSection.tsx      |   4 +-
 11 files changed, 234 insertions(+), 212 deletions(-)

diff --git a/surfsense_web/components/announcements/AnnouncementsEmptyState.tsx b/surfsense_web/components/announcements/AnnouncementsEmptyState.tsx
index 9ed1ea45d..329a284db 100644
--- a/surfsense_web/components/announcements/AnnouncementsEmptyState.tsx
+++ b/surfsense_web/components/announcements/AnnouncementsEmptyState.tsx
@@ -2,12 +2,12 @@ import { BellOff } from "lucide-react";
 
 export function AnnouncementsEmptyState() {
 	return (
-		<div className="flex flex-col items-center justify-center py-16 text-center">
-			<div className="flex h-16 w-16 items-center justify-center rounded-full bg-muted mb-4">
-				<BellOff className="h-7 w-7 text-muted-foreground" />
+		<div className="flex flex-col items-center justify-center py-12 text-center">
+			<div className="mb-3 flex h-12 w-12 items-center justify-center rounded-full bg-muted">
+				<BellOff className="h-5 w-5 text-muted-foreground" />
 			</div>
-			<h3 className="text-lg font-semibold">No announcements</h3>
-			<p className="mt-1 text-sm text-muted-foreground max-w-sm">
+			<h3 className="text-sm font-semibold">No announcements</h3>
+			<p className="mt-1 max-w-xs text-xs text-muted-foreground">
 				You're all caught up! New announcements will appear here.
 			</p>
 		</div>
diff --git a/surfsense_web/components/layout/ui/sidebar/AllPrivateChatsSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/AllPrivateChatsSidebar.tsx
index ab5213db2..8630c5a9b 100644
--- a/surfsense_web/components/layout/ui/sidebar/AllPrivateChatsSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/AllPrivateChatsSidebar.tsx
@@ -252,7 +252,7 @@ export function AllPrivateChatsSidebarContent({
 
 	return (
 		<>
-			<div className="shrink-0 p-4 pb-2 space-y-3">
+			<div className="shrink-0 p-3 pb-1.5 space-y-2">
 				<div className="flex items-center gap-2">
 					{isMobile && (
 						<Button
@@ -265,24 +265,24 @@ export function AllPrivateChatsSidebarContent({
 							<span className="sr-only">{t("close") || "Close"}</span>
 						</Button>
 					)}
-					<User className="h-5 w-5 text-primary" />
-					<h2 className="text-lg font-semibold">{t("chats") || "Private Chats"}</h2>
+					<User className="h-4 w-4 text-primary" />
+					<h2 className="text-md 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" />
+					<Search className="absolute left-2.5 top-1/2 -translate-y-1/2 h-3.5 w-3.5 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"
+						className="h-8 pl-8 pr-7 text-sm"
 					/>
 					{searchQuery && (
 						<Button
 							variant="ghost"
 							size="icon"
-							className="absolute right-1 top-1/2 -translate-y-1/2 h-6 w-6"
+							className="absolute right-1 top-1/2 h-5 w-5 -translate-y-1/2"
 							onClick={handleClearSearch}
 						>
 							<X className="h-3.5 w-3.5" />
@@ -296,23 +296,23 @@ export function AllPrivateChatsSidebarContent({
 				<Tabs
 					value={showArchived ? "archived" : "active"}
 					onValueChange={(value) => setShowArchived(value === "archived")}
-					className="shrink-0 mx-4 mt-2"
+					className="shrink-0 mx-3 mt-1.5"
 				>
 					<TabsList stretch showBottomBorder size="sm">
 						<TabsTrigger value="active">
 							<span className="inline-flex items-center gap-1.5">
-								<MessageCircleMore className="h-4 w-4" />
+								<MessageCircleMore className="h-3.5 w-3.5" />
 								<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">
+								<span className="inline-flex h-4.5 min-w-4.5 items-center justify-center rounded-full bg-primary/20 px-1 text-[10px] font-medium text-muted-foreground">
 									{activeCount}
 								</span>
 							</span>
 						</TabsTrigger>
 						<TabsTrigger value="archived">
 							<span className="inline-flex items-center gap-1.5">
-								<ArchiveIcon className="h-4 w-4" />
+								<ArchiveIcon className="h-3.5 w-3.5" />
 								<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">
+								<span className="inline-flex h-4.5 min-w-4.5 items-center justify-center rounded-full bg-primary/20 px-1 text-[10px] font-medium text-muted-foreground">
 									{archivedCount}
 								</span>
 							</span>
@@ -321,7 +321,7 @@ export function AllPrivateChatsSidebarContent({
 				</Tabs>
 			)}
 
-			<div className="flex-1 overflow-y-auto overflow-x-hidden p-2">
+			<div className="flex-1 overflow-y-auto overflow-x-hidden p-1.5">
 				{isLoading ? (
 					<div className="space-y-1">
 						{[75, 90, 55, 80, 65, 85].map((titleWidth) => (
@@ -347,16 +347,7 @@ export function AllPrivateChatsSidebarContent({
 							const isActive = currentChatId === thread.id;
 
 							return (
-								<div
-									key={thread.id}
-									className={cn(
-										"sidebar-item-lazy 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"
-									)}
-								>
+								<div key={thread.id} className="group/item relative w-full">
 									{isMobile ? (
 										<button
 											type="button"
@@ -371,7 +362,13 @@ export function AllPrivateChatsSidebarContent({
 											onTouchEnd={longPressHandlers.onTouchEnd}
 											onTouchMove={longPressHandlers.onTouchMove}
 											disabled={isBusy}
-											className="flex items-center gap-2 flex-1 min-w-0 text-left overflow-hidden"
+											className={cn(
+												"flex w-full items-center gap-2 overflow-hidden rounded-md px-2 py-1.5 text-xs text-left",
+												"group-hover/item:bg-accent group-hover/item:text-accent-foreground",
+												"focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring",
+												isActive && "bg-accent text-accent-foreground",
+												isBusy && "opacity-50 pointer-events-none"
+											)}
 										>
 											<span className="truncate">{thread.title || "New Chat"}</span>
 										</button>
@@ -382,7 +379,13 @@ export function AllPrivateChatsSidebarContent({
 													type="button"
 													onClick={() => handleThreadClick(thread.id)}
 													disabled={isBusy}
-													className="flex items-center gap-2 flex-1 min-w-0 text-left overflow-hidden"
+													className={cn(
+														"flex w-full items-center gap-2 overflow-hidden rounded-md px-2 py-1.5 text-xs text-left",
+														"group-hover/item:bg-accent group-hover/item:text-accent-foreground",
+														"focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring",
+														isActive && "bg-accent text-accent-foreground",
+														isBusy && "opacity-50 pointer-events-none"
+													)}
 												>
 													<span className="truncate">{thread.title || "New Chat"}</span>
 												</button>
@@ -396,89 +399,97 @@ export function AllPrivateChatsSidebarContent({
 										</Tooltip>
 									)}
 
-									<DropdownMenu
-										open={openDropdownId === thread.id}
-										onOpenChange={(isOpen) => setOpenDropdownId(isOpen ? thread.id : null)}
+									<div
+										className={cn(
+											"pointer-events-none absolute right-0 top-0 bottom-0 flex items-center rounded-r-md pl-6 pr-1",
+											isActive
+												? "bg-gradient-to-l from-accent from-60% to-transparent"
+												: "bg-gradient-to-l from-sidebar from-60% to-transparent group-hover/item:from-accent",
+											isMobile
+												? "opacity-0"
+												: openDropdownId === thread.id
+													? "opacity-100"
+													: "opacity-0 group-hover/item:opacity-100"
+										)}
 									>
-										<DropdownMenuTrigger asChild>
-											<Button
-												variant="ghost"
-												size="icon"
-												className={cn(
-													"h-6 w-6 shrink-0 hover:bg-transparent",
-													isMobile
-														? "opacity-0 pointer-events-none absolute"
-														: openDropdownId === thread.id
-															? "opacity-100"
-															: "md:opacity-0 md:group-hover:opacity-100 md:focus:opacity-100",
-													openDropdownId === thread.id && "bg-accent hover:bg-accent",
-													"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">
-											{!thread.archived && (
-												<DropdownMenuItem
-													onClick={() => handleStartRename(thread.id, thread.title || "New Chat")}
+										<DropdownMenu
+											open={openDropdownId === thread.id}
+											onOpenChange={(isOpen) => setOpenDropdownId(isOpen ? thread.id : null)}
+										>
+											<DropdownMenuTrigger asChild>
+												<Button
+													variant="ghost"
+													size="icon"
+													className={cn(
+														"pointer-events-auto h-6 w-6 hover:bg-transparent",
+														openDropdownId === thread.id && "bg-accent hover:bg-accent"
+													)}
+													disabled={isBusy}
 												>
-													<Pencil className="mr-2 h-4 w-4" />
-													<span>{t("rename") || "Rename"}</span>
-												</DropdownMenuItem>
-											)}
-											<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>
-													</>
+													{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">
+												{!thread.archived && (
+													<DropdownMenuItem
+														onClick={() => handleStartRename(thread.id, thread.title || "New Chat")}
+													>
+														<Pencil className="mr-2 h-4 w-4" />
+														<span>{t("rename") || "Rename"}</span>
+													</DropdownMenuItem>
 												)}
-											</DropdownMenuItem>
-											<DropdownMenuItem onClick={() => handleDeleteThread(thread.id)}>
-												<Trash2 className="mr-2 h-4 w-4" />
-												<span>{t("delete") || "Delete"}</span>
-											</DropdownMenuItem>
-										</DropdownMenuContent>
-									</DropdownMenu>
+												<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>
+												<DropdownMenuItem onClick={() => handleDeleteThread(thread.id)}>
+													<Trash2 className="mr-2 h-4 w-4" />
+													<span>{t("delete") || "Delete"}</span>
+												</DropdownMenuItem>
+											</DropdownMenuContent>
+										</DropdownMenu>
+									</div>
 								</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">
+						<Search className="mx-auto mb-2.5 h-10 w-10 text-muted-foreground" />
+						<p className="text-xs text-muted-foreground">
 							{t("no_chats_found") || "No chats found"}
 						</p>
-						<p className="text-xs text-muted-foreground/70 mt-1">
+						<p className="mt-1 text-[11px] text-muted-foreground/70">
 							{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">
+						<User className="mx-auto mb-2.5 h-10 w-10 text-muted-foreground" />
+						<p className="text-xs 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">
+							<p className="mt-1 text-[11px] text-muted-foreground/70">
 								{t("start_new_chat_hint") || "Start a new chat from the chat page"}
 							</p>
 						)}
diff --git a/surfsense_web/components/layout/ui/sidebar/AllSharedChatsSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/AllSharedChatsSidebar.tsx
index ab1072459..26556b0bd 100644
--- a/surfsense_web/components/layout/ui/sidebar/AllSharedChatsSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/AllSharedChatsSidebar.tsx
@@ -251,7 +251,7 @@ export function AllSharedChatsSidebarContent({
 
 	return (
 		<>
-			<div className="shrink-0 p-4 pb-2 space-y-3">
+			<div className="shrink-0 p-3 pb-1.5 space-y-2">
 				<div className="flex items-center gap-2">
 					{isMobile && (
 						<Button
@@ -264,24 +264,24 @@ export function AllSharedChatsSidebarContent({
 							<span className="sr-only">{t("close") || "Close"}</span>
 						</Button>
 					)}
-					<Users className="h-5 w-5 text-primary" />
-					<h2 className="text-lg font-semibold">{t("shared_chats") || "Shared Chats"}</h2>
+					<Users className="h-4 w-4 text-primary" />
+					<h2 className="text-md 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" />
+					<Search className="absolute left-2.5 top-1/2 -translate-y-1/2 h-3.5 w-3.5 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"
+						className="h-8 pl-8 pr-7 text-sm"
 					/>
 					{searchQuery && (
 						<Button
 							variant="ghost"
 							size="icon"
-							className="absolute right-1 top-1/2 -translate-y-1/2 h-6 w-6"
+							className="absolute right-1 top-1/2 h-5 w-5 -translate-y-1/2"
 							onClick={handleClearSearch}
 						>
 							<X className="h-3.5 w-3.5" />
@@ -295,23 +295,23 @@ export function AllSharedChatsSidebarContent({
 				<Tabs
 					value={showArchived ? "archived" : "active"}
 					onValueChange={(value) => setShowArchived(value === "archived")}
-					className="shrink-0 mx-4 mt-2"
+					className="shrink-0 mx-3 mt-1.5"
 				>
 					<TabsList stretch showBottomBorder size="sm">
 						<TabsTrigger value="active">
 							<span className="inline-flex items-center gap-1.5">
-								<MessageCircleMore className="h-4 w-4" />
+								<MessageCircleMore className="h-3.5 w-3.5" />
 								<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">
+								<span className="inline-flex h-4.5 min-w-4.5 items-center justify-center rounded-full bg-primary/20 px-1 text-[10px] font-medium text-muted-foreground">
 									{activeCount}
 								</span>
 							</span>
 						</TabsTrigger>
 						<TabsTrigger value="archived">
 							<span className="inline-flex items-center gap-1.5">
-								<ArchiveIcon className="h-4 w-4" />
+								<ArchiveIcon className="h-3.5 w-3.5" />
 								<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">
+								<span className="inline-flex h-4.5 min-w-4.5 items-center justify-center rounded-full bg-primary/20 px-1 text-[10px] font-medium text-muted-foreground">
 									{archivedCount}
 								</span>
 							</span>
@@ -320,7 +320,7 @@ export function AllSharedChatsSidebarContent({
 				</Tabs>
 			)}
 
-			<div className="flex-1 overflow-y-auto overflow-x-hidden p-2">
+			<div className="flex-1 overflow-y-auto overflow-x-hidden p-1.5">
 				{isLoading ? (
 					<div className="space-y-1">
 						{[75, 90, 55, 80, 65, 85].map((titleWidth) => (
@@ -346,16 +346,7 @@ export function AllSharedChatsSidebarContent({
 							const isActive = currentChatId === thread.id;
 
 							return (
-								<div
-									key={thread.id}
-									className={cn(
-										"sidebar-item-lazy 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"
-									)}
-								>
+								<div key={thread.id} className="group/item relative w-full">
 									{isMobile ? (
 										<button
 											type="button"
@@ -370,7 +361,13 @@ export function AllSharedChatsSidebarContent({
 											onTouchEnd={longPressHandlers.onTouchEnd}
 											onTouchMove={longPressHandlers.onTouchMove}
 											disabled={isBusy}
-											className="flex items-center gap-2 flex-1 min-w-0 text-left overflow-hidden"
+											className={cn(
+												"flex w-full items-center gap-2 overflow-hidden rounded-md px-2 py-1.5 text-xs text-left",
+												"group-hover/item:bg-accent group-hover/item:text-accent-foreground",
+												"focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring",
+												isActive && "bg-accent text-accent-foreground",
+												isBusy && "opacity-50 pointer-events-none"
+											)}
 										>
 											<span className="truncate">{thread.title || "New Chat"}</span>
 										</button>
@@ -381,7 +378,13 @@ export function AllSharedChatsSidebarContent({
 													type="button"
 													onClick={() => handleThreadClick(thread.id)}
 													disabled={isBusy}
-													className="flex items-center gap-2 flex-1 min-w-0 text-left overflow-hidden"
+													className={cn(
+														"flex w-full items-center gap-2 overflow-hidden rounded-md px-2 py-1.5 text-xs text-left",
+														"group-hover/item:bg-accent group-hover/item:text-accent-foreground",
+														"focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring",
+														isActive && "bg-accent text-accent-foreground",
+														isBusy && "opacity-50 pointer-events-none"
+													)}
 												>
 													<span className="truncate">{thread.title || "New Chat"}</span>
 												</button>
@@ -395,89 +398,97 @@ export function AllSharedChatsSidebarContent({
 										</Tooltip>
 									)}
 
-									<DropdownMenu
-										open={openDropdownId === thread.id}
-										onOpenChange={(isOpen) => setOpenDropdownId(isOpen ? thread.id : null)}
+									<div
+										className={cn(
+											"pointer-events-none absolute right-0 top-0 bottom-0 flex items-center rounded-r-md pl-6 pr-1",
+											isActive
+												? "bg-gradient-to-l from-accent from-60% to-transparent"
+												: "bg-gradient-to-l from-sidebar from-60% to-transparent group-hover/item:from-accent",
+											isMobile
+												? "opacity-0"
+												: openDropdownId === thread.id
+													? "opacity-100"
+													: "opacity-0 group-hover/item:opacity-100"
+										)}
 									>
-										<DropdownMenuTrigger asChild>
-											<Button
-												variant="ghost"
-												size="icon"
-												className={cn(
-													"h-6 w-6 shrink-0 hover:bg-transparent",
-													isMobile
-														? "opacity-0 pointer-events-none absolute"
-														: openDropdownId === thread.id
-															? "opacity-100"
-															: "md:opacity-0 md:group-hover:opacity-100 md:focus:opacity-100",
-													openDropdownId === thread.id && "bg-accent hover:bg-accent",
-													"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">
-											{!thread.archived && (
-												<DropdownMenuItem
-													onClick={() => handleStartRename(thread.id, thread.title || "New Chat")}
+										<DropdownMenu
+											open={openDropdownId === thread.id}
+											onOpenChange={(isOpen) => setOpenDropdownId(isOpen ? thread.id : null)}
+										>
+											<DropdownMenuTrigger asChild>
+												<Button
+													variant="ghost"
+													size="icon"
+													className={cn(
+														"pointer-events-auto h-6 w-6 hover:bg-transparent",
+														openDropdownId === thread.id && "bg-accent hover:bg-accent"
+													)}
+													disabled={isBusy}
 												>
-													<Pencil className="mr-2 h-4 w-4" />
-													<span>{t("rename") || "Rename"}</span>
-												</DropdownMenuItem>
-											)}
-											<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>
-													</>
+													{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">
+												{!thread.archived && (
+													<DropdownMenuItem
+														onClick={() => handleStartRename(thread.id, thread.title || "New Chat")}
+													>
+														<Pencil className="mr-2 h-4 w-4" />
+														<span>{t("rename") || "Rename"}</span>
+													</DropdownMenuItem>
 												)}
-											</DropdownMenuItem>
-											<DropdownMenuItem onClick={() => handleDeleteThread(thread.id)}>
-												<Trash2 className="mr-2 h-4 w-4" />
-												<span>{t("delete") || "Delete"}</span>
-											</DropdownMenuItem>
-										</DropdownMenuContent>
-									</DropdownMenu>
+												<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>
+												<DropdownMenuItem onClick={() => handleDeleteThread(thread.id)}>
+													<Trash2 className="mr-2 h-4 w-4" />
+													<span>{t("delete") || "Delete"}</span>
+												</DropdownMenuItem>
+											</DropdownMenuContent>
+										</DropdownMenu>
+									</div>
 								</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">
+						<Search className="mx-auto mb-2.5 h-10 w-10 text-muted-foreground" />
+						<p className="text-xs text-muted-foreground">
 							{t("no_chats_found") || "No chats found"}
 						</p>
-						<p className="text-xs text-muted-foreground/70 mt-1">
+						<p className="mt-1 text-[11px] text-muted-foreground/70">
 							{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">
+						<Users className="mx-auto mb-2.5 h-10 w-10 text-muted-foreground" />
+						<p className="text-xs 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">
+							<p className="mt-1 text-[11px] text-muted-foreground/70">
 								Share a chat to collaborate with your team
 							</p>
 						)}
diff --git a/surfsense_web/components/layout/ui/sidebar/AnnouncementsSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/AnnouncementsSidebar.tsx
index 6a1233537..d6729eec4 100644
--- a/surfsense_web/components/layout/ui/sidebar/AnnouncementsSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/AnnouncementsSidebar.tsx
@@ -31,7 +31,7 @@ export function AnnouncementsSidebarContent({
 
 	return (
 		<div className="h-full flex flex-col">
-			<div className="shrink-0 p-4 pb-2 space-y-3">
+			<div className="shrink-0 p-3 pb-1.5 space-y-2">
 				<div className="flex items-center justify-between">
 					<div className="flex items-center gap-2">
 						{isMobile && (
@@ -48,12 +48,12 @@ export function AnnouncementsSidebarContent({
 								<span className="sr-only">Close</span>
 							</Button>
 						)}
-						<h2 className="text-lg font-semibold">Announcements</h2>
+						<h2 className="text-md font-semibold">Announcements</h2>
 					</div>
 				</div>
 			</div>
 
-			<div className="flex-1 overflow-y-auto p-4">
+			<div className="flex-1 overflow-y-auto p-3">
 				{announcements.length === 0 ? (
 					<AnnouncementsEmptyState />
 				) : (
diff --git a/surfsense_web/components/layout/ui/sidebar/ChatListItem.tsx b/surfsense_web/components/layout/ui/sidebar/ChatListItem.tsx
index bfc930b25..d8fe5465f 100644
--- a/surfsense_web/components/layout/ui/sidebar/ChatListItem.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/ChatListItem.tsx
@@ -61,7 +61,7 @@ export function ChatListItem({
 				onClick={handleClick}
 				{...(isMobile ? longPressHandlers : {})}
 				className={cn(
-					"flex w-full items-center gap-2 overflow-hidden rounded-md p-2 text-sm text-left",
+					"flex w-full items-center gap-2 overflow-hidden rounded-md px-2 py-1.5 text-xs text-left",
 					"group-hover/item:bg-accent group-hover/item:text-accent-foreground",
 					"focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring",
 					isActive && "bg-accent text-accent-foreground"
diff --git a/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx
index fa05559d7..76cb985b9 100644
--- a/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx
@@ -178,7 +178,7 @@ export function InboxSidebarContent({
 	const [mounted, setMounted] = useState(false);
 	const [openDropdown, setOpenDropdown] = useState<"filter" | null>(null);
 	const [connectorScrollPos, setConnectorScrollPos] = useState<"top" | "middle" | "bottom">("top");
-	const connectorRafRef = useRef<number>();
+	const connectorRafRef = useRef<number | null>(null);
 	const handleConnectorScroll = useCallback((e: React.UIEvent<HTMLDivElement>) => {
 		const el = e.currentTarget;
 		if (connectorRafRef.current) return;
@@ -186,7 +186,7 @@ export function InboxSidebarContent({
 			const atTop = el.scrollTop <= 2;
 			const atBottom = el.scrollHeight - el.scrollTop - el.clientHeight <= 2;
 			setConnectorScrollPos(atTop ? "top" : atBottom ? "bottom" : "middle");
-			connectorRafRef.current = undefined;
+			connectorRafRef.current = null;
 		});
 	}, []);
 	useEffect(
@@ -528,7 +528,7 @@ export function InboxSidebarContent({
 
 	return (
 		<>
-			<div className="shrink-0 p-4 pb-2 space-y-3">
+			<div className="shrink-0 p-3 pb-1.5 space-y-2">
 				<div className="flex items-center justify-between">
 					<div className="flex items-center gap-2">
 						{isMobile && (
@@ -542,7 +542,7 @@ export function InboxSidebarContent({
 								<span className="sr-only">{t("close") || "Close"}</span>
 							</Button>
 						)}
-						<h2 className="text-lg font-semibold">{t("inbox") || "Inbox"}</h2>
+						<h2 className="text-md font-semibold">{t("inbox") || "Inbox"}</h2>
 					</div>
 					<div className="flex items-center gap-1">
 						{isMobile ? (
@@ -811,19 +811,19 @@ export function InboxSidebarContent({
 				</div>
 
 				<div className="relative">
-					<Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
+					<Search className="absolute left-2.5 top-1/2 -translate-y-1/2 h-3.5 w-3.5 text-muted-foreground" />
 					<Input
 						type="text"
 						placeholder={t("search_inbox") || "Search inbox"}
 						value={searchQuery}
 						onChange={(e) => setSearchQuery(e.target.value)}
-						className="pl-9 pr-8 h-9"
+						className="h-8 pl-8 pr-7 text-sm"
 					/>
 					{searchQuery && (
 						<Button
 							variant="ghost"
 							size="icon"
-							className="absolute right-1 top-1/2 -translate-y-1/2 h-6 w-6"
+							className="absolute right-1 top-1/2 h-5 w-5 -translate-y-1/2"
 							onClick={handleClearSearch}
 						>
 							<X className="h-3.5 w-3.5" />
@@ -842,23 +842,23 @@ export function InboxSidebarContent({
 						setActiveFilter("all");
 					}
 				}}
-				className="shrink-0 mx-4 mt-2"
+				className="shrink-0 mx-3 mt-1.5"
 			>
 				<TabsList stretch showBottomBorder size="sm">
 					<TabsTrigger value="comments">
 						<span className="inline-flex items-center gap-1.5">
-							<MessageCircleReply className="h-4 w-4" />
+							<MessageCircleReply className="h-3.5 w-3.5" />
 							<span>{t("comments") || "Comments"}</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">
+							<span className="inline-flex h-4.5 min-w-4.5 items-center justify-center rounded-full bg-primary/20 px-1 text-[10px] font-medium text-muted-foreground">
 								{formatInboxCount(comments.unreadCount)}
 							</span>
 						</span>
 					</TabsTrigger>
 					<TabsTrigger value="status">
 						<span className="inline-flex items-center gap-1.5">
-							<History className="h-4 w-4" />
+							<History className="h-3.5 w-3.5" />
 							<span>{t("status") || "Status"}</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">
+							<span className="inline-flex h-4.5 min-w-4.5 items-center justify-center rounded-full bg-primary/20 px-1 text-[10px] font-medium text-muted-foreground">
 								{formatInboxCount(status.unreadCount)}
 							</span>
 						</span>
@@ -1021,23 +1021,23 @@ export function InboxSidebarContent({
 					</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">
+						<Search className="mx-auto mb-2.5 h-10 w-10 text-muted-foreground" />
+						<p className="text-xs text-muted-foreground">
 							{t("no_results_found") || "No results found"}
 						</p>
-						<p className="text-xs text-muted-foreground/70 mt-1">
+						<p className="mt-1 text-[11px] text-muted-foreground/70">
 							{t("try_different_search") || "Try a different search term"}
 						</p>
 					</div>
 				) : (
 					<div className="text-center py-8">
 						{activeTab === "comments" ? (
-							<MessageCircleReply className="h-12 w-12 mx-auto text-muted-foreground mb-3" />
+							<MessageCircleReply className="mx-auto mb-2.5 h-10 w-10 text-muted-foreground" />
 						) : (
-							<History className="h-12 w-12 mx-auto text-muted-foreground mb-3" />
+							<History className="mx-auto mb-2.5 h-10 w-10 text-muted-foreground" />
 						)}
-						<p className="text-sm text-muted-foreground">{getEmptyStateMessage().title}</p>
-						<p className="text-xs text-muted-foreground/70 mt-1">{getEmptyStateMessage().hint}</p>
+						<p className="text-xs text-muted-foreground">{getEmptyStateMessage().title}</p>
+						<p className="mt-1 text-[11px] text-muted-foreground/70">{getEmptyStateMessage().hint}</p>
 					</div>
 				)}
 			</div>
diff --git a/surfsense_web/components/layout/ui/sidebar/NavSection.tsx b/surfsense_web/components/layout/ui/sidebar/NavSection.tsx
index 0781a66c2..658067f3f 100644
--- a/surfsense_web/components/layout/ui/sidebar/NavSection.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/NavSection.tsx
@@ -159,7 +159,7 @@ export function NavSection({ items, onItemClick, isCollapsed = false }: NavSecti
 							<StatusIcon
 								status={item.statusIndicator}
 								FallbackIcon={item.icon}
-								className="h-4 w-4"
+							className="h-3.5 w-3.5"
 							/>
 						}
 						trailingContent={<StatusPill status={item.statusIndicator} />}
diff --git a/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx b/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
index f00fcee81..1064d2adc 100644
--- a/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
@@ -113,7 +113,7 @@ export function Sidebar({
 		>
 			{/* Header - search space name or collapse button when collapsed */}
 			{isCollapsed ? (
-				<div className="flex h-14 shrink-0 items-center justify-center border-b">
+				<div className="flex h-12 shrink-0 items-center justify-center border-b">
 					<SidebarCollapseButton
 						isCollapsed={isCollapsed}
 						onToggle={onToggleCollapse ?? (() => {})}
@@ -121,7 +121,7 @@ export function Sidebar({
 					/>
 				</div>
 			) : (
-				<div className="flex h-14 shrink-0 items-center gap-0 px-1 border-b">
+				<div className="flex h-12 shrink-0 items-center gap-0 px-1 border-b">
 					<SidebarHeader
 						searchSpace={searchSpace}
 						isCollapsed={isCollapsed}
@@ -139,7 +139,7 @@ export function Sidebar({
 			)}
 
 			{/* New chat button */}
-			<div className={cn("flex flex-col gap-0.5 py-2", isCollapsed && "items-center")}>
+			<div className={cn("flex flex-col gap-0.5 py-1.5", isCollapsed && "items-center")}>
 				<SidebarButton
 					icon={SquarePen}
 					label={t("new_chat")}
diff --git a/surfsense_web/components/layout/ui/sidebar/SidebarButton.tsx b/surfsense_web/components/layout/ui/sidebar/SidebarButton.tsx
index 4410edafa..9add894db 100644
--- a/surfsense_web/components/layout/ui/sidebar/SidebarButton.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/SidebarButton.tsx
@@ -26,7 +26,7 @@ interface SidebarButtonProps {
 }
 
 const expandedClassName = cn(
-	"flex items-center gap-2 rounded-md mx-2 px-2 py-1.5 text-sm transition-colors text-left",
+	"flex items-center gap-1.5 rounded-md mx-2 px-2 py-1 text-sm transition-colors text-left",
 	"hover:bg-accent hover:text-accent-foreground",
 	"focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
 );
@@ -63,7 +63,7 @@ export function SidebarButton({
 						className={cn(collapsedClassName, isActive && activeClassName, className)}
 						{...buttonProps}
 					>
-						<Icon className="h-4 w-4" />
+			<Icon className="h-3.5 w-3.5" />
 						{collapsedOverlay}
 						<span className="sr-only">{label}</span>
 					</button>
@@ -87,7 +87,7 @@ export function SidebarButton({
 			className={cn(expandedClassName, isActive && activeClassName, className)}
 			{...buttonProps}
 		>
-			{expandedIconNode ?? <Icon className="h-4 w-4 shrink-0" />}
+			{expandedIconNode ?? <Icon className="h-3.5 w-3.5 shrink-0" />}
 			<span className="flex-1 truncate">{label}</span>
 			{trailingContent}
 			{badge && typeof badge !== "string" ? badge : null}
diff --git a/surfsense_web/components/layout/ui/sidebar/SidebarHeader.tsx b/surfsense_web/components/layout/ui/sidebar/SidebarHeader.tsx
index 2c8539dc8..2a5761d6f 100644
--- a/surfsense_web/components/layout/ui/sidebar/SidebarHeader.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/SidebarHeader.tsx
@@ -36,14 +36,14 @@ export function SidebarHeader({
 					<Button
 						variant="ghost"
 						className={cn(
-							"flex h-auto w-full items-center justify-between gap-1 overflow-hidden py-1.5 font-semibold",
+							"flex h-8 w-full items-center justify-between gap-1 overflow-hidden px-2 py-0.5 font-semibold",
 							isCollapsed && "w-10"
 						)}
 					>
-						<span className="truncate text-base">
+						<span className="truncate text-sm">
 							{searchSpace?.name ?? t("select_search_space")}
 						</span>
-						<ChevronsUpDown className="h-4 w-4 shrink-0 text-muted-foreground" />
+						<ChevronsUpDown className="h-3.5 w-3.5 shrink-0 text-muted-foreground" />
 					</Button>
 				</DropdownMenuTrigger>
 				<DropdownMenuContent align="start" className="w-48">
diff --git a/surfsense_web/components/layout/ui/sidebar/SidebarSection.tsx b/surfsense_web/components/layout/ui/sidebar/SidebarSection.tsx
index b8ea5e1ee..5ef037fa0 100644
--- a/surfsense_web/components/layout/ui/sidebar/SidebarSection.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/SidebarSection.tsx
@@ -39,8 +39,8 @@ export function SidebarSection({
 				className
 			)}
 		>
-			<div className="flex items-center group/section shrink-0 px-2 py-1.5">
-				<CollapsibleTrigger className="flex items-center gap-1.5 text-xs font-medium text-muted-foreground hover:text-foreground transition-colors min-w-0">
+			<div className="flex items-center group/section shrink-0 px-2 py-1">
+				<CollapsibleTrigger className="flex items-center gap-1 text-[11px] font-medium text-muted-foreground hover:text-foreground transition-colors min-w-0">
 					<span className="truncate">{title}</span>
 					<ChevronRight
 						className={cn(

From a869069a0d433fb65dae97ae442440e4c94de3f4 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Tue, 28 Apr 2026 22:58:44 +0530
Subject: [PATCH 03/96] refactor(sidebar): adjust component dimensions and font
 sizes for improved visual consistency across sidebar elements

---
 .../components/documents/DocumentsFilters.tsx | 24 +++++++++----------
 .../ui/sidebar/AllPrivateChatsSidebar.tsx     |  6 ++---
 .../ui/sidebar/AllSharedChatsSidebar.tsx      |  6 ++---
 .../layout/ui/sidebar/ChatListItem.tsx        |  2 +-
 .../layout/ui/sidebar/DocumentsSidebar.tsx    | 20 ++++++++--------
 .../components/layout/ui/sidebar/Sidebar.tsx  |  4 ++--
 .../layout/ui/sidebar/SidebarSection.tsx      |  2 +-
 7 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/surfsense_web/components/documents/DocumentsFilters.tsx b/surfsense_web/components/documents/DocumentsFilters.tsx
index 57e6479cb..50df59955 100644
--- a/surfsense_web/components/documents/DocumentsFilters.tsx
+++ b/surfsense_web/components/documents/DocumentsFilters.tsx
@@ -84,13 +84,13 @@ export function DocumentsFilters({
 							<TooltipTrigger asChild>
 								<ToggleGroupItem
 									value="folder"
-									className="h-9 w-9 shrink-0 border bg-muted/50 text-muted-foreground transition-colors hover:bg-muted/80 hover:text-foreground"
+									className="h-8 w-8 shrink-0 border bg-muted/50 text-muted-foreground transition-colors hover:bg-muted/80 hover:text-foreground"
 									onClick={(e) => {
 										e.preventDefault();
 										onCreateFolder();
 									}}
 								>
-									<FolderPlus size={14} />
+									<FolderPlus size={13} />
 								</ToggleGroupItem>
 							</TooltipTrigger>
 							<TooltipContent>New folder</TooltipContent>
@@ -104,7 +104,7 @@ export function DocumentsFilters({
 									value="ai-sort"
 									disabled={aiSortBusy}
 									className={cn(
-										"h-9 w-9 shrink-0 border bg-muted/50 transition-colors",
+										"h-8 w-8 shrink-0 border bg-muted/50 transition-colors",
 										"disabled:pointer-events-none disabled:opacity-50",
 										aiSortEnabled
 											? "bg-accent text-accent-foreground hover:bg-accent"
@@ -120,9 +120,9 @@ export function DocumentsFilters({
 									{aiSortBusy ? (
 										<Spinner size="xs" />
 									) : aiSortEnabled ? (
-										<IconBinaryTreeFilled size={16} />
+										<IconBinaryTreeFilled size={14} />
 									) : (
-										<IconBinaryTree size={16} />
+										<IconBinaryTree size={14} />
 									)}
 								</ToggleGroupItem>
 							</TooltipTrigger>
@@ -142,9 +142,9 @@ export function DocumentsFilters({
 								<PopoverTrigger asChild>
 									<ToggleGroupItem
 										value="filter"
-										className="relative h-9 w-9 shrink-0 border bg-muted/50 text-muted-foreground transition-colors hover:bg-muted/80 hover:text-foreground overflow-visible"
+										className="relative h-8 w-8 shrink-0 overflow-visible border bg-muted/50 text-muted-foreground transition-colors hover:bg-muted/80 hover:text-foreground"
 									>
-										<ListFilter size={14} />
+										<ListFilter size={13} />
 										{activeTypes.length > 0 && (
 											<span className="absolute -top-1 -right-1 flex h-4 w-4 items-center justify-center rounded-full bg-neutral-300 text-[9px] font-medium text-neutral-700 dark:bg-neutral-700 dark:text-neutral-200">
 												{activeTypes.length}
@@ -227,12 +227,12 @@ export function DocumentsFilters({
 				{/* Search Input */}
 				<div className="relative flex-1 min-w-0">
 					<div className="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-3">
-						<Search size={14} aria-hidden="true" />
+						<Search size={13} aria-hidden="true" />
 					</div>
 					<Input
 						id={`${id}-input`}
 						ref={inputRef}
-						className="h-9 w-full pl-9 pr-8 text-sm select-none focus:select-text"
+						className="h-8 w-full select-none pl-8 pr-7 text-sm focus:select-text"
 						value={searchValue}
 						onChange={(e) => onSearch(e.target.value)}
 						placeholder="Search docs"
@@ -242,7 +242,7 @@ export function DocumentsFilters({
 					{Boolean(searchValue) && (
 						<button
 							type="button"
-							className="absolute right-1 top-1/2 -translate-y-1/2 inline-flex h-6 w-6 items-center justify-center rounded-sm text-muted-foreground hover:bg-accent hover:text-accent-foreground transition-colors"
+							className="absolute right-1 top-1/2 inline-flex h-5 w-5 -translate-y-1/2 items-center justify-center rounded-sm text-muted-foreground transition-colors hover:bg-accent hover:text-accent-foreground"
 							aria-label="Clear filter"
 							onClick={() => {
 								onSearch("");
@@ -260,9 +260,9 @@ export function DocumentsFilters({
 					onClick={handleUpload}
 					variant="outline"
 					size="sm"
-					className="h-9 shrink-0 gap-1.5 border-0 shadow-none bg-white text-gray-700 hover:bg-gray-50 dark:bg-white dark:text-gray-800 dark:hover:bg-gray-100"
+					className="h-8 shrink-0 gap-1.5 border-0 bg-white text-gray-700 shadow-none hover:bg-gray-50 dark:bg-white dark:text-gray-800 dark:hover:bg-gray-100"
 				>
-					<Upload size={14} />
+					<Upload size={13} />
 					<span>Upload</span>
 				</Button>
 			</div>
diff --git a/surfsense_web/components/layout/ui/sidebar/AllPrivateChatsSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/AllPrivateChatsSidebar.tsx
index 8630c5a9b..e821ec4da 100644
--- a/surfsense_web/components/layout/ui/sidebar/AllPrivateChatsSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/AllPrivateChatsSidebar.tsx
@@ -266,7 +266,7 @@ export function AllPrivateChatsSidebarContent({
 						</Button>
 					)}
 					<User className="h-4 w-4 text-primary" />
-					<h2 className="text-md font-semibold">{t("chats") || "Private Chats"}</h2>
+					<h2 className="text-lg font-semibold">{t("chats") || "Private Chats"}</h2>
 				</div>
 
 				<div className="relative">
@@ -363,7 +363,7 @@ export function AllPrivateChatsSidebarContent({
 											onTouchMove={longPressHandlers.onTouchMove}
 											disabled={isBusy}
 											className={cn(
-												"flex w-full items-center gap-2 overflow-hidden rounded-md px-2 py-1.5 text-xs text-left",
+												"flex w-full items-center gap-2 overflow-hidden rounded-md px-2 py-1.5 text-sm text-left",
 												"group-hover/item:bg-accent group-hover/item:text-accent-foreground",
 												"focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring",
 												isActive && "bg-accent text-accent-foreground",
@@ -380,7 +380,7 @@ export function AllPrivateChatsSidebarContent({
 													onClick={() => handleThreadClick(thread.id)}
 													disabled={isBusy}
 													className={cn(
-														"flex w-full items-center gap-2 overflow-hidden rounded-md px-2 py-1.5 text-xs text-left",
+														"flex w-full items-center gap-2 overflow-hidden rounded-md px-2 py-1.5 text-sm text-left",
 														"group-hover/item:bg-accent group-hover/item:text-accent-foreground",
 														"focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring",
 														isActive && "bg-accent text-accent-foreground",
diff --git a/surfsense_web/components/layout/ui/sidebar/AllSharedChatsSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/AllSharedChatsSidebar.tsx
index 26556b0bd..c5ab0e0f3 100644
--- a/surfsense_web/components/layout/ui/sidebar/AllSharedChatsSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/AllSharedChatsSidebar.tsx
@@ -265,7 +265,7 @@ export function AllSharedChatsSidebarContent({
 						</Button>
 					)}
 					<Users className="h-4 w-4 text-primary" />
-					<h2 className="text-md font-semibold">{t("shared_chats") || "Shared Chats"}</h2>
+					<h2 className="text-lg font-semibold">{t("shared_chats") || "Shared Chats"}</h2>
 				</div>
 
 				<div className="relative">
@@ -362,7 +362,7 @@ export function AllSharedChatsSidebarContent({
 											onTouchMove={longPressHandlers.onTouchMove}
 											disabled={isBusy}
 											className={cn(
-												"flex w-full items-center gap-2 overflow-hidden rounded-md px-2 py-1.5 text-xs text-left",
+												"flex w-full items-center gap-2 overflow-hidden rounded-md px-2 py-1.5 text-sm text-left",
 												"group-hover/item:bg-accent group-hover/item:text-accent-foreground",
 												"focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring",
 												isActive && "bg-accent text-accent-foreground",
@@ -379,7 +379,7 @@ export function AllSharedChatsSidebarContent({
 													onClick={() => handleThreadClick(thread.id)}
 													disabled={isBusy}
 													className={cn(
-														"flex w-full items-center gap-2 overflow-hidden rounded-md px-2 py-1.5 text-xs text-left",
+														"flex w-full items-center gap-2 overflow-hidden rounded-md px-2 py-1.5 text-sm text-left",
 														"group-hover/item:bg-accent group-hover/item:text-accent-foreground",
 														"focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring",
 														isActive && "bg-accent text-accent-foreground",
diff --git a/surfsense_web/components/layout/ui/sidebar/ChatListItem.tsx b/surfsense_web/components/layout/ui/sidebar/ChatListItem.tsx
index d8fe5465f..4ef7b2965 100644
--- a/surfsense_web/components/layout/ui/sidebar/ChatListItem.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/ChatListItem.tsx
@@ -61,7 +61,7 @@ export function ChatListItem({
 				onClick={handleClick}
 				{...(isMobile ? longPressHandlers : {})}
 				className={cn(
-					"flex w-full items-center gap-2 overflow-hidden rounded-md px-2 py-1.5 text-xs text-left",
+					"flex w-full items-center gap-2 overflow-hidden rounded-md px-2 py-1.5 text-sm text-left",
 					"group-hover/item:bg-accent group-hover/item:text-accent-foreground",
 					"focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring",
 					isActive && "bg-accent text-accent-foreground"
diff --git a/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx
index 3c5a64b0e..59873e72c 100644
--- a/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx
@@ -1028,11 +1028,11 @@ function AuthenticatedDocumentsSidebarBase({
 	const cloudContent = (
 		<>
 			{/* Connected tools strip */}
-			<div className="shrink-0 mx-4 mt-4 mb-4 flex select-none items-center gap-2 rounded-lg border bg-muted/50 transition-colors hover:bg-muted/80">
+			<div className="shrink-0 mx-4 mt-6 mb-2.5 flex select-none items-center gap-2 rounded-lg border bg-muted/50 transition-colors hover:bg-muted/80">
 				<button
 					type="button"
 					onClick={() => setConnectorDialogOpen(true)}
-					className="flex items-center gap-2 min-w-0 flex-1 text-left px-3 py-2"
+					className="flex min-w-0 flex-1 items-center gap-2 px-3 py-1.5 text-left"
 				>
 					<Unplug className="size-4 shrink-0 text-muted-foreground" />
 					<span className="truncate text-xs text-muted-foreground">
@@ -1099,7 +1099,7 @@ function AuthenticatedDocumentsSidebarBase({
 				<button
 					type="button"
 					onClick={handleWatchLocalFolder}
-					className="shrink-0 mx-4 mb-4 flex select-none items-center gap-2 rounded-lg border bg-muted/50 px-3 py-2 transition-colors hover:bg-muted/80"
+					className="shrink-0 mx-4 mb-2.5 flex select-none items-center gap-2 rounded-lg border bg-muted/50 px-3 py-1.5 transition-colors hover:bg-muted/80"
 				>
 					<FolderClock className="size-4 shrink-0 text-muted-foreground" />
 					<span className="truncate text-xs text-muted-foreground">Watch local folder</span>
@@ -1107,7 +1107,7 @@ function AuthenticatedDocumentsSidebarBase({
 			)}
 
 			<div className="flex-1 min-h-0 pt-0 flex flex-col">
-				<div className="px-4 pb-2">
+				<div className="px-4 pb-1.5">
 					<DocumentsFilters
 						typeCounts={typeCounts}
 						onSearch={setSearch}
@@ -1207,7 +1207,7 @@ function AuthenticatedDocumentsSidebarBase({
 
 	const documentsContent = (
 		<>
-			<div className="shrink-0 flex h-14 items-center px-4">
+			<div className="shrink-0 flex h-12 items-center px-4">
 				<div className="flex w-full items-center justify-between">
 					<div className="flex items-center gap-3">
 						{isMobile && (
@@ -1692,10 +1692,10 @@ function AnonymousDocumentsSidebar({
 			/>
 
 			{/* Header */}
-			<div className="shrink-0 flex h-14 items-center px-4">
+			<div className="shrink-0 flex h-12 items-center px-4">
 				<div className="flex w-full items-center justify-between">
 					<div className="flex items-center gap-2">
-						<h2 className="select-none text-lg font-semibold">{t("title") || "Documents"}</h2>
+						<h2 className="select-none text-base font-semibold">{t("title") || "Documents"}</h2>
 					</div>
 					<div className="flex items-center gap-1">
 						{isMobile && (
@@ -1744,11 +1744,11 @@ function AnonymousDocumentsSidebar({
 			</div>
 
 			{/* Connectors strip (gated) */}
-			<div className="shrink-0 mx-4 mt-4 mb-4 flex select-none items-center gap-2 rounded-lg border bg-muted/50 transition-colors hover:bg-muted/80">
+			<div className="shrink-0 mx-4 mt-6 mb-2.5 flex select-none items-center gap-2 rounded-lg border bg-muted/50 transition-colors hover:bg-muted/80">
 				<button
 					type="button"
 					onClick={() => gate("connect your data sources")}
-					className="flex items-center gap-2 min-w-0 flex-1 text-left px-3 py-2"
+					className="flex min-w-0 flex-1 items-center gap-2 px-3 py-1.5 text-left"
 				>
 					<Unplug className="size-4 shrink-0 text-muted-foreground" />
 					<span className="truncate text-xs text-muted-foreground">Connect your connectors</span>
@@ -1783,7 +1783,7 @@ function AnonymousDocumentsSidebar({
 
 			{/* Filters & upload */}
 			<div className="flex-1 min-h-0 pt-0 flex flex-col">
-				<div className="px-4 pb-2">
+				<div className="px-4 pb-1.5">
 					<DocumentsFilters
 						typeCounts={hasDoc ? { FILE: 1 } : {}}
 						onSearch={setSearch}
diff --git a/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx b/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
index 1064d2adc..f0deea038 100644
--- a/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
@@ -206,7 +206,7 @@ export function Sidebar({
 								)}
 							</div>
 						) : (
-							<p className="px-2 py-1 text-xs text-muted-foreground">{t("no_shared_chats")}</p>
+							<p className="px-2 py-1 text-sm text-muted-foreground">{t("no_shared_chats")}</p>
 						)}
 					</SidebarSection>
 
@@ -262,7 +262,7 @@ export function Sidebar({
 								)}
 							</div>
 						) : (
-							<p className="px-2 py-1 text-xs text-muted-foreground">{t("no_chats")}</p>
+							<p className="px-2 py-1 text-sm text-muted-foreground">{t("no_chats")}</p>
 						)}
 					</SidebarSection>
 				</div>
diff --git a/surfsense_web/components/layout/ui/sidebar/SidebarSection.tsx b/surfsense_web/components/layout/ui/sidebar/SidebarSection.tsx
index 5ef037fa0..aeb0ebef1 100644
--- a/surfsense_web/components/layout/ui/sidebar/SidebarSection.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/SidebarSection.tsx
@@ -40,7 +40,7 @@ export function SidebarSection({
 			)}
 		>
 			<div className="flex items-center group/section shrink-0 px-2 py-1">
-				<CollapsibleTrigger className="flex items-center gap-1 text-[11px] font-medium text-muted-foreground hover:text-foreground transition-colors min-w-0">
+				<CollapsibleTrigger className="flex items-center gap-1 text-xs font-medium text-muted-foreground hover:text-foreground transition-colors min-w-0">
 					<span className="truncate">{title}</span>
 					<ChevronRight
 						className={cn(

From 360e21eee4ec4ab0458f82ce813d583a6d059a62 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Tue, 28 Apr 2026 23:58:00 +0530
Subject: [PATCH 04/96] feat(icon-rail, layout): enhance IconRail with new chat
 functionality and navigation items; update LayoutShell to support collapsible
 sidebar and integrate new actions

---
 .../layout/ui/icon-rail/IconRail.tsx          | 62 +++++++++++-
 .../layout/ui/shell/LayoutShell.tsx           | 96 +++++++++++--------
 .../components/layout/ui/sidebar/Sidebar.tsx  |  6 +-
 .../layout/ui/sidebar/SidebarButton.tsx       |  7 +-
 .../ui/sidebar/SidebarCollapseButton.tsx      |  2 +-
 .../components/layout/ui/tabs/TabBar.tsx      | 24 ++++-
 6 files changed, 145 insertions(+), 52 deletions(-)

diff --git a/surfsense_web/components/layout/ui/icon-rail/IconRail.tsx b/surfsense_web/components/layout/ui/icon-rail/IconRail.tsx
index 756d6ffaf..c4b127c63 100644
--- a/surfsense_web/components/layout/ui/icon-rail/IconRail.tsx
+++ b/surfsense_web/components/layout/ui/icon-rail/IconRail.tsx
@@ -1,11 +1,11 @@
 "use client";
 
-import { Plus } from "lucide-react";
+import { Plus, SquarePen } from "lucide-react";
 import { Button } from "@/components/ui/button";
 import { ScrollArea } from "@/components/ui/scroll-area";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { cn } from "@/lib/utils";
-import type { SearchSpace } from "../../types/layout.types";
+import type { NavItem, SearchSpace } from "../../types/layout.types";
 import type { User } from "../../types/layout.types";
 import { SidebarUserProfile } from "../sidebar/SidebarUserProfile";
 import { SearchSpaceAvatar } from "./SearchSpaceAvatar";
@@ -17,6 +17,10 @@ interface IconRailProps {
 	onSearchSpaceDelete?: (searchSpace: SearchSpace) => void;
 	onSearchSpaceSettings?: (searchSpace: SearchSpace) => void;
 	onAddSearchSpace: () => void;
+	isSingleRailMode?: boolean;
+	onNewChat?: () => void;
+	navItems?: NavItem[];
+	onNavItemClick?: (item: NavItem) => void;
 	user: User;
 	onUserSettings?: () => void;
 	onLogout?: () => void;
@@ -32,6 +36,10 @@ export function IconRail({
 	onSearchSpaceDelete,
 	onSearchSpaceSettings,
 	onAddSearchSpace,
+	isSingleRailMode = false,
+	onNewChat,
+	navItems = [],
+	onNavItemClick,
 	user,
 	onUserSettings,
 	onLogout,
@@ -39,6 +47,29 @@ export function IconRail({
 	setTheme,
 	className,
 }: IconRailProps) {
+	const actionItems = isSingleRailMode
+		? [
+				...(onNewChat
+					? [
+							{
+								key: "new-chat",
+								label: "New chat",
+								onClick: onNewChat,
+								icon: SquarePen,
+								isActive: false,
+							},
+						]
+					: []),
+				...navItems.map((item) => ({
+					key: item.url,
+					label: item.title,
+					onClick: () => onNavItemClick?.(item),
+					icon: item.icon,
+					isActive: !!item.isActive,
+				})),
+			]
+		: [];
+
 	return (
 		<div className={cn("flex h-full w-14 min-h-0 flex-col items-center", className)}>
 			<ScrollArea className="w-full min-h-0 flex-1">
@@ -75,6 +106,33 @@ export function IconRail({
 							Add search space
 						</TooltipContent>
 					</Tooltip>
+
+					{actionItems.length > 0 && (
+						<>
+							<div className="my-1 h-px w-8 bg-border/60" />
+							{actionItems.map(({ key, label, onClick, icon: Icon, isActive }) => (
+								<Tooltip key={key}>
+									<TooltipTrigger asChild>
+										<Button
+											variant="ghost"
+											size="icon"
+											onClick={onClick}
+											className={cn(
+												"h-10 w-10 rounded-lg",
+												isActive && "bg-accent text-accent-foreground"
+											)}
+										>
+											<Icon className="h-4 w-4" />
+											<span className="sr-only">{label}</span>
+										</Button>
+									</TooltipTrigger>
+									<TooltipContent side="right" sideOffset={8}>
+										{label}
+									</TooltipContent>
+								</Tooltip>
+							))}
+						</>
+					)}
 				</div>
 			</ScrollArea>
 			<SidebarUserProfile
diff --git a/surfsense_web/components/layout/ui/shell/LayoutShell.tsx b/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
index 4ef216bae..66468dd88 100644
--- a/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
+++ b/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
@@ -26,6 +26,7 @@ import {
 	MobileSidebarTrigger,
 	Sidebar,
 } from "../sidebar";
+import { SidebarCollapseButton } from "../sidebar/SidebarCollapseButton";
 import { SidebarSlideOutPanel } from "../sidebar/SidebarSlideOutPanel";
 import { TabBar } from "../tabs/TabBar";
 
@@ -121,11 +122,13 @@ function MainContentPanel({
 	isChatPage,
 	onTabSwitch,
 	onNewChat,
+	leftActions,
 	children,
 }: {
 	isChatPage: boolean;
 	onTabSwitch?: (tab: Tab) => void;
 	onNewChat?: () => void;
+	leftActions?: React.ReactNode;
 	children: React.ReactNode;
 }) {
 	const activeTab = useAtomValue(activeTabAtom);
@@ -136,6 +139,7 @@ function MainContentPanel({
 			<TabBar
 				onTabSwitch={onTabSwitch}
 				onNewChat={onNewChat}
+				leftActions={leftActions}
 				rightActions={<RightPanelExpandButton />}
 				className="min-w-0"
 			/>
@@ -377,9 +381,9 @@ export function LayoutShell({
 		<SidebarProvider value={sidebarContextValue}>
 			<TooltipProvider delayDuration={0}>
 				<div
-					className={cn("flex h-screen w-full gap-2 p-2 overflow-hidden bg-muted/40", className)}
+					className={cn("flex h-screen w-full gap-2 px-2 py-0 overflow-hidden bg-muted/40", className)}
 				>
-					<div className="hidden md:flex overflow-hidden">
+					<div className="hidden md:flex overflow-hidden border-r border-border/60 -mr-2 pr-2">
 						<IconRail
 							searchSpaces={searchSpaces}
 							activeSearchSpaceId={activeSearchSpaceId}
@@ -387,6 +391,10 @@ export function LayoutShell({
 							onSearchSpaceDelete={onSearchSpaceDelete}
 							onSearchSpaceSettings={onSearchSpaceSettings}
 							onAddSearchSpace={onAddSearchSpace}
+							isSingleRailMode={isCollapsed}
+							onNewChat={onNewChat}
+							navItems={navItems}
+							onNavItemClick={onNavItemClick}
 							user={user}
 							onUserSettings={onUserSettings}
 							onLogout={onLogout}
@@ -398,45 +406,44 @@ export function LayoutShell({
 					{/* Sidebar + slide-out panels share one container; overflow visible so panels can overlay main content */}
 					<div
 						className={cn(
-							"relative hidden md:flex shrink-0 border bg-sidebar z-20 transition-[border-radius,border-color] duration-200",
-							anySlideOutOpen ? "rounded-l-xl border-r-0 delay-0" : "rounded-xl delay-150"
+							"relative hidden md:flex shrink-0 z-20",
+							!isCollapsed && "bg-sidebar"
 						)}
 					>
-						<Sidebar
-							searchSpace={searchSpace}
-							isCollapsed={isCollapsed}
-							onToggleCollapse={toggleCollapsed}
-							navItems={navItems}
-							onNavItemClick={onNavItemClick}
-							chats={chats}
-							sharedChats={sharedChats}
-							activeChatId={activeChatId}
-							onNewChat={onNewChat}
-							onChatSelect={onChatSelect}
-							onChatRename={onChatRename}
-							onChatDelete={onChatDelete}
-							onChatArchive={onChatArchive}
-							onViewAllSharedChats={onViewAllSharedChats}
-							onViewAllPrivateChats={onViewAllPrivateChats}
-							isSharedChatsPanelOpen={activeSlideoutPanel === "shared"}
-							isPrivateChatsPanelOpen={activeSlideoutPanel === "private"}
-							user={user}
-							onSettings={onSettings}
-							onManageMembers={onManageMembers}
-							onUserSettings={onUserSettings}
-							onLogout={onLogout}
-							pageUsage={pageUsage}
-							theme={theme}
-							setTheme={setTheme}
-							renderUserProfile={false}
-							className={cn(
-								"flex shrink-0 transition-[border-radius] duration-200",
-								anySlideOutOpen ? "rounded-l-xl delay-0" : "rounded-xl delay-150"
-							)}
-							isLoadingChats={isLoadingChats}
-							sidebarWidth={sidebarWidth}
-							isResizing={isResizing}
-						/>
+						{!isCollapsed && (
+							<Sidebar
+								searchSpace={searchSpace}
+								isCollapsed={isCollapsed}
+								onToggleCollapse={toggleCollapsed}
+								navItems={navItems}
+								onNavItemClick={onNavItemClick}
+								chats={chats}
+								sharedChats={sharedChats}
+								activeChatId={activeChatId}
+								onNewChat={onNewChat}
+								onChatSelect={onChatSelect}
+								onChatRename={onChatRename}
+								onChatDelete={onChatDelete}
+								onChatArchive={onChatArchive}
+								onViewAllSharedChats={onViewAllSharedChats}
+								onViewAllPrivateChats={onViewAllPrivateChats}
+								isSharedChatsPanelOpen={activeSlideoutPanel === "shared"}
+								isPrivateChatsPanelOpen={activeSlideoutPanel === "private"}
+								user={user}
+								onSettings={onSettings}
+								onManageMembers={onManageMembers}
+								onUserSettings={onUserSettings}
+								onLogout={onLogout}
+								pageUsage={pageUsage}
+								theme={theme}
+								setTheme={setTheme}
+								renderUserProfile={false}
+								className="flex shrink-0"
+								isLoadingChats={isLoadingChats}
+								sidebarWidth={sidebarWidth}
+								isResizing={isResizing}
+							/>
+						)}
 
 						{/* Unified slide-out panel — shell stays open, content cross-fades */}
 						<SidebarSlideOutPanel
@@ -524,7 +531,16 @@ export function LayoutShell({
 					)}
 
 					{/* Main content panel */}
-					<MainContentPanel isChatPage={isChatPage} onTabSwitch={onTabSwitch} onNewChat={onNewChat}>
+					<MainContentPanel
+						isChatPage={isChatPage}
+						onTabSwitch={onTabSwitch}
+						onNewChat={onNewChat}
+						leftActions={
+							isCollapsed ? (
+								<SidebarCollapseButton isCollapsed={isCollapsed} onToggle={toggleCollapsed} />
+							) : undefined
+						}
+					>
 						{children}
 					</MainContentPanel>
 
diff --git a/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx b/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
index f0deea038..00263e81a 100644
--- a/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
@@ -269,7 +269,7 @@ export function Sidebar({
 			)}
 
 			{/* Footer */}
-			<div className="mt-auto border-t">
+			<div className="mt-auto border-t border-border/60">
 				{/* Platform navigation */}
 				{navItems.length > 0 && (
 					<NavSection items={navItems} onItemClick={onNavItemClick} isCollapsed={isCollapsed} />
@@ -307,7 +307,7 @@ function SidebarUsageFooter({
 
 	if (isAnonymous) {
 		return (
-			<div className="px-3 py-3 border-t space-y-3">
+			<div className="px-3 py-3 border-t border-border/60 space-y-3">
 				{pageUsage && (
 					<div className="space-y-1.5">
 						<div className="flex justify-between items-center text-xs">
@@ -340,7 +340,7 @@ function SidebarUsageFooter({
 	}
 
 	return (
-		<div className="px-3 py-3 border-t space-y-3">
+		<div className="px-3 py-3 border-t border-border/60 space-y-3">
 			<PremiumTokenUsageDisplay />
 			{pageUsage && (
 				<PageUsageDisplay pagesUsed={pageUsage.pagesUsed} pagesLimit={pageUsage.pagesLimit} />
diff --git a/surfsense_web/components/layout/ui/sidebar/SidebarButton.tsx b/surfsense_web/components/layout/ui/sidebar/SidebarButton.tsx
index 9add894db..a3c3b383c 100644
--- a/surfsense_web/components/layout/ui/sidebar/SidebarButton.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/SidebarButton.tsx
@@ -14,6 +14,8 @@ interface SidebarButtonProps {
 	badge?: React.ReactNode;
 	/** Overlay in the top-right corner of the collapsed icon (e.g. status badge) */
 	collapsedOverlay?: React.ReactNode;
+	/** Custom icon node for collapsed mode — overrides the default <Icon> rendering */
+	collapsedIconNode?: React.ReactNode;
 	/** Custom icon node for expanded mode — overrides the default <Icon> rendering */
 	expandedIconNode?: React.ReactNode;
 	/** Optional inline trailing content shown in expanded mode */
@@ -26,7 +28,7 @@ interface SidebarButtonProps {
 }
 
 const expandedClassName = cn(
-	"flex items-center gap-1.5 rounded-md mx-2 px-2 py-1 text-sm transition-colors text-left",
+	"flex items-center gap-2 rounded-md mx-2 px-2 py-1.5 text-sm transition-colors text-left",
 	"hover:bg-accent hover:text-accent-foreground",
 	"focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
 );
@@ -45,6 +47,7 @@ export function SidebarButton({
 	isActive = false,
 	badge,
 	collapsedOverlay,
+	collapsedIconNode,
 	expandedIconNode,
 	trailingContent,
 	tooltipContent,
@@ -63,7 +66,7 @@ export function SidebarButton({
 						className={cn(collapsedClassName, isActive && activeClassName, className)}
 						{...buttonProps}
 					>
-			<Icon className="h-3.5 w-3.5" />
+						{collapsedIconNode ?? <Icon className="h-3.5 w-3.5" />}
 						{collapsedOverlay}
 						<span className="sr-only">{label}</span>
 					</button>
diff --git a/surfsense_web/components/layout/ui/sidebar/SidebarCollapseButton.tsx b/surfsense_web/components/layout/ui/sidebar/SidebarCollapseButton.tsx
index 0eb409349..06f1479cf 100644
--- a/surfsense_web/components/layout/ui/sidebar/SidebarCollapseButton.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/SidebarCollapseButton.tsx
@@ -35,7 +35,7 @@ export function SidebarCollapseButton({
 	return (
 		<Tooltip>
 			<TooltipTrigger asChild>{button}</TooltipTrigger>
-			<TooltipContent side={isCollapsed ? "right" : "bottom"}>
+			<TooltipContent side="bottom" avoidCollisions={false}>
 				<span className="flex items-center">
 					{isCollapsed ? t("expand_sidebar") : t("collapse_sidebar")}
 					<ShortcutKbd keys={shortcutKeys("Mod", "\\")} />
diff --git a/surfsense_web/components/layout/ui/tabs/TabBar.tsx b/surfsense_web/components/layout/ui/tabs/TabBar.tsx
index 8d0d986d3..a246ff849 100644
--- a/surfsense_web/components/layout/ui/tabs/TabBar.tsx
+++ b/surfsense_web/components/layout/ui/tabs/TabBar.tsx
@@ -15,11 +15,18 @@ import { cn } from "@/lib/utils";
 interface TabBarProps {
 	onTabSwitch?: (tab: Tab) => void;
 	onNewChat?: () => void;
+	leftActions?: React.ReactNode;
 	rightActions?: React.ReactNode;
 	className?: string;
 }
 
-export function TabBar({ onTabSwitch, onNewChat, rightActions, className }: TabBarProps) {
+export function TabBar({
+	onTabSwitch,
+	onNewChat,
+	leftActions,
+	rightActions,
+	className,
+}: TabBarProps) {
 	const tabs = useAtomValue(tabsAtom);
 	const activeTabId = useAtomValue(activeTabIdAtom);
 	const switchTab = useSetAtom(switchTabAtom);
@@ -68,11 +75,20 @@ export function TabBar({ onTabSwitch, onNewChat, rightActions, className }: TabB
 		}
 	}, [activeTabId]);
 
-	// Only show tab bar when there's more than one tab
-	if (tabs.length <= 1) return null;
+	// Keep action slots visible even with one/no tabs
+	const hasAuxActions = !!leftActions || !!rightActions || !!onNewChat;
+	const hasMultipleChats = tabs.length > 1;
+	if (tabs.length <= 1 && !hasAuxActions) return null;
 
 	return (
-		<div className={cn("mb-2 flex h-9 items-center shrink-0 px-1 gap-0.5 select-none", className)}>
+		<div
+			className={cn(
+				"mb-2 flex h-9 items-center shrink-0 px-1 gap-0.5 select-none",
+				hasMultipleChats && "mt-1",
+				className
+			)}
+		>
+			{leftActions ? <div className="flex items-center gap-0.5 shrink-0">{leftActions}</div> : null}
 			<div
 				ref={scrollRef}
 				className="flex h-full items-center flex-1 gap-0.5 overflow-x-auto overflow-y-hidden scrollbar-hide [scrollbar-width:none] [-ms-overflow-style:none] [&::-webkit-scrollbar]:hidden py-1"

From 65f3916fc38abebeb271ff0141015601719e9ab3 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Wed, 29 Apr 2026 03:46:40 +0530
Subject: [PATCH 05/96] refactor(header, layout): simplify header component by
 removing unused tabs and mobile checks; enhance RightPanel and LayoutShell
 with improved styling and sidebar functionality

---
 .../components/layout/ui/header/Header.tsx    |  8 +--
 .../layout/ui/right-panel/RightPanel.tsx      | 11 +++-
 .../layout/ui/shell/LayoutShell.tsx           | 59 +++++++++++--------
 .../layout/ui/sidebar/DocumentsSidebar.tsx    |  4 +-
 .../ui/sidebar/SidebarCollapseButton.tsx      |  7 ++-
 .../components/layout/ui/tabs/TabBar.tsx      | 14 ++---
 6 files changed, 59 insertions(+), 44 deletions(-)

diff --git a/surfsense_web/components/layout/ui/header/Header.tsx b/surfsense_web/components/layout/ui/header/Header.tsx
index ec54cb901..fc80bb4d2 100644
--- a/surfsense_web/components/layout/ui/header/Header.tsx
+++ b/surfsense_web/components/layout/ui/header/Header.tsx
@@ -4,12 +4,10 @@ import { useAtomValue } from "jotai";
 import { usePathname } from "next/navigation";
 import { currentThreadAtom } from "@/atoms/chat/current-thread.atom";
 import { activeSearchSpaceIdAtom } from "@/atoms/search-spaces/search-space-query.atoms";
-import { activeTabAtom, tabsAtom } from "@/atoms/tabs/tabs.atom";
+import { activeTabAtom } from "@/atoms/tabs/tabs.atom";
 import { ChatHeader } from "@/components/new-chat/chat-header";
 import { ChatShareButton } from "@/components/new-chat/chat-share-button";
-import { useIsMobile } from "@/hooks/use-mobile";
 import type { ChatVisibility, ThreadRecord } from "@/lib/chat/thread-persistence";
-import { RightPanelExpandButton } from "../right-panel/RightPanel";
 
 interface HeaderProps {
 	mobileMenuTrigger?: React.ReactNode;
@@ -18,14 +16,11 @@ interface HeaderProps {
 export function Header({ mobileMenuTrigger }: HeaderProps) {
 	const pathname = usePathname();
 	const searchSpaceId = useAtomValue(activeSearchSpaceIdAtom);
-	const isMobile = useIsMobile();
 	const activeTab = useAtomValue(activeTabAtom);
-	const tabs = useAtomValue(tabsAtom);
 
 	const isFreePage = pathname?.startsWith("/free") ?? false;
 	const isChatPage = pathname?.includes("/new-chat") ?? false;
 	const isDocumentTab = activeTab?.type === "document";
-	const hasTabBar = tabs.length > 1;
 
 	const currentThreadState = useAtomValue(currentThreadAtom);
 
@@ -72,7 +67,6 @@ export function Header({ mobileMenuTrigger }: HeaderProps) {
 				{hasThread && (
 					<ChatShareButton thread={threadForButton} onVisibilityChange={handleVisibilityChange} />
 				)}
-				{!isMobile && !hasTabBar && <RightPanelExpandButton />}
 			</div>
 		</header>
 	);
diff --git a/surfsense_web/components/layout/ui/right-panel/RightPanel.tsx b/surfsense_web/components/layout/ui/right-panel/RightPanel.tsx
index c26cc9b23..f9c02b197 100644
--- a/surfsense_web/components/layout/ui/right-panel/RightPanel.tsx
+++ b/surfsense_web/components/layout/ui/right-panel/RightPanel.tsx
@@ -48,7 +48,12 @@ function CollapseButton({ onClick }: { onClick: () => void }) {
 	return (
 		<Tooltip>
 			<TooltipTrigger asChild>
-				<Button variant="ghost" size="icon" onClick={onClick} className="h-8 w-8 shrink-0">
+				<Button
+					variant="ghost"
+					size="icon"
+					onClick={onClick}
+					className="h-8 w-8 shrink-0 text-muted-foreground hover:text-foreground hover:bg-muted/40"
+				>
 					<PanelRight className="h-4 w-4" />
 					<span className="sr-only">Collapse panel</span>
 				</Button>
@@ -88,7 +93,7 @@ export function RightPanelExpandButton() {
 						variant="ghost"
 						size="icon"
 						onClick={() => startTransition(() => setCollapsed(false))}
-						className="h-8 w-8 shrink-0 -m-0.5"
+						className="h-8 w-8 shrink-0 -m-0.5 text-muted-foreground hover:text-foreground hover:bg-muted/40"
 					>
 						<PanelRight className="h-4 w-4" />
 						<span className="sr-only">Expand panel</span>
@@ -161,7 +166,7 @@ export function RightPanel({ documentsPanel }: RightPanelProps) {
 	return (
 		<aside
 			style={{ width: targetWidth }}
-			className="flex h-full shrink-0 flex-col rounded-xl border bg-sidebar text-sidebar-foreground overflow-hidden transition-[width] duration-200 ease-out"
+			className="flex h-full shrink-0 flex-col border-l border-b bg-sidebar text-sidebar-foreground overflow-hidden transition-[width] duration-200 ease-out"
 		>
 			<div className="relative flex-1 min-h-0 overflow-hidden">
 				{effectiveTab === "sources" && documentsOpen && documentsPanel && (
diff --git a/surfsense_web/components/layout/ui/shell/LayoutShell.tsx b/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
index 66468dd88..3d61836ad 100644
--- a/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
+++ b/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
@@ -120,22 +120,45 @@ interface LayoutShellProps {
 
 function MainContentPanel({
 	isChatPage,
+	isSidebarCollapsed,
 	onTabSwitch,
 	onNewChat,
 	leftActions,
+	showResizeHandle = false,
+	onResizeMouseDown,
 	children,
 }: {
 	isChatPage: boolean;
+	isSidebarCollapsed: boolean;
 	onTabSwitch?: (tab: Tab) => void;
 	onNewChat?: () => void;
 	leftActions?: React.ReactNode;
+	showResizeHandle?: boolean;
+	onResizeMouseDown?: (e: React.MouseEvent) => void;
 	children: React.ReactNode;
 }) {
 	const activeTab = useAtomValue(activeTabAtom);
 	const isDocumentTab = activeTab?.type === "document";
 
 	return (
-		<div className="relative flex flex-1 flex-col min-w-0">
+		<div
+			className={cn(
+				"relative flex flex-1 flex-col min-w-0 -ml-2",
+				isSidebarCollapsed ? "" : "border-l border-border/60"
+			)}
+		>
+			{showResizeHandle && onResizeMouseDown && (
+				<div
+					role="slider"
+					aria-label="Resize sidebar"
+					aria-valuemin={0}
+					aria-valuemax={100}
+					aria-valuenow={50}
+					tabIndex={0}
+					onMouseDown={onResizeMouseDown}
+					className="absolute left-0 top-0 hidden md:block h-full w-2 -translate-x-1/2 cursor-col-resize z-30 focus:outline-none"
+				/>
+			)}
 			<TabBar
 				onTabSwitch={onTabSwitch}
 				onNewChat={onNewChat}
@@ -143,7 +166,7 @@ function MainContentPanel({
 				rightActions={<RightPanelExpandButton />}
 				className="min-w-0"
 			/>
-			<div className="relative flex flex-1 flex-col rounded-xl border bg-main-panel overflow-hidden min-w-0">
+			<div className="relative flex flex-1 flex-col border border-l-0 border-r-0 border-t-0 bg-main-panel overflow-hidden min-w-0">
 				<Header />
 
 				{isDocumentTab && activeTab.documentId && activeTab.searchSpaceId ? (
@@ -515,26 +538,14 @@ export function LayoutShell({
 						</SidebarSlideOutPanel>
 					</div>
 
-					{/* Resize handle — negative margins eat the flex gap so spacing stays unchanged */}
-					{!isCollapsed && (
-						<div
-							role="slider"
-							aria-label="Resize sidebar"
-							aria-valuemin={0}
-							aria-valuemax={100}
-							aria-valuenow={50}
-							tabIndex={0}
-							onMouseDown={onResizeMouseDown}
-							className="hidden md:block h-full cursor-col-resize z-30 focus:outline-none"
-							style={{ width: 8, marginLeft: -8, marginRight: -8 }}
-						/>
-					)}
-
 					{/* Main content panel */}
 					<MainContentPanel
 						isChatPage={isChatPage}
+						isSidebarCollapsed={isCollapsed}
 						onTabSwitch={onTabSwitch}
 						onNewChat={onNewChat}
+						showResizeHandle={!isCollapsed}
+						onResizeMouseDown={onResizeMouseDown}
 						leftActions={
 							isCollapsed ? (
 								<SidebarCollapseButton isCollapsed={isCollapsed} onToggle={toggleCollapsed} />
@@ -546,12 +557,14 @@ export function LayoutShell({
 
 					{/* Right panel — tabbed Sources/Report (desktop only) */}
 					{documentsPanel && (
-						<RightPanel
-							documentsPanel={{
-								open: documentsPanel.open,
-								onOpenChange: documentsPanel.onOpenChange,
-							}}
-						/>
+						<div className="-ml-2 -mr-2">
+							<RightPanel
+								documentsPanel={{
+									open: documentsPanel.open,
+									onOpenChange: documentsPanel.onOpenChange,
+								}}
+							/>
+						</div>
 					)}
 				</div>
 			</TooltipProvider>
diff --git a/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx
index 59873e72c..248f82695 100644
--- a/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx
@@ -1207,7 +1207,7 @@ function AuthenticatedDocumentsSidebarBase({
 
 	const documentsContent = (
 		<>
-			<div className="shrink-0 flex h-12 items-center px-4">
+			<div className="shrink-0 flex h-12 items-center px-3 border-b">
 				<div className="flex w-full items-center justify-between">
 					<div className="flex items-center gap-3">
 						{isMobile && (
@@ -1692,7 +1692,7 @@ function AnonymousDocumentsSidebar({
 			/>
 
 			{/* Header */}
-			<div className="shrink-0 flex h-12 items-center px-4">
+			<div className="shrink-0 flex h-12 items-center px-3 border-b">
 				<div className="flex w-full items-center justify-between">
 					<div className="flex items-center gap-2">
 						<h2 className="select-none text-base font-semibold">{t("title") || "Documents"}</h2>
diff --git a/surfsense_web/components/layout/ui/sidebar/SidebarCollapseButton.tsx b/surfsense_web/components/layout/ui/sidebar/SidebarCollapseButton.tsx
index 06f1479cf..7f8844b8d 100644
--- a/surfsense_web/components/layout/ui/sidebar/SidebarCollapseButton.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/SidebarCollapseButton.tsx
@@ -22,7 +22,12 @@ export function SidebarCollapseButton({
 	const { shortcutKeys } = usePlatformShortcut();
 
 	const button = (
-		<Button variant="ghost" size="icon" onClick={onToggle} className="h-8 w-8 shrink-0">
+		<Button
+			variant="ghost"
+			size="icon"
+			onClick={onToggle}
+			className="h-8 w-8 shrink-0 text-muted-foreground hover:text-foreground hover:bg-muted/40"
+		>
 			<PanelLeft className="h-4 w-4" />
 			<span className="sr-only">{isCollapsed ? t("expand_sidebar") : t("collapse_sidebar")}</span>
 		</Button>
diff --git a/surfsense_web/components/layout/ui/tabs/TabBar.tsx b/surfsense_web/components/layout/ui/tabs/TabBar.tsx
index a246ff849..2d013eaaa 100644
--- a/surfsense_web/components/layout/ui/tabs/TabBar.tsx
+++ b/surfsense_web/components/layout/ui/tabs/TabBar.tsx
@@ -77,21 +77,19 @@ export function TabBar({
 
 	// Keep action slots visible even with one/no tabs
 	const hasAuxActions = !!leftActions || !!rightActions || !!onNewChat;
-	const hasMultipleChats = tabs.length > 1;
 	if (tabs.length <= 1 && !hasAuxActions) return null;
 
 	return (
 		<div
 			className={cn(
-				"mb-2 flex h-9 items-center shrink-0 px-1 gap-0.5 select-none",
-				hasMultipleChats && "mt-1",
+				"mb-0 flex h-12 items-center shrink-0 px-1 gap-0.5 select-none border-b border-border/60",
 				className
 			)}
 		>
 			{leftActions ? <div className="flex items-center gap-0.5 shrink-0">{leftActions}</div> : null}
 			<div
 				ref={scrollRef}
-				className="flex h-full items-center flex-1 gap-0.5 overflow-x-auto overflow-y-hidden scrollbar-hide [scrollbar-width:none] [-ms-overflow-style:none] [&::-webkit-scrollbar]:hidden py-1"
+				className="flex h-8 items-center flex-1 gap-3 overflow-x-auto overflow-y-hidden scrollbar-hide [scrollbar-width:none] [-ms-overflow-style:none] [&::-webkit-scrollbar]:hidden py-0"
 			>
 				{tabs.map((tab) => {
 					const isActive = tab.id === activeTabId;
@@ -103,7 +101,7 @@ export function TabBar({
 							data-tab-id={tab.id}
 							onClick={() => handleTabClick(tab)}
 							className={cn(
-								"group relative flex h-full w-[150px] items-center px-3 min-h-0 overflow-hidden text-[13px] font-medium rounded-lg transition-all duration-150 shrink-0",
+								"group relative flex h-full w-[150px] items-center px-3 min-h-0 overflow-hidden text-[13px] font-medium rounded-md transition-all duration-150 shrink-0",
 								isActive
 									? "bg-muted/60 text-foreground"
 									: "bg-transparent text-muted-foreground hover:bg-muted/30 hover:text-foreground"
@@ -136,15 +134,15 @@ export function TabBar({
 					);
 				})}
 			</div>
-			<div className="flex items-center gap-0.5 shrink-0">
+			<div className="flex items-center gap-0.5 shrink-0 pr-2">
 				{onNewChat && (
 					<button
 						type="button"
 						onClick={onNewChat}
-						className="flex h-6 w-6 items-center justify-center shrink-0 rounded-md text-muted-foreground transition-all duration-150 hover:text-foreground hover:bg-muted/40"
+						className="flex h-8 w-8 items-center justify-center shrink-0 rounded-md text-muted-foreground transition-all duration-150 hover:text-foreground hover:bg-muted/40"
 						title="New Chat"
 					>
-						<Plus className="size-3.5" />
+						<Plus className="size-4" />
 					</button>
 				)}
 				{rightActions}

From 5374da009297e050547470c4f466963d8df2e9a1 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Wed, 29 Apr 2026 03:55:13 +0530
Subject: [PATCH 06/96] refactor(ui): update component styles for improved
 consistency; adjust footer and message content rounding, and enhance tab bar
 padding

---
 surfsense_web/components/assistant-ui/thread.tsx       | 4 ++--
 surfsense_web/components/assistant-ui/user-message.tsx | 2 +-
 surfsense_web/components/layout/ui/tabs/TabBar.tsx     | 2 +-
 surfsense_web/components/public-chat/public-thread.tsx | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/surfsense_web/components/assistant-ui/thread.tsx b/surfsense_web/components/assistant-ui/thread.tsx
index dcc068bd1..6a9baa86a 100644
--- a/surfsense_web/components/assistant-ui/thread.tsx
+++ b/surfsense_web/components/assistant-ui/thread.tsx
@@ -126,7 +126,7 @@ const ThreadContent: FC = () => {
 				</AuiIf>
 
 				<ThreadPrimitive.ViewportFooter
-					className="aui-thread-viewport-footer sticky bottom-0 z-10 mx-auto flex w-full max-w-(--thread-max-width) flex-col gap-4 overflow-visible rounded-t-3xl bg-main-panel pb-4 md:pb-6"
+					className="aui-thread-viewport-footer sticky bottom-0 z-10 mx-auto flex w-full max-w-(--thread-max-width) flex-col gap-4 overflow-visible rounded-t-2xl bg-main-panel pb-4 md:pb-6"
 					style={{ paddingBottom: "max(1rem, env(safe-area-inset-bottom))" }}
 				>
 					<ThreadScrollToBottom />
@@ -681,7 +681,7 @@ const Composer: FC = () => {
 	}, [mentionedDocuments]);
 
 	return (
-		<ComposerPrimitive.Root className="aui-composer-root relative flex w-full flex-col gap-2">
+		<ComposerPrimitive.Root className="aui-composer-root relative flex w-full flex-col gap-2 rounded-2xl">
 			<ChatSessionStatus
 				isAiResponding={isAiResponding}
 				respondingToUserId={respondingToUserId}
diff --git a/surfsense_web/components/assistant-ui/user-message.tsx b/surfsense_web/components/assistant-ui/user-message.tsx
index fb7212119..037e85ad4 100644
--- a/surfsense_web/components/assistant-ui/user-message.tsx
+++ b/surfsense_web/components/assistant-ui/user-message.tsx
@@ -77,7 +77,7 @@ export const UserMessage: FC = () => {
 			<div className="col-start-2 min-w-0">
 				<div className="aui-user-message-content-wrapper flex items-end gap-2">
 					<div className="relative flex-1 min-w-0">
-						<div className="aui-user-message-content wrap-break-word rounded-2xl bg-muted px-4 py-2.5 text-foreground">
+						<div className="aui-user-message-content wrap-break-word rounded-xl bg-muted px-4 py-2.5 text-foreground">
 							{mentionedDocs && mentionedDocs.length > 0 ? (
 								<UserMessageWithMentionChips text={messageText} mentionedDocs={mentionedDocs} />
 							) : (
diff --git a/surfsense_web/components/layout/ui/tabs/TabBar.tsx b/surfsense_web/components/layout/ui/tabs/TabBar.tsx
index 2d013eaaa..3015fcf51 100644
--- a/surfsense_web/components/layout/ui/tabs/TabBar.tsx
+++ b/surfsense_web/components/layout/ui/tabs/TabBar.tsx
@@ -89,7 +89,7 @@ export function TabBar({
 			{leftActions ? <div className="flex items-center gap-0.5 shrink-0">{leftActions}</div> : null}
 			<div
 				ref={scrollRef}
-				className="flex h-8 items-center flex-1 gap-3 overflow-x-auto overflow-y-hidden scrollbar-hide [scrollbar-width:none] [-ms-overflow-style:none] [&::-webkit-scrollbar]:hidden py-0"
+				className="flex h-8 items-center flex-1 gap-3 pl-2 overflow-x-auto overflow-y-hidden scrollbar-hide [scrollbar-width:none] [-ms-overflow-style:none] [&::-webkit-scrollbar]:hidden py-0"
 			>
 				{tabs.map((tab) => {
 					const isActive = tab.id === activeTabId;
diff --git a/surfsense_web/components/public-chat/public-thread.tsx b/surfsense_web/components/public-chat/public-thread.tsx
index 627baf831..19a13ab54 100644
--- a/surfsense_web/components/public-chat/public-thread.tsx
+++ b/surfsense_web/components/public-chat/public-thread.tsx
@@ -120,7 +120,7 @@ const PublicUserMessage: FC = () => {
 		>
 			<div className="aui-user-message-content-wrapper col-start-2 min-w-0 flex items-end gap-2">
 				<div className="flex-1 min-w-0">
-					<div className="aui-user-message-content wrap-break-word rounded-2xl bg-muted px-4 py-2.5 text-foreground">
+					<div className="aui-user-message-content wrap-break-word rounded-xl bg-muted px-4 py-2.5 text-foreground">
 						<MessagePrimitive.Parts />
 					</div>
 				</div>

From 481397469045c555eb92a975b932f9e22b104e7f Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Wed, 29 Apr 2026 14:21:29 +0530
Subject: [PATCH 07/96] fix(ui): update hover styles for buttons in RightPanel,
 Sidebar, and TabBar components

---
 surfsense_web/components/layout/ui/right-panel/RightPanel.tsx | 4 ++--
 .../components/layout/ui/sidebar/SidebarCollapseButton.tsx    | 2 +-
 surfsense_web/components/layout/ui/tabs/TabBar.tsx            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/surfsense_web/components/layout/ui/right-panel/RightPanel.tsx b/surfsense_web/components/layout/ui/right-panel/RightPanel.tsx
index 88ca66954..3dc7a96d4 100644
--- a/surfsense_web/components/layout/ui/right-panel/RightPanel.tsx
+++ b/surfsense_web/components/layout/ui/right-panel/RightPanel.tsx
@@ -61,7 +61,7 @@ function CollapseButton({ onClick }: { onClick: () => void }) {
 					variant="ghost"
 					size="icon"
 					onClick={onClick}
-					className="h-8 w-8 shrink-0 text-muted-foreground hover:text-foreground hover:bg-muted/40"
+					className="h-8 w-8 shrink-0 text-muted-foreground hover:text-muted-foreground hover:bg-muted/40"
 				>
 					<PanelRight className="h-4 w-4" />
 					<span className="sr-only">Collapse panel</span>
@@ -102,7 +102,7 @@ export function RightPanelExpandButton() {
 						variant="ghost"
 						size="icon"
 						onClick={() => startTransition(() => setCollapsed(false))}
-						className="h-8 w-8 shrink-0 -m-0.5 text-muted-foreground hover:text-foreground hover:bg-muted/40"
+						className="h-8 w-8 shrink-0 -m-0.5 text-muted-foreground hover:text-muted-foreground hover:bg-muted/40"
 					>
 						<PanelRight className="h-4 w-4" />
 						<span className="sr-only">Expand panel</span>
diff --git a/surfsense_web/components/layout/ui/sidebar/SidebarCollapseButton.tsx b/surfsense_web/components/layout/ui/sidebar/SidebarCollapseButton.tsx
index 7f8844b8d..7228c1fd9 100644
--- a/surfsense_web/components/layout/ui/sidebar/SidebarCollapseButton.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/SidebarCollapseButton.tsx
@@ -26,7 +26,7 @@ export function SidebarCollapseButton({
 			variant="ghost"
 			size="icon"
 			onClick={onToggle}
-			className="h-8 w-8 shrink-0 text-muted-foreground hover:text-foreground hover:bg-muted/40"
+			className="h-8 w-8 shrink-0 text-muted-foreground hover:text-muted-foreground hover:bg-muted/40"
 		>
 			<PanelLeft className="h-4 w-4" />
 			<span className="sr-only">{isCollapsed ? t("expand_sidebar") : t("collapse_sidebar")}</span>
diff --git a/surfsense_web/components/layout/ui/tabs/TabBar.tsx b/surfsense_web/components/layout/ui/tabs/TabBar.tsx
index 3015fcf51..c6f892034 100644
--- a/surfsense_web/components/layout/ui/tabs/TabBar.tsx
+++ b/surfsense_web/components/layout/ui/tabs/TabBar.tsx
@@ -139,7 +139,7 @@ export function TabBar({
 					<button
 						type="button"
 						onClick={onNewChat}
-						className="flex h-8 w-8 items-center justify-center shrink-0 rounded-md text-muted-foreground transition-all duration-150 hover:text-foreground hover:bg-muted/40"
+						className="flex h-8 w-8 items-center justify-center shrink-0 rounded-md text-muted-foreground transition-all duration-150 hover:text-muted-foreground hover:bg-muted/40"
 						title="New Chat"
 					>
 						<Plus className="size-4" />

From 315f4229f9a49f9811a26c8822f433dc07ba613e Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Sat, 2 May 2026 14:01:33 +0530
Subject: [PATCH 08/96] refactor(sidebar): remove sidebarWidth from context and
 update resize handling

---
 .../layout/hooks/SidebarContext.tsx           |  1 -
 .../layout/hooks/useSidebarResize.ts          |  1 +
 .../layout/ui/shell/LayoutShell.tsx           | 33 ++++++++-----------
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/surfsense_web/components/layout/hooks/SidebarContext.tsx b/surfsense_web/components/layout/hooks/SidebarContext.tsx
index bfb5b5aeb..35f76929d 100644
--- a/surfsense_web/components/layout/hooks/SidebarContext.tsx
+++ b/surfsense_web/components/layout/hooks/SidebarContext.tsx
@@ -6,7 +6,6 @@ interface SidebarContextValue {
 	isCollapsed: boolean;
 	setIsCollapsed: (collapsed: boolean) => void;
 	toggleCollapsed: () => void;
-	sidebarWidth: number;
 }
 
 const SidebarContext = createContext<SidebarContextValue | null>(null);
diff --git a/surfsense_web/components/layout/hooks/useSidebarResize.ts b/surfsense_web/components/layout/hooks/useSidebarResize.ts
index 887c86dce..35ef7bf8b 100644
--- a/surfsense_web/components/layout/hooks/useSidebarResize.ts
+++ b/surfsense_web/components/layout/hooks/useSidebarResize.ts
@@ -39,6 +39,7 @@ export function useSidebarResize(defaultWidth = SIDEBAR_MIN_WIDTH): UseSidebarRe
 	// Persist width to cookie
 	const persistWidth = useCallback((width: number) => {
 		try {
+			// biome-ignore lint/suspicious/noDocumentCookie: SSR-readable preference, not security-sensitive
 			document.cookie = `${SIDEBAR_WIDTH_COOKIE_NAME}=${width}; path=/; max-age=${SIDEBAR_WIDTH_COOKIE_MAX_AGE}`;
 		} catch {
 			// Ignore cookie write errors
diff --git a/surfsense_web/components/layout/ui/shell/LayoutShell.tsx b/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
index d57cd148a..701b89b39 100644
--- a/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
+++ b/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
@@ -217,8 +217,8 @@ export function LayoutShell({
 
 	// Memoize context value to prevent unnecessary re-renders
 	const sidebarContextValue = useMemo(
-		() => ({ isCollapsed, setIsCollapsed, toggleCollapsed, sidebarWidth }),
-		[isCollapsed, setIsCollapsed, toggleCollapsed, sidebarWidth]
+		() => ({ isCollapsed, setIsCollapsed, toggleCollapsed }),
+		[isCollapsed, setIsCollapsed, toggleCollapsed]
 	);
 
 	const closeSlideout = useCallback(
@@ -403,10 +403,10 @@ export function LayoutShell({
 						/>
 					</div>
 
-					{/* Sidebar + slide-out panels share one container; overflow visible so panels can overlay main content */}
+					{/* Sidebar + slide-out panels share one container; overflow visible so panels can overlay main content. Negative right margin closes the flex gap so the sidebar sits flush against the main panel, separated only by a border. */}
 					<div
 						className={cn(
-							"relative hidden md:flex shrink-0 z-20",
+							"relative hidden md:flex shrink-0 z-20 -mr-2 border-r border-border/60",
 							!isCollapsed && "bg-sidebar"
 						)}
 					>
@@ -445,6 +445,16 @@ export function LayoutShell({
 							/>
 						)}
 
+						{/* Invisible drag hit-area straddling the right border — provides resize affordance without any visible UI */}
+						{!isCollapsed && (
+							<button
+								type="button"
+								aria-label="Resize sidebar"
+								onMouseDown={onResizeMouseDown}
+								className="absolute top-0 right-0 h-full w-2 translate-x-1/2 cursor-col-resize z-30 bg-transparent border-0 p-0 focus:outline-none"
+							/>
+						)}
+
 						{/* Unified slide-out panel — shell stays open, content cross-fades */}
 						<SidebarSlideOutPanel
 							open={anySlideOutOpen}
@@ -515,21 +525,6 @@ export function LayoutShell({
 						</SidebarSlideOutPanel>
 					</div>
 
-					{/* Resize handle — negative margins eat the flex gap so spacing stays unchanged */}
-					{!isCollapsed && (
-						<div
-							role="slider"
-							aria-label="Resize sidebar"
-							aria-valuemin={0}
-							aria-valuemax={100}
-							aria-valuenow={50}
-							tabIndex={0}
-							onMouseDown={onResizeMouseDown}
-							className="hidden md:block h-full cursor-col-resize z-30 focus:outline-none"
-							style={{ width: 8, marginLeft: -8, marginRight: -8 }}
-						/>
-					)}
-
 					{/* Main content panel */}
 					<MainContentPanel
 						isChatPage={isChatPage}

From 3cdfe8b5b68f457bcda1c79d1952f337c8abae8a Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Sun, 3 May 2026 18:36:23 +0530
Subject: [PATCH 09/96] feat(tabs): persist tabs in localStorage for improved
 user experience across sessions; enhance syncChatTabAtom to include
 searchSpaceId; update LayoutDataProvider to support announcements dialog and
 clean up unused imports

---
 surfsense_web/atoms/tabs/tabs.atom.ts         |  39 +++++--
 .../layout/providers/LayoutDataProvider.tsx   |  56 ++++------
 .../components/layout/ui/tabs/TabBar.tsx      | 101 +++++++++++++++---
 3 files changed, 139 insertions(+), 57 deletions(-)

diff --git a/surfsense_web/atoms/tabs/tabs.atom.ts b/surfsense_web/atoms/tabs/tabs.atom.ts
index 22cc5373a..3bb06c8e3 100644
--- a/surfsense_web/atoms/tabs/tabs.atom.ts
+++ b/surfsense_web/atoms/tabs/tabs.atom.ts
@@ -36,14 +36,16 @@ const initialState: TabsState = {
 // Prevent race conditions where route-sync recreates a just-deleted chat tab.
 const deletedChatIdsAtom = atom<Set<number>>(new Set<number>());
 
-const sessionStorageAdapter = createJSONStorage<TabsState>(
-	() => (typeof window !== "undefined" ? sessionStorage : undefined) as Storage
+// Persist tabs in localStorage so they survive a hard refresh and let the user
+// keep tabs open across multiple search spaces (browser-like behavior).
+const localStorageAdapter = createJSONStorage<TabsState>(
+	() => (typeof window !== "undefined" ? localStorage : undefined) as Storage
 );
 
 export const tabsStateAtom = atomWithStorage<TabsState>(
 	"surfsense:tabs",
 	initialState,
-	sessionStorageAdapter,
+	localStorageAdapter,
 	{ getOnInit: true }
 );
 
@@ -72,7 +74,17 @@ export const syncChatTabAtom = atom(
 	(
 		get,
 		set,
-		{ chatId, title, chatUrl }: { chatId: number | null; title?: string; chatUrl?: string }
+		{
+			chatId,
+			title,
+			chatUrl,
+			searchSpaceId,
+		}: {
+			chatId: number | null;
+			title?: string;
+			chatUrl?: string;
+			searchSpaceId: number;
+		}
 	) => {
 		if (chatId && get(deletedChatIdsAtom).has(chatId)) {
 			return;
@@ -87,20 +99,32 @@ export const syncChatTabAtom = atom(
 				...state,
 				activeTabId: tabId,
 				tabs: state.tabs.map((t) =>
-					t.id === tabId ? { ...t, title: title || t.title, chatUrl: chatUrl || t.chatUrl } : t
+					t.id === tabId
+						? {
+								...t,
+								title: title || t.title,
+								chatUrl: chatUrl || t.chatUrl,
+								searchSpaceId: searchSpaceId ?? t.searchSpaceId,
+							}
+						: t
 				),
 			});
 			return;
 		}
 
 		// If navigating to a new chat (no chatId), ensure there's a "new chat" tab
+		// scoped to the current search space.
 		if (!chatId) {
 			const hasNewChatTab = state.tabs.some((t) => t.id === "chat-new");
 			if (hasNewChatTab) {
-				set(tabsStateAtom, { ...state, activeTabId: "chat-new" });
+				set(tabsStateAtom, {
+					...state,
+					activeTabId: "chat-new",
+					tabs: state.tabs.map((t) => (t.id === "chat-new" ? { ...t, searchSpaceId, chatUrl } : t)),
+				});
 			} else {
 				set(tabsStateAtom, {
-					tabs: [...state.tabs, INITIAL_CHAT_TAB],
+					tabs: [...state.tabs, { ...INITIAL_CHAT_TAB, searchSpaceId, chatUrl }],
 					activeTabId: "chat-new",
 				});
 			}
@@ -115,6 +139,7 @@ export const syncChatTabAtom = atom(
 			title: title || `Chat ${chatId}`,
 			chatId,
 			chatUrl,
+			searchSpaceId,
 		};
 
 		let updatedTabs: Tab[];
diff --git a/surfsense_web/components/layout/providers/LayoutDataProvider.tsx b/surfsense_web/components/layout/providers/LayoutDataProvider.tsx
index d70a7ade4..c125ff0eb 100644
--- a/surfsense_web/components/layout/providers/LayoutDataProvider.tsx
+++ b/surfsense_web/components/layout/providers/LayoutDataProvider.tsx
@@ -2,7 +2,7 @@
 
 import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { useAtom, useAtomValue, useSetAtom } from "jotai";
-import { AlertTriangle, Inbox, Megaphone, SquareLibrary } from "lucide-react";
+import { AlertTriangle, Inbox, SquareLibrary } from "lucide-react";
 import { useParams, usePathname, useRouter } from "next/navigation";
 import { useTranslations } from "next-intl";
 import { useTheme } from "next-themes";
@@ -15,18 +15,15 @@ import { rightPanelCollapsedAtom } from "@/atoms/layout/right-panel.atom";
 import { deleteSearchSpaceMutationAtom } from "@/atoms/search-spaces/search-space-mutation.atoms";
 import { searchSpacesAtom } from "@/atoms/search-spaces/search-space-query.atoms";
 import {
+	announcementsDialogAtom,
 	searchSpaceSettingsDialogAtom,
 	teamDialogAtom,
 	userSettingsDialogAtom,
 } from "@/atoms/settings/settings-dialog.atoms";
-import {
-	removeChatTabAtom,
-	resetTabsAtom,
-	syncChatTabAtom,
-	type Tab,
-} from "@/atoms/tabs/tabs.atom";
+import { removeChatTabAtom, syncChatTabAtom, type Tab } from "@/atoms/tabs/tabs.atom";
 import { currentUserAtom } from "@/atoms/user/user-query.atoms";
 import { ActionLogSheet } from "@/components/agent-action-log/action-log-sheet";
+import { AnnouncementsDialog } from "@/components/announcements/AnnouncementsDialog";
 import { SearchSpaceSettingsDialog } from "@/components/settings/search-space-settings-dialog";
 import { TeamDialog } from "@/components/settings/team-dialog";
 import { UserSettingsDialog } from "@/components/settings/user-settings-dialog";
@@ -105,7 +102,6 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 	const currentThreadState = useAtomValue(currentThreadAtom);
 	const resetCurrentThread = useSetAtom(resetCurrentThreadAtom);
 	const syncChatTab = useSetAtom(syncChatTabAtom);
-	const resetTabs = useSetAtom(resetTabsAtom);
 	const removeChatTab = useSetAtom(removeChatTabAtom);
 
 	// Key used to force-remount the page component (e.g. after deleting the active chat
@@ -132,11 +128,10 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 	});
 
 	// Unified slide-out panel state (only one can be open at a time)
-	type SlideoutPanel = "inbox" | "shared" | "private" | "announcements" | null;
+	type SlideoutPanel = "inbox" | "shared" | "private" | null;
 	const [activeSlideoutPanel, setActiveSlideoutPanel] = useState<SlideoutPanel>(null);
 
 	const isInboxSidebarOpen = activeSlideoutPanel === "inbox";
-	const isAnnouncementsSidebarOpen = activeSlideoutPanel === "announcements";
 
 	// Documents sidebar state (shared atom so Composer can toggle it)
 	const [isDocumentsSidebarOpen, setIsDocumentsSidebarOpen] = useAtom(documentsSidebarOpenAtom);
@@ -252,16 +247,16 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 	const [isDeletingSearchSpace, setIsDeletingSearchSpace] = useState(false);
 	const [isLeavingSearchSpace, setIsLeavingSearchSpace] = useState(false);
 
-	// Reset transient slide-out panels and tabs when switching search spaces.
-	// Use a ref to skip the initial mount — only reset when the space actually changes.
+	// Reset transient slide-out panels when switching search spaces.
+	// Tabs intentionally persist across spaces — opening tabs from multiple
+	// search spaces is a supported flow (browser-tab semantics).
 	const prevSearchSpaceIdRef = useRef(searchSpaceId);
 	useEffect(() => {
 		if (prevSearchSpaceIdRef.current !== searchSpaceId) {
 			prevSearchSpaceIdRef.current = searchSpaceId;
 			setActiveSlideoutPanel(null);
-			resetTabs();
 		}
-	}, [searchSpaceId, resetTabs]);
+	}, [searchSpaceId]);
 
 	const searchSpaces: SearchSpace[] = useMemo(() => {
 		if (!searchSpacesData || !Array.isArray(searchSpacesData)) return [];
@@ -313,6 +308,7 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 			// Avoid overwriting live SSE-updated tab titles with fallback values.
 			title: chatId ? (thread?.title ?? undefined) : "New Chat",
 			chatUrl,
+			searchSpaceId: Number(searchSpaceId),
 		});
 	}, [currentChatId, searchSpaceId, threadsData?.threads, syncChatTab]);
 
@@ -347,6 +343,9 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 	}, [threadsData, searchSpaceId]);
 
 	// Navigation items
+	// Inbox is rendered explicitly below "New chat" in the sidebar (it is also
+	// surfaced in the icon rail's collapsed mode via this list). Announcements
+	// has been moved to the avatar dropdown and is no longer a nav item.
 	const navItems: NavItem[] = useMemo(
 		() =>
 			(
@@ -366,24 +365,9 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 								isActive: isDocumentsSidebarOpen,
 							}
 						: null,
-					{
-						title: "Announcements",
-						url: "#announcements",
-						icon: Megaphone,
-						isActive: isAnnouncementsSidebarOpen,
-						badge:
-							announcementUnreadCount > 0 ? formatInboxCount(announcementUnreadCount) : undefined,
-					},
 				] as (NavItem | null)[]
 			).filter((item): item is NavItem => item !== null),
-		[
-			isMobile,
-			isInboxSidebarOpen,
-			isDocumentsSidebarOpen,
-			totalUnreadCount,
-			isAnnouncementsSidebarOpen,
-			announcementUnreadCount,
-		]
+		[isMobile, isInboxSidebarOpen, isDocumentsSidebarOpen, totalUnreadCount]
 	);
 
 	// Handlers
@@ -401,11 +385,16 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 	const setUserSettingsDialog = useSetAtom(userSettingsDialogAtom);
 	const setSearchSpaceSettingsDialog = useSetAtom(searchSpaceSettingsDialogAtom);
 	const setTeamDialogOpen = useSetAtom(teamDialogAtom);
+	const setAnnouncementsDialog = useSetAtom(announcementsDialogAtom);
 
 	const handleUserSettings = useCallback(() => {
 		setUserSettingsDialog({ open: true, initialTab: "profile" });
 	}, [setUserSettingsDialog]);
 
+	const handleAnnouncements = useCallback(() => {
+		setAnnouncementsDialog(true);
+	}, [setAnnouncementsDialog]);
+
 	const handleSearchSpaceSettings = useCallback(
 		(_space: SearchSpace) => {
 			setSearchSpaceSettingsDialog({ open: true, initialTab: "general" });
@@ -519,10 +508,6 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 				}
 				return;
 			}
-			if (item.url === "#announcements") {
-				setActiveSlideoutPanel((prev) => (prev === "announcements" ? null : "announcements"));
-				return;
-			}
 			router.push(item.url);
 		},
 		[router, isMobile, isDocumentsSidebarOpen, setIsDocumentsSidebarOpen, setIsRightPanelCollapsed]
@@ -714,6 +699,8 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 				onSettings={handleSettings}
 				onManageMembers={handleManageMembers}
 				onUserSettings={handleUserSettings}
+				onAnnouncements={handleAnnouncements}
+				announcementUnreadCount={announcementUnreadCount}
 				onLogout={handleLogout}
 				theme={theme}
 				setTheme={setTheme}
@@ -901,6 +888,7 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 			<SearchSpaceSettingsDialog searchSpaceId={Number(searchSpaceId)} />
 			<UserSettingsDialog />
 			<TeamDialog searchSpaceId={Number(searchSpaceId)} />
+			<AnnouncementsDialog />
 
 			{/* Agent action log + revert sheet */}
 			<ActionLogSheet />
diff --git a/surfsense_web/components/layout/ui/tabs/TabBar.tsx b/surfsense_web/components/layout/ui/tabs/TabBar.tsx
index c6f892034..f3c88bf6a 100644
--- a/surfsense_web/components/layout/ui/tabs/TabBar.tsx
+++ b/surfsense_web/components/layout/ui/tabs/TabBar.tsx
@@ -20,6 +20,19 @@ interface TabBarProps {
 	className?: string;
 }
 
+// Pure scroll-target calculation (port of opencode's nextTabListScrollLeft).
+// - When the list shrinks (a tab was closed), do not move the scroll.
+// - When the list overflows after growing, snap to the right edge so the new tab is visible.
+function nextTabListScrollLeft(input: {
+	prevScrollWidth: number;
+	scrollWidth: number;
+	clientWidth: number;
+}) {
+	if (input.scrollWidth <= input.prevScrollWidth) return;
+	if (input.scrollWidth <= input.clientWidth) return;
+	return input.scrollWidth - input.clientWidth;
+}
+
 export function TabBar({
 	onTabSwitch,
 	onNewChat,
@@ -53,7 +66,56 @@ export function TabBar({
 		[closeTab, onTabSwitch]
 	);
 
-	// Keep active tab visible with minimal scroll shift.
+	// React to tab list growth (port of opencode's createFileTabListSync).
+	// Uses a MutationObserver instead of a tab-id effect so the scroll catches
+	// the moment the new tab is added to the DOM, not after activation lands.
+	// Also remaps vertical wheel motion to horizontal scroll.
+	useEffect(() => {
+		const el = scrollRef.current;
+		if (!el) return;
+
+		let prevScrollWidth = el.scrollWidth;
+		let frame: number | undefined;
+
+		const update = () => {
+			const left = nextTabListScrollLeft({
+				prevScrollWidth,
+				scrollWidth: el.scrollWidth,
+				clientWidth: el.clientWidth,
+			});
+			if (left !== undefined) {
+				el.scrollTo({ left, behavior: "smooth" });
+			}
+			prevScrollWidth = el.scrollWidth;
+		};
+
+		const schedule = () => {
+			if (frame !== undefined) cancelAnimationFrame(frame);
+			frame = requestAnimationFrame(() => {
+				frame = undefined;
+				update();
+			});
+		};
+
+		const onWheel = (e: WheelEvent) => {
+			if (Math.abs(e.deltaY) <= Math.abs(e.deltaX)) return;
+			el.scrollLeft += e.deltaY > 0 ? 50 : -50;
+			e.preventDefault();
+		};
+
+		el.addEventListener("wheel", onWheel, { passive: false });
+		const observer = new MutationObserver(schedule);
+		observer.observe(el, { childList: true });
+
+		return () => {
+			el.removeEventListener("wheel", onWheel);
+			observer.disconnect();
+			if (frame !== undefined) cancelAnimationFrame(frame);
+		};
+	}, []);
+
+	// When the user activates a tab that's currently off-screen (e.g. clicked
+	// from the sidebar), nudge the scroller minimally so the active tab is in view.
 	useEffect(() => {
 		if (!scrollRef.current || !activeTabId) return;
 		const scroller = scrollRef.current;
@@ -75,10 +137,6 @@ export function TabBar({
 		}
 	}, [activeTabId]);
 
-	// Keep action slots visible even with one/no tabs
-	const hasAuxActions = !!leftActions || !!rightActions || !!onNewChat;
-	if (tabs.length <= 1 && !hasAuxActions) return null;
-
 	return (
 		<div
 			className={cn(
@@ -101,7 +159,7 @@ export function TabBar({
 							data-tab-id={tab.id}
 							onClick={() => handleTabClick(tab)}
 							className={cn(
-								"group relative flex h-full w-[150px] items-center px-3 min-h-0 overflow-hidden text-[13px] font-medium rounded-md transition-all duration-150 shrink-0",
+								"group relative flex h-full items-center px-3 min-w-[120px] max-w-[240px] min-h-0 overflow-hidden text-[13px] font-medium rounded-md transition-all duration-150 shrink-0",
 								isActive
 									? "bg-muted/60 text-foreground"
 									: "bg-transparent text-muted-foreground hover:bg-muted/30 hover:text-foreground"
@@ -133,20 +191,31 @@ export function TabBar({
 						</button>
 					);
 				})}
-			</div>
-			<div className="flex items-center gap-0.5 shrink-0 pr-2">
 				{onNewChat && (
-					<button
-						type="button"
-						onClick={onNewChat}
-						className="flex h-8 w-8 items-center justify-center shrink-0 rounded-md text-muted-foreground transition-all duration-150 hover:text-muted-foreground hover:bg-muted/40"
-						title="New Chat"
+					<div
+						className={cn(
+							// Solid bg + soft left-fade so tabs scrolling underneath the
+							// + button get visually masked into the bar's background —
+							// 1:1 port of opencode's `> .sticky` rule in tabs.css.
+							"sticky right-0 z-10 flex h-full shrink-0 items-center bg-main-panel pl-3 pr-1",
+							"before:content-[''] before:absolute before:inset-y-0 before:-left-4 before:w-4 before:pointer-events-none",
+							"before:bg-gradient-to-r before:from-transparent before:to-main-panel"
+						)}
 					>
-						<Plus className="size-4" />
-					</button>
+						<button
+							type="button"
+							onClick={onNewChat}
+							className="flex h-8 w-8 items-center justify-center shrink-0 rounded-md text-muted-foreground transition-all duration-150 hover:text-muted-foreground hover:bg-muted/40"
+							title="New Chat"
+						>
+							<Plus className="size-4" />
+						</button>
+					</div>
 				)}
-				{rightActions}
 			</div>
+			{rightActions ? (
+				<div className="flex items-center gap-0.5 shrink-0 pr-2">{rightActions}</div>
+			) : null}
 		</div>
 	);
 }

From a9192beae3e87e937e8fce37bb9158595410fd44 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Sun, 3 May 2026 18:42:29 +0530
Subject: [PATCH 10/96] feat(announcements): rename "Announcements" to "What's
 New" across the application; add AnnouncementsDialog component for displaying
 updates; update empty state messaging; remove unused AnnouncementsSidebar
 component.

---
 .../app/(home)/announcements/layout.tsx       |  6 +-
 .../app/(home)/announcements/page.tsx         |  2 +-
 .../atoms/settings/settings-dialog.atoms.ts   |  2 +
 .../announcements/AnnouncementsDialog.tsx     | 50 +++++++++++
 .../announcements/AnnouncementsEmptyState.tsx |  4 +-
 .../components/homepage/footer-new.tsx        |  2 +-
 .../providers/FreeLayoutDataProvider.tsx      | 46 +++++-----
 .../layout/ui/icon-rail/IconRail.tsx          |  6 ++
 .../layout/ui/shell/LayoutShell.tsx           | 44 +++-------
 .../ui/sidebar/AnnouncementsSidebar.tsx       | 84 -------------------
 .../layout/ui/sidebar/MobileSidebar.tsx       | 13 +++
 .../layout/ui/sidebar/NavSection.tsx          |  7 +-
 .../components/layout/ui/sidebar/Sidebar.tsx  | 41 ++++++++-
 .../layout/ui/sidebar/SidebarUserProfile.tsx  | 37 ++++++++
 .../components/layout/ui/sidebar/index.ts     |  1 -
 .../lib/announcements/announcements-data.ts   |  4 +-
 16 files changed, 189 insertions(+), 160 deletions(-)
 create mode 100644 surfsense_web/components/announcements/AnnouncementsDialog.tsx
 delete mode 100644 surfsense_web/components/layout/ui/sidebar/AnnouncementsSidebar.tsx

diff --git a/surfsense_web/app/(home)/announcements/layout.tsx b/surfsense_web/app/(home)/announcements/layout.tsx
index 072db2c3f..cff15d3a1 100644
--- a/surfsense_web/app/(home)/announcements/layout.tsx
+++ b/surfsense_web/app/(home)/announcements/layout.tsx
@@ -2,20 +2,20 @@ import type { Metadata } from "next";
 import type { ReactNode } from "react";
 
 export const metadata: Metadata = {
-	title: "Announcements | SurfSense",
+	title: "What's New | SurfSense",
 	description: "Latest product updates, feature releases, and news from SurfSense.",
 	alternates: {
 		canonical: "https://surfsense.com/announcements",
 	},
 	openGraph: {
-		title: "Announcements | SurfSense",
+		title: "What's New | SurfSense",
 		description: "Latest product updates, feature releases, and news from SurfSense.",
 		url: "https://surfsense.com/announcements",
 		type: "website",
 	},
 	twitter: {
 		card: "summary_large_image",
-		title: "Announcements | SurfSense",
+		title: "What's New | SurfSense",
 		description: "Latest product updates, feature releases, and news from SurfSense.",
 	},
 };
diff --git a/surfsense_web/app/(home)/announcements/page.tsx b/surfsense_web/app/(home)/announcements/page.tsx
index 966c09f77..f287e43d1 100644
--- a/surfsense_web/app/(home)/announcements/page.tsx
+++ b/surfsense_web/app/(home)/announcements/page.tsx
@@ -24,7 +24,7 @@ export default function AnnouncementsPage() {
 				<div className="max-w-5xl mx-auto relative">
 					<div className="p-6">
 						<h1 className="text-4xl font-bold tracking-tight bg-linear-to-r from-gray-900 to-gray-600 dark:from-white dark:to-gray-400 bg-clip-text text-transparent">
-							Announcements
+							What's New
 						</h1>
 					</div>
 				</div>
diff --git a/surfsense_web/atoms/settings/settings-dialog.atoms.ts b/surfsense_web/atoms/settings/settings-dialog.atoms.ts
index 3b49f1f06..480c41204 100644
--- a/surfsense_web/atoms/settings/settings-dialog.atoms.ts
+++ b/surfsense_web/atoms/settings/settings-dialog.atoms.ts
@@ -21,3 +21,5 @@ export const userSettingsDialogAtom = atom<UserSettingsDialogState>({
 });
 
 export const teamDialogAtom = atom<boolean>(false);
+
+export const announcementsDialogAtom = atom<boolean>(false);
diff --git a/surfsense_web/components/announcements/AnnouncementsDialog.tsx b/surfsense_web/components/announcements/AnnouncementsDialog.tsx
new file mode 100644
index 000000000..4d3aaeb73
--- /dev/null
+++ b/surfsense_web/components/announcements/AnnouncementsDialog.tsx
@@ -0,0 +1,50 @@
+"use client";
+
+import { useAtom } from "jotai";
+import { useEffect } from "react";
+import { announcementsDialogAtom } from "@/atoms/settings/settings-dialog.atoms";
+import { AnnouncementCard } from "@/components/announcements/AnnouncementCard";
+import { AnnouncementsEmptyState } from "@/components/announcements/AnnouncementsEmptyState";
+import { Dialog, DialogContent, DialogTitle } from "@/components/ui/dialog";
+import { Separator } from "@/components/ui/separator";
+import { useAnnouncements } from "@/hooks/use-announcements";
+
+export function AnnouncementsDialog() {
+	const [open, setOpen] = useAtom(announcementsDialogAtom);
+	const { announcements, markAllRead } = useAnnouncements();
+
+	// Auto-mark all visible announcements as read when the dialog opens
+	useEffect(() => {
+		if (open) {
+			markAllRead();
+		}
+	}, [open, markAllRead]);
+
+	return (
+		<Dialog open={open} onOpenChange={setOpen}>
+			<DialogContent className="select-none max-w-[900px] w-[95vw] md:w-[90vw] h-[90vh] md:h-[80vh] max-h-[640px] flex flex-col p-0 gap-0 overflow-hidden [--card:var(--background)] dark:[--card:oklch(0.205_0_0)] dark:[--background:oklch(0.205_0_0)]">
+				<DialogTitle className="sr-only">What's New</DialogTitle>
+
+				<div className="flex flex-1 flex-col overflow-hidden min-w-0">
+					<div className="px-6 md:px-8 pt-6 pb-2 shrink-0">
+						<h2 className="text-lg font-semibold">What's New</h2>
+						<Separator className="mt-4" />
+					</div>
+					<div className="flex-1 overflow-y-auto overflow-x-hidden">
+						<div className="px-4 md:px-8 pt-4 pb-6 min-w-0">
+							{announcements.length === 0 ? (
+								<AnnouncementsEmptyState />
+							) : (
+								<div className="flex flex-col gap-4">
+									{announcements.map((announcement) => (
+										<AnnouncementCard key={announcement.id} announcement={announcement} />
+									))}
+								</div>
+							)}
+						</div>
+					</div>
+				</div>
+			</DialogContent>
+		</Dialog>
+	);
+}
diff --git a/surfsense_web/components/announcements/AnnouncementsEmptyState.tsx b/surfsense_web/components/announcements/AnnouncementsEmptyState.tsx
index 329a284db..7aa4564b6 100644
--- a/surfsense_web/components/announcements/AnnouncementsEmptyState.tsx
+++ b/surfsense_web/components/announcements/AnnouncementsEmptyState.tsx
@@ -6,9 +6,9 @@ export function AnnouncementsEmptyState() {
 			<div className="mb-3 flex h-12 w-12 items-center justify-center rounded-full bg-muted">
 				<BellOff className="h-5 w-5 text-muted-foreground" />
 			</div>
-			<h3 className="text-sm font-semibold">No announcements</h3>
+			<h3 className="text-sm font-semibold">Nothing new yet</h3>
 			<p className="mt-1 max-w-xs text-xs text-muted-foreground">
-				You're all caught up! New announcements will appear here.
+				You're all caught up! New updates will appear here.
 			</p>
 		</div>
 	);
diff --git a/surfsense_web/components/homepage/footer-new.tsx b/surfsense_web/components/homepage/footer-new.tsx
index 53eb833e9..5943cc8ec 100644
--- a/surfsense_web/components/homepage/footer-new.tsx
+++ b/surfsense_web/components/homepage/footer-new.tsx
@@ -38,7 +38,7 @@ export function FooterNew() {
 			href: "/contact",
 		},
 		{
-			title: "Announcements",
+			title: "What's New",
 			href: "/announcements",
 		},
 	];
diff --git a/surfsense_web/components/layout/providers/FreeLayoutDataProvider.tsx b/surfsense_web/components/layout/providers/FreeLayoutDataProvider.tsx
index 8b362f45b..a2695078a 100644
--- a/surfsense_web/components/layout/providers/FreeLayoutDataProvider.tsx
+++ b/surfsense_web/components/layout/providers/FreeLayoutDataProvider.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { Inbox, Megaphone, SquareLibrary } from "lucide-react";
+import { Inbox, SquareLibrary } from "lucide-react";
 import { useRouter } from "next/navigation";
 import type { ReactNode } from "react";
 import { Fragment, useCallback, useEffect, useMemo, useState } from "react";
@@ -55,28 +55,24 @@ export function FreeLayoutDataProvider({ children }: FreeLayoutDataProviderProps
 
 	const navItems: NavItem[] = useMemo(
 		() =>
-			[
-				{
-					title: "Inbox",
-					url: "#inbox",
-					icon: Inbox,
-					isActive: false,
-				},
-				isMobile
-					? {
-							title: "Documents",
-							url: "#documents",
-							icon: SquareLibrary,
-							isActive: false,
-						}
-					: null,
-				{
-					title: "Announcements",
-					url: "#announcements",
-					icon: Megaphone,
-					isActive: false,
-				},
-			].filter((item): item is NavItem => item !== null),
+			(
+				[
+					{
+						title: "Inbox",
+						url: "#inbox",
+						icon: Inbox,
+						isActive: false,
+					},
+					isMobile
+						? {
+								title: "Documents",
+								url: "#documents",
+								icon: SquareLibrary,
+								isActive: false,
+							}
+						: null,
+				] as (NavItem | null)[]
+			).filter((item): item is NavItem => item !== null),
 		[isMobile]
 	);
 
@@ -90,11 +86,12 @@ export function FreeLayoutDataProvider({ children }: FreeLayoutDataProviderProps
 		(item: NavItem) => {
 			if (item.title === "Inbox") gate("use the inbox");
 			else if (item.title === "Documents") setIsDocsSidebarOpen((v) => !v);
-			else if (item.title === "Announcements") gate("view announcements");
 		},
 		[gate]
 	);
 
+	const handleAnnouncements = useCallback(() => gate("see what's new"), [gate]);
+
 	const handleSearchSpaceSelect = useCallback(
 		(_id: number) => gate("switch search spaces"),
 		[gate]
@@ -127,6 +124,7 @@ export function FreeLayoutDataProvider({ children }: FreeLayoutDataProviderProps
 			onSettings={gatedAction("search space settings")}
 			onManageMembers={gatedAction("team management")}
 			onUserSettings={gatedAction("account settings")}
+			onAnnouncements={handleAnnouncements}
 			onLogout={() => router.push("/register")}
 			pageUsage={pageUsage}
 			isChatPage
diff --git a/surfsense_web/components/layout/ui/icon-rail/IconRail.tsx b/surfsense_web/components/layout/ui/icon-rail/IconRail.tsx
index c4b127c63..fdc4930d6 100644
--- a/surfsense_web/components/layout/ui/icon-rail/IconRail.tsx
+++ b/surfsense_web/components/layout/ui/icon-rail/IconRail.tsx
@@ -23,6 +23,8 @@ interface IconRailProps {
 	onNavItemClick?: (item: NavItem) => void;
 	user: User;
 	onUserSettings?: () => void;
+	onAnnouncements?: () => void;
+	announcementUnreadCount?: number;
 	onLogout?: () => void;
 	theme?: string;
 	setTheme?: (theme: "light" | "dark" | "system") => void;
@@ -42,6 +44,8 @@ export function IconRail({
 	onNavItemClick,
 	user,
 	onUserSettings,
+	onAnnouncements,
+	announcementUnreadCount = 0,
 	onLogout,
 	theme,
 	setTheme,
@@ -138,6 +142,8 @@ export function IconRail({
 			<SidebarUserProfile
 				user={user}
 				onUserSettings={onUserSettings}
+				onAnnouncements={onAnnouncements}
+				announcementUnreadCount={announcementUnreadCount}
 				onLogout={onLogout}
 				isCollapsed
 				theme={theme}
diff --git a/surfsense_web/components/layout/ui/shell/LayoutShell.tsx b/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
index 701b89b39..a41027573 100644
--- a/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
+++ b/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
@@ -19,7 +19,6 @@ import { RightPanel, RightPanelExpandButton } from "../right-panel/RightPanel";
 import {
 	AllPrivateChatsSidebarContent,
 	AllSharedChatsSidebarContent,
-	AnnouncementsSidebarContent,
 	DocumentsSidebar,
 	InboxSidebarContent,
 	MobileSidebar,
@@ -54,7 +53,7 @@ interface TabDataSource {
 	markAllAsRead: () => Promise<boolean>;
 }
 
-export type ActiveSlideoutPanel = "inbox" | "shared" | "private" | "announcements" | null;
+export type ActiveSlideoutPanel = "inbox" | "shared" | "private" | null;
 
 // Inbox-related props — per-tab data sources with independent loading/pagination
 interface InboxProps {
@@ -88,6 +87,8 @@ interface LayoutShellProps {
 	onSettings?: () => void;
 	onManageMembers?: () => void;
 	onUserSettings?: () => void;
+	onAnnouncements?: () => void;
+	announcementUnreadCount?: number;
 	onLogout?: () => void;
 	pageUsage?: PageUsage;
 	theme?: string;
@@ -189,6 +190,8 @@ export function LayoutShell({
 	onSettings,
 	onManageMembers,
 	onUserSettings,
+	onAnnouncements,
+	announcementUnreadCount = 0,
 	onLogout,
 	pageUsage,
 	theme,
@@ -237,9 +240,7 @@ export function LayoutShell({
 				? "Shared Chats"
 				: activeSlideoutPanel === "private"
 					? "Private Chats"
-					: activeSlideoutPanel === "announcements"
-						? "Announcements"
-						: "Panel";
+					: "Panel";
 
 	// Mobile layout
 	if (isMobile) {
@@ -277,6 +278,8 @@ export function LayoutShell({
 							onSettings={onSettings}
 							onManageMembers={onManageMembers}
 							onUserSettings={onUserSettings}
+							onAnnouncements={onAnnouncements}
+							announcementUnreadCount={announcementUnreadCount}
 							onLogout={onLogout}
 							pageUsage={pageUsage}
 							theme={theme}
@@ -313,21 +316,6 @@ export function LayoutShell({
 										/>
 									</motion.div>
 								)}
-								{activeSlideoutPanel === "announcements" && (
-									<motion.div
-										key="announcements"
-										className="h-full flex flex-col"
-										initial={{ opacity: 0 }}
-										animate={{ opacity: 1 }}
-										exit={{ opacity: 0 }}
-										transition={{ duration: 0.15 }}
-									>
-										<AnnouncementsSidebarContent
-											onOpenChange={(open) => closeSlideout(open)}
-											onCloseMobileSidebar={() => setMobileMenuOpen(false)}
-										/>
-									</motion.div>
-								)}
 								{activeSlideoutPanel === "shared" && allSharedChatsPanel && (
 									<motion.div
 										key="shared"
@@ -397,6 +385,8 @@ export function LayoutShell({
 							onNavItemClick={onNavItemClick}
 							user={user}
 							onUserSettings={onUserSettings}
+							onAnnouncements={onAnnouncements}
+							announcementUnreadCount={announcementUnreadCount}
 							onLogout={onLogout}
 							theme={theme}
 							setTheme={setTheme}
@@ -433,6 +423,8 @@ export function LayoutShell({
 								onSettings={onSettings}
 								onManageMembers={onManageMembers}
 								onUserSettings={onUserSettings}
+								onAnnouncements={onAnnouncements}
+								announcementUnreadCount={announcementUnreadCount}
 								onLogout={onLogout}
 								pageUsage={pageUsage}
 								theme={theme}
@@ -479,18 +471,6 @@ export function LayoutShell({
 										/>
 									</motion.div>
 								)}
-								{activeSlideoutPanel === "announcements" && (
-									<motion.div
-										key="announcements"
-										className="h-full flex flex-col"
-										initial={{ opacity: 0 }}
-										animate={{ opacity: 1 }}
-										exit={{ opacity: 0 }}
-										transition={{ duration: 0.15 }}
-									>
-										<AnnouncementsSidebarContent onOpenChange={(open) => closeSlideout(open)} />
-									</motion.div>
-								)}
 								{activeSlideoutPanel === "shared" && allSharedChatsPanel && (
 									<motion.div
 										key="shared"
diff --git a/surfsense_web/components/layout/ui/sidebar/AnnouncementsSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/AnnouncementsSidebar.tsx
deleted file mode 100644
index d6729eec4..000000000
--- a/surfsense_web/components/layout/ui/sidebar/AnnouncementsSidebar.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-"use client";
-
-import { ChevronLeft } from "lucide-react";
-import { useEffect } from "react";
-import { AnnouncementCard } from "@/components/announcements/AnnouncementCard";
-import { AnnouncementsEmptyState } from "@/components/announcements/AnnouncementsEmptyState";
-import { Button } from "@/components/ui/button";
-import { useAnnouncements } from "@/hooks/use-announcements";
-import { useMediaQuery } from "@/hooks/use-media-query";
-import { SidebarSlideOutPanel } from "./SidebarSlideOutPanel";
-
-export interface AnnouncementsSidebarContentProps {
-	onOpenChange: (open: boolean) => void;
-	onCloseMobileSidebar?: () => void;
-}
-
-interface AnnouncementsSidebarProps extends AnnouncementsSidebarContentProps {
-	open: boolean;
-}
-
-export function AnnouncementsSidebarContent({
-	onOpenChange,
-	onCloseMobileSidebar,
-}: AnnouncementsSidebarContentProps) {
-	const isMobile = !useMediaQuery("(min-width: 640px)");
-	const { announcements, markAllRead } = useAnnouncements();
-
-	useEffect(() => {
-		markAllRead();
-	}, [markAllRead]);
-
-	return (
-		<div className="h-full flex flex-col">
-			<div className="shrink-0 p-3 pb-1.5 space-y-2">
-				<div className="flex items-center justify-between">
-					<div className="flex items-center gap-2">
-						{isMobile && (
-							<Button
-								variant="ghost"
-								size="icon"
-								className="h-8 w-8 rounded-full"
-								onClick={() => {
-									onOpenChange(false);
-									onCloseMobileSidebar?.();
-								}}
-							>
-								<ChevronLeft className="h-4 w-4 text-muted-foreground" />
-								<span className="sr-only">Close</span>
-							</Button>
-						)}
-						<h2 className="text-md font-semibold">Announcements</h2>
-					</div>
-				</div>
-			</div>
-
-			<div className="flex-1 overflow-y-auto p-3">
-				{announcements.length === 0 ? (
-					<AnnouncementsEmptyState />
-				) : (
-					<div className="flex flex-col gap-4">
-						{announcements.map((announcement) => (
-							<AnnouncementCard key={announcement.id} announcement={announcement} />
-						))}
-					</div>
-				)}
-			</div>
-		</div>
-	);
-}
-
-export function AnnouncementsSidebar({
-	open,
-	onOpenChange,
-	onCloseMobileSidebar,
-}: AnnouncementsSidebarProps) {
-	return (
-		<SidebarSlideOutPanel open={open} onOpenChange={onOpenChange} ariaLabel="Announcements">
-			<AnnouncementsSidebarContent
-				onOpenChange={onOpenChange}
-				onCloseMobileSidebar={onCloseMobileSidebar}
-			/>
-		</SidebarSlideOutPanel>
-	);
-}
diff --git a/surfsense_web/components/layout/ui/sidebar/MobileSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/MobileSidebar.tsx
index def40f24f..ebb12bae8 100644
--- a/surfsense_web/components/layout/ui/sidebar/MobileSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/MobileSidebar.tsx
@@ -34,6 +34,8 @@ interface MobileSidebarProps {
 	onSettings?: () => void;
 	onManageMembers?: () => void;
 	onUserSettings?: () => void;
+	onAnnouncements?: () => void;
+	announcementUnreadCount?: number;
 	onLogout?: () => void;
 	pageUsage?: PageUsage;
 	theme?: string;
@@ -77,6 +79,8 @@ export function MobileSidebar({
 	onSettings,
 	onManageMembers,
 	onUserSettings,
+	onAnnouncements,
+	announcementUnreadCount = 0,
 	onLogout,
 	pageUsage,
 	theme,
@@ -193,6 +197,15 @@ export function MobileSidebar({
 									}
 								: undefined
 						}
+						onAnnouncements={
+							onAnnouncements
+								? () => {
+										onOpenChange(false);
+										onAnnouncements();
+									}
+								: undefined
+						}
+						announcementUnreadCount={announcementUnreadCount}
 						onLogout={onLogout}
 						pageUsage={pageUsage}
 						theme={theme}
diff --git a/surfsense_web/components/layout/ui/sidebar/NavSection.tsx b/surfsense_web/components/layout/ui/sidebar/NavSection.tsx
index 658067f3f..3110382d0 100644
--- a/surfsense_web/components/layout/ui/sidebar/NavSection.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/NavSection.tsx
@@ -139,10 +139,6 @@ export function NavSection({ items, onItemClick, isCollapsed = false }: NavSecti
 	return (
 		<div className={cn("flex flex-col gap-0.5 py-2", isCollapsed && "items-center")}>
 			{items.map((item) => {
-				const joyrideAttr =
-					item.title === "Inbox" || item.title.toLowerCase().includes("inbox")
-						? { "data-joyride": "inbox-sidebar" as const }
-						: {};
 				const { tooltip } = getStatusInfo(item.statusIndicator);
 
 				return (
@@ -159,12 +155,11 @@ export function NavSection({ items, onItemClick, isCollapsed = false }: NavSecti
 							<StatusIcon
 								status={item.statusIndicator}
 								FallbackIcon={item.icon}
-							className="h-3.5 w-3.5"
+								className="h-3.5 w-3.5"
 							/>
 						}
 						trailingContent={<StatusPill status={item.statusIndicator} />}
 						tooltipContent={tooltip}
-						buttonProps={joyrideAttr}
 					/>
 				);
 			})}
diff --git a/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx b/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
index c5990b11b..946079333 100644
--- a/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
@@ -4,7 +4,7 @@ import { CreditCard, SquarePen, Zap } from "lucide-react";
 import Link from "next/link";
 import { useParams } from "next/navigation";
 import { useTranslations } from "next-intl";
-import { useState } from "react";
+import { useMemo, useState } from "react";
 import { Badge } from "@/components/ui/badge";
 import { Progress } from "@/components/ui/progress";
 import { Skeleton } from "@/components/ui/skeleton";
@@ -53,6 +53,8 @@ interface SidebarProps {
 	onSettings?: () => void;
 	onManageMembers?: () => void;
 	onUserSettings?: () => void;
+	onAnnouncements?: () => void;
+	announcementUnreadCount?: number;
 	onLogout?: () => void;
 	pageUsage?: PageUsage;
 	theme?: string;
@@ -87,6 +89,8 @@ export function Sidebar({
 	onSettings,
 	onManageMembers,
 	onUserSettings,
+	onAnnouncements,
+	announcementUnreadCount = 0,
 	onLogout,
 	pageUsage,
 	theme,
@@ -101,6 +105,14 @@ export function Sidebar({
 	const t = useTranslations("sidebar");
 	const [openDropdownChatId, setOpenDropdownChatId] = useState<number | null>(null);
 
+	// Inbox is rendered explicitly right below New Chat. Pull it out of the
+	// nav items list so it doesn't also appear in the bottom NavSection.
+	const inboxItem = useMemo(() => navItems.find((item) => item.url === "#inbox"), [navItems]);
+	const footerNavItems = useMemo(
+		() => navItems.filter((item) => item.url !== "#inbox"),
+		[navItems]
+	);
+
 	return (
 		<div
 			className={cn(
@@ -138,7 +150,7 @@ export function Sidebar({
 				</div>
 			)}
 
-			{/* New chat button */}
+			{/* New chat button + Inbox */}
 			<div className={cn("flex flex-col gap-0.5 py-1.5", isCollapsed && "items-center")}>
 				<SidebarButton
 					icon={SquarePen}
@@ -146,6 +158,21 @@ export function Sidebar({
 					onClick={onNewChat}
 					isCollapsed={isCollapsed}
 				/>
+				{inboxItem && (
+					<SidebarButton
+						icon={inboxItem.icon}
+						label={inboxItem.title}
+						onClick={() => onNavItemClick?.(inboxItem)}
+						isCollapsed={isCollapsed}
+						isActive={inboxItem.isActive}
+						badge={inboxItem.badge}
+						buttonProps={
+							{
+								"data-joyride": "inbox-sidebar",
+							} as React.ButtonHTMLAttributes<HTMLButtonElement>
+						}
+					/>
+				)}
 			</div>
 
 			{/* Chat sections - fills available space */}
@@ -271,8 +298,12 @@ export function Sidebar({
 			{/* Footer */}
 			<div className="mt-auto border-t border-border/60">
 				{/* Platform navigation */}
-				{navItems.length > 0 && (
-					<NavSection items={navItems} onItemClick={onNavItemClick} isCollapsed={isCollapsed} />
+				{footerNavItems.length > 0 && (
+					<NavSection
+						items={footerNavItems}
+						onItemClick={onNavItemClick}
+						isCollapsed={isCollapsed}
+					/>
 				)}
 
 				<SidebarUsageFooter pageUsage={pageUsage} isCollapsed={isCollapsed} />
@@ -281,6 +312,8 @@ export function Sidebar({
 					<SidebarUserProfile
 						user={user}
 						onUserSettings={onUserSettings}
+						onAnnouncements={onAnnouncements}
+						announcementUnreadCount={announcementUnreadCount}
 						onLogout={onLogout}
 						isCollapsed={isCollapsed}
 						theme={theme}
diff --git a/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx b/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx
index ffd00ed14..1cbabec2c 100644
--- a/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx
@@ -8,6 +8,7 @@ import {
 	Info,
 	Languages,
 	LogOut,
+	Megaphone,
 	Monitor,
 	Moon,
 	Sun,
@@ -60,12 +61,22 @@ const LEARN_MORE_LINKS = [
 interface SidebarUserProfileProps {
 	user: User;
 	onUserSettings?: () => void;
+	onAnnouncements?: () => void;
+	announcementUnreadCount?: number;
 	onLogout?: () => void;
 	isCollapsed?: boolean;
 	theme?: string;
 	setTheme?: (theme: "light" | "dark" | "system") => void;
 }
 
+function formatAnnouncementCount(count: number): string {
+	if (count <= 999) {
+		return count.toString();
+	}
+	const thousands = Math.floor(count / 1000);
+	return `${thousands}k+`;
+}
+
 /**
  * Generates a consistent color based on email
  */
@@ -152,6 +163,8 @@ function UserAvatar({
 export function SidebarUserProfile({
 	user,
 	onUserSettings,
+	onAnnouncements,
+	announcementUnreadCount = 0,
 	onLogout,
 	isCollapsed = false,
 	theme,
@@ -228,6 +241,18 @@ export function SidebarUserProfile({
 							{t("user_settings")}
 						</DropdownMenuItem>
 
+						{onAnnouncements && (
+							<DropdownMenuItem onClick={onAnnouncements}>
+								<Megaphone className="h-4 w-4" />
+								<span className="flex-1">What's New</span>
+								{announcementUnreadCount > 0 && (
+									<span className="inline-flex items-center justify-center min-w-4 h-4 px-1 rounded-full bg-red-500 text-white text-[10px] font-medium">
+										{formatAnnouncementCount(announcementUnreadCount)}
+									</span>
+								)}
+							</DropdownMenuItem>
+						)}
+
 						{setTheme && (
 							<DropdownMenuSub>
 								<DropdownMenuSubTrigger>
@@ -382,6 +407,18 @@ export function SidebarUserProfile({
 						{t("user_settings")}
 					</DropdownMenuItem>
 
+					{onAnnouncements && (
+						<DropdownMenuItem onClick={onAnnouncements}>
+							<Megaphone className="h-4 w-4" />
+							<span className="flex-1">What's New</span>
+							{announcementUnreadCount > 0 && (
+								<span className="inline-flex items-center justify-center min-w-4 h-4 px-1 rounded-full bg-red-500 text-white text-[10px] font-medium">
+									{formatAnnouncementCount(announcementUnreadCount)}
+								</span>
+							)}
+						</DropdownMenuItem>
+					)}
+
 					{setTheme && (
 						<DropdownMenuSub>
 							<DropdownMenuSubTrigger>
diff --git a/surfsense_web/components/layout/ui/sidebar/index.ts b/surfsense_web/components/layout/ui/sidebar/index.ts
index 33023c9e8..d72f86c8a 100644
--- a/surfsense_web/components/layout/ui/sidebar/index.ts
+++ b/surfsense_web/components/layout/ui/sidebar/index.ts
@@ -1,6 +1,5 @@
 export { AllPrivateChatsSidebar, AllPrivateChatsSidebarContent } from "./AllPrivateChatsSidebar";
 export { AllSharedChatsSidebar, AllSharedChatsSidebarContent } from "./AllSharedChatsSidebar";
-export { AnnouncementsSidebar, AnnouncementsSidebarContent } from "./AnnouncementsSidebar";
 export { ChatListItem } from "./ChatListItem";
 export { DocumentsSidebar } from "./DocumentsSidebar";
 export { InboxSidebar, InboxSidebarContent } from "./InboxSidebar";
diff --git a/surfsense_web/lib/announcements/announcements-data.ts b/surfsense_web/lib/announcements/announcements-data.ts
index bde8b3f43..ce44ec539 100644
--- a/surfsense_web/lib/announcements/announcements-data.ts
+++ b/surfsense_web/lib/announcements/announcements-data.ts
@@ -15,8 +15,8 @@ import type { Announcement } from "@/contracts/types/announcement.types";
 export const announcements: Announcement[] = [
 	{
 		id: "announcement-1",
-		title: "Introducing Announcements",
-		description: "All major announcements will be posted here.",
+		title: "Introducing What's New",
+		description: "All major product updates will be posted here.",
 		category: "feature",
 		date: "2026-02-17T00:00:00Z",
 		startTime: "2026-02-17T00:00:00Z",

From 89beced3c0f68c0e52b439e5e8ea63c465e0639c Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Sun, 3 May 2026 18:47:01 +0530
Subject: [PATCH 11/96] feat(layout): integrate announcement unread count into
 FreeLayoutDataProvider for enhanced user notifications

---
 .../components/layout/providers/FreeLayoutDataProvider.tsx     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/surfsense_web/components/layout/providers/FreeLayoutDataProvider.tsx b/surfsense_web/components/layout/providers/FreeLayoutDataProvider.tsx
index a2695078a..68ee552f8 100644
--- a/surfsense_web/components/layout/providers/FreeLayoutDataProvider.tsx
+++ b/surfsense_web/components/layout/providers/FreeLayoutDataProvider.tsx
@@ -6,6 +6,7 @@ import type { ReactNode } from "react";
 import { Fragment, useCallback, useEffect, useMemo, useState } from "react";
 import { useAnonymousMode } from "@/contexts/anonymous-mode";
 import { useLoginGate } from "@/contexts/login-gate";
+import { useAnnouncements } from "@/hooks/use-announcements";
 import { useIsMobile } from "@/hooks/use-mobile";
 import { anonymousChatApiService } from "@/lib/apis/anonymous-chat-api.service";
 import type { ChatItem, NavItem, PageUsage, SearchSpace } from "../types/layout.types";
@@ -28,6 +29,7 @@ export function FreeLayoutDataProvider({ children }: FreeLayoutDataProviderProps
 	const { gate } = useLoginGate();
 	const anonMode = useAnonymousMode();
 	const isMobile = useIsMobile();
+	const { unreadCount: announcementUnreadCount } = useAnnouncements();
 	const [quota, setQuota] = useState<{ used: number; limit: number } | null>(null);
 	const [isDocsSidebarOpen, setIsDocsSidebarOpen] = useState(false);
 
@@ -125,6 +127,7 @@ export function FreeLayoutDataProvider({ children }: FreeLayoutDataProviderProps
 			onManageMembers={gatedAction("team management")}
 			onUserSettings={gatedAction("account settings")}
 			onAnnouncements={handleAnnouncements}
+			announcementUnreadCount={announcementUnreadCount}
 			onLogout={() => router.push("/register")}
 			pageUsage={pageUsage}
 			isChatPage

From 3eb1cc9cf68115e38ed7dfaf87f05e5723b0366b Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Sun, 3 May 2026 18:56:58 +0530
Subject: [PATCH 12/96] refactor(icon-rail, tabs): remove unused separators and
 improve comments for clarity in SearchSpaceAvatar and TabBar components

---
 .../layout/ui/icon-rail/SearchSpaceAvatar.tsx          |  8 ++------
 surfsense_web/components/layout/ui/tabs/TabBar.tsx     | 10 ++++------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/surfsense_web/components/layout/ui/icon-rail/SearchSpaceAvatar.tsx b/surfsense_web/components/layout/ui/icon-rail/SearchSpaceAvatar.tsx
index 641e5f5af..c35d8c708 100644
--- a/surfsense_web/components/layout/ui/icon-rail/SearchSpaceAvatar.tsx
+++ b/surfsense_web/components/layout/ui/icon-rail/SearchSpaceAvatar.tsx
@@ -7,14 +7,12 @@ import {
 	ContextMenu,
 	ContextMenuContent,
 	ContextMenuItem,
-	ContextMenuSeparator,
 	ContextMenuTrigger,
 } from "@/components/ui/context-menu";
 import {
 	DropdownMenu,
 	DropdownMenuContent,
 	DropdownMenuItem,
-	DropdownMenuSeparator,
 	DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
@@ -157,7 +155,6 @@ export function SearchSpaceAvatar({
 					{tCommon("settings")}
 				</DropdownMenuItem>
 			)}
-			{onSettings && onDelete && <DropdownMenuSeparator />}
 			{onDelete && isOwner && (
 				<DropdownMenuItem onClick={onDelete}>
 					<Trash2 className="mr-2 h-4 w-4" />
@@ -190,7 +187,7 @@ export function SearchSpaceAvatar({
 							{avatarButton}
 						</div>
 					</DropdownMenuTrigger>
-					<DropdownMenuContent className="w-48">{menuItems}</DropdownMenuContent>
+					<DropdownMenuContent>{menuItems}</DropdownMenuContent>
 				</DropdownMenu>
 			);
 		}
@@ -208,14 +205,13 @@ export function SearchSpaceAvatar({
 						{tooltipContent}
 					</TooltipContent>
 				</Tooltip>
-				<ContextMenuContent className="w-48">
+				<ContextMenuContent>
 					{onSettings && (
 						<ContextMenuItem onClick={onSettings}>
 							<Settings className="mr-2 h-4 w-4" />
 							{tCommon("settings")}
 						</ContextMenuItem>
 					)}
-					{onSettings && onDelete && <ContextMenuSeparator />}
 					{onDelete && isOwner && (
 						<ContextMenuItem onClick={onDelete}>
 							<Trash2 className="mr-2 h-4 w-4" />
diff --git a/surfsense_web/components/layout/ui/tabs/TabBar.tsx b/surfsense_web/components/layout/ui/tabs/TabBar.tsx
index f3c88bf6a..cefb79e43 100644
--- a/surfsense_web/components/layout/ui/tabs/TabBar.tsx
+++ b/surfsense_web/components/layout/ui/tabs/TabBar.tsx
@@ -20,7 +20,7 @@ interface TabBarProps {
 	className?: string;
 }
 
-// Pure scroll-target calculation (port of opencode's nextTabListScrollLeft).
+// Pure scroll-target calculation for the tab list.
 // - When the list shrinks (a tab was closed), do not move the scroll.
 // - When the list overflows after growing, snap to the right edge so the new tab is visible.
 function nextTabListScrollLeft(input: {
@@ -66,9 +66,8 @@ export function TabBar({
 		[closeTab, onTabSwitch]
 	);
 
-	// React to tab list growth (port of opencode's createFileTabListSync).
-	// Uses a MutationObserver instead of a tab-id effect so the scroll catches
-	// the moment the new tab is added to the DOM, not after activation lands.
+	// React to tab list growth via a MutationObserver so the scroll catches the
+	// moment a new tab is added to the DOM, not after activation lands.
 	// Also remaps vertical wheel motion to horizontal scroll.
 	useEffect(() => {
 		const el = scrollRef.current;
@@ -195,8 +194,7 @@ export function TabBar({
 					<div
 						className={cn(
 							// Solid bg + soft left-fade so tabs scrolling underneath the
-							// + button get visually masked into the bar's background —
-							// 1:1 port of opencode's `> .sticky` rule in tabs.css.
+							// + button get visually masked into the bar's background.
 							"sticky right-0 z-10 flex h-full shrink-0 items-center bg-main-panel pl-3 pr-1",
 							"before:content-[''] before:absolute before:inset-y-0 before:-left-4 before:w-4 before:pointer-events-none",
 							"before:bg-gradient-to-r before:from-transparent before:to-main-panel"

From 2e1367b00e0c354840a61796eeef55b8adb0aadb Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Sun, 3 May 2026 19:18:30 +0530
Subject: [PATCH 13/96] fix(sidebar): adjust padding and gradient heights for
 improved layout consistency; enhance SidebarUsageFooter to conditionally
 render border based on navigation items

---
 .../components/layout/ui/sidebar/Sidebar.tsx  | 27 +++++++++++++------
 .../layout/ui/sidebar/SidebarSection.tsx      |  2 +-
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx b/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
index 946079333..3f02f1d6f 100644
--- a/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
@@ -179,7 +179,7 @@ export function Sidebar({
 			{isCollapsed ? (
 				<div className="flex-1 w-[60px]" />
 			) : (
-				<div className="flex-1 flex flex-col gap-1 py-2 w-full min-h-0 overflow-hidden">
+				<div className="flex-1 flex flex-col gap-1 pt-2 w-full min-h-0 overflow-hidden">
 					{/* Shared Chats Section - takes only space needed, max 50% */}
 					<SidebarSection
 						title={t("shared_chats")}
@@ -210,7 +210,7 @@ export function Sidebar({
 						) : sharedChats.length > 0 ? (
 							<div className="relative min-h-0 flex-1">
 								<div
-									className={`flex flex-col gap-0.5 max-h-full overflow-y-auto scrollbar-thin scrollbar-thumb-muted-foreground/20 scrollbar-track-transparent ${sharedChats.length > 4 ? "pb-8" : ""}`}
+									className={`flex flex-col gap-0.5 max-h-full overflow-y-auto scrollbar-thin scrollbar-thumb-muted-foreground/20 scrollbar-track-transparent ${sharedChats.length > 4 ? "pb-2" : ""}`}
 								>
 									{sharedChats.slice(0, 20).map((chat) => (
 										<ChatListItem
@@ -229,7 +229,7 @@ export function Sidebar({
 								</div>
 								{/* Gradient fade indicator when more than 4 items */}
 								{sharedChats.length > 4 && (
-									<div className="pointer-events-none absolute bottom-0 left-0 right-0 h-8 bg-gradient-to-t from-sidebar via-sidebar/90 to-transparent" />
+									<div className="pointer-events-none absolute bottom-0 left-0 right-0 h-5 bg-gradient-to-t from-sidebar/80 to-transparent" />
 								)}
 							</div>
 						) : (
@@ -266,7 +266,7 @@ export function Sidebar({
 						) : chats.length > 0 ? (
 							<div className="relative flex-1 min-h-0">
 								<div
-									className={`flex flex-col gap-0.5 h-full overflow-y-auto scrollbar-thin scrollbar-thumb-muted-foreground/20 scrollbar-track-transparent ${chats.length > 4 ? "pb-8" : ""}`}
+									className={`flex flex-col gap-0.5 h-full overflow-y-auto scrollbar-thin scrollbar-thumb-muted-foreground/20 scrollbar-track-transparent ${chats.length > 4 ? "pb-2" : ""}`}
 								>
 									{chats.slice(0, 20).map((chat) => (
 										<ChatListItem
@@ -285,7 +285,7 @@ export function Sidebar({
 								</div>
 								{/* Gradient fade indicator when more than 4 items */}
 								{chats.length > 4 && (
-									<div className="pointer-events-none absolute bottom-0 left-0 right-0 h-8 bg-gradient-to-t from-sidebar via-sidebar/90 to-transparent" />
+									<div className="pointer-events-none absolute bottom-0 left-0 right-0 h-5 bg-gradient-to-t from-sidebar/80 to-transparent" />
 								)}
 							</div>
 						) : (
@@ -306,7 +306,11 @@ export function Sidebar({
 					/>
 				)}
 
-				<SidebarUsageFooter pageUsage={pageUsage} isCollapsed={isCollapsed} />
+				<SidebarUsageFooter
+					pageUsage={pageUsage}
+					isCollapsed={isCollapsed}
+					hasNavSectionAbove={footerNavItems.length > 0}
+				/>
 
 				{renderUserProfile && (
 					<SidebarUserProfile
@@ -328,9 +332,11 @@ export function Sidebar({
 function SidebarUsageFooter({
 	pageUsage,
 	isCollapsed,
+	hasNavSectionAbove = false,
 }: {
 	pageUsage?: PageUsage;
 	isCollapsed: boolean;
+	hasNavSectionAbove?: boolean;
 }) {
 	const params = useParams();
 	const searchSpaceId = params?.search_space_id ?? "";
@@ -338,9 +344,14 @@ function SidebarUsageFooter({
 
 	if (isCollapsed) return null;
 
+	const containerClass = cn(
+		"px-3 py-3 space-y-3",
+		hasNavSectionAbove && "border-t border-border/60"
+	);
+
 	if (isAnonymous) {
 		return (
-			<div className="px-3 py-3 border-t border-border/60 space-y-3">
+			<div className={containerClass}>
 				{pageUsage && (
 					<div className="space-y-1.5">
 						<div className="flex justify-between items-center text-xs">
@@ -373,7 +384,7 @@ function SidebarUsageFooter({
 	}
 
 	return (
-		<div className="px-3 py-3 border-t border-border/60 space-y-3">
+		<div className={containerClass}>
 			<PremiumTokenUsageDisplay />
 			<AuthenticatedPageUsageDisplay />
 			<div className="space-y-0.5">
diff --git a/surfsense_web/components/layout/ui/sidebar/SidebarSection.tsx b/surfsense_web/components/layout/ui/sidebar/SidebarSection.tsx
index aeb0ebef1..10d5942ca 100644
--- a/surfsense_web/components/layout/ui/sidebar/SidebarSection.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/SidebarSection.tsx
@@ -69,7 +69,7 @@ export function SidebarSection({
 			</div>
 
 			<CollapsibleContent className={cn("overflow-hidden flex-1 flex flex-col min-h-0")}>
-				<div className={cn("px-2 pb-2 flex-1 flex flex-col min-h-0 overflow-hidden")}>
+				<div className={cn("px-2 flex-1 flex flex-col min-h-0 overflow-hidden")}>
 					{children}
 				</div>
 			</CollapsibleContent>

From cdce6a8f147864b8efc441f31a80da4f63927bf5 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Sun, 3 May 2026 20:38:21 +0530
Subject: [PATCH 14/96] refactor(styles): unify panel and sidebar colors for
 consistent theming; update hover effects for buttons in the right panel and
 sidebar

---
 surfsense_web/app/globals.css                 | 24 +++++++++++++------
 .../components/assistant-ui/user-message.tsx  |  2 +-
 .../layout/ui/right-panel/RightPanel.tsx      |  6 ++---
 .../layout/ui/shell/LayoutShell.tsx           | 24 ++++++++++++-------
 .../components/layout/ui/sidebar/Sidebar.tsx  |  6 ++---
 .../ui/sidebar/SidebarCollapseButton.tsx      |  2 +-
 .../components/layout/ui/tabs/TabBar.tsx      |  6 ++---
 7 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/surfsense_web/app/globals.css b/surfsense_web/app/globals.css
index a37ddb8f3..76e3eea8c 100644
--- a/surfsense_web/app/globals.css
+++ b/surfsense_web/app/globals.css
@@ -39,7 +39,11 @@
 	--chart-4: oklch(0.828 0.189 84.429);
 	--chart-5: oklch(0.769 0.188 70.08);
 	--radius: 0.625rem;
-	--sidebar: oklch(0.985 0 0);
+	/* Unified surface used by the left sidebar, main panel, and right panel. */
+	--panel: oklch(0.96 0 0);
+	/* Distinct (lighter) surface used by the leftmost icon rail. */
+	--rail: oklch(0.985 0 0);
+	--sidebar: var(--panel);
 	--sidebar-foreground: oklch(0.145 0 0);
 	--sidebar-primary: oklch(0.205 0 0);
 	--sidebar-primary-foreground: oklch(0.985 0 0);
@@ -47,7 +51,7 @@
 	--sidebar-accent-foreground: oklch(0.205 0 0);
 	--sidebar-border: oklch(0.922 0 0);
 	--sidebar-ring: oklch(0.708 0 0);
-	--main-panel: oklch(1 0 0);
+	--main-panel: var(--panel);
 	--syntax-bg: #f5f5f5;
 	--brand: oklch(0.623 0.214 259.815);
 	--highlight: oklch(0.852 0.199 91.936);
@@ -70,23 +74,27 @@
 	--accent-foreground: oklch(0.985 0 0);
 	--destructive: oklch(0.577 0.245 27.325);
 	--destructive-foreground: oklch(0.985 0 0);
-	--border: oklch(0.269 0 0);
-	--input: oklch(0.269 0 0);
+	--border: oklch(0.32 0 0);
+	--input: oklch(0.32 0 0);
 	--ring: oklch(0.439 0 0);
 	--chart-1: oklch(0.488 0.243 264.376);
 	--chart-2: oklch(0.696 0.17 162.48);
 	--chart-3: oklch(0.769 0.188 70.08);
 	--chart-4: oklch(0.627 0.265 303.9);
 	--chart-5: oklch(0.645 0.246 16.439);
-	--sidebar: oklch(0.205 0 0);
+	/* Unified surface used by the left sidebar, main panel, and right panel. */
+	--panel: oklch(0.24 0 0);
+	/* Distinct (slightly darker) surface used by the leftmost icon rail. */
+	--rail: oklch(0.205 0 0);
+	--sidebar: var(--panel);
 	--sidebar-foreground: oklch(0.985 0 0);
 	--sidebar-primary: oklch(0.488 0.243 264.376);
 	--sidebar-primary-foreground: oklch(0.985 0 0);
 	--sidebar-accent: oklch(0.269 0 0);
 	--sidebar-accent-foreground: oklch(0.985 0 0);
-	--sidebar-border: oklch(0.269 0 0);
+	--sidebar-border: oklch(0.32 0 0);
 	--sidebar-ring: oklch(0.439 0 0);
-	--main-panel: oklch(0.18 0 0);
+	--main-panel: var(--panel);
 	--syntax-bg: #1e1e1e;
 	--brand: oklch(0.707 0.165 254.624);
 	--highlight: oklch(0.852 0.199 91.936);
@@ -118,6 +126,8 @@
 	--color-chart-4: var(--chart-4);
 	--color-chart-5: var(--chart-5);
 	--color-main-panel: var(--main-panel);
+	--color-panel: var(--panel);
+	--color-rail: var(--rail);
 	--radius-sm: calc(var(--radius) - 4px);
 	--radius-md: calc(var(--radius) - 2px);
 	--radius-lg: var(--radius);
diff --git a/surfsense_web/components/assistant-ui/user-message.tsx b/surfsense_web/components/assistant-ui/user-message.tsx
index 145ac2d7e..b28ee374e 100644
--- a/surfsense_web/components/assistant-ui/user-message.tsx
+++ b/surfsense_web/components/assistant-ui/user-message.tsx
@@ -102,7 +102,7 @@ export const UserMessage: FC = () => {
 			<div className="col-start-2 min-w-0">
 				<div className="aui-user-message-content-wrapper flex items-end gap-2">
 					<div className="relative flex-1 min-w-0">
-						<div className="aui-user-message-content wrap-break-word rounded-2xl bg-muted px-4 py-2.5 text-foreground">
+						<div className="aui-user-message-content wrap-break-word rounded-xl bg-muted px-4 py-2.5 text-foreground">
 							<MessagePrimitive.Parts components={userMessageParts} />
 						</div>
 						<div className="absolute right-0 top-full mt-1 z-10 opacity-100 pointer-events-auto md:opacity-0 md:pointer-events-none md:transition-opacity md:duration-200 md:delay-300 md:group-hover/user-msg:opacity-100 md:group-hover/user-msg:delay-0 md:group-hover/user-msg:pointer-events-auto">
diff --git a/surfsense_web/components/layout/ui/right-panel/RightPanel.tsx b/surfsense_web/components/layout/ui/right-panel/RightPanel.tsx
index 3dc7a96d4..1e543c885 100644
--- a/surfsense_web/components/layout/ui/right-panel/RightPanel.tsx
+++ b/surfsense_web/components/layout/ui/right-panel/RightPanel.tsx
@@ -61,7 +61,7 @@ function CollapseButton({ onClick }: { onClick: () => void }) {
 					variant="ghost"
 					size="icon"
 					onClick={onClick}
-					className="h-8 w-8 shrink-0 text-muted-foreground hover:text-muted-foreground hover:bg-muted/40"
+					className="h-8 w-8 shrink-0 text-muted-foreground hover:text-muted-foreground hover:bg-accent"
 				>
 					<PanelRight className="h-4 w-4" />
 					<span className="sr-only">Collapse panel</span>
@@ -102,7 +102,7 @@ export function RightPanelExpandButton() {
 						variant="ghost"
 						size="icon"
 						onClick={() => startTransition(() => setCollapsed(false))}
-						className="h-8 w-8 shrink-0 -m-0.5 text-muted-foreground hover:text-muted-foreground hover:bg-muted/40"
+						className="h-8 w-8 shrink-0 -m-0.5 text-muted-foreground hover:text-muted-foreground hover:bg-accent"
 					>
 						<PanelRight className="h-4 w-4" />
 						<span className="sr-only">Expand panel</span>
@@ -203,7 +203,7 @@ export function RightPanel({ documentsPanel }: RightPanelProps) {
 	return (
 		<aside
 			style={{ width: targetWidth }}
-			className="flex h-full shrink-0 flex-col border-l border-b bg-sidebar text-sidebar-foreground overflow-hidden transition-[width] duration-200 ease-out"
+			className="flex h-full shrink-0 flex-col border-l border-b bg-panel text-sidebar-foreground overflow-hidden transition-[width] duration-200 ease-out"
 		>
 			<div className="relative flex-1 min-h-0 overflow-hidden">
 				{effectiveTab === "sources" && documentsOpen && documentsPanel && (
diff --git a/surfsense_web/components/layout/ui/shell/LayoutShell.tsx b/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
index a41027573..01bc4255c 100644
--- a/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
+++ b/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
@@ -144,7 +144,7 @@ function MainContentPanel({
 				rightActions={<RightPanelExpandButton />}
 				className="min-w-0"
 			/>
-			<div className="relative flex flex-1 flex-col border border-l-0 border-r-0 border-t-0 bg-main-panel overflow-hidden min-w-0">
+			<div className="relative flex flex-1 flex-col border border-l-0 border-r-0 border-t-0 bg-panel overflow-hidden min-w-0">
 				<Header />
 
 				{isDocumentTab && activeTab.documentId && activeTab.searchSpaceId ? (
@@ -247,7 +247,7 @@ export function LayoutShell({
 		return (
 			<SidebarProvider value={sidebarContextValue}>
 				<TooltipProvider delayDuration={0}>
-					<div className={cn("flex h-screen w-full flex-col bg-main-panel", className)}>
+					<div className={cn("flex h-screen w-full flex-col bg-panel", className)}>
 						<Header
 							mobileMenuTrigger={<MobileSidebarTrigger onClick={() => setMobileMenuOpen(true)} />}
 						/>
@@ -369,9 +369,12 @@ export function LayoutShell({
 		<SidebarProvider value={sidebarContextValue}>
 			<TooltipProvider delayDuration={0}>
 				<div
-					className={cn("flex h-screen w-full gap-2 px-2 py-0 overflow-hidden bg-muted/40", className)}
+					className={cn(
+						"flex h-screen w-full gap-2 px-2 py-0 overflow-hidden bg-rail",
+						className
+					)}
 				>
-					<div className="hidden md:flex overflow-hidden border-r border-border/60 -mr-2 pr-2">
+					<div className="hidden md:flex overflow-hidden border-r -mr-2 pr-2 bg-rail">
 						<IconRail
 							searchSpaces={searchSpaces}
 							activeSearchSpaceId={activeSearchSpaceId}
@@ -396,8 +399,8 @@ export function LayoutShell({
 					{/* Sidebar + slide-out panels share one container; overflow visible so panels can overlay main content. Negative right margin closes the flex gap so the sidebar sits flush against the main panel, separated only by a border. */}
 					<div
 						className={cn(
-							"relative hidden md:flex shrink-0 z-20 -mr-2 border-r border-border/60",
-							!isCollapsed && "bg-sidebar"
+							"relative hidden md:flex shrink-0 z-20 -mr-2 border-r",
+							!isCollapsed && "bg-panel"
 						)}
 					>
 						{!isCollapsed && (
@@ -437,13 +440,18 @@ export function LayoutShell({
 							/>
 						)}
 
-						{/* Invisible drag hit-area straddling the right border — provides resize affordance without any visible UI */}
+						{/* Drag hit-area straddling the right border — wider for a forgiving grab,
+						    z-50 + pointer-events-auto to beat any neighboring stacking context. */}
 						{!isCollapsed && (
 							<button
 								type="button"
 								aria-label="Resize sidebar"
 								onMouseDown={onResizeMouseDown}
-								className="absolute top-0 right-0 h-full w-2 translate-x-1/2 cursor-col-resize z-30 bg-transparent border-0 p-0 focus:outline-none"
+								className={cn(
+									"absolute top-0 right-0 h-full w-4 translate-x-1/2 cursor-col-resize z-50 pointer-events-auto select-none bg-transparent border-0 p-0 focus:outline-none",
+									"after:content-[''] after:absolute after:inset-y-0 after:left-1/2 after:w-px after:-translate-x-1/2 after:bg-transparent hover:after:bg-border/80 after:transition-colors",
+									isResizing && "after:bg-border"
+								)}
 							/>
 						)}
 
diff --git a/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx b/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
index 3f02f1d6f..a9d5d0bf6 100644
--- a/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
@@ -116,7 +116,7 @@ export function Sidebar({
 	return (
 		<div
 			className={cn(
-				"relative flex h-full flex-col bg-sidebar text-sidebar-foreground overflow-hidden select-none",
+				"relative flex h-full flex-col bg-panel text-sidebar-foreground overflow-hidden select-none",
 				isCollapsed ? "w-[60px] transition-[width] duration-200" : "",
 				!isCollapsed && !isResizing ? "transition-[width] duration-200" : "",
 				className
@@ -296,7 +296,7 @@ export function Sidebar({
 			)}
 
 			{/* Footer */}
-			<div className="mt-auto border-t border-border/60">
+			<div className="mt-auto border-t">
 				{/* Platform navigation */}
 				{footerNavItems.length > 0 && (
 					<NavSection
@@ -346,7 +346,7 @@ function SidebarUsageFooter({
 
 	const containerClass = cn(
 		"px-3 py-3 space-y-3",
-		hasNavSectionAbove && "border-t border-border/60"
+		hasNavSectionAbove && "border-t"
 	);
 
 	if (isAnonymous) {
diff --git a/surfsense_web/components/layout/ui/sidebar/SidebarCollapseButton.tsx b/surfsense_web/components/layout/ui/sidebar/SidebarCollapseButton.tsx
index 7228c1fd9..9a3349f06 100644
--- a/surfsense_web/components/layout/ui/sidebar/SidebarCollapseButton.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/SidebarCollapseButton.tsx
@@ -26,7 +26,7 @@ export function SidebarCollapseButton({
 			variant="ghost"
 			size="icon"
 			onClick={onToggle}
-			className="h-8 w-8 shrink-0 text-muted-foreground hover:text-muted-foreground hover:bg-muted/40"
+			className="h-8 w-8 shrink-0 text-muted-foreground hover:text-muted-foreground hover:bg-accent"
 		>
 			<PanelLeft className="h-4 w-4" />
 			<span className="sr-only">{isCollapsed ? t("expand_sidebar") : t("collapse_sidebar")}</span>
diff --git a/surfsense_web/components/layout/ui/tabs/TabBar.tsx b/surfsense_web/components/layout/ui/tabs/TabBar.tsx
index cefb79e43..ebb701389 100644
--- a/surfsense_web/components/layout/ui/tabs/TabBar.tsx
+++ b/surfsense_web/components/layout/ui/tabs/TabBar.tsx
@@ -139,7 +139,7 @@ export function TabBar({
 	return (
 		<div
 			className={cn(
-				"mb-0 flex h-12 items-center shrink-0 px-1 gap-0.5 select-none border-b border-border/60",
+				"mb-0 flex h-12 items-center shrink-0 px-1 gap-0.5 select-none border-b bg-panel",
 				className
 			)}
 		>
@@ -195,9 +195,9 @@ export function TabBar({
 						className={cn(
 							// Solid bg + soft left-fade so tabs scrolling underneath the
 							// + button get visually masked into the bar's background.
-							"sticky right-0 z-10 flex h-full shrink-0 items-center bg-main-panel pl-3 pr-1",
+							"sticky right-0 z-10 flex h-full shrink-0 items-center bg-panel pl-3 pr-1",
 							"before:content-[''] before:absolute before:inset-y-0 before:-left-4 before:w-4 before:pointer-events-none",
-							"before:bg-gradient-to-r before:from-transparent before:to-main-panel"
+							"before:bg-gradient-to-r before:from-transparent before:to-panel"
 						)}
 					>
 						<button

From 761f5b1c114be3032dd990f83e0ce84aba1dd25c Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Sun, 3 May 2026 22:35:40 +0530
Subject: [PATCH 15/96] refactor(styles): update component backgrounds and
 hover effects for improved visual consistency across user interface elements

---
 .../components/assistant-ui/user-message.tsx          |  2 +-
 .../components/free-chat/free-model-selector.tsx      |  2 +-
 .../components/layout/ui/sidebar/MobileSidebar.tsx    | 11 ++++++++---
 surfsense_web/components/new-chat/model-selector.tsx  |  2 +-
 .../components/public-chat/public-thread.tsx          |  2 +-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/surfsense_web/components/assistant-ui/user-message.tsx b/surfsense_web/components/assistant-ui/user-message.tsx
index b28ee374e..45917c20c 100644
--- a/surfsense_web/components/assistant-ui/user-message.tsx
+++ b/surfsense_web/components/assistant-ui/user-message.tsx
@@ -49,7 +49,7 @@ const UserAvatar: FC<AuthorMetadata> = ({ displayName, avatarUrl }) => {
 	}
 
 	return (
-		<div className="flex size-8 items-center justify-center rounded-full bg-primary/10 text-xs font-medium text-primary select-none">
+		<div className="flex size-8 items-center justify-center rounded-full bg-muted text-xs font-medium text-foreground select-none">
 			{initials}
 		</div>
 	);
diff --git a/surfsense_web/components/free-chat/free-model-selector.tsx b/surfsense_web/components/free-chat/free-model-selector.tsx
index b25d06db8..14005fe3d 100644
--- a/surfsense_web/components/free-chat/free-model-selector.tsx
+++ b/surfsense_web/components/free-chat/free-model-selector.tsx
@@ -103,7 +103,7 @@ export function FreeModelSelector({ className }: { className?: string }) {
 					role="combobox"
 					aria-expanded={open}
 					className={cn(
-						"h-8 gap-2 px-3 text-sm bg-main-panel hover:bg-accent/50 dark:hover:bg-white/6 border border-border/40 select-none",
+						"h-8 gap-2 px-3 text-sm bg-muted hover:bg-muted/80 border-0 select-none",
 						className
 					)}
 				>
diff --git a/surfsense_web/components/layout/ui/sidebar/MobileSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/MobileSidebar.tsx
index ebb12bae8..f69b0223d 100644
--- a/surfsense_web/components/layout/ui/sidebar/MobileSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/MobileSidebar.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { PanelRightClose, Plus } from "lucide-react";
+import { PanelLeft, Plus } from "lucide-react";
 import { Button } from "@/components/ui/button";
 import { ScrollArea } from "@/components/ui/scroll-area";
 import { Sheet, SheetContent, SheetTitle } from "@/components/ui/sheet";
@@ -45,8 +45,13 @@ interface MobileSidebarProps {
 
 export function MobileSidebarTrigger({ onClick }: { onClick: () => void }) {
 	return (
-		<Button variant="ghost" size="icon" className="md:hidden h-8 w-8" onClick={onClick}>
-			<PanelRightClose className="h-5 w-5" />
+		<Button
+			variant="ghost"
+			size="icon"
+			onClick={onClick}
+			className="md:hidden h-8 w-8 shrink-0 text-muted-foreground hover:bg-transparent hover:text-muted-foreground"
+		>
+			<PanelLeft className="h-4 w-4" />
 			<span className="sr-only">Open menu</span>
 		</Button>
 	);
diff --git a/surfsense_web/components/new-chat/model-selector.tsx b/surfsense_web/components/new-chat/model-selector.tsx
index 44f3feb7a..52fb18dcc 100644
--- a/surfsense_web/components/new-chat/model-selector.tsx
+++ b/surfsense_web/components/new-chat/model-selector.tsx
@@ -1344,7 +1344,7 @@ export function ModelSelector({
 			role="combobox"
 			aria-expanded={open}
 			className={cn(
-				"h-8 gap-2 px-3 text-sm bg-main-panel hover:bg-accent/50 dark:hover:bg-white/[0.06] border border-border/40 select-none",
+				"h-8 gap-2 px-3 text-sm bg-muted hover:bg-muted/80 border-0 select-none",
 				className
 			)}
 		>
diff --git a/surfsense_web/components/public-chat/public-thread.tsx b/surfsense_web/components/public-chat/public-thread.tsx
index a74f0d9f2..e8606592c 100644
--- a/surfsense_web/components/public-chat/public-thread.tsx
+++ b/surfsense_web/components/public-chat/public-thread.tsx
@@ -105,7 +105,7 @@ const UserAvatar: FC<AuthorMetadata & { hasError: boolean; onError: () => void }
 	}
 
 	return (
-		<div className="flex size-8 items-center justify-center rounded-full bg-primary/10 text-xs font-medium text-primary">
+		<div className="flex size-8 items-center justify-center rounded-full bg-muted text-xs font-medium text-foreground">
 			{initials}
 		</div>
 	);

From 056b2e270b62d3a7642b5ca35b3174a934ab5b09 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Sun, 3 May 2026 22:52:43 +0530
Subject: [PATCH 16/96] refactor(ui): enhance Drawer component structure and
 styling; add Manage Connectors option to dropdown menu

---
 .../components/assistant-ui/thread.tsx        | 66 +++++++++++--------
 .../comment-sheet/comment-sheet.tsx           |  5 +-
 2 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/surfsense_web/components/assistant-ui/thread.tsx b/surfsense_web/components/assistant-ui/thread.tsx
index e5b6e4da8..6ec33c281 100644
--- a/surfsense_web/components/assistant-ui/thread.tsx
+++ b/surfsense_web/components/assistant-ui/thread.tsx
@@ -69,7 +69,13 @@ import {
 import { PromptPicker, type PromptPickerRef } from "@/components/new-chat/prompt-picker";
 import { Avatar, AvatarFallback, AvatarGroup } from "@/components/ui/avatar";
 import { Button } from "@/components/ui/button";
-import { Drawer, DrawerContent, DrawerHandle, DrawerTitle } from "@/components/ui/drawer";
+import {
+	Drawer,
+	DrawerContent,
+	DrawerHandle,
+	DrawerHeader,
+	DrawerTitle,
+} from "@/components/ui/drawer";
 import {
 	DropdownMenu,
 	DropdownMenuContent,
@@ -900,15 +906,28 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 									<Upload className="size-4" />
 									Upload Files
 								</DropdownMenuItem>
+								<DropdownMenuItem onSelect={() => setConnectorDialogOpen(true)}>
+									<Unplug className="size-4" />
+									Manage Connectors
+								</DropdownMenuItem>
 							</DropdownMenuContent>
 						</DropdownMenu>
-						<Drawer open={toolsPopoverOpen} onOpenChange={setToolsPopoverOpen}>
-							<DrawerContent className="max-h-[60dvh]">
+						<Drawer
+							open={toolsPopoverOpen}
+							onOpenChange={setToolsPopoverOpen}
+							shouldScaleBackground={false}
+						>
+							<DrawerContent className="h-[85vh] max-h-[85vh] z-80" overlayClassName="z-80">
 								<DrawerHandle />
-								<div className="px-4 py-2">
-									<DrawerTitle className="text-sm font-medium">Manage Tools</DrawerTitle>
-								</div>
-								<div className="overflow-y-auto pb-6" onScroll={handleToolsScroll}>
+								<DrawerHeader className="px-4 pb-3 pt-2">
+									<DrawerTitle className="flex items-center justify-center gap-2 text-base font-semibold">
+										Manage Tools
+									</DrawerTitle>
+								</DrawerHeader>
+								<div
+									className="min-h-0 flex-1 overflow-y-auto scrollbar-thin pb-6"
+									onScroll={handleToolsScroll}
+								>
 									{groupedTools
 										.filter((g) => !g.connectorIcon)
 										.map((group) => (
@@ -1003,15 +1022,6 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 								</div>
 							</DrawerContent>
 						</Drawer>
-						<Button
-							variant="ghost"
-							size="icon"
-							className="size-[34px] rounded-full p-1 font-semibold text-xs hover:bg-muted-foreground/15 dark:border-muted-foreground/15 dark:hover:bg-muted-foreground/30"
-							aria-label="Manage connectors"
-							onClick={() => setConnectorDialogOpen(true)}
-						>
-							<Unplug className="size-4" />
-						</Button>
 					</>
 				) : (
 					<Popover open={toolsPopoverOpen} onOpenChange={setToolsPopoverOpen}>
@@ -1212,17 +1222,19 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 				</div>
 			)}
 			<div className="flex items-center gap-2">
-				<TooltipIconButton
-					tooltip="Capture screen"
-					type="button"
-					variant="ghost"
-					size="icon"
-					className="size-8 rounded-full"
-					aria-label="Capture screen"
-					onClick={() => void handleScreenCapture()}
-				>
-					<Camera className="size-4" />
-				</TooltipIconButton>
+				{isDesktop && (
+					<TooltipIconButton
+						tooltip="Capture screen"
+						type="button"
+						variant="ghost"
+						size="icon"
+						className="size-8 rounded-full"
+						aria-label="Capture screen"
+						onClick={() => void handleScreenCapture()}
+					>
+						<Camera className="size-4" />
+					</TooltipIconButton>
+				)}
 				<AuiIf condition={({ thread }) => !thread.isRunning}>
 					<ComposerPrimitive.Send asChild disabled={isSendDisabled}>
 						<TooltipIconButton
diff --git a/surfsense_web/components/chat-comments/comment-sheet/comment-sheet.tsx b/surfsense_web/components/chat-comments/comment-sheet/comment-sheet.tsx
index 8db45f764..054d77fa6 100644
--- a/surfsense_web/components/chat-comments/comment-sheet/comment-sheet.tsx
+++ b/surfsense_web/components/chat-comments/comment-sheet/comment-sheet.tsx
@@ -1,6 +1,5 @@
 "use client";
 
-import { MessageCircleReply } from "lucide-react";
 import {
 	Drawer,
 	DrawerContent,
@@ -29,8 +28,7 @@ export function CommentSheet({
 				<DrawerContent className="h-[85vh] max-h-[85vh] z-80" overlayClassName="z-80">
 					<DrawerHandle />
 					<DrawerHeader className="px-4 pb-3 pt-2">
-						<DrawerTitle className="flex items-center gap-2 text-base font-semibold">
-							<MessageCircleReply className="size-5" />
+						<DrawerTitle className="flex items-center justify-center gap-2 text-base font-semibold">
 							Comments
 							{commentCount > 0 && (
 								<span className="rounded-full bg-primary/10 px-2 py-0.5 text-xs font-medium text-primary">
@@ -56,7 +54,6 @@ export function CommentSheet({
 			>
 				<SheetHeader className="flex-shrink-0 px-4 py-4">
 					<SheetTitle className="flex items-center gap-2 text-base font-semibold">
-						<MessageCircleReply className="size-5" />
 						Comments
 						{commentCount > 0 && (
 							<span className="rounded-full bg-primary/10 px-2 py-0.5 text-xs font-medium text-primary">

From 04f9f7dfc17e6f7e7d175322543ccaa4aa3e9ca3 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Sun, 3 May 2026 22:58:20 +0530
Subject: [PATCH 17/96] refactor(sidebar): remove unused user icons from
 Private and Shared Chats sidebars; update Inbox header font size for
 consistency

---
 .../components/layout/ui/sidebar/AllPrivateChatsSidebar.tsx     | 1 -
 .../components/layout/ui/sidebar/AllSharedChatsSidebar.tsx      | 1 -
 surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx     | 2 +-
 .../components/layout/ui/sidebar/SidebarSlideOutPanel.tsx       | 2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/surfsense_web/components/layout/ui/sidebar/AllPrivateChatsSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/AllPrivateChatsSidebar.tsx
index e821ec4da..717f38743 100644
--- a/surfsense_web/components/layout/ui/sidebar/AllPrivateChatsSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/AllPrivateChatsSidebar.tsx
@@ -265,7 +265,6 @@ export function AllPrivateChatsSidebarContent({
 							<span className="sr-only">{t("close") || "Close"}</span>
 						</Button>
 					)}
-					<User className="h-4 w-4 text-primary" />
 					<h2 className="text-lg font-semibold">{t("chats") || "Private Chats"}</h2>
 				</div>
 
diff --git a/surfsense_web/components/layout/ui/sidebar/AllSharedChatsSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/AllSharedChatsSidebar.tsx
index c5ab0e0f3..12a71d65d 100644
--- a/surfsense_web/components/layout/ui/sidebar/AllSharedChatsSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/AllSharedChatsSidebar.tsx
@@ -264,7 +264,6 @@ export function AllSharedChatsSidebarContent({
 							<span className="sr-only">{t("close") || "Close"}</span>
 						</Button>
 					)}
-					<Users className="h-4 w-4 text-primary" />
 					<h2 className="text-lg font-semibold">{t("shared_chats") || "Shared Chats"}</h2>
 				</div>
 
diff --git a/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx
index 76cb985b9..b842bde22 100644
--- a/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx
@@ -542,7 +542,7 @@ export function InboxSidebarContent({
 								<span className="sr-only">{t("close") || "Close"}</span>
 							</Button>
 						)}
-						<h2 className="text-md font-semibold">{t("inbox") || "Inbox"}</h2>
+						<h2 className="text-lg font-semibold">{t("inbox") || "Inbox"}</h2>
 					</div>
 					<div className="flex items-center gap-1">
 						{isMobile ? (
diff --git a/surfsense_web/components/layout/ui/sidebar/SidebarSlideOutPanel.tsx b/surfsense_web/components/layout/ui/sidebar/SidebarSlideOutPanel.tsx
index dbfdf0304..70c71012b 100644
--- a/surfsense_web/components/layout/ui/sidebar/SidebarSlideOutPanel.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/SidebarSlideOutPanel.tsx
@@ -99,7 +99,7 @@ export function SidebarSlideOutPanel({
 					>
 						<div
 							style={{ width }}
-							className="h-full bg-sidebar text-sidebar-foreground flex flex-col select-none border rounded-r-xl shadow-xl"
+							className="h-full bg-sidebar text-sidebar-foreground flex flex-col select-none border shadow-xl"
 							role="dialog"
 							aria-label={ariaLabel}
 						>

From 331589275bc7ba372e8f5ef58966dece048b23ed Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Sun, 3 May 2026 23:30:36 +0530
Subject: [PATCH 18/96] refactor(tabs): update default chat tab title for
 clarity; adjust TabBar styles for improved layout and hover effects

---
 surfsense_web/atoms/tabs/tabs.atom.ts         |  2 +-
 .../components/layout/ui/tabs/TabBar.tsx      | 46 +++++++++++--------
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/surfsense_web/atoms/tabs/tabs.atom.ts b/surfsense_web/atoms/tabs/tabs.atom.ts
index 3bb06c8e3..dba459cc9 100644
--- a/surfsense_web/atoms/tabs/tabs.atom.ts
+++ b/surfsense_web/atoms/tabs/tabs.atom.ts
@@ -136,7 +136,7 @@ export const syncChatTabAtom = atom(
 		const newTab: Tab = {
 			id: tabId,
 			type: "chat",
-			title: title || `Chat ${chatId}`,
+			title: title || "New Chat",
 			chatId,
 			chatUrl,
 			searchSpaceId,
diff --git a/surfsense_web/components/layout/ui/tabs/TabBar.tsx b/surfsense_web/components/layout/ui/tabs/TabBar.tsx
index ebb701389..27e87f600 100644
--- a/surfsense_web/components/layout/ui/tabs/TabBar.tsx
+++ b/surfsense_web/components/layout/ui/tabs/TabBar.tsx
@@ -158,35 +158,41 @@ export function TabBar({
 							data-tab-id={tab.id}
 							onClick={() => handleTabClick(tab)}
 							className={cn(
-								"group relative flex h-full items-center px-3 min-w-[120px] max-w-[240px] min-h-0 overflow-hidden text-[13px] font-medium rounded-md transition-all duration-150 shrink-0",
+								"group relative flex h-full items-center px-3 w-[180px] min-h-0 overflow-hidden text-[13px] font-medium rounded-md transition-colors duration-150 shrink-0",
 								isActive
-									? "bg-muted/60 text-foreground"
-									: "bg-transparent text-muted-foreground hover:bg-muted/30 hover:text-foreground"
+									? "bg-muted text-foreground"
+									: "bg-transparent text-muted-foreground hover:bg-muted/50 hover:text-foreground"
 							)}
 						>
-							<span className="block min-w-0 flex-1 truncate text-left group-hover:pr-5 group-focus-within:pr-5">
+							<span className="block min-w-0 flex-1 whitespace-nowrap overflow-hidden text-left">
 								{tab.title}
 							</span>
-							{/* biome-ignore lint/a11y/useSemanticElements: cannot nest button inside button */}
-							<span
-								role="button"
-								tabIndex={0}
-								onClick={(e) => handleTabClose(e, tab.id)}
-								onKeyDown={(e) => {
-									if (e.key === "Enter" || e.key === " ") {
-										e.preventDefault();
-										handleTabClose(e as unknown as React.MouseEvent, tab.id);
-									}
-								}}
+							{/* Hover-only gradient + close overlay (sidebar pattern) — keeps pill width fixed and avoids ellipsis shift. */}
+							<div
 								className={cn(
-									"absolute right-2 top-1/2 -translate-y-1/2 shrink-0 rounded-full p-0.5 transition-all duration-150 hover:bg-muted-foreground/15",
+									"pointer-events-none absolute right-0 top-0 bottom-0 flex items-center rounded-r-md pl-6 pr-2 opacity-0 transition-opacity duration-150",
+									"group-hover:opacity-100 group-focus-within:opacity-100",
 									isActive
-										? "opacity-0 group-hover:opacity-70 group-focus-within:opacity-70 hover:opacity-100"
-										: "opacity-0 group-hover:opacity-60 group-focus-within:opacity-60 hover:opacity-100!"
+										? "bg-gradient-to-l from-muted from-60% to-transparent"
+										: "bg-gradient-to-l from-muted/50 from-60% to-transparent"
 								)}
 							>
-								<X className="size-3" />
-							</span>
+								{/* biome-ignore lint/a11y/useSemanticElements: cannot nest button inside button */}
+								<span
+									role="button"
+									tabIndex={0}
+									onClick={(e) => handleTabClose(e, tab.id)}
+									onKeyDown={(e) => {
+										if (e.key === "Enter" || e.key === " ") {
+											e.preventDefault();
+											handleTabClose(e as unknown as React.MouseEvent, tab.id);
+										}
+									}}
+									className="pointer-events-auto rounded-full p-0.5 transition-colors hover:bg-muted-foreground/15"
+								>
+									<X className="size-3" />
+								</span>
+							</div>
 						</button>
 					);
 				})}

From 147be7123898800c239529a8c843ee85deaf2af8 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Mon, 4 May 2026 01:47:17 +0530
Subject: [PATCH 19/96] refactor(sidebar): update sidebar resizing logic to use
 pointer events; enhance drag cursor handling and improve sidebar width
 persistence

---
 .../layout/hooks/useSidebarResize.ts          | 105 +++++++++++-----
 .../layout/ui/shell/LayoutShell.tsx           | 114 ++++++++----------
 .../layout/ui/sidebar/NavSection.tsx          |   2 +-
 .../components/layout/ui/sidebar/Sidebar.tsx  |  50 ++++----
 .../layout/ui/sidebar/SidebarButton.tsx       | 103 +++++++++-------
 5 files changed, 208 insertions(+), 166 deletions(-)

diff --git a/surfsense_web/components/layout/hooks/useSidebarResize.ts b/surfsense_web/components/layout/hooks/useSidebarResize.ts
index 35ef7bf8b..5df6be378 100644
--- a/surfsense_web/components/layout/hooks/useSidebarResize.ts
+++ b/surfsense_web/components/layout/hooks/useSidebarResize.ts
@@ -10,18 +10,36 @@ export const SIDEBAR_MAX_WIDTH = 480;
 
 interface UseSidebarResizeReturn {
 	sidebarWidth: number;
-	handleMouseDown: (e: React.MouseEvent) => void;
+	handlePointerDown: (e: React.PointerEvent<HTMLElement>) => void;
 	isDragging: boolean;
 }
 
+function setGlobalDragCursor(active: boolean) {
+	const html = document.documentElement;
+	const body = document.body;
+	if (active) {
+		html.style.cursor = "col-resize";
+		body.style.cursor = "col-resize";
+		html.style.userSelect = "none";
+		body.style.userSelect = "none";
+	} else {
+		html.style.cursor = "";
+		body.style.cursor = "";
+		html.style.userSelect = "";
+		body.style.userSelect = "";
+	}
+}
+
 export function useSidebarResize(defaultWidth = SIDEBAR_MIN_WIDTH): UseSidebarResizeReturn {
 	const [sidebarWidth, setSidebarWidth] = useState(defaultWidth);
 	const [isDragging, setIsDragging] = useState(false);
 
 	const startXRef = useRef(0);
 	const startWidthRef = useRef(defaultWidth);
+	const widthRef = useRef(defaultWidth);
+	const pointerIdRef = useRef<number | null>(null);
+	const captureTargetRef = useRef<HTMLElement | null>(null);
 
-	// Initialize from cookie on mount
 	useEffect(() => {
 		try {
 			const match = document.cookie.match(/(?:^|; )sidebar_width=([^;]+)/);
@@ -29,14 +47,13 @@ export function useSidebarResize(defaultWidth = SIDEBAR_MIN_WIDTH): UseSidebarRe
 				const parsed = Number(match[1]);
 				if (!Number.isNaN(parsed) && parsed >= SIDEBAR_MIN_WIDTH && parsed <= SIDEBAR_MAX_WIDTH) {
 					setSidebarWidth(parsed);
+					widthRef.current = parsed;
 				}
 			}
 		} catch {
-			// Ignore cookie read errors
 		}
 	}, []);
 
-	// Persist width to cookie
 	const persistWidth = useCallback((width: number) => {
 		try {
 			// biome-ignore lint/suspicious/noDocumentCookie: SSR-readable preference, not security-sensitive
@@ -46,57 +63,81 @@ export function useSidebarResize(defaultWidth = SIDEBAR_MIN_WIDTH): UseSidebarRe
 		}
 	}, []);
 
-	const handleMouseDown = useCallback(
-		(e: React.MouseEvent) => {
-			e.preventDefault();
-			startXRef.current = e.clientX;
-			startWidthRef.current = sidebarWidth;
-			setIsDragging(true);
+	const releaseCapture = useCallback(() => {
+		const target = captureTargetRef.current;
+		const pointerId = pointerIdRef.current;
+		if (target && pointerId !== null) {
+			try {
+				if (target.hasPointerCapture(pointerId)) {
+					target.releasePointerCapture(pointerId);
+				}
+			} catch {
+			}
+		}
+		captureTargetRef.current = null;
+		pointerIdRef.current = null;
+	}, []);
 
-			document.body.style.cursor = "col-resize";
-			document.body.style.userSelect = "none";
+	const handlePointerDown = useCallback(
+		(e: React.PointerEvent<HTMLElement>) => {
+			if (e.pointerType === "mouse" && e.button !== 0) return;
+
+			e.preventDefault();
+			const target = e.currentTarget;
+			try {
+				target.setPointerCapture(e.pointerId);
+			} catch {
+			}
+			captureTargetRef.current = target;
+			pointerIdRef.current = e.pointerId;
+			startXRef.current = e.clientX;
+			startWidthRef.current = widthRef.current;
+			setIsDragging(true);
+			setGlobalDragCursor(true);
 		},
-		[sidebarWidth]
+		[]
 	);
 
 	useEffect(() => {
 		if (!isDragging) return;
 
-		const handleMouseMove = (e: MouseEvent) => {
+		const handlePointerMove = (e: PointerEvent) => {
+			if (pointerIdRef.current !== null && e.pointerId !== pointerIdRef.current) return;
 			const delta = e.clientX - startXRef.current;
 			const newWidth = Math.min(
 				SIDEBAR_MAX_WIDTH,
 				Math.max(SIDEBAR_MIN_WIDTH, startWidthRef.current + delta)
 			);
-			setSidebarWidth(newWidth);
+			if (newWidth !== widthRef.current) {
+				widthRef.current = newWidth;
+				setSidebarWidth(newWidth);
+			}
 		};
 
-		const handleMouseUp = () => {
+		const stop = (e: PointerEvent) => {
+			if (pointerIdRef.current !== null && e.pointerId !== pointerIdRef.current) return;
+			releaseCapture();
 			setIsDragging(false);
-			document.body.style.cursor = "";
-			document.body.style.userSelect = "";
-
-			// Persist the final width
-			setSidebarWidth((currentWidth) => {
-				persistWidth(currentWidth);
-				return currentWidth;
-			});
+			setGlobalDragCursor(false);
+			persistWidth(widthRef.current);
 		};
 
-		document.addEventListener("mousemove", handleMouseMove);
-		document.addEventListener("mouseup", handleMouseUp);
+		window.addEventListener("pointermove", handlePointerMove);
+		window.addEventListener("pointerup", stop);
+		window.addEventListener("pointercancel", stop);
 
 		return () => {
-			document.removeEventListener("mousemove", handleMouseMove);
-			document.removeEventListener("mouseup", handleMouseUp);
-			document.body.style.cursor = "";
-			document.body.style.userSelect = "";
+			window.removeEventListener("pointermove", handlePointerMove);
+			window.removeEventListener("pointerup", stop);
+			window.removeEventListener("pointercancel", stop);
+			setGlobalDragCursor(false);
+			releaseCapture();
 		};
-	}, [isDragging, persistWidth]);
+	}, [isDragging, persistWidth, releaseCapture]);
 
 	return {
 		sidebarWidth,
-		handleMouseDown,
+		handlePointerDown,
 		isDragging,
 	};
 }
diff --git a/surfsense_web/components/layout/ui/shell/LayoutShell.tsx b/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
index 01bc4255c..1af8dcbc5 100644
--- a/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
+++ b/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
@@ -11,7 +11,11 @@ import type { InboxItem } from "@/hooks/use-inbox";
 import { useIsMobile } from "@/hooks/use-mobile";
 import { cn } from "@/lib/utils";
 import { SidebarProvider, useSidebarState } from "../../hooks";
-import { useSidebarResize } from "../../hooks/useSidebarResize";
+import {
+	SIDEBAR_MAX_WIDTH,
+	SIDEBAR_MIN_WIDTH,
+	useSidebarResize,
+} from "../../hooks/useSidebarResize";
 import type { ChatItem, NavItem, PageUsage, SearchSpace, User } from "../../types/layout.types";
 import { Header } from "../header";
 import { IconRail } from "../icon-rail";
@@ -25,7 +29,6 @@ import {
 	MobileSidebarTrigger,
 	Sidebar,
 } from "../sidebar";
-import { SidebarCollapseButton } from "../sidebar/SidebarCollapseButton";
 import { SidebarSlideOutPanel } from "../sidebar/SidebarSlideOutPanel";
 import { TabBar } from "../tabs/TabBar";
 
@@ -123,13 +126,11 @@ function MainContentPanel({
 	isChatPage,
 	onTabSwitch,
 	onNewChat,
-	leftActions,
 	children,
 }: {
 	isChatPage: boolean;
 	onTabSwitch?: (tab: Tab) => void;
 	onNewChat?: () => void;
-	leftActions?: React.ReactNode;
 	children: React.ReactNode;
 }) {
 	const activeTab = useAtomValue(activeTabAtom);
@@ -140,7 +141,6 @@ function MainContentPanel({
 			<TabBar
 				onTabSwitch={onTabSwitch}
 				onNewChat={onNewChat}
-				leftActions={leftActions}
 				rightActions={<RightPanelExpandButton />}
 				className="min-w-0"
 			/>
@@ -214,7 +214,7 @@ export function LayoutShell({
 	const { isCollapsed, setIsCollapsed, toggleCollapsed } = useSidebarState(defaultCollapsed);
 	const {
 		sidebarWidth,
-		handleMouseDown: onResizeMouseDown,
+		handlePointerDown: onResizePointerDown,
 		isDragging: isResizing,
 	} = useSidebarResize();
 
@@ -382,10 +382,7 @@ export function LayoutShell({
 							onSearchSpaceDelete={onSearchSpaceDelete}
 							onSearchSpaceSettings={onSearchSpaceSettings}
 							onAddSearchSpace={onAddSearchSpace}
-							isSingleRailMode={isCollapsed}
-							onNewChat={onNewChat}
-							navItems={navItems}
-							onNavItemClick={onNavItemClick}
+							isSingleRailMode={false}
 							user={user}
 							onUserSettings={onUserSettings}
 							onAnnouncements={onAnnouncements}
@@ -397,58 +394,54 @@ export function LayoutShell({
 					</div>
 
 					{/* Sidebar + slide-out panels share one container; overflow visible so panels can overlay main content. Negative right margin closes the flex gap so the sidebar sits flush against the main panel, separated only by a border. */}
-					<div
-						className={cn(
-							"relative hidden md:flex shrink-0 z-20 -mr-2 border-r",
-							!isCollapsed && "bg-panel"
-						)}
-					>
-						{!isCollapsed && (
-							<Sidebar
-								searchSpace={searchSpace}
-								isCollapsed={isCollapsed}
-								onToggleCollapse={toggleCollapsed}
-								navItems={navItems}
-								onNavItemClick={onNavItemClick}
-								chats={chats}
-								sharedChats={sharedChats}
-								activeChatId={activeChatId}
-								onNewChat={onNewChat}
-								onChatSelect={onChatSelect}
-								onChatRename={onChatRename}
-								onChatDelete={onChatDelete}
-								onChatArchive={onChatArchive}
-								onViewAllSharedChats={onViewAllSharedChats}
-								onViewAllPrivateChats={onViewAllPrivateChats}
-								isSharedChatsPanelOpen={activeSlideoutPanel === "shared"}
-								isPrivateChatsPanelOpen={activeSlideoutPanel === "private"}
-								user={user}
-								onSettings={onSettings}
-								onManageMembers={onManageMembers}
-								onUserSettings={onUserSettings}
-								onAnnouncements={onAnnouncements}
-								announcementUnreadCount={announcementUnreadCount}
-								onLogout={onLogout}
-								pageUsage={pageUsage}
-								theme={theme}
-								setTheme={setTheme}
-								renderUserProfile={false}
-								className="flex shrink-0"
-								isLoadingChats={isLoadingChats}
-								sidebarWidth={sidebarWidth}
-								isResizing={isResizing}
-							/>
-						)}
+					<div className="relative hidden md:flex shrink-0 z-20 -mr-2 border-r bg-panel">
+						<Sidebar
+							searchSpace={searchSpace}
+							isCollapsed={isCollapsed}
+							onToggleCollapse={toggleCollapsed}
+							navItems={navItems}
+							onNavItemClick={onNavItemClick}
+							chats={chats}
+							sharedChats={sharedChats}
+							activeChatId={activeChatId}
+							onNewChat={onNewChat}
+							onChatSelect={onChatSelect}
+							onChatRename={onChatRename}
+							onChatDelete={onChatDelete}
+							onChatArchive={onChatArchive}
+							onViewAllSharedChats={onViewAllSharedChats}
+							onViewAllPrivateChats={onViewAllPrivateChats}
+							isSharedChatsPanelOpen={activeSlideoutPanel === "shared"}
+							isPrivateChatsPanelOpen={activeSlideoutPanel === "private"}
+							user={user}
+							onSettings={onSettings}
+							onManageMembers={onManageMembers}
+							onUserSettings={onUserSettings}
+							onAnnouncements={onAnnouncements}
+							announcementUnreadCount={announcementUnreadCount}
+							onLogout={onLogout}
+							pageUsage={pageUsage}
+							theme={theme}
+							setTheme={setTheme}
+							renderUserProfile={false}
+							className="flex shrink-0"
+							isLoadingChats={isLoadingChats}
+							sidebarWidth={sidebarWidth}
+							isResizing={isResizing}
+						/>
 
-						{/* Drag hit-area straddling the right border — wider for a forgiving grab,
-						    z-50 + pointer-events-auto to beat any neighboring stacking context. */}
 						{!isCollapsed && (
-							<button
-								type="button"
+							<hr
+								aria-orientation="vertical"
 								aria-label="Resize sidebar"
-								onMouseDown={onResizeMouseDown}
+								aria-valuemin={SIDEBAR_MIN_WIDTH}
+								aria-valuemax={SIDEBAR_MAX_WIDTH}
+								aria-valuenow={sidebarWidth}
+								tabIndex={0}
+								onPointerDown={onResizePointerDown}
+								style={{ touchAction: "none" }}
 								className={cn(
-									"absolute top-0 right-0 h-full w-4 translate-x-1/2 cursor-col-resize z-50 pointer-events-auto select-none bg-transparent border-0 p-0 focus:outline-none",
+									"absolute top-0 right-0 h-full w-4 translate-x-1/2 z-50 select-none cursor-col-resize",
 									"after:content-[''] after:absolute after:inset-y-0 after:left-1/2 after:w-px after:-translate-x-1/2 after:bg-transparent hover:after:bg-border/80 after:transition-colors",
 									isResizing && "after:bg-border"
 								)}
@@ -518,11 +511,6 @@ export function LayoutShell({
 						isChatPage={isChatPage}
 						onTabSwitch={onTabSwitch}
 						onNewChat={onNewChat}
-						leftActions={
-							isCollapsed ? (
-								<SidebarCollapseButton isCollapsed={isCollapsed} onToggle={toggleCollapsed} />
-							) : undefined
-						}
 					>
 						{children}
 					</MainContentPanel>
diff --git a/surfsense_web/components/layout/ui/sidebar/NavSection.tsx b/surfsense_web/components/layout/ui/sidebar/NavSection.tsx
index 3110382d0..d3412ccfc 100644
--- a/surfsense_web/components/layout/ui/sidebar/NavSection.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/NavSection.tsx
@@ -137,7 +137,7 @@ function CollapsedOverlay({ item }: { item: NavItem }) {
 
 export function NavSection({ items, onItemClick, isCollapsed = false }: NavSectionProps) {
 	return (
-		<div className={cn("flex flex-col gap-0.5 py-2", isCollapsed && "items-center")}>
+		<div className="flex flex-col gap-0.5 py-2">
 			{items.map((item) => {
 				const { tooltip } = getStatusInfo(item.statusIndicator);
 
diff --git a/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx b/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
index a9d5d0bf6..2c8792b7f 100644
--- a/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
@@ -113,45 +113,43 @@ export function Sidebar({
 		[navItems]
 	);
 
+	const collapsedWidth = 51;
+
 	return (
 		<div
 			className={cn(
 				"relative flex h-full flex-col bg-panel text-sidebar-foreground overflow-hidden select-none",
-				isCollapsed ? "w-[60px] transition-[width] duration-200" : "",
-				!isCollapsed && !isResizing ? "transition-[width] duration-200" : "",
+				!isResizing && "transition-[width] duration-200 ease-out",
 				className
 			)}
-			style={!isCollapsed ? { width: sidebarWidth } : undefined}
+			style={{ width: isCollapsed ? collapsedWidth : sidebarWidth }}
 		>
-			{/* Header - search space name or collapse button when collapsed */}
-			{isCollapsed ? (
-				<div className="flex h-12 shrink-0 items-center justify-center border-b">
+			<div className="flex h-12 shrink-0 items-center gap-0 px-1 border-b">
+				<div
+					className={cn(
+						"min-w-0 overflow-hidden",
+						"transition-[max-width,opacity,margin-right] duration-200 ease-out",
+						isCollapsed ? "max-w-0 opacity-0 mr-0" : "max-w-[400px] flex-1 opacity-100"
+					)}
+					aria-hidden={isCollapsed}
+				>
+					<SidebarHeader
+						searchSpace={searchSpace}
+						isCollapsed={false}
+						onSettings={onSettings}
+						onManageMembers={onManageMembers}
+					/>
+				</div>
+				<div className={cn("shrink-0", isCollapsed && "mx-auto")}>
 					<SidebarCollapseButton
 						isCollapsed={isCollapsed}
 						onToggle={onToggleCollapse ?? (() => {})}
 						disableTooltip={disableTooltips}
 					/>
 				</div>
-			) : (
-				<div className="flex h-12 shrink-0 items-center gap-0 px-1 border-b">
-					<SidebarHeader
-						searchSpace={searchSpace}
-						isCollapsed={isCollapsed}
-						onSettings={onSettings}
-						onManageMembers={onManageMembers}
-					/>
-					<div className="shrink-0">
-						<SidebarCollapseButton
-							isCollapsed={isCollapsed}
-							onToggle={onToggleCollapse ?? (() => {})}
-							disableTooltip={disableTooltips}
-						/>
-					</div>
-				</div>
-			)}
+			</div>
 
-			{/* New chat button + Inbox */}
-			<div className={cn("flex flex-col gap-0.5 py-1.5", isCollapsed && "items-center")}>
+			<div className="flex flex-col gap-0.5 py-1.5">
 				<SidebarButton
 					icon={SquarePen}
 					label={t("new_chat")}
@@ -177,7 +175,7 @@ export function Sidebar({
 
 			{/* Chat sections - fills available space */}
 			{isCollapsed ? (
-				<div className="flex-1 w-[60px]" />
+				<div className="flex-1 w-full" />
 			) : (
 				<div className="flex-1 flex flex-col gap-1 pt-2 w-full min-h-0 overflow-hidden">
 					{/* Shared Chats Section - takes only space needed, max 50% */}
diff --git a/surfsense_web/components/layout/ui/sidebar/SidebarButton.tsx b/surfsense_web/components/layout/ui/sidebar/SidebarButton.tsx
index a3c3b383c..6702cea4a 100644
--- a/surfsense_web/components/layout/ui/sidebar/SidebarButton.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/SidebarButton.tsx
@@ -27,15 +27,9 @@ interface SidebarButtonProps {
 	buttonProps?: React.ButtonHTMLAttributes<HTMLButtonElement>;
 }
 
-const expandedClassName = cn(
-	"flex items-center gap-2 rounded-md mx-2 px-2 py-1.5 text-sm transition-colors text-left",
-	"hover:bg-accent hover:text-accent-foreground",
-	"focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
-);
-
-const collapsedClassName = cn(
-	"relative flex h-10 w-10 items-center justify-center rounded-md transition-colors",
-	"hover:bg-accent hover:text-accent-foreground",
+const baseClassName = cn(
+	"group/sidebar-button relative flex h-9 items-center rounded-md mx-2 px-2 text-sm text-left",
+	"transition-colors hover:bg-accent hover:text-accent-foreground",
 	"focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
 );
 
@@ -56,53 +50,67 @@ export function SidebarButton({
 }: SidebarButtonProps) {
 	const activeClassName = "bg-accent text-accent-foreground";
 
-	if (isCollapsed) {
-		return (
-			<Tooltip>
-				<TooltipTrigger asChild>
-					<button
-						type="button"
-						onClick={onClick}
-						className={cn(collapsedClassName, isActive && activeClassName, className)}
-						{...buttonProps}
-					>
-						{collapsedIconNode ?? <Icon className="h-3.5 w-3.5" />}
-						{collapsedOverlay}
-						<span className="sr-only">{label}</span>
-					</button>
-				</TooltipTrigger>
-				<TooltipContent side="right" className="max-w-xs">
-					{tooltipContent ?? (
-						<>
-							{label}
-							{typeof badge === "string" && ` (${badge})`}
-						</>
-					)}
-				</TooltipContent>
-			</Tooltip>
-		);
-	}
+	const iconNode = isCollapsed
+		? (collapsedIconNode ?? <Icon className="h-3.5 w-3.5" />)
+		: (expandedIconNode ?? <Icon className="h-3.5 w-3.5 shrink-0" />);
 
 	const button = (
 		<button
 			type="button"
 			onClick={onClick}
-			className={cn(expandedClassName, isActive && activeClassName, className)}
+			aria-label={isCollapsed ? label : undefined}
+			className={cn(baseClassName, isActive && activeClassName, className)}
 			{...buttonProps}
 		>
-			{expandedIconNode ?? <Icon className="h-3.5 w-3.5 shrink-0" />}
-			<span className="flex-1 truncate">{label}</span>
-			{trailingContent}
-			{badge && typeof badge !== "string" ? badge : null}
-			{badge && typeof badge === "string" ? (
-				<span className="inline-flex items-center justify-center min-w-4 h-4 px-1 rounded-full bg-red-500 text-white text-[10px] font-medium">
+			<span
+				className={cn(
+					"flex min-w-0 items-center translate-x-0.5 transition-transform duration-200 ease-out",
+					isCollapsed ? "shrink-0" : "flex-1"
+				)}
+			>
+				<span className="flex h-3.5 w-3.5 shrink-0 items-center justify-center">
+					{iconNode}
+				</span>
+
+				<span
+					className={cn(
+						"min-w-0 overflow-hidden whitespace-nowrap text-left",
+						"transition-[max-width,opacity,margin-left] duration-200 ease-out",
+						isCollapsed
+							? "max-w-0 opacity-0 ml-0"
+							: "max-w-[260px] flex-1 opacity-100 ml-2"
+					)}
+				>
+					<span className="block truncate">{label}</span>
+				</span>
+			</span>
+
+			{!isCollapsed && trailingContent}
+			{!isCollapsed && badge && typeof badge !== "string" ? badge : null}
+			{!isCollapsed && badge && typeof badge === "string" ? (
+				<span className="ml-1 inline-flex items-center justify-center min-w-4 h-4 px-1 rounded-full bg-red-500 text-white text-[10px] font-medium">
 					{badge}
 				</span>
 			) : null}
+
+			{collapsedOverlay && (
+				<span
+					aria-hidden={!isCollapsed}
+					className={cn(
+						"pointer-events-none absolute inset-0 transition-opacity duration-150",
+						isCollapsed ? "opacity-100" : "opacity-0"
+					)}
+				>
+					{collapsedOverlay}
+				</span>
+			)}
+
+			<span className="sr-only">{label}</span>
 		</button>
 	);
 
-	if (!tooltipContent) {
+	const renderTooltip = isCollapsed || !!tooltipContent;
+	if (!renderTooltip) {
 		return button;
 	}
 
@@ -110,7 +118,14 @@ export function SidebarButton({
 		<Tooltip>
 			<TooltipTrigger asChild>{button}</TooltipTrigger>
 			<TooltipContent side="right" className="max-w-xs">
-				{tooltipContent}
+				{isCollapsed
+					? (tooltipContent ?? (
+							<>
+								{label}
+								{typeof badge === "string" && ` (${badge})`}
+							</>
+						))
+					: tooltipContent}
 			</TooltipContent>
 		</Tooltip>
 	);

From c1c34eb916c66d6d5c4d42cce7ee196cae21925f Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Mon, 4 May 2026 02:05:20 +0530
Subject: [PATCH 20/96] refactor(layout): implement background color management
 in DashboardClientLayout; streamline RightPanel and LayoutShell styles for
 consistency

---
 .../[search_space_id]/client-layout.tsx       | 22 +++++++++++++++----
 .../layout/ui/right-panel/RightPanel.tsx      |  2 +-
 .../layout/ui/shell/LayoutShell.tsx           |  4 ++--
 .../components/layout/ui/tabs/TabBar.tsx      |  4 ++--
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/surfsense_web/app/dashboard/[search_space_id]/client-layout.tsx b/surfsense_web/app/dashboard/[search_space_id]/client-layout.tsx
index d95aab6e8..759539ce3 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/client-layout.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/client-layout.tsx
@@ -144,6 +144,19 @@ export function DashboardClientLayout({
 
 	const electronAPI = useElectronAPI();
 
+	useEffect(() => {
+		const htmlBackground = document.documentElement.style.backgroundColor;
+		const bodyBackground = document.body.style.backgroundColor;
+
+		document.documentElement.style.backgroundColor = "var(--panel)";
+		document.body.style.backgroundColor = "var(--panel)";
+
+		return () => {
+			document.documentElement.style.backgroundColor = htmlBackground;
+			document.body.style.backgroundColor = bodyBackground;
+		};
+	}, []);
+
 	useEffect(() => {
 		if (!electronAPI?.onChatScreenCapture) return;
 		return electronAPI.onChatScreenCapture((dataUrl: string) => {
@@ -163,12 +176,13 @@ export function DashboardClientLayout({
 		setActiveSearchSpaceIdState(activeSeacrhSpaceId);
 
 		// Sync to Electron store if stored value is null (first navigation)
-		if (electronAPI?.setActiveSearchSpace) {
+		if (electronAPI?.getActiveSearchSpace && electronAPI.setActiveSearchSpace) {
+			const setActiveSearchSpace = electronAPI.setActiveSearchSpace;
 			electronAPI
-				.getActiveSearchSpace?.()
-				.then((stored) => {
+				.getActiveSearchSpace()
+				.then((stored: string | null) => {
 					if (!stored) {
-						electronAPI.setActiveSearchSpace!(activeSeacrhSpaceId);
+						setActiveSearchSpace(activeSeacrhSpaceId);
 					}
 				})
 				.catch(() => {});
diff --git a/surfsense_web/components/layout/ui/right-panel/RightPanel.tsx b/surfsense_web/components/layout/ui/right-panel/RightPanel.tsx
index 1e543c885..a647ba26d 100644
--- a/surfsense_web/components/layout/ui/right-panel/RightPanel.tsx
+++ b/surfsense_web/components/layout/ui/right-panel/RightPanel.tsx
@@ -203,7 +203,7 @@ export function RightPanel({ documentsPanel }: RightPanelProps) {
 	return (
 		<aside
 			style={{ width: targetWidth }}
-			className="flex h-full shrink-0 flex-col border-l border-b bg-panel text-sidebar-foreground overflow-hidden transition-[width] duration-200 ease-out"
+			className="flex h-full shrink-0 flex-col border-l bg-panel text-sidebar-foreground overflow-hidden transition-[width] duration-200 ease-out"
 		>
 			<div className="relative flex-1 min-h-0 overflow-hidden">
 				{effectiveTab === "sources" && documentsOpen && documentsPanel && (
diff --git a/surfsense_web/components/layout/ui/shell/LayoutShell.tsx b/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
index 1af8dcbc5..841190256 100644
--- a/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
+++ b/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
@@ -144,7 +144,7 @@ function MainContentPanel({
 				rightActions={<RightPanelExpandButton />}
 				className="min-w-0"
 			/>
-			<div className="relative flex flex-1 flex-col border border-l-0 border-r-0 border-t-0 bg-panel overflow-hidden min-w-0">
+			<div className="relative flex flex-1 flex-col bg-panel overflow-hidden min-w-0">
 				<Header />
 
 				{isDocumentTab && activeTab.documentId && activeTab.searchSpaceId ? (
@@ -441,7 +441,7 @@ export function LayoutShell({
 								onPointerDown={onResizePointerDown}
 								style={{ touchAction: "none" }}
 								className={cn(
-									"absolute top-0 right-0 h-full w-4 translate-x-1/2 z-50 select-none cursor-col-resize",
+									"absolute top-0 right-0 h-full w-4 translate-x-1/2 z-50 m-0 border-0 bg-transparent p-0 select-none cursor-col-resize",
 									"after:content-[''] after:absolute after:inset-y-0 after:left-1/2 after:w-px after:-translate-x-1/2 after:bg-transparent hover:after:bg-border/80 after:transition-colors",
 									isResizing && "after:bg-border"
 								)}
diff --git a/surfsense_web/components/layout/ui/tabs/TabBar.tsx b/surfsense_web/components/layout/ui/tabs/TabBar.tsx
index 27e87f600..432d101e4 100644
--- a/surfsense_web/components/layout/ui/tabs/TabBar.tsx
+++ b/surfsense_web/components/layout/ui/tabs/TabBar.tsx
@@ -170,11 +170,11 @@ export function TabBar({
 							{/* Hover-only gradient + close overlay (sidebar pattern) — keeps pill width fixed and avoids ellipsis shift. */}
 							<div
 								className={cn(
-									"pointer-events-none absolute right-0 top-0 bottom-0 flex items-center rounded-r-md pl-6 pr-2 opacity-0 transition-opacity duration-150",
+									"pointer-events-none absolute right-0 top-0 bottom-0 flex items-center rounded-r-md pl-8 pr-2 opacity-0 transition-opacity duration-150",
 									"group-hover:opacity-100 group-focus-within:opacity-100",
 									isActive
 										? "bg-gradient-to-l from-muted from-60% to-transparent"
-										: "bg-gradient-to-l from-muted/50 from-60% to-transparent"
+										: "bg-gradient-to-l from-muted from-60% to-transparent"
 								)}
 							>
 								{/* biome-ignore lint/a11y/useSemanticElements: cannot nest button inside button */}

From 5c77864b14317fd983b9c4be754d4a5938775ea8 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Mon, 4 May 2026 03:06:01 +0530
Subject: [PATCH 21/96] refactor(ui): standardize header styles across panels;
 adjust button sizes and spacing for improved layout consistency

---
 .../components/assistant-ui/chat-viewport.tsx |  3 +--
 .../citation-panel/citation-panel.tsx         | 17 +++++++++++------
 .../components/editor-panel/editor-panel.tsx  | 19 ++++++++++++-------
 .../components/report-panel/report-panel.tsx  | 19 ++++++++++++-------
 surfsense_web/components/ui/fixed-toolbar.tsx |  2 +-
 5 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/surfsense_web/components/assistant-ui/chat-viewport.tsx b/surfsense_web/components/assistant-ui/chat-viewport.tsx
index c0684407e..a7cf227b4 100644
--- a/surfsense_web/components/assistant-ui/chat-viewport.tsx
+++ b/surfsense_web/components/assistant-ui/chat-viewport.tsx
@@ -9,8 +9,7 @@ const ChatScrollToBottom: FC = () => (
 	<ThreadPrimitive.ScrollToBottom asChild>
 		<TooltipIconButton
 			tooltip="Scroll to bottom"
-			variant="outline"
-			className="aui-thread-scroll-to-bottom -top-12 absolute z-10 self-center rounded-full p-4 disabled:invisible dark:bg-main-panel dark:hover:bg-accent"
+			className="aui-thread-scroll-to-bottom -top-12 absolute z-10 self-center rounded-full border-0 bg-muted p-4 text-foreground hover:bg-muted/80 disabled:invisible"
 		>
 			<ArrowDownIcon />
 		</TooltipIconButton>
diff --git a/surfsense_web/components/citation-panel/citation-panel.tsx b/surfsense_web/components/citation-panel/citation-panel.tsx
index ed8acd656..e9f14bf64 100644
--- a/surfsense_web/components/citation-panel/citation-panel.tsx
+++ b/surfsense_web/components/citation-panel/citation-panel.tsx
@@ -94,19 +94,24 @@ export const CitationPanelContent: FC<CitationPanelContentProps> = ({ chunkId, o
 
 	return (
 		<>
-			<div className="shrink-0 border-b">
-				<div className="flex h-14 items-center justify-between px-4">
-					<h2 className="text-lg font-medium text-muted-foreground select-none">Citation</h2>
+			<div className="shrink-0">
+				<div className="shrink-0 flex h-12 items-center justify-between px-3 border-b">
+					<h2 className="select-none text-lg font-semibold">Citation</h2>
 					<div className="flex items-center gap-1 shrink-0">
 						{onClose && (
-							<Button variant="ghost" size="icon" onClick={onClose} className="size-7 shrink-0">
-								<XIcon className="size-4" />
+							<Button
+								variant="ghost"
+								size="icon"
+								onClick={onClose}
+								className="h-8 w-8 rounded-full shrink-0"
+							>
+								<XIcon className="h-4 w-4 text-muted-foreground" />
 								<span className="sr-only">Close citation panel</span>
 							</Button>
 						)}
 					</div>
 				</div>
-				<div className="flex h-10 items-center justify-between gap-2 border-t px-4">
+				<div className="flex h-10 items-center justify-between gap-2 border-b px-4">
 					<div className="min-w-0 flex flex-1 items-center gap-2">
 						<p className="truncate text-sm text-muted-foreground">
 							{data?.title ?? (isLoading ? "Loading…" : `Chunk #${chunkId}`)}
diff --git a/surfsense_web/components/editor-panel/editor-panel.tsx b/surfsense_web/components/editor-panel/editor-panel.tsx
index eab07a91b..224f0b6a4 100644
--- a/surfsense_web/components/editor-panel/editor-panel.tsx
+++ b/surfsense_web/components/editor-panel/editor-panel.tsx
@@ -448,17 +448,22 @@ export function EditorPanelContent({
 	return (
 		<>
 			{showDesktopHeader ? (
-				<div className="shrink-0 border-b">
-					<div className="flex h-14 items-center justify-between px-4">
-						<h2 className="text-lg font-medium text-muted-foreground select-none">File</h2>
+				<div className="shrink-0">
+					<div className="shrink-0 flex h-12 items-center justify-between px-3 border-b">
+						<h2 className="select-none text-lg font-semibold">File</h2>
 						<div className="flex items-center gap-1 shrink-0">
-							<Button variant="ghost" size="icon" onClick={onClose} className="size-7 shrink-0">
-								<XIcon className="size-4" />
+							<Button
+								variant="ghost"
+								size="icon"
+								onClick={onClose}
+								className="h-8 w-8 rounded-full shrink-0"
+							>
+								<XIcon className="h-4 w-4 text-muted-foreground" />
 								<span className="sr-only">Close editor panel</span>
 							</Button>
 						</div>
 					</div>
-					<div className="flex h-10 items-center justify-between gap-2 border-t px-4">
+					<div className="flex h-10 items-center justify-between gap-2 border-b px-4">
 						<div className="min-w-0 flex flex-1 items-center gap-2">
 							<p className="truncate text-sm text-muted-foreground">{displayTitle}</p>
 						</div>
@@ -667,7 +672,7 @@ export function EditorPanelContent({
 								placeholder="Start writing..."
 								editorVariant="default"
 								allowModeToggle={false}
-								reserveToolbarSpace
+								reserveToolbarSpace={isEditing}
 								defaultEditing={isEditing}
 								className="**:[[role=toolbar]]:bg-sidebar!"
 								// Render `[citation:N]` badges in view mode only.
diff --git a/surfsense_web/components/report-panel/report-panel.tsx b/surfsense_web/components/report-panel/report-panel.tsx
index 7fafc9c3b..53625b521 100644
--- a/surfsense_web/components/report-panel/report-panel.tsx
+++ b/surfsense_web/components/report-panel/report-panel.tsx
@@ -446,21 +446,26 @@ export function ReportPanelContent({
 		<>
 			{showDesktopHeader ? (
 				<>
-					{/* Header — matches the editor panel "File" header pattern */}
-					<div className="flex h-14 items-center justify-between px-4 shrink-0">
-						<h2 className="text-lg font-medium text-muted-foreground select-none">
+					{/* Header — matches the Documents panel header pattern */}
+					<div className="shrink-0 flex h-12 items-center justify-between px-3 border-b">
+						<h2 className="select-none text-lg font-semibold">
 							{isResume ? "Resume" : "Report"}
 						</h2>
 						{onClose && (
-							<Button variant="ghost" size="icon" onClick={onClose} className="size-7 shrink-0">
-								<XIcon className="size-4" />
+							<Button
+								variant="ghost"
+								size="icon"
+								onClick={onClose}
+								className="h-8 w-8 rounded-full shrink-0"
+							>
+								<XIcon className="h-4 w-4 text-muted-foreground" />
 								<span className="sr-only">Close report panel</span>
 							</Button>
 						)}
 					</div>
 
 					{!isResume && (
-						<div className="flex h-10 items-center justify-between gap-2 border-t border-b px-4 shrink-0">
+						<div className="flex h-10 items-center justify-between gap-2 border-b px-4 shrink-0">
 							<div className="min-w-0 flex-1">
 								<p className="truncate text-sm text-muted-foreground">
 									{reportContent?.title || title}
@@ -528,7 +533,7 @@ export function ReportPanelContent({
 							placeholder="Report content..."
 							editorVariant="default"
 							allowModeToggle={false}
-							reserveToolbarSpace
+							reserveToolbarSpace={isEditing}
 							defaultEditing={isEditing}
 							className="[&_[role=toolbar]]:!bg-sidebar"
 							// Show citation badges in view mode; raw `[citation:N]`
diff --git a/surfsense_web/components/ui/fixed-toolbar.tsx b/surfsense_web/components/ui/fixed-toolbar.tsx
index 40677e777..e11fae861 100644
--- a/surfsense_web/components/ui/fixed-toolbar.tsx
+++ b/surfsense_web/components/ui/fixed-toolbar.tsx
@@ -14,7 +14,7 @@ export function FixedToolbar({
 	return (
 		<Toolbar
 			className={cn(
-				"scrollbar-hide sticky top-0 left-0 z-10 w-full justify-between overflow-x-auto border-b bg-background/95 p-1 backdrop-blur supports-backdrop-filter:bg-background/60",
+				"scrollbar-hide absolute top-0 left-0 z-[60] w-full justify-between overflow-x-auto border-b bg-background p-1",
 				className
 			)}
 			{...props}

From d302fbd272e864861edad643ef6faa29f950e62b Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Mon, 4 May 2026 04:03:14 +0530
Subject: [PATCH 22/96] refactor(styles): standardize input and button styles
 across various components; enhance hover effects and background management
 for improved UI consistency

---
 .../components/documents/DocumentsFilters.tsx       | 13 +++++++------
 .../layout/ui/sidebar/AllPrivateChatsSidebar.tsx    |  4 ++--
 .../layout/ui/sidebar/AllSharedChatsSidebar.tsx     |  4 ++--
 .../layout/ui/sidebar/DesktopLocalTabContent.tsx    |  4 ++--
 .../layout/ui/sidebar/DocumentsSidebar.tsx          |  4 ++--
 .../components/layout/ui/sidebar/InboxSidebar.tsx   |  4 ++--
 .../components/new-chat/chat-share-button.tsx       |  8 ++++----
 .../components/new-chat/model-selector.tsx          |  4 ++--
 8 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/surfsense_web/components/documents/DocumentsFilters.tsx b/surfsense_web/components/documents/DocumentsFilters.tsx
index 50df59955..1a1784b12 100644
--- a/surfsense_web/components/documents/DocumentsFilters.tsx
+++ b/surfsense_web/components/documents/DocumentsFilters.tsx
@@ -78,13 +78,13 @@ export function DocumentsFilters({
 		<div className="flex select-none">
 			<div className="flex items-center gap-2 w-full">
 				{/* New Folder + AI Sort + Filter Toggle Group */}
-				<ToggleGroup type="multiple" variant="outline" value={[]} className="overflow-visible">
+				<ToggleGroup type="multiple" value={[]} className="overflow-visible">
 					{onCreateFolder && (
 						<Tooltip>
 							<TooltipTrigger asChild>
 								<ToggleGroupItem
 									value="folder"
-									className="h-8 w-8 shrink-0 border bg-muted/50 text-muted-foreground transition-colors hover:bg-muted/80 hover:text-foreground"
+									className="h-8 w-8 shrink-0 border-0 bg-muted text-muted-foreground transition-colors hover:bg-muted/80 hover:text-foreground"
 									onClick={(e) => {
 										e.preventDefault();
 										onCreateFolder();
@@ -104,7 +104,8 @@ export function DocumentsFilters({
 									value="ai-sort"
 									disabled={aiSortBusy}
 									className={cn(
-										"h-8 w-8 shrink-0 border bg-muted/50 transition-colors",
+										"h-8 w-8 shrink-0 border-0 bg-muted transition-colors",
+										"relative before:absolute before:left-0 before:top-1/2 before:h-4 before:w-px before:-translate-y-1/2 before:bg-border/60 before:content-[''] dark:before:bg-white/10",
 										"disabled:pointer-events-none disabled:opacity-50",
 										aiSortEnabled
 											? "bg-accent text-accent-foreground hover:bg-accent"
@@ -142,7 +143,7 @@ export function DocumentsFilters({
 								<PopoverTrigger asChild>
 									<ToggleGroupItem
 										value="filter"
-										className="relative h-8 w-8 shrink-0 overflow-visible border bg-muted/50 text-muted-foreground transition-colors hover:bg-muted/80 hover:text-foreground"
+										className="relative h-8 w-8 shrink-0 overflow-visible border-0 bg-muted text-muted-foreground transition-colors before:absolute before:left-0 before:top-1/2 before:h-4 before:w-px before:-translate-y-1/2 before:bg-border/60 before:content-[''] hover:bg-muted/80 hover:text-foreground dark:before:bg-white/10"
 									>
 										<ListFilter size={13} />
 										{activeTypes.length > 0 && (
@@ -226,13 +227,13 @@ export function DocumentsFilters({
 
 				{/* Search Input */}
 				<div className="relative flex-1 min-w-0">
-					<div className="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-3">
+					<div className="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-3 text-muted-foreground">
 						<Search size={13} aria-hidden="true" />
 					</div>
 					<Input
 						id={`${id}-input`}
 						ref={inputRef}
-						className="h-8 w-full select-none pl-8 pr-7 text-sm focus:select-text"
+						className="h-8 w-full select-none border-0 bg-muted pl-8 pr-7 text-sm shadow-none focus:select-text"
 						value={searchValue}
 						onChange={(e) => onSearch(e.target.value)}
 						placeholder="Search docs"
diff --git a/surfsense_web/components/layout/ui/sidebar/AllPrivateChatsSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/AllPrivateChatsSidebar.tsx
index 717f38743..439c09017 100644
--- a/surfsense_web/components/layout/ui/sidebar/AllPrivateChatsSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/AllPrivateChatsSidebar.tsx
@@ -275,13 +275,13 @@ export function AllPrivateChatsSidebarContent({
 						placeholder={t("search_chats") || "Search chats..."}
 						value={searchQuery}
 						onChange={(e) => setSearchQuery(e.target.value)}
-						className="h-8 pl-8 pr-7 text-sm"
+						className="h-8 border-0 bg-muted pl-8 pr-7 text-sm shadow-none"
 					/>
 					{searchQuery && (
 						<Button
 							variant="ghost"
 							size="icon"
-							className="absolute right-1 top-1/2 h-5 w-5 -translate-y-1/2"
+							className="absolute right-1 top-1/2 h-5 w-5 -translate-y-1/2 rounded-sm text-muted-foreground transition-colors hover:bg-accent hover:text-accent-foreground"
 							onClick={handleClearSearch}
 						>
 							<X className="h-3.5 w-3.5" />
diff --git a/surfsense_web/components/layout/ui/sidebar/AllSharedChatsSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/AllSharedChatsSidebar.tsx
index 12a71d65d..ca28a421b 100644
--- a/surfsense_web/components/layout/ui/sidebar/AllSharedChatsSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/AllSharedChatsSidebar.tsx
@@ -274,13 +274,13 @@ export function AllSharedChatsSidebarContent({
 						placeholder={t("search_chats") || "Search chats..."}
 						value={searchQuery}
 						onChange={(e) => setSearchQuery(e.target.value)}
-						className="h-8 pl-8 pr-7 text-sm"
+						className="h-8 border-0 bg-muted pl-8 pr-7 text-sm shadow-none"
 					/>
 					{searchQuery && (
 						<Button
 							variant="ghost"
 							size="icon"
-							className="absolute right-1 top-1/2 h-5 w-5 -translate-y-1/2"
+							className="absolute right-1 top-1/2 h-5 w-5 -translate-y-1/2 rounded-sm text-muted-foreground transition-colors hover:bg-accent hover:text-accent-foreground"
 							onClick={handleClearSearch}
 						>
 							<X className="h-3.5 w-3.5" />
diff --git a/surfsense_web/components/layout/ui/sidebar/DesktopLocalTabContent.tsx b/surfsense_web/components/layout/ui/sidebar/DesktopLocalTabContent.tsx
index cd8fca331..a66b7f216 100644
--- a/surfsense_web/components/layout/ui/sidebar/DesktopLocalTabContent.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/DesktopLocalTabContent.tsx
@@ -65,7 +65,7 @@ export function DesktopLocalTabContent({
 	return (
 		<div className="flex min-h-0 flex-1 flex-col select-none">
 			<div className="mx-4 mt-4 mb-3">
-				<div className="flex h-7 w-full items-stretch rounded-lg border bg-muted/50 text-[11px] text-muted-foreground">
+				<div className="flex h-7 w-full items-stretch rounded-lg border-0 bg-muted text-[11px] text-muted-foreground hover:bg-muted/80">
 					{localRootPaths.length > 0 ? (
 						<DropdownMenu>
 							<DropdownMenuTrigger asChild>
@@ -134,7 +134,7 @@ export function DesktopLocalTabContent({
 					)}
 					<Separator
 						orientation="vertical"
-						className="data-[orientation=vertical]:h-3 self-center bg-border"
+						className="data-[orientation=vertical]:h-3 self-center bg-border/60 dark:bg-white/10"
 					/>
 					{electronAvailable ? (
 						<Tooltip>
diff --git a/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx
index 616f39102..bbf882ed6 100644
--- a/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx
@@ -1052,7 +1052,7 @@ function AuthenticatedDocumentsSidebarBase({
 	const cloudContent = (
 		<>
 			{/* Connected tools strip */}
-			<div className="shrink-0 mx-4 mt-6 mb-2.5 flex select-none items-center gap-2 rounded-lg border bg-muted/50 transition-colors hover:bg-muted/80">
+			<div className="shrink-0 mx-4 mt-6 mb-2.5 flex select-none items-center gap-2 rounded-lg border-0 bg-muted transition-colors hover:bg-muted/80">
 				<button
 					type="button"
 					onClick={() => setConnectorDialogOpen(true)}
@@ -1123,7 +1123,7 @@ function AuthenticatedDocumentsSidebarBase({
 				<button
 					type="button"
 					onClick={handleWatchLocalFolder}
-					className="shrink-0 mx-4 mb-2.5 flex select-none items-center gap-2 rounded-lg border bg-muted/50 px-3 py-1.5 transition-colors hover:bg-muted/80"
+					className="shrink-0 mx-4 mb-2.5 flex select-none items-center gap-2 rounded-lg border-0 bg-muted px-3 py-1.5 transition-colors hover:bg-muted/80"
 				>
 					<FolderClock className="size-4 shrink-0 text-muted-foreground" />
 					<span className="truncate text-xs text-muted-foreground">Watch local folder</span>
diff --git a/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx
index b842bde22..c0e11da0b 100644
--- a/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx
@@ -817,13 +817,13 @@ export function InboxSidebarContent({
 						placeholder={t("search_inbox") || "Search inbox"}
 						value={searchQuery}
 						onChange={(e) => setSearchQuery(e.target.value)}
-						className="h-8 pl-8 pr-7 text-sm"
+						className="h-8 border-0 bg-muted pl-8 pr-7 text-sm shadow-none"
 					/>
 					{searchQuery && (
 						<Button
 							variant="ghost"
 							size="icon"
-							className="absolute right-1 top-1/2 h-5 w-5 -translate-y-1/2"
+							className="absolute right-1 top-1/2 h-5 w-5 -translate-y-1/2 rounded-sm text-muted-foreground transition-colors hover:bg-accent hover:text-accent-foreground"
 							onClick={handleClearSearch}
 						>
 							<X className="h-3.5 w-3.5" />
diff --git a/surfsense_web/components/new-chat/chat-share-button.tsx b/surfsense_web/components/new-chat/chat-share-button.tsx
index 239745745..bacde9c75 100644
--- a/surfsense_web/components/new-chat/chat-share-button.tsx
+++ b/surfsense_web/components/new-chat/chat-share-button.tsx
@@ -173,7 +173,7 @@ export function ChatShareButton({ thread, onVisibilityChange, className }: ChatS
 				</PopoverTrigger>
 
 				<PopoverContent
-					className="w-[280px] md:w-[320px] p-0 rounded-lg shadow-lg border-border/60 dark:bg-neutral-900 dark:border dark:border-white/5 select-none"
+					className="w-[280px] md:w-[320px] p-0 rounded-lg shadow-lg bg-muted border-border/60 dark:border dark:border-neutral-700 select-none"
 					align="end"
 					sideOffset={8}
 					onCloseAutoFocus={(e) => e.preventDefault()}
@@ -191,9 +191,9 @@ export function ChatShareButton({ thread, onVisibilityChange, className }: ChatS
 									onClick={() => handleVisibilityChange(option.value)}
 									className={cn(
 										"w-full flex items-center gap-2.5 px-2.5 py-2 rounded-md transition-all",
-										"hover:bg-accent/50 dark:hover:bg-white/10 cursor-pointer",
+										"hover:bg-accent/40 cursor-pointer",
 										"focus:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2",
-										isSelected && "bg-accent/80 dark:bg-white/10"
+										isSelected && "bg-primary/6 dark:bg-primary/8"
 									)}
 								>
 									<div
@@ -240,7 +240,7 @@ export function ChatShareButton({ thread, onVisibilityChange, className }: ChatS
 									disabled={isCreatingSnapshot}
 									className={cn(
 										"w-full flex items-center gap-2.5 px-2.5 py-2 rounded-md transition-all",
-										"hover:bg-accent/50 dark:hover:bg-white/10 cursor-pointer",
+										"hover:bg-accent/40 cursor-pointer",
 										"focus:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2",
 										"disabled:opacity-50 disabled:cursor-not-allowed"
 									)}
diff --git a/surfsense_web/components/new-chat/model-selector.tsx b/surfsense_web/components/new-chat/model-selector.tsx
index 52fb18dcc..82c0fb9e9 100644
--- a/surfsense_web/components/new-chat/model-selector.tsx
+++ b/surfsense_web/components/new-chat/model-selector.tsx
@@ -1146,7 +1146,7 @@ export function ModelSelector({
 		return (
 			<div className="flex flex-col w-full overflow-hidden">
 				{/* Tab header */}
-				<div className="border-b border-border/80 dark:border-neutral-800">
+				<div className="border-b border-border/50">
 					<div className="w-full grid grid-cols-3 h-11">
 						{(
 							[
@@ -1425,7 +1425,7 @@ export function ModelSelector({
 		<Popover open={open} onOpenChange={handleOpenChange}>
 			<PopoverTrigger asChild>{triggerButton}</PopoverTrigger>
 			<PopoverContent
-				className="w-[300px] md:w-[380px] p-0 rounded-lg shadow-lg overflow-hidden bg-white border-border/60 dark:bg-neutral-900 dark:border dark:border-white/5 select-none"
+				className="w-[300px] md:w-[380px] p-0 rounded-lg shadow-lg overflow-hidden bg-muted border-border/60 dark:border dark:border-neutral-700 select-none"
 				align="start"
 				sideOffset={8}
 				onCloseAutoFocus={(e) => e.preventDefault()}

From 0a74b0d0c8a30457c0bbcd4e6244d6efacf3811b Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Mon, 4 May 2026 11:58:59 +0530
Subject: [PATCH 23/96] refactor(model-selector): enhance premium and citation
 status display logic; streamline badge rendering for improved clarity and UI
 consistency

---
 .../components/new-chat/model-selector.tsx    | 63 ++++++++++---------
 1 file changed, 33 insertions(+), 30 deletions(-)

diff --git a/surfsense_web/components/new-chat/model-selector.tsx b/surfsense_web/components/new-chat/model-selector.tsx
index 82c0fb9e9..7d7afb3d8 100644
--- a/surfsense_web/components/new-chat/model-selector.tsx
+++ b/surfsense_web/components/new-chat/model-selector.tsx
@@ -997,6 +997,8 @@ export function ModelSelector({
 		const isSelected = getSelectedId() === config.id;
 		const isFocused = focusedIndex === index;
 		const hasCitations = "citations_enabled" in config && !!config.citations_enabled;
+		const hasPremiumStatus = "is_premium" in config && !isAutoMode;
+		const isPremium = hasPremiumStatus && !!(config as Record<string, unknown>).is_premium;
 		// Chat-tab only: surface an amber "No image" hint when the
 		// composer carries images and the catalog reports the model as
 		// non-vision. This is purely advisory — selection is *not*
@@ -1068,23 +1070,6 @@ export function ModelSelector({
 								Recommended
 							</Badge>
 						)}
-						{"is_premium" in config && (config as Record<string, unknown>).is_premium ? (
-							<Badge
-								variant="secondary"
-								className="text-[9px] px-1 py-0 h-3.5 bg-purple-100 text-purple-700 dark:bg-purple-900/50 dark:text-purple-300 border-0"
-							>
-								Premium
-							</Badge>
-						) : "is_premium" in config &&
-							!(config as Record<string, unknown>).is_premium &&
-							!isAutoMode ? (
-							<Badge
-								variant="secondary"
-								className="text-[9px] px-1 py-0 h-3.5 bg-emerald-100 text-emerald-700 dark:bg-emerald-900/50 dark:text-emerald-300 border-0"
-							>
-								Free
-							</Badge>
-						) : null}
 						{isImageIncompatibleChatModel && (
 							<Badge
 								variant="secondary"
@@ -1094,19 +1079,37 @@ export function ModelSelector({
 							</Badge>
 						)}
 					</div>
-					<div className="flex items-center gap-1.5 mt-0.5">
-						<span className="text-xs text-muted-foreground truncate">
-							{isAutoMode ? "Auto Mode" : (config.model_name as string)}
-						</span>
-						{!isAutoMode && hasCitations && (
-							<Badge
-								variant="secondary"
-								className="text-[10px] px-1.5 py-0.5 border-0 text-muted-foreground bg-muted"
-							>
-								Citations
-							</Badge>
-						)}
-					</div>
+					{isAutoMode ? (
+						<div className="flex items-center gap-1.5 mt-0.5">
+							<span className="text-xs text-muted-foreground truncate">Auto Mode</span>
+						</div>
+					) : (
+						(hasPremiumStatus || hasCitations) && (
+							<div className="flex items-center gap-1.5 mt-0.5">
+								{hasPremiumStatus && (
+									<Badge
+										variant="secondary"
+										className={cn(
+											"text-[10px] px-1.5 py-0.5 border-0",
+											isPremium
+												? "bg-purple-100 text-purple-700 dark:bg-purple-900/50 dark:text-purple-300"
+												: "bg-emerald-100 text-emerald-700 dark:bg-emerald-900/50 dark:text-emerald-300"
+										)}
+									>
+										{isPremium ? "Premium" : "Free"}
+									</Badge>
+								)}
+								{hasCitations && (
+									<Badge
+										variant="secondary"
+										className="text-[10px] px-1.5 py-0.5 border-0 bg-neutral-200 text-neutral-700 dark:bg-neutral-700 dark:text-neutral-200"
+									>
+										Citations
+									</Badge>
+								)}
+							</div>
+						)
+					)}
 				</div>
 
 				{/* Actions */}

From ce4531461c515922eb901d37f1a269233faac24d Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Tue, 12 May 2026 15:24:19 +0530
Subject: [PATCH 24/96] chore: update zero-cache image and dependencies to
 version 1.4.0

---
 docker/docker-compose.deps-only.yml |    2 +-
 docker/docker-compose.dev.yml       |    2 +-
 docker/docker-compose.yml           |    2 +-
 surfsense_web/package.json          |    2 +-
 surfsense_web/pnpm-lock.yaml        | 1441 +++++++++++++++++----------
 5 files changed, 916 insertions(+), 533 deletions(-)

diff --git a/docker/docker-compose.deps-only.yml b/docker/docker-compose.deps-only.yml
index ee09a4d5b..31dcd8b26 100644
--- a/docker/docker-compose.deps-only.yml
+++ b/docker/docker-compose.deps-only.yml
@@ -83,7 +83,7 @@ services:
       retries: 5
 
   zero-cache:
-    image: rocicorp/zero:0.26.2
+    image: rocicorp/zero:1.4.0
     ports:
       - "${ZERO_CACHE_PORT:-4848}:4848"
     extra_hosts:
diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml
index bbe758d4f..528061882 100644
--- a/docker/docker-compose.dev.yml
+++ b/docker/docker-compose.dev.yml
@@ -174,7 +174,7 @@ services:
   #     - celery_worker
 
   zero-cache:
-    image: rocicorp/zero:0.26.2
+    image: rocicorp/zero:1.4.0
     ports:
       - "${ZERO_CACHE_PORT:-4848}:4848"
     extra_hosts:
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 10cace249..18147a189 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -163,7 +163,7 @@ services:
   #   restart: unless-stopped
 
   zero-cache:
-    image: rocicorp/zero:0.26.2
+    image: rocicorp/zero:1.4.0
     ports:
       - "${ZERO_CACHE_PORT:-5929}:4848"
     extra_hosts:
diff --git a/surfsense_web/package.json b/surfsense_web/package.json
index fa8d50cdc..efeb45fd8 100644
--- a/surfsense_web/package.json
+++ b/surfsense_web/package.json
@@ -79,7 +79,7 @@
 		"@remotion/media": "^4.0.438",
 		"@remotion/player": "^4.0.438",
 		"@remotion/web-renderer": "^4.0.438",
-		"@rocicorp/zero": "^0.26.2",
+		"@rocicorp/zero": "^1.4.0",
 		"@slate-serializers/html": "^2.2.3",
 		"@streamdown/code": "^1.0.2",
 		"@streamdown/math": "^1.0.2",
diff --git a/surfsense_web/pnpm-lock.yaml b/surfsense_web/pnpm-lock.yaml
index af2850dfa..62056a215 100644
--- a/surfsense_web/pnpm-lock.yaml
+++ b/surfsense_web/pnpm-lock.yaml
@@ -165,8 +165,8 @@ importers:
         specifier: ^4.0.438
         version: 4.0.438(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       '@rocicorp/zero':
-        specifier: ^0.26.2
-        version: 0.26.2(@opentelemetry/core@2.6.0(@opentelemetry/api@1.9.0))
+        specifier: ^1.4.0
+        version: 1.4.0(@opentelemetry/core@2.7.1(@opentelemetry/api@1.9.0))
       '@slate-serializers/html':
         specifier: ^2.2.3
         version: 2.2.3
@@ -1186,8 +1186,8 @@ packages:
   '@date-fns/tz@1.4.1':
     resolution: {integrity: sha512-P5LUNhtbj6YfI3iJjw5EL9eUAG6OitD0W3fWQcpQjDRc/QIsL0tRNuO1PcDvPccWL1fSTXXdE1ds+l95DV/OFA==}
 
-  '@dotenvx/dotenvx@1.57.2':
-    resolution: {integrity: sha512-lv9+UZPnl/KOvShepevLWm3+/wc1It5kgO5Q580evnvOFMZcgKVEYFwxlL7Ohl9my1yjTsWo28N3PJYUEO8wFQ==}
+  '@dotenvx/dotenvx@1.65.0':
+    resolution: {integrity: sha512-v4FA/Lw3pTEloLxBqTOaYDX6MNo0Jo7lGBsPZhwnJBqRJp0AzQg1ZZNxrFsh6HVC6QWeWrfIKLn0y2eyIXaVDg==}
     hasBin: true
 
   '@drdgvhbh/postgres-error-codes@0.0.6':
@@ -1196,9 +1196,9 @@ packages:
   '@drizzle-team/brocli@0.10.2':
     resolution: {integrity: sha512-z33Il7l5dKjUgGULTqBsQBQwckHh5AbIuxhdsIxDDiZAzBOrZO6q9ogcWC65kU382AfynTfgNumVcNIjuIua6w==}
 
-  '@ecies/ciphers@0.2.5':
-    resolution: {integrity: sha512-GalEZH4JgOMHYYcYmVqnFirFsjZHeoGMDt9IxEnM9F7GRUUyUksJ7Ou53L83WHJq3RWKD3AcBpo0iQh0oMpf8A==}
-    engines: {bun: '>=1', deno: '>=2', node: '>=16'}
+  '@ecies/ciphers@0.2.6':
+    resolution: {integrity: sha512-patgsRPKGkhhoBjETV4XxD0En4ui5fbX0hzayqI3M8tvNMGUoUvmyYAIWwlxBc1KX5cturfqByYdj5bYGRpN9g==}
+    engines: {bun: '>=1', deno: '>=2.7.10', node: '>=16'}
     peerDependencies:
       '@noble/ciphers': ^1.0.0
 
@@ -1780,8 +1780,8 @@ packages:
     resolution: {integrity: sha512-Iq8QQQ/7X3Sac15oB6p0FmUg/klxQvXLeileoqrTRGJYLV+/9tubbr9ipz0GKHjmXVsgFPo/+W+2cA8eNcR+XA==}
     engines: {node: '>=12.10.0'}
 
-  '@grpc/proto-loader@0.8.0':
-    resolution: {integrity: sha512-rc1hOQtjIWGxcxpb9aHAfLpIctjEnsDehj0DAiVfBlmT84uvR0uUtN2hEi/ecvWVjXUGf5qPF4qEgiLOx1YIMQ==}
+  '@grpc/proto-loader@0.8.1':
+    resolution: {integrity: sha512-wtF6h+DY6M3YaDBPAmvuuA6jV8Sif9MjtOI5euKFWRgCDl5PeDpPsHR9u2l6St5ceY8AZgoNDww5+HvEsXFsGg==}
     engines: {node: '>=6'}
     hasBin: true
 
@@ -2172,6 +2172,10 @@ packages:
     resolution: {integrity: sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==}
     engines: {node: '>=8.0.0'}
 
+  '@opentelemetry/api@1.9.1':
+    resolution: {integrity: sha512-gLyJlPHPZYdAk1JENA9LeHejZe1Ti77/pTeFm/nMXmQH/HFZlcS/O2XJB+L8fkbrNSqhdtlvjBVjxwUYanNH5Q==}
+    engines: {node: '>=8.0.0'}
+
   '@opentelemetry/auto-instrumentations-node@0.62.2':
     resolution: {integrity: sha512-Ipe6X7ddrCiRsuewyTU83IvKiSFT4piqmv9z8Ovg1E7v98pdTj1pUE6sDrHV50zl7/ypd+cONBgt+EYSZu4u9Q==}
     engines: {node: ^18.19.0 || >=20.6.0}
@@ -2185,8 +2189,8 @@ packages:
     peerDependencies:
       '@opentelemetry/api': '>=1.0.0 <1.10.0'
 
-  '@opentelemetry/context-async-hooks@2.6.0':
-    resolution: {integrity: sha512-L8UyDwqpTcbkIK5cgwDRDYDoEhQoj8wp8BwsO19w3LB1Z41yEQm2VJyNfAi9DrLP/YTqXqWpKHyZfR9/tFYo1Q==}
+  '@opentelemetry/context-async-hooks@2.7.1':
+    resolution: {integrity: sha512-OPFBYuXEn1E4ja3Y6eeA7O+ZnLBNcXTV5Cgsn1VaqBZ6hC5FnpZPLBNme1LJY8ZtF4aOujPKFoeWN4ik487KuQ==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': '>=1.0.0 <1.10.0'
@@ -2209,6 +2213,12 @@ packages:
     peerDependencies:
       '@opentelemetry/api': '>=1.0.0 <1.10.0'
 
+  '@opentelemetry/core@2.7.1':
+    resolution: {integrity: sha512-QAqIj32AtK6+pEVNG7EOVxHdE06RP+FM5qpiEJ4RtDcFIqKUZHYhl7/7UY5efhwmwNAg7j8QbJVBLxMerc0+gw==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
   '@opentelemetry/exporter-logs-otlp-grpc@0.203.0':
     resolution: {integrity: sha512-g/2Y2noc/l96zmM+g0LdeuyYKINyBwN6FJySoU15LHPLcMN/1a0wNk2SegwKcxrRdE7Xsm7fkIR5n6XFe3QpPw==}
     engines: {node: ^18.19.0 || >=20.6.0}
@@ -2569,8 +2579,8 @@ packages:
     peerDependencies:
       '@opentelemetry/api': '>=1.0.0 <1.10.0'
 
-  '@opentelemetry/redis-common@0.38.2':
-    resolution: {integrity: sha512-1BCcU93iwSRZvDAgwUxC/DV4T/406SkMfxGqu5ojc3AvNI+I9GhV7v0J1HljsczuuhcnFLYqD5VmwVXfCGHzxA==}
+  '@opentelemetry/redis-common@0.38.3':
+    resolution: {integrity: sha512-VCghU1JYs/4gP6Gqf/xro9MEsZ7LrMv2uONVsaESKL38ZOB9BqnI98FfS23wjMnHlpuE+TTaWSoAVNpTwYXzjw==}
     engines: {node: ^18.19.0 || >=20.6.0}
 
   '@opentelemetry/resource-detector-alibaba-cloud@0.31.11':
@@ -2579,8 +2589,8 @@ packages:
     peerDependencies:
       '@opentelemetry/api': ^1.0.0
 
-  '@opentelemetry/resource-detector-aws@2.13.0':
-    resolution: {integrity: sha512-ZPCn7gZhGqUYUoD+RCHIlayoHBMaJaEjfqlgz2EPKoXJ4y7Ru7CUm+Tm3yJVMKF92cN9xUQR0j5KALyF0fg9aw==}
+  '@opentelemetry/resource-detector-aws@2.17.0':
+    resolution: {integrity: sha512-IpeUtIdKW5PQsO2Ylfvxqr5ZawoObKigzQtEbT96NxSs7gej8Fp4LQZuooGAGu5H+qAI8/wjCZWLlJk2FT1Uzg==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': ^1.0.0
@@ -2621,6 +2631,12 @@ packages:
     peerDependencies:
       '@opentelemetry/api': '>=1.3.0 <1.10.0'
 
+  '@opentelemetry/resources@2.7.1':
+    resolution: {integrity: sha512-DeT6KKolmC4e/dRQvMQ/RwlnzhaqeiFOXY5ngoOPJ07GgVVKxZOg9EcrNZb5aTzUn+iCrJldAgOfQm1O/QfPAQ==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.3.0 <1.10.0'
+
   '@opentelemetry/sdk-logs@0.203.0':
     resolution: {integrity: sha512-vM2+rPq0Vi3nYA5akQD2f3QwossDnTDLvKbea6u/A2NZ3XDkPxMfo/PNrDoXhDUD/0pPo2CdH5ce/thn9K0kLw==}
     engines: {node: ^18.19.0 || >=20.6.0}
@@ -2645,6 +2661,12 @@ packages:
     peerDependencies:
       '@opentelemetry/api': '>=1.9.0 <1.10.0'
 
+  '@opentelemetry/sdk-metrics@2.7.1':
+    resolution: {integrity: sha512-MpDJdkiFDs3Pm1RHO3KByuZbuBdJEXEAkiC0+yJdsZGVCdf1RpHR6n+LHDcS7ffmfrt5kVCzJSCfm4z2C7v0uQ==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.9.0 <1.10.0'
+
   '@opentelemetry/sdk-node@0.203.0':
     resolution: {integrity: sha512-zRMvrZGhGVMvAbbjiNQW3eKzW/073dlrSiAKPVWmkoQzah9wfynpVPeL55f9fVIm0GaBxTLcPeukWGy0/Wj7KQ==}
     engines: {node: ^18.19.0 || >=20.6.0}
@@ -2663,8 +2685,8 @@ packages:
     peerDependencies:
       '@opentelemetry/api': '>=1.3.0 <1.10.0'
 
-  '@opentelemetry/sdk-trace-base@2.6.0':
-    resolution: {integrity: sha512-g/OZVkqlxllgFM7qMKqbPV9c1DUPhQ7d4n3pgZFcrnrNft9eJXZM2TNHTPYREJBrtNdRytYyvwjgL5geDKl3EQ==}
+  '@opentelemetry/sdk-trace-base@2.7.1':
+    resolution: {integrity: sha512-NAYIlsF8MPUsKqJMiDQJTMPOmlbawC1Iz/omMLygZ1C9am8fTKYjTaI+OZM+WTY3t3Glo0wnOg/6/pac6RGPPw==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': '>=1.3.0 <1.10.0'
@@ -2675,8 +2697,8 @@ packages:
     peerDependencies:
       '@opentelemetry/api': '>=1.0.0 <1.10.0'
 
-  '@opentelemetry/sdk-trace-node@2.6.0':
-    resolution: {integrity: sha512-YhswtasmsbIGEFvLGvR9p/y3PVRTfFf+mgY8van4Ygpnv4sA3vooAjvh+qAn9PNWxs4/IwGGqiQS0PPsaRJ0vQ==}
+  '@opentelemetry/sdk-trace-node@2.7.1':
+    resolution: {integrity: sha512-pCpQxU68lV+I9s9svqMyVu5iHdDDUnqUpSxqwyCU8A9ejEsSnMPCbearwsUO4yk08ZJzAIUCFuReMdVQvHrdvg==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': '>=1.0.0 <1.10.0'
@@ -2685,6 +2707,10 @@ packages:
     resolution: {integrity: sha512-R5R9tb2AXs2IRLNKLBJDynhkfmx7mX0vi8NkhZb3gUkPWHn6HXk5J8iQ/dql0U3ApfWym4kXXmBDRGO+oeOfjg==}
     engines: {node: '>=14'}
 
+  '@opentelemetry/semantic-conventions@1.40.0':
+    resolution: {integrity: sha512-cifvXDhcqMwwTlTK04GBNeIe7yyo28Mfby85QXFe1Yk8nmi36Ab/5UQwptOx84SsoGNRg+EVSjwzfSZMy6pmlw==}
+    engines: {node: '>=14'}
+
   '@opentelemetry/sql-common@0.41.2':
     resolution: {integrity: sha512-4mhWm3Z8z+i508zQJ7r6Xi7y4mmoJpdvH0fZPFRkWrdp5fq7hhZ2HhYokEOLkfqSMgPR4Z9EyB3DBkbKGOqZiQ==}
     engines: {node: ^18.19.0 || >=20.6.0}
@@ -2695,6 +2721,120 @@ packages:
     resolution: {integrity: sha512-a61ljmRVVyG5MC/698C8/FfFDw5a8LOIvyOLW5fztgUXqUpc1jOfQzOitSCbge657OgXXThmY3Tk8fpiDb4UcA==}
     engines: {node: '>= 20.0.0'}
 
+  '@oxfmt/binding-android-arm-eabi@0.45.0':
+    resolution: {integrity: sha512-A/UMxFob1fefCuMeGxQBulGfFE38g2Gm23ynr3u6b+b7fY7/ajGbNsa3ikMIkGMLJW/TRoQaMoP1kME7S+815w==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm]
+    os: [android]
+
+  '@oxfmt/binding-android-arm64@0.45.0':
+    resolution: {integrity: sha512-L63z4uZmHjgvvqvMJD7mwff8aSBkM0+X4uFr6l6U5t6+Qc9DCLVZWIunJ7Gm4fn4zHPdSq6FFQnhu9yqqobxIg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [android]
+
+  '@oxfmt/binding-darwin-arm64@0.45.0':
+    resolution: {integrity: sha512-UV34dd623FzqT+outIGndsCA/RBB+qgB3XVQhgmmJ9PJwa37NzPC9qzgKeOhPKxVk2HW+JKldQrVL54zs4Noww==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@oxfmt/binding-darwin-x64@0.45.0':
+    resolution: {integrity: sha512-pMNJv0CMa1pDefVPeNbuQxibh8ITpWDFEhMC/IBB9Zlu76EbgzYwrzI4Cb11mqX2+rIYN70UTrh3z06TM59ptQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [darwin]
+
+  '@oxfmt/binding-freebsd-x64@0.45.0':
+    resolution: {integrity: sha512-xTcRoxbbo61sW2+ZRPeH+vp/o9G8gkdhiVumFU+TpneiPm14c79l6GFlxPXlCE9bNWikigbsrvJw46zCVAQFfg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@oxfmt/binding-linux-arm-gnueabihf@0.45.0':
+    resolution: {integrity: sha512-hWL8Hdni+3U1mPFx1UtWeGp3tNb6EhBAUHRMbKUxVkOp3WwoJbpVO2bfUVbS4PfpledviXXNHSTl1veTa6FhkQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm]
+    os: [linux]
+
+  '@oxfmt/binding-linux-arm-musleabihf@0.45.0':
+    resolution: {integrity: sha512-6Blt/0OBT7vvfQpqYuYbpbFLPqSiaYpEJzUUWhinPEuADypDbtV1+LdjM0vYBNGPvnj85ex7lTerEX6JGcPt9w==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm]
+    os: [linux]
+
+  '@oxfmt/binding-linux-arm64-gnu@0.45.0':
+    resolution: {integrity: sha512-jLjoLfe+hGfjhA8hNBSdw85yCA8ePKq7ME4T+g6P9caQXvmt6IhE2X7iVjnVdkmYUWEzZrxlh4p6RkDmAMJY/A==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [linux]
+
+  '@oxfmt/binding-linux-arm64-musl@0.45.0':
+    resolution: {integrity: sha512-XQKXZIKYJC3GQJ8FnD3iMntpw69Wd9kDDK/Xt79p6xnFYlGGxSNv2vIBvRTDg5CKByWFWWZLCRDOXoP/m6YN4g==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [linux]
+
+  '@oxfmt/binding-linux-ppc64-gnu@0.45.0':
+    resolution: {integrity: sha512-+g5RiG+xOkdrCWkKodv407nTvMq4vYM18Uox2MhZBm/YoqFxxJpWKsloskFFG5NU13HGPw1wzYjjOVcyd9moCA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [ppc64]
+    os: [linux]
+
+  '@oxfmt/binding-linux-riscv64-gnu@0.45.0':
+    resolution: {integrity: sha512-V7dXKoSyEbWAkkSF4JJNtF+NJZDmJoSarSoP30WCsB3X636Rehd3CvxBj49FIJxEBFWhvcUjGSHVeU8Erck1bQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [riscv64]
+    os: [linux]
+
+  '@oxfmt/binding-linux-riscv64-musl@0.45.0':
+    resolution: {integrity: sha512-Vdelft1sAEYojVGgcODEFXSWYQYlIvoyIGWebKCuUibd1tvS1TjTx413xG2ZLuHpYj45CkN/ztMLMX6jrgqpgg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [riscv64]
+    os: [linux]
+
+  '@oxfmt/binding-linux-s390x-gnu@0.45.0':
+    resolution: {integrity: sha512-RR7xKgNpqwENnK0aYCGYg0JycY2n93J0reNjHyes+I9Gq52dH95x+CBlnlAQHCPfz6FGnKA9HirgUl14WO6o7w==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [s390x]
+    os: [linux]
+
+  '@oxfmt/binding-linux-x64-gnu@0.45.0':
+    resolution: {integrity: sha512-U/QQ0+BQNSHxjuXR/utvXnQ50Vu5kUuqEomZvQ1/3mhgbBiMc2WU9q5kZ5WwLp3gnFIx9ibkveoRSe2EZubkqg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [linux]
+
+  '@oxfmt/binding-linux-x64-musl@0.45.0':
+    resolution: {integrity: sha512-o5TLOUCF0RWQjsIS06yVC+kFgp092/yLe6qBGSUvtnmTVw9gxjpdQSXc3VN5Cnive4K11HNstEZF8ROKHfDFSw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [linux]
+
+  '@oxfmt/binding-openharmony-arm64@0.45.0':
+    resolution: {integrity: sha512-RnGcV3HgPuOjsGx/k9oyRNKmOp+NBLGzZTdPDYbc19r7NGeYPplnUU/BfU35bX2Y/O4ejvHxcfkvW2WoYL/gsg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [openharmony]
+
+  '@oxfmt/binding-win32-arm64-msvc@0.45.0':
+    resolution: {integrity: sha512-v3Vj7iKKsUFwt9w5hsqIIoErKVoENC6LoqfDlteOQ5QMDCXihlqLoxpmviUhXnNncg4zV6U9BPwlBbwa+qm4wg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [win32]
+
+  '@oxfmt/binding-win32-ia32-msvc@0.45.0':
+    resolution: {integrity: sha512-N8yotPBX6ph0H3toF4AEpdCeVPrdcSetj+8eGiZGsrLsng3bs/Q5HPu4bbSxip5GBPx5hGbGHrZwH4+rcrjhHA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [ia32]
+    os: [win32]
+
+  '@oxfmt/binding-win32-x64-msvc@0.45.0':
+    resolution: {integrity: sha512-w5MMTRCK1dpQeRA+HHqXQXyN33DlG/N2LOYxJmaT4fJjcmZrbNnqw7SmIk7I2/a2493PPLZ+2E/Ar6t2iKVMug==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [win32]
+
   '@parcel/watcher-android-arm64@2.5.6':
     resolution: {integrity: sha512-YQxSS34tPF/6ZG7r/Ih9xy+kP/WwediEUsqmtf0cuCV5TPPKw/PQHRhueUo6JdeFJaqV3pyjm0GdYjZotbRt/A==}
     engines: {node: '>= 10.0.0'}
@@ -2950,6 +3090,9 @@ packages:
   '@protobufjs/codegen@2.0.4':
     resolution: {integrity: sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==}
 
+  '@protobufjs/codegen@2.0.5':
+    resolution: {integrity: sha512-zgXFLzW3Ap33e6d0Wlj4MGIm6Ce8O89n/apUaGNB/jx+hw+ruWEp7EwGUshdLKVRCxZW12fp9r40E1mQrf/34g==}
+
   '@protobufjs/eventemitter@1.1.0':
     resolution: {integrity: sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==}
 
@@ -2962,6 +3105,9 @@ packages:
   '@protobufjs/inquire@1.1.0':
     resolution: {integrity: sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==}
 
+  '@protobufjs/inquire@1.1.1':
+    resolution: {integrity: sha512-mnzgDV26ueAvk7rsbt9L7bE0SuAoqyuys/sMMrmVcN5x9VsxpcG3rqAUSgDyLp0UZlmNfIbQ4fHfCtreVBk8Ew==}
+
   '@protobufjs/path@1.1.2':
     resolution: {integrity: sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==}
 
@@ -2971,6 +3117,9 @@ packages:
   '@protobufjs/utf8@1.1.0':
     resolution: {integrity: sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==}
 
+  '@protobufjs/utf8@1.1.1':
+    resolution: {integrity: sha512-oOAWABowe8EAbMyWKM0tYDKi8Yaox52D+HWZhAIJqQXbqe0xI/GV7FhLWqlEKreMkfDjshR5FKgi3mnle0h6Eg==}
+
   '@radix-ui/number@1.1.1':
     resolution: {integrity: sha512-MkKCwxlXTgz6CFoJx3pCwn07GKp36+aZyu/u2Ln2VrA5DcdyCZkASEDBTd8x5whTQQL5CiYf4prXKLcgQdv29g==}
 
@@ -4018,23 +4167,26 @@ packages:
     resolution: {integrity: sha512-TfjMTQp9cNNqNtHFfa+XHEGdA7NnmDRu+ZJH4YF3dso0Xk/b9DMhg/sl+b6CR4ThFZArXXDsG1j8Mwl34wcOZQ==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
-  '@rocicorp/zero-sqlite3@1.0.15':
-    resolution: {integrity: sha512-o4ezzTgNQvOM23X/mBRN4LAo0i7XkIDAL3Obg7FaJLFTuwJyYwqE45aqk9vg8/0mlBw2U+DEUGLP1q/Pf+VgYQ==}
-    engines: {bun: '>=1.1.0', node: 20.x || 22.x || 23.x || 24.x}
+  '@rocicorp/zero-sqlite3@1.0.18':
+    resolution: {integrity: sha512-JwHcCijxKj94NDij5UDCJsGHo/D8z4j5De/5zphQ+NctQ4TWr9Zx7L+Q1JBfie4ewVS82Ingu+QKbIwWvdNFXg==}
+    engines: {bun: '>=1.1.0', node: 20.x || 22.x || 23.x || 24.x || 25.x}
     hasBin: true
 
-  '@rocicorp/zero@0.26.2':
-    resolution: {integrity: sha512-fq67gwxvV3rWx/QeKTXu6ab2CLqR7O9GrcZPbI5bCBxHgRB2S+VSxEvcbEtYDjyZvI3GWmisa5UdsYN3H2vYsA==}
+  '@rocicorp/zero@1.4.0':
+    resolution: {integrity: sha512-BRgdF64JWNgIsHG4Fajgjr5ms0HBTdmZUWoJy09KE3TNwMo0Rmz1r1fte1MMH1zY4witcUJsFhGj4aHLsZAfTA==}
     engines: {node: '>=22'}
     hasBin: true
     peerDependencies:
       '@op-engineering/op-sqlite': '>=15'
       expo-sqlite: '>=15'
+      kysely: ^0.28.16
     peerDependenciesMeta:
       '@op-engineering/op-sqlite':
         optional: true
       expo-sqlite:
         optional: true
+      kysely:
+        optional: true
 
   '@rollup/rollup-android-arm-eabi@4.59.0':
     resolution: {integrity: sha512-upnNBkA6ZH2VKGcBj9Fyl9IGNPULcjXRlg0LLeaioQWueH30p6IXtJEbKAgvyv+mJaMxSm1l6xwDXYjpEMiLMg==}
@@ -4875,8 +5027,8 @@ packages:
   ajv@6.14.0:
     resolution: {integrity: sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==}
 
-  ajv@8.18.0:
-    resolution: {integrity: sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==}
+  ajv@8.20.0:
+    resolution: {integrity: sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==}
 
   ansi-regex@5.0.1:
     resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
@@ -5202,8 +5354,8 @@ packages:
     resolution: {integrity: sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==}
     engines: {node: '>= 12'}
 
-  compare-utf8@0.1.1:
-    resolution: {integrity: sha512-bND8Irz+KrF96w4Tkm1m8u5q8iE2fnvP196sHGy7XNrGNXlhyl07VnsCRYrXgEhhf/lM7hyCKRnMeh8Icis4Sw==}
+  compare-utf8@0.2.0:
+    resolution: {integrity: sha512-5BjVs4Be9AwMm4le3Qb3crp44OAn+uuJhvrjPWA8Es/DfVPq5lSc8JaRg/clrrHOMCU+CdDfv/9eBSPh6OOiUQ==}
 
   compute-scroll-into-view@3.1.1:
     resolution: {integrity: sha512-VRhuHOLoKYOy4UbilLbUzbYg93XLjv2PncJC50EuTWPA3gaja1UjBsUP/D/9/juV3vQFr6XBEzn9KCAHdUvOHw==}
@@ -5348,8 +5500,8 @@ packages:
     resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==}
     engines: {node: '>= 0.4'}
 
-  defu@6.1.4:
-    resolution: {integrity: sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==}
+  defu@6.1.7:
+    resolution: {integrity: sha512-7z22QmUWiQ/2d0KkdYmANbRUVABpZ9SNYyH5vx6PZ+nE5bcC0l7uFvEfHlyld/HcGBFTL536ClDt3DEcSlEJAQ==}
 
   dequal@2.0.3:
     resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==}
@@ -5792,8 +5944,8 @@ packages:
   fast-json-stable-stringify@2.1.0:
     resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==}
 
-  fast-json-stringify@6.3.0:
-    resolution: {integrity: sha512-oRCntNDY/329HJPlmdNLIdogNtt6Vyjb1WuT01Soss3slIdyUp8kAcDU3saQTOquEK8KFVfwIIF7FebxUAu+yA==}
+  fast-json-stringify@6.4.0:
+    resolution: {integrity: sha512-ibRCQ0GZKJIQ+P3Et1h0LhPgp3PMTYk0MH8O+kW3lNYsvmaQww5Nn3f1jf73Q0jR1Yz3a1CDP4/NZD3vOajWJQ==}
 
   fast-levenshtein@2.0.6:
     resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
@@ -5801,14 +5953,14 @@ packages:
   fast-querystring@1.1.2:
     resolution: {integrity: sha512-g6KuKWmFXc0fID8WWH0jit4g0AGBoJhCkJMb1RmbsSEUNvQ+ZC8D6CUZ+GtF8nMzSPXnhiePyyqqipzNNEnHjg==}
 
-  fast-uri@3.1.0:
-    resolution: {integrity: sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==}
+  fast-uri@3.1.2:
+    resolution: {integrity: sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ==}
 
   fastify-plugin@5.1.0:
     resolution: {integrity: sha512-FAIDA8eovSt5qcDgcBvDuX/v0Cjz0ohGhENZ/wpc3y+oZCY2afZ9Baqql3g/lC+OHRnciQol4ww7tuthOb9idw==}
 
-  fastify@5.8.4:
-    resolution: {integrity: sha512-sa42J1xylbBAYUWALSBoyXKPDUvM3OoNOibIefA+Oha57FryXKKCZarA1iDntOCWp3O35voZLuDg2mdODXtPzQ==}
+  fastify@5.8.5:
+    resolution: {integrity: sha512-Yqptv59pQzPgQUSIm87hMqHJmdkb1+GPxdE6vW6FRyVE9G86mt7rOghitiU4JHRaTyDUk9pfeKmDeu70lAwM4Q==}
 
   fastq@1.20.1:
     resolution: {integrity: sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==}
@@ -5843,8 +5995,8 @@ packages:
     resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
     engines: {node: '>=8'}
 
-  find-my-way@9.5.0:
-    resolution: {integrity: sha512-VW2RfnmscZO5KgBY5XVyKREMW5nMZcxDy+buTOsL+zIPnBlbKm+00sgzoQzq1EVh4aALZLfKdwv6atBGcjvjrQ==}
+  find-my-way@9.6.0:
+    resolution: {integrity: sha512-Zf4Xve4RymLl7NgaavNebZ01joJ8MfVerOG43wy7SHLO+r+K0C6d/SE0BiR7AV5V1VOCFlOP7ecdo+I4qmiHrQ==}
     engines: {node: '>=20'}
 
   find-replace@5.0.2:
@@ -6137,6 +6289,10 @@ packages:
     resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==}
     engines: {node: '>= 0.4'}
 
+  hasown@2.0.3:
+    resolution: {integrity: sha512-ej4AhfhfL2Q2zpMmLo7U1Uv9+PyhIZpgQLGT1F9miIGmiCJIoCgSmczFdrc97mWT4kVY72KA+WnnhJ5pghSvSg==}
+    engines: {node: '>= 0.4'}
+
   hast-util-from-dom@5.0.1:
     resolution: {integrity: sha512-N+LqofjR2zuzTjCPzyDUdSshy4Ma6li7p/c3pA78uTwzFgENbgbUrm2ugwsOdcjI1muO+o6Dgzp9p8WHtn/39Q==}
 
@@ -6288,8 +6444,8 @@ packages:
   intl-messageformat@11.1.2:
     resolution: {integrity: sha512-ucSrQmZGAxfiBHfBRXW/k7UC8MaGFlEj4Ry1tKiDcmgwQm1y3EDl40u+4VNHYomxJQMJi9NEI3riDRlth96jKg==}
 
-  ipaddr.js@2.3.0:
-    resolution: {integrity: sha512-Zv/pA+ciVFbCSBBjGfaKUya/CcGmUHzTydLMaTwrUUEM2DIEO3iZvueGxmacvmN50fGpGVKeTXpb2LcYQxeVdg==}
+  ipaddr.js@2.4.0:
+    resolution: {integrity: sha512-9VGk3HGanVE6JoZXHiCpnGy5X0jYDnN4EA4lntFPj+1vIWlFhIylq2CrrCOJH9EAhc5CYhq18F2Av2tgoAPsYQ==}
     engines: {node: '>= 10'}
 
   is-alphabetical@1.0.4:
@@ -6338,6 +6494,10 @@ packages:
     resolution: {integrity: sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==}
     engines: {node: '>= 0.4'}
 
+  is-core-module@2.16.2:
+    resolution: {integrity: sha512-evOr8xfXKxE6qSR0hSXL2r3sd7ALj8+7jQEUvPYcm5sgZFdJ+AYzT6yNmJenvIYQBgIGwfwz08sL8zoL7yq2BA==}
+    engines: {node: '>= 0.4'}
+
   is-data-view@1.0.2:
     resolution: {integrity: sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==}
     engines: {node: '>= 0.4'}
@@ -7037,6 +7197,11 @@ packages:
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
 
+  nanoid@5.1.11:
+    resolution: {integrity: sha512-v+KEsUv2ps74PaSKv0gHTxTCgMXOIfBEbaqa6w6ISIGC7ZsvHN4N9oJ8d4cmf0n5oTzQz2SLmThbQWhjd/8eKg==}
+    engines: {node: ^18 || >=20}
+    hasBin: true
+
   nanoid@5.1.7:
     resolution: {integrity: sha512-ua3NDgISf6jdwezAheMOk4mbE1LXjm1DfMUDMuJf4AqxLFK3ccGpgWizwa5YV7Yz9EpXwEaWoRXSb/BnV0t5dQ==}
     engines: {node: ^18 || >=20}
@@ -7100,8 +7265,8 @@ packages:
   no-case@3.0.4:
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
 
-  node-abi@3.89.0:
-    resolution: {integrity: sha512-6u9UwL0HlAl21+agMN3YAMXcKByMqwGx+pq+P76vii5f7hTPtKDp08/H9py6DY+cfDw7kQNTGEj/rly3IgbNQA==}
+  node-abi@3.92.0:
+    resolution: {integrity: sha512-KdHvFWZjEKDf0cakgFjebl371GPsISX2oZHcuyKqM7DtogIsHrqKeLTo8wBHxaXRAQlY2PsPlZmfo+9ZCxEREQ==}
     engines: {node: '>=10'}
 
   node-addon-api@7.1.1:
@@ -7212,6 +7377,11 @@ packages:
     resolution: {integrity: sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==}
     engines: {node: '>= 0.4'}
 
+  oxfmt@0.45.0:
+    resolution: {integrity: sha512-0o/COoN9fY50bjVeM7PQsNgbhndKurBIeTIcspW033OumksjJJmIVDKjAk5HMwU/GHTxSOdGDdhJ6BRzGPmsHg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    hasBin: true
+
   p-limit@3.1.0:
     resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
     engines: {node: '>=10'}
@@ -7293,6 +7463,9 @@ packages:
   pg-protocol@1.11.0:
     resolution: {integrity: sha512-pfsxk2M9M3BuGgDOfuy37VNRRX3jmKgMjcvAcWqNDpZSf4cUmv8HSOl5ViRQFsfARFn0KuUQTgLxVMbNq5NW3g==}
 
+  pg-protocol@1.13.0:
+    resolution: {integrity: sha512-zzdvXfS6v89r6v7OcFCHfHlyG/wvry1ALxZo4LqgUoy7W9xhBDMaqOuMiF3qEV45VqsN6rdlcehHrfDtlCPc8w==}
+
   pg-types@2.2.0:
     resolution: {integrity: sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==}
     engines: {node: '>=4'}
@@ -7320,6 +7493,10 @@ packages:
     resolution: {integrity: sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==}
     engines: {node: '>=12'}
 
+  picomatch@4.0.4:
+    resolution: {integrity: sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==}
+    engines: {node: '>=12'}
+
   pino-abstract-transport@3.0.0:
     resolution: {integrity: sha512-wlfUczU+n7Hy/Ha5j9a/gZNy7We5+cXp8YL+X+PG8S0KXxw7n/JXA3c46Y0zQznIJ83URJiwy7Lh56WLokNuxg==}
 
@@ -7416,11 +7593,6 @@ packages:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
 
-  prettier@3.8.1:
-    resolution: {integrity: sha512-UOnG6LftzbdaHZcKoPFtOcCKztrQ57WkHDeRD9t/PTQtmT0NHSeWWepj6pS0z/N7+08BHFDQVUrfmfMRcZwbMg==}
-    engines: {node: '>=14'}
-    hasBin: true
-
   prismjs@1.27.0:
     resolution: {integrity: sha512-t13BGPUlFDR7wRB5kQDG4jjl7XeuH6jbJGt11JHPL96qwsEHNX2+68tFXqc1/k+/jALsbSWJKUOT/hcYAZ5LkA==}
     engines: {node: '>=6'}
@@ -7455,6 +7627,10 @@ packages:
     resolution: {integrity: sha512-3wY1AxV+VBNW8Yypfd1yQY9pXnqTAN+KwQxL8iYm3/BjKYMNg4i0owhEe26PWDOMaIrzeeF98Lqd5NGz4omiIg==}
     engines: {node: '>=12.0.0'}
 
+  protobufjs@7.5.7:
+    resolution: {integrity: sha512-NGnrxS/nLKUo5nkbVQxlC71sB4hdfImdYIbFeSCidxtwATx0AHRPcANSLd0q5Bb2BkoSWo2iisQhGg5/r+ihbA==}
+    engines: {node: '>=12.0.0'}
+
   proxy-compare@2.6.0:
     resolution: {integrity: sha512-8xuCeM3l8yqdmbPoYeLbrAXCBWu19XEYc5/F28f5qOaoAIMyfmBUkl5axiK+x9olUvRlcekvnm98AP9RDngOIw==}
 
@@ -7673,6 +7849,9 @@ packages:
     resolution: {integrity: sha512-57frrGM/OCTLqLOAh0mhVA9VBMHd+9U7Zb2THMGdBUoZVOtGbJzjxsYGDJ3A9AYYCP4hn6y1TVbaOfzWtm5GFg==}
     engines: {node: '>= 12.13.0'}
 
+  real-require@1.0.0:
+    resolution: {integrity: sha512-P4nbQYQfePJxRSmY+v/KINxVucm4NF3p3s7pJveMTtom52FR4YGltUQLB8idDXwDDWW+eYrWDFbuzUnjoWHF7g==}
+
   recma-build-jsx@1.0.0:
     resolution: {integrity: sha512-8GtdyqaBcDfva+GUKDr3nev3VpKAhup1+RvkMvUxURHpW7QyIvk9F5wz7Vzo06CEMSilw6uArgRqhpiUcWp8ew==}
 
@@ -7797,6 +7976,11 @@ packages:
     engines: {node: '>= 0.4'}
     hasBin: true
 
+  resolve@1.22.12:
+    resolution: {integrity: sha512-TyeJ1zif53BPfHootBGwPRYT1RUt6oGWsaQr8UyZW/eAm9bKoijtvruSDEmZHm92CwS9nj7/fWttqPCgzep8CA==}
+    engines: {node: '>= 0.4'}
+    hasBin: true
+
   resolve@2.0.0-next.6:
     resolution: {integrity: sha512-3JmVl5hMGtJ3kMmB3zi3DL25KfkCEyy3Tw7Gmw7z5w8M9WlwoPFnIvwChzu1+cF3iaK3sp18hhPz8ANeimdJfA==}
     engines: {node: '>= 0.4'}
@@ -7828,6 +8012,9 @@ packages:
   safe-buffer@5.1.2:
     resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==}
 
+  safe-buffer@5.2.1:
+    resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
+
   safe-push-apply@1.0.0:
     resolution: {integrity: sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==}
     engines: {node: '>= 0.4'}
@@ -7836,8 +8023,8 @@ packages:
     resolution: {integrity: sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==}
     engines: {node: '>= 0.4'}
 
-  safe-regex2@5.1.0:
-    resolution: {integrity: sha512-pNHAuBW7TrcleFHsxBr5QMi/Iyp0ENjUKz7GCcX1UO7cMh+NmVK6HxQckNL1tJp1XAJVjG6B8OKIPqodqj9rtw==}
+  safe-regex2@5.1.1:
+    resolution: {integrity: sha512-mOSBvHGDZMuIEZMdOz/aCEYDCv0E7nfcNsIhUF+/P+xC7Hyf3FkvymqgPbg9D1EdSGu+uKbJgy09K/RKKc7kJA==}
     hasBin: true
 
   safe-stable-stringify@2.5.0:
@@ -7865,6 +8052,11 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
 
+  semver@7.8.0:
+    resolution: {integrity: sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==}
+    engines: {node: '>=10'}
+    hasBin: true
+
   server-only@0.0.1:
     resolution: {integrity: sha512-qepMx2JxAa5jjfzxG79yPPq+8BuFToHd1hm7kI+Z4zAq1ftQiP7HcxMhDDItrbtwVeLg/cY2JnKnrcFkmiswNA==}
 
@@ -8042,6 +8234,9 @@ packages:
   string_decoder@1.1.1:
     resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==}
 
+  string_decoder@1.3.0:
+    resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==}
+
   stringify-entities@4.0.4:
     resolution: {integrity: sha512-IwfBptatlO+QCJUo19AqvrPNqlVMpW9YEL2LIVY+Rpv2qsjCGxaDLNRgeGsQWJhfItebuJhsGSLjaBbNSQ+ieg==}
 
@@ -8115,6 +8310,9 @@ packages:
   tailwind-merge@3.5.0:
     resolution: {integrity: sha512-I8K9wewnVDkL1NTGoqWmVEIlUcB9gFriAEkXkfCjX5ib8ezGxtR3xD7iZIxrfArjEsH7F1CHD4RFUtxefdqV/A==}
 
+  tailwind-merge@3.6.0:
+    resolution: {integrity: sha512-uxL7qAVQriqRQPAyK3pj66VqskWqoZ37PW94jwOTwNfq/z9oyu1V+eqrZqtR2+fCiXdYOZe/Modt8GtvqNzu+w==}
+
   tailwind-scrollbar-hide@4.0.0:
     resolution: {integrity: sha512-gobtvVcThB2Dxhy0EeYSS1RKQJ5baDFkamkhwBvzvevwX6L4XQfpZ3me9s25Ss1ecFVT5jPYJ50n+7xTBJG9WQ==}
     peerDependencies:
@@ -8142,8 +8340,8 @@ packages:
   text-segmentation@1.0.3:
     resolution: {integrity: sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==}
 
-  thread-stream@4.0.0:
-    resolution: {integrity: sha512-4iMVL6HAINXWf1ZKZjIPcz5wYaOdPhtO8ATvZ+Xqp3BTdaqtAwQkNmKORqcIo5YkQqGXq5cwfswDwMqqQNrpJA==}
+  thread-stream@4.1.0:
+    resolution: {integrity: sha512-Bw6h2iBDt16v6iHLChBIoVYU8CBo9GPsW8TG7h1hRVhqKhIkH6N8qkxNSmiOZTKsCLPbtWG4ViWLkU6KeKXpig==}
     engines: {node: '>=20'}
 
   throttleit@2.1.0:
@@ -8167,6 +8365,10 @@ packages:
     resolution: {integrity: sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==}
     engines: {node: '>=12.0.0'}
 
+  tinypool@2.1.0:
+    resolution: {integrity: sha512-Pugqs6M0m7Lv1I7FtxN4aoyToKg1C4tu+/381vH35y8oENM/Ai7f7C4StcoK4/+BSw9ebcS8jRiVrORFKCALLw==}
+    engines: {node: ^20.0.0 || >=22.0.0}
+
   to-regex-range@5.0.1:
     resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
     engines: {node: '>=8.0'}
@@ -8415,10 +8617,12 @@ packages:
 
   uuid@8.3.2:
     resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==}
+    deprecated: uuid@10 and below is no longer supported.  For ESM codebases, update to uuid@latest.  For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).
     hasBin: true
 
   uuid@9.0.1:
     resolution: {integrity: sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==}
+    deprecated: uuid@10 and below is no longer supported.  For ESM codebases, update to uuid@latest.  For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).
     hasBin: true
 
   vaul@1.1.2:
@@ -8564,6 +8768,14 @@ packages:
     resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
     engines: {node: '>=10'}
 
+  yocto-spinner@1.2.0:
+    resolution: {integrity: sha512-Yw0hUB6UA3o4YUgKy3oSe9a4cxoaZ9sBfYDw+JSxo6Id0KoJGoxzPA24qqUXYKBWABs/zDSGTz9kww7t3F0XGw==}
+    engines: {node: '>=18.19'}
+
+  yoctocolors@2.1.2:
+    resolution: {integrity: sha512-CzhO+pFNo8ajLM2d2IW/R93ipy99LWjtwblvC1RsoSUMZgyLbYFr221TnSNT7GjGdYui6P459mw9JH/g/zW2ug==}
+    engines: {node: '>=18'}
+
   zod-to-json-schema@3.25.1:
     resolution: {integrity: sha512-pM/SU9d3YAggzi6MtR4h7ruuQlqKtad8e9S0fmxcMi+ueAK5Korys/aWcV9LIIHTVbj01NdzxcnXSN+O74ZIVA==}
     peerDependencies:
@@ -9494,23 +9706,24 @@ snapshots:
 
   '@date-fns/tz@1.4.1': {}
 
-  '@dotenvx/dotenvx@1.57.2':
+  '@dotenvx/dotenvx@1.65.0':
     dependencies:
       commander: 11.1.0
       dotenv: 17.3.1
       eciesjs: 0.4.18
       execa: 5.1.1
-      fdir: 6.5.0(picomatch@4.0.3)
+      fdir: 6.5.0(picomatch@4.0.4)
       ignore: 5.3.2
       object-treeify: 1.1.33
-      picomatch: 4.0.3
+      picomatch: 4.0.4
       which: 4.0.0
+      yocto-spinner: 1.2.0
 
   '@drdgvhbh/postgres-error-codes@0.0.6': {}
 
   '@drizzle-team/brocli@0.10.2': {}
 
-  '@ecies/ciphers@0.2.5(@noble/ciphers@1.3.0)':
+  '@ecies/ciphers@0.2.6(@noble/ciphers@1.3.0)':
     dependencies:
       '@noble/ciphers': 1.3.0
 
@@ -9813,9 +10026,9 @@ snapshots:
 
   '@fastify/ajv-compiler@4.0.5':
     dependencies:
-      ajv: 8.18.0
-      ajv-formats: 3.0.1(ajv@8.18.0)
-      fast-uri: 3.1.0
+      ajv: 8.20.0
+      ajv-formats: 3.0.1(ajv@8.20.0)
+      fast-uri: 3.1.2
 
   '@fastify/cors@10.1.0':
     dependencies:
@@ -9826,7 +10039,7 @@ snapshots:
 
   '@fastify/fast-json-stringify-compiler@5.0.3':
     dependencies:
-      fast-json-stringify: 6.3.0
+      fast-json-stringify: 6.4.0
 
   '@fastify/forwarded@3.0.1': {}
 
@@ -9837,7 +10050,7 @@ snapshots:
   '@fastify/proxy-addr@5.1.0':
     dependencies:
       '@fastify/forwarded': 3.0.1
-      ipaddr.js: 2.3.0
+      ipaddr.js: 2.4.0
 
   '@fastify/websocket@11.2.0':
     dependencies:
@@ -9910,14 +10123,14 @@ snapshots:
 
   '@grpc/grpc-js@1.14.3':
     dependencies:
-      '@grpc/proto-loader': 0.8.0
+      '@grpc/proto-loader': 0.8.1
       '@js-sdsl/ordered-map': 4.4.2
 
-  '@grpc/proto-loader@0.8.0':
+  '@grpc/proto-loader@0.8.1':
     dependencies:
       lodash.camelcase: 4.3.0
       long: 5.3.2
-      protobufjs: 7.5.5
+      protobufjs: 7.5.7
       yargs: 17.7.2
 
   '@hookform/resolvers@5.2.2(react-hook-form@7.71.2(react@19.2.4))':
@@ -10230,7 +10443,7 @@ snapshots:
 
   '@opentelemetry/api-logs@0.203.0':
     dependencies:
-      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/api': 1.9.1
 
   '@opentelemetry/api-logs@0.208.0':
     dependencies:
@@ -10238,74 +10451,76 @@ snapshots:
 
   '@opentelemetry/api@1.9.0': {}
 
-  '@opentelemetry/auto-instrumentations-node@0.62.2(@opentelemetry/api@1.9.0)(@opentelemetry/core@2.6.0(@opentelemetry/api@1.9.0))':
+  '@opentelemetry/api@1.9.1': {}
+
+  '@opentelemetry/auto-instrumentations-node@0.62.2(@opentelemetry/api@1.9.1)(@opentelemetry/core@2.7.1(@opentelemetry/api@1.9.0))':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.6.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-amqplib': 0.50.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-aws-lambda': 0.54.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-aws-sdk': 0.58.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-bunyan': 0.49.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-cassandra-driver': 0.49.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-connect': 0.47.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-cucumber': 0.19.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-dataloader': 0.21.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-dns': 0.47.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-express': 0.52.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-fastify': 0.48.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-fs': 0.23.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-generic-pool': 0.47.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-graphql': 0.51.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-grpc': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-hapi': 0.50.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-http': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-ioredis': 0.51.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-kafkajs': 0.13.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-knex': 0.48.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-koa': 0.51.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-lru-memoizer': 0.48.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-memcached': 0.47.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-mongodb': 0.56.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-mongoose': 0.50.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-mysql': 0.49.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-mysql2': 0.50.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-nestjs-core': 0.49.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-net': 0.47.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-oracledb': 0.29.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-pg': 0.56.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-pino': 0.50.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-redis': 0.52.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-restify': 0.49.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-router': 0.48.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-runtime-node': 0.17.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-socket.io': 0.50.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-tedious': 0.22.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-undici': 0.14.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-winston': 0.48.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resource-detector-alibaba-cloud': 0.31.11(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resource-detector-aws': 2.13.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resource-detector-azure': 0.10.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resource-detector-container': 0.7.11(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resource-detector-gcp': 0.37.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 2.6.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-node': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.7.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-amqplib': 0.50.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-aws-lambda': 0.54.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-aws-sdk': 0.58.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-bunyan': 0.49.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-cassandra-driver': 0.49.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-connect': 0.47.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-cucumber': 0.19.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-dataloader': 0.21.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-dns': 0.47.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-express': 0.52.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-fastify': 0.48.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-fs': 0.23.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-generic-pool': 0.47.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-graphql': 0.51.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-grpc': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-hapi': 0.50.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-http': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-ioredis': 0.51.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-kafkajs': 0.13.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-knex': 0.48.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-koa': 0.51.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-lru-memoizer': 0.48.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-memcached': 0.47.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-mongodb': 0.56.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-mongoose': 0.50.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-mysql': 0.49.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-mysql2': 0.50.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-nestjs-core': 0.49.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-net': 0.47.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-oracledb': 0.29.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-pg': 0.56.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-pino': 0.50.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-redis': 0.52.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-restify': 0.49.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-router': 0.48.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-runtime-node': 0.17.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-socket.io': 0.50.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-tedious': 0.22.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-undici': 0.14.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-winston': 0.48.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/resource-detector-alibaba-cloud': 0.31.11(@opentelemetry/api@1.9.1)
+      '@opentelemetry/resource-detector-aws': 2.17.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/resource-detector-azure': 0.10.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/resource-detector-container': 0.7.11(@opentelemetry/api@1.9.1)
+      '@opentelemetry/resource-detector-gcp': 0.37.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/resources': 2.7.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/sdk-node': 0.203.0(@opentelemetry/api@1.9.1)
     transitivePeerDependencies:
       - encoding
       - supports-color
 
-  '@opentelemetry/context-async-hooks@2.0.1(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/context-async-hooks@2.0.1(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/api': 1.9.1
 
-  '@opentelemetry/context-async-hooks@2.6.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/context-async-hooks@2.7.1(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/api': 1.9.1
 
-  '@opentelemetry/core@2.0.1(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/core@2.0.1(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/semantic-conventions': 1.39.0
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/semantic-conventions': 1.40.0
 
   '@opentelemetry/core@2.2.0(@opentelemetry/api@1.9.0)':
     dependencies:
@@ -10317,24 +10532,34 @@ snapshots:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/semantic-conventions': 1.39.0
 
-  '@opentelemetry/exporter-logs-otlp-grpc@0.203.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/core@2.7.1(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/semantic-conventions': 1.40.0
+
+  '@opentelemetry/core@2.7.1(@opentelemetry/api@1.9.1)':
+    dependencies:
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/semantic-conventions': 1.40.0
+
+  '@opentelemetry/exporter-logs-otlp-grpc@0.203.0(@opentelemetry/api@1.9.1)':
     dependencies:
       '@grpc/grpc-js': 1.14.3
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-exporter-base': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-grpc-exporter-base': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-transformer': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-logs': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/otlp-exporter-base': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/otlp-grpc-exporter-base': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/otlp-transformer': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/sdk-logs': 0.203.0(@opentelemetry/api@1.9.1)
 
-  '@opentelemetry/exporter-logs-otlp-http@0.203.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/exporter-logs-otlp-http@0.203.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/api': 1.9.1
       '@opentelemetry/api-logs': 0.203.0
-      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-exporter-base': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-transformer': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-logs': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/otlp-exporter-base': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/otlp-transformer': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/sdk-logs': 0.203.0(@opentelemetry/api@1.9.1)
 
   '@opentelemetry/exporter-logs-otlp-http@0.208.0(@opentelemetry/api@1.9.0)':
     dependencies:
@@ -10345,446 +10570,446 @@ snapshots:
       '@opentelemetry/otlp-transformer': 0.208.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/sdk-logs': 0.208.0(@opentelemetry/api@1.9.0)
 
-  '@opentelemetry/exporter-logs-otlp-proto@0.203.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/exporter-logs-otlp-proto@0.203.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/api': 1.9.1
       '@opentelemetry/api-logs': 0.203.0
-      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-exporter-base': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-transformer': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-logs': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-trace-base': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/otlp-exporter-base': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/otlp-transformer': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/sdk-logs': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/sdk-trace-base': 2.0.1(@opentelemetry/api@1.9.1)
 
-  '@opentelemetry/exporter-metrics-otlp-grpc@0.203.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/exporter-metrics-otlp-grpc@0.203.0(@opentelemetry/api@1.9.1)':
     dependencies:
       '@grpc/grpc-js': 1.14.3
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/exporter-metrics-otlp-http': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-exporter-base': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-grpc-exporter-base': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-transformer': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-metrics': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/exporter-metrics-otlp-http': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/otlp-exporter-base': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/otlp-grpc-exporter-base': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/otlp-transformer': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/sdk-metrics': 2.0.1(@opentelemetry/api@1.9.1)
 
-  '@opentelemetry/exporter-metrics-otlp-http@0.203.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/exporter-metrics-otlp-http@0.203.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-exporter-base': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-transformer': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-metrics': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/otlp-exporter-base': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/otlp-transformer': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/sdk-metrics': 2.0.1(@opentelemetry/api@1.9.1)
 
-  '@opentelemetry/exporter-metrics-otlp-proto@0.203.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/exporter-metrics-otlp-proto@0.203.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/exporter-metrics-otlp-http': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-exporter-base': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-transformer': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-metrics': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/exporter-metrics-otlp-http': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/otlp-exporter-base': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/otlp-transformer': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/sdk-metrics': 2.0.1(@opentelemetry/api@1.9.1)
 
-  '@opentelemetry/exporter-prometheus@0.203.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/exporter-prometheus@0.203.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-metrics': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/sdk-metrics': 2.0.1(@opentelemetry/api@1.9.1)
 
-  '@opentelemetry/exporter-trace-otlp-grpc@0.203.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/exporter-trace-otlp-grpc@0.203.0(@opentelemetry/api@1.9.1)':
     dependencies:
       '@grpc/grpc-js': 1.14.3
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-exporter-base': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-grpc-exporter-base': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-transformer': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-trace-base': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/otlp-exporter-base': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/otlp-grpc-exporter-base': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/otlp-transformer': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/sdk-trace-base': 2.0.1(@opentelemetry/api@1.9.1)
 
-  '@opentelemetry/exporter-trace-otlp-http@0.203.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/exporter-trace-otlp-http@0.203.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-exporter-base': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-transformer': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-trace-base': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/otlp-exporter-base': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/otlp-transformer': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/sdk-trace-base': 2.0.1(@opentelemetry/api@1.9.1)
 
-  '@opentelemetry/exporter-trace-otlp-proto@0.203.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/exporter-trace-otlp-proto@0.203.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-exporter-base': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-transformer': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-trace-base': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/otlp-exporter-base': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/otlp-transformer': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/sdk-trace-base': 2.0.1(@opentelemetry/api@1.9.1)
 
-  '@opentelemetry/exporter-zipkin@2.0.1(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/exporter-zipkin@2.0.1(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-trace-base': 2.0.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.39.0
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/sdk-trace-base': 2.0.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
 
-  '@opentelemetry/instrumentation-amqplib@0.50.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-amqplib@0.50.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.6.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.39.0
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.7.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-aws-lambda@0.54.1(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-aws-lambda@0.54.1(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.39.0
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
       '@types/aws-lambda': 8.10.152
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-aws-sdk@0.58.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-aws-sdk@0.58.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.6.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.39.0
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.7.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-bunyan@0.49.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-bunyan@0.49.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/api': 1.9.1
       '@opentelemetry/api-logs': 0.203.0
-      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.1)
       '@types/bunyan': 1.8.11
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-cassandra-driver@0.49.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-cassandra-driver@0.49.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.39.0
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-connect@0.47.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-connect@0.47.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.6.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.39.0
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.7.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
       '@types/connect': 3.4.38
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-cucumber@0.19.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-cucumber@0.19.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.39.0
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-dataloader@0.21.1(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-dataloader@0.21.1(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-dns@0.47.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-dns@0.47.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-express@0.52.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-express@0.52.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.6.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.39.0
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.7.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-fastify@0.48.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-fastify@0.48.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.6.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.39.0
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.7.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-fs@0.23.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-fs@0.23.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.6.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.7.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-generic-pool@0.47.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-generic-pool@0.47.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-graphql@0.51.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-graphql@0.51.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-grpc@0.203.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-grpc@0.203.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.39.0
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-hapi@0.50.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-hapi@0.50.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.6.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.39.0
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.7.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-http@0.203.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-http@0.203.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.39.0
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
       forwarded-parse: 2.1.2
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-ioredis@0.51.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-ioredis@0.51.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/redis-common': 0.38.2
-      '@opentelemetry/semantic-conventions': 1.39.0
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/redis-common': 0.38.3
+      '@opentelemetry/semantic-conventions': 1.40.0
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-kafkajs@0.13.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-kafkajs@0.13.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.39.0
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-knex@0.48.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-knex@0.48.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.39.0
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-koa@0.51.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-koa@0.51.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.6.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.39.0
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.7.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-lru-memoizer@0.48.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-lru-memoizer@0.48.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-memcached@0.47.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-memcached@0.47.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.39.0
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
       '@types/memcached': 2.2.10
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-mongodb@0.56.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-mongodb@0.56.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.39.0
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-mongoose@0.50.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-mongoose@0.50.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.6.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.39.0
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.7.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-mysql2@0.50.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-mysql2@0.50.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.39.0
-      '@opentelemetry/sql-common': 0.41.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
+      '@opentelemetry/sql-common': 0.41.2(@opentelemetry/api@1.9.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-mysql@0.49.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-mysql@0.49.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.39.0
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
       '@types/mysql': 2.15.27
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-nestjs-core@0.49.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-nestjs-core@0.49.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.39.0
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-net@0.47.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-net@0.47.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.39.0
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-oracledb@0.29.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-oracledb@0.29.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.39.0
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
       '@types/oracledb': 6.5.2
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-pg@0.56.1(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-pg@0.56.1(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.6.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.39.0
-      '@opentelemetry/sql-common': 0.41.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.7.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
+      '@opentelemetry/sql-common': 0.41.2(@opentelemetry/api@1.9.1)
       '@types/pg': 8.15.5
       '@types/pg-pool': 2.0.6
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-pino@0.50.1(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-pino@0.50.1(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/api': 1.9.1
       '@opentelemetry/api-logs': 0.203.0
-      '@opentelemetry/core': 2.6.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/core': 2.7.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-redis@0.52.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-redis@0.52.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/redis-common': 0.38.2
-      '@opentelemetry/semantic-conventions': 1.39.0
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/redis-common': 0.38.3
+      '@opentelemetry/semantic-conventions': 1.40.0
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-restify@0.49.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-restify@0.49.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.6.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.39.0
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.7.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-router@0.48.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-router@0.48.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.39.0
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-runtime-node@0.17.1(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-runtime-node@0.17.1(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-socket.io@0.50.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-socket.io@0.50.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.39.0
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-tedious@0.22.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-tedious@0.22.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.39.0
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
       '@types/tedious': 4.0.14
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-undici@0.14.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-undici@0.14.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.6.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.7.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-winston@0.48.1(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-winston@0.48.1(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/api': 1.9.1
       '@opentelemetry/api-logs': 0.203.0
-      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation@0.203.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation@0.203.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/api': 1.9.1
       '@opentelemetry/api-logs': 0.203.0
       import-in-the-middle: 1.15.0
       require-in-the-middle: 7.5.2
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/otlp-exporter-base@0.203.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/otlp-exporter-base@0.203.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-transformer': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/otlp-transformer': 0.203.0(@opentelemetry/api@1.9.1)
 
   '@opentelemetry/otlp-exporter-base@0.208.0(@opentelemetry/api@1.9.0)':
     dependencies:
@@ -10792,24 +11017,24 @@ snapshots:
       '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/otlp-transformer': 0.208.0(@opentelemetry/api@1.9.0)
 
-  '@opentelemetry/otlp-grpc-exporter-base@0.203.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/otlp-grpc-exporter-base@0.203.0(@opentelemetry/api@1.9.1)':
     dependencies:
       '@grpc/grpc-js': 1.14.3
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-exporter-base': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-transformer': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/otlp-exporter-base': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/otlp-transformer': 0.203.0(@opentelemetry/api@1.9.1)
 
-  '@opentelemetry/otlp-transformer@0.203.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/otlp-transformer@0.203.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/api': 1.9.1
       '@opentelemetry/api-logs': 0.203.0
-      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-logs': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-metrics': 2.0.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-trace-base': 2.0.1(@opentelemetry/api@1.9.0)
-      protobufjs: 7.5.5
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/sdk-logs': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/sdk-metrics': 2.0.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/sdk-trace-base': 2.0.1(@opentelemetry/api@1.9.1)
+      protobufjs: 7.5.7
 
   '@opentelemetry/otlp-transformer@0.208.0(@opentelemetry/api@1.9.0)':
     dependencies:
@@ -10822,60 +11047,60 @@ snapshots:
       '@opentelemetry/sdk-trace-base': 2.2.0(@opentelemetry/api@1.9.0)
       protobufjs: 7.5.5
 
-  '@opentelemetry/propagator-b3@2.0.1(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/propagator-b3@2.0.1(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.1)
 
-  '@opentelemetry/propagator-jaeger@2.0.1(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/propagator-jaeger@2.0.1(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.1)
 
-  '@opentelemetry/redis-common@0.38.2': {}
+  '@opentelemetry/redis-common@0.38.3': {}
 
-  '@opentelemetry/resource-detector-alibaba-cloud@0.31.11(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/resource-detector-alibaba-cloud@0.31.11(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.6.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 2.6.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.7.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/resources': 2.7.1(@opentelemetry/api@1.9.1)
 
-  '@opentelemetry/resource-detector-aws@2.13.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/resource-detector-aws@2.17.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.6.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 2.6.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.39.0
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.7.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/resources': 2.7.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
 
-  '@opentelemetry/resource-detector-azure@0.10.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/resource-detector-azure@0.10.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.6.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 2.6.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.39.0
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.7.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/resources': 2.7.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
 
-  '@opentelemetry/resource-detector-container@0.7.11(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/resource-detector-container@0.7.11(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.6.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 2.6.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.7.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/resources': 2.7.1(@opentelemetry/api@1.9.1)
 
-  '@opentelemetry/resource-detector-gcp@0.37.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/resource-detector-gcp@0.37.0(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.6.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 2.6.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.39.0
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.7.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/resources': 2.7.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
       gcp-metadata: 6.1.1
     transitivePeerDependencies:
       - encoding
       - supports-color
 
-  '@opentelemetry/resources@2.0.1(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/resources@2.0.1(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.39.0
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
 
   '@opentelemetry/resources@2.2.0(@opentelemetry/api@1.9.0)':
     dependencies:
@@ -10889,12 +11114,18 @@ snapshots:
       '@opentelemetry/core': 2.6.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.39.0
 
-  '@opentelemetry/sdk-logs@0.203.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/resources@2.7.1(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.7.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
+
+  '@opentelemetry/sdk-logs@0.203.0(@opentelemetry/api@1.9.1)':
+    dependencies:
+      '@opentelemetry/api': 1.9.1
       '@opentelemetry/api-logs': 0.203.0
-      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.1)
 
   '@opentelemetry/sdk-logs@0.208.0(@opentelemetry/api@1.9.0)':
     dependencies:
@@ -10903,11 +11134,11 @@ snapshots:
       '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/resources': 2.2.0(@opentelemetry/api@1.9.0)
 
-  '@opentelemetry/sdk-metrics@2.0.1(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/sdk-metrics@2.0.1(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.1)
 
   '@opentelemetry/sdk-metrics@2.2.0(@opentelemetry/api@1.9.0)':
     dependencies:
@@ -10915,40 +11146,46 @@ snapshots:
       '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/resources': 2.2.0(@opentelemetry/api@1.9.0)
 
-  '@opentelemetry/sdk-node@0.203.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/sdk-metrics@2.7.1(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.7.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/resources': 2.7.1(@opentelemetry/api@1.9.1)
+
+  '@opentelemetry/sdk-node@0.203.0(@opentelemetry/api@1.9.1)':
+    dependencies:
+      '@opentelemetry/api': 1.9.1
       '@opentelemetry/api-logs': 0.203.0
-      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/exporter-logs-otlp-grpc': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/exporter-logs-otlp-http': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/exporter-logs-otlp-proto': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/exporter-metrics-otlp-grpc': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/exporter-metrics-otlp-http': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/exporter-metrics-otlp-proto': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/exporter-prometheus': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/exporter-trace-otlp-grpc': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/exporter-trace-otlp-http': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/exporter-trace-otlp-proto': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/exporter-zipkin': 2.0.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/propagator-b3': 2.0.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/propagator-jaeger': 2.0.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-logs': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-metrics': 2.0.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-trace-base': 2.0.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-trace-node': 2.0.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.39.0
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/exporter-logs-otlp-grpc': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/exporter-logs-otlp-http': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/exporter-logs-otlp-proto': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/exporter-metrics-otlp-grpc': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/exporter-metrics-otlp-http': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/exporter-metrics-otlp-proto': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/exporter-prometheus': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/exporter-trace-otlp-grpc': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/exporter-trace-otlp-http': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/exporter-trace-otlp-proto': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/exporter-zipkin': 2.0.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/propagator-b3': 2.0.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/propagator-jaeger': 2.0.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/sdk-logs': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/sdk-metrics': 2.0.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/sdk-trace-base': 2.0.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/sdk-trace-node': 2.0.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/sdk-trace-base@2.0.1(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/sdk-trace-base@2.0.1(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.39.0
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
 
   '@opentelemetry/sdk-trace-base@2.2.0(@opentelemetry/api@1.9.0)':
     dependencies:
@@ -10957,36 +11194,95 @@ snapshots:
       '@opentelemetry/resources': 2.2.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.39.0
 
-  '@opentelemetry/sdk-trace-base@2.6.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/sdk-trace-base@2.7.1(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.6.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 2.6.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.39.0
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.7.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/resources': 2.7.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
 
-  '@opentelemetry/sdk-trace-node@2.0.1(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/sdk-trace-node@2.0.1(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/context-async-hooks': 2.0.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-trace-base': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/context-async-hooks': 2.0.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/sdk-trace-base': 2.0.1(@opentelemetry/api@1.9.1)
 
-  '@opentelemetry/sdk-trace-node@2.6.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/sdk-trace-node@2.7.1(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/context-async-hooks': 2.6.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/core': 2.6.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-trace-base': 2.6.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/context-async-hooks': 2.7.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/core': 2.7.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/sdk-trace-base': 2.7.1(@opentelemetry/api@1.9.1)
 
   '@opentelemetry/semantic-conventions@1.39.0': {}
 
-  '@opentelemetry/sql-common@0.41.2(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/semantic-conventions@1.40.0': {}
+
+  '@opentelemetry/sql-common@0.41.2(@opentelemetry/api@1.9.1)':
     dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.6.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.7.1(@opentelemetry/api@1.9.1)
 
   '@orama/orama@3.1.18': {}
 
+  '@oxfmt/binding-android-arm-eabi@0.45.0':
+    optional: true
+
+  '@oxfmt/binding-android-arm64@0.45.0':
+    optional: true
+
+  '@oxfmt/binding-darwin-arm64@0.45.0':
+    optional: true
+
+  '@oxfmt/binding-darwin-x64@0.45.0':
+    optional: true
+
+  '@oxfmt/binding-freebsd-x64@0.45.0':
+    optional: true
+
+  '@oxfmt/binding-linux-arm-gnueabihf@0.45.0':
+    optional: true
+
+  '@oxfmt/binding-linux-arm-musleabihf@0.45.0':
+    optional: true
+
+  '@oxfmt/binding-linux-arm64-gnu@0.45.0':
+    optional: true
+
+  '@oxfmt/binding-linux-arm64-musl@0.45.0':
+    optional: true
+
+  '@oxfmt/binding-linux-ppc64-gnu@0.45.0':
+    optional: true
+
+  '@oxfmt/binding-linux-riscv64-gnu@0.45.0':
+    optional: true
+
+  '@oxfmt/binding-linux-riscv64-musl@0.45.0':
+    optional: true
+
+  '@oxfmt/binding-linux-s390x-gnu@0.45.0':
+    optional: true
+
+  '@oxfmt/binding-linux-x64-gnu@0.45.0':
+    optional: true
+
+  '@oxfmt/binding-linux-x64-musl@0.45.0':
+    optional: true
+
+  '@oxfmt/binding-openharmony-arm64@0.45.0':
+    optional: true
+
+  '@oxfmt/binding-win32-arm64-msvc@0.45.0':
+    optional: true
+
+  '@oxfmt/binding-win32-ia32-msvc@0.45.0':
+    optional: true
+
+  '@oxfmt/binding-win32-x64-msvc@0.45.0':
+    optional: true
+
   '@parcel/watcher-android-arm64@2.5.6':
     optional: true
 
@@ -11279,6 +11575,8 @@ snapshots:
 
   '@protobufjs/codegen@2.0.4': {}
 
+  '@protobufjs/codegen@2.0.5': {}
+
   '@protobufjs/eventemitter@1.1.0': {}
 
   '@protobufjs/fetch@1.1.0':
@@ -11290,12 +11588,16 @@ snapshots:
 
   '@protobufjs/inquire@1.1.0': {}
 
+  '@protobufjs/inquire@1.1.1': {}
+
   '@protobufjs/path@1.1.2': {}
 
   '@protobufjs/pool@1.1.0': {}
 
   '@protobufjs/utf8@1.1.0': {}
 
+  '@protobufjs/utf8@1.1.1': {}
+
   '@radix-ui/number@1.1.1': {}
 
   '@radix-ui/primitive@1.0.0':
@@ -12405,59 +12707,58 @@ snapshots:
 
   '@rocicorp/resolver@1.0.2': {}
 
-  '@rocicorp/zero-sqlite3@1.0.15':
+  '@rocicorp/zero-sqlite3@1.0.18':
     dependencies:
       bindings: 1.5.0
       prebuild-install: 7.1.3
 
-  '@rocicorp/zero@0.26.2(@opentelemetry/core@2.6.0(@opentelemetry/api@1.9.0))':
+  '@rocicorp/zero@1.4.0(@opentelemetry/core@2.7.1(@opentelemetry/api@1.9.0))':
     dependencies:
       '@badrap/valita': 0.3.11
       '@databases/escape-identifier': 1.0.3
       '@databases/sql': 3.3.0
-      '@dotenvx/dotenvx': 1.57.2
+      '@dotenvx/dotenvx': 1.65.0
       '@drdgvhbh/postgres-error-codes': 0.0.6
       '@fastify/cors': 10.1.0
       '@fastify/websocket': 11.2.0
       '@google-cloud/precise-date': 4.0.0
-      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/api': 1.9.1
       '@opentelemetry/api-logs': 0.203.0
-      '@opentelemetry/auto-instrumentations-node': 0.62.2(@opentelemetry/api@1.9.0)(@opentelemetry/core@2.6.0(@opentelemetry/api@1.9.0))
-      '@opentelemetry/exporter-metrics-otlp-http': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 2.6.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-metrics': 2.2.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-node': 0.203.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-trace-node': 2.6.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/auto-instrumentations-node': 0.62.2(@opentelemetry/api@1.9.1)(@opentelemetry/core@2.7.1(@opentelemetry/api@1.9.0))
+      '@opentelemetry/exporter-metrics-otlp-http': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/resources': 2.7.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/sdk-metrics': 2.7.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/sdk-node': 0.203.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/sdk-trace-node': 2.7.1(@opentelemetry/api@1.9.1)
       '@postgresql-typed/oids': 0.2.0
       '@rocicorp/lock': 1.0.4
       '@rocicorp/logger': 5.4.0
       '@rocicorp/resolver': 1.0.2
-      '@rocicorp/zero-sqlite3': 1.0.15
+      '@rocicorp/zero-sqlite3': 1.0.18
       '@standard-schema/spec': 1.1.0
       '@types/basic-auth': 1.1.8
       '@types/ws': 8.18.1
       basic-auth: 2.0.1
-      chalk: 5.6.2
       chalk-template: 1.1.2
       chokidar: 4.0.3
       cloudevents: 10.0.0
       command-line-args: 6.0.2
       command-line-usage: 7.0.4
-      compare-utf8: 0.1.1
-      defu: 6.1.4
+      compare-utf8: 0.2.0
+      defu: 6.1.7
       eventemitter3: 5.0.4
-      fastify: 5.8.4
+      fastify: 5.8.5
       is-in-subnet: 4.0.1
       jose: 5.10.0
       js-xxhash: 4.0.0
       json-custom-numbers: 3.1.1
       kasi: 1.1.2
-      nanoid: 5.1.7
+      nanoid: 5.1.11
+      oxfmt: 0.45.0
       parse-prometheus-text-format: 1.1.1
       pg-format: pg-format-fix@1.0.5
       postgres: 3.4.7
-      prettier: 3.8.1
-      semver: 7.7.4
+      semver: 7.8.0
       tsx: 4.21.0
       url-pattern: 1.0.3
       urlpattern-polyfill: 10.1.0
@@ -13017,7 +13318,7 @@ snapshots:
   '@types/pg@8.15.5':
     dependencies:
       '@types/node': 20.19.33
-      pg-protocol: 1.11.0
+      pg-protocol: 1.13.0
       pg-types: 2.2.0
 
   '@types/pg@8.16.0':
@@ -13263,13 +13564,13 @@ snapshots:
     optionalDependencies:
       react: 19.2.4
 
-  ajv-formats@2.1.1(ajv@8.18.0):
+  ajv-formats@2.1.1(ajv@8.20.0):
     optionalDependencies:
-      ajv: 8.18.0
+      ajv: 8.20.0
 
-  ajv-formats@3.0.1(ajv@8.18.0):
+  ajv-formats@3.0.1(ajv@8.20.0):
     optionalDependencies:
-      ajv: 8.18.0
+      ajv: 8.20.0
 
   ajv@6.14.0:
     dependencies:
@@ -13278,10 +13579,10 @@ snapshots:
       json-schema-traverse: 0.4.1
       uri-js: 4.4.1
 
-  ajv@8.18.0:
+  ajv@8.20.0:
     dependencies:
       fast-deep-equal: 3.1.3
-      fast-uri: 3.1.0
+      fast-uri: 3.1.2
       json-schema-traverse: 1.0.0
       require-from-string: 2.0.2
 
@@ -13567,8 +13868,8 @@ snapshots:
 
   cloudevents@10.0.0:
     dependencies:
-      ajv: 8.18.0
-      ajv-formats: 2.1.1(ajv@8.18.0)
+      ajv: 8.20.0
+      ajv-formats: 2.1.1(ajv@8.20.0)
       json-bigint: 1.0.0
       process: 0.11.10
       util: 0.12.5
@@ -13628,7 +13929,7 @@ snapshots:
 
   commander@8.3.0: {}
 
-  compare-utf8@0.1.1: {}
+  compare-utf8@0.2.0: {}
 
   compute-scroll-into-view@3.1.1: {}
 
@@ -13769,7 +14070,7 @@ snapshots:
       has-property-descriptors: 1.0.2
       object-keys: 1.1.1
 
-  defu@6.1.4: {}
+  defu@6.1.7: {}
 
   dequal@2.0.3: {}
 
@@ -13869,7 +14170,7 @@ snapshots:
 
   eciesjs@0.4.18:
     dependencies:
-      '@ecies/ciphers': 0.2.5(@noble/ciphers@1.3.0)
+      '@ecies/ciphers': 0.2.6(@noble/ciphers@1.3.0)
       '@noble/ciphers': 1.3.0
       '@noble/curves': 1.9.7
       '@noble/hashes': 1.8.0
@@ -13887,7 +14188,7 @@ snapshots:
       react: 19.2.4
       react-dom: 19.2.4(react@19.2.4)
       react-easy-sort: 1.8.0(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
-      tailwind-merge: 3.5.0
+      tailwind-merge: 3.6.0
     transitivePeerDependencies:
       - '@types/react'
       - '@types/react-dom'
@@ -14393,12 +14694,12 @@ snapshots:
 
   fast-json-stable-stringify@2.1.0: {}
 
-  fast-json-stringify@6.3.0:
+  fast-json-stringify@6.4.0:
     dependencies:
       '@fastify/merge-json-schemas': 0.2.1
-      ajv: 8.18.0
-      ajv-formats: 3.0.1(ajv@8.18.0)
-      fast-uri: 3.1.0
+      ajv: 8.20.0
+      ajv-formats: 3.0.1(ajv@8.20.0)
+      fast-uri: 3.1.2
       json-schema-ref-resolver: 3.0.0
       rfdc: 1.4.1
 
@@ -14408,11 +14709,11 @@ snapshots:
     dependencies:
       fast-decode-uri-component: 1.0.1
 
-  fast-uri@3.1.0: {}
+  fast-uri@3.1.2: {}
 
   fastify-plugin@5.1.0: {}
 
-  fastify@5.8.4:
+  fastify@5.8.5:
     dependencies:
       '@fastify/ajv-compiler': 4.0.5
       '@fastify/error': 4.2.0
@@ -14420,14 +14721,14 @@ snapshots:
       '@fastify/proxy-addr': 5.1.0
       abstract-logging: 2.0.1
       avvio: 9.2.0
-      fast-json-stringify: 6.3.0
-      find-my-way: 9.5.0
+      fast-json-stringify: 6.4.0
+      find-my-way: 9.6.0
       light-my-request: 6.6.0
       pino: 10.3.1
       process-warning: 5.0.0
       rfdc: 1.4.1
       secure-json-parse: 4.1.0
-      semver: 7.7.4
+      semver: 7.8.0
       toad-cache: 3.7.0
 
   fastq@1.20.1:
@@ -14442,6 +14743,10 @@ snapshots:
     optionalDependencies:
       picomatch: 4.0.3
 
+  fdir@6.5.0(picomatch@4.0.4):
+    optionalDependencies:
+      picomatch: 4.0.4
+
   fflate@0.4.8: {}
 
   file-entry-cache@8.0.0:
@@ -14458,11 +14763,11 @@ snapshots:
     dependencies:
       to-regex-range: 5.0.1
 
-  find-my-way@9.5.0:
+  find-my-way@9.6.0:
     dependencies:
       fast-deep-equal: 3.1.3
       fast-querystring: 1.1.2
-      safe-regex2: 5.1.0
+      safe-regex2: 5.1.1
 
   find-replace@5.0.2: {}
 
@@ -14736,6 +15041,10 @@ snapshots:
     dependencies:
       function-bind: 1.1.2
 
+  hasown@2.0.3:
+    dependencies:
+      function-bind: 1.1.2
+
   hast-util-from-dom@5.0.1:
     dependencies:
       '@types/hast': 3.0.4
@@ -14989,7 +15298,7 @@ snapshots:
       '@formatjs/icu-messageformat-parser': 3.5.1
       tslib: 2.8.1
 
-  ipaddr.js@2.3.0: {}
+  ipaddr.js@2.4.0: {}
 
   is-alphabetical@1.0.4: {}
 
@@ -15045,6 +15354,10 @@ snapshots:
     dependencies:
       hasown: 2.0.2
 
+  is-core-module@2.16.2:
+    dependencies:
+      hasown: 2.0.3
+
   is-data-view@1.0.2:
     dependencies:
       call-bound: 1.0.4
@@ -15924,6 +16237,8 @@ snapshots:
 
   nanoid@3.3.11: {}
 
+  nanoid@5.1.11: {}
+
   nanoid@5.1.7: {}
 
   napi-build-utils@2.0.0: {}
@@ -15989,9 +16304,9 @@ snapshots:
       lower-case: 2.0.2
       tslib: 2.8.1
 
-  node-abi@3.89.0:
+  node-abi@3.92.0:
     dependencies:
-      semver: 7.7.4
+      semver: 7.8.0
 
   node-addon-api@7.1.1: {}
 
@@ -16111,6 +16426,30 @@ snapshots:
       object-keys: 1.1.1
       safe-push-apply: 1.0.0
 
+  oxfmt@0.45.0:
+    dependencies:
+      tinypool: 2.1.0
+    optionalDependencies:
+      '@oxfmt/binding-android-arm-eabi': 0.45.0
+      '@oxfmt/binding-android-arm64': 0.45.0
+      '@oxfmt/binding-darwin-arm64': 0.45.0
+      '@oxfmt/binding-darwin-x64': 0.45.0
+      '@oxfmt/binding-freebsd-x64': 0.45.0
+      '@oxfmt/binding-linux-arm-gnueabihf': 0.45.0
+      '@oxfmt/binding-linux-arm-musleabihf': 0.45.0
+      '@oxfmt/binding-linux-arm64-gnu': 0.45.0
+      '@oxfmt/binding-linux-arm64-musl': 0.45.0
+      '@oxfmt/binding-linux-ppc64-gnu': 0.45.0
+      '@oxfmt/binding-linux-riscv64-gnu': 0.45.0
+      '@oxfmt/binding-linux-riscv64-musl': 0.45.0
+      '@oxfmt/binding-linux-s390x-gnu': 0.45.0
+      '@oxfmt/binding-linux-x64-gnu': 0.45.0
+      '@oxfmt/binding-linux-x64-musl': 0.45.0
+      '@oxfmt/binding-openharmony-arm64': 0.45.0
+      '@oxfmt/binding-win32-arm64-msvc': 0.45.0
+      '@oxfmt/binding-win32-ia32-msvc': 0.45.0
+      '@oxfmt/binding-win32-x64-msvc': 0.45.0
+
   p-limit@3.1.0:
     dependencies:
       yocto-queue: 0.1.0
@@ -16193,6 +16532,8 @@ snapshots:
 
   pg-protocol@1.11.0: {}
 
+  pg-protocol@1.13.0: {}
+
   pg-types@2.2.0:
     dependencies:
       pg-int8: 1.0.1
@@ -16221,6 +16562,8 @@ snapshots:
 
   picomatch@4.0.3: {}
 
+  picomatch@4.0.4: {}
+
   pino-abstract-transport@3.0.0:
     dependencies:
       split2: 4.2.0
@@ -16239,7 +16582,7 @@ snapshots:
       real-require: 0.2.0
       safe-stable-stringify: 2.5.0
       sonic-boom: 4.2.1
-      thread-stream: 4.0.0
+      thread-stream: 4.1.0
 
   platejs@52.0.17(@types/react@19.2.14)(immer@10.2.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(scheduler@0.27.0)(use-sync-external-store@1.6.0(react@19.2.4)):
     dependencies:
@@ -16344,7 +16687,7 @@ snapshots:
       minimist: 1.2.8
       mkdirp-classic: 0.5.3
       napi-build-utils: 2.0.0
-      node-abi: 3.89.0
+      node-abi: 3.92.0
       pump: 3.0.4
       rc: 1.2.8
       simple-get: 4.0.1
@@ -16353,8 +16696,6 @@ snapshots:
 
   prelude-ls@1.2.1: {}
 
-  prettier@3.8.1: {}
-
   prismjs@1.27.0: {}
 
   prismjs@1.30.0: {}
@@ -16394,6 +16735,21 @@ snapshots:
       '@types/node': 20.19.33
       long: 5.3.2
 
+  protobufjs@7.5.7:
+    dependencies:
+      '@protobufjs/aspromise': 1.1.2
+      '@protobufjs/base64': 1.1.2
+      '@protobufjs/codegen': 2.0.5
+      '@protobufjs/eventemitter': 1.1.0
+      '@protobufjs/fetch': 1.1.0
+      '@protobufjs/float': 1.0.2
+      '@protobufjs/inquire': 1.1.1
+      '@protobufjs/path': 1.1.2
+      '@protobufjs/pool': 1.1.0
+      '@protobufjs/utf8': 1.1.1
+      '@types/node': 20.19.33
+      long: 5.3.2
+
   proxy-compare@2.6.0: {}
 
   pump@3.0.4:
@@ -16661,7 +17017,7 @@ snapshots:
   readable-stream@3.6.2:
     dependencies:
       inherits: 2.0.4
-      string_decoder: 1.1.1
+      string_decoder: 1.3.0
       util-deprecate: 1.0.2
 
   readdirp@4.1.2: {}
@@ -16670,6 +17026,8 @@ snapshots:
 
   real-require@0.2.0: {}
 
+  real-require@1.0.0: {}
+
   recma-build-jsx@1.0.0:
     dependencies:
       '@types/estree': 1.0.8
@@ -16867,7 +17225,7 @@ snapshots:
     dependencies:
       debug: 4.4.3
       module-details-from-path: 1.0.4
-      resolve: 1.22.11
+      resolve: 1.22.12
     transitivePeerDependencies:
       - supports-color
 
@@ -16881,6 +17239,13 @@ snapshots:
       path-parse: 1.0.7
       supports-preserve-symlinks-flag: 1.0.0
 
+  resolve@1.22.12:
+    dependencies:
+      es-errors: 1.3.0
+      is-core-module: 2.16.2
+      path-parse: 1.0.7
+      supports-preserve-symlinks-flag: 1.0.0
+
   resolve@2.0.0-next.6:
     dependencies:
       es-errors: 1.3.0
@@ -16941,6 +17306,8 @@ snapshots:
 
   safe-buffer@5.1.2: {}
 
+  safe-buffer@5.2.1: {}
+
   safe-push-apply@1.0.0:
     dependencies:
       es-errors: 1.3.0
@@ -16952,7 +17319,7 @@ snapshots:
       es-errors: 1.3.0
       is-regex: 1.2.1
 
-  safe-regex2@5.1.0:
+  safe-regex2@5.1.1:
     dependencies:
       ret: 0.5.0
 
@@ -16972,6 +17339,8 @@ snapshots:
 
   semver@7.7.4: {}
 
+  semver@7.8.0: {}
+
   server-only@0.0.1: {}
 
   set-cookie-parser@2.7.2: {}
@@ -17257,6 +17626,10 @@ snapshots:
     dependencies:
       safe-buffer: 5.1.2
 
+  string_decoder@1.3.0:
+    dependencies:
+      safe-buffer: 5.2.1
+
   stringify-entities@4.0.4:
     dependencies:
       character-entities-html4: 2.1.0
@@ -17322,6 +17695,8 @@ snapshots:
 
   tailwind-merge@3.5.0: {}
 
+  tailwind-merge@3.6.0: {}
+
   tailwind-scrollbar-hide@4.0.0(tailwindcss@4.2.1):
     dependencies:
       tailwindcss: 4.2.1
@@ -17353,9 +17728,9 @@ snapshots:
     dependencies:
       utrie: 1.0.2
 
-  thread-stream@4.0.0:
+  thread-stream@4.1.0:
     dependencies:
-      real-require: 0.2.0
+      real-require: 1.0.0
 
   throttleit@2.1.0: {}
 
@@ -17372,6 +17747,8 @@ snapshots:
       fdir: 6.5.0(picomatch@4.0.3)
       picomatch: 4.0.3
 
+  tinypool@2.1.0: {}
+
   to-regex-range@5.0.1:
     dependencies:
       is-number: 7.0.0
@@ -17414,7 +17791,7 @@ snapshots:
 
   tunnel-agent@0.6.0:
     dependencies:
-      safe-buffer: 5.1.2
+      safe-buffer: 5.2.1
 
   type-check@0.4.0:
     dependencies:
@@ -17781,6 +18158,12 @@ snapshots:
 
   yocto-queue@0.1.0: {}
 
+  yocto-spinner@1.2.0:
+    dependencies:
+      yoctocolors: 2.1.2
+
+  yoctocolors@2.1.2: {}
+
   zod-to-json-schema@3.25.1(zod@4.3.6):
     dependencies:
       zod: 4.3.6

From d923d34e389bc61fdab7520cd41a9b9775e7fb26 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Tue, 12 May 2026 16:43:50 +0530
Subject: [PATCH 25/96] feat(migration): add migration 143 to force zero-cache
 resync after Zero upgrade

---
 .../143_force_zero_publication_resync.py      | 142 ++++++++++++++++++
 1 file changed, 142 insertions(+)
 create mode 100644 surfsense_backend/alembic/versions/143_force_zero_publication_resync.py

diff --git a/surfsense_backend/alembic/versions/143_force_zero_publication_resync.py b/surfsense_backend/alembic/versions/143_force_zero_publication_resync.py
new file mode 100644
index 000000000..147cbde56
--- /dev/null
+++ b/surfsense_backend/alembic/versions/143_force_zero_publication_resync.py
@@ -0,0 +1,142 @@
+"""force zero-cache to resync after upgrading to Zero >= 1.0
+
+Re-emits the current ``zero_publication`` shape using
+``ALTER PUBLICATION ... SET TABLE`` wrapped in
+``COMMENT ON PUBLICATION`` bookends. This is the publication-change
+hook documented for Zero ``>=1.0``:
+
+    https://zero.rocicorp.dev/docs/connecting-to-postgres#publication-changes
+
+Background
+----------
+Migrations 117 / 139 / 140 mutated ``zero_publication`` using
+``DROP PUBLICATION`` + ``CREATE PUBLICATION``. On Zero 0.26.2 that
+sequence did not reliably wake the zero-cache change-streamer, so
+affected installs ended up with a SQLite replica file (in the
+``surfsense-zero-cache`` volume) that was snapshotted against the
+pre-``user`` publication. The frontend Zero schema includes a
+``userTable`` query, which then failed with
+``SchemaVersionNotSupported`` and triggered the default
+``onUpdateNeeded`` -> ``location.reload()`` every WebSocket keepalive
+interval (~60s). See bug #1355.
+
+This migration emits the canonical publication shape one more time,
+this time using a pattern that fires Postgres event triggers and
+Zero's schema-change hook. With ``ZERO_AUTO_RESET=true`` (the default)
+and Zero ``>=1.0``, zero-cache responds by wiping its replica and
+doing a fresh initial sync from the corrected publication.
+
+The publication shape itself is unchanged versus migration 140 -- on
+installs whose replica is already correct, this is a no-op aside
+from the harmless event-trigger fire.
+
+Revision ID: 143
+Revises: 142
+"""
+
+from collections.abc import Sequence
+
+import sqlalchemy as sa
+
+from alembic import op
+
+revision: str = "143"
+down_revision: str | None = "142"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+PUBLICATION_NAME = "zero_publication"
+
+# Must stay in sync with the column lists in migrations 117 / 139 / 140.
+DOCUMENT_COLS = [
+    "id",
+    "title",
+    "document_type",
+    "search_space_id",
+    "folder_id",
+    "created_by_id",
+    "status",
+    "created_at",
+    "updated_at",
+]
+
+USER_COLS = [
+    "id",
+    "pages_limit",
+    "pages_used",
+    "premium_credit_micros_limit",
+    "premium_credit_micros_used",
+]
+
+
+def _has_zero_version(conn, table: str) -> bool:
+    return (
+        conn.execute(
+            sa.text(
+                "SELECT 1 FROM information_schema.columns "
+                "WHERE table_name = :tbl AND column_name = '_0_version'"
+            ),
+            {"tbl": table},
+        ).fetchone()
+        is not None
+    )
+
+
+def _build_set_table_ddl(
+    *, documents_has_zero_ver: bool, user_has_zero_ver: bool
+) -> str:
+    doc_cols = DOCUMENT_COLS + (['"_0_version"'] if documents_has_zero_ver else [])
+    user_cols = USER_COLS + (['"_0_version"'] if user_has_zero_ver else [])
+    doc_col_list = ", ".join(doc_cols)
+    user_col_list = ", ".join(user_cols)
+    return (
+        f"ALTER PUBLICATION {PUBLICATION_NAME} SET TABLE "
+        f"notifications, "
+        f"documents ({doc_col_list}), "
+        f"folders, "
+        f"search_source_connectors, "
+        f"new_chat_messages, "
+        f"chat_comments, "
+        f"chat_session_state, "
+        f'"user" ({user_col_list})'
+    )
+
+
+def upgrade() -> None:
+    conn = op.get_bind()
+
+    exists = conn.execute(
+        sa.text("SELECT 1 FROM pg_publication WHERE pubname = :name"),
+        {"name": PUBLICATION_NAME},
+    ).fetchone()
+    if not exists:
+        return
+
+    documents_has_zero_ver = _has_zero_version(conn, "documents")
+    user_has_zero_ver = _has_zero_version(conn, "user")
+
+    # The COMMENT-ALTER-COMMENT trio MUST run in a single transaction so
+    # Zero observes them as one schema-change event. Alembic's outer
+    # transaction already covers us, but a SAVEPOINT keeps the trio
+    # atomic with asyncpg, matching the pattern used in migrations
+    # 117 / 139 / 140.
+    tx = conn.begin_nested() if conn.in_transaction() else conn.begin()
+    with tx:
+        conn.execute(
+            sa.text(f"COMMENT ON PUBLICATION {PUBLICATION_NAME} IS 'pre-143-resync'")
+        )
+        conn.execute(
+            sa.text(
+                _build_set_table_ddl(
+                    documents_has_zero_ver=documents_has_zero_ver,
+                    user_has_zero_ver=user_has_zero_ver,
+                )
+            )
+        )
+        conn.execute(
+            sa.text(f"COMMENT ON PUBLICATION {PUBLICATION_NAME} IS 'post-143-resync'")
+        )
+
+
+def downgrade() -> None:
+    """No-op. The publication shape is unchanged versus migration 140."""

From c43bfdb1d97ac28ef366ee53367a8fe2e69126be Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Tue, 12 May 2026 17:31:49 +0530
Subject: [PATCH 26/96] chore(migration): update migration files to enforce new
 publication mutation pattern

---
 .../alembic/versions/116_create_zero_publication.py   | 11 +++++++++++
 .../117_optimize_zero_publication_column_lists.py     | 10 ++++++++++
 .../118_add_local_folder_sync_and_versioning.py       | 11 +++++++++++
 .../versions/139_add_user_to_zero_publication.py      | 10 ++++++++++
 .../versions/140_premium_tokens_to_credit_micros.py   | 10 ++++++++++
 5 files changed, 52 insertions(+)

diff --git a/surfsense_backend/alembic/versions/116_create_zero_publication.py b/surfsense_backend/alembic/versions/116_create_zero_publication.py
index ff74952a9..927673c35 100644
--- a/surfsense_backend/alembic/versions/116_create_zero_publication.py
+++ b/surfsense_backend/alembic/versions/116_create_zero_publication.py
@@ -5,6 +5,17 @@ queries via Zero, instead of replicating all tables in public schema.
 
 See: https://zero.rocicorp.dev/docs/zero-cache-config#app-publications
 
+NOTE for future migration authors: this is the ONLY migration allowed
+to use bare ``CREATE PUBLICATION``. All subsequent mutations of
+``zero_publication`` MUST use the ``COMMENT ON PUBLICATION`` bookend
+pattern wrapping an ``ALTER PUBLICATION ... SET TABLE`` -- copy the
+``upgrade()`` function from migration
+``143_force_zero_publication_resync.py`` as your starting template.
+Raw ``DROP``/``CREATE PUBLICATION`` in new migrations would
+re-introduce bug #1355 (zero-cache stuck on a stale replica snapshot
+because Zero >= 1.0's change-streamer never sees the schema-change
+event).
+
 Revision ID: 116
 Revises: 115
 """
diff --git a/surfsense_backend/alembic/versions/117_optimize_zero_publication_column_lists.py b/surfsense_backend/alembic/versions/117_optimize_zero_publication_column_lists.py
index 3ad5a043b..c21ed2bf0 100644
--- a/surfsense_backend/alembic/versions/117_optimize_zero_publication_column_lists.py
+++ b/surfsense_backend/alembic/versions/117_optimize_zero_publication_column_lists.py
@@ -17,6 +17,16 @@ IMPORTANT — before AND after running this migration:
   3. Delete / reset the zero-cache data volume
   4. Restart zero-cache  (it will do a fresh initial sync)
 
+DO NOT COPY THIS PATTERN. The ``DROP PUBLICATION`` + ``CREATE
+PUBLICATION`` dance below is the pre-#1355 anti-pattern: on Zero >=
+1.0 it does not reliably wake the zero-cache change-streamer and can
+leave the replica pinned to a stale snapshot. This file is
+grandfathered in because it has already shipped to users; new
+publication mutations MUST use the ``COMMENT ON PUBLICATION`` bookend
+pattern wrapping an ``ALTER PUBLICATION ... SET TABLE`` -- copy the
+``upgrade()`` function from migration
+``143_force_zero_publication_resync.py`` as your starting template.
+
 Revision ID: 117
 Revises: 116
 """
diff --git a/surfsense_backend/alembic/versions/118_add_local_folder_sync_and_versioning.py b/surfsense_backend/alembic/versions/118_add_local_folder_sync_and_versioning.py
index 1fef9fbcb..1dce24e56 100644
--- a/surfsense_backend/alembic/versions/118_add_local_folder_sync_and_versioning.py
+++ b/surfsense_backend/alembic/versions/118_add_local_folder_sync_and_versioning.py
@@ -1,5 +1,16 @@
 """Add LOCAL_FOLDER_FILE document type, folder metadata, and document_versions table
 
+DO NOT COPY THIS PATTERN. The bare ``ALTER PUBLICATION ... ADD/DROP
+TABLE`` calls below pre-date the ``COMMENT ON PUBLICATION`` bookend
+fix for bug #1355: on Zero >= 1.0 they do not reliably wake the
+zero-cache change-streamer and can leave the replica pinned to a
+stale snapshot. This file is grandfathered in because it has already
+shipped to users; new publication mutations MUST use the
+``COMMENT ON PUBLICATION`` bookend pattern wrapping an
+``ALTER PUBLICATION ... SET TABLE`` -- copy the ``upgrade()`` function
+from migration ``143_force_zero_publication_resync.py`` as your
+starting template.
+
 Revision ID: 118
 Revises: 117
 """
diff --git a/surfsense_backend/alembic/versions/139_add_user_to_zero_publication.py b/surfsense_backend/alembic/versions/139_add_user_to_zero_publication.py
index 83c96a429..646049e3c 100644
--- a/surfsense_backend/alembic/versions/139_add_user_to_zero_publication.py
+++ b/surfsense_backend/alembic/versions/139_add_user_to_zero_publication.py
@@ -21,6 +21,16 @@ IMPORTANT - before AND after running this migration:
   3. Delete / reset the zero-cache data volume
   4. Restart zero-cache  (it will do a fresh initial sync)
 
+DO NOT COPY THIS PATTERN. The ``DROP PUBLICATION`` + ``CREATE
+PUBLICATION`` dance below is the pre-#1355 anti-pattern: on Zero >=
+1.0 it does not reliably wake the zero-cache change-streamer and can
+leave the replica pinned to a stale snapshot. This file is
+grandfathered in because it has already shipped to users; new
+publication mutations MUST use the ``COMMENT ON PUBLICATION`` bookend
+pattern wrapping an ``ALTER PUBLICATION ... SET TABLE`` -- copy the
+``upgrade()`` function from migration
+``143_force_zero_publication_resync.py`` as your starting template.
+
 Revision ID: 139
 Revises: 138
 """
diff --git a/surfsense_backend/alembic/versions/140_premium_tokens_to_credit_micros.py b/surfsense_backend/alembic/versions/140_premium_tokens_to_credit_micros.py
index 64aa699e8..ff88ac34e 100644
--- a/surfsense_backend/alembic/versions/140_premium_tokens_to_credit_micros.py
+++ b/surfsense_backend/alembic/versions/140_premium_tokens_to_credit_micros.py
@@ -32,6 +32,16 @@ Skipping the zero-cache stop will deadlock at the ACCESS EXCLUSIVE LOCK on
 "user". Skipping the data-volume reset will leave IndexedDB clients seeing
 column-not-found errors from a stale catalog snapshot.
 
+DO NOT COPY THIS PATTERN. The ``DROP PUBLICATION`` + ``CREATE
+PUBLICATION`` dance below is the pre-#1355 anti-pattern: on Zero >=
+1.0 it does not reliably wake the zero-cache change-streamer and can
+leave the replica pinned to a stale snapshot. This file is
+grandfathered in because it has already shipped to users; new
+publication mutations MUST use the ``COMMENT ON PUBLICATION`` bookend
+pattern wrapping an ``ALTER PUBLICATION ... SET TABLE`` -- copy the
+``upgrade()`` function from migration
+``143_force_zero_publication_resync.py`` as your starting template.
+
 Revision ID: 140
 Revises: 139
 """

From 8ea042e88c59030b9c21fa085cfd079a37c33c13 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Tue, 12 May 2026 20:57:15 +0530
Subject: [PATCH 27/96] refactor(chat): improve user query handling and mention
 chip functionality

---
 .../app/tasks/chat/stream_new_chat.py         |  22 ++--
 .../assistant-ui/inline-mention-editor.tsx    | 117 +++++++++++++-----
 .../components/assistant-ui/mention-chip.tsx  |  10 +-
 3 files changed, 107 insertions(+), 42 deletions(-)

diff --git a/surfsense_backend/app/tasks/chat/stream_new_chat.py b/surfsense_backend/app/tasks/chat/stream_new_chat.py
index 818282996..aed62ece9 100644
--- a/surfsense_backend/app/tasks/chat/stream_new_chat.py
+++ b/surfsense_backend/app/tasks/chat/stream_new_chat.py
@@ -1507,14 +1507,20 @@ async def stream_new_chat(
 
         # Resolve @-mention chips to canonical virtual paths and rewrite
         # the user-typed text so the LLM sees ``\`/documents/...\``` instead
-        # of bare ``@title``. The persisted user-message text keeps
-        # ``@title`` so chip rendering on reload is unchanged — see
-        # ``persistence._build_user_content``.
+        # of bare ``@title``. The substitution lands in ``agent_user_query``
+        # ONLY — the original ``user_query`` (with ``@title`` tokens) flows
+        # untouched into ``persist_user_turn`` below so chip rendering on
+        # reload still works (``UserTextPart`` → ``parseMentionSegments``
+        # matches ``@title``, not ``\`/documents/...\```). It also feeds
+        # the human-readable surfaces — SSE "Processing X" status, auto
+        # thread title, memory seed — which all want what the user typed.
+        # See ``persistence._build_user_content``.
         #
         # Cloud mode only: local-folder mode keeps the legacy
         # ``@title`` text path; mention support there is a follow-up
         # task because the path scheme (mount-rooted) and the picker
         # UI both need separate work.
+        agent_user_query = user_query
         accepted_folder_ids: list[int] = []
         if fs_mode == FilesystemMode.CLOUD.value and (
             mentioned_document_ids
@@ -1549,11 +1555,13 @@ async def stream_new_chat(
                 mentioned_surfsense_doc_ids=mentioned_surfsense_doc_ids,
                 mentioned_folder_ids=mentioned_folder_ids,
             )
-            user_query = substitute_in_text(user_query, resolved.token_to_path)
+            agent_user_query = substitute_in_text(user_query, resolved.token_to_path)
             accepted_folder_ids = resolved.mentioned_folder_ids
 
-        # Format the user query with context (SurfSense docs + reports only)
-        final_query = user_query
+        # Format the user query with context (SurfSense docs + reports only).
+        # Uses ``agent_user_query`` so the LLM sees backtick-wrapped paths
+        # instead of bare ``@title`` tokens.
+        final_query = agent_user_query
         context_parts = []
 
         if mentioned_surfsense_docs:
@@ -1584,7 +1592,7 @@ async def stream_new_chat(
 
         if context_parts:
             context = "\n\n".join(context_parts)
-            final_query = f"{context}\n\n<user_query>{user_query}</user_query>"
+            final_query = f"{context}\n\n<user_query>{agent_user_query}</user_query>"
 
         if visibility == ChatVisibility.SEARCH_SPACE and current_user_display_name:
             final_query = f"**[{current_user_display_name}]:** {final_query}"
diff --git a/surfsense_web/components/assistant-ui/inline-mention-editor.tsx b/surfsense_web/components/assistant-ui/inline-mention-editor.tsx
index e12556486..c2b896794 100644
--- a/surfsense_web/components/assistant-ui/inline-mention-editor.tsx
+++ b/surfsense_web/components/assistant-ui/inline-mention-editor.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { Folder as FolderIcon } from "lucide-react";
+import { Folder as FolderIcon, X as XIcon } from "lucide-react";
 import type { PlateElementProps } from "platejs/react";
 import {
 	createPlatePlugin,
@@ -9,7 +9,16 @@ import {
 	PlateContent,
 	usePlateEditor,
 } from "platejs/react";
-import { type FC, forwardRef, useCallback, useImperativeHandle, useMemo, useRef } from "react";
+import {
+	createContext,
+	type FC,
+	forwardRef,
+	useCallback,
+	useContext,
+	useImperativeHandle,
+	useMemo,
+	useRef,
+} from "react";
 import { FOLDER_MENTION_DOCUMENT_TYPE } from "@/atoms/chat/mentioned-documents.atom";
 import { getConnectorIcon } from "@/contracts/enums/connectorIcons";
 import type { Document } from "@/contracts/types/document.types";
@@ -107,13 +116,25 @@ type ComposerValue = ComposerParagraph[];
 
 const MENTION_TYPE = "mention";
 const MENTION_CHIP_CLASSNAME =
-	"inline-flex h-5 items-center gap-1 mx-0.5 rounded bg-primary/10 px-1 text-xs font-bold text-primary/60 select-none align-middle leading-none";
+	"group inline-flex h-5 items-center gap-1 mx-0.5 rounded bg-primary/10 px-1 text-xs font-bold text-primary/60 select-none align-middle leading-none";
 const MENTION_CHIP_ICON_CLASSNAME = "flex items-center text-muted-foreground leading-none";
 const MENTION_CHIP_TITLE_CLASSNAME = "max-w-[120px] truncate leading-none";
 const COMPOSER_TEXT_METRICS_CLASSNAME = "text-sm leading-6";
 
 const EMPTY_VALUE: ComposerValue = [{ type: "p", children: [{ text: "" }] }];
 
+/**
+ * Internal seam that lets ``MentionElement`` (a Plate render component
+ * with no React props beyond ``element``) reach the editor's chip-removal
+ * function. Mirrors the Backspace path in ``handleKeyDown`` so the X
+ * button delegates to the exact same combined call site — no extra
+ * state, no atom coupling leaking into the chip.
+ */
+type MentionEditorContextValue = {
+	removeChip: (docId: number, docType: string | undefined) => void;
+};
+const MentionEditorContext = createContext<MentionEditorContextValue | null>(null);
+
 const MentionElement: FC<PlateElementProps<MentionElementNode>> = ({
 	attributes,
 	children,
@@ -127,16 +148,36 @@ const MentionElement: FC<PlateElementProps<MentionElementNode>> = ({
 				: "text-amber-700";
 
 	const isFolder = element.kind === "folder";
+	const ctx = useContext(MentionEditorContext);
 
 	return (
 		<span {...attributes} className="inline-flex align-middle">
 			<span contentEditable={false} className={`${MENTION_CHIP_CLASSNAME} cursor-default`}>
 				<span className={MENTION_CHIP_ICON_CLASSNAME}>
-					{isFolder ? (
-						<FolderIcon className="h-3 w-3" />
-					) : (
-						getConnectorIcon(element.document_type ?? "UNKNOWN", "h-3 w-3")
-					)}
+					<span className="relative flex h-3 w-3 items-center justify-center">
+						<span className="flex items-center justify-center transition-opacity group-hover:opacity-0">
+							{isFolder ? (
+								<FolderIcon className="h-3 w-3" />
+							) : (
+								getConnectorIcon(element.document_type ?? "UNKNOWN", "h-3 w-3")
+							)}
+						</span>
+						{ctx ? (
+							<button
+								type="button"
+								aria-label={`Remove mention ${element.title}`}
+								title={`Remove ${element.title}`}
+								onMouseDown={(e) => e.preventDefault()}
+								onClick={(e) => {
+									e.stopPropagation();
+									ctx.removeChip(element.id, element.document_type);
+								}}
+								className="absolute inset-0 flex items-center justify-center rounded-sm opacity-0 transition-opacity hover:text-primary focus-visible:opacity-100 focus-visible:outline-none group-hover:opacity-100"
+							>
+								<XIcon className="h-3 w-3" />
+							</button>
+						) : null}
+					</span>
 				</span>
 				<span className={MENTION_CHIP_TITLE_CLASSNAME} title={element.title}>
 					{element.title}
@@ -464,6 +505,18 @@ export const InlineMentionEditor = forwardRef<InlineMentionEditorRef, InlineMent
 			[getCurrentValue, setValue]
 		);
 
+		// Combined "remove chip end-to-end" used by both the Backspace
+		// keybinding and the in-chip X button. Keeping these two surfaces
+		// pinned to a single helper guarantees they can never diverge —
+		// e.g. one path forgetting to notify the parent atom.
+		const removeChip = useCallback(
+			(docId: number, docType: string | undefined) => {
+				removeDocumentChip(docId, docType);
+				onDocumentRemove?.(docId, docType);
+			},
+			[onDocumentRemove, removeDocumentChip]
+		);
+
 		const setDocumentChipStatus = useCallback(
 			(
 				docId: number,
@@ -568,10 +621,9 @@ export const InlineMentionEditor = forwardRef<InlineMentionEditorRef, InlineMent
 				if (!isMentionNode(prev)) return;
 
 				e.preventDefault();
-				removeDocumentChip(prev.id, prev.document_type);
-				onDocumentRemove?.(prev.id, prev.document_type);
+				removeChip(prev.id, prev.document_type);
 			},
-			[editor.selection, getCurrentValue, onDocumentRemove, onKeyDown, onSubmit, removeDocumentChip]
+			[editor.selection, getCurrentValue, onKeyDown, onSubmit, removeChip]
 		);
 
 		const editableProps = useMemo(
@@ -588,26 +640,33 @@ export const InlineMentionEditor = forwardRef<InlineMentionEditorRef, InlineMent
 			[editor, handleKeyDown, placeholder]
 		);
 
+		const mentionEditorContextValue = useMemo<MentionEditorContextValue>(
+			() => ({ removeChip }),
+			[removeChip]
+		);
+
 		return (
 			<div className="relative w-full">
-				<Plate
-					editor={editor}
-					onChange={({ value }) => {
-						emitState(value as ComposerValue);
-					}}
-				>
-					<PlateContent
-						ref={editableRef}
-						readOnly={disabled}
-						{...editableProps}
-						className={cn(
-							"min-h-[24px] max-h-32 overflow-y-auto outline-none whitespace-pre-wrap wrap-break-word",
-							COMPOSER_TEXT_METRICS_CLASSNAME,
-							disabled && "opacity-50 cursor-not-allowed",
-							className
-						)}
-					/>
-				</Plate>
+				<MentionEditorContext.Provider value={mentionEditorContextValue}>
+					<Plate
+						editor={editor}
+						onChange={({ value }) => {
+							emitState(value as ComposerValue);
+						}}
+					>
+						<PlateContent
+							ref={editableRef}
+							readOnly={disabled}
+							{...editableProps}
+							className={cn(
+								"min-h-[24px] max-h-32 overflow-y-auto outline-none whitespace-pre-wrap wrap-break-word",
+								COMPOSER_TEXT_METRICS_CLASSNAME,
+								disabled && "opacity-50 cursor-not-allowed",
+								className
+							)}
+						/>
+					</Plate>
+				</MentionEditorContext.Provider>
 			</div>
 		);
 	}
diff --git a/surfsense_web/components/assistant-ui/mention-chip.tsx b/surfsense_web/components/assistant-ui/mention-chip.tsx
index 9f9c9b177..7197fccdc 100644
--- a/surfsense_web/components/assistant-ui/mention-chip.tsx
+++ b/surfsense_web/components/assistant-ui/mention-chip.tsx
@@ -66,23 +66,21 @@ export function MentionChip({
 			disabled={disabled}
 			aria-label={ariaLabel ?? label}
 			className={cn(
-				"inline-flex max-w-[220px] items-center gap-1.5 rounded-md border bg-background px-2 py-0.5 align-middle text-xs font-medium text-foreground leading-5 transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring",
-				isInteractive
-					? "cursor-pointer hover:bg-accent hover:text-accent-foreground"
-					: "cursor-default",
+				"inline-flex h-5 items-center gap-1 rounded bg-primary/10 px-1 align-middle text-xs font-bold text-primary/60 leading-none focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring",
+				isInteractive ? "cursor-pointer" : "cursor-default",
 				disabled && "opacity-60",
 				className
 			)}
 		>
 			<span className="inline-flex shrink-0 text-muted-foreground">{icon}</span>
-			<span className="truncate">{label}</span>
+			<span className="max-w-[120px] truncate leading-none">{label}</span>
 		</button>
 	);
 
 	if (!tooltip) return chip;
 
 	return (
-		<Tooltip>
+		<Tooltip delayDuration={600}>
 			<TooltipTrigger asChild>{chip}</TooltipTrigger>
 			<TooltipContent side="top" className="max-w-xs break-all">
 				{tooltip}

From 0c2beb7ce8c4b417abac0eb5e6d13dd577b15064 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Tue, 12 May 2026 21:26:33 +0530
Subject: [PATCH 28/96] fix(thread): conditionally render screen capture button
 for desktop users

---
 .../components/assistant-ui/thread.tsx        | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/surfsense_web/components/assistant-ui/thread.tsx b/surfsense_web/components/assistant-ui/thread.tsx
index ec7d19eff..4f4395611 100644
--- a/surfsense_web/components/assistant-ui/thread.tsx
+++ b/surfsense_web/components/assistant-ui/thread.tsx
@@ -1212,17 +1212,19 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 				</div>
 			)}
 			<div className="flex items-center gap-2">
-				<TooltipIconButton
-					tooltip="Capture screen"
-					type="button"
-					variant="ghost"
-					size="icon"
-					className="size-8 rounded-full"
-					aria-label="Capture screen"
-					onClick={() => void handleScreenCapture()}
-				>
-					<Camera className="size-4" />
-				</TooltipIconButton>
+				{isDesktop && (
+					<TooltipIconButton
+						tooltip="Capture screen"
+						type="button"
+						variant="ghost"
+						size="icon"
+						className="size-8 rounded-full"
+						aria-label="Capture screen"
+						onClick={() => void handleScreenCapture()}
+					>
+						<Camera className="size-4" />
+					</TooltipIconButton>
+				)}
 				<AuiIf condition={({ thread }) => !thread.isRunning}>
 					<ComposerPrimitive.Send asChild disabled={isSendDisabled}>
 						<TooltipIconButton

From 2437716752866bd588f49b27068cf3aa023a2501 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Tue, 12 May 2026 23:18:45 +0530
Subject: [PATCH 29/96] refactor(assistant-ui): enhance mention chip handling
 and editor focus behavior

---
 .../assistant-ui/inline-mention-editor.tsx    | 241 ++++++++++--------
 .../components/assistant-ui/thread.tsx        | 108 +++++---
 2 files changed, 215 insertions(+), 134 deletions(-)

diff --git a/surfsense_web/components/assistant-ui/inline-mention-editor.tsx b/surfsense_web/components/assistant-ui/inline-mention-editor.tsx
index c2b896794..da5fe878f 100644
--- a/surfsense_web/components/assistant-ui/inline-mention-editor.tsx
+++ b/surfsense_web/components/assistant-ui/inline-mention-editor.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { Folder as FolderIcon, X as XIcon } from "lucide-react";
+import type { NodeEntry, TElement } from "platejs";
 import type { PlateElementProps } from "platejs/react";
 import {
 	createPlatePlugin,
@@ -56,10 +57,7 @@ export interface InlineMentionEditorRef {
 	setText: (text: string) => void;
 	getText: () => string;
 	getMentionedDocuments: () => MentionedDocument[];
-	insertMentionChip: (
-		mention: MentionChipInput,
-		options?: { removeTriggerText?: boolean }
-	) => void;
+	insertMentionChip: (mention: MentionChipInput, options?: { removeTriggerText?: boolean }) => void;
 	/**
 	 * @deprecated Use ``insertMentionChip``. Kept for one transition
 	 * cycle so we don't break ad-hoc callers; prefer the new name.
@@ -338,17 +336,21 @@ export const InlineMentionEditor = forwardRef<InlineMentionEditorRef, InlineMent
 			value: initialText ? toValueFromText(initialText) : EMPTY_VALUE,
 		});
 
+		// Move the caret to the end of the document and focus the editor.
+		// Routes through Plate's transforms so ``editor.selection`` and
+		// the DOM selection stay in sync — bypassing Plate (via raw
+		// ``window.getSelection``) was the prior implementation and is
+		// what made the caret disappear after every ``setValue``-based
+		// mutation. Falls back to DOM focus if Plate's API throws (e.g.
+		// during a transient unmount race).
 		const focusAtEnd = useCallback(() => {
-			const el = editableRef.current;
-			if (!el) return;
-			el.focus();
-			const selection = window.getSelection();
-			const range = document.createRange();
-			range.selectNodeContents(el);
-			range.collapse(false);
-			selection?.removeAllRanges();
-			selection?.addRange(range);
-		}, []);
+			try {
+				editor.tf.select(editor.api.end([]));
+				editor.tf.focus();
+			} catch {
+				editableRef.current?.focus();
+			}
+		}, [editor]);
 
 		const getCurrentValue = useCallback(
 			() => (editor.children as ComposerValue) ?? EMPTY_VALUE,
@@ -396,17 +398,30 @@ export const InlineMentionEditor = forwardRef<InlineMentionEditorRef, InlineMent
 			[editor, emitState]
 		);
 
+		// Insert a mention chip at the current caret. Uses Plate
+		// transforms so Slate keeps the editor selection valid through
+		// the edit.
+		//
+		// Critical detail: the chip is a void inline element. Inserting
+		// it on its own with ``{ select: true }`` would land the caret
+		// inside the void's empty ``children: [{ text: "" }]`` — a point
+		// the browser can't render a caret on, which is what made the
+		// cursor disappear or jump to the wrong side of the chip after
+		// insertion. Inserting ``[mentionNode, { text: " " }]`` as a
+		// single array means the *last* inserted node is a text node, so
+		// ``{ select: true }`` resolves to that text node's end (offset
+		// 1, after the trailing space) — a real, renderable text point.
+		// The whole sequence stays inside ``withoutNormalizing`` so the
+		// optional trigger-text delete and the chip insert show up as a
+		// single undo step.
 		const insertMentionChip = useCallback(
 			(mention: MentionChipInput, options?: { removeTriggerText?: boolean }) => {
 				if (typeof mention.id !== "number" || typeof mention.title !== "string") return;
 
 				const removeTriggerText = options?.removeTriggerText ?? true;
-				const current = getCurrentValue();
-				const selection = editor.selection;
 				const kind: MentionKind = mention.kind ?? "doc";
 				const document_type =
-					mention.document_type ??
-					(kind === "folder" ? FOLDER_MENTION_DOCUMENT_TYPE : undefined);
+					mention.document_type ?? (kind === "folder" ? FOLDER_MENTION_DOCUMENT_TYPE : undefined);
 				const mentionNode: MentionElementNode = {
 					type: MENTION_TYPE,
 					id: mention.id,
@@ -416,60 +431,49 @@ export const InlineMentionEditor = forwardRef<InlineMentionEditorRef, InlineMent
 					children: [{ text: "" }],
 				};
 
-				const cursorCtx = getCursorTextContext(current, selection);
-				if (!cursorCtx) {
-					const lastBlock = current[current.length - 1] ?? { type: "p", children: [{ text: "" }] };
-					const appended: ComposerValue = [
-						...current.slice(0, -1),
-						{
-							...lastBlock,
-							children: [...lastBlock.children, mentionNode, { text: " " }],
-						},
-					];
-					setValue(appended);
-					requestAnimationFrame(focusAtEnd);
-					return;
-				}
+				editor.tf.withoutNormalizing(() => {
+					const selection = editor.selection;
 
-				const block = current[cursorCtx.blockIndex];
-				const currentChild = getTextNode(block.children[cursorCtx.childIndex]);
-				if (!currentChild) {
-					const children = [...block.children];
-					children.splice(cursorCtx.childIndex + 1, 0, mentionNode, { text: " " });
-					const next = [...current];
-					next[cursorCtx.blockIndex] = { ...block, children };
-					setValue(next as ComposerValue);
-					requestAnimationFrame(focusAtEnd);
-					return;
-				}
-
-				const text = currentChild.text;
-				let removeStart = cursorCtx.cursor;
-				if (removeTriggerText) {
-					for (let i = cursorCtx.cursor - 1; i >= 0; i--) {
-						if (text[i] === "@") {
-							removeStart = i;
-							break;
+					// No active editor selection — typically because focus
+					// moved to a picker/dropdown. Snap the caret to the end
+					// of the document so the chip appends cleanly instead
+					// of disappearing into a dead range.
+					if (!selection) {
+						editor.tf.select(editor.api.end([]));
+					} else if (removeTriggerText) {
+						// Delete the in-progress "@query" text so the chip
+						// stands in for it. Mirrors the old splice but lets
+						// Slate keep selection sane through the edit.
+						const cursorCtx = getCursorTextContext(getCurrentValue(), selection);
+						if (cursorCtx) {
+							const text = cursorCtx.text;
+							let triggerIndex = -1;
+							for (let i = cursorCtx.cursor - 1; i >= 0; i--) {
+								if (text[i] === "@") {
+									triggerIndex = i;
+									break;
+								}
+								if (text[i] === " " || text[i] === "\n") break;
+							}
+							if (triggerIndex >= 0 && triggerIndex < cursorCtx.cursor) {
+								const path = [cursorCtx.blockIndex, cursorCtx.childIndex];
+								editor.tf.delete({
+									at: {
+										anchor: { path, offset: triggerIndex },
+										focus: { path, offset: cursorCtx.cursor },
+									},
+								});
+							}
 						}
-						if (text[i] === " " || text[i] === "\n") break;
 					}
-				}
 
-				const before = text.slice(0, removeStart);
-				const after = text.slice(cursorCtx.cursor);
-				const replacement: ComposerNode[] = [];
-				if (before.length > 0) replacement.push({ text: before });
-				replacement.push(mentionNode);
-				replacement.push({ text: ` ${after}` });
-
-				const children = [...block.children];
-				children.splice(cursorCtx.childIndex, 1, ...replacement);
-				const next = [...current];
-				next[cursorCtx.blockIndex] = { ...block, children };
-				setValue(next as ComposerValue);
-				requestAnimationFrame(focusAtEnd);
+					editor.tf.insertNodes([mentionNode, { text: " " }] as unknown as TElement[], {
+						select: true,
+					});
+				});
+				editor.tf.focus();
 			},
-			[editor.selection, focusAtEnd, getCurrentValue, setValue]
+			[editor, getCurrentValue]
 		);
 
 		// Backwards-compatible shim — pre-folder callers pass a doc-only
@@ -485,24 +489,34 @@ export const InlineMentionEditor = forwardRef<InlineMentionEditorRef, InlineMent
 			[insertMentionChip]
 		);
 
+		// Remove the chip(s) matching the given (id, document_type) pair.
+		// Goes through ``tf.removeNodes`` so Slate keeps the surrounding
+		// selection valid — the previous ``setValue``-based filter wiped
+		// selection on every removal, which is why the caret vanished
+		// when the X button was clicked. Iterates descending so removing
+		// one entry doesn't invalidate the path of subsequent matches.
+		// In practice chips are deduped by ``getMentionDocKey`` so this
+		// loop runs at most once; the descending iteration is defense
+		// against any future divergence.
 		const removeDocumentChip = useCallback(
 			(docId: number, docType?: string) => {
-				const current = getCurrentValue();
-				let changed = false;
-				const next = current.map((block) => {
-					const children = block.children.filter((node) => {
-						if (!isMentionNode(node)) return true;
-						const match =
-							node.id === docId && (node.document_type ?? "UNKNOWN") === (docType ?? "UNKNOWN");
-						if (match) changed = true;
-						return !match;
-					});
-					return { ...block, children: children.length ? children : [{ text: "" }] };
+				const match = (n: unknown) => {
+					if (!n || typeof n !== "object" || !("type" in n)) return false;
+					const node = n as MentionElementNode;
+					if (node.type !== MENTION_TYPE) return false;
+					if (node.id !== docId) return false;
+					return (node.document_type ?? "UNKNOWN") === (docType ?? "UNKNOWN");
+				};
+
+				const entries = Array.from(editor.api.nodes({ at: [], match })) as NodeEntry[];
+				if (entries.length === 0) return;
+				editor.tf.withoutNormalizing(() => {
+					for (const [, path] of entries.reverse()) {
+						editor.tf.removeNodes({ at: path });
+					}
 				});
-				if (!changed) return;
-				setValue(next as ComposerValue);
 			},
-			[getCurrentValue, setValue]
+			[editor]
 		);
 
 		// Combined "remove chip end-to-end" used by both the Backspace
@@ -517,6 +531,11 @@ export const InlineMentionEditor = forwardRef<InlineMentionEditorRef, InlineMent
 			[onDocumentRemove, removeDocumentChip]
 		);
 
+		// Update the streaming status on a chip in place. ``tf.setNodes``
+		// merges the partial props onto every node matching the
+		// predicate without rebuilding the document, so the user's
+		// selection stays put — important because status transitions
+		// arrive as backend events while the user may be mid-typing.
 		const setDocumentChipStatus = useCallback(
 			(
 				docId: number,
@@ -524,31 +543,33 @@ export const InlineMentionEditor = forwardRef<InlineMentionEditorRef, InlineMent
 				statusLabel: string | null,
 				statusKind: MentionStatusKind = "pending"
 			) => {
-				const current = getCurrentValue();
-				let changed = false;
-				const next = current.map((block) => ({
-					...block,
-					children: block.children.map((node) => {
-						if (!isMentionNode(node)) return node;
-						const sameType = (node.document_type ?? "UNKNOWN") === (docType ?? "UNKNOWN");
-						if (node.id !== docId || !sameType) return node;
-						changed = true;
-						return {
-							...node,
-							statusLabel,
-							statusKind: statusLabel ? statusKind : undefined,
-						};
-					}),
-				}));
-				if (!changed) return;
-				setValue(next as ComposerValue);
+				const match = (n: unknown) => {
+					if (!n || typeof n !== "object" || !("type" in n)) return false;
+					const node = n as MentionElementNode;
+					if (node.type !== MENTION_TYPE) return false;
+					if (node.id !== docId) return false;
+					return (node.document_type ?? "UNKNOWN") === (docType ?? "UNKNOWN");
+				};
+
+				editor.tf.setNodes(
+					{
+						statusLabel,
+						statusKind: statusLabel ? statusKind : undefined,
+					} as Partial<TElement>,
+					{ at: [], match }
+				);
 			},
-			[getCurrentValue, setValue]
+			[editor]
 		);
 
 		const clear = useCallback(() => {
 			setValue(EMPTY_VALUE);
-		}, [setValue]);
+			// ``tf.setValue`` (inside ``setValue``) wipes the editor's
+			// selection — without this, after the user presses Enter to
+			// submit, the composer is left with no caret and they would
+			// have to click before typing again.
+			requestAnimationFrame(focusAtEnd);
+		}, [focusAtEnd, setValue]);
 
 		const setText = useCallback(
 			(text: string) => {
@@ -567,7 +588,22 @@ export const InlineMentionEditor = forwardRef<InlineMentionEditorRef, InlineMent
 		useImperativeHandle(
 			ref,
 			() => ({
-				focus: () => editableRef.current?.focus(),
+				// If we already have a Plate selection (user was typing
+				// before focus left), preserve it — just refocus. If we
+				// don't (first mount, or focus was lost without a
+				// surviving selection), seed a selection at end-of-doc
+				// so the contentEditable shows a caret instead of an
+				// invisible focus ring.
+				focus: () => {
+					try {
+						if (!editor.selection) {
+							editor.tf.select(editor.api.end([]));
+						}
+						editor.tf.focus();
+					} catch {
+						editableRef.current?.focus();
+					}
+				},
 				clear,
 				setText,
 				getText,
@@ -579,6 +615,7 @@ export const InlineMentionEditor = forwardRef<InlineMentionEditorRef, InlineMent
 			}),
 			[
 				clear,
+				editor,
 				getMentionedDocs,
 				getText,
 				insertMentionChip,
diff --git a/surfsense_web/components/assistant-ui/thread.tsx b/surfsense_web/components/assistant-ui/thread.tsx
index 4f4395611..64069870b 100644
--- a/surfsense_web/components/assistant-ui/thread.tsx
+++ b/surfsense_web/components/assistant-ui/thread.tsx
@@ -62,6 +62,7 @@ import { useDocumentUploadDialog } from "@/components/assistant-ui/document-uplo
 import {
 	InlineMentionEditor,
 	type InlineMentionEditorRef,
+	type MentionedDocument,
 } from "@/components/assistant-ui/inline-mention-editor";
 import { TooltipIconButton } from "@/components/assistant-ui/tooltip-icon-button";
 import { UserMessage } from "@/components/assistant-ui/user-message";
@@ -384,7 +385,10 @@ const Composer: FC = () => {
 	const promptPickerRef = useRef<PromptPickerRef>(null);
 	const { search_space_id, chat_id } = useParams();
 	const aui = useAui();
-	const hasAutoFocusedRef = useRef(false);
+	// Gate the always-focused composer behaviour to desktop. On mobile,
+	// programmatic focus pops the soft keyboard, which would be jarring
+	// whenever a picker closes or the user navigates between threads.
+	const isDesktop = useMediaQuery("(min-width: 640px)");
 
 	const electronAPI = useElectronAPI();
 	const [clipboardInitialText, setClipboardInitialText] = useState<string | undefined>();
@@ -437,16 +441,24 @@ const Composer: FC = () => {
 	);
 	useBatchCommentsPreload(assistantDbMessageIds);
 
-	// Auto-focus editor on new chat page after mount
+	// Always-focused composer (Claude-style). Runs as a reactive
+	// invariant: whenever the composer is mounted and no transient
+	// picker has taken over keyboard input, the editor should be the
+	// focused element. This naturally restores focus after pickers
+	// close, after the user switches threads, and on first mount —
+	// replacing the previous one-shot ``hasAutoFocusedRef`` gate that
+	// only worked on the welcome screen.
+	//
+	// Gated on ``isDesktop`` so we don't repeatedly summon the mobile
+	// soft keyboard whenever any of the deps change. ``threadId`` is
+	// read so the effect re-fires when the user switches between two
+	// non-empty threads (where the Composer instance is reused).
 	useEffect(() => {
-		if (isThreadEmpty && !hasAutoFocusedRef.current && editorRef.current) {
-			const timeoutId = setTimeout(() => {
-				editorRef.current?.focus();
-				hasAutoFocusedRef.current = true;
-			}, 100);
-			return () => clearTimeout(timeoutId);
-		}
-	}, [isThreadEmpty]);
+		if (!isDesktop) return;
+		if (showDocumentPopover || showPromptPicker) return;
+		void threadId;
+		editorRef.current?.focus();
+	}, [isDesktop, showDocumentPopover, showPromptPicker, threadId]);
 
 	// Close document picker when a slide-out panel (inbox, shared/private chats) opens
 	useEffect(() => {
@@ -458,12 +470,45 @@ const Composer: FC = () => {
 		return () => window.removeEventListener(SLIDEOUT_PANEL_OPENED_EVENT, handler);
 	}, []);
 
-	// Sync editor text with assistant-ui composer runtime
+	// Sync editor text with the assistant-ui composer runtime and
+	// reconcile the chip atom from the editor's reported docs.
+	//
+	// The editor is the source of truth for which chips exist on
+	// screen. Reconciling here covers every deletion path Plate can
+	// produce (the explicit Backspace handler, the X-button,
+	// Cmd+Backspace, range-select+Delete, cut, paste-over) without
+	// needing per-keybinding plumbing. Without this, paths that bypass
+	// ``onDocumentRemove`` left the atom carrying stale entries that
+	// the picker would re-emit via ``initialSelectedDocuments`` and
+	// resurface as chips on the next selection.
+	//
+	// The setter returns ``prev`` when the chip set is unchanged so
+	// pure-text keystrokes don't churn the atom (Jotai compares by
+	// reference for store change notifications).
 	const handleEditorChange = useCallback(
-		(text: string) => {
+		(text: string, docs: MentionedDocument[]) => {
 			aui.composer().setText(text);
+			setMentionedDocuments((prev) => {
+				if (prev.length === docs.length) {
+					const editorKeys = new Set(docs.map((d) => getMentionDocKey(d)));
+					if (prev.every((d) => editorKeys.has(getMentionDocKey(d)))) {
+						return prev;
+					}
+				}
+				return docs.map<MentionedDocumentInfo>((d) => ({
+					id: d.id,
+					title: d.title,
+					// ``MentionedDocument.document_type`` is optional but
+					// the atom shape requires a string. ``"UNKNOWN"`` is
+					// the same sentinel ``getMentionDocKey`` and the
+					// editor's match predicates already use, so the key
+					// is stable across the round trip.
+					document_type: d.document_type ?? "UNKNOWN",
+					kind: d.kind,
+				}));
+			});
 		},
-		[aui]
+		[aui, setMentionedDocuments]
 	);
 
 	// Open document picker when @ mention is triggered
@@ -621,27 +666,26 @@ const Composer: FC = () => {
 		[setMentionedDocuments]
 	);
 
-	const handleDocumentsMention = useCallback(
-		(mentions: MentionedDocumentInfo[]) => {
-			const editorMentionedDocs = editorRef.current?.getMentionedDocuments() ?? [];
-			const editorDocKeys = new Set(editorMentionedDocs.map((doc) => getMentionDocKey(doc)));
+	const handleDocumentsMention = useCallback((mentions: MentionedDocumentInfo[]) => {
+		const editorMentionedDocs = editorRef.current?.getMentionedDocuments() ?? [];
+		const editorDocKeys = new Set(editorMentionedDocs.map((doc) => getMentionDocKey(doc)));
 
-			for (const mention of mentions) {
-				const key = getMentionDocKey(mention);
-				if (editorDocKeys.has(key)) continue;
-				editorRef.current?.insertMentionChip(mention);
-			}
+		for (const mention of mentions) {
+			const key = getMentionDocKey(mention);
+			if (editorDocKeys.has(key)) continue;
+			editorRef.current?.insertMentionChip(mention);
+			// Track within the loop so duplicates in the same batch
+			// (defensive — the picker shouldn't produce them today)
+			// can't slip through as double-inserted chips.
+			editorDocKeys.add(key);
+		}
 
-			setMentionedDocuments((prev) => {
-				const existingKeySet = new Set(prev.map((d) => getMentionDocKey(d)));
-				const uniqueNew = mentions.filter((m) => !existingKeySet.has(getMentionDocKey(m)));
-				return [...prev, ...uniqueNew];
-			});
-
-			setMentionQuery("");
-		},
-		[setMentionedDocuments]
-	);
+		// Atom is reconciled by the editor's ``onChange`` after each
+		// ``insertMentionChip`` (see ``handleEditorChange``); writing
+		// here would be a second, divergent write path — exactly the
+		// shape that let stale entries resurface in the past.
+		setMentionQuery("");
+	}, []);
 
 	useEffect(() => {
 		const editor = editorRef.current;

From 32ff864fd3f9a092dc0437483df0725895538b80 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Tue, 12 May 2026 23:24:01 +0530
Subject: [PATCH 30/96] refactor(assistant-ui): streamline docstrings and
 comments

---
 .../assistant-ui/inline-mention-editor.tsx    | 115 +++++-------------
 .../components/assistant-ui/thread.tsx        | 110 ++++-------------
 2 files changed, 57 insertions(+), 168 deletions(-)

diff --git a/surfsense_web/components/assistant-ui/inline-mention-editor.tsx b/surfsense_web/components/assistant-ui/inline-mention-editor.tsx
index da5fe878f..cbd8e8d5a 100644
--- a/surfsense_web/components/assistant-ui/inline-mention-editor.tsx
+++ b/surfsense_web/components/assistant-ui/inline-mention-editor.tsx
@@ -36,13 +36,9 @@ export interface MentionedDocument {
 }
 
 /**
- * Input shape for inserting a chip. ``kind`` defaults to ``"doc"``
- * when omitted so legacy callers don't have to thread the
- * discriminator. Folder callers pass ``kind: "folder"`` and the
- * folder ``id`` and ``title``; ``document_type`` defaults to
- * ``FOLDER_MENTION_DOCUMENT_TYPE`` inside ``insertMentionChip`` so the
- * dedup key (`kind:document_type:id`) never collides with a doc chip
- * that happens to share an id.
+ * Input shape for inserting a chip. ``kind`` defaults to ``"doc"``.
+ * Folder chips default ``document_type`` to ``FOLDER_MENTION_DOCUMENT_TYPE``
+ * so the dedup key never collides with a doc chip sharing the same id.
  */
 export type MentionChipInput = {
 	id: number;
@@ -58,10 +54,7 @@ export interface InlineMentionEditorRef {
 	getText: () => string;
 	getMentionedDocuments: () => MentionedDocument[];
 	insertMentionChip: (mention: MentionChipInput, options?: { removeTriggerText?: boolean }) => void;
-	/**
-	 * @deprecated Use ``insertMentionChip``. Kept for one transition
-	 * cycle so we don't break ad-hoc callers; prefer the new name.
-	 */
+	/** @deprecated Use ``insertMentionChip``. */
 	insertDocumentChip: (
 		doc: Pick<Document, "id" | "title" | "document_type">,
 		options?: { removeTriggerText?: boolean }
@@ -97,12 +90,7 @@ type MentionElementNode = {
 	id: number;
 	title: string;
 	document_type?: string;
-	/**
-	 * Discriminator added so a folder chip and a doc chip with the
-	 * same id round-trip cleanly through ``getMentionedDocuments``
-	 * and the persisted ``mentioned-documents`` content part.
-	 * Defaults to ``"doc"`` for nodes that predate this field.
-	 */
+	/** Discriminator; defaults to ``"doc"`` for legacy nodes. */
 	kind?: MentionKind;
 	statusLabel?: string | null;
 	statusKind?: MentionStatusKind;
@@ -122,11 +110,8 @@ const COMPOSER_TEXT_METRICS_CLASSNAME = "text-sm leading-6";
 const EMPTY_VALUE: ComposerValue = [{ type: "p", children: [{ text: "" }] }];
 
 /**
- * Internal seam that lets ``MentionElement`` (a Plate render component
- * with no React props beyond ``element``) reach the editor's chip-removal
- * function. Mirrors the Backspace path in ``handleKeyDown`` so the X
- * button delegates to the exact same combined call site — no extra
- * state, no atom coupling leaking into the chip.
+ * Lets ``MentionElement`` reach the editor's chip-removal helper so
+ * the X button and Backspace go through the same call site.
  */
 type MentionEditorContextValue = {
 	removeChip: (docId: number, docType: string | undefined) => void;
@@ -336,13 +321,8 @@ export const InlineMentionEditor = forwardRef<InlineMentionEditorRef, InlineMent
 			value: initialText ? toValueFromText(initialText) : EMPTY_VALUE,
 		});
 
-		// Move the caret to the end of the document and focus the editor.
-		// Routes through Plate's transforms so ``editor.selection`` and
-		// the DOM selection stay in sync — bypassing Plate (via raw
-		// ``window.getSelection``) was the prior implementation and is
-		// what made the caret disappear after every ``setValue``-based
-		// mutation. Falls back to DOM focus if Plate's API throws (e.g.
-		// during a transient unmount race).
+		// Move the caret to end-of-doc and focus the editor. Falls back
+		// to DOM focus if Plate's API throws (transient unmount race).
 		const focusAtEnd = useCallback(() => {
 			try {
 				editor.tf.select(editor.api.end([]));
@@ -398,22 +378,13 @@ export const InlineMentionEditor = forwardRef<InlineMentionEditorRef, InlineMent
 			[editor, emitState]
 		);
 
-		// Insert a mention chip at the current caret. Uses Plate
-		// transforms so Slate keeps the editor selection valid through
-		// the edit.
-		//
-		// Critical detail: the chip is a void inline element. Inserting
-		// it on its own with ``{ select: true }`` would land the caret
-		// inside the void's empty ``children: [{ text: "" }]`` — a point
-		// the browser can't render a caret on, which is what made the
-		// cursor disappear or jump to the wrong side of the chip after
-		// insertion. Inserting ``[mentionNode, { text: " " }]`` as a
-		// single array means the *last* inserted node is a text node, so
-		// ``{ select: true }`` resolves to that text node's end (offset
-		// 1, after the trailing space) — a real, renderable text point.
-		// The whole sequence stays inside ``withoutNormalizing`` so the
-		// optional trigger-text delete and the chip insert show up as a
-		// single undo step.
+		// Insert chip + trailing space as a single ``insertNodes`` call.
+		// The chip is a void inline; ``select: true`` on it alone would
+		// land the caret inside its empty children (an unrenderable
+		// point). With the space as the last inserted node, the caret
+		// resolves to that text node and stays visible. The
+		// ``withoutNormalizing`` wrapper batches the optional trigger
+		// delete + insert into a single undo step.
 		const insertMentionChip = useCallback(
 			(mention: MentionChipInput, options?: { removeTriggerText?: boolean }) => {
 				if (typeof mention.id !== "number" || typeof mention.title !== "string") return;
@@ -434,16 +405,12 @@ export const InlineMentionEditor = forwardRef<InlineMentionEditorRef, InlineMent
 				editor.tf.withoutNormalizing(() => {
 					const selection = editor.selection;
 
-					// No active editor selection — typically because focus
-					// moved to a picker/dropdown. Snap the caret to the end
-					// of the document so the chip appends cleanly instead
-					// of disappearing into a dead range.
+					// No active selection (focus moved to a picker) — snap
+					// to end-of-doc so the chip appends cleanly.
 					if (!selection) {
 						editor.tf.select(editor.api.end([]));
 					} else if (removeTriggerText) {
-						// Delete the in-progress "@query" text so the chip
-						// stands in for it. Mirrors the old splice but lets
-						// Slate keep selection sane through the edit.
+						// Delete the in-progress "@query" so the chip stands in for it.
 						const cursorCtx = getCursorTextContext(getCurrentValue(), selection);
 						if (cursorCtx) {
 							const text = cursorCtx.text;
@@ -476,9 +443,7 @@ export const InlineMentionEditor = forwardRef<InlineMentionEditorRef, InlineMent
 			[editor, getCurrentValue]
 		);
 
-		// Backwards-compatible shim — pre-folder callers pass a doc-only
-		// payload; we route them through ``insertMentionChip`` with
-		// ``kind: "doc"``.
+		// Doc-only shim that routes through ``insertMentionChip``.
 		const insertDocumentChip = useCallback(
 			(
 				doc: Pick<Document, "id" | "title" | "document_type">,
@@ -489,15 +454,10 @@ export const InlineMentionEditor = forwardRef<InlineMentionEditorRef, InlineMent
 			[insertMentionChip]
 		);
 
-		// Remove the chip(s) matching the given (id, document_type) pair.
-		// Goes through ``tf.removeNodes`` so Slate keeps the surrounding
-		// selection valid — the previous ``setValue``-based filter wiped
-		// selection on every removal, which is why the caret vanished
-		// when the X button was clicked. Iterates descending so removing
-		// one entry doesn't invalidate the path of subsequent matches.
-		// In practice chips are deduped by ``getMentionDocKey`` so this
-		// loop runs at most once; the descending iteration is defense
-		// against any future divergence.
+		// Remove chip(s) matching (id, document_type). Iterates in
+		// descending path order so removing one entry can't invalidate
+		// later paths. Chips are deduped today, so this typically runs
+		// at most once.
 		const removeDocumentChip = useCallback(
 			(docId: number, docType?: string) => {
 				const match = (n: unknown) => {
@@ -519,10 +479,8 @@ export const InlineMentionEditor = forwardRef<InlineMentionEditorRef, InlineMent
 			[editor]
 		);
 
-		// Combined "remove chip end-to-end" used by both the Backspace
-		// keybinding and the in-chip X button. Keeping these two surfaces
-		// pinned to a single helper guarantees they can never diverge —
-		// e.g. one path forgetting to notify the parent atom.
+		// Single removal call site for Backspace and the X button so the
+		// two can never diverge (e.g. one forgetting to notify the parent).
 		const removeChip = useCallback(
 			(docId: number, docType: string | undefined) => {
 				removeDocumentChip(docId, docType);
@@ -531,11 +489,8 @@ export const InlineMentionEditor = forwardRef<InlineMentionEditorRef, InlineMent
 			[onDocumentRemove, removeDocumentChip]
 		);
 
-		// Update the streaming status on a chip in place. ``tf.setNodes``
-		// merges the partial props onto every node matching the
-		// predicate without rebuilding the document, so the user's
-		// selection stays put — important because status transitions
-		// arrive as backend events while the user may be mid-typing.
+		// Update chip status in place via ``tf.setNodes`` so the user's
+		// selection survives backend status events arriving mid-typing.
 		const setDocumentChipStatus = useCallback(
 			(
 				docId: number,
@@ -564,10 +519,8 @@ export const InlineMentionEditor = forwardRef<InlineMentionEditorRef, InlineMent
 
 		const clear = useCallback(() => {
 			setValue(EMPTY_VALUE);
-			// ``tf.setValue`` (inside ``setValue``) wipes the editor's
-			// selection — without this, after the user presses Enter to
-			// submit, the composer is left with no caret and they would
-			// have to click before typing again.
+			// ``tf.setValue`` wipes the selection — refocus so the caret
+			// returns after Enter-to-submit.
 			requestAnimationFrame(focusAtEnd);
 		}, [focusAtEnd, setValue]);
 
@@ -588,12 +541,8 @@ export const InlineMentionEditor = forwardRef<InlineMentionEditorRef, InlineMent
 		useImperativeHandle(
 			ref,
 			() => ({
-				// If we already have a Plate selection (user was typing
-				// before focus left), preserve it — just refocus. If we
-				// don't (first mount, or focus was lost without a
-				// surviving selection), seed a selection at end-of-doc
-				// so the contentEditable shows a caret instead of an
-				// invisible focus ring.
+				// Preserve existing selection if any; otherwise seed one
+				// at end-of-doc so the contentEditable shows a caret.
 				focus: () => {
 					try {
 						if (!editor.selection) {
diff --git a/surfsense_web/components/assistant-ui/thread.tsx b/surfsense_web/components/assistant-ui/thread.tsx
index 64069870b..420f64fb3 100644
--- a/surfsense_web/components/assistant-ui/thread.tsx
+++ b/surfsense_web/components/assistant-ui/thread.tsx
@@ -172,36 +172,24 @@ const PremiumQuotaPinnedAlert: FC = () => {
 const getTimeBasedGreeting = (user?: { display_name?: string | null; email?: string }): string => {
 	const hour = new Date().getHours();
 
-	// Extract first name: prefer display_name, fall back to email extraction
 	let firstName: string | null = null;
-
 	if (user?.display_name?.trim()) {
-		// Use display_name if available and not empty
-		// Extract first name from display_name (take first word)
 		const nameParts = user.display_name.trim().split(/\s+/);
 		firstName = nameParts[0].charAt(0).toUpperCase() + nameParts[0].slice(1).toLowerCase();
 	} else if (user?.email) {
-		// Fall back to email extraction if display_name is not available
 		firstName =
 			user.email.split("@")[0].split(".")[0].charAt(0).toUpperCase() +
 			user.email.split("@")[0].split(".")[0].slice(1);
 	}
 
-	// Array of greeting variations for each time period
 	const morningGreetings = ["Good morning", "Fresh start today", "Morning", "Hey there"];
-
 	const afternoonGreetings = ["Good afternoon", "Afternoon", "Hey there", "Hi there"];
-
 	const eveningGreetings = ["Good evening", "Evening", "Hey there", "Hi there"];
-
 	const nightGreetings = ["Good night", "Evening", "Hey there", "Winding down"];
-
 	const lateNightGreetings = ["Still up", "Night owl mode", "Up past bedtime", "Hi there"];
 
-	// Select a random greeting based on time
 	let greeting: string;
 	if (hour < 5) {
-		// Late night: midnight to 5 AM
 		greeting = lateNightGreetings[Math.floor(Math.random() * lateNightGreetings.length)];
 	} else if (hour < 12) {
 		greeting = morningGreetings[Math.floor(Math.random() * morningGreetings.length)];
@@ -210,33 +198,23 @@ const getTimeBasedGreeting = (user?: { display_name?: string | null; email?: str
 	} else if (hour < 22) {
 		greeting = eveningGreetings[Math.floor(Math.random() * eveningGreetings.length)];
 	} else {
-		// Night: 10 PM to midnight
 		greeting = nightGreetings[Math.floor(Math.random() * nightGreetings.length)];
 	}
 
-	// Add personalization with first name if available
-	if (firstName) {
-		return `${greeting}, ${firstName}!`;
-	}
-
-	return `${greeting}!`;
+	return firstName ? `${greeting}, ${firstName}!` : `${greeting}!`;
 };
 
 const ThreadWelcome: FC = () => {
 	const { data: user } = useAtomValue(currentUserAtom);
-
-	// Memoize greeting so it doesn't change on re-renders (only on user change)
 	const greeting = useMemo(() => getTimeBasedGreeting(user), [user]);
 
 	return (
 		<div className="aui-thread-welcome-root mx-auto flex w-full max-w-(--thread-max-width) grow flex-col items-center px-4 relative">
-			{/* Greeting positioned above the composer */}
 			<div className="aui-thread-welcome-message absolute bottom-[calc(50%+5rem)] left-0 right-0 flex flex-col items-center text-center">
 				<h1 className="aui-thread-welcome-message-inner text-3xl md:text-5xl select-none">
 					{greeting}
 				</h1>
 			</div>
-			{/* Composer - top edge fixed, expands downward only */}
 			<div className="w-full flex items-start justify-center absolute top-[calc(50%-3.5rem)] left-0 right-0">
 				<Composer />
 			</div>
@@ -373,7 +351,6 @@ const ClipboardChip: FC<{ text: string; onDismiss: () => void }> = ({ text, onDi
 };
 
 const Composer: FC = () => {
-	// Document mention state (atoms persist across component remounts)
 	const [mentionedDocuments, setMentionedDocuments] = useAtom(mentionedDocumentsAtom);
 	const [showDocumentPopover, setShowDocumentPopover] = useState(false);
 	const [showPromptPicker, setShowPromptPicker] = useState(false);
@@ -385,9 +362,8 @@ const Composer: FC = () => {
 	const promptPickerRef = useRef<PromptPickerRef>(null);
 	const { search_space_id, chat_id } = useParams();
 	const aui = useAui();
-	// Gate the always-focused composer behaviour to desktop. On mobile,
-	// programmatic focus pops the soft keyboard, which would be jarring
-	// whenever a picker closes or the user navigates between threads.
+	// Desktop-only auto-focus; on mobile, programmatic focus would
+	// summon the soft keyboard on every picker close / thread switch.
 	const isDesktop = useMediaQuery("(min-width: 640px)");
 
 	const electronAPI = useElectronAPI();
@@ -408,7 +384,6 @@ const Composer: FC = () => {
 
 	const currentPlaceholder = COMPOSER_PLACEHOLDER;
 
-	// Live collaboration state
 	const { data: currentUser } = useAtomValue(currentUserAtom);
 	const { data: members } = useAtomValue(membersAtom);
 	const threadId = useMemo(() => {
@@ -422,13 +397,11 @@ const Composer: FC = () => {
 	const respondingToUserId = sessionState?.respondingToUserId ?? null;
 	const isBlockedByOtherUser = isAiResponding && respondingToUserId !== currentUser?.id;
 
-	// Sync comments for the entire thread via Zero (one subscription per thread)
+	// One Zero subscription per thread for comment sync.
 	useCommentsSync(threadId);
 
-	// Batch-prefetch comments for all assistant messages so individual useComments
-	// hooks never fire their own network requests (eliminates N+1 API calls).
-	// Return a primitive string from the selector so useSyncExternalStore can
-	// compare snapshots by value and avoid infinite re-render loops.
+	// Batch-prefetch assistant message comments to avoid N+1 fetches.
+	// Returns a primitive string so useSyncExternalStore can compare by value.
 	const assistantIdsKey = useAuiState(({ thread }) =>
 		thread.messages
 			.filter((m) => m.role === "assistant" && m.id?.startsWith("msg-"))
@@ -441,18 +414,9 @@ const Composer: FC = () => {
 	);
 	useBatchCommentsPreload(assistantDbMessageIds);
 
-	// Always-focused composer (Claude-style). Runs as a reactive
-	// invariant: whenever the composer is mounted and no transient
-	// picker has taken over keyboard input, the editor should be the
-	// focused element. This naturally restores focus after pickers
-	// close, after the user switches threads, and on first mount —
-	// replacing the previous one-shot ``hasAutoFocusedRef`` gate that
-	// only worked on the welcome screen.
-	//
-	// Gated on ``isDesktop`` so we don't repeatedly summon the mobile
-	// soft keyboard whenever any of the deps change. ``threadId`` is
-	// read so the effect re-fires when the user switches between two
-	// non-empty threads (where the Composer instance is reused).
+	// Always-focused composer: refocus whenever no picker has taken
+	// over input. ``threadId`` is in the deps so the effect re-fires
+	// on thread switch (Composer instance is reused).
 	useEffect(() => {
 		if (!isDesktop) return;
 		if (showDocumentPopover || showPromptPicker) return;
@@ -460,7 +424,7 @@ const Composer: FC = () => {
 		editorRef.current?.focus();
 	}, [isDesktop, showDocumentPopover, showPromptPicker, threadId]);
 
-	// Close document picker when a slide-out panel (inbox, shared/private chats) opens
+	// Close document picker when a slide-out panel (inbox, etc.) opens.
 	useEffect(() => {
 		const handler = () => {
 			setShowDocumentPopover(false);
@@ -470,21 +434,12 @@ const Composer: FC = () => {
 		return () => window.removeEventListener(SLIDEOUT_PANEL_OPENED_EVENT, handler);
 	}, []);
 
-	// Sync editor text with the assistant-ui composer runtime and
-	// reconcile the chip atom from the editor's reported docs.
-	//
-	// The editor is the source of truth for which chips exist on
-	// screen. Reconciling here covers every deletion path Plate can
-	// produce (the explicit Backspace handler, the X-button,
-	// Cmd+Backspace, range-select+Delete, cut, paste-over) without
-	// needing per-keybinding plumbing. Without this, paths that bypass
-	// ``onDocumentRemove`` left the atom carrying stale entries that
-	// the picker would re-emit via ``initialSelectedDocuments`` and
-	// resurface as chips on the next selection.
-	//
-	// The setter returns ``prev`` when the chip set is unchanged so
-	// pure-text keystrokes don't churn the atom (Jotai compares by
-	// reference for store change notifications).
+	// Sync editor text into assistant-ui's composer and mirror the chip
+	// atom from the editor's reported ``docs``. The editor is the
+	// single source of truth, so this catches every Plate deletion path
+	// (Backspace, X button, Cmd+Backspace, range-delete, cut,
+	// paste-over) without per-keybinding plumbing. The ``prev``
+	// short-circuit keeps pure-text keystrokes from churning the atom.
 	const handleEditorChange = useCallback(
 		(text: string, docs: MentionedDocument[]) => {
 			aui.composer().setText(text);
@@ -498,11 +453,9 @@ const Composer: FC = () => {
 				return docs.map<MentionedDocumentInfo>((d) => ({
 					id: d.id,
 					title: d.title,
-					// ``MentionedDocument.document_type`` is optional but
-					// the atom shape requires a string. ``"UNKNOWN"`` is
-					// the same sentinel ``getMentionDocKey`` and the
-					// editor's match predicates already use, so the key
-					// is stable across the round trip.
+					// Atom requires a string; ``"UNKNOWN"`` matches the
+					// sentinel ``getMentionDocKey`` and the editor's
+					// match predicates use.
 					document_type: d.document_type ?? "UNKNOWN",
 					kind: d.kind,
 				}));
@@ -511,13 +464,11 @@ const Composer: FC = () => {
 		[aui, setMentionedDocuments]
 	);
 
-	// Open document picker when @ mention is triggered
 	const handleMentionTrigger = useCallback((query: string) => {
 		setShowDocumentPopover(true);
 		setMentionQuery(query);
 	}, []);
 
-	// Close document picker and reset query
 	const handleMentionClose = useCallback(() => {
 		if (showDocumentPopover) {
 			setShowDocumentPopover(false);
@@ -525,13 +476,11 @@ const Composer: FC = () => {
 		}
 	}, [showDocumentPopover]);
 
-	// Open action picker when / is triggered
 	const handleActionTrigger = useCallback((query: string) => {
 		setShowPromptPicker(true);
 		setActionQuery(query);
 	}, []);
 
-	// Close action picker and reset query
 	const handleActionClose = useCallback(() => {
 		if (showPromptPicker) {
 			setShowPromptPicker(false);
@@ -575,7 +524,7 @@ const Composer: FC = () => {
 		[clipboardInitialText, electronAPI, aui]
 	);
 
-	// Keyboard navigation for document/action picker (arrow keys, Enter, Escape)
+	// Arrow / Enter / Escape navigation for the active picker.
 	const handleKeyDown = useCallback(
 		(e: React.KeyboardEvent) => {
 			if (showPromptPicker) {
@@ -656,7 +605,7 @@ const Composer: FC = () => {
 		(docId: number, docType?: string) => {
 			setMentionedDocuments((prev) => {
 				if (!docType) {
-					// Defensive fallback: keep UI in sync even when chip type is unavailable.
+					// Fallback when chip type is unavailable.
 					return prev.filter((doc) => doc.id !== docId);
 				}
 				const removedKey = getMentionDocKey({ id: docId, document_type: docType });
@@ -674,16 +623,12 @@ const Composer: FC = () => {
 			const key = getMentionDocKey(mention);
 			if (editorDocKeys.has(key)) continue;
 			editorRef.current?.insertMentionChip(mention);
-			// Track within the loop so duplicates in the same batch
-			// (defensive — the picker shouldn't produce them today)
-			// can't slip through as double-inserted chips.
+			// Track within the loop so a duplicate-in-batch can't double-insert.
 			editorDocKeys.add(key);
 		}
 
-		// Atom is reconciled by the editor's ``onChange`` after each
-		// ``insertMentionChip`` (see ``handleEditorChange``); writing
-		// here would be a second, divergent write path — exactly the
-		// shape that let stale entries resurface in the past.
+		// Atom is reconciled by ``handleEditorChange`` via the editor's
+		// onChange — no second write path here.
 		setMentionQuery("");
 	}, []);
 
@@ -1315,12 +1260,7 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 	);
 };
 
-/**
- * Friendly tool name for display in the chat UI. Delegates to the
- * shared map in ``contracts/enums/toolIcons`` so unix-style identifiers
- * (``rm``, ``ls``, ``grep`` …) and snake_cased function names render as
- * plain English (e.g. "Delete file", "List files", "Search in files").
- */
+/** Friendly tool name (delegates to ``getToolDisplayName``). */
 function formatToolName(name: string): string {
 	return getToolDisplayName(name);
 }

From 0884b63406135a817a7134a76f3a70f62f314d39 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Tue, 12 May 2026 23:25:33 +0530
Subject: [PATCH 31/96] chore: ran linting

---
 surfsense_web/atoms/chat/mentioned-documents.atom.ts       | 4 +---
 .../components/new-chat/document-mention-picker.tsx        | 7 ++-----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/surfsense_web/atoms/chat/mentioned-documents.atom.ts b/surfsense_web/atoms/chat/mentioned-documents.atom.ts
index eafdaf87e..9163960f4 100644
--- a/surfsense_web/atoms/chat/mentioned-documents.atom.ts
+++ b/surfsense_web/atoms/chat/mentioned-documents.atom.ts
@@ -97,9 +97,7 @@ export const mentionedDocumentIdsAtom = atom((get) => {
 		surfsense_doc_ids: docs
 			.filter((doc) => doc.document_type === "SURFSENSE_DOCS")
 			.map((doc) => doc.id),
-		document_ids: docs
-			.filter((doc) => doc.document_type !== "SURFSENSE_DOCS")
-			.map((doc) => doc.id),
+		document_ids: docs.filter((doc) => doc.document_type !== "SURFSENSE_DOCS").map((doc) => doc.id),
 		folder_ids: folders.map((f) => f.id),
 	};
 });
diff --git a/surfsense_web/components/new-chat/document-mention-picker.tsx b/surfsense_web/components/new-chat/document-mention-picker.tsx
index 0881b11b6..0d68c8df8 100644
--- a/surfsense_web/components/new-chat/document-mention-picker.tsx
+++ b/surfsense_web/components/new-chat/document-mention-picker.tsx
@@ -301,8 +301,7 @@ export const DocumentMentionPicker = forwardRef<
 	// folder entries lift the existing kind-aware key so the same
 	// matchers used by the chip atom apply unchanged.
 	const selectedKeys = useMemo(
-		() =>
-			new Set(initialSelectedDocuments.map((d) => getMentionDocKey(d))),
+		() => new Set(initialSelectedDocuments.map((d) => getMentionDocKey(d))),
 		[initialSelectedDocuments]
 	);
 
@@ -583,9 +582,7 @@ export const DocumentMentionPicker = forwardRef<
 								{(surfsenseDocsList.length > 0 || userDocsList.length > 0) && (
 									<div className="mx-2 my-4 border-t border-border dark:border-white/5" />
 								)}
-								<div className="px-3 py-2 text-xs font-bold text-muted-foreground/55">
-									Folders
-								</div>
+								<div className="px-3 py-2 text-xs font-bold text-muted-foreground/55">Folders</div>
 								{folderMentions.map((folder) => {
 									const folderKey = getMentionDocKey(folder);
 									const isAlreadySelected = selectedKeys.has(folderKey);

From 9b926b31337277e80c1a1f091d5a37ad7e588d5a Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Wed, 13 May 2026 00:22:43 +0530
Subject: [PATCH 32/96] refactor: update test for index() to use
 chunk_text_hybrid

---
 .../test_index_batch_parallel.py              | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/surfsense_backend/tests/unit/indexing_pipeline/test_index_batch_parallel.py b/surfsense_backend/tests/unit/indexing_pipeline/test_index_batch_parallel.py
index ae55bc089..10abd05e0 100644
--- a/surfsense_backend/tests/unit/indexing_pipeline/test_index_batch_parallel.py
+++ b/surfsense_backend/tests/unit/indexing_pipeline/test_index_batch_parallel.py
@@ -37,7 +37,11 @@ def _make_orm_doc(connector_doc, doc_id):
 async def test_index_calls_embed_and_chunk_via_to_thread(
     pipeline, make_connector_document, monkeypatch
 ):
-    """index() runs embed_texts and chunk_text via asyncio.to_thread, not blocking the loop."""
+    """index() runs the chunker and embed_texts via asyncio.to_thread, not blocking the loop.
+
+    The default (non-code) path uses ``chunk_text_hybrid`` so Markdown tables stay
+    intact (see issue #1334); ``chunk_text`` is reserved for the code-chunker branch.
+    """
     to_thread_calls = []
     original_to_thread = asyncio.to_thread
 
@@ -51,11 +55,11 @@ async def test_index_calls_embed_and_chunk_via_to_thread(
         "app.indexing_pipeline.indexing_pipeline_service.summarize_document",
         AsyncMock(return_value="Summary."),
     )
-    mock_chunk = MagicMock(return_value=["chunk1"])
-    mock_chunk.__name__ = "chunk_text"
+    mock_chunk_hybrid = MagicMock(return_value=["chunk1"])
+    mock_chunk_hybrid.__name__ = "chunk_text_hybrid"
     monkeypatch.setattr(
-        "app.indexing_pipeline.indexing_pipeline_service.chunk_text",
-        mock_chunk,
+        "app.indexing_pipeline.indexing_pipeline_service.chunk_text_hybrid",
+        mock_chunk_hybrid,
     )
     mock_embed = MagicMock(
         side_effect=lambda texts: [[0.1] * _EMBEDDING_DIM for _ in texts]
@@ -65,6 +69,11 @@ async def test_index_calls_embed_and_chunk_via_to_thread(
         "app.indexing_pipeline.indexing_pipeline_service.embed_texts",
         mock_embed,
     )
+    # Bypass set_committed_value, which requires a real ORM instance (not MagicMock).
+    monkeypatch.setattr(
+        "app.indexing_pipeline.indexing_pipeline_service.attach_chunks_to_document",
+        MagicMock(),
+    )
 
     connector_doc = make_connector_document(
         document_type=DocumentType.GOOGLE_GMAIL_CONNECTOR,
@@ -77,8 +86,9 @@ async def test_index_calls_embed_and_chunk_via_to_thread(
 
     await pipeline.index(document, connector_doc, llm=MagicMock())
 
-    assert "chunk_text" in to_thread_calls
+    assert "chunk_text_hybrid" in to_thread_calls
     assert "embed_texts" in to_thread_calls
+    assert document.status == DocumentStatus.ready()
 
 
 def _mock_session_factory(orm_docs_by_id):

From bd452b3df4a53dc2624f73213c38b79e5d050e28 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Wed, 13 May 2026 00:44:20 +0530
Subject: [PATCH 33/96] fix(tests): improve composio module hijack in
 integration tests

---
 .../tests/integration/composio/conftest.py    | 18 +++------
 .../tests/integration/conftest.py             | 37 +++++++++++++------
 2 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/surfsense_backend/tests/integration/composio/conftest.py b/surfsense_backend/tests/integration/composio/conftest.py
index 779e7bdb2..44d707ec3 100644
--- a/surfsense_backend/tests/integration/composio/conftest.py
+++ b/surfsense_backend/tests/integration/composio/conftest.py
@@ -1,13 +1,11 @@
 """Composio route integration fixtures.
 
-The sys.modules hijack happens at module import time, before importing
-app.app, so production `from composio import Composio` bindings resolve to
-the strict E2E fake in this pytest process too.
+The `composio` sys.modules hijack lives in the parent integration conftest
+so it runs before any sibling suite imports `app.routes`.
 """
 
 from __future__ import annotations
 
-import sys
 from collections.abc import AsyncGenerator
 
 import httpx
@@ -16,19 +14,15 @@ import pytest_asyncio
 from httpx import ASGITransport
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from tests.e2e.fakes import composio_module as _fake_composio
-
-sys.modules["composio"] = _fake_composio
-
-from app.app import app, limiter  # noqa: E402
-from app.config import config  # noqa: E402
-from app.db import (  # noqa: E402
+from app.app import app, limiter
+from app.config import config
+from app.db import (
     SearchSourceConnector,
     SearchSourceConnectorType,
     User,
     get_async_session,
 )
-from app.users import current_active_user  # noqa: E402
+from app.users import current_active_user
 
 pytestmark = pytest.mark.integration
 
diff --git a/surfsense_backend/tests/integration/conftest.py b/surfsense_backend/tests/integration/conftest.py
index d9d7cacae..2f4b3fe9a 100644
--- a/surfsense_backend/tests/integration/conftest.py
+++ b/surfsense_backend/tests/integration/conftest.py
@@ -1,3 +1,5 @@
+import importlib
+import sys
 import uuid
 from unittest.mock import AsyncMock, MagicMock
 
@@ -7,17 +9,27 @@ from sqlalchemy import text
 from sqlalchemy.ext.asyncio import AsyncSession, create_async_engine
 from sqlalchemy.pool import NullPool
 
-from app.config import config as app_config
-from app.db import (
-    Base,
-    DocumentType,
-    SearchSourceConnector,
-    SearchSourceConnectorType,
-    SearchSpace,
-    User,
-)
-from app.indexing_pipeline.connector_document import ConnectorDocument
-from tests.conftest import TEST_DATABASE_URL
+# Hijack `composio` before any `from app.*` import; the `from composio import
+# Composio` in app.services.composio_service binds once at first import.
+from tests.e2e.fakes import composio_module as _fake_composio
+
+sys.modules["composio"] = _fake_composio
+
+app_config = importlib.import_module("app.config").config
+app_db = importlib.import_module("app.db")
+Base = app_db.Base
+DocumentType = app_db.DocumentType
+SearchSourceConnector = app_db.SearchSourceConnector
+SearchSourceConnectorType = app_db.SearchSourceConnectorType
+SearchSpace = app_db.SearchSpace
+User = app_db.User
+ConnectorDocument = importlib.import_module(
+    "app.indexing_pipeline.connector_document"
+).ConnectorDocument
+create_default_roles_and_membership = importlib.import_module(
+    "app.routes.search_spaces_routes"
+).create_default_roles_and_membership
+TEST_DATABASE_URL = importlib.import_module("tests.conftest").TEST_DATABASE_URL
 
 _EMBEDDING_DIM = app_config.embedding_model_instance.dimension
 
@@ -105,6 +117,9 @@ async def db_search_space(db_session: AsyncSession, db_user: User) -> SearchSpac
     )
     db_session.add(space)
     await db_session.flush()
+    # Mirror POST /searchspaces so routes guarded by check_permission find a membership.
+    await create_default_roles_and_membership(db_session, space.id, db_user.id)
+    await db_session.flush()
     return space
 
 

From d9ec4018356e56667ad517c458d7a3da5e0ac5bc Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Wed, 13 May 2026 03:34:28 +0530
Subject: [PATCH 34/96] chore: remove caret from @rocicorp/zero dependency
 version

---
 surfsense_web/package.json   | 2 +-
 surfsense_web/pnpm-lock.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/surfsense_web/package.json b/surfsense_web/package.json
index efeb45fd8..d71298c72 100644
--- a/surfsense_web/package.json
+++ b/surfsense_web/package.json
@@ -79,7 +79,7 @@
 		"@remotion/media": "^4.0.438",
 		"@remotion/player": "^4.0.438",
 		"@remotion/web-renderer": "^4.0.438",
-		"@rocicorp/zero": "^1.4.0",
+		"@rocicorp/zero": "1.4.0",
 		"@slate-serializers/html": "^2.2.3",
 		"@streamdown/code": "^1.0.2",
 		"@streamdown/math": "^1.0.2",
diff --git a/surfsense_web/pnpm-lock.yaml b/surfsense_web/pnpm-lock.yaml
index 62056a215..8602feb8d 100644
--- a/surfsense_web/pnpm-lock.yaml
+++ b/surfsense_web/pnpm-lock.yaml
@@ -165,7 +165,7 @@ importers:
         specifier: ^4.0.438
         version: 4.0.438(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       '@rocicorp/zero':
-        specifier: ^1.4.0
+        specifier: 1.4.0
         version: 1.4.0(@opentelemetry/core@2.7.1(@opentelemetry/api@1.9.0))
       '@slate-serializers/html':
         specifier: ^2.2.3

From 6aa4dcef60c8f98b35e709f68a5d8bf98932886e Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Wed, 13 May 2026 16:46:35 +0530
Subject: [PATCH 35/96] refactor: update UI components to use consistent popup
 and text colors

---
 .../[search_space_id]/team/team-content.tsx   |  2 +-
 surfsense_web/app/layout.tsx                  |  2 +-
 .../announcements/AnnouncementsDialog.tsx     |  2 +-
 .../assistant-ui/assistant-message.tsx        |  2 +-
 .../assistant-ui/connector-popup.tsx          |  2 +-
 .../assistant-ui/document-upload-popup.tsx    |  4 +-
 .../components/documents/version-history.tsx  |  2 +-
 .../free-chat/free-model-selector.tsx         |  2 +-
 .../components/inference-params-editor.tsx    |  2 +-
 .../components/new-chat/chat-share-button.tsx |  2 +-
 .../new-chat/document-mention-picker.tsx      |  2 +-
 .../components/new-chat/model-selector.tsx    |  2 +-
 .../components/new-chat/prompt-picker.tsx     |  2 +-
 surfsense_web/components/onboarding-tour.tsx  | 76 +++----------------
 .../providers/GlobalLoadingProvider.tsx       |  2 +-
 .../components/settings/settings-dialog.tsx   |  2 +-
 .../components/settings/team-dialog.tsx       |  2 +-
 .../components/shared/llm-config-form.tsx     |  7 +-
 .../shared/vision-config-dialog.tsx           |  5 +-
 .../components/sources/FolderWatchDialog.tsx  |  2 +-
 surfsense_web/components/ui/alert-dialog.tsx  |  2 +-
 surfsense_web/components/ui/context-menu.tsx  |  4 +-
 surfsense_web/components/ui/dialog.tsx        |  2 +-
 surfsense_web/components/ui/dropdown-menu.tsx |  4 +-
 surfsense_web/components/ui/equation-node.tsx |  2 +-
 .../components/ui/floating-toolbar.tsx        |  2 +-
 surfsense_web/components/ui/link-toolbar.tsx  |  2 +-
 surfsense_web/components/ui/popover.tsx       |  2 +-
 surfsense_web/components/ui/select.tsx        |  2 +-
 surfsense_web/components/ui/sheet.tsx         | 10 +--
 surfsense_web/components/ui/table-node.tsx    |  2 +-
 31 files changed, 50 insertions(+), 108 deletions(-)

diff --git a/surfsense_web/app/dashboard/[search_space_id]/team/team-content.tsx b/surfsense_web/app/dashboard/[search_space_id]/team/team-content.tsx
index d9ca9efb3..f6668957b 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/team/team-content.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/team/team-content.tsx
@@ -493,7 +493,7 @@ function MemberRow({
 						<DropdownMenuContent
 							align="end"
 							onCloseAutoFocus={(e) => e.preventDefault()}
-							className="min-w-[120px] dark:bg-neutral-900 dark:border dark:border-white/5"
+							className="min-w-[120px]"
 						>
 							{canManageRoles &&
 								roles
diff --git a/surfsense_web/app/layout.tsx b/surfsense_web/app/layout.tsx
index 144968a2b..3a61069c2 100644
--- a/surfsense_web/app/layout.tsx
+++ b/surfsense_web/app/layout.tsx
@@ -137,7 +137,7 @@ export default function RootLayout({
 				<WebSiteJsonLd />
 				<SoftwareApplicationJsonLd />
 			</head>
-			<body className={cn(roboto.className, "bg-white dark:bg-black antialiased h-full w-full ")}>
+			<body className={cn(roboto.className, "bg-main-panel antialiased h-full w-full ")}>
 				<PostHogProvider>
 					<LocaleProvider>
 						<I18nProvider>
diff --git a/surfsense_web/components/announcements/AnnouncementsDialog.tsx b/surfsense_web/components/announcements/AnnouncementsDialog.tsx
index 4d3aaeb73..d624444c4 100644
--- a/surfsense_web/components/announcements/AnnouncementsDialog.tsx
+++ b/surfsense_web/components/announcements/AnnouncementsDialog.tsx
@@ -22,7 +22,7 @@ export function AnnouncementsDialog() {
 
 	return (
 		<Dialog open={open} onOpenChange={setOpen}>
-			<DialogContent className="select-none max-w-[900px] w-[95vw] md:w-[90vw] h-[90vh] md:h-[80vh] max-h-[640px] flex flex-col p-0 gap-0 overflow-hidden [--card:var(--background)] dark:[--card:oklch(0.205_0_0)] dark:[--background:oklch(0.205_0_0)]">
+			<DialogContent className="select-none max-w-[900px] w-[95vw] md:w-[90vw] h-[90vh] md:h-[80vh] max-h-[640px] flex flex-col p-0 gap-0 overflow-hidden [--card:var(--popover)]">
 				<DialogTitle className="sr-only">What's New</DialogTitle>
 
 				<div className="flex flex-1 flex-col overflow-hidden min-w-0">
diff --git a/surfsense_web/components/assistant-ui/assistant-message.tsx b/surfsense_web/components/assistant-ui/assistant-message.tsx
index 00f3acebf..0e0f47bb1 100644
--- a/surfsense_web/components/assistant-ui/assistant-message.tsx
+++ b/surfsense_web/components/assistant-ui/assistant-message.tsx
@@ -311,7 +311,7 @@ const MessageInfoDropdown: FC = () => {
 			</ActionBarMorePrimitive.Trigger>
 			<ActionBarMorePrimitive.Content
 				align="start"
-				className="bg-muted text-popover-foreground z-50 max-h-(--radix-dropdown-menu-content-available-height) min-w-[180px] origin-(--radix-dropdown-menu-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-md border dark:border-neutral-700 p-1 shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2"
+				className="bg-popover text-popover-foreground z-50 max-h-(--radix-dropdown-menu-content-available-height) min-w-[180px] origin-(--radix-dropdown-menu-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-md p-1 shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2"
 			>
 				{createdAt && (
 					<DropdownMenuLabel className="text-xs text-muted-foreground font-normal select-none">
diff --git a/surfsense_web/components/assistant-ui/connector-popup.tsx b/surfsense_web/components/assistant-ui/connector-popup.tsx
index 32943142a..52004159a 100644
--- a/surfsense_web/components/assistant-ui/connector-popup.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup.tsx
@@ -219,7 +219,7 @@ export const ConnectorIndicator = forwardRef<ConnectorIndicatorHandle, Connector
 					onPointerDownOutside={(e) => {
 						if (pickerOpen) e.preventDefault();
 					}}
-					className="max-w-3xl w-[95vw] sm:w-full h-[75vh] sm:h-[85vh] flex flex-col p-0 gap-0 overflow-hidden border border-border ring-0 dark:ring-0 bg-muted dark:bg-muted text-foreground [&>button]:right-4 sm:[&>button]:right-12 [&>button]:top-6 sm:[&>button]:top-10 [&>button]:opacity-80 [&>button]:hover:opacity-100 [&>button]:hover:bg-foreground/10 [&>button>svg]:size-5 select-none"
+					className="max-w-3xl w-[95vw] sm:w-full h-[75vh] sm:h-[85vh] flex flex-col p-0 gap-0 overflow-hidden ring-0 dark:ring-0 [&>button]:right-4 sm:[&>button]:right-12 [&>button]:top-6 sm:[&>button]:top-10 [&>button]:opacity-80 [&>button]:hover:opacity-100 [&>button]:hover:bg-foreground/10 [&>button>svg]:size-5 select-none"
 				>
 					<DialogTitle className="sr-only">Manage Connectors</DialogTitle>
 					{/* YouTube Crawler View - shown when adding YouTube videos */}
diff --git a/surfsense_web/components/assistant-ui/document-upload-popup.tsx b/surfsense_web/components/assistant-ui/document-upload-popup.tsx
index 561dc55b4..56cd533ee 100644
--- a/surfsense_web/components/assistant-ui/document-upload-popup.tsx
+++ b/surfsense_web/components/assistant-ui/document-upload-popup.tsx
@@ -133,10 +133,10 @@ const DocumentUploadPopupContent: FC<{
 				onPointerDownOutside={(e) => e.preventDefault()}
 				onInteractOutside={(e) => e.preventDefault()}
 				onEscapeKeyDown={(e) => e.preventDefault()}
-				className="select-none max-w-2xl w-[95vw] sm:w-[640px] h-[min(440px,75dvh)] sm:h-[min(520px,80vh)] flex flex-col p-0 gap-0 overflow-hidden border border-border ring-0 bg-muted dark:bg-muted text-foreground [&>button]:right-3 sm:[&>button]:right-6 [&>button]:top-5 sm:[&>button]:top-8 [&>button]:opacity-80 [&>button]:hover:opacity-100 [&>button]:hover:bg-foreground/10 [&>button]:z-[100] [&>button>svg]:size-4 sm:[&>button>svg]:size-5"
+				className="select-none max-w-2xl w-[95vw] sm:w-[640px] h-[min(440px,75dvh)] sm:h-[min(520px,80vh)] flex flex-col p-0 gap-0 overflow-hidden ring-0 [&>button]:right-3 sm:[&>button]:right-6 [&>button]:top-5 sm:[&>button]:top-8 [&>button]:opacity-80 [&>button]:hover:opacity-100 [&>button]:hover:bg-foreground/10 [&>button]:z-[100] [&>button>svg]:size-4 sm:[&>button>svg]:size-5"
 			>
 				<div className="flex-1 min-h-0 overflow-y-auto overscroll-contain">
-					<DialogHeader className="sticky top-0 z-20 bg-muted px-4 sm:px-6 pt-6 sm:pt-8 pb-10">
+					<DialogHeader className="sticky top-0 z-20 bg-popover px-4 sm:px-6 pt-6 sm:pt-8 pb-10">
 						<DialogTitle className="text-xl sm:text-3xl font-semibold tracking-tight pr-8 sm:pr-0">
 							Upload Documents
 						</DialogTitle>
diff --git a/surfsense_web/components/documents/version-history.tsx b/surfsense_web/components/documents/version-history.tsx
index 27343dc6a..ba6f368cd 100644
--- a/surfsense_web/components/documents/version-history.tsx
+++ b/surfsense_web/components/documents/version-history.tsx
@@ -29,7 +29,7 @@ export function isVersionableType(documentType: string) {
 }
 
 const DIALOG_CLASSES =
-	"select-none max-w-[900px] w-[95vw] md:w-[90vw] h-[90vh] md:h-[80vh] max-h-[640px] flex flex-col md:flex-row p-0 gap-0 overflow-hidden [--card:var(--background)] dark:[--card:oklch(0.205_0_0)] dark:[--background:oklch(0.205_0_0)]";
+	"select-none max-w-[900px] w-[95vw] md:w-[90vw] h-[90vh] md:h-[80vh] max-h-[640px] flex flex-col md:flex-row p-0 gap-0 overflow-hidden [--card:var(--popover)]";
 
 export function VersionHistoryButton({ documentId, documentType }: VersionHistoryProps) {
 	if (!isVersionableType(documentType)) return null;
diff --git a/surfsense_web/components/free-chat/free-model-selector.tsx b/surfsense_web/components/free-chat/free-model-selector.tsx
index 14005fe3d..b32bd0a9a 100644
--- a/surfsense_web/components/free-chat/free-model-selector.tsx
+++ b/surfsense_web/components/free-chat/free-model-selector.tsx
@@ -122,7 +122,7 @@ export function FreeModelSelector({ className }: { className?: string }) {
 				</Button>
 			</PopoverTrigger>
 			<PopoverContent
-				className="w-[320px] p-0 rounded-lg shadow-lg overflow-hidden bg-white border-border/60 dark:bg-neutral-900 dark:border dark:border-white/5 select-none"
+				className="w-[320px] p-0 rounded-lg shadow-lg overflow-hidden select-none"
 				align="start"
 				sideOffset={8}
 				onCloseAutoFocus={(e) => e.preventDefault()}
diff --git a/surfsense_web/components/inference-params-editor.tsx b/surfsense_web/components/inference-params-editor.tsx
index 3764b1dac..c656c2020 100644
--- a/surfsense_web/components/inference-params-editor.tsx
+++ b/surfsense_web/components/inference-params-editor.tsx
@@ -76,7 +76,7 @@ export default function InferenceParamsEditor({ params, setParams }: InferencePa
 						<SelectTrigger id="param-key" className="w-full">
 							<SelectValue placeholder="Select parameter" />
 						</SelectTrigger>
-						<SelectContent className="bg-muted dark:border-neutral-700">
+						<SelectContent>
 							{PARAM_KEYS.map((key) => (
 								<SelectItem key={key} value={key}>
 									{key}
diff --git a/surfsense_web/components/new-chat/chat-share-button.tsx b/surfsense_web/components/new-chat/chat-share-button.tsx
index bacde9c75..56c7c4bdb 100644
--- a/surfsense_web/components/new-chat/chat-share-button.tsx
+++ b/surfsense_web/components/new-chat/chat-share-button.tsx
@@ -173,7 +173,7 @@ export function ChatShareButton({ thread, onVisibilityChange, className }: ChatS
 				</PopoverTrigger>
 
 				<PopoverContent
-					className="w-[280px] md:w-[320px] p-0 rounded-lg shadow-lg bg-muted border-border/60 dark:border dark:border-neutral-700 select-none"
+					className="w-[280px] md:w-[320px] p-0 rounded-lg shadow-lg select-none"
 					align="end"
 					sideOffset={8}
 					onCloseAutoFocus={(e) => e.preventDefault()}
diff --git a/surfsense_web/components/new-chat/document-mention-picker.tsx b/surfsense_web/components/new-chat/document-mention-picker.tsx
index 0881b11b6..003b604dd 100644
--- a/surfsense_web/components/new-chat/document-mention-picker.tsx
+++ b/surfsense_web/components/new-chat/document-mention-picker.tsx
@@ -428,7 +428,7 @@ export const DocumentMentionPicker = forwardRef<
 
 	return (
 		<div
-			className="shadow-2xl rounded-lg border border-border dark:border-white/5 overflow-hidden bg-popover dark:bg-neutral-900 flex flex-col w-[280px] sm:w-[320px] select-none"
+			className="shadow-2xl rounded-lg overflow-hidden bg-popover text-popover-foreground flex flex-col w-[280px] sm:w-[320px] select-none"
 			onKeyDown={handleKeyDown}
 			role="listbox"
 			tabIndex={-1}
diff --git a/surfsense_web/components/new-chat/model-selector.tsx b/surfsense_web/components/new-chat/model-selector.tsx
index 7d7afb3d8..f1ad17823 100644
--- a/surfsense_web/components/new-chat/model-selector.tsx
+++ b/surfsense_web/components/new-chat/model-selector.tsx
@@ -1428,7 +1428,7 @@ export function ModelSelector({
 		<Popover open={open} onOpenChange={handleOpenChange}>
 			<PopoverTrigger asChild>{triggerButton}</PopoverTrigger>
 			<PopoverContent
-				className="w-[300px] md:w-[380px] p-0 rounded-lg shadow-lg overflow-hidden bg-muted border-border/60 dark:border dark:border-neutral-700 select-none"
+				className="w-[300px] md:w-[380px] p-0 rounded-lg shadow-lg overflow-hidden select-none"
 				align="start"
 				sideOffset={8}
 				onCloseAutoFocus={(e) => e.preventDefault()}
diff --git a/surfsense_web/components/new-chat/prompt-picker.tsx b/surfsense_web/components/new-chat/prompt-picker.tsx
index 9c3cd1d9f..9b3a448bb 100644
--- a/surfsense_web/components/new-chat/prompt-picker.tsx
+++ b/surfsense_web/components/new-chat/prompt-picker.tsx
@@ -112,7 +112,7 @@ export const PromptPicker = forwardRef<PromptPickerRef, PromptPickerProps>(funct
 	);
 
 	return (
-		<div className="shadow-2xl rounded-lg border border-border dark:border-white/5 overflow-hidden bg-popover dark:bg-neutral-900 flex flex-col w-[280px] sm:w-[320px] select-none">
+		<div className="shadow-2xl rounded-lg overflow-hidden bg-popover text-popover-foreground flex flex-col w-[280px] sm:w-[320px] select-none">
 			<div ref={scrollContainerRef} className="max-h-[180px] sm:max-h-[280px] overflow-y-auto">
 				{isLoading ? (
 					<div className="py-1 px-2">
diff --git a/surfsense_web/components/onboarding-tour.tsx b/surfsense_web/components/onboarding-tour.tsx
index 178b6c97e..86caaf543 100644
--- a/surfsense_web/components/onboarding-tour.tsx
+++ b/surfsense_web/components/onboarding-tour.tsx
@@ -178,10 +178,6 @@ function TourTooltip({
 	const isLastStep = stepIndex === totalSteps - 1;
 	const isFirstStep = stepIndex === 0;
 
-	const bgColor = isDarkMode ? "#27272a" : "#ffffff";
-	const textColor = isDarkMode ? "#ffffff" : "#18181b";
-	const mutedTextColor = isDarkMode ? "#a1a1aa" : "#71717a";
-
 	// Calculate pointer line position
 	const getPointerStyles = (): React.CSSProperties => {
 		const lineLength = 16;
@@ -224,68 +220,27 @@ function TourTooltip({
 	};
 
 	const renderPointer = () => {
-		const lineColor = isDarkMode ? "#27272a" : "#ffffff";
-
 		if (position.pointerPosition === "left") {
 			return (
 				<div style={getPointerStyles()}>
-					<div
-						style={{
-							width: 6,
-							height: 6,
-							borderRadius: "50%",
-							backgroundColor: lineColor,
-						}}
-					/>
-					<div
-						style={{
-							width: 16,
-							height: 2,
-							backgroundColor: lineColor,
-						}}
-					/>
+					<div className="size-1.5 rounded-full bg-main-panel" />
+					<div className="h-0.5 w-4 bg-main-panel" />
 				</div>
 			);
 		}
 		if (position.pointerPosition === "right") {
 			return (
 				<div style={getPointerStyles()}>
-					<div
-						style={{
-							width: 16,
-							height: 2,
-							backgroundColor: lineColor,
-						}}
-					/>
-					<div
-						style={{
-							width: 6,
-							height: 6,
-							borderRadius: "50%",
-							backgroundColor: lineColor,
-						}}
-					/>
+					<div className="h-0.5 w-4 bg-main-panel" />
+					<div className="size-1.5 rounded-full bg-main-panel" />
 				</div>
 			);
 		}
 		if (position.pointerPosition === "top") {
 			return (
 				<div style={getPointerStyles()}>
-					<div
-						style={{
-							width: 6,
-							height: 6,
-							borderRadius: "50%",
-							backgroundColor: lineColor,
-						}}
-					/>
-					<div
-						style={{
-							width: 2,
-							height: 16,
-							backgroundColor: lineColor,
-						}}
-					/>
+					<div className="size-1.5 rounded-full bg-main-panel" />
+					<div className="h-4 w-0.5 bg-main-panel" />
 				</div>
 			);
 		}
@@ -338,10 +293,8 @@ function TourTooltip({
 			{renderPointer()}
 
 			<div
-				className="relative rounded-lg p-4"
+				className="relative rounded-lg bg-main-panel p-4 text-foreground"
 				style={{
-					backgroundColor: bgColor,
-					color: textColor,
 					boxShadow: isDarkMode
 						? "0 25px 50px -12px rgba(0, 0, 0, 0.5)"
 						: "0 25px 50px -12px rgba(0, 0, 0, 0.15)",
@@ -355,12 +308,10 @@ function TourTooltip({
 					}}
 					onAnimationEnd={onAnimationEnd}
 				>
-					<h3 id="tour-title" className="text-sm font-semibold mb-1.5" style={{ color: textColor }}>
+					<h3 id="tour-title" className="mb-1.5 text-sm font-semibold">
 						{step.title}
 					</h3>
-					<p className="text-sm leading-relaxed" style={{ color: mutedTextColor }}>
-						{step.content}
-					</p>
+					<p className="text-sm leading-relaxed text-muted-foreground">{step.content}</p>
 				</div>
 
 				{/* Footer */}
@@ -377,8 +328,7 @@ function TourTooltip({
 									e.stopPropagation();
 									onPrev();
 								}}
-								className="text-sm font-medium transition-opacity hover:opacity-80"
-								style={{ color: mutedTextColor }}
+								className="text-sm font-medium text-muted-foreground transition-opacity hover:opacity-80"
 							>
 								Back
 							</button>
@@ -390,8 +340,7 @@ function TourTooltip({
 									e.stopPropagation();
 									onSkip();
 								}}
-								className="text-sm font-medium transition-opacity hover:opacity-80"
-								style={{ color: mutedTextColor }}
+								className="text-sm font-medium text-muted-foreground transition-opacity hover:opacity-80"
 							>
 								Skip
 							</button>
@@ -402,8 +351,7 @@ function TourTooltip({
 								e.stopPropagation();
 								onNext();
 							}}
-							className="text-sm font-medium transition-opacity hover:opacity-80"
-							style={{ color: textColor }}
+							className="text-sm font-medium text-foreground transition-opacity hover:opacity-80"
 						>
 							{isLastStep ? "Done" : "Next"}
 						</button>
diff --git a/surfsense_web/components/providers/GlobalLoadingProvider.tsx b/surfsense_web/components/providers/GlobalLoadingProvider.tsx
index 08c888954..c0fa8e4d3 100644
--- a/surfsense_web/components/providers/GlobalLoadingProvider.tsx
+++ b/surfsense_web/components/providers/GlobalLoadingProvider.tsx
@@ -34,7 +34,7 @@ export function GlobalLoadingProvider({ children }: { children: React.ReactNode
 			)}
 			aria-hidden={!isLoading}
 		>
-			<div className="flex min-h-screen flex-col items-center justify-center bg-background">
+			<div className="flex min-h-screen flex-col items-center justify-center bg-main-panel">
 				<div className="h-12 w-12 flex items-center justify-center">
 					<Spinner size="lg" className="text-muted-foreground" />
 				</div>
diff --git a/surfsense_web/components/settings/settings-dialog.tsx b/surfsense_web/components/settings/settings-dialog.tsx
index 057d7643a..ff7c4e675 100644
--- a/surfsense_web/components/settings/settings-dialog.tsx
+++ b/surfsense_web/components/settings/settings-dialog.tsx
@@ -48,7 +48,7 @@ export function SettingsDialog({
 
 	return (
 		<Dialog open={open} onOpenChange={onOpenChange}>
-			<DialogContent className="select-none max-w-[900px] w-[95vw] md:w-[90vw] h-[90vh] md:h-[80vh] max-h-[640px] flex flex-col md:flex-row p-0 gap-0 overflow-hidden [--card:var(--background)] dark:[--card:oklch(0.205_0_0)] dark:[--background:oklch(0.205_0_0)]">
+			<DialogContent className="select-none max-w-[900px] w-[95vw] md:w-[90vw] h-[90vh] md:h-[80vh] max-h-[640px] flex flex-col md:flex-row p-0 gap-0 overflow-hidden [--card:var(--popover)]">
 				<DialogTitle className="sr-only">{title}</DialogTitle>
 
 				{/* Desktop: Left sidebar */}
diff --git a/surfsense_web/components/settings/team-dialog.tsx b/surfsense_web/components/settings/team-dialog.tsx
index a3a962378..22c2a0eda 100644
--- a/surfsense_web/components/settings/team-dialog.tsx
+++ b/surfsense_web/components/settings/team-dialog.tsx
@@ -17,7 +17,7 @@ export function TeamDialog({ searchSpaceId }: TeamDialogProps) {
 	return (
 		<Dialog open={open} onOpenChange={setOpen}>
 			<DialogContent
-				className="select-none max-w-[900px] w-[95vw] md:w-[90vw] h-[90vh] md:h-[80vh] max-h-[640px] flex flex-col p-0 gap-0 overflow-hidden [--card:var(--background)] dark:[--card:oklch(0.205_0_0)] dark:[--background:oklch(0.205_0_0)]"
+				className="select-none max-w-[900px] w-[95vw] md:w-[90vw] h-[90vh] md:h-[80vh] max-h-[640px] flex flex-col p-0 gap-0 overflow-hidden [--card:var(--popover)]"
 				onOpenAutoFocus={(e) => e.preventDefault()}
 			>
 				<DialogTitle className="sr-only">{t("manage_members")}</DialogTitle>
diff --git a/surfsense_web/components/shared/llm-config-form.tsx b/surfsense_web/components/shared/llm-config-form.tsx
index 732bf971e..580b7b027 100644
--- a/surfsense_web/components/shared/llm-config-form.tsx
+++ b/surfsense_web/components/shared/llm-config-form.tsx
@@ -202,7 +202,7 @@ export function LLMConfigForm({
 											<SelectValue placeholder="Select a provider" />
 										</SelectTrigger>
 									</FormControl>
-									<SelectContent className="max-h-[300px] bg-muted dark:border-neutral-700">
+									<SelectContent className="max-h-[300px]">
 										{LLM_PROVIDERS.map((provider) => (
 											<SelectItem
 												key={provider.value}
@@ -260,10 +260,7 @@ export function LLMConfigForm({
 											</Button>
 										</FormControl>
 									</PopoverTrigger>
-									<PopoverContent
-										className="w-full p-0 bg-muted dark:border-neutral-700"
-										align="start"
-									>
+									<PopoverContent className="w-full p-0" align="start">
 										<Command shouldFilter={false} className="bg-transparent">
 											<CommandInput
 												placeholder={selectedProvider?.example || "Search model name"}
diff --git a/surfsense_web/components/shared/vision-config-dialog.tsx b/surfsense_web/components/shared/vision-config-dialog.tsx
index 7f96b0594..f8268562a 100644
--- a/surfsense_web/components/shared/vision-config-dialog.tsx
+++ b/surfsense_web/components/shared/vision-config-dialog.tsx
@@ -339,10 +339,7 @@ export function VisionConfigDialog({
 											<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
 										</Button>
 									</PopoverTrigger>
-									<PopoverContent
-										className="w-full p-0 bg-muted dark:border-neutral-700"
-										align="start"
-									>
+									<PopoverContent className="w-full p-0" align="start">
 										<Command shouldFilter={false} className="bg-transparent">
 											<CommandInput
 												placeholder={selectedProvider?.example || "Search model name"}
diff --git a/surfsense_web/components/sources/FolderWatchDialog.tsx b/surfsense_web/components/sources/FolderWatchDialog.tsx
index 3590279ce..25d7ff392 100644
--- a/surfsense_web/components/sources/FolderWatchDialog.tsx
+++ b/surfsense_web/components/sources/FolderWatchDialog.tsx
@@ -164,7 +164,7 @@ export function FolderWatchDialog({
 
 	return (
 		<Dialog open={open} onOpenChange={handleOpenChange}>
-			<DialogContent className="sm:max-w-md select-none p-0 gap-0 overflow-hidden bg-muted dark:bg-muted border border-border [&>button]:opacity-80 [&>button]:hover:opacity-100 [&>button]:hover:bg-foreground/10">
+			<DialogContent className="sm:max-w-md select-none p-0 gap-0 overflow-hidden [&>button]:opacity-80 [&>button]:hover:opacity-100 [&>button]:hover:bg-foreground/10">
 				<DialogHeader className="px-4 sm:px-6 pt-5 sm:pt-6 pb-3">
 					<DialogTitle className="text-lg sm:text-xl font-semibold tracking-tight">
 						Watch Local Folder
diff --git a/surfsense_web/components/ui/alert-dialog.tsx b/surfsense_web/components/ui/alert-dialog.tsx
index 21632ca18..4db90020f 100644
--- a/surfsense_web/components/ui/alert-dialog.tsx
+++ b/surfsense_web/components/ui/alert-dialog.tsx
@@ -45,7 +45,7 @@ function AlertDialogContent({
 			<AlertDialogPrimitive.Content
 				data-slot="alert-dialog-content"
 				className={cn(
-					"bg-background dark:bg-neutral-900 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 fixed top-[50%] left-[50%] z-50 grid w-full max-w-[calc(100%-2rem)] translate-x-[-50%] translate-y-[-50%] gap-4 rounded-xl p-6 shadow-2xl duration-200 sm:max-w-lg select-none",
+					"bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 fixed top-[50%] left-[50%] z-50 grid w-full max-w-[calc(100%-2rem)] translate-x-[-50%] translate-y-[-50%] gap-4 rounded-xl p-6 shadow-2xl duration-200 sm:max-w-lg select-none",
 					className
 				)}
 				{...props}
diff --git a/surfsense_web/components/ui/context-menu.tsx b/surfsense_web/components/ui/context-menu.tsx
index f3d4063e2..f48828acb 100644
--- a/surfsense_web/components/ui/context-menu.tsx
+++ b/surfsense_web/components/ui/context-menu.tsx
@@ -66,7 +66,7 @@ function ContextMenuSubContent({
 		<ContextMenuPrimitive.SubContent
 			data-slot="context-menu-sub-content"
 			className={cn(
-				"bg-muted text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 min-w-[8rem] overflow-hidden rounded-md border dark:border-neutral-700 p-1 shadow-lg",
+				"bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 min-w-[8rem] overflow-hidden rounded-md p-1 shadow-lg",
 				className
 			)}
 			{...props}
@@ -83,7 +83,7 @@ function ContextMenuContent({
 			<ContextMenuPrimitive.Content
 				data-slot="context-menu-content"
 				className={cn(
-					"bg-muted text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 min-w-[8rem] overflow-hidden rounded-md border dark:border-neutral-700 p-1 shadow-md",
+					"bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 min-w-[8rem] overflow-hidden rounded-md p-1 shadow-md",
 					className
 				)}
 				{...props}
diff --git a/surfsense_web/components/ui/dialog.tsx b/surfsense_web/components/ui/dialog.tsx
index 2dfd71130..48a4d958b 100644
--- a/surfsense_web/components/ui/dialog.tsx
+++ b/surfsense_web/components/ui/dialog.tsx
@@ -38,7 +38,7 @@ const DialogContent = React.forwardRef<
 		<DialogPrimitive.Content
 			ref={ref}
 			className={cn(
-				"fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 bg-background dark:bg-neutral-900 p-6 shadow-2xl duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 rounded-xl focus:outline-none focus:ring-0 focus-visible:outline-none focus-visible:ring-0 select-none",
+				"fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 bg-popover text-popover-foreground p-6 shadow-2xl duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 rounded-xl focus:outline-none focus:ring-0 focus-visible:outline-none focus-visible:ring-0 select-none",
 				className
 			)}
 			{...props}
diff --git a/surfsense_web/components/ui/dropdown-menu.tsx b/surfsense_web/components/ui/dropdown-menu.tsx
index 78ddad710..7fe3da76b 100644
--- a/surfsense_web/components/ui/dropdown-menu.tsx
+++ b/surfsense_web/components/ui/dropdown-menu.tsx
@@ -33,7 +33,7 @@ function DropdownMenuContent({
 				data-slot="dropdown-menu-content"
 				sideOffset={sideOffset}
 				className={cn(
-					"bg-muted text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 max-h-(--radix-dropdown-menu-content-available-height) min-w-[8rem] origin-(--radix-dropdown-menu-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-md border dark:border-neutral-700 p-1 shadow-md",
+					"bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 max-h-(--radix-dropdown-menu-content-available-height) min-w-[8rem] origin-(--radix-dropdown-menu-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-md p-1 shadow-md",
 					className
 				)}
 				{...props}
@@ -201,7 +201,7 @@ function DropdownMenuSubContent({
 		<DropdownMenuPrimitive.SubContent
 			data-slot="dropdown-menu-sub-content"
 			className={cn(
-				"bg-muted text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 min-w-[8rem] origin-(--radix-dropdown-menu-content-transform-origin) overflow-hidden rounded-md border dark:border-neutral-700 p-1 shadow-lg",
+				"bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 min-w-[8rem] origin-(--radix-dropdown-menu-content-transform-origin) overflow-hidden rounded-md p-1 shadow-lg",
 				className
 			)}
 			{...props}
diff --git a/surfsense_web/components/ui/equation-node.tsx b/surfsense_web/components/ui/equation-node.tsx
index e708c3238..98bcf5f8e 100644
--- a/surfsense_web/components/ui/equation-node.tsx
+++ b/surfsense_web/components/ui/equation-node.tsx
@@ -151,7 +151,7 @@ export function InlineEquationElement({ children, ...props }: PlateElementProps<
 
 			{isEditing && (
 				<span
-					className="absolute z-50 mt-1 rounded-md border bg-popover p-2 shadow-md"
+					className="absolute z-50 mt-1 rounded-md bg-popover p-2 shadow-md"
 					contentEditable={false}
 				>
 					<textarea
diff --git a/surfsense_web/components/ui/floating-toolbar.tsx b/surfsense_web/components/ui/floating-toolbar.tsx
index 3d5a73787..33560573a 100644
--- a/surfsense_web/components/ui/floating-toolbar.tsx
+++ b/surfsense_web/components/ui/floating-toolbar.tsx
@@ -65,7 +65,7 @@ export function FloatingToolbar({
 				{...rootProps}
 				ref={ref}
 				className={cn(
-					"scrollbar-hide absolute z-50 overflow-x-auto whitespace-nowrap rounded-md border dark:border-neutral-700 bg-muted p-1 opacity-100 shadow-md print:hidden",
+					"scrollbar-hide absolute z-50 overflow-x-auto whitespace-nowrap rounded-md bg-muted p-1 opacity-100 shadow-md print:hidden",
 					"max-w-[80vw]",
 					"[&_button:hover]:bg-neutral-200 dark:[&_button:hover]:bg-neutral-700",
 					className
diff --git a/surfsense_web/components/ui/link-toolbar.tsx b/surfsense_web/components/ui/link-toolbar.tsx
index 5779d9157..ee61e515d 100644
--- a/surfsense_web/components/ui/link-toolbar.tsx
+++ b/surfsense_web/components/ui/link-toolbar.tsx
@@ -26,7 +26,7 @@ import { buttonVariants } from "@/components/ui/button";
 import { Separator } from "@/components/ui/separator";
 
 const popoverVariants = cva(
-	"z-50 w-auto rounded-md border bg-popover p-1 text-popover-foreground shadow-md outline-hidden"
+	"z-50 w-auto rounded-md bg-popover p-1 text-popover-foreground shadow-md outline-hidden"
 );
 
 const inputVariants = cva(
diff --git a/surfsense_web/components/ui/popover.tsx b/surfsense_web/components/ui/popover.tsx
index 2dd8d280b..0d2759543 100644
--- a/surfsense_web/components/ui/popover.tsx
+++ b/surfsense_web/components/ui/popover.tsx
@@ -26,7 +26,7 @@ function PopoverContent({
 				align={align}
 				sideOffset={sideOffset}
 				className={cn(
-					"bg-muted text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-72 rounded-md border dark:border-neutral-700 p-4 shadow-md outline-hidden",
+					"bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-72 rounded-md p-4 shadow-md outline-hidden",
 					className
 				)}
 				{...props}
diff --git a/surfsense_web/components/ui/select.tsx b/surfsense_web/components/ui/select.tsx
index 5bde69af2..637349e7f 100644
--- a/surfsense_web/components/ui/select.tsx
+++ b/surfsense_web/components/ui/select.tsx
@@ -51,7 +51,7 @@ function SelectContent({
 			<SelectPrimitive.Content
 				data-slot="select-content"
 				className={cn(
-					"bg-muted text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 relative z-50 max-h-96 min-w-[8rem] overflow-hidden rounded-md border dark:border-neutral-700 shadow-md",
+					"bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 relative z-50 max-h-96 min-w-[8rem] overflow-hidden rounded-md shadow-md",
 					position === "popper" &&
 						"data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1",
 					className
diff --git a/surfsense_web/components/ui/sheet.tsx b/surfsense_web/components/ui/sheet.tsx
index 650e85403..6a7e94227 100644
--- a/surfsense_web/components/ui/sheet.tsx
+++ b/surfsense_web/components/ui/sheet.tsx
@@ -54,15 +54,15 @@ function SheetContent({
 			<SheetPrimitive.Content
 				data-slot="sheet-content"
 				className={cn(
-					"bg-background data-[state=open]:animate-in data-[state=closed]:animate-out fixed z-50 flex flex-col gap-4 shadow-lg transition ease-in-out data-[state=closed]:duration-300 data-[state=open]:duration-500",
+					"bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out fixed z-50 flex flex-col gap-4 shadow-lg transition ease-in-out data-[state=closed]:duration-300 data-[state=open]:duration-500",
 					side === "right" &&
-						"data-[state=closed]:slide-out-to-right data-[state=open]:slide-in-from-right inset-y-0 right-0 h-full w-3/4 border-l sm:max-w-sm",
+						"data-[state=closed]:slide-out-to-right data-[state=open]:slide-in-from-right inset-y-0 right-0 h-full w-3/4 sm:max-w-sm",
 					side === "left" &&
-						"data-[state=closed]:slide-out-to-left data-[state=open]:slide-in-from-left inset-y-0 left-0 h-full w-3/4 border-r sm:max-w-sm",
+						"data-[state=closed]:slide-out-to-left data-[state=open]:slide-in-from-left inset-y-0 left-0 h-full w-3/4 sm:max-w-sm",
 					side === "top" &&
-						"data-[state=closed]:slide-out-to-top data-[state=open]:slide-in-from-top inset-x-0 top-0 h-auto border-b",
+						"data-[state=closed]:slide-out-to-top data-[state=open]:slide-in-from-top inset-x-0 top-0 h-auto",
 					side === "bottom" &&
-						"data-[state=closed]:slide-out-to-bottom data-[state=open]:slide-in-from-bottom inset-x-0 bottom-0 h-auto border-t",
+						"data-[state=closed]:slide-out-to-bottom data-[state=open]:slide-in-from-bottom inset-x-0 bottom-0 h-auto",
 					className
 				)}
 				{...props}
diff --git a/surfsense_web/components/ui/table-node.tsx b/surfsense_web/components/ui/table-node.tsx
index c0f1d6ea8..06d1826e9 100644
--- a/surfsense_web/components/ui/table-node.tsx
+++ b/surfsense_web/components/ui/table-node.tsx
@@ -123,7 +123,7 @@ function TableFloatingToolbar({ children, ...props }: React.ComponentProps<typeo
 				{...props}
 			>
 				<Toolbar
-					className="scrollbar-hide flex w-auto max-w-[80vw] flex-row overflow-x-auto rounded-md border bg-popover p-1 shadow-md print:hidden"
+					className="scrollbar-hide flex w-auto max-w-[80vw] flex-row overflow-x-auto rounded-md bg-popover p-1 shadow-md print:hidden"
 					contentEditable={false}
 				>
 					<ToolbarGroup>

From 0fecff45b9b08dc706bc43d7e62fe7b1d1cd689a Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Wed, 13 May 2026 17:21:10 +0530
Subject: [PATCH 36/96] refactor: update UI components to use 'bg-popover' for
 consistent styling

---
 .../assistant-ui/connector-popup.tsx          |  2 +-
 .../components/connector-dialog-header.tsx    |  2 +-
 .../views/connector-edit-view.tsx             |  6 ++---
 .../views/indexing-configuration-view.tsx     |  4 ++--
 .../views/connector-accounts-list-view.tsx    |  2 +-
 .../layout/ui/right-panel/RightPanel.tsx      | 18 ++++++++++++---
 .../layout/ui/sidebar/DocumentsSidebar.tsx    | 23 +++++--------------
 7 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/surfsense_web/components/assistant-ui/connector-popup.tsx b/surfsense_web/components/assistant-ui/connector-popup.tsx
index 52004159a..a44deeb1f 100644
--- a/surfsense_web/components/assistant-ui/connector-popup.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup.tsx
@@ -453,7 +453,7 @@ export const ConnectorIndicator = forwardRef<ConnectorIndicatorHandle, Connector
 									</div>
 								</div>
 								{/* Bottom fade shadow */}
-								<div className="absolute bottom-0 left-0 right-0 h-7 bg-linear-to-t from-muted via-muted/80 to-transparent pointer-events-none z-10" />
+								<div className="absolute bottom-0 left-0 right-0 h-7 bg-linear-to-t from-popover via-popover/80 to-transparent pointer-events-none z-10" />
 							</div>
 						</Tabs>
 					)}
diff --git a/surfsense_web/components/assistant-ui/connector-popup/components/connector-dialog-header.tsx b/surfsense_web/components/assistant-ui/connector-popup/components/connector-dialog-header.tsx
index 819e11cd3..5c1d61c26 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/components/connector-dialog-header.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/components/connector-dialog-header.tsx
@@ -25,7 +25,7 @@ export const ConnectorDialogHeader: FC<ConnectorDialogHeaderProps> = ({
 		<div
 			className={cn(
 				"flex-shrink-0 px-4 sm:px-12 pt-5 sm:pt-10 transition-shadow duration-200 relative z-10",
-				isScrolled && "shadow-xl bg-muted/50 backdrop-blur-md"
+				isScrolled && "bg-popover shadow-xl"
 			)}
 		>
 			<DialogHeader>
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-edit-view.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-edit-view.tsx
index c104f140a..f8116d2fd 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-edit-view.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-edit-view.tsx
@@ -368,16 +368,16 @@ export const ConnectorEditView: FC<ConnectorEditViewProps> = ({
 				</div>
 				{/* Top fade shadow - appears when scrolled */}
 				{isScrolled && (
-					<div className="absolute top-0 left-0 right-0 h-6 bg-gradient-to-b from-muted/50 to-transparent pointer-events-none z-10" />
+					<div className="absolute top-0 left-0 right-0 h-6 bg-gradient-to-b from-popover to-transparent pointer-events-none z-10" />
 				)}
 				{/* Bottom fade shadow - appears when there's more content */}
 				{hasMoreContent && (
-					<div className="absolute bottom-0 left-0 right-0 h-3 bg-gradient-to-t from-muted/50 to-transparent pointer-events-none z-10" />
+					<div className="absolute bottom-0 left-0 right-0 h-3 bg-gradient-to-t from-popover to-transparent pointer-events-none z-10" />
 				)}
 			</div>
 
 			{/* Fixed Footer - Action buttons */}
-			<div className="flex-shrink-0 flex flex-col sm:flex-row items-stretch sm:items-center justify-between gap-3 sm:gap-0 px-6 sm:px-12 py-6 sm:py-6 bg-muted border-t border-border">
+			<div className="flex-shrink-0 flex flex-col sm:flex-row items-stretch sm:items-center justify-between gap-3 sm:gap-0 px-6 sm:px-12 py-6 sm:py-6 bg-popover">
 				{showDisconnectConfirm ? (
 					<div className="flex flex-col sm:flex-row items-stretch sm:items-center gap-3 flex-1 sm:flex-initial">
 						<span className="text-xs sm:text-sm text-muted-foreground sm:whitespace-nowrap">
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/indexing-configuration-view.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/indexing-configuration-view.tsx
index 982b0be11..276cd24d3 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/indexing-configuration-view.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/indexing-configuration-view.tsx
@@ -246,11 +246,11 @@ export const IndexingConfigurationView: FC<IndexingConfigurationViewProps> = ({
 				</div>
 				{/* Top fade shadow - appears when scrolled */}
 				{isScrolled && (
-					<div className="absolute top-0 left-0 right-0 h-6 bg-gradient-to-b from-muted/50 to-transparent pointer-events-none z-10" />
+					<div className="absolute top-0 left-0 right-0 h-6 bg-gradient-to-b from-popover to-transparent pointer-events-none z-10" />
 				)}
 				{/* Bottom fade shadow - appears when there's more content */}
 				{hasMoreContent && (
-					<div className="absolute bottom-0 left-0 right-0 h-3 bg-gradient-to-t from-muted/50 to-transparent pointer-events-none z-10" />
+					<div className="absolute bottom-0 left-0 right-0 h-3 bg-gradient-to-t from-popover to-transparent pointer-events-none z-10" />
 				)}
 			</div>
 
diff --git a/surfsense_web/components/assistant-ui/connector-popup/views/connector-accounts-list-view.tsx b/surfsense_web/components/assistant-ui/connector-popup/views/connector-accounts-list-view.tsx
index 8aee7e005..1d0f20922 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/views/connector-accounts-list-view.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/views/connector-accounts-list-view.tsx
@@ -108,7 +108,7 @@ export const ConnectorAccountsListView: FC<ConnectorAccountsListViewProps> = ({
 	return (
 		<div className="flex flex-col h-full">
 			{/* Header */}
-			<div className="px-6 sm:px-12 pt-8 sm:pt-10 pb-1 sm:pb-4 border-b border-border/50 bg-muted">
+			<div className="px-6 sm:px-12 pt-8 sm:pt-10 pb-1 sm:pb-4 bg-popover">
 				{/* Back button */}
 				<button
 					type="button"
diff --git a/surfsense_web/components/layout/ui/right-panel/RightPanel.tsx b/surfsense_web/components/layout/ui/right-panel/RightPanel.tsx
index 8bc15b4c5..8e2a5d1fe 100644
--- a/surfsense_web/components/layout/ui/right-panel/RightPanel.tsx
+++ b/surfsense_web/components/layout/ui/right-panel/RightPanel.tsx
@@ -3,7 +3,7 @@
 import { useAtom, useAtomValue, useSetAtom } from "jotai";
 import { PanelRight } from "lucide-react";
 import dynamic from "next/dynamic";
-import { startTransition, useEffect } from "react";
+import { startTransition, useEffect, type MouseEvent } from "react";
 import { closeReportPanelAtom, reportPanelAtom } from "@/atoms/chat/report-panel.atom";
 import { citationPanelAtom, closeCitationPanelAtom } from "@/atoms/citation/citation-panel.atom";
 import { documentsSidebarOpenAtom } from "@/atoms/documents/ui.atoms";
@@ -53,6 +53,10 @@ interface RightPanelProps {
 	};
 }
 
+function isKeyboardClick(event: MouseEvent) {
+	return event.detail === 0;
+}
+
 function CollapseButton({ onClick }: { onClick: () => void }) {
 	return (
 		<Tooltip>
@@ -60,7 +64,11 @@ function CollapseButton({ onClick }: { onClick: () => void }) {
 				<Button
 					variant="ghost"
 					size="icon"
-					onClick={onClick}
+					tabIndex={-1}
+					onClick={(event) => {
+						if (isKeyboardClick(event)) return;
+						onClick();
+					}}
 					className="h-8 w-8 shrink-0 text-muted-foreground hover:text-muted-foreground hover:bg-accent"
 				>
 					<PanelRight className="h-4 w-4" />
@@ -101,7 +109,11 @@ export function RightPanelExpandButton() {
 					<Button
 						variant="ghost"
 						size="icon"
-						onClick={() => startTransition(() => setCollapsed(false))}
+						tabIndex={-1}
+						onClick={(event) => {
+							if (isKeyboardClick(event)) return;
+							startTransition(() => setCollapsed(false));
+						}}
 						className="h-8 w-8 shrink-0 -m-0.5 text-muted-foreground hover:text-muted-foreground hover:bg-accent"
 					>
 						<PanelRight className="h-4 w-4" />
diff --git a/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx
index 0e6945fc1..17bf62967 100644
--- a/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx
@@ -38,7 +38,6 @@ import {
 	folderWatchDialogOpenAtom,
 	folderWatchInitialFolderAtom,
 } from "@/atoms/folder-sync/folder-sync.atoms";
-import { rightPanelCollapsedAtom } from "@/atoms/layout/right-panel.atom";
 import { searchSpacesAtom } from "@/atoms/search-spaces/search-space-query.atoms";
 import { CreateFolderDialog } from "@/components/documents/CreateFolderDialog";
 import type { DocumentNodeDoc } from "@/components/documents/DocumentNode";
@@ -199,7 +198,6 @@ function AuthenticatedDocumentsSidebarBase({
 	const electronAPI = desktopFeaturesEnabled ? platformElectronAPI : null;
 	const searchSpaceId = Number(params.search_space_id);
 	const setConnectorDialogOpen = useSetAtom(connectorDialogOpenAtom);
-	const setRightPanelCollapsed = useSetAtom(rightPanelCollapsedAtom);
 	const openEditorPanel = useSetAtom(openEditorPanelAtom);
 	const { data: agentFlags } = useAtomValue(agentFlagsAtom);
 	const { data: connectors } = useAtomValue(connectorsAtom);
@@ -1024,17 +1022,13 @@ function AuthenticatedDocumentsSidebarBase({
 
 	useEffect(() => {
 		const handleEscape = (e: KeyboardEvent) => {
-			if (e.key === "Escape" && open) {
-				if (isMobile) {
-					onOpenChange(false);
-				} else {
-					setRightPanelCollapsed(true);
-				}
+			if (e.key === "Escape" && open && isMobile) {
+				onOpenChange(false);
 			}
 		};
 		document.addEventListener("keydown", handleEscape);
 		return () => document.removeEventListener("keydown", handleEscape);
-	}, [open, onOpenChange, isMobile, setRightPanelCollapsed]);
+	}, [open, onOpenChange, isMobile]);
 
 	const showFilesystemTabs =
 		!isMobile && !!electronAPI && !!filesystemSettings && localFilesystemEnabled;
@@ -1585,7 +1579,6 @@ function AnonymousDocumentsSidebar({
 	const t = useTranslations("documents");
 	const tSidebar = useTranslations("sidebar");
 	const isMobile = !useMediaQuery("(min-width: 640px)");
-	const setRightPanelCollapsed = useSetAtom(rightPanelCollapsedAtom);
 	const anonMode = useAnonymousMode();
 	const { gate } = useLoginGate();
 
@@ -1697,17 +1690,13 @@ function AnonymousDocumentsSidebar({
 
 	useEffect(() => {
 		const handleEscape = (e: KeyboardEvent) => {
-			if (e.key === "Escape" && open) {
-				if (isMobile) {
-					onOpenChange(false);
-				} else {
-					setRightPanelCollapsed(true);
-				}
+			if (e.key === "Escape" && open && isMobile) {
+				onOpenChange(false);
 			}
 		};
 		document.addEventListener("keydown", handleEscape);
 		return () => document.removeEventListener("keydown", handleEscape);
-	}, [open, onOpenChange, isMobile, setRightPanelCollapsed]);
+	}, [open, onOpenChange, isMobile]);
 
 	const documentsContent = (
 		<>

From 357714beda8714178ec776c6577f2369873a3cdf Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Wed, 13 May 2026 17:55:33 +0530
Subject: [PATCH 37/96] refactor: enhance TabBar component with hover effects
 and improved scrolling behavior

---
 .../components/layout/ui/tabs/TabBar.tsx      | 125 ++++++++++++------
 1 file changed, 82 insertions(+), 43 deletions(-)

diff --git a/surfsense_web/components/layout/ui/tabs/TabBar.tsx b/surfsense_web/components/layout/ui/tabs/TabBar.tsx
index 432d101e4..e74cd0919 100644
--- a/surfsense_web/components/layout/ui/tabs/TabBar.tsx
+++ b/surfsense_web/components/layout/ui/tabs/TabBar.tsx
@@ -2,7 +2,7 @@
 
 import { useAtomValue, useSetAtom } from "jotai";
 import { Plus, X } from "lucide-react";
-import { useCallback, useEffect, useRef } from "react";
+import { Fragment, useCallback, useEffect, useRef, useState } from "react";
 import {
 	activeTabIdAtom,
 	closeTabAtom,
@@ -45,6 +45,21 @@ export function TabBar({
 	const switchTab = useSetAtom(switchTabAtom);
 	const closeTab = useSetAtom(closeTabAtom);
 	const scrollRef = useRef<HTMLDivElement>(null);
+	const [hoveredTabIndex, setHoveredTabIndex] = useState<number | null>(null);
+	const activeTabIndex = tabs.findIndex((tab) => tab.id === activeTabId);
+
+	const shouldHideSeparator = useCallback(
+		(separatorIndex: number) => {
+			// separatorIndex sits between tabs[separatorIndex - 1] and tabs[separatorIndex].
+			return (
+				hoveredTabIndex === separatorIndex - 1 ||
+				hoveredTabIndex === separatorIndex ||
+				activeTabIndex === separatorIndex - 1 ||
+				activeTabIndex === separatorIndex
+			);
+		},
+		[hoveredTabIndex, activeTabIndex]
+	);
 
 	const handleTabClick = useCallback(
 		(tab: Tab) => {
@@ -98,7 +113,19 @@ export function TabBar({
 
 		const onWheel = (e: WheelEvent) => {
 			if (Math.abs(e.deltaY) <= Math.abs(e.deltaX)) return;
-			el.scrollLeft += e.deltaY > 0 ? 50 : -50;
+
+			const delta =
+				e.deltaMode === WheelEvent.DOM_DELTA_LINE
+					? e.deltaY * 16
+					: e.deltaMode === WheelEvent.DOM_DELTA_PAGE
+						? e.deltaY * el.clientWidth
+						: e.deltaY;
+			const maxScrollLeft = el.scrollWidth - el.clientWidth;
+			const nextScrollLeft = Math.min(maxScrollLeft, Math.max(0, el.scrollLeft + delta));
+
+			if (nextScrollLeft === el.scrollLeft) return;
+
+			el.scrollLeft = nextScrollLeft;
 			e.preventDefault();
 		};
 
@@ -146,54 +173,66 @@ export function TabBar({
 			{leftActions ? <div className="flex items-center gap-0.5 shrink-0">{leftActions}</div> : null}
 			<div
 				ref={scrollRef}
-				className="flex h-8 items-center flex-1 gap-3 pl-2 overflow-x-auto overflow-y-hidden scrollbar-hide [scrollbar-width:none] [-ms-overflow-style:none] [&::-webkit-scrollbar]:hidden py-0"
+				className="flex h-8 items-center flex-1 gap-0 pl-2 overflow-x-auto overflow-y-hidden scrollbar-hide [scrollbar-width:none] [-ms-overflow-style:none] [&::-webkit-scrollbar]:hidden py-0"
 			>
-				{tabs.map((tab) => {
+				{tabs.map((tab, index) => {
 					const isActive = tab.id === activeTabId;
 
 					return (
-						<button
-							key={tab.id}
-							type="button"
-							data-tab-id={tab.id}
-							onClick={() => handleTabClick(tab)}
-							className={cn(
-								"group relative flex h-full items-center px-3 w-[180px] min-h-0 overflow-hidden text-[13px] font-medium rounded-md transition-colors duration-150 shrink-0",
-								isActive
-									? "bg-muted text-foreground"
-									: "bg-transparent text-muted-foreground hover:bg-muted/50 hover:text-foreground"
-							)}
-						>
-							<span className="block min-w-0 flex-1 whitespace-nowrap overflow-hidden text-left">
-								{tab.title}
-							</span>
-							{/* Hover-only gradient + close overlay (sidebar pattern) — keeps pill width fixed and avoids ellipsis shift. */}
-							<div
+						<Fragment key={tab.id}>
+							{index > 0 ? (
+								<div
+									aria-hidden="true"
+									className={cn(
+										"mx-1.5 h-4 w-px shrink-0 bg-muted-foreground/20 transition-opacity duration-150 dark:bg-muted-foreground/25",
+										shouldHideSeparator(index) && "opacity-0"
+									)}
+								/>
+							) : null}
+							<button
+								type="button"
+								data-tab-id={tab.id}
+								onClick={() => handleTabClick(tab)}
+								onMouseEnter={() => setHoveredTabIndex(index)}
+								onMouseLeave={() => setHoveredTabIndex(null)}
 								className={cn(
-									"pointer-events-none absolute right-0 top-0 bottom-0 flex items-center rounded-r-md pl-8 pr-2 opacity-0 transition-opacity duration-150",
-									"group-hover:opacity-100 group-focus-within:opacity-100",
+									"group relative flex h-full items-center px-3 w-[180px] min-h-0 overflow-hidden text-[13px] font-medium rounded-md transition-colors duration-150 shrink-0",
 									isActive
-										? "bg-gradient-to-l from-muted from-60% to-transparent"
-										: "bg-gradient-to-l from-muted from-60% to-transparent"
+										? "bg-muted text-foreground"
+										: "bg-transparent text-muted-foreground hover:bg-accent hover:text-accent-foreground"
 								)}
 							>
-								{/* biome-ignore lint/a11y/useSemanticElements: cannot nest button inside button */}
-								<span
-									role="button"
-									tabIndex={0}
-									onClick={(e) => handleTabClose(e, tab.id)}
-									onKeyDown={(e) => {
-										if (e.key === "Enter" || e.key === " ") {
-											e.preventDefault();
-											handleTabClose(e as unknown as React.MouseEvent, tab.id);
-										}
-									}}
-									className="pointer-events-auto rounded-full p-0.5 transition-colors hover:bg-muted-foreground/15"
-								>
-									<X className="size-3" />
+								<span className="block min-w-0 flex-1 whitespace-nowrap overflow-hidden text-left">
+									{tab.title}
 								</span>
-							</div>
-						</button>
+								{/* Hover-only gradient + close overlay (sidebar pattern) — keeps pill width fixed and avoids ellipsis shift. */}
+								<div
+									className={cn(
+										"pointer-events-none absolute right-0 top-0 bottom-0 flex items-center rounded-r-md pl-8 pr-2 opacity-0 transition-opacity duration-150",
+										"group-hover:opacity-100 group-focus-within:opacity-100",
+										isActive
+											? "bg-gradient-to-l from-muted from-60% to-transparent"
+											: "bg-gradient-to-l from-accent from-60% to-transparent"
+									)}
+								>
+									{/* biome-ignore lint/a11y/useSemanticElements: cannot nest button inside button */}
+									<span
+										role="button"
+										tabIndex={0}
+										onClick={(e) => handleTabClose(e, tab.id)}
+										onKeyDown={(e) => {
+											if (e.key === "Enter" || e.key === " ") {
+												e.preventDefault();
+												handleTabClose(e as unknown as React.MouseEvent, tab.id);
+											}
+										}}
+										className="pointer-events-auto rounded-full p-0.5 transition-colors hover:bg-accent hover:text-accent-foreground"
+									>
+										<X className="size-3" />
+									</span>
+								</div>
+							</button>
+						</Fragment>
 					);
 				})}
 				{onNewChat && (
@@ -201,7 +240,7 @@ export function TabBar({
 						className={cn(
 							// Solid bg + soft left-fade so tabs scrolling underneath the
 							// + button get visually masked into the bar's background.
-							"sticky right-0 z-10 flex h-full shrink-0 items-center bg-panel pl-3 pr-1",
+							"sticky right-0 z-10 ml-3 flex h-full shrink-0 items-center bg-panel pl-3 pr-1",
 							"before:content-[''] before:absolute before:inset-y-0 before:-left-4 before:w-4 before:pointer-events-none",
 							"before:bg-gradient-to-r before:from-transparent before:to-panel"
 						)}
@@ -209,7 +248,7 @@ export function TabBar({
 						<button
 							type="button"
 							onClick={onNewChat}
-							className="flex h-8 w-8 items-center justify-center shrink-0 rounded-md text-muted-foreground transition-all duration-150 hover:text-muted-foreground hover:bg-muted/40"
+							className="flex h-8 w-8 items-center justify-center shrink-0 rounded-md text-muted-foreground transition-all duration-150 hover:bg-accent hover:text-accent-foreground"
 							title="New Chat"
 						>
 							<Plus className="size-4" />

From a9252913cf884c5f34f740d0c1ab78b4bf02fb4a Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Wed, 13 May 2026 18:22:52 +0530
Subject: [PATCH 38/96] refactor: update OnboardPage styling for consistency
 with main panel design

---
 .../app/dashboard/[search_space_id]/onboard/page.tsx          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/surfsense_web/app/dashboard/[search_space_id]/onboard/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/onboard/page.tsx
index 4dba3bbb6..3e3f41deb 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/onboard/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/onboard/page.tsx
@@ -151,7 +151,7 @@ export default function OnboardPage() {
 	}
 
 	return (
-		<div className="h-screen flex flex-col items-center p-4 bg-background dark:bg-neutral-900 select-none overflow-hidden">
+		<div className="h-screen flex flex-col items-center p-4 bg-main-panel select-none overflow-hidden">
 			<div className="w-full max-w-lg flex flex-col min-h-0 h-full gap-6 py-8">
 				{/* Header */}
 				<div className="text-center space-y-3 shrink-0">
@@ -165,7 +165,7 @@ export default function OnboardPage() {
 				</div>
 
 				{/* Form card */}
-				<div className="rounded-xl border bg-background dark:bg-neutral-900 flex-1 min-h-0 overflow-y-auto px-6 py-6">
+				<div className="rounded-xl border bg-main-panel flex-1 min-h-0 overflow-y-auto px-6 py-6">
 					<LLMConfigForm
 						searchSpaceId={searchSpaceId}
 						onSubmit={handleSubmit}

From 75b7a9cc6c64fb227813e8e248e0713f0e362809 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Wed, 13 May 2026 23:53:09 +0530
Subject: [PATCH 39/96] refactor: update UI components to enhance hover effects
 and color consistency

---
 .../[search_space_id]/buy-more/page.tsx       |  2 +-
 .../[search_space_id]/logs/(manage)/page.tsx  |  4 +-
 .../[search_space_id]/logs/loading.tsx        |  2 +-
 .../[search_space_id]/team/team-content.tsx   |  4 +-
 .../components/ApiKeyContent.tsx              |  4 +-
 .../components/DesktopShortcutsContent.tsx    |  4 +-
 .../components/MemoryContent.tsx              |  2 +-
 .../components/ProfileContent.tsx             |  2 +-
 .../components/PromptsContent.tsx             |  2 +-
 surfsense_web/app/desktop/login/page.tsx      | 43 ++++++++++++++++---
 surfsense_web/app/globals.css                 |  4 +-
 .../agent-action-log/action-log-item.tsx      |  2 +-
 .../assistant-ui/assistant-message.tsx        |  6 +--
 .../components/assistant-ui/chat-viewport.tsx |  2 +-
 .../assistant-ui/connector-popup.tsx          |  2 +-
 .../components/connector-card.tsx             |  6 +--
 .../components/connector-dialog-header.tsx    |  2 +-
 .../components/date-range-selector.tsx        |  8 ++--
 .../components/mcp-connect-form.tsx           |  6 +--
 .../components/obsidian-connect-form.tsx      |  2 +-
 .../components/composio-drive-config.tsx      |  6 +--
 .../components/discord-config.tsx             |  4 +-
 .../components/dropbox-config.tsx             |  6 +--
 .../components/google-drive-config.tsx        |  6 +--
 .../components/mcp-config.tsx                 |  2 +-
 .../components/onedrive-config.tsx            |  6 +--
 .../components/slack-config.tsx               |  4 +-
 .../components/webcrawler-config.tsx          |  2 +-
 .../views/connector-connect-view.tsx          |  2 +-
 .../views/connector-edit-view.tsx             |  4 +-
 .../views/indexing-configuration-view.tsx     |  2 +-
 .../tabs/active-connectors-tab.tsx            | 10 ++---
 .../views/connector-accounts-list-view.tsx    |  8 ++--
 .../views/youtube-crawler-view.tsx            |  4 +-
 .../assistant-ui/document-upload-popup.tsx    |  2 +-
 .../assistant-ui/inline-citation.tsx          |  2 +-
 .../assistant-ui/reasoning-message-part.tsx   |  8 ++--
 .../assistant-ui/revert-turn-button.tsx       |  2 +-
 .../components/assistant-ui/thread-list.tsx   |  6 +--
 .../components/assistant-ui/thread.tsx        | 26 +++++------
 .../comment-item/comment-item.tsx             |  2 +-
 .../comment-thread/comment-thread.tsx         |  2 +-
 .../member-mention-item.tsx                   |  2 +-
 .../citation-panel/citation-panel.tsx         |  4 +-
 .../components/documents/DocumentNode.tsx     |  2 +-
 .../components/documents/DocumentsFilters.tsx | 10 ++---
 .../components/documents/FolderNode.tsx       |  2 +-
 .../documents/FolderPickerDialog.tsx          |  4 +-
 .../components/documents/version-history.tsx  |  2 +-
 .../components/editor-panel/editor-panel.tsx  |  4 +-
 .../components/inference-params-editor.tsx    |  2 +-
 .../layout/ui/right-panel/RightPanel.tsx      |  4 +-
 .../ui/sidebar/AllPrivateChatsSidebar.tsx     |  4 +-
 .../ui/sidebar/AllSharedChatsSidebar.tsx      |  4 +-
 .../ui/sidebar/DesktopLocalTabContent.tsx     | 12 +++---
 .../layout/ui/sidebar/DocumentsSidebar.tsx    | 26 +++++------
 .../layout/ui/sidebar/InboxSidebar.tsx        |  4 +-
 .../ui/sidebar/LocalFilesystemBrowser.tsx     |  4 +-
 .../ui/sidebar/SidebarCollapseButton.tsx      |  2 +-
 .../layout/ui/sidebar/SidebarSection.tsx      |  2 +-
 .../layout/ui/sidebar/SidebarUserProfile.tsx  |  8 ++--
 .../components/new-chat/chat-share-button.tsx |  4 +-
 .../components/new-chat/model-selector.tsx    | 14 +++---
 .../components/new-chat/prompt-picker.tsx     |  2 +-
 .../prompt-kit/chain-of-thought.tsx           |  2 +-
 .../components/report-panel/report-panel.tsx  | 10 ++---
 .../components/search-space-form.tsx          |  2 +-
 .../settings/agent-model-manager.tsx          |  4 +-
 .../settings/general-settings-manager.tsx     |  2 +-
 .../settings/image-model-manager.tsx          |  4 +-
 .../settings/more-pages-content.tsx           |  2 +-
 .../settings/prompt-config-manager.tsx        |  2 +-
 .../components/settings/roles-manager.tsx     | 10 ++---
 .../components/settings/settings-dialog.tsx   |  4 +-
 .../settings/team-memory-manager.tsx          |  2 +-
 .../settings/vision-model-manager.tsx         |  4 +-
 .../components/shared/llm-config-form.tsx     |  6 +--
 .../components/sources/DocumentUploadTab.tsx  | 10 ++---
 .../components/sources/FolderWatchDialog.tsx  |  4 +-
 .../tool-ui/citation/citation-list.tsx        |  8 ++--
 .../components/tool-ui/citation/citation.tsx  |  4 +-
 .../components/tool-ui/generate-podcast.tsx   |  2 +-
 .../components/tool-ui/generate-report.tsx    |  2 +-
 .../components/tool-ui/generate-resume.tsx    |  2 +-
 .../components/tool-ui/plan/plan.tsx          |  2 +-
 .../components/tool-ui/sandbox-execute.tsx    |  2 +-
 surfsense_web/components/ui/dialog.tsx        |  2 +-
 surfsense_web/components/ui/sheet.tsx         |  2 +-
 .../chat-messages/timeline/timeline.tsx       |  2 +-
 .../fallback/default-fallback-card.tsx        |  2 +-
 90 files changed, 237 insertions(+), 208 deletions(-)

diff --git a/surfsense_web/app/dashboard/[search_space_id]/buy-more/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/buy-more/page.tsx
index 0c5662712..d5f1d0539 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/buy-more/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/buy-more/page.tsx
@@ -34,7 +34,7 @@ export default function BuyMorePage() {
 								"flex-1 rounded-md px-3 py-1.5 text-sm font-medium transition-colors",
 								activeTab === tab.id
 									? "bg-background text-foreground shadow-sm"
-									: "text-muted-foreground hover:text-foreground"
+									: "text-muted-foreground hover:text-accent-foreground"
 							)}
 						>
 							{tab.label}
diff --git a/surfsense_web/app/dashboard/[search_space_id]/logs/(manage)/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/logs/(manage)/page.tsx
index c5be2b590..3e1d42eb0 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/logs/(manage)/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/logs/(manage)/page.tsx
@@ -739,7 +739,7 @@ function LogsFilters({
 					</div>
 					{Boolean(filterInput) && (
 						<Button
-							className="absolute inset-y-0 end-0 flex h-full w-9 items-center justify-center rounded-e-lg text-muted-foreground/80 hover:text-foreground"
+							className="absolute inset-y-0 end-0 flex h-full w-9 items-center justify-center rounded-e-lg text-muted-foreground/80 hover:text-accent-foreground"
 							variant="ghost"
 							size="icon"
 							onClick={() => {
@@ -1045,7 +1045,7 @@ function LogsTable({
 										}}
 										exit={{ opacity: 0, y: -10 }}
 										className={cn(
-											"border-b transition-colors hover:bg-muted/50",
+											"border-b transition-colors hover:bg-accent hover:text-accent-foreground",
 											row.getIsSelected() ? "bg-muted/50" : ""
 										)}
 									>
diff --git a/surfsense_web/app/dashboard/[search_space_id]/logs/loading.tsx b/surfsense_web/app/dashboard/[search_space_id]/logs/loading.tsx
index e8ea64890..115125531 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/logs/loading.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/logs/loading.tsx
@@ -53,7 +53,7 @@ export default function Loading() {
 
 				{/* Table Rows */}
 				{[...Array(6)].map((_, i) => (
-					<div key={i} className="border-b px-4 py-3 flex items-center gap-4 hover:bg-muted/50">
+					<div key={i} className="border-b px-4 py-3 flex items-center gap-4 hover:bg-accent hover:text-accent-foreground">
 						<Skeleton className="h-4 w-4" />
 						<Skeleton className="h-6 w-12 rounded-full" />
 						<Skeleton className="h-6 w-16 rounded-full" />
diff --git a/surfsense_web/app/dashboard/[search_space_id]/team/team-content.tsx b/surfsense_web/app/dashboard/[search_space_id]/team/team-content.tsx
index f6668957b..2ab6ef34e 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/team/team-content.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/team/team-content.tsx
@@ -454,7 +454,7 @@ function MemberRow({
 	const showActions = !member.is_owner && (canManageRoles || canRemove);
 
 	return (
-		<TableRow className="border-b border-border/40 transition-colors hover:bg-muted/30">
+		<TableRow className="border-b border-border/40 transition-colors hover:bg-accent hover:text-accent-foreground">
 			<TableCell className="w-[45%] py-2.5 px-4 md:px-6 max-w-0 border-r border-border/40">
 				<div className="flex items-center gap-3">
 					<Avatar className="size-10 shrink-0">
@@ -484,7 +484,7 @@ function MemberRow({
 						<DropdownMenuTrigger asChild>
 							<button
 								type="button"
-								className="inline-flex items-center gap-1.5 text-sm text-muted-foreground hover:text-foreground transition-colors"
+								className="inline-flex items-center gap-1.5 text-sm text-muted-foreground hover:text-accent-foreground transition-colors"
 							>
 								{roleName}
 								<ChevronDown className="h-4 w-4" />
diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/ApiKeyContent.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/ApiKeyContent.tsx
index c34d9c0ca..4ee8bad1c 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/ApiKeyContent.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/ApiKeyContent.tsx
@@ -52,7 +52,7 @@ export function ApiKeyContent() {
 										variant="ghost"
 										size="icon"
 										onClick={copyToClipboard}
-										className="h-6 w-6 shrink-0 text-muted-foreground hover:text-foreground"
+										className="h-6 w-6 shrink-0 text-muted-foreground hover:text-accent-foreground"
 									>
 										{copied ? (
 											<Check className="h-3 w-3 text-green-500" />
@@ -86,7 +86,7 @@ export function ApiKeyContent() {
 									variant="ghost"
 									size="icon"
 									onClick={copyUsageToClipboard}
-									className="h-6 w-6 shrink-0 text-muted-foreground hover:text-foreground"
+									className="h-6 w-6 shrink-0 text-muted-foreground hover:text-accent-foreground"
 								>
 									{copiedUsage ? (
 										<Check className="h-3 w-3 text-green-500" />
diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/DesktopShortcutsContent.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/DesktopShortcutsContent.tsx
index f1679cb15..b17f5b9ba 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/DesktopShortcutsContent.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/DesktopShortcutsContent.tsx
@@ -90,7 +90,7 @@ function HotkeyRow({
 					<Button
 						variant="ghost"
 						size="icon"
-						className="size-7 text-muted-foreground hover:text-foreground"
+						className="size-7 text-muted-foreground hover:text-accent-foreground"
 						onClick={onReset}
 						title="Reset to default"
 					>
@@ -111,7 +111,7 @@ function HotkeyRow({
 					}
 				>
 					{recording ? (
-						<span className="px-2 text-[9px] text-primary whitespace-nowrap">Press hotkeys...</span>
+						<span className="px-2 text-[9px] text-primary whitespace-nowrap">Press hotkeys</span>
 					) : (
 						<ShortcutKbd keys={displayKeys} className="ml-0 px-1.5 text-foreground/85" />
 					)}
diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/MemoryContent.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/MemoryContent.tsx
index 3d0550b6c..8ae2fd007 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/MemoryContent.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/MemoryContent.tsx
@@ -222,7 +222,7 @@ export function MemoryContent() {
 								onClick={handleEdit}
 								disabled={editing || !editQuery.trim()}
 								className={`h-11 w-11 shrink-0 rounded-full ${
-									editing ? "" : "bg-muted-foreground/15 hover:bg-muted-foreground/20"
+									editing ? "" : "bg-muted-foreground/15 hover:bg-accent hover:text-accent-foreground"
 								}`}
 							>
 								{editing ? (
diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/ProfileContent.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/ProfileContent.tsx
index b7a594f01..309bcda06 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/ProfileContent.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/ProfileContent.tsx
@@ -114,7 +114,7 @@ export function ProfileContent() {
 							type="submit"
 							variant="outline"
 							disabled={isPending || !hasChanges}
-							className="relative gap-2 bg-white text-black hover:bg-neutral-100 dark:bg-white dark:text-black dark:hover:bg-neutral-200"
+							className="relative gap-2 bg-white text-black hover:bg-accent hover:text-accent-foreground dark:bg-white dark:text-black"
 						>
 							<span className={isPending ? "opacity-0" : ""}>{t("profile_save")}</span>
 							{isPending && <Spinner size="sm" className="absolute" />}
diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/PromptsContent.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/PromptsContent.tsx
index c78d4f9f0..aa7aa3ff0 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/PromptsContent.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/PromptsContent.tsx
@@ -292,7 +292,7 @@ export function PromptsContent() {
 									title={prompt.is_public ? "Make private" : "Share with community"}
 									onClick={() => handleTogglePublic(prompt)}
 									disabled={togglingPublicIds.has(prompt.id)}
-									className="flex items-center justify-center size-7 rounded-md text-muted-foreground hover:text-foreground hover:bg-accent transition-colors disabled:opacity-50 disabled:pointer-events-none"
+									className="flex items-center justify-center size-7 rounded-md text-muted-foreground hover:text-accent-foreground hover:bg-accent transition-colors disabled:opacity-50 disabled:pointer-events-none"
 								>
 									{togglingPublicIds.has(prompt.id) ? (
 										<Spinner className="size-3.5" />
diff --git a/surfsense_web/app/desktop/login/page.tsx b/surfsense_web/app/desktop/login/page.tsx
index c8ec4dfce..b3d0c1823 100644
--- a/surfsense_web/app/desktop/login/page.tsx
+++ b/surfsense_web/app/desktop/login/page.tsx
@@ -1,6 +1,5 @@
 "use client";
 
-import { IconBrandGoogleFilled } from "@tabler/icons-react";
 import { useAtom } from "jotai";
 import { Crop, Eye, EyeOff, Rocket, RotateCcw, Zap } from "lucide-react";
 import Image from "next/image";
@@ -24,6 +23,34 @@ const isGoogleAuth = AUTH_TYPE === "GOOGLE";
 type ShortcutKey = "generalAssist" | "quickAsk" | "screenshotAssist";
 type ShortcutMap = typeof DEFAULT_SHORTCUTS;
 
+function GoogleGLogo({ className }: { className?: string }) {
+	return (
+		<svg
+			className={className}
+			xmlns="http://www.w3.org/2000/svg"
+			viewBox="0 0 48 48"
+			aria-hidden="true"
+		>
+			<path
+				fill="#EA4335"
+				d="M24 9.5c3.54 0 6.71 1.22 9.21 3.6l6.85-6.85C35.9 2.38 30.47 0 24 0 14.62 0 6.51 5.38 2.56 13.22l7.98 6.19C12.43 13.72 17.74 9.5 24 9.5z"
+			/>
+			<path
+				fill="#4285F4"
+				d="M46.98 24.55c0-1.57-.15-3.09-.38-4.55H24v9.02h12.94c-.58 2.96-2.26 5.48-4.78 7.18l7.73 6c4.51-4.18 7.09-10.36 7.09-17.65z"
+			/>
+			<path
+				fill="#FBBC05"
+				d="M10.53 28.59c-.48-1.45-.76-2.99-.76-4.59s.27-3.14.76-4.59l-7.98-6.19C.92 16.46 0 20.12 0 24c0 3.88.92 7.54 2.56 10.78l7.97-6.19z"
+			/>
+			<path
+				fill="#34A853"
+				d="M24 48c6.48 0 11.93-2.13 15.89-5.81l-7.73-6c-2.15 1.45-4.92 2.3-8.16 2.3-6.26 0-11.57-4.22-13.47-9.91l-7.98 6.19C6.51 42.62 14.62 48 24 48z"
+			/>
+		</svg>
+	);
+}
+
 const HOTKEY_ROWS: Array<{
 	key: ShortcutKey;
 	label: string;
@@ -148,7 +175,7 @@ function HotkeyRow({
 					}
 				>
 					{recording ? (
-						<span className="px-2 text-[9px] text-primary whitespace-nowrap">Press hotkeys...</span>
+						<span className="px-2 text-[9px] text-primary whitespace-nowrap">Press hotkeys</span>
 					) : (
 						<ShortcutKbd keys={displayKeys} className="ml-0 px-1.5 text-foreground/85" />
 					)}
@@ -255,8 +282,8 @@ export default function DesktopLoginPage() {
 	};
 
 	return (
-		<div className="relative flex min-h-svh items-center justify-center bg-background p-4 sm:p-6 select-none">
-			<div className="relative flex w-full max-w-md flex-col overflow-hidden bg-card shadow-lg">
+		<div className="relative flex min-h-svh items-center justify-center bg-main-panel p-4 sm:p-6 select-none">
+			<div className="relative flex w-full max-w-md flex-col overflow-hidden bg-main-panel">
 				{/* Header */}
 				<div className="flex flex-col items-center px-6 pt-6 pb-2 text-center">
 					<Image
@@ -313,8 +340,12 @@ export default function DesktopLoginPage() {
 							</p> */}
 
 							{isGoogleAuth ? (
-								<Button variant="outline" className="w-full gap-2 h-10" onClick={handleGoogleLogin}>
-									<IconBrandGoogleFilled className="size-4" />
+								<Button
+									variant="outline"
+									className="w-full gap-2 h-10 bg-white text-[#1f1f1f] border-white hover:bg-zinc-100 hover:text-[#1f1f1f] dark:border-white shadow-sm font-medium"
+									onClick={handleGoogleLogin}
+								>
+									<GoogleGLogo className="size-4" />
 									Continue with Google
 								</Button>
 							) : (
diff --git a/surfsense_web/app/globals.css b/surfsense_web/app/globals.css
index 76e3eea8c..48ba10cac 100644
--- a/surfsense_web/app/globals.css
+++ b/surfsense_web/app/globals.css
@@ -18,7 +18,7 @@
 	--foreground: oklch(0.145 0 0);
 	--card: oklch(1 0 0);
 	--card-foreground: oklch(0.145 0 0);
-	--popover: oklch(1 0 0);
+	--popover: oklch(0.99 0 0);
 	--popover-foreground: oklch(0.145 0 0);
 	--primary: oklch(0.205 0 0);
 	--primary-foreground: oklch(0.985 0 0);
@@ -62,7 +62,7 @@
 	--foreground: oklch(0.985 0 0);
 	--card: oklch(0.145 0 0);
 	--card-foreground: oklch(0.985 0 0);
-	--popover: oklch(0.145 0 0);
+	--popover: oklch(0.32 0 0);
 	--popover-foreground: oklch(0.985 0 0);
 	--primary: oklch(0.985 0 0);
 	--primary-foreground: oklch(0.205 0 0);
diff --git a/surfsense_web/components/agent-action-log/action-log-item.tsx b/surfsense_web/components/agent-action-log/action-log-item.tsx
index 673189709..f951cd5da 100644
--- a/surfsense_web/components/agent-action-log/action-log-item.tsx
+++ b/surfsense_web/components/agent-action-log/action-log-item.tsx
@@ -77,7 +77,7 @@ export function ActionLogItem({ action, threadId, onRevertSuccess }: ActionLogIt
 			<button
 				type="button"
 				onClick={() => setIsExpanded((v) => !v)}
-				className="flex w-full items-start gap-3 p-3 text-left hover:bg-muted/40"
+				className="flex w-full items-start gap-3 p-3 text-left hover:bg-accent hover:text-accent-foreground"
 				aria-expanded={isExpanded}
 			>
 				<div className="flex size-8 shrink-0 items-center justify-center rounded-md bg-muted">
diff --git a/surfsense_web/components/assistant-ui/assistant-message.tsx b/surfsense_web/components/assistant-ui/assistant-message.tsx
index 0e0f47bb1..28dc9aacc 100644
--- a/surfsense_web/components/assistant-ui/assistant-message.tsx
+++ b/surfsense_web/components/assistant-ui/assistant-message.tsx
@@ -151,7 +151,7 @@ const MobileCitationDrawer: FC = () => {
 					"isolate inline-flex cursor-pointer items-center gap-2 rounded-lg px-3 py-2",
 					"bg-muted/40 outline-none",
 					"transition-colors duration-150",
-					"hover:bg-muted/70",
+					"hover:bg-accent hover:text-accent-foreground",
 					"focus-visible:ring-ring focus-visible:ring-2"
 				)}
 			>
@@ -208,7 +208,7 @@ const MobileCitationDrawer: FC = () => {
 								key={citation.id}
 								type="button"
 								onClick={() => handleNavigate(citation)}
-								className="group flex w-full items-center gap-2.5 rounded-md px-3 py-2.5 text-left transition-colors hover:bg-muted focus-visible:bg-muted focus-visible:outline-none"
+								className="group flex w-full items-center gap-2.5 rounded-md px-3 py-2.5 text-left transition-colors hover:bg-accent hover:text-accent-foreground focus-visible:bg-muted focus-visible:outline-none"
 							>
 								{citation.favicon ? (
 									// biome-ignore lint/performance/noImgElement: external favicon from arbitrary domain
@@ -526,7 +526,7 @@ export const AssistantMessage: FC = () => {
 							? "bg-primary/10 text-primary"
 							: hasComments
 								? "text-primary hover:bg-primary/10"
-								: "text-muted-foreground hover:text-foreground hover:bg-muted"
+								: "text-muted-foreground hover:text-accent-foreground hover:bg-accent hover:text-accent-foreground"
 					)}
 				>
 					<MessageCircleReply className={cn("size-3.5", hasComments && "fill-current")} />
diff --git a/surfsense_web/components/assistant-ui/chat-viewport.tsx b/surfsense_web/components/assistant-ui/chat-viewport.tsx
index a7cf227b4..cb0b484ef 100644
--- a/surfsense_web/components/assistant-ui/chat-viewport.tsx
+++ b/surfsense_web/components/assistant-ui/chat-viewport.tsx
@@ -9,7 +9,7 @@ const ChatScrollToBottom: FC = () => (
 	<ThreadPrimitive.ScrollToBottom asChild>
 		<TooltipIconButton
 			tooltip="Scroll to bottom"
-			className="aui-thread-scroll-to-bottom -top-12 absolute z-10 self-center rounded-full border-0 bg-muted p-4 text-foreground hover:bg-muted/80 disabled:invisible"
+			className="aui-thread-scroll-to-bottom -top-12 absolute z-10 self-center rounded-full border-0 bg-muted p-4 text-foreground hover:bg-accent hover:text-accent-foreground disabled:invisible"
 		>
 			<ArrowDownIcon />
 		</TooltipIconButton>
diff --git a/surfsense_web/components/assistant-ui/connector-popup.tsx b/surfsense_web/components/assistant-ui/connector-popup.tsx
index a44deeb1f..d73d0db1c 100644
--- a/surfsense_web/components/assistant-ui/connector-popup.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup.tsx
@@ -219,7 +219,7 @@ export const ConnectorIndicator = forwardRef<ConnectorIndicatorHandle, Connector
 					onPointerDownOutside={(e) => {
 						if (pickerOpen) e.preventDefault();
 					}}
-					className="max-w-3xl w-[95vw] sm:w-full h-[75vh] sm:h-[85vh] flex flex-col p-0 gap-0 overflow-hidden ring-0 dark:ring-0 [&>button]:right-4 sm:[&>button]:right-12 [&>button]:top-6 sm:[&>button]:top-10 [&>button]:opacity-80 [&>button]:hover:opacity-100 [&>button]:hover:bg-foreground/10 [&>button>svg]:size-5 select-none"
+					className="max-w-3xl w-[95vw] sm:w-full h-[75vh] sm:h-[85vh] flex flex-col p-0 gap-0 overflow-hidden ring-0 dark:ring-0 [&>button]:right-4 sm:[&>button]:right-12 [&>button]:top-6 sm:[&>button]:top-10 [&>button]:opacity-80 [&>button]:hover:opacity-100 [&>button]:hover:bg-accent [&>button]:hover:text-accent-foreground [&>button>svg]:size-5 select-none"
 				>
 					<DialogTitle className="sr-only">Manage Connectors</DialogTitle>
 					{/* YouTube Crawler View - shown when adding YouTube videos */}
diff --git a/surfsense_web/components/assistant-ui/connector-popup/components/connector-card.tsx b/surfsense_web/components/assistant-ui/connector-popup/components/connector-card.tsx
index e0df73e66..04b61ea54 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/components/connector-card.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/components/connector-card.tsx
@@ -81,8 +81,8 @@ export const ConnectorCard: FC<ConnectorCardProps> = ({
 			className={cn(
 				"group relative flex items-center gap-4 p-4 rounded-xl text-left transition-all duration-200 w-full border",
 				status.status === "warning"
-					? "border-yellow-500/30 bg-slate-400/5 dark:bg-white/5 hover:bg-slate-400/10 dark:hover:bg-white/10"
-					: "border-border bg-slate-400/5 dark:bg-white/5 hover:bg-slate-400/10 dark:hover:bg-white/10"
+					? "border-yellow-500/30 bg-slate-400/5 dark:bg-white/5 hover:bg-accent hover:text-accent-foreground"
+					: "border-border bg-slate-400/5 dark:bg-white/5 hover:bg-accent hover:text-accent-foreground"
 			)}
 		>
 			<div
@@ -147,7 +147,7 @@ export const ConnectorCard: FC<ConnectorCardProps> = ({
 				className={cn(
 					"relative h-8 text-[11px] px-3 rounded-lg shrink-0 font-medium items-center justify-center",
 					isConnected &&
-						"bg-white text-slate-700 hover:bg-slate-50 border-0 shadow-xs dark:bg-secondary dark:text-secondary-foreground dark:hover:bg-secondary/80",
+						"bg-white text-slate-700 hover:bg-accent hover:text-accent-foreground border-0 shadow-xs dark:bg-secondary dark:text-secondary-foreground",
 					!isConnected && "shadow-xs"
 				)}
 				onClick={isConnected ? onManage : onConnect}
diff --git a/surfsense_web/components/assistant-ui/connector-popup/components/connector-dialog-header.tsx b/surfsense_web/components/assistant-ui/connector-popup/components/connector-dialog-header.tsx
index 5c1d61c26..e6e107ae8 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/components/connector-dialog-header.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/components/connector-dialog-header.tsx
@@ -69,7 +69,7 @@ export const ConnectorDialogHeader: FC<ConnectorDialogHeaderProps> = ({
 							autoComplete="off"
 							placeholder="Search"
 							className={cn(
-								"w-full bg-slate-400/5 dark:bg-white/5 hover:bg-slate-400/10 dark:hover:bg-white/10 focus:bg-slate-400/10 dark:focus:bg-white/10 border border-border rounded-xl pl-9 py-2 text-sm transition-all outline-none placeholder:text-muted-foreground/50",
+								"w-full bg-slate-400/5 dark:bg-white/5 hover:bg-accent hover:text-accent-foreground focus:bg-slate-400/10 dark:focus:bg-white/10 border border-border rounded-xl pl-9 py-2 text-sm transition-all outline-none placeholder:text-muted-foreground/50",
 								searchQuery ? "pr-9" : "pr-4"
 							)}
 							value={searchQuery}
diff --git a/surfsense_web/components/assistant-ui/connector-popup/components/date-range-selector.tsx b/surfsense_web/components/assistant-ui/connector-popup/components/date-range-selector.tsx
index 9d7044bb4..b4aef0e66 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/components/date-range-selector.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/components/date-range-selector.tsx
@@ -136,7 +136,7 @@ export const DateRangeSelector: FC<DateRangeSelectorProps> = ({
 					variant="outline"
 					size="sm"
 					onClick={handleClearDates}
-					className="text-xs sm:text-sm bg-slate-400/5 dark:bg-slate-400/5 border-slate-400/20 hover:bg-slate-400/10 dark:hover:bg-slate-400/10"
+					className="text-xs sm:text-sm bg-slate-400/5 dark:bg-slate-400/5 border-slate-400/20 hover:bg-accent hover:text-accent-foreground"
 				>
 					Clear Dates
 				</Button>
@@ -145,7 +145,7 @@ export const DateRangeSelector: FC<DateRangeSelectorProps> = ({
 					variant="outline"
 					size="sm"
 					onClick={handleLast30Days}
-					className="text-xs sm:text-sm bg-slate-400/5 dark:bg-slate-400/5 border-slate-400/20 hover:bg-slate-400/10 dark:hover:bg-slate-400/10"
+					className="text-xs sm:text-sm bg-slate-400/5 dark:bg-slate-400/5 border-slate-400/20 hover:bg-accent hover:text-accent-foreground"
 				>
 					Last 30 Days
 				</Button>
@@ -155,7 +155,7 @@ export const DateRangeSelector: FC<DateRangeSelectorProps> = ({
 						variant="outline"
 						size="sm"
 						onClick={handleNext30Days}
-						className="text-xs sm:text-sm bg-slate-400/5 dark:bg-slate-400/5 border-slate-400/20 hover:bg-slate-400/10 dark:hover:bg-slate-400/10"
+						className="text-xs sm:text-sm bg-slate-400/5 dark:bg-slate-400/5 border-slate-400/20 hover:bg-accent hover:text-accent-foreground"
 					>
 						Next 30 Days
 					</Button>
@@ -165,7 +165,7 @@ export const DateRangeSelector: FC<DateRangeSelectorProps> = ({
 					variant="outline"
 					size="sm"
 					onClick={handleLastYear}
-					className="text-xs sm:text-sm bg-slate-400/5 dark:bg-slate-400/5 border-slate-400/20 hover:bg-slate-400/10 dark:hover:bg-slate-400/10"
+					className="text-xs sm:text-sm bg-slate-400/5 dark:bg-slate-400/5 border-slate-400/20 hover:bg-accent hover:text-accent-foreground"
 				>
 					Last Year
 				</Button>
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/mcp-connect-form.tsx b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/mcp-connect-form.tsx
index d9a740af2..3ca813af0 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/mcp-connect-form.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/mcp-connect-form.tsx
@@ -155,7 +155,7 @@ export const MCPConnectForm: FC<ConnectFormProps> = ({ onSubmit, isSubmitting })
 										type="button"
 										variant="ghost"
 										size="sm"
-										className="h-6 px-2 text-xs text-muted-foreground hover:text-foreground"
+										className="h-6 px-2 text-xs text-muted-foreground hover:text-accent-foreground"
 										onClick={() => handleConfigChange(DEFAULT_STDIO_CONFIG)}
 									>
 										Local Example
@@ -164,7 +164,7 @@ export const MCPConnectForm: FC<ConnectFormProps> = ({ onSubmit, isSubmitting })
 										type="button"
 										variant="ghost"
 										size="sm"
-										className="h-6 px-2 text-xs text-muted-foreground hover:text-foreground"
+										className="h-6 px-2 text-xs text-muted-foreground hover:text-accent-foreground"
 										onClick={() => handleConfigChange(DEFAULT_HTTP_CONFIG)}
 									>
 										Remote Example
@@ -210,7 +210,7 @@ export const MCPConnectForm: FC<ConnectFormProps> = ({ onSubmit, isSubmitting })
 							onClick={handleTestConnection}
 							disabled={isTesting}
 							variant="secondary"
-							className="w-full h-8 text-[13px] px-3 rounded-lg font-medium bg-white text-slate-700 hover:bg-slate-50 border-0 shadow-xs dark:bg-secondary dark:text-secondary-foreground dark:hover:bg-secondary/80"
+							className="w-full h-8 text-[13px] px-3 rounded-lg font-medium bg-white text-slate-700 hover:bg-accent hover:text-accent-foreground border-0 shadow-xs dark:bg-secondary dark:text-secondary-foreground"
 						>
 							{isTesting ? (
 								<>
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/obsidian-connect-form.tsx b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/obsidian-connect-form.tsx
index ecbb09fae..59de2b7a4 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/obsidian-connect-form.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/obsidian-connect-form.tsx
@@ -123,7 +123,7 @@ export const ObsidianConnectForm: FC<ConnectFormProps> = ({ onBack }) => {
 									variant="ghost"
 									size="icon"
 									onClick={copyToClipboard}
-									className="size-7 shrink-0 text-muted-foreground hover:text-foreground"
+									className="size-7 shrink-0 text-muted-foreground hover:text-accent-foreground"
 									aria-label={copied ? "Copied" : "Copy API key"}
 								>
 									{copied ? (
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/composio-drive-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/composio-drive-config.tsx
index c08011bb5..8e92af44b 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/composio-drive-config.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/composio-drive-config.tsx
@@ -199,7 +199,7 @@ export const ComposioDriveConfig: FC<ConnectorConfigProps> = ({ connector, onCon
 									<button
 										type="button"
 										onClick={() => handleRemoveFolder(folder.id)}
-										className="shrink-0 p-0.5 hover:bg-muted-foreground/20 rounded transition-colors"
+										className="shrink-0 p-0.5 hover:bg-accent hover:text-accent-foreground rounded transition-colors"
 										aria-label={`Remove ${folder.name}`}
 									>
 										<X className="size-3.5" />
@@ -217,7 +217,7 @@ export const ComposioDriveConfig: FC<ConnectorConfigProps> = ({ connector, onCon
 									<button
 										type="button"
 										onClick={() => handleRemoveFile(file.id)}
-										className="shrink-0 p-0.5 hover:bg-muted-foreground/20 rounded transition-colors"
+										className="shrink-0 p-0.5 hover:bg-accent hover:text-accent-foreground rounded transition-colors"
 										aria-label={`Remove ${file.name}`}
 									>
 										<X className="size-3.5" />
@@ -240,7 +240,7 @@ export const ComposioDriveConfig: FC<ConnectorConfigProps> = ({ connector, onCon
 						<button
 							type="button"
 							onClick={() => setIsFolderTreeOpen((prev) => !prev)}
-							className="flex items-center gap-2 text-xs sm:text-sm text-muted-foreground hover:text-foreground transition-colors w-fit"
+							className="flex items-center gap-2 text-xs sm:text-sm text-muted-foreground hover:text-accent-foreground transition-colors w-fit"
 						>
 							Change Selection
 							{isFolderTreeOpen ? (
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/discord-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/discord-config.tsx
index c8714ba40..3c00a1603 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/discord-config.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/discord-config.tsx
@@ -100,7 +100,7 @@ export const DiscordConfig: FC<DiscordConfigProps> = ({ connector }) => {
 							size="sm"
 							onClick={fetchChannels}
 							disabled={isLoading}
-							className="h-7 px-2.5 text-[11px] bg-slate-400/10 dark:bg-white/10 hover:bg-slate-400/20 dark:hover:bg-white/20 border-slate-400/20 dark:border-white/20"
+							className="h-7 px-2.5 text-[11px] bg-slate-400/10 dark:bg-white/10 hover:bg-accent hover:text-accent-foreground border-slate-400/20 dark:border-white/20"
 						>
 							<RefreshCw className={cn("mr-1.5 size-3", isLoading && "animate-spin")} />
 							Refresh
@@ -175,7 +175,7 @@ interface ChannelPillProps {
 
 const ChannelPill: FC<ChannelPillProps> = ({ channel }) => {
 	return (
-		<div className="inline-flex items-center gap-1 px-2 py-1 rounded-md text-[11px] font-medium bg-slate-400/10 dark:bg-white/10 hover:bg-slate-400/20 dark:hover:bg-white/20 transition-colors">
+		<div className="inline-flex items-center gap-1 px-2 py-1 rounded-md text-[11px] font-medium bg-slate-400/10 dark:bg-white/10 hover:bg-accent hover:text-accent-foreground transition-colors">
 			{channel.type === "announcement" ? (
 				<Megaphone className="size-2.5 text-muted-foreground" />
 			) : (
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/dropbox-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/dropbox-config.tsx
index ce793a1a7..706e8f2e4 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/dropbox-config.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/dropbox-config.tsx
@@ -180,7 +180,7 @@ export const DropboxConfig: FC<ConnectorConfigProps> = ({ connector, onConfigCha
 									<button
 										type="button"
 										onClick={() => handleRemoveFolder(folder.id)}
-										className="shrink-0 p-0.5 hover:bg-muted-foreground/20 rounded transition-colors"
+										className="shrink-0 p-0.5 hover:bg-accent hover:text-accent-foreground rounded transition-colors"
 										aria-label={`Remove ${folder.name}`}
 									>
 										<X className="size-3.5" />
@@ -198,7 +198,7 @@ export const DropboxConfig: FC<ConnectorConfigProps> = ({ connector, onConfigCha
 									<button
 										type="button"
 										onClick={() => handleRemoveFile(file.id)}
-										className="shrink-0 p-0.5 hover:bg-muted-foreground/20 rounded transition-colors"
+										className="shrink-0 p-0.5 hover:bg-accent hover:text-accent-foreground rounded transition-colors"
 										aria-label={`Remove ${file.name}`}
 									>
 										<X className="size-3.5" />
@@ -220,7 +220,7 @@ export const DropboxConfig: FC<ConnectorConfigProps> = ({ connector, onConfigCha
 						<button
 							type="button"
 							onClick={() => setIsFolderTreeOpen(!isFolderTreeOpen)}
-							className="flex items-center gap-2 text-xs sm:text-sm text-muted-foreground hover:text-foreground transition-colors w-fit"
+							className="flex items-center gap-2 text-xs sm:text-sm text-muted-foreground hover:text-accent-foreground transition-colors w-fit"
 						>
 							Change Selection
 							{isFolderTreeOpen ? (
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/google-drive-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/google-drive-config.tsx
index c73eed788..5d5f2e236 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/google-drive-config.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/google-drive-config.tsx
@@ -191,7 +191,7 @@ export const GoogleDriveConfig: FC<ConnectorConfigProps> = ({ connector, onConfi
 									<button
 										type="button"
 										onClick={() => handleRemoveFolder(folder.id)}
-										className="shrink-0 p-0.5 hover:bg-muted-foreground/20 rounded transition-colors"
+										className="shrink-0 p-0.5 hover:bg-accent hover:text-accent-foreground rounded transition-colors"
 										aria-label={`Remove ${folder.name}`}
 									>
 										<X className="size-3.5" />
@@ -209,7 +209,7 @@ export const GoogleDriveConfig: FC<ConnectorConfigProps> = ({ connector, onConfi
 									<button
 										type="button"
 										onClick={() => handleRemoveFile(file.id)}
-										className="shrink-0 p-0.5 hover:bg-muted-foreground/20 rounded transition-colors"
+										className="shrink-0 p-0.5 hover:bg-accent hover:text-accent-foreground rounded transition-colors"
 										aria-label={`Remove ${file.name}`}
 									>
 										<X className="size-3.5" />
@@ -225,7 +225,7 @@ export const GoogleDriveConfig: FC<ConnectorConfigProps> = ({ connector, onConfi
 					variant="outline"
 					onClick={openPicker}
 					disabled={pickerLoading || isAuthExpired}
-					className="bg-slate-400/5 dark:bg-white/5 border-slate-400/20 hover:bg-slate-400/10 dark:hover:bg-white/10 text-xs sm:text-sm h-8 sm:h-9"
+					className="bg-slate-400/5 dark:bg-white/5 border-slate-400/20 hover:bg-accent hover:text-accent-foreground text-xs sm:text-sm h-8 sm:h-9"
 				>
 					{pickerLoading && <Spinner size="xs" className="mr-1.5" />}
 					{totalSelected > 0 ? "Change Selection" : "Select from Google Drive"}
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/mcp-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/mcp-config.tsx
index 97b5de675..61f1e29a1 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/mcp-config.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/mcp-config.tsx
@@ -215,7 +215,7 @@ export const MCPConfig: FC<MCPConfigProps> = ({ connector, onConfigChange, onNam
 							onClick={handleTestConnection}
 							disabled={isTesting}
 							variant="secondary"
-							className="w-full h-8 text-[13px] px-3 rounded-lg font-medium bg-white text-slate-700 hover:bg-slate-50 border-0 shadow-xs dark:bg-secondary dark:text-secondary-foreground dark:hover:bg-secondary/80"
+							className="w-full h-8 text-[13px] px-3 rounded-lg font-medium bg-white text-slate-700 hover:bg-accent hover:text-accent-foreground border-0 shadow-xs dark:bg-secondary dark:text-secondary-foreground"
 						>
 							{isTesting ? (
 								<>
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/onedrive-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/onedrive-config.tsx
index b835dbcec..208a42123 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/onedrive-config.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/onedrive-config.tsx
@@ -181,7 +181,7 @@ export const OneDriveConfig: FC<ConnectorConfigProps> = ({ connector, onConfigCh
 									<button
 										type="button"
 										onClick={() => handleRemoveFolder(folder.id)}
-										className="shrink-0 p-0.5 hover:bg-muted-foreground/20 rounded transition-colors"
+										className="shrink-0 p-0.5 hover:bg-accent hover:text-accent-foreground rounded transition-colors"
 										aria-label={`Remove ${folder.name}`}
 									>
 										<X className="size-3.5" />
@@ -199,7 +199,7 @@ export const OneDriveConfig: FC<ConnectorConfigProps> = ({ connector, onConfigCh
 									<button
 										type="button"
 										onClick={() => handleRemoveFile(file.id)}
-										className="shrink-0 p-0.5 hover:bg-muted-foreground/20 rounded transition-colors"
+										className="shrink-0 p-0.5 hover:bg-accent hover:text-accent-foreground rounded transition-colors"
 										aria-label={`Remove ${file.name}`}
 									>
 										<X className="size-3.5" />
@@ -221,7 +221,7 @@ export const OneDriveConfig: FC<ConnectorConfigProps> = ({ connector, onConfigCh
 						<button
 							type="button"
 							onClick={() => setIsFolderTreeOpen((prev) => !prev)}
-							className="flex items-center gap-2 text-xs sm:text-sm text-muted-foreground hover:text-foreground transition-colors w-fit"
+							className="flex items-center gap-2 text-xs sm:text-sm text-muted-foreground hover:text-accent-foreground transition-colors w-fit"
 						>
 							Change Selection
 							{isFolderTreeOpen ? (
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/slack-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/slack-config.tsx
index ff01ac96a..e7a03423b 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/slack-config.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/slack-config.tsx
@@ -104,7 +104,7 @@ export const SlackConfig: FC<SlackConfigProps> = ({ connector }) => {
 							size="sm"
 							onClick={fetchChannels}
 							disabled={isLoading}
-							className="h-7 px-2.5 text-[11px] bg-slate-400/10 dark:bg-white/10 hover:bg-slate-400/20 dark:hover:bg-white/20 border-slate-400/20 dark:border-white/20"
+							className="h-7 px-2.5 text-[11px] bg-slate-400/10 dark:bg-white/10 hover:bg-accent hover:text-accent-foreground border-slate-400/20 dark:border-white/20"
 						>
 							<RefreshCw className={cn("mr-1.5 size-3", isLoading && "animate-spin")} />
 							Refresh
@@ -178,7 +178,7 @@ interface ChannelPillProps {
 
 const ChannelPill: FC<ChannelPillProps> = ({ channel }) => {
 	return (
-		<div className="inline-flex items-center gap-1 px-2 py-1 rounded-md text-[11px] font-medium bg-slate-400/10 dark:bg-white/10 hover:bg-slate-400/20 dark:hover:bg-white/20 transition-colors">
+		<div className="inline-flex items-center gap-1 px-2 py-1 rounded-md text-[11px] font-medium bg-slate-400/10 dark:bg-white/10 hover:bg-accent hover:text-accent-foreground transition-colors">
 			{channel.is_private ? (
 				<Lock className="size-2.5 text-muted-foreground" />
 			) : (
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/webcrawler-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/webcrawler-config.tsx
index a01cde15f..365d1c020 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/webcrawler-config.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/webcrawler-config.tsx
@@ -79,7 +79,7 @@ export const WebcrawlerConfig: FC<ConnectorConfigProps> = ({ connector, onConfig
 						variant="ghost"
 						size="sm"
 						onClick={() => setShowApiKey((prev) => !prev)}
-						className="absolute right-1 top-1/2 -translate-y-1/2 h-7 px-2 text-xs text-muted-foreground hover:text-foreground"
+						className="absolute right-1 top-1/2 -translate-y-1/2 h-7 px-2 text-xs text-muted-foreground hover:text-accent-foreground"
 					>
 						{showApiKey ? "Hide" : "Show"}
 					</Button>
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-connect-view.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-connect-view.tsx
index 5b82a8e88..ddd08e749 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-connect-view.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-connect-view.tsx
@@ -93,7 +93,7 @@ export const ConnectorConnectView: FC<ConnectorConnectViewProps> = ({
 				<button
 					type="button"
 					onClick={onBack}
-					className="flex items-center gap-2 text-xs sm:text-sm text-muted-foreground hover:text-foreground mb-6 w-fit"
+					className="flex items-center gap-2 text-xs sm:text-sm text-muted-foreground hover:text-accent-foreground mb-6 w-fit"
 				>
 					<ArrowLeft className="size-4" />
 					Back to connectors
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-edit-view.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-edit-view.tsx
index f8116d2fd..797126e39 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-edit-view.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-edit-view.tsx
@@ -209,7 +209,7 @@ export const ConnectorEditView: FC<ConnectorEditViewProps> = ({
 				<button
 					type="button"
 					onClick={onBack}
-					className="flex items-center gap-2 text-xs sm:text-sm text-muted-foreground hover:text-foreground mb-6 w-fit"
+					className="flex items-center gap-2 text-xs sm:text-sm text-muted-foreground hover:text-accent-foreground mb-6 w-fit"
 				>
 					<ArrowLeft className="size-4" />
 					Back to connectors
@@ -239,7 +239,7 @@ export const ConnectorEditView: FC<ConnectorEditViewProps> = ({
 							size="sm"
 							onClick={handleQuickIndex}
 							disabled={isQuickIndexing || isIndexing || isSaving || isDisconnecting}
-							className="text-xs sm:text-sm bg-slate-400/10 dark:bg-white/10 hover:bg-slate-400/20 dark:hover:bg-white/20 border-slate-400/20 dark:border-white/20 w-full sm:w-auto"
+							className="text-xs sm:text-sm bg-slate-400/10 dark:bg-white/10 hover:bg-accent hover:text-accent-foreground border-slate-400/20 dark:border-white/20 w-full sm:w-auto"
 						>
 							{isQuickIndexing || isIndexing ? (
 								<>
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/indexing-configuration-view.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/indexing-configuration-view.tsx
index 276cd24d3..3e872d458 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/indexing-configuration-view.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/indexing-configuration-view.tsx
@@ -131,7 +131,7 @@ export const IndexingConfigurationView: FC<IndexingConfigurationViewProps> = ({
 					<button
 						type="button"
 						onClick={onSkip}
-						className="flex items-center gap-2 text-xs sm:text-sm text-muted-foreground hover:text-foreground mb-6 w-fit"
+						className="flex items-center gap-2 text-xs sm:text-sm text-muted-foreground hover:text-accent-foreground mb-6 w-fit"
 					>
 						<ArrowLeft className="size-4" />
 						Back to connectors
diff --git a/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx b/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx
index 755086ba5..3433f6d4d 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx
@@ -185,7 +185,7 @@ export const ActiveConnectorsTab: FC<ActiveConnectorsTabProps> = ({
 												"relative flex items-center gap-4 p-4 rounded-xl transition-all",
 												isAnyIndexing
 													? "bg-primary/5 border-0"
-													: "bg-slate-400/5 dark:bg-white/5 hover:bg-slate-400/10 dark:hover:bg-white/10 border border-border"
+													: "bg-slate-400/5 dark:bg-white/5 hover:bg-accent hover:text-accent-foreground border border-border"
 											)}
 										>
 											<div
@@ -222,7 +222,7 @@ export const ActiveConnectorsTab: FC<ActiveConnectorsTabProps> = ({
 											<Button
 												variant="secondary"
 												size="sm"
-												className="h-8 text-[11px] px-3 rounded-lg font-medium bg-white text-slate-700 hover:bg-slate-50 border-0 shadow-xs dark:bg-secondary dark:text-secondary-foreground dark:hover:bg-secondary/80 shrink-0"
+												className="h-8 text-[11px] px-3 rounded-lg font-medium bg-white text-slate-700 hover:bg-accent hover:text-accent-foreground border-0 shadow-xs dark:bg-secondary dark:text-secondary-foreground shrink-0"
 												onClick={handleManageClick}
 											>
 												Manage
@@ -247,7 +247,7 @@ export const ActiveConnectorsTab: FC<ActiveConnectorsTabProps> = ({
 												"flex items-center gap-4 p-4 rounded-xl transition-all",
 												isIndexing
 													? "bg-primary/5 border-0"
-													: "bg-slate-400/5 dark:bg-white/5 hover:bg-slate-400/10 dark:hover:bg-white/10 border border-border"
+													: "bg-slate-400/5 dark:bg-white/5 hover:bg-accent hover:text-accent-foreground border border-border"
 											)}
 										>
 											<div
@@ -280,7 +280,7 @@ export const ActiveConnectorsTab: FC<ActiveConnectorsTabProps> = ({
 											<Button
 												variant="secondary"
 												size="sm"
-												className="h-8 text-[11px] px-3 rounded-lg font-medium bg-white text-slate-700 hover:bg-slate-50 border-0 shadow-xs dark:bg-secondary dark:text-secondary-foreground dark:hover:bg-secondary/80 shrink-0"
+												className="h-8 text-[11px] px-3 rounded-lg font-medium bg-white text-slate-700 hover:bg-accent hover:text-accent-foreground border-0 shadow-xs dark:bg-secondary dark:text-secondary-foreground shrink-0"
 												onClick={onManage ? () => onManage(connector) : undefined}
 											>
 												Manage
@@ -302,7 +302,7 @@ export const ActiveConnectorsTab: FC<ActiveConnectorsTabProps> = ({
 								{standaloneDocuments.map((doc) => (
 									<div
 										key={doc.type}
-										className="inline-flex items-center gap-2 px-3 py-1.5 rounded-full border border-border bg-slate-400/5 dark:bg-white/5 hover:bg-slate-400/10 dark:hover:bg-white/10 transition-all"
+										className="inline-flex items-center gap-2 px-3 py-1.5 rounded-full border border-border bg-slate-400/5 dark:bg-white/5 hover:bg-accent hover:text-accent-foreground transition-all"
 									>
 										<div className="flex items-center justify-center">
 											{getConnectorIcon(doc.type, "size-3.5")}
diff --git a/surfsense_web/components/assistant-ui/connector-popup/views/connector-accounts-list-view.tsx b/surfsense_web/components/assistant-ui/connector-popup/views/connector-accounts-list-view.tsx
index 1d0f20922..98b0dea21 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/views/connector-accounts-list-view.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/views/connector-accounts-list-view.tsx
@@ -113,7 +113,7 @@ export const ConnectorAccountsListView: FC<ConnectorAccountsListViewProps> = ({
 				<button
 					type="button"
 					onClick={onBack}
-					className="flex items-center gap-2 text-xs sm:text-sm text-muted-foreground hover:text-foreground mb-6 w-fit"
+					className="flex items-center gap-2 text-xs sm:text-sm text-muted-foreground hover:text-accent-foreground mb-6 w-fit"
 				>
 					<ArrowLeft className="size-4" />
 					Back to connectors
@@ -143,7 +143,7 @@ export const ConnectorAccountsListView: FC<ConnectorAccountsListViewProps> = ({
 							"flex items-center justify-center gap-1.5 h-8 px-3 rounded-md border-2 border-dashed text-xs sm:text-sm transition-all duration-200 shrink-0 w-full sm:w-auto",
 							!isEnabled
 								? "border-border/30 opacity-50 cursor-not-allowed"
-								: "border-slate-400/20 dark:border-white/20 hover:bg-primary/5",
+								: "border-slate-400/20 dark:border-white/20 hover:bg-accent hover:text-accent-foreground",
 							isConnecting && "opacity-50 cursor-not-allowed"
 						)}
 					>
@@ -198,7 +198,7 @@ export const ConnectorAccountsListView: FC<ConnectorAccountsListViewProps> = ({
 										"flex items-center gap-4 p-4 rounded-xl transition-all",
 										isIndexing
 											? "bg-primary/5 border-0"
-											: "bg-slate-400/5 dark:bg-white/5 hover:bg-slate-400/10 dark:hover:bg-white/10 border border-border"
+											: "bg-slate-400/5 dark:bg-white/5 hover:bg-accent hover:text-accent-foreground border border-border"
 									)}
 								>
 									<div
@@ -289,7 +289,7 @@ export const ConnectorAccountsListView: FC<ConnectorAccountsListViewProps> = ({
 										<Button
 											variant="secondary"
 											size="sm"
-											className="h-8 text-[11px] px-3 rounded-lg font-medium bg-white text-slate-700 hover:bg-slate-50 border-0 shadow-xs dark:bg-secondary dark:text-secondary-foreground dark:hover:bg-secondary/80 shrink-0"
+											className="h-8 text-[11px] px-3 rounded-lg font-medium bg-white text-slate-700 hover:bg-accent hover:text-accent-foreground border-0 shadow-xs dark:bg-secondary dark:text-secondary-foreground shrink-0"
 											onClick={() => onManage(connector)}
 										>
 											Manage
diff --git a/surfsense_web/components/assistant-ui/connector-popup/views/youtube-crawler-view.tsx b/surfsense_web/components/assistant-ui/connector-popup/views/youtube-crawler-view.tsx
index 8982b16a8..49a0d1265 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/views/youtube-crawler-view.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/views/youtube-crawler-view.tsx
@@ -219,7 +219,7 @@ export const YouTubeCrawlerView: FC<YouTubeCrawlerViewProps> = ({ searchSpaceId,
 				<button
 					type="button"
 					onClick={onBack}
-					className="flex items-center gap-2 text-xs sm:text-sm text-muted-foreground hover:text-foreground mb-6 w-fit"
+					className="flex items-center gap-2 text-xs sm:text-sm text-muted-foreground hover:text-accent-foreground mb-6 w-fit"
 				>
 					<ArrowLeft className="size-4" />
 					Back to connectors
@@ -259,7 +259,7 @@ export const YouTubeCrawlerView: FC<YouTubeCrawlerViewProps> = ({ searchSpaceId,
 									tag: {
 										body: "h-7 relative bg-background border border-input hover:bg-background rounded-md font-medium text-xs ps-2 pe-7 flex",
 										closeButton:
-											"absolute -inset-y-px -end-px p-0 rounded-e-lg flex size-7 transition-colors outline-0 focus-visible:outline focus-visible:outline-2 focus-visible:outline-ring/70 text-muted-foreground/80 hover:text-foreground",
+											"absolute -inset-y-px -end-px p-0 rounded-e-lg flex size-7 transition-colors outline-0 focus-visible:outline focus-visible:outline-2 focus-visible:outline-ring/70 text-muted-foreground/80 hover:text-accent-foreground",
 									},
 								}}
 								activeTagIndex={activeTagIndex}
diff --git a/surfsense_web/components/assistant-ui/document-upload-popup.tsx b/surfsense_web/components/assistant-ui/document-upload-popup.tsx
index 56cd533ee..13683162f 100644
--- a/surfsense_web/components/assistant-ui/document-upload-popup.tsx
+++ b/surfsense_web/components/assistant-ui/document-upload-popup.tsx
@@ -133,7 +133,7 @@ const DocumentUploadPopupContent: FC<{
 				onPointerDownOutside={(e) => e.preventDefault()}
 				onInteractOutside={(e) => e.preventDefault()}
 				onEscapeKeyDown={(e) => e.preventDefault()}
-				className="select-none max-w-2xl w-[95vw] sm:w-[640px] h-[min(440px,75dvh)] sm:h-[min(520px,80vh)] flex flex-col p-0 gap-0 overflow-hidden ring-0 [&>button]:right-3 sm:[&>button]:right-6 [&>button]:top-5 sm:[&>button]:top-8 [&>button]:opacity-80 [&>button]:hover:opacity-100 [&>button]:hover:bg-foreground/10 [&>button]:z-[100] [&>button>svg]:size-4 sm:[&>button>svg]:size-5"
+				className="select-none max-w-2xl w-[95vw] sm:w-[640px] h-[min(440px,75dvh)] sm:h-[min(520px,80vh)] flex flex-col p-0 gap-0 overflow-hidden ring-0 [&>button]:right-3 sm:[&>button]:right-6 [&>button]:top-5 sm:[&>button]:top-8 [&>button]:opacity-80 [&>button]:hover:opacity-100 [&>button]:hover:bg-accent [&>button]:hover:text-accent-foreground [&>button]:z-[100] [&>button>svg]:size-4 sm:[&>button>svg]:size-5"
 			>
 				<div className="flex-1 min-h-0 overflow-y-auto overscroll-contain">
 					<DialogHeader className="sticky top-0 z-20 bg-popover px-4 sm:px-6 pt-6 sm:pt-8 pb-10">
diff --git a/surfsense_web/components/assistant-ui/inline-citation.tsx b/surfsense_web/components/assistant-ui/inline-citation.tsx
index 32a29cfc9..1a3d04262 100644
--- a/surfsense_web/components/assistant-ui/inline-citation.tsx
+++ b/surfsense_web/components/assistant-ui/inline-citation.tsx
@@ -79,7 +79,7 @@ const NumericChunkCitation: FC<{ chunkId: number }> = ({ chunkId }) => {
 		<button
 			type="button"
 			onClick={() => openCitationPanel({ chunkId })}
-			className="ml-0.5 inline-flex h-5 min-w-5 cursor-pointer items-center justify-center rounded-md bg-muted/60 px-1.5 text-[11px] font-medium text-muted-foreground align-baseline shadow-sm transition-colors hover:bg-muted hover:text-foreground focus-visible:ring-ring focus-visible:ring-2 focus-visible:outline-none"
+			className="ml-0.5 inline-flex h-5 min-w-5 cursor-pointer items-center justify-center rounded-md bg-muted/60 px-1.5 text-[11px] font-medium text-muted-foreground align-baseline shadow-sm transition-colors hover:bg-accent hover:text-accent-foreground focus-visible:ring-ring focus-visible:ring-2 focus-visible:outline-none"
 			title={`View source chunk #${chunkId}`}
 			aria-label={`View cited chunk ${chunkId}`}
 		>
diff --git a/surfsense_web/components/assistant-ui/reasoning-message-part.tsx b/surfsense_web/components/assistant-ui/reasoning-message-part.tsx
index 6e7aaf048..94dd6f25e 100644
--- a/surfsense_web/components/assistant-ui/reasoning-message-part.tsx
+++ b/surfsense_web/components/assistant-ui/reasoning-message-part.tsx
@@ -11,9 +11,9 @@ import { cn } from "@/lib/utils";
  * (typed reasoning deltas from the chat model).
  *
  * Behaviour mirrors the existing `ThinkingStepsDisplay`:
- *   - collapsed by default;
- *   - auto-expanded while the part is still `running`;
- *   - auto-collapsed once status flips to `complete`.
+ *  - collapsed by default;
+ *  - auto-expanded while the part is still `running`;
+ *  - auto-collapsed once status flips to `complete`.
  *
  * The component is registered via the `Reasoning` slot on
  * `MessagePrimitive.Parts` in `assistant-message.tsx` so it lives at the
@@ -50,7 +50,7 @@ export const ReasoningMessagePart: ReasoningMessagePartComponent = ({ text, stat
 					onClick={() => setIsOpen((prev) => !prev)}
 					className={cn(
 						"flex w-full items-center gap-1.5 text-left text-sm transition-colors",
-						"text-muted-foreground hover:text-foreground"
+						"text-muted-foreground hover:text-accent-foreground"
 					)}
 				>
 					{isRunning ? (
diff --git a/surfsense_web/components/assistant-ui/revert-turn-button.tsx b/surfsense_web/components/assistant-ui/revert-turn-button.tsx
index 733162c80..2cc151ee2 100644
--- a/surfsense_web/components/assistant-ui/revert-turn-button.tsx
+++ b/surfsense_web/components/assistant-ui/revert-turn-button.tsx
@@ -129,7 +129,7 @@ export function RevertTurnButton({ chatTurnId }: RevertTurnButtonProps) {
 					<Button
 						size="sm"
 						variant="ghost"
-						className="text-muted-foreground hover:text-foreground gap-1.5"
+						className="text-muted-foreground hover:text-accent-foreground gap-1.5"
 						onClick={(e) => {
 							e.stopPropagation();
 							setConfirmOpen(true);
diff --git a/surfsense_web/components/assistant-ui/thread-list.tsx b/surfsense_web/components/assistant-ui/thread-list.tsx
index bca36c037..1753a6ccf 100644
--- a/surfsense_web/components/assistant-ui/thread-list.tsx
+++ b/surfsense_web/components/assistant-ui/thread-list.tsx
@@ -150,7 +150,7 @@ export function ThreadList({ searchSpaceId, currentThreadId, className }: Thread
 						"flex-1 px-3 py-2 text-center text-xs font-medium transition-colors",
 						!showArchived
 							? "border-b-2 border-primary text-primary"
-							: "text-muted-foreground hover:text-foreground"
+							: "text-muted-foreground hover:text-accent-foreground"
 					)}
 				>
 					Active ({state.threads.length})
@@ -162,7 +162,7 @@ export function ThreadList({ searchSpaceId, currentThreadId, className }: Thread
 						"flex-1 px-3 py-2 text-center text-xs font-medium transition-colors",
 						showArchived
 							? "border-b-2 border-primary text-primary"
-							: "text-muted-foreground hover:text-foreground"
+							: "text-muted-foreground hover:text-accent-foreground"
 					)}
 				>
 					Archived ({state.archivedThreads.length})
@@ -234,7 +234,7 @@ const ThreadListItemComponent = memo(function ThreadListItemComponent({
 			type="button"
 			className={cn(
 				"group flex w-full items-center gap-2 rounded-lg px-3 py-2 transition-colors cursor-pointer text-left",
-				isActive ? "bg-accent text-accent-foreground" : "hover:bg-muted/50"
+				isActive ? "bg-accent text-accent-foreground" : "hover:bg-accent hover:text-accent-foreground"
 			)}
 			onClick={onClick}
 		>
diff --git a/surfsense_web/components/assistant-ui/thread.tsx b/surfsense_web/components/assistant-ui/thread.tsx
index dcb416585..153e0d54d 100644
--- a/surfsense_web/components/assistant-ui/thread.tsx
+++ b/surfsense_web/components/assistant-ui/thread.tsx
@@ -163,7 +163,7 @@ const PremiumQuotaPinnedAlert: FC = () => {
 				</div>
 				<button
 					type="button"
-					className="inline-flex size-6 items-center justify-center text-muted-foreground transition-colors hover:text-foreground"
+					className="inline-flex size-6 items-center justify-center text-muted-foreground transition-colors hover:text-accent-foreground"
 					aria-label="Dismiss premium quota alert"
 					onClick={() => clearPremiumAlertForThread(currentThreadId)}
 				>
@@ -304,10 +304,10 @@ const ConnectToolsBanner: FC<{ isThreadEmpty: boolean }> = ({ isThreadEmpty }) =
 				<button
 					type="button"
 					onClick={handleDismiss}
-					className="shrink-0 ml-0.5 p-1.5 -mr-1 text-muted-foreground/40 hover:text-foreground transition-colors cursor-pointer"
+					className="shrink-0 ml-0.5 p-1.5 -mr-1 text-muted-foreground/40 hover:text-accent-foreground transition-colors cursor-pointer"
 					aria-label="Dismiss"
 				>
-					<X className="size-3.5 text-muted-foreground" />
+					<X className="size-3.5" />
 				</button>
 			</div>
 		</div>
@@ -329,7 +329,7 @@ const PendingScreenImageStrip: FC = () => {
 					<button
 						type="button"
 						onClick={() => setUrls((prev) => prev.filter((_, i) => i !== index))}
-						className="absolute right-0.5 top-0.5 flex size-5 items-center justify-center rounded-full bg-background/90 text-muted-foreground shadow-sm transition-opacity hover:text-foreground sm:opacity-0 sm:group-hover:opacity-100"
+						className="absolute right-0.5 top-0.5 flex size-5 items-center justify-center rounded-full bg-background/90 text-muted-foreground shadow-sm transition-opacity hover:text-accent-foreground sm:opacity-0 sm:group-hover:opacity-100"
 						aria-label="Remove screenshot"
 					>
 						<X className="size-3" />
@@ -355,7 +355,7 @@ const ClipboardChip: FC<{ text: string; onDismiss: () => void }> = ({ text, onDi
 					<button
 						type="button"
 						onClick={() => setExpanded((v) => !v)}
-						className="flex items-center text-muted-foreground hover:text-foreground transition-colors"
+						className="flex items-center text-muted-foreground hover:text-accent-foreground transition-colors"
 					>
 						{expanded ? <ChevronUp className="size-3.5" /> : <ChevronDown className="size-3.5" />}
 					</button>
@@ -363,7 +363,7 @@ const ClipboardChip: FC<{ text: string; onDismiss: () => void }> = ({ text, onDi
 				<button
 					type="button"
 					onClick={onDismiss}
-					className="flex items-center text-muted-foreground hover:text-foreground transition-colors"
+					className="flex items-center text-muted-foreground hover:text-accent-foreground transition-colors"
 				>
 					<X className="size-3.5" />
 				</button>
@@ -890,7 +890,7 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 								<Button
 									variant="ghost"
 									size="icon"
-									className="size-[34px] rounded-full p-1 font-semibold text-xs hover:bg-muted-foreground/15 dark:border-muted-foreground/15 dark:hover:bg-muted-foreground/30"
+									className="size-[34px] rounded-full p-1 font-semibold text-xs dark:border-muted-foreground/15 hover:bg-accent hover:text-accent-foreground"
 									aria-label="More actions"
 									data-joyride="connector-icon"
 								>
@@ -941,7 +941,7 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 													return (
 														<div
 															key={tool.name}
-															className="flex w-full items-center gap-3 px-4 py-2 hover:bg-muted-foreground/10 transition-colors"
+															className="flex w-full items-center gap-3 px-4 py-2 hover:bg-accent hover:text-accent-foreground transition-colors"
 														>
 															<ToolIcon className="size-4 shrink-0 text-muted-foreground" />
 															<span className="flex-1 min-w-0 text-sm font-medium truncate">
@@ -972,7 +972,7 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 													return (
 														<div
 															key={group.label}
-															className="flex w-full items-center gap-3 px-4 py-2 hover:bg-muted-foreground/10 transition-colors"
+															className="flex w-full items-center gap-3 px-4 py-2 hover:bg-accent hover:text-accent-foreground transition-colors"
 														>
 															{iconInfo ? (
 																<Image
@@ -1032,7 +1032,7 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 								disableTooltip={toolsPopoverOpen}
 								variant="ghost"
 								size="icon"
-								className="size-[34px] rounded-full p-1 font-semibold text-xs hover:bg-muted-foreground/15 dark:border-muted-foreground/15 dark:hover:bg-muted-foreground/30"
+								className="size-[34px] rounded-full p-1 font-semibold text-xs dark:border-muted-foreground/15 hover:bg-accent hover:text-accent-foreground"
 								aria-label="Manage tools"
 								data-joyride="connector-icon"
 							>
@@ -1066,7 +1066,7 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 												const isDisabled = disabledToolsSet.has(tool.name);
 												const ToolIcon = getToolIcon(tool.name);
 												const row = (
-													<div className="flex w-full items-center gap-1.5 sm:gap-2 px-2 sm:px-2.5 py-0.5 sm:py-1 hover:bg-muted-foreground/10 transition-colors">
+													<div className="flex w-full items-center gap-1.5 sm:gap-2 px-2 sm:px-2.5 py-0.5 sm:py-1 hover:bg-accent hover:text-accent-foreground transition-colors">
 														<ToolIcon className="size-3 sm:size-3.5 shrink-0 text-muted-foreground" />
 														<span className="flex-1 min-w-0 text-[11px] sm:text-xs font-medium truncate">
 															{formatToolName(tool.name)}
@@ -1103,7 +1103,7 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 												const allDisabled = toolNames.every((n) => disabledToolsSet.has(n));
 												const groupDef = TOOL_GROUPS.find((g) => g.label === group.label);
 												const row = (
-													<div className="flex w-full items-center gap-1.5 sm:gap-2 px-2 sm:px-2.5 py-0.5 sm:py-1 hover:bg-muted-foreground/10 transition-colors">
+													<div className="flex w-full items-center gap-1.5 sm:gap-2 px-2 sm:px-2.5 py-0.5 sm:py-1 hover:bg-accent hover:text-accent-foreground transition-colors">
 														{iconInfo ? (
 															<Image
 																src={iconInfo.src}
@@ -1182,7 +1182,7 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 							"rounded-full transition-[background-color,border-color,color] flex items-center gap-1 px-2 py-1 border h-8 select-none",
 							isWebSearchEnabled
 								? "bg-sky-500/15 border-sky-500/60 text-sky-500"
-								: "bg-transparent border-transparent text-muted-foreground hover:text-foreground"
+								: "bg-transparent border-transparent text-muted-foreground hover:text-accent-foreground"
 						)}
 					>
 						<motion.div
diff --git a/surfsense_web/components/chat-comments/comment-item/comment-item.tsx b/surfsense_web/components/chat-comments/comment-item/comment-item.tsx
index a8da34855..40b48f0e9 100644
--- a/surfsense_web/components/chat-comments/comment-item/comment-item.tsx
+++ b/surfsense_web/components/chat-comments/comment-item/comment-item.tsx
@@ -213,7 +213,7 @@ export function CommentItem({
 					<Button
 						variant="ghost"
 						size="sm"
-						className="mt-1 h-7 w-fit px-2 text-xs text-muted-foreground hover:text-foreground"
+						className="mt-1 h-7 w-fit px-2 text-xs text-muted-foreground hover:text-accent-foreground"
 						onClick={() => onReply(comment.id)}
 					>
 						<MessageCircleReply className="mr-1 size-3" />
diff --git a/surfsense_web/components/chat-comments/comment-thread/comment-thread.tsx b/surfsense_web/components/chat-comments/comment-thread/comment-thread.tsx
index 7929716bb..81407e2c6 100644
--- a/surfsense_web/components/chat-comments/comment-thread/comment-thread.tsx
+++ b/surfsense_web/components/chat-comments/comment-thread/comment-thread.tsx
@@ -92,7 +92,7 @@ export function CommentThread({
 							<Button
 								variant="ghost"
 								size="sm"
-								className="h-6 px-2 text-xs text-muted-foreground hover:text-foreground"
+								className="h-6 px-2 text-xs text-muted-foreground hover:text-accent-foreground"
 								onClick={() => setIsRepliesExpanded((prev) => !prev)}
 							>
 								{isRepliesExpanded ? (
diff --git a/surfsense_web/components/chat-comments/member-mention-picker/member-mention-item.tsx b/surfsense_web/components/chat-comments/member-mention-picker/member-mention-item.tsx
index 0ea53eeb4..349076372 100644
--- a/surfsense_web/components/chat-comments/member-mention-picker/member-mention-item.tsx
+++ b/surfsense_web/components/chat-comments/member-mention-picker/member-mention-item.tsx
@@ -29,7 +29,7 @@ export function MemberMentionItem({
 			type="button"
 			className={cn(
 				"flex w-full items-center gap-3 px-3 py-2 text-left transition-colors",
-				isHighlighted ? "bg-primary/15 text-accent-foreground" : "hover:bg-accent/50"
+				isHighlighted ? "bg-primary/15 text-accent-foreground" : "hover:bg-accent hover:text-accent-foreground"
 			)}
 			onClick={() => onSelect(member)}
 			onMouseEnter={onMouseEnter}
diff --git a/surfsense_web/components/citation-panel/citation-panel.tsx b/surfsense_web/components/citation-panel/citation-panel.tsx
index e9f14bf64..c588bb93d 100644
--- a/surfsense_web/components/citation-panel/citation-panel.tsx
+++ b/surfsense_web/components/citation-panel/citation-panel.tsx
@@ -103,9 +103,9 @@ export const CitationPanelContent: FC<CitationPanelContentProps> = ({ chunkId, o
 								variant="ghost"
 								size="icon"
 								onClick={onClose}
-								className="h-8 w-8 rounded-full shrink-0"
+								className="h-8 w-8 rounded-full shrink-0 text-muted-foreground hover:text-accent-foreground"
 							>
-								<XIcon className="h-4 w-4 text-muted-foreground" />
+								<XIcon className="h-4 w-4" />
 								<span className="sr-only">Close citation panel</span>
 							</Button>
 						)}
diff --git a/surfsense_web/components/documents/DocumentNode.tsx b/surfsense_web/components/documents/DocumentNode.tsx
index 795c694c9..f6da88e55 100644
--- a/surfsense_web/components/documents/DocumentNode.tsx
+++ b/surfsense_web/components/documents/DocumentNode.tsx
@@ -144,7 +144,7 @@ export const DocumentNode = React.memo(function DocumentNode({
 					tabIndex={0}
 					ref={attachRef}
 					className={cn(
-						"group flex h-8 w-full items-center gap-2.5 rounded-md px-1 text-sm hover:bg-accent/50 cursor-pointer select-none text-left",
+						"group flex h-8 w-full items-center gap-2.5 rounded-md px-1 text-sm hover:bg-accent hover:text-accent-foreground cursor-pointer select-none text-left",
 						isMentioned && "bg-accent/30",
 						isDragging && "opacity-40"
 					)}
diff --git a/surfsense_web/components/documents/DocumentsFilters.tsx b/surfsense_web/components/documents/DocumentsFilters.tsx
index 1a1784b12..06be4a55c 100644
--- a/surfsense_web/components/documents/DocumentsFilters.tsx
+++ b/surfsense_web/components/documents/DocumentsFilters.tsx
@@ -84,7 +84,7 @@ export function DocumentsFilters({
 							<TooltipTrigger asChild>
 								<ToggleGroupItem
 									value="folder"
-									className="h-8 w-8 shrink-0 border-0 bg-muted text-muted-foreground transition-colors hover:bg-muted/80 hover:text-foreground"
+									className="h-8 w-8 shrink-0 border-0 bg-muted text-muted-foreground transition-colors hover:bg-accent hover:text-accent-foreground"
 									onClick={(e) => {
 										e.preventDefault();
 										onCreateFolder();
@@ -109,7 +109,7 @@ export function DocumentsFilters({
 										"disabled:pointer-events-none disabled:opacity-50",
 										aiSortEnabled
 											? "bg-accent text-accent-foreground hover:bg-accent"
-											: "text-muted-foreground hover:bg-muted/80 hover:text-foreground"
+											: "text-muted-foreground hover:bg-accent hover:text-accent-foreground"
 									)}
 									onClick={(e) => {
 										e.preventDefault();
@@ -143,7 +143,7 @@ export function DocumentsFilters({
 								<PopoverTrigger asChild>
 									<ToggleGroupItem
 										value="filter"
-										className="relative h-8 w-8 shrink-0 overflow-visible border-0 bg-muted text-muted-foreground transition-colors before:absolute before:left-0 before:top-1/2 before:h-4 before:w-px before:-translate-y-1/2 before:bg-border/60 before:content-[''] hover:bg-muted/80 hover:text-foreground dark:before:bg-white/10"
+										className="relative h-8 w-8 shrink-0 overflow-visible border-0 bg-muted text-muted-foreground transition-colors before:absolute before:left-0 before:top-1/2 before:h-4 before:w-px before:-translate-y-1/2 before:bg-border/60 before:content-[''] hover:bg-accent hover:text-accent-foreground dark:before:bg-white/10"
 									>
 										<ListFilter size={13} />
 										{activeTypes.length > 0 && (
@@ -189,7 +189,7 @@ export function DocumentsFilters({
 												aria-selected={activeTypes.includes(value)}
 												tabIndex={0}
 												key={value}
-												className="flex w-full items-center gap-2.5 py-2 px-3 rounded-md hover:bg-neutral-200 dark:hover:bg-neutral-700 transition-colors cursor-pointer text-left"
+												className="flex w-full items-center gap-2.5 py-2 px-3 rounded-md hover:bg-accent hover:text-accent-foreground transition-colors cursor-pointer text-left"
 												onClick={() => onToggleType(value, !activeTypes.includes(value))}
 												onKeyDown={(e) => {
 													if (e.key === "Enter" || e.key === " ") {
@@ -261,7 +261,7 @@ export function DocumentsFilters({
 					onClick={handleUpload}
 					variant="outline"
 					size="sm"
-					className="h-8 shrink-0 gap-1.5 border-0 bg-white text-gray-700 shadow-none hover:bg-gray-50 dark:bg-white dark:text-gray-800 dark:hover:bg-gray-100"
+					className="h-8 shrink-0 gap-1.5 border-0 bg-white text-gray-700 shadow-none hover:bg-accent hover:text-accent-foreground dark:bg-white dark:text-gray-800"
 				>
 					<Upload size={13} />
 					<span>Upload</span>
diff --git a/surfsense_web/components/documents/FolderNode.tsx b/surfsense_web/components/documents/FolderNode.tsx
index 9fda7ac0e..2506713a4 100644
--- a/surfsense_web/components/documents/FolderNode.tsx
+++ b/surfsense_web/components/documents/FolderNode.tsx
@@ -260,7 +260,7 @@ export const FolderNode = React.memo(function FolderNode({
 					role="button"
 					tabIndex={0}
 					className={cn(
-						"group relative flex h-8 items-center gap-1 rounded-md px-1 text-sm hover:bg-accent/50 cursor-pointer select-none",
+						"group relative flex h-8 items-center gap-1 rounded-md px-1 text-sm hover:bg-accent hover:text-accent-foreground cursor-pointer select-none",
 						isExpanded && "font-medium",
 						isDragging && "opacity-40",
 						isOver && canDrop && dropZone === "middle" && "bg-accent ring-1 ring-primary/40",
diff --git a/surfsense_web/components/documents/FolderPickerDialog.tsx b/surfsense_web/components/documents/FolderPickerDialog.tsx
index cb97caa62..3359f7499 100644
--- a/surfsense_web/components/documents/FolderPickerDialog.tsx
+++ b/surfsense_web/components/documents/FolderPickerDialog.tsx
@@ -92,7 +92,7 @@ export function FolderPickerDialog({
 					className={cn(
 						"flex w-full items-center gap-1.5 rounded-md px-2 py-1.5 text-sm transition-colors",
 						isSelected && "bg-accent text-accent-foreground",
-						!isSelected && !isDisabled && "hover:bg-accent/50",
+						!isSelected && !isDisabled && "hover:bg-accent hover:text-accent-foreground",
 						isDisabled && "cursor-not-allowed opacity-40"
 					)}
 					style={{ paddingLeft: `${depth * 16 + 8}px` }}
@@ -148,7 +148,7 @@ export function FolderPickerDialog({
 						className={cn(
 							"flex w-full items-center gap-1.5 rounded-md px-2 py-1.5 text-sm transition-colors",
 							selectedId === null && "bg-accent text-accent-foreground",
-							selectedId !== null && "hover:bg-accent/50"
+							selectedId !== null && "hover:bg-accent hover:text-accent-foreground"
 						)}
 						onClick={() => setSelectedId(null)}
 					>
diff --git a/surfsense_web/components/documents/version-history.tsx b/surfsense_web/components/documents/version-history.tsx
index ba6f368cd..453c02817 100644
--- a/surfsense_web/components/documents/version-history.tsx
+++ b/surfsense_web/components/documents/version-history.tsx
@@ -185,7 +185,7 @@ function VersionHistoryPanel({ documentId }: { documentId: number }) {
 									"flex items-center gap-2 rounded-lg px-3 py-2.5 text-left transition-colors focus:outline-none focus-visible:outline-none w-full",
 									selectedVersion === v.version_number
 										? "bg-accent text-accent-foreground"
-										: "text-muted-foreground hover:bg-accent/50 hover:text-foreground"
+										: "text-muted-foreground hover:bg-accent hover:text-accent-foreground"
 								)}
 							>
 								<div className="flex-1 min-w-0 space-y-0.5">
diff --git a/surfsense_web/components/editor-panel/editor-panel.tsx b/surfsense_web/components/editor-panel/editor-panel.tsx
index 224f0b6a4..d2dbd2127 100644
--- a/surfsense_web/components/editor-panel/editor-panel.tsx
+++ b/surfsense_web/components/editor-panel/editor-panel.tsx
@@ -456,9 +456,9 @@ export function EditorPanelContent({
 								variant="ghost"
 								size="icon"
 								onClick={onClose}
-								className="h-8 w-8 rounded-full shrink-0"
+								className="h-8 w-8 rounded-full shrink-0 text-muted-foreground hover:text-accent-foreground"
 							>
-								<XIcon className="h-4 w-4 text-muted-foreground" />
+								<XIcon className="h-4 w-4" />
 								<span className="sr-only">Close editor panel</span>
 							</Button>
 						</div>
diff --git a/surfsense_web/components/inference-params-editor.tsx b/surfsense_web/components/inference-params-editor.tsx
index c656c2020..64de39dd8 100644
--- a/surfsense_web/components/inference-params-editor.tsx
+++ b/surfsense_web/components/inference-params-editor.tsx
@@ -128,7 +128,7 @@ export default function InferenceParamsEditor({ params, setParams }: InferencePa
 						</thead>
 						<tbody className="divide-y divide-gray-200 bg-black dark:bg-black">
 							{Object.entries(params).map(([key, val]) => (
-								<tr key={key} className="hover:bg-gray-50 dark:hover:bg-gray-800 transition-colors">
+								<tr key={key} className="hover:bg-accent hover:text-accent-foreground transition-colors">
 									<td className="px-4 py-3 font-medium text-gray-900 dark:text-white">{key}</td>
 									<td className="px-4 py-3 text-gray-700 dark:text-gray-300">{val.toString()}</td>
 									<td className="px-4 py-3">
diff --git a/surfsense_web/components/layout/ui/right-panel/RightPanel.tsx b/surfsense_web/components/layout/ui/right-panel/RightPanel.tsx
index 8e2a5d1fe..027a25af3 100644
--- a/surfsense_web/components/layout/ui/right-panel/RightPanel.tsx
+++ b/surfsense_web/components/layout/ui/right-panel/RightPanel.tsx
@@ -69,7 +69,7 @@ function CollapseButton({ onClick }: { onClick: () => void }) {
 						if (isKeyboardClick(event)) return;
 						onClick();
 					}}
-					className="h-8 w-8 shrink-0 text-muted-foreground hover:text-muted-foreground hover:bg-accent"
+					className="h-8 w-8 shrink-0 text-muted-foreground hover:bg-accent hover:text-accent-foreground"
 				>
 					<PanelRight className="h-4 w-4" />
 					<span className="sr-only">Collapse panel</span>
@@ -114,7 +114,7 @@ export function RightPanelExpandButton() {
 							if (isKeyboardClick(event)) return;
 							startTransition(() => setCollapsed(false));
 						}}
-						className="h-8 w-8 shrink-0 -m-0.5 text-muted-foreground hover:text-muted-foreground hover:bg-accent"
+						className="h-8 w-8 shrink-0 -m-0.5 text-muted-foreground hover:bg-accent hover:text-accent-foreground"
 					>
 						<PanelRight className="h-4 w-4" />
 						<span className="sr-only">Expand panel</span>
diff --git a/surfsense_web/components/layout/ui/sidebar/AllPrivateChatsSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/AllPrivateChatsSidebar.tsx
index 439c09017..e5bc0bd31 100644
--- a/surfsense_web/components/layout/ui/sidebar/AllPrivateChatsSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/AllPrivateChatsSidebar.tsx
@@ -258,10 +258,10 @@ export function AllPrivateChatsSidebarContent({
 						<Button
 							variant="ghost"
 							size="icon"
-							className="h-8 w-8 rounded-full"
+							className="h-8 w-8 rounded-full text-muted-foreground hover:text-accent-foreground"
 							onClick={() => onOpenChange(false)}
 						>
-							<ChevronLeft className="h-4 w-4 text-muted-foreground" />
+							<ChevronLeft className="h-4 w-4" />
 							<span className="sr-only">{t("close") || "Close"}</span>
 						</Button>
 					)}
diff --git a/surfsense_web/components/layout/ui/sidebar/AllSharedChatsSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/AllSharedChatsSidebar.tsx
index ca28a421b..d6a25608e 100644
--- a/surfsense_web/components/layout/ui/sidebar/AllSharedChatsSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/AllSharedChatsSidebar.tsx
@@ -257,10 +257,10 @@ export function AllSharedChatsSidebarContent({
 						<Button
 							variant="ghost"
 							size="icon"
-							className="h-8 w-8 rounded-full"
+							className="h-8 w-8 rounded-full text-muted-foreground hover:text-accent-foreground"
 							onClick={() => onOpenChange(false)}
 						>
-							<ChevronLeft className="h-4 w-4 text-muted-foreground" />
+							<ChevronLeft className="h-4 w-4" />
 							<span className="sr-only">{t("close") || "Close"}</span>
 						</Button>
 					)}
diff --git a/surfsense_web/components/layout/ui/sidebar/DesktopLocalTabContent.tsx b/surfsense_web/components/layout/ui/sidebar/DesktopLocalTabContent.tsx
index a66b7f216..3730f0e53 100644
--- a/surfsense_web/components/layout/ui/sidebar/DesktopLocalTabContent.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/DesktopLocalTabContent.tsx
@@ -65,13 +65,13 @@ export function DesktopLocalTabContent({
 	return (
 		<div className="flex min-h-0 flex-1 flex-col select-none">
 			<div className="mx-4 mt-4 mb-3">
-				<div className="flex h-7 w-full items-stretch rounded-lg border-0 bg-muted text-[11px] text-muted-foreground hover:bg-muted/80">
+				<div className="flex h-7 w-full items-stretch rounded-lg border-0 bg-muted text-[11px] text-muted-foreground hover:bg-accent hover:text-accent-foreground">
 					{localRootPaths.length > 0 ? (
 						<DropdownMenu>
 							<DropdownMenuTrigger asChild>
 								<button
 									type="button"
-									className="min-w-0 flex-1 flex items-center gap-1 rounded-l-lg px-2 text-left transition-colors hover:bg-muted/80 focus-visible:outline-none focus-visible:ring-0 focus-visible:ring-offset-0"
+									className="min-w-0 flex-1 flex items-center gap-1 rounded-l-lg px-2 text-left transition-colors hover:bg-accent hover:text-accent-foreground focus-visible:outline-none focus-visible:ring-0 focus-visible:ring-offset-0"
 									title={localRootPaths.join("\n")}
 									aria-label="Manage selected folders"
 								>
@@ -100,7 +100,7 @@ export function DesktopLocalTabContent({
 										</span>
 										<button
 											type="button"
-											className="inline-flex size-5 items-center justify-center rounded text-muted-foreground transition-colors hover:text-foreground"
+											className="inline-flex size-5 items-center justify-center rounded text-muted-foreground transition-colors hover:text-accent-foreground"
 											onClick={(event) => {
 												event.stopPropagation();
 												void onRemoveFilesystemRoot(rootPath);
@@ -142,7 +142,7 @@ export function DesktopLocalTabContent({
 								<span className="inline-flex">
 									<button
 										type="button"
-										className="flex w-8 items-center justify-center rounded-r-lg text-muted-foreground transition-colors hover:bg-muted/80 hover:text-foreground focus-visible:outline-none focus-visible:ring-0 focus-visible:ring-offset-0 disabled:opacity-50"
+										className="flex w-8 items-center justify-center rounded-r-lg text-muted-foreground transition-colors hover:bg-accent hover:text-accent-foreground focus-visible:outline-none focus-visible:ring-0 focus-visible:ring-offset-0 disabled:opacity-50"
 										onClick={() => {
 											void onPickFilesystemRoot();
 										}}
@@ -169,7 +169,7 @@ export function DesktopLocalTabContent({
 					</div>
 					<Input
 						ref={localSearchInputRef}
-						className="peer h-8 w-full pl-8 pr-8 text-sm bg-sidebar border-border/60 select-none focus:select-text"
+						className="peer h-8 w-full border-0 bg-muted pl-8 pr-8 text-sm shadow-none select-none focus:select-text"
 						value={localSearch}
 						onChange={(e) => setLocalSearch(e.target.value)}
 						placeholder="Search local files"
@@ -179,7 +179,7 @@ export function DesktopLocalTabContent({
 					{Boolean(localSearch) && (
 						<button
 							type="button"
-							className="absolute inset-y-0 right-0 flex h-full w-8 items-center justify-center rounded-r-md text-muted-foreground hover:text-foreground transition-colors"
+							className="absolute inset-y-0 right-0 flex h-full w-8 items-center justify-center rounded-r-md text-muted-foreground hover:text-accent-foreground transition-colors"
 							aria-label="Clear local search"
 							onClick={() => {
 								setLocalSearch("");
diff --git a/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx
index 17bf62967..017f14adf 100644
--- a/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx
@@ -1043,7 +1043,7 @@ function AuthenticatedDocumentsSidebarBase({
 	const cloudContent = (
 		<>
 			{/* Connected tools strip */}
-			<div className="shrink-0 mx-4 mt-6 mb-2.5 flex select-none items-center gap-2 rounded-lg border-0 bg-muted transition-colors hover:bg-muted/80">
+			<div className="shrink-0 mx-4 mt-6 mb-2.5 flex select-none items-center gap-2 rounded-lg border-0 bg-muted transition-colors hover:bg-accent hover:text-accent-foreground">
 				<button
 					type="button"
 					onClick={() => setConnectorDialogOpen(true)}
@@ -1114,7 +1114,7 @@ function AuthenticatedDocumentsSidebarBase({
 				<button
 					type="button"
 					onClick={handleWatchLocalFolder}
-					className="shrink-0 mx-4 mb-2.5 flex select-none items-center gap-2 rounded-lg border-0 bg-muted px-3 py-1.5 transition-colors hover:bg-muted/80"
+					className="shrink-0 mx-4 mb-2.5 flex select-none items-center gap-2 rounded-lg border-0 bg-muted px-3 py-1.5 transition-colors hover:bg-accent hover:text-accent-foreground"
 				>
 					<FolderClock className="size-4 shrink-0 text-muted-foreground" />
 					<span className="truncate text-xs text-muted-foreground">Watch local folder</span>
@@ -1229,10 +1229,10 @@ function AuthenticatedDocumentsSidebarBase({
 							<Button
 								variant="ghost"
 								size="icon"
-								className="h-8 w-8 rounded-full"
+								className="h-8 w-8 rounded-full text-muted-foreground hover:text-accent-foreground"
 								onClick={() => onOpenChange(false)}
 							>
-								<ChevronLeft className="h-4 w-4 text-muted-foreground" />
+								<ChevronLeft className="h-4 w-4" />
 								<span className="sr-only">{tSidebar("close") || "Close"}</span>
 							</Button>
 						)}
@@ -1272,7 +1272,7 @@ function AuthenticatedDocumentsSidebarBase({
 									<Button
 										variant="ghost"
 										size="icon"
-										className="h-8 w-8 rounded-full"
+										className="h-8 w-8 rounded-full text-muted-foreground hover:text-accent-foreground"
 										onClick={() => {
 											if (isDocked) {
 												onDockedChange(false);
@@ -1283,9 +1283,9 @@ function AuthenticatedDocumentsSidebarBase({
 										}}
 									>
 										{isDocked ? (
-											<ChevronLeft className="h-4 w-4 text-muted-foreground" />
+											<ChevronLeft className="h-4 w-4" />
 										) : (
-											<ChevronRight className="h-4 w-4 text-muted-foreground" />
+											<ChevronRight className="h-4 w-4" />
 										)}
 										<span className="sr-only">{isDocked ? "Collapse panel" : "Expand panel"}</span>
 									</Button>
@@ -1720,10 +1720,10 @@ function AnonymousDocumentsSidebar({
 							<Button
 								variant="ghost"
 								size="icon"
-								className="h-8 w-8 rounded-full"
+								className="h-8 w-8 rounded-full text-muted-foreground hover:text-accent-foreground"
 								onClick={() => onOpenChange(false)}
 							>
-								<X className="h-4 w-4 text-muted-foreground" />
+								<X className="h-4 w-4" />
 								<span className="sr-only">{tSidebar("close") || "Close"}</span>
 							</Button>
 						)}
@@ -1733,7 +1733,7 @@ function AnonymousDocumentsSidebar({
 									<Button
 										variant="ghost"
 										size="icon"
-										className="h-8 w-8 rounded-full"
+										className="h-8 w-8 rounded-full text-muted-foreground hover:text-accent-foreground"
 										onClick={() => {
 											if (isDocked) {
 												onDockedChange(false);
@@ -1744,9 +1744,9 @@ function AnonymousDocumentsSidebar({
 										}}
 									>
 										{isDocked ? (
-											<ChevronLeft className="h-4 w-4 text-muted-foreground" />
+											<ChevronLeft className="h-4 w-4" />
 										) : (
-											<ChevronRight className="h-4 w-4 text-muted-foreground" />
+											<ChevronRight className="h-4 w-4" />
 										)}
 										<span className="sr-only">{isDocked ? "Collapse panel" : "Expand panel"}</span>
 									</Button>
@@ -1762,7 +1762,7 @@ function AnonymousDocumentsSidebar({
 			</div>
 
 			{/* Connectors strip (gated) */}
-			<div className="shrink-0 mx-4 mt-6 mb-2.5 flex select-none items-center gap-2 rounded-lg border bg-muted/50 transition-colors hover:bg-muted/80">
+			<div className="shrink-0 mx-4 mt-6 mb-2.5 flex select-none items-center gap-2 rounded-lg border bg-muted/50 transition-colors hover:bg-accent hover:text-accent-foreground">
 				<button
 					type="button"
 					onClick={() => gate("connect your data sources")}
diff --git a/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx
index c0e11da0b..45a0fbb39 100644
--- a/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx
@@ -535,10 +535,10 @@ export function InboxSidebarContent({
 							<Button
 								variant="ghost"
 								size="icon"
-								className="h-8 w-8 rounded-full"
+								className="h-8 w-8 rounded-full text-muted-foreground hover:text-accent-foreground"
 								onClick={() => onOpenChange(false)}
 							>
-								<ChevronLeft className="h-4 w-4 text-muted-foreground" />
+								<ChevronLeft className="h-4 w-4" />
 								<span className="sr-only">{t("close") || "Close"}</span>
 							</Button>
 						)}
diff --git a/surfsense_web/components/layout/ui/sidebar/LocalFilesystemBrowser.tsx b/surfsense_web/components/layout/ui/sidebar/LocalFilesystemBrowser.tsx
index 19c47d605..9184ed511 100644
--- a/surfsense_web/components/layout/ui/sidebar/LocalFilesystemBrowser.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/LocalFilesystemBrowser.tsx
@@ -412,7 +412,7 @@ export function LocalFilesystemBrowser({
 					<button
 						type="button"
 						onClick={() => toggleFolder(folder.key)}
-						className="flex h-8 w-full items-center gap-1.5 rounded-md px-2 text-left text-sm transition-colors hover:bg-muted/60"
+						className="flex h-8 w-full items-center gap-1.5 rounded-md px-2 text-left text-sm transition-colors hover:bg-accent hover:text-accent-foreground"
 						style={{ paddingInlineStart: `${depth * 12 + 8}px` }}
 						draggable={false}
 					>
@@ -440,7 +440,7 @@ export function LocalFilesystemBrowser({
 												: undefined
 										}
 										className={`flex h-8 w-full items-center gap-1.5 rounded-md px-2 text-left text-sm transition-colors ${
-											isOpenable ? "hover:bg-muted/60" : "cursor-not-allowed opacity-60"
+											isOpenable ? "hover:bg-accent hover:text-accent-foreground" : "cursor-not-allowed opacity-60"
 										}`}
 										style={{ paddingInlineStart: `${(depth + 1) * 12 + 22}px` }}
 										title={
diff --git a/surfsense_web/components/layout/ui/sidebar/SidebarCollapseButton.tsx b/surfsense_web/components/layout/ui/sidebar/SidebarCollapseButton.tsx
index 9a3349f06..c140029dc 100644
--- a/surfsense_web/components/layout/ui/sidebar/SidebarCollapseButton.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/SidebarCollapseButton.tsx
@@ -26,7 +26,7 @@ export function SidebarCollapseButton({
 			variant="ghost"
 			size="icon"
 			onClick={onToggle}
-			className="h-8 w-8 shrink-0 text-muted-foreground hover:text-muted-foreground hover:bg-accent"
+			className="h-8 w-8 shrink-0 text-muted-foreground hover:bg-accent hover:text-accent-foreground"
 		>
 			<PanelLeft className="h-4 w-4" />
 			<span className="sr-only">{isCollapsed ? t("expand_sidebar") : t("collapse_sidebar")}</span>
diff --git a/surfsense_web/components/layout/ui/sidebar/SidebarSection.tsx b/surfsense_web/components/layout/ui/sidebar/SidebarSection.tsx
index 10d5942ca..0c957e1fe 100644
--- a/surfsense_web/components/layout/ui/sidebar/SidebarSection.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/SidebarSection.tsx
@@ -40,7 +40,7 @@ export function SidebarSection({
 			)}
 		>
 			<div className="flex items-center group/section shrink-0 px-2 py-1">
-				<CollapsibleTrigger className="flex items-center gap-1 text-xs font-medium text-muted-foreground hover:text-foreground transition-colors min-w-0">
+				<CollapsibleTrigger className="flex items-center gap-1 text-xs font-medium text-muted-foreground hover:text-accent-foreground transition-colors min-w-0">
 					<span className="truncate">{title}</span>
 					<ChevronRight
 						className={cn(
diff --git a/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx b/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx
index 1cbabec2c..9a6e36f19 100644
--- a/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx
@@ -270,7 +270,7 @@ export function SidebarUserProfile({
 													onClick={() => handleThemeChange(themeOption.value)}
 													className={cn(
 														"mb-1 last:mb-0 transition-all",
-														"hover:bg-accent/50",
+														"hover:bg-accent hover:text-accent-foreground",
 														isSelected && "text-primary"
 													)}
 												>
@@ -300,7 +300,7 @@ export function SidebarUserProfile({
 												onClick={() => handleLanguageChange(language.code)}
 												className={cn(
 													"mb-1 last:mb-0 transition-all",
-													"hover:bg-accent/50",
+													"hover:bg-accent hover:text-accent-foreground",
 													isSelected && "text-primary"
 												)}
 											>
@@ -436,7 +436,7 @@ export function SidebarUserProfile({
 												onClick={() => handleThemeChange(themeOption.value)}
 												className={cn(
 													"mb-1 last:mb-0 transition-all",
-													"hover:bg-accent/50",
+													"hover:bg-accent hover:text-accent-foreground",
 													isSelected && "text-primary"
 												)}
 											>
@@ -466,7 +466,7 @@ export function SidebarUserProfile({
 											onClick={() => handleLanguageChange(language.code)}
 											className={cn(
 												"mb-1 last:mb-0 transition-all",
-												"hover:bg-accent/50",
+												"hover:bg-accent hover:text-accent-foreground",
 												isSelected && "text-primary"
 											)}
 										>
diff --git a/surfsense_web/components/new-chat/chat-share-button.tsx b/surfsense_web/components/new-chat/chat-share-button.tsx
index 56c7c4bdb..f5264e386 100644
--- a/surfsense_web/components/new-chat/chat-share-button.tsx
+++ b/surfsense_web/components/new-chat/chat-share-button.tsx
@@ -151,7 +151,7 @@ export function ChatShareButton({ thread, onVisibilityChange, className }: ChatS
 									initialTab: "public-links",
 								})
 							}
-							className="flex items-center justify-center h-8 w-8 rounded-md bg-muted/50 hover:bg-muted transition-colors"
+							className="flex items-center justify-center h-8 w-8 rounded-md bg-muted/50 hover:bg-accent hover:text-accent-foreground transition-colors"
 						>
 							<Earth className="h-4 w-4 text-muted-foreground" />
 						</button>
@@ -165,7 +165,7 @@ export function ChatShareButton({ thread, onVisibilityChange, className }: ChatS
 					<Button
 						variant="outline"
 						size="icon"
-						className="h-8 w-8 md:w-auto md:px-3 md:gap-2 relative bg-muted hover:bg-muted/80 border-0 select-none"
+						className="h-8 w-8 md:w-auto md:px-3 md:gap-2 relative bg-muted hover:bg-accent hover:text-accent-foreground border-0 select-none"
 					>
 						<CurrentIcon className="h-4 w-4" />
 						<span className="hidden md:inline text-sm">{buttonLabel}</span>
diff --git a/surfsense_web/components/new-chat/model-selector.tsx b/surfsense_web/components/new-chat/model-selector.tsx
index f1ad17823..3af98a50a 100644
--- a/surfsense_web/components/new-chat/model-selector.tsx
+++ b/surfsense_web/components/new-chat/model-selector.tsx
@@ -857,7 +857,7 @@ export function ModelSelector({
 							type="button"
 							aria-label="Scroll providers up"
 							onClick={() => scrollProviderSidebar("backward")}
-							className="flex h-4 w-4 items-center justify-center rounded-sm text-muted-foreground/90 hover:text-foreground hover:bg-accent/60 transition-colors"
+							className="flex h-4 w-4 items-center justify-center rounded-sm text-muted-foreground/90 hover:text-accent-foreground hover:bg-accent transition-colors"
 						>
 							<ChevronUp className="size-3" />
 						</button>
@@ -923,7 +923,7 @@ export function ModelSelector({
 												isActive
 													? "bg-primary/10 text-primary"
 													: isConfigured
-														? "hover:bg-accent/60 text-muted-foreground hover:text-foreground"
+														? "hover:bg-accent text-muted-foreground hover:text-accent-foreground"
 														: "opacity-50 hover:opacity-80 hover:bg-accent/40 text-muted-foreground"
 											)}
 										>
@@ -958,7 +958,7 @@ export function ModelSelector({
 							type="button"
 							aria-label="Scroll providers down"
 							onClick={() => scrollProviderSidebar("forward")}
-							className="flex h-4 w-4 items-center justify-center rounded-sm text-muted-foreground/90 hover:text-foreground hover:bg-accent/60 transition-colors"
+							className="flex h-4 w-4 items-center justify-center rounded-sm text-muted-foreground/90 hover:text-accent-foreground hover:bg-accent transition-colors"
 						>
 							<ChevronDown className="size-3" />
 						</button>
@@ -1118,7 +1118,7 @@ export function ModelSelector({
 						<Button
 							variant="ghost"
 							size="icon"
-							className="size-7 rounded-md hover:bg-muted opacity-0 group-hover:opacity-100 transition-opacity"
+							className="size-7 rounded-md hover:bg-accent hover:text-accent-foreground opacity-0 group-hover:opacity-100 transition-opacity"
 							onClick={(e) => handleEditItem(e, item)}
 						>
 							<Pencil className="size-3.5 text-muted-foreground" />
@@ -1179,7 +1179,7 @@ export function ModelSelector({
 									"flex items-center justify-center gap-1.5 text-sm font-medium transition-all duration-200 border-b-[1.5px]",
 									activeTab === value
 										? "border-foreground dark:border-white text-foreground"
-										: "border-transparent text-muted-foreground hover:text-foreground/70"
+										: "border-transparent text-muted-foreground hover:text-accent-foreground"
 								)}
 							>
 								<Icon className="size-3.5" />
@@ -1322,7 +1322,7 @@ export function ModelSelector({
 								<Button
 									variant="ghost"
 									size="sm"
-									className="w-full justify-start gap-2 h-9 rounded-lg hover:bg-accent/50 dark:hover:bg-white/[0.06]"
+									className="w-full justify-start gap-2 h-9 rounded-lg hover:bg-accent hover:text-accent-foreground "
 									onClick={() => {
 										setOpen(false);
 										addHandler(selectedProvider !== "all" ? selectedProvider : undefined);
@@ -1347,7 +1347,7 @@ export function ModelSelector({
 			role="combobox"
 			aria-expanded={open}
 			className={cn(
-				"h-8 gap-2 px-3 text-sm bg-muted hover:bg-muted/80 border-0 select-none",
+				"h-8 gap-2 px-3 text-sm bg-muted hover:bg-accent hover:text-accent-foreground border-0 select-none",
 				className
 			)}
 		>
diff --git a/surfsense_web/components/new-chat/prompt-picker.tsx b/surfsense_web/components/new-chat/prompt-picker.tsx
index 9b3a448bb..46f0d9562 100644
--- a/surfsense_web/components/new-chat/prompt-picker.tsx
+++ b/surfsense_web/components/new-chat/prompt-picker.tsx
@@ -184,7 +184,7 @@ export const PromptPicker = forwardRef<PromptPickerRef, PromptPickerProps>(funct
 								"w-full flex items-center gap-2 px-3 py-2 text-left text-sm transition-colors rounded-md cursor-pointer text-muted-foreground",
 								highlightedIndex === createPromptIndex
 									? "bg-accent text-foreground"
-									: "hover:text-foreground hover:bg-accent/50"
+									: "hover:text-accent-foreground hover:bg-accent"
 							)}
 						>
 							<span className="shrink-0">
diff --git a/surfsense_web/components/prompt-kit/chain-of-thought.tsx b/surfsense_web/components/prompt-kit/chain-of-thought.tsx
index ca9698b31..3ed0b6677 100644
--- a/surfsense_web/components/prompt-kit/chain-of-thought.tsx
+++ b/surfsense_web/components/prompt-kit/chain-of-thought.tsx
@@ -203,7 +203,7 @@ export const ChainOfThoughtTrigger: React.FC<ChainOfThoughtTriggerProps> = ({
 }) => (
 	<CollapsibleTrigger
 		className={cn(
-			"group text-muted-foreground hover:text-foreground flex cursor-pointer items-center justify-start gap-1 text-left text-sm transition-colors",
+			"group text-muted-foreground hover:text-accent-foreground flex cursor-pointer items-center justify-start gap-1 text-left text-sm transition-colors",
 			className
 		)}
 		{...props}
diff --git a/surfsense_web/components/report-panel/report-panel.tsx b/surfsense_web/components/report-panel/report-panel.tsx
index 53625b521..fc9a9f27b 100644
--- a/surfsense_web/components/report-panel/report-panel.tsx
+++ b/surfsense_web/components/report-panel/report-panel.tsx
@@ -318,8 +318,7 @@ export function ReportPanelContent({
 	}, []);
 
 	const exportButton = !isEditing && (
-		<>
-			{isResume ? (
+		isResume ? (
 				<Button
 					variant="ghost"
 					size="icon"
@@ -354,8 +353,7 @@ export function ReportPanelContent({
 						/>
 					</DropdownMenuContent>
 				</DropdownMenu>
-			)}
-		</>
+			)
 	);
 
 	const versionSwitcher = !isEditing && versions.length > 1 && (
@@ -456,9 +454,9 @@ export function ReportPanelContent({
 								variant="ghost"
 								size="icon"
 								onClick={onClose}
-								className="h-8 w-8 rounded-full shrink-0"
+								className="h-8 w-8 rounded-full shrink-0 text-muted-foreground hover:text-accent-foreground"
 							>
-								<XIcon className="h-4 w-4 text-muted-foreground" />
+								<XIcon className="h-4 w-4" />
 								<span className="sr-only">Close report panel</span>
 							</Button>
 						)}
diff --git a/surfsense_web/components/search-space-form.tsx b/surfsense_web/components/search-space-form.tsx
index bcea48e3d..e87b36504 100644
--- a/surfsense_web/components/search-space-form.tsx
+++ b/surfsense_web/components/search-space-form.tsx
@@ -131,7 +131,7 @@ export function SearchSpaceForm({
 				>
 					<MoveLeftIcon
 						size={18}
-						className="text-muted-foreground group-hover:text-foreground transition-colors duration-200"
+						className="text-muted-foreground group-hover:text-accent-foreground transition-colors duration-200"
 					/>
 					<div className="absolute inset-0 rounded-full bg-gradient-to-r from-blue-500/10 to-purple-500/10 opacity-0 group-hover:opacity-100 transition-opacity duration-300" />
 				</Button>
diff --git a/surfsense_web/components/settings/agent-model-manager.tsx b/surfsense_web/components/settings/agent-model-manager.tsx
index a0b700c2d..6f11a9ffe 100644
--- a/surfsense_web/components/settings/agent-model-manager.tsx
+++ b/surfsense_web/components/settings/agent-model-manager.tsx
@@ -130,7 +130,7 @@ export function AgentModelManager({ searchSpaceId }: AgentModelManagerProps) {
 					<Button
 						variant="outline"
 						onClick={openNewDialog}
-						className="gap-2 bg-white text-black hover:bg-neutral-100 dark:bg-white dark:text-black dark:hover:bg-neutral-200"
+						className="gap-2 bg-white text-black hover:bg-accent hover:text-accent-foreground dark:bg-white dark:text-black"
 					>
 						Add Model
 					</Button>
@@ -277,7 +277,7 @@ export function AgentModelManager({ searchSpaceId }: AgentModelManagerProps) {
 																				variant="ghost"
 																				size="icon"
 																				onClick={() => openEditDialog(config)}
-																				className="h-7 w-7 rounded-lg text-muted-foreground hover:text-foreground"
+																				className="h-7 w-7 rounded-lg text-muted-foreground hover:text-accent-foreground"
 																			>
 																				<Pencil className="h-3 w-3" />
 																			</Button>
diff --git a/surfsense_web/components/settings/general-settings-manager.tsx b/surfsense_web/components/settings/general-settings-manager.tsx
index 75316a9cd..796746f75 100644
--- a/surfsense_web/components/settings/general-settings-manager.tsx
+++ b/surfsense_web/components/settings/general-settings-manager.tsx
@@ -176,7 +176,7 @@ export function GeneralSettingsManager({ searchSpaceId }: GeneralSettingsManager
 						type="submit"
 						variant="outline"
 						disabled={!hasChanges || saving || !name.trim()}
-						className="relative gap-2 bg-white text-black hover:bg-neutral-100 dark:bg-white dark:text-black dark:hover:bg-neutral-200"
+						className="relative gap-2 bg-white text-black hover:bg-accent hover:text-accent-foreground dark:bg-white dark:text-black"
 					>
 						<span className={saving ? "opacity-0" : ""}>{t("general_save")}</span>
 						{saving && <Spinner size="sm" className="absolute" />}
diff --git a/surfsense_web/components/settings/image-model-manager.tsx b/surfsense_web/components/settings/image-model-manager.tsx
index d4afa698b..e6c5f375e 100644
--- a/surfsense_web/components/settings/image-model-manager.tsx
+++ b/surfsense_web/components/settings/image-model-manager.tsx
@@ -133,7 +133,7 @@ export function ImageModelManager({ searchSpaceId }: ImageModelManagerProps) {
 					<Button
 						variant="outline"
 						onClick={openNewDialog}
-						className="gap-2 bg-white text-black hover:bg-neutral-100 dark:bg-white dark:text-black dark:hover:bg-neutral-200"
+						className="gap-2 bg-white text-black hover:bg-accent hover:text-accent-foreground dark:bg-white dark:text-black"
 					>
 						Add Image Model
 					</Button>
@@ -369,7 +369,7 @@ export function ImageModelManager({ searchSpaceId }: ImageModelManagerProps) {
 																				variant="ghost"
 																				size="icon"
 																				onClick={() => openEditDialog(config)}
-																				className="h-7 w-7 rounded-lg text-muted-foreground hover:text-foreground"
+																				className="h-7 w-7 rounded-lg text-muted-foreground hover:text-accent-foreground"
 																			>
 																				<Pencil className="h-3 w-3" />
 																			</Button>
diff --git a/surfsense_web/components/settings/more-pages-content.tsx b/surfsense_web/components/settings/more-pages-content.tsx
index 5635c3314..a2a81fb8b 100644
--- a/surfsense_web/components/settings/more-pages-content.tsx
+++ b/surfsense_web/components/settings/more-pages-content.tsx
@@ -119,7 +119,7 @@ export function MorePagesContent() {
 										disabled={task.completed || completeMutation.isPending}
 										onClick={() => handleTaskClick(task)}
 										asChild={!task.completed}
-										className="text-muted-foreground hover:text-foreground"
+										className="text-muted-foreground hover:text-accent-foreground"
 									>
 										{task.completed ? (
 											<span>Done</span>
diff --git a/surfsense_web/components/settings/prompt-config-manager.tsx b/surfsense_web/components/settings/prompt-config-manager.tsx
index 66fda9e38..6bc77faa2 100644
--- a/surfsense_web/components/settings/prompt-config-manager.tsx
+++ b/surfsense_web/components/settings/prompt-config-manager.tsx
@@ -183,7 +183,7 @@ export function PromptConfigManager({ searchSpaceId }: PromptConfigManagerProps)
 						type="submit"
 						variant="outline"
 						disabled={!hasChanges || saving}
-						className="gap-2 bg-white text-black hover:bg-neutral-100 dark:bg-white dark:text-black dark:hover:bg-neutral-200"
+						className="gap-2 bg-white text-black hover:bg-accent hover:text-accent-foreground dark:bg-white dark:text-black"
 					>
 						{saving ? <Spinner size="sm" /> : null}
 						{saving ? "Saving" : "Save Instructions"}
diff --git a/surfsense_web/components/settings/roles-manager.tsx b/surfsense_web/components/settings/roles-manager.tsx
index 335cfc8a9..eb049d8fa 100644
--- a/surfsense_web/components/settings/roles-manager.tsx
+++ b/surfsense_web/components/settings/roles-manager.tsx
@@ -415,7 +415,7 @@ function RolesContent({
 					<Button
 						variant="outline"
 						onClick={() => setShowCreateRole(true)}
-						className="gap-2 bg-white text-black hover:bg-neutral-100 dark:bg-white dark:text-black dark:hover:bg-neutral-200"
+						className="gap-2 bg-white text-black hover:bg-accent hover:text-accent-foreground dark:bg-white dark:text-black"
 					>
 						Create Custom Role
 					</Button>
@@ -467,7 +467,7 @@ function RolesContent({
 								role="button"
 								tabIndex={0}
 								aria-expanded={isExpanded}
-								className="flex items-center gap-4 p-4 transition-colors hover:bg-muted/30 cursor-pointer focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
+								className="flex items-center gap-4 p-4 transition-colors hover:bg-accent hover:text-accent-foreground cursor-pointer focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
 								onClick={() => setExpandedRoleId(isExpanded ? null : role.id)}
 								onKeyDown={(e) => {
 									if (e.key === "Enter" || e.key === " ") {
@@ -697,7 +697,7 @@ function PermissionsEditor({
 								role="button"
 								tabIndex={0}
 								aria-expanded={isExpanded}
-								className="flex items-center justify-between px-3 py-2.5 hover:bg-muted/40 transition-colors cursor-pointer focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
+								className="flex items-center justify-between px-3 py-2.5 hover:bg-accent hover:text-accent-foreground transition-colors cursor-pointer focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
 								onClick={() => toggleCategoryExpanded(category)}
 								onKeyDown={(e) => {
 									if (e.key === "Enter" || e.key === " ") {
@@ -742,7 +742,7 @@ function PermissionsEditor({
 													key={perm.value}
 													className={cn(
 														"flex items-center justify-between gap-3 px-2.5 py-2 rounded-md transition-colors",
-														isSelected ? "bg-muted/60 hover:bg-muted/80" : "hover:bg-muted/40"
+														isSelected ? "bg-muted/60 hover:bg-accent hover:text-accent-foreground" : "hover:bg-accent hover:text-accent-foreground"
 													)}
 												>
 													<button
@@ -876,7 +876,7 @@ function CreateRoleDialog({
 										type="button"
 										onClick={() => applyPreset(key as keyof typeof ROLE_PRESETS)}
 										className={cn(
-											"p-3 rounded-lg border transition-colors hover:bg-muted/40",
+											"p-3 rounded-lg border transition-colors hover:bg-accent hover:text-accent-foreground",
 											"flex items-center justify-center text-center sm:block sm:text-left",
 											selectedPermissions.length > 0 &&
 												preset.permissions.every((p) => selectedPermissions.includes(p))
diff --git a/surfsense_web/components/settings/settings-dialog.tsx b/surfsense_web/components/settings/settings-dialog.tsx
index ff7c4e675..7bfcb9a60 100644
--- a/surfsense_web/components/settings/settings-dialog.tsx
+++ b/surfsense_web/components/settings/settings-dialog.tsx
@@ -63,7 +63,7 @@ export function SettingsDialog({
 									"flex items-center gap-3 rounded-lg px-3 py-2.5 text-sm font-medium transition-colors text-left focus:outline-none focus-visible:outline-none",
 									activeItem === item.value
 										? "bg-accent text-accent-foreground"
-										: "text-muted-foreground hover:bg-accent/50 hover:text-foreground"
+										: "text-muted-foreground hover:bg-accent hover:text-accent-foreground"
 								)}
 							>
 								{item.icon}
@@ -97,7 +97,7 @@ export function SettingsDialog({
 										"flex items-center gap-2 whitespace-nowrap rounded-full px-3 py-1.5 text-xs font-medium transition-colors shrink-0 focus:outline-none focus-visible:outline-none",
 										activeItem === item.value
 											? "bg-accent text-accent-foreground"
-											: "text-muted-foreground hover:bg-accent/50 hover:text-foreground"
+											: "text-muted-foreground hover:bg-accent hover:text-accent-foreground"
 									)}
 								>
 									{item.icon}
diff --git a/surfsense_web/components/settings/team-memory-manager.tsx b/surfsense_web/components/settings/team-memory-manager.tsx
index 371527530..534687326 100644
--- a/surfsense_web/components/settings/team-memory-manager.tsx
+++ b/surfsense_web/components/settings/team-memory-manager.tsx
@@ -228,7 +228,7 @@ export function TeamMemoryManager({ searchSpaceId }: TeamMemoryManagerProps) {
 								onClick={handleEdit}
 								disabled={editing || !editQuery.trim()}
 								className={`h-11 w-11 shrink-0 rounded-full ${
-									editing ? "" : "bg-muted-foreground/15 hover:bg-muted-foreground/20"
+									editing ? "" : "bg-muted-foreground/15 hover:bg-accent hover:text-accent-foreground"
 								}`}
 							>
 								{editing ? (
diff --git a/surfsense_web/components/settings/vision-model-manager.tsx b/surfsense_web/components/settings/vision-model-manager.tsx
index 34aa531fd..0e528094e 100644
--- a/surfsense_web/components/settings/vision-model-manager.tsx
+++ b/surfsense_web/components/settings/vision-model-manager.tsx
@@ -137,7 +137,7 @@ export function VisionModelManager({ searchSpaceId }: VisionModelManagerProps) {
 					<Button
 						variant="outline"
 						onClick={openNewDialog}
-						className="gap-2 bg-white text-black hover:bg-neutral-100 dark:bg-white dark:text-black dark:hover:bg-neutral-200"
+						className="gap-2 bg-white text-black hover:bg-accent hover:text-accent-foreground dark:bg-white dark:text-black"
 					>
 						Add Vision Model
 					</Button>
@@ -367,7 +367,7 @@ export function VisionModelManager({ searchSpaceId }: VisionModelManagerProps) {
 																				variant="ghost"
 																				size="icon"
 																				onClick={() => openEditDialog(config)}
-																				className="h-6 w-6 text-muted-foreground hover:text-foreground"
+																				className="h-6 w-6 text-muted-foreground hover:text-accent-foreground"
 																			>
 																				<Pencil className="h-3 w-3" />
 																			</Button>
diff --git a/surfsense_web/components/shared/llm-config-form.tsx b/surfsense_web/components/shared/llm-config-form.tsx
index 580b7b027..3581ac302 100644
--- a/surfsense_web/components/shared/llm-config-form.tsx
+++ b/surfsense_web/components/shared/llm-config-form.tsx
@@ -409,7 +409,7 @@ export function LLMConfigForm({
 							<CollapsibleTrigger asChild>
 								<button
 									type="button"
-									className="flex w-full items-center justify-between py-2 text-xs sm:text-sm font-medium text-muted-foreground hover:text-foreground transition-colors"
+									className="flex w-full items-center justify-between py-2 text-xs sm:text-sm font-medium text-muted-foreground hover:text-accent-foreground transition-colors"
 								>
 									<span>Advanced Parameters</span>
 									<ChevronDown
@@ -447,7 +447,7 @@ export function LLMConfigForm({
 					<CollapsibleTrigger asChild>
 						<button
 							type="button"
-							className="flex w-full items-center justify-between py-2 text-xs sm:text-sm font-medium text-muted-foreground hover:text-foreground transition-colors"
+							className="flex w-full items-center justify-between py-2 text-xs sm:text-sm font-medium text-muted-foreground hover:text-accent-foreground transition-colors"
 						>
 							<span>System Instructions</span>
 							<ChevronDown
@@ -475,7 +475,7 @@ export function LLMConfigForm({
 												onClick={() =>
 													field.onChange(defaultInstructions.default_system_instructions)
 												}
-												className="h-7 text-[10px] sm:text-xs text-muted-foreground hover:text-foreground"
+												className="h-7 text-[10px] sm:text-xs text-muted-foreground hover:text-accent-foreground"
 											>
 												Reset to Default
 											</Button>
diff --git a/surfsense_web/components/sources/DocumentUploadTab.tsx b/surfsense_web/components/sources/DocumentUploadTab.tsx
index 3b22c0872..134680b49 100644
--- a/surfsense_web/components/sources/DocumentUploadTab.tsx
+++ b/surfsense_web/components/sources/DocumentUploadTab.tsx
@@ -457,7 +457,7 @@ export function DocumentUploadTab({
 						<Button
 							variant="ghost"
 							size="sm"
-							className={`text-xs gap-1 bg-neutral-700/50 hover:bg-neutral-600/50 ${sizeClass} ${widthClass}`}
+							className={`text-xs gap-1 bg-neutral-700/50 hover:bg-accent hover:text-accent-foreground ${sizeClass} ${widthClass}`}
 						>
 							Browse
 							<ChevronDown className="h-3 w-3 opacity-60" />
@@ -487,7 +487,7 @@ export function DocumentUploadTab({
 					<Button
 						variant="ghost"
 						size="sm"
-						className={`text-xs gap-1 bg-neutral-700/50 hover:bg-neutral-600/50 ${sizeClass} ${widthClass}`}
+						className={`text-xs gap-1 bg-neutral-700/50 hover:bg-accent hover:text-accent-foreground ${sizeClass} ${widthClass}`}
 					>
 						Browse
 						<ChevronDown className="h-3 w-3 opacity-60" />
@@ -539,7 +539,7 @@ export function DocumentUploadTab({
 					) : (
 						<button
 							type="button"
-							className="w-full text-xs h-8 flex items-center justify-center gap-1.5 rounded-md border border-dashed border-muted-foreground/30 text-muted-foreground hover:text-foreground hover:border-foreground/50 transition-colors"
+							className="w-full text-xs h-8 flex items-center justify-center gap-1.5 rounded-md border border-dashed border-muted-foreground/30 text-muted-foreground hover:text-accent-foreground hover:border-foreground/50 transition-colors"
 							onClick={() => fileInputRef.current?.click()}
 						>
 							Add more files
@@ -636,7 +636,7 @@ export function DocumentUploadTab({
 						<Button
 							variant="ghost"
 							size="sm"
-							className="h-7 text-xs text-muted-foreground hover:text-foreground"
+							className="h-7 text-xs text-muted-foreground hover:text-accent-foreground"
 							onClick={() => {
 								setFiles([]);
 								setFolderUpload(null);
@@ -671,7 +671,7 @@ export function DocumentUploadTab({
 							: files.map((entry) => (
 									<div
 										key={entry.id}
-										className="flex items-center gap-2 py-1.5 px-2 rounded-md hover:bg-slate-400/5 dark:hover:bg-white/5 group"
+										className="flex items-center gap-2 py-1.5 px-2 rounded-md hover:bg-accent hover:text-accent-foreground group"
 									>
 										<span className="text-[10px] font-medium uppercase leading-none bg-muted px-1.5 py-0.5 rounded text-muted-foreground shrink-0">
 											{entry.file.name.split(".").pop() || "?"}
diff --git a/surfsense_web/components/sources/FolderWatchDialog.tsx b/surfsense_web/components/sources/FolderWatchDialog.tsx
index 25d7ff392..8454d6d34 100644
--- a/surfsense_web/components/sources/FolderWatchDialog.tsx
+++ b/surfsense_web/components/sources/FolderWatchDialog.tsx
@@ -164,7 +164,7 @@ export function FolderWatchDialog({
 
 	return (
 		<Dialog open={open} onOpenChange={handleOpenChange}>
-			<DialogContent className="sm:max-w-md select-none p-0 gap-0 overflow-hidden [&>button]:opacity-80 [&>button]:hover:opacity-100 [&>button]:hover:bg-foreground/10">
+			<DialogContent className="sm:max-w-md select-none p-0 gap-0 overflow-hidden [&>button]:opacity-80 [&>button]:hover:opacity-100 [&>button]:hover:bg-accent [&>button]:hover:text-accent-foreground">
 				<DialogHeader className="px-4 sm:px-6 pt-5 sm:pt-6 pb-3">
 					<DialogTitle className="text-lg sm:text-xl font-semibold tracking-tight">
 						Watch Local Folder
@@ -197,7 +197,7 @@ export function FolderWatchDialog({
 						<button
 							type="button"
 							onClick={handleSelectFolder}
-							className="flex flex-1 w-full items-center justify-center gap-2 rounded-lg border-2 border-dashed border-muted-foreground/30 text-sm text-muted-foreground transition-colors hover:border-foreground/50 hover:text-foreground"
+							className="flex flex-1 w-full items-center justify-center gap-2 rounded-lg border-2 border-dashed border-muted-foreground/30 text-sm text-muted-foreground transition-colors hover:border-foreground/50 hover:text-accent-foreground"
 						>
 							Browse for a folder
 						</button>
diff --git a/surfsense_web/components/tool-ui/citation/citation-list.tsx b/surfsense_web/components/tool-ui/citation/citation-list.tsx
index 26066b66f..94737f142 100644
--- a/surfsense_web/components/tool-ui/citation/citation-list.tsx
+++ b/surfsense_web/components/tool-ui/citation/citation-list.tsx
@@ -176,7 +176,7 @@ function OverflowIndicator({ citations, count, variant, onNavigate }: OverflowIn
 							"inline-flex items-center gap-1 rounded-md px-2 py-1",
 							"bg-muted/60 text-sm tabular-nums",
 							"transition-colors duration-150",
-							"hover:bg-muted",
+							"hover:bg-accent hover:text-accent-foreground",
 							"focus-visible:ring-ring focus-visible:ring-2 focus-visible:outline-none"
 						)}
 					>
@@ -209,7 +209,7 @@ function OverflowIndicator({ citations, count, variant, onNavigate }: OverflowIn
 						"flex items-center justify-center rounded-xl px-4 py-3",
 						"border-border bg-card border border-dashed",
 						"transition-colors duration-150",
-						"hover:border-foreground/25 hover:bg-muted/50",
+						"hover:border-foreground/25 hover:bg-accent hover:text-accent-foreground",
 						"focus-visible:ring-ring focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:outline-none"
 					)}
 				>
@@ -242,7 +242,7 @@ function OverflowItem({ citation, onClick }: OverflowItemProps) {
 		<button
 			type="button"
 			onClick={onClick}
-			className="group hover:bg-muted focus-visible:bg-muted flex w-full cursor-pointer items-center gap-2.5 rounded-md px-2 py-2 text-left transition-colors focus-visible:outline-none"
+			className="group hover:bg-accent hover:text-accent-foreground focus-visible:bg-muted flex w-full cursor-pointer items-center gap-2.5 rounded-md px-2 py-2 text-left transition-colors focus-visible:outline-none"
 		>
 			{citation.favicon ? (
 				<NextImage
@@ -313,7 +313,7 @@ function StackedCitations({ id, citations, className, onNavigate }: StackedCitat
 							"isolate inline-flex cursor-pointer items-center gap-2 rounded-lg px-3 py-2",
 							"bg-muted/40 outline-none",
 							"transition-colors duration-150",
-							"hover:bg-muted/70",
+							"hover:bg-accent hover:text-accent-foreground",
 							"focus-visible:ring-ring focus-visible:ring-2",
 							className
 						)}
diff --git a/surfsense_web/components/tool-ui/citation/citation.tsx b/surfsense_web/components/tool-ui/citation/citation.tsx
index 05ce214f3..425ee2ecf 100644
--- a/surfsense_web/components/tool-ui/citation/citation.tsx
+++ b/surfsense_web/components/tool-ui/citation/citation.tsx
@@ -138,7 +138,7 @@ export function Citation(props: CitationProps) {
 							"inline-flex cursor-pointer items-center gap-1.5 rounded-md px-2 py-1",
 							"bg-muted/60 text-sm outline-none",
 							"transition-colors duration-150",
-							"hover:bg-muted",
+							"hover:bg-accent hover:text-accent-foreground",
 							"focus-visible:ring-ring focus-visible:ring-2",
 							className
 						)}
@@ -157,7 +157,7 @@ export function Citation(props: CitationProps) {
 					onCloseAutoFocus={(e) => e.preventDefault()}
 					onClick={handleClick}
 				>
-					<div className="hover:bg-muted/50 flex flex-col gap-2 p-3 transition-colors">
+					<div className="hover:bg-accent hover:text-accent-foreground flex flex-col gap-2 p-3 transition-colors">
 						<div className="flex items-start gap-2">
 							{iconElement}
 							<span className="text-muted-foreground text-xs">{domain}</span>
diff --git a/surfsense_web/components/tool-ui/generate-podcast.tsx b/surfsense_web/components/tool-ui/generate-podcast.tsx
index e8fff2873..b690530a1 100644
--- a/surfsense_web/components/tool-ui/generate-podcast.tsx
+++ b/surfsense_web/components/tool-ui/generate-podcast.tsx
@@ -264,7 +264,7 @@ function PodcastPlayer({
 					<div className="mx-5 h-px bg-border/50" />
 					<Accordion type="single" collapsible className="px-5">
 						<AccordionItem value="transcript" className="border-b-0">
-							<AccordionTrigger className="py-3 text-xs sm:text-sm font-medium text-muted-foreground hover:text-foreground hover:no-underline">
+							<AccordionTrigger className="py-3 text-xs sm:text-sm font-medium text-muted-foreground hover:text-accent-foreground hover:no-underline">
 								View transcript
 							</AccordionTrigger>
 							<AccordionContent className="pb-0">
diff --git a/surfsense_web/components/tool-ui/generate-report.tsx b/surfsense_web/components/tool-ui/generate-report.tsx
index 912028596..95137b576 100644
--- a/surfsense_web/components/tool-ui/generate-report.tsx
+++ b/surfsense_web/components/tool-ui/generate-report.tsx
@@ -218,7 +218,7 @@ function ReportCard({
 			<button
 				type="button"
 				onClick={handleOpen}
-				className="w-full text-left transition-colors hover:bg-muted/50 focus:outline-none focus-visible:outline-none cursor-pointer"
+				className="w-full text-left transition-colors hover:bg-accent hover:text-accent-foreground focus:outline-none focus-visible:outline-none cursor-pointer"
 			>
 				<div className="px-5 pt-5 pb-4 select-none">
 					<p className="text-sm font-semibold text-foreground line-clamp-2">
diff --git a/surfsense_web/components/tool-ui/generate-resume.tsx b/surfsense_web/components/tool-ui/generate-resume.tsx
index 4e9d06fbb..cc9dbb60e 100644
--- a/surfsense_web/components/tool-ui/generate-resume.tsx
+++ b/surfsense_web/components/tool-ui/generate-resume.tsx
@@ -284,7 +284,7 @@ function ResumeCard({
 			<button
 				type="button"
 				onClick={handleOpen}
-				className="w-full text-left transition-colors hover:bg-muted/50 focus:outline-none focus-visible:outline-none cursor-pointer select-none"
+				className="w-full text-left transition-colors hover:bg-accent hover:text-accent-foreground focus:outline-none focus-visible:outline-none cursor-pointer select-none"
 			>
 				<div className="px-5 pt-5 pb-4">
 					<p className="text-sm font-semibold text-foreground line-clamp-2">{title}</p>
diff --git a/surfsense_web/components/tool-ui/plan/plan.tsx b/surfsense_web/components/tool-ui/plan/plan.tsx
index 37a94fb9f..4405cfc35 100644
--- a/surfsense_web/components/tool-ui/plan/plan.tsx
+++ b/surfsense_web/components/tool-ui/plan/plan.tsx
@@ -195,7 +195,7 @@ export const Plan: FC<PlanProps> = ({
 							<Button
 								variant="ghost"
 								size="sm"
-								className="w-full mt-2 text-xs text-muted-foreground hover:text-foreground"
+								className="w-full mt-2 text-xs text-muted-foreground hover:text-accent-foreground"
 							>
 								{isExpanded
 									? "Show less"
diff --git a/surfsense_web/components/tool-ui/sandbox-execute.tsx b/surfsense_web/components/tool-ui/sandbox-execute.tsx
index f54b035e3..3d309332e 100644
--- a/surfsense_web/components/tool-ui/sandbox-execute.tsx
+++ b/surfsense_web/components/tool-ui/sandbox-execute.tsx
@@ -295,7 +295,7 @@ function ExecuteCompleted({
 			<Collapsible open={open} onOpenChange={setOpen}>
 				<CollapsibleTrigger
 					className={cn(
-						"flex w-full items-center gap-2 rounded-xl border bg-card px-4 py-2.5 text-left transition-colors hover:bg-accent/50",
+						"flex w-full items-center gap-2 rounded-xl border bg-card px-4 py-2.5 text-left transition-colors hover:bg-accent hover:text-accent-foreground",
 						open && "rounded-b-none border-b-0",
 						parsed.isError && "border-destructive/20"
 					)}
diff --git a/surfsense_web/components/ui/dialog.tsx b/surfsense_web/components/ui/dialog.tsx
index 48a4d958b..90c8bf538 100644
--- a/surfsense_web/components/ui/dialog.tsx
+++ b/surfsense_web/components/ui/dialog.tsx
@@ -44,7 +44,7 @@ const DialogContent = React.forwardRef<
 			{...props}
 		>
 			{children}
-			<DialogPrimitive.Close className="absolute right-4 top-4 z-50 h-8 w-8 rounded-full inline-flex items-center justify-center text-muted-foreground transition-colors hover:text-foreground hover:bg-accent focus:outline-none disabled:pointer-events-none">
+			<DialogPrimitive.Close className="absolute right-4 top-4 z-50 h-8 w-8 rounded-full inline-flex items-center justify-center text-muted-foreground transition-colors hover:text-accent-foreground hover:bg-accent focus:outline-none disabled:pointer-events-none">
 				<X className="h-4 w-4" />
 				<span className="sr-only">Close</span>
 			</DialogPrimitive.Close>
diff --git a/surfsense_web/components/ui/sheet.tsx b/surfsense_web/components/ui/sheet.tsx
index 6a7e94227..6ba22350e 100644
--- a/surfsense_web/components/ui/sheet.tsx
+++ b/surfsense_web/components/ui/sheet.tsx
@@ -68,7 +68,7 @@ function SheetContent({
 				{...props}
 			>
 				{children}
-				<SheetPrimitive.Close className="ring-offset-background focus:ring-ring data-[state=open]:bg-secondary absolute top-4 right-4 rounded-xs opacity-70 transition-opacity hover:opacity-100 focus:ring-2 focus:ring-offset-2 focus:outline-hidden disabled:pointer-events-none">
+				<SheetPrimitive.Close className="ring-offset-background focus:ring-ring absolute top-4 right-4 inline-flex h-8 w-8 items-center justify-center rounded-full text-muted-foreground transition-colors hover:bg-accent hover:text-accent-foreground focus:ring-2 focus:ring-offset-2 focus:outline-hidden disabled:pointer-events-none">
 					<XIcon className="size-4" />
 					<span className="sr-only">Close</span>
 				</SheetPrimitive.Close>
diff --git a/surfsense_web/features/chat-messages/timeline/timeline.tsx b/surfsense_web/features/chat-messages/timeline/timeline.tsx
index f51034733..12f71e9a6 100644
--- a/surfsense_web/features/chat-messages/timeline/timeline.tsx
+++ b/surfsense_web/features/chat-messages/timeline/timeline.tsx
@@ -103,7 +103,7 @@ export const Timeline: FC<{
 					onClick={() => setIsOpen((prev) => !prev)}
 					className={cn(
 						"flex w-full items-center gap-1.5 text-left text-sm transition-colors",
-						"text-muted-foreground hover:text-foreground"
+						"text-muted-foreground hover:text-accent-foreground"
 					)}
 				>
 					{isProcessing ? (
diff --git a/surfsense_web/features/chat-messages/timeline/tool-registry/fallback/default-fallback-card.tsx b/surfsense_web/features/chat-messages/timeline/tool-registry/fallback/default-fallback-card.tsx
index 228249ba1..903c21e00 100644
--- a/surfsense_web/features/chat-messages/timeline/tool-registry/fallback/default-fallback-card.tsx
+++ b/surfsense_web/features/chat-messages/timeline/tool-registry/fallback/default-fallback-card.tsx
@@ -95,7 +95,7 @@ export const DefaultFallbackCard: TimelineToolComponent = ({
 					setIsExpanded(next);
 				}}
 			>
-				<div className="flex items-stretch transition-colors hover:bg-muted/50">
+				<div className="flex items-stretch transition-colors hover:bg-accent hover:text-accent-foreground">
 					<CollapsibleTrigger asChild>
 						<button
 							type="button"

From bd5f1b3cdf4adb2ab98f84a2e801e6cdde551bf3 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Thu, 14 May 2026 00:13:53 +0530
Subject: [PATCH 40/96] feat: add CollapsedInboxIcon component to enhance
 sidebar functionality

---
 .../components/layout/ui/sidebar/Sidebar.tsx    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx b/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
index 2c8792b7f..3a319347f 100644
--- a/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
@@ -31,6 +31,21 @@ function ChatListItemSkeleton() {
 	);
 }
 
+function CollapsedInboxIcon({ item }: { item: NavItem }) {
+	const Icon = item.icon;
+
+	return (
+		<span className="relative flex h-3.5 w-3.5 items-center justify-center">
+			<Icon className="h-3.5 w-3.5" />
+			{typeof item.badge === "string" ? (
+				<span className="absolute right-0 top-0 flex min-w-3.5 -translate-y-1/2 translate-x-1/2 items-center justify-center rounded-full bg-destructive px-1 text-[9px] font-medium leading-3 text-destructive-foreground">
+					{item.badge}
+				</span>
+			) : null}
+		</span>
+	);
+}
+
 interface SidebarProps {
 	searchSpace: SearchSpace | null;
 	isCollapsed?: boolean;
@@ -164,6 +179,8 @@ export function Sidebar({
 						isCollapsed={isCollapsed}
 						isActive={inboxItem.isActive}
 						badge={inboxItem.badge}
+						collapsedIconNode={<CollapsedInboxIcon item={inboxItem} />}
+						tooltipContent={isCollapsed ? inboxItem.title : undefined}
 						buttonProps={
 							{
 								"data-joyride": "inbox-sidebar",

From cbfbf59c4694ece7ed371d3c729ef5be6fa117ef Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Thu, 14 May 2026 02:07:53 +0530
Subject: [PATCH 41/96] refactor: enhance UI components with improved hover
 effects and color consistency

---
 .../components/connectors/drive-folder-tree.tsx        |  4 ++--
 .../components/connectors/google-drive-folder-tree.tsx |  4 ++--
 surfsense_web/components/documents/DocumentNode.tsx    |  2 +-
 surfsense_web/components/free-chat/free-composer.tsx   |  5 ++---
 .../components/free-chat/free-model-selector.tsx       |  8 ++++----
 surfsense_web/components/layout/ui/tabs/TabBar.tsx     |  6 ++----
 .../components/new-chat/chat-share-button.tsx          | 10 +++++-----
 .../components/new-chat/document-mention-picker.tsx    |  6 +++---
 surfsense_web/components/new-chat/model-selector.tsx   |  7 ++++---
 surfsense_web/components/new-chat/prompt-picker.tsx    |  4 ++--
 surfsense_web/components/ui/context-menu.tsx           |  4 ++--
 surfsense_web/components/ui/dropdown-menu.tsx          |  8 ++++----
 12 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/surfsense_web/components/connectors/drive-folder-tree.tsx b/surfsense_web/components/connectors/drive-folder-tree.tsx
index 905d2b7ca..5f11222f0 100644
--- a/surfsense_web/components/connectors/drive-folder-tree.tsx
+++ b/surfsense_web/components/connectors/drive-folder-tree.tsx
@@ -261,9 +261,9 @@ export function DriveFolderTree({
 				<div
 					className={cn(
 						"flex items-center group gap-1 sm:gap-2 h-auto py-1 sm:py-2 px-1 sm:px-2 rounded-md",
-						isFolder && "hover:bg-accent cursor-pointer",
+						isFolder && "hover:bg-accent hover:text-accent-foreground cursor-pointer",
 						!isFolder && "cursor-default opacity-60",
-						isSelected && "bg-accent/50"
+						isSelected && "bg-accent text-accent-foreground"
 					)}
 				>
 					{isFolder ? (
diff --git a/surfsense_web/components/connectors/google-drive-folder-tree.tsx b/surfsense_web/components/connectors/google-drive-folder-tree.tsx
index 1584d05d0..8146a4bf8 100644
--- a/surfsense_web/components/connectors/google-drive-folder-tree.tsx
+++ b/surfsense_web/components/connectors/google-drive-folder-tree.tsx
@@ -237,9 +237,9 @@ export function GoogleDriveFolderTree({
 				<div
 					className={cn(
 						"flex items-center group gap-1 sm:gap-2 h-auto py-1 sm:py-2 px-1 sm:px-2 rounded-md",
-						isFolder && "hover:bg-accent cursor-pointer",
+						isFolder && "hover:bg-accent hover:text-accent-foreground cursor-pointer",
 						!isFolder && "cursor-default opacity-60",
-						isSelected && "bg-accent/50"
+						isSelected && "bg-accent text-accent-foreground"
 					)}
 				>
 					{isFolder ? (
diff --git a/surfsense_web/components/documents/DocumentNode.tsx b/surfsense_web/components/documents/DocumentNode.tsx
index f6da88e55..826feb51d 100644
--- a/surfsense_web/components/documents/DocumentNode.tsx
+++ b/surfsense_web/components/documents/DocumentNode.tsx
@@ -145,7 +145,7 @@ export const DocumentNode = React.memo(function DocumentNode({
 					ref={attachRef}
 					className={cn(
 						"group flex h-8 w-full items-center gap-2.5 rounded-md px-1 text-sm hover:bg-accent hover:text-accent-foreground cursor-pointer select-none text-left",
-						isMentioned && "bg-accent/30",
+						isMentioned && "bg-accent text-accent-foreground",
 						isDragging && "opacity-40"
 					)}
 					style={{ paddingLeft: `${depth * 16 + 4}px` }}
diff --git a/surfsense_web/components/free-chat/free-composer.tsx b/surfsense_web/components/free-chat/free-composer.tsx
index a22d2b205..2ece3dcca 100644
--- a/surfsense_web/components/free-chat/free-composer.tsx
+++ b/surfsense_web/components/free-chat/free-composer.tsx
@@ -67,7 +67,6 @@ const ACCEPT_EXTENSIONS = Array.from(ANON_ALLOWED_EXTENSIONS).join(",");
 export const FreeComposer: FC = () => {
 	const aui = useAui();
 	const isRunning = useAuiState(({ thread }) => thread.isRunning);
-	const isEmpty = useAuiState(({ thread }) => thread.isEmpty);
 	const { gate } = useLoginGate();
 	const anonMode = useAnonymousMode();
 	const [text, setText] = useState("");
@@ -191,7 +190,7 @@ export const FreeComposer: FC = () => {
 								onClick={handleUploadClick}
 								className={cn(
 									"flex items-center gap-1.5 rounded-md px-2 py-1 text-xs transition-colors",
-									"text-muted-foreground hover:text-foreground hover:bg-accent/50",
+									"text-muted-foreground hover:text-accent-foreground hover:bg-accent",
 									hasUploadedDoc && "text-primary"
 								)}
 							>
@@ -212,7 +211,7 @@ export const FreeComposer: FC = () => {
 						<TooltipTrigger asChild>
 							<label
 								htmlFor="free-web-search-toggle"
-								className="flex items-center gap-1.5 cursor-pointer select-none rounded-md px-2 py-1 text-xs text-muted-foreground hover:text-foreground hover:bg-accent/50 transition-colors"
+								className="flex items-center gap-1.5 cursor-pointer select-none rounded-md px-2 py-1 text-xs text-muted-foreground hover:text-accent-foreground hover:bg-accent transition-colors"
 							>
 								<Globe className="size-3.5" />
 								<span className="hidden sm:inline">Web</span>
diff --git a/surfsense_web/components/free-chat/free-model-selector.tsx b/surfsense_web/components/free-chat/free-model-selector.tsx
index b32bd0a9a..b7ae60bd3 100644
--- a/surfsense_web/components/free-chat/free-model-selector.tsx
+++ b/surfsense_web/components/free-chat/free-model-selector.tsx
@@ -164,10 +164,10 @@ export function FreeModelSelector({ className }: { className?: string }) {
 									onMouseEnter={() => setFocusedIndex(index)}
 									className={cn(
 										"group flex items-center gap-2.5 px-3 py-2 rounded-xl cursor-pointer",
-										"transition-all duration-150 mx-2",
-										"hover:bg-accent/40",
-										isSelected && "bg-primary/6 dark:bg-primary/8",
-										isFocused && "bg-accent/50"
+										"transition-colors duration-150 mx-2",
+										"hover:bg-accent hover:text-accent-foreground",
+										isFocused && "bg-accent text-accent-foreground",
+										isSelected && "bg-accent text-accent-foreground"
 									)}
 								>
 									<div className="shrink-0">
diff --git a/surfsense_web/components/layout/ui/tabs/TabBar.tsx b/surfsense_web/components/layout/ui/tabs/TabBar.tsx
index e74cd0919..6d170409f 100644
--- a/surfsense_web/components/layout/ui/tabs/TabBar.tsx
+++ b/surfsense_web/components/layout/ui/tabs/TabBar.tsx
@@ -198,7 +198,7 @@ export function TabBar({
 								className={cn(
 									"group relative flex h-full items-center px-3 w-[180px] min-h-0 overflow-hidden text-[13px] font-medium rounded-md transition-colors duration-150 shrink-0",
 									isActive
-										? "bg-muted text-foreground"
+										? "bg-accent text-accent-foreground"
 										: "bg-transparent text-muted-foreground hover:bg-accent hover:text-accent-foreground"
 								)}
 							>
@@ -210,9 +210,7 @@ export function TabBar({
 									className={cn(
 										"pointer-events-none absolute right-0 top-0 bottom-0 flex items-center rounded-r-md pl-8 pr-2 opacity-0 transition-opacity duration-150",
 										"group-hover:opacity-100 group-focus-within:opacity-100",
-										isActive
-											? "bg-gradient-to-l from-muted from-60% to-transparent"
-											: "bg-gradient-to-l from-accent from-60% to-transparent"
+										"bg-gradient-to-l from-accent from-60% to-transparent"
 									)}
 								>
 									{/* biome-ignore lint/a11y/useSemanticElements: cannot nest button inside button */}
diff --git a/surfsense_web/components/new-chat/chat-share-button.tsx b/surfsense_web/components/new-chat/chat-share-button.tsx
index f5264e386..ce0c5dbcc 100644
--- a/surfsense_web/components/new-chat/chat-share-button.tsx
+++ b/surfsense_web/components/new-chat/chat-share-button.tsx
@@ -190,10 +190,10 @@ export function ChatShareButton({ thread, onVisibilityChange, className }: ChatS
 									key={option.value}
 									onClick={() => handleVisibilityChange(option.value)}
 									className={cn(
-										"w-full flex items-center gap-2.5 px-2.5 py-2 rounded-md transition-all",
-										"hover:bg-accent/40 cursor-pointer",
+										"w-full flex items-center gap-2.5 px-2.5 py-2 rounded-md transition-colors",
+										"hover:bg-accent hover:text-accent-foreground cursor-pointer",
 										"focus:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2",
-										isSelected && "bg-primary/6 dark:bg-primary/8"
+										isSelected && "bg-accent text-accent-foreground"
 									)}
 								>
 									<div
@@ -239,8 +239,8 @@ export function ChatShareButton({ thread, onVisibilityChange, className }: ChatS
 									onClick={handleCreatePublicLink}
 									disabled={isCreatingSnapshot}
 									className={cn(
-										"w-full flex items-center gap-2.5 px-2.5 py-2 rounded-md transition-all",
-										"hover:bg-accent/40 cursor-pointer",
+										"w-full flex items-center gap-2.5 px-2.5 py-2 rounded-md transition-colors",
+										"hover:bg-accent hover:text-accent-foreground cursor-pointer",
 										"focus:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2",
 										"disabled:opacity-50 disabled:cursor-not-allowed"
 									)}
diff --git a/surfsense_web/components/new-chat/document-mention-picker.tsx b/surfsense_web/components/new-chat/document-mention-picker.tsx
index 003b604dd..3a5621604 100644
--- a/surfsense_web/components/new-chat/document-mention-picker.tsx
+++ b/surfsense_web/components/new-chat/document-mention-picker.tsx
@@ -502,7 +502,7 @@ export const DocumentMentionPicker = forwardRef<
 											className={cn(
 												"w-full flex items-center gap-2 px-3 py-2 text-left transition-colors rounded-md",
 												isAlreadySelected ? "opacity-50 cursor-not-allowed" : "cursor-pointer",
-												isHighlighted && "bg-accent"
+												isHighlighted && "bg-accent text-accent-foreground"
 											)}
 										>
 											<span className="shrink-0 text-muted-foreground text-sm">
@@ -559,7 +559,7 @@ export const DocumentMentionPicker = forwardRef<
 											className={cn(
 												"w-full flex items-center gap-2 px-3 py-2 text-left transition-colors rounded-md",
 												isAlreadySelected ? "opacity-50 cursor-not-allowed" : "cursor-pointer",
-												isHighlighted && "bg-accent"
+												isHighlighted && "bg-accent text-accent-foreground"
 											)}
 										>
 											<span className="shrink-0 text-muted-foreground text-sm">
@@ -613,7 +613,7 @@ export const DocumentMentionPicker = forwardRef<
 											className={cn(
 												"w-full flex items-center gap-2 px-3 py-2 text-left transition-colors rounded-md",
 												isAlreadySelected ? "opacity-50 cursor-not-allowed" : "cursor-pointer",
-												isHighlighted && "bg-accent"
+												isHighlighted && "bg-accent text-accent-foreground"
 											)}
 										>
 											<span className="shrink-0 text-muted-foreground text-sm">
diff --git a/surfsense_web/components/new-chat/model-selector.tsx b/surfsense_web/components/new-chat/model-selector.tsx
index 3af98a50a..669b3d21a 100644
--- a/surfsense_web/components/new-chat/model-selector.tsx
+++ b/surfsense_web/components/new-chat/model-selector.tsx
@@ -1041,9 +1041,10 @@ export function ModelSelector({
 				onMouseEnter={() => setFocusedIndex(index)}
 				className={cn(
 					"group flex items-center gap-2.5 px-3 py-2 rounded-xl",
-					"transition-all duration-150 mx-2 cursor-pointer hover:bg-accent/40",
-					isSelected && "bg-primary/6 dark:bg-primary/8",
-					isFocused && "bg-accent/50"
+					"transition-colors duration-150 mx-2 cursor-pointer",
+					"hover:bg-accent hover:text-accent-foreground",
+					isFocused && "bg-accent text-accent-foreground",
+					isSelected && "bg-accent text-accent-foreground"
 				)}
 			>
 				{/* Provider icon */}
diff --git a/surfsense_web/components/new-chat/prompt-picker.tsx b/surfsense_web/components/new-chat/prompt-picker.tsx
index 46f0d9562..cd149ef2d 100644
--- a/surfsense_web/components/new-chat/prompt-picker.tsx
+++ b/surfsense_web/components/new-chat/prompt-picker.tsx
@@ -161,7 +161,7 @@ export const PromptPicker = forwardRef<PromptPickerRef, PromptPickerProps>(funct
 								onMouseEnter={() => setHighlightedIndex(index)}
 								className={cn(
 									"w-full flex items-center gap-2 px-3 py-2 text-left text-sm transition-colors rounded-md cursor-pointer",
-									index === highlightedIndex && "bg-accent"
+									index === highlightedIndex && "bg-accent text-accent-foreground"
 								)}
 							>
 								<span className="shrink-0 text-muted-foreground">
@@ -183,7 +183,7 @@ export const PromptPicker = forwardRef<PromptPickerRef, PromptPickerProps>(funct
 							className={cn(
 								"w-full flex items-center gap-2 px-3 py-2 text-left text-sm transition-colors rounded-md cursor-pointer text-muted-foreground",
 								highlightedIndex === createPromptIndex
-									? "bg-accent text-foreground"
+									? "bg-accent text-accent-foreground"
 									: "hover:text-accent-foreground hover:bg-accent"
 							)}
 						>
diff --git a/surfsense_web/components/ui/context-menu.tsx b/surfsense_web/components/ui/context-menu.tsx
index f48828acb..c15f8e17a 100644
--- a/surfsense_web/components/ui/context-menu.tsx
+++ b/surfsense_web/components/ui/context-menu.tsx
@@ -107,7 +107,7 @@ function ContextMenuItem({
 			data-inset={inset}
 			data-variant={variant}
 			className={cn(
-				"focus:bg-accent focus:text-accent-foreground dark:focus:bg-neutral-700 relative flex cursor-pointer items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 data-[inset]:pl-8 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 [&_svg:not([class*='text-'])]:text-muted-foreground",
+				"focus:bg-accent focus:text-accent-foreground relative flex cursor-pointer items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 data-[inset]:pl-8 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 [&_svg:not([class*='text-'])]:text-muted-foreground",
 				className
 			)}
 			{...props}
@@ -189,7 +189,7 @@ function ContextMenuSeparator({
 	return (
 		<ContextMenuPrimitive.Separator
 			data-slot="context-menu-separator"
-			className={cn("bg-border dark:bg-neutral-700 -mx-1 my-1 h-px", className)}
+			className={cn("bg-border -mx-1 my-1 h-px", className)}
 			{...props}
 		/>
 	);
diff --git a/surfsense_web/components/ui/dropdown-menu.tsx b/surfsense_web/components/ui/dropdown-menu.tsx
index 7fe3da76b..5ada20d03 100644
--- a/surfsense_web/components/ui/dropdown-menu.tsx
+++ b/surfsense_web/components/ui/dropdown-menu.tsx
@@ -61,7 +61,7 @@ function DropdownMenuItem({
 			data-inset={inset}
 			data-variant={variant}
 			className={cn(
-				"focus:bg-neutral-200 focus:text-accent-foreground dark:focus:bg-neutral-700 [&_svg:not([class*='text-'])]:text-muted-foreground relative flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 data-[inset]:pl-8 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+				"focus:bg-accent focus:text-accent-foreground [&_svg:not([class*='text-'])]:text-muted-foreground relative flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 data-[inset]:pl-8 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
 				className
 			)}
 			{...props}
@@ -79,7 +79,7 @@ function DropdownMenuCheckboxItem({
 		<DropdownMenuPrimitive.CheckboxItem
 			data-slot="dropdown-menu-checkbox-item"
 			className={cn(
-				"focus:bg-neutral-200 focus:text-accent-foreground dark:focus:bg-neutral-700 relative flex cursor-default items-center gap-2 rounded-sm py-1.5 pr-2 pl-8 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+				"focus:bg-accent focus:text-accent-foreground relative flex cursor-default items-center gap-2 rounded-sm py-1.5 pr-2 pl-8 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
 				className
 			)}
 			checked={checked}
@@ -110,7 +110,7 @@ function DropdownMenuRadioItem({
 		<DropdownMenuPrimitive.RadioItem
 			data-slot="dropdown-menu-radio-item"
 			className={cn(
-				"focus:bg-neutral-200 focus:text-accent-foreground dark:focus:bg-neutral-700 relative flex cursor-default items-center gap-2 rounded-sm py-1.5 pr-2 pl-8 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+				"focus:bg-accent focus:text-accent-foreground relative flex cursor-default items-center gap-2 rounded-sm py-1.5 pr-2 pl-8 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
 				className
 			)}
 			{...props}
@@ -182,7 +182,7 @@ function DropdownMenuSubTrigger({
 			data-slot="dropdown-menu-sub-trigger"
 			data-inset={inset}
 			className={cn(
-				"focus:bg-neutral-200 focus:text-accent-foreground dark:focus:bg-neutral-700 data-[state=open]:bg-neutral-200 data-[state=open]:text-accent-foreground dark:data-[state=open]:bg-neutral-700 [&_svg:not([class*='text-'])]:text-muted-foreground flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 data-[inset]:pl-8 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+				"focus:bg-accent focus:text-accent-foreground data-[state=open]:bg-accent data-[state=open]:text-accent-foreground [&_svg:not([class*='text-'])]:text-muted-foreground flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 data-[inset]:pl-8 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
 				className
 			)}
 			{...props}

From 468f4ef121c00631a57bd6777a26bdf949c3b7cc Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Thu, 14 May 2026 02:10:33 +0530
Subject: [PATCH 42/96] refactor: standardize hover effects and focus styles
 across UI components

---
 surfsense_web/components/assistant-ui/assistant-message.tsx | 4 ++--
 surfsense_web/components/ui/inline-combobox.tsx             | 2 +-
 surfsense_web/components/ui/select.tsx                      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/surfsense_web/components/assistant-ui/assistant-message.tsx b/surfsense_web/components/assistant-ui/assistant-message.tsx
index 28dc9aacc..3f4e972fc 100644
--- a/surfsense_web/components/assistant-ui/assistant-message.tsx
+++ b/surfsense_web/components/assistant-ui/assistant-message.tsx
@@ -328,7 +328,7 @@ const MessageInfoDropdown: FC = () => {
 								return (
 									<ActionBarMorePrimitive.Item
 										key={model}
-										className="focus:bg-neutral-200 dark:focus:bg-neutral-700 relative flex cursor-default flex-col items-start gap-0.5 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none"
+										className="focus:bg-accent focus:text-accent-foreground relative flex cursor-default flex-col items-start gap-0.5 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none"
 										onSelect={(e) => e.preventDefault()}
 									>
 										<span className="flex items-center gap-1.5 text-xs font-medium">
@@ -344,7 +344,7 @@ const MessageInfoDropdown: FC = () => {
 							})
 						) : (
 							<ActionBarMorePrimitive.Item
-								className="focus:bg-neutral-200 dark:focus:bg-neutral-700 relative flex cursor-default flex-col items-start gap-0.5 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none"
+								className="focus:bg-accent focus:text-accent-foreground relative flex cursor-default flex-col items-start gap-0.5 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none"
 								onSelect={(e) => e.preventDefault()}
 							>
 								<span className="text-xs text-muted-foreground">
diff --git a/surfsense_web/components/ui/inline-combobox.tsx b/surfsense_web/components/ui/inline-combobox.tsx
index 941c1c7db..1747dc469 100644
--- a/surfsense_web/components/ui/inline-combobox.tsx
+++ b/surfsense_web/components/ui/inline-combobox.tsx
@@ -299,7 +299,7 @@ const comboboxItemVariants = cva(
 		variants: {
 			interactive: {
 				false: "",
-				true: "cursor-pointer transition-colors hover:bg-accent hover:text-accent-foreground data-[active-item=true]:bg-accent data-[active-item=true]:text-accent-foreground dark:hover:bg-neutral-700 dark:data-[active-item=true]:bg-neutral-700",
+				true: "cursor-pointer transition-colors hover:bg-accent hover:text-accent-foreground data-[active-item=true]:bg-accent data-[active-item=true]:text-accent-foreground",
 			},
 		},
 	}
diff --git a/surfsense_web/components/ui/select.tsx b/surfsense_web/components/ui/select.tsx
index 637349e7f..0a17516d5 100644
--- a/surfsense_web/components/ui/select.tsx
+++ b/surfsense_web/components/ui/select.tsx
@@ -97,7 +97,7 @@ function SelectItem({
 		<SelectPrimitive.Item
 			data-slot="select-item"
 			className={cn(
-				"focus:bg-accent focus:text-accent-foreground dark:focus:bg-neutral-700 hover:bg-accent dark:hover:bg-neutral-700 [&_svg:not([class*='text-'])]:text-muted-foreground relative flex w-full cursor-default items-center gap-2 rounded-sm py-1.5 px-2 text-sm outline-hidden select-none transition-all data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 *:[span]:last:flex *:[span]:last:items-center *:[span]:last:gap-2 data-[highlighted]:bg-accent dark:data-[highlighted]:bg-neutral-700",
+				"focus:bg-accent focus:text-accent-foreground hover:bg-accent hover:text-accent-foreground [&_svg:not([class*='text-'])]:text-muted-foreground relative flex w-full cursor-default items-center gap-2 rounded-sm py-1.5 px-2 text-sm outline-hidden select-none transition-colors data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 *:[span]:last:flex *:[span]:last:items-center *:[span]:last:gap-2 data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground",
 				className
 			)}
 			{...props}
@@ -121,7 +121,7 @@ function SelectSeparator({
 	return (
 		<SelectPrimitive.Separator
 			data-slot="select-separator"
-			className={cn("bg-border dark:bg-neutral-700 pointer-events-none -mx-1 my-1 h-px", className)}
+			className={cn("bg-border pointer-events-none -mx-1 my-1 h-px", className)}
 			{...props}
 		/>
 	);

From 88f9c3353c6ec8ec194e4d1483a7705841c8f21a Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Thu, 14 May 2026 12:53:52 +0530
Subject: [PATCH 43/96] refactor: update UI components to utilize
 'popover-border' for consistent styling and enhance overall design coherence

---
 surfsense_web/app/globals.css                 |  3 +
 .../agent-action-log/action-log-sheet.tsx     | 79 ++++++++-----------
 .../assistant-ui/assistant-message.tsx        |  2 +-
 .../components/connector-card.tsx             |  2 +-
 .../components/connector-dialog-header.tsx    |  6 +-
 .../components/mcp-connect-form.tsx           |  2 +-
 .../components/mcp-config.tsx                 |  2 +-
 .../views/connector-connect-view.tsx          |  2 +-
 .../views/connector-edit-view.tsx             |  4 +-
 .../views/indexing-configuration-view.tsx     |  2 +-
 .../tabs/active-connectors-tab.tsx            |  4 +-
 .../views/connector-accounts-list-view.tsx    | 27 +++----
 .../views/youtube-crawler-view.tsx            |  2 +-
 .../layout/ui/sidebar/SidebarUserProfile.tsx  | 12 +--
 .../components/new-chat/chat-share-button.tsx |  2 +-
 .../new-chat/document-mention-picker.tsx      |  4 +-
 .../components/new-chat/model-selector.tsx    | 18 +++--
 .../components/new-chat/prompt-picker.tsx     |  2 +-
 surfsense_web/components/ui/command.tsx       |  2 +-
 surfsense_web/components/ui/context-menu.tsx  |  2 +-
 surfsense_web/components/ui/dropdown-menu.tsx |  2 +-
 surfsense_web/components/ui/select.tsx        |  2 +-
 surfsense_web/components/ui/toolbar.tsx       |  3 +-
 23 files changed, 89 insertions(+), 97 deletions(-)

diff --git a/surfsense_web/app/globals.css b/surfsense_web/app/globals.css
index 48ba10cac..3cdb34bff 100644
--- a/surfsense_web/app/globals.css
+++ b/surfsense_web/app/globals.css
@@ -20,6 +20,7 @@
 	--card-foreground: oklch(0.145 0 0);
 	--popover: oklch(0.99 0 0);
 	--popover-foreground: oklch(0.145 0 0);
+	--popover-border: oklch(0.92 0 0);
 	--primary: oklch(0.205 0 0);
 	--primary-foreground: oklch(0.985 0 0);
 	--secondary: oklch(0.97 0 0);
@@ -64,6 +65,7 @@
 	--card-foreground: oklch(0.985 0 0);
 	--popover: oklch(0.32 0 0);
 	--popover-foreground: oklch(0.985 0 0);
+	--popover-border: oklch(0.4 0 0);
 	--primary: oklch(0.985 0 0);
 	--primary-foreground: oklch(0.205 0 0);
 	--secondary: oklch(0.269 0 0);
@@ -107,6 +109,7 @@
 	--color-card-foreground: var(--card-foreground);
 	--color-popover: var(--popover);
 	--color-popover-foreground: var(--popover-foreground);
+	--color-popover-border: var(--popover-border);
 	--color-primary: var(--primary);
 	--color-primary-foreground: var(--primary-foreground);
 	--color-secondary: var(--secondary);
diff --git a/surfsense_web/components/agent-action-log/action-log-sheet.tsx b/surfsense_web/components/agent-action-log/action-log-sheet.tsx
index 7d27b4019..fdb0bb7a9 100644
--- a/surfsense_web/components/agent-action-log/action-log-sheet.tsx
+++ b/surfsense_web/components/agent-action-log/action-log-sheet.tsx
@@ -8,7 +8,6 @@ import { actionLogSheetAtom } from "@/atoms/agent/action-log-sheet.atom";
 import { agentFlagsAtom } from "@/atoms/agent/agent-flags-query.atom";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
-import { Separator } from "@/components/ui/separator";
 import {
 	Sheet,
 	SheetContent,
@@ -22,15 +21,11 @@ import { ActionLogItem } from "./action-log-item";
 
 function EmptyState() {
 	return (
-		<div className="flex flex-1 flex-col items-center justify-center gap-3 px-6 text-center">
-			<div className="flex size-12 items-center justify-center rounded-full bg-muted">
-				<Activity className="size-5 text-muted-foreground" />
-			</div>
-			<div className="flex flex-col gap-1">
-				<p className="text-sm font-medium">No actions logged yet</p>
-				<p className="text-xs text-muted-foreground">
-					Once the agent calls a tool in this thread, it will show up here. From the log you can
-					inspect arguments and revert reversible actions.
+		<div className="flex flex-1 flex-col items-center justify-center gap-4 px-6 pb-12 text-center">
+			<div className="flex max-w-[260px] flex-col gap-1.5">
+				<p className="text-sm font-semibold tracking-tight">No actions logged yet</p>
+				<p className="text-xs leading-relaxed text-muted-foreground">
+				A complete audit trail of every tool the agent uses in this thread will appear here
 				</p>
 			</div>
 		</div>
@@ -39,15 +34,15 @@ function EmptyState() {
 
 function DisabledState() {
 	return (
-		<div className="flex flex-1 flex-col items-center justify-center gap-3 px-6 text-center">
-			<div className="flex size-12 items-center justify-center rounded-full bg-muted">
-				<Activity className="size-5 text-muted-foreground" />
+		<div className="flex flex-1 flex-col items-center justify-center gap-4 px-6 pb-12 text-center">
+			<div className="flex size-12 items-center justify-center rounded-full border border-popover-border bg-muted/40">
+				<Activity className="size-5 text-muted-foreground" strokeWidth={1.75} />
 			</div>
-			<div className="flex flex-col gap-1">
-				<p className="text-sm font-medium">Action log is disabled</p>
-				<p className="text-xs text-muted-foreground">
-					This deployment hasn't enabled the agent action log. An admin can flip
-					<code className="ml-1 rounded bg-muted px-1 text-[10px]">
+			<div className="flex max-w-[280px] flex-col gap-1.5">
+				<p className="text-sm font-semibold tracking-tight">Action log is disabled</p>
+				<p className="text-xs leading-relaxed text-muted-foreground">
+					This deployment hasn't enabled the agent action log. An admin can enable{" "}
+					<code className="rounded bg-muted px-1 py-0.5 font-mono text-[10px] text-foreground">
 						SURFSENSE_ENABLE_ACTION_LOG
 					</code>
 					.
@@ -75,7 +70,6 @@ export function ActionLogSheet() {
 
 	const { data: flags } = useAtomValue(agentFlagsAtom);
 	const actionLogEnabled = !!flags?.enable_action_log && !flags?.disable_new_agent_stack;
-	const revertEnabled = !!flags?.enable_revert_route && !flags?.disable_new_agent_stack;
 
 	const threadId = state.threadId;
 
@@ -94,39 +88,32 @@ export function ActionLogSheet() {
 		<Sheet open={state.open} onOpenChange={(open) => setState((s) => ({ ...s, open }))}>
 			<SheetContent
 				side="right"
-				className="flex h-full w-full flex-col gap-0 overflow-hidden p-0 sm:max-w-md"
+				className="flex h-full w-full flex-col gap-0 overflow-hidden p-0 sm:max-w-md select-none"
 			>
-				<SheetHeader className="shrink-0 border-b px-4 py-4">
-					<div className="flex items-center justify-between gap-2">
-						<div className="flex items-center gap-2">
-							<Activity className="size-4 text-muted-foreground" />
-							<SheetTitle className="text-base font-semibold">Agent actions</SheetTitle>
-							{data?.total !== undefined && data.total > 0 && (
-								<Badge variant="secondary" className="text-[10px]">
-									{data.total}
-								</Badge>
-							)}
-						</div>
-						<Button
-							size="sm"
-							variant="ghost"
-							onClick={() => refetch()}
-							disabled={isFetching || !actionLogEnabled}
-							className="size-8 p-0"
-							aria-label="Refresh action log"
-						>
-							<RefreshCcw className={isFetching ? "size-3.5 animate-spin" : "size-3.5"} />
-						</Button>
+				<SheetHeader className="shrink-0 px-4 py-4">
+					<div className="flex items-center gap-2 pr-24">
+						<SheetTitle className="text-base font-semibold">Agent actions</SheetTitle>
+						{data?.total !== undefined && data.total > 0 && (
+							<Badge variant="secondary" className="text-[10px]">
+								{data.total}
+							</Badge>
+						)}
 					</div>
-					<SheetDescription className="text-xs text-muted-foreground">
+					<SheetDescription className="sr-only">
 						Audit trail of every tool call the agent made in this thread.
-						{revertEnabled
-							? " Reversible actions can be undone in place."
-							: " Reverts are read-only on this deployment."}
 					</SheetDescription>
 				</SheetHeader>
 
-				<Separator />
+				<Button
+					size="sm"
+					variant="ghost"
+					onClick={() => refetch()}
+					disabled={isFetching || !actionLogEnabled}
+					className="absolute right-14 top-4 size-8 rounded-full p-0 text-muted-foreground hover:bg-accent hover:text-accent-foreground"
+					aria-label="Refresh action log"
+				>
+					<RefreshCcw className={isFetching ? "size-3.5 animate-spin" : "size-3.5"} />
+				</Button>
 
 				<div className="flex min-h-0 flex-1 flex-col overflow-y-auto scrollbar-thin">
 					{!actionLogEnabled ? (
diff --git a/surfsense_web/components/assistant-ui/assistant-message.tsx b/surfsense_web/components/assistant-ui/assistant-message.tsx
index 3f4e972fc..59801e897 100644
--- a/surfsense_web/components/assistant-ui/assistant-message.tsx
+++ b/surfsense_web/components/assistant-ui/assistant-message.tsx
@@ -320,7 +320,7 @@ const MessageInfoDropdown: FC = () => {
 				)}
 				{hasUsage && (
 					<>
-						<ActionBarMorePrimitive.Separator className="bg-border mx-2 my-1 h-px" />
+						<ActionBarMorePrimitive.Separator className="bg-popover-border mx-2 my-1 h-px" />
 						{models.length > 0 ? (
 							models.map(([model, counts]) => {
 								const { name, icon } = resolveModel(model);
diff --git a/surfsense_web/components/assistant-ui/connector-popup/components/connector-card.tsx b/surfsense_web/components/assistant-ui/connector-popup/components/connector-card.tsx
index 04b61ea54..dadfe32ab 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/components/connector-card.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/components/connector-card.tsx
@@ -145,7 +145,7 @@ export const ConnectorCard: FC<ConnectorCardProps> = ({
 				size="sm"
 				variant={isConnected ? "secondary" : "default"}
 				className={cn(
-					"relative h-8 text-[11px] px-3 rounded-lg shrink-0 font-medium items-center justify-center",
+					"relative h-8 text-[11px] px-3 shrink-0 font-medium items-center justify-center",
 					isConnected &&
 						"bg-white text-slate-700 hover:bg-accent hover:text-accent-foreground border-0 shadow-xs dark:bg-secondary dark:text-secondary-foreground",
 					!isConnected && "shadow-xs"
diff --git a/surfsense_web/components/assistant-ui/connector-popup/components/connector-dialog-header.tsx b/surfsense_web/components/assistant-ui/connector-popup/components/connector-dialog-header.tsx
index e6e107ae8..4fa261dba 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/components/connector-dialog-header.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/components/connector-dialog-header.tsx
@@ -37,7 +37,7 @@ export const ConnectorDialogHeader: FC<ConnectorDialogHeaderProps> = ({
 				</DialogDescription>
 			</DialogHeader>
 
-			<div className="flex flex-col-reverse sm:flex-row sm:items-end justify-between gap-4 sm:gap-8 mt-4 sm:mt-8 border-b border-border/80 dark:border-white/5">
+			<div className="flex flex-col-reverse sm:flex-row sm:items-end justify-between gap-4 sm:gap-8 mt-4 sm:mt-8 border-b border-popover-border">
 				<TabsList className="bg-transparent p-0 gap-4 sm:gap-8 h-auto w-full sm:w-auto justify-center sm:justify-start">
 					<TabsTrigger
 						value="all"
@@ -63,7 +63,7 @@ export const ConnectorDialogHeader: FC<ConnectorDialogHeaderProps> = ({
 
 				<div className="w-full sm:w-72 sm:pb-1">
 					<div className="relative">
-						<Search className="absolute left-3 top-1/2 -translate-y-1/2 size-4 text-gray-500 dark:text-gray-500" />
+						<Search className="absolute left-3 top-1/2 -translate-y-1/2 size-4 text-muted-foreground" />
 						<input
 							type="text"
 							autoComplete="off"
@@ -79,7 +79,7 @@ export const ConnectorDialogHeader: FC<ConnectorDialogHeaderProps> = ({
 							<button
 								type="button"
 								onClick={() => onSearchChange("")}
-								className="absolute right-3 top-1/2 -translate-y-1/2 size-4 text-gray-500 dark:text-gray-500 hover:text-gray-700 dark:hover:text-gray-300 transition-colors"
+								className="absolute right-3 top-1/2 -translate-y-1/2 size-4 text-muted-foreground hover:text-accent-foreground transition-colors"
 								aria-label="Clear search"
 							>
 								<X className="size-4" />
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/mcp-connect-form.tsx b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/mcp-connect-form.tsx
index 3ca813af0..92df6f5a1 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/mcp-connect-form.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/mcp-connect-form.tsx
@@ -210,7 +210,7 @@ export const MCPConnectForm: FC<ConnectFormProps> = ({ onSubmit, isSubmitting })
 							onClick={handleTestConnection}
 							disabled={isTesting}
 							variant="secondary"
-							className="w-full h-8 text-[13px] px-3 rounded-lg font-medium bg-white text-slate-700 hover:bg-accent hover:text-accent-foreground border-0 shadow-xs dark:bg-secondary dark:text-secondary-foreground"
+							className="w-full h-8 text-[13px] px-3 font-medium bg-white text-slate-700 hover:bg-accent hover:text-accent-foreground border-0 shadow-xs dark:bg-secondary dark:text-secondary-foreground"
 						>
 							{isTesting ? (
 								<>
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/mcp-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/mcp-config.tsx
index 61f1e29a1..a03826d3a 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/mcp-config.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/mcp-config.tsx
@@ -215,7 +215,7 @@ export const MCPConfig: FC<MCPConfigProps> = ({ connector, onConfigChange, onNam
 							onClick={handleTestConnection}
 							disabled={isTesting}
 							variant="secondary"
-							className="w-full h-8 text-[13px] px-3 rounded-lg font-medium bg-white text-slate-700 hover:bg-accent hover:text-accent-foreground border-0 shadow-xs dark:bg-secondary dark:text-secondary-foreground"
+							className="w-full h-8 text-[13px] px-3 font-medium bg-white text-slate-700 hover:bg-accent hover:text-accent-foreground border-0 shadow-xs dark:bg-secondary dark:text-secondary-foreground"
 						>
 							{isTesting ? (
 								<>
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-connect-view.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-connect-view.tsx
index ddd08e749..66a34afdf 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-connect-view.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-connect-view.tsx
@@ -133,7 +133,7 @@ export const ConnectorConnectView: FC<ConnectorConnectViewProps> = ({
 			</div>
 
 			{/* Fixed Footer - Action buttons */}
-			<div className="flex-shrink-0 flex items-center justify-between px-6 sm:px-12 py-6 bg-muted border-t border-border">
+			<div className="flex-shrink-0 flex items-center justify-between px-6 sm:px-12 py-6 bg-popover">
 				<Button
 					variant="ghost"
 					onClick={onBack}
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-edit-view.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-edit-view.tsx
index 797126e39..b74042205 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-edit-view.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-edit-view.tsx
@@ -382,8 +382,8 @@ export const ConnectorEditView: FC<ConnectorEditViewProps> = ({
 					<div className="flex flex-col sm:flex-row items-stretch sm:items-center gap-3 flex-1 sm:flex-initial">
 						<span className="text-xs sm:text-sm text-muted-foreground sm:whitespace-nowrap">
 							{isLive
-								? "Your agent will lose access to this service."
-								: "This will remove all indexed data."}
+								? "Your agent will lose access to this service"
+								: "This will remove all indexed data"}
 						</span>
 						<div className="flex items-center gap-2 sm:gap-3">
 							<Button
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/indexing-configuration-view.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/indexing-configuration-view.tsx
index 3e872d458..5503ce062 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/indexing-configuration-view.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/indexing-configuration-view.tsx
@@ -255,7 +255,7 @@ export const IndexingConfigurationView: FC<IndexingConfigurationViewProps> = ({
 			</div>
 
 			{/* Fixed Footer - Action buttons */}
-			<div className="flex-shrink-0 flex items-center justify-end px-6 sm:px-12 py-6 bg-muted">
+			<div className="flex-shrink-0 flex items-center justify-end px-6 sm:px-12 py-6 bg-popover">
 				{isLive ? (
 					<Button onClick={onSkip} className="text-xs sm:text-sm">
 						Done
diff --git a/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx b/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx
index 3433f6d4d..42532859a 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx
@@ -222,7 +222,7 @@ export const ActiveConnectorsTab: FC<ActiveConnectorsTabProps> = ({
 											<Button
 												variant="secondary"
 												size="sm"
-												className="h-8 text-[11px] px-3 rounded-lg font-medium bg-white text-slate-700 hover:bg-accent hover:text-accent-foreground border-0 shadow-xs dark:bg-secondary dark:text-secondary-foreground shrink-0"
+												className="h-8 text-[11px] px-3 font-medium bg-white text-slate-700 hover:bg-accent hover:text-accent-foreground border-0 shadow-xs dark:bg-secondary dark:text-secondary-foreground shrink-0"
 												onClick={handleManageClick}
 											>
 												Manage
@@ -280,7 +280,7 @@ export const ActiveConnectorsTab: FC<ActiveConnectorsTabProps> = ({
 											<Button
 												variant="secondary"
 												size="sm"
-												className="h-8 text-[11px] px-3 rounded-lg font-medium bg-white text-slate-700 hover:bg-accent hover:text-accent-foreground border-0 shadow-xs dark:bg-secondary dark:text-secondary-foreground shrink-0"
+												className="h-8 text-[11px] px-3 font-medium bg-white text-slate-700 hover:bg-accent hover:text-accent-foreground border-0 shadow-xs dark:bg-secondary dark:text-secondary-foreground shrink-0"
 												onClick={onManage ? () => onManage(connector) : undefined}
 											>
 												Manage
diff --git a/surfsense_web/components/assistant-ui/connector-popup/views/connector-accounts-list-view.tsx b/surfsense_web/components/assistant-ui/connector-popup/views/connector-accounts-list-view.tsx
index 98b0dea21..b4234b119 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/views/connector-accounts-list-view.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/views/connector-accounts-list-view.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { useAtomValue } from "jotai";
-import { ArrowLeft, Plus, RefreshCw, Server, Trash2 } from "lucide-react";
+import { ArrowLeft, Plus, RefreshCw, Server } from "lucide-react";
 import { type FC, useCallback, useState } from "react";
 import { toast } from "sonner";
 import { activeSearchSpaceIdAtom } from "@/atoms/search-spaces/search-space-query.atoms";
@@ -231,7 +231,7 @@ export const ConnectorAccountsListView: FC<ConnectorAccountsListViewProps> = ({
 									{isAuthExpired ? (
 										<Button
 											size="sm"
-											className="h-8 text-[11px] px-3 rounded-lg font-medium bg-amber-600 hover:bg-amber-700 text-white border-0 shadow-xs shrink-0"
+											className="h-8 text-[11px] px-3 font-medium bg-amber-600 hover:bg-amber-700 text-white border-0 shadow-xs shrink-0"
 											onClick={() => handleReauth(connector)}
 											disabled={reauthingId === connector.id}
 										>
@@ -246,7 +246,7 @@ export const ConnectorAccountsListView: FC<ConnectorAccountsListViewProps> = ({
 												<Button
 													variant="destructive"
 													size="sm"
-													className="h-8 text-[11px] px-3 rounded-lg font-medium shadow-xs"
+													className="h-8 text-[11px] px-3 font-medium shadow-xs"
 													onClick={async () => {
 														setDisconnectingId(connector.id);
 														setConfirmDisconnectId(null);
@@ -267,7 +267,7 @@ export const ConnectorAccountsListView: FC<ConnectorAccountsListViewProps> = ({
 												<Button
 													variant="ghost"
 													size="sm"
-													className="h-8 text-[11px] px-2 rounded-lg"
+													className="h-8 text-[11px] px-2"
 													onClick={() => setConfirmDisconnectId(null)}
 													disabled={disconnectingId === connector.id}
 												>
@@ -275,21 +275,20 @@ export const ConnectorAccountsListView: FC<ConnectorAccountsListViewProps> = ({
 												</Button>
 											</div>
 										) : (
-											<Button
-												variant="secondary"
-												size="sm"
-												className="h-8 text-[11px] px-3 rounded-lg font-medium bg-white text-slate-700 hover:bg-red-50 hover:text-red-700 border-0 shadow-xs dark:bg-secondary dark:text-secondary-foreground dark:hover:bg-red-950 dark:hover:text-red-400 shrink-0"
-												onClick={() => setConfirmDisconnectId(connector.id)}
-											>
-												<Trash2 className="size-3.5" />
-												Disconnect
-											</Button>
+										<Button
+											variant="destructive"
+											size="sm"
+											className="h-8 text-[11px] px-3 font-medium shrink-0"
+											onClick={() => setConfirmDisconnectId(connector.id)}
+										>
+											Disconnect
+										</Button>
 										)
 									) : (
 										<Button
 											variant="secondary"
 											size="sm"
-											className="h-8 text-[11px] px-3 rounded-lg font-medium bg-white text-slate-700 hover:bg-accent hover:text-accent-foreground border-0 shadow-xs dark:bg-secondary dark:text-secondary-foreground shrink-0"
+											className="h-8 text-[11px] px-3 font-medium bg-white text-slate-700 hover:bg-accent hover:text-accent-foreground border-0 shadow-xs dark:bg-secondary dark:text-secondary-foreground shrink-0"
 											onClick={() => onManage(connector)}
 										>
 											Manage
diff --git a/surfsense_web/components/assistant-ui/connector-popup/views/youtube-crawler-view.tsx b/surfsense_web/components/assistant-ui/connector-popup/views/youtube-crawler-view.tsx
index 49a0d1265..e2e44f0c6 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/views/youtube-crawler-view.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/views/youtube-crawler-view.tsx
@@ -323,7 +323,7 @@ export const YouTubeCrawlerView: FC<YouTubeCrawlerViewProps> = ({ searchSpaceId,
 			</div>
 
 			{/* Fixed Footer - Action buttons */}
-			<div className="shrink-0 flex items-center justify-between px-6 sm:px-12 py-6 bg-muted border-t border-border">
+			<div className="shrink-0 flex items-center justify-between px-6 sm:px-12 py-6 bg-popover">
 				<Button
 					variant="ghost"
 					onClick={onBack}
diff --git a/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx b/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx
index 9a6e36f19..71966ae45 100644
--- a/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx
@@ -234,7 +234,7 @@ export function SidebarUserProfile({
 							</div>
 						</DropdownMenuLabel>
 
-						<DropdownMenuSeparator className="dark:bg-neutral-700" />
+						<DropdownMenuSeparator />
 
 						<DropdownMenuItem onClick={onUserSettings}>
 							<UserCog className="h-4 w-4" />
@@ -329,7 +329,7 @@ export function SidebarUserProfile({
 											</a>
 										</DropdownMenuItem>
 									))}
-									<DropdownMenuSeparator className="dark:bg-neutral-700" />
+									<DropdownMenuSeparator />
 									<p className="select-none px-2 py-1.5 text-xs text-muted-foreground/50">
 										v{APP_VERSION}
 									</p>
@@ -346,7 +346,7 @@ export function SidebarUserProfile({
 							</DropdownMenuItem>
 						)}
 
-						<DropdownMenuSeparator className="dark:bg-neutral-700" />
+						<DropdownMenuSeparator />
 
 						<DropdownMenuItem onClick={handleLogout} disabled={isLoggingOut}>
 							{isLoggingOut ? (
@@ -400,7 +400,7 @@ export function SidebarUserProfile({
 						</div>
 					</DropdownMenuLabel>
 
-					<DropdownMenuSeparator className="dark:bg-neutral-700" />
+					<DropdownMenuSeparator />
 
 					<DropdownMenuItem onClick={onUserSettings}>
 						<UserCog className="h-4 w-4" />
@@ -495,7 +495,7 @@ export function SidebarUserProfile({
 										</a>
 									</DropdownMenuItem>
 								))}
-								<DropdownMenuSeparator className="dark:bg-neutral-700" />
+								<DropdownMenuSeparator />
 								<p className="select-none px-2 py-1.5 text-xs text-muted-foreground/50">
 									v{APP_VERSION}
 								</p>
@@ -512,7 +512,7 @@ export function SidebarUserProfile({
 						</DropdownMenuItem>
 					)}
 
-					<DropdownMenuSeparator className="dark:bg-neutral-700" />
+					<DropdownMenuSeparator />
 
 					<DropdownMenuItem onClick={handleLogout} disabled={isLoggingOut}>
 						{isLoggingOut ? <Spinner size="sm" className="mr-2" /> : <LogOut className="h-4 w-4" />}
diff --git a/surfsense_web/components/new-chat/chat-share-button.tsx b/surfsense_web/components/new-chat/chat-share-button.tsx
index ce0c5dbcc..6e231707e 100644
--- a/surfsense_web/components/new-chat/chat-share-button.tsx
+++ b/surfsense_web/components/new-chat/chat-share-button.tsx
@@ -231,7 +231,7 @@ export function ChatShareButton({ thread, onVisibilityChange, className }: ChatS
 						{canCreatePublicLink && (
 							<>
 								{/* Divider */}
-								<div className="border-t border-border dark:border-white/5 my-1" />
+								<div className="border-t border-popover-border my-1" />
 
 								{/* Public Link Option */}
 								<button
diff --git a/surfsense_web/components/new-chat/document-mention-picker.tsx b/surfsense_web/components/new-chat/document-mention-picker.tsx
index 3a5621604..cb61a5f2b 100644
--- a/surfsense_web/components/new-chat/document-mention-picker.tsx
+++ b/surfsense_web/components/new-chat/document-mention-picker.tsx
@@ -521,7 +521,7 @@ export const DocumentMentionPicker = forwardRef<
 						{userDocsList.length > 0 && (
 							<>
 								{surfsenseDocsList.length > 0 && (
-									<div className="mx-2 my-4 border-t border-border dark:border-white/5" />
+									<div className="mx-2 my-4 border-t border-popover-border" />
 								)}
 								<div className="px-3 py-2 text-xs font-bold text-muted-foreground/55">
 									Your Documents
@@ -581,7 +581,7 @@ export const DocumentMentionPicker = forwardRef<
 						{folderMentions.length > 0 && (
 							<>
 								{(surfsenseDocsList.length > 0 || userDocsList.length > 0) && (
-									<div className="mx-2 my-4 border-t border-border dark:border-white/5" />
+									<div className="mx-2 my-4 border-t border-popover-border" />
 								)}
 								<div className="px-3 py-2 text-xs font-bold text-muted-foreground/55">
 									Folders
diff --git a/surfsense_web/components/new-chat/model-selector.tsx b/surfsense_web/components/new-chat/model-selector.tsx
index 669b3d21a..a88a8d04e 100644
--- a/surfsense_web/components/new-chat/model-selector.tsx
+++ b/surfsense_web/components/new-chat/model-selector.tsx
@@ -840,8 +840,8 @@ export function ModelSelector({
 		return (
 			<div
 				className={cn(
-					"shrink-0 border-border/50 flex relative",
-					isMobile ? "flex-row items-center border-b border-border/40" : "flex-col w-10 border-r"
+					"shrink-0 border-popover-border flex relative",
+					isMobile ? "flex-row items-center border-b" : "flex-col w-10 border-r"
 				)}
 			>
 				{!isMobile && (
@@ -907,9 +907,9 @@ export function ModelSelector({
 							<Fragment key={provider}>
 								{showSeparator &&
 									(isMobile ? (
-										<div className="w-px h-5 bg-border/60 shrink-0 self-center mx-0.5" />
+										<div className="w-px h-5 bg-popover-border shrink-0 self-center mx-0.5" />
 									) : (
-										<div className="h-px w-5 bg-border/60 mx-auto my-0.5" />
+										<div className="h-px w-5 bg-popover-border mx-auto my-0.5" />
 									))}
 								<Tooltip>
 									<TooltipTrigger asChild>
@@ -1125,7 +1125,11 @@ export function ModelSelector({
 							<Pencil className="size-3.5 text-muted-foreground" />
 						</Button>
 					)}
-					{isSelected && <Check className="size-4 text-primary shrink-0" />}
+					{isSelected && (
+						<div className="size-7 grid place-items-center shrink-0">
+							<Check className="size-4" />
+						</div>
+					)}
 				</div>
 			</div>
 		);
@@ -1150,7 +1154,7 @@ export function ModelSelector({
 		return (
 			<div className="flex flex-col w-full overflow-hidden">
 				{/* Tab header */}
-				<div className="border-b border-border/50">
+				<div className="border-b border-popover-border">
 					<div className="w-full grid grid-cols-3 h-11">
 						{(
 							[
@@ -1303,7 +1307,7 @@ export function ModelSelector({
 										</>
 									)}
 									{globalItems.length > 0 && userItems.length > 0 && (
-										<div className="my-1.5 mx-4 h-px bg-border/60" />
+										<div className="my-1.5 mx-4 h-px bg-popover-border" />
 									)}
 									{userItems.length > 0 && (
 										<>
diff --git a/surfsense_web/components/new-chat/prompt-picker.tsx b/surfsense_web/components/new-chat/prompt-picker.tsx
index cd149ef2d..3f18890c7 100644
--- a/surfsense_web/components/new-chat/prompt-picker.tsx
+++ b/surfsense_web/components/new-chat/prompt-picker.tsx
@@ -171,7 +171,7 @@ export const PromptPicker = forwardRef<PromptPickerRef, PromptPickerProps>(funct
 							</button>
 						))}
 
-						<div className="mx-2 my-1 border-t border-border dark:border-white/5" />
+						<div className="mx-2 my-1 border-t border-popover-border" />
 						<button
 							ref={(el) => {
 								if (el) itemRefs.current.set(createPromptIndex, el);
diff --git a/surfsense_web/components/ui/command.tsx b/surfsense_web/components/ui/command.tsx
index 203d8b32c..034dbab5e 100644
--- a/surfsense_web/components/ui/command.tsx
+++ b/surfsense_web/components/ui/command.tsx
@@ -118,7 +118,7 @@ function CommandSeparator({
 	return (
 		<CommandPrimitive.Separator
 			data-slot="command-separator"
-			className={cn("bg-border -mx-1 h-px", className)}
+			className={cn("bg-popover-border -mx-1 h-px", className)}
 			{...props}
 		/>
 	);
diff --git a/surfsense_web/components/ui/context-menu.tsx b/surfsense_web/components/ui/context-menu.tsx
index c15f8e17a..8fa7c6d1a 100644
--- a/surfsense_web/components/ui/context-menu.tsx
+++ b/surfsense_web/components/ui/context-menu.tsx
@@ -189,7 +189,7 @@ function ContextMenuSeparator({
 	return (
 		<ContextMenuPrimitive.Separator
 			data-slot="context-menu-separator"
-			className={cn("bg-border -mx-1 my-1 h-px", className)}
+			className={cn("bg-popover-border -mx-1 my-1 h-px", className)}
 			{...props}
 		/>
 	);
diff --git a/surfsense_web/components/ui/dropdown-menu.tsx b/surfsense_web/components/ui/dropdown-menu.tsx
index 5ada20d03..fdbdc90d8 100644
--- a/surfsense_web/components/ui/dropdown-menu.tsx
+++ b/surfsense_web/components/ui/dropdown-menu.tsx
@@ -149,7 +149,7 @@ function DropdownMenuSeparator({
 	return (
 		<DropdownMenuPrimitive.Separator
 			data-slot="dropdown-menu-separator"
-			className={cn("bg-border mx-2 my-1 h-px", className)}
+			className={cn("bg-popover-border mx-2 my-1 h-px", className)}
 			{...props}
 		/>
 	);
diff --git a/surfsense_web/components/ui/select.tsx b/surfsense_web/components/ui/select.tsx
index 0a17516d5..55d208328 100644
--- a/surfsense_web/components/ui/select.tsx
+++ b/surfsense_web/components/ui/select.tsx
@@ -121,7 +121,7 @@ function SelectSeparator({
 	return (
 		<SelectPrimitive.Separator
 			data-slot="select-separator"
-			className={cn("bg-border pointer-events-none -mx-1 my-1 h-px", className)}
+			className={cn("bg-popover-border pointer-events-none -mx-1 my-1 h-px", className)}
 			{...props}
 		/>
 	);
diff --git a/surfsense_web/components/ui/toolbar.tsx b/surfsense_web/components/ui/toolbar.tsx
index b030f5c6d..772055c04 100644
--- a/surfsense_web/components/ui/toolbar.tsx
+++ b/surfsense_web/components/ui/toolbar.tsx
@@ -337,8 +337,7 @@ export function ToolbarMenuGroup({
 			<DropdownMenuSeparator
 				className={cn(
 					"hidden",
-					"mb-0 mx-2 shrink-0 peer-has-[[role=menuitem]]/menu-group:block peer-has-[[role=menuitemradio]]/menu-group:block peer-has-[[role=option]]/menu-group:block",
-					"dark:bg-neutral-700"
+					"mb-0 mx-2 shrink-0 peer-has-[[role=menuitem]]/menu-group:block peer-has-[[role=menuitemradio]]/menu-group:block peer-has-[[role=option]]/menu-group:block"
 				)}
 			/>
 

From 198c38b335a27cb2af72e0320cbfbc0e7d580fca Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Thu, 14 May 2026 13:30:20 +0530
Subject: [PATCH 44/96] refactor: replace button elements with Button component
 for consistent styling across various UI components

---
 .../app/(home)/login/LocalLoginForm.tsx       |  23 +-
 surfsense_web/app/(home)/login/page.tsx       |   9 +-
 surfsense_web/app/(home)/register/page.tsx    |  17 +-
 .../[search_space_id]/buy-more/page.tsx       |   9 +-
 .../new-chat/[[...chat_id]]/page.tsx          |  24 ++-
 .../[search_space_id]/team/team-content.tsx   |   8 +-
 .../components/AgentStatusContent.tsx         |   9 +-
 surfsense_web/app/dashboard/error.tsx         |   6 +-
 surfsense_web/app/error.tsx                   |   6 +-
 .../components/free-chat/anonymous-chat.tsx   |  28 ++-
 .../ui/sidebar/DesktopLocalTabContent.tsx     |  44 ++--
 .../layout/ui/sidebar/DocumentsSidebar.tsx    | 201 +++++++++---------
 surfsense_web/components/onboarding-tour.tsx  |  30 ++-
 13 files changed, 234 insertions(+), 180 deletions(-)

diff --git a/surfsense_web/app/(home)/login/LocalLoginForm.tsx b/surfsense_web/app/(home)/login/LocalLoginForm.tsx
index a0326e39b..9692d35e1 100644
--- a/surfsense_web/app/(home)/login/LocalLoginForm.tsx
+++ b/surfsense_web/app/(home)/login/LocalLoginForm.tsx
@@ -7,6 +7,7 @@ import { useRouter } from "next/navigation";
 import { useTranslations } from "next-intl";
 import { useState } from "react";
 import { loginMutationAtom } from "@/atoms/auth/auth-mutation.atoms";
+import { Button } from "@/components/ui/button";
 import { Spinner } from "@/components/ui/spinner";
 import { getAuthErrorDetails, isNetworkError } from "@/lib/auth-errors";
 import { AUTH_TYPE } from "@/lib/env-config";
@@ -120,11 +121,13 @@ export function LocalLoginForm() {
 									<p className="text-sm font-semibold mb-1">{error.title}</p>
 									<p className="text-sm text-destructive">{error.message}</p>
 								</div>
-								<button
+								<Button
+									variant="ghost"
+									size="icon"
 									onClick={() => {
 										setError({ title: null, message: null });
 									}}
-									className="flex-shrink-0 text-destructive hover:text-destructive/90 transition-colors"
+									className="size-6 flex-shrink-0 text-destructive hover:bg-transparent hover:text-destructive/90"
 									aria-label="Dismiss error"
 									type="button"
 								>
@@ -143,7 +146,7 @@ export function LocalLoginForm() {
 										<line x1="18" y1="6" x2="6" y2="18" />
 										<line x1="6" y1="6" x2="18" y2="18" />
 									</svg>
-								</button>
+								</Button>
 							</div>
 						</motion.div>
 					)}
@@ -191,21 +194,23 @@ export function LocalLoginForm() {
 							}`}
 							disabled={isLoggingIn}
 						/>
-						<button
+						<Button
 							type="button"
+							variant="ghost"
+							size="icon"
 							onClick={() => setShowPassword((prev) => !prev)}
-							className="absolute inset-y-0 right-0 flex items-center pr-3 text-muted-foreground hover:text-foreground"
+							className="absolute inset-y-0 right-0 h-full w-10 text-muted-foreground hover:bg-transparent hover:text-foreground"
 							aria-label={showPassword ? t("hide_password") : t("show_password")}
 						>
 							{showPassword ? <EyeOff className="h-4 w-4" /> : <Eye className="h-4 w-4" />}
-						</button>
+						</Button>
 					</div>
 				</div>
 
-				<button
+				<Button
 					type="submit"
 					disabled={isLoggingIn}
-					className="relative w-full rounded-md bg-primary px-4 py-1.5 md:py-2 text-primary-foreground shadow-sm hover:bg-primary/90 focus:outline-none focus:ring-2 focus:ring-primary focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 transition-all text-sm md:text-base flex items-center justify-center gap-2"
+					className="relative h-auto w-full px-4 py-1.5 text-sm md:py-2 md:text-base"
 				>
 					<span className={isLoggingIn ? "invisible" : ""}>{t("sign_in")}</span>
 					{isLoggingIn && (
@@ -213,7 +218,7 @@ export function LocalLoginForm() {
 							<Spinner size="sm" className="text-primary-foreground" />
 						</span>
 					)}
-				</button>
+				</Button>
 			</form>
 
 			{authType === "LOCAL" && (
diff --git a/surfsense_web/app/(home)/login/page.tsx b/surfsense_web/app/(home)/login/page.tsx
index c336e757c..42a9182e9 100644
--- a/surfsense_web/app/(home)/login/page.tsx
+++ b/surfsense_web/app/(home)/login/page.tsx
@@ -6,6 +6,7 @@ import { useTranslations } from "next-intl";
 import { Suspense, useEffect, useState } from "react";
 import { toast } from "sonner";
 import { Logo } from "@/components/Logo";
+import { Button } from "@/components/ui/button";
 import { useGlobalLoadingEffect } from "@/hooks/use-global-loading";
 import { getAuthErrorDetails, shouldRetry } from "@/lib/auth-errors";
 import { setRedirectPath } from "@/lib/auth-utils";
@@ -154,10 +155,12 @@ function LoginContent() {
 									<p className="text-sm font-semibold mb-1">{urlError.title}</p>
 									<p className="text-sm text-red-700 dark:text-red-300">{urlError.message}</p>
 								</div>
-								<button
+								<Button
 									type="button"
+									variant="ghost"
+									size="icon"
 									onClick={() => setUrlError(null)}
-									className="flex-shrink-0 text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-200 transition-colors"
+									className="size-6 flex-shrink-0 text-red-500 hover:bg-transparent hover:text-red-700 dark:text-red-400 dark:hover:text-red-200"
 									aria-label="Dismiss error"
 								>
 									<svg
@@ -175,7 +178,7 @@ function LoginContent() {
 										<line x1="18" y1="6" x2="6" y2="18" />
 										<line x1="6" y1="6" x2="18" y2="18" />
 									</svg>
-								</button>
+								</Button>
 							</div>
 						</motion.div>
 					)}
diff --git a/surfsense_web/app/(home)/register/page.tsx b/surfsense_web/app/(home)/register/page.tsx
index 00f142567..1fd1a4ecb 100644
--- a/surfsense_web/app/(home)/register/page.tsx
+++ b/surfsense_web/app/(home)/register/page.tsx
@@ -9,6 +9,7 @@ import { useEffect, useState } from "react";
 import { type ExternalToast, toast } from "sonner";
 import { registerMutationAtom } from "@/atoms/auth/auth-mutation.atoms";
 import { Logo } from "@/components/Logo";
+import { Button } from "@/components/ui/button";
 import { Spinner } from "@/components/ui/spinner";
 import { getAuthErrorDetails, isNetworkError, shouldRetry } from "@/lib/auth-errors";
 import { getBearerToken } from "@/lib/auth-utils";
@@ -199,11 +200,13 @@ export default function RegisterPage() {
 											<p className="text-sm font-semibold mb-1">{error.title}</p>
 											<p className="text-sm text-red-700 dark:text-red-300">{error.message}</p>
 										</div>
-										<button
+										<Button
+											variant="ghost"
+											size="icon"
 											onClick={() => {
 												setError({ title: null, message: null });
 											}}
-											className="flex-shrink-0 text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-200 transition-colors"
+											className="size-6 flex-shrink-0 text-red-500 hover:bg-transparent hover:text-red-700 dark:text-red-400 dark:hover:text-red-200"
 											aria-label="Dismiss error"
 											type="button"
 										>
@@ -222,7 +225,7 @@ export default function RegisterPage() {
 												<line x1="18" y1="6" x2="6" y2="18" />
 												<line x1="6" y1="6" x2="18" y2="18" />
 											</svg>
-										</button>
+										</Button>
 									</div>
 								</motion.div>
 							)}
@@ -295,18 +298,18 @@ export default function RegisterPage() {
 							/>
 						</div>
 
-						<button
+						<Button
 							type="submit"
 							disabled={isRegistering}
-							className="relative w-full rounded-md bg-primary px-4 py-1.5 md:py-2 text-primary-foreground shadow-sm hover:bg-primary/90 focus:outline-none focus:ring-1 focus:ring-primary/40 disabled:cursor-not-allowed disabled:opacity-50 transition-all text-sm md:text-base flex items-center justify-center gap-2"
+							className="relative h-auto w-full px-4 py-1.5 text-sm md:py-2 md:text-base"
 						>
 							<span className={isRegistering ? "invisible" : ""}>{t("register")}</span>
 							{isRegistering && (
 								<span className="absolute inset-0 flex items-center justify-center gap-2">
-									<Spinner size="sm" className="text-white" />
+									<Spinner size="sm" className="text-primary-foreground" />
 								</span>
 							)}
-						</button>
+						</Button>
 					</form>
 
 					<div className="mt-4 text-center text-sm">
diff --git a/surfsense_web/app/dashboard/[search_space_id]/buy-more/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/buy-more/page.tsx
index d5f1d0539..ba13a6239 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/buy-more/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/buy-more/page.tsx
@@ -4,6 +4,7 @@ import { motion } from "motion/react";
 import { useState } from "react";
 import { BuyPagesContent } from "@/components/settings/buy-pages-content";
 import { BuyTokensContent } from "@/components/settings/buy-tokens-content";
+import { Button } from "@/components/ui/button";
 import { cn } from "@/lib/utils";
 
 const TABS = [
@@ -26,19 +27,21 @@ export default function BuyMorePage() {
 			>
 				<div className="flex items-center justify-center rounded-lg border bg-muted/30 p-1">
 					{TABS.map((tab) => (
-						<button
+						<Button
 							key={tab.id}
 							type="button"
+							variant="ghost"
+							size="sm"
 							onClick={() => setActiveTab(tab.id)}
 							className={cn(
-								"flex-1 rounded-md px-3 py-1.5 text-sm font-medium transition-colors",
+								"h-auto flex-1 px-3 py-1.5 text-sm",
 								activeTab === tab.id
 									? "bg-background text-foreground shadow-sm"
 									: "text-muted-foreground hover:text-accent-foreground"
 							)}
 						>
 							{tab.label}
-						</button>
+						</Button>
 					))}
 				</div>
 
diff --git a/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
index c431ab304..604e241f9 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
@@ -44,6 +44,7 @@ import {
 } from "@/components/assistant-ui/edit-message-dialog";
 import { StepSeparatorDataUI } from "@/components/assistant-ui/step-separator";
 import { Thread } from "@/components/assistant-ui/thread";
+import { Button } from "@/components/ui/button";
 import {
 	createTokenUsageStore,
 	type TokenUsageData,
@@ -76,8 +77,6 @@ import {
 import { createStreamFlushHelpers } from "@/lib/chat/stream-flush";
 import {
 	consumeSseEvents,
-	hasPersistableContent,
-	markInterruptsCompleted,
 	processSharedStreamEvent,
 } from "@/lib/chat/stream-pipeline";
 import {
@@ -88,7 +87,6 @@ import {
 } from "@/lib/chat/stream-side-effects";
 import {
 	addToolCall,
-	buildContentForPersistence,
 	buildContentForUI,
 	type ContentPartsState,
 	type FrameBatchedUpdater,
@@ -1718,8 +1716,19 @@ export default function NewChatPage() {
 			}
 
 			const byTcId = new Map<string, (typeof incoming)[number]>();
-			for (let i = 0; i < tcIds.length; i++) byTcId.set(tcIds[i], incoming[i]);
-			const submittedDecisions = tcIds.map((id) => byTcId.get(id)!);
+			const submittedDecisions: typeof incoming = [];
+			for (let i = 0; i < tcIds.length; i++) {
+				const tcId = tcIds[i];
+				const decision = incoming[i];
+				if (tcId === undefined || decision === undefined) {
+					toast.error(
+						`Cannot resume: ${incoming.length} decision(s) submitted for ${N} pending actions.`
+					);
+					return;
+				}
+				byTcId.set(tcId, decision);
+				submittedDecisions.push(decision);
+			}
 
 			setMessages((prev) =>
 				prev.map((m) => {
@@ -2341,16 +2350,15 @@ export default function NewChatPage() {
 		return (
 			<div className="flex h-full flex-col items-center justify-center gap-4">
 				<div className="text-destructive">Failed to load chat</div>
-				<button
+				<Button
 					type="button"
 					onClick={() => {
 						setIsInitializing(true);
 						initializeThread();
 					}}
-					className="rounded-md bg-primary px-4 py-2 text-primary-foreground hover:bg-primary/90"
 				>
 					Try Again
-				</button>
+				</Button>
 			</div>
 		);
 	}
diff --git a/surfsense_web/app/dashboard/[search_space_id]/team/team-content.tsx b/surfsense_web/app/dashboard/[search_space_id]/team/team-content.tsx
index 2ab6ef34e..e93ad1799 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/team/team-content.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/team/team-content.tsx
@@ -482,13 +482,15 @@ function MemberRow({
 				{showActions ? (
 					<DropdownMenu>
 						<DropdownMenuTrigger asChild>
-							<button
+							<Button
 								type="button"
-								className="inline-flex items-center gap-1.5 text-sm text-muted-foreground hover:text-accent-foreground transition-colors"
+								variant="ghost"
+								size="sm"
+								className="h-auto gap-1.5 px-0 py-0 text-sm text-muted-foreground hover:bg-transparent hover:text-accent-foreground"
 							>
 								{roleName}
 								<ChevronDown className="h-4 w-4" />
-							</button>
+							</Button>
 						</DropdownMenuTrigger>
 						<DropdownMenuContent
 							align="end"
diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/AgentStatusContent.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/AgentStatusContent.tsx
index 17d8aa50c..1c20b79c2 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/AgentStatusContent.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/AgentStatusContent.tsx
@@ -6,6 +6,7 @@ import { useMemo } from "react";
 import { agentFlagsAtom } from "@/atoms/agent/agent-flags-query.atom";
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
 import { Separator } from "@/components/ui/separator";
 import { Skeleton } from "@/components/ui/skeleton";
 import type { AgentFeatureFlags } from "@/lib/apis/agent-flags-api.service";
@@ -246,14 +247,16 @@ export function AgentStatusContent() {
 				<AlertTitle>Failed to load agent status</AlertTitle>
 				<AlertDescription className="flex items-center gap-2">
 					{error instanceof Error ? error.message : "Unknown error."}
-					<button
+					<Button
 						type="button"
+						variant="outline"
+						size="sm"
 						onClick={() => refetch()}
-						className="ml-auto inline-flex items-center gap-1 rounded-md border px-2 py-0.5 text-xs hover:bg-background"
+						className="ml-auto h-auto gap-1 px-2 py-0.5 text-xs hover:bg-background"
 					>
 						<RotateCcw className="size-3" />
 						Retry
-					</button>
+					</Button>
 				</AlertDescription>
 			</Alert>
 		);
diff --git a/surfsense_web/app/dashboard/error.tsx b/surfsense_web/app/dashboard/error.tsx
index fa71f72bb..85c31e1a0 100644
--- a/surfsense_web/app/dashboard/error.tsx
+++ b/surfsense_web/app/dashboard/error.tsx
@@ -3,6 +3,7 @@
 import { ExternalLink } from "lucide-react";
 import Link from "next/link";
 import { useEffect, useMemo } from "react";
+import { Button } from "@/components/ui/button";
 import { buildIssueUrl } from "@/lib/error-toast";
 
 export default function DashboardError({
@@ -39,13 +40,12 @@ export default function DashboardError({
 			)}
 
 			<div className="flex gap-2">
-				<button
+				<Button
 					type="button"
 					onClick={reset}
-					className="rounded-md bg-primary px-4 py-2 text-sm font-medium text-primary-foreground hover:bg-primary/90 transition-colors"
 				>
 					Try again
-				</button>
+				</Button>
 				<Link
 					href="/dashboard"
 					className="rounded-md border border-input bg-background px-4 py-2 text-sm font-medium hover:bg-accent hover:text-accent-foreground transition-colors"
diff --git a/surfsense_web/app/error.tsx b/surfsense_web/app/error.tsx
index 251c69d29..dd3a35d41 100644
--- a/surfsense_web/app/error.tsx
+++ b/surfsense_web/app/error.tsx
@@ -2,6 +2,7 @@
 
 import { ExternalLink } from "lucide-react";
 import { useEffect, useMemo } from "react";
+import { Button } from "@/components/ui/button";
 import { buildIssueUrl } from "@/lib/error-toast";
 
 export default function ErrorPage({
@@ -37,13 +38,12 @@ export default function ErrorPage({
 			)}
 
 			<div className="flex gap-2">
-				<button
+				<Button
 					type="button"
 					onClick={reset}
-					className="rounded-md bg-primary px-4 py-2 text-sm font-medium text-primary-foreground hover:bg-primary/90 transition-colors"
 				>
 					Try again
-				</button>
+				</Button>
 				<a
 					href={issueUrl}
 					target="_blank"
diff --git a/surfsense_web/components/free-chat/anonymous-chat.tsx b/surfsense_web/components/free-chat/anonymous-chat.tsx
index 3de2ca434..93168d084 100644
--- a/surfsense_web/components/free-chat/anonymous-chat.tsx
+++ b/surfsense_web/components/free-chat/anonymous-chat.tsx
@@ -2,6 +2,7 @@
 
 import { ArrowUp, Loader2, Square } from "lucide-react";
 import { useCallback, useEffect, useRef, useState } from "react";
+import { Button } from "@/components/ui/button";
 import type { AnonModel, AnonQuotaResponse } from "@/contracts/types/anonymous-chat.types";
 import { anonymousChatApiService } from "@/lib/apis/anonymous-chat-api.service";
 import { readSSEStream } from "@/lib/chat/streaming-state";
@@ -28,14 +29,16 @@ export function AnonymousChat({ model }: AnonymousChatProps) {
 	const abortRef = useRef<AbortController | null>(null);
 	const messagesEndRef = useRef<HTMLDivElement>(null);
 	const textareaRef = useRef<HTMLTextAreaElement>(null);
+	const modelSlug = model.seo_slug ?? model.model_name;
 
 	useEffect(() => {
 		anonymousChatApiService.getQuota().then(setQuota).catch(console.error);
 	}, []);
 
 	useEffect(() => {
+		if (messages.length === 0) return;
 		messagesEndRef.current?.scrollIntoView({ behavior: "smooth" });
-	}, [messages]);
+	}, [messages.length]);
 
 	const autoResizeTextarea = useCallback(() => {
 		const textarea = textareaRef.current;
@@ -63,7 +66,7 @@ export function AnonymousChat({ model }: AnonymousChatProps) {
 		}
 
 		trackAnonymousChatMessageSent({
-			modelSlug: model.seo_slug,
+			modelSlug,
 			messageLength: trimmed.length,
 			surface: "free_model_page",
 		});
@@ -84,7 +87,7 @@ export function AnonymousChat({ model }: AnonymousChatProps) {
 					headers: { "Content-Type": "application/json" },
 					credentials: "include",
 					body: JSON.stringify({
-						model_slug: model.seo_slug,
+						model_slug: modelSlug,
 						messages: chatHistory,
 					}),
 					signal: controller.signal,
@@ -100,6 +103,7 @@ export function AnonymousChat({ model }: AnonymousChatProps) {
 						remaining: 0,
 						status: "exceeded",
 						warning_threshold: quota?.warning_threshold ?? 800000,
+						captcha_required: errorData.detail?.captcha_required ?? quota?.captcha_required ?? false,
 					});
 					setMessages((prev) => prev.filter((m) => m.id !== assistantId));
 					return;
@@ -148,7 +152,7 @@ export function AnonymousChat({ model }: AnonymousChatProps) {
 			abortRef.current = null;
 			anonymousChatApiService.getQuota().then(setQuota).catch(console.error);
 		}
-	}, [input, isStreaming, messages, model.seo_slug, quota]);
+	}, [input, isStreaming, messages, modelSlug, quota]);
 
 	const handleCancel = useCallback(() => {
 		abortRef.current?.abort();
@@ -258,22 +262,26 @@ export function AnonymousChat({ model }: AnonymousChatProps) {
 						)}
 					/>
 					{isStreaming ? (
-						<button
+						<Button
 							type="button"
+							variant="ghost"
+							size="icon"
 							onClick={handleCancel}
-							className="absolute right-2 bottom-2 flex h-8 w-8 items-center justify-center rounded-lg bg-foreground text-background transition-colors hover:opacity-80"
+							className="absolute right-2 bottom-2 size-8 bg-foreground text-background hover:bg-foreground hover:text-background hover:opacity-80"
 						>
 							<Square className="h-3.5 w-3.5" fill="currentColor" />
-						</button>
+						</Button>
 					) : (
-						<button
+						<Button
 							type="button"
+							variant="ghost"
+							size="icon"
 							onClick={handleSubmit}
 							disabled={!input.trim() || isExceeded}
-							className="absolute right-2 bottom-2 flex h-8 w-8 items-center justify-center rounded-lg bg-foreground text-background transition-colors hover:opacity-80 disabled:opacity-40 disabled:cursor-not-allowed"
+							className="absolute right-2 bottom-2 size-8 bg-foreground text-background hover:bg-foreground hover:text-background hover:opacity-80 disabled:opacity-40"
 						>
 							<ArrowUp className="h-4 w-4" />
-						</button>
+						</Button>
 					)}
 				</div>
 
diff --git a/surfsense_web/components/layout/ui/sidebar/DesktopLocalTabContent.tsx b/surfsense_web/components/layout/ui/sidebar/DesktopLocalTabContent.tsx
index 3730f0e53..473a4894b 100644
--- a/surfsense_web/components/layout/ui/sidebar/DesktopLocalTabContent.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/DesktopLocalTabContent.tsx
@@ -9,9 +9,9 @@ import {
 	DropdownMenuContent,
 	DropdownMenuItem,
 	DropdownMenuLabel,
-	DropdownMenuSeparator,
 	DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
+import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { Separator } from "@/components/ui/separator";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
@@ -65,29 +65,30 @@ export function DesktopLocalTabContent({
 	return (
 		<div className="flex min-h-0 flex-1 flex-col select-none">
 			<div className="mx-4 mt-4 mb-3">
-				<div className="flex h-7 w-full items-stretch rounded-lg border-0 bg-muted text-[11px] text-muted-foreground hover:bg-accent hover:text-accent-foreground">
+				<div className="flex h-7 w-full items-stretch rounded-lg border-0 bg-muted text-[11px] text-muted-foreground">
 					{localRootPaths.length > 0 ? (
 						<DropdownMenu>
 							<DropdownMenuTrigger asChild>
-								<button
+								<Button
 									type="button"
-									className="min-w-0 flex-1 flex items-center gap-1 rounded-l-lg px-2 text-left transition-colors hover:bg-accent hover:text-accent-foreground focus-visible:outline-none focus-visible:ring-0 focus-visible:ring-offset-0"
+									variant="ghost"
+									size="sm"
+									className="min-w-0 flex-1 h-full justify-start gap-1 px-2 text-left text-[11px] text-muted-foreground"
 									title={localRootPaths.join("\n")}
 									aria-label="Manage selected folders"
 								>
-									<Folder className="size-3 shrink-0 text-muted-foreground" />
+									<Folder className="size-3 shrink-0" />
 									<span className="truncate">
 										{localRootPaths.length === 1
 											? "1 folder selected"
 											: `${localRootPaths.length} folders selected`}
 									</span>
-								</button>
+								</Button>
 							</DropdownMenuTrigger>
 							<DropdownMenuContent align="start" className="w-56 select-none p-0.5">
 								<DropdownMenuLabel className="px-1.5 pt-1.5 pb-0.5 text-xs font-medium text-muted-foreground">
 									Selected folders
 								</DropdownMenuLabel>
-								<DropdownMenuSeparator className="mx-1 my-0.5" />
 								{localRootPaths.map((rootPath) => (
 									<DropdownMenuItem
 										key={rootPath}
@@ -98,9 +99,11 @@ export function DesktopLocalTabContent({
 										<span className="min-w-0 flex-1 truncate">
 											{getFolderDisplayName(rootPath)}
 										</span>
-										<button
+										<Button
 											type="button"
-											className="inline-flex size-5 items-center justify-center rounded text-muted-foreground transition-colors hover:text-accent-foreground"
+											variant="ghost"
+											size="icon"
+											className="size-5 text-muted-foreground hover:text-accent-foreground"
 											onClick={(event) => {
 												event.stopPropagation();
 												void onRemoveFilesystemRoot(rootPath);
@@ -108,10 +111,9 @@ export function DesktopLocalTabContent({
 											aria-label={`Remove ${getFolderDisplayName(rootPath)}`}
 										>
 											<X className="size-3" />
-										</button>
+										</Button>
 									</DropdownMenuItem>
 								))}
-								<DropdownMenuSeparator className="mx-1 my-0.5" />
 								<DropdownMenuItem
 									variant="destructive"
 									className="h-8 px-1.5 text-xs text-destructive focus:text-destructive"
@@ -125,10 +127,10 @@ export function DesktopLocalTabContent({
 						</DropdownMenu>
 					) : (
 						<div
-							className="min-w-0 flex-1 flex items-center gap-1 px-2"
+							className="min-w-0 flex-1 flex items-center gap-1 px-2 transition-colors hover:bg-accent hover:text-accent-foreground"
 							title="No local folders selected"
 						>
-							<Folder className="size-3 shrink-0 text-muted-foreground" />
+							<Folder className="size-3 shrink-0" />
 							<span className="truncate">No local folders selected</span>
 						</div>
 					)}
@@ -140,9 +142,11 @@ export function DesktopLocalTabContent({
 						<Tooltip>
 							<TooltipTrigger asChild>
 								<span className="inline-flex">
-									<button
+									<Button
 										type="button"
-										className="flex w-8 items-center justify-center rounded-r-lg text-muted-foreground transition-colors hover:bg-accent hover:text-accent-foreground focus-visible:outline-none focus-visible:ring-0 focus-visible:ring-offset-0 disabled:opacity-50"
+										variant="ghost"
+										size="icon"
+										className="h-full w-8 text-muted-foreground hover:text-accent-foreground"
 										onClick={() => {
 											void onPickFilesystemRoot();
 										}}
@@ -150,7 +154,7 @@ export function DesktopLocalTabContent({
 										aria-label="Add folder"
 									>
 										<FolderPlus className="size-3.5" />
-									</button>
+									</Button>
 								</span>
 							</TooltipTrigger>
 							<TooltipContent side="top" className="text-xs">
@@ -177,9 +181,11 @@ export function DesktopLocalTabContent({
 						aria-label="Search local files"
 					/>
 					{Boolean(localSearch) && (
-						<button
+						<Button
 							type="button"
-							className="absolute inset-y-0 right-0 flex h-full w-8 items-center justify-center rounded-r-md text-muted-foreground hover:text-accent-foreground transition-colors"
+							variant="ghost"
+							size="icon"
+							className="absolute inset-y-0 right-0 h-full w-8 text-muted-foreground hover:text-accent-foreground"
 							aria-label="Clear local search"
 							onClick={() => {
 								setLocalSearch("");
@@ -187,7 +193,7 @@ export function DesktopLocalTabContent({
 							}}
 						>
 							<X size={13} strokeWidth={2} aria-hidden="true" />
-						</button>
+						</Button>
 					)}
 				</div>
 			</div>
diff --git a/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx
index 017f14adf..98943a6e4 100644
--- a/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx
@@ -1043,82 +1043,84 @@ function AuthenticatedDocumentsSidebarBase({
 	const cloudContent = (
 		<>
 			{/* Connected tools strip */}
-			<div className="shrink-0 mx-4 mt-6 mb-2.5 flex select-none items-center gap-2 rounded-lg border-0 bg-muted transition-colors hover:bg-accent hover:text-accent-foreground">
-				<button
-					type="button"
-					onClick={() => setConnectorDialogOpen(true)}
-					className="flex min-w-0 flex-1 items-center gap-2 px-3 py-1.5 text-left"
-				>
-					<Unplug className="size-4 shrink-0 text-muted-foreground" />
-					<span className="truncate text-xs text-muted-foreground">
-						{connectorCount > 0 ? "Manage connectors" : "Connect your connectors"}
+			<Button
+				type="button"
+				variant="ghost"
+				size="sm"
+				onClick={() => setConnectorDialogOpen(true)}
+				className="shrink-0 mx-4 mt-6 mb-2.5 h-auto select-none justify-start gap-2 bg-muted px-3 py-1.5 text-xs text-muted-foreground"
+			>
+				<Unplug className="size-4 shrink-0" />
+				<span className="truncate">
+					{connectorCount > 0 ? "Manage connectors" : "Connect your connectors"}
+				</span>
+				{connectorCount > 0 && (
+					<span className="shrink-0 rounded-full bg-muted-foreground/15 px-1.5 py-0.5 text-[10px] font-medium text-muted-foreground">
+						{connectorCount}
 					</span>
-					{connectorCount > 0 && (
-						<span className="shrink-0 rounded-full bg-muted-foreground/15 px-1.5 py-0.5 text-[10px] font-medium text-muted-foreground">
-							{connectorCount}
-						</span>
-					)}
-					<AvatarGroup className="ml-auto shrink-0">
-						{connectorCount > 0 && connectors
-							? connectors.slice(0, isMobile ? 5 : 9).map((connector, i) => {
+				)}
+				<AvatarGroup className="ml-auto shrink-0">
+					{connectorCount > 0 && connectors
+						? connectors.slice(0, isMobile ? 5 : 9).map((connector, i) => {
+								const avatar = (
+									<Avatar
+										key={connector.id}
+										className="size-6"
+										style={{ zIndex: Math.max(9 - i, 1) }}
+									>
+										<AvatarFallback className="bg-muted text-[10px] text-muted-foreground">
+											{getConnectorIcon(connector.connector_type, "size-3.5")}
+										</AvatarFallback>
+									</Avatar>
+								);
+								if (isMobile) return avatar;
+								return (
+									<Tooltip key={connector.id}>
+										<TooltipTrigger asChild>{avatar}</TooltipTrigger>
+										<TooltipContent side="top" className="text-xs">
+											{connector.name}
+										</TooltipContent>
+									</Tooltip>
+								);
+							})
+						: (isMobile ? SHOWCASE_CONNECTORS.slice(0, 5) : SHOWCASE_CONNECTORS).map(
+								({ type, label }, i) => {
 									const avatar = (
 										<Avatar
-											key={connector.id}
+											key={type}
 											className="size-6"
-											style={{ zIndex: Math.max(9 - i, 1) }}
+											style={{ zIndex: SHOWCASE_CONNECTORS.length - i }}
 										>
-											<AvatarFallback className="bg-muted text-[10px]">
-												{getConnectorIcon(connector.connector_type, "size-3.5")}
+											<AvatarFallback className="bg-muted text-[10px] text-muted-foreground">
+												{getConnectorIcon(type, "size-3.5")}
 											</AvatarFallback>
 										</Avatar>
 									);
 									if (isMobile) return avatar;
 									return (
-										<Tooltip key={connector.id}>
+										<Tooltip key={type}>
 											<TooltipTrigger asChild>{avatar}</TooltipTrigger>
 											<TooltipContent side="top" className="text-xs">
-												{connector.name}
+												{label}
 											</TooltipContent>
 										</Tooltip>
 									);
-								})
-							: (isMobile ? SHOWCASE_CONNECTORS.slice(0, 5) : SHOWCASE_CONNECTORS).map(
-									({ type, label }, i) => {
-										const avatar = (
-											<Avatar
-												key={type}
-												className="size-6"
-												style={{ zIndex: SHOWCASE_CONNECTORS.length - i }}
-											>
-												<AvatarFallback className="bg-muted text-[10px]">
-													{getConnectorIcon(type, "size-3.5")}
-												</AvatarFallback>
-											</Avatar>
-										);
-										if (isMobile) return avatar;
-										return (
-											<Tooltip key={type}>
-												<TooltipTrigger asChild>{avatar}</TooltipTrigger>
-												<TooltipContent side="top" className="text-xs">
-													{label}
-												</TooltipContent>
-											</Tooltip>
-										);
-									}
-								)}
-					</AvatarGroup>
-				</button>
-			</div>
+								}
+							)}
+				</AvatarGroup>
+			</Button>
 
 			{isElectron && (
-				<button
+				<Button
 					type="button"
+					variant="ghost"
+					size="sm"
 					onClick={handleWatchLocalFolder}
-					className="shrink-0 mx-4 mb-2.5 flex select-none items-center gap-2 rounded-lg border-0 bg-muted px-3 py-1.5 transition-colors hover:bg-accent hover:text-accent-foreground"
+					className="shrink-0 mx-4 mb-2.5 h-auto select-none justify-start gap-2 bg-muted px-3 py-1.5 text-xs text-muted-foreground"
 				>
-					<FolderClock className="size-4 shrink-0 text-muted-foreground" />
-					<span className="truncate text-xs text-muted-foreground">Watch local folder</span>
-				</button>
+					<FolderClock className="size-4 shrink-0" />
+					<span className="truncate">Watch local folder</span>
+				</Button>
 			)}
 
 			<div className="flex-1 min-h-0 pt-0 flex flex-col">
@@ -1139,15 +1141,17 @@ function AuthenticatedDocumentsSidebarBase({
 				<div className="relative flex-1 min-h-0 overflow-auto">
 					{deletableSelectedIds.length > 0 && (
 						<div className="absolute inset-x-0 top-0 z-10 flex items-center justify-center px-4 py-1.5 animate-in fade-in duration-150 pointer-events-none">
-							<button
+							<Button
 								type="button"
+								variant="destructive"
+								size="sm"
 								onClick={() => setBulkDeleteConfirmOpen(true)}
-								className="pointer-events-auto flex items-center gap-1.5 px-3 py-1 rounded-md bg-destructive text-destructive-foreground shadow-lg text-xs font-medium hover:bg-destructive/90 transition-colors"
+								className="pointer-events-auto h-auto gap-1.5 px-3 py-1 text-xs shadow-lg"
 							>
 								<Trash2 size={12} />
 								Delete {deletableSelectedIds.length}{" "}
 								{deletableSelectedIds.length === 1 ? "item" : "items"}
-							</button>
+							</Button>
 						</div>
 					)}
 
@@ -1762,42 +1766,42 @@ function AnonymousDocumentsSidebar({
 			</div>
 
 			{/* Connectors strip (gated) */}
-			<div className="shrink-0 mx-4 mt-6 mb-2.5 flex select-none items-center gap-2 rounded-lg border bg-muted/50 transition-colors hover:bg-accent hover:text-accent-foreground">
-				<button
-					type="button"
-					onClick={() => gate("connect your data sources")}
-					className="flex min-w-0 flex-1 items-center gap-2 px-3 py-1.5 text-left"
-				>
-					<Unplug className="size-4 shrink-0 text-muted-foreground" />
-					<span className="truncate text-xs text-muted-foreground">Connect your connectors</span>
-					<AvatarGroup className="ml-auto shrink-0">
-						{(isMobile ? SHOWCASE_CONNECTORS.slice(0, 5) : SHOWCASE_CONNECTORS).map(
-							({ type, label }, i) => {
-								const avatar = (
-									<Avatar
-										key={type}
-										className="size-6"
-										style={{ zIndex: SHOWCASE_CONNECTORS.length - i }}
-									>
-										<AvatarFallback className="bg-muted text-[10px]">
-											{getConnectorIcon(type, "size-3.5")}
-										</AvatarFallback>
-									</Avatar>
-								);
-								if (isMobile) return avatar;
-								return (
-									<Tooltip key={type}>
-										<TooltipTrigger asChild>{avatar}</TooltipTrigger>
-										<TooltipContent side="top" className="text-xs">
-											{label}
-										</TooltipContent>
-									</Tooltip>
-								);
-							}
-						)}
-					</AvatarGroup>
-				</button>
-			</div>
+			<Button
+				type="button"
+				variant="ghost"
+				size="sm"
+				onClick={() => gate("connect your data sources")}
+				className="shrink-0 mx-4 mt-6 mb-2.5 h-auto select-none justify-start gap-2 border bg-muted/50 px-3 py-1.5 text-xs text-muted-foreground"
+			>
+				<Unplug className="size-4 shrink-0" />
+				<span className="truncate">Connect your connectors</span>
+				<AvatarGroup className="ml-auto shrink-0">
+					{(isMobile ? SHOWCASE_CONNECTORS.slice(0, 5) : SHOWCASE_CONNECTORS).map(
+						({ type, label }, i) => {
+							const avatar = (
+								<Avatar
+									key={type}
+									className="size-6"
+									style={{ zIndex: SHOWCASE_CONNECTORS.length - i }}
+								>
+									<AvatarFallback className="bg-muted text-[10px] text-muted-foreground">
+										{getConnectorIcon(type, "size-3.5")}
+									</AvatarFallback>
+								</Avatar>
+							);
+							if (isMobile) return avatar;
+							return (
+								<Tooltip key={type}>
+									<TooltipTrigger asChild>{avatar}</TooltipTrigger>
+									<TooltipContent side="top" className="text-xs">
+										{label}
+									</TooltipContent>
+								</Tooltip>
+							);
+						}
+					)}
+				</AvatarGroup>
+			</Button>
 
 			{/* Filters & upload */}
 			<div className="flex-1 min-h-0 pt-0 flex flex-col">
@@ -1849,18 +1853,19 @@ function AnonymousDocumentsSidebar({
 
 					{!hasDoc && (
 						<div className="px-4 py-8 text-center">
-							<button
+							<Button
 								type="button"
+								variant="ghost"
 								onClick={handleAnonUploadClick}
 								disabled={isUploading}
-								className="relative flex w-full items-center justify-center rounded-lg border-2 border-dashed border-primary/30 px-4 py-6 text-sm text-primary transition-colors hover:border-primary/60 hover:bg-primary/5 cursor-pointer disabled:opacity-50 disabled:pointer-events-none"
+								className="relative h-auto w-full border-2 border-dashed border-primary/30 px-4 py-6 text-sm text-primary hover:border-primary/60 hover:bg-primary/5 hover:text-primary cursor-pointer"
 							>
 								<span className={`flex items-center gap-2 ${isUploading ? "opacity-0" : ""}`}>
 									<Upload className="size-4" />
 									Upload a document
 								</span>
 								{isUploading && <Spinner size="sm" className="absolute" />}
-							</button>
+							</Button>
 							<p className="mt-2 text-[11px] text-muted-foreground leading-relaxed">
 								Text, code, CSV, and HTML files only. Create an account for PDFs, images, and 30+
 								connectors.
diff --git a/surfsense_web/components/onboarding-tour.tsx b/surfsense_web/components/onboarding-tour.tsx
index 86caaf543..a3c530ac0 100644
--- a/surfsense_web/components/onboarding-tour.tsx
+++ b/surfsense_web/components/onboarding-tour.tsx
@@ -9,6 +9,7 @@ import { createPortal } from "react-dom";
 import { connectorsAtom } from "@/atoms/connectors/connector-query.atoms";
 import { activeSearchSpaceIdAtom } from "@/atoms/search-spaces/search-space-query.atoms";
 import { currentUserAtom } from "@/atoms/user/user-query.atoms";
+import { Button } from "@/components/ui/button";
 import { useIsMobile } from "@/hooks/use-mobile";
 import { useZeroDocumentTypeCounts } from "@/hooks/use-zero-document-type-counts";
 import { fetchThreads } from "@/lib/chat/thread-persistence";
@@ -322,39 +323,45 @@ function TourTooltip({
 					{/* Navigation buttons */}
 					<div className="flex items-center gap-3">
 						{!isFirstStep && (
-							<button
+							<Button
 								type="button"
+								variant="ghost"
+								size="sm"
 								onClick={(e) => {
 									e.stopPropagation();
 									onPrev();
 								}}
-								className="text-sm font-medium text-muted-foreground transition-opacity hover:opacity-80"
+								className="h-auto px-0 py-0 text-sm text-muted-foreground hover:bg-transparent hover:text-muted-foreground hover:opacity-80"
 							>
 								Back
-							</button>
+							</Button>
 						)}
 						{isFirstStep && (
-							<button
+							<Button
 								type="button"
+								variant="ghost"
+								size="sm"
 								onClick={(e) => {
 									e.stopPropagation();
 									onSkip();
 								}}
-								className="text-sm font-medium text-muted-foreground transition-opacity hover:opacity-80"
+								className="h-auto px-0 py-0 text-sm text-muted-foreground hover:bg-transparent hover:text-muted-foreground hover:opacity-80"
 							>
 								Skip
-							</button>
+							</Button>
 						)}
-						<button
+						<Button
 							type="button"
+							variant="ghost"
+							size="sm"
 							onClick={(e) => {
 								e.stopPropagation();
 								onNext();
 							}}
-							className="text-sm font-medium text-foreground transition-opacity hover:opacity-80"
+							className="h-auto px-0 py-0 text-sm text-foreground hover:bg-transparent hover:text-foreground hover:opacity-80"
 						>
 							{isLastStep ? "Done" : "Next"}
-						</button>
+						</Button>
 					</div>
 				</div>
 			</div>
@@ -714,9 +721,10 @@ export function OnboardingTour() {
 			`}</style>
 			<div className="fixed inset-0 z-[99995]">
 				{/* Clickable backdrop to close */}
-				<button
+				<Button
 					type="button"
-					className="fixed inset-0 w-full h-full bg-transparent border-0 cursor-default"
+					variant="ghost"
+					className="fixed inset-0 h-full w-full rounded-none border-0 bg-transparent p-0 hover:bg-transparent cursor-default"
 					onClick={handleOverlayClick}
 					aria-label="Close tour"
 				/>

From f98bde1e04984f631d2c0ab5487041969542699d Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Thu, 14 May 2026 13:49:33 +0530
Subject: [PATCH 45/96] refactor: replace button elements with Button component
 for improved consistency and styling across UI components

---
 surfsense_web/app/desktop/login/page.tsx      | 16 +++---
 .../assistant-ui/assistant-message.tsx        | 21 ++++---
 .../components/assistant-ui/thread.tsx        | 56 ++++++++++++-------
 .../new-chat/document-mention-picker.tsx      | 22 +++++---
 .../components/new-chat/model-selector.tsx    | 28 ++++++----
 surfsense_web/components/ui/equation-node.tsx | 31 ++++++----
 surfsense_web/components/ui/hero-carousel.tsx | 35 +++++++-----
 7 files changed, 125 insertions(+), 84 deletions(-)

diff --git a/surfsense_web/app/desktop/login/page.tsx b/surfsense_web/app/desktop/login/page.tsx
index b3d0c1823..765ff8276 100644
--- a/surfsense_web/app/desktop/login/page.tsx
+++ b/surfsense_web/app/desktop/login/page.tsx
@@ -161,17 +161,18 @@ function HotkeyRow({
 						<RotateCcw className="size-3" />
 					</Button>
 				)}
-				<button
+				<Button
 					ref={inputRef}
 					type="button"
+					variant="ghost"
 					title={recording ? "Press shortcut keys" : "Click to edit shortcut"}
 					onClick={() => setRecording(true)}
 					onKeyDown={handleKeyDown}
 					onBlur={() => setRecording(false)}
 					className={
 						recording
-							? "flex h-7 items-center rounded-md border border-transparent bg-primary/5 outline-none ring-0 focus:outline-none focus-visible:outline-none focus-visible:ring-0"
-							: "flex h-7 cursor-pointer items-center rounded-md border border-transparent bg-transparent outline-none ring-0 transition-colors hover:bg-accent hover:text-accent-foreground focus:outline-none focus-visible:outline-none focus-visible:ring-0"
+							? "h-7 border border-transparent bg-primary/5 px-0 outline-none ring-0 focus:outline-none focus-visible:outline-none focus-visible:ring-0"
+							: "h-7 cursor-pointer border border-transparent bg-transparent px-0 outline-none ring-0 transition-colors hover:bg-accent hover:text-accent-foreground focus:outline-none focus-visible:outline-none focus-visible:ring-0"
 					}
 				>
 					{recording ? (
@@ -179,7 +180,7 @@ function HotkeyRow({
 					) : (
 						<ShortcutKbd keys={displayKeys} className="ml-0 px-1.5 text-foreground/85" />
 					)}
-				</button>
+				</Button>
 			</div>
 		</div>
 	);
@@ -388,10 +389,11 @@ export default function DesktopLoginPage() {
 												disabled={isLoggingIn}
 												className="h-9 pr-9"
 											/>
-											<button
+											<Button
 												type="button"
+												variant="ghost"
 												onClick={() => setShowPassword((v) => !v)}
-												className="absolute inset-y-0 right-0 flex items-center pr-2.5 text-muted-foreground hover:text-foreground"
+												className="absolute inset-y-0 right-0 h-auto bg-transparent px-2.5 py-0 text-muted-foreground hover:bg-transparent hover:text-foreground"
 												tabIndex={-1}
 											>
 												{showPassword ? (
@@ -399,7 +401,7 @@ export default function DesktopLoginPage() {
 												) : (
 													<Eye className="size-3.5" />
 												)}
-											</button>
+											</Button>
 										</div>
 									</div>
 
diff --git a/surfsense_web/components/assistant-ui/assistant-message.tsx b/surfsense_web/components/assistant-ui/assistant-message.tsx
index 59801e897..c0716f1eb 100644
--- a/surfsense_web/components/assistant-ui/assistant-message.tsx
+++ b/surfsense_web/components/assistant-ui/assistant-message.tsx
@@ -144,11 +144,12 @@ const MobileCitationDrawer: FC = () => {
 
 	return (
 		<>
-			<button
+			<Button
 				type="button"
+				variant="ghost"
 				onClick={() => setOpen(true)}
 				className={cn(
-					"isolate inline-flex cursor-pointer items-center gap-2 rounded-lg px-3 py-2",
+					"isolate h-auto cursor-pointer gap-2 rounded-lg px-3 py-2",
 					"bg-muted/40 outline-none",
 					"transition-colors duration-150",
 					"hover:bg-accent hover:text-accent-foreground",
@@ -194,7 +195,7 @@ const MobileCitationDrawer: FC = () => {
 				<span className="text-muted-foreground text-sm tabular-nums">
 					{citations.length} source{citations.length !== 1 && "s"}
 				</span>
-			</button>
+			</Button>
 
 			<Drawer open={open} onOpenChange={setOpen}>
 				<DrawerContent className="max-h-[85vh] flex flex-col">
@@ -204,11 +205,12 @@ const MobileCitationDrawer: FC = () => {
 					</DrawerHeader>
 					<div className="overflow-y-auto flex-1 min-h-0 px-1 pb-6">
 						{citations.map((citation) => (
-							<button
+							<Button
 								key={citation.id}
 								type="button"
+								variant="ghost"
 								onClick={() => handleNavigate(citation)}
-								className="group flex w-full items-center gap-2.5 rounded-md px-3 py-2.5 text-left transition-colors hover:bg-accent hover:text-accent-foreground focus-visible:bg-muted focus-visible:outline-none"
+								className="group h-auto w-full justify-start gap-2.5 px-3 py-2.5 text-left hover:bg-accent hover:text-accent-foreground focus-visible:bg-muted"
 							>
 								{citation.favicon ? (
 									// biome-ignore lint/performance/noImgElement: external favicon from arbitrary domain
@@ -230,7 +232,7 @@ const MobileCitationDrawer: FC = () => {
 									<p className="text-muted-foreground truncate text-xs">{citation.domain}</p>
 								</div>
 								<ExternalLink className="text-muted-foreground size-3.5 shrink-0 opacity-0 transition-opacity group-hover:opacity-100" />
-							</button>
+							</Button>
 						))}
 					</div>
 				</DrawerContent>
@@ -506,9 +508,10 @@ export const AssistantMessage: FC = () => {
 		>
 			{/* Fixed trigger slot prevents any vertical reflow when visibility changes */}
 			<div className="mr-2 mb-1 flex h-7 justify-end">
-				<button
+				<Button
 					ref={isDesktop ? commentTriggerRef : undefined}
 					type="button"
+					variant="ghost"
 					onClick={
 						showCommentTrigger
 							? isDesktop
@@ -519,7 +522,7 @@ export const AssistantMessage: FC = () => {
 					aria-hidden={!showCommentTrigger}
 					tabIndex={showCommentTrigger ? 0 : -1}
 					className={cn(
-						"flex items-center gap-1.5 rounded-full px-3 py-1 text-sm transition-colors",
+						"h-auto gap-1.5 rounded-full px-3 py-1 text-sm transition-colors",
 						"opacity-0 pointer-events-none",
 						showCommentTrigger && "opacity-100 pointer-events-auto",
 						isDesktop && isInlineOpen
@@ -537,7 +540,7 @@ export const AssistantMessage: FC = () => {
 					) : (
 						<span>Add comment</span>
 					)}
-				</button>
+				</Button>
 			</div>
 
 			{/* Desktop floating comment panel — overlays on top of chat content */}
diff --git a/surfsense_web/components/assistant-ui/thread.tsx b/surfsense_web/components/assistant-ui/thread.tsx
index 153e0d54d..31212b0d2 100644
--- a/surfsense_web/components/assistant-ui/thread.tsx
+++ b/surfsense_web/components/assistant-ui/thread.tsx
@@ -161,14 +161,16 @@ const PremiumQuotaPinnedAlert: FC = () => {
 				<div className="min-w-0 flex-1">
 					<p className="text-sm">{alert.message}</p>
 				</div>
-				<button
+				<Button
 					type="button"
-					className="inline-flex size-6 items-center justify-center text-muted-foreground transition-colors hover:text-accent-foreground"
+					variant="ghost"
+					size="icon"
+					className="size-6 text-muted-foreground hover:bg-transparent hover:text-accent-foreground"
 					aria-label="Dismiss premium quota alert"
 					onClick={() => clearPremiumAlertForThread(currentThreadId)}
 				>
 					<X className="size-4" />
-				</button>
+				</Button>
 			</div>
 		</div>
 	);
@@ -280,9 +282,11 @@ const ConnectToolsBanner: FC<{ isThreadEmpty: boolean }> = ({ isThreadEmpty }) =
 	return (
 		<div className="border-t border-border/50">
 			<div className="flex w-full items-center gap-2.5 px-4 py-2.5">
-				<button
+				<Button
 					type="button"
-					className="flex flex-1 items-center gap-2.5 text-left cursor-pointer select-none"
+					variant="ghost"
+					size="sm"
+					className="h-auto flex-1 justify-start gap-2.5 px-0 py-0 text-left cursor-pointer select-none hover:bg-transparent"
 					onClick={() => setConnectorDialogOpen(true)}
 				>
 					<Unplug className="size-4 text-muted-foreground shrink-0" />
@@ -300,15 +304,17 @@ const ConnectToolsBanner: FC<{ isThreadEmpty: boolean }> = ({ isThreadEmpty }) =
 							</Avatar>
 						))}
 					</AvatarGroup>
-				</button>
-				<button
+				</Button>
+				<Button
 					type="button"
 					onClick={handleDismiss}
-					className="shrink-0 ml-0.5 p-1.5 -mr-1 text-muted-foreground/40 hover:text-accent-foreground transition-colors cursor-pointer"
+					variant="ghost"
+					size="icon"
+					className="size-auto shrink-0 ml-0.5 -mr-1 p-1.5 text-muted-foreground/40 hover:bg-transparent hover:text-accent-foreground cursor-pointer"
 					aria-label="Dismiss"
 				>
 					<X className="size-3.5" />
-				</button>
+				</Button>
 			</div>
 		</div>
 	);
@@ -326,14 +332,16 @@ const PendingScreenImageStrip: FC = () => {
 				>
 					{/* biome-ignore lint/performance/noImgElement: data URL thumbnails from capture */}
 					<img src={url} alt="" className="size-full object-cover" draggable={false} />
-					<button
+					<Button
 						type="button"
 						onClick={() => setUrls((prev) => prev.filter((_, i) => i !== index))}
-						className="absolute right-0.5 top-0.5 flex size-5 items-center justify-center rounded-full bg-background/90 text-muted-foreground shadow-sm transition-opacity hover:text-accent-foreground sm:opacity-0 sm:group-hover:opacity-100"
+						variant="ghost"
+						size="icon"
+						className="absolute right-0.5 top-0.5 size-5 rounded-full bg-background/90 text-muted-foreground shadow-sm transition-opacity hover:bg-background/90 hover:text-accent-foreground sm:opacity-0 sm:group-hover:opacity-100"
 						aria-label="Remove screenshot"
 					>
 						<X className="size-3" />
-					</button>
+					</Button>
 				</div>
 			))}
 		</div>
@@ -352,21 +360,25 @@ const ClipboardChip: FC<{ text: string; onDismiss: () => void }> = ({ text, onDi
 				<span className="text-xs font-medium text-muted-foreground">From clipboard</span>
 				<div className="flex-1" />
 				{isLong && (
-					<button
+					<Button
 						type="button"
 						onClick={() => setExpanded((v) => !v)}
-						className="flex items-center text-muted-foreground hover:text-accent-foreground transition-colors"
+						variant="ghost"
+						size="icon"
+						className="size-5 text-muted-foreground hover:bg-transparent hover:text-accent-foreground"
 					>
 						{expanded ? <ChevronUp className="size-3.5" /> : <ChevronDown className="size-3.5" />}
-					</button>
+					</Button>
 				)}
-				<button
+				<Button
 					type="button"
 					onClick={onDismiss}
-					className="flex items-center text-muted-foreground hover:text-accent-foreground transition-colors"
+					variant="ghost"
+					size="icon"
+					className="size-5 text-muted-foreground hover:bg-transparent hover:text-accent-foreground"
 				>
 					<X className="size-3.5" />
-				</button>
+				</Button>
 			</div>
 			<div className="px-3 pb-2">
 				<p className="text-xs text-foreground/80 whitespace-pre-wrap wrap-break-word leading-relaxed">
@@ -1173,13 +1185,15 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 					</Popover>
 				)}
 				{hasWebSearchTool && (
-					<button
+					<Button
 						type="button"
+						variant="ghost"
+						size="sm"
 						aria-label={isWebSearchEnabled ? "Disable web search" : "Enable web search"}
 						aria-pressed={isWebSearchEnabled}
 						onClick={() => toggleTool("web_search")}
 						className={cn(
-							"rounded-full transition-[background-color,border-color,color] flex items-center gap-1 px-2 py-1 border h-8 select-none",
+							"rounded-full transition-[background-color,border-color,color] flex items-center gap-1 px-2 py-1 border h-8 select-none hover:bg-transparent",
 							isWebSearchEnabled
 								? "bg-sky-500/15 border-sky-500/60 text-sky-500"
 								: "bg-transparent border-transparent text-muted-foreground hover:text-accent-foreground"
@@ -1212,7 +1226,7 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 								</motion.span>
 							)}
 						</AnimatePresence>
-					</button>
+					</Button>
 				)}
 			</div>
 			{!hasModelConfigured && (
diff --git a/surfsense_web/components/new-chat/document-mention-picker.tsx b/surfsense_web/components/new-chat/document-mention-picker.tsx
index cb61a5f2b..a2b3c138c 100644
--- a/surfsense_web/components/new-chat/document-mention-picker.tsx
+++ b/surfsense_web/components/new-chat/document-mention-picker.tsx
@@ -17,6 +17,7 @@ import {
 	FOLDER_MENTION_DOCUMENT_TYPE,
 	type MentionedDocumentInfo,
 } from "@/atoms/chat/mentioned-documents.atom";
+import { Button } from "@/components/ui/button";
 import { Skeleton } from "@/components/ui/skeleton";
 import { getConnectorIcon } from "@/contracts/enums/connectorIcons";
 import type { Document, SearchDocumentTitlesResponse } from "@/contracts/types/document.types";
@@ -484,7 +485,7 @@ export const DocumentMentionPicker = forwardRef<
 									const isHighlighted = !isAlreadySelected && selectableIndex === highlightedIndex;
 
 									return (
-										<button
+										<Button
 											key={docKey}
 											ref={(el) => {
 												if (el && selectableIndex >= 0) {
@@ -492,6 +493,7 @@ export const DocumentMentionPicker = forwardRef<
 												}
 											}}
 											type="button"
+											variant="ghost"
 											onClick={() => !isAlreadySelected && handleSelectMention(mention)}
 											onMouseEnter={() => {
 												if (!isAlreadySelected && selectableIndex >= 0) {
@@ -500,7 +502,7 @@ export const DocumentMentionPicker = forwardRef<
 											}}
 											disabled={isAlreadySelected}
 											className={cn(
-												"w-full flex items-center gap-2 px-3 py-2 text-left transition-colors rounded-md",
+												"h-auto w-full justify-start gap-2 px-3 py-2 text-left transition-colors",
 												isAlreadySelected ? "opacity-50 cursor-not-allowed" : "cursor-pointer",
 												isHighlighted && "bg-accent text-accent-foreground"
 											)}
@@ -511,7 +513,7 @@ export const DocumentMentionPicker = forwardRef<
 											<span className="flex-1 text-sm truncate" title={doc.title}>
 												{doc.title}
 											</span>
-										</button>
+										</Button>
 									);
 								})}
 							</>
@@ -541,7 +543,7 @@ export const DocumentMentionPicker = forwardRef<
 									const isHighlighted = !isAlreadySelected && selectableIndex === highlightedIndex;
 
 									return (
-										<button
+										<Button
 											key={docKey}
 											ref={(el) => {
 												if (el && selectableIndex >= 0) {
@@ -549,6 +551,7 @@ export const DocumentMentionPicker = forwardRef<
 												}
 											}}
 											type="button"
+											variant="ghost"
 											onClick={() => !isAlreadySelected && handleSelectMention(mention)}
 											onMouseEnter={() => {
 												if (!isAlreadySelected && selectableIndex >= 0) {
@@ -557,7 +560,7 @@ export const DocumentMentionPicker = forwardRef<
 											}}
 											disabled={isAlreadySelected}
 											className={cn(
-												"w-full flex items-center gap-2 px-3 py-2 text-left transition-colors rounded-md",
+												"h-auto w-full justify-start gap-2 px-3 py-2 text-left transition-colors",
 												isAlreadySelected ? "opacity-50 cursor-not-allowed" : "cursor-pointer",
 												isHighlighted && "bg-accent text-accent-foreground"
 											)}
@@ -568,7 +571,7 @@ export const DocumentMentionPicker = forwardRef<
 											<span className="flex-1 text-sm truncate" title={doc.title}>
 												{doc.title}
 											</span>
-										</button>
+										</Button>
 									);
 								})}
 							</>
@@ -595,7 +598,7 @@ export const DocumentMentionPicker = forwardRef<
 									const isHighlighted = !isAlreadySelected && selectableIndex === highlightedIndex;
 
 									return (
-										<button
+										<Button
 											key={folderKey}
 											ref={(el) => {
 												if (el && selectableIndex >= 0) {
@@ -603,6 +606,7 @@ export const DocumentMentionPicker = forwardRef<
 												}
 											}}
 											type="button"
+											variant="ghost"
 											onClick={() => !isAlreadySelected && handleSelectMention(folder)}
 											onMouseEnter={() => {
 												if (!isAlreadySelected && selectableIndex >= 0) {
@@ -611,7 +615,7 @@ export const DocumentMentionPicker = forwardRef<
 											}}
 											disabled={isAlreadySelected}
 											className={cn(
-												"w-full flex items-center gap-2 px-3 py-2 text-left transition-colors rounded-md",
+												"h-auto w-full justify-start gap-2 px-3 py-2 text-left transition-colors",
 												isAlreadySelected ? "opacity-50 cursor-not-allowed" : "cursor-pointer",
 												isHighlighted && "bg-accent text-accent-foreground"
 											)}
@@ -622,7 +626,7 @@ export const DocumentMentionPicker = forwardRef<
 											<span className="flex-1 text-sm truncate" title={folder.title}>
 												{folder.title}
 											</span>
-										</button>
+										</Button>
 									);
 								})}
 							</>
diff --git a/surfsense_web/components/new-chat/model-selector.tsx b/surfsense_web/components/new-chat/model-selector.tsx
index a88a8d04e..6f7c946f0 100644
--- a/surfsense_web/components/new-chat/model-selector.tsx
+++ b/surfsense_web/components/new-chat/model-selector.tsx
@@ -853,14 +853,15 @@ export function ModelSelector({
 								: "opacity-100 translate-y-0 pointer-events-auto"
 						)}
 					>
-						<button
+						<Button
 							type="button"
+							variant="ghost"
 							aria-label="Scroll providers up"
 							onClick={() => scrollProviderSidebar("backward")}
-							className="flex h-4 w-4 items-center justify-center rounded-sm text-muted-foreground/90 hover:text-accent-foreground hover:bg-accent transition-colors"
+							className="h-4 w-4 rounded-sm p-0 text-muted-foreground/90 hover:bg-accent hover:text-accent-foreground"
 						>
 							<ChevronUp className="size-3" />
-						</button>
+						</Button>
 					</div>
 				)}
 				{isMobile && (
@@ -913,12 +914,13 @@ export function ModelSelector({
 									))}
 								<Tooltip>
 									<TooltipTrigger asChild>
-										<button
+										<Button
 											type="button"
+											variant="ghost"
 											onClick={() => setSelectedProvider(provider)}
 											tabIndex={-1}
 											className={cn(
-												"relative flex items-center justify-center rounded-md transition-all duration-150",
+												"relative h-auto rounded-md transition-all duration-150",
 												isMobile ? "p-2 shrink-0" : "p-1.5 w-full",
 												isActive
 													? "bg-primary/10 text-primary"
@@ -934,7 +936,7 @@ export function ModelSelector({
 													className: "size-4",
 												})
 											)}
-										</button>
+										</Button>
 									</TooltipTrigger>
 									<TooltipContent side={isMobile ? "bottom" : "right"}>
 										{isAll ? "All Models" : formatProviderName(provider)}
@@ -954,14 +956,15 @@ export function ModelSelector({
 								: "opacity-100 translate-y-0 pointer-events-auto"
 						)}
 					>
-						<button
+						<Button
 							type="button"
+							variant="ghost"
 							aria-label="Scroll providers down"
 							onClick={() => scrollProviderSidebar("forward")}
-							className="flex h-4 w-4 items-center justify-center rounded-sm text-muted-foreground/90 hover:text-accent-foreground hover:bg-accent transition-colors"
+							className="h-4 w-4 rounded-sm p-0 text-muted-foreground/90 hover:bg-accent hover:text-accent-foreground"
 						>
 							<ChevronDown className="size-3" />
-						</button>
+						</Button>
 					</div>
 				)}
 				{isMobile && (
@@ -1175,13 +1178,14 @@ export function ModelSelector({
 								},
 							] as const
 						).map(({ value, icon: Icon, label }) => (
-							<button
+							<Button
 								key={value}
 								type="button"
+								variant="ghost"
 								// onClick={() => setActiveTab(value)}
 								onClick={() => handleTabChange(value)}
 								className={cn(
-									"flex items-center justify-center gap-1.5 text-sm font-medium transition-all duration-200 border-b-[1.5px]",
+									"h-auto rounded-none px-0 py-0 gap-1.5 text-sm font-medium transition-all duration-200 border-b-[1.5px] hover:bg-transparent",
 									activeTab === value
 										? "border-foreground dark:border-white text-foreground"
 										: "border-transparent text-muted-foreground hover:text-accent-foreground"
@@ -1189,7 +1193,7 @@ export function ModelSelector({
 							>
 								<Icon className="size-3.5" />
 								{label}
-							</button>
+							</Button>
 						))}
 					</div>
 				</div>
diff --git a/surfsense_web/components/ui/equation-node.tsx b/surfsense_web/components/ui/equation-node.tsx
index 98bcf5f8e..5ceea83e5 100644
--- a/surfsense_web/components/ui/equation-node.tsx
+++ b/surfsense_web/components/ui/equation-node.tsx
@@ -6,6 +6,7 @@ import type { TEquationElement } from "platejs";
 import { PlateElement, type PlateElementProps, useSelected } from "platejs/react";
 import * as React from "react";
 
+import { Button } from "@/components/ui/button";
 import { cn } from "@/lib/utils";
 
 export function EquationElement({ children, ...props }: PlateElementProps<TEquationElement>) {
@@ -74,20 +75,23 @@ export function EquationElement({ children, ...props }: PlateElementProps<TEquat
 						{...inputProps}
 					/>
 					<div className="mt-1 flex justify-end gap-1">
-						<button
-							className="rounded px-2 py-1 text-xs text-muted-foreground hover:bg-accent"
+						<Button
+							variant="ghost"
+							size="sm"
+							className="h-auto px-2 py-1 text-xs text-muted-foreground"
 							onClick={onDismiss}
 							type="button"
 						>
 							Cancel
-						</button>
-						<button
-							className="rounded bg-primary px-2 py-1 text-xs text-primary-foreground hover:bg-primary/90"
+						</Button>
+						<Button
+							size="sm"
+							className="h-auto px-2 py-1 text-xs"
 							onClick={onSubmit}
 							type="button"
 						>
 							Done
-						</button>
+						</Button>
 					</div>
 				</div>
 			)}
@@ -162,20 +166,23 @@ export function InlineEquationElement({ children, ...props }: PlateElementProps<
 						{...inputProps}
 					/>
 					<span className="mt-1 flex justify-end gap-1">
-						<button
-							className="rounded px-2 py-0.5 text-xs text-muted-foreground hover:bg-accent"
+						<Button
+							variant="ghost"
+							size="sm"
+							className="h-auto px-2 py-0.5 text-xs text-muted-foreground"
 							onClick={onDismiss}
 							type="button"
 						>
 							Cancel
-						</button>
-						<button
-							className="rounded bg-primary px-2 py-0.5 text-xs text-primary-foreground hover:bg-primary/90"
+						</Button>
+						<Button
+							size="sm"
+							className="h-auto px-2 py-0.5 text-xs"
 							onClick={onSubmit}
 							type="button"
 						>
 							Done
-						</button>
+						</Button>
 					</span>
 				</span>
 			)}
diff --git a/surfsense_web/components/ui/hero-carousel.tsx b/surfsense_web/components/ui/hero-carousel.tsx
index 2c1a98f46..53c1febac 100644
--- a/surfsense_web/components/ui/hero-carousel.tsx
+++ b/surfsense_web/components/ui/hero-carousel.tsx
@@ -3,7 +3,8 @@
 import { ChevronLeft, ChevronRight } from "lucide-react";
 import { AnimatePresence, motion } from "motion/react";
 import { useCallback, useEffect, useRef, useState } from "react";
-import { ExpandedGifOverlay, useExpandedGif } from "@/components/ui/expanded-gif-overlay";
+import { Button } from "@/components/ui/button";
+import { ExpandedMediaOverlay, useExpandedMedia } from "@/components/ui/expanded-gif-overlay";
 
 const carouselItems = [
 	{
@@ -70,7 +71,7 @@ function HeroCarouselCard({
 	src: string;
 	onExpandedChange?: (expanded: boolean) => void;
 }) {
-	const { expanded, open, close } = useExpandedGif();
+	const { expanded, open, close } = useExpandedMedia();
 	const videoRef = useRef<HTMLVideoElement>(null);
 	const [hasLoaded, setHasLoaded] = useState(false);
 
@@ -147,7 +148,7 @@ function HeroCarouselCard({
 			</div>
 
 			<AnimatePresence>
-				{expanded && <ExpandedGifOverlay src={src} alt={title} onClose={close} />}
+				{expanded && <ExpandedMediaOverlay src={src} alt={title} onClose={close} />}
 			</AnimatePresence>
 		</>
 	);
@@ -204,22 +205,26 @@ function HeroCarousel() {
 			</div>
 
 			<div className="relative z-5 mt-4 flex items-center justify-center gap-2">
-				<button
+				<Button
 					type="button"
+					variant="ghost"
+					size="icon"
 					onClick={() => !isGifExpanded && goToPrev()}
-					className="flex size-11 items-center justify-center rounded-full border border-neutral-200 bg-white text-neutral-700 shadow-sm transition-colors hover:bg-neutral-100 touch-manipulation dark:border-neutral-700 dark:bg-neutral-800 dark:text-neutral-200 dark:hover:bg-neutral-700"
+					className="size-11 rounded-full border border-neutral-200 bg-white text-neutral-700 shadow-sm hover:bg-neutral-100 touch-manipulation dark:border-neutral-700 dark:bg-neutral-800 dark:text-neutral-200 dark:hover:bg-neutral-700"
 					aria-label="Previous slide"
 				>
 					<ChevronLeft className="size-5" />
-				</button>
+				</Button>
 
 				<div className="flex items-center">
-					{carouselItems.map((_, i) => (
-						<button
-							key={`dot_${i}`}
+					{carouselItems.map((carouselItem, i) => (
+						<Button
+							key={carouselItem.src}
 							type="button"
+							variant="ghost"
+							size="icon"
 							onClick={() => !isGifExpanded && goTo(i)}
-							className="flex h-11 min-w-[28px] items-center justify-center touch-manipulation"
+							className="h-11 min-w-[28px] bg-transparent p-0 hover:bg-transparent touch-manipulation"
 							aria-label={`Go to slide ${i + 1}`}
 						>
 							<span
@@ -229,18 +234,20 @@ function HeroCarousel() {
 										: "w-2.5 bg-neutral-300 hover:bg-neutral-400 dark:bg-neutral-600 dark:hover:bg-neutral-500"
 								}`}
 							/>
-						</button>
+						</Button>
 					))}
 				</div>
 
-				<button
+				<Button
 					type="button"
+					variant="ghost"
+					size="icon"
 					onClick={() => !isGifExpanded && goToNext()}
-					className="flex size-11 items-center justify-center rounded-full border border-neutral-200 bg-white text-neutral-700 shadow-sm transition-colors hover:bg-neutral-100 touch-manipulation dark:border-neutral-700 dark:bg-neutral-800 dark:text-neutral-200 dark:hover:bg-neutral-700"
+					className="size-11 rounded-full border border-neutral-200 bg-white text-neutral-700 shadow-sm hover:bg-neutral-100 touch-manipulation dark:border-neutral-700 dark:bg-neutral-800 dark:text-neutral-200 dark:hover:bg-neutral-700"
 					aria-label="Next slide"
 				>
 					<ChevronRight className="size-5" />
-				</button>
+				</Button>
 			</div>
 		</div>
 	);

From 23e05acc7c544b44693bc9e830700d49b2f0a432 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Thu, 14 May 2026 13:49:52 +0530
Subject: [PATCH 46/96] refactor: remove CitationList component to streamline
 citation handling and improve code maintainability

---
 .../tool-ui/citation/citation-list.tsx        | 387 ------------------
 .../components/tool-ui/citation/index.ts      |   2 -
 2 files changed, 389 deletions(-)
 delete mode 100644 surfsense_web/components/tool-ui/citation/citation-list.tsx

diff --git a/surfsense_web/components/tool-ui/citation/citation-list.tsx b/surfsense_web/components/tool-ui/citation/citation-list.tsx
deleted file mode 100644
index 94737f142..000000000
--- a/surfsense_web/components/tool-ui/citation/citation-list.tsx
+++ /dev/null
@@ -1,387 +0,0 @@
-"use client";
-
-import { ExternalLink, Globe } from "lucide-react";
-import NextImage from "next/image";
-import * as React from "react";
-import { openSafeNavigationHref, resolveSafeNavigationHref } from "../shared/media";
-import { cn, Popover, PopoverContent, PopoverTrigger } from "./_adapter";
-import { Citation } from "./citation";
-import type { CitationVariant, SerializableCitation } from "./schema";
-import { TYPE_ICONS } from "./type-icons";
-
-function useHoverPopover(delay = 100) {
-	const [open, setOpen] = React.useState(false);
-	const timeoutRef = React.useRef<ReturnType<typeof setTimeout> | null>(null);
-	const containerRef = React.useRef<HTMLDivElement>(null);
-
-	const handleMouseEnter = React.useCallback(() => {
-		if (timeoutRef.current) clearTimeout(timeoutRef.current);
-		timeoutRef.current = setTimeout(() => setOpen(true), delay);
-	}, [delay]);
-
-	const handleMouseLeave = React.useCallback(() => {
-		if (timeoutRef.current) clearTimeout(timeoutRef.current);
-		timeoutRef.current = setTimeout(() => setOpen(false), delay);
-	}, [delay]);
-
-	const handleFocus = React.useCallback(() => {
-		if (timeoutRef.current) clearTimeout(timeoutRef.current);
-		setOpen(true);
-	}, []);
-
-	const handleBlur = React.useCallback(
-		(e: React.FocusEvent) => {
-			const relatedTarget = e.relatedTarget as HTMLElement | null;
-			if (containerRef.current?.contains(relatedTarget)) {
-				return;
-			}
-			if (relatedTarget?.closest("[data-radix-popper-content-wrapper]")) {
-				return;
-			}
-			if (timeoutRef.current) clearTimeout(timeoutRef.current);
-			timeoutRef.current = setTimeout(() => setOpen(false), delay);
-		},
-		[delay]
-	);
-
-	React.useEffect(() => {
-		return () => {
-			if (timeoutRef.current) clearTimeout(timeoutRef.current);
-		};
-	}, []);
-
-	return {
-		open,
-		setOpen,
-		containerRef,
-		handleMouseEnter,
-		handleMouseLeave,
-		handleFocus,
-		handleBlur,
-	};
-}
-
-export interface CitationListProps {
-	id: string;
-	citations: SerializableCitation[];
-	variant?: CitationVariant;
-	maxVisible?: number;
-	className?: string;
-	onNavigate?: (href: string, citation: SerializableCitation) => void;
-}
-
-export function CitationList(props: CitationListProps) {
-	const { id, citations, variant = "default", maxVisible, className, onNavigate } = props;
-
-	const shouldTruncate = maxVisible !== undefined && citations.length > maxVisible;
-	const visibleCitations = shouldTruncate ? citations.slice(0, maxVisible) : citations;
-	const overflowCitations = shouldTruncate ? citations.slice(maxVisible) : [];
-	const overflowCount = overflowCitations.length;
-
-	const wrapperClass =
-		variant === "inline" ? "flex flex-wrap items-center gap-1.5" : "flex flex-col gap-2";
-
-	// Stacked variant: overlapping favicons with popover
-	if (variant === "stacked") {
-		return (
-			<StackedCitations
-				id={id}
-				citations={citations}
-				className={className}
-				onNavigate={onNavigate}
-			/>
-		);
-	}
-
-	if (variant === "default") {
-		return (
-			<div
-				className={cn("isolate flex flex-col gap-4", className)}
-				data-tool-ui-id={id}
-				data-slot="citation-list"
-			>
-				{visibleCitations.map((citation) => (
-					<Citation key={citation.id} {...citation} variant="default" onNavigate={onNavigate} />
-				))}
-				{shouldTruncate && (
-					<OverflowIndicator
-						citations={overflowCitations}
-						count={overflowCount}
-						variant="default"
-						onNavigate={onNavigate}
-					/>
-				)}
-			</div>
-		);
-	}
-
-	return (
-		<div
-			className={cn("isolate", wrapperClass, className)}
-			data-tool-ui-id={id}
-			data-slot="citation-list"
-		>
-			{visibleCitations.map((citation) => (
-				<Citation key={citation.id} {...citation} variant={variant} onNavigate={onNavigate} />
-			))}
-			{shouldTruncate && (
-				<OverflowIndicator
-					citations={overflowCitations}
-					count={overflowCount}
-					variant={variant}
-					onNavigate={onNavigate}
-				/>
-			)}
-		</div>
-	);
-}
-
-interface OverflowIndicatorProps {
-	citations: SerializableCitation[];
-	count: number;
-	variant: CitationVariant;
-	onNavigate?: (href: string, citation: SerializableCitation) => void;
-}
-
-function OverflowIndicator({ citations, count, variant, onNavigate }: OverflowIndicatorProps) {
-	const { open, handleMouseEnter, handleMouseLeave } = useHoverPopover();
-
-	const handleClick = (citation: SerializableCitation) => {
-		const href = resolveSafeNavigationHref(citation.href);
-		if (!href) return;
-		if (onNavigate) {
-			onNavigate(href, citation);
-		} else {
-			openSafeNavigationHref(href);
-		}
-	};
-
-	const popoverContent = (
-		<div className="flex max-h-72 flex-col overflow-y-auto">
-			{citations.map((citation) => (
-				<OverflowItem key={citation.id} citation={citation} onClick={() => handleClick(citation)} />
-			))}
-		</div>
-	);
-
-	if (variant === "inline") {
-		return (
-			<Popover open={open}>
-				<PopoverTrigger asChild>
-					<button
-						type="button"
-						onMouseEnter={handleMouseEnter}
-						onMouseLeave={handleMouseLeave}
-						className={cn(
-							"inline-flex items-center gap-1 rounded-md px-2 py-1",
-							"bg-muted/60 text-sm tabular-nums",
-							"transition-colors duration-150",
-							"hover:bg-accent hover:text-accent-foreground",
-							"focus-visible:ring-ring focus-visible:ring-2 focus-visible:outline-none"
-						)}
-					>
-						<span className="text-muted-foreground">+{count} more</span>
-					</button>
-				</PopoverTrigger>
-				<PopoverContent
-					side="top"
-					align="start"
-					className="w-80 p-1"
-					onMouseEnter={handleMouseEnter}
-					onMouseLeave={handleMouseLeave}
-					onOpenAutoFocus={(e) => e.preventDefault()}
-				>
-					{popoverContent}
-				</PopoverContent>
-			</Popover>
-		);
-	}
-
-	// Default variant
-	return (
-		<Popover open={open}>
-			<PopoverTrigger asChild>
-				<button
-					type="button"
-					onMouseEnter={handleMouseEnter}
-					onMouseLeave={handleMouseLeave}
-					className={cn(
-						"flex items-center justify-center rounded-xl px-4 py-3",
-						"border-border bg-card border border-dashed",
-						"transition-colors duration-150",
-						"hover:border-foreground/25 hover:bg-accent hover:text-accent-foreground",
-						"focus-visible:ring-ring focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:outline-none"
-					)}
-				>
-					<span className="text-muted-foreground text-sm tabular-nums">+{count} more sources</span>
-				</button>
-			</PopoverTrigger>
-			<PopoverContent
-				side="bottom"
-				align="start"
-				className="w-80 p-1"
-				onMouseEnter={handleMouseEnter}
-				onMouseLeave={handleMouseLeave}
-				onOpenAutoFocus={(e) => e.preventDefault()}
-			>
-				{popoverContent}
-			</PopoverContent>
-		</Popover>
-	);
-}
-
-interface OverflowItemProps {
-	citation: SerializableCitation;
-	onClick: () => void;
-}
-
-function OverflowItem({ citation, onClick }: OverflowItemProps) {
-	const TypeIcon = TYPE_ICONS[citation.type ?? "webpage"] ?? Globe;
-
-	return (
-		<button
-			type="button"
-			onClick={onClick}
-			className="group hover:bg-accent hover:text-accent-foreground focus-visible:bg-muted flex w-full cursor-pointer items-center gap-2.5 rounded-md px-2 py-2 text-left transition-colors focus-visible:outline-none"
-		>
-			{citation.favicon ? (
-				<NextImage
-					src={citation.favicon}
-					alt=""
-					aria-hidden="true"
-					width={18}
-					height={18}
-					className="size-4.5 rounded-full object-cover"
-					unoptimized={true}
-				/>
-			) : (
-				<TypeIcon className="text-muted-foreground size-3" aria-hidden="true" />
-			)}
-			<div className="min-w-0 flex-1">
-				<p className="group-hover:decoration-foreground/30 truncate text-sm font-medium group-hover:underline group-hover:underline-offset-2">
-					{citation.title}
-				</p>
-				<p className="text-muted-foreground truncate text-xs">{citation.domain}</p>
-			</div>
-			<ExternalLink className="text-muted-foreground mt-0.5 size-3.5 shrink-0 self-start opacity-0 transition-opacity group-hover:opacity-100" />
-		</button>
-	);
-}
-
-interface StackedCitationsProps {
-	id: string;
-	citations: SerializableCitation[];
-	className?: string;
-	onNavigate?: (href: string, citation: SerializableCitation) => void;
-}
-
-function StackedCitations({ id, citations, className, onNavigate }: StackedCitationsProps) {
-	const { open, setOpen, containerRef, handleMouseEnter, handleMouseLeave, handleBlur } =
-		useHoverPopover();
-	const maxIcons = 4;
-	const visibleCitations = citations.slice(0, maxIcons);
-	const remainingCount = Math.max(0, citations.length - maxIcons);
-
-	const handleClick = (citation: SerializableCitation) => {
-		const href = resolveSafeNavigationHref(citation.href);
-		if (!href) return;
-		if (onNavigate) {
-			onNavigate(href, citation);
-		} else {
-			openSafeNavigationHref(href);
-		}
-	};
-
-	return (
-		// biome-ignore lint/a11y/noStaticElementInteractions: blur boundary for popover focus management
-		<div ref={containerRef} onBlur={handleBlur} className="inline-flex">
-			<Popover open={open}>
-				<PopoverTrigger asChild>
-					<button
-						type="button"
-						data-tool-ui-id={id}
-						data-slot="citation-list"
-						onMouseEnter={handleMouseEnter}
-						onMouseLeave={handleMouseLeave}
-						onKeyDown={(e) => {
-							if (e.key === "Enter" || e.key === " ") {
-								e.preventDefault();
-								setOpen(true);
-							}
-						}}
-						className={cn(
-							"isolate inline-flex cursor-pointer items-center gap-2 rounded-lg px-3 py-2",
-							"bg-muted/40 outline-none",
-							"transition-colors duration-150",
-							"hover:bg-accent hover:text-accent-foreground",
-							"focus-visible:ring-ring focus-visible:ring-2",
-							className
-						)}
-					>
-						<div className="flex items-center">
-							{visibleCitations.map((citation, index) => {
-								const TypeIcon = TYPE_ICONS[citation.type ?? "webpage"] ?? Globe;
-								return (
-									<div
-										key={citation.id}
-										className={cn(
-											"border-border bg-background dark:border-foreground/20 relative flex size-6 items-center justify-center rounded-full border shadow-xs",
-											index > 0 && "-ml-2"
-										)}
-										style={{ zIndex: maxIcons - index }}
-									>
-										{citation.favicon ? (
-											<NextImage
-												src={citation.favicon}
-												alt=""
-												aria-hidden="true"
-												width={18}
-												height={18}
-												className="size-4.5 rounded-full object-cover"
-												unoptimized={true}
-											/>
-										) : (
-											<TypeIcon className="text-muted-foreground size-3" aria-hidden="true" />
-										)}
-									</div>
-								);
-							})}
-							{remainingCount > 0 && (
-								<div
-									className="border-border bg-background dark:border-foreground/20 relative -ml-2 flex size-6 items-center justify-center rounded-full border shadow-xs"
-									style={{ zIndex: 0 }}
-								>
-									<span className="text-muted-foreground text-[10px] font-medium tracking-tight">
-										•••
-									</span>
-								</div>
-							)}
-						</div>
-						<span className="text-muted-foreground text-sm tabular-nums">
-							{citations.length} source{citations.length !== 1 && "s"}
-						</span>
-					</button>
-				</PopoverTrigger>
-				<PopoverContent
-					side="bottom"
-					align="start"
-					className="w-80 p-1"
-					onMouseEnter={handleMouseEnter}
-					onMouseLeave={handleMouseLeave}
-					onBlur={handleBlur}
-					onEscapeKeyDown={() => setOpen(false)}
-				>
-					<div className="flex max-h-72 flex-col overflow-y-auto">
-						{citations.map((citation) => (
-							<OverflowItem
-								key={citation.id}
-								citation={citation}
-								onClick={() => handleClick(citation)}
-							/>
-						))}
-					</div>
-				</PopoverContent>
-			</Popover>
-		</div>
-	);
-}
diff --git a/surfsense_web/components/tool-ui/citation/index.ts b/surfsense_web/components/tool-ui/citation/index.ts
index 2abcc5746..8a6415903 100644
--- a/surfsense_web/components/tool-ui/citation/index.ts
+++ b/surfsense_web/components/tool-ui/citation/index.ts
@@ -1,7 +1,5 @@
 export type { CitationProps } from "./citation";
 export { Citation } from "./citation";
-export type { CitationListProps } from "./citation-list";
-export { CitationList } from "./citation-list";
 export type {
 	CitationType,
 	CitationVariant,

From 3d42712b3f2befd6abd2d4241c78f50de119d435 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Thu, 14 May 2026 14:17:44 +0530
Subject: [PATCH 47/96] refactor: replace button elements with Button component
 for improved consistency and styling across multiple UI components

---
 .../components/CommunityPromptsContent.tsx    |   7 +-
 .../components/DesktopShortcutsContent.tsx    |   9 +-
 .../components/PromptsContent.tsx             |  15 +-
 .../app/desktop/permissions/page.tsx          |   7 +-
 .../agent-action-log/action-log-item.tsx      |   7 +-
 .../components/assistant-ui/image.tsx         | 134 ++++++------------
 .../connectors/google-drive-folder-tree.tsx   |  23 +--
 .../components/documents/DocumentsFilters.tsx |   8 +-
 .../documents/FolderPickerDialog.tsx          |  71 +++++-----
 .../components/documents/version-history.tsx  |   7 +-
 .../editor/plugins/citation-kit.tsx           |  55 +++----
 .../components/free-chat/free-composer.tsx    |   8 +-
 .../free-chat/quota-warning-banner.tsx        |   9 +-
 surfsense_web/components/homepage/cta.tsx     |  16 ++-
 .../components/homepage/hero-section.tsx      |  76 +++++-----
 surfsense_web/components/homepage/navbar.tsx  |  15 +-
 .../layout/ui/icon-rail/SearchSpaceAvatar.tsx |   9 +-
 .../ui/sidebar/AllSharedChatsSidebar.tsx      |  14 +-
 .../layout/ui/sidebar/ChatListItem.tsx        |   7 +-
 .../layout/ui/sidebar/InboxSidebar.tsx        |  49 ++++---
 .../components/layout/ui/sidebar/Sidebar.tsx  |  15 +-
 .../layout/ui/sidebar/SidebarButton.tsx       |   6 -
 .../layout/ui/sidebar/SidebarUserProfile.tsx  |  17 ++-
 .../components/layout/ui/tabs/TabBar.tsx      |  66 ++++-----
 .../components/new-chat/chat-share-button.tsx |  34 ++---
 .../components/sources/DocumentUploadTab.tsx  |  82 ++++++-----
 surfsense_web/components/ui/link-toolbar.tsx  |  59 +++-----
 27 files changed, 401 insertions(+), 424 deletions(-)

diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/CommunityPromptsContent.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/CommunityPromptsContent.tsx
index 239832b2d..8fe8f40ed 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/CommunityPromptsContent.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/CommunityPromptsContent.tsx
@@ -96,13 +96,14 @@ export function CommunityPromptsContent() {
 									{prompt.prompt}
 								</p>
 								{prompt.prompt.length > 100 && (
-									<button
+									<Button
 										type="button"
+										variant="link"
 										onClick={() => setExpandedId(expandedId === prompt.id ? null : prompt.id)}
-										className="mt-1 text-[11px] text-primary hover:underline cursor-pointer"
+										className="mt-1 h-auto cursor-pointer px-0 py-0 text-[11px] text-primary"
 									>
 										{expandedId === prompt.id ? "See less" : "See more"}
-									</button>
+									</Button>
 								)}
 							</div>
 							<Button
diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/DesktopShortcutsContent.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/DesktopShortcutsContent.tsx
index b17f5b9ba..3abe46f6c 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/DesktopShortcutsContent.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/DesktopShortcutsContent.tsx
@@ -97,17 +97,18 @@ function HotkeyRow({
 						<RotateCcw className="size-3" />
 					</Button>
 				)}
-				<button
+				<Button
 					ref={inputRef}
 					type="button"
+					variant="ghost"
 					title={recording ? "Press shortcut keys" : "Click to edit shortcut"}
 					onClick={() => setRecording(true)}
 					onKeyDown={handleKeyDown}
 					onBlur={() => setRecording(false)}
 					className={
 						recording
-							? "flex h-7 items-center rounded-md border border-transparent bg-primary/5 outline-none ring-0 focus:outline-none focus-visible:outline-none focus-visible:ring-0"
-							: "flex h-7 cursor-pointer items-center rounded-md border border-transparent bg-transparent outline-none ring-0 transition-colors hover:bg-accent hover:text-accent-foreground focus:outline-none focus-visible:outline-none focus-visible:ring-0"
+							? "h-7 border border-transparent bg-primary/5 px-0 outline-none ring-0 focus:outline-none focus-visible:outline-none focus-visible:ring-0"
+							: "h-7 cursor-pointer border border-transparent bg-transparent px-0 outline-none ring-0 transition-colors hover:bg-accent hover:text-accent-foreground focus:outline-none focus-visible:outline-none focus-visible:ring-0"
 					}
 				>
 					{recording ? (
@@ -115,7 +116,7 @@ function HotkeyRow({
 					) : (
 						<ShortcutKbd keys={displayKeys} className="ml-0 px-1.5 text-foreground/85" />
 					)}
-				</button>
+				</Button>
 			</div>
 		</div>
 	);
diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/PromptsContent.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/PromptsContent.tsx
index aa7aa3ff0..a3c824ea0 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/PromptsContent.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/PromptsContent.tsx
@@ -277,22 +277,25 @@ export function PromptsContent() {
 									{prompt.prompt}
 								</p>
 								{prompt.prompt.length > 100 && (
-									<button
+									<Button
 										type="button"
+										variant="link"
 										onClick={() => setExpandedId(expandedId === prompt.id ? null : prompt.id)}
-										className="mt-1 text-[11px] text-primary hover:underline cursor-pointer"
+										className="mt-1 h-auto cursor-pointer px-0 py-0 text-[11px] text-primary"
 									>
 										{expandedId === prompt.id ? "See less" : "See more"}
-									</button>
+									</Button>
 								)}
 							</div>
 							<div className="hidden group-hover:flex items-center gap-1 shrink-0">
-								<button
+								<Button
 									type="button"
+									variant="ghost"
+									size="icon"
 									title={prompt.is_public ? "Make private" : "Share with community"}
 									onClick={() => handleTogglePublic(prompt)}
 									disabled={togglingPublicIds.has(prompt.id)}
-									className="flex items-center justify-center size-7 rounded-md text-muted-foreground hover:text-accent-foreground hover:bg-accent transition-colors disabled:opacity-50 disabled:pointer-events-none"
+									className="size-7 text-muted-foreground hover:bg-accent hover:text-accent-foreground"
 								>
 									{togglingPublicIds.has(prompt.id) ? (
 										<Spinner className="size-3.5" />
@@ -301,7 +304,7 @@ export function PromptsContent() {
 									) : (
 										<Globe className="size-3.5" />
 									)}
-								</button>
+								</Button>
 								<Button
 									variant="ghost"
 									size="icon"
diff --git a/surfsense_web/app/desktop/permissions/page.tsx b/surfsense_web/app/desktop/permissions/page.tsx
index ca9228272..c736bf87c 100644
--- a/surfsense_web/app/desktop/permissions/page.tsx
+++ b/surfsense_web/app/desktop/permissions/page.tsx
@@ -207,13 +207,14 @@ export default function DesktopPermissionsPage() {
 							<Button disabled className="text-sm h-9 min-w-[180px]">
 								Grant permissions to continue
 							</Button>
-							<button
+							<Button
 								type="button"
+								variant="link"
 								onClick={handleSkip}
-								className="block mx-auto text-xs text-muted-foreground hover:text-foreground transition-colors"
+								className="mx-auto h-auto px-0 py-0 text-xs text-muted-foreground hover:text-foreground"
 							>
 								Skip for now
-							</button>
+							</Button>
 						</>
 					)}
 				</div>
diff --git a/surfsense_web/components/agent-action-log/action-log-item.tsx b/surfsense_web/components/agent-action-log/action-log-item.tsx
index f951cd5da..954ee9aa5 100644
--- a/surfsense_web/components/agent-action-log/action-log-item.tsx
+++ b/surfsense_web/components/agent-action-log/action-log-item.tsx
@@ -74,10 +74,11 @@ export function ActionLogItem({ action, threadId, onRevertSuccess }: ActionLogIt
 				isAlreadyReverted && "opacity-70"
 			)}
 		>
-			<button
+			<Button
 				type="button"
+				variant="ghost"
 				onClick={() => setIsExpanded((v) => !v)}
-				className="flex w-full items-start gap-3 p-3 text-left hover:bg-accent hover:text-accent-foreground"
+				className="h-auto w-full items-start justify-start gap-3 p-3 text-left hover:bg-accent hover:text-accent-foreground"
 				aria-expanded={isExpanded}
 			>
 				<div className="flex size-8 shrink-0 items-center justify-center rounded-md bg-muted">
@@ -119,7 +120,7 @@ export function ActionLogItem({ action, threadId, onRevertSuccess }: ActionLogIt
 						isExpanded && "rotate-90"
 					)}
 				/>
-			</button>
+			</Button>
 
 			{isExpanded && (
 				<div className="flex flex-col gap-3 border-t bg-muted/20 p-3">
diff --git a/surfsense_web/components/assistant-ui/image.tsx b/surfsense_web/components/assistant-ui/image.tsx
index 59781abcf..6cba01c50 100644
--- a/surfsense_web/components/assistant-ui/image.tsx
+++ b/surfsense_web/components/assistant-ui/image.tsx
@@ -4,8 +4,9 @@ import type { ImageMessagePartComponent } from "@assistant-ui/react";
 import { cva, type VariantProps } from "class-variance-authority";
 import { ImageIcon, ImageOffIcon } from "lucide-react";
 import NextImage from "next/image";
-import { memo, type PropsWithChildren, useEffect, useRef, useState } from "react";
+import { memo, type PropsWithChildren, useEffect, useState } from "react";
 import { createPortal } from "react-dom";
+import { Button } from "@/components/ui/button";
 import { cn } from "@/lib/utils";
 
 const imageVariants = cva("aui-image-root relative overflow-hidden rounded-lg", {
@@ -44,8 +45,14 @@ function ImageRoot({ className, variant, size, children, ...props }: ImageRootPr
 	);
 }
 
-type ImagePreviewProps = Omit<React.ComponentProps<"img">, "children"> & {
+type ImagePreviewProps = Omit<
+	React.ComponentProps<"img">,
+	"children" | "height" | "onError" | "onLoad" | "src" | "width"
+> & {
 	containerClassName?: string;
+	onError?: React.ReactEventHandler<HTMLImageElement>;
+	onLoad?: React.ReactEventHandler<HTMLImageElement>;
+	src?: string;
 };
 
 function ImagePreview({
@@ -57,18 +64,17 @@ function ImagePreview({
 	src,
 	...props
 }: ImagePreviewProps) {
-	const imgRef = useRef<HTMLImageElement>(null);
 	const [loadedSrc, setLoadedSrc] = useState<string | undefined>(undefined);
 	const [errorSrc, setErrorSrc] = useState<string | undefined>(undefined);
+	const imageSrc = src ?? "";
 
-	const loaded = loadedSrc === src;
-	const error = errorSrc === src;
+	const loaded = imageSrc !== "" && loadedSrc === imageSrc;
+	const error = imageSrc === "" || errorSrc === imageSrc;
 
 	useEffect(() => {
-		if (typeof src === "string" && imgRef.current?.complete && imgRef.current.naturalWidth > 0) {
-			setLoadedSrc(src);
-		}
-	}, [src]);
+		setLoadedSrc((current) => (current === imageSrc ? current : undefined));
+		setErrorSrc((current) => (current === imageSrc ? current : undefined));
+	}, [imageSrc]);
 
 	return (
 		<div data-slot="image-preview" className={cn("relative min-h-32", containerClassName)}>
@@ -87,55 +93,22 @@ function ImagePreview({
 				>
 					<ImageOffIcon className="size-8 text-muted-foreground" />
 				</div>
-			) : isDataOrBlobUrl(src) ? (
-				// biome-ignore lint/performance/noImgElement: data/blob URLs need plain img
-				<img
-					ref={imgRef}
-					src={src}
-					alt={alt}
-					className={cn("block h-auto w-full object-contain", !loaded && "invisible", className)}
-					onLoad={(e) => {
-						if (typeof src === "string") setLoadedSrc(src);
-						onLoad?.(e);
-					}}
-					onError={(e) => {
-						if (typeof src === "string") setErrorSrc(src);
-						onError?.(e);
-					}}
-					{...props}
-				/>
 			) : (
-				// biome-ignore lint/performance/noImgElement: intentional for dynamic external URLs
-				// <img
-				// 	ref={imgRef}
-				// 	src={src}
-				// 	alt={alt}
-				// 	className={cn("block h-auto w-full object-contain", !loaded && "invisible", className)}
-				// 	onLoad={(e) => {
-				// 		if (typeof src === "string") setLoadedSrc(src);
-				// 		onLoad?.(e);
-				// 	}}
-				// 	onError={(e) => {
-				// 		if (typeof src === "string") setErrorSrc(src);
-				// 		onError?.(e);
-				// 	}}
-				// 	{...props}
-				// />
 				<NextImage
 					fill
-					src={src || ""}
+					src={imageSrc}
 					alt={alt}
 					sizes="(max-width: 768px) 100vw, (max-width: 1200px) 80vw, 60vw"
 					className={cn("block object-contain", !loaded && "invisible", className)}
-					onLoad={() => {
-						if (typeof src === "string") setLoadedSrc(src);
-						onLoad?.();
+					onLoad={(event) => {
+						setLoadedSrc(imageSrc);
+						onLoad?.(event);
 					}}
-					onError={() => {
-						if (typeof src === "string") setErrorSrc(src);
-						onError?.();
+					onError={(event) => {
+						setErrorSrc(imageSrc);
+						onError?.(event);
 					}}
-					unoptimized={false}
+					unoptimized={isDataOrBlobUrl(imageSrc)}
 					{...props}
 				/>
 			)}
@@ -196,59 +169,40 @@ function ImageZoom({ src, alt = "Image preview", children }: ImageZoomProps) {
 
 	return (
 		<>
-			<button
+			<Button
 				type="button"
+				variant="ghost"
 				onClick={handleOpen}
-				className="aui-image-zoom-trigger cursor-zoom-in border-0 bg-transparent p-0 text-left"
+				className="aui-image-zoom-trigger h-auto cursor-zoom-in border-0 bg-transparent p-0 text-left hover:bg-transparent"
 				aria-label="Click to zoom image"
 			>
 				{children}
-			</button>
+			</Button>
 			{isMounted &&
 				isOpen &&
 				createPortal(
-					<button
+					<Button
 						type="button"
+						variant="ghost"
 						data-slot="image-zoom-overlay"
-						className="aui-image-zoom-overlay fade-in fixed inset-0 z-50 flex animate-in cursor-zoom-out items-center justify-center border-0 bg-black/80 p-0 duration-200"
+						className="aui-image-zoom-overlay fade-in fixed inset-0 z-50 h-auto w-auto animate-in cursor-zoom-out items-center justify-center rounded-none border-0 bg-black/80 p-0 duration-200 hover:bg-black/80 focus-visible:ring-0"
 						onClick={handleClose}
 						aria-label="Close zoomed image"
 					>
-						{/** biome-ignore lint/performance/noImgElement: <explanation> */}
-						{isDataOrBlobUrl(src) ? (
-							// biome-ignore lint/performance/noImgElement: data/blob URLs need plain img
-							<img
-								data-slot="image-zoom-content"
-								src={src}
-								alt={alt}
-								className="aui-image-zoom-content fade-in zoom-in-95 max-h-[90vh] max-w-[90vw] animate-in object-contain duration-200"
-								onClick={(e) => {
-									e.stopPropagation();
-									handleClose();
-								}}
-								onKeyDown={(e) => {
-									if (e.key === "Enter") {
-										e.stopPropagation();
-										handleClose();
-									}
-								}}
-							/>
-						) : (
-							<NextImage
-								data-slot="image-zoom-content"
-								fill
-								src={src}
-								alt={alt}
-								sizes="90vw"
-								className="aui-image-zoom-content fade-in zoom-in-95 object-contain duration-200"
-								onClick={(e) => {
-									e.stopPropagation();
-									handleClose();
-								}}
-								unoptimized={false}
-							/>
-						)}
-					</button>,
+						<NextImage
+							data-slot="image-zoom-content"
+							fill
+							src={src}
+							alt={alt}
+							sizes="90vw"
+							className="aui-image-zoom-content fade-in zoom-in-95 object-contain duration-200"
+							onClick={(e) => {
+								e.stopPropagation();
+								handleClose();
+							}}
+							unoptimized={isDataOrBlobUrl(src)}
+						/>
+					</Button>,
 					document.body
 				)}
 		</>
diff --git a/surfsense_web/components/connectors/google-drive-folder-tree.tsx b/surfsense_web/components/connectors/google-drive-folder-tree.tsx
index 8146a4bf8..e47d1d185 100644
--- a/surfsense_web/components/connectors/google-drive-folder-tree.tsx
+++ b/surfsense_web/components/connectors/google-drive-folder-tree.tsx
@@ -13,6 +13,7 @@ import {
 	Presentation,
 } from "lucide-react";
 import { useState } from "react";
+import { Button } from "@/components/ui/button";
 import { Checkbox } from "@/components/ui/checkbox";
 import { ScrollArea } from "@/components/ui/scroll-area";
 import { Spinner } from "@/components/ui/spinner";
@@ -243,9 +244,11 @@ export function GoogleDriveFolderTree({
 					)}
 				>
 					{isFolder ? (
-						<button
+						<Button
 							type="button"
-							className="flex items-center justify-center w-3 h-3 sm:w-4 sm:h-4 shrink-0 bg-transparent border-0 p-0 cursor-pointer"
+							variant="ghost"
+							size="icon"
+							className="h-3 w-3 shrink-0 cursor-pointer bg-transparent p-0 hover:bg-transparent sm:h-4 sm:w-4"
 							onClick={(e) => {
 								e.stopPropagation();
 								toggleFolder(item);
@@ -259,7 +262,7 @@ export function GoogleDriveFolderTree({
 							) : (
 								<ChevronRight className="h-3 w-3 sm:h-4 sm:w-4" />
 							)}
-						</button>
+						</Button>
 					) : (
 						<span className="w-3 h-3 sm:w-4 sm:h-4 shrink-0" />
 					)}
@@ -290,13 +293,14 @@ export function GoogleDriveFolderTree({
 					</div>
 
 					{isFolder ? (
-						<button
+						<Button
 							type="button"
-							className="truncate flex-1 text-left text-xs sm:text-sm min-w-0 bg-transparent border-0 p-0 cursor-pointer"
+							variant="ghost"
+							className="h-auto min-w-0 flex-1 cursor-pointer justify-start truncate bg-transparent p-0 text-left text-xs hover:bg-transparent sm:text-sm"
 							onClick={() => toggleFolder(item)}
 						>
 							{item.name}
-						</button>
+						</Button>
 					) : (
 						<span className="truncate flex-1 text-left text-xs sm:text-sm min-w-0">
 							{item.name}
@@ -332,13 +336,14 @@ export function GoogleDriveFolderTree({
 								className="shrink-0 h-3.5 w-3.5 sm:h-4 sm:w-4 border-slate-400/20 dark:border-white/20"
 							/>
 							<HardDrive className="h-3 w-3 sm:h-4 sm:w-4 text-muted-foreground shrink-0" />
-							<button
+							<Button
 								type="button"
-								className="font-semibold truncate text-xs sm:text-sm cursor-pointer bg-transparent border-0 p-0 text-left"
+								variant="ghost"
+								className="h-auto cursor-pointer truncate bg-transparent p-0 text-left text-xs font-semibold hover:bg-transparent sm:text-sm"
 								onClick={() => toggleFolderSelection("root", "My Drive")}
 							>
 								My Drive
-							</button>
+							</Button>
 						</div>
 					</div>
 
diff --git a/surfsense_web/components/documents/DocumentsFilters.tsx b/surfsense_web/components/documents/DocumentsFilters.tsx
index 06be4a55c..86e91ee42 100644
--- a/surfsense_web/components/documents/DocumentsFilters.tsx
+++ b/surfsense_web/components/documents/DocumentsFilters.tsx
@@ -241,9 +241,11 @@ export function DocumentsFilters({
 						aria-label={t("filter_placeholder")}
 					/>
 					{Boolean(searchValue) && (
-						<button
+						<Button
 							type="button"
-							className="absolute right-1 top-1/2 inline-flex h-5 w-5 -translate-y-1/2 items-center justify-center rounded-sm text-muted-foreground transition-colors hover:bg-accent hover:text-accent-foreground"
+							variant="ghost"
+							size="icon"
+							className="absolute right-1 top-1/2 h-5 w-5 -translate-y-1/2 rounded-sm text-muted-foreground transition-colors hover:bg-accent hover:text-accent-foreground"
 							aria-label="Clear filter"
 							onClick={() => {
 								onSearch("");
@@ -251,7 +253,7 @@ export function DocumentsFilters({
 							}}
 						>
 							<X size={14} strokeWidth={2} aria-hidden="true" />
-						</button>
+						</Button>
 					)}
 				</div>
 
diff --git a/surfsense_web/components/documents/FolderPickerDialog.tsx b/surfsense_web/components/documents/FolderPickerDialog.tsx
index 3359f7499..13cff6ace 100644
--- a/surfsense_web/components/documents/FolderPickerDialog.tsx
+++ b/surfsense_web/components/documents/FolderPickerDialog.tsx
@@ -85,42 +85,47 @@ export function FolderPickerDialog({
 			const FolderIcon = isExpanded ? FolderOpen : Folder;
 
 			return [
-				<button
-					key={f.id}
-					type="button"
-					disabled={isDisabled}
-					className={cn(
-						"flex w-full items-center gap-1.5 rounded-md px-2 py-1.5 text-sm transition-colors",
-						isSelected && "bg-accent text-accent-foreground",
-						!isSelected && !isDisabled && "hover:bg-accent hover:text-accent-foreground",
-						isDisabled && "cursor-not-allowed opacity-40"
-					)}
-					style={{ paddingLeft: `${depth * 16 + 8}px` }}
-					onClick={() => {
-						if (!isDisabled) setSelectedId(f.id);
-					}}
-				>
-					{hasChildren ? (
-						<button
+				<div key={f.id} className="relative w-full">
+					{hasChildren && (
+						<Button
 							type="button"
-							className="flex h-4 w-4 shrink-0 items-center justify-center"
+							variant="ghost"
+							size="icon"
+							disabled={isDisabled}
+							className="absolute top-1/2 z-10 size-4 -translate-y-1/2 p-0"
+							style={{ left: `${depth * 16 + 8}px` }}
+							aria-label={isExpanded ? `Collapse ${f.name}` : `Expand ${f.name}`}
 							onClick={(e) => {
 								e.stopPropagation();
 								toggleExpand(f.id);
 							}}
 						>
 							{isExpanded ? (
-								<ChevronDown className="h-3.5 w-3.5" />
+								<ChevronDown data-icon="inline-start" />
 							) : (
-								<ChevronRight className="h-3.5 w-3.5" />
+								<ChevronRight data-icon="inline-start" />
 							)}
-						</button>
-					) : (
-						<span className="h-4 w-4 shrink-0" />
+						</Button>
 					)}
-					<FolderIcon className="h-4 w-4 shrink-0 text-muted-foreground" />
-					<span className="truncate">{f.name}</span>
-				</button>,
+					<Button
+						type="button"
+						variant="ghost"
+						disabled={isDisabled}
+						className={cn(
+							"h-auto w-full justify-start gap-1.5 px-2 py-1.5 text-sm font-normal",
+							isSelected && "bg-accent text-accent-foreground",
+							isDisabled && "cursor-not-allowed opacity-40"
+						)}
+						style={{ paddingLeft: `${depth * 16 + 8}px` }}
+						onClick={() => {
+							if (!isDisabled) setSelectedId(f.id);
+						}}
+					>
+						<span className="size-4 shrink-0" />
+						<FolderIcon data-icon="inline-start" className="text-muted-foreground" />
+						<span className="truncate">{f.name}</span>
+					</Button>
+				</div>,
 				...(isExpanded ? renderPickerLevel(f.id, depth + 1) : []),
 			];
 		});
@@ -143,19 +148,19 @@ export function FolderPickerDialog({
 				</DialogHeader>
 
 				<div className="max-h-[300px] overflow-y-auto rounded-md border p-1">
-					<button
+					<Button
 						type="button"
+						variant="ghost"
 						className={cn(
-							"flex w-full items-center gap-1.5 rounded-md px-2 py-1.5 text-sm transition-colors",
-							selectedId === null && "bg-accent text-accent-foreground",
-							selectedId !== null && "hover:bg-accent hover:text-accent-foreground"
+							"h-auto w-full justify-start gap-1.5 px-2 py-1.5 text-sm font-normal",
+							selectedId === null && "bg-accent text-accent-foreground"
 						)}
 						onClick={() => setSelectedId(null)}
 					>
-						<span className="h-4 w-4 shrink-0" />
-						<Home className="h-4 w-4 shrink-0 text-muted-foreground" />
+						<span className="size-4 shrink-0" />
+						<Home data-icon="inline-start" className="text-muted-foreground" />
 						<span>Root</span>
-					</button>
+					</Button>
 					{renderPickerLevel(null, 1)}
 				</div>
 
diff --git a/surfsense_web/components/documents/version-history.tsx b/surfsense_web/components/documents/version-history.tsx
index 453c02817..498e89495 100644
--- a/surfsense_web/components/documents/version-history.tsx
+++ b/surfsense_web/components/documents/version-history.tsx
@@ -177,12 +177,13 @@ function VersionHistoryPanel({ documentId }: { documentId: number }) {
 				<div className="flex-1 overflow-y-auto p-2">
 					<div className="flex flex-col gap-0.5">
 						{versions.map((v) => (
-							<button
+							<Button
 								key={v.version_number}
 								type="button"
+								variant="ghost"
 								onClick={() => handleSelectVersion(v.version_number)}
 								className={cn(
-									"flex items-center gap-2 rounded-lg px-3 py-2.5 text-left transition-colors focus:outline-none focus-visible:outline-none w-full",
+									"h-auto w-full justify-start gap-2 rounded-lg px-3 py-2.5 text-left transition-colors focus:outline-none focus-visible:outline-none",
 									selectedVersion === v.version_number
 										? "bg-accent text-accent-foreground"
 										: "text-muted-foreground hover:bg-accent hover:text-accent-foreground"
@@ -197,7 +198,7 @@ function VersionHistoryPanel({ documentId }: { documentId: number }) {
 									{v.title && <p className="text-xs text-muted-foreground truncate">{v.title}</p>}
 								</div>
 								<ChevronRight className="h-3.5 w-3.5 shrink-0 opacity-50" />
-							</button>
+							</Button>
 						))}
 					</div>
 				</div>
diff --git a/surfsense_web/components/editor/plugins/citation-kit.tsx b/surfsense_web/components/editor/plugins/citation-kit.tsx
index 1908de209..97e8ec723 100644
--- a/surfsense_web/components/editor/plugins/citation-kit.tsx
+++ b/surfsense_web/components/editor/plugins/citation-kit.tsx
@@ -11,20 +11,16 @@ import {
 } from "@/lib/citations/citation-parser";
 
 /**
- * Plate inline-void node modeling a single `[citation:...]` reference.
- *
- * Modeled after the existing `MentionPlugin` pattern in
- * `inline-mention-editor.tsx` — the only confirmed pattern in this repo
- * for non-text inline UI. Inline-void elements satisfy Slate's invariant
- * that the editor renders both atomic widgets and surrounding text
- * cleanly without breaking selection / caret semantics.
+ * Plate inline-void node for one `[citation:...]` reference.
+ * Inline voids keep the citation chip atomic while preserving caret behavior
+ * around the surrounding text.
  */
 export type CitationElementNode = {
 	type: "citation";
 	kind: "chunk" | "doc" | "url";
 	chunkId?: number;
 	url?: string;
-	/** Original `[citation:...]` substring for traceability/debugging. */
+	/** Original literal token that produced this citation node. */
 	rawText: string;
 	children: [{ text: "" }];
 };
@@ -62,17 +58,14 @@ const CitationPlugin = createPlatePlugin({
 	},
 });
 
-/** Plugin kit shape used elsewhere in the editor. */
 export const CitationKit = [CitationPlugin];
 
 // ---------------------------------------------------------------------------
-// Slate value transform — runs after MarkdownPlugin.deserialize
+// Slate value transform
 // ---------------------------------------------------------------------------
 
-// Structural shapes used by the value transform. We cannot use Plate's
-// generic Element / Text type predicates directly because `Descendant` is a
-// constrained union and our predicates would over-narrow. Casting through
-// these row types keeps the walker readable without fighting the types.
+// Local structural shapes keep the recursive walker readable without forcing
+// Plate's broad Descendant union into narrower generic predicates.
 type SlateText = { text: string } & Record<string, unknown>;
 type SlateElement = { type?: string; children: Descendant[] } & Record<string, unknown>;
 
@@ -89,19 +82,15 @@ function asElement(node: Descendant): SlateElement {
 }
 
 /**
- * Element types whose subtrees we MUST NOT inject citation void elements
- * into. Each rationale documented in the citation plan:
- *  - `KEYS.codeBlock` / `code_line` — Plate's schema rejects inline elements
- *    inside code containers; the user expects literal text inside code.
- *  - `KEYS.link` — `<button>` inside `<a>` is invalid HTML and the link
- *    swallows the citation click. Mirrors the `<a>` skip in
- *    `MarkdownViewer`.
+ * Subtrees that should keep citation tokens as text:
+ * - Code nodes preserve source text and reject inline void children.
+ * - Link nodes already render as anchors; citation chips are interactive
+ *   shadcn Button-based controls, so injecting them would nest interactions.
  */
 const SKIP_SUBTREE_TYPES = new Set<string>([KEYS.codeBlock, "code_line", KEYS.link]);
 
 /**
- * Build the marks portion of a Slate text node so we can preserve formatting
- * (bold/italic/etc.) on the surrounding text fragments after we split.
+ * Preserve text marks such as bold and italic when splitting around citations.
  */
 function copyMarks(textNode: SlateText): Record<string, unknown> {
 	const { text: _text, ...marks } = textNode;
@@ -131,9 +120,7 @@ function makeCitationElement(
 }
 
 /**
- * Re-extract the raw `[citation:...]` substrings that produced each parsed
- * segment, in source order. Lets us preserve the original literal for
- * `rawText` on the inline-void element.
+ * Keep each original citation token on the generated node for diagnostics.
  */
 function extractRawCitationMatches(text: string): string[] {
 	const matches: string[] = [];
@@ -159,9 +146,7 @@ function transformTextNode(node: SlateText, urlMap: CitationUrlMap): Descendant[
 	let pendingText: string | null = null;
 
 	const flushText = () => {
-		// Slate inline-void adjacency: emit an empty text node (with copied
-		// marks) when the citation appears at the very start/end of the text
-		// node so neighbours of the void always have a text sibling.
+		// Inline voids need text siblings, even at text boundaries.
 		out.push({ ...marks, text: pendingText ?? "" } as unknown as Descendant);
 		pendingText = null;
 	};
@@ -174,8 +159,7 @@ function transformTextNode(node: SlateText, urlMap: CitationUrlMap): Descendant[
 			const raw = rawMatches[citationIdx] ?? "";
 			out.push(makeCitationElement(raw, segment) as unknown as Descendant);
 			citationIdx += 1;
-			// Always reset pendingText so the next loop iteration emits a
-			// trailing empty text node if no further plain text follows.
+			// Ensure a trailing text sibling if the citation ends the node.
 			pendingText = "";
 		}
 	}
@@ -206,12 +190,9 @@ function transformChildren(children: Descendant[], urlMap: CitationUrlMap): Desc
 }
 
 /**
- * Walk a deserialized Slate value and replace every `[citation:...]`
- * substring with a `citation` inline-void element. URL placeholders
- * created by `preprocessCitationMarkdown` are resolved through `urlMap`.
- *
- * Subtrees of `code_block`, `code_line`, and `link` are returned as-is —
- * see `SKIP_SUBTREE_TYPES` above.
+ * Replace citation tokens in a deserialized Slate tree with citation inline
+ * void nodes. URL placeholders from `preprocessCitationMarkdown` are resolved
+ * through `urlMap`; skipped subtrees are returned unchanged.
  */
 export function injectCitationNodes(value: Descendant[], urlMap: CitationUrlMap): Descendant[] {
 	return transformChildren(value, urlMap);
diff --git a/surfsense_web/components/free-chat/free-composer.tsx b/surfsense_web/components/free-chat/free-composer.tsx
index 2ece3dcca..943ace9aa 100644
--- a/surfsense_web/components/free-chat/free-composer.tsx
+++ b/surfsense_web/components/free-chat/free-composer.tsx
@@ -5,6 +5,7 @@ import { ArrowUpIcon, Globe, Paperclip, SquareIcon } from "lucide-react";
 import { type FC, useCallback, useRef, useState } from "react";
 import { toast } from "sonner";
 import { TooltipIconButton } from "@/components/assistant-ui/tooltip-icon-button";
+import { Button } from "@/components/ui/button";
 import { Switch } from "@/components/ui/switch";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { useAnonymousMode } from "@/contexts/anonymous-mode";
@@ -185,18 +186,19 @@ export const FreeComposer: FC = () => {
 					/>
 					<Tooltip>
 						<TooltipTrigger asChild>
-							<button
+							<Button
 								type="button"
+								variant="ghost"
 								onClick={handleUploadClick}
 								className={cn(
-									"flex items-center gap-1.5 rounded-md px-2 py-1 text-xs transition-colors",
+									"h-auto gap-1.5 rounded-md px-2 py-1 text-xs transition-colors",
 									"text-muted-foreground hover:text-accent-foreground hover:bg-accent",
 									hasUploadedDoc && "text-primary"
 								)}
 							>
 								<Paperclip className="size-3.5" />
 								{hasUploadedDoc ? "1/1" : "Upload"}
-							</button>
+							</Button>
 						</TooltipTrigger>
 						<TooltipContent>
 							{hasUploadedDoc
diff --git a/surfsense_web/components/free-chat/quota-warning-banner.tsx b/surfsense_web/components/free-chat/quota-warning-banner.tsx
index e013a64a8..828e8006e 100644
--- a/surfsense_web/components/free-chat/quota-warning-banner.tsx
+++ b/surfsense_web/components/free-chat/quota-warning-banner.tsx
@@ -3,6 +3,7 @@
 import { OctagonAlert, Orbit, X } from "lucide-react";
 import Link from "next/link";
 import { useState } from "react";
+import { Button } from "@/components/ui/button";
 import { cn } from "@/lib/utils";
 
 interface QuotaWarningBannerProps {
@@ -71,13 +72,15 @@ export function QuotaWarningBanner({
 					</Link>{" "}
 					for $5 of premium credit.
 				</p>
-				<button
+				<Button
 					type="button"
+					variant="ghost"
+					size="icon"
 					onClick={() => setDismissed(true)}
-					className="text-amber-400 hover:text-amber-600 dark:hover:text-amber-200"
+					className="size-6 text-amber-400 hover:bg-transparent hover:text-amber-600 dark:hover:text-amber-200"
 				>
 					<X className="h-4 w-4" />
-				</button>
+				</Button>
 			</div>
 		</div>
 	);
diff --git a/surfsense_web/components/homepage/cta.tsx b/surfsense_web/components/homepage/cta.tsx
index a09d7354c..7e21a7fe2 100644
--- a/surfsense_web/components/homepage/cta.tsx
+++ b/surfsense_web/components/homepage/cta.tsx
@@ -2,6 +2,7 @@
 import { IconMessageCircleQuestion } from "@tabler/icons-react";
 import Link from "next/link";
 import type React from "react";
+import { Button } from "@/components/ui/button";
 import { cn } from "@/lib/utils";
 
 export function CTAHomepage() {
@@ -22,15 +23,16 @@ export function CTAHomepage() {
 				</p>
 
 				<div className="flex items-start sm:items-center flex-col sm:flex-row sm:gap-4">
-					<Link href="/contact">
-						<button
-							type="button"
-							className="mt-8 flex space-x-2 items-center group text-base px-4 py-2 rounded-lg  text-black dark:text-white border border-neutral-200 dark:border-neutral-800 shadow-[0px_2px_0px_0px_rgba(255,255,255,0.3)_inset]"
-						>
+					<Button
+						asChild
+						variant="ghost"
+						className="mt-8 h-auto gap-2 rounded-lg border border-neutral-200 px-4 py-2 text-base text-black shadow-[0px_2px_0px_0px_rgba(255,255,255,0.3)_inset] dark:border-neutral-800 dark:text-white"
+					>
+						<Link href="/contact" className="group">
 							<span>Talk to us</span>
 							<IconMessageCircleQuestion className="text-black dark:text-white group-hover:translate-x-1 stroke-[1px] h-3 w-3 mt-0.5 transition-transform duration-200" />
-						</button>
-					</Link>
+						</Link>
+					</Button>
 				</div>
 			</div>
 			{/* <div className="border-t md:border-t-0 md:border-l border-dashed p-8 md:p-14">
diff --git a/surfsense_web/components/homepage/hero-section.tsx b/surfsense_web/components/homepage/hero-section.tsx
index ec09fa34d..2630f4266 100644
--- a/surfsense_web/components/homepage/hero-section.tsx
+++ b/surfsense_web/components/homepage/hero-section.tsx
@@ -4,6 +4,7 @@ import { AnimatePresence, motion } from "motion/react";
 import Link from "next/link";
 import React, { memo, useCallback, useEffect, useRef, useState } from "react";
 import Balancer from "react-wrap-balancer";
+import { Button } from "@/components/ui/button";
 import {
 	DropdownMenu,
 	DropdownMenuContent,
@@ -184,24 +185,26 @@ function GetStartedButton() {
 
 	if (isGoogleAuth) {
 		return (
-			<button
+			<Button
 				type="button"
+				variant="ghost"
 				onClick={handleGoogleLogin}
-				className="flex h-14 w-full cursor-pointer items-center justify-center gap-3 rounded-lg bg-white text-center text-base font-medium text-neutral-700 shadow-sm ring-1 shadow-black/10 ring-black/10 transition duration-150 active:scale-98 hover:bg-neutral-50 sm:w-56 dark:bg-neutral-900 dark:text-neutral-200 dark:ring-neutral-700/50 dark:hover:bg-neutral-800"
+				className="h-14 w-full cursor-pointer gap-3 rounded-lg bg-white text-center text-base font-medium text-neutral-700 shadow-sm ring-1 shadow-black/10 ring-black/10 transition duration-150 active:scale-98 hover:bg-neutral-50 sm:w-56 dark:bg-neutral-900 dark:text-neutral-200 dark:ring-neutral-700/50 dark:hover:bg-neutral-800"
 			>
 				<GoogleLogo className="h-5 w-5" />
 				<span>Continue with Google</span>
-			</button>
+			</Button>
 		);
 	}
 
 	return (
-		<Link
-			href="/login"
-			className="flex h-14 w-full items-center justify-center rounded-lg bg-black text-center text-base font-medium text-white shadow-sm ring-1 shadow-black/10 ring-black/10 transition duration-150 active:scale-98 sm:w-52 dark:bg-white dark:text-black"
+		<Button
+			asChild
+			variant="ghost"
+			className="h-14 w-full rounded-lg bg-black text-center text-base font-medium text-white shadow-sm ring-1 shadow-black/10 ring-black/10 transition duration-150 active:scale-98 hover:bg-black sm:w-52 dark:bg-white dark:text-black dark:hover:bg-white"
 		>
-			Get Started
-		</Link>
+			<Link href="/login">Get Started</Link>
+		</Button>
 	);
 }
 
@@ -212,35 +215,40 @@ function DownloadButton() {
 
 	if (!primary) {
 		return (
-			<a
-				href={fallbackUrl}
-				target="_blank"
-				rel="noopener noreferrer"
-				className="flex h-14 w-full items-center justify-center gap-2 rounded-lg border border-neutral-200 bg-white text-center text-base font-medium text-neutral-700 shadow-sm transition duration-150 active:scale-98 hover:bg-neutral-50 sm:w-auto sm:px-6 dark:border-neutral-700 dark:bg-neutral-900 dark:text-neutral-200 dark:hover:bg-neutral-800"
+			<Button
+				asChild
+				variant="ghost"
+				className="h-14 w-full gap-2 rounded-lg border border-neutral-200 bg-white text-center text-base font-medium text-neutral-700 shadow-sm transition duration-150 active:scale-98 hover:bg-neutral-50 sm:w-auto sm:px-6 dark:border-neutral-700 dark:bg-neutral-900 dark:text-neutral-200 dark:hover:bg-neutral-800"
 			>
-				<Download className="size-4" />
-				Download for {os}
-			</a>
+				<a href={fallbackUrl} target="_blank" rel="noopener noreferrer">
+					<Download className="size-4" />
+					Download for {os}
+				</a>
+			</Button>
 		);
 	}
 
 	return (
 		<div className="flex h-14 w-full items-stretch sm:w-auto">
-			<a
-				href={primary.url}
-				className="flex flex-1 items-center justify-center gap-2 rounded-l-lg border border-r-0 border-neutral-200 bg-white px-5 text-base font-medium text-neutral-700 shadow-sm transition duration-150 active:scale-[0.99] hover:bg-neutral-50 dark:border-neutral-700 dark:bg-neutral-900 dark:text-neutral-200 dark:hover:bg-neutral-800"
+			<Button
+				asChild
+				variant="ghost"
+				className="h-auto flex-1 gap-2 rounded-l-lg rounded-r-none border border-r-0 border-neutral-200 bg-white px-5 text-base font-medium text-neutral-700 shadow-sm transition duration-150 active:scale-[0.99] hover:bg-neutral-50 dark:border-neutral-700 dark:bg-neutral-900 dark:text-neutral-200 dark:hover:bg-neutral-800"
 			>
-				<Download className="size-4 shrink-0" />
-				Download for {os}
-			</a>
+				<a href={primary.url}>
+					<Download className="size-4 shrink-0" />
+					Download for {os}
+				</a>
+			</Button>
 			<DropdownMenu>
 				<DropdownMenuTrigger asChild>
-					<button
+					<Button
 						type="button"
-						className="flex items-center justify-center rounded-r-lg border border-neutral-200 bg-white px-2.5 text-neutral-500 shadow-sm transition duration-150 hover:bg-neutral-50 dark:border-neutral-700 dark:bg-neutral-900 dark:text-neutral-400 dark:hover:bg-neutral-800"
+						variant="ghost"
+						className="h-auto rounded-l-none rounded-r-lg border border-neutral-200 bg-white px-2.5 text-neutral-500 shadow-sm transition duration-150 hover:bg-neutral-50 dark:border-neutral-700 dark:bg-neutral-900 dark:text-neutral-400 dark:hover:bg-neutral-800"
 					>
 						<ChevronDown className="size-4" />
-					</button>
+					</Button>
 				</DropdownMenuTrigger>
 				<DropdownMenuContent align="end" className="w-64">
 					{alternatives.map((asset) => (
@@ -284,11 +292,12 @@ const BrowserWindow = () => {
 					<div className="no-visible-scrollbar flex min-w-0 shrink flex-row items-center justify-start gap-2 overflow-x-auto mask-l-from-98% py-0.5 pr-2 pl-2 md:pl-4">
 						{TAB_ITEMS.map((item, index) => (
 							<React.Fragment key={item.title}>
-								<button
+								<Button
 									type="button"
+									variant="ghost"
 									onClick={() => setSelectedIndex(index)}
 									className={cn(
-										"flex shrink-0 items-center gap-1.5 rounded-md px-2 py-1 text-xs transition duration-150 hover:bg-white sm:text-sm dark:hover:bg-neutral-950",
+										"h-auto shrink-0 gap-1.5 rounded-md px-2 py-1 text-xs transition duration-150 hover:bg-white sm:text-sm dark:hover:bg-neutral-950",
 										selectedIndex === index &&
 											!item.featured &&
 											"bg-white shadow ring-1 shadow-black/10 ring-black/10 dark:bg-neutral-900",
@@ -311,7 +320,7 @@ const BrowserWindow = () => {
 											<TooltipContent side="bottom">Desktop app only</TooltipContent>
 										</Tooltip>
 									)}
-								</button>
+								</Button>
 								{index !== TAB_ITEMS.length - 1 && (
 									<div className="h-4 w-px shrink-0 rounded-full bg-neutral-300 dark:bg-neutral-700" />
 								)}
@@ -354,13 +363,14 @@ const BrowserWindow = () => {
 									</p>
 								</div>
 							</div>
-							<button
+							<Button
 								type="button"
-								className="cursor-pointer bg-neutral-50 p-2 sm:p-3 dark:bg-neutral-950 w-full"
+								variant="ghost"
+								className="h-auto w-full cursor-pointer rounded-none bg-neutral-50 p-2 hover:bg-neutral-50 sm:p-3 dark:bg-neutral-950 dark:hover:bg-neutral-950"
 								onClick={open}
 							>
-								<TabVideo src={selectedItem.src} />
-							</button>
+								<TabVideo key={selectedItem.src} src={selectedItem.src} />
+							</Button>
 						</motion.div>
 					</AnimatePresence>
 				</div>
@@ -385,7 +395,7 @@ const TabVideo = memo(function TabVideo({ src }: { src: string }) {
 		if (!video) return;
 		video.currentTime = 0;
 		video.play().catch(() => {});
-	}, [src]);
+	}, []);
 
 	const handleCanPlay = useCallback(() => {
 		setHasLoaded(true);
diff --git a/surfsense_web/components/homepage/navbar.tsx b/surfsense_web/components/homepage/navbar.tsx
index 04b011c2d..576af2b7d 100644
--- a/surfsense_web/components/homepage/navbar.tsx
+++ b/surfsense_web/components/homepage/navbar.tsx
@@ -7,6 +7,7 @@ import { SignInButton } from "@/components/auth/sign-in-button";
 import { NavbarGitHubStars } from "@/components/homepage/github-stars-badge";
 import { Logo } from "@/components/Logo";
 import { ThemeTogglerComponent } from "@/components/theme/theme-toggle";
+import { Button } from "@/components/ui/button";
 import { cn } from "@/lib/utils";
 
 interface NavItem {
@@ -99,7 +100,7 @@ const DesktopNav = ({ navItems, isScrolled, scrolledBgClassName }: DesktopNavPro
 						onMouseEnter={() => setHovered(idx)}
 						onMouseLeave={() => setHovered(null)}
 						className="relative px-4 py-2 text-neutral-600 dark:text-neutral-300"
-						key={`link=${idx}`}
+						key={navItem.link}
 						href={navItem.link}
 					>
 						{hovered === idx && (
@@ -179,10 +180,12 @@ const MobileNav = ({ navItems, isScrolled, scrolledBgClassName }: MobileNavProps
 					<Logo className="h-8 w-8 rounded-md" disableLink />
 					<span className="dark:text-white/90 text-gray-800 text-lg font-bold">SurfSense</span>
 				</Link>
-				<button
+				<Button
 					type="button"
+					variant="ghost"
+					size="icon"
 					onClick={() => setOpen((prev) => !prev)}
-					className="relative z-50 flex items-center justify-center p-2 -mr-2 rounded-lg hover:bg-gray-100 dark:hover:bg-neutral-800 transition-colors touch-manipulation"
+					className="relative z-50 -mr-2 rounded-lg p-2 hover:bg-gray-100 dark:hover:bg-neutral-800 touch-manipulation"
 					aria-label={open ? "Close menu" : "Open menu"}
 				>
 					{open ? (
@@ -190,7 +193,7 @@ const MobileNav = ({ navItems, isScrolled, scrolledBgClassName }: MobileNavProps
 					) : (
 						<IconMenu2 className="h-6 w-6 text-black dark:text-white" />
 					)}
-				</button>
+				</Button>
 			</div>
 
 			<AnimatePresence>
@@ -202,9 +205,9 @@ const MobileNav = ({ navItems, isScrolled, scrolledBgClassName }: MobileNavProps
 						transition={{ duration: 0.2, ease: "easeOut" }}
 						className="absolute inset-x-0 top-full mt-1 z-20 flex w-full flex-col items-start justify-start gap-4 rounded-xl bg-white/90 backdrop-blur-xl border border-white/20 shadow-2xl px-4 py-6 dark:bg-neutral-950/90 dark:border-neutral-800/50"
 					>
-						{navItems.map((navItem: NavItem, idx: number) => (
+						{navItems.map((navItem: NavItem) => (
 							<Link
-								key={`link=${idx}`}
+								key={navItem.link}
 								href={navItem.link}
 								className="relative text-neutral-600 dark:text-neutral-300"
 							>
diff --git a/surfsense_web/components/layout/ui/icon-rail/SearchSpaceAvatar.tsx b/surfsense_web/components/layout/ui/icon-rail/SearchSpaceAvatar.tsx
index c35d8c708..28fb235fe 100644
--- a/surfsense_web/components/layout/ui/icon-rail/SearchSpaceAvatar.tsx
+++ b/surfsense_web/components/layout/ui/icon-rail/SearchSpaceAvatar.tsx
@@ -3,6 +3,7 @@
 import { Settings, Trash2, Users } from "lucide-react";
 import { useTranslations } from "next-intl";
 import { useCallback, useRef, useState } from "react";
+import { Button } from "@/components/ui/button";
 import {
 	ContextMenu,
 	ContextMenuContent,
@@ -120,11 +121,13 @@ export function SearchSpaceAvatar({
 	);
 
 	const avatarButton = (
-		<button
+		<Button
 			type="button"
+			variant="ghost"
+			size="icon"
 			onClick={onClick}
 			className={cn(
-				"relative flex items-center justify-center rounded-lg font-semibold text-white transition-all select-none",
+				"relative rounded-lg font-semibold text-white transition-all select-none",
 				"hover:opacity-90 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring",
 				sizeClasses,
 				isActive && "ring-2 ring-primary ring-offset-1 ring-offset-background"
@@ -144,7 +147,7 @@ export function SearchSpaceAvatar({
 					<Users className={cn(size === "sm" ? "h-2 w-2" : "h-2.5 w-2.5")} />
 				</span>
 			)}
-		</button>
+		</Button>
 	);
 
 	const menuItems = (
diff --git a/surfsense_web/components/layout/ui/sidebar/AllSharedChatsSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/AllSharedChatsSidebar.tsx
index d6a25608e..b8073c3c4 100644
--- a/surfsense_web/components/layout/ui/sidebar/AllSharedChatsSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/AllSharedChatsSidebar.tsx
@@ -347,8 +347,9 @@ export function AllSharedChatsSidebarContent({
 							return (
 								<div key={thread.id} className="group/item relative w-full">
 									{isMobile ? (
-										<button
+										<Button
 											type="button"
+											variant="ghost"
 											onClick={() => {
 												if (wasLongPress()) return;
 												handleThreadClick(thread.id);
@@ -361,7 +362,7 @@ export function AllSharedChatsSidebarContent({
 											onTouchMove={longPressHandlers.onTouchMove}
 											disabled={isBusy}
 											className={cn(
-												"flex w-full items-center gap-2 overflow-hidden rounded-md px-2 py-1.5 text-sm text-left",
+												"h-auto w-full justify-start gap-2 overflow-hidden rounded-md px-2 py-1.5 text-sm text-left",
 												"group-hover/item:bg-accent group-hover/item:text-accent-foreground",
 												"focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring",
 												isActive && "bg-accent text-accent-foreground",
@@ -369,16 +370,17 @@ export function AllSharedChatsSidebarContent({
 											)}
 										>
 											<span className="truncate">{thread.title || "New Chat"}</span>
-										</button>
+										</Button>
 									) : (
 										<Tooltip delayDuration={600}>
 											<TooltipTrigger asChild>
-												<button
+												<Button
 													type="button"
+													variant="ghost"
 													onClick={() => handleThreadClick(thread.id)}
 													disabled={isBusy}
 													className={cn(
-														"flex w-full items-center gap-2 overflow-hidden rounded-md px-2 py-1.5 text-sm text-left",
+														"h-auto w-full justify-start gap-2 overflow-hidden rounded-md px-2 py-1.5 text-sm text-left",
 														"group-hover/item:bg-accent group-hover/item:text-accent-foreground",
 														"focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring",
 														isActive && "bg-accent text-accent-foreground",
@@ -386,7 +388,7 @@ export function AllSharedChatsSidebarContent({
 													)}
 												>
 													<span className="truncate">{thread.title || "New Chat"}</span>
-												</button>
+												</Button>
 											</TooltipTrigger>
 											<TooltipContent side="bottom" align="start">
 												<p>
diff --git a/surfsense_web/components/layout/ui/sidebar/ChatListItem.tsx b/surfsense_web/components/layout/ui/sidebar/ChatListItem.tsx
index 4ef7b2965..ea4f946c2 100644
--- a/surfsense_web/components/layout/ui/sidebar/ChatListItem.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/ChatListItem.tsx
@@ -56,19 +56,20 @@ export function ChatListItem({
 
 	return (
 		<div className="group/item relative w-full">
-			<button
+			<Button
 				type="button"
+				variant="ghost"
 				onClick={handleClick}
 				{...(isMobile ? longPressHandlers : {})}
 				className={cn(
-					"flex w-full items-center gap-2 overflow-hidden rounded-md px-2 py-1.5 text-sm text-left",
+					"h-auto w-full justify-start gap-2 overflow-hidden px-2 py-1.5 text-left font-normal",
 					"group-hover/item:bg-accent group-hover/item:text-accent-foreground",
 					"focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring",
 					isActive && "bg-accent text-accent-foreground"
 				)}
 			>
 				<span className="truncate">{animatedName}</span>
-			</button>
+			</Button>
 
 			{/* Actions dropdown - trigger hidden on mobile, long-press opens it instead */}
 			<div
diff --git a/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx
index 45a0fbb39..06c074800 100644
--- a/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx
@@ -575,14 +575,15 @@ export function InboxSidebarContent({
 													{t("filter") || "Filter"}
 												</p>
 												<div className="space-y-1">
-													<button
+													<Button
 														type="button"
+														variant="ghost"
 														onClick={() => {
 															setActiveFilter("all");
 															setFilterDrawerOpen(false);
 														}}
 														className={cn(
-															"flex w-full items-center justify-between rounded-lg px-3 py-2.5 text-sm transition-colors",
+															"h-auto w-full justify-between rounded-lg px-3 py-2.5 text-sm transition-colors",
 															activeFilter === "all"
 																? "bg-primary/10 text-primary"
 																: "hover:bg-muted"
@@ -593,15 +594,16 @@ export function InboxSidebarContent({
 															<span>{t("all") || "All"}</span>
 														</span>
 														{activeFilter === "all" && <Check className="h-4 w-4" />}
-													</button>
-													<button
+													</Button>
+													<Button
 														type="button"
+														variant="ghost"
 														onClick={() => {
 															setActiveFilter("unread");
 															setFilterDrawerOpen(false);
 														}}
 														className={cn(
-															"flex w-full items-center justify-between rounded-lg px-3 py-2.5 text-sm transition-colors",
+															"h-auto w-full justify-between rounded-lg px-3 py-2.5 text-sm transition-colors",
 															activeFilter === "unread"
 																? "bg-primary/10 text-primary"
 																: "hover:bg-muted"
@@ -612,16 +614,17 @@ export function InboxSidebarContent({
 															<span>{t("unread") || "Unread"}</span>
 														</span>
 														{activeFilter === "unread" && <Check className="h-4 w-4" />}
-													</button>
+													</Button>
 													{activeTab === "status" && (
-														<button
+														<Button
 															type="button"
+															variant="ghost"
 															onClick={() => {
 																setActiveFilter("errors");
 																setFilterDrawerOpen(false);
 															}}
 															className={cn(
-																"flex w-full items-center justify-between rounded-lg px-3 py-2.5 text-sm transition-colors",
+																"h-auto w-full justify-between rounded-lg px-3 py-2.5 text-sm transition-colors",
 																activeFilter === "errors"
 																	? "bg-primary/10 text-primary"
 																	: "hover:bg-muted"
@@ -632,7 +635,7 @@ export function InboxSidebarContent({
 																<span>{t("errors_only") || "Errors only"}</span>
 															</span>
 															{activeFilter === "errors" && <Check className="h-4 w-4" />}
-														</button>
+														</Button>
 													)}
 												</div>
 											</div>
@@ -642,14 +645,15 @@ export function InboxSidebarContent({
 														{t("sources") || "Sources"}
 													</p>
 													<div className="space-y-1">
-														<button
+														<Button
 															type="button"
+															variant="ghost"
 															onClick={() => {
 																setSelectedSource(null);
 																setFilterDrawerOpen(false);
 															}}
 															className={cn(
-																"flex w-full items-center justify-between rounded-lg px-3 py-2.5 text-sm transition-colors",
+																"h-auto w-full justify-between rounded-lg px-3 py-2.5 text-sm transition-colors",
 																selectedSource === null
 																	? "bg-primary/10 text-primary"
 																	: "hover:bg-muted"
@@ -660,17 +664,18 @@ export function InboxSidebarContent({
 																<span>{t("all_sources") || "All sources"}</span>
 															</span>
 															{selectedSource === null && <Check className="h-4 w-4" />}
-														</button>
+														</Button>
 														{statusSourceOptions.map((source) => (
-															<button
+															<Button
 																key={source.key}
 																type="button"
+																variant="ghost"
 																onClick={() => {
 																	setSelectedSource(source.key);
 																	setFilterDrawerOpen(false);
 																}}
 																className={cn(
-																	"flex w-full items-center justify-between rounded-lg px-3 py-2.5 text-sm transition-colors",
+																	"h-auto w-full justify-between rounded-lg px-3 py-2.5 text-sm transition-colors",
 																	selectedSource === source.key
 																		? "bg-primary/10 text-primary"
 																		: "hover:bg-muted"
@@ -681,7 +686,7 @@ export function InboxSidebarContent({
 																	<span>{source.displayName}</span>
 																</span>
 																{selectedSource === source.key && <Check className="h-4 w-4" />}
-															</button>
+															</Button>
 														))}
 													</div>
 												</div>
@@ -922,11 +927,12 @@ export function InboxSidebarContent({
 									{activeTab === "status" ? (
 										<Tooltip delayDuration={600}>
 											<TooltipTrigger asChild>
-												<button
+												<Button
 													type="button"
+													variant="ghost"
 													onClick={() => handleItemClick(item)}
 													disabled={isMarkingAsRead}
-													className="flex items-center gap-3 flex-1 min-w-0 text-left overflow-hidden"
+													className="h-auto flex-1 justify-start gap-3 overflow-hidden bg-transparent p-0 text-left hover:bg-transparent"
 												>
 													<div className="shrink-0">{getStatusIcon(item)}</div>
 													<div className="flex-1 min-w-0 overflow-hidden">
@@ -942,7 +948,7 @@ export function InboxSidebarContent({
 															{convertRenderedToDisplay(item.message)}
 														</p>
 													</div>
-												</button>
+												</Button>
 											</TooltipTrigger>
 											<TooltipContent side="bottom" align="start" className="max-w-[250px]">
 												<p className="font-medium">{item.title}</p>
@@ -952,11 +958,12 @@ export function InboxSidebarContent({
 											</TooltipContent>
 										</Tooltip>
 									) : (
-										<button
+										<Button
 											type="button"
+											variant="ghost"
 											onClick={() => handleItemClick(item)}
 											disabled={isMarkingAsRead}
-											className="flex items-center gap-3 flex-1 min-w-0 text-left overflow-hidden"
+											className="h-auto flex-1 justify-start gap-3 overflow-hidden bg-transparent p-0 text-left hover:bg-transparent"
 										>
 											<div className="shrink-0">{getStatusIcon(item)}</div>
 											<div className="flex-1 min-w-0 overflow-hidden">
@@ -972,7 +979,7 @@ export function InboxSidebarContent({
 													{convertRenderedToDisplay(item.message)}
 												</p>
 											</div>
-										</button>
+										</Button>
 									)}
 
 									<div className="flex items-center justify-end gap-1.5 shrink-0 w-10">
diff --git a/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx b/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
index 3a319347f..7cc65d2b8 100644
--- a/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
@@ -6,6 +6,7 @@ import { useParams } from "next/navigation";
 import { useTranslations } from "next-intl";
 import { useMemo, useState } from "react";
 import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
 import { Progress } from "@/components/ui/progress";
 import { Skeleton } from "@/components/ui/skeleton";
 import { useIsAnonymous } from "@/contexts/anonymous-mode";
@@ -204,13 +205,14 @@ export function Sidebar({
 						alwaysShowAction={!disableTooltips && isSharedChatsPanelOpen}
 						action={
 							onViewAllSharedChats ? (
-								<button
+								<Button
 									type="button"
+									variant="ghost"
 									onClick={onViewAllSharedChats}
-									className="text-xs font-medium text-muted-foreground/60 hover:text-muted-foreground transition-colors whitespace-nowrap cursor-pointer bg-transparent border-none p-0 focus:outline-none"
+									className="h-auto cursor-pointer whitespace-nowrap bg-transparent p-0 text-xs font-medium text-muted-foreground/60 transition-colors hover:bg-transparent hover:text-muted-foreground"
 								>
 									{!disableTooltips && isSharedChatsPanelOpen ? t("hide") : t("show_all")}
-								</button>
+								</Button>
 							) : undefined
 						}
 					>
@@ -260,13 +262,14 @@ export function Sidebar({
 						alwaysShowAction={!disableTooltips && isPrivateChatsPanelOpen}
 						action={
 							onViewAllPrivateChats ? (
-								<button
+								<Button
 									type="button"
+									variant="ghost"
 									onClick={onViewAllPrivateChats}
-									className="text-xs font-medium text-muted-foreground/60 hover:text-muted-foreground transition-colors whitespace-nowrap cursor-pointer bg-transparent border-none p-0 focus:outline-none"
+									className="h-auto cursor-pointer whitespace-nowrap bg-transparent p-0 text-xs font-medium text-muted-foreground/60 transition-colors hover:bg-transparent hover:text-muted-foreground"
 								>
 									{!disableTooltips && isPrivateChatsPanelOpen ? t("hide") : t("show_all")}
-								</button>
+								</Button>
 							) : undefined
 						}
 					>
diff --git a/surfsense_web/components/layout/ui/sidebar/SidebarButton.tsx b/surfsense_web/components/layout/ui/sidebar/SidebarButton.tsx
index 6702cea4a..83ece94ab 100644
--- a/surfsense_web/components/layout/ui/sidebar/SidebarButton.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/SidebarButton.tsx
@@ -12,18 +12,12 @@ interface SidebarButtonProps {
 	isCollapsed?: boolean;
 	isActive?: boolean;
 	badge?: React.ReactNode;
-	/** Overlay in the top-right corner of the collapsed icon (e.g. status badge) */
 	collapsedOverlay?: React.ReactNode;
-	/** Custom icon node for collapsed mode — overrides the default <Icon> rendering */
 	collapsedIconNode?: React.ReactNode;
-	/** Custom icon node for expanded mode — overrides the default <Icon> rendering */
 	expandedIconNode?: React.ReactNode;
-	/** Optional inline trailing content shown in expanded mode */
 	trailingContent?: React.ReactNode;
-	/** Optional tooltip content that replaces the default label tooltip */
 	tooltipContent?: React.ReactNode;
 	className?: string;
-	/** Extra attributes spread onto the inner <button> (e.g. data-joyride) */
 	buttonProps?: React.ButtonHTMLAttributes<HTMLButtonElement>;
 }
 
diff --git a/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx b/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx
index 71966ae45..a8275829b 100644
--- a/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx
@@ -29,6 +29,7 @@ import {
 	DropdownMenuSubTrigger,
 	DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
+import { Button } from "@/components/ui/button";
 import { Spinner } from "@/components/ui/spinner";
 import { useLocaleContext } from "@/contexts/LocaleContext";
 import { usePlatform } from "@/hooks/use-platform";
@@ -204,11 +205,12 @@ export function SidebarUserProfile({
 			<div className="border-t px-1.5 py-2">
 				<DropdownMenu>
 					<DropdownMenuTrigger asChild>
-						<button
+						<Button
 							type="button"
+							variant="ghost"
 							className={cn(
-								"mx-auto flex h-9 w-9 items-center justify-center rounded-full",
-								"transition-opacity hover:opacity-90",
+								"mx-auto h-9 w-9 rounded-full p-0",
+								"transition-opacity hover:bg-transparent hover:opacity-90",
 								"focus:outline-none focus-visible:outline-none",
 								"data-[state=open]:opacity-90"
 							)}
@@ -220,7 +222,7 @@ export function SidebarUserProfile({
 								size="md"
 							/>
 							<span className="sr-only">{displayName}</span>
-						</button>
+						</Button>
 					</DropdownMenuTrigger>
 
 					<DropdownMenuContent className="w-48" side="right" align="end" sideOffset={8}>
@@ -367,10 +369,11 @@ export function SidebarUserProfile({
 		<div className="border-t">
 			<DropdownMenu>
 				<DropdownMenuTrigger asChild>
-					<button
+					<Button
 						type="button"
+						variant="ghost"
 						className={cn(
-							"flex w-full items-center gap-2 px-2 py-3 text-left",
+							"h-auto w-full justify-start gap-2 rounded-none px-2 py-3 text-left",
 							"hover:bg-accent transition-colors",
 							"focus:outline-none focus-visible:outline-none",
 							"data-[state=open]:bg-transparent"
@@ -386,7 +389,7 @@ export function SidebarUserProfile({
 
 						{/* Chevron icon */}
 						<ChevronUp className="h-4 w-4 shrink-0 text-muted-foreground" />
-					</button>
+					</Button>
 				</DropdownMenuTrigger>
 
 				<DropdownMenuContent className="w-48" side="top" align="center" sideOffset={4}>
diff --git a/surfsense_web/components/layout/ui/tabs/TabBar.tsx b/surfsense_web/components/layout/ui/tabs/TabBar.tsx
index 6d170409f..3946fdc6d 100644
--- a/surfsense_web/components/layout/ui/tabs/TabBar.tsx
+++ b/surfsense_web/components/layout/ui/tabs/TabBar.tsx
@@ -10,6 +10,7 @@ import {
 	type Tab,
 	tabsAtom,
 } from "@/atoms/tabs/tabs.atom";
+import { Button } from "@/components/ui/button";
 import { cn } from "@/lib/utils";
 
 interface TabBarProps {
@@ -189,22 +190,25 @@ export function TabBar({
 									)}
 								/>
 							) : null}
-							<button
-								type="button"
+							<div
 								data-tab-id={tab.id}
-								onClick={() => handleTabClick(tab)}
-								onMouseEnter={() => setHoveredTabIndex(index)}
-								onMouseLeave={() => setHoveredTabIndex(null)}
-								className={cn(
-									"group relative flex h-full items-center px-3 w-[180px] min-h-0 overflow-hidden text-[13px] font-medium rounded-md transition-colors duration-150 shrink-0",
-									isActive
-										? "bg-accent text-accent-foreground"
-										: "bg-transparent text-muted-foreground hover:bg-accent hover:text-accent-foreground"
-								)}
+								className="group relative h-full w-[180px] shrink-0"
 							>
-								<span className="block min-w-0 flex-1 whitespace-nowrap overflow-hidden text-left">
-									{tab.title}
-								</span>
+								<Button
+									type="button"
+									variant="ghost"
+									onClick={() => handleTabClick(tab)}
+									onMouseEnter={() => setHoveredTabIndex(index)}
+									onMouseLeave={() => setHoveredTabIndex(null)}
+									className={cn(
+										"h-full w-full justify-start overflow-hidden px-3 text-left text-[13px] font-medium transition-colors duration-150",
+										isActive
+											? "bg-accent text-accent-foreground"
+											: "bg-transparent text-muted-foreground hover:bg-accent hover:text-accent-foreground group-hover:bg-accent group-hover:text-accent-foreground group-focus-within:bg-accent group-focus-within:text-accent-foreground"
+									)}
+								>
+									<span className="block min-w-0 flex-1 truncate text-left">{tab.title}</span>
+								</Button>
 								{/* Hover-only gradient + close overlay (sidebar pattern) — keeps pill width fixed and avoids ellipsis shift. */}
 								<div
 									className={cn(
@@ -213,23 +217,19 @@ export function TabBar({
 										"bg-gradient-to-l from-accent from-60% to-transparent"
 									)}
 								>
-									{/* biome-ignore lint/a11y/useSemanticElements: cannot nest button inside button */}
-									<span
-										role="button"
-										tabIndex={0}
+									<Button
+										type="button"
+										variant="ghost"
+										size="icon"
 										onClick={(e) => handleTabClose(e, tab.id)}
-										onKeyDown={(e) => {
-											if (e.key === "Enter" || e.key === " ") {
-												e.preventDefault();
-												handleTabClose(e as unknown as React.MouseEvent, tab.id);
-											}
-										}}
-										className="pointer-events-auto rounded-full p-0.5 transition-colors hover:bg-accent hover:text-accent-foreground"
+										onMouseEnter={() => setHoveredTabIndex(index)}
+										onMouseLeave={() => setHoveredTabIndex(null)}
+										className="pointer-events-auto size-4 rounded-full p-0.5 hover:bg-accent hover:text-accent-foreground"
 									>
-										<X className="size-3" />
-									</span>
+										<X data-icon="inline-start" />
+									</Button>
 								</div>
-							</button>
+							</div>
 						</Fragment>
 					);
 				})}
@@ -243,14 +243,16 @@ export function TabBar({
 							"before:bg-gradient-to-r before:from-transparent before:to-panel"
 						)}
 					>
-						<button
+						<Button
 							type="button"
+							variant="ghost"
+							size="icon"
 							onClick={onNewChat}
-							className="flex h-8 w-8 items-center justify-center shrink-0 rounded-md text-muted-foreground transition-all duration-150 hover:bg-accent hover:text-accent-foreground"
+							className="size-8 shrink-0 text-muted-foreground transition-all duration-150 hover:bg-accent hover:text-accent-foreground"
 							title="New Chat"
 						>
-							<Plus className="size-4" />
-						</button>
+							<Plus data-icon="inline-start" />
+						</Button>
 					</div>
 				)}
 			</div>
diff --git a/surfsense_web/components/new-chat/chat-share-button.tsx b/surfsense_web/components/new-chat/chat-share-button.tsx
index 6e231707e..f8a9f55ff 100644
--- a/surfsense_web/components/new-chat/chat-share-button.tsx
+++ b/surfsense_web/components/new-chat/chat-share-button.tsx
@@ -143,18 +143,20 @@ export function ChatShareButton({ thread, onVisibilityChange, className }: ChatS
 			{hasPublicSnapshots && (
 				<Tooltip>
 					<TooltipTrigger asChild>
-						<button
+						<Button
 							type="button"
+							variant="ghost"
+							size="icon"
 							onClick={() =>
 								setSearchSpaceSettingsDialog({
 									open: true,
 									initialTab: "public-links",
 								})
 							}
-							className="flex items-center justify-center h-8 w-8 rounded-md bg-muted/50 hover:bg-accent hover:text-accent-foreground transition-colors"
+							className="size-8 bg-muted/50 hover:bg-accent hover:text-accent-foreground"
 						>
-							<Earth className="h-4 w-4 text-muted-foreground" />
-						</button>
+							<Earth data-icon="inline-start" className="text-muted-foreground" />
+						</Button>
 					</TooltipTrigger>
 					<TooltipContent>Manage public links</TooltipContent>
 				</Tooltip>
@@ -185,14 +187,13 @@ export function ChatShareButton({ thread, onVisibilityChange, className }: ChatS
 							const Icon = option.icon;
 
 							return (
-								<button
+								<Button
 									type="button"
+									variant="ghost"
 									key={option.value}
 									onClick={() => handleVisibilityChange(option.value)}
 									className={cn(
-										"w-full flex items-center gap-2.5 px-2.5 py-2 rounded-md transition-colors",
-										"hover:bg-accent hover:text-accent-foreground cursor-pointer",
-										"focus:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2",
+										"h-auto w-full justify-start gap-2.5 whitespace-normal px-2.5 py-2 font-normal",
 										isSelected && "bg-accent text-accent-foreground"
 									)}
 								>
@@ -204,7 +205,7 @@ export function ChatShareButton({ thread, onVisibilityChange, className }: ChatS
 									>
 										<Icon
 											className={cn(
-												"size-4 block",
+												"block",
 												isSelected ? "text-primary dark:text-white" : "text-muted-foreground"
 											)}
 										/>
@@ -224,7 +225,7 @@ export function ChatShareButton({ thread, onVisibilityChange, className }: ChatS
 											{option.description}
 										</p>
 									</div>
-								</button>
+								</Button>
 							);
 						})}
 
@@ -234,19 +235,18 @@ export function ChatShareButton({ thread, onVisibilityChange, className }: ChatS
 								<div className="border-t border-popover-border my-1" />
 
 								{/* Public Link Option */}
-								<button
+								<Button
 									type="button"
+									variant="ghost"
 									onClick={handleCreatePublicLink}
 									disabled={isCreatingSnapshot}
 									className={cn(
-										"w-full flex items-center gap-2.5 px-2.5 py-2 rounded-md transition-colors",
-										"hover:bg-accent hover:text-accent-foreground cursor-pointer",
-										"focus:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2",
-										"disabled:opacity-50 disabled:cursor-not-allowed"
+										"h-auto w-full justify-start gap-2.5 whitespace-normal px-2.5 py-2 font-normal",
+										"disabled:cursor-not-allowed"
 									)}
 								>
 									<div className="size-7 rounded-md shrink-0 grid place-items-center bg-muted dark:bg-white/5">
-										<Earth className="size-4 block text-muted-foreground" />
+										<Earth className="block text-muted-foreground" />
 									</div>
 									<div className="flex-1 text-left min-w-0">
 										<div className="flex items-center gap-1.5">
@@ -258,7 +258,7 @@ export function ChatShareButton({ thread, onVisibilityChange, className }: ChatS
 											Creates a shareable snapshot of this chat
 										</p>
 									</div>
-								</button>
+								</Button>
 							</>
 						)}
 					</div>
diff --git a/surfsense_web/components/sources/DocumentUploadTab.tsx b/surfsense_web/components/sources/DocumentUploadTab.tsx
index 134680b49..a9aec21a1 100644
--- a/surfsense_web/components/sources/DocumentUploadTab.tsx
+++ b/surfsense_web/components/sources/DocumentUploadTab.tsx
@@ -115,13 +115,15 @@ function buildFolderTree(entries: FolderEntry[]): FolderTreeNode[] {
 
 function flattenTree(
 	nodes: FolderTreeNode[],
-	depth = 0
-): { name: string; isFolder: boolean; depth: number; size?: number }[] {
-	const items: { name: string; isFolder: boolean; depth: number; size?: number }[] = [];
+	depth = 0,
+	parentPath = ""
+): { name: string; isFolder: boolean; depth: number; path: string; size?: number }[] {
+	const items: { name: string; isFolder: boolean; depth: number; path: string; size?: number }[] = [];
 	for (const node of nodes) {
-		items.push({ name: node.name, isFolder: node.isFolder, depth, size: node.size });
+		const path = parentPath ? `${parentPath}/${node.name}` : node.name;
+		items.push({ name: node.name, isFolder: node.isFolder, depth, path, size: node.size });
 		if (node.isFolder && node.children.length > 0) {
-			items.push(...flattenTree(node.children, depth + 1));
+			items.push(...flattenTree(node.children, depth + 1, path));
 		}
 	}
 	return items;
@@ -537,37 +539,39 @@ export function DocumentUploadTab({
 					isElectron ? (
 						<div className="w-full">{renderBrowseButton({ compact: true, fullWidth: true })}</div>
 					) : (
-						<button
+						<Button
 							type="button"
-							className="w-full text-xs h-8 flex items-center justify-center gap-1.5 rounded-md border border-dashed border-muted-foreground/30 text-muted-foreground hover:text-accent-foreground hover:border-foreground/50 transition-colors"
+							variant="ghost"
+							className="h-8 w-full gap-1.5 rounded-md border border-dashed border-muted-foreground/30 px-0 text-xs text-muted-foreground transition-colors hover:border-foreground/50 hover:bg-transparent hover:text-accent-foreground"
 							onClick={() => fileInputRef.current?.click()}
 						>
 							Add more files
-						</button>
+						</Button>
 					)
 				) : (
-					// biome-ignore lint/a11y/useSemanticElements: cannot use <button> here because the contents include nested interactive elements (renderBrowseButton renders a Button), which would be invalid HTML.
-					<div
-						role="button"
-						tabIndex={0}
-						className="flex flex-col items-center gap-4 py-12 px-4 cursor-pointer w-full bg-transparent outline-none select-none"
-						onClick={() => {
-							if (!isElectron) fileInputRef.current?.click();
-						}}
-						onKeyDown={(e) => {
-							if (e.key === "Enter" || e.key === " ") {
-								e.preventDefault();
-								if (!isElectron) fileInputRef.current?.click();
-							}
-						}}
-					>
-						<Upload className="h-10 w-10 text-muted-foreground" />
-						<div className="text-center space-y-1.5">
-							<p className="text-base font-medium">
-								{isElectron ? t("select_files_or_folder") : t("tap_select_files_or_folder")}
-							</p>
-							<p className="text-sm text-muted-foreground">{t("file_size_limit")}</p>
-						</div>
+					<div className="flex w-full flex-col items-center gap-4 bg-transparent px-4 py-12 select-none">
+						{isElectron ? (
+							<div className="flex w-full flex-col items-center gap-4">
+								<Upload className="h-10 w-10 text-muted-foreground" />
+								<div className="text-center space-y-1.5">
+									<p className="text-base font-medium">{t("select_files_or_folder")}</p>
+									<p className="text-sm text-muted-foreground">{t("file_size_limit")}</p>
+								</div>
+							</div>
+						) : (
+							<Button
+								type="button"
+								variant="ghost"
+								className="h-auto w-full flex-col gap-4 whitespace-normal bg-transparent p-0 text-foreground hover:bg-transparent hover:text-foreground"
+								onClick={() => fileInputRef.current?.click()}
+							>
+								<Upload className="h-10 w-10 text-muted-foreground" />
+								<div className="text-center space-y-1.5">
+									<p className="text-base font-medium">{t("tap_select_files_or_folder")}</p>
+									<p className="text-sm text-muted-foreground">{t("file_size_limit")}</p>
+								</div>
+							</Button>
+						)}
 						<fieldset
 							className="w-full mt-1 border-none p-0 m-0"
 							onClick={(e) => e.stopPropagation()}
@@ -649,9 +653,9 @@ export function DocumentUploadTab({
 
 					<div className="max-h-[160px] sm:max-h-[200px] overflow-y-auto -mx-1">
 						{folderUpload
-							? folderTreeItems.map((item, i) => (
+							? folderTreeItems.map((item) => (
 									<div
-										key={`${item.depth}-${i}-${item.name}`}
+										key={item.path}
 										className="flex items-center gap-1.5 py-0.5 px-2"
 										style={{ paddingLeft: `${item.depth * 16 + 8}px` }}
 									>
@@ -726,10 +730,11 @@ export function DocumentUploadTab({
 					<div className="space-y-1.5">
 						<p className="font-medium text-sm px-1">{t("processing_mode")}</p>
 						<div className="grid grid-cols-2 gap-2">
-							<button
+							<Button
 								type="button"
 								onClick={() => setProcessingMode("basic")}
-								className={`flex items-start gap-2.5 rounded-lg border p-3 text-left transition-colors ${
+								variant="ghost"
+								className={`h-auto w-full items-start justify-start whitespace-normal rounded-lg border p-3 text-left transition-colors hover:bg-transparent hover:text-foreground ${
 									processingMode === "basic"
 										? "border-primary bg-primary/5"
 										: "border-border hover:border-muted-foreground/50"
@@ -742,11 +747,12 @@ export function DocumentUploadTab({
 									<p className="font-medium text-sm">{t("basic_mode")}</p>
 									<p className="text-xs text-muted-foreground">{t("basic_mode_desc")}</p>
 								</div>
-							</button>
-							<button
+							</Button>
+							<Button
 								type="button"
 								onClick={() => setProcessingMode("premium")}
-								className={`flex items-start gap-2.5 rounded-lg border p-3 text-left transition-colors ${
+								variant="ghost"
+								className={`h-auto w-full items-start justify-start whitespace-normal rounded-lg border p-3 text-left transition-colors hover:bg-transparent hover:text-foreground ${
 									processingMode === "premium"
 										? "border-amber-500 bg-amber-500/5"
 										: "border-border hover:border-muted-foreground/50"
@@ -759,7 +765,7 @@ export function DocumentUploadTab({
 									<p className="font-medium text-sm">{t("premium_mode")}</p>
 									<p className="text-xs text-muted-foreground">{t("premium_mode_desc")}</p>
 								</div>
-							</button>
+							</Button>
 						</div>
 					</div>
 
diff --git a/surfsense_web/components/ui/link-toolbar.tsx b/surfsense_web/components/ui/link-toolbar.tsx
index ee61e515d..462c716f0 100644
--- a/surfsense_web/components/ui/link-toolbar.tsx
+++ b/surfsense_web/components/ui/link-toolbar.tsx
@@ -22,7 +22,7 @@ import {
 } from "platejs/react";
 import * as React from "react";
 
-import { buttonVariants } from "@/components/ui/button";
+import { Button } from "@/components/ui/button";
 import { Separator } from "@/components/ui/separator";
 
 const popoverVariants = cva(
@@ -116,13 +116,9 @@ export function LinkFloatingToolbar({ state }: { state?: LinkFloatingToolbarStat
 		input
 	) : (
 		<div className="box-content flex items-center">
-			<button
-				className={buttonVariants({ size: "sm", variant: "ghost" })}
-				type="button"
-				{...editButtonProps}
-			>
+			<Button size="sm" variant="ghost" type="button" {...editButtonProps}>
 				Edit link
-			</button>
+			</Button>
 
 			<Separator orientation="vertical" />
 
@@ -130,16 +126,9 @@ export function LinkFloatingToolbar({ state }: { state?: LinkFloatingToolbarStat
 
 			<Separator orientation="vertical" />
 
-			<button
-				className={buttonVariants({
-					size: "sm",
-					variant: "ghost",
-				})}
-				type="button"
-				{...unlinkButtonProps}
-			>
+			<Button size="sm" variant="ghost" type="button" {...unlinkButtonProps}>
 				<Unlink width={18} />
-			</button>
+			</Button>
 		</div>
 	);
 
@@ -158,29 +147,22 @@ export function LinkFloatingToolbar({ state }: { state?: LinkFloatingToolbarStat
 
 function LinkOpenButton() {
 	const editor = useEditorRef();
-	const selection = useEditorSelection();
+	useEditorSelection();
 
-	// biome-ignore lint/correctness/useExhaustiveDependencies: selection triggers recalculation of link attributes
-	const attributes = React.useMemo(() => {
-		const entry = editor.api.node<TLinkElement>({
-			match: { type: editor.getType(KEYS.link) },
-		});
-		if (!entry) {
-			return {};
-		}
-		const [element] = entry;
-		return getLinkAttributes(editor, element);
-	}, [editor, selection]);
+	const entry = editor.api.node<TLinkElement>({
+		match: { type: editor.getType(KEYS.link) },
+	});
+	const attributes = entry ? getLinkAttributes(editor, entry[0]) : {};
+	const href = typeof attributes.href === "string" ? attributes.href : undefined;
 
 	return (
-		// biome-ignore lint/a11y/noStaticElementInteractions: <a> with spread attributes has dynamic href
-		// biome-ignore lint/a11y/useAriaPropsSupportedByRole: aria-label needed for icon-only link
-		<a
-			{...attributes}
-			className={buttonVariants({
-				size: "sm",
-				variant: "ghost",
-			})}
+		<Button
+			size="sm"
+			variant="ghost"
+			type="button"
+			onClick={() => {
+				if (href) window.open(href, "_blank", "noopener,noreferrer");
+			}}
 			onMouseOver={(e) => {
 				e.stopPropagation();
 			}}
@@ -188,10 +170,9 @@ function LinkOpenButton() {
 				e.stopPropagation();
 			}}
 			aria-label="Open link in a new tab"
-			target="_blank"
-			rel="noopener noreferrer"
+			disabled={!href}
 		>
 			<ExternalLink width={18} />
-		</a>
+		</Button>
 	);
 }

From ee72a49ab14ab3bbd38eb8488e178ff6dae31772 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Thu, 14 May 2026 14:40:08 +0530
Subject: [PATCH 48/96] refactor: replace button elements with Button component
 for improved consistency and styling across additional UI components

---
 .../components/composio-drive-config.tsx      |  24 +--
 .../components/dropbox-config.tsx             |  24 +--
 .../components/google-drive-config.tsx        |  27 ++--
 .../components/onedrive-config.tsx            |  24 +--
 .../views/connector-accounts-list-view.tsx    |  14 +-
 .../assistant-ui/inline-citation.tsx          |  15 +-
 .../connectors/drive-folder-tree.tsx          |  23 +--
 .../components/documents/DocumentNode.tsx     |  24 ++-
 .../ui/sidebar/AllPrivateChatsSidebar.tsx     |  14 +-
 .../ui/sidebar/LocalFilesystemBrowser.tsx     |  23 ++-
 surfsense_web/components/markdown-viewer.tsx  |  88 ++---------
 .../components/new-chat/prompt-picker.tsx     |  15 +-
 .../components/settings/buy-pages-content.tsx |  23 +--
 .../settings/buy-tokens-content.tsx           |  23 +--
 .../components/settings/roles-manager.tsx     | 147 ++++++++++--------
 .../components/settings/settings-dialog.tsx   |  15 +-
 .../components/shared/llm-config-form.tsx     |  14 +-
 17 files changed, 274 insertions(+), 263 deletions(-)

diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/composio-drive-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/composio-drive-config.tsx
index 8e92af44b..6d119e8a2 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/composio-drive-config.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/composio-drive-config.tsx
@@ -14,6 +14,7 @@ import {
 import type { FC } from "react";
 import { useCallback, useState } from "react";
 import { DriveFolderTree, type SelectedFolder } from "@/components/connectors/drive-folder-tree";
+import { Button } from "@/components/ui/button";
 import { Label } from "@/components/ui/label";
 import {
 	Select,
@@ -196,14 +197,16 @@ export const ComposioDriveConfig: FC<ConnectorConfigProps> = ({ connector, onCon
 								>
 									<FolderClosed className="size-3.5 shrink-0 text-muted-foreground" />
 									<span className="flex-1 truncate">{folder.name}</span>
-									<button
+									<Button
 										type="button"
+										variant="ghost"
+										size="icon"
 										onClick={() => handleRemoveFolder(folder.id)}
-										className="shrink-0 p-0.5 hover:bg-accent hover:text-accent-foreground rounded transition-colors"
+										className="size-5 shrink-0 rounded p-0 hover:bg-accent hover:text-accent-foreground"
 										aria-label={`Remove ${folder.name}`}
 									>
 										<X className="size-3.5" />
-									</button>
+									</Button>
 								</div>
 							))}
 							{selectedFiles.map((file) => (
@@ -214,14 +217,16 @@ export const ComposioDriveConfig: FC<ConnectorConfigProps> = ({ connector, onCon
 								>
 									{getFileIconFromName(file.name)}
 									<span className="flex-1 truncate">{file.name}</span>
-									<button
+									<Button
 										type="button"
+										variant="ghost"
+										size="icon"
 										onClick={() => handleRemoveFile(file.id)}
-										className="shrink-0 p-0.5 hover:bg-accent hover:text-accent-foreground rounded transition-colors"
+										className="size-5 shrink-0 rounded p-0 hover:bg-accent hover:text-accent-foreground"
 										aria-label={`Remove ${file.name}`}
 									>
 										<X className="size-3.5" />
-									</button>
+									</Button>
 								</div>
 							))}
 						</div>
@@ -237,10 +242,11 @@ export const ComposioDriveConfig: FC<ConnectorConfigProps> = ({ connector, onCon
 
 				{isEditMode ? (
 					<div className="space-y-2">
-						<button
+						<Button
 							type="button"
+							variant="ghost"
 							onClick={() => setIsFolderTreeOpen((prev) => !prev)}
-							className="flex items-center gap-2 text-xs sm:text-sm text-muted-foreground hover:text-accent-foreground transition-colors w-fit"
+							className="h-auto w-fit gap-2 px-0 py-0 text-xs font-normal text-muted-foreground hover:bg-transparent hover:text-accent-foreground sm:text-sm"
 						>
 							Change Selection
 							{isFolderTreeOpen ? (
@@ -248,7 +254,7 @@ export const ComposioDriveConfig: FC<ConnectorConfigProps> = ({ connector, onCon
 							) : (
 								<ChevronRight className="size-4" />
 							)}
-						</button>
+						</Button>
 						{isFolderTreeOpen && (
 							<DriveFolderTree
 								fetchItems={fetchItems}
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/dropbox-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/dropbox-config.tsx
index 706e8f2e4..7696ce9a5 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/dropbox-config.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/dropbox-config.tsx
@@ -14,6 +14,7 @@ import {
 import type { FC } from "react";
 import { useCallback, useEffect, useState } from "react";
 import { DriveFolderTree, type SelectedFolder } from "@/components/connectors/drive-folder-tree";
+import { Button } from "@/components/ui/button";
 import { Label } from "@/components/ui/label";
 import {
 	Select,
@@ -177,14 +178,16 @@ export const DropboxConfig: FC<ConnectorConfigProps> = ({ connector, onConfigCha
 								>
 									<FolderClosed className="size-3.5 shrink-0 text-muted-foreground" />
 									<span className="flex-1 truncate">{folder.name}</span>
-									<button
+									<Button
 										type="button"
+										variant="ghost"
+										size="icon"
 										onClick={() => handleRemoveFolder(folder.id)}
-										className="shrink-0 p-0.5 hover:bg-accent hover:text-accent-foreground rounded transition-colors"
+										className="size-5 shrink-0 rounded p-0 hover:bg-accent hover:text-accent-foreground"
 										aria-label={`Remove ${folder.name}`}
 									>
 										<X className="size-3.5" />
-									</button>
+									</Button>
 								</div>
 							))}
 							{selectedFiles.map((file) => (
@@ -195,14 +198,16 @@ export const DropboxConfig: FC<ConnectorConfigProps> = ({ connector, onConfigCha
 								>
 									{getFileIconFromName(file.name)}
 									<span className="flex-1 truncate">{file.name}</span>
-									<button
+									<Button
 										type="button"
+										variant="ghost"
+										size="icon"
 										onClick={() => handleRemoveFile(file.id)}
-										className="shrink-0 p-0.5 hover:bg-accent hover:text-accent-foreground rounded transition-colors"
+										className="size-5 shrink-0 rounded p-0 hover:bg-accent hover:text-accent-foreground"
 										aria-label={`Remove ${file.name}`}
 									>
 										<X className="size-3.5" />
-									</button>
+									</Button>
 								</div>
 							))}
 						</div>
@@ -217,10 +222,11 @@ export const DropboxConfig: FC<ConnectorConfigProps> = ({ connector, onConfigCha
 
 				{isEditMode ? (
 					<div className="space-y-2">
-						<button
+						<Button
 							type="button"
+							variant="ghost"
 							onClick={() => setIsFolderTreeOpen(!isFolderTreeOpen)}
-							className="flex items-center gap-2 text-xs sm:text-sm text-muted-foreground hover:text-accent-foreground transition-colors w-fit"
+							className="h-auto w-fit gap-2 px-0 py-0 text-xs font-normal text-muted-foreground hover:bg-transparent hover:text-accent-foreground sm:text-sm"
 						>
 							Change Selection
 							{isFolderTreeOpen ? (
@@ -228,7 +234,7 @@ export const DropboxConfig: FC<ConnectorConfigProps> = ({ connector, onConfigCha
 							) : (
 								<ChevronRight className="size-4" />
 							)}
-						</button>
+						</Button>
 						{isFolderTreeOpen && (
 							<DriveFolderTree
 								fetchItems={fetchItems}
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/google-drive-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/google-drive-config.tsx
index 5d5f2e236..6111feba3 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/google-drive-config.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/google-drive-config.tsx
@@ -92,11 +92,7 @@ export const GoogleDriveConfig: FC<ConnectorConfigProps> = ({ connector, onConfi
 	const [selectedFiles, setSelectedFiles] = useState<SelectedItem[]>(existingFiles);
 	const [indexingOptions, setIndexingOptions] = useState<IndexingOptions>(existingIndexingOptions);
 
-	const updateConfig = (
-		folders: SelectedItem[],
-		files: SelectedItem[],
-		options: IndexingOptions
-	) => {
+	const updateConfig = useCallback((folders: SelectedItem[], files: SelectedItem[], options: IndexingOptions) => {
 		if (onConfigChange) {
 			onConfigChange({
 				...connector.config,
@@ -105,7 +101,7 @@ export const GoogleDriveConfig: FC<ConnectorConfigProps> = ({ connector, onConfi
 				indexing_options: options,
 			});
 		}
-	};
+	}, [connector.config, onConfigChange]);
 
 	const handlePicked = useCallback(
 		(result: PickerResult) => {
@@ -115,8 +111,7 @@ export const GoogleDriveConfig: FC<ConnectorConfigProps> = ({ connector, onConfi
 			setSelectedFiles(files);
 			updateConfig(folders, files, indexingOptions);
 		},
-		// eslint-disable-next-line react-hooks/exhaustive-deps
-		[indexingOptions, connector.config]
+		[indexingOptions, updateConfig]
 	);
 
 	const {
@@ -188,14 +183,16 @@ export const GoogleDriveConfig: FC<ConnectorConfigProps> = ({ connector, onConfi
 								>
 									<FolderClosed className="size-3.5 shrink-0 text-muted-foreground" />
 									<span className="flex-1 truncate">{folder.name}</span>
-									<button
+									<Button
 										type="button"
+										variant="ghost"
+										size="icon"
 										onClick={() => handleRemoveFolder(folder.id)}
-										className="shrink-0 p-0.5 hover:bg-accent hover:text-accent-foreground rounded transition-colors"
+										className="size-5 shrink-0 rounded p-0 hover:bg-accent hover:text-accent-foreground"
 										aria-label={`Remove ${folder.name}`}
 									>
 										<X className="size-3.5" />
-									</button>
+									</Button>
 								</div>
 							))}
 							{selectedFiles.map((file) => (
@@ -206,14 +203,16 @@ export const GoogleDriveConfig: FC<ConnectorConfigProps> = ({ connector, onConfi
 								>
 									{getFileIconFromName(file.name)}
 									<span className="flex-1 truncate">{file.name}</span>
-									<button
+									<Button
 										type="button"
+										variant="ghost"
+										size="icon"
 										onClick={() => handleRemoveFile(file.id)}
-										className="shrink-0 p-0.5 hover:bg-accent hover:text-accent-foreground rounded transition-colors"
+										className="size-5 shrink-0 rounded p-0 hover:bg-accent hover:text-accent-foreground"
 										aria-label={`Remove ${file.name}`}
 									>
 										<X className="size-3.5" />
-									</button>
+									</Button>
 								</div>
 							))}
 						</div>
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/onedrive-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/onedrive-config.tsx
index 208a42123..5ecaee045 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/onedrive-config.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/onedrive-config.tsx
@@ -14,6 +14,7 @@ import {
 import type { FC } from "react";
 import { useCallback, useEffect, useState } from "react";
 import { DriveFolderTree, type SelectedFolder } from "@/components/connectors/drive-folder-tree";
+import { Button } from "@/components/ui/button";
 import { Label } from "@/components/ui/label";
 import {
 	Select,
@@ -178,14 +179,16 @@ export const OneDriveConfig: FC<ConnectorConfigProps> = ({ connector, onConfigCh
 								>
 									<FolderClosed className="size-3.5 shrink-0 text-muted-foreground" />
 									<span className="flex-1 truncate">{folder.name}</span>
-									<button
+									<Button
 										type="button"
+										variant="ghost"
+										size="icon"
 										onClick={() => handleRemoveFolder(folder.id)}
-										className="shrink-0 p-0.5 hover:bg-accent hover:text-accent-foreground rounded transition-colors"
+										className="size-5 shrink-0 rounded p-0 hover:bg-accent hover:text-accent-foreground"
 										aria-label={`Remove ${folder.name}`}
 									>
 										<X className="size-3.5" />
-									</button>
+									</Button>
 								</div>
 							))}
 							{selectedFiles.map((file) => (
@@ -196,14 +199,16 @@ export const OneDriveConfig: FC<ConnectorConfigProps> = ({ connector, onConfigCh
 								>
 									{getFileIconFromName(file.name)}
 									<span className="flex-1 truncate">{file.name}</span>
-									<button
+									<Button
 										type="button"
+										variant="ghost"
+										size="icon"
 										onClick={() => handleRemoveFile(file.id)}
-										className="shrink-0 p-0.5 hover:bg-accent hover:text-accent-foreground rounded transition-colors"
+										className="size-5 shrink-0 rounded p-0 hover:bg-accent hover:text-accent-foreground"
 										aria-label={`Remove ${file.name}`}
 									>
 										<X className="size-3.5" />
-									</button>
+									</Button>
 								</div>
 							))}
 						</div>
@@ -218,10 +223,11 @@ export const OneDriveConfig: FC<ConnectorConfigProps> = ({ connector, onConfigCh
 
 				{isEditMode ? (
 					<div className="space-y-2">
-						<button
+						<Button
 							type="button"
+							variant="ghost"
 							onClick={() => setIsFolderTreeOpen((prev) => !prev)}
-							className="flex items-center gap-2 text-xs sm:text-sm text-muted-foreground hover:text-accent-foreground transition-colors w-fit"
+							className="h-auto w-fit gap-2 px-0 py-0 text-xs font-normal text-muted-foreground hover:bg-transparent hover:text-accent-foreground sm:text-sm"
 						>
 							Change Selection
 							{isFolderTreeOpen ? (
@@ -229,7 +235,7 @@ export const OneDriveConfig: FC<ConnectorConfigProps> = ({ connector, onConfigCh
 							) : (
 								<ChevronRight className="size-4" />
 							)}
-						</button>
+						</Button>
 						{isFolderTreeOpen && (
 							<DriveFolderTree
 								fetchItems={fetchItems}
diff --git a/surfsense_web/components/assistant-ui/connector-popup/views/connector-accounts-list-view.tsx b/surfsense_web/components/assistant-ui/connector-popup/views/connector-accounts-list-view.tsx
index b4234b119..5aed026e7 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/views/connector-accounts-list-view.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/views/connector-accounts-list-view.tsx
@@ -110,14 +110,15 @@ export const ConnectorAccountsListView: FC<ConnectorAccountsListViewProps> = ({
 			{/* Header */}
 			<div className="px-6 sm:px-12 pt-8 sm:pt-10 pb-1 sm:pb-4 bg-popover">
 				{/* Back button */}
-				<button
+				<Button
 					type="button"
+					variant="ghost"
 					onClick={onBack}
-					className="flex items-center gap-2 text-xs sm:text-sm text-muted-foreground hover:text-accent-foreground mb-6 w-fit"
+					className="mb-6 h-auto w-fit gap-2 px-0 py-0 text-xs font-normal text-muted-foreground hover:bg-transparent hover:text-accent-foreground sm:text-sm"
 				>
 					<ArrowLeft className="size-4" />
 					Back to connectors
-				</button>
+				</Button>
 
 				{/* Connector header */}
 				<div className="flex flex-col sm:flex-row items-start sm:items-center gap-4 mb-6">
@@ -135,12 +136,13 @@ export const ConnectorAccountsListView: FC<ConnectorAccountsListViewProps> = ({
 						</div>
 					</div>
 					{/* Add Account Button with dashed border */}
-					<button
+					<Button
 						type="button"
+						variant="ghost"
 						onClick={onAddAccount}
 						disabled={isConnecting || !isEnabled}
 						className={cn(
-							"flex items-center justify-center gap-1.5 h-8 px-3 rounded-md border-2 border-dashed text-xs sm:text-sm transition-all duration-200 shrink-0 w-full sm:w-auto",
+							"h-8 w-full shrink-0 gap-1.5 rounded-md border-2 border-dashed px-3 text-xs transition-all duration-200 sm:w-auto sm:text-sm",
 							!isEnabled
 								? "border-border/30 opacity-50 cursor-not-allowed"
 								: "border-slate-400/20 dark:border-white/20 hover:bg-accent hover:text-accent-foreground",
@@ -155,7 +157,7 @@ export const ConnectorAccountsListView: FC<ConnectorAccountsListViewProps> = ({
 							)}
 						</div>
 						<span className="text-xs sm:text-sm font-medium">{buttonText}</span>
-					</button>
+					</Button>
 				</div>
 			</div>
 
diff --git a/surfsense_web/components/assistant-ui/inline-citation.tsx b/surfsense_web/components/assistant-ui/inline-citation.tsx
index 1a3d04262..abb89d5da 100644
--- a/surfsense_web/components/assistant-ui/inline-citation.tsx
+++ b/surfsense_web/components/assistant-ui/inline-citation.tsx
@@ -9,6 +9,7 @@ import { useCallback, useEffect, useRef, useState } from "react";
 import { openCitationPanelAtom } from "@/atoms/citation/citation-panel.atom";
 import { useCitationMetadata } from "@/components/assistant-ui/citation-metadata-context";
 import { Citation } from "@/components/tool-ui/citation";
+import { Button } from "@/components/ui/button";
 import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
 import { Spinner } from "@/components/ui/spinner";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
@@ -76,15 +77,16 @@ const NumericChunkCitation: FC<{ chunkId: number }> = ({ chunkId }) => {
 	const openCitationPanel = useSetAtom(openCitationPanelAtom);
 
 	return (
-		<button
+		<Button
 			type="button"
+			variant="ghost"
 			onClick={() => openCitationPanel({ chunkId })}
-			className="ml-0.5 inline-flex h-5 min-w-5 cursor-pointer items-center justify-center rounded-md bg-muted/60 px-1.5 text-[11px] font-medium text-muted-foreground align-baseline shadow-sm transition-colors hover:bg-accent hover:text-accent-foreground focus-visible:ring-ring focus-visible:ring-2 focus-visible:outline-none"
+			className="ml-0.5 h-5 min-w-5 cursor-pointer rounded-md bg-muted/60 px-1.5 text-[11px] font-medium text-muted-foreground align-baseline shadow-sm transition-colors hover:bg-accent hover:text-accent-foreground focus-visible:ring-ring focus-visible:ring-2 focus-visible:outline-none"
 			title={`View source chunk #${chunkId}`}
 			aria-label={`View cited chunk ${chunkId}`}
 		>
 			{chunkId}
-		</button>
+		</Button>
 	);
 };
 
@@ -121,8 +123,9 @@ const SurfsenseDocCitation: FC<{ chunkId: number }> = ({ chunkId }) => {
 	return (
 		<Popover open={open} onOpenChange={setOpen}>
 			<PopoverTrigger asChild>
-				<button
+				<Button
 					type="button"
+					variant="ghost"
 					onClick={() => setOpen((prev) => !prev)}
 					onMouseEnter={() => {
 						cancelClose();
@@ -134,13 +137,13 @@ const SurfsenseDocCitation: FC<{ chunkId: number }> = ({ chunkId }) => {
 						setOpen(true);
 					}}
 					onBlur={scheduleClose}
-					className="ml-0.5 inline-flex h-5 min-w-5 cursor-pointer items-center justify-center gap-0.5 rounded-md bg-primary/10 px-1.5 text-[11px] font-medium text-primary align-baseline shadow-sm transition-colors hover:bg-primary/15 focus-visible:ring-ring focus-visible:ring-2 focus-visible:outline-none"
+					className="ml-0.5 h-5 min-w-5 cursor-pointer gap-0.5 rounded-md bg-primary/10 px-1.5 text-[11px] font-medium text-primary align-baseline shadow-sm transition-colors hover:bg-primary/15 focus-visible:ring-ring focus-visible:ring-2 focus-visible:outline-none"
 					aria-label={`Show Surfsense documentation chunk ${chunkId}`}
 					title="Surfsense documentation"
 				>
 					<FileText className="size-3" />
 					doc
-				</button>
+				</Button>
 			</PopoverTrigger>
 			<PopoverContent
 				className="w-96 max-w-[calc(100vw-2rem)] p-0"
diff --git a/surfsense_web/components/connectors/drive-folder-tree.tsx b/surfsense_web/components/connectors/drive-folder-tree.tsx
index 5f11222f0..dd9cd7323 100644
--- a/surfsense_web/components/connectors/drive-folder-tree.tsx
+++ b/surfsense_web/components/connectors/drive-folder-tree.tsx
@@ -13,6 +13,7 @@ import {
 	Presentation,
 } from "lucide-react";
 import { useCallback, useEffect, useState } from "react";
+import { Button } from "@/components/ui/button";
 import { Checkbox } from "@/components/ui/checkbox";
 import { ScrollArea } from "@/components/ui/scroll-area";
 import { Spinner } from "@/components/ui/spinner";
@@ -267,9 +268,11 @@ export function DriveFolderTree({
 					)}
 				>
 					{isFolder ? (
-						<button
+						<Button
 							type="button"
-							className="flex items-center justify-center w-3 h-3 sm:w-4 sm:h-4 shrink-0 bg-transparent border-0 p-0 cursor-pointer"
+							variant="ghost"
+							size="icon"
+							className="h-3 w-3 shrink-0 cursor-pointer bg-transparent p-0 hover:bg-transparent sm:h-4 sm:w-4"
 							onClick={(e) => {
 								e.stopPropagation();
 								toggleFolder(item);
@@ -283,7 +286,7 @@ export function DriveFolderTree({
 							) : (
 								<ChevronRight className="h-3 w-3 sm:h-4 sm:w-4" />
 							)}
-						</button>
+						</Button>
 					) : (
 						<span className="w-3 h-3 sm:w-4 sm:h-4 shrink-0" />
 					)}
@@ -314,13 +317,14 @@ export function DriveFolderTree({
 					</div>
 
 					{isFolder ? (
-						<button
+						<Button
 							type="button"
-							className="truncate flex-1 text-left text-xs sm:text-sm min-w-0 bg-transparent border-0 p-0 cursor-pointer"
+							variant="ghost"
+							className="h-auto min-w-0 flex-1 justify-start truncate bg-transparent p-0 text-left text-xs font-normal hover:bg-transparent hover:text-inherit sm:text-sm"
 							onClick={() => toggleFolder(item)}
 						>
 							{item.name}
-						</button>
+						</Button>
 					) : (
 						<span className="truncate flex-1 text-left text-xs sm:text-sm min-w-0">
 							{item.name}
@@ -356,13 +360,14 @@ export function DriveFolderTree({
 								className="shrink-0 h-3.5 w-3.5 sm:h-4 sm:w-4 border-slate-400/20 dark:border-white/20"
 							/>
 							<HardDrive className="h-3 w-3 sm:h-4 sm:w-4 text-muted-foreground shrink-0" />
-							<button
+							<Button
 								type="button"
-								className="font-semibold truncate text-xs sm:text-sm cursor-pointer bg-transparent border-0 p-0 text-left"
+								variant="ghost"
+								className="h-auto min-w-0 justify-start truncate bg-transparent p-0 text-left text-xs font-semibold hover:bg-transparent hover:text-inherit sm:text-sm"
 								onClick={() => toggleFolderSelection("root", rootLabel)}
 							>
 								{rootLabel}
-							</button>
+							</Button>
 						</div>
 					</div>
 
diff --git a/surfsense_web/components/documents/DocumentNode.tsx b/surfsense_web/components/documents/DocumentNode.tsx
index 826feb51d..0f3cd4a19 100644
--- a/surfsense_web/components/documents/DocumentNode.tsx
+++ b/surfsense_web/components/documents/DocumentNode.tsx
@@ -138,10 +138,7 @@ export const DocumentNode = React.memo(function DocumentNode({
 	return (
 		<ContextMenu onOpenChange={onContextMenuOpenChange}>
 			<ContextMenuTrigger asChild>
-				{/* biome-ignore lint/a11y/useSemanticElements: contains nested interactive children (Checkbox) that render as <button>, making a semantic <button> wrapper invalid */}
 				<div
-					role="button"
-					tabIndex={0}
 					ref={attachRef}
 					className={cn(
 						"group flex h-8 w-full items-center gap-2.5 rounded-md px-1 text-sm hover:bg-accent hover:text-accent-foreground cursor-pointer select-none text-left",
@@ -149,13 +146,6 @@ export const DocumentNode = React.memo(function DocumentNode({
 						isDragging && "opacity-40"
 					)}
 					style={{ paddingLeft: `${depth * 16 + 4}px` }}
-					onClick={handleCheckChange}
-					onKeyDown={(e) => {
-						if (e.key === "Enter" || e.key === " ") {
-							e.preventDefault();
-							handleCheckChange();
-						}
-					}}
 				>
 					{(() => {
 						if (statusState === "pending") {
@@ -212,9 +202,17 @@ export const DocumentNode = React.memo(function DocumentNode({
 						onOpenChange={handleTitleTooltipOpenChange}
 					>
 						<TooltipTrigger asChild>
-							<span ref={titleRef} className="flex-1 min-w-0 truncate">
-								{doc.title}
-							</span>
+							<Button
+								type="button"
+								variant="ghost"
+								aria-disabled={!isSelectable}
+								onClick={handleCheckChange}
+								className="h-full min-w-0 flex-1 justify-start bg-transparent px-0 py-0 text-left font-normal text-inherit hover:bg-transparent hover:text-inherit"
+							>
+								<span ref={titleRef} className="min-w-0 flex-1 truncate">
+									{doc.title}
+								</span>
+							</Button>
 						</TooltipTrigger>
 						<TooltipContent side="bottom" className="max-w-xs break-words">
 							{doc.title}
diff --git a/surfsense_web/components/layout/ui/sidebar/AllPrivateChatsSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/AllPrivateChatsSidebar.tsx
index e5bc0bd31..a2e912c72 100644
--- a/surfsense_web/components/layout/ui/sidebar/AllPrivateChatsSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/AllPrivateChatsSidebar.tsx
@@ -348,8 +348,9 @@ export function AllPrivateChatsSidebarContent({
 							return (
 								<div key={thread.id} className="group/item relative w-full">
 									{isMobile ? (
-										<button
+										<Button
 											type="button"
+											variant="ghost"
 											onClick={() => {
 												if (wasLongPress()) return;
 												handleThreadClick(thread.id);
@@ -362,7 +363,7 @@ export function AllPrivateChatsSidebarContent({
 											onTouchMove={longPressHandlers.onTouchMove}
 											disabled={isBusy}
 											className={cn(
-												"flex w-full items-center gap-2 overflow-hidden rounded-md px-2 py-1.5 text-sm text-left",
+												"h-auto w-full justify-start gap-2 overflow-hidden px-2 py-1.5 text-left font-normal",
 												"group-hover/item:bg-accent group-hover/item:text-accent-foreground",
 												"focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring",
 												isActive && "bg-accent text-accent-foreground",
@@ -370,16 +371,17 @@ export function AllPrivateChatsSidebarContent({
 											)}
 										>
 											<span className="truncate">{thread.title || "New Chat"}</span>
-										</button>
+										</Button>
 									) : (
 										<Tooltip delayDuration={600}>
 											<TooltipTrigger asChild>
-												<button
+												<Button
 													type="button"
+													variant="ghost"
 													onClick={() => handleThreadClick(thread.id)}
 													disabled={isBusy}
 													className={cn(
-														"flex w-full items-center gap-2 overflow-hidden rounded-md px-2 py-1.5 text-sm text-left",
+														"h-auto w-full justify-start gap-2 overflow-hidden px-2 py-1.5 text-left font-normal",
 														"group-hover/item:bg-accent group-hover/item:text-accent-foreground",
 														"focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring",
 														isActive && "bg-accent text-accent-foreground",
@@ -387,7 +389,7 @@ export function AllPrivateChatsSidebarContent({
 													)}
 												>
 													<span className="truncate">{thread.title || "New Chat"}</span>
-												</button>
+												</Button>
 											</TooltipTrigger>
 											<TooltipContent side="bottom" align="start">
 												<p>
diff --git a/surfsense_web/components/layout/ui/sidebar/LocalFilesystemBrowser.tsx b/surfsense_web/components/layout/ui/sidebar/LocalFilesystemBrowser.tsx
index 9184ed511..aa773f3e1 100644
--- a/surfsense_web/components/layout/ui/sidebar/LocalFilesystemBrowser.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/LocalFilesystemBrowser.tsx
@@ -3,9 +3,11 @@
 import { ChevronDown, ChevronRight, FileText, Folder, FolderOpen } from "lucide-react";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { DEFAULT_EXCLUDE_PATTERNS } from "@/components/sources/FolderWatchDialog";
+import { Button } from "@/components/ui/button";
 import { Skeleton } from "@/components/ui/skeleton";
 import { Spinner } from "@/components/ui/spinner";
 import { useElectronAPI } from "@/hooks/use-platform";
+import { cn } from "@/lib/utils";
 
 interface LocalFilesystemBrowserProps {
 	rootPaths: string[];
@@ -409,10 +411,11 @@ export function LocalFilesystemBrowser({
 			const files = [...folder.files].sort((a, b) => a.relativePath.localeCompare(b.relativePath));
 			return (
 				<div key={folder.key} className="select-none">
-					<button
+					<Button
 						type="button"
+						variant="ghost"
 						onClick={() => toggleFolder(folder.key)}
-						className="flex h-8 w-full items-center gap-1.5 rounded-md px-2 text-left text-sm transition-colors hover:bg-accent hover:text-accent-foreground"
+						className="h-8 w-full justify-start gap-1.5 px-2 text-left text-sm font-normal hover:bg-accent hover:text-accent-foreground"
 						style={{ paddingInlineStart: `${depth * 12 + 8}px` }}
 						draggable={false}
 					>
@@ -423,7 +426,7 @@ export function LocalFilesystemBrowser({
 						)}
 						<FolderIcon className="size-3.5 shrink-0 text-muted-foreground" />
 						<span className="truncate">{folder.name}</span>
-					</button>
+					</Button>
 					{isExpanded && (
 						<>
 							{childFolders.map((childFolder) => renderFolder(childFolder, depth + 1, mount))}
@@ -431,17 +434,21 @@ export function LocalFilesystemBrowser({
 								const extension = getNormalizedExtension(file.relativePath);
 								const isOpenable = openableExtensions.has(extension);
 								return (
-									<button
+									<Button
 										key={file.fullPath}
 										type="button"
+										variant="ghost"
 										onClick={
 											isOpenable
 												? () => onOpenFile(toMountedVirtualPath(mount, file.relativePath))
 												: undefined
 										}
-										className={`flex h-8 w-full items-center gap-1.5 rounded-md px-2 text-left text-sm transition-colors ${
-											isOpenable ? "hover:bg-accent hover:text-accent-foreground" : "cursor-not-allowed opacity-60"
-										}`}
+										className={cn(
+											"h-8 w-full justify-start gap-1.5 px-2 text-left text-sm font-normal",
+											isOpenable
+												? "hover:bg-accent hover:text-accent-foreground"
+												: "cursor-not-allowed opacity-60"
+										)}
 										style={{ paddingInlineStart: `${(depth + 1) * 12 + 22}px` }}
 										title={
 											isOpenable
@@ -453,7 +460,7 @@ export function LocalFilesystemBrowser({
 									>
 										<FileText className="size-3.5 shrink-0 text-muted-foreground" />
 										<span className="truncate">{getFileName(file.relativePath)}</span>
-									</button>
+									</Button>
 								);
 							})}
 						</>
diff --git a/surfsense_web/components/markdown-viewer.tsx b/surfsense_web/components/markdown-viewer.tsx
index 6caf01917..45bdc7be1 100644
--- a/surfsense_web/components/markdown-viewer.tsx
+++ b/surfsense_web/components/markdown-viewer.tsx
@@ -13,10 +13,7 @@ const code = createCodePlugin({
 });
 
 const math = createMathPlugin({
-	// Disabled so currency like "$3,120.00 and ... $0.00" isn't parsed as
-	// inline LaTeX. convertLatexDelimiters() below normalises any genuine
-	// inline math (\(...\), $...$ starting with a LaTeX command, etc.) to
-	// $$...$$, so this flip doesn't lose any math rendering.
+	// Keep currency from being parsed as math; real math is normalized below.
 	singleDollarTextMath: false,
 });
 
@@ -24,76 +21,37 @@ interface MarkdownViewerProps {
 	content: string;
 	className?: string;
 	maxLength?: number;
-	/**
-	 * When true, render `[citation:N]` / `[citation:URL]` tokens as the
-	 * interactive citation badges/popovers used in chat. Default `false`
-	 * so callers that don't need citations are unchanged.
-	 *
-	 * Note: we deliberately do NOT override `<a>` to inject citations into
-	 * link text — that would produce `<button>` inside `<a>` (invalid
-	 * HTML). A `[citation:N]` token literally placed inside markdown link
-	 * text stays as raw text.
-	 */
+	/** Render citation tokens as interactive badges. */
 	enableCitations?: boolean;
 }
 
 const EMPTY_URL_MAP: CitationUrlMap = new Map();
 
-/**
- * If the entire content is wrapped in a single ```markdown or ```md
- * code fence, strip the fence so the inner markdown renders properly.
- */
+/** Strip a single outer markdown fence when the whole payload is fenced. */
 function stripOuterMarkdownFence(content: string): string {
 	const trimmed = content.trim();
-	// Match 3+ backtick fences (LLMs escalate to 4+ when content has triple-backtick blocks)
 	const match = trimmed.match(/^(`{3,})(?:markdown|md)?\s*\n([\s\S]+?)\n\1\s*$/);
 	return match ? match[2] : content;
 }
 
-/**
- * Convert all LaTeX delimiter styles to the double-dollar syntax
- * that Streamdown's @streamdown/math plugin understands.
- *
- * Streamdown math conventions (different from remark-math!):
- *   $$...$$  on the SAME line     → inline math
- *   $$\n...\n$$  on SEPARATE lines → block (display) math
- *
- * Conversions performed:
- *   \[...\]                              → $$\n ... \n$$  (block math)
- *   \(...\)                              → $$...$$        (inline math, same line)
- *   \begin{equation}...\end{equation}    → $$\n ... \n$$  (block math)
- *   \begin{displaymath}...\end{displaymath} → $$\n ... \n$$ (block math)
- *   \begin{math}...\end{math}            → $$...$$        (inline math, same line)
- *   `$$ … $$`                             → $$ … $$       (strip wrapping backtick code)
- *   `$ … $`                               → $ … $         (strip wrapping backtick code)
- *   $...$                                 → $$...$$        (normalise single-$ to double-$$)
- */
+/** Normalize common LaTeX delimiters to Streamdown's double-dollar syntax. */
 function convertLatexDelimiters(content: string): string {
-	// 1. Block math: \[...\] → $$\n...\n$$ (display math on separate lines)
 	content = content.replace(/\\\[([\s\S]*?)\\\]/g, (_, inner) => `\n$$\n${inner.trim()}\n$$\n`);
-	// 2. Inline math: \(...\) → $$...$$ (inline math on same line)
 	content = content.replace(/\\\(([\s\S]*?)\\\)/g, (_, inner) => `$$${inner.trim()}$$`);
-	// 3. Block: \begin{equation}...\end{equation} → $$\n...\n$$
 	content = content.replace(
 		/\\begin\{equation\}([\s\S]*?)\\end\{equation\}/g,
 		(_, inner) => `\n$$\n${inner.trim()}\n$$\n`
 	);
-	// 4. Block: \begin{displaymath}...\end{displaymath} → $$\n...\n$$
 	content = content.replace(
 		/\\begin\{displaymath\}([\s\S]*?)\\end\{displaymath\}/g,
 		(_, inner) => `\n$$\n${inner.trim()}\n$$\n`
 	);
-	// 5. Inline: \begin{math}...\end{math} → $$...$$
 	content = content.replace(
 		/\\begin\{math\}([\s\S]*?)\\end\{math\}/g,
 		(_, inner) => `$$${inner.trim()}$$`
 	);
-	// 6. Strip backtick wrapping around math: `$$...$$` → $$...$$ and `$...$` → $...$
 	content = content.replace(/`(\${1,2})((?:(?!\1).)+)\1`/g, "$1$2$1");
-	// 7. Normalise single-dollar $...$ to double-dollar $$...$$ so they render
-	//    reliably in Streamdown (single-$ has strict no-space rules that often fail).
-	//    We match $…$ where the content starts with a backslash (LaTeX command)
-	//    to avoid converting currency like $50.
+	// Only convert command-style single-dollar math, leaving currency alone.
 	content = content.replace(
 		/(?<!\$)\$(?!\$)(\\[a-zA-Z][\s\S]*?)(?<!\$)\$(?!\$)/g,
 		(_, inner) => `$$${inner.trim()}$$`
@@ -110,9 +68,7 @@ export function MarkdownViewer({
 	const isTruncated = maxLength != null && content.length > maxLength;
 	const displayContent = isTruncated ? content.slice(0, maxLength) : content;
 
-	// Preprocess for URL placeholders BEFORE LaTeX so GFM autolinks don't
-	// split `[citation:https://…]` apart. The preprocess is code-fence
-	// aware so citations inside fenced code stay literal.
+	// Rewrite citation URLs before markdown autolinking can split them.
 	const { processedContent, urlMap } = useMemo(() => {
 		const stripped = stripOuterMarkdownFence(displayContent);
 		if (!enableCitations) {
@@ -128,11 +84,7 @@ export function MarkdownViewer({
 		};
 	}, [displayContent, enableCitations]);
 
-	// Phrasing/block renderers wrap their string children through the
-	// citation renderer when `enableCitations` is on. We deliberately do
-	// NOT override `<a>` (would produce <button> inside <a>) and we do
-	// NOT touch the inline/fenced `code` paths (citations stay literal
-	// inside code, matching markdown-text.tsx behavior).
+	// Do not wrap anchors or code; citation buttons inside them would be invalid.
 	const wrap = (children: React.ReactNode): React.ReactNode =>
 		enableCitations ? processChildrenWithCitations(children, urlMap) : children;
 
@@ -198,27 +150,21 @@ export function MarkdownViewer({
 		),
 		hr: ({ ...props }) => <hr className="my-4 border-muted" {...props} />,
 		img: ({ src, alt, width: _w, height: _h, ...props }) => {
-			const isDataOrUnknownUrl =
-				typeof src === "string" && (src.startsWith("data:") || !src.startsWith("http"));
+			if (typeof src !== "string") return null;
 
-			return isDataOrUnknownUrl ? (
-				// eslint-disable-next-line @next/next/no-img-element
-				<img
-					className="max-w-full h-auto my-4 rounded"
-					alt={alt || "markdown image"}
-					src={src}
-					loading="lazy"
-					{...props}
-				/>
-			) : (
+			const width = typeof _w === "number" ? _w : Number(_w) || 800;
+			const height = typeof _h === "number" ? _h : Number(_h) || 600;
+			const shouldSkipOptimization = src.startsWith("data:");
+
+			return (
 				<Image
 					className="max-w-full h-auto my-4 rounded"
 					alt={alt || "markdown image"}
-					src={typeof src === "string" ? src : ""}
-					width={_w || 800}
-					height={_h || 600}
+					src={src}
+					width={width}
+					height={height}
 					sizes="(max-width: 768px) 100vw, (max-width: 1200px) 75vw, 60vw"
-					unoptimized={isDataOrUnknownUrl}
+					unoptimized={shouldSkipOptimization}
 					{...props}
 				/>
 			);
diff --git a/surfsense_web/components/new-chat/prompt-picker.tsx b/surfsense_web/components/new-chat/prompt-picker.tsx
index 3f18890c7..220fe3436 100644
--- a/surfsense_web/components/new-chat/prompt-picker.tsx
+++ b/surfsense_web/components/new-chat/prompt-picker.tsx
@@ -15,6 +15,7 @@ import {
 
 import { promptsAtom } from "@/atoms/prompts/prompts-query.atoms";
 import { userSettingsDialogAtom } from "@/atoms/settings/settings-dialog.atoms";
+import { Button } from "@/components/ui/button";
 import { Skeleton } from "@/components/ui/skeleton";
 import { cn } from "@/lib/utils";
 
@@ -150,17 +151,18 @@ export const PromptPicker = forwardRef<PromptPickerRef, PromptPickerProps>(funct
 							Saved Prompts
 						</div>
 						{filtered.map((action, index) => (
-							<button
+							<Button
 								key={action.id}
 								ref={(el) => {
 									if (el) itemRefs.current.set(index, el);
 									else itemRefs.current.delete(index);
 								}}
 								type="button"
+								variant="ghost"
 								onClick={() => handleSelect(index)}
 								onMouseEnter={() => setHighlightedIndex(index)}
 								className={cn(
-									"w-full flex items-center gap-2 px-3 py-2 text-left text-sm transition-colors rounded-md cursor-pointer",
+									"h-auto w-full justify-start gap-2 rounded-md px-3 py-2 text-left text-sm font-normal transition-colors",
 									index === highlightedIndex && "bg-accent text-accent-foreground"
 								)}
 							>
@@ -168,20 +170,21 @@ export const PromptPicker = forwardRef<PromptPickerRef, PromptPickerProps>(funct
 									<Zap className="size-4" />
 								</span>
 								<span className="flex-1 text-sm truncate">{action.name}</span>
-							</button>
+							</Button>
 						))}
 
 						<div className="mx-2 my-1 border-t border-popover-border" />
-						<button
+						<Button
 							ref={(el) => {
 								if (el) itemRefs.current.set(createPromptIndex, el);
 								else itemRefs.current.delete(createPromptIndex);
 							}}
 							type="button"
+							variant="ghost"
 							onClick={() => handleSelect(createPromptIndex)}
 							onMouseEnter={() => setHighlightedIndex(createPromptIndex)}
 							className={cn(
-								"w-full flex items-center gap-2 px-3 py-2 text-left text-sm transition-colors rounded-md cursor-pointer text-muted-foreground",
+								"h-auto w-full justify-start gap-2 rounded-md px-3 py-2 text-left text-sm font-normal text-muted-foreground transition-colors",
 								highlightedIndex === createPromptIndex
 									? "bg-accent text-accent-foreground"
 									: "hover:text-accent-foreground hover:bg-accent"
@@ -191,7 +194,7 @@ export const PromptPicker = forwardRef<PromptPickerRef, PromptPickerProps>(funct
 								<Plus className="size-4" />
 							</span>
 							<span>Create prompt</span>
-						</button>
+						</Button>
 					</div>
 				)}
 			</div>
diff --git a/surfsense_web/components/settings/buy-pages-content.tsx b/surfsense_web/components/settings/buy-pages-content.tsx
index 5e2c6f9db..3cb8e7133 100644
--- a/surfsense_web/components/settings/buy-pages-content.tsx
+++ b/surfsense_web/components/settings/buy-pages-content.tsx
@@ -72,44 +72,49 @@ export function BuyPagesContent() {
 			<div className="space-y-3">
 				{/* Stepper */}
 				<div className="flex items-center justify-center gap-3">
-					<button
+					<Button
 						type="button"
+						variant="outline"
+						size="icon"
 						onClick={() => setQuantity((q) => Math.max(1, q - 1))}
 						disabled={quantity <= 1 || purchaseMutation.isPending}
-						className="flex h-8 w-8 items-center justify-center rounded-md border transition-colors hover:bg-muted disabled:opacity-40"
+						className="size-8 shadow-none transition-colors hover:bg-muted disabled:opacity-40"
 					>
 						<Minus className="h-3.5 w-3.5" />
-					</button>
+					</Button>
 					<span className="min-w-28 text-center text-lg font-semibold tabular-nums">
 						{totalPages.toLocaleString()}
 					</span>
-					<button
+					<Button
 						type="button"
+						variant="outline"
+						size="icon"
 						onClick={() => setQuantity((q) => Math.min(100, q + 1))}
 						disabled={quantity >= 100 || purchaseMutation.isPending}
-						className="flex h-8 w-8 items-center justify-center rounded-md border transition-colors hover:bg-muted disabled:opacity-40"
+						className="size-8 shadow-none transition-colors hover:bg-muted disabled:opacity-40"
 					>
 						<Plus className="h-3.5 w-3.5" />
-					</button>
+					</Button>
 				</div>
 
 				{/* Quick-pick presets */}
 				<div className="flex flex-wrap justify-center gap-1.5">
 					{PRESET_MULTIPLIERS.map((m) => (
-						<button
+						<Button
 							key={m}
 							type="button"
+							variant="ghost"
 							onClick={() => setQuantity(m)}
 							disabled={purchaseMutation.isPending}
 							className={cn(
-								"rounded-md border px-2.5 py-1 text-xs font-medium tabular-nums transition-colors disabled:opacity-60",
+								"h-auto rounded-md border px-2.5 py-1 text-xs font-medium tabular-nums transition-colors hover:text-foreground disabled:opacity-60",
 								quantity === m
 									? "border-emerald-500 bg-emerald-500/10 text-emerald-600 dark:text-emerald-400"
 									: "border-border hover:border-emerald-500/40 hover:bg-muted/40"
 							)}
 						>
 							{(m * PAGE_PACK_SIZE).toLocaleString()}
-						</button>
+						</Button>
 					))}
 				</div>
 
diff --git a/surfsense_web/components/settings/buy-tokens-content.tsx b/surfsense_web/components/settings/buy-tokens-content.tsx
index 79a1b4943..abda14266 100644
--- a/surfsense_web/components/settings/buy-tokens-content.tsx
+++ b/surfsense_web/components/settings/buy-tokens-content.tsx
@@ -105,43 +105,48 @@ export function BuyTokensContent() {
 
 			<div className="space-y-3">
 				<div className="flex items-center justify-center gap-3">
-					<button
+					<Button
 						type="button"
+						variant="outline"
+						size="icon"
 						onClick={() => setQuantity((q) => Math.max(1, q - 1))}
 						disabled={quantity <= 1 || purchaseMutation.isPending}
-						className="flex h-8 w-8 items-center justify-center rounded-md border transition-colors hover:bg-muted disabled:opacity-40"
+						className="size-8 shadow-none transition-colors hover:bg-muted disabled:opacity-40"
 					>
 						<Minus className="h-3.5 w-3.5" />
-					</button>
+					</Button>
 					<span className="min-w-32 text-center text-lg font-semibold tabular-nums">
 						${(totalCreditMicros / 1_000_000).toFixed(0)} of credit
 					</span>
-					<button
+					<Button
 						type="button"
+						variant="outline"
+						size="icon"
 						onClick={() => setQuantity((q) => Math.min(100, q + 1))}
 						disabled={quantity >= 100 || purchaseMutation.isPending}
-						className="flex h-8 w-8 items-center justify-center rounded-md border transition-colors hover:bg-muted disabled:opacity-40"
+						className="size-8 shadow-none transition-colors hover:bg-muted disabled:opacity-40"
 					>
 						<Plus className="h-3.5 w-3.5" />
-					</button>
+					</Button>
 				</div>
 
 				<div className="flex flex-wrap justify-center gap-1.5">
 					{PRESET_MULTIPLIERS.map((m) => (
-						<button
+						<Button
 							key={m}
 							type="button"
+							variant="ghost"
 							onClick={() => setQuantity(m)}
 							disabled={purchaseMutation.isPending}
 							className={cn(
-								"rounded-md border px-2.5 py-1 text-xs font-medium tabular-nums transition-colors disabled:opacity-60",
+								"h-auto rounded-md border px-2.5 py-1 text-xs font-medium tabular-nums transition-colors hover:text-foreground disabled:opacity-60",
 								quantity === m
 									? "border-purple-500 bg-purple-500/10 text-purple-600 dark:text-purple-400"
 									: "border-border hover:border-purple-500/40 hover:bg-muted/40"
 							)}
 						>
 							${m}
-						</button>
+						</Button>
 					))}
 				</div>
 
diff --git a/surfsense_web/components/settings/roles-manager.tsx b/surfsense_web/components/settings/roles-manager.tsx
index eb049d8fa..d2ddba9a0 100644
--- a/surfsense_web/components/settings/roles-manager.tsx
+++ b/surfsense_web/components/settings/roles-manager.tsx
@@ -462,47 +462,44 @@ function RolesContent({
 
 					return (
 						<div key={role.id} className="rounded-lg border border-border/60 overflow-hidden">
-							{/* biome-ignore lint/a11y/useSemanticElements: row contains nested interactive elements (DropdownMenu); using a <button> would produce invalid nested-button markup */}
 							<div
-								role="button"
-								tabIndex={0}
-								aria-expanded={isExpanded}
-								className="flex items-center gap-4 p-4 transition-colors hover:bg-accent hover:text-accent-foreground cursor-pointer focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
-								onClick={() => setExpandedRoleId(isExpanded ? null : role.id)}
-								onKeyDown={(e) => {
-									if (e.key === "Enter" || e.key === " ") {
-										e.preventDefault();
-										setExpandedRoleId(isExpanded ? null : role.id);
-									}
-								}}
+								className="group/role-header flex items-center gap-4 p-4 transition-colors hover:bg-accent hover:text-accent-foreground focus-within:bg-accent focus-within:text-accent-foreground"
 							>
-								<div className="flex-1 min-w-0 text-left">
-									<div className="flex items-center gap-2">
-										<span className="font-medium text-sm">{role.name}</span>
-										{role.is_system_role && (
-											<span className="text-[10px] px-1.5 py-0.5 rounded bg-muted text-muted-foreground font-medium">
-												System
-											</span>
-										)}
-										{role.is_default && (
-											<span className="text-[10px] px-1.5 py-0.5 rounded bg-muted text-muted-foreground font-medium">
-												Default
-											</span>
+								<Button
+									type="button"
+									variant="ghost"
+									aria-expanded={isExpanded}
+									className="h-auto min-w-0 flex-1 justify-start gap-4 p-0 text-left font-normal hover:bg-transparent hover:text-inherit focus-visible:ring-0"
+									onClick={() => setExpandedRoleId(isExpanded ? null : role.id)}
+								>
+									<div className="flex-1 min-w-0 text-left">
+										<div className="flex items-center gap-2">
+											<span className="font-medium text-sm">{role.name}</span>
+											{role.is_system_role && (
+												<span className="text-[10px] px-1.5 py-0.5 rounded bg-muted text-muted-foreground font-medium">
+													System
+												</span>
+											)}
+											{role.is_default && (
+												<span className="text-[10px] px-1.5 py-0.5 rounded bg-muted text-muted-foreground font-medium">
+													Default
+												</span>
+											)}
+										</div>
+										{role.description && (
+											<p className="text-xs text-muted-foreground mt-0.5 truncate">
+												{role.description}
+											</p>
 										)}
 									</div>
-									{role.description && (
-										<p className="text-xs text-muted-foreground mt-0.5 truncate">
-											{role.description}
-										</p>
-									)}
-								</div>
 
-								<div className="shrink-0">
-									<PermissionsBadge permissions={role.permissions} />
-								</div>
+									<div className="shrink-0">
+										<PermissionsBadge permissions={role.permissions} />
+									</div>
+								</Button>
 
 								{!role.is_system_role && (
-									<div className="shrink-0" role="none" onClick={(e) => e.stopPropagation()}>
+									<div className="shrink-0">
 										<DropdownMenu>
 											<DropdownMenuTrigger asChild>
 												<Button variant="ghost" size="icon" className="h-8 w-8">
@@ -552,14 +549,22 @@ function RolesContent({
 									</div>
 								)}
 
-								<div className="shrink-0 p-1">
+								<Button
+									type="button"
+									variant="ghost"
+									size="icon"
+									aria-label={isExpanded ? `Collapse ${role.name}` : `Expand ${role.name}`}
+									aria-expanded={isExpanded}
+									className="size-6 shrink-0 p-1 hover:bg-transparent hover:text-inherit focus-visible:ring-0"
+									onClick={() => setExpandedRoleId(isExpanded ? null : role.id)}
+								>
 									<ChevronRight
 										className={cn(
 											"h-4 w-4 text-muted-foreground transition-transform duration-200",
 											isExpanded && "rotate-90"
 										)}
 									/>
-								</div>
+								</Button>
 							</div>
 
 							{isExpanded && (
@@ -692,40 +697,44 @@ function PermissionsEditor({
 
 					return (
 						<div key={category} className="rounded-lg border border-border/60 overflow-hidden">
-							{/* biome-ignore lint/a11y/useSemanticElements: row contains a nested interactive Checkbox; using a <button> would produce invalid nested-button markup */}
 							<div
-								role="button"
-								tabIndex={0}
-								aria-expanded={isExpanded}
-								className="flex items-center justify-between px-3 py-2.5 hover:bg-accent hover:text-accent-foreground transition-colors cursor-pointer focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
-								onClick={() => toggleCategoryExpanded(category)}
-								onKeyDown={(e) => {
-									if (e.key === "Enter" || e.key === " ") {
-										e.preventDefault();
-										toggleCategoryExpanded(category);
-									}
-								}}
+								className="group/category-header flex items-center justify-between px-3 py-2.5 transition-colors hover:bg-accent hover:text-accent-foreground focus-within:bg-accent focus-within:text-accent-foreground"
 							>
-								<div className="flex-1 flex items-center gap-2.5">
+								<Button
+									type="button"
+									variant="ghost"
+									aria-expanded={isExpanded}
+									className="h-auto min-w-0 flex-1 justify-start gap-2.5 p-0 text-left font-normal hover:bg-transparent hover:text-inherit focus-visible:ring-0"
+									onClick={() => toggleCategoryExpanded(category)}
+								>
 									<IconComponent className="h-4 w-4 text-muted-foreground shrink-0" />
 									<span className="font-medium text-sm">{config.label}</span>
 									<span className="text-[11px] text-muted-foreground tabular-nums">
 										{stats.selected}/{stats.total}
 									</span>
-								</div>
+								</Button>
 								<div className="flex items-center gap-2">
 									<Checkbox
 										checked={stats.allSelected}
-										onClick={(e) => e.stopPropagation()}
 										onCheckedChange={() => onToggleCategory(category)}
 										aria-label={`Select all ${config.label} permissions`}
 									/>
-									<ChevronRight
-										className={cn(
-											"h-4 w-4 text-muted-foreground transition-transform duration-200",
-											isExpanded && "rotate-90"
-										)}
-									/>
+									<Button
+										type="button"
+										variant="ghost"
+										size="icon"
+										aria-label={isExpanded ? `Collapse ${config.label}` : `Expand ${config.label}`}
+										aria-expanded={isExpanded}
+										className="size-6 p-1 hover:bg-transparent hover:text-inherit focus-visible:ring-0"
+										onClick={() => toggleCategoryExpanded(category)}
+									>
+										<ChevronRight
+											className={cn(
+												"h-4 w-4 text-muted-foreground transition-transform duration-200",
+												isExpanded && "rotate-90"
+											)}
+										/>
+									</Button>
 								</div>
 							</div>
 
@@ -745,16 +754,19 @@ function PermissionsEditor({
 														isSelected ? "bg-muted/60 hover:bg-accent hover:text-accent-foreground" : "hover:bg-accent hover:text-accent-foreground"
 													)}
 												>
-													<button
+													<Button
 														type="button"
-														className="flex-1 min-w-0 text-left cursor-pointer focus:outline-none focus-visible:outline-none"
+														variant="ghost"
+														className="h-auto flex-1 min-w-0 justify-start p-0 text-left font-normal hover:bg-transparent hover:text-inherit focus-visible:ring-0"
 														onClick={() => onTogglePermission(perm.value)}
 													>
-														<span className="text-sm font-medium">{actionLabel}</span>
-														<p className="text-xs text-muted-foreground truncate">
-															{perm.description}
-														</p>
-													</button>
+														<span className="min-w-0">
+															<span className="block text-sm font-medium">{actionLabel}</span>
+															<span className="block text-xs text-muted-foreground truncate">
+																{perm.description}
+															</span>
+														</span>
+													</Button>
 													<Checkbox
 														checked={isSelected}
 														onCheckedChange={() => onTogglePermission(perm.value)}
@@ -871,12 +883,13 @@ function CreateRoleDialog({
 							<Label className="text-sm font-medium">Start from a template</Label>
 							<div className="grid grid-cols-3 gap-2">
 								{Object.entries(ROLE_PRESETS).map(([key, preset]) => (
-									<button
+									<Button
 										key={key}
 										type="button"
+										variant="outline"
 										onClick={() => applyPreset(key as keyof typeof ROLE_PRESETS)}
 										className={cn(
-											"p-3 rounded-lg border transition-colors hover:bg-accent hover:text-accent-foreground",
+											"h-auto p-3 whitespace-normal transition-colors hover:bg-accent hover:text-accent-foreground",
 											"flex items-center justify-center text-center sm:block sm:text-left",
 											selectedPermissions.length > 0 &&
 												preset.permissions.every((p) => selectedPermissions.includes(p))
@@ -888,7 +901,7 @@ function CreateRoleDialog({
 										<p className="hidden sm:block text-xs text-muted-foreground mt-0.5 line-clamp-2">
 											{preset.description}
 										</p>
-									</button>
+									</Button>
 								))}
 							</div>
 						</div>
diff --git a/surfsense_web/components/settings/settings-dialog.tsx b/surfsense_web/components/settings/settings-dialog.tsx
index 7bfcb9a60..d3f75c2a8 100644
--- a/surfsense_web/components/settings/settings-dialog.tsx
+++ b/surfsense_web/components/settings/settings-dialog.tsx
@@ -2,6 +2,7 @@
 
 import type * as React from "react";
 import { useCallback, useRef, useState } from "react";
+import { Button } from "@/components/ui/button";
 import { Dialog, DialogContent, DialogTitle } from "@/components/ui/dialog";
 import { Separator } from "@/components/ui/separator";
 import { cn } from "@/lib/utils";
@@ -55,12 +56,13 @@ export function SettingsDialog({
 				<nav className="hidden md:flex w-[220px] shrink-0 flex-col border-r border-border p-3 pt-6">
 					<div className="flex flex-col gap-0.5">
 						{navItems.map((item) => (
-							<button
+							<Button
 								key={item.value}
 								type="button"
+								variant="ghost"
 								onClick={() => onItemChange(item.value)}
 								className={cn(
-									"flex items-center gap-3 rounded-lg px-3 py-2.5 text-sm font-medium transition-colors text-left focus:outline-none focus-visible:outline-none",
+									"h-auto justify-start gap-3 rounded-lg px-3 py-2.5 text-left text-sm font-medium transition-colors focus:outline-none focus-visible:outline-none",
 									activeItem === item.value
 										? "bg-accent text-accent-foreground"
 										: "text-muted-foreground hover:bg-accent hover:text-accent-foreground"
@@ -68,7 +70,7 @@ export function SettingsDialog({
 							>
 								{item.icon}
 								{item.label}
-							</button>
+							</Button>
 						))}
 					</div>
 				</nav>
@@ -88,13 +90,14 @@ export function SettingsDialog({
 					>
 						<div className="flex gap-1 px-4 pb-2">
 							{navItems.map((item) => (
-								<button
+								<Button
 									key={item.value}
 									ref={activeItem === item.value ? activeRef : undefined}
 									type="button"
+									variant="ghost"
 									onClick={() => handleItemChange(item.value)}
 									className={cn(
-										"flex items-center gap-2 whitespace-nowrap rounded-full px-3 py-1.5 text-xs font-medium transition-colors shrink-0 focus:outline-none focus-visible:outline-none",
+										"h-auto shrink-0 gap-2 rounded-full px-3 py-1.5 text-xs font-medium transition-colors focus:outline-none focus-visible:outline-none",
 										activeItem === item.value
 											? "bg-accent text-accent-foreground"
 											: "text-muted-foreground hover:bg-accent hover:text-accent-foreground"
@@ -102,7 +105,7 @@ export function SettingsDialog({
 								>
 									{item.icon}
 									{item.label}
-								</button>
+								</Button>
 							))}
 						</div>
 					</div>
diff --git a/surfsense_web/components/shared/llm-config-form.tsx b/surfsense_web/components/shared/llm-config-form.tsx
index 3581ac302..6b00408cb 100644
--- a/surfsense_web/components/shared/llm-config-form.tsx
+++ b/surfsense_web/components/shared/llm-config-form.tsx
@@ -407,9 +407,10 @@ export function LLMConfigForm({
 						<Separator />
 						<Collapsible open={advancedOpen} onOpenChange={setAdvancedOpen}>
 							<CollapsibleTrigger asChild>
-								<button
+								<Button
 									type="button"
-									className="flex w-full items-center justify-between py-2 text-xs sm:text-sm font-medium text-muted-foreground hover:text-accent-foreground transition-colors"
+									variant="ghost"
+									className="h-auto w-full justify-between px-0 py-2 text-xs font-medium text-muted-foreground hover:bg-transparent hover:text-accent-foreground sm:text-sm"
 								>
 									<span>Advanced Parameters</span>
 									<ChevronDown
@@ -418,7 +419,7 @@ export function LLMConfigForm({
 											advancedOpen && "rotate-180"
 										)}
 									/>
-								</button>
+								</Button>
 							</CollapsibleTrigger>
 							<CollapsibleContent className="space-y-4 pt-2">
 								<FormField
@@ -445,9 +446,10 @@ export function LLMConfigForm({
 				<Separator />
 				<Collapsible open={systemInstructionsOpen} onOpenChange={setSystemInstructionsOpen}>
 					<CollapsibleTrigger asChild>
-						<button
+						<Button
 							type="button"
-							className="flex w-full items-center justify-between py-2 text-xs sm:text-sm font-medium text-muted-foreground hover:text-accent-foreground transition-colors"
+							variant="ghost"
+							className="h-auto w-full justify-between px-0 py-2 text-xs font-medium text-muted-foreground hover:bg-transparent hover:text-accent-foreground sm:text-sm"
 						>
 							<span>System Instructions</span>
 							<ChevronDown
@@ -456,7 +458,7 @@ export function LLMConfigForm({
 									systemInstructionsOpen && "rotate-180"
 								)}
 							/>
-						</button>
+						</Button>
 					</CollapsibleTrigger>
 					<CollapsibleContent className="space-y-4 pt-2">
 						{/* System Instructions */}

From da55c75e5ef8efe98257d2792aa31ac24ba4fadc Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Thu, 14 May 2026 14:42:41 +0530
Subject: [PATCH 49/96] refactor: remove ThreadList component and associated
 thread management logic

---
 .../components/assistant-ui/thread-list.tsx   | 298 ------------------
 surfsense_web/lib/chat/thread-persistence.ts  | 100 ------
 2 files changed, 398 deletions(-)
 delete mode 100644 surfsense_web/components/assistant-ui/thread-list.tsx

diff --git a/surfsense_web/components/assistant-ui/thread-list.tsx b/surfsense_web/components/assistant-ui/thread-list.tsx
deleted file mode 100644
index 1753a6ccf..000000000
--- a/surfsense_web/components/assistant-ui/thread-list.tsx
+++ /dev/null
@@ -1,298 +0,0 @@
-"use client";
-
-import {
-	ArchiveIcon,
-	MessageSquareIcon,
-	MoreVerticalIcon,
-	PlusIcon,
-	RotateCcwIcon,
-	TrashIcon,
-} from "lucide-react";
-import { useRouter } from "next/navigation";
-import { memo, useCallback, useEffect, useMemo, useState } from "react";
-import { Button } from "@/components/ui/button";
-import {
-	DropdownMenu,
-	DropdownMenuContent,
-	DropdownMenuItem,
-	DropdownMenuSeparator,
-	DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu";
-import {
-	createThreadListManager,
-	type ThreadListItem,
-	type ThreadListState,
-} from "@/lib/chat/thread-persistence";
-import { cn } from "@/lib/utils";
-
-interface ThreadListProps {
-	searchSpaceId: number;
-	currentThreadId?: number;
-	className?: string;
-}
-
-export function ThreadList({ searchSpaceId, currentThreadId, className }: ThreadListProps) {
-	const router = useRouter();
-	const [state, setState] = useState<ThreadListState>({
-		threads: [],
-		archivedThreads: [],
-		isLoading: true,
-		error: null,
-	});
-	const [showArchived, setShowArchived] = useState(false);
-
-	// Create the thread list manager
-	const manager = useCallback(
-		() =>
-			createThreadListManager({
-				searchSpaceId,
-				currentThreadId: currentThreadId ?? null,
-				onThreadSwitch: (threadId) => {
-					router.push(`/dashboard/${searchSpaceId}/new-chat/${threadId}`);
-				},
-				onNewThread: (threadId) => {
-					router.push(`/dashboard/${searchSpaceId}/new-chat/${threadId}`);
-				},
-			}),
-		[searchSpaceId, currentThreadId, router]
-	);
-
-	// Load threads on mount and when searchSpaceId changes
-	const loadThreads = useCallback(async () => {
-		setState((prev) => ({ ...prev, isLoading: true }));
-		const newState = await manager().loadThreads();
-		setState(newState);
-	}, [manager]);
-
-	useEffect(() => {
-		loadThreads();
-	}, [loadThreads]);
-
-	// Handle new thread creation
-	const handleNewThread = async () => {
-		await manager().createNewThread();
-		await loadThreads();
-	};
-
-	// Handle thread actions
-	const handleArchive = async (threadId: number) => {
-		const success = await manager().archiveThread(threadId);
-		if (success) await loadThreads();
-	};
-
-	const handleUnarchive = async (threadId: number) => {
-		const success = await manager().unarchiveThread(threadId);
-		if (success) await loadThreads();
-	};
-
-	const handleDelete = async (threadId: number) => {
-		const success = await manager().deleteThread(threadId);
-		if (success) {
-			await loadThreads();
-			// If we deleted the current thread, redirect to new chat
-			if (threadId === currentThreadId) {
-				router.push(`/dashboard/${searchSpaceId}/new-chat`);
-			}
-		}
-	};
-
-	const handleSwitchToThread = (threadId: number) => {
-		manager().switchToThread(threadId);
-	};
-
-	const displayedThreads = showArchived ? state.archivedThreads : state.threads;
-
-	if (state.isLoading) {
-		return (
-			<div className={cn("flex h-full flex-col", className)}>
-				<div className="flex items-center justify-center p-4">
-					<span className="text-muted-foreground text-sm">Loading threads...</span>
-				</div>
-			</div>
-		);
-	}
-
-	if (state.error) {
-		return (
-			<div className={cn("flex h-full flex-col", className)}>
-				<div className="p-4 text-center">
-					<span className="text-destructive text-sm">{state.error}</span>
-					<Button variant="ghost" size="sm" className="mt-2" onClick={loadThreads}>
-						Retry
-					</Button>
-				</div>
-			</div>
-		);
-	}
-
-	return (
-		<div className={cn("flex h-full flex-col", className)}>
-			{/* Header with New Chat button */}
-			<div className="flex items-center justify-between border-b p-3">
-				<h2 className="font-semibold text-sm">Conversations</h2>
-				<Button
-					variant="ghost"
-					size="icon"
-					className="size-8"
-					onClick={handleNewThread}
-					title="New Chat"
-				>
-					<PlusIcon className="size-4" />
-				</Button>
-			</div>
-
-			{/* Tab toggle for active/archived */}
-			<div className="flex border-b">
-				<button
-					type="button"
-					onClick={() => setShowArchived(false)}
-					className={cn(
-						"flex-1 px-3 py-2 text-center text-xs font-medium transition-colors",
-						!showArchived
-							? "border-b-2 border-primary text-primary"
-							: "text-muted-foreground hover:text-accent-foreground"
-					)}
-				>
-					Active ({state.threads.length})
-				</button>
-				<button
-					type="button"
-					onClick={() => setShowArchived(true)}
-					className={cn(
-						"flex-1 px-3 py-2 text-center text-xs font-medium transition-colors",
-						showArchived
-							? "border-b-2 border-primary text-primary"
-							: "text-muted-foreground hover:text-accent-foreground"
-					)}
-				>
-					Archived ({state.archivedThreads.length})
-				</button>
-			</div>
-
-			{/* Thread list */}
-			<div className="flex-1 overflow-y-auto">
-				{displayedThreads.length === 0 ? (
-					<div className="flex flex-col items-center justify-center p-6 text-center">
-						<MessageSquareIcon className="mb-2 size-8 text-muted-foreground/50" />
-						<p className="text-muted-foreground text-sm">
-							{showArchived ? "No archived conversations" : "No conversations yet"}
-						</p>
-						{!showArchived && (
-							<Button variant="outline" size="sm" className="mt-3" onClick={handleNewThread}>
-								<PlusIcon className="mr-1 size-3" />
-								Start a conversation
-							</Button>
-						)}
-					</div>
-				) : (
-					<div className="space-y-1 p-2">
-						{displayedThreads.map((thread) => (
-							<ThreadListItemComponent
-								key={thread.id}
-								thread={thread}
-								isActive={thread.id === currentThreadId}
-								isArchived={showArchived}
-								onClick={() => handleSwitchToThread(thread.id)}
-								onArchive={() => handleArchive(thread.id)}
-								onUnarchive={() => handleUnarchive(thread.id)}
-								onDelete={() => handleDelete(thread.id)}
-							/>
-						))}
-					</div>
-				)}
-			</div>
-		</div>
-	);
-}
-
-interface ThreadListItemComponentProps {
-	thread: ThreadListItem;
-	isActive: boolean;
-	isArchived: boolean;
-	onClick: () => void;
-	onArchive: () => void;
-	onUnarchive: () => void;
-	onDelete: () => void;
-}
-
-const ThreadListItemComponent = memo(function ThreadListItemComponent({
-	thread,
-	isActive,
-	isArchived,
-	onClick,
-	onArchive,
-	onUnarchive,
-	onDelete,
-}: ThreadListItemComponentProps) {
-	const relativeTime = useMemo(
-		() => formatRelativeTime(new Date(thread.updatedAt)),
-		[thread.updatedAt]
-	);
-
-	return (
-		<button
-			type="button"
-			className={cn(
-				"group flex w-full items-center gap-2 rounded-lg px-3 py-2 transition-colors cursor-pointer text-left",
-				isActive ? "bg-accent text-accent-foreground" : "hover:bg-accent hover:text-accent-foreground"
-			)}
-			onClick={onClick}
-		>
-			<MessageSquareIcon className="size-4 shrink-0 text-muted-foreground" />
-			<div className="flex-1 min-w-0">
-				<p className="truncate text-sm font-medium">{thread.title || "New Chat"}</p>
-				<p className="truncate text-xs text-muted-foreground">{relativeTime}</p>
-			</div>
-			<DropdownMenu>
-				<DropdownMenuTrigger asChild>
-					<Button
-						variant="ghost"
-						size="icon"
-						className="size-7 opacity-0 group-hover:opacity-100 transition-opacity"
-						onClick={(e) => e.stopPropagation()}
-					>
-						<MoreVerticalIcon className="size-4" />
-					</Button>
-				</DropdownMenuTrigger>
-				<DropdownMenuContent align="end">
-					{isArchived ? (
-						<DropdownMenuItem onClick={onUnarchive}>
-							<RotateCcwIcon className="mr-2 size-4" />
-							Unarchive
-						</DropdownMenuItem>
-					) : (
-						<DropdownMenuItem onClick={onArchive}>
-							<ArchiveIcon className="mr-2 size-4" />
-							Archive
-						</DropdownMenuItem>
-					)}
-					<DropdownMenuSeparator />
-					<DropdownMenuItem onClick={onDelete}>
-						<TrashIcon className="mr-2 size-4" />
-						Delete
-					</DropdownMenuItem>
-				</DropdownMenuContent>
-			</DropdownMenu>
-		</button>
-	);
-});
-
-/**
- * Format a date as relative time (e.g., "2 hours ago", "Yesterday")
- */
-function formatRelativeTime(date: Date): string {
-	const now = new Date();
-	const diffMs = now.getTime() - date.getTime();
-	const diffSecs = Math.floor(diffMs / 1000);
-	const diffMins = Math.floor(diffSecs / 60);
-	const diffHours = Math.floor(diffMins / 60);
-	const diffDays = Math.floor(diffHours / 24);
-
-	if (diffSecs < 60) return "Just now";
-	if (diffMins < 60) return `${diffMins} min${diffMins === 1 ? "" : "s"} ago`;
-	if (diffHours < 24) return `${diffHours} hour${diffHours === 1 ? "" : "s"} ago`;
-	if (diffDays === 1) return "Yesterday";
-	if (diffDays < 7) return `${diffDays} days ago`;
-
-	return date.toLocaleDateString();
-}
diff --git a/surfsense_web/lib/chat/thread-persistence.ts b/surfsense_web/lib/chat/thread-persistence.ts
index 2fb283f87..18ddb4ea0 100644
--- a/surfsense_web/lib/chat/thread-persistence.ts
+++ b/surfsense_web/lib/chat/thread-persistence.ts
@@ -232,103 +232,3 @@ export function getRegenerateUrl(threadId: number): string {
 	return `${backendUrl}/api/v1/threads/${threadId}/regenerate`;
 }
 
-// =============================================================================
-// Thread List Manager (for thread list sidebar)
-// =============================================================================
-
-export interface ThreadListAdapterConfig {
-	searchSpaceId: number;
-	currentThreadId: number | null;
-	onThreadSwitch: (threadId: number) => void;
-	onNewThread: (threadId: number) => void;
-}
-
-export interface ThreadListState {
-	threads: ThreadListItem[];
-	archivedThreads: ThreadListItem[];
-	isLoading: boolean;
-	error: string | null;
-}
-
-/**
- * Creates a thread list management object.
- * This provides methods to manage the thread list for the sidebar.
- */
-export function createThreadListManager(config: ThreadListAdapterConfig) {
-	return {
-		async loadThreads(): Promise<ThreadListState> {
-			try {
-				const response = await fetchThreads(config.searchSpaceId);
-				return {
-					threads: response.threads,
-					archivedThreads: response.archived_threads,
-					isLoading: false,
-					error: null,
-				};
-			} catch (error) {
-				console.error("[ThreadListManager] Failed to load threads:", error);
-				return {
-					threads: [],
-					archivedThreads: [],
-					isLoading: false,
-					error: error instanceof Error ? error.message : "Failed to load threads",
-				};
-			}
-		},
-
-		async createNewThread(title = "New Chat"): Promise<number | null> {
-			try {
-				const thread = await createThread(config.searchSpaceId, title);
-				config.onNewThread(thread.id);
-				return thread.id;
-			} catch (error) {
-				console.error("[ThreadListManager] Failed to create thread:", error);
-				return null;
-			}
-		},
-
-		switchToThread(threadId: number) {
-			config.onThreadSwitch(threadId);
-		},
-
-		async renameThread(threadId: number, newTitle: string): Promise<boolean> {
-			try {
-				await updateThread(threadId, { title: newTitle });
-				return true;
-			} catch (error) {
-				console.error("[ThreadListManager] Failed to rename thread:", error);
-				return false;
-			}
-		},
-
-		async archiveThread(threadId: number): Promise<boolean> {
-			try {
-				await updateThread(threadId, { archived: true });
-				return true;
-			} catch (error) {
-				console.error("[ThreadListManager] Failed to archive thread:", error);
-				return false;
-			}
-		},
-
-		async unarchiveThread(threadId: number): Promise<boolean> {
-			try {
-				await updateThread(threadId, { archived: false });
-				return true;
-			} catch (error) {
-				console.error("[ThreadListManager] Failed to unarchive thread:", error);
-				return false;
-			}
-		},
-
-		async deleteThread(threadId: number): Promise<boolean> {
-			try {
-				await deleteThread(threadId);
-				return true;
-			} catch (error) {
-				console.error("[ThreadListManager] Failed to delete thread:", error);
-				return false;
-			}
-		},
-	};
-}

From 13b2e874f6b74895e6d317687819e60e43bd6e64 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Thu, 14 May 2026 14:46:48 +0530
Subject: [PATCH 50/96] refactor: replace button elements with Button component

---
 .../browser-apis/iframes.md                   |  2 +-
 .../playwright-testing/core/locators.md       |  2 +-
 .../vercel-react-best-practices/AGENTS.md     | 25 +++++++++++++------
 .../rules/bundle-preload.md                   |  6 +++--
 .../rules/client-swr-dedup.md                 |  3 ++-
 .../rules/rerender-defer-reads.md             |  8 ++++--
 .../rules/rerender-move-effect-to-event.md    |  8 ++++--
 7 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/.cursor/skills/playwright-testing/browser-apis/iframes.md b/.cursor/skills/playwright-testing/browser-apis/iframes.md
index 145e050ff..155cc1c1b 100644
--- a/.cursor/skills/playwright-testing/browser-apis/iframes.md
+++ b/.cursor/skills/playwright-testing/browser-apis/iframes.md
@@ -372,7 +372,7 @@ test("mock iframe response", async ({ page }) => {
         <html>
           <body>
             <h1>Mocked Widget</h1>
-            <button>Mocked Button</button>
+            <p>Mocked widget content</p>
           </body>
         </html>
       `,
diff --git a/.cursor/skills/playwright-testing/core/locators.md b/.cursor/skills/playwright-testing/core/locators.md
index f806635d6..afe3af361 100644
--- a/.cursor/skills/playwright-testing/core/locators.md
+++ b/.cursor/skills/playwright-testing/core/locators.md
@@ -100,7 +100,7 @@ use: {
 Usage:
 
 ```typescript
-// HTML: <button data-testid="submit-btn">Submit</button>
+// React: <Button data-testid="submit-btn">Submit</Button>
 page.getByTestId("submit-btn");
 ```
 
diff --git a/.cursor/skills/vercel-react-best-practices/AGENTS.md b/.cursor/skills/vercel-react-best-practices/AGENTS.md
index 94c3c8441..2b839ab51 100644
--- a/.cursor/skills/vercel-react-best-practices/AGENTS.md
+++ b/.cursor/skills/vercel-react-best-practices/AGENTS.md
@@ -549,6 +549,8 @@ Preload heavy bundles before they're needed to reduce perceived latency.
 **Example: preload on hover/focus**
 
 ```tsx
+import { Button } from '@/components/ui/button'
+
 function EditorButton({ onClick }: { onClick: () => void }) {
   const preload = () => {
     if (typeof window !== 'undefined') {
@@ -557,13 +559,13 @@ function EditorButton({ onClick }: { onClick: () => void }) {
   }
 
   return (
-    <button
+    <Button
       onMouseEnter={preload}
       onFocus={preload}
       onClick={onClick}
     >
       Open Editor
-    </button>
+    </Button>
   )
 }
 ```
@@ -1239,11 +1241,12 @@ function StaticContent() {
 **For mutations:**
 
 ```tsx
+import { Button } from '@/components/ui/button'
 import { useSWRMutation } from 'swr/mutation'
 
 function UpdateButton() {
   const { trigger } = useSWRMutation('/api/user', updateUser)
-  return <button onClick={() => trigger()}>Update</button>
+  return <Button onClick={() => trigger()}>Update</Button>
 }
 ```
 
@@ -1369,6 +1372,8 @@ Don't subscribe to dynamic state (searchParams, localStorage) if you only read i
 **Incorrect: subscribes to all searchParams changes**
 
 ```tsx
+import { Button } from '@/components/ui/button'
+
 function ShareButton({ chatId }: { chatId: string }) {
   const searchParams = useSearchParams()
 
@@ -1377,13 +1382,15 @@ function ShareButton({ chatId }: { chatId: string }) {
     shareChat(chatId, { ref })
   }
 
-  return <button onClick={handleShare}>Share</button>
+  return <Button onClick={handleShare}>Share</Button>
 }
 ```
 
 **Correct: reads on demand, no subscription**
 
 ```tsx
+import { Button } from '@/components/ui/button'
+
 function ShareButton({ chatId }: { chatId: string }) {
   const handleShare = () => {
     const params = new URLSearchParams(window.location.search)
@@ -1391,7 +1398,7 @@ function ShareButton({ chatId }: { chatId: string }) {
     shareChat(chatId, { ref })
   }
 
-  return <button onClick={handleShare}>Share</button>
+  return <Button onClick={handleShare}>Share</Button>
 }
 ```
 
@@ -1549,6 +1556,8 @@ If a side effect is triggered by a specific user action (submit, click, drag), r
 **Incorrect: event modeled as state + effect**
 
 ```tsx
+import { Button } from '@/components/ui/button'
+
 function Form() {
   const [submitted, setSubmitted] = useState(false)
   const theme = useContext(ThemeContext)
@@ -1560,13 +1569,15 @@ function Form() {
     }
   }, [submitted, theme])
 
-  return <button onClick={() => setSubmitted(true)}>Submit</button>
+  return <Button onClick={() => setSubmitted(true)}>Submit</Button>
 }
 ```
 
 **Correct: do it in the handler**
 
 ```tsx
+import { Button } from '@/components/ui/button'
+
 function Form() {
   const theme = useContext(ThemeContext)
 
@@ -1575,7 +1586,7 @@ function Form() {
     showToast('Registered', theme)
   }
 
-  return <button onClick={handleSubmit}>Submit</button>
+  return <Button onClick={handleSubmit}>Submit</Button>
 }
 ```
 
diff --git a/.cursor/skills/vercel-react-best-practices/rules/bundle-preload.md b/.cursor/skills/vercel-react-best-practices/rules/bundle-preload.md
index 700050406..0662ef81b 100644
--- a/.cursor/skills/vercel-react-best-practices/rules/bundle-preload.md
+++ b/.cursor/skills/vercel-react-best-practices/rules/bundle-preload.md
@@ -12,6 +12,8 @@ Preload heavy bundles before they're needed to reduce perceived latency.
 **Example (preload on hover/focus):**
 
 ```tsx
+import { Button } from "@/components/ui/button"
+
 function EditorButton({ onClick }: { onClick: () => void }) {
   const preload = () => {
     if (typeof window !== 'undefined') {
@@ -20,13 +22,13 @@ function EditorButton({ onClick }: { onClick: () => void }) {
   }
 
   return (
-    <button
+    <Button
       onMouseEnter={preload}
       onFocus={preload}
       onClick={onClick}
     >
       Open Editor
-    </button>
+    </Button>
   )
 }
 ```
diff --git a/.cursor/skills/vercel-react-best-practices/rules/client-swr-dedup.md b/.cursor/skills/vercel-react-best-practices/rules/client-swr-dedup.md
index 2a430f27f..22d419bca 100644
--- a/.cursor/skills/vercel-react-best-practices/rules/client-swr-dedup.md
+++ b/.cursor/skills/vercel-react-best-practices/rules/client-swr-dedup.md
@@ -45,11 +45,12 @@ function StaticContent() {
 **For mutations:**
 
 ```tsx
+import { Button } from '@/components/ui/button'
 import { useSWRMutation } from 'swr/mutation'
 
 function UpdateButton() {
   const { trigger } = useSWRMutation('/api/user', updateUser)
-  return <button onClick={() => trigger()}>Update</button>
+  return <Button onClick={() => trigger()}>Update</Button>
 }
 ```
 
diff --git a/.cursor/skills/vercel-react-best-practices/rules/rerender-defer-reads.md b/.cursor/skills/vercel-react-best-practices/rules/rerender-defer-reads.md
index e867c95f0..94410bc5b 100644
--- a/.cursor/skills/vercel-react-best-practices/rules/rerender-defer-reads.md
+++ b/.cursor/skills/vercel-react-best-practices/rules/rerender-defer-reads.md
@@ -12,6 +12,8 @@ Don't subscribe to dynamic state (searchParams, localStorage) if you only read i
 **Incorrect (subscribes to all searchParams changes):**
 
 ```tsx
+import { Button } from '@/components/ui/button'
+
 function ShareButton({ chatId }: { chatId: string }) {
   const searchParams = useSearchParams()
 
@@ -20,13 +22,15 @@ function ShareButton({ chatId }: { chatId: string }) {
     shareChat(chatId, { ref })
   }
 
-  return <button onClick={handleShare}>Share</button>
+  return <Button onClick={handleShare}>Share</Button>
 }
 ```
 
 **Correct (reads on demand, no subscription):**
 
 ```tsx
+import { Button } from '@/components/ui/button'
+
 function ShareButton({ chatId }: { chatId: string }) {
   const handleShare = () => {
     const params = new URLSearchParams(window.location.search)
@@ -34,6 +38,6 @@ function ShareButton({ chatId }: { chatId: string }) {
     shareChat(chatId, { ref })
   }
 
-  return <button onClick={handleShare}>Share</button>
+  return <Button onClick={handleShare}>Share</Button>
 }
 ```
diff --git a/.cursor/skills/vercel-react-best-practices/rules/rerender-move-effect-to-event.md b/.cursor/skills/vercel-react-best-practices/rules/rerender-move-effect-to-event.md
index dd58a1af0..299815d69 100644
--- a/.cursor/skills/vercel-react-best-practices/rules/rerender-move-effect-to-event.md
+++ b/.cursor/skills/vercel-react-best-practices/rules/rerender-move-effect-to-event.md
@@ -12,6 +12,8 @@ If a side effect is triggered by a specific user action (submit, click, drag), r
 **Incorrect (event modeled as state + effect):**
 
 ```tsx
+import { Button } from '@/components/ui/button'
+
 function Form() {
   const [submitted, setSubmitted] = useState(false)
   const theme = useContext(ThemeContext)
@@ -23,13 +25,15 @@ function Form() {
     }
   }, [submitted, theme])
 
-  return <button onClick={() => setSubmitted(true)}>Submit</button>
+  return <Button onClick={() => setSubmitted(true)}>Submit</Button>
 }
 ```
 
 **Correct (do it in the handler):**
 
 ```tsx
+import { Button } from '@/components/ui/button'
+
 function Form() {
   const theme = useContext(ThemeContext)
 
@@ -38,7 +42,7 @@ function Form() {
     showToast('Registered', theme)
   }
 
-  return <button onClick={handleSubmit}>Submit</button>
+  return <Button onClick={handleSubmit}>Submit</Button>
 }
 ```
 

From c77babf39bee3c295424fe07a5ac9c0dd4560c17 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Thu, 14 May 2026 15:02:46 +0530
Subject: [PATCH 51/96] refactor: replace button elements with Button component
 for improved consistency and styling across additional UI components

---
 .../components/connector-dialog-header.tsx    | 11 +++++----
 .../components/connector-warning-banner.tsx   | 11 +++++----
 .../views/connector-connect-view.tsx          |  9 ++++----
 .../views/connector-edit-view.tsx             |  9 ++++----
 .../views/indexing-configuration-view.tsx     |  9 ++++----
 .../views/youtube-crawler-view.tsx            |  9 ++++----
 .../components/assistant-ui/mention-chip.tsx  |  8 ++++---
 .../assistant-ui/reasoning-message-part.tsx   | 11 +++++----
 .../components/assistant-ui/thread.tsx        | 11 +++++++--
 .../member-mention-item.tsx                   |  8 ++++---
 .../components/desktop/shortcut-recorder.tsx  | 11 +++++----
 .../layout/ui/sidebar/SidebarButton.tsx       |  8 ++++---
 .../components/pricing/pricing-section.tsx    | 12 ++++++----
 .../components/sources/FolderWatchDialog.tsx  |  7 +++---
 .../components/theme/theme-toggle.tsx         | 10 +++++---
 .../components/tool-ui/citation/citation.tsx  |  8 ++++---
 .../components/tool-ui/generate-report.tsx    |  8 ++++---
 .../components/tool-ui/generate-resume.tsx    |  8 ++++---
 surfsense_web/components/ui/callout-node.tsx  | 23 +++++++++++--------
 surfsense_web/components/ui/sidebar.tsx       |  7 +++---
 surfsense_web/components/ui/toggle-node.tsx   |  8 ++++---
 surfsense_web/components/ui/toolbar.tsx       |  6 +++--
 .../hitl/edit-panel/fields/calendar-field.tsx | 10 ++++----
 .../chat-messages/timeline/timeline.tsx       | 11 +++++----
 .../fallback/default-fallback-card.tsx        |  7 +++---
 25 files changed, 148 insertions(+), 92 deletions(-)

diff --git a/surfsense_web/components/assistant-ui/connector-popup/components/connector-dialog-header.tsx b/surfsense_web/components/assistant-ui/connector-popup/components/connector-dialog-header.tsx
index 4fa261dba..25ad22523 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/components/connector-dialog-header.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/components/connector-dialog-header.tsx
@@ -2,6 +2,7 @@
 
 import { Search, X } from "lucide-react";
 import type { FC } from "react";
+import { Button } from "@/components/ui/button";
 import { DialogDescription, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 import { TabsList, TabsTrigger } from "@/components/ui/tabs";
 import { cn } from "@/lib/utils";
@@ -76,14 +77,16 @@ export const ConnectorDialogHeader: FC<ConnectorDialogHeaderProps> = ({
 							onChange={(e) => onSearchChange(e.target.value)}
 						/>
 						{searchQuery && (
-							<button
+							<Button
+								variant="ghost"
+								size="icon"
 								type="button"
 								onClick={() => onSearchChange("")}
-								className="absolute right-3 top-1/2 -translate-y-1/2 size-4 text-muted-foreground hover:text-accent-foreground transition-colors"
+								className="absolute right-1.5 top-1/2 size-7 -translate-y-1/2 text-muted-foreground transition-colors hover:bg-transparent hover:text-accent-foreground"
 								aria-label="Clear search"
 							>
-								<X className="size-4" />
-							</button>
+								<X data-icon="inline-start" />
+							</Button>
 						)}
 					</div>
 				</div>
diff --git a/surfsense_web/components/assistant-ui/connector-popup/components/connector-warning-banner.tsx b/surfsense_web/components/assistant-ui/connector-popup/components/connector-warning-banner.tsx
index d1de3e37e..ccd778be4 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/components/connector-warning-banner.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/components/connector-warning-banner.tsx
@@ -3,6 +3,7 @@
 import { AlertTriangle, X } from "lucide-react";
 import type { FC } from "react";
 import { useState } from "react";
+import { Button } from "@/components/ui/button";
 import { cn } from "@/lib/utils";
 
 interface ConnectorWarningBannerProps {
@@ -42,14 +43,16 @@ export const ConnectorWarningBanner: FC<ConnectorWarningBannerProps> = ({
 				)}
 			</div>
 			{onDismiss && (
-				<button
+				<Button
+					variant="ghost"
+					size="icon"
 					type="button"
 					onClick={handleDismiss}
-					className="shrink-0 p-0.5 rounded hover:bg-yellow-500/20 transition-colors"
+					className="size-6 shrink-0 rounded p-0 transition-colors hover:bg-yellow-500/20"
 					aria-label="Dismiss warning"
 				>
-					<X className="size-3.5 text-yellow-700 dark:text-yellow-300" />
-				</button>
+					<X data-icon="inline-start" className="text-yellow-700 dark:text-yellow-300" />
+				</Button>
 			)}
 		</div>
 	);
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-connect-view.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-connect-view.tsx
index 66a34afdf..7eaea271e 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-connect-view.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-connect-view.tsx
@@ -90,14 +90,15 @@ export const ConnectorConnectView: FC<ConnectorConnectViewProps> = ({
 		<div className="flex-1 flex flex-col min-h-0 overflow-hidden">
 			{/* Header */}
 			<div className="flex-shrink-0 px-6 sm:px-12 pt-8 sm:pt-10">
-				<button
+				<Button
+					variant="ghost"
 					type="button"
 					onClick={onBack}
-					className="flex items-center gap-2 text-xs sm:text-sm text-muted-foreground hover:text-accent-foreground mb-6 w-fit"
+					className="mb-6 h-auto w-fit justify-start gap-2 px-0 py-0 text-xs text-muted-foreground hover:bg-transparent hover:text-accent-foreground sm:text-sm"
 				>
-					<ArrowLeft className="size-4" />
+					<ArrowLeft data-icon="inline-start" />
 					Back to connectors
-				</button>
+				</Button>
 
 				<div className="flex items-center gap-4 mb-6">
 					<div className="flex h-14 w-14 items-center justify-center rounded-xl border border-slate-400/30">
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-edit-view.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-edit-view.tsx
index b74042205..2f69df79c 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-edit-view.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-edit-view.tsx
@@ -206,14 +206,15 @@ export const ConnectorEditView: FC<ConnectorEditViewProps> = ({
 				)}
 			>
 				{/* Back button */}
-				<button
+				<Button
+					variant="ghost"
 					type="button"
 					onClick={onBack}
-					className="flex items-center gap-2 text-xs sm:text-sm text-muted-foreground hover:text-accent-foreground mb-6 w-fit"
+					className="mb-6 h-auto w-fit justify-start gap-2 px-0 py-0 text-xs text-muted-foreground hover:bg-transparent hover:text-accent-foreground sm:text-sm"
 				>
-					<ArrowLeft className="size-4" />
+					<ArrowLeft data-icon="inline-start" />
 					Back to connectors
-				</button>
+				</Button>
 
 				{/* Connector header */}
 				<div className="flex flex-col sm:flex-row items-start sm:items-center gap-4 mb-6">
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/indexing-configuration-view.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/indexing-configuration-view.tsx
index 5503ce062..cf8f32ee4 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/indexing-configuration-view.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/indexing-configuration-view.tsx
@@ -128,14 +128,15 @@ export const IndexingConfigurationView: FC<IndexingConfigurationViewProps> = ({
 			>
 				{/* Back button - only show if not from OAuth */}
 				{!isFromOAuth && (
-					<button
+					<Button
+						variant="ghost"
 						type="button"
 						onClick={onSkip}
-						className="flex items-center gap-2 text-xs sm:text-sm text-muted-foreground hover:text-accent-foreground mb-6 w-fit"
+						className="mb-6 h-auto w-fit justify-start gap-2 px-0 py-0 text-xs text-muted-foreground hover:bg-transparent hover:text-accent-foreground sm:text-sm"
 					>
-						<ArrowLeft className="size-4" />
+						<ArrowLeft data-icon="inline-start" />
 						Back to connectors
-					</button>
+					</Button>
 				)}
 
 				{/* Success header */}
diff --git a/surfsense_web/components/assistant-ui/connector-popup/views/youtube-crawler-view.tsx b/surfsense_web/components/assistant-ui/connector-popup/views/youtube-crawler-view.tsx
index e2e44f0c6..576d858d1 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/views/youtube-crawler-view.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/views/youtube-crawler-view.tsx
@@ -216,14 +216,15 @@ export const YouTubeCrawlerView: FC<YouTubeCrawlerViewProps> = ({ searchSpaceId,
 		<div className="flex-1 flex flex-col min-h-0 overflow-hidden">
 			{/* Header */}
 			<div className="shrink-0 px-6 sm:px-12 pt-8 sm:pt-10">
-				<button
+				<Button
+					variant="ghost"
 					type="button"
 					onClick={onBack}
-					className="flex items-center gap-2 text-xs sm:text-sm text-muted-foreground hover:text-accent-foreground mb-6 w-fit"
+					className="mb-6 h-auto w-fit justify-start gap-2 px-0 py-0 text-xs text-muted-foreground hover:bg-transparent hover:text-accent-foreground sm:text-sm"
 				>
-					<ArrowLeft className="size-4" />
+					<ArrowLeft data-icon="inline-start" />
 					Back to connectors
-				</button>
+				</Button>
 
 				<div className="flex items-center gap-4 mb-6">
 					<div className="flex h-14 w-14 items-center justify-center rounded-xl border border-slate-400/30">
diff --git a/surfsense_web/components/assistant-ui/mention-chip.tsx b/surfsense_web/components/assistant-ui/mention-chip.tsx
index 9f9c9b177..79be46611 100644
--- a/surfsense_web/components/assistant-ui/mention-chip.tsx
+++ b/surfsense_web/components/assistant-ui/mention-chip.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import type { MouseEventHandler, ReactNode } from "react";
+import { Button } from "@/components/ui/button";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { cn } from "@/lib/utils";
 
@@ -60,13 +61,14 @@ export function MentionChip({
 	const isInteractive = Boolean(onClick) && !disabled;
 
 	const chip = (
-		<button
+		<Button
+			variant="ghost"
 			type="button"
 			onClick={onClick}
 			disabled={disabled}
 			aria-label={ariaLabel ?? label}
 			className={cn(
-				"inline-flex max-w-[220px] items-center gap-1.5 rounded-md border bg-background px-2 py-0.5 align-middle text-xs font-medium text-foreground leading-5 transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring",
+				"h-auto max-w-[220px] justify-start gap-1.5 rounded-md border bg-background px-2 py-0.5 align-middle text-xs leading-5 text-foreground shadow-none transition-colors focus-visible:ring-1 focus-visible:ring-ring",
 				isInteractive
 					? "cursor-pointer hover:bg-accent hover:text-accent-foreground"
 					: "cursor-default",
@@ -76,7 +78,7 @@ export function MentionChip({
 		>
 			<span className="inline-flex shrink-0 text-muted-foreground">{icon}</span>
 			<span className="truncate">{label}</span>
-		</button>
+		</Button>
 	);
 
 	if (!tooltip) return chip;
diff --git a/surfsense_web/components/assistant-ui/reasoning-message-part.tsx b/surfsense_web/components/assistant-ui/reasoning-message-part.tsx
index 94dd6f25e..72347e33c 100644
--- a/surfsense_web/components/assistant-ui/reasoning-message-part.tsx
+++ b/surfsense_web/components/assistant-ui/reasoning-message-part.tsx
@@ -4,6 +4,7 @@ import type { ReasoningMessagePartComponent } from "@assistant-ui/react";
 import { ChevronRightIcon } from "lucide-react";
 import { useEffect, useMemo, useState } from "react";
 import { TextShimmerLoader } from "@/components/prompt-kit/loader";
+import { Button } from "@/components/ui/button";
 import { cn } from "@/lib/utils";
 
 /**
@@ -45,11 +46,12 @@ export const ReasoningMessagePart: ReasoningMessagePartComponent = ({ text, stat
 	return (
 		<div className="mx-auto w-full max-w-(--thread-max-width) px-2 py-2">
 			<div className="rounded-lg">
-				<button
+				<Button
+					variant="ghost"
 					type="button"
 					onClick={() => setIsOpen((prev) => !prev)}
 					className={cn(
-						"flex w-full items-center gap-1.5 text-left text-sm transition-colors",
+						"h-auto w-full justify-start gap-1.5 p-0 text-left text-sm font-normal transition-colors hover:bg-transparent",
 						"text-muted-foreground hover:text-accent-foreground"
 					)}
 				>
@@ -59,9 +61,10 @@ export const ReasoningMessagePart: ReasoningMessagePartComponent = ({ text, stat
 						<span>{headerLabel}</span>
 					)}
 					<ChevronRightIcon
-						className={cn("size-4 transition-transform duration-200", isOpen && "rotate-90")}
+						data-icon="inline-end"
+						className={cn("transition-transform duration-200", isOpen && "rotate-90")}
 					/>
-				</button>
+				</Button>
 
 				<div
 					className={cn(
diff --git a/surfsense_web/components/assistant-ui/thread.tsx b/surfsense_web/components/assistant-ui/thread.tsx
index 31212b0d2..4bc1a2e0e 100644
--- a/surfsense_web/components/assistant-ui/thread.tsx
+++ b/surfsense_web/components/assistant-ui/thread.tsx
@@ -330,8 +330,15 @@ const PendingScreenImageStrip: FC = () => {
 					key={url}
 					className="group relative h-14 w-14 shrink-0 overflow-hidden rounded-md border border-border/50 bg-muted"
 				>
-					{/* biome-ignore lint/performance/noImgElement: data URL thumbnails from capture */}
-					<img src={url} alt="" className="size-full object-cover" draggable={false} />
+					<Image
+						src={url}
+						alt="Pending screenshot preview"
+						fill
+						sizes="56px"
+						className="object-cover"
+						draggable={false}
+						unoptimized
+					/>
 					<Button
 						type="button"
 						onClick={() => setUrls((prev) => prev.filter((_, i) => i !== index))}
diff --git a/surfsense_web/components/chat-comments/member-mention-picker/member-mention-item.tsx b/surfsense_web/components/chat-comments/member-mention-picker/member-mention-item.tsx
index 349076372..8972c903d 100644
--- a/surfsense_web/components/chat-comments/member-mention-picker/member-mention-item.tsx
+++ b/surfsense_web/components/chat-comments/member-mention-picker/member-mention-item.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
+import { Button } from "@/components/ui/button";
 import { cn } from "@/lib/utils";
 import type { MemberMentionItemProps } from "./types";
 
@@ -25,10 +26,11 @@ export function MemberMentionItem({
 	const displayName = member.displayName || member.email.split("@")[0];
 
 	return (
-		<button
+		<Button
+			variant="ghost"
 			type="button"
 			className={cn(
-				"flex w-full items-center gap-3 px-3 py-2 text-left transition-colors",
+				"h-auto w-full justify-start gap-3 rounded-none px-3 py-2 text-left transition-colors",
 				isHighlighted ? "bg-primary/15 text-accent-foreground" : "hover:bg-accent hover:text-accent-foreground"
 			)}
 			onClick={() => onSelect(member)}
@@ -44,6 +46,6 @@ export function MemberMentionItem({
 				<span className="truncate text-sm font-medium">{displayName}</span>
 				<span className="truncate text-xs text-muted-foreground">{member.email}</span>
 			</div>
-		</button>
+		</Button>
 	);
 }
diff --git a/surfsense_web/components/desktop/shortcut-recorder.tsx b/surfsense_web/components/desktop/shortcut-recorder.tsx
index 388bb1bf8..cd49eac71 100644
--- a/surfsense_web/components/desktop/shortcut-recorder.tsx
+++ b/surfsense_web/components/desktop/shortcut-recorder.tsx
@@ -48,9 +48,9 @@ export const DEFAULT_SHORTCUTS = {
 export function Kbd({ keys, className }: { keys: string[]; className?: string }) {
 	return (
 		<span className={cn("inline-flex items-center gap-0.5", className)}>
-			{keys.map((key, i) => (
+			{keys.map((key) => (
 				<kbd
-					key={`${key}-${i}`}
+					key={key}
 					className={cn(
 						"inline-flex h-6 min-w-6 items-center justify-center rounded border bg-muted px-1 font-mono text-[11px] font-medium text-muted-foreground",
 						key.length > 3 && "px-1.5"
@@ -136,14 +136,15 @@ export function ShortcutRecorder({
 						<RotateCcw className="size-3" />
 					</Button>
 				)}
-				<button
+				<Button
+					variant="ghost"
 					ref={inputRef}
 					type="button"
 					onClick={() => setRecording(true)}
 					onKeyDown={handleKeyDown}
 					onBlur={() => setRecording(false)}
 					className={cn(
-						"flex h-7 items-center gap-0.5 rounded-md border px-2 transition-all focus:outline-none",
+						"h-7 justify-start gap-0.5 rounded-md border px-2 transition-all",
 						recording
 							? "border-primary bg-primary/5 ring-2 ring-primary/20"
 							: "border-input bg-muted/40 hover:bg-muted"
@@ -156,7 +157,7 @@ export function ShortcutRecorder({
 					) : (
 						<Kbd keys={displayKeys} />
 					)}
-				</button>
+				</Button>
 			</div>
 		</div>
 	);
diff --git a/surfsense_web/components/layout/ui/sidebar/SidebarButton.tsx b/surfsense_web/components/layout/ui/sidebar/SidebarButton.tsx
index 83ece94ab..d440fe9d3 100644
--- a/surfsense_web/components/layout/ui/sidebar/SidebarButton.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/SidebarButton.tsx
@@ -2,6 +2,7 @@
 
 import type { LucideIcon } from "lucide-react";
 import type React from "react";
+import { Button } from "@/components/ui/button";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { cn } from "@/lib/utils";
 
@@ -22,7 +23,7 @@ interface SidebarButtonProps {
 }
 
 const baseClassName = cn(
-	"group/sidebar-button relative flex h-9 items-center rounded-md mx-2 px-2 text-sm text-left",
+	"group/sidebar-button relative h-9 justify-start gap-0 rounded-md mx-2 px-2 text-sm text-left",
 	"transition-colors hover:bg-accent hover:text-accent-foreground",
 	"focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
 );
@@ -49,7 +50,8 @@ export function SidebarButton({
 		: (expandedIconNode ?? <Icon className="h-3.5 w-3.5 shrink-0" />);
 
 	const button = (
-		<button
+		<Button
+			variant="ghost"
 			type="button"
 			onClick={onClick}
 			aria-label={isCollapsed ? label : undefined}
@@ -100,7 +102,7 @@ export function SidebarButton({
 			)}
 
 			<span className="sr-only">{label}</span>
-		</button>
+		</Button>
 	);
 
 	const renderTooltip = isCollapsed || !!tooltipContent;
diff --git a/surfsense_web/components/pricing/pricing-section.tsx b/surfsense_web/components/pricing/pricing-section.tsx
index 7616d461d..b2eef2778 100644
--- a/surfsense_web/components/pricing/pricing-section.tsx
+++ b/surfsense_web/components/pricing/pricing-section.tsx
@@ -4,6 +4,7 @@ import { AnimatePresence, motion } from "motion/react";
 import type React from "react";
 import { useEffect, useRef, useState } from "react";
 import { Pricing } from "@/components/pricing";
+import { Button } from "@/components/ui/button";
 import { cn } from "@/lib/utils";
 
 const demoPlans = [
@@ -264,7 +265,7 @@ function PricingFAQ() {
 
 			<div ref={containerRef} className="relative mt-16 flex w-full flex-col gap-12 px-4 md:px-8">
 				{faqData.map((section) => (
-					<div key={section.title + "faq"}>
+					<div key={`${section.title}faq`}>
 						<h3 className="mb-6 text-lg font-medium text-neutral-800 dark:text-neutral-200">
 							{section.title}
 						</h3>
@@ -275,7 +276,7 @@ function PricingFAQ() {
 
 								return (
 									<div
-										key={id + "faq-item"}
+										key={`${id}faq-item`}
 										className={cn(
 											"relative rounded-lg transition-all duration-200",
 											isActive
@@ -291,10 +292,11 @@ function PricingFAQ() {
 												<GridLineVertical className="-right-[2px] left-auto" offset="100px" />
 											</div>
 										)}
-										<button
+										<Button
+											variant="ghost"
 											type="button"
 											onClick={() => toggleQuestion(id)}
-											className="flex w-full items-center justify-between px-4 py-4 text-left"
+											className="h-auto w-full justify-between rounded-lg px-4 py-4 text-left hover:bg-transparent"
 										>
 											<span className="text-sm font-medium text-neutral-700 md:text-base dark:text-neutral-300">
 												{item.question}
@@ -306,7 +308,7 @@ function PricingFAQ() {
 											>
 												<IconPlus className="size-5 text-neutral-500 dark:text-neutral-400" />
 											</motion.div>
-										</button>
+										</Button>
 										<AnimatePresence initial={false}>
 											{isActive && (
 												<motion.div
diff --git a/surfsense_web/components/sources/FolderWatchDialog.tsx b/surfsense_web/components/sources/FolderWatchDialog.tsx
index 8454d6d34..4cc566ef6 100644
--- a/surfsense_web/components/sources/FolderWatchDialog.tsx
+++ b/surfsense_web/components/sources/FolderWatchDialog.tsx
@@ -194,13 +194,14 @@ export function FolderWatchDialog({
 							</Button>
 						</div>
 					) : (
-						<button
+						<Button
+							variant="ghost"
 							type="button"
 							onClick={handleSelectFolder}
-							className="flex flex-1 w-full items-center justify-center gap-2 rounded-lg border-2 border-dashed border-muted-foreground/30 text-sm text-muted-foreground transition-colors hover:border-foreground/50 hover:text-accent-foreground"
+							className="h-auto flex-1 w-full gap-2 rounded-lg border-2 border-dashed border-muted-foreground/30 bg-transparent text-sm text-muted-foreground transition-colors hover:border-foreground/50 hover:bg-transparent hover:text-accent-foreground"
 						>
 							Browse for a folder
-						</button>
+						</Button>
 					)}
 
 					{selectedFolder && (
diff --git a/surfsense_web/components/theme/theme-toggle.tsx b/surfsense_web/components/theme/theme-toggle.tsx
index 0b480a1ca..9985e863a 100644
--- a/surfsense_web/components/theme/theme-toggle.tsx
+++ b/surfsense_web/components/theme/theme-toggle.tsx
@@ -4,6 +4,7 @@ import { motion } from "motion/react";
 import { useTheme } from "next-themes";
 import { useCallback, useEffect, useId, useState } from "react";
 
+import { Button } from "@/components/ui/button";
 import { cn } from "@/lib/utils";
 
 // ///////////////////////////////////////////////////////////////////////////
@@ -706,10 +707,12 @@ export const ThemeToggleButton = ({
 	const clipPathId = `theme-toggle-clip-${clipId}`;
 
 	return (
-		<button
+		<Button
+			variant="ghost"
+			size="icon"
 			type="button"
 			className={cn(
-				"size-10 cursor-pointer rounded-full p-2 transition-all duration-300 active:scale-95 bg-transparent",
+				"size-10 cursor-pointer rounded-full bg-transparent p-2 transition-all duration-300 hover:bg-transparent active:scale-95",
 				isDark ? "text-white" : "text-black",
 				className
 			)}
@@ -720,6 +723,7 @@ export const ThemeToggleButton = ({
 			<svg
 				xmlns="http://www.w3.org/2000/svg"
 				aria-hidden="true"
+				className="size-full"
 				fill="currentColor"
 				strokeLinecap="round"
 				viewBox="0 0 32 32"
@@ -759,7 +763,7 @@ export const ThemeToggleButton = ({
 					</motion.g>
 				</g>
 			</svg>
-		</button>
+		</Button>
 	);
 };
 
diff --git a/surfsense_web/components/tool-ui/citation/citation.tsx b/surfsense_web/components/tool-ui/citation/citation.tsx
index 425ee2ecf..9ecb7c2f2 100644
--- a/surfsense_web/components/tool-ui/citation/citation.tsx
+++ b/surfsense_web/components/tool-ui/citation/citation.tsx
@@ -3,6 +3,7 @@
 import { ExternalLink, Globe } from "lucide-react";
 import NextImage from "next/image";
 import * as React from "react";
+import { Button } from "@/components/ui/button";
 import { openSafeNavigationHref, sanitizeHref } from "../shared/media";
 import { cn, Popover, PopoverContent, PopoverTrigger } from "./_adapter";
 import type { CitationVariant, SerializableCitation } from "./schema";
@@ -126,7 +127,8 @@ export function Citation(props: CitationProps) {
 		return (
 			<Popover open={open}>
 				<PopoverTrigger asChild>
-					<button
+					<Button
+						variant="ghost"
 						type="button"
 						aria-label={title}
 						data-tool-ui-id={id}
@@ -135,7 +137,7 @@ export function Citation(props: CitationProps) {
 						onMouseEnter={handleMouseEnter}
 						onMouseLeave={handleMouseLeave}
 						className={cn(
-							"inline-flex cursor-pointer items-center gap-1.5 rounded-md px-2 py-1",
+							"h-auto cursor-pointer gap-1.5 rounded-md px-2 py-1",
 							"bg-muted/60 text-sm outline-none",
 							"transition-colors duration-150",
 							"hover:bg-accent hover:text-accent-foreground",
@@ -145,7 +147,7 @@ export function Citation(props: CitationProps) {
 					>
 						{iconElement}
 						<span className="text-muted-foreground">{domain}</span>
-					</button>
+					</Button>
 				</PopoverTrigger>
 				<PopoverContent
 					side="top"
diff --git a/surfsense_web/components/tool-ui/generate-report.tsx b/surfsense_web/components/tool-ui/generate-report.tsx
index 95137b576..2e21dd4e7 100644
--- a/surfsense_web/components/tool-ui/generate-report.tsx
+++ b/surfsense_web/components/tool-ui/generate-report.tsx
@@ -9,6 +9,7 @@ import { z } from "zod";
 import { openReportPanelAtom, reportPanelAtom } from "@/atoms/chat/report-panel.atom";
 import { PlateEditor } from "@/components/editor/plate-editor";
 import { TextShimmerLoader } from "@/components/prompt-kit/loader";
+import { Button } from "@/components/ui/button";
 import { useMediaQuery } from "@/hooks/use-media-query";
 import { baseApiService } from "@/lib/apis/base-api.service";
 
@@ -215,10 +216,11 @@ function ReportCard({
 		<div
 			className={`my-4 max-w-lg overflow-hidden rounded-2xl border bg-muted/30 transition-[box-shadow] duration-300 ${isActive ? "ring-1 ring-primary/50" : ""}`}
 		>
-			<button
+			<Button
+				variant="ghost"
 				type="button"
 				onClick={handleOpen}
-				className="w-full text-left transition-colors hover:bg-accent hover:text-accent-foreground focus:outline-none focus-visible:outline-none cursor-pointer"
+				className="h-auto w-full flex-col items-stretch justify-start gap-0 rounded-2xl p-0 text-left font-normal whitespace-normal transition-colors hover:bg-accent hover:text-accent-foreground focus:outline-none focus-visible:outline-none cursor-pointer"
 			>
 				<div className="px-5 pt-5 pb-4 select-none">
 					<p className="text-sm font-semibold text-foreground line-clamp-2">
@@ -262,7 +264,7 @@ function ReportCard({
 						<p className="text-sm text-muted-foreground italic">No content available</p>
 					)}
 				</div>
-			</button>
+			</Button>
 		</div>
 	);
 }
diff --git a/surfsense_web/components/tool-ui/generate-resume.tsx b/surfsense_web/components/tool-ui/generate-resume.tsx
index cc9dbb60e..448e8c531 100644
--- a/surfsense_web/components/tool-ui/generate-resume.tsx
+++ b/surfsense_web/components/tool-ui/generate-resume.tsx
@@ -9,6 +9,7 @@ import { useCallback, useEffect, useRef, useState } from "react";
 import { z } from "zod";
 import { openReportPanelAtom, reportPanelAtom } from "@/atoms/chat/report-panel.atom";
 import { TextShimmerLoader } from "@/components/prompt-kit/loader";
+import { Button } from "@/components/ui/button";
 import { useMediaQuery } from "@/hooks/use-media-query";
 import { baseApiService } from "@/lib/apis/base-api.service";
 import { getAuthHeaders } from "@/lib/auth-utils";
@@ -281,10 +282,11 @@ function ResumeCard({
 		<div
 			className={`my-4 max-w-lg overflow-hidden rounded-2xl border bg-muted/30 transition-[box-shadow] duration-300 ${isActive ? "ring-1 ring-primary/50" : ""}`}
 		>
-			<button
+			<Button
+				variant="ghost"
 				type="button"
 				onClick={handleOpen}
-				className="w-full text-left transition-colors hover:bg-accent hover:text-accent-foreground focus:outline-none focus-visible:outline-none cursor-pointer select-none"
+				className="h-auto w-full flex-col items-stretch justify-start gap-0 rounded-2xl p-0 text-left font-normal whitespace-normal transition-colors hover:bg-accent hover:text-accent-foreground focus:outline-none focus-visible:outline-none cursor-pointer select-none"
 			>
 				<div className="px-5 pt-5 pb-4">
 					<p className="text-sm font-semibold text-foreground line-clamp-2">{title}</p>
@@ -316,7 +318,7 @@ function ResumeCard({
 						</div>
 					)}
 				</div>
-			</button>
+			</Button>
 		</div>
 	);
 }
diff --git a/surfsense_web/components/ui/callout-node.tsx b/surfsense_web/components/ui/callout-node.tsx
index 0b5213b43..597276511 100644
--- a/surfsense_web/components/ui/callout-node.tsx
+++ b/surfsense_web/components/ui/callout-node.tsx
@@ -6,6 +6,7 @@ import type { TCalloutElement } from "platejs";
 import { PlateElement, type PlateElementProps, useEditorPlugin } from "platejs/react";
 import * as React from "react";
 
+import { Button } from "@/components/ui/button";
 import { cn } from "@/lib/utils";
 
 const calloutVariants = cva("my-1 flex w-full items-start gap-2 rounded-lg border p-4", {
@@ -24,7 +25,10 @@ const calloutVariants = cva("my-1 flex w-full items-start gap-2 rounded-lg borde
 	},
 });
 
-const calloutIcons: Record<string, string> = {
+const variantCycle = ["info", "warning", "error", "success", "note", "tip"] as const;
+type CalloutVariant = (typeof variantCycle)[number];
+
+const calloutIcons: Record<CalloutVariant, string> = {
 	info: "💡",
 	warning: "⚠️",
 	error: "🚨",
@@ -33,13 +37,13 @@ const calloutIcons: Record<string, string> = {
 	tip: "💜",
 };
 
-const variantCycle = ["info", "warning", "error", "success", "note", "tip"] as const;
-
 export function CalloutElement({ children, ...props }: PlateElementProps<TCalloutElement>) {
 	const { editor } = useEditorPlugin(CalloutPlugin);
 	const element = props.element;
-	const variant = element.variant || "info";
-	const icon = element.icon || calloutIcons[variant] || "💡";
+	const variant = variantCycle.includes(element.variant as CalloutVariant)
+		? (element.variant as CalloutVariant)
+		: "info";
+	const icon = element.icon || calloutIcons[variant];
 
 	const cycleVariant = React.useCallback(() => {
 		const currentIndex = variantCycle.indexOf(variant as (typeof variantCycle)[number]);
@@ -58,17 +62,18 @@ export function CalloutElement({ children, ...props }: PlateElementProps<TCallou
 	return (
 		<PlateElement
 			{...props}
-			className={cn(calloutVariants({ variant: variant as any }), props.className)}
+			className={cn(calloutVariants({ variant }), props.className)}
 		>
-			<button
-				className="mt-0.5 shrink-0 cursor-pointer select-none text-lg leading-none"
+			<Button
+				variant="ghost"
+				className="mt-0.5 h-auto shrink-0 cursor-pointer select-none p-0 text-lg leading-none hover:bg-transparent"
 				contentEditable={false}
 				onClick={cycleVariant}
 				type="button"
 				aria-label="Change callout type"
 			>
 				{icon}
-			</button>
+			</Button>
 			<div className="min-w-0 flex-1">{children}</div>
 		</PlateElement>
 	);
diff --git a/surfsense_web/components/ui/sidebar.tsx b/surfsense_web/components/ui/sidebar.tsx
index 7399a30aa..a5592bf9c 100644
--- a/surfsense_web/components/ui/sidebar.tsx
+++ b/surfsense_web/components/ui/sidebar.tsx
@@ -263,11 +263,12 @@ function SidebarTrigger({ className, onClick, ...props }: React.ComponentProps<t
 	);
 }
 
-function SidebarRail({ className, ...props }: React.ComponentProps<"button">) {
+function SidebarRail({ className, ...props }: React.ComponentProps<typeof Button>) {
 	const { toggleSidebar } = useSidebar();
 
 	return (
-		<button
+		<Button
+			variant="ghost"
 			data-sidebar="rail"
 			data-slot="sidebar-rail"
 			aria-label="Toggle Sidebar"
@@ -275,7 +276,7 @@ function SidebarRail({ className, ...props }: React.ComponentProps<"button">) {
 			onClick={toggleSidebar}
 			title="Toggle Sidebar"
 			className={cn(
-				"hover:after:bg-sidebar-border absolute inset-y-0 z-20 hidden w-4 -translate-x-1/2 transition-all ease-linear group-data-[side=left]:-right-4 group-data-[side=right]:left-0 after:absolute after:inset-y-0 after:left-1/2 after:w-[2px] sm:flex",
+				"hover:after:bg-sidebar-border absolute inset-y-0 z-20 hidden h-auto w-4 -translate-x-1/2 rounded-none p-0 transition-all ease-linear hover:bg-transparent group-data-[side=left]:-right-4 group-data-[side=right]:left-0 after:absolute after:inset-y-0 after:left-1/2 after:w-[2px] sm:flex",
 				"in-data-[side=left]:cursor-w-resize in-data-[side=right]:cursor-e-resize",
 				"[[data-side=left][data-state=collapsed]_&]:cursor-e-resize [[data-side=right][data-state=collapsed]_&]:cursor-w-resize",
 				"hover:group-data-[collapsible=offcanvas]:bg-sidebar group-data-[collapsible=offcanvas]:translate-x-0 group-data-[collapsible=offcanvas]:after:left-full",
diff --git a/surfsense_web/components/ui/toggle-node.tsx b/surfsense_web/components/ui/toggle-node.tsx
index 4d5d61787..f56632200 100644
--- a/surfsense_web/components/ui/toggle-node.tsx
+++ b/surfsense_web/components/ui/toggle-node.tsx
@@ -3,8 +3,8 @@
 import { useToggleButton, useToggleButtonState } from "@platejs/toggle/react";
 import { ChevronRightIcon } from "lucide-react";
 import { PlateElement, type PlateElementProps } from "platejs/react";
-import * as React from "react";
 
+import { Button } from "@/components/ui/button";
 import { cn } from "@/lib/utils";
 
 export function ToggleElement({ children, ...props }: PlateElementProps) {
@@ -14,7 +14,9 @@ export function ToggleElement({ children, ...props }: PlateElementProps) {
 
 	return (
 		<PlateElement {...props} className="relative py-1 pl-6">
-			<button
+			<Button
+				variant="ghost"
+				size="icon"
 				className={cn(
 					"absolute top-1.5 left-0 flex size-6 cursor-pointer select-none items-center justify-center rounded-sm text-muted-foreground transition-colors hover:bg-accent hover:text-accent-foreground"
 				)}
@@ -25,7 +27,7 @@ export function ToggleElement({ children, ...props }: PlateElementProps) {
 				<ChevronRightIcon
 					className={cn("size-4 transition-transform duration-200", open && "rotate-90")}
 				/>
-			</button>
+			</Button>
 			<div>{children}</div>
 		</PlateElement>
 	);
diff --git a/surfsense_web/components/ui/toolbar.tsx b/surfsense_web/components/ui/toolbar.tsx
index 772055c04..35ad1352c 100644
--- a/surfsense_web/components/ui/toolbar.tsx
+++ b/surfsense_web/components/ui/toolbar.tsx
@@ -6,6 +6,7 @@ import { cva, type VariantProps } from "class-variance-authority";
 import { ChevronDown } from "lucide-react";
 import * as React from "react";
 
+import { Button } from "@/components/ui/button";
 import {
 	DropdownMenuLabel,
 	DropdownMenuRadioGroup,
@@ -219,7 +220,8 @@ export function ToolbarSplitButtonSecondary({
 	...props
 }: React.ComponentPropsWithoutRef<"span"> & VariantProps<typeof dropdownArrowVariants>) {
 	return (
-		<button
+		<Button
+			variant="ghost"
 			type="button"
 			className={cn(
 				dropdownArrowVariants({
@@ -233,7 +235,7 @@ export function ToolbarSplitButtonSecondary({
 			{...(props as React.ComponentPropsWithoutRef<"button">)}
 		>
 			<ChevronDown className="size-3.5 text-muted-foreground" data-icon />
-		</button>
+		</Button>
 	);
 }
 
diff --git a/surfsense_web/features/chat-messages/hitl/edit-panel/fields/calendar-field.tsx b/surfsense_web/features/chat-messages/hitl/edit-panel/fields/calendar-field.tsx
index 23bc22d2c..534e9a2d5 100644
--- a/surfsense_web/features/chat-messages/hitl/edit-panel/fields/calendar-field.tsx
+++ b/surfsense_web/features/chat-messages/hitl/edit-panel/fields/calendar-field.tsx
@@ -4,6 +4,7 @@ import { format } from "date-fns";
 import { CalendarIcon } from "lucide-react";
 import type React from "react";
 import { useCallback, useMemo, useState } from "react";
+import { Button } from "@/components/ui/button";
 import { Calendar } from "@/components/ui/calendar";
 import { Input } from "@/components/ui/input";
 import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
@@ -81,16 +82,17 @@ export function DateTimePickerField({
 		<div className="flex gap-2">
 			<Popover open={open} onOpenChange={setOpen}>
 				<PopoverTrigger asChild>
-					<button
+					<Button
+						variant="outline"
 						id={id}
 						type="button"
-						className="flex-1 flex items-center gap-2 h-9 rounded-md border border-input bg-transparent px-3 py-1 text-sm shadow-xs transition-[color,box-shadow] outline-none focus-visible:border-ring"
+						className="h-9 flex-1 justify-start gap-2 bg-transparent px-3 py-1 text-sm"
 					>
-						<CalendarIcon className="size-3.5 text-muted-foreground shrink-0" />
+						<CalendarIcon data-icon="inline-start" className="text-muted-foreground" />
 						<span className={selectedDate ? "text-foreground" : "text-muted-foreground"}>
 							{displayLabel}
 						</span>
-					</button>
+					</Button>
 				</PopoverTrigger>
 				<PopoverContent className="w-auto p-0" align="start">
 					<Calendar
diff --git a/surfsense_web/features/chat-messages/timeline/timeline.tsx b/surfsense_web/features/chat-messages/timeline/timeline.tsx
index 12f71e9a6..91d8c41ce 100644
--- a/surfsense_web/features/chat-messages/timeline/timeline.tsx
+++ b/surfsense_web/features/chat-messages/timeline/timeline.tsx
@@ -3,6 +3,7 @@
 import { ChevronRightIcon } from "lucide-react";
 import { type FC, useEffect, useMemo, useState } from "react";
 import { TextShimmerLoader } from "@/components/prompt-kit/loader";
+import { Button } from "@/components/ui/button";
 import { getToolDisplayName } from "@/contracts/enums/toolIcons";
 import { HitlApprovalCard, usePendingInterrupt } from "@/features/chat-messages/hitl";
 import { cn } from "@/lib/utils";
@@ -98,11 +99,12 @@ export const Timeline: FC<{
 	return (
 		<div className="mx-auto w-full max-w-(--thread-max-width) px-2 py-2">
 			<div className="rounded-lg">
-				<button
+				<Button
+					variant="ghost"
 					type="button"
 					onClick={() => setIsOpen((prev) => !prev)}
 					className={cn(
-						"flex w-full items-center gap-1.5 text-left text-sm transition-colors",
+						"h-auto w-full justify-start gap-1.5 p-0 text-left text-sm font-normal transition-colors hover:bg-transparent",
 						"text-muted-foreground hover:text-accent-foreground"
 					)}
 				>
@@ -112,9 +114,10 @@ export const Timeline: FC<{
 						<span>{headerText}</span>
 					)}
 					<ChevronRightIcon
-						className={cn("size-4 transition-transform duration-200", isOpen && "rotate-90")}
+						data-icon="inline-end"
+						className={cn("transition-transform duration-200", isOpen && "rotate-90")}
 					/>
-				</button>
+				</Button>
 
 				<div
 					className={cn(
diff --git a/surfsense_web/features/chat-messages/timeline/tool-registry/fallback/default-fallback-card.tsx b/surfsense_web/features/chat-messages/timeline/tool-registry/fallback/default-fallback-card.tsx
index 903c21e00..57165c05f 100644
--- a/surfsense_web/features/chat-messages/timeline/tool-registry/fallback/default-fallback-card.tsx
+++ b/surfsense_web/features/chat-messages/timeline/tool-registry/fallback/default-fallback-card.tsx
@@ -97,10 +97,11 @@ export const DefaultFallbackCard: TimelineToolComponent = ({
 			>
 				<div className="flex items-stretch transition-colors hover:bg-accent hover:text-accent-foreground">
 					<CollapsibleTrigger asChild>
-						<button
+						<Button
+							variant="ghost"
 							type="button"
 							className={cn(
-								"flex flex-1 min-w-0 items-center gap-3 py-4 pl-5 pr-2 text-left",
+								"h-auto flex-1 min-w-0 justify-start gap-3 rounded-none py-4 pl-5 pr-2 text-left font-normal hover:bg-transparent",
 								"focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-inset",
 								"disabled:cursor-default"
 							)}
@@ -148,7 +149,7 @@ export const DefaultFallbackCard: TimelineToolComponent = ({
 									</p>
 								)}
 							</div>
-						</button>
+						</Button>
 					</CollapsibleTrigger>
 
 					<div className="flex shrink-0 items-center gap-2 pl-2 pr-5">

From 4083d33b5c00b8c7e97dc138f7fc740a3d60e4f8 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Thu, 14 May 2026 22:53:41 +0530
Subject: [PATCH 52/96] refactor: enhance SidebarUserProfile component with
 download tracking and improved button styling

---
 .../layout/ui/sidebar/SidebarUserProfile.tsx  | 39 ++++++++++++++++++-
 surfsense_web/components/ui/fixed-toolbar.tsx |  2 +-
 .../components/ui/inline-combobox.tsx         |  2 +-
 surfsense_web/lib/posthog/events.ts           | 10 +++++
 4 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx b/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx
index a8275829b..e5bb18054 100644
--- a/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx
@@ -35,6 +35,7 @@ import { useLocaleContext } from "@/contexts/LocaleContext";
 import { usePlatform } from "@/hooks/use-platform";
 import { GITHUB_RELEASES_URL, usePrimaryDownload } from "@/lib/desktop-download-utils";
 import { APP_VERSION } from "@/lib/env-config";
+import { trackDesktopDownloadClicked } from "@/lib/posthog/events";
 import { cn } from "@/lib/utils";
 import type { User } from "../../types/layout.types";
 
@@ -180,6 +181,7 @@ export function SidebarUserProfile({
 	const initials = getInitials(user.email);
 	const displayName = user.name || user.email.split("@")[0];
 	const downloadUrl = primary?.url ?? GITHUB_RELEASES_URL;
+	const downloadLabel = t("download_for_os", { os });
 
 	const handleLanguageChange = (newLocale: "en" | "es" | "pt" | "hi" | "zh") => {
 		setLocale(newLocale);
@@ -203,6 +205,24 @@ export function SidebarUserProfile({
 	if (isCollapsed) {
 		return (
 			<div className="border-t px-1.5 py-2">
+				<Button
+					asChild
+					variant="ghost"
+					size="icon"
+					className="mx-auto mb-2 h-9 w-9 rounded-md bg-muted hover:bg-accent"
+				>
+					<a
+						href={downloadUrl}
+						target="_blank"
+						rel="noopener noreferrer"
+						aria-label={downloadLabel}
+						onClick={() =>
+							trackDesktopDownloadClicked({ os, placement: "sidebar_collapsed" })
+						}
+					>
+						<Download className="h-4 w-4" strokeWidth={2.5} />
+					</a>
+				</Button>
 				<DropdownMenu>
 					<DropdownMenuTrigger asChild>
 						<Button
@@ -343,7 +363,7 @@ export function SidebarUserProfile({
 							<DropdownMenuItem asChild className="font-medium">
 								<a href={downloadUrl} target="_blank" rel="noopener noreferrer">
 									<Download className="h-4 w-4" strokeWidth={2.5} />
-									{t("download_for_os", { os })}
+									{downloadLabel}
 								</a>
 							</DropdownMenuItem>
 						)}
@@ -367,6 +387,21 @@ export function SidebarUserProfile({
 	// Expanded view
 	return (
 		<div className="border-t">
+			<Button
+				asChild
+				variant="ghost"
+				className="mx-2 mt-2 mb-1 h-10 w-[calc(100%-1rem)] justify-start gap-2 rounded-md bg-muted px-3 text-sm font-semibold hover:bg-accent"
+			>
+				<a
+					href={downloadUrl}
+					target="_blank"
+					rel="noopener noreferrer"
+					onClick={() => trackDesktopDownloadClicked({ os, placement: "sidebar_expanded" })}
+				>
+					<Download className="h-4 w-4" strokeWidth={2.5} />
+					{downloadLabel}
+				</a>
+			</Button>
 			<DropdownMenu>
 				<DropdownMenuTrigger asChild>
 					<Button
@@ -510,7 +545,7 @@ export function SidebarUserProfile({
 						<DropdownMenuItem asChild className="font-medium">
 							<a href={downloadUrl} target="_blank" rel="noopener noreferrer">
 								<Download className="h-4 w-4" strokeWidth={2.5} />
-								{t("download_for_os", { os })}
+								{downloadLabel}
 							</a>
 						</DropdownMenuItem>
 					)}
diff --git a/surfsense_web/components/ui/fixed-toolbar.tsx b/surfsense_web/components/ui/fixed-toolbar.tsx
index e11fae861..540088ea5 100644
--- a/surfsense_web/components/ui/fixed-toolbar.tsx
+++ b/surfsense_web/components/ui/fixed-toolbar.tsx
@@ -14,7 +14,7 @@ export function FixedToolbar({
 	return (
 		<Toolbar
 			className={cn(
-				"scrollbar-hide absolute top-0 left-0 z-[60] w-full justify-between overflow-x-auto border-b bg-background p-1",
+				"scrollbar-hide absolute top-0 left-0 z-40 w-full justify-between overflow-x-auto border-b bg-background p-1",
 				className
 			)}
 			{...props}
diff --git a/surfsense_web/components/ui/inline-combobox.tsx b/surfsense_web/components/ui/inline-combobox.tsx
index 1747dc469..2c45457b1 100644
--- a/surfsense_web/components/ui/inline-combobox.tsx
+++ b/surfsense_web/components/ui/inline-combobox.tsx
@@ -280,7 +280,7 @@ const InlineComboboxContent: typeof ComboboxPopover = ({ className, ...props })
 		<Portal>
 			<ComboboxPopover
 				className={cn(
-					"z-500 max-h-[288px] w-[300px] overflow-y-auto rounded-md bg-popover shadow-md",
+					"z-500 max-h-[288px] w-[300px] overflow-y-auto overscroll-none rounded-md bg-popover shadow-md",
 					className
 				)}
 				onKeyDownCapture={handleKeyDown}
diff --git a/surfsense_web/lib/posthog/events.ts b/surfsense_web/lib/posthog/events.ts
index f9eb6b312..127685fe8 100644
--- a/surfsense_web/lib/posthog/events.ts
+++ b/surfsense_web/lib/posthog/events.ts
@@ -401,6 +401,16 @@ export function trackSourcesTabViewed(searchSpaceId: number, tab: string) {
 	});
 }
 
+export function trackDesktopDownloadClicked(options: {
+	os: string;
+	placement: "sidebar_collapsed" | "sidebar_expanded";
+}) {
+	safeCapture("desktop_download_clicked", {
+		os: options.os,
+		placement: options.placement,
+	});
+}
+
 // ============================================
 // SEARCH SPACE INVITE EVENTS
 // ============================================

From 2bdd59611a19cb6903da21874fd4cd4d59d27882 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Thu, 14 May 2026 23:22:32 +0530
Subject: [PATCH 53/96] refactor: update SidebarUserProfile and Composer
 components with improved styling and tooltip integration

---
 .../components/assistant-ui/thread.tsx        |   4 +-
 .../layout/ui/sidebar/SidebarUserProfile.tsx  | 351 +++++++++---------
 surfsense_web/components/ui/tooltip.tsx       |   2 +-
 3 files changed, 187 insertions(+), 170 deletions(-)

diff --git a/surfsense_web/components/assistant-ui/thread.tsx b/surfsense_web/components/assistant-ui/thread.tsx
index 4bc1a2e0e..7994af8ac 100644
--- a/surfsense_web/components/assistant-ui/thread.tsx
+++ b/surfsense_web/components/assistant-ui/thread.tsx
@@ -735,7 +735,7 @@ const Composer: FC = () => {
 					/>
 				</div>
 			)}
-			<div className="aui-composer-attachment-dropzone flex w-full flex-col overflow-hidden rounded-2xl border-input bg-muted pt-2 outline-none transition-shadow">
+			<div className="aui-composer-attachment-dropzone flex w-full flex-col overflow-hidden rounded-3xl border-input bg-muted pt-2 shadow-sm shadow-black/5 outline-none transition-shadow dark:shadow-black/10">
 				<PendingScreenImageStrip />
 				{clipboardInitialText && (
 					<ClipboardChip
@@ -900,7 +900,7 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 	const isSendDisabled = isComposerEmpty || !hasModelConfigured || isBlockedByOtherUser;
 
 	return (
-		<div className="aui-composer-action-wrapper relative mx-3 mb-2 flex items-center justify-between">
+		<div className="aui-composer-action-wrapper relative mx-3 mb-3 flex items-center justify-between">
 			<div className="flex items-center gap-1">
 				{!isDesktop ? (
 					<>
diff --git a/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx b/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx
index e5bb18054..87e160029 100644
--- a/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx
@@ -31,7 +31,9 @@ import {
 } from "@/components/ui/dropdown-menu";
 import { Button } from "@/components/ui/button";
 import { Spinner } from "@/components/ui/spinner";
+import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { useLocaleContext } from "@/contexts/LocaleContext";
+import { useMediaQuery } from "@/hooks/use-media-query";
 import { usePlatform } from "@/hooks/use-platform";
 import { GITHUB_RELEASES_URL, usePrimaryDownload } from "@/lib/desktop-download-utils";
 import { APP_VERSION } from "@/lib/env-config";
@@ -133,15 +135,15 @@ function UserAvatar({
 	bgColor: string;
 	size?: "sm" | "md";
 }) {
-	const sizeClass = size === "md" ? "h-9 w-9" : "h-8 w-8";
+	const sizeClass = size === "md" ? "h-10 w-10" : "h-8 w-8";
 
 	if (avatarUrl) {
 		return (
 			<Image
 				src={avatarUrl}
 				alt="User avatar"
-				width={size === "md" ? 36 : 32}
-				height={size === "md" ? 36 : 32}
+				width={size === "md" ? 40 : 32}
+				height={size === "md" ? 40 : 32}
 				className={cn(sizeClass, "shrink-0 rounded-full object-cover select-none")}
 				referrerPolicy="no-referrer"
 				unoptimized
@@ -175,6 +177,7 @@ export function SidebarUserProfile({
 	const t = useTranslations("sidebar");
 	const { locale, setLocale } = useLocaleContext();
 	const { isDesktop } = usePlatform();
+	const isDesktopViewport = useMediaQuery("(min-width: 768px)");
 	const { os, primary } = usePrimaryDownload();
 	const [isLoggingOut, setIsLoggingOut] = useState(false);
 	const bgColor = stringToColor(user.email);
@@ -182,6 +185,7 @@ export function SidebarUserProfile({
 	const displayName = user.name || user.email.split("@")[0];
 	const downloadUrl = primary?.url ?? GITHUB_RELEASES_URL;
 	const downloadLabel = t("download_for_os", { os });
+	const showDownloadCta = !isDesktop && isDesktopViewport;
 
 	const handleLanguageChange = (newLocale: "en" | "es" | "pt" | "hi" | "zh") => {
 		setLocale(newLocale);
@@ -204,100 +208,140 @@ export function SidebarUserProfile({
 	// Collapsed view - just show avatar with dropdown
 	if (isCollapsed) {
 		return (
-			<div className="border-t px-1.5 py-2">
-				<Button
-					asChild
-					variant="ghost"
-					size="icon"
-					className="mx-auto mb-2 h-9 w-9 rounded-md bg-muted hover:bg-accent"
-				>
-					<a
-						href={downloadUrl}
-						target="_blank"
-						rel="noopener noreferrer"
-						aria-label={downloadLabel}
-						onClick={() =>
-							trackDesktopDownloadClicked({ os, placement: "sidebar_collapsed" })
-						}
-					>
-						<Download className="h-4 w-4" strokeWidth={2.5} />
-					</a>
-				</Button>
-				<DropdownMenu>
-					<DropdownMenuTrigger asChild>
-						<Button
-							type="button"
-							variant="ghost"
-							className={cn(
-								"mx-auto h-9 w-9 rounded-full p-0",
-								"transition-opacity hover:bg-transparent hover:opacity-90",
-								"focus:outline-none focus-visible:outline-none",
-								"data-[state=open]:opacity-90"
-							)}
-						>
-							<UserAvatar
-								avatarUrl={user.avatarUrl}
-								initials={initials}
-								bgColor={bgColor}
-								size="md"
-							/>
-							<span className="sr-only">{displayName}</span>
-						</Button>
-					</DropdownMenuTrigger>
-
-					<DropdownMenuContent className="w-48" side="right" align="end" sideOffset={8}>
-						<DropdownMenuLabel className="font-normal">
-							<div className="flex items-center gap-2">
-								<UserAvatar avatarUrl={user.avatarUrl} initials={initials} bgColor={bgColor} />
-								<div className="flex-1 min-w-0">
-									<p className="truncate text-sm font-medium">{displayName}</p>
-									<p className="truncate text-xs text-muted-foreground">{user.email}</p>
-								</div>
-							</div>
-						</DropdownMenuLabel>
-
-						<DropdownMenuSeparator />
-
-						<DropdownMenuItem onClick={onUserSettings}>
-							<UserCog className="h-4 w-4" />
-							{t("user_settings")}
-						</DropdownMenuItem>
-
-						{onAnnouncements && (
-							<DropdownMenuItem onClick={onAnnouncements}>
-								<Megaphone className="h-4 w-4" />
-								<span className="flex-1">What's New</span>
-								{announcementUnreadCount > 0 && (
-									<span className="inline-flex items-center justify-center min-w-4 h-4 px-1 rounded-full bg-red-500 text-white text-[10px] font-medium">
-										{formatAnnouncementCount(announcementUnreadCount)}
-									</span>
+			<div className="w-full border-t px-1.5 py-2">
+				<div className="flex flex-col items-center gap-2">
+					{showDownloadCta && (
+						<Tooltip>
+							<TooltipTrigger asChild>
+								<Button
+									asChild
+									variant="ghost"
+									size="icon"
+									className="h-10 w-10 rounded-lg bg-muted hover:bg-accent"
+								>
+									<a
+										href={downloadUrl}
+										target="_blank"
+										rel="noopener noreferrer"
+										aria-label={downloadLabel}
+										onClick={() =>
+											trackDesktopDownloadClicked({ os, placement: "sidebar_collapsed" })
+										}
+									>
+										<Download className="h-4 w-4" strokeWidth={2.5} />
+									</a>
+								</Button>
+							</TooltipTrigger>
+							<TooltipContent side="right" sideOffset={8}>
+								{downloadLabel}
+							</TooltipContent>
+						</Tooltip>
+					)}
+					<DropdownMenu>
+						<DropdownMenuTrigger asChild>
+							<Button
+								type="button"
+								variant="ghost"
+								className={cn(
+									"h-10 w-10 rounded-full p-0",
+									"transition-opacity hover:bg-transparent hover:opacity-90",
+									"focus:outline-none focus-visible:outline-none",
+									"data-[state=open]:opacity-90"
 								)}
-							</DropdownMenuItem>
-						)}
+							>
+								<UserAvatar
+									avatarUrl={user.avatarUrl}
+									initials={initials}
+									bgColor={bgColor}
+									size="md"
+								/>
+								<span className="sr-only">{displayName}</span>
+							</Button>
+						</DropdownMenuTrigger>
+
+						<DropdownMenuContent className="w-48" side="right" align="end" sideOffset={8}>
+							<DropdownMenuLabel className="font-normal">
+								<div className="flex items-center gap-2">
+									<UserAvatar avatarUrl={user.avatarUrl} initials={initials} bgColor={bgColor} />
+									<div className="flex-1 min-w-0">
+										<p className="truncate text-sm font-medium">{displayName}</p>
+										<p className="truncate text-xs text-muted-foreground">{user.email}</p>
+									</div>
+								</div>
+							</DropdownMenuLabel>
+
+							<DropdownMenuSeparator />
+
+							<DropdownMenuItem onClick={onUserSettings}>
+								<UserCog className="h-4 w-4" />
+								{t("user_settings")}
+							</DropdownMenuItem>
+
+							{onAnnouncements && (
+								<DropdownMenuItem onClick={onAnnouncements}>
+									<Megaphone className="h-4 w-4" />
+									<span className="flex-1">What's New</span>
+									{announcementUnreadCount > 0 && (
+										<span className="inline-flex items-center justify-center min-w-4 h-4 px-1 rounded-full bg-red-500 text-white text-[10px] font-medium">
+											{formatAnnouncementCount(announcementUnreadCount)}
+										</span>
+									)}
+								</DropdownMenuItem>
+							)}
+
+							{setTheme && (
+								<DropdownMenuSub>
+									<DropdownMenuSubTrigger>
+										<Sun className="h-4 w-4" />
+										{t("theme")}
+									</DropdownMenuSubTrigger>
+									<DropdownMenuPortal>
+										<DropdownMenuSubContent className="gap-1">
+											{THEMES.map((themeOption) => {
+												const Icon = themeOption.icon;
+												const isSelected = theme === themeOption.value;
+												return (
+													<DropdownMenuItem
+														key={themeOption.value}
+														onClick={() => handleThemeChange(themeOption.value)}
+														className={cn(
+															"mb-1 last:mb-0 transition-all",
+															"hover:bg-accent hover:text-accent-foreground",
+															isSelected && "text-primary"
+														)}
+													>
+														<Icon className="h-4 w-4" />
+														<span className="flex-1">{t(themeOption.value)}</span>
+														{isSelected && <Check className="h-4 w-4 shrink-0" />}
+													</DropdownMenuItem>
+												);
+											})}
+										</DropdownMenuSubContent>
+									</DropdownMenuPortal>
+								</DropdownMenuSub>
+							)}
 
-						{setTheme && (
 							<DropdownMenuSub>
 								<DropdownMenuSubTrigger>
-									<Sun className="h-4 w-4" />
-									{t("theme")}
+									<Languages className="h-4 w-4" />
+									{t("language")}
 								</DropdownMenuSubTrigger>
 								<DropdownMenuPortal>
 									<DropdownMenuSubContent className="gap-1">
-										{THEMES.map((themeOption) => {
-											const Icon = themeOption.icon;
-											const isSelected = theme === themeOption.value;
+										{LANGUAGES.map((language) => {
+											const isSelected = locale === language.code;
 											return (
 												<DropdownMenuItem
-													key={themeOption.value}
-													onClick={() => handleThemeChange(themeOption.value)}
+													key={language.code}
+													onClick={() => handleLanguageChange(language.code)}
 													className={cn(
 														"mb-1 last:mb-0 transition-all",
 														"hover:bg-accent hover:text-accent-foreground",
 														isSelected && "text-primary"
 													)}
 												>
-													<Icon className="h-4 w-4" />
-													<span className="flex-1">{t(themeOption.value)}</span>
+													<span className="mr-2">{language.flag}</span>
+													<span className="flex-1">{language.name}</span>
 													{isSelected && <Check className="h-4 w-4 shrink-0" />}
 												</DropdownMenuItem>
 											);
@@ -305,81 +349,52 @@ export function SidebarUserProfile({
 									</DropdownMenuSubContent>
 								</DropdownMenuPortal>
 							</DropdownMenuSub>
-						)}
 
-						<DropdownMenuSub>
-							<DropdownMenuSubTrigger>
-								<Languages className="h-4 w-4" />
-								{t("language")}
-							</DropdownMenuSubTrigger>
-							<DropdownMenuPortal>
-								<DropdownMenuSubContent className="gap-1">
-									{LANGUAGES.map((language) => {
-										const isSelected = locale === language.code;
-										return (
-											<DropdownMenuItem
-												key={language.code}
-												onClick={() => handleLanguageChange(language.code)}
-												className={cn(
-													"mb-1 last:mb-0 transition-all",
-													"hover:bg-accent hover:text-accent-foreground",
-													isSelected && "text-primary"
-												)}
-											>
-												<span className="mr-2">{language.flag}</span>
-												<span className="flex-1">{language.name}</span>
-												{isSelected && <Check className="h-4 w-4 shrink-0" />}
+							<DropdownMenuSub>
+								<DropdownMenuSubTrigger>
+									<Info className="h-4 w-4" />
+									{t("learn_more")}
+								</DropdownMenuSubTrigger>
+								<DropdownMenuPortal>
+									<DropdownMenuSubContent className="min-w-[180px] gap-1">
+										{LEARN_MORE_LINKS.map((link) => (
+											<DropdownMenuItem key={link.key} asChild>
+												<a href={link.href} target="_blank" rel="noopener noreferrer">
+													<span className="flex-1">{t(link.key)}</span>
+													<ExternalLink className="h-3.5 w-3.5 shrink-0 text-muted-foreground" />
+												</a>
 											</DropdownMenuItem>
-										);
-									})}
-								</DropdownMenuSubContent>
-							</DropdownMenuPortal>
-						</DropdownMenuSub>
+										))}
+										<DropdownMenuSeparator />
+										<p className="select-none px-2 py-1.5 text-xs text-muted-foreground/50">
+											v{APP_VERSION}
+										</p>
+									</DropdownMenuSubContent>
+								</DropdownMenuPortal>
+							</DropdownMenuSub>
 
-						<DropdownMenuSub>
-							<DropdownMenuSubTrigger>
-								<Info className="h-4 w-4" />
-								{t("learn_more")}
-							</DropdownMenuSubTrigger>
-							<DropdownMenuPortal>
-								<DropdownMenuSubContent className="min-w-[180px] gap-1">
-									{LEARN_MORE_LINKS.map((link) => (
-										<DropdownMenuItem key={link.key} asChild>
-											<a href={link.href} target="_blank" rel="noopener noreferrer">
-												<span className="flex-1">{t(link.key)}</span>
-												<ExternalLink className="h-3.5 w-3.5 shrink-0 text-muted-foreground" />
-											</a>
-										</DropdownMenuItem>
-									))}
-									<DropdownMenuSeparator />
-									<p className="select-none px-2 py-1.5 text-xs text-muted-foreground/50">
-										v{APP_VERSION}
-									</p>
-								</DropdownMenuSubContent>
-							</DropdownMenuPortal>
-						</DropdownMenuSub>
-
-						{!isDesktop && (
-							<DropdownMenuItem asChild className="font-medium">
-								<a href={downloadUrl} target="_blank" rel="noopener noreferrer">
-									<Download className="h-4 w-4" strokeWidth={2.5} />
-									{downloadLabel}
-								</a>
-							</DropdownMenuItem>
-						)}
-
-						<DropdownMenuSeparator />
-
-						<DropdownMenuItem onClick={handleLogout} disabled={isLoggingOut}>
-							{isLoggingOut ? (
-								<Spinner size="sm" className="mr-2" />
-							) : (
-								<LogOut className="h-4 w-4" />
+							{!isDesktop && (
+								<DropdownMenuItem asChild className="font-medium">
+									<a href={downloadUrl} target="_blank" rel="noopener noreferrer">
+										<Download className="h-4 w-4" strokeWidth={2.5} />
+										{downloadLabel}
+									</a>
+								</DropdownMenuItem>
 							)}
-							{isLoggingOut ? t("loggingOut") : t("logout")}
-						</DropdownMenuItem>
-					</DropdownMenuContent>
-				</DropdownMenu>
+
+							<DropdownMenuSeparator />
+
+							<DropdownMenuItem onClick={handleLogout} disabled={isLoggingOut}>
+								{isLoggingOut ? (
+									<Spinner size="sm" className="mr-2" />
+								) : (
+									<LogOut className="h-4 w-4" />
+								)}
+								{isLoggingOut ? t("loggingOut") : t("logout")}
+							</DropdownMenuItem>
+						</DropdownMenuContent>
+					</DropdownMenu>
+				</div>
 			</div>
 		);
 	}
@@ -387,21 +402,23 @@ export function SidebarUserProfile({
 	// Expanded view
 	return (
 		<div className="border-t">
-			<Button
-				asChild
-				variant="ghost"
-				className="mx-2 mt-2 mb-1 h-10 w-[calc(100%-1rem)] justify-start gap-2 rounded-md bg-muted px-3 text-sm font-semibold hover:bg-accent"
-			>
-				<a
-					href={downloadUrl}
-					target="_blank"
-					rel="noopener noreferrer"
-					onClick={() => trackDesktopDownloadClicked({ os, placement: "sidebar_expanded" })}
+			{showDownloadCta && (
+				<Button
+					asChild
+					variant="ghost"
+					className="mx-2 mt-2 mb-1 h-10 w-[calc(100%-1rem)] justify-start gap-2 rounded-md bg-muted px-3 text-sm font-semibold hover:bg-accent"
 				>
-					<Download className="h-4 w-4" strokeWidth={2.5} />
-					{downloadLabel}
-				</a>
-			</Button>
+					<a
+						href={downloadUrl}
+						target="_blank"
+						rel="noopener noreferrer"
+						onClick={() => trackDesktopDownloadClicked({ os, placement: "sidebar_expanded" })}
+					>
+						<Download className="h-4 w-4" strokeWidth={2.5} />
+						{downloadLabel}
+					</a>
+				</Button>
+			)}
 			<DropdownMenu>
 				<DropdownMenuTrigger asChild>
 					<Button
diff --git a/surfsense_web/components/ui/tooltip.tsx b/surfsense_web/components/ui/tooltip.tsx
index c1469156d..ef5dded61 100644
--- a/surfsense_web/components/ui/tooltip.tsx
+++ b/surfsense_web/components/ui/tooltip.tsx
@@ -71,7 +71,7 @@ function TooltipContent({
 				data-slot="tooltip-content"
 				sideOffset={sideOffset}
 				className={cn(
-					"bg-black text-white font-medium shadow-xl px-3 py-1.5 dark:bg-zinc-800 dark:text-zinc-50 border-none animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-fit rounded-md text-xs text-pretty pointer-events-none select-none",
+					"bg-neutral-800 text-white font-medium shadow-xl px-3 py-1.5 dark:bg-neutral-800 dark:text-white border-none animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-fit rounded-md text-xs text-pretty pointer-events-none select-none",
 					className
 				)}
 				{...props}

From c1804173294c6754b9a976c5e8118c89a1a3709e Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Thu, 14 May 2026 23:28:41 +0530
Subject: [PATCH 54/96] refactor: enhance loading and sidebar components with
 improved skeleton loading states and styling

---
 .../[search_space_id]/new-chat/loading.tsx    | 85 +++++++++++--------
 .../components/layout/ui/sidebar/Sidebar.tsx  | 41 ++++-----
 2 files changed, 72 insertions(+), 54 deletions(-)

diff --git a/surfsense_web/app/dashboard/[search_space_id]/new-chat/loading.tsx b/surfsense_web/app/dashboard/[search_space_id]/new-chat/loading.tsx
index 6eb9223ca..e18100e6a 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/new-chat/loading.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/new-chat/loading.tsx
@@ -2,42 +2,59 @@ import { Skeleton } from "@/components/ui/skeleton";
 
 export default function Loading() {
 	return (
-		<div className="flex h-full flex-col bg-main-panel px-4">
-			<div className="mx-auto w-full max-w-[44rem] flex flex-1 flex-col gap-6 py-8">
-				{/* User message */}
-				<div className="flex justify-end">
-					<Skeleton className="h-12 w-56 rounded-2xl" />
+		<div
+			className="aui-root aui-thread-root @container flex h-full min-h-0 flex-col bg-main-panel"
+			style={{
+				["--thread-max-width" as string]: "44rem",
+			}}
+		>
+			<div
+				className="aui-thread-viewport relative flex flex-1 min-h-0 flex-col overflow-y-auto px-4 scroll-smooth"
+				style={{ scrollbarGutter: "stable" }}
+			>
+				<div
+					aria-hidden
+					className="aui-chat-viewport-top-fade pointer-events-none sticky top-0 z-10 -mx-4 h-2 shrink-0 bg-gradient-to-b from-main-panel from-20% to-transparent"
+				/>
+				<div className="mx-auto w-full max-w-(--thread-max-width) flex flex-1 flex-col gap-6 py-8">
+					{/* User message */}
+					<div className="flex justify-end">
+						<Skeleton className="h-12 w-56 rounded-2xl" />
+					</div>
+
+					{/* Assistant message */}
+					<div className="flex flex-col gap-2">
+						<Skeleton className="h-4 w-full" />
+						<Skeleton className="h-4 w-[85%]" />
+						<Skeleton className="h-18 w-[40%]" />
+					</div>
+
+					{/* User message */}
+					<div className="flex gap-2 justify-end">
+						<Skeleton className="h-12 w-72 rounded-2xl" />
+					</div>
+
+					{/* Assistant message */}
+					<div className="flex flex-col gap-2">
+						<Skeleton className="h-10 w-[30%]" />
+						<Skeleton className="h-4 w-[90%]" />
+						<Skeleton className="h-6 w-[60%]" />
+					</div>
+
+					{/* User message */}
+					<div className="flex gap-2 justify-end">
+						<Skeleton className="h-12 w-96 rounded-2xl" />
+					</div>
 				</div>
 
-				{/* Assistant message */}
-				<div className="flex flex-col gap-2">
-					<Skeleton className="h-4 w-full" />
-					<Skeleton className="h-4 w-[85%]" />
-					<Skeleton className="h-18 w-[40%]" />
-				</div>
-
-				{/* User message */}
-				<div className="flex gap-2 justify-end">
-					<Skeleton className="h-12 w-72 rounded-2xl" />
-				</div>
-
-				{/* Assistant message */}
-				<div className="flex flex-col gap-2">
-					<Skeleton className="h-10 w-[30%]" />
-					<Skeleton className="h-4 w-[90%]" />
-					<Skeleton className="h-6 w-[60%]" />
-				</div>
-
-				{/* User message */}
-				<div className="flex gap-2 justify-end">
-					<Skeleton className="h-12 w-96 rounded-2xl" />
-				</div>
-			</div>
-
-			{/* Input bar */}
-			<div className="sticky bottom-0 pb-6 bg-main-panel">
-				<div className="mx-auto w-full max-w-[44rem]">
-					<Skeleton className="h-24 w-full rounded-2xl" />
+				{/* Input bar */}
+				<div
+					className="aui-chat-composer-footer sticky bottom-0 z-20 -mx-4 mt-auto flex flex-col items-stretch bg-gradient-to-t from-main-panel from-60% to-transparent px-4 pt-6"
+					style={{ paddingBottom: "max(0.5rem, env(safe-area-inset-bottom))" }}
+				>
+					<div className="aui-chat-composer-area relative mx-auto flex w-full max-w-(--thread-max-width) flex-col gap-3 overflow-visible">
+						<Skeleton className="h-28 w-full rounded-3xl" />
+					</div>
 				</div>
 			</div>
 		</div>
diff --git a/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx b/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
index 7cc65d2b8..a55909ab2 100644
--- a/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
@@ -23,11 +23,24 @@ import { SidebarHeader } from "./SidebarHeader";
 import { SidebarSection } from "./SidebarSection";
 import { SidebarUserProfile } from "./SidebarUserProfile";
 
-function ChatListItemSkeleton() {
+const CHAT_LIST_SKELETON_WIDTHS = ["w-[78%]", "w-[64%]", "w-[86%]", "w-[58%]", "w-[72%]"];
+
+function ChatListItemSkeleton({ widthClass }: { widthClass: string }) {
 	return (
-		<div className="flex w-full items-center gap-2 rounded-md p-2">
-			<Skeleton className="h-4 w-4 shrink-0 rounded" />
-			<Skeleton className="h-4 w-full max-w-[180px]" />
+		<div className="group/item relative w-full">
+			<div className="flex h-[32px] w-full items-center rounded-md px-2 py-1.5">
+				<Skeleton className={cn("h-4 rounded", widthClass)} />
+			</div>
+		</div>
+	);
+}
+
+function ChatListSkeletonRows() {
+	return (
+		<div className="flex flex-col gap-0.5">
+			{CHAT_LIST_SKELETON_WIDTHS.map((widthClass) => (
+				<ChatListItemSkeleton key={widthClass} widthClass={widthClass} />
+			))}
 		</div>
 	);
 }
@@ -217,13 +230,7 @@ export function Sidebar({
 						}
 					>
 						{isLoadingChats ? (
-							<div className="flex flex-col gap-0.5">
-								<ChatListItemSkeleton />
-								<ChatListItemSkeleton />
-								<ChatListItemSkeleton />
-								<ChatListItemSkeleton />
-								<ChatListItemSkeleton />
-							</div>
+							<ChatListSkeletonRows />
 						) : sharedChats.length > 0 ? (
 							<div className="relative min-h-0 flex-1">
 								<div
@@ -250,7 +257,7 @@ export function Sidebar({
 								)}
 							</div>
 						) : (
-							<p className="px-2 py-1 text-sm text-muted-foreground">{t("no_shared_chats")}</p>
+							<p className="px-2 py-1 text-sm text-muted-foreground/60">{t("no_shared_chats")}</p>
 						)}
 					</SidebarSection>
 
@@ -274,13 +281,7 @@ export function Sidebar({
 						}
 					>
 						{isLoadingChats ? (
-							<div className="flex flex-col gap-0.5">
-								<ChatListItemSkeleton />
-								<ChatListItemSkeleton />
-								<ChatListItemSkeleton />
-								<ChatListItemSkeleton />
-								<ChatListItemSkeleton />
-							</div>
+							<ChatListSkeletonRows />
 						) : chats.length > 0 ? (
 							<div className="relative flex-1 min-h-0">
 								<div
@@ -307,7 +308,7 @@ export function Sidebar({
 								)}
 							</div>
 						) : (
-							<p className="px-2 py-1 text-sm text-muted-foreground">{t("no_chats")}</p>
+							<p className="px-2 py-1 text-sm text-muted-foreground/60">{t("no_chats")}</p>
 						)}
 					</SidebarSection>
 				</div>

From 3846056bc75157df74141c838ba7c3d4144c88e6 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Fri, 15 May 2026 00:25:58 +0530
Subject: [PATCH 55/96] refactor: update icons and improve sidebar styling for
 enhanced user experience

---
 .../providers/FreeLayoutDataProvider.tsx      |  4 ++--
 .../layout/providers/LayoutDataProvider.tsx   |  4 ++--
 .../layout/ui/icon-rail/SearchSpaceAvatar.tsx |  8 +++----
 .../layout/ui/sidebar/InboxSidebar.tsx        |  5 ++++-
 .../layout/ui/sidebar/MobileSidebar.tsx       |  4 ++--
 .../components/layout/ui/sidebar/Sidebar.tsx  | 21 ++++++++++++++++---
 6 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/surfsense_web/components/layout/providers/FreeLayoutDataProvider.tsx b/surfsense_web/components/layout/providers/FreeLayoutDataProvider.tsx
index 68ee552f8..1c5d7af6e 100644
--- a/surfsense_web/components/layout/providers/FreeLayoutDataProvider.tsx
+++ b/surfsense_web/components/layout/providers/FreeLayoutDataProvider.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { Inbox, SquareLibrary } from "lucide-react";
+import { Inbox, LibraryBig } from "lucide-react";
 import { useRouter } from "next/navigation";
 import type { ReactNode } from "react";
 import { Fragment, useCallback, useEffect, useMemo, useState } from "react";
@@ -69,7 +69,7 @@ export function FreeLayoutDataProvider({ children }: FreeLayoutDataProviderProps
 						? {
 								title: "Documents",
 								url: "#documents",
-								icon: SquareLibrary,
+								icon: LibraryBig,
 								isActive: false,
 							}
 						: null,
diff --git a/surfsense_web/components/layout/providers/LayoutDataProvider.tsx b/surfsense_web/components/layout/providers/LayoutDataProvider.tsx
index c125ff0eb..6884da7c7 100644
--- a/surfsense_web/components/layout/providers/LayoutDataProvider.tsx
+++ b/surfsense_web/components/layout/providers/LayoutDataProvider.tsx
@@ -2,7 +2,7 @@
 
 import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { useAtom, useAtomValue, useSetAtom } from "jotai";
-import { AlertTriangle, Inbox, SquareLibrary } from "lucide-react";
+import { AlertTriangle, Inbox, LibraryBig } from "lucide-react";
 import { useParams, usePathname, useRouter } from "next/navigation";
 import { useTranslations } from "next-intl";
 import { useTheme } from "next-themes";
@@ -361,7 +361,7 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 						? {
 								title: "Documents",
 								url: "#documents",
-								icon: SquareLibrary,
+								icon: LibraryBig,
 								isActive: isDocumentsSidebarOpen,
 							}
 						: null,
diff --git a/surfsense_web/components/layout/ui/icon-rail/SearchSpaceAvatar.tsx b/surfsense_web/components/layout/ui/icon-rail/SearchSpaceAvatar.tsx
index 28fb235fe..944536c8f 100644
--- a/surfsense_web/components/layout/ui/icon-rail/SearchSpaceAvatar.tsx
+++ b/surfsense_web/components/layout/ui/icon-rail/SearchSpaceAvatar.tsx
@@ -128,9 +128,9 @@ export function SearchSpaceAvatar({
 			onClick={onClick}
 			className={cn(
 				"relative rounded-lg font-semibold text-white transition-all select-none",
-				"hover:opacity-90 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring",
+				"hover:text-white hover:opacity-90 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring",
 				sizeClasses,
-				isActive && "ring-2 ring-primary ring-offset-1 ring-offset-background"
+				isActive && "ring-2 ring-primary ring-offset-1 ring-offset-rail"
 			)}
 			style={{ backgroundColor: bgColor }}
 		>
@@ -139,12 +139,12 @@ export function SearchSpaceAvatar({
 			{isShared && (
 				<span
 					className={cn(
-						"absolute -top-1 -right-1 flex items-center justify-center rounded-full bg-blue-500 text-white shadow-sm",
+						"absolute -top-1 -right-1 flex items-center justify-center rounded-full bg-gray-800 text-white shadow-sm",
 						size === "sm" ? "h-3.5 w-3.5" : "h-4 w-4"
 					)}
 					title={tCommon("shared")}
 				>
-					<Users className={cn(size === "sm" ? "h-2 w-2" : "h-2.5 w-2.5")} />
+					<Users className={cn(size === "sm" ? "size-2" : "size-2.5")} />
 				</span>
 			)}
 		</Button>
diff --git a/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx
index 06c074800..83f4f26f1 100644
--- a/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx
@@ -561,7 +561,10 @@ export function InboxSidebarContent({
 									onOpenChange={setFilterDrawerOpen}
 									shouldScaleBackground={false}
 								>
-									<DrawerContent className="max-h-[70vh] z-80" overlayClassName="z-80">
+									<DrawerContent
+										className="max-h-[70vh] z-80 bg-popover text-popover-foreground"
+										overlayClassName="z-80"
+									>
 										<DrawerHandle />
 										<DrawerHeader className="px-4 pb-3 pt-2">
 											<DrawerTitle className="flex items-center gap-2 text-base font-semibold">
diff --git a/surfsense_web/components/layout/ui/sidebar/MobileSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/MobileSidebar.tsx
index f69b0223d..12809ec22 100644
--- a/surfsense_web/components/layout/ui/sidebar/MobileSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/MobileSidebar.tsx
@@ -108,11 +108,11 @@ export function MobileSidebar({
 
 	return (
 		<Sheet open={isOpen} onOpenChange={onOpenChange}>
-			<SheetContent side="left" className="w-[340px] p-0 flex flex-row gap-0 [&>button]:hidden">
+			<SheetContent side="left" className="w-[340px] p-0 flex flex-row gap-0 bg-panel [&>button]:hidden">
 				<SheetTitle className="sr-only">Navigation</SheetTitle>
 
 				{/* Vertical Search Spaces Rail - left side */}
-				<div className="flex h-full w-14 shrink-0 flex-col items-center bg-muted/40 border-r">
+				<div className="flex h-full w-14 shrink-0 flex-col items-center border-r bg-rail">
 					<ScrollArea className="w-full flex-1">
 						<div className="flex flex-col items-center gap-2 px-1.5 py-3">
 							{searchSpaces.map((space) => (
diff --git a/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx b/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
index a55909ab2..540a3dcc1 100644
--- a/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
@@ -134,11 +134,16 @@ export function Sidebar({
 	const t = useTranslations("sidebar");
 	const [openDropdownChatId, setOpenDropdownChatId] = useState<number | null>(null);
 
-	// Inbox is rendered explicitly right below New Chat. Pull it out of the
-	// nav items list so it doesn't also appear in the bottom NavSection.
+	// Inbox and Documents are rendered explicitly right below New Chat. Pull
+	// them out of the nav items list so they don't also appear in the bottom
+	// NavSection. Documents is only present in navItems on mobile.
 	const inboxItem = useMemo(() => navItems.find((item) => item.url === "#inbox"), [navItems]);
+	const documentsItem = useMemo(
+		() => navItems.find((item) => item.url === "#documents"),
+		[navItems]
+	);
 	const footerNavItems = useMemo(
-		() => navItems.filter((item) => item.url !== "#inbox"),
+		() => navItems.filter((item) => item.url !== "#inbox" && item.url !== "#documents"),
 		[navItems]
 	);
 
@@ -202,6 +207,16 @@ export function Sidebar({
 						}
 					/>
 				)}
+				{documentsItem && (
+					<SidebarButton
+						icon={documentsItem.icon}
+						label={documentsItem.title}
+						onClick={() => onNavItemClick?.(documentsItem)}
+						isCollapsed={isCollapsed}
+						isActive={documentsItem.isActive}
+						tooltipContent={isCollapsed ? documentsItem.title : undefined}
+					/>
+				)}
 			</div>
 
 			{/* Chat sections - fills available space */}

From 56239548c8194ea912c2a490d8404268783718e2 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Fri, 15 May 2026 00:47:21 +0530
Subject: [PATCH 56/96] refactor: replace Activity icons with Workflow icons
 across various components for consistency

---
 .../[search_space_id]/logs/(manage)/page.tsx       |  5 ++---
 .../agent-action-log/action-log-button.tsx         |  4 ++--
 .../agent-action-log/action-log-sheet.tsx          |  4 ++--
 .../components/new-chat/model-selector.tsx         |  2 +-
 .../components/settings/user-settings-dialog.tsx   |  4 ++--
 .../components/sources/DocumentUploadTab.tsx       | 14 +++++---------
 6 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/surfsense_web/app/dashboard/[search_space_id]/logs/(manage)/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/logs/(manage)/page.tsx
index 3e1d42eb0..dea1e16c2 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/logs/(manage)/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/logs/(manage)/page.tsx
@@ -17,7 +17,6 @@ import {
 } from "@tanstack/react-table";
 import { useAtomValue } from "jotai";
 import {
-	Activity,
 	AlertCircle,
 	AlertTriangle,
 	Bug,
@@ -38,6 +37,7 @@ import {
 	RefreshCw,
 	Terminal,
 	Trash,
+	Workflow,
 	X,
 	Zap,
 } from "lucide-react";
@@ -133,7 +133,6 @@ const logStatusConfig = {
 function MessageDetails({
 	message,
 	taskName,
-	metadata,
 	createdAt,
 	children,
 }: {
@@ -623,7 +622,7 @@ function LogsSummaryDashboard({
 				<Card>
 					<CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
 						<CardTitle className="text-sm font-medium">{t("total_logs")}</CardTitle>
-						<Activity className="h-4 w-4 text-muted-foreground" />
+						<Workflow className="h-4 w-4 text-muted-foreground" />
 					</CardHeader>
 					<CardContent>
 						<div className="text-2xl font-bold">{summary.total_logs}</div>
diff --git a/surfsense_web/components/agent-action-log/action-log-button.tsx b/surfsense_web/components/agent-action-log/action-log-button.tsx
index 1c0383136..358acc8e7 100644
--- a/surfsense_web/components/agent-action-log/action-log-button.tsx
+++ b/surfsense_web/components/agent-action-log/action-log-button.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { useAtomValue, useSetAtom } from "jotai";
-import { Activity } from "lucide-react";
+import { Workflow } from "lucide-react";
 import { useCallback } from "react";
 import { openActionLogSheetAtom } from "@/atoms/agent/action-log-sheet.atom";
 import { agentFlagsAtom } from "@/atoms/agent/agent-flags-query.atom";
@@ -41,7 +41,7 @@ export function ActionLogButton({ threadId }: ActionLogButtonProps) {
 					aria-label="Open agent action log"
 					onClick={handleClick}
 				>
-					<Activity className="size-4" />
+					<Workflow className="size-4 text-muted-foreground" />
 				</Button>
 			</TooltipTrigger>
 			<TooltipContent>Agent actions</TooltipContent>
diff --git a/surfsense_web/components/agent-action-log/action-log-sheet.tsx b/surfsense_web/components/agent-action-log/action-log-sheet.tsx
index fdb0bb7a9..1ce5dd20c 100644
--- a/surfsense_web/components/agent-action-log/action-log-sheet.tsx
+++ b/surfsense_web/components/agent-action-log/action-log-sheet.tsx
@@ -2,7 +2,7 @@
 
 import { useQueryClient } from "@tanstack/react-query";
 import { useAtom, useAtomValue } from "jotai";
-import { Activity, RefreshCcw } from "lucide-react";
+import { RefreshCcw, Workflow, } from "lucide-react";
 import { useCallback } from "react";
 import { actionLogSheetAtom } from "@/atoms/agent/action-log-sheet.atom";
 import { agentFlagsAtom } from "@/atoms/agent/agent-flags-query.atom";
@@ -36,7 +36,7 @@ function DisabledState() {
 	return (
 		<div className="flex flex-1 flex-col items-center justify-center gap-4 px-6 pb-12 text-center">
 			<div className="flex size-12 items-center justify-center rounded-full border border-popover-border bg-muted/40">
-				<Activity className="size-5 text-muted-foreground" strokeWidth={1.75} />
+				<Workflow className="size-5 text-muted-foreground" strokeWidth={1.75} />
 			</div>
 			<div className="flex max-w-[280px] flex-col gap-1.5">
 				<p className="text-sm font-semibold tracking-tight">Action log is disabled</p>
diff --git a/surfsense_web/components/new-chat/model-selector.tsx b/surfsense_web/components/new-chat/model-selector.tsx
index 6f7c946f0..0a096f5f8 100644
--- a/surfsense_web/components/new-chat/model-selector.tsx
+++ b/surfsense_web/components/new-chat/model-selector.tsx
@@ -1356,7 +1356,7 @@ export function ModelSelector({
 			role="combobox"
 			aria-expanded={open}
 			className={cn(
-				"h-8 gap-2 px-3 text-sm bg-muted hover:bg-accent hover:text-accent-foreground border-0 select-none",
+				"h-8 gap-2 px-3 text-sm bg-muted shadow-xs hover:bg-accent hover:text-accent-foreground border-0 select-none",
 				className
 			)}
 		>
diff --git a/surfsense_web/components/settings/user-settings-dialog.tsx b/surfsense_web/components/settings/user-settings-dialog.tsx
index a04ce16dd..81dfc68f1 100644
--- a/surfsense_web/components/settings/user-settings-dialog.tsx
+++ b/surfsense_web/components/settings/user-settings-dialog.tsx
@@ -2,7 +2,6 @@
 
 import { useAtom } from "jotai";
 import {
-	Activity,
 	Brain,
 	CircleUser,
 	Globe,
@@ -12,6 +11,7 @@ import {
 	ReceiptText,
 	ShieldCheck,
 	Sparkles,
+	Workflow,
 } from "lucide-react";
 import dynamic from "next/dynamic";
 import { useTranslations } from "next-intl";
@@ -127,7 +127,7 @@ export function UserSettingsDialog() {
 			{
 				value: "agent-status",
 				label: "Agent Status",
-				icon: <Activity className="h-4 w-4" />,
+				icon: <Workflow className="h-4 w-4" />,
 			},
 			{
 				value: "purchases",
diff --git a/surfsense_web/components/sources/DocumentUploadTab.tsx b/surfsense_web/components/sources/DocumentUploadTab.tsx
index a9aec21a1..842816551 100644
--- a/surfsense_web/components/sources/DocumentUploadTab.tsx
+++ b/surfsense_web/components/sources/DocumentUploadTab.tsx
@@ -7,7 +7,6 @@ import {
 	Dot,
 	File as FileIcon,
 	FolderOpen,
-	Upload,
 	X,
 	Zap,
 } from "lucide-react";
@@ -537,7 +536,9 @@ export function DocumentUploadTab({
 			<div className="sm:hidden">
 				{hasContent ? (
 					isElectron ? (
-						<div className="w-full">{renderBrowseButton({ compact: true, fullWidth: true })}</div>
+						<div className="flex w-full justify-center">
+							{renderBrowseButton({ compact: true })}
+						</div>
 					) : (
 						<Button
 							type="button"
@@ -552,7 +553,6 @@ export function DocumentUploadTab({
 					<div className="flex w-full flex-col items-center gap-4 bg-transparent px-4 py-12 select-none">
 						{isElectron ? (
 							<div className="flex w-full flex-col items-center gap-4">
-								<Upload className="h-10 w-10 text-muted-foreground" />
 								<div className="text-center space-y-1.5">
 									<p className="text-base font-medium">{t("select_files_or_folder")}</p>
 									<p className="text-sm text-muted-foreground">{t("file_size_limit")}</p>
@@ -565,7 +565,6 @@ export function DocumentUploadTab({
 								className="h-auto w-full flex-col gap-4 whitespace-normal bg-transparent p-0 text-foreground hover:bg-transparent hover:text-foreground"
 								onClick={() => fileInputRef.current?.click()}
 							>
-								<Upload className="h-10 w-10 text-muted-foreground" />
 								<div className="text-center space-y-1.5">
 									<p className="text-base font-medium">{t("tap_select_files_or_folder")}</p>
 									<p className="text-sm text-muted-foreground">{t("file_size_limit")}</p>
@@ -573,11 +572,11 @@ export function DocumentUploadTab({
 							</Button>
 						)}
 						<fieldset
-							className="w-full mt-1 border-none p-0 m-0"
+							className="mt-1 flex w-full justify-center border-none p-0 m-0"
 							onClick={(e) => e.stopPropagation()}
 							onKeyDown={(e) => e.stopPropagation()}
 						>
-							{renderBrowseButton({ fullWidth: true })}
+							{renderBrowseButton()}
 						</fieldset>
 					</div>
 				)}
@@ -590,7 +589,6 @@ export function DocumentUploadTab({
 			>
 				{hasContent ? (
 					<div className="flex items-center gap-3">
-						<Upload className="h-4 w-4 text-muted-foreground shrink-0" />
 						<span className="text-xs text-muted-foreground flex-1 truncate">
 							{isDragActive ? t("drop_files") : t("drag_drop_more")}
 						</span>
@@ -600,12 +598,10 @@ export function DocumentUploadTab({
 					<div className="relative">
 						{isDragActive && (
 							<div className="absolute inset-0 flex flex-col items-center justify-center gap-2">
-								<Upload className="h-8 w-8 text-primary" />
 								<p className="text-sm font-medium text-primary">{t("drop_files")}</p>
 							</div>
 						)}
 						<div className={`flex flex-col items-center gap-2 ${isDragActive ? "invisible" : ""}`}>
-							<Upload className="h-8 w-8 text-muted-foreground" />
 							<p className="text-sm font-medium">{t("drag_drop")}</p>
 							<p className="text-xs text-muted-foreground">{t("file_size_limit")}</p>
 							<div className="mt-1">{renderBrowseButton()}</div>

From ea087d1d23d9dbe9f5c17709a1c690f1fe600c19 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Fri, 15 May 2026 02:00:17 +0530
Subject: [PATCH 57/96] refactor: implement CitationHoverPopover component to
 enhance inline citation functionality and improve user interaction

---
 .../assistant-ui/inline-citation.tsx          | 159 ++++++--------
 .../citation/citation-hover-popover.tsx       | 142 ++++++++++++
 .../components/tool-ui/citation/citation.tsx  | 202 ++++++++----------
 3 files changed, 293 insertions(+), 210 deletions(-)
 create mode 100644 surfsense_web/components/tool-ui/citation/citation-hover-popover.tsx

diff --git a/surfsense_web/components/assistant-ui/inline-citation.tsx b/surfsense_web/components/assistant-ui/inline-citation.tsx
index abb89d5da..a9f9cc076 100644
--- a/surfsense_web/components/assistant-ui/inline-citation.tsx
+++ b/surfsense_web/components/assistant-ui/inline-citation.tsx
@@ -5,12 +5,11 @@ import { useSetAtom } from "jotai";
 import { ExternalLink, FileText } from "lucide-react";
 import dynamic from "next/dynamic";
 import type { FC } from "react";
-import { useCallback, useEffect, useRef, useState } from "react";
 import { openCitationPanelAtom } from "@/atoms/citation/citation-panel.atom";
 import { useCitationMetadata } from "@/components/assistant-ui/citation-metadata-context";
 import { Citation } from "@/components/tool-ui/citation";
+import { CitationHoverPopover } from "@/components/tool-ui/citation/citation-hover-popover";
 import { Button } from "@/components/ui/button";
-import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
 import { Spinner } from "@/components/ui/spinner";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { documentsApiService } from "@/lib/apis/documents-api.service";
@@ -31,8 +30,6 @@ interface InlineCitationProps {
 	isDocsChunk?: boolean;
 }
 
-const POPOVER_HOVER_CLOSE_DELAY_MS = 150;
-
 /**
  * Inline citation badge for knowledge-base chunks (numeric chunk IDs) and
  * Surfsense documentation chunks (`isDocsChunk`). Negative chunk IDs render as
@@ -91,108 +88,80 @@ const NumericChunkCitation: FC<{ chunkId: number }> = ({ chunkId }) => {
 };
 
 const SurfsenseDocCitation: FC<{ chunkId: number }> = ({ chunkId }) => {
-	const [open, setOpen] = useState(false);
-	const closeTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
-
-	const cancelClose = useCallback(() => {
-		if (closeTimerRef.current) {
-			clearTimeout(closeTimerRef.current);
-			closeTimerRef.current = null;
-		}
-	}, []);
-
-	const scheduleClose = useCallback(() => {
-		cancelClose();
-		closeTimerRef.current = setTimeout(() => {
-			setOpen(false);
-			closeTimerRef.current = null;
-		}, POPOVER_HOVER_CLOSE_DELAY_MS);
-	}, [cancelClose]);
-
-	useEffect(() => () => cancelClose(), [cancelClose]);
+	return (
+		<CitationHoverPopover
+			id={`doc-${chunkId}`}
+			contentClassName="w-96 max-w-[calc(100vw-2rem)] p-0"
+			align="start"
+			trigger={(hoverProps) => (
+				<Button
+					type="button"
+					variant="ghost"
+					className="ml-0.5 h-5 min-w-5 cursor-pointer gap-0.5 rounded-md bg-primary/10 px-1.5 text-[11px] font-medium text-primary align-baseline shadow-sm transition-colors hover:bg-primary/15 focus-visible:ring-ring focus-visible:ring-2 focus-visible:outline-none"
+					aria-label={`Show Surfsense documentation chunk ${chunkId}`}
+					title="Surfsense documentation"
+					{...hoverProps}
+				>
+					<FileText className="size-3" />
+					doc
+				</Button>
+			)}
+		>
+			<SurfsenseDocPreview chunkId={chunkId} />
+		</CitationHoverPopover>
+	);
+};
 
+const SurfsenseDocPreview: FC<{ chunkId: number }> = ({ chunkId }) => {
 	const { data, isLoading, error } = useQuery({
 		queryKey: cacheKeys.documents.byChunk(`doc-${chunkId}`),
 		queryFn: () => documentsApiService.getSurfsenseDocByChunk(chunkId),
-		enabled: open,
 		staleTime: 5 * 60 * 1000,
 	});
 
 	const citedChunk = data?.chunks.find((c) => c.id === chunkId) ?? data?.chunks[0];
 
 	return (
-		<Popover open={open} onOpenChange={setOpen}>
-			<PopoverTrigger asChild>
-				<Button
-					type="button"
-					variant="ghost"
-					onClick={() => setOpen((prev) => !prev)}
-					onMouseEnter={() => {
-						cancelClose();
-						setOpen(true);
-					}}
-					onMouseLeave={scheduleClose}
-					onFocus={() => {
-						cancelClose();
-						setOpen(true);
-					}}
-					onBlur={scheduleClose}
-					className="ml-0.5 h-5 min-w-5 cursor-pointer gap-0.5 rounded-md bg-primary/10 px-1.5 text-[11px] font-medium text-primary align-baseline shadow-sm transition-colors hover:bg-primary/15 focus-visible:ring-ring focus-visible:ring-2 focus-visible:outline-none"
-					aria-label={`Show Surfsense documentation chunk ${chunkId}`}
-					title="Surfsense documentation"
-				>
-					<FileText className="size-3" />
-					doc
-				</Button>
-			</PopoverTrigger>
-			<PopoverContent
-				className="w-96 max-w-[calc(100vw-2rem)] p-0"
-				align="start"
-				sideOffset={6}
-				onMouseEnter={cancelClose}
-				onMouseLeave={scheduleClose}
-				onOpenAutoFocus={(e) => e.preventDefault()}
-			>
-				<div className="flex items-center justify-between gap-2 border-b px-3 py-2">
-					<div className="min-w-0">
-						<p className="truncate text-sm font-medium">
-							{data?.title ?? "Surfsense documentation"}
-						</p>
-						<p className="text-[11px] text-muted-foreground">Chunk #{chunkId}</p>
+		<>
+			<div className="flex items-center justify-between gap-2 border-b px-3 py-2">
+				<div className="min-w-0">
+					<p className="truncate text-sm font-medium">
+						{data?.title ?? "Surfsense documentation"}
+					</p>
+					<p className="text-[11px] text-muted-foreground">Chunk #{chunkId}</p>
+				</div>
+				{data?.source && (
+					<a
+						href={data.source}
+						target="_blank"
+						rel="noopener noreferrer"
+						className="inline-flex shrink-0 items-center gap-1 rounded-md px-2 py-1 text-[11px] font-medium text-primary hover:bg-primary/10"
+					>
+						<ExternalLink className="size-3" />
+						Open
+					</a>
+				)}
+			</div>
+			<div className="max-h-72 overflow-auto px-3 py-2 text-sm">
+				{isLoading && (
+					<div className="flex items-center gap-2 py-4 text-muted-foreground">
+						<Spinner size="xs" />
+						<span className="text-xs">Loading…</span>
 					</div>
-					{data?.source && (
-						<a
-							href={data.source}
-							target="_blank"
-							rel="noopener noreferrer"
-							className="inline-flex shrink-0 items-center gap-1 rounded-md px-2 py-1 text-[11px] font-medium text-primary hover:bg-primary/10"
-						>
-							<ExternalLink className="size-3" />
-							Open
-						</a>
-					)}
-				</div>
-				<div className="max-h-72 overflow-auto px-3 py-2 text-sm">
-					{isLoading && (
-						<div className="flex items-center gap-2 py-4 text-muted-foreground">
-							<Spinner size="xs" />
-							<span className="text-xs">Loading…</span>
-						</div>
-					)}
-					{error && (
-						<p className="py-4 text-xs text-destructive">
-							{error instanceof Error ? error.message : "Failed to load chunk"}
-						</p>
-					)}
-					{!isLoading && !error && citedChunk?.content && (
-						<MarkdownViewer content={citedChunk.content} maxLength={1500} enableCitations />
-					)}
-					{!isLoading && !error && !citedChunk?.content && (
-						<p className="py-4 text-xs text-muted-foreground">No content available.</p>
-					)}
-				</div>
-			</PopoverContent>
-		</Popover>
+				)}
+				{error && (
+					<p className="py-4 text-xs text-destructive">
+						{error instanceof Error ? error.message : "Failed to load chunk"}
+					</p>
+				)}
+				{!isLoading && !error && citedChunk?.content && (
+					<MarkdownViewer content={citedChunk.content} maxLength={1500} enableCitations />
+				)}
+				{!isLoading && !error && !citedChunk?.content && (
+					<p className="py-4 text-xs text-muted-foreground">No content available.</p>
+				)}
+			</div>
+		</>
 	);
 };
 
diff --git a/surfsense_web/components/tool-ui/citation/citation-hover-popover.tsx b/surfsense_web/components/tool-ui/citation/citation-hover-popover.tsx
new file mode 100644
index 000000000..0ea1cf54d
--- /dev/null
+++ b/surfsense_web/components/tool-ui/citation/citation-hover-popover.tsx
@@ -0,0 +1,142 @@
+"use client";
+
+import type { ComponentProps, HTMLAttributes, ReactElement, ReactNode } from "react";
+import { useCallback, useEffect, useRef, useSyncExternalStore } from "react";
+import { Popover, PopoverContent, PopoverTrigger } from "./_adapter";
+
+type PopoverContentProps = ComponentProps<typeof PopoverContent>;
+
+export type CitationHoverTriggerProps = Pick<
+	HTMLAttributes<HTMLElement>,
+	"onBlur" | "onFocus" | "onPointerEnter" | "onPointerLeave"
+>;
+
+interface CitationHoverPopoverProps {
+	id: string;
+	trigger: (props: CitationHoverTriggerProps) => ReactElement;
+	children: ReactNode;
+	contentClassName?: string;
+	side?: PopoverContentProps["side"];
+	align?: PopoverContentProps["align"];
+	sideOffset?: PopoverContentProps["sideOffset"];
+	onContentClick?: PopoverContentProps["onClick"];
+}
+
+const OPEN_DELAY_MS = 80;
+const CLOSE_DELAY_MS = 120;
+
+let activeCitationId: string | null = null;
+const listeners = new Set<() => void>();
+
+function subscribe(listener: () => void) {
+	listeners.add(listener);
+	return () => {
+		listeners.delete(listener);
+	};
+}
+
+function getSnapshot() {
+	return activeCitationId;
+}
+
+function setActiveCitationId(id: string | null) {
+	if (activeCitationId === id) return;
+	activeCitationId = id;
+	for (const listener of listeners) {
+		listener();
+	}
+}
+
+function useCitationHoverState(id: string) {
+	const activeId = useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
+	const openTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+	const closeTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+
+	const clearTimers = useCallback(() => {
+		if (openTimerRef.current) {
+			clearTimeout(openTimerRef.current);
+			openTimerRef.current = null;
+		}
+		if (closeTimerRef.current) {
+			clearTimeout(closeTimerRef.current);
+			closeTimerRef.current = null;
+		}
+	}, []);
+
+	const open = activeId === id;
+
+	const scheduleOpen = useCallback(() => {
+		clearTimers();
+		openTimerRef.current = setTimeout(() => {
+			setActiveCitationId(id);
+			openTimerRef.current = null;
+		}, OPEN_DELAY_MS);
+	}, [clearTimers, id]);
+
+	const scheduleClose = useCallback(() => {
+		clearTimers();
+		closeTimerRef.current = setTimeout(() => {
+			if (activeCitationId === id) {
+				setActiveCitationId(null);
+			}
+			closeTimerRef.current = null;
+		}, CLOSE_DELAY_MS);
+	}, [clearTimers, id]);
+
+	const handleOpenChange = useCallback(
+		(nextOpen: boolean) => {
+			clearTimers();
+			setActiveCitationId(nextOpen ? id : null);
+		},
+		[clearTimers, id]
+	);
+
+	useEffect(() => {
+		return () => {
+			clearTimers();
+			if (activeCitationId === id) {
+				setActiveCitationId(null);
+			}
+		};
+	}, [clearTimers, id]);
+
+	return { open, scheduleOpen, scheduleClose, handleOpenChange };
+}
+
+export function CitationHoverPopover({
+	id,
+	trigger,
+	children,
+	contentClassName,
+	side = "top",
+	align = "start",
+	sideOffset = 6,
+	onContentClick,
+}: CitationHoverPopoverProps) {
+	const { open, scheduleOpen, scheduleClose, handleOpenChange } = useCitationHoverState(id);
+	const hoverProps = {
+		onPointerEnter: scheduleOpen,
+		onPointerLeave: scheduleClose,
+		onFocus: scheduleOpen,
+		onBlur: scheduleClose,
+	} satisfies CitationHoverTriggerProps;
+
+	return (
+		<Popover open={open} onOpenChange={handleOpenChange}>
+			<PopoverTrigger asChild>{trigger(hoverProps)}</PopoverTrigger>
+			<PopoverContent
+				side={side}
+				align={align}
+				sideOffset={sideOffset}
+				className={contentClassName}
+				onPointerEnter={scheduleOpen}
+				onPointerLeave={scheduleClose}
+				onOpenAutoFocus={(event) => event.preventDefault()}
+				onCloseAutoFocus={(event) => event.preventDefault()}
+				onClick={onContentClick}
+			>
+				{children}
+			</PopoverContent>
+		</Popover>
+	);
+}
diff --git a/surfsense_web/components/tool-ui/citation/citation.tsx b/surfsense_web/components/tool-ui/citation/citation.tsx
index 9ecb7c2f2..8f8d872ef 100644
--- a/surfsense_web/components/tool-ui/citation/citation.tsx
+++ b/surfsense_web/components/tool-ui/citation/citation.tsx
@@ -2,10 +2,10 @@
 
 import { ExternalLink, Globe } from "lucide-react";
 import NextImage from "next/image";
-import * as React from "react";
 import { Button } from "@/components/ui/button";
 import { openSafeNavigationHref, sanitizeHref } from "../shared/media";
-import { cn, Popover, PopoverContent, PopoverTrigger } from "./_adapter";
+import { cn } from "./_adapter";
+import { CitationHoverPopover } from "./citation-hover-popover";
 import type { CitationVariant, SerializableCitation } from "./schema";
 import { TYPE_ICONS } from "./type-icons";
 
@@ -32,29 +32,6 @@ function formatDate(isoString: string, locale: string): string {
 	}
 }
 
-function useHoverPopover(delay = 100) {
-	const [open, setOpen] = React.useState(false);
-	const timeoutRef = React.useRef<ReturnType<typeof setTimeout> | null>(null);
-
-	const handleMouseEnter = React.useCallback(() => {
-		if (timeoutRef.current) clearTimeout(timeoutRef.current);
-		timeoutRef.current = setTimeout(() => setOpen(true), delay);
-	}, [delay]);
-
-	const handleMouseLeave = React.useCallback(() => {
-		if (timeoutRef.current) clearTimeout(timeoutRef.current);
-		timeoutRef.current = setTimeout(() => setOpen(false), delay);
-	}, [delay]);
-
-	React.useEffect(() => {
-		return () => {
-			if (timeoutRef.current) clearTimeout(timeoutRef.current);
-		};
-	}, []);
-
-	return { open, setOpen, handleMouseEnter, handleMouseLeave };
-}
-
 export interface CitationProps extends SerializableCitation {
 	variant?: CitationVariant;
 	className?: string;
@@ -99,13 +76,6 @@ export function Citation(props: CitationProps) {
 		}
 	};
 
-	const handleKeyDown = (e: React.KeyboardEvent) => {
-		if (sanitizedHref && (e.key === "Enter" || e.key === " ")) {
-			e.preventDefault();
-			handleClick();
-		}
-	};
-
 	const iconElement = favicon ? (
 		<NextImage
 			src={favicon}
@@ -120,13 +90,14 @@ export function Citation(props: CitationProps) {
 		<TypeIcon className="size-3.5 shrink-0 opacity-60" aria-hidden="true" />
 	);
 
-	const { open, handleMouseEnter, handleMouseLeave } = useHoverPopover();
-
 	// Inline variant: compact chip with hover popover
 	if (variant === "inline") {
 		return (
-			<Popover open={open}>
-				<PopoverTrigger asChild>
+			<CitationHoverPopover
+				id={id}
+				contentClassName="w-72 cursor-pointer p-0"
+				onContentClick={handleClick}
+				trigger={(hoverProps) => (
 					<Button
 						variant="ghost"
 						type="button"
@@ -134,8 +105,7 @@ export function Citation(props: CitationProps) {
 						data-tool-ui-id={id}
 						data-slot="citation"
 						onClick={handleClick}
-						onMouseEnter={handleMouseEnter}
-						onMouseLeave={handleMouseLeave}
+						{...hoverProps}
 						className={cn(
 							"h-auto cursor-pointer gap-1.5 rounded-md px-2 py-1",
 							"bg-muted/60 text-sm outline-none",
@@ -148,34 +118,73 @@ export function Citation(props: CitationProps) {
 						{iconElement}
 						<span className="text-muted-foreground">{domain}</span>
 					</Button>
-				</PopoverTrigger>
-				<PopoverContent
-					side="top"
-					align="start"
-					className="w-72 cursor-pointer p-0"
-					onMouseEnter={handleMouseEnter}
-					onMouseLeave={handleMouseLeave}
-					onOpenAutoFocus={(e) => e.preventDefault()}
-					onCloseAutoFocus={(e) => e.preventDefault()}
-					onClick={handleClick}
-				>
-					<div className="hover:bg-accent hover:text-accent-foreground flex flex-col gap-2 p-3 transition-colors">
-						<div className="flex items-start gap-2">
-							{iconElement}
-							<span className="text-muted-foreground text-xs">{domain}</span>
-						</div>
-						<p className="text-sm leading-snug font-medium">{title}</p>
-						{snippet && (
-							<p className="text-muted-foreground line-clamp-2 text-xs leading-relaxed">
-								{snippet}
-							</p>
-						)}
+				)}
+			>
+				<div className="hover:bg-accent hover:text-accent-foreground flex flex-col gap-2 p-3 transition-colors">
+					<div className="flex items-start gap-2">
+						{iconElement}
+						<span className="text-muted-foreground text-xs">{domain}</span>
 					</div>
-				</PopoverContent>
-			</Popover>
+					<p className="text-sm leading-snug font-medium">{title}</p>
+					{snippet && (
+						<p className="text-muted-foreground line-clamp-2 text-xs leading-relaxed">
+							{snippet}
+						</p>
+					)}
+				</div>
+			</CitationHoverPopover>
 		);
 	}
 
+	const cardClassName = cn(
+		"group @container relative isolate flex w-full min-w-0 flex-col overflow-hidden rounded-xl",
+		"border-border bg-card border text-sm shadow-xs",
+		"transition-colors duration-150",
+		sanitizedHref && [
+			"cursor-pointer no-underline",
+			"hover:border-foreground/25",
+			"focus-visible:ring-ring focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:outline-none",
+		]
+	);
+
+	const cardContent = (
+		<div className="flex flex-col gap-2 p-4">
+			<div className="text-muted-foreground flex min-w-0 items-center justify-between gap-1.5 text-xs">
+				<div className="flex min-w-0 items-center gap-1.5">
+					{iconElement}
+					<span className="truncate font-medium">{domain}</span>
+					{(author || publishedAt) && (
+						<span className="opacity-70">
+							<span className="opacity-60"> — </span>
+							{author}
+							{author && publishedAt && ", "}
+							{publishedAt && (
+								<time dateTime={publishedAt} className="tabular-nums">
+									{formatDate(publishedAt, locale)}
+								</time>
+							)}
+						</span>
+					)}
+				</div>
+				{sanitizedHref && (
+					<ExternalLink className="size-3.5 shrink-0 opacity-0 transition-opacity group-hover:opacity-100" />
+				)}
+			</div>
+
+			<h3 className="text-foreground text-[15px] leading-snug font-medium text-pretty">
+				<span className="group-hover:decoration-foreground/30 line-clamp-2 group-hover:underline group-hover:underline-offset-2">
+					{title}
+				</span>
+			</h3>
+
+			{snippet && (
+				<p className="text-muted-foreground text-[13px] leading-relaxed text-pretty">
+					<span className="line-clamp-3">{snippet}</span>
+				</p>
+			)}
+		</div>
+	);
+
 	// Default variant: full card
 	return (
 		<article
@@ -184,59 +193,22 @@ export function Citation(props: CitationProps) {
 			data-tool-ui-id={id}
 			data-slot="citation"
 		>
-			{/* biome-ignore lint/a11y/noStaticElementInteractions: div receives role="link" conditionally when href is present */}
-			<div
-				className={cn(
-					"group @container relative isolate flex w-full min-w-0 flex-col overflow-hidden rounded-xl",
-					"border-border bg-card border text-sm shadow-xs",
-					"transition-colors duration-150",
-					sanitizedHref && [
-						"cursor-pointer",
-						"hover:border-foreground/25",
-						"focus-visible:ring-ring focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:outline-none",
-					]
-				)}
-				onClick={sanitizedHref ? handleClick : undefined}
-				role={sanitizedHref ? "link" : undefined}
-				tabIndex={sanitizedHref ? 0 : undefined}
-				onKeyDown={sanitizedHref ? handleKeyDown : undefined}
-			>
-				<div className="flex flex-col gap-2 p-4">
-					<div className="text-muted-foreground flex min-w-0 items-center justify-between gap-1.5 text-xs">
-						<div className="flex min-w-0 items-center gap-1.5">
-							{iconElement}
-							<span className="truncate font-medium">{domain}</span>
-							{(author || publishedAt) && (
-								<span className="opacity-70">
-									<span className="opacity-60"> — </span>
-									{author}
-									{author && publishedAt && ", "}
-									{publishedAt && (
-										<time dateTime={publishedAt} className="tabular-nums">
-											{formatDate(publishedAt, locale)}
-										</time>
-									)}
-								</span>
-							)}
-						</div>
-						{sanitizedHref && (
-							<ExternalLink className="size-3.5 shrink-0 opacity-0 transition-opacity group-hover:opacity-100" />
-						)}
-					</div>
-
-					<h3 className="text-foreground text-[15px] leading-snug font-medium text-pretty">
-						<span className="group-hover:decoration-foreground/30 line-clamp-2 group-hover:underline group-hover:underline-offset-2">
-							{title}
-						</span>
-					</h3>
-
-					{snippet && (
-						<p className="text-muted-foreground text-[13px] leading-relaxed text-pretty">
-							<span className="line-clamp-3">{snippet}</span>
-						</p>
-					)}
-				</div>
-			</div>
+			{sanitizedHref ? (
+				<a
+					href={sanitizedHref}
+					target="_blank"
+					rel="noopener noreferrer"
+					className={cardClassName}
+					onClick={(event) => {
+						event.preventDefault();
+						handleClick();
+					}}
+				>
+					{cardContent}
+				</a>
+			) : (
+				<div className={cardClassName}>{cardContent}</div>
+			)}
 		</article>
 	);
 }

From 01d7379914d093f2b72ece0ce982093722110014 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Fri, 15 May 2026 02:05:11 +0530
Subject: [PATCH 58/96] refactor: add public URL handling for SurfSense
 documents across various components and schemas

---
 .../research/tools/search_surfsense_docs.py         |  6 ++++--
 .../agents/new_chat/tools/search_surfsense_docs.py  |  6 ++++--
 .../app/routes/surfsense_docs_routes.py             |  3 +++
 surfsense_backend/app/schemas/surfsense_docs.py     |  2 ++
 surfsense_backend/app/tasks/chat/stream_new_chat.py |  8 ++++++--
 surfsense_backend/app/utils/surfsense_docs.py       | 13 +++++++++++++
 .../components/assistant-ui/inline-citation.tsx     |  4 ++--
 surfsense_web/contracts/types/document.types.ts     |  1 +
 8 files changed, 35 insertions(+), 8 deletions(-)
 create mode 100644 surfsense_backend/app/utils/surfsense_docs.py

diff --git a/surfsense_backend/app/agents/multi_agent_chat/subagents/builtins/research/tools/search_surfsense_docs.py b/surfsense_backend/app/agents/multi_agent_chat/subagents/builtins/research/tools/search_surfsense_docs.py
index 0d702be4c..ccc5c49e2 100644
--- a/surfsense_backend/app/agents/multi_agent_chat/subagents/builtins/research/tools/search_surfsense_docs.py
+++ b/surfsense_backend/app/agents/multi_agent_chat/subagents/builtins/research/tools/search_surfsense_docs.py
@@ -9,6 +9,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
 
 from app.db import SurfsenseDocsChunk, SurfsenseDocsDocument
 from app.utils.document_converters import embed_text
+from app.utils.surfsense_docs import surfsense_docs_public_url
 
 
 def format_surfsense_docs_results(results: list[tuple]) -> str:
@@ -19,13 +20,14 @@ def format_surfsense_docs_results(results: list[tuple]) -> str:
     # Group chunks by document
     grouped: dict[int, dict] = {}
     for chunk, doc in results:
+        public_url = surfsense_docs_public_url(doc.source)
         if doc.id not in grouped:
             grouped[doc.id] = {
                 "document_id": f"doc-{doc.id}",
                 "document_type": "SURFSENSE_DOCS",
                 "title": doc.title,
-                "url": doc.source,
-                "metadata": {"source": doc.source},
+                "url": public_url,
+                "metadata": {"source": doc.source, "public_url": public_url},
                 "chunks": [],
             }
         grouped[doc.id]["chunks"].append(
diff --git a/surfsense_backend/app/agents/new_chat/tools/search_surfsense_docs.py b/surfsense_backend/app/agents/new_chat/tools/search_surfsense_docs.py
index 2965f2f02..d8a0efac7 100644
--- a/surfsense_backend/app/agents/new_chat/tools/search_surfsense_docs.py
+++ b/surfsense_backend/app/agents/new_chat/tools/search_surfsense_docs.py
@@ -17,6 +17,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
 
 from app.db import SurfsenseDocsChunk, SurfsenseDocsDocument, async_session_maker
 from app.utils.document_converters import embed_text
+from app.utils.surfsense_docs import surfsense_docs_public_url
 
 
 def format_surfsense_docs_results(results: list[tuple]) -> str:
@@ -40,13 +41,14 @@ def format_surfsense_docs_results(results: list[tuple]) -> str:
     # Group chunks by document
     grouped: dict[int, dict] = {}
     for chunk, doc in results:
+        public_url = surfsense_docs_public_url(doc.source)
         if doc.id not in grouped:
             grouped[doc.id] = {
                 "document_id": f"doc-{doc.id}",
                 "document_type": "SURFSENSE_DOCS",
                 "title": doc.title,
-                "url": doc.source,
-                "metadata": {"source": doc.source},
+                "url": public_url,
+                "metadata": {"source": doc.source, "public_url": public_url},
                 "chunks": [],
             }
         grouped[doc.id]["chunks"].append(
diff --git a/surfsense_backend/app/routes/surfsense_docs_routes.py b/surfsense_backend/app/routes/surfsense_docs_routes.py
index e1713e8a3..0d5428dec 100644
--- a/surfsense_backend/app/routes/surfsense_docs_routes.py
+++ b/surfsense_backend/app/routes/surfsense_docs_routes.py
@@ -24,6 +24,7 @@ from app.schemas.surfsense_docs import (
     SurfsenseDocsDocumentWithChunksRead,
 )
 from app.users import current_active_user
+from app.utils.surfsense_docs import surfsense_docs_public_url
 
 router = APIRouter()
 
@@ -76,6 +77,7 @@ async def get_surfsense_doc_by_chunk_id(
             id=document.id,
             title=document.title,
             source=document.source,
+            public_url=surfsense_docs_public_url(document.source),
             content=document.content,
             chunks=[
                 SurfsenseDocsChunkRead(id=c.id, content=c.content)
@@ -146,6 +148,7 @@ async def list_surfsense_docs(
                 id=doc.id,
                 title=doc.title,
                 source=doc.source,
+                public_url=surfsense_docs_public_url(doc.source),
                 content=doc.content,
                 created_at=doc.created_at,
                 updated_at=doc.updated_at,
diff --git a/surfsense_backend/app/schemas/surfsense_docs.py b/surfsense_backend/app/schemas/surfsense_docs.py
index ce32c0ef8..3adf25032 100644
--- a/surfsense_backend/app/schemas/surfsense_docs.py
+++ b/surfsense_backend/app/schemas/surfsense_docs.py
@@ -22,6 +22,7 @@ class SurfsenseDocsDocumentRead(BaseModel):
     id: int
     title: str
     source: str
+    public_url: str
     content: str
     created_at: datetime | None = None
     updated_at: datetime | None = None
@@ -35,6 +36,7 @@ class SurfsenseDocsDocumentWithChunksRead(BaseModel):
     id: int
     title: str
     source: str
+    public_url: str
     content: str
     chunks: list[SurfsenseDocsChunkRead]
 
diff --git a/surfsense_backend/app/tasks/chat/stream_new_chat.py b/surfsense_backend/app/tasks/chat/stream_new_chat.py
index 818282996..328ef59ad 100644
--- a/surfsense_backend/app/tasks/chat/stream_new_chat.py
+++ b/surfsense_backend/app/tasks/chat/stream_new_chat.py
@@ -78,6 +78,7 @@ from app.services.new_streaming_service import VercelStreamingService
 from app.tasks.chat.streaming.graph_stream.event_stream import stream_output
 from app.utils.content_utils import bootstrap_history_from_db
 from app.utils.perf import get_perf_logger, log_system_snapshot, trim_native_heap
+from app.utils.surfsense_docs import surfsense_docs_public_url
 from app.utils.user_message_multimodal import build_human_message_content
 
 _background_tasks: set[asyncio.Task] = set()
@@ -239,14 +240,17 @@ def format_mentioned_surfsense_docs_as_context(
     )
 
     for doc in documents:
-        metadata_json = json.dumps({"source": doc.source}, ensure_ascii=False)
+        public_url = surfsense_docs_public_url(doc.source)
+        metadata_json = json.dumps(
+            {"source": doc.source, "public_url": public_url}, ensure_ascii=False
+        )
 
         context_parts.append("<document>")
         context_parts.append("<document_metadata>")
         context_parts.append(f"  <document_id>doc-{doc.id}</document_id>")
         context_parts.append("  <document_type>SURFSENSE_DOCS</document_type>")
         context_parts.append(f"  <title><![CDATA[{doc.title}]]></title>")
-        context_parts.append(f"  <url><![CDATA[{doc.source}]]></url>")
+        context_parts.append(f"  <url><![CDATA[{public_url}]]></url>")
         context_parts.append(
             f"  <metadata_json><![CDATA[{metadata_json}]]></metadata_json>"
         )
diff --git a/surfsense_backend/app/utils/surfsense_docs.py b/surfsense_backend/app/utils/surfsense_docs.py
new file mode 100644
index 000000000..9a6ab11a9
--- /dev/null
+++ b/surfsense_backend/app/utils/surfsense_docs.py
@@ -0,0 +1,13 @@
+"""Utilities for SurfSense's built-in documentation index."""
+
+from pathlib import PurePosixPath
+
+DOCS_PUBLIC_ROOT = PurePosixPath("/docs")
+
+
+def surfsense_docs_public_url(source: str) -> str:
+    """Return the public docs route for an indexed documentation source path."""
+    docs_path = PurePosixPath(source).with_suffix("")
+    if docs_path.name == "index":
+        docs_path = docs_path.parent
+    return (DOCS_PUBLIC_ROOT / docs_path).as_posix()
diff --git a/surfsense_web/components/assistant-ui/inline-citation.tsx b/surfsense_web/components/assistant-ui/inline-citation.tsx
index a9f9cc076..eba617c15 100644
--- a/surfsense_web/components/assistant-ui/inline-citation.tsx
+++ b/surfsense_web/components/assistant-ui/inline-citation.tsx
@@ -130,9 +130,9 @@ const SurfsenseDocPreview: FC<{ chunkId: number }> = ({ chunkId }) => {
 					</p>
 					<p className="text-[11px] text-muted-foreground">Chunk #{chunkId}</p>
 				</div>
-				{data?.source && (
+				{data?.public_url && (
 					<a
-						href={data.source}
+						href={data.public_url}
 						target="_blank"
 						rel="noopener noreferrer"
 						className="inline-flex shrink-0 items-center gap-1 rounded-md px-2 py-1 text-[11px] font-medium text-primary hover:bg-primary/10"
diff --git a/surfsense_web/contracts/types/document.types.ts b/surfsense_web/contracts/types/document.types.ts
index da733c2c4..7b8784568 100644
--- a/surfsense_web/contracts/types/document.types.ts
+++ b/surfsense_web/contracts/types/document.types.ts
@@ -88,6 +88,7 @@ export const surfsenseDocsDocument = z.object({
 	id: z.number(),
 	title: z.string(),
 	source: z.string(),
+	public_url: z.string(),
 	content: z.string(),
 });
 

From 4dd587131837c43099afc1a282a2db7c00738ee5 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Fri, 15 May 2026 03:56:01 +0530
Subject: [PATCH 59/96] refactor: enhance citation components with mobile
 support and improved styling for better user experience

---
 .../assistant-ui/inline-citation.tsx          | 98 ++++++++++++++-----
 .../citation-panel/citation-panel.tsx         | 29 ++----
 .../citation/citation-hover-popover.tsx       |  6 ++
 .../components/tool-ui/citation/citation.tsx  | 12 +--
 4 files changed, 92 insertions(+), 53 deletions(-)

diff --git a/surfsense_web/components/assistant-ui/inline-citation.tsx b/surfsense_web/components/assistant-ui/inline-citation.tsx
index eba617c15..28b4c43c3 100644
--- a/surfsense_web/components/assistant-ui/inline-citation.tsx
+++ b/surfsense_web/components/assistant-ui/inline-citation.tsx
@@ -5,13 +5,22 @@ import { useSetAtom } from "jotai";
 import { ExternalLink, FileText } from "lucide-react";
 import dynamic from "next/dynamic";
 import type { FC } from "react";
+import { useState } from "react";
 import { openCitationPanelAtom } from "@/atoms/citation/citation-panel.atom";
 import { useCitationMetadata } from "@/components/assistant-ui/citation-metadata-context";
 import { Citation } from "@/components/tool-ui/citation";
 import { CitationHoverPopover } from "@/components/tool-ui/citation/citation-hover-popover";
 import { Button } from "@/components/ui/button";
+import {
+	Drawer,
+	DrawerContent,
+	DrawerHandle,
+	DrawerHeader,
+	DrawerTitle,
+} from "@/components/ui/drawer";
 import { Spinner } from "@/components/ui/spinner";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
+import { useMediaQuery } from "@/hooks/use-media-query";
 import { documentsApiService } from "@/lib/apis/documents-api.service";
 import { cacheKeys } from "@/lib/query-client/cache-keys";
 
@@ -51,7 +60,7 @@ export const InlineCitation: FC<InlineCitationProps> = ({ chunkId, isDocsChunk =
 			<Tooltip>
 				<TooltipTrigger asChild>
 					<span
-						className="ml-0.5 inline-flex h-5 min-w-5 items-center justify-center gap-0.5 rounded-md bg-primary/10 px-1.5 text-[11px] font-medium text-primary align-baseline shadow-sm"
+						className="ml-0.5 inline-flex h-5 min-w-5 items-center justify-center gap-0.5 rounded-md bg-popover px-1.5 text-[11px] font-medium text-popover-foreground/80 align-baseline"
 						role="note"
 					>
 						<FileText className="size-3" />
@@ -78,7 +87,7 @@ const NumericChunkCitation: FC<{ chunkId: number }> = ({ chunkId }) => {
 			type="button"
 			variant="ghost"
 			onClick={() => openCitationPanel({ chunkId })}
-			className="ml-0.5 h-5 min-w-5 cursor-pointer rounded-md bg-muted/60 px-1.5 text-[11px] font-medium text-muted-foreground align-baseline shadow-sm transition-colors hover:bg-accent hover:text-accent-foreground focus-visible:ring-ring focus-visible:ring-2 focus-visible:outline-none"
+			className="ml-0.5 inline-flex h-5 min-w-5 items-center justify-center gap-0.5 rounded-md bg-popover px-1.5 text-[11px] font-medium text-popover-foreground/80 align-baseline"
 			title={`View source chunk #${chunkId}`}
 			aria-label={`View cited chunk ${chunkId}`}
 		>
@@ -88,36 +97,77 @@ const NumericChunkCitation: FC<{ chunkId: number }> = ({ chunkId }) => {
 };
 
 const SurfsenseDocCitation: FC<{ chunkId: number }> = ({ chunkId }) => {
+	const isTouchLike = useMediaQuery("(hover: none), (pointer: coarse)");
+	const [mobilePreviewOpen, setMobilePreviewOpen] = useState(false);
+	const docQuery = useSurfsenseDocPreviewQuery(chunkId, mobilePreviewOpen);
+
+	const handleMobileClick = () => {
+		setMobilePreviewOpen(true);
+	};
+
 	return (
-		<CitationHoverPopover
-			id={`doc-${chunkId}`}
-			contentClassName="w-96 max-w-[calc(100vw-2rem)] p-0"
-			align="start"
-			trigger={(hoverProps) => (
-				<Button
-					type="button"
-					variant="ghost"
-					className="ml-0.5 h-5 min-w-5 cursor-pointer gap-0.5 rounded-md bg-primary/10 px-1.5 text-[11px] font-medium text-primary align-baseline shadow-sm transition-colors hover:bg-primary/15 focus-visible:ring-ring focus-visible:ring-2 focus-visible:outline-none"
-					aria-label={`Show Surfsense documentation chunk ${chunkId}`}
-					title="Surfsense documentation"
-					{...hoverProps}
+		<>
+			<CitationHoverPopover
+				id={`doc-${chunkId}`}
+				contentClassName="w-96 max-w-[calc(100vw-2rem)] p-0"
+				align="start"
+				trigger={(hoverProps) => (
+					<Button
+						type="button"
+						variant="ghost"
+						size={null}
+						onClick={isTouchLike ? handleMobileClick : undefined}
+						className="ml-0.5 inline-flex h-5 min-w-5 items-center justify-center gap-0.5 rounded-md bg-popover px-1.5 text-[11px] font-medium text-popover-foreground/80 align-baseline"
+						aria-label={`Show Surfsense documentation chunk ${chunkId}`}
+						title="Surfsense documentation"
+						{...hoverProps}
+					>
+						<FileText className="size-3" />
+						doc
+					</Button>
+				)}
+			>
+				<SurfsenseDocPreview chunkId={chunkId} />
+			</CitationHoverPopover>
+			<Drawer open={mobilePreviewOpen} onOpenChange={setMobilePreviewOpen} shouldScaleBackground={false}>
+				<DrawerContent
+					className="max-h-[85vh] z-80 bg-popover text-popover-foreground"
+					overlayClassName="z-80"
 				>
-					<FileText className="size-3" />
-					doc
-				</Button>
-			)}
-		>
-			<SurfsenseDocPreview chunkId={chunkId} />
-		</CitationHoverPopover>
+					<DrawerHandle />
+					<DrawerHeader className="pb-0">
+						<DrawerTitle>Surfsense documentation</DrawerTitle>
+					</DrawerHeader>
+					<SurfsenseDocPreviewContent chunkId={chunkId} query={docQuery} contentClassName="max-h-[60vh]" />
+				</DrawerContent>
+			</Drawer>
+		</>
 	);
 };
 
-const SurfsenseDocPreview: FC<{ chunkId: number }> = ({ chunkId }) => {
-	const { data, isLoading, error } = useQuery({
+function useSurfsenseDocPreviewQuery(chunkId: number, enabled = true) {
+	return useQuery({
 		queryKey: cacheKeys.documents.byChunk(`doc-${chunkId}`),
 		queryFn: () => documentsApiService.getSurfsenseDocByChunk(chunkId),
 		staleTime: 5 * 60 * 1000,
+		enabled,
 	});
+}
+
+type SurfsenseDocPreviewQuery = ReturnType<typeof useSurfsenseDocPreviewQuery>;
+
+const SurfsenseDocPreview: FC<{ chunkId: number }> = ({ chunkId }) => {
+	const query = useSurfsenseDocPreviewQuery(chunkId);
+
+	return <SurfsenseDocPreviewContent chunkId={chunkId} query={query} />;
+};
+
+const SurfsenseDocPreviewContent: FC<{
+	chunkId: number;
+	query: SurfsenseDocPreviewQuery;
+	contentClassName?: string;
+}> = ({ chunkId, query, contentClassName = "max-h-72" }) => {
+	const { data, isLoading, error } = query;
 
 	const citedChunk = data?.chunks.find((c) => c.id === chunkId) ?? data?.chunks[0];
 
@@ -142,7 +192,7 @@ const SurfsenseDocPreview: FC<{ chunkId: number }> = ({ chunkId }) => {
 					</a>
 				)}
 			</div>
-			<div className="max-h-72 overflow-auto px-3 py-2 text-sm">
+			<div className={`${contentClassName} overflow-auto px-3 py-2 text-sm`}>
 				{isLoading && (
 					<div className="flex items-center gap-2 py-4 text-muted-foreground">
 						<Spinner size="xs" />
diff --git a/surfsense_web/components/citation-panel/citation-panel.tsx b/surfsense_web/components/citation-panel/citation-panel.tsx
index c588bb93d..715facbde 100644
--- a/surfsense_web/components/citation-panel/citation-panel.tsx
+++ b/surfsense_web/components/citation-panel/citation-panel.tsx
@@ -50,14 +50,6 @@ export const CitationPanelContent: FC<CitationPanelContentProps> = ({ chunkId, o
 
 	const totalChunks = data?.total_chunks ?? data?.chunks.length ?? 0;
 	const startIndex = data?.chunk_start_index ?? 0;
-	const citedIndexInWindow = data
-		? Math.max(
-				0,
-				data.chunks.findIndex((c) => c.id === chunkId)
-			)
-		: 0;
-	const shownAbove = citedIndexInWindow;
-	const shownBelow = data ? Math.max(0, data.chunks.length - 1 - citedIndexInWindow) : 0;
 	const hasMoreAbove = startIndex > 0;
 	const hasMoreBelow = data ? startIndex + data.chunks.length < totalChunks : false;
 
@@ -117,18 +109,16 @@ export const CitationPanelContent: FC<CitationPanelContentProps> = ({ chunkId, o
 							{data?.title ?? (isLoading ? "Loading…" : `Chunk #${chunkId}`)}
 						</p>
 					</div>
-					<div className="flex items-center gap-2 shrink-0 text-[11px] text-muted-foreground">
-						<span>Chunk #{chunkId}</span>
-						{totalChunks > 0 && <span>· {totalChunks} chunks</span>}
+					<div className="flex items-center gap-1 shrink-0 text-[11px] text-muted-foreground">
+						{totalChunks > 0 && <span>{totalChunks} chunks</span>}
 					</div>
 				</div>
 			</div>
 
 			<div ref={scrollContainerRef} className="flex-1 overflow-y-auto px-5 py-4">
 				{isLoading && (
-					<div className="flex items-center gap-2 py-8 text-muted-foreground">
-						<Spinner size="sm" />
-						<span className="text-sm">Loading citation…</span>
+					<div className="flex min-h-full items-center justify-center text-muted-foreground">
+						<Spinner size="md" />
 					</div>
 				)}
 
@@ -163,14 +153,14 @@ export const CitationPanelContent: FC<CitationPanelContentProps> = ({ chunkId, o
 											<span
 												className={
 													isCited
-														? "text-[11px] font-semibold text-primary"
+														? "text-[11px] text-muted-foreground"
 														: "text-[11px] font-medium text-muted-foreground"
 												}
 											>
-												{isCited ? "Cited chunk" : `Chunk #${chunk.id}`}
+												Chunk #{chunk.id}
 											</span>
 											{isCited && (
-												<span className="text-[11px] text-muted-foreground">#{chunk.id}</span>
+												<span className="text-[11px] font-semibold text-primary">Cited chunk</span>
 											)}
 										</div>
 										<div className="text-sm">
@@ -191,10 +181,7 @@ export const CitationPanelContent: FC<CitationPanelContentProps> = ({ chunkId, o
 			</div>
 
 			{!isLoading && !error && data && (
-				<div className="shrink-0 flex flex-wrap items-center justify-between gap-2 border-t px-4 py-3">
-					<div className="text-[11px] text-muted-foreground">
-						Showing {shownAbove} above · cited · {shownBelow} below
-					</div>
+				<div className="shrink-0 flex flex-wrap items-center justify-end gap-2 border-t px-4 py-3">
 					<div className="flex items-center gap-2">
 						{(hasMoreAbove || hasMoreBelow) && !expanded && (
 							<Button
diff --git a/surfsense_web/components/tool-ui/citation/citation-hover-popover.tsx b/surfsense_web/components/tool-ui/citation/citation-hover-popover.tsx
index 0ea1cf54d..9c85e0f5b 100644
--- a/surfsense_web/components/tool-ui/citation/citation-hover-popover.tsx
+++ b/surfsense_web/components/tool-ui/citation/citation-hover-popover.tsx
@@ -2,6 +2,7 @@
 
 import type { ComponentProps, HTMLAttributes, ReactElement, ReactNode } from "react";
 import { useCallback, useEffect, useRef, useSyncExternalStore } from "react";
+import { useMediaQuery } from "@/hooks/use-media-query";
 import { Popover, PopoverContent, PopoverTrigger } from "./_adapter";
 
 type PopoverContentProps = ComponentProps<typeof PopoverContent>;
@@ -113,6 +114,7 @@ export function CitationHoverPopover({
 	sideOffset = 6,
 	onContentClick,
 }: CitationHoverPopoverProps) {
+	const isTouchLike = useMediaQuery("(hover: none), (pointer: coarse)");
 	const { open, scheduleOpen, scheduleClose, handleOpenChange } = useCitationHoverState(id);
 	const hoverProps = {
 		onPointerEnter: scheduleOpen,
@@ -121,6 +123,10 @@ export function CitationHoverPopover({
 		onBlur: scheduleClose,
 	} satisfies CitationHoverTriggerProps;
 
+	if (isTouchLike) {
+		return trigger({});
+	}
+
 	return (
 		<Popover open={open} onOpenChange={handleOpenChange}>
 			<PopoverTrigger asChild>{trigger(hoverProps)}</PopoverTrigger>
diff --git a/surfsense_web/components/tool-ui/citation/citation.tsx b/surfsense_web/components/tool-ui/citation/citation.tsx
index 8f8d872ef..08791d532 100644
--- a/surfsense_web/components/tool-ui/citation/citation.tsx
+++ b/surfsense_web/components/tool-ui/citation/citation.tsx
@@ -95,7 +95,7 @@ export function Citation(props: CitationProps) {
 		return (
 			<CitationHoverPopover
 				id={id}
-				contentClassName="w-72 cursor-pointer p-0"
+				contentClassName="w-72 cursor-pointer overflow-hidden p-0"
 				onContentClick={handleClick}
 				trigger={(hoverProps) => (
 					<Button
@@ -107,20 +107,16 @@ export function Citation(props: CitationProps) {
 						onClick={handleClick}
 						{...hoverProps}
 						className={cn(
-							"h-auto cursor-pointer gap-1.5 rounded-md px-2 py-1",
-							"bg-muted/60 text-sm outline-none",
-							"transition-colors duration-150",
-							"hover:bg-accent hover:text-accent-foreground",
-							"focus-visible:ring-ring focus-visible:ring-2",
+							"ml-0.5 inline-flex h-5 min-w-5 cursor-pointer items-center justify-center gap-1.5 rounded-md bg-popover px-1.5 text-[11px] font-medium text-popover-foreground/80 align-baseline",
 							className
 						)}
 					>
 						{iconElement}
-						<span className="text-muted-foreground">{domain}</span>
+						<span>{domain}</span>
 					</Button>
 				)}
 			>
-				<div className="hover:bg-accent hover:text-accent-foreground flex flex-col gap-2 p-3 transition-colors">
+				<div className="flex flex-col gap-2 p-3">
 					<div className="flex items-start gap-2">
 						{iconElement}
 						<span className="text-muted-foreground text-xs">{domain}</span>

From 5092bd3e8cab4da3172ebca86f87f967e1609ce0 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Fri, 15 May 2026 04:13:58 +0530
Subject: [PATCH 60/96] refactor: integrate mobile preview functionality in
 citation components and enhance styling for improved usability

---
 .../assistant-ui/inline-citation.tsx          |  49 ++++++--
 .../citation-panel/citation-panel.tsx         | 110 +++++++-----------
 .../components/editor-panel/editor-panel.tsx  |   2 +-
 3 files changed, 80 insertions(+), 81 deletions(-)

diff --git a/surfsense_web/components/assistant-ui/inline-citation.tsx b/surfsense_web/components/assistant-ui/inline-citation.tsx
index 28b4c43c3..886002c83 100644
--- a/surfsense_web/components/assistant-ui/inline-citation.tsx
+++ b/surfsense_web/components/assistant-ui/inline-citation.tsx
@@ -8,6 +8,7 @@ import type { FC } from "react";
 import { useState } from "react";
 import { openCitationPanelAtom } from "@/atoms/citation/citation-panel.atom";
 import { useCitationMetadata } from "@/components/assistant-ui/citation-metadata-context";
+import { CitationPanelContent } from "@/components/citation-panel/citation-panel";
 import { Citation } from "@/components/tool-ui/citation";
 import { CitationHoverPopover } from "@/components/tool-ui/citation/citation-hover-popover";
 import { Button } from "@/components/ui/button";
@@ -80,19 +81,45 @@ export const InlineCitation: FC<InlineCitationProps> = ({ chunkId, isDocsChunk =
 };
 
 const NumericChunkCitation: FC<{ chunkId: number }> = ({ chunkId }) => {
+	const isTouchLike = useMediaQuery("(hover: none), (pointer: coarse)");
 	const openCitationPanel = useSetAtom(openCitationPanelAtom);
+	const [mobilePreviewOpen, setMobilePreviewOpen] = useState(false);
+
+	const handleClick = () => {
+		if (isTouchLike) {
+			setMobilePreviewOpen(true);
+			return;
+		}
+		openCitationPanel({ chunkId });
+	};
 
 	return (
-		<Button
-			type="button"
-			variant="ghost"
-			onClick={() => openCitationPanel({ chunkId })}
-			className="ml-0.5 inline-flex h-5 min-w-5 items-center justify-center gap-0.5 rounded-md bg-popover px-1.5 text-[11px] font-medium text-popover-foreground/80 align-baseline"
-			title={`View source chunk #${chunkId}`}
-			aria-label={`View cited chunk ${chunkId}`}
-		>
-			{chunkId}
-		</Button>
+		<>
+			<Button
+				type="button"
+				variant="ghost"
+				onClick={handleClick}
+				className="ml-0.5 inline-flex h-5 min-w-5 items-center justify-center gap-0.5 rounded-md bg-popover px-1.5 text-[11px] font-medium text-popover-foreground/80 align-baseline"
+				title={`View source chunk #${chunkId}`}
+				aria-label={`View cited chunk ${chunkId}`}
+			>
+				{chunkId}
+			</Button>
+			<Drawer open={mobilePreviewOpen} onOpenChange={setMobilePreviewOpen} shouldScaleBackground={false}>
+				<DrawerContent
+					className="h-[85vh] max-h-[85vh] z-80 overflow-hidden"
+					overlayClassName="z-80"
+				>
+					<DrawerHandle />
+					<DrawerHeader className="pb-0">
+						<DrawerTitle>Citation</DrawerTitle>
+					</DrawerHeader>
+					<div className="min-h-0 flex-1 flex flex-col overflow-hidden">
+						<CitationPanelContent chunkId={chunkId} showHeader={false} />
+					</div>
+				</DrawerContent>
+			</Drawer>
+		</>
 	);
 };
 
@@ -131,7 +158,7 @@ const SurfsenseDocCitation: FC<{ chunkId: number }> = ({ chunkId }) => {
 			</CitationHoverPopover>
 			<Drawer open={mobilePreviewOpen} onOpenChange={setMobilePreviewOpen} shouldScaleBackground={false}>
 				<DrawerContent
-					className="max-h-[85vh] z-80 bg-popover text-popover-foreground"
+					className="max-h-[85vh] z-80"
 					overlayClassName="z-80"
 				>
 					<DrawerHandle />
diff --git a/surfsense_web/components/citation-panel/citation-panel.tsx b/surfsense_web/components/citation-panel/citation-panel.tsx
index 715facbde..a63efa296 100644
--- a/surfsense_web/components/citation-panel/citation-panel.tsx
+++ b/surfsense_web/components/citation-panel/citation-panel.tsx
@@ -2,9 +2,9 @@
 
 import { useQuery } from "@tanstack/react-query";
 import { useSetAtom } from "jotai";
-import { ChevronDown, ChevronUp, ExternalLink, XIcon } from "lucide-react";
+import { XIcon } from "lucide-react";
 import type { FC } from "react";
-import { useEffect, useMemo, useRef, useState } from "react";
+import { useEffect, useMemo, useRef } from "react";
 import { openEditorPanelAtom } from "@/atoms/editor/editor-panel.atom";
 import { MarkdownViewer } from "@/components/markdown-viewer";
 import { Button } from "@/components/ui/button";
@@ -12,29 +12,27 @@ import { Spinner } from "@/components/ui/spinner";
 import { documentsApiService } from "@/lib/apis/documents-api.service";
 
 const DEFAULT_CHUNK_WINDOW = 5;
-const EXPANDED_CHUNK_WINDOW = 50;
 
 interface CitationPanelContentProps {
 	chunkId: number;
 	onClose?: () => void;
+	showHeader?: boolean;
 }
 
 /**
  * Right-panel citation viewer. Shows the cited chunk surrounded by
  * adjacent chunks (±N chunks via the API's `chunk_window` parameter),
  * with the cited one visually highlighted and auto-scrolled into view.
- * The window can be expanded to a wider range, or the user can jump to
- * the full document via the editor panel.
+ * The user can jump to the full document via the editor panel.
  */
-export const CitationPanelContent: FC<CitationPanelContentProps> = ({ chunkId, onClose }) => {
+export const CitationPanelContent: FC<CitationPanelContentProps> = ({
+	chunkId,
+	onClose,
+	showHeader = true,
+}) => {
 	const openEditorPanel = useSetAtom(openEditorPanelAtom);
-	const [expanded, setExpanded] = useState(false);
 
-	useEffect(() => {
-		setExpanded(false);
-	}, []);
-
-	const chunkWindow = expanded ? EXPANDED_CHUNK_WINDOW : DEFAULT_CHUNK_WINDOW;
+	const chunkWindow = DEFAULT_CHUNK_WINDOW;
 
 	const { data, isLoading, error } = useQuery({
 		queryKey: ["citation-panel", chunkId, chunkWindow] as const,
@@ -87,30 +85,42 @@ export const CitationPanelContent: FC<CitationPanelContentProps> = ({ chunkId, o
 	return (
 		<>
 			<div className="shrink-0">
-				<div className="shrink-0 flex h-12 items-center justify-between px-3 border-b">
-					<h2 className="select-none text-lg font-semibold">Citation</h2>
-					<div className="flex items-center gap-1 shrink-0">
-						{onClose && (
-							<Button
-								variant="ghost"
-								size="icon"
-								onClick={onClose}
-								className="h-8 w-8 rounded-full shrink-0 text-muted-foreground hover:text-accent-foreground"
-							>
-								<XIcon className="h-4 w-4" />
-								<span className="sr-only">Close citation panel</span>
-							</Button>
-						)}
+				{showHeader && (
+					<div className="shrink-0 flex h-12 items-center justify-between px-3 border-b">
+						<h2 className="select-none text-lg font-semibold">Citation</h2>
+						<div className="flex items-center gap-1 shrink-0">
+							{onClose && (
+								<Button
+									variant="ghost"
+									size="icon"
+									onClick={onClose}
+									className="h-8 w-8 rounded-full shrink-0 text-muted-foreground hover:text-accent-foreground"
+								>
+									<XIcon className="h-4 w-4" />
+									<span className="sr-only">Close citation panel</span>
+								</Button>
+							)}
+						</div>
 					</div>
-				</div>
-				<div className="flex h-10 items-center justify-between gap-2 border-b px-4">
+				)}
+				<div className="grid h-10 grid-cols-[minmax(0,1fr)_auto] items-center gap-3 border-b px-4">
 					<div className="min-w-0 flex flex-1 items-center gap-2">
 						<p className="truncate text-sm text-muted-foreground">
 							{data?.title ?? (isLoading ? "Loading…" : `Chunk #${chunkId}`)}
 						</p>
 					</div>
-					<div className="flex items-center gap-1 shrink-0 text-[11px] text-muted-foreground">
+					<div className="flex items-center gap-3 shrink-0 text-[11px] text-muted-foreground">
 						{totalChunks > 0 && <span>{totalChunks} chunks</span>}
+						{!isLoading && !error && data && (
+							<Button
+								variant="default"
+								size="sm"
+								className="h-6 px-1.5 text-[11px]"
+								onClick={handleOpenFullDocument}
+							>
+								Open
+							</Button>
+						)}
 					</div>
 				</div>
 			</div>
@@ -145,8 +155,8 @@ export const CitationPanelContent: FC<CitationPanelContentProps> = ({ chunkId, o
 										data-cited={isCited || undefined}
 										className={
 											isCited
-												? "rounded-md border-2 border-primary bg-primary/5 px-4 py-3 shadow-sm"
-												: "rounded-md border border-border/40 bg-muted/20 px-4 py-3 opacity-70 transition-opacity hover:opacity-100"
+												? "rounded-md border-2 border-primary bg-accent px-4 py-3 shadow-sm"
+												: "rounded-md bg-accent px-4 py-3 opacity-70 transition-opacity hover:opacity-100"
 										}
 									>
 										<div className="mb-1.5 flex items-center justify-between">
@@ -179,44 +189,6 @@ export const CitationPanelContent: FC<CitationPanelContentProps> = ({ chunkId, o
 					</>
 				)}
 			</div>
-
-			{!isLoading && !error && data && (
-				<div className="shrink-0 flex flex-wrap items-center justify-end gap-2 border-t px-4 py-3">
-					<div className="flex items-center gap-2">
-						{(hasMoreAbove || hasMoreBelow) && !expanded && (
-							<Button
-								variant="ghost"
-								size="sm"
-								className="h-8 text-xs"
-								onClick={() => setExpanded(true)}
-							>
-								<ChevronDown className="mr-1 size-3.5" />
-								More context
-							</Button>
-						)}
-						{expanded && (
-							<Button
-								variant="ghost"
-								size="sm"
-								className="h-8 text-xs"
-								onClick={() => setExpanded(false)}
-							>
-								<ChevronUp className="mr-1 size-3.5" />
-								Less
-							</Button>
-						)}
-						<Button
-							variant="default"
-							size="sm"
-							className="h-8 text-xs"
-							onClick={handleOpenFullDocument}
-						>
-							<ExternalLink className="mr-1 size-3.5" />
-							Open full document
-						</Button>
-					</div>
-				</div>
-			)}
 		</>
 	);
 };
diff --git a/surfsense_web/components/editor-panel/editor-panel.tsx b/surfsense_web/components/editor-panel/editor-panel.tsx
index d2dbd2127..3cb30cee6 100644
--- a/surfsense_web/components/editor-panel/editor-panel.tsx
+++ b/surfsense_web/components/editor-panel/editor-panel.tsx
@@ -463,7 +463,7 @@ export function EditorPanelContent({
 							</Button>
 						</div>
 					</div>
-					<div className="flex h-10 items-center justify-between gap-2 border-b px-4">
+					<div className="grid h-10 grid-cols-[minmax(0,1fr)_auto] items-center gap-3 border-b px-4">
 						<div className="min-w-0 flex flex-1 items-center gap-2">
 							<p className="truncate text-sm text-muted-foreground">{displayTitle}</p>
 						</div>

From 8001cae1b4c2550fab5be59fef9b7082d38e5ed9 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Fri, 15 May 2026 10:48:57 +0530
Subject: [PATCH 61/96] refactor: update MessageInfoDropdown to accept
 chatTurnId prop and enhance RevertTurnButton integration for improved
 functionality

---
 .../assistant-ui/assistant-message.tsx        |  8 ++--
 .../assistant-ui/revert-turn-button.tsx       | 40 ++++++++++++++-----
 2 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/surfsense_web/components/assistant-ui/assistant-message.tsx b/surfsense_web/components/assistant-ui/assistant-message.tsx
index c0716f1eb..76396b397 100644
--- a/surfsense_web/components/assistant-ui/assistant-message.tsx
+++ b/surfsense_web/components/assistant-ui/assistant-message.tsx
@@ -274,7 +274,7 @@ function formatTurnCost(micros: number): string {
 	return "$0";
 }
 
-const MessageInfoDropdown: FC = () => {
+const MessageInfoDropdown: FC<{ chatTurnId: string | null | undefined }> = ({ chatTurnId }) => {
 	const messageId = useAuiState(({ message }) => message?.id);
 	const createdAt = useAuiState(({ message }) => message?.createdAt);
 	const usage = useTokenUsage(messageId);
@@ -359,6 +359,7 @@ const MessageInfoDropdown: FC = () => {
 						)}
 					</>
 				)}
+				<RevertTurnButton chatTurnId={chatTurnId} variant="menu-item" />
 			</ActionBarMorePrimitive.Content>
 		</ActionBarMorePrimitive.Root>
 	);
@@ -623,10 +624,7 @@ const AssistantActionBar: FC = () => {
 					<ClipboardPaste />
 				</TooltipIconButton>
 			)}
-			<MessageInfoDropdown />
-			<div className="ml-auto">
-				<RevertTurnButton chatTurnId={chatTurnId} />
-			</div>
+			<MessageInfoDropdown chatTurnId={chatTurnId} />
 		</ActionBarPrimitive.Root>
 	);
 };
diff --git a/surfsense_web/components/assistant-ui/revert-turn-button.tsx b/surfsense_web/components/assistant-ui/revert-turn-button.tsx
index 2cc151ee2..7b2725989 100644
--- a/surfsense_web/components/assistant-ui/revert-turn-button.tsx
+++ b/surfsense_web/components/assistant-ui/revert-turn-button.tsx
@@ -15,6 +15,7 @@
  * with their messages.
  */
 
+import { ActionBarMorePrimitive } from "@assistant-ui/react";
 import { useQueryClient } from "@tanstack/react-query";
 import { useAtomValue } from "jotai";
 import { CheckIcon, RotateCcw, XCircleIcon } from "lucide-react";
@@ -47,9 +48,10 @@ import { cn } from "@/lib/utils";
 
 interface RevertTurnButtonProps {
 	chatTurnId: string | null | undefined;
+	variant?: "button" | "menu-item";
 }
 
-export function RevertTurnButton({ chatTurnId }: RevertTurnButtonProps) {
+export function RevertTurnButton({ chatTurnId, variant = "button" }: RevertTurnButtonProps) {
 	const session = useAtomValue(chatSessionStateAtom);
 	const threadId = session?.threadId ?? null;
 	const queryClient = useQueryClient();
@@ -125,23 +127,39 @@ export function RevertTurnButton({ chatTurnId }: RevertTurnButtonProps) {
 	return (
 		<>
 			<AlertDialog open={confirmOpen} onOpenChange={setConfirmOpen}>
-				<AlertDialogTrigger asChild>
-					<Button
-						size="sm"
-						variant="ghost"
-						className="text-muted-foreground hover:text-accent-foreground gap-1.5"
-						onClick={(e) => {
-							e.stopPropagation();
+				{variant === "menu-item" ? (
+					<ActionBarMorePrimitive.Item
+						className="focus:bg-accent focus:text-accent-foreground relative flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none"
+						onSelect={(e) => {
+							e.preventDefault();
 							setConfirmOpen(true);
 						}}
 					>
 						<RotateCcw className="size-3.5" />
 						<span>Revert turn</span>
-						<span className="text-xs tabular-nums opacity-70">
+						<span className="ml-auto text-xs tabular-nums opacity-70">
 							{reversibleCount}/{totalCount}
 						</span>
-					</Button>
-				</AlertDialogTrigger>
+					</ActionBarMorePrimitive.Item>
+				) : (
+					<AlertDialogTrigger asChild>
+						<Button
+							size="sm"
+							variant="ghost"
+							className="text-muted-foreground hover:text-accent-foreground gap-1.5"
+							onClick={(e) => {
+								e.stopPropagation();
+								setConfirmOpen(true);
+							}}
+						>
+							<RotateCcw className="size-3.5" />
+							<span>Revert turn</span>
+							<span className="text-xs tabular-nums opacity-70">
+								{reversibleCount}/{totalCount}
+							</span>
+						</Button>
+					</AlertDialogTrigger>
+				)}
 				<AlertDialogContent>
 					<AlertDialogHeader>
 						<AlertDialogTitle>Revert this turn?</AlertDialogTitle>

From 3504be34133dd0584c48bbc96eaa6492ec30dda5 Mon Sep 17 00:00:00 2001
From: guangyang1206 <guangyang1206@users.noreply.github.com>
Date: Sat, 16 May 2026 12:10:04 +0800
Subject: [PATCH 62/96] fix(web): make cacheKeys.*.withQueryParams order-stable
 (sort entries)

Fixes #1370

Object.values() produces order-dependent cache keys because the order of values depends on the order of keys in the object. This causes the same logical query to produce different cache keys when the parameter object has keys in different orders.

Added stableEntries() helper that:
1. Filters out undefined values
2. Sorts entries by key name
3. Returns flat array of [key, value] pairs

This ensures cache key identity is stable regardless of parameter object key order.

Co-authored-by: guangyang1206 <guangyang1206@users.noreply.github.com>
---
 surfsense_web/lib/query-client/cache-keys.ts | 23 +++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/surfsense_web/lib/query-client/cache-keys.ts b/surfsense_web/lib/query-client/cache-keys.ts
index a05055075..ce45ee143 100644
--- a/surfsense_web/lib/query-client/cache-keys.ts
+++ b/surfsense_web/lib/query-client/cache-keys.ts
@@ -3,6 +3,19 @@ import type { GetDocumentsRequest } from "@/contracts/types/document.types";
 import type { GetLogsRequest } from "@/contracts/types/log.types";
 import type { GetSearchSpacesRequest } from "@/contracts/types/search-space.types";
 
+/**
+ * Convert an object to a stable array of [key, value] pairs sorted by key.
+ * This ensures cache keys are order-independent (avoiding Object.values order-dependency).
+ * Filters out undefined values.
+ */
+function stableEntries(obj: Record<string, unknown> | null | undefined): unknown[] {
+	if (!obj) return [];
+	return Object.entries(obj)
+		.filter(([, v]) => v !== undefined)
+		.sort(([a], [b]) => a.localeCompare(b))
+		.flat();
+}
+
 export const cacheKeys = {
 	// New chat threads (assistant-ui)
 	threads: {
@@ -13,9 +26,9 @@ export const cacheKeys = {
 	},
 	documents: {
 		globalQueryParams: (queries: GetDocumentsRequest["queryParams"]) =>
-			["documents", ...(queries ? Object.values(queries) : [])] as const,
+			["documents", ...stableEntries(queries)] as const,
 		withQueryParams: (queries: GetDocumentsRequest["queryParams"]) =>
-			["documents-with-queries", ...(queries ? Object.values(queries) : [])] as const,
+			["documents-with-queries", ...stableEntries(queries)] as const,
 		document: (documentId: string) => ["document", documentId] as const,
 		byChunk: (chunkId: string) => ["documents", "by-chunk", chunkId] as const,
 	},
@@ -24,7 +37,7 @@ export const cacheKeys = {
 		detail: (logId: number | string) => ["logs", "detail", logId] as const,
 		summary: (searchSpaceId?: number | string) => ["logs", "summary", searchSpaceId] as const,
 		withQueryParams: (queries: GetLogsRequest["queryParams"]) =>
-			["logs", "with-query-params", ...(queries ? Object.values(queries) : [])] as const,
+			["logs", "with-query-params", ...stableEntries(queries)] as const,
 	},
 	newLLMConfigs: {
 		all: (searchSpaceId: number) => ["new-llm-configs", searchSpaceId] as const,
@@ -51,7 +64,7 @@ export const cacheKeys = {
 	searchSpaces: {
 		all: ["search-spaces"] as const,
 		withQueryParams: (queries: GetSearchSpacesRequest["queryParams"]) =>
-			["search-spaces", ...(queries ? Object.values(queries) : [])] as const,
+			["search-spaces", ...stableEntries(queries)] as const,
 		detail: (searchSpaceId: string) => ["search-spaces", searchSpaceId] as const,
 	},
 	user: {
@@ -78,7 +91,7 @@ export const cacheKeys = {
 	connectors: {
 		all: (searchSpaceId: string) => ["connectors", searchSpaceId] as const,
 		withQueryParams: (queries: GetConnectorsRequest["queryParams"]) =>
-			["connectors", ...(queries ? Object.values(queries) : [])] as const,
+			["connectors", ...stableEntries(queries)] as const,
 		byId: (connectorId: string) => ["connector", connectorId] as const,
 		index: () => ["connector", "index"] as const,
 		googleDrive: {

From f096548a162b9a9062cfdc1f137a098eacba7b4b Mon Sep 17 00:00:00 2001
From: guangyang1206 <guangyang1206@users.noreply.github.com>
Date: Sat, 16 May 2026 12:15:16 +0800
Subject: [PATCH 63/96] fix(web): extract single tryGetHostname helper (DRY,
 unified fallback)

Fixes #1368

Previously,  was duplicated in 4 places with 3 subtly different fallback behaviors:
1. inline-citation.tsx: returned  on error
2. markdown-text.tsx: returned  on error
3. assistant-message.tsx: returned  on error
4. citation.tsx: returned  on error

Created canonical  in  that:
- Returns
- Strips  prefix from hostname
- Returns  on invalid URL (safest contract)

Updated all 4 call sites:
- inline-citation.tsx:  (preserves original fallback)
- markdown-text.tsx:  (preserves original fallback)
- assistant-message.tsx:  (drop-in, both return )
- citation.tsx:  (drop-in, both return )

Co-authored-by: guangyang1206 <guangyang1206@users.noreply.github.com>
---
 .../components/assistant-ui/assistant-message.tsx  | 12 +++---------
 .../components/assistant-ui/inline-citation.tsx    | 11 ++---------
 .../components/assistant-ui/markdown-text.tsx      | 13 +++----------
 .../components/tool-ui/citation/citation.tsx       | 12 ++----------
 surfsense_web/lib/url.ts                           | 14 ++++++++++++++
 5 files changed, 24 insertions(+), 38 deletions(-)
 create mode 100644 surfsense_web/lib/url.ts

diff --git a/surfsense_web/components/assistant-ui/assistant-message.tsx b/surfsense_web/components/assistant-ui/assistant-message.tsx
index 00f3acebf..1748f47a9 100644
--- a/surfsense_web/components/assistant-ui/assistant-message.tsx
+++ b/surfsense_web/components/assistant-ui/assistant-message.tsx
@@ -24,6 +24,8 @@ import dynamic from "next/dynamic";
 import type { FC } from "react";
 import { useEffect, useMemo, useRef, useState } from "react";
 import { commentsEnabledAtom, targetCommentIdAtom } from "@/atoms/chat/current-thread.atom";
+import { tryGetHostname } from "@/lib/url";
+
 import {
 	globalNewLLMConfigsAtom,
 	newLLMConfigsAtom,
@@ -99,20 +101,12 @@ const GenerateImageToolUI = dynamic(
 		import("@/components/tool-ui/generate-image").then((m) => ({ default: m.GenerateImageToolUI })),
 	{ ssr: false }
 );
-function extractDomain(url: string): string | undefined {
-	try {
-		return new URL(url).hostname.replace(/^www\./, "");
-	} catch {
-		return undefined;
-	}
-}
-
 function useCitationsFromMetadata(): SerializableCitation[] {
 	const allCitations = useAllCitationMetadata();
 	return useMemo(() => {
 		const result: SerializableCitation[] = [];
 		for (const [url, meta] of allCitations) {
-			const domain = extractDomain(url);
+			const domain = tryGetHostname(url);
 			result.push({
 				id: `url-cite-${url}`,
 				href: url,
diff --git a/surfsense_web/components/assistant-ui/inline-citation.tsx b/surfsense_web/components/assistant-ui/inline-citation.tsx
index 32a29cfc9..f0d9013bf 100644
--- a/surfsense_web/components/assistant-ui/inline-citation.tsx
+++ b/surfsense_web/components/assistant-ui/inline-citation.tsx
@@ -193,14 +193,7 @@ const SurfsenseDocCitation: FC<{ chunkId: number }> = ({ chunkId }) => {
 	);
 };
 
-function extractDomain(url: string): string {
-	try {
-		const hostname = new URL(url).hostname;
-		return hostname.replace(/^www\./, "");
-	} catch {
-		return url;
-	}
-}
+import { tryGetHostname } from "@/lib/url";
 
 interface UrlCitationProps {
 	url: string;
@@ -212,7 +205,7 @@ interface UrlCitationProps {
  * page title and snippet (extracted deterministically from web_search tool results).
  */
 export const UrlCitation: FC<UrlCitationProps> = ({ url }) => {
-	const domain = extractDomain(url);
+	const domain = tryGetHostname(url) ?? url;
 	const meta = useCitationMetadata(url);
 
 	return (
diff --git a/surfsense_web/components/assistant-ui/markdown-text.tsx b/surfsense_web/components/assistant-ui/markdown-text.tsx
index 1bb7cf2d9..43d435d20 100644
--- a/surfsense_web/components/assistant-ui/markdown-text.tsx
+++ b/surfsense_web/components/assistant-ui/markdown-text.tsx
@@ -23,6 +23,8 @@ import "katex/dist/katex.min.css";
 import { toast } from "sonner";
 import { processChildrenWithCitations } from "@/components/citations/citation-renderer";
 import { Skeleton } from "@/components/ui/skeleton";
+import { tryGetHostname } from "@/lib/url";
+
 import {
 	Table,
 	TableBody,
@@ -139,15 +141,6 @@ const MarkdownTextImpl = () => {
 
 export const MarkdownText = memo(MarkdownTextImpl);
 
-function extractDomain(url: string): string {
-	try {
-		const parsed = new URL(url);
-		return parsed.hostname.replace(/^www\./, "");
-	} catch {
-		return "";
-	}
-}
-
 // Canonical local-file virtual paths are mount-prefixed: /<mount>/<relative/path>
 const LOCAL_FILE_PATH_REGEX = /^\/[a-z0-9_-]+\/[^\s`]+(?:\/[^\s`]+)*$/;
 
@@ -288,7 +281,7 @@ function FilePathLink({ path, className }: { path: string; className?: string })
 function MarkdownImage({ src, alt }: { src?: string; alt?: string }) {
 	if (!src) return null;
 
-	const domain = extractDomain(src);
+	const domain = tryGetHostname(src) ?? "";
 
 	return (
 		<div className="my-4 w-fit max-w-lg overflow-hidden rounded-2xl border bg-muted/30 select-none">
diff --git a/surfsense_web/components/tool-ui/citation/citation.tsx b/surfsense_web/components/tool-ui/citation/citation.tsx
index 05ce214f3..a7c82de8c 100644
--- a/surfsense_web/components/tool-ui/citation/citation.tsx
+++ b/surfsense_web/components/tool-ui/citation/citation.tsx
@@ -6,19 +6,11 @@ import * as React from "react";
 import { openSafeNavigationHref, sanitizeHref } from "../shared/media";
 import { cn, Popover, PopoverContent, PopoverTrigger } from "./_adapter";
 import type { CitationVariant, SerializableCitation } from "./schema";
+import { tryGetHostname } from "@/lib/url";
 import { TYPE_ICONS } from "./type-icons";
 
 const FALLBACK_LOCALE = "en-US";
 
-function extractDomain(url: string): string | undefined {
-	try {
-		const urlObj = new URL(url);
-		return urlObj.hostname.replace(/^www\./, "");
-	} catch {
-		return undefined;
-	}
-}
-
 function formatDate(isoString: string, locale: string): string {
 	try {
 		const date = new Date(isoString);
@@ -78,7 +70,7 @@ export function Citation(props: CitationProps) {
 
 	const locale = providedLocale ?? FALLBACK_LOCALE;
 	const sanitizedHref = sanitizeHref(rawHref);
-	const domain = providedDomain ?? extractDomain(rawHref);
+	const domain = providedDomain ?? tryGetHostname(rawHref);
 
 	const citationData: SerializableCitation = {
 		...serializable,
diff --git a/surfsense_web/lib/url.ts b/surfsense_web/lib/url.ts
new file mode 100644
index 000000000..0c9227581
--- /dev/null
+++ b/surfsense_web/lib/url.ts
@@ -0,0 +1,14 @@
+/**
+ * Extract a normalized hostname from a URL. Strips a leading `www.`.
+ * Returns `undefined` if the input is not a parseable URL.
+ *
+ * This is the canonical replacement for the four previously-duplicated
+ * `extractDomain` helpers that had subtly different error fallbacks.
+ */
+export function tryGetHostname(url: string): string | undefined {
+    try {
+        return new URL(url).hostname.replace(/^www\./, "");
+    } catch {
+        return undefined;
+    }
+}

From 9c5a8c00b99837be53cdc4b5f71822b66badab1b Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Sat, 16 May 2026 19:16:28 +0530
Subject: [PATCH 64/96] refactor: improve error handling layout in
 CitationPanel and update Separator styling across multiple components for
 consistency

---
 .../components/citation-panel/citation-panel.tsx          | 8 +++++---
 surfsense_web/components/shared/image-config-dialog.tsx   | 2 +-
 surfsense_web/components/shared/llm-config-form.tsx       | 4 ++--
 surfsense_web/components/shared/vision-config-dialog.tsx  | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/surfsense_web/components/citation-panel/citation-panel.tsx b/surfsense_web/components/citation-panel/citation-panel.tsx
index a63efa296..890ac11ac 100644
--- a/surfsense_web/components/citation-panel/citation-panel.tsx
+++ b/surfsense_web/components/citation-panel/citation-panel.tsx
@@ -133,9 +133,11 @@ export const CitationPanelContent: FC<CitationPanelContentProps> = ({
 				)}
 
 				{error && (
-					<p className="py-8 text-sm text-destructive">
-						{error instanceof Error ? error.message : "Failed to load citation"}
-					</p>
+					<div className="flex min-h-full items-center justify-center text-center">
+						<p className="text-sm text-destructive">
+							{error instanceof Error ? error.message : "Failed to load citation"}
+						</p>
+					</div>
 				)}
 
 				{!isLoading && !error && data && (
diff --git a/surfsense_web/components/shared/image-config-dialog.tsx b/surfsense_web/components/shared/image-config-dialog.tsx
index 1b94f0a35..36d16081a 100644
--- a/surfsense_web/components/shared/image-config-dialog.tsx
+++ b/surfsense_web/components/shared/image-config-dialog.tsx
@@ -298,7 +298,7 @@ export function ImageConfigDialog({
 								/>
 							</div>
 
-							<Separator />
+							<Separator className="bg-popover-border" />
 
 							<div className="space-y-2">
 								<Label className="text-sm font-medium">Provider *</Label>
diff --git a/surfsense_web/components/shared/llm-config-form.tsx b/surfsense_web/components/shared/llm-config-form.tsx
index 6b00408cb..1356ed58f 100644
--- a/surfsense_web/components/shared/llm-config-form.tsx
+++ b/surfsense_web/components/shared/llm-config-form.tsx
@@ -404,7 +404,7 @@ export function LLMConfigForm({
 				{/* Advanced Parameters */}
 				{showAdvanced && (
 					<>
-						<Separator />
+						<Separator className="bg-popover-border" />
 						<Collapsible open={advancedOpen} onOpenChange={setAdvancedOpen}>
 							<CollapsibleTrigger asChild>
 								<Button
@@ -443,7 +443,7 @@ export function LLMConfigForm({
 				)}
 
 				{/* System Instructions & Citations Section */}
-				<Separator />
+				<Separator className="bg-popover-border" />
 				<Collapsible open={systemInstructionsOpen} onOpenChange={setSystemInstructionsOpen}>
 					<CollapsibleTrigger asChild>
 						<Button
diff --git a/surfsense_web/components/shared/vision-config-dialog.tsx b/surfsense_web/components/shared/vision-config-dialog.tsx
index f8268562a..2646f3842 100644
--- a/surfsense_web/components/shared/vision-config-dialog.tsx
+++ b/surfsense_web/components/shared/vision-config-dialog.tsx
@@ -299,7 +299,7 @@ export function VisionConfigDialog({
 								/>
 							</div>
 
-							<Separator />
+							<Separator className="bg-popover-border" />
 
 							<div className="space-y-2">
 								<Label className="text-sm font-medium">Provider *</Label>

From cc06cff4fb0054890e9bf52efbfa3345b904c11f Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Sat, 16 May 2026 20:20:04 +0530
Subject: [PATCH 65/96] feat(tests): add mock response for file ownership in
 composio_module

---
 .../tests/e2e/fakes/composio_module.py        | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/surfsense_backend/tests/e2e/fakes/composio_module.py b/surfsense_backend/tests/e2e/fakes/composio_module.py
index 38c4d4c46..16a93d0f1 100644
--- a/surfsense_backend/tests/e2e/fakes/composio_module.py
+++ b/surfsense_backend/tests/e2e/fakes/composio_module.py
@@ -350,6 +350,25 @@ def _drive_list_files(args: dict[str, Any]) -> dict[str, Any]:
     folder id and serve the matching fixture list.
     """
     q = args.get("q", "")
+    if "in owners" in q:
+        return {
+            "data": {
+                "files": [
+                    {
+                        "id": "fake-file-owner-probe",
+                        "name": "owner-probe",
+                        "owners": [
+                            {
+                                "me": True,
+                                "emailAddress": "e2e-fake@surfsense.example",
+                            }
+                        ],
+                    }
+                ],
+                "nextPageToken": None,
+            }
+        }
+
     folder_id = "root"
     if "in parents" in q:
         # q looks like:  '<folder_id>' in parents and trashed = false ...

From a0f2563dc35158be98f997272a72ed01b9cd2fec Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Sat, 16 May 2026 21:13:17 +0530
Subject: [PATCH 66/96] test: update Stripe and Google Calendar integration
 tests to use ComposioService

---
 .../test_stripe_page_purchases.py             |  1 +
 .../test_calendar_indexer_credentials.py      | 61 +++++++++++--------
 2 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/surfsense_backend/tests/integration/document_upload/test_stripe_page_purchases.py b/surfsense_backend/tests/integration/document_upload/test_stripe_page_purchases.py
index 1c8f7f990..143c9e252 100644
--- a/surfsense_backend/tests/integration/document_upload/test_stripe_page_purchases.py
+++ b/surfsense_backend/tests/integration/document_upload/test_stripe_page_purchases.py
@@ -204,6 +204,7 @@ class TestStripeCheckoutSessionCreation:
         assert (
             fake_client.last_params["success_url"]
             == f"http://localhost:3000/dashboard/{search_space_id}/purchase-success"
+            "?session_id={CHECKOUT_SESSION_ID}"
         )
         assert (
             fake_client.last_params["cancel_url"]
diff --git a/surfsense_backend/tests/integration/google_unification/test_calendar_indexer_credentials.py b/surfsense_backend/tests/integration/google_unification/test_calendar_indexer_credentials.py
index 795f0d564..44ff5c48a 100644
--- a/surfsense_backend/tests/integration/google_unification/test_calendar_indexer_credentials.py
+++ b/surfsense_backend/tests/integration/google_unification/test_calendar_indexer_credentials.py
@@ -7,7 +7,7 @@ mocked at their system boundaries.
 
 from __future__ import annotations
 
-from unittest.mock import AsyncMock, MagicMock, patch
+from unittest.mock import ANY, AsyncMock, MagicMock, patch
 
 import pytest
 import pytest_asyncio
@@ -25,6 +25,7 @@ pytestmark = pytest.mark.integration
 
 _COMPOSIO_ACCOUNT_ID = "composio-calendar-test-789"
 _INDEXER_MODULE = "app.tasks.connector_indexers.google_calendar_indexer"
+_GET_ACCESS_TOKEN = "app.services.composio_service.ComposioService.get_access_token"
 
 
 @pytest_asyncio.fixture
@@ -69,32 +70,29 @@ async def native_calendar(async_engine):
     await cleanup_space(async_engine, data["search_space_id"])
 
 
+@patch(_GET_ACCESS_TOKEN)
 @patch(f"{_INDEXER_MODULE}.TaskLoggingService")
 @patch(f"{_INDEXER_MODULE}.GoogleCalendarConnector")
-@patch(f"{_INDEXER_MODULE}.build_composio_credentials")
-async def test_composio_calendar_uses_composio_credentials(
-    mock_build_creds,
+@patch(f"{_INDEXER_MODULE}.ComposioService")
+async def test_composio_calendar_uses_composio_service(
+    mock_composio_service_cls,
     mock_cal_cls,
     mock_tl_cls,
+    mock_get_access_token,
     async_engine,
     composio_calendar,
 ):
-    """Calendar indexer calls build_composio_credentials for a Composio connector."""
+    """Calendar indexer uses Composio tools directly for a Composio connector."""
     from app.tasks.connector_indexers.google_calendar_indexer import (
         index_google_calendar_events,
     )
 
     data = composio_calendar
-    mock_creds = MagicMock(name="composio-creds")
-    mock_build_creds.return_value = mock_creds
+    mock_composio_service = MagicMock()
+    mock_composio_service.get_calendar_events = AsyncMock(return_value=([], None))
+    mock_composio_service_cls.return_value = mock_composio_service
     mock_tl_cls.return_value = mock_task_logger()
 
-    mock_cal_instance = MagicMock()
-    mock_cal_instance.get_all_primary_calendar_events = AsyncMock(
-        return_value=([], None)
-    )
-    mock_cal_cls.return_value = mock_cal_instance
-
     maker = make_session_factory(async_engine)
     async with maker() as session:
         await index_google_calendar_events(
@@ -104,17 +102,25 @@ async def test_composio_calendar_uses_composio_credentials(
             user_id=data["user_id"],
         )
 
-    mock_build_creds.assert_called_once_with(_COMPOSIO_ACCOUNT_ID)
-    mock_cal_cls.assert_called_once()
-    _, kwargs = mock_cal_cls.call_args
-    assert kwargs.get("credentials") is mock_creds
+    mock_composio_service_cls.assert_called_once()
+    mock_composio_service.get_calendar_events.assert_called_once_with(
+        connected_account_id=_COMPOSIO_ACCOUNT_ID,
+        entity_id=f"surfsense_{data['user_id']}",
+        time_min=ANY,
+        time_max=ANY,
+        max_results=250,
+    )
+    mock_cal_cls.assert_not_called()
+    mock_get_access_token.assert_not_called()
 
 
+@patch(_GET_ACCESS_TOKEN)
 @patch(f"{_INDEXER_MODULE}.TaskLoggingService")
-@patch(f"{_INDEXER_MODULE}.build_composio_credentials")
+@patch(f"{_INDEXER_MODULE}.ComposioService")
 async def test_composio_calendar_without_account_id_returns_error(
-    mock_build_creds,
+    mock_composio_service_cls,
     mock_tl_cls,
+    mock_get_access_token,
     async_engine,
     composio_calendar_no_id,
 ):
@@ -138,20 +144,23 @@ async def test_composio_calendar_without_account_id_returns_error(
     assert count == 0
     assert error is not None
     assert "composio" in error.lower()
-    mock_build_creds.assert_not_called()
+    mock_composio_service_cls.assert_not_called()
+    mock_get_access_token.assert_not_called()
 
 
+@patch(_GET_ACCESS_TOKEN)
 @patch(f"{_INDEXER_MODULE}.TaskLoggingService")
+@patch(f"{_INDEXER_MODULE}.ComposioService")
 @patch(f"{_INDEXER_MODULE}.GoogleCalendarConnector")
-@patch(f"{_INDEXER_MODULE}.build_composio_credentials")
-async def test_native_calendar_does_not_use_composio_credentials(
-    mock_build_creds,
+async def test_native_calendar_uses_google_calendar_connector(
     mock_cal_cls,
+    mock_composio_service_cls,
     mock_tl_cls,
+    mock_get_access_token,
     async_engine,
     native_calendar,
 ):
-    """Calendar indexer does NOT call build_composio_credentials for a native connector."""
+    """Native Calendar connector uses GoogleCalendarConnector with no Composio path."""
     from app.tasks.connector_indexers.google_calendar_indexer import (
         index_google_calendar_events,
     )
@@ -174,4 +183,6 @@ async def test_native_calendar_does_not_use_composio_credentials(
             user_id=data["user_id"],
         )
 
-    mock_build_creds.assert_not_called()
+    mock_cal_cls.assert_called_once()
+    mock_composio_service_cls.assert_not_called()
+    mock_get_access_token.assert_not_called()

From cb9a0f327caa8b2bc3a5e7e40f737c22a77a1823 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Sat, 16 May 2026 21:26:40 +0530
Subject: [PATCH 67/96] test: refactor Gmail indexer tests to utilize
 ComposioService and hybrid chunking

---
 .../tests/integration/conftest.py             |  4 ++
 .../test_gmail_indexer_credentials.py         | 62 ++++++++++++-------
 .../adapters/test_file_upload_adapter.py      |  2 +-
 3 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/surfsense_backend/tests/integration/conftest.py b/surfsense_backend/tests/integration/conftest.py
index 2f4b3fe9a..e03101e63 100644
--- a/surfsense_backend/tests/integration/conftest.py
+++ b/surfsense_backend/tests/integration/conftest.py
@@ -160,6 +160,10 @@ def patched_chunk_text(monkeypatch) -> MagicMock:
         "app.indexing_pipeline.indexing_pipeline_service.chunk_text",
         mock,
     )
+    monkeypatch.setattr(
+        "app.indexing_pipeline.indexing_pipeline_service.chunk_text_hybrid",
+        mock,
+    )
     return mock
 
 
diff --git a/surfsense_backend/tests/integration/google_unification/test_gmail_indexer_credentials.py b/surfsense_backend/tests/integration/google_unification/test_gmail_indexer_credentials.py
index afb3e64c3..b869f5607 100644
--- a/surfsense_backend/tests/integration/google_unification/test_gmail_indexer_credentials.py
+++ b/surfsense_backend/tests/integration/google_unification/test_gmail_indexer_credentials.py
@@ -7,7 +7,7 @@ mocked at their system boundaries.
 
 from __future__ import annotations
 
-from unittest.mock import AsyncMock, MagicMock, patch
+from unittest.mock import ANY, AsyncMock, MagicMock, patch
 
 import pytest
 import pytest_asyncio
@@ -25,6 +25,7 @@ pytestmark = pytest.mark.integration
 
 _COMPOSIO_ACCOUNT_ID = "composio-gmail-test-456"
 _INDEXER_MODULE = "app.tasks.connector_indexers.google_gmail_indexer"
+_GET_ACCESS_TOKEN = "app.services.composio_service.ComposioService.get_access_token"
 
 
 @pytest_asyncio.fixture
@@ -69,30 +70,32 @@ async def native_gmail(async_engine):
     await cleanup_space(async_engine, data["search_space_id"])
 
 
+@patch(_GET_ACCESS_TOKEN)
 @patch(f"{_INDEXER_MODULE}.TaskLoggingService")
 @patch(f"{_INDEXER_MODULE}.GoogleGmailConnector")
-@patch(f"{_INDEXER_MODULE}.build_composio_credentials")
-async def test_composio_gmail_uses_composio_credentials(
-    mock_build_creds,
+@patch(f"{_INDEXER_MODULE}.ComposioService")
+async def test_composio_gmail_uses_composio_service(
+    mock_composio_service_cls,
     mock_gmail_cls,
     mock_tl_cls,
+    mock_get_access_token,
     async_engine,
     composio_gmail,
 ):
-    """Gmail indexer calls build_composio_credentials for a Composio connector."""
+    """Gmail indexer uses Composio tools directly for a Composio connector."""
     from app.tasks.connector_indexers.google_gmail_indexer import (
         index_google_gmail_messages,
     )
 
     data = composio_gmail
-    mock_creds = MagicMock(name="composio-creds")
-    mock_build_creds.return_value = mock_creds
+    mock_composio_service = MagicMock()
+    mock_composio_service.get_gmail_messages = AsyncMock(
+        return_value=([], None, None, None)
+    )
+    mock_composio_service.get_gmail_message_detail = AsyncMock(return_value=({}, None))
+    mock_composio_service_cls.return_value = mock_composio_service
     mock_tl_cls.return_value = mock_task_logger()
 
-    mock_gmail_instance = MagicMock()
-    mock_gmail_instance.get_recent_messages = AsyncMock(return_value=([], None))
-    mock_gmail_cls.return_value = mock_gmail_instance
-
     maker = make_session_factory(async_engine)
     async with maker() as session:
         await index_google_gmail_messages(
@@ -102,17 +105,25 @@ async def test_composio_gmail_uses_composio_credentials(
             user_id=data["user_id"],
         )
 
-    mock_build_creds.assert_called_once_with(_COMPOSIO_ACCOUNT_ID)
-    mock_gmail_cls.assert_called_once()
-    args, _ = mock_gmail_cls.call_args
-    assert args[0] is mock_creds
+    mock_composio_service_cls.assert_called_once()
+    mock_composio_service.get_gmail_messages.assert_called_once_with(
+        connected_account_id=_COMPOSIO_ACCOUNT_ID,
+        entity_id=f"surfsense_{data['user_id']}",
+        query=ANY,
+        max_results=ANY,
+        page_token=None,
+    )
+    mock_gmail_cls.assert_not_called()
+    mock_get_access_token.assert_not_called()
 
 
+@patch(_GET_ACCESS_TOKEN)
 @patch(f"{_INDEXER_MODULE}.TaskLoggingService")
-@patch(f"{_INDEXER_MODULE}.build_composio_credentials")
+@patch(f"{_INDEXER_MODULE}.ComposioService")
 async def test_composio_gmail_without_account_id_returns_error(
-    mock_build_creds,
+    mock_composio_service_cls,
     mock_tl_cls,
+    mock_get_access_token,
     async_engine,
     composio_gmail_no_id,
 ):
@@ -136,20 +147,23 @@ async def test_composio_gmail_without_account_id_returns_error(
     assert count == 0
     assert error is not None
     assert "composio" in error.lower()
-    mock_build_creds.assert_not_called()
+    mock_composio_service_cls.assert_not_called()
+    mock_get_access_token.assert_not_called()
 
 
+@patch(_GET_ACCESS_TOKEN)
 @patch(f"{_INDEXER_MODULE}.TaskLoggingService")
+@patch(f"{_INDEXER_MODULE}.ComposioService")
 @patch(f"{_INDEXER_MODULE}.GoogleGmailConnector")
-@patch(f"{_INDEXER_MODULE}.build_composio_credentials")
-async def test_native_gmail_does_not_use_composio_credentials(
-    mock_build_creds,
+async def test_native_gmail_uses_google_gmail_connector(
     mock_gmail_cls,
+    mock_composio_service_cls,
     mock_tl_cls,
+    mock_get_access_token,
     async_engine,
     native_gmail,
 ):
-    """Gmail indexer does NOT call build_composio_credentials for a native connector."""
+    """Native Gmail connector uses GoogleGmailConnector with no Composio path."""
     from app.tasks.connector_indexers.google_gmail_indexer import (
         index_google_gmail_messages,
     )
@@ -170,4 +184,6 @@ async def test_native_gmail_does_not_use_composio_credentials(
             user_id=data["user_id"],
         )
 
-    mock_build_creds.assert_not_called()
+    mock_gmail_cls.assert_called_once()
+    mock_composio_service_cls.assert_not_called()
+    mock_get_access_token.assert_not_called()
diff --git a/surfsense_backend/tests/integration/indexing_pipeline/adapters/test_file_upload_adapter.py b/surfsense_backend/tests/integration/indexing_pipeline/adapters/test_file_upload_adapter.py
index 9fc802aa6..6bb1d2094 100644
--- a/surfsense_backend/tests/integration/indexing_pipeline/adapters/test_file_upload_adapter.py
+++ b/surfsense_backend/tests/integration/indexing_pipeline/adapters/test_file_upload_adapter.py
@@ -200,7 +200,7 @@ async def test_reindex_sets_status_ready(db_session, db_search_space, db_user, m
 async def test_reindex_replaces_chunks(db_session, db_search_space, db_user, mocker):
     """Reindexing replaces old chunks with new content rather than appending."""
     mocker.patch(
-        "app.indexing_pipeline.indexing_pipeline_service.chunk_text",
+        "app.indexing_pipeline.indexing_pipeline_service.chunk_text_hybrid",
         side_effect=[["Original chunk."], ["Updated chunk."]],
     )
 

From b52e5780211521d49bfe8b2d82a5c671ae0cd644 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Sun, 17 May 2026 00:57:35 +0530
Subject: [PATCH 68/96] refactor: replace Popover with DropdownMenu in
 ComposerAction and clean up unused state management

---
 .../components/assistant-ui/thread.tsx        | 299 ++++++++----------
 surfsense_web/components/ui/tooltip.tsx       |   2 +-
 2 files changed, 129 insertions(+), 172 deletions(-)

diff --git a/surfsense_web/components/assistant-ui/thread.tsx b/surfsense_web/components/assistant-ui/thread.tsx
index 7994af8ac..92bcc31e9 100644
--- a/surfsense_web/components/assistant-ui/thread.tsx
+++ b/surfsense_web/components/assistant-ui/thread.tsx
@@ -14,7 +14,6 @@ import {
 	ChevronDown,
 	ChevronUp,
 	Clipboard,
-	Dot,
 	Globe,
 	Plus,
 	Settings2,
@@ -83,12 +82,14 @@ import {
 	DropdownMenu,
 	DropdownMenuContent,
 	DropdownMenuItem,
+	DropdownMenuPortal,
+	DropdownMenuSub,
+	DropdownMenuSubContent,
+	DropdownMenuSubTrigger,
 	DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
-import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
 import { Skeleton } from "@/components/ui/skeleton";
 import { Switch } from "@/components/ui/switch";
-import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { getConnectorIcon } from "@/contracts/enums/connectorIcons";
 import {
 	CONNECTOR_ICON_TO_TYPES,
@@ -776,24 +777,6 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 	const [toolsPopoverOpen, setToolsPopoverOpen] = useState(false);
 	const isDesktop = useMediaQuery("(min-width: 640px)");
 	const { openDialog: openUploadDialog } = useDocumentUploadDialog();
-	const [toolsScrollPos, setToolsScrollPos] = useState<"top" | "middle" | "bottom">("top");
-	const toolsRafRef = useRef<number | undefined>(undefined);
-	const handleToolsScroll = useCallback((e: React.UIEvent<HTMLDivElement>) => {
-		const el = e.currentTarget;
-		if (toolsRafRef.current) return;
-		toolsRafRef.current = requestAnimationFrame(() => {
-			const atTop = el.scrollTop <= 2;
-			const atBottom = el.scrollHeight - el.scrollTop - el.clientHeight <= 2;
-			setToolsScrollPos(atTop ? "top" : atBottom ? "bottom" : "middle");
-			toolsRafRef.current = undefined;
-		});
-	}, []);
-	useEffect(
-		() => () => {
-			if (toolsRafRef.current) cancelAnimationFrame(toolsRafRef.current);
-		},
-		[]
-	);
 	const pendingScreenImages = useAtomValue(pendingUserImageDataUrlsAtom);
 	const setPendingScreenImages = useSetAtom(pendingUserImageDataUrlsAtom);
 	const electronAPI = useElectronAPI();
@@ -943,10 +926,7 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 										Manage Tools
 									</DrawerTitle>
 								</DrawerHeader>
-								<div
-									className="min-h-0 flex-1 overflow-y-auto scrollbar-thin pb-6"
-									onScroll={handleToolsScroll}
-								>
+								<div className="min-h-0 flex-1 overflow-y-auto scrollbar-thin pb-6">
 									{groupedTools
 										.filter((g) => !g.connectorIcon)
 										.map((group) => (
@@ -1043,153 +1023,143 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 						</Drawer>
 					</>
 				) : (
-					<Popover open={toolsPopoverOpen} onOpenChange={setToolsPopoverOpen}>
-						<PopoverTrigger asChild>
+					<DropdownMenu onOpenChange={(open) => !open && setToolsPopoverOpen(false)}>
+						<DropdownMenuTrigger asChild>
 							<TooltipIconButton
-								tooltip="Manage tools"
+								tooltip="More actions"
 								side="bottom"
 								disableTooltip={toolsPopoverOpen}
 								variant="ghost"
 								size="icon"
 								className="size-[34px] rounded-full p-1 font-semibold text-xs dark:border-muted-foreground/15 hover:bg-accent hover:text-accent-foreground"
-								aria-label="Manage tools"
+								aria-label="More actions"
 								data-joyride="connector-icon"
 							>
-								<Settings2 className="size-4" />
+								<Plus className="size-4" />
 							</TooltipIconButton>
-						</PopoverTrigger>
-						<PopoverContent
-							side="bottom"
-							align="start"
-							sideOffset={12}
-							className="w-[calc(100vw-2rem)] max-w-48 sm:max-w-56 sm:w-56 p-0 select-none"
-							onOpenAutoFocus={(e) => e.preventDefault()}
-						>
-							<div className="sr-only">Manage Tools</div>
-							<div
-								className="max-h-44 sm:max-h-56 overflow-y-auto overscroll-none py-0.5"
-								onScroll={handleToolsScroll}
-								style={{
-									maskImage: `linear-gradient(to bottom, ${toolsScrollPos === "top" ? "black" : "transparent"}, black 16px, black calc(100% - 16px), ${toolsScrollPos === "bottom" ? "black" : "transparent"})`,
-									WebkitMaskImage: `linear-gradient(to bottom, ${toolsScrollPos === "top" ? "black" : "transparent"}, black 16px, black calc(100% - 16px), ${toolsScrollPos === "bottom" ? "black" : "transparent"})`,
-								}}
-							>
-								{groupedTools
-									.filter((g) => !g.connectorIcon)
-									.map((group) => (
-										<div key={group.label}>
-											<div className="px-2 sm:px-2.5 pt-1.5 pb-0.5 text-[9px] sm:text-[10px] text-muted-foreground/80 font-normal select-none">
-												{group.label}
-											</div>
-											{group.tools.map((tool) => {
-												const isDisabled = disabledToolsSet.has(tool.name);
-												const ToolIcon = getToolIcon(tool.name);
-												const row = (
-													<div className="flex w-full items-center gap-1.5 sm:gap-2 px-2 sm:px-2.5 py-0.5 sm:py-1 hover:bg-accent hover:text-accent-foreground transition-colors">
-														<ToolIcon className="size-3 sm:size-3.5 shrink-0 text-muted-foreground" />
-														<span className="flex-1 min-w-0 text-[11px] sm:text-xs font-medium truncate">
-															{formatToolName(tool.name)}
-														</span>
-														<Switch
-															checked={!isDisabled}
-															onCheckedChange={() => toggleTool(tool.name)}
-															className="shrink-0 scale-50 sm:scale-[0.6]"
-														/>
-													</div>
-												);
-												return (
-													<Tooltip key={tool.name}>
-														<TooltipTrigger asChild>{row}</TooltipTrigger>
-														<TooltipContent side="right" className="max-w-64 text-xs">
-															{tool.description}
-														</TooltipContent>
-													</Tooltip>
-												);
-											})}
-										</div>
-									))}
-								{groupedTools.some((g) => g.connectorIcon) && (
-									<div>
-										<div className="px-2 sm:px-2.5 pt-1.5 pb-0.5 text-[9px] sm:text-[10px] text-muted-foreground/80 font-normal select-none">
-											Connector Actions
-										</div>
+						</DropdownMenuTrigger>
+						<DropdownMenuContent className="w-48" side="bottom" align="start" sideOffset={8}>
+							<DropdownMenuItem onSelect={() => openUploadDialog()}>
+								<Upload className="h-4 w-4" />
+								Upload Files
+							</DropdownMenuItem>
+							<DropdownMenuItem onSelect={() => void handleScreenCapture()}>
+								<Camera className="h-4 w-4" />
+								Take a screenshot
+							</DropdownMenuItem>
+							<DropdownMenuSub open={toolsPopoverOpen} onOpenChange={setToolsPopoverOpen}>
+								<DropdownMenuSubTrigger>
+									<Settings2 className="h-4 w-4" />
+									Manage Tools
+								</DropdownMenuSubTrigger>
+								<DropdownMenuPortal>
+									<DropdownMenuSubContent
+										alignOffset={-192}
+										collisionPadding={8}
+										className="w-60 h-56 gap-1 overflow-y-auto overscroll-none"
+									>
 										{groupedTools
-											.filter((g) => g.connectorIcon)
-											.map((group) => {
-												const iconKey = group.connectorIcon ?? "";
-												const iconInfo = CONNECTOR_TOOL_ICON_PATHS[iconKey];
-												const toolNames = group.tools.map((t) => t.name);
-												const allDisabled = toolNames.every((n) => disabledToolsSet.has(n));
-												const groupDef = TOOL_GROUPS.find((g) => g.label === group.label);
-												const row = (
-													<div className="flex w-full items-center gap-1.5 sm:gap-2 px-2 sm:px-2.5 py-0.5 sm:py-1 hover:bg-accent hover:text-accent-foreground transition-colors">
-														{iconInfo ? (
-															<Image
-																src={iconInfo.src}
-																alt={iconInfo.alt}
-																width={14}
-																height={14}
-																className="size-3 sm:size-3.5 shrink-0 select-none pointer-events-none"
-																draggable={false}
-															/>
-														) : (
-															<Wrench className="size-3 sm:size-3.5 shrink-0 text-muted-foreground" />
-														)}
-														<span className="flex-1 min-w-0 text-[11px] sm:text-xs font-medium truncate">
-															{group.label}
-														</span>
-														<Switch
-															checked={!allDisabled}
-															onCheckedChange={() => toggleToolGroup(toolNames)}
-															className="shrink-0 scale-50 sm:scale-[0.6]"
-														/>
+											.filter((g) => !g.connectorIcon)
+											.map((group) => (
+												<div key={group.label}>
+													<div className="px-2 pt-1.5 pb-0.5 text-[10px] text-muted-foreground/80 font-normal select-none">
+														{group.label}
 													</div>
-												);
-												return (
-													<Tooltip key={group.label}>
-														<TooltipTrigger asChild>{row}</TooltipTrigger>
-														<TooltipContent side="right" className="max-w-72 text-xs">
-															{groupDef?.tooltip ??
-																group.tools.flatMap((t, i) =>
-																	i === 0
-																		? [t.description]
-																		: [
-																				<Dot
-																					key={`dot-${group.label}-${t.description}`}
-																					className="inline h-4 w-4"
-																				/>,
-																				t.description,
-																			]
+													{group.tools.map((tool) => {
+														const isDisabled = disabledToolsSet.has(tool.name);
+														const ToolIcon = getToolIcon(tool.name);
+														return (
+															<DropdownMenuItem
+																key={tool.name}
+																onSelect={(e) => {
+																	e.preventDefault();
+																	toggleTool(tool.name);
+																}}
+																className={cn(
+																	"mb-1 last:mb-0 transition-all",
+																	"hover:bg-accent hover:text-accent-foreground",
+																	!isDisabled && "text-primary"
 																)}
-														</TooltipContent>
-													</Tooltip>
-												);
-											})}
-									</div>
-								)}
-								{!filteredTools?.length && (
-									<div className="px-2 sm:px-2.5 pt-1.5 pb-1">
-										<Skeleton className="h-2 w-12 mb-1.5" />
-										{["dt1", "dt2", "dt3", "dt4"].map((k) => (
-											<div key={k} className="flex items-center gap-1.5 sm:gap-2 py-0.5 sm:py-1">
-												<Skeleton className="size-3 sm:size-3.5 rounded shrink-0" />
-												<Skeleton className="h-2.5 sm:h-3 flex-1" />
-												<Skeleton className="h-3.5 sm:h-4 w-7 sm:w-8 rounded-full shrink-0" />
+															>
+																<ToolIcon className="h-4 w-4" />
+																<span className="flex-1 min-w-0 truncate">
+																	{formatToolName(tool.name)}
+																</span>
+																<Switch
+																	checked={!isDisabled}
+																	tabIndex={-1}
+																	className="pointer-events-none shrink-0 scale-[0.6]"
+																/>
+															</DropdownMenuItem>
+														);
+													})}
+												</div>
+											))}
+										{groupedTools.some((g) => g.connectorIcon) && (
+											<div>
+												<div className="px-2 pt-1.5 pb-0.5 text-[10px] text-muted-foreground/80 font-normal select-none">
+													Connector Actions
+												</div>
+												{groupedTools
+													.filter((g) => g.connectorIcon)
+													.map((group) => {
+														const iconKey = group.connectorIcon ?? "";
+														const iconInfo = CONNECTOR_TOOL_ICON_PATHS[iconKey];
+														const toolNames = group.tools.map((t) => t.name);
+														const allDisabled = toolNames.every((n) => disabledToolsSet.has(n));
+														return (
+															<DropdownMenuItem
+																key={group.label}
+																onSelect={(e) => {
+																	e.preventDefault();
+																	toggleToolGroup(toolNames);
+																}}
+																className={cn(
+																	"mb-1 last:mb-0 transition-all",
+																	"hover:bg-accent hover:text-accent-foreground",
+																	!allDisabled && "text-primary"
+																)}
+															>
+																{iconInfo ? (
+																	<Image
+																		src={iconInfo.src}
+																		alt={iconInfo.alt}
+																		width={16}
+																		height={16}
+																		className="h-4 w-4 shrink-0 select-none pointer-events-none"
+																		draggable={false}
+																	/>
+																) : (
+																	<Wrench className="h-4 w-4" />
+																)}
+																<span className="flex-1 min-w-0 truncate">{group.label}</span>
+																<Switch
+																	checked={!allDisabled}
+																	tabIndex={-1}
+																	className="pointer-events-none shrink-0 scale-[0.6]"
+																/>
+															</DropdownMenuItem>
+														);
+													})}
 											</div>
-										))}
-										<Skeleton className="h-2 w-20 mt-2 mb-1.5" />
-										{["dc1", "dc2", "dc3"].map((k) => (
-											<div key={k} className="flex items-center gap-1.5 sm:gap-2 py-0.5 sm:py-1">
-												<Skeleton className="size-3 sm:size-3.5 rounded shrink-0" />
-												<Skeleton className="h-2.5 sm:h-3 flex-1" />
-												<Skeleton className="h-3.5 sm:h-4 w-7 sm:w-8 rounded-full shrink-0" />
+										)}
+										{!filteredTools?.length && (
+											<div className="px-2 pt-1.5 pb-1">
+												<Skeleton className="h-2 w-12 mb-1.5" />
+												{["dt1", "dt2", "dt3", "dt4"].map((k) => (
+													<div key={k} className="flex items-center gap-2 py-1">
+														<Skeleton className="h-4 w-4 rounded shrink-0" />
+														<Skeleton className="h-3 flex-1" />
+														<Skeleton className="h-4 w-8 rounded-full shrink-0" />
+													</div>
+												))}
 											</div>
-										))}
-									</div>
-								)}
-							</div>
-						</PopoverContent>
-					</Popover>
+										)}
+									</DropdownMenuSubContent>
+								</DropdownMenuPortal>
+							</DropdownMenuSub>
+						</DropdownMenuContent>
+					</DropdownMenu>
 				)}
 				{hasWebSearchTool && (
 					<Button
@@ -1243,19 +1213,6 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 				</div>
 			)}
 			<div className="flex items-center gap-2">
-				{isDesktop && (
-					<TooltipIconButton
-						tooltip="Capture screen"
-						type="button"
-						variant="ghost"
-						size="icon"
-						className="size-8 rounded-full"
-						aria-label="Capture screen"
-						onClick={() => void handleScreenCapture()}
-					>
-						<Camera className="size-4" />
-					</TooltipIconButton>
-				)}
 				<AuiIf condition={({ thread }) => !thread.isRunning}>
 					<ComposerPrimitive.Send asChild disabled={isSendDisabled}>
 						<TooltipIconButton
diff --git a/surfsense_web/components/ui/tooltip.tsx b/surfsense_web/components/ui/tooltip.tsx
index ef5dded61..80650aae3 100644
--- a/surfsense_web/components/ui/tooltip.tsx
+++ b/surfsense_web/components/ui/tooltip.tsx
@@ -71,7 +71,7 @@ function TooltipContent({
 				data-slot="tooltip-content"
 				sideOffset={sideOffset}
 				className={cn(
-					"bg-neutral-800 text-white font-medium shadow-xl px-3 py-1.5 dark:bg-neutral-800 dark:text-white border-none animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-fit rounded-md text-xs text-pretty pointer-events-none select-none",
+					"bg-neutral-800 text-white font-medium shadow-md shadow-neutral-950/40 px-3 py-1.5 dark:bg-neutral-800 dark:text-white border-none animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-fit rounded-md text-xs text-pretty pointer-events-none select-none",
 					className
 				)}
 				{...props}

From bd1d1c42a769d45dedf3a56bdb688f2ddd5c5d6e Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Sun, 17 May 2026 02:57:00 +0530
Subject: [PATCH 69/96] refactor: adjust thread max width and update button
 sizes in ComposerAction for improved UI consistency

---
 .../[search_space_id]/new-chat/loading.tsx    |   2 +-
 .../components/assistant-ui/thread.tsx        | 109 +++++++++---------
 surfsense_web/components/ui/switch.tsx        |   2 +-
 3 files changed, 55 insertions(+), 58 deletions(-)

diff --git a/surfsense_web/app/dashboard/[search_space_id]/new-chat/loading.tsx b/surfsense_web/app/dashboard/[search_space_id]/new-chat/loading.tsx
index e18100e6a..108671662 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/new-chat/loading.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/new-chat/loading.tsx
@@ -5,7 +5,7 @@ export default function Loading() {
 		<div
 			className="aui-root aui-thread-root @container flex h-full min-h-0 flex-col bg-main-panel"
 			style={{
-				["--thread-max-width" as string]: "44rem",
+				["--thread-max-width" as string]: "42rem",
 			}}
 		>
 			<div
diff --git a/surfsense_web/components/assistant-ui/thread.tsx b/surfsense_web/components/assistant-ui/thread.tsx
index 92bcc31e9..a3709911a 100644
--- a/surfsense_web/components/assistant-ui/thread.tsx
+++ b/surfsense_web/components/assistant-ui/thread.tsx
@@ -23,7 +23,6 @@ import {
 	Wrench,
 	X,
 } from "lucide-react";
-import { AnimatePresence, motion } from "motion/react";
 import Image from "next/image";
 import { useParams } from "next/navigation";
 import { type FC, useCallback, useEffect, useMemo, useRef, useState } from "react";
@@ -117,7 +116,7 @@ const ThreadContent: FC = () => {
 		<ThreadPrimitive.Root
 			className="aui-root aui-thread-root @container flex h-full min-h-0 flex-col bg-main-panel"
 			style={{
-				["--thread-max-width" as string]: "44rem",
+				["--thread-max-width" as string]: "42rem",
 			}}
 		>
 			<ChatViewport
@@ -240,7 +239,7 @@ const ThreadWelcome: FC = () => {
 		<div className="aui-thread-welcome-root mx-auto flex w-full max-w-(--thread-max-width) grow flex-col items-center px-4 relative">
 			{/* Greeting positioned above the composer */}
 			<div className="aui-thread-welcome-message absolute bottom-[calc(50%+5rem)] left-0 right-0 flex flex-col items-center text-center">
-				<h1 className="aui-thread-welcome-message-inner text-3xl md:text-5xl select-none">
+				<h1 className="aui-thread-welcome-message-inner text-3xl md:text-[2.625rem] select-none">
 					{greeting}
 				</h1>
 			</div>
@@ -892,11 +891,11 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 								<Button
 									variant="ghost"
 									size="icon"
-									className="size-[34px] rounded-full p-1 font-semibold text-xs dark:border-muted-foreground/15 hover:bg-accent hover:text-accent-foreground"
+									className="size-9 rounded-full p-1 font-semibold text-xs text-muted-foreground dark:border-muted-foreground/15 hover:bg-accent hover:text-accent-foreground"
 									aria-label="More actions"
 									data-joyride="connector-icon"
 								>
-									<Plus className="size-4" />
+									<Plus className="size-5" />
 								</Button>
 							</DropdownMenuTrigger>
 							<DropdownMenuContent side="bottom" align="start" sideOffset={8}>
@@ -908,6 +907,22 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 									<Upload className="size-4" />
 									Upload Files
 								</DropdownMenuItem>
+								{hasWebSearchTool && (
+									<DropdownMenuItem
+										onSelect={(event) => {
+											event.preventDefault();
+											toggleTool("web_search");
+										}}
+									>
+										<Globe className="size-4" />
+										<span className="flex-1">Web Search</span>
+										<Switch
+											checked={isWebSearchEnabled}
+											tabIndex={-1}
+											className="pointer-events-none h-4 w-7 shrink-0 border [&>span]:h-3 [&>span]:w-3 [&>span[data-state=checked]]:translate-x-3"
+										/>
+									</DropdownMenuItem>
+								)}
 								<DropdownMenuItem onSelect={() => setConnectorDialogOpen(true)}>
 									<Unplug className="size-4" />
 									Manage Connectors
@@ -1031,14 +1046,20 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 								disableTooltip={toolsPopoverOpen}
 								variant="ghost"
 								size="icon"
-								className="size-[34px] rounded-full p-1 font-semibold text-xs dark:border-muted-foreground/15 hover:bg-accent hover:text-accent-foreground"
+								className="size-9 rounded-full p-1 font-semibold text-xs text-muted-foreground dark:border-muted-foreground/15 hover:bg-accent hover:text-accent-foreground"
 								aria-label="More actions"
 								data-joyride="connector-icon"
 							>
-								<Plus className="size-4" />
+								<Plus className="size-5" />
 							</TooltipIconButton>
 						</DropdownMenuTrigger>
-						<DropdownMenuContent className="w-48" side="bottom" align="start" sideOffset={8}>
+						<DropdownMenuContent
+							className="w-48"
+							side="bottom"
+							align="start"
+							sideOffset={8}
+							onCloseAutoFocus={(event) => event.preventDefault()}
+						>
 							<DropdownMenuItem onSelect={() => openUploadDialog()}>
 								<Upload className="h-4 w-4" />
 								Upload Files
@@ -1047,6 +1068,26 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 								<Camera className="h-4 w-4" />
 								Take a screenshot
 							</DropdownMenuItem>
+							{hasWebSearchTool && (
+								<DropdownMenuItem
+									onSelect={(event) => {
+										event.preventDefault();
+										toggleTool("web_search");
+									}}
+									className={cn(
+										"hover:bg-accent hover:text-accent-foreground",
+										isWebSearchEnabled && "text-primary"
+									)}
+								>
+									<Globe className="h-4 w-4" />
+									<span className="flex-1 min-w-0 truncate">Web Search</span>
+									<Switch
+										checked={isWebSearchEnabled}
+										tabIndex={-1}
+										className="pointer-events-none h-4 w-7 shrink-0 border [&>span]:h-3 [&>span]:w-3 [&>span[data-state=checked]]:translate-x-3"
+									/>
+								</DropdownMenuItem>
+							)}
 							<DropdownMenuSub open={toolsPopoverOpen} onOpenChange={setToolsPopoverOpen}>
 								<DropdownMenuSubTrigger>
 									<Settings2 className="h-4 w-4" />
@@ -1161,50 +1202,6 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 						</DropdownMenuContent>
 					</DropdownMenu>
 				)}
-				{hasWebSearchTool && (
-					<Button
-						type="button"
-						variant="ghost"
-						size="sm"
-						aria-label={isWebSearchEnabled ? "Disable web search" : "Enable web search"}
-						aria-pressed={isWebSearchEnabled}
-						onClick={() => toggleTool("web_search")}
-						className={cn(
-							"rounded-full transition-[background-color,border-color,color] flex items-center gap-1 px-2 py-1 border h-8 select-none hover:bg-transparent",
-							isWebSearchEnabled
-								? "bg-sky-500/15 border-sky-500/60 text-sky-500"
-								: "bg-transparent border-transparent text-muted-foreground hover:text-accent-foreground"
-						)}
-					>
-						<motion.div
-							animate={{
-								rotate: isWebSearchEnabled ? 360 : 0,
-								scale: isWebSearchEnabled ? 1.1 : 1,
-							}}
-							whileHover={{
-								rotate: isWebSearchEnabled ? 360 : 15,
-								scale: 1.1,
-								transition: { type: "spring", stiffness: 300, damping: 10 },
-							}}
-							transition={{ type: "spring", stiffness: 260, damping: 25 }}
-						>
-							<Globe className="size-4" />
-						</motion.div>
-						<AnimatePresence>
-							{isWebSearchEnabled && (
-								<motion.span
-									initial={{ width: 0, opacity: 0 }}
-									animate={{ width: "auto", opacity: 1 }}
-									exit={{ width: 0, opacity: 0 }}
-									transition={{ duration: 0.2 }}
-									className="text-xs overflow-hidden whitespace-nowrap"
-								>
-									Search
-								</motion.span>
-							)}
-						</AnimatePresence>
-					</Button>
-				)}
 			</div>
 			{!hasModelConfigured && (
 				<div className="flex items-center gap-1.5 text-amber-600 dark:text-amber-400 text-xs">
@@ -1230,13 +1227,13 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 							variant="default"
 							size="icon"
 							className={cn(
-								"aui-composer-send size-8 rounded-full",
+								"aui-composer-send size-9 rounded-full",
 								isSendDisabled && "cursor-not-allowed opacity-50"
 							)}
 							aria-label="Send message"
 							disabled={isSendDisabled}
 						>
-							<ArrowUpIcon className="aui-composer-send-icon size-4" />
+							<ArrowUpIcon className="aui-composer-send-icon size-5" />
 						</TooltipIconButton>
 					</ComposerPrimitive.Send>
 				</AuiIf>
@@ -1247,10 +1244,10 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 							type="button"
 							variant="default"
 							size="icon"
-							className="aui-composer-cancel size-8 rounded-full"
+							className="aui-composer-cancel size-9 rounded-full"
 							aria-label="Stop generating"
 						>
-							<SquareIcon className="aui-composer-cancel-icon size-3 fill-current" />
+							<SquareIcon className="aui-composer-cancel-icon size-3.5 fill-current" />
 						</Button>
 					</ComposerPrimitive.Cancel>
 				</AuiIf>
diff --git a/surfsense_web/components/ui/switch.tsx b/surfsense_web/components/ui/switch.tsx
index de2c35fc0..2ebd7bfd8 100644
--- a/surfsense_web/components/ui/switch.tsx
+++ b/surfsense_web/components/ui/switch.tsx
@@ -19,7 +19,7 @@ const Switch = React.forwardRef<
 	>
 		<SwitchPrimitives.Thumb
 			className={cn(
-				"pointer-events-none block h-5 w-5 rounded-full bg-background shadow-lg ring-0 transition-transform data-[state=checked]:translate-x-5 data-[state=checked]:bg-background data-[state=unchecked]:translate-x-0 data-[state=unchecked]:bg-muted-foreground/40"
+				"pointer-events-none block h-5 w-5 rounded-full bg-background shadow-lg ring-0 transition-transform data-[state=checked]:translate-x-5 data-[state=checked]:bg-[var(--panel)] data-[state=unchecked]:translate-x-0 data-[state=unchecked]:bg-muted-foreground/40"
 			)}
 		/>
 	</SwitchPrimitives.Root>

From a49ee05456380baa1a0f147fcf1630f23e9672ac Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Sun, 17 May 2026 03:17:12 +0530
Subject: [PATCH 70/96] refactor: enhance layout structure by introducing
 WorkspacePanel and updating component styles

---
 .../[search_space_id]/buy-more/page.tsx       | 56 ++++++++---------
 .../[search_space_id]/more-pages/page.tsx     | 18 +++---
 .../layout/providers/LayoutDataProvider.tsx   |  5 +-
 .../layout/ui/shell/LayoutShell.tsx           | 61 ++++++++++++-------
 .../layout/ui/shell/WorkspacePanel.tsx        | 28 +++++++++
 .../components/layout/ui/shell/index.ts       |  1 +
 6 files changed, 107 insertions(+), 62 deletions(-)
 create mode 100644 surfsense_web/components/layout/ui/shell/WorkspacePanel.tsx

diff --git a/surfsense_web/app/dashboard/[search_space_id]/buy-more/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/buy-more/page.tsx
index ba13a6239..da2b5787b 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/buy-more/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/buy-more/page.tsx
@@ -18,35 +18,33 @@ export default function BuyMorePage() {
 	const [activeTab, setActiveTab] = useState<TabId>("pages");
 
 	return (
-		<div className="flex min-h-[calc(100vh-64px)] select-none items-center justify-center px-4 py-8">
-			<motion.div
-				initial={{ opacity: 0, y: 20 }}
-				animate={{ opacity: 1, y: 0 }}
-				transition={{ duration: 0.3 }}
-				className="w-full max-w-md space-y-6"
-			>
-				<div className="flex items-center justify-center rounded-lg border bg-muted/30 p-1">
-					{TABS.map((tab) => (
-						<Button
-							key={tab.id}
-							type="button"
-							variant="ghost"
-							size="sm"
-							onClick={() => setActiveTab(tab.id)}
-							className={cn(
-								"h-auto flex-1 px-3 py-1.5 text-sm",
-								activeTab === tab.id
-									? "bg-background text-foreground shadow-sm"
-									: "text-muted-foreground hover:text-accent-foreground"
-							)}
-						>
-							{tab.label}
-						</Button>
-					))}
-				</div>
+		<motion.div
+			initial={{ opacity: 0, y: 20 }}
+			animate={{ opacity: 1, y: 0 }}
+			transition={{ duration: 0.3 }}
+			className="w-full select-none space-y-6"
+		>
+			<div className="flex items-center justify-center rounded-lg border bg-muted/30 p-1">
+				{TABS.map((tab) => (
+					<Button
+						key={tab.id}
+						type="button"
+						variant="ghost"
+						size="sm"
+						onClick={() => setActiveTab(tab.id)}
+						className={cn(
+							"h-auto flex-1 px-3 py-1.5 text-sm",
+							activeTab === tab.id
+								? "bg-background text-foreground shadow-sm"
+								: "text-muted-foreground hover:text-accent-foreground"
+						)}
+					>
+						{tab.label}
+					</Button>
+				))}
+			</div>
 
-				{activeTab === "pages" ? <BuyPagesContent /> : <BuyTokensContent />}
-			</motion.div>
-		</div>
+			{activeTab === "pages" ? <BuyPagesContent /> : <BuyTokensContent />}
+		</motion.div>
 	);
 }
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 448706caf..9c0b2c4e7 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
@@ -5,15 +5,13 @@ import { MorePagesContent } from "@/components/settings/more-pages-content";
 
 export default function MorePagesPage() {
 	return (
-		<div className="flex min-h-[calc(100vh-64px)] select-none items-center justify-center px-4 py-8">
-			<motion.div
-				initial={{ opacity: 0, y: 20 }}
-				animate={{ opacity: 1, y: 0 }}
-				transition={{ duration: 0.3 }}
-				className="w-full max-w-md space-y-6"
-			>
-				<MorePagesContent />
-			</motion.div>
-		</div>
+		<motion.div
+			initial={{ opacity: 0, y: 20 }}
+			animate={{ opacity: 1, y: 0 }}
+			transition={{ duration: 0.3 }}
+			className="w-full select-none space-y-6"
+		>
+			<MorePagesContent />
+		</motion.div>
 	);
 }
diff --git a/surfsense_web/components/layout/providers/LayoutDataProvider.tsx b/surfsense_web/components/layout/providers/LayoutDataProvider.tsx
index 6884da7c7..d774ae862 100644
--- a/surfsense_web/components/layout/providers/LayoutDataProvider.tsx
+++ b/surfsense_web/components/layout/providers/LayoutDataProvider.tsx
@@ -136,7 +136,7 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 	// Documents sidebar state (shared atom so Composer can toggle it)
 	const [isDocumentsSidebarOpen, setIsDocumentsSidebarOpen] = useAtom(documentsSidebarOpenAtom);
 	const [isDocumentsDocked, setIsDocumentsDocked] = useState(true);
-	const [isRightPanelCollapsed, setIsRightPanelCollapsed] = useAtom(rightPanelCollapsedAtom);
+	const setIsRightPanelCollapsed = useSetAtom(rightPanelCollapsedAtom);
 
 	// Open documents sidebar by default on desktop (docked mode)
 	const documentsInitialized = useRef(false);
@@ -668,6 +668,8 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 
 	// Detect if we're on the chat page (needs overflow-hidden for chat's own scroll)
 	const isChatPage = pathname?.includes("/new-chat") ?? false;
+	const useWorkspacePanel =
+		pathname?.endsWith("/buy-more") === true || pathname?.endsWith("/more-pages") === true;
 
 	return (
 		<>
@@ -705,6 +707,7 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 				theme={theme}
 				setTheme={setTheme}
 				isChatPage={isChatPage}
+				useWorkspacePanel={useWorkspacePanel}
 				isLoadingChats={isLoadingThreads}
 				activeSlideoutPanel={activeSlideoutPanel}
 				onSlideoutPanelChange={setActiveSlideoutPanel}
diff --git a/surfsense_web/components/layout/ui/shell/LayoutShell.tsx b/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
index 841190256..ad1d809ab 100644
--- a/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
+++ b/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
@@ -31,6 +31,7 @@ import {
 } from "../sidebar";
 import { SidebarSlideOutPanel } from "../sidebar/SidebarSlideOutPanel";
 import { TabBar } from "../tabs/TabBar";
+import { WorkspacePanel } from "./WorkspacePanel";
 
 const DocumentTabContent = dynamic(
 	() => import("../tabs/DocumentTabContent").then((m) => ({ default: m.DocumentTabContent })),
@@ -98,6 +99,7 @@ interface LayoutShellProps {
 	setTheme?: (theme: "light" | "dark" | "system") => void;
 	defaultCollapsed?: boolean;
 	isChatPage?: boolean;
+	useWorkspacePanel?: boolean;
 	children: React.ReactNode;
 	className?: string;
 	// Unified slide-out panel state
@@ -166,6 +168,10 @@ function MainContentPanel({
 	);
 }
 
+function DesktopWorkspaceRegion({ children }: { children: React.ReactNode }) {
+	return <div className="flex h-full min-w-0 flex-1 -mr-2">{children}</div>;
+}
+
 export function LayoutShell({
 	searchSpaces,
 	activeSearchSpaceId,
@@ -198,6 +204,7 @@ export function LayoutShell({
 	setTheme,
 	defaultCollapsed = false,
 	isChatPage = false,
+	useWorkspacePanel = false,
 	children,
 	className,
 	activeSlideoutPanel = null,
@@ -287,9 +294,13 @@ export function LayoutShell({
 							isLoadingChats={isLoadingChats}
 						/>
 
-						<main className={cn("flex-1", isChatPage ? "overflow-hidden" : "overflow-auto")}>
-							{children}
-						</main>
+						{useWorkspacePanel ? (
+							<WorkspacePanel>{children}</WorkspacePanel>
+						) : (
+							<main className={cn("flex-1", isChatPage ? "overflow-hidden" : "overflow-auto")}>
+								{children}
+							</main>
+						)}
 
 						{/* Mobile unified slide-out panel */}
 						<SidebarSlideOutPanel
@@ -506,26 +517,32 @@ export function LayoutShell({
 						</SidebarSlideOutPanel>
 					</div>
 
-					{/* Main content panel */}
-					<MainContentPanel
-						isChatPage={isChatPage}
-						onTabSwitch={onTabSwitch}
-						onNewChat={onNewChat}
-					>
-						{children}
-					</MainContentPanel>
+					<DesktopWorkspaceRegion>
+						{useWorkspacePanel ? (
+							<WorkspacePanel>{children}</WorkspacePanel>
+						) : (
+							<>
+								{/* Main content panel */}
+								<MainContentPanel
+									isChatPage={isChatPage}
+									onTabSwitch={onTabSwitch}
+									onNewChat={onNewChat}
+								>
+									{children}
+								</MainContentPanel>
 
-					{/* Right panel — tabbed Sources/Report (desktop only) */}
-					{documentsPanel && (
-						<div className="-ml-2 -mr-2">
-							<RightPanel
-								documentsPanel={{
-									open: documentsPanel.open,
-									onOpenChange: documentsPanel.onOpenChange,
-								}}
-							/>
-						</div>
-					)}
+								{/* Right panel — tabbed Sources/Report (desktop only) */}
+								{documentsPanel ? (
+									<RightPanel
+										documentsPanel={{
+											open: documentsPanel.open,
+											onOpenChange: documentsPanel.onOpenChange,
+										}}
+									/>
+								) : null}
+							</>
+						)}
+					</DesktopWorkspaceRegion>
 				</div>
 			</TooltipProvider>
 		</SidebarProvider>
diff --git a/surfsense_web/components/layout/ui/shell/WorkspacePanel.tsx b/surfsense_web/components/layout/ui/shell/WorkspacePanel.tsx
new file mode 100644
index 000000000..d6dbe1870
--- /dev/null
+++ b/surfsense_web/components/layout/ui/shell/WorkspacePanel.tsx
@@ -0,0 +1,28 @@
+import type { ReactNode } from "react";
+import { cn } from "@/lib/utils";
+
+interface WorkspacePanelProps {
+	children: ReactNode;
+	className?: string;
+	contentClassName?: string;
+}
+
+/**
+ * Full workspace area to the right of the left rail/sidebar.
+ * Use this when a route should own the whole workspace instead of rendering
+ * inside the normal TabBar/Header/main/right-panel chrome.
+ */
+export function WorkspacePanel({ children, className, contentClassName }: WorkspacePanelProps) {
+	return (
+		<main
+			className={cn(
+				"relative isolate flex min-w-0 flex-1 flex-col overflow-hidden bg-panel",
+				className
+			)}
+		>
+			<div className="flex min-h-0 flex-1 items-center justify-center overflow-auto px-4 py-8">
+				<div className={cn("w-full max-w-md", contentClassName)}>{children}</div>
+			</div>
+		</main>
+	);
+}
diff --git a/surfsense_web/components/layout/ui/shell/index.ts b/surfsense_web/components/layout/ui/shell/index.ts
index d7d96a574..e58da76c1 100644
--- a/surfsense_web/components/layout/ui/shell/index.ts
+++ b/surfsense_web/components/layout/ui/shell/index.ts
@@ -1 +1,2 @@
 export { LayoutShell } from "./LayoutShell";
+export { WorkspacePanel } from "./WorkspacePanel";

From 88a43cdd65926fc746e04e93151f734e2fade783 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Sun, 17 May 2026 16:46:34 +0530
Subject: [PATCH 71/96] refactor: enhance ConnectToolsBanner functionality and
 update sidebar navigation handling

---
 .../components/assistant-ui/thread.tsx        | 144 ++++++++++--------
 .../layout/ui/sidebar/MobileSidebar.tsx       |   1 +
 .../components/layout/ui/sidebar/Sidebar.tsx  |  15 +-
 3 files changed, 94 insertions(+), 66 deletions(-)

diff --git a/surfsense_web/components/assistant-ui/thread.tsx b/surfsense_web/components/assistant-ui/thread.tsx
index a3709911a..60c4a4d25 100644
--- a/surfsense_web/components/assistant-ui/thread.tsx
+++ b/surfsense_web/components/assistant-ui/thread.tsx
@@ -261,7 +261,10 @@ const BANNER_CONNECTORS = [
 
 const BANNER_DISMISSED_KEY = "surfsense-connect-tools-banner-dismissed";
 
-const ConnectToolsBanner: FC<{ isThreadEmpty: boolean }> = ({ isThreadEmpty }) => {
+const ConnectToolsBanner: FC<{
+	isThreadEmpty: boolean;
+	onVisibleChange?: (visible: boolean) => void;
+}> = ({ isThreadEmpty, onVisibleChange }) => {
 	const { data: connectors } = useAtomValue(connectorsAtom);
 	const setConnectorDialogOpen = useSetAtom(connectorDialogOpenAtom);
 	const [dismissed, setDismissed] = useState(() => {
@@ -270,8 +273,13 @@ const ConnectToolsBanner: FC<{ isThreadEmpty: boolean }> = ({ isThreadEmpty }) =
 	});
 
 	const hasConnectors = (connectors?.length ?? 0) > 0;
+	const isVisible = !dismissed && !hasConnectors && isThreadEmpty;
 
-	if (dismissed || hasConnectors || !isThreadEmpty) return null;
+	useEffect(() => {
+		onVisibleChange?.(isVisible);
+	}, [isVisible, onVisibleChange]);
+
+	if (!isVisible) return null;
 
 	const handleDismiss = (e: React.MouseEvent) => {
 		e.stopPropagation();
@@ -280,42 +288,41 @@ const ConnectToolsBanner: FC<{ isThreadEmpty: boolean }> = ({ isThreadEmpty }) =
 	};
 
 	return (
-		<div className="border-t border-border/50">
-			<div className="flex w-full items-center gap-2.5 px-4 py-2.5">
-				<Button
-					type="button"
-					variant="ghost"
-					size="sm"
-					className="h-auto flex-1 justify-start gap-2.5 px-0 py-0 text-left cursor-pointer select-none hover:bg-transparent"
-					onClick={() => setConnectorDialogOpen(true)}
-				>
-					<Unplug className="size-4 text-muted-foreground shrink-0" />
-					<span className="text-[13px] text-muted-foreground/80 flex-1">Connect your tools</span>
-					<AvatarGroup className="shrink-0">
-						{BANNER_CONNECTORS.map(({ type }, i) => (
-							<Avatar
-								key={type}
-								className="size-6"
-								style={{ zIndex: BANNER_CONNECTORS.length - i }}
-							>
-								<AvatarFallback className="bg-muted text-[10px]">
-									{getConnectorIcon(type, "size-3.5")}
-								</AvatarFallback>
-							</Avatar>
-						))}
-					</AvatarGroup>
-				</Button>
-				<Button
-					type="button"
-					onClick={handleDismiss}
-					variant="ghost"
-					size="icon"
-					className="size-auto shrink-0 ml-0.5 -mr-1 p-1.5 text-muted-foreground/40 hover:bg-transparent hover:text-accent-foreground cursor-pointer"
-					aria-label="Dismiss"
-				>
-					<X className="size-3.5" />
-				</Button>
-			</div>
+		<div className="relative z-0 -mt-5 flex min-w-0 items-center gap-2 rounded-b-3xl border border-input bg-muted/40 px-4 pt-7 pb-3 shadow-sm shadow-black/5 dark:shadow-black/10">
+			<Button
+				type="button"
+				variant="ghost"
+				size="sm"
+				className="h-7 min-w-0 cursor-pointer justify-start gap-2 rounded-md px-0 text-[13px] font-normal text-muted-foreground select-none hover:bg-transparent hover:text-foreground"
+				onClick={() => setConnectorDialogOpen(true)}
+			>
+				<Unplug className="size-4 shrink-0" />
+				<span className="truncate">Connect your tools</span>
+			</Button>
+			<div className="min-w-0 flex-1" />
+			<AvatarGroup className="shrink-0">
+				{BANNER_CONNECTORS.map(({ type }, i) => (
+					<Avatar
+						key={type}
+						className="size-5"
+						style={{ zIndex: BANNER_CONNECTORS.length - i }}
+					>
+						<AvatarFallback className="bg-accent text-[10px]">
+							{getConnectorIcon(type, "size-3")}
+						</AvatarFallback>
+					</Avatar>
+				))}
+			</AvatarGroup>
+			<Button
+				type="button"
+				onClick={handleDismiss}
+				variant="ghost"
+				size="icon"
+				className="size-7 shrink-0 cursor-pointer rounded-md text-muted-foreground hover:bg-transparent hover:text-foreground"
+				aria-label="Dismiss"
+			>
+				<X className="size-3.5" />
+			</Button>
 		</div>
 	);
 };
@@ -426,6 +433,7 @@ const Composer: FC = () => {
 
 	const isThreadEmpty = useAuiState(({ thread }) => thread.isEmpty);
 	const isThreadRunning = useAuiState(({ thread }) => thread.isRunning);
+	const [connectToolsTrayVisible, setConnectToolsTrayVisible] = useState(false);
 
 	const currentPlaceholder = COMPOSER_PLACEHOLDER;
 
@@ -735,32 +743,42 @@ const Composer: FC = () => {
 					/>
 				</div>
 			)}
-			<div className="aui-composer-attachment-dropzone flex w-full flex-col overflow-hidden rounded-3xl border-input bg-muted pt-2 shadow-sm shadow-black/5 outline-none transition-shadow dark:shadow-black/10">
-				<PendingScreenImageStrip />
-				{clipboardInitialText && (
-					<ClipboardChip
-						text={clipboardInitialText}
-						onDismiss={() => setClipboardInitialText(undefined)}
-					/>
-				)}
-				<div className="aui-composer-input-wrapper px-4 pt-3 pb-6">
-					<InlineMentionEditor
-						ref={editorRef}
-						placeholder={currentPlaceholder}
-						onMentionTrigger={handleMentionTrigger}
-						onMentionClose={handleMentionClose}
-						onActionTrigger={handleActionTrigger}
-						onActionClose={handleActionClose}
-						onChange={handleEditorChange}
-						onDocumentRemove={handleDocumentRemove}
-						onSubmit={handleSubmit}
-						onKeyDown={handleKeyDown}
-						className="min-h-[24px]"
-					/>
+			<div className="flex w-full flex-col">
+				<div
+					className={cn(
+						"aui-composer-attachment-dropzone relative z-10 flex w-full flex-col overflow-hidden rounded-3xl border border-input bg-muted pt-2 shadow-sm shadow-black/5 outline-none transition-shadow dark:shadow-black/10",
+						connectToolsTrayVisible && "rounded-b-3xl shadow-none dark:shadow-none"
+					)}
+				>
+					<PendingScreenImageStrip />
+					{clipboardInitialText && (
+						<ClipboardChip
+							text={clipboardInitialText}
+							onDismiss={() => setClipboardInitialText(undefined)}
+						/>
+					)}
+					<div className="aui-composer-input-wrapper px-4 pt-3 pb-6">
+						<InlineMentionEditor
+							ref={editorRef}
+							placeholder={currentPlaceholder}
+							onMentionTrigger={handleMentionTrigger}
+							onMentionClose={handleMentionClose}
+							onActionTrigger={handleActionTrigger}
+							onActionClose={handleActionClose}
+							onChange={handleEditorChange}
+							onDocumentRemove={handleDocumentRemove}
+							onSubmit={handleSubmit}
+							onKeyDown={handleKeyDown}
+							className="min-h-[24px]"
+						/>
+					</div>
+					<ComposerAction isBlockedByOtherUser={isBlockedByOtherUser} />
+					<ConnectorIndicator showTrigger={false} />
 				</div>
-				<ComposerAction isBlockedByOtherUser={isBlockedByOtherUser} />
-				<ConnectorIndicator showTrigger={false} />
-				<ConnectToolsBanner isThreadEmpty={isThreadEmpty} />
+				<ConnectToolsBanner
+					isThreadEmpty={isThreadEmpty}
+					onVisibleChange={setConnectToolsTrayVisible}
+				/>
 			</div>
 		</ComposerPrimitive.Root>
 	);
diff --git a/surfsense_web/components/layout/ui/sidebar/MobileSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/MobileSidebar.tsx
index 12809ec22..02fa666be 100644
--- a/surfsense_web/components/layout/ui/sidebar/MobileSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/MobileSidebar.tsx
@@ -210,6 +210,7 @@ export function MobileSidebar({
 									}
 								: undefined
 						}
+						onNavigate={() => onOpenChange(false)}
 						announcementUnreadCount={announcementUnreadCount}
 						onLogout={onLogout}
 						pageUsage={pageUsage}
diff --git a/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx b/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
index 540a3dcc1..d290373dc 100644
--- a/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { CreditCard, SquarePen, Zap } from "lucide-react";
+import { CreditCard, Dot, SquarePen, Zap } from "lucide-react";
 import Link from "next/link";
 import { useParams } from "next/navigation";
 import { useTranslations } from "next-intl";
@@ -83,6 +83,7 @@ interface SidebarProps {
 	onManageMembers?: () => void;
 	onUserSettings?: () => void;
 	onAnnouncements?: () => void;
+	onNavigate?: () => void;
 	announcementUnreadCount?: number;
 	onLogout?: () => void;
 	pageUsage?: PageUsage;
@@ -119,6 +120,7 @@ export function Sidebar({
 	onManageMembers,
 	onUserSettings,
 	onAnnouncements,
+	onNavigate,
 	announcementUnreadCount = 0,
 	onLogout,
 	pageUsage,
@@ -344,6 +346,7 @@ export function Sidebar({
 					pageUsage={pageUsage}
 					isCollapsed={isCollapsed}
 					hasNavSectionAbove={footerNavItems.length > 0}
+					onNavigate={onNavigate}
 				/>
 
 				{renderUserProfile && (
@@ -367,10 +370,12 @@ function SidebarUsageFooter({
 	pageUsage,
 	isCollapsed,
 	hasNavSectionAbove = false,
+	onNavigate,
 }: {
 	pageUsage?: PageUsage;
 	isCollapsed: boolean;
 	hasNavSectionAbove?: boolean;
+	onNavigate?: () => void;
 }) {
 	const params = useParams();
 	const searchSpaceId = params?.search_space_id ?? "";
@@ -424,6 +429,7 @@ function SidebarUsageFooter({
 			<div className="space-y-0.5">
 				<Link
 					href={`/dashboard/${searchSpaceId}/more-pages`}
+					onClick={onNavigate}
 					className="group flex w-full items-center justify-between rounded-md px-1.5 py-1 transition-colors hover:bg-accent"
 				>
 					<span className="flex items-center gap-1.5 text-xs text-muted-foreground group-hover:text-accent-foreground">
@@ -436,14 +442,17 @@ function SidebarUsageFooter({
 				</Link>
 				<Link
 					href={`/dashboard/${searchSpaceId}/buy-more`}
+					onClick={onNavigate}
 					className="group flex w-full items-center justify-between rounded-md px-1.5 py-1 transition-colors hover:bg-accent"
 				>
 					<span className="flex items-center gap-1.5 text-xs text-muted-foreground group-hover:text-accent-foreground">
 						<CreditCard className="h-3 w-3 shrink-0" />
 						Buy More
 					</span>
-					<span className="text-[10px] font-medium text-muted-foreground">
-						$1/1k &middot; $1/1M
+					<span className="flex items-center text-[10px] font-medium text-muted-foreground">
+						$1/1k
+						<Dot className="h-3 w-3" />
+						$1/1M
 					</span>
 				</Link>
 			</div>

From 10527ddb7c0da4def74f61233073d80a89da9392 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Sun, 17 May 2026 23:29:41 +0530
Subject: [PATCH 72/96] refactor: implement tab navigation in BuyMorePage and
 enhance button styles in BuyPagesContent and BuyTokensContent

---
 .../[search_space_id]/buy-more/page.tsx       | 50 +++++-----
 .../[search_space_id]/more-pages/page.tsx     | 10 +-
 .../components/assistant-ui/thread.tsx        | 96 +++++++++++--------
 .../components/settings/buy-pages-content.tsx | 16 ++--
 .../settings/buy-tokens-content.tsx           | 18 ++--
 .../settings/more-pages-content.tsx           | 20 ++--
 6 files changed, 114 insertions(+), 96 deletions(-)

diff --git a/surfsense_web/app/dashboard/[search_space_id]/buy-more/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/buy-more/page.tsx
index da2b5787b..74bcaff2e 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/buy-more/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/buy-more/page.tsx
@@ -4,8 +4,7 @@ import { motion } from "motion/react";
 import { useState } from "react";
 import { BuyPagesContent } from "@/components/settings/buy-pages-content";
 import { BuyTokensContent } from "@/components/settings/buy-tokens-content";
-import { Button } from "@/components/ui/button";
-import { cn } from "@/lib/utils";
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 
 const TABS = [
 	{ id: "pages", label: "Pages" },
@@ -22,29 +21,34 @@ export default function BuyMorePage() {
 			initial={{ opacity: 0, y: 20 }}
 			animate={{ opacity: 1, y: 0 }}
 			transition={{ duration: 0.3 }}
-			className="w-full select-none space-y-6"
+			className="w-full select-none"
 		>
-			<div className="flex items-center justify-center rounded-lg border bg-muted/30 p-1">
-				{TABS.map((tab) => (
-					<Button
-						key={tab.id}
-						type="button"
-						variant="ghost"
-						size="sm"
-						onClick={() => setActiveTab(tab.id)}
-						className={cn(
-							"h-auto flex-1 px-3 py-1.5 text-sm",
-							activeTab === tab.id
-								? "bg-background text-foreground shadow-sm"
-								: "text-muted-foreground hover:text-accent-foreground"
-						)}
-					>
-						{tab.label}
-					</Button>
-				))}
-			</div>
+			<Tabs
+				value={activeTab}
+				onValueChange={(value) => {
+					setActiveTab(value as TabId);
+				}}
+				className="relative min-h-[37rem] w-full"
+			>
+				<TabsList className="absolute top-20 left-1/2 -translate-x-1/2 rounded-xl bg-accent p-1">
+					{TABS.map((tab) => (
+						<TabsTrigger
+							key={tab.id}
+							value={tab.id}
+							className="h-8 rounded-lg px-4 text-sm font-semibold text-accent-foreground transition-colors hover:bg-transparent hover:text-white data-[state=active]:bg-[#4a4a4a] data-[state=active]:text-white data-[state=active]:shadow-none"
+						>
+							{tab.label}
+						</TabsTrigger>
+					))}
+				</TabsList>
 
-			{activeTab === "pages" ? <BuyPagesContent /> : <BuyTokensContent />}
+				<TabsContent value="pages" className="mt-0 flex min-h-[37rem] items-center pt-14">
+					<BuyPagesContent />
+				</TabsContent>
+				<TabsContent value="tokens" className="mt-0 flex min-h-[37rem] items-center pt-14">
+					<BuyTokensContent />
+				</TabsContent>
+			</Tabs>
 		</motion.div>
 	);
 }
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 9c0b2c4e7..4b3301b9f 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
@@ -1,17 +1,11 @@
 "use client";
 
-import { motion } from "motion/react";
 import { MorePagesContent } from "@/components/settings/more-pages-content";
 
 export default function MorePagesPage() {
 	return (
-		<motion.div
-			initial={{ opacity: 0, y: 20 }}
-			animate={{ opacity: 1, y: 0 }}
-			transition={{ duration: 0.3 }}
-			className="w-full select-none space-y-6"
-		>
+		<div className="w-full select-none space-y-6">
 			<MorePagesContent />
-		</motion.div>
+		</div>
 	);
 }
diff --git a/surfsense_web/components/assistant-ui/thread.tsx b/surfsense_web/components/assistant-ui/thread.tsx
index 60c4a4d25..d30996c40 100644
--- a/surfsense_web/components/assistant-ui/thread.tsx
+++ b/surfsense_web/components/assistant-ui/thread.tsx
@@ -23,6 +23,7 @@ import {
 	Wrench,
 	X,
 } from "lucide-react";
+import { AnimatePresence, motion } from "motion/react";
 import Image from "next/image";
 import { useParams } from "next/navigation";
 import { type FC, useCallback, useEffect, useMemo, useRef, useState } from "react";
@@ -271,59 +272,76 @@ const ConnectToolsBanner: FC<{
 		if (typeof window === "undefined") return false;
 		return localStorage.getItem(BANNER_DISMISSED_KEY) === "true";
 	});
+	const [dismissRequested, setDismissRequested] = useState(false);
 
 	const hasConnectors = (connectors?.length ?? 0) > 0;
 	const isVisible = !dismissed && !hasConnectors && isThreadEmpty;
+	const shouldShowTray = isVisible && !dismissRequested;
 
 	useEffect(() => {
 		onVisibleChange?.(isVisible);
 	}, [isVisible, onVisibleChange]);
 
-	if (!isVisible) return null;
-
 	const handleDismiss = (e: React.MouseEvent) => {
 		e.stopPropagation();
-		setDismissed(true);
-		localStorage.setItem(BANNER_DISMISSED_KEY, "true");
+		setDismissRequested(true);
 	};
 
 	return (
-		<div className="relative z-0 -mt-5 flex min-w-0 items-center gap-2 rounded-b-3xl border border-input bg-muted/40 px-4 pt-7 pb-3 shadow-sm shadow-black/5 dark:shadow-black/10">
-			<Button
-				type="button"
-				variant="ghost"
-				size="sm"
-				className="h-7 min-w-0 cursor-pointer justify-start gap-2 rounded-md px-0 text-[13px] font-normal text-muted-foreground select-none hover:bg-transparent hover:text-foreground"
-				onClick={() => setConnectorDialogOpen(true)}
-			>
-				<Unplug className="size-4 shrink-0" />
-				<span className="truncate">Connect your tools</span>
-			</Button>
-			<div className="min-w-0 flex-1" />
-			<AvatarGroup className="shrink-0">
-				{BANNER_CONNECTORS.map(({ type }, i) => (
-					<Avatar
-						key={type}
-						className="size-5"
-						style={{ zIndex: BANNER_CONNECTORS.length - i }}
+		<AnimatePresence
+			initial={false}
+			onExitComplete={() => {
+				if (!dismissRequested) return;
+				setDismissed(true);
+				localStorage.setItem(BANNER_DISMISSED_KEY, "true");
+			}}
+		>
+			{shouldShowTray ? (
+				<motion.div
+					key="connect-tools-tray"
+					initial={{ opacity: 0, y: -10 }}
+					animate={{ opacity: 1, y: 0 }}
+					exit={{ opacity: 0, y: -14 }}
+					transition={{ duration: 0.18, ease: "easeOut" }}
+					className="relative z-0 -mt-5 flex min-w-0 items-center gap-2 rounded-b-3xl border border-input bg-muted/40 px-4 pt-7 pb-3 shadow-sm shadow-black/5 dark:shadow-black/10"
+				>
+					<Button
+						type="button"
+						variant="ghost"
+						size="sm"
+						className="h-7 min-w-0 cursor-pointer justify-start gap-2 rounded-md px-0 text-[13px] font-normal text-muted-foreground select-none hover:bg-transparent hover:text-foreground"
+						onClick={() => setConnectorDialogOpen(true)}
 					>
-						<AvatarFallback className="bg-accent text-[10px]">
-							{getConnectorIcon(type, "size-3")}
-						</AvatarFallback>
-					</Avatar>
-				))}
-			</AvatarGroup>
-			<Button
-				type="button"
-				onClick={handleDismiss}
-				variant="ghost"
-				size="icon"
-				className="size-7 shrink-0 cursor-pointer rounded-md text-muted-foreground hover:bg-transparent hover:text-foreground"
-				aria-label="Dismiss"
-			>
-				<X className="size-3.5" />
-			</Button>
-		</div>
+						<Unplug className="size-4 shrink-0" />
+						<span className="truncate">Connect your tools</span>
+					</Button>
+					<div className="min-w-0 flex-1" />
+					<AvatarGroup className="shrink-0">
+						{BANNER_CONNECTORS.map(({ type }, i) => (
+							<Avatar
+								key={type}
+								className="size-5"
+								style={{ zIndex: BANNER_CONNECTORS.length - i }}
+							>
+								<AvatarFallback className="bg-accent text-[10px]">
+									{getConnectorIcon(type, "size-3")}
+								</AvatarFallback>
+							</Avatar>
+						))}
+					</AvatarGroup>
+					<Button
+						type="button"
+						onClick={handleDismiss}
+						variant="ghost"
+						size="icon"
+						className="size-7 shrink-0 cursor-pointer rounded-md text-muted-foreground hover:bg-transparent hover:text-foreground"
+						aria-label="Dismiss"
+					>
+						<X className="size-3.5" />
+					</Button>
+				</motion.div>
+			) : null}
+		</AnimatePresence>
 	);
 };
 
diff --git a/surfsense_web/components/settings/buy-pages-content.tsx b/surfsense_web/components/settings/buy-pages-content.tsx
index 3cb8e7133..82b8d8e2a 100644
--- a/surfsense_web/components/settings/buy-pages-content.tsx
+++ b/surfsense_web/components/settings/buy-pages-content.tsx
@@ -74,11 +74,11 @@ export function BuyPagesContent() {
 				<div className="flex items-center justify-center gap-3">
 					<Button
 						type="button"
-						variant="outline"
+						variant="ghost"
 						size="icon"
 						onClick={() => setQuantity((q) => Math.max(1, q - 1))}
 						disabled={quantity <= 1 || purchaseMutation.isPending}
-						className="size-8 shadow-none transition-colors hover:bg-muted disabled:opacity-40"
+						className="size-8 text-muted-foreground shadow-none transition-colors hover:bg-muted hover:text-white disabled:opacity-40"
 					>
 						<Minus className="h-3.5 w-3.5" />
 					</Button>
@@ -87,11 +87,11 @@ export function BuyPagesContent() {
 					</span>
 					<Button
 						type="button"
-						variant="outline"
+						variant="ghost"
 						size="icon"
 						onClick={() => setQuantity((q) => Math.min(100, q + 1))}
 						disabled={quantity >= 100 || purchaseMutation.isPending}
-						className="size-8 shadow-none transition-colors hover:bg-muted disabled:opacity-40"
+						className="size-8 text-muted-foreground shadow-none transition-colors hover:bg-muted hover:text-white disabled:opacity-40"
 					>
 						<Plus className="h-3.5 w-3.5" />
 					</Button>
@@ -107,10 +107,10 @@ export function BuyPagesContent() {
 							onClick={() => setQuantity(m)}
 							disabled={purchaseMutation.isPending}
 							className={cn(
-								"h-auto rounded-md border px-2.5 py-1 text-xs font-medium tabular-nums transition-colors hover:text-foreground disabled:opacity-60",
+								"h-auto rounded-md px-2.5 py-1 text-xs font-medium tabular-nums transition-colors disabled:opacity-60",
 								quantity === m
-									? "border-emerald-500 bg-emerald-500/10 text-emerald-600 dark:text-emerald-400"
-									: "border-border hover:border-emerald-500/40 hover:bg-muted/40"
+									? "bg-accent text-accent-foreground"
+									: "text-muted-foreground hover:bg-accent hover:text-accent-foreground"
 							)}
 						>
 							{(m * PAGE_PACK_SIZE).toLocaleString()}
@@ -126,7 +126,7 @@ export function BuyPagesContent() {
 				</div>
 
 				<Button
-					className="w-full bg-emerald-600 text-white hover:bg-emerald-700"
+					className="w-full"
 					disabled={purchaseMutation.isPending || !hasValidSearchSpace}
 					onClick={handleBuyNow}
 				>
diff --git a/surfsense_web/components/settings/buy-tokens-content.tsx b/surfsense_web/components/settings/buy-tokens-content.tsx
index abda14266..4b0605f28 100644
--- a/surfsense_web/components/settings/buy-tokens-content.tsx
+++ b/surfsense_web/components/settings/buy-tokens-content.tsx
@@ -96,7 +96,7 @@ export function BuyTokensContent() {
 						</span>
 						<span className="font-medium">{usagePercentage.toFixed(0)}%</span>
 					</div>
-					<Progress value={usagePercentage} className="h-1.5" />
+					<Progress value={usagePercentage} className="h-1.5 [&>div]:bg-purple-500" />
 					<p className="text-[11px] text-muted-foreground">
 						{formatUsd(remaining)} of credit remaining
 					</p>
@@ -107,11 +107,11 @@ export function BuyTokensContent() {
 				<div className="flex items-center justify-center gap-3">
 					<Button
 						type="button"
-						variant="outline"
+						variant="ghost"
 						size="icon"
 						onClick={() => setQuantity((q) => Math.max(1, q - 1))}
 						disabled={quantity <= 1 || purchaseMutation.isPending}
-						className="size-8 shadow-none transition-colors hover:bg-muted disabled:opacity-40"
+						className="size-8 text-muted-foreground shadow-none transition-colors hover:bg-muted hover:text-white disabled:opacity-40"
 					>
 						<Minus className="h-3.5 w-3.5" />
 					</Button>
@@ -120,11 +120,11 @@ export function BuyTokensContent() {
 					</span>
 					<Button
 						type="button"
-						variant="outline"
+						variant="ghost"
 						size="icon"
 						onClick={() => setQuantity((q) => Math.min(100, q + 1))}
 						disabled={quantity >= 100 || purchaseMutation.isPending}
-						className="size-8 shadow-none transition-colors hover:bg-muted disabled:opacity-40"
+						className="size-8 text-muted-foreground shadow-none transition-colors hover:bg-muted hover:text-white disabled:opacity-40"
 					>
 						<Plus className="h-3.5 w-3.5" />
 					</Button>
@@ -139,10 +139,10 @@ export function BuyTokensContent() {
 							onClick={() => setQuantity(m)}
 							disabled={purchaseMutation.isPending}
 							className={cn(
-								"h-auto rounded-md border px-2.5 py-1 text-xs font-medium tabular-nums transition-colors hover:text-foreground disabled:opacity-60",
+								"h-auto rounded-md px-2.5 py-1 text-xs font-medium tabular-nums transition-colors disabled:opacity-60",
 								quantity === m
-									? "border-purple-500 bg-purple-500/10 text-purple-600 dark:text-purple-400"
-									: "border-border hover:border-purple-500/40 hover:bg-muted/40"
+									? "bg-accent text-accent-foreground"
+									: "text-muted-foreground hover:bg-accent hover:text-accent-foreground"
 							)}
 						>
 							${m}
@@ -158,7 +158,7 @@ export function BuyTokensContent() {
 				</div>
 
 				<Button
-					className="w-full bg-purple-600 text-white hover:bg-purple-700"
+					className="w-full"
 					disabled={purchaseMutation.isPending}
 					onClick={() => purchaseMutation.mutate({ quantity, search_space_id: searchSpaceId })}
 				>
diff --git a/surfsense_web/components/settings/more-pages-content.tsx b/surfsense_web/components/settings/more-pages-content.tsx
index a2a81fb8b..e1b05f4d2 100644
--- a/surfsense_web/components/settings/more-pages-content.tsx
+++ b/surfsense_web/components/settings/more-pages-content.tsx
@@ -76,15 +76,17 @@ export function MorePagesContent() {
 			<div className="space-y-2">
 				<h3 className="text-sm font-semibold">Earn Bonus Pages</h3>
 				{isLoading ? (
-					<Card>
-						<CardContent className="flex items-center gap-3 p-3">
-							<Skeleton className="h-8 w-8 rounded-full" />
-							<div className="flex-1 space-y-2">
-								<Skeleton className="h-4 w-3/4" />
-							</div>
-							<Skeleton className="h-8 w-16" />
-						</CardContent>
-					</Card>
+					<div className="space-y-1.5">
+						{["github", "reddit", "discord"].map((task) => (
+							<Card key={task} className="bg-transparent">
+								<CardContent className="flex items-center gap-3 p-3">
+									<Skeleton className="h-8 w-8 rounded-full bg-muted" />
+									<Skeleton className="h-4 flex-1 bg-muted" />
+									<Skeleton className="h-8 w-16 bg-muted" />
+								</CardContent>
+							</Card>
+						))}
+					</div>
 				) : (
 					<div className="space-y-1.5">
 						{data?.tasks.map((task) => (

From c580addc04e7ef595669b3ef1ba00a0098ec78e7 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Mon, 18 May 2026 01:17:37 +0530
Subject: [PATCH 73/96] refactor: enhance Google login functionality and button
 styles across multiple components

---
 .../app/(home)/login/GoogleLoginButton.tsx    | 54 ++++++++++++++-----
 surfsense_web/app/desktop/login/page.tsx      |  4 ++
 .../components/auth/sign-in-button.tsx        | 20 +++----
 .../components/homepage/hero-section.tsx      |  6 ++-
 4 files changed, 60 insertions(+), 24 deletions(-)

diff --git a/surfsense_web/app/(home)/login/GoogleLoginButton.tsx b/surfsense_web/app/(home)/login/GoogleLoginButton.tsx
index e22fc2798..581bfe17f 100644
--- a/surfsense_web/app/(home)/login/GoogleLoginButton.tsx
+++ b/surfsense_web/app/(home)/login/GoogleLoginButton.tsx
@@ -1,15 +1,47 @@
 "use client";
-import { IconBrandGoogleFilled } from "@tabler/icons-react";
-import { motion } from "motion/react";
 import { useTranslations } from "next-intl";
+import { useState } from "react";
 import { Logo } from "@/components/Logo";
+import { Button } from "@/components/ui/button";
 import { trackLoginAttempt } from "@/lib/posthog/events";
 import { AmbientBackground } from "./AmbientBackground";
 
+function GoogleGLogo({ className }: { className?: string }) {
+	return (
+		<svg
+			className={className}
+			xmlns="http://www.w3.org/2000/svg"
+			viewBox="0 0 48 48"
+			aria-hidden="true"
+		>
+			<path
+				fill="#EA4335"
+				d="M24 9.5c3.54 0 6.71 1.22 9.21 3.6l6.85-6.85C35.9 2.38 30.47 0 24 0 14.62 0 6.51 5.38 2.56 13.22l7.98 6.19C12.43 13.72 17.74 9.5 24 9.5z"
+			/>
+			<path
+				fill="#4285F4"
+				d="M46.98 24.55c0-1.57-.15-3.09-.38-4.55H24v9.02h12.94c-.58 2.96-2.26 5.48-4.78 7.18l7.73 6c4.51-4.18 7.09-10.36 7.09-17.65z"
+			/>
+			<path
+				fill="#FBBC05"
+				d="M10.53 28.59c-.48-1.45-.76-2.99-.76-4.59s.27-3.14.76-4.59l-7.98-6.19C.92 16.46 0 20.12 0 24c0 3.88.92 7.54 2.56 10.78l7.97-6.19z"
+			/>
+			<path
+				fill="#34A853"
+				d="M24 48c6.48 0 11.93-2.13 15.89-5.81l-7.73-6c-2.15 1.45-4.92 2.3-8.16 2.3-6.26 0-11.57-4.22-13.47-9.91l-7.98 6.19C6.51 42.62 14.62 48 24 48z"
+			/>
+		</svg>
+	);
+}
+
 export function GoogleLoginButton() {
 	const t = useTranslations("auth");
+	const [isRedirecting, setIsRedirecting] = useState(false);
 
 	const handleGoogleLogin = () => {
+		if (isRedirecting) return;
+		setIsRedirecting(true);
+
 		// Track Google login attempt
 		trackLoginAttempt("google");
 
@@ -73,21 +105,15 @@ export function GoogleLoginButton() {
 					</motion.div>
 				</motion.div> */}
 
-				<motion.button
-					whileHover={{ scale: 1.02 }}
-					whileTap={{ scale: 0.98 }}
-					className="group/btn relative flex w-full items-center justify-center space-x-2 rounded-lg bg-white px-6 py-3 md:py-4 text-neutral-700 shadow-lg transition-all duration-200 hover:shadow-xl dark:bg-neutral-800 dark:text-neutral-200"
+				<Button
+					variant="outline"
+					className="w-full max-w-md gap-2 rounded-lg border-white bg-white px-6 py-5 font-medium text-[#1f1f1f] shadow-sm hover:bg-zinc-100 hover:text-[#1f1f1f] dark:border-white md:py-5"
+					disabled={isRedirecting}
 					onClick={handleGoogleLogin}
 				>
-					<div className="absolute inset-0 h-full w-full transform opacity-0 transition duration-200 group-hover/btn:opacity-100">
-						<div className="absolute -left-px -top-px h-4 w-4 rounded-tl-lg border-l-2 border-t-2 border-blue-500 bg-transparent transition-all duration-200 group-hover/btn:-left-2 group-hover/btn:-top-2"></div>
-						<div className="absolute -right-px -top-px h-4 w-4 rounded-tr-lg border-r-2 border-t-2 border-blue-500 bg-transparent transition-all duration-200 group-hover/btn:-right-2 group-hover/btn:-top-2"></div>
-						<div className="absolute -bottom-px -left-px h-4 w-4 rounded-bl-lg border-b-2 border-l-2 border-blue-500 bg-transparent transition-all duration-200 group-hover/btn:-bottom-2 group-hover/btn:-left-2"></div>
-						<div className="absolute -bottom-px -right-px h-4 w-4 rounded-br-lg border-b-2 border-r-2 border-blue-500 bg-transparent transition-all duration-200 group-hover/btn:-bottom-2 group-hover/btn:-right-2"></div>
-					</div>
-					<IconBrandGoogleFilled className="h-5 w-5 text-neutral-700 dark:text-neutral-200" />
+					<GoogleGLogo className="h-5 w-5" />
 					<span className="text-base font-medium">{t("continue_with_google")}</span>
-				</motion.button>
+				</Button>
 			</div>
 		</div>
 	);
diff --git a/surfsense_web/app/desktop/login/page.tsx b/surfsense_web/app/desktop/login/page.tsx
index 765ff8276..41c956f3e 100644
--- a/surfsense_web/app/desktop/login/page.tsx
+++ b/surfsense_web/app/desktop/login/page.tsx
@@ -195,6 +195,7 @@ export default function DesktopLoginPage() {
 	const [password, setPassword] = useState("");
 	const [showPassword, setShowPassword] = useState(false);
 	const [loginError, setLoginError] = useState<string | null>(null);
+	const [isGoogleRedirecting, setIsGoogleRedirecting] = useState(false);
 
 	const [shortcuts, setShortcuts] = useState(DEFAULT_SHORTCUTS);
 	const [shortcutsLoaded, setShortcutsLoaded] = useState(false);
@@ -236,6 +237,8 @@ export default function DesktopLoginPage() {
 	);
 
 	const handleGoogleLogin = () => {
+		if (isGoogleRedirecting) return;
+		setIsGoogleRedirecting(true);
 		window.location.href = `${BACKEND_URL}/auth/google/authorize-redirect`;
 	};
 
@@ -344,6 +347,7 @@ export default function DesktopLoginPage() {
 								<Button
 									variant="outline"
 									className="w-full gap-2 h-10 bg-white text-[#1f1f1f] border-white hover:bg-zinc-100 hover:text-[#1f1f1f] dark:border-white shadow-sm font-medium"
+									disabled={isGoogleRedirecting}
 									onClick={handleGoogleLogin}
 								>
 									<GoogleGLogo className="size-4" />
diff --git a/surfsense_web/components/auth/sign-in-button.tsx b/surfsense_web/components/auth/sign-in-button.tsx
index dd5893deb..688dd496a 100644
--- a/surfsense_web/components/auth/sign-in-button.tsx
+++ b/surfsense_web/components/auth/sign-in-button.tsx
@@ -1,7 +1,7 @@
 "use client";
 
-import { motion } from "motion/react";
 import Link from "next/link";
+import { useState } from "react";
 import { AUTH_TYPE, BACKEND_URL } from "@/lib/env-config";
 import { trackLoginAttempt } from "@/lib/posthog/events";
 import { cn } from "@/lib/utils";
@@ -46,8 +46,11 @@ interface SignInButtonProps {
 
 export const SignInButton = ({ variant = "desktop" }: SignInButtonProps) => {
 	const isGoogleAuth = AUTH_TYPE === "GOOGLE";
+	const [isRedirecting, setIsRedirecting] = useState(false);
 
 	const handleGoogleLogin = () => {
+		if (isRedirecting) return;
+		setIsRedirecting(true);
 		trackLoginAttempt("google");
 		window.location.href = `${BACKEND_URL}/auth/google/authorize-redirect`;
 	};
@@ -55,35 +58,34 @@ export const SignInButton = ({ variant = "desktop" }: SignInButtonProps) => {
 	const getClassName = () => {
 		if (variant === "desktop") {
 			return isGoogleAuth
-				? "hidden rounded-full bg-white px-5 py-2 text-sm text-neutral-700 shadow-md ring-1 ring-neutral-200/50 hover:shadow-lg md:flex dark:bg-neutral-900 dark:text-neutral-200 dark:ring-neutral-700/50"
+				? "hidden rounded-full border border-white bg-white px-5 py-2 text-sm font-medium text-[#1f1f1f] shadow-sm hover:bg-zinc-100 hover:text-[#1f1f1f] md:flex dark:border-white"
 				: "hidden rounded-full bg-black px-8 py-2 text-sm font-bold text-white shadow-[0px_-2px_0px_0px_rgba(255,255,255,0.4)_inset] md:block dark:bg-white dark:text-black";
 		}
 		if (variant === "compact") {
 			return isGoogleAuth
-				? "rounded-full bg-white px-4 py-1.5 text-sm text-neutral-700 shadow-md ring-1 ring-neutral-200/50 hover:shadow-lg dark:bg-neutral-900 dark:text-neutral-200 dark:ring-neutral-700/50"
+				? "rounded-full border border-white bg-white px-4 py-1.5 text-sm font-medium text-[#1f1f1f] shadow-sm hover:bg-zinc-100 hover:text-[#1f1f1f] dark:border-white"
 				: "rounded-full bg-black px-6 py-1.5 text-sm font-bold text-white shadow-[0px_-2px_0px_0px_rgba(255,255,255,0.4)_inset] dark:bg-white dark:text-black";
 		}
 		// mobile
 		return isGoogleAuth
-			? "w-full rounded-lg bg-white px-8 py-2.5 text-neutral-700 shadow-md ring-1 ring-neutral-200/50 dark:bg-neutral-900 dark:text-neutral-200 dark:ring-neutral-700/50 touch-manipulation"
+			? "w-full rounded-lg border border-white bg-white px-8 py-2.5 font-medium text-[#1f1f1f] shadow-sm hover:bg-zinc-100 hover:text-[#1f1f1f] dark:border-white touch-manipulation"
 			: "w-full rounded-lg bg-black px-8 py-2 font-medium text-white shadow-[0px_-2px_0px_0px_rgba(255,255,255,0.4)_inset] dark:bg-white dark:text-black text-center touch-manipulation";
 	};
 
 	if (isGoogleAuth) {
 		return (
-			<motion.button
+			<button
 				type="button"
 				onClick={handleGoogleLogin}
-				whileHover={{ scale: 1.02 }}
-				whileTap={{ scale: 0.98 }}
+				disabled={isRedirecting}
 				className={cn(
-					"flex items-center justify-center gap-2 font-semibold transition-all duration-200",
+					"flex items-center justify-center gap-2 transition-colors duration-200 disabled:cursor-not-allowed disabled:opacity-50",
 					getClassName()
 				)}
 			>
 				<GoogleLogo className="h-4 w-4" />
 				<span>Sign In</span>
-			</motion.button>
+			</button>
 		);
 	}
 
diff --git a/surfsense_web/components/homepage/hero-section.tsx b/surfsense_web/components/homepage/hero-section.tsx
index 2630f4266..c0abd927f 100644
--- a/surfsense_web/components/homepage/hero-section.tsx
+++ b/surfsense_web/components/homepage/hero-section.tsx
@@ -177,8 +177,11 @@ export function HeroSection() {
 
 function GetStartedButton() {
 	const isGoogleAuth = AUTH_TYPE === "GOOGLE";
+	const [isRedirecting, setIsRedirecting] = useState(false);
 
 	const handleGoogleLogin = () => {
+		if (isRedirecting) return;
+		setIsRedirecting(true);
 		trackLoginAttempt("google");
 		window.location.href = `${BACKEND_URL}/auth/google/authorize-redirect`;
 	};
@@ -189,7 +192,8 @@ function GetStartedButton() {
 				type="button"
 				variant="ghost"
 				onClick={handleGoogleLogin}
-				className="h-14 w-full cursor-pointer gap-3 rounded-lg bg-white text-center text-base font-medium text-neutral-700 shadow-sm ring-1 shadow-black/10 ring-black/10 transition duration-150 active:scale-98 hover:bg-neutral-50 sm:w-56 dark:bg-neutral-900 dark:text-neutral-200 dark:ring-neutral-700/50 dark:hover:bg-neutral-800"
+				disabled={isRedirecting}
+				className="h-14 w-full cursor-pointer gap-3 rounded-lg border border-white bg-white text-center text-base font-medium text-[#1f1f1f] shadow-sm transition duration-150 hover:bg-zinc-100 hover:text-[#1f1f1f] sm:w-56 dark:border-white"
 			>
 				<GoogleLogo className="h-5 w-5" />
 				<span>Continue with Google</span>

From 5bcda6b83bf84ecd3608fe5c70164242f304e459 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Mon, 18 May 2026 01:34:41 +0530
Subject: [PATCH 74/96] refactor: replace action log sheet with dialog
 component and update related references

---
 .../new-chat/[[...chat_id]]/page.tsx          |   2 +-
 .../components/AgentStatusContent.tsx         |   2 +-
 .../atoms/agent/action-log-dialog.atom.ts     |  19 +++
 .../atoms/agent/action-log-sheet.atom.ts      |  19 ---
 .../agent-action-log/action-log-button.tsx    |   6 +-
 ...on-log-sheet.tsx => action-log-dialog.tsx} |  63 +++++----
 .../agent-action-log/action-log-item.tsx      | 130 ++++++++++++++----
 .../assistant-ui/revert-turn-button.tsx       |   2 +-
 .../layout/providers/LayoutDataProvider.tsx   |   6 +-
 .../tool-registry/fallback/use-tool-action.ts |   2 +-
 .../hooks/use-agent-actions-query.ts          |   8 +-
 11 files changed, 168 insertions(+), 91 deletions(-)
 create mode 100644 surfsense_web/atoms/agent/action-log-dialog.atom.ts
 delete mode 100644 surfsense_web/atoms/agent/action-log-sheet.atom.ts
 rename surfsense_web/components/agent-action-log/{action-log-sheet.tsx => action-log-dialog.tsx} (75%)

diff --git a/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
index c3a18ea87..ed4ed6ce1 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
@@ -451,7 +451,7 @@ export default function NewChatPage() {
 	}, [params.search_space_id]);
 
 	// Unified store for agent-action rows (the same react-query cache
-	// the agent-actions sheet, the inline Revert button, and the
+	// the agent-actions dialog, the inline Revert button, and the
 	// per-turn Revert button all read). Hydrates from
 	// ``GET /threads/{id}/actions`` and is updated incrementally by the
 	// SSE handlers + revert-batch results below — no atom side-channel.
diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/AgentStatusContent.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/AgentStatusContent.tsx
index 1c20b79c2..1fa957a6a 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/AgentStatusContent.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/AgentStatusContent.tsx
@@ -137,7 +137,7 @@ const FLAG_GROUPS: FlagGroup[] = [
 	{
 		id: "tier5",
 		title: "Tier 5 — Audit + revert",
-		subtitle: "Action log + revert route used by the Agent Actions sheet.",
+		subtitle: "Action log + revert route used by the Agent Actions dialog.",
 		flags: [
 			{
 				key: "enable_action_log",
diff --git a/surfsense_web/atoms/agent/action-log-dialog.atom.ts b/surfsense_web/atoms/agent/action-log-dialog.atom.ts
new file mode 100644
index 000000000..bb0c386d8
--- /dev/null
+++ b/surfsense_web/atoms/agent/action-log-dialog.atom.ts
@@ -0,0 +1,19 @@
+import { atom } from "jotai";
+
+interface ActionLogDialogState {
+	open: boolean;
+	threadId: number | null;
+}
+
+export const actionLogDialogAtom = atom<ActionLogDialogState>({
+	open: false,
+	threadId: null,
+});
+
+export const openActionLogDialogAtom = atom(null, (_get, set, threadId: number) => {
+	set(actionLogDialogAtom, { open: true, threadId });
+});
+
+export const closeActionLogDialogAtom = atom(null, (_get, set) => {
+	set(actionLogDialogAtom, { open: false, threadId: null });
+});
diff --git a/surfsense_web/atoms/agent/action-log-sheet.atom.ts b/surfsense_web/atoms/agent/action-log-sheet.atom.ts
deleted file mode 100644
index f88d3ed1e..000000000
--- a/surfsense_web/atoms/agent/action-log-sheet.atom.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { atom } from "jotai";
-
-interface ActionLogSheetState {
-	open: boolean;
-	threadId: number | null;
-}
-
-export const actionLogSheetAtom = atom<ActionLogSheetState>({
-	open: false,
-	threadId: null,
-});
-
-export const openActionLogSheetAtom = atom(null, (_get, set, threadId: number) => {
-	set(actionLogSheetAtom, { open: true, threadId });
-});
-
-export const closeActionLogSheetAtom = atom(null, (_get, set) => {
-	set(actionLogSheetAtom, { open: false, threadId: null });
-});
diff --git a/surfsense_web/components/agent-action-log/action-log-button.tsx b/surfsense_web/components/agent-action-log/action-log-button.tsx
index 358acc8e7..6e4c72fc5 100644
--- a/surfsense_web/components/agent-action-log/action-log-button.tsx
+++ b/surfsense_web/components/agent-action-log/action-log-button.tsx
@@ -3,7 +3,7 @@
 import { useAtomValue, useSetAtom } from "jotai";
 import { Workflow } from "lucide-react";
 import { useCallback } from "react";
-import { openActionLogSheetAtom } from "@/atoms/agent/action-log-sheet.atom";
+import { openActionLogDialogAtom } from "@/atoms/agent/action-log-dialog.atom";
 import { agentFlagsAtom } from "@/atoms/agent/agent-flags-query.atom";
 import { Button } from "@/components/ui/button";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
@@ -13,7 +13,7 @@ interface ActionLogButtonProps {
 }
 
 /**
- * Header button that opens the agent action log sheet for the current
+ * Header button that opens the agent action log dialog for the current
  * thread. Renders nothing when:
  *   - the action log feature flag is off (graceful no-op for older
  *     deployments), OR
@@ -21,7 +21,7 @@ interface ActionLogButtonProps {
  */
 export function ActionLogButton({ threadId }: ActionLogButtonProps) {
 	const { data: flags } = useAtomValue(agentFlagsAtom);
-	const open = useSetAtom(openActionLogSheetAtom);
+	const open = useSetAtom(openActionLogDialogAtom);
 
 	const enabled = !!flags?.enable_action_log && !flags?.disable_new_agent_stack;
 
diff --git a/surfsense_web/components/agent-action-log/action-log-sheet.tsx b/surfsense_web/components/agent-action-log/action-log-dialog.tsx
similarity index 75%
rename from surfsense_web/components/agent-action-log/action-log-sheet.tsx
rename to surfsense_web/components/agent-action-log/action-log-dialog.tsx
index 1ce5dd20c..75f2408ae 100644
--- a/surfsense_web/components/agent-action-log/action-log-sheet.tsx
+++ b/surfsense_web/components/agent-action-log/action-log-dialog.tsx
@@ -2,19 +2,19 @@
 
 import { useQueryClient } from "@tanstack/react-query";
 import { useAtom, useAtomValue } from "jotai";
-import { RefreshCcw, Workflow, } from "lucide-react";
+import { RefreshCcw, Workflow } from "lucide-react";
 import { useCallback } from "react";
-import { actionLogSheetAtom } from "@/atoms/agent/action-log-sheet.atom";
+import { actionLogDialogAtom } from "@/atoms/agent/action-log-dialog.atom";
 import { agentFlagsAtom } from "@/atoms/agent/agent-flags-query.atom";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import {
-	Sheet,
-	SheetContent,
-	SheetDescription,
-	SheetHeader,
-	SheetTitle,
-} from "@/components/ui/sheet";
+	Dialog,
+	DialogContent,
+	DialogDescription,
+	DialogTitle,
+} from "@/components/ui/dialog";
+import { Separator } from "@/components/ui/separator";
 import { Skeleton } from "@/components/ui/skeleton";
 import { agentActionsQueryKey, useAgentActionsQuery } from "@/hooks/use-agent-actions-query";
 import { ActionLogItem } from "./action-log-item";
@@ -25,7 +25,7 @@ function EmptyState() {
 			<div className="flex max-w-[260px] flex-col gap-1.5">
 				<p className="text-sm font-semibold tracking-tight">No actions logged yet</p>
 				<p className="text-xs leading-relaxed text-muted-foreground">
-				A complete audit trail of every tool the agent uses in this thread will appear here
+					A complete audit trail of every tool the agent uses in this thread will appear here
 				</p>
 			</div>
 		</div>
@@ -64,8 +64,8 @@ function LoadingState() {
 	);
 }
 
-export function ActionLogSheet() {
-	const [state, setState] = useAtom(actionLogSheetAtom);
+export function ActionLogDialog() {
+	const [state, setState] = useAtom(actionLogDialogAtom);
 	const queryClient = useQueryClient();
 
 	const { data: flags } = useAtomValue(agentFlagsAtom);
@@ -78,6 +78,13 @@ export function ActionLogSheet() {
 		{ enabled: state.open && actionLogEnabled }
 	);
 
+	const handleOpenChange = useCallback(
+		(open: boolean) => {
+			setState((current) => (open ? { ...current, open } : { open: false, threadId: null }));
+		},
+		[setState]
+	);
+
 	const handleRevertSuccess = useCallback(() => {
 		if (threadId !== null) {
 			queryClient.invalidateQueries({ queryKey: agentActionsQueryKey(threadId) });
@@ -85,24 +92,22 @@ export function ActionLogSheet() {
 	}, [queryClient, threadId]);
 
 	return (
-		<Sheet open={state.open} onOpenChange={(open) => setState((s) => ({ ...s, open }))}>
-			<SheetContent
-				side="right"
-				className="flex h-full w-full flex-col gap-0 overflow-hidden p-0 sm:max-w-md select-none"
-			>
-				<SheetHeader className="shrink-0 px-4 py-4">
-					<div className="flex items-center gap-2 pr-24">
-						<SheetTitle className="text-base font-semibold">Agent actions</SheetTitle>
-						{data?.total !== undefined && data.total > 0 && (
+		<Dialog open={state.open} onOpenChange={handleOpenChange}>
+			<DialogContent className="select-none flex h-[90vh] max-h-[640px] w-[95vw] max-w-[900px] flex-col gap-0 overflow-hidden p-0 [--card:var(--popover)] md:h-[80vh]">
+				<div className="shrink-0 px-6 pb-3 pt-6 pr-28">
+					<div className="flex items-center gap-2">
+						<DialogTitle className="text-lg font-semibold">Agent actions</DialogTitle>
+						{data?.total !== undefined && data.total > 0 ? (
 							<Badge variant="secondary" className="text-[10px]">
 								{data.total}
 							</Badge>
-						)}
+						) : null}
 					</div>
-					<SheetDescription className="sr-only">
+					<DialogDescription className="sr-only">
 						Audit trail of every tool call the agent made in this thread.
-					</SheetDescription>
-				</SheetHeader>
+					</DialogDescription>
+					<Separator className="mt-4" />
+				</div>
 
 				<Button
 					size="sm"
@@ -135,7 +140,7 @@ export function ActionLogSheet() {
 					) : items.length === 0 ? (
 						<EmptyState />
 					) : (
-						<div className="flex flex-col gap-2 p-3">
+						<div className="flex flex-col gap-2 px-4 pb-4">
 							{items.map((action) => (
 								<ActionLogItem
 									key={action.id}
@@ -144,15 +149,15 @@ export function ActionLogSheet() {
 									onRevertSuccess={handleRevertSuccess}
 								/>
 							))}
-							{data?.has_more && (
+							{data?.has_more ? (
 								<p className="py-2 text-center text-[11px] text-muted-foreground">
 									Showing {items.length} of {data.total}. Older actions are paginated.
 								</p>
-							)}
+							) : null}
 						</div>
 					)}
 				</div>
-			</SheetContent>
-		</Sheet>
+			</DialogContent>
+		</Dialog>
 	);
 }
diff --git a/surfsense_web/components/agent-action-log/action-log-item.tsx b/surfsense_web/components/agent-action-log/action-log-item.tsx
index 954ee9aa5..7b57293ad 100644
--- a/surfsense_web/components/agent-action-log/action-log-item.tsx
+++ b/surfsense_web/components/agent-action-log/action-log-item.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { ChevronRight, RotateCcw, ShieldOff, Undo2 } from "lucide-react";
+import { Check, ChevronRight, Copy, RotateCcw, Undo2 } from "lucide-react";
 import { useState } from "react";
 import { toast } from "sonner";
 import {
@@ -16,7 +16,6 @@ import {
 } from "@/components/ui/alert-dialog";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
-import { Separator } from "@/components/ui/separator";
 import { getToolDisplayName, getToolIcon } from "@/contracts/enums/toolIcons";
 import { type AgentAction, agentActionsApiService } from "@/lib/apis/agent-actions-api.service";
 import { AppError } from "@/lib/error";
@@ -29,10 +28,55 @@ interface ActionLogItemProps {
 	onRevertSuccess: () => void;
 }
 
+function formatPrimitiveValue(value: unknown) {
+	if (value === null) return "null";
+	if (value === undefined) return "undefined";
+	if (typeof value === "string") return value;
+	if (typeof value === "number" || typeof value === "boolean") return String(value);
+	return JSON.stringify(value, null, 2);
+}
+
+function ArgumentValue({ value }: { value: unknown }) {
+	const formatted = formatPrimitiveValue(value);
+	const isBlockValue =
+		typeof value === "object" ||
+		(typeof value === "string" && (value.includes("\n") || value.length > 120));
+
+	if (isBlockValue) {
+		return (
+			<pre className="mt-2 whitespace-pre-wrap break-words bg-popover px-4 py-3 text-[11px] leading-relaxed text-popover-foreground/80">
+				{formatted}
+			</pre>
+		);
+	}
+
+	return (
+		<p className="mt-1 break-words font-mono text-[11px] leading-relaxed text-popover-foreground/80">
+			{formatted}
+		</p>
+	);
+}
+
+function StructuredArguments({ args }: { args: Record<string, unknown> }) {
+	return (
+		<div className="divide-y divide-popover-border border-t border-popover-border">
+			{Object.entries(args).map(([key, value]) => (
+				<div key={key} className="bg-popover">
+					<div className="px-4 py-3">
+						<p className="font-mono text-[10px] font-medium text-muted-foreground">{key}</p>
+						<ArgumentValue value={value} />
+					</div>
+				</div>
+			))}
+		</div>
+	);
+}
+
 export function ActionLogItem({ action, threadId, onRevertSuccess }: ActionLogItemProps) {
 	const [isExpanded, setIsExpanded] = useState(false);
 	const [isReverting, setIsReverting] = useState(false);
 	const [confirmOpen, setConfirmOpen] = useState(false);
+	const [copiedSection, setCopiedSection] = useState<"arguments" | null>(null);
 
 	const isAlreadyReverted = action.reverted_by_action_id !== null;
 	const isRevertAction = action.is_revert_action;
@@ -42,11 +86,22 @@ export function ActionLogItem({ action, threadId, onRevertSuccess }: ActionLogIt
 	const displayName = getToolDisplayName(action.tool_name);
 
 	const argsPreview = action.args ? JSON.stringify(action.args, null, 2) : null;
-	const truncatedArgs =
-		argsPreview && argsPreview.length > 600 ? `${argsPreview.slice(0, 600)}…` : argsPreview;
 
 	const canRevert = action.reversible && !isAlreadyReverted && !isRevertAction && !hasError;
 
+	const handleCopyArguments = async () => {
+		if (!argsPreview) return;
+
+		try {
+			await navigator.clipboard.writeText(argsPreview);
+			setCopiedSection("arguments");
+			toast.success("Arguments copied");
+			window.setTimeout(() => setCopiedSection(null), 1200);
+		} catch {
+			toast.error("Failed to copy arguments.");
+		}
+	};
+
 	const handleRevert = async () => {
 		setIsReverting(true);
 		try {
@@ -70,7 +125,7 @@ export function ActionLogItem({ action, threadId, onRevertSuccess }: ActionLogIt
 	return (
 		<div
 			className={cn(
-				"rounded-lg border bg-card transition-colors",
+				"overflow-hidden rounded-lg border border-popover-border bg-popover text-popover-foreground transition-colors",
 				isAlreadyReverted && "opacity-70"
 			)}
 		>
@@ -78,10 +133,10 @@ export function ActionLogItem({ action, threadId, onRevertSuccess }: ActionLogIt
 				type="button"
 				variant="ghost"
 				onClick={() => setIsExpanded((v) => !v)}
-				className="h-auto w-full items-start justify-start gap-3 p-3 text-left hover:bg-accent hover:text-accent-foreground"
+				className="h-auto w-full items-start justify-start gap-3 rounded-none p-3 text-left hover:bg-accent hover:text-accent-foreground"
 				aria-expanded={isExpanded}
 			>
-				<div className="flex size-8 shrink-0 items-center justify-center rounded-md bg-muted">
+				<div className="flex size-8 shrink-0 items-center justify-center rounded-md bg-accent">
 					{isRevertAction ? (
 						<Undo2 className="size-4 text-muted-foreground" />
 					) : (
@@ -102,7 +157,10 @@ export function ActionLogItem({ action, threadId, onRevertSuccess }: ActionLogIt
 							</Badge>
 						)}
 						{!isRevertAction && action.reversible && !isAlreadyReverted && (
-							<Badge variant="outline" className="text-[10px]">
+							<Badge
+								variant="secondary"
+								className="border-0 bg-neutral-200 px-1.5 py-0.5 text-[10px] text-neutral-700 dark:bg-neutral-700 dark:text-neutral-200"
+							>
 								Reversible
 							</Badge>
 						)}
@@ -116,55 +174,69 @@ export function ActionLogItem({ action, threadId, onRevertSuccess }: ActionLogIt
 				</div>
 				<ChevronRight
 					className={cn(
-						"size-4 shrink-0 text-muted-foreground transition-transform",
+						"size-4 shrink-0 self-center text-muted-foreground transition-transform",
 						isExpanded && "rotate-90"
 					)}
 				/>
 			</Button>
 
 			{isExpanded && (
-				<div className="flex flex-col gap-3 border-t bg-muted/20 p-3">
-					{truncatedArgs && (
-						<div>
-							<p className="mb-1 text-[10px] font-medium uppercase tracking-wide text-muted-foreground">
-								Arguments
-							</p>
-							<pre className="max-h-48 overflow-auto rounded-md bg-background p-2 text-[11px] text-foreground/80">
-								{truncatedArgs}
-							</pre>
+				<div className="flex flex-col border-t border-popover-border bg-accent/80">
+					{action.args && argsPreview && (
+						<div className="border-b border-popover-border">
+							<div className="flex items-center justify-between px-4 py-2">
+								<p className="text-[10px] font-medium uppercase tracking-wide text-muted-foreground">
+									Arguments
+								</p>
+								<Button
+									type="button"
+									size="sm"
+									variant="ghost"
+									onClick={handleCopyArguments}
+									className="size-6 rounded-lg p-0 text-muted-foreground hover:bg-popover hover:text-popover-foreground"
+									aria-label={
+										copiedSection === "arguments" ? "Arguments copied" : "Copy arguments"
+									}
+								>
+									{copiedSection === "arguments" ? (
+										<Check className="size-3" />
+									) : (
+										<Copy className="size-3" />
+									)}
+								</Button>
+							</div>
+							<StructuredArguments args={action.args} />
 						</div>
 					)}
 					{action.error && (
-						<div>
-							<p className="mb-1 text-[10px] font-medium uppercase tracking-wide text-muted-foreground">
+						<div className="border-b border-popover-border">
+							<p className="px-4 py-2 text-[10px] font-medium uppercase tracking-wide text-muted-foreground">
 								Error
 							</p>
-							<pre className="max-h-32 overflow-auto rounded-md bg-destructive/10 p-2 text-[11px] text-destructive">
+							<pre className="max-h-32 overflow-auto border-t border-popover-border bg-destructive/10 px-4 py-3 text-[11px] text-destructive">
 								{JSON.stringify(action.error, null, 2)}
 							</pre>
 						</div>
 					)}
 					{action.reverse_descriptor && (
-						<div>
-							<p className="mb-1 text-[10px] font-medium uppercase tracking-wide text-muted-foreground">
+						<div className="border-b border-popover-border">
+							<p className="px-4 py-2 text-[10px] font-medium uppercase tracking-wide text-muted-foreground">
 								Reverse plan
 							</p>
-							<pre className="max-h-32 overflow-auto rounded-md bg-background p-2 text-[11px] text-foreground/80">
+							<pre className="max-h-32 overflow-auto border-t border-popover-border bg-popover px-4 py-3 text-[11px] text-popover-foreground/80">
 								{JSON.stringify(action.reverse_descriptor, null, 2)}
 							</pre>
 						</div>
 					)}
 
-					<Separator />
-
-					<div className="flex items-center justify-between">
+					<div className="flex items-center justify-between px-4 py-3">
 						<p className="text-[10px] text-muted-foreground">
 							Action ID: <span className="font-mono">{action.id}</span>
 						</p>
 						{canRevert ? (
 							<AlertDialog open={confirmOpen} onOpenChange={setConfirmOpen}>
 								<AlertDialogTrigger asChild>
-									<Button size="sm" variant="outline" className="gap-1.5">
+									<Button size="sm" variant="secondary" className="gap-1.5">
 										<RotateCcw className="size-3.5" />
 										Revert
 									</Button>
@@ -186,6 +258,7 @@ export function ActionLogItem({ action, threadId, onRevertSuccess }: ActionLogIt
 												handleRevert();
 											}}
 											disabled={isReverting}
+											className="bg-secondary text-secondary-foreground hover:bg-secondary/80 focus-visible:ring-0"
 										>
 											{isReverting ? "Reverting…" : "Revert"}
 										</AlertDialogAction>
@@ -194,7 +267,6 @@ export function ActionLogItem({ action, threadId, onRevertSuccess }: ActionLogIt
 							</AlertDialog>
 						) : (
 							<div className="flex items-center gap-1.5 text-[11px] text-muted-foreground">
-								<ShieldOff className="size-3.5" />
 								{isAlreadyReverted
 									? "Already reverted"
 									: isRevertAction
diff --git a/surfsense_web/components/assistant-ui/revert-turn-button.tsx b/surfsense_web/components/assistant-ui/revert-turn-button.tsx
index 7b2725989..7e733fd99 100644
--- a/surfsense_web/components/assistant-ui/revert-turn-button.tsx
+++ b/surfsense_web/components/assistant-ui/revert-turn-button.tsx
@@ -5,7 +5,7 @@
  * assistant turn that has at least one reversible action.
  *
  * The button reads from the unified ``useAgentActionsQuery`` cache
- * (the SAME react-query cache the agent-actions sheet and the inline
+ * (the SAME react-query cache the agent-actions dialog and the inline
  * Revert button consume) filtered by ``chat_turn_id``. It shows a
  * confirmation dialog summarising "N reversible / M total" and, on
  * confirm, calls ``POST /threads/{id}/revert-turn/{chat_turn_id}``.
diff --git a/surfsense_web/components/layout/providers/LayoutDataProvider.tsx b/surfsense_web/components/layout/providers/LayoutDataProvider.tsx
index d774ae862..db44e8895 100644
--- a/surfsense_web/components/layout/providers/LayoutDataProvider.tsx
+++ b/surfsense_web/components/layout/providers/LayoutDataProvider.tsx
@@ -22,7 +22,7 @@ import {
 } from "@/atoms/settings/settings-dialog.atoms";
 import { removeChatTabAtom, syncChatTabAtom, type Tab } from "@/atoms/tabs/tabs.atom";
 import { currentUserAtom } from "@/atoms/user/user-query.atoms";
-import { ActionLogSheet } from "@/components/agent-action-log/action-log-sheet";
+import { ActionLogDialog } from "@/components/agent-action-log/action-log-dialog";
 import { AnnouncementsDialog } from "@/components/announcements/AnnouncementsDialog";
 import { SearchSpaceSettingsDialog } from "@/components/settings/search-space-settings-dialog";
 import { TeamDialog } from "@/components/settings/team-dialog";
@@ -893,8 +893,8 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 			<TeamDialog searchSpaceId={Number(searchSpaceId)} />
 			<AnnouncementsDialog />
 
-			{/* Agent action log + revert sheet */}
-			<ActionLogSheet />
+			{/* Agent action log + revert dialog */}
+			<ActionLogDialog />
 		</>
 	);
 }
diff --git a/surfsense_web/features/chat-messages/timeline/tool-registry/fallback/use-tool-action.ts b/surfsense_web/features/chat-messages/timeline/tool-registry/fallback/use-tool-action.ts
index 9e34724b9..cd5265a25 100644
--- a/surfsense_web/features/chat-messages/timeline/tool-registry/fallback/use-tool-action.ts
+++ b/surfsense_web/features/chat-messages/timeline/tool-registry/fallback/use-tool-action.ts
@@ -10,7 +10,7 @@ import { useAgentActionsQuery } from "@/hooks/use-agent-actions-query";
  * Resolve the ``AgentActionLog`` row for a given tool-call card. Tries
  * three lookup strategies, in priority order, against the unified
  * ``useAgentActionsQuery`` cache (the same react-query cache the
- * agent-actions sheet consumes — keeps the card and the sheet in
+ * agent-actions dialog consumes — keeps the card and the dialog in
  * lockstep across reload, navigation, live stream, post-stream
  * reversibility flips, and explicit revert clicks).
  *
diff --git a/surfsense_web/hooks/use-agent-actions-query.ts b/surfsense_web/hooks/use-agent-actions-query.ts
index 114c79567..1e2f45a8a 100644
--- a/surfsense_web/hooks/use-agent-actions-query.ts
+++ b/surfsense_web/hooks/use-agent-actions-query.ts
@@ -35,12 +35,12 @@ const dbg = (...args: unknown[]) => {
  * * the per-turn "Revert turn" button under each assistant message
  * * the edit-from-position pre-flight that decides whether to show
  *   the confirmation dialog
- * * the agent-actions sheet
+ * * the agent-actions dialog
  *
  * The cache is hydrated by ``GET /threads/{id}/actions`` (sized to
  * 200, the server max) and updated incrementally by helpers that turn
  * SSE events / revert RPC responses into ``setQueryData`` mutations.
- * That keeps the card and the sheet in lockstep on every code path —
+ * That keeps the card and the dialog in lockstep on every code path —
  * page reload, navigation, live stream, post-stream reversibility flip,
  * and explicit revert clicks.
  */
@@ -72,7 +72,7 @@ export interface ActionLogSseEvent {
  *
  * The SSE payload is a strict subset of ``AgentAction``; missing
  * fields (``args``, ``reverse_descriptor``, ``user_id``) are filled
- * with ``null`` placeholders. The next refetch (sheet open, user
+ * with ``null`` placeholders. The next refetch (dialog open, user
  * focus, route stale) backfills them — but the inline Revert button
  * only reads the fields the SSE payload carries, so it lights up
  * immediately.
@@ -251,7 +251,7 @@ export function applyRevertTurnResultsToCache(
 }
 
 /**
- * Read-side hook used by the card, the turn button, the sheet, and
+ * Read-side hook used by the card, the turn button, the dialog, and
  * the edit-from-position pre-flight.
  *
  * Returns the raw query state plus convenience selectors so consumers

From 08142f9add1006a30d65b5a54f5b4801d76bcd1e Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Mon, 18 May 2026 01:51:31 +0530
Subject: [PATCH 75/96] refactor: implement UserSettingsPage and
 UserSettingsPanel components, replacing UserSettingsDialog and enhancing user
 settings navigation

---
 .../[search_space_id]/user-settings/page.tsx  |  36 +++
 .../atoms/settings/settings-dialog.atoms.ts   |  10 -
 .../layout/providers/LayoutDataProvider.tsx   |  18 +-
 .../layout/ui/shell/LayoutShell.tsx           |  18 +-
 .../layout/ui/shell/WorkspacePanel.tsx        |  15 +-
 .../components/new-chat/prompt-picker.tsx     |  16 +-
 .../settings/user-settings-dialog.tsx         | 178 ------------
 .../settings/user-settings-panel.tsx          | 271 ++++++++++++++++++
 8 files changed, 357 insertions(+), 205 deletions(-)
 create mode 100644 surfsense_web/app/dashboard/[search_space_id]/user-settings/page.tsx
 delete mode 100644 surfsense_web/components/settings/user-settings-dialog.tsx
 create mode 100644 surfsense_web/components/settings/user-settings-panel.tsx

diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/page.tsx
new file mode 100644
index 000000000..48a5e7cde
--- /dev/null
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/page.tsx
@@ -0,0 +1,36 @@
+import { UserSettingsPanel, type UserSettingsTab } from "@/components/settings/user-settings-panel";
+
+const USER_SETTINGS_TABS = new Set<string>([
+	"profile",
+	"api-key",
+	"prompts",
+	"community-prompts",
+	"memory",
+	"agent-permissions",
+	"agent-status",
+	"purchases",
+	"desktop",
+	"desktop-shortcuts",
+]);
+
+function getInitialTab(tab: string | string[] | undefined): UserSettingsTab {
+	const value = Array.isArray(tab) ? tab[0] : tab;
+	return value && USER_SETTINGS_TABS.has(value) ? (value as UserSettingsTab) : "profile";
+}
+
+export default async function UserSettingsPage({
+	params,
+	searchParams,
+}: {
+	params: Promise<{ search_space_id: string }>;
+	searchParams: Promise<{ tab?: string | string[] }>;
+}) {
+	const [{ search_space_id }, resolvedSearchParams] = await Promise.all([params, searchParams]);
+
+	return (
+		<UserSettingsPanel
+			searchSpaceId={search_space_id}
+			initialTab={getInitialTab(resolvedSearchParams.tab)}
+		/>
+	);
+}
diff --git a/surfsense_web/atoms/settings/settings-dialog.atoms.ts b/surfsense_web/atoms/settings/settings-dialog.atoms.ts
index 480c41204..e066fc8ca 100644
--- a/surfsense_web/atoms/settings/settings-dialog.atoms.ts
+++ b/surfsense_web/atoms/settings/settings-dialog.atoms.ts
@@ -5,21 +5,11 @@ export interface SearchSpaceSettingsDialogState {
 	initialTab: string;
 }
 
-export interface UserSettingsDialogState {
-	open: boolean;
-	initialTab: string;
-}
-
 export const searchSpaceSettingsDialogAtom = atom<SearchSpaceSettingsDialogState>({
 	open: false,
 	initialTab: "general",
 });
 
-export const userSettingsDialogAtom = atom<UserSettingsDialogState>({
-	open: false,
-	initialTab: "profile",
-});
-
 export const teamDialogAtom = atom<boolean>(false);
 
 export const announcementsDialogAtom = atom<boolean>(false);
diff --git a/surfsense_web/components/layout/providers/LayoutDataProvider.tsx b/surfsense_web/components/layout/providers/LayoutDataProvider.tsx
index db44e8895..c1fe3e5c1 100644
--- a/surfsense_web/components/layout/providers/LayoutDataProvider.tsx
+++ b/surfsense_web/components/layout/providers/LayoutDataProvider.tsx
@@ -18,7 +18,6 @@ import {
 	announcementsDialogAtom,
 	searchSpaceSettingsDialogAtom,
 	teamDialogAtom,
-	userSettingsDialogAtom,
 } from "@/atoms/settings/settings-dialog.atoms";
 import { removeChatTabAtom, syncChatTabAtom, type Tab } from "@/atoms/tabs/tabs.atom";
 import { currentUserAtom } from "@/atoms/user/user-query.atoms";
@@ -26,7 +25,6 @@ import { ActionLogDialog } from "@/components/agent-action-log/action-log-dialog
 import { AnnouncementsDialog } from "@/components/announcements/AnnouncementsDialog";
 import { SearchSpaceSettingsDialog } from "@/components/settings/search-space-settings-dialog";
 import { TeamDialog } from "@/components/settings/team-dialog";
-import { UserSettingsDialog } from "@/components/settings/user-settings-dialog";
 import {
 	AlertDialog,
 	AlertDialogAction,
@@ -382,14 +380,13 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 		setIsCreateSearchSpaceDialogOpen(true);
 	}, []);
 
-	const setUserSettingsDialog = useSetAtom(userSettingsDialogAtom);
 	const setSearchSpaceSettingsDialog = useSetAtom(searchSpaceSettingsDialogAtom);
 	const setTeamDialogOpen = useSetAtom(teamDialogAtom);
 	const setAnnouncementsDialog = useSetAtom(announcementsDialogAtom);
 
 	const handleUserSettings = useCallback(() => {
-		setUserSettingsDialog({ open: true, initialTab: "profile" });
-	}, [setUserSettingsDialog]);
+		router.push(`/dashboard/${searchSpaceId}/user-settings`);
+	}, [router, searchSpaceId]);
 
 	const handleAnnouncements = useCallback(() => {
 		setAnnouncementsDialog(true);
@@ -668,8 +665,11 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 
 	// Detect if we're on the chat page (needs overflow-hidden for chat's own scroll)
 	const isChatPage = pathname?.includes("/new-chat") ?? false;
+	const isUserSettingsPage = pathname?.endsWith("/user-settings") === true;
 	const useWorkspacePanel =
-		pathname?.endsWith("/buy-more") === true || pathname?.endsWith("/more-pages") === true;
+		pathname?.endsWith("/buy-more") === true ||
+		pathname?.endsWith("/more-pages") === true ||
+		isUserSettingsPage;
 
 	return (
 		<>
@@ -708,6 +708,10 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 				setTheme={setTheme}
 				isChatPage={isChatPage}
 				useWorkspacePanel={useWorkspacePanel}
+				workspacePanelViewportClassName={
+					isUserSettingsPage ? "items-start justify-center px-6 py-8 md:px-10 md:py-10" : undefined
+				}
+				workspacePanelContentClassName={isUserSettingsPage ? "max-w-5xl" : undefined}
 				isLoadingChats={isLoadingThreads}
 				activeSlideoutPanel={activeSlideoutPanel}
 				onSlideoutPanelChange={setActiveSlideoutPanel}
@@ -887,9 +891,7 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 				onOpenChange={setIsCreateSearchSpaceDialogOpen}
 			/>
 
-			{/* Settings Dialogs */}
 			<SearchSpaceSettingsDialog searchSpaceId={Number(searchSpaceId)} />
-			<UserSettingsDialog />
 			<TeamDialog searchSpaceId={Number(searchSpaceId)} />
 			<AnnouncementsDialog />
 
diff --git a/surfsense_web/components/layout/ui/shell/LayoutShell.tsx b/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
index ad1d809ab..c090a8886 100644
--- a/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
+++ b/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
@@ -100,6 +100,8 @@ interface LayoutShellProps {
 	defaultCollapsed?: boolean;
 	isChatPage?: boolean;
 	useWorkspacePanel?: boolean;
+	workspacePanelViewportClassName?: string;
+	workspacePanelContentClassName?: string;
 	children: React.ReactNode;
 	className?: string;
 	// Unified slide-out panel state
@@ -205,6 +207,8 @@ export function LayoutShell({
 	defaultCollapsed = false,
 	isChatPage = false,
 	useWorkspacePanel = false,
+	workspacePanelViewportClassName,
+	workspacePanelContentClassName,
 	children,
 	className,
 	activeSlideoutPanel = null,
@@ -295,7 +299,12 @@ export function LayoutShell({
 						/>
 
 						{useWorkspacePanel ? (
-							<WorkspacePanel>{children}</WorkspacePanel>
+							<WorkspacePanel
+								viewportClassName={workspacePanelViewportClassName}
+								contentClassName={workspacePanelContentClassName}
+							>
+								{children}
+							</WorkspacePanel>
 						) : (
 							<main className={cn("flex-1", isChatPage ? "overflow-hidden" : "overflow-auto")}>
 								{children}
@@ -519,7 +528,12 @@ export function LayoutShell({
 
 					<DesktopWorkspaceRegion>
 						{useWorkspacePanel ? (
-							<WorkspacePanel>{children}</WorkspacePanel>
+							<WorkspacePanel
+								viewportClassName={workspacePanelViewportClassName}
+								contentClassName={workspacePanelContentClassName}
+							>
+								{children}
+							</WorkspacePanel>
 						) : (
 							<>
 								{/* Main content panel */}
diff --git a/surfsense_web/components/layout/ui/shell/WorkspacePanel.tsx b/surfsense_web/components/layout/ui/shell/WorkspacePanel.tsx
index d6dbe1870..e90240a5a 100644
--- a/surfsense_web/components/layout/ui/shell/WorkspacePanel.tsx
+++ b/surfsense_web/components/layout/ui/shell/WorkspacePanel.tsx
@@ -4,6 +4,7 @@ import { cn } from "@/lib/utils";
 interface WorkspacePanelProps {
 	children: ReactNode;
 	className?: string;
+	viewportClassName?: string;
 	contentClassName?: string;
 }
 
@@ -12,7 +13,12 @@ interface WorkspacePanelProps {
  * Use this when a route should own the whole workspace instead of rendering
  * inside the normal TabBar/Header/main/right-panel chrome.
  */
-export function WorkspacePanel({ children, className, contentClassName }: WorkspacePanelProps) {
+export function WorkspacePanel({
+	children,
+	className,
+	viewportClassName,
+	contentClassName,
+}: WorkspacePanelProps) {
 	return (
 		<main
 			className={cn(
@@ -20,7 +26,12 @@ export function WorkspacePanel({ children, className, contentClassName }: Worksp
 				className
 			)}
 		>
-			<div className="flex min-h-0 flex-1 items-center justify-center overflow-auto px-4 py-8">
+			<div
+				className={cn(
+					"flex min-h-0 flex-1 items-center justify-center overflow-auto px-4 py-8",
+					viewportClassName
+				)}
+			>
 				<div className={cn("w-full max-w-md", contentClassName)}>{children}</div>
 			</div>
 		</main>
diff --git a/surfsense_web/components/new-chat/prompt-picker.tsx b/surfsense_web/components/new-chat/prompt-picker.tsx
index 220fe3436..7700dd0b2 100644
--- a/surfsense_web/components/new-chat/prompt-picker.tsx
+++ b/surfsense_web/components/new-chat/prompt-picker.tsx
@@ -1,7 +1,8 @@
 "use client";
 
-import { useAtomValue, useSetAtom } from "jotai";
+import { useAtomValue } from "jotai";
 import { Plus, Zap } from "lucide-react";
+import { useParams, useRouter } from "next/navigation";
 import {
 	forwardRef,
 	useCallback,
@@ -14,7 +15,6 @@ import {
 } from "react";
 
 import { promptsAtom } from "@/atoms/prompts/prompts-query.atoms";
-import { userSettingsDialogAtom } from "@/atoms/settings/settings-dialog.atoms";
 import { Button } from "@/components/ui/button";
 import { Skeleton } from "@/components/ui/skeleton";
 import { cn } from "@/lib/utils";
@@ -35,7 +35,8 @@ export const PromptPicker = forwardRef<PromptPickerRef, PromptPickerProps>(funct
 	{ onSelect, onDone, externalSearch = "" },
 	ref
 ) {
-	const setUserSettingsDialog = useSetAtom(userSettingsDialogAtom);
+	const router = useRouter();
+	const params = useParams();
 	const { data: prompts, isLoading, isError } = useAtomValue(promptsAtom);
 	const [highlightedIndex, setHighlightedIndex] = useState(0);
 	const scrollContainerRef = useRef<HTMLDivElement>(null);
@@ -62,19 +63,24 @@ export const PromptPicker = forwardRef<PromptPickerRef, PromptPickerProps>(funct
 
 	const createPromptIndex = filtered.length;
 	const totalItems = filtered.length + 1;
+	const searchSpaceId = Array.isArray(params?.search_space_id)
+		? params.search_space_id[0]
+		: params?.search_space_id;
 
 	const handleSelect = useCallback(
 		(index: number) => {
 			if (index === createPromptIndex) {
 				onDone();
-				setUserSettingsDialog({ open: true, initialTab: "prompts" });
+				if (searchSpaceId) {
+					router.push(`/dashboard/${searchSpaceId}/user-settings?tab=prompts`);
+				}
 				return;
 			}
 			const action = filtered[index];
 			if (!action) return;
 			onSelect({ name: action.name, prompt: action.prompt, mode: action.mode });
 		},
-		[filtered, onSelect, createPromptIndex, onDone, setUserSettingsDialog]
+		[filtered, onSelect, createPromptIndex, onDone, router, searchSpaceId]
 	);
 
 	useEffect(() => {
diff --git a/surfsense_web/components/settings/user-settings-dialog.tsx b/surfsense_web/components/settings/user-settings-dialog.tsx
deleted file mode 100644
index 81dfc68f1..000000000
--- a/surfsense_web/components/settings/user-settings-dialog.tsx
+++ /dev/null
@@ -1,178 +0,0 @@
-"use client";
-
-import { useAtom } from "jotai";
-import {
-	Brain,
-	CircleUser,
-	Globe,
-	Keyboard,
-	KeyRound,
-	Monitor,
-	ReceiptText,
-	ShieldCheck,
-	Sparkles,
-	Workflow,
-} from "lucide-react";
-import dynamic from "next/dynamic";
-import { useTranslations } from "next-intl";
-import { useMemo } from "react";
-import { userSettingsDialogAtom } from "@/atoms/settings/settings-dialog.atoms";
-import { SettingsDialog } from "@/components/settings/settings-dialog";
-import { usePlatform } from "@/hooks/use-platform";
-
-const ProfileContent = dynamic(
-	() =>
-		import("@/app/dashboard/[search_space_id]/user-settings/components/ProfileContent").then(
-			(m) => ({ default: m.ProfileContent })
-		),
-	{ ssr: false }
-);
-const ApiKeyContent = dynamic(
-	() =>
-		import("@/app/dashboard/[search_space_id]/user-settings/components/ApiKeyContent").then(
-			(m) => ({ default: m.ApiKeyContent })
-		),
-	{ ssr: false }
-);
-const PromptsContent = dynamic(
-	() =>
-		import("@/app/dashboard/[search_space_id]/user-settings/components/PromptsContent").then(
-			(m) => ({ default: m.PromptsContent })
-		),
-	{ ssr: false }
-);
-const CommunityPromptsContent = dynamic(
-	() =>
-		import(
-			"@/app/dashboard/[search_space_id]/user-settings/components/CommunityPromptsContent"
-		).then((m) => ({ default: m.CommunityPromptsContent })),
-	{ ssr: false }
-);
-const PurchaseHistoryContent = dynamic(
-	() =>
-		import(
-			"@/app/dashboard/[search_space_id]/user-settings/components/PurchaseHistoryContent"
-		).then((m) => ({ default: m.PurchaseHistoryContent })),
-	{ ssr: false }
-);
-const DesktopContent = dynamic(
-	() =>
-		import("@/app/dashboard/[search_space_id]/user-settings/components/DesktopContent").then(
-			(m) => ({ default: m.DesktopContent })
-		),
-	{ ssr: false }
-);
-const DesktopShortcutsContent = dynamic(
-	() =>
-		import(
-			"@/app/dashboard/[search_space_id]/user-settings/components/DesktopShortcutsContent"
-		).then((m) => ({ default: m.DesktopShortcutsContent })),
-	{ ssr: false }
-);
-const MemoryContent = dynamic(
-	() =>
-		import("@/app/dashboard/[search_space_id]/user-settings/components/MemoryContent").then(
-			(m) => ({ default: m.MemoryContent })
-		),
-	{ ssr: false }
-);
-const AgentPermissionsContent = dynamic(
-	() =>
-		import(
-			"@/app/dashboard/[search_space_id]/user-settings/components/AgentPermissionsContent"
-		).then((m) => ({ default: m.AgentPermissionsContent })),
-	{ ssr: false }
-);
-const AgentStatusContent = dynamic(
-	() =>
-		import("@/app/dashboard/[search_space_id]/user-settings/components/AgentStatusContent").then(
-			(m) => ({ default: m.AgentStatusContent })
-		),
-	{ ssr: false }
-);
-
-export function UserSettingsDialog() {
-	const t = useTranslations("userSettings");
-	const [state, setState] = useAtom(userSettingsDialogAtom);
-	const { isDesktop } = usePlatform();
-
-	const navItems = useMemo(
-		() => [
-			{ value: "profile", label: t("profile_nav_label"), icon: <CircleUser className="h-4 w-4" /> },
-			{
-				value: "api-key",
-				label: t("api_key_nav_label"),
-				icon: <KeyRound className="h-4 w-4" />,
-			},
-			{
-				value: "prompts",
-				label: "My Prompts",
-				icon: <Sparkles className="h-4 w-4" />,
-			},
-			{
-				value: "community-prompts",
-				label: "Community Prompts",
-				icon: <Globe className="h-4 w-4" />,
-			},
-			{
-				value: "memory",
-				label: "Memory",
-				icon: <Brain className="h-4 w-4" />,
-			},
-			{
-				value: "agent-permissions",
-				label: "Agent Permissions",
-				icon: <ShieldCheck className="h-4 w-4" />,
-			},
-			{
-				value: "agent-status",
-				label: "Agent Status",
-				icon: <Workflow className="h-4 w-4" />,
-			},
-			{
-				value: "purchases",
-				label: "Purchase History",
-				icon: <ReceiptText className="h-4 w-4" />,
-			},
-			...(isDesktop
-				? [
-						{
-							value: "desktop",
-							label: "App Preferences",
-							icon: <Monitor className="h-4 w-4" />,
-						},
-						{
-							value: "desktop-shortcuts",
-							label: "Hotkeys",
-							icon: <Keyboard className="h-4 w-4" />,
-						},
-					]
-				: []),
-		],
-		[t, isDesktop]
-	);
-
-	return (
-		<SettingsDialog
-			open={state.open}
-			onOpenChange={(open) => setState((prev) => ({ ...prev, open }))}
-			title={t("title")}
-			navItems={navItems}
-			activeItem={state.initialTab}
-			onItemChange={(tab) => setState((prev) => ({ ...prev, initialTab: tab }))}
-		>
-			<div className="pt-4">
-				{state.initialTab === "profile" && <ProfileContent />}
-				{state.initialTab === "api-key" && <ApiKeyContent />}
-				{state.initialTab === "prompts" && <PromptsContent />}
-				{state.initialTab === "community-prompts" && <CommunityPromptsContent />}
-				{state.initialTab === "memory" && <MemoryContent />}
-				{state.initialTab === "agent-permissions" && <AgentPermissionsContent />}
-				{state.initialTab === "agent-status" && <AgentStatusContent />}
-				{state.initialTab === "purchases" && <PurchaseHistoryContent />}
-				{state.initialTab === "desktop" && <DesktopContent />}
-				{state.initialTab === "desktop-shortcuts" && <DesktopShortcutsContent />}
-			</div>
-		</SettingsDialog>
-	);
-}
diff --git a/surfsense_web/components/settings/user-settings-panel.tsx b/surfsense_web/components/settings/user-settings-panel.tsx
new file mode 100644
index 000000000..28e04a8d4
--- /dev/null
+++ b/surfsense_web/components/settings/user-settings-panel.tsx
@@ -0,0 +1,271 @@
+"use client";
+
+import {
+	Brain,
+	CircleUser,
+	Globe,
+	Keyboard,
+	KeyRound,
+	Monitor,
+	ReceiptText,
+	ShieldCheck,
+	Sparkles,
+	Workflow,
+} from "lucide-react";
+import dynamic from "next/dynamic";
+import { useRouter } from "next/navigation";
+import { useTranslations } from "next-intl";
+import { useCallback, useEffect, useMemo, useState } from "react";
+import { Button } from "@/components/ui/button";
+import { Separator } from "@/components/ui/separator";
+import { usePlatform } from "@/hooks/use-platform";
+import { cn } from "@/lib/utils";
+
+const ProfileContent = dynamic(
+	() =>
+		import("@/app/dashboard/[search_space_id]/user-settings/components/ProfileContent").then(
+			(m) => ({ default: m.ProfileContent })
+		),
+	{ ssr: false }
+);
+const ApiKeyContent = dynamic(
+	() =>
+		import("@/app/dashboard/[search_space_id]/user-settings/components/ApiKeyContent").then(
+			(m) => ({ default: m.ApiKeyContent })
+		),
+	{ ssr: false }
+);
+const PromptsContent = dynamic(
+	() =>
+		import("@/app/dashboard/[search_space_id]/user-settings/components/PromptsContent").then(
+			(m) => ({ default: m.PromptsContent })
+		),
+	{ ssr: false }
+);
+const CommunityPromptsContent = dynamic(
+	() =>
+		import(
+			"@/app/dashboard/[search_space_id]/user-settings/components/CommunityPromptsContent"
+		).then((m) => ({ default: m.CommunityPromptsContent })),
+	{ ssr: false }
+);
+const PurchaseHistoryContent = dynamic(
+	() =>
+		import(
+			"@/app/dashboard/[search_space_id]/user-settings/components/PurchaseHistoryContent"
+		).then((m) => ({ default: m.PurchaseHistoryContent })),
+	{ ssr: false }
+);
+const DesktopContent = dynamic(
+	() =>
+		import("@/app/dashboard/[search_space_id]/user-settings/components/DesktopContent").then(
+			(m) => ({ default: m.DesktopContent })
+		),
+	{ ssr: false }
+);
+const DesktopShortcutsContent = dynamic(
+	() =>
+		import(
+			"@/app/dashboard/[search_space_id]/user-settings/components/DesktopShortcutsContent"
+		).then((m) => ({ default: m.DesktopShortcutsContent })),
+	{ ssr: false }
+);
+const MemoryContent = dynamic(
+	() =>
+		import("@/app/dashboard/[search_space_id]/user-settings/components/MemoryContent").then(
+			(m) => ({ default: m.MemoryContent })
+		),
+	{ ssr: false }
+);
+const AgentPermissionsContent = dynamic(
+	() =>
+		import(
+			"@/app/dashboard/[search_space_id]/user-settings/components/AgentPermissionsContent"
+		).then((m) => ({ default: m.AgentPermissionsContent })),
+	{ ssr: false }
+);
+const AgentStatusContent = dynamic(
+	() =>
+		import("@/app/dashboard/[search_space_id]/user-settings/components/AgentStatusContent").then(
+			(m) => ({ default: m.AgentStatusContent })
+		),
+	{ ssr: false }
+);
+
+export type UserSettingsTab =
+	| "profile"
+	| "api-key"
+	| "prompts"
+	| "community-prompts"
+	| "memory"
+	| "agent-permissions"
+	| "agent-status"
+	| "purchases"
+	| "desktop"
+	| "desktop-shortcuts";
+
+interface UserSettingsPanelProps {
+	searchSpaceId: string;
+	initialTab?: UserSettingsTab;
+}
+
+export function UserSettingsPanel({
+	searchSpaceId,
+	initialTab = "profile",
+}: UserSettingsPanelProps) {
+	const t = useTranslations("userSettings");
+	const router = useRouter();
+	const { isDesktop } = usePlatform();
+	const [activeTab, setActiveTab] = useState<UserSettingsTab>(initialTab);
+	const [tabScrollPos, setTabScrollPos] = useState<"start" | "middle" | "end">("start");
+
+	useEffect(() => {
+		setActiveTab(initialTab);
+	}, [initialTab]);
+
+	const handleTabScroll = useCallback((e: React.UIEvent<HTMLDivElement>) => {
+		const el = e.currentTarget;
+		const atStart = el.scrollLeft <= 2;
+		const atEnd = el.scrollWidth - el.scrollLeft - el.clientWidth <= 2;
+		setTabScrollPos(atStart ? "start" : atEnd ? "end" : "middle");
+	}, []);
+
+	const navItems = useMemo(
+		() => [
+			{ value: "profile", label: t("profile_nav_label"), icon: <CircleUser className="h-4 w-4" /> },
+			{
+				value: "api-key",
+				label: t("api_key_nav_label"),
+				icon: <KeyRound className="h-4 w-4" />,
+			},
+			{
+				value: "prompts",
+				label: "My Prompts",
+				icon: <Sparkles className="h-4 w-4" />,
+			},
+			{
+				value: "community-prompts",
+				label: "Community Prompts",
+				icon: <Globe className="h-4 w-4" />,
+			},
+			{
+				value: "memory",
+				label: "Memory",
+				icon: <Brain className="h-4 w-4" />,
+			},
+			{
+				value: "agent-permissions",
+				label: "Agent Permissions",
+				icon: <ShieldCheck className="h-4 w-4" />,
+			},
+			{
+				value: "agent-status",
+				label: "Agent Status",
+				icon: <Workflow className="h-4 w-4" />,
+			},
+			{
+				value: "purchases",
+				label: "Purchase History",
+				icon: <ReceiptText className="h-4 w-4" />,
+			},
+			...(isDesktop
+				? [
+						{
+							value: "desktop" as const,
+							label: "App Preferences",
+							icon: <Monitor className="h-4 w-4" />,
+						},
+						{
+							value: "desktop-shortcuts" as const,
+							label: "Hotkeys",
+							icon: <Keyboard className="h-4 w-4" />,
+						},
+					]
+				: []),
+		],
+		[t, isDesktop]
+	);
+
+	const selectedTab = navItems.some((item) => item.value === activeTab) ? activeTab : "profile";
+	const selectedLabel = navItems.find((item) => item.value === selectedTab)?.label ?? t("title");
+
+	const handleItemChange = (tab: UserSettingsTab) => {
+		setActiveTab(tab);
+		const suffix = tab === "profile" ? "" : `?tab=${tab}`;
+		router.replace(`/dashboard/${searchSpaceId}/user-settings${suffix}`, { scroll: false });
+	};
+
+	return (
+		<section className="flex h-full min-h-[min(680px,calc(100vh-5rem))] w-full select-none flex-col gap-6 md:pt-10 md:flex-row">
+			<div className="md:w-[220px] md:shrink-0">
+				<h1 className="mb-4 px-1 text-2xl font-semibold tracking-tight">{t("title")}</h1>
+				<nav className="hidden flex-col gap-0.5 md:flex">
+					{navItems.map((item) => (
+						<Button
+							key={item.value}
+							type="button"
+							variant="ghost"
+							onClick={() => handleItemChange(item.value as UserSettingsTab)}
+							className={cn(
+								"h-auto justify-start gap-3 px-3 py-2.5 text-left text-sm font-medium transition-colors duration-150 focus:outline-none focus-visible:outline-none",
+								selectedTab === item.value
+									? "bg-accent text-accent-foreground"
+									: "bg-transparent text-muted-foreground hover:bg-accent hover:text-accent-foreground"
+							)}
+						>
+							{item.icon}
+							{item.label}
+						</Button>
+					))}
+				</nav>
+				<div
+					className="overflow-x-auto border-b border-border pb-3 md:hidden"
+					onScroll={handleTabScroll}
+					style={{
+						maskImage: `linear-gradient(to right, ${tabScrollPos === "start" ? "black" : "transparent"}, black 24px, black calc(100% - 24px), ${tabScrollPos === "end" ? "black" : "transparent"})`,
+						WebkitMaskImage: `linear-gradient(to right, ${tabScrollPos === "start" ? "black" : "transparent"}, black 24px, black calc(100% - 24px), ${tabScrollPos === "end" ? "black" : "transparent"})`,
+					}}
+				>
+					<div className="flex gap-1">
+						{navItems.map((item) => (
+							<Button
+								key={item.value}
+								type="button"
+								variant="ghost"
+								onClick={() => handleItemChange(item.value as UserSettingsTab)}
+								className={cn(
+									"h-auto shrink-0 gap-2 px-3 py-1.5 text-xs font-medium transition-colors duration-150 focus:outline-none focus-visible:outline-none",
+									selectedTab === item.value
+										? "bg-accent text-accent-foreground"
+										: "bg-transparent text-muted-foreground hover:bg-accent hover:text-accent-foreground"
+								)}
+							>
+								{item.icon}
+								{item.label}
+							</Button>
+						))}
+					</div>
+				</div>
+			</div>
+
+			<div className="min-w-0 flex-1">
+				<div className="hidden md:block">
+					<h2 className="text-lg font-semibold">{selectedLabel}</h2>
+					<Separator className="mt-4" />
+				</div>
+				<div className="min-w-0 pt-4 md:max-w-3xl">
+					{selectedTab === "profile" && <ProfileContent />}
+					{selectedTab === "api-key" && <ApiKeyContent />}
+					{selectedTab === "prompts" && <PromptsContent />}
+					{selectedTab === "community-prompts" && <CommunityPromptsContent />}
+					{selectedTab === "memory" && <MemoryContent />}
+					{selectedTab === "agent-permissions" && <AgentPermissionsContent />}
+					{selectedTab === "agent-status" && <AgentStatusContent />}
+					{selectedTab === "purchases" && <PurchaseHistoryContent />}
+					{selectedTab === "desktop" && <DesktopContent />}
+					{selectedTab === "desktop-shortcuts" && <DesktopShortcutsContent />}
+				</div>
+			</div>
+		</section>
+	);
+}

From b6aed05683978eb2d195deb4d27dbd38db2bd7ba Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Mon, 18 May 2026 02:02:45 +0530
Subject: [PATCH 76/96] refactor: implement SearchSpaceSettingsPage and
 SearchSpaceSettingsPanel components, replacing the previous settings dialog
 and enhancing tab navigation for search space settings

---
 .../search-space-settings/page.tsx            |  40 +++
 .../[search_space_id]/team/team-content.tsx   |  15 +-
 surfsense_web/atoms/layout/dialogs.atom.ts    |   5 +
 .../atoms/settings/settings-dialog.atoms.ts   |  15 --
 .../announcements/AnnouncementsDialog.tsx     |   2 +-
 .../assistant-ui/connector-popup.tsx          |  13 +-
 .../assistant-ui/document-upload-popup.tsx    |  11 +-
 .../layout/providers/LayoutDataProvider.tsx   |  31 ++-
 .../components/new-chat/chat-share-button.tsx |  11 +-
 .../settings/search-space-settings-dialog.tsx | 140 ----------
 .../settings/search-space-settings-panel.tsx  | 245 ++++++++++++++++++
 .../components/settings/settings-dialog.tsx   | 129 ---------
 .../components/settings/team-dialog.tsx       |   2 +-
 13 files changed, 330 insertions(+), 329 deletions(-)
 create mode 100644 surfsense_web/app/dashboard/[search_space_id]/search-space-settings/page.tsx
 create mode 100644 surfsense_web/atoms/layout/dialogs.atom.ts
 delete mode 100644 surfsense_web/atoms/settings/settings-dialog.atoms.ts
 delete mode 100644 surfsense_web/components/settings/search-space-settings-dialog.tsx
 create mode 100644 surfsense_web/components/settings/search-space-settings-panel.tsx
 delete mode 100644 surfsense_web/components/settings/settings-dialog.tsx

diff --git a/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/page.tsx
new file mode 100644
index 000000000..8dd7eb38e
--- /dev/null
+++ b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/page.tsx
@@ -0,0 +1,40 @@
+import {
+	SearchSpaceSettingsPanel,
+	type SearchSpaceSettingsTab,
+} from "@/components/settings/search-space-settings-panel";
+
+const SEARCH_SPACE_SETTINGS_TABS = new Set<string>([
+	"general",
+	"roles",
+	"models",
+	"image-models",
+	"vision-models",
+	"team-roles",
+	"prompts",
+	"team-memory",
+	"public-links",
+]);
+
+function getInitialTab(tab: string | string[] | undefined): SearchSpaceSettingsTab {
+	const value = Array.isArray(tab) ? tab[0] : tab;
+	return value && SEARCH_SPACE_SETTINGS_TABS.has(value)
+		? (value as SearchSpaceSettingsTab)
+		: "general";
+}
+
+export default async function SearchSpaceSettingsPage({
+	params,
+	searchParams,
+}: {
+	params: Promise<{ search_space_id: string }>;
+	searchParams: Promise<{ tab?: string | string[] }>;
+}) {
+	const [{ search_space_id }, resolvedSearchParams] = await Promise.all([params, searchParams]);
+
+	return (
+		<SearchSpaceSettingsPanel
+			searchSpaceId={search_space_id}
+			initialTab={getInitialTab(resolvedSearchParams.tab)}
+		/>
+	);
+}
diff --git a/surfsense_web/app/dashboard/[search_space_id]/team/team-content.tsx b/surfsense_web/app/dashboard/[search_space_id]/team/team-content.tsx
index e93ad1799..cc83148a3 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/team/team-content.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/team/team-content.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { useQuery } from "@tanstack/react-query";
-import { useAtomValue, useSetAtom } from "jotai";
+import { useAtomValue } from "jotai";
 import {
 	Calendar,
 	Check,
@@ -20,6 +20,7 @@ import {
 	UserPlus,
 	Users,
 } from "lucide-react";
+import { useRouter } from "next/navigation";
 import { useCallback, useEffect, useMemo, useState } from "react";
 import { toast } from "sonner";
 import {
@@ -31,7 +32,6 @@ import {
 	updateMemberMutationAtom,
 } from "@/atoms/members/members-mutation.atoms";
 import { membersAtom, myAccessAtom } from "@/atoms/members/members-query.atoms";
-import { searchSpaceSettingsDialogAtom } from "@/atoms/settings/settings-dialog.atoms";
 import {
 	AlertDialog,
 	AlertDialogAction,
@@ -346,6 +346,7 @@ export function TeamContent({ searchSpaceId }: TeamContentProps) {
 						{owners.map((member) => (
 							<MemberRow
 								key={`member-${member.id}`}
+								searchSpaceId={searchSpaceId}
 								member={member}
 								roles={roles}
 								canManageRoles={canManageRoles}
@@ -357,6 +358,7 @@ export function TeamContent({ searchSpaceId }: TeamContentProps) {
 						{paginatedMembers.map((member) => (
 							<MemberRow
 								key={`member-${member.id}`}
+								searchSpaceId={searchSpaceId}
 								member={member}
 								roles={roles}
 								canManageRoles={canManageRoles}
@@ -433,6 +435,7 @@ export function TeamContent({ searchSpaceId }: TeamContentProps) {
 }
 
 function MemberRow({
+	searchSpaceId,
 	member,
 	roles,
 	canManageRoles,
@@ -440,6 +443,7 @@ function MemberRow({
 	onUpdateRole,
 	onRemoveMember,
 }: {
+	searchSpaceId: number;
 	member: Membership;
 	roles: Role[];
 	canManageRoles: boolean;
@@ -447,7 +451,7 @@ function MemberRow({
 	onUpdateRole: (membershipId: number, roleId: number | null) => Promise<Membership>;
 	onRemoveMember: (membershipId: number) => Promise<boolean>;
 }) {
-	const setSearchSpaceSettingsDialog = useSetAtom(searchSpaceSettingsDialogAtom);
+	const router = useRouter();
 	const initials = getAvatarInitials(member);
 	const displayName = member.user_display_name || member.user_email || "Unknown";
 	const roleName = member.is_owner ? "Owner" : member.role?.name || "No role";
@@ -541,10 +545,7 @@ function MemberRow({
 							<DropdownMenuSeparator className="dark:bg-white/5" />
 							<DropdownMenuItem
 								onClick={() =>
-									setSearchSpaceSettingsDialog({
-										open: true,
-										initialTab: "team-roles",
-									})
+									router.push(`/dashboard/${searchSpaceId}/search-space-settings?tab=team-roles`)
 								}
 							>
 								Manage Roles
diff --git a/surfsense_web/atoms/layout/dialogs.atom.ts b/surfsense_web/atoms/layout/dialogs.atom.ts
new file mode 100644
index 000000000..e9ee0c6ea
--- /dev/null
+++ b/surfsense_web/atoms/layout/dialogs.atom.ts
@@ -0,0 +1,5 @@
+import { atom } from "jotai";
+
+export const teamDialogAtom = atom<boolean>(false);
+
+export const announcementsDialogAtom = atom<boolean>(false);
diff --git a/surfsense_web/atoms/settings/settings-dialog.atoms.ts b/surfsense_web/atoms/settings/settings-dialog.atoms.ts
deleted file mode 100644
index e066fc8ca..000000000
--- a/surfsense_web/atoms/settings/settings-dialog.atoms.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { atom } from "jotai";
-
-export interface SearchSpaceSettingsDialogState {
-	open: boolean;
-	initialTab: string;
-}
-
-export const searchSpaceSettingsDialogAtom = atom<SearchSpaceSettingsDialogState>({
-	open: false,
-	initialTab: "general",
-});
-
-export const teamDialogAtom = atom<boolean>(false);
-
-export const announcementsDialogAtom = atom<boolean>(false);
diff --git a/surfsense_web/components/announcements/AnnouncementsDialog.tsx b/surfsense_web/components/announcements/AnnouncementsDialog.tsx
index d624444c4..54653b535 100644
--- a/surfsense_web/components/announcements/AnnouncementsDialog.tsx
+++ b/surfsense_web/components/announcements/AnnouncementsDialog.tsx
@@ -2,7 +2,7 @@
 
 import { useAtom } from "jotai";
 import { useEffect } from "react";
-import { announcementsDialogAtom } from "@/atoms/settings/settings-dialog.atoms";
+import { announcementsDialogAtom } from "@/atoms/layout/dialogs.atom";
 import { AnnouncementCard } from "@/components/announcements/AnnouncementCard";
 import { AnnouncementsEmptyState } from "@/components/announcements/AnnouncementsEmptyState";
 import { Dialog, DialogContent, DialogTitle } from "@/components/ui/dialog";
diff --git a/surfsense_web/components/assistant-ui/connector-popup.tsx b/surfsense_web/components/assistant-ui/connector-popup.tsx
index 001259236..ed671d374 100644
--- a/surfsense_web/components/assistant-ui/connector-popup.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup.tsx
@@ -1,7 +1,8 @@
 "use client";
 
-import { useAtomValue, useSetAtom } from "jotai";
+import { useAtomValue } from "jotai";
 import { AlertTriangle, Settings } from "lucide-react";
+import { useRouter } from "next/navigation";
 import { forwardRef, useEffect, useImperativeHandle, useMemo, useState } from "react";
 import { createPortal } from "react-dom";
 import { statusInboxItemsAtom } from "@/atoms/inbox/status-inbox.atom";
@@ -10,7 +11,6 @@ import {
 	llmPreferencesAtom,
 } from "@/atoms/new-llm-config/new-llm-config-query.atoms";
 import { activeSearchSpaceIdAtom } from "@/atoms/search-spaces/search-space-query.atoms";
-import { searchSpaceSettingsDialogAtom } from "@/atoms/settings/settings-dialog.atoms";
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Button } from "@/components/ui/button";
 import { Dialog, DialogContent, DialogTitle } from "@/components/ui/dialog";
@@ -44,8 +44,8 @@ interface ConnectorIndicatorProps {
 
 export const ConnectorIndicator = forwardRef<ConnectorIndicatorHandle, ConnectorIndicatorProps>(
 	(_props, ref) => {
+		const router = useRouter();
 		const searchSpaceId = useAtomValue(activeSearchSpaceIdAtom);
-		const setSearchSpaceSettingsDialog = useSetAtom(searchSpaceSettingsDialogAtom);
 		const { data: preferences = {}, isFetching: preferencesLoading } =
 			useAtomValue(llmPreferencesAtom);
 		const { data: globalConfigs = [], isFetching: globalConfigsLoading } =
@@ -397,10 +397,9 @@ export const ConnectorIndicator = forwardRef<ConnectorIndicatorHandle, Connector
 														variant="outline"
 														onClick={() => {
 															handleOpenChange(false);
-															setSearchSpaceSettingsDialog({
-																open: true,
-																initialTab: "models",
-															});
+															router.push(
+																`/dashboard/${searchSpaceId}/search-space-settings?tab=models`
+															);
 														}}
 													>
 														<Settings className="mr-2 h-4 w-4" />
diff --git a/surfsense_web/components/assistant-ui/document-upload-popup.tsx b/surfsense_web/components/assistant-ui/document-upload-popup.tsx
index 13683162f..d4482a01b 100644
--- a/surfsense_web/components/assistant-ui/document-upload-popup.tsx
+++ b/surfsense_web/components/assistant-ui/document-upload-popup.tsx
@@ -1,7 +1,8 @@
 "use client";
 
-import { useAtomValue, useSetAtom } from "jotai";
+import { useAtomValue } from "jotai";
 import { AlertTriangle, Settings } from "lucide-react";
+import { useRouter } from "next/navigation";
 import {
 	createContext,
 	type FC,
@@ -16,7 +17,6 @@ import {
 	llmPreferencesAtom,
 } from "@/atoms/new-llm-config/new-llm-config-query.atoms";
 import { activeSearchSpaceIdAtom } from "@/atoms/search-spaces/search-space-query.atoms";
-import { searchSpaceSettingsDialogAtom } from "@/atoms/settings/settings-dialog.atoms";
 import { DocumentUploadTab } from "@/components/sources/DocumentUploadTab";
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Button } from "@/components/ui/button";
@@ -98,8 +98,8 @@ const DocumentUploadPopupContent: FC<{
 	isOpen: boolean;
 	onOpenChange: (open: boolean) => void;
 }> = ({ isOpen, onOpenChange }) => {
+	const router = useRouter();
 	const searchSpaceId = useAtomValue(activeSearchSpaceIdAtom);
-	const setSearchSpaceSettingsDialog = useSetAtom(searchSpaceSettingsDialogAtom);
 	const { data: preferences = {}, isFetching: preferencesLoading } =
 		useAtomValue(llmPreferencesAtom);
 	const { data: globalConfigs = [], isFetching: globalConfigsLoading } =
@@ -164,10 +164,7 @@ const DocumentUploadPopupContent: FC<{
 										variant="outline"
 										onClick={() => {
 											onOpenChange(false);
-											setSearchSpaceSettingsDialog({
-												open: true,
-												initialTab: "models",
-											});
+											router.push(`/dashboard/${searchSpaceId}/search-space-settings?tab=models`);
 										}}
 									>
 										<Settings className="mr-2 h-4 w-4" />
diff --git a/surfsense_web/components/layout/providers/LayoutDataProvider.tsx b/surfsense_web/components/layout/providers/LayoutDataProvider.tsx
index c1fe3e5c1..d46895a0a 100644
--- a/surfsense_web/components/layout/providers/LayoutDataProvider.tsx
+++ b/surfsense_web/components/layout/providers/LayoutDataProvider.tsx
@@ -11,19 +11,14 @@ import { toast } from "sonner";
 import { currentThreadAtom, resetCurrentThreadAtom } from "@/atoms/chat/current-thread.atom";
 import { documentsSidebarOpenAtom } from "@/atoms/documents/ui.atoms";
 import { statusInboxItemsAtom } from "@/atoms/inbox/status-inbox.atom";
+import { announcementsDialogAtom, teamDialogAtom } from "@/atoms/layout/dialogs.atom";
 import { rightPanelCollapsedAtom } from "@/atoms/layout/right-panel.atom";
 import { deleteSearchSpaceMutationAtom } from "@/atoms/search-spaces/search-space-mutation.atoms";
 import { searchSpacesAtom } from "@/atoms/search-spaces/search-space-query.atoms";
-import {
-	announcementsDialogAtom,
-	searchSpaceSettingsDialogAtom,
-	teamDialogAtom,
-} from "@/atoms/settings/settings-dialog.atoms";
 import { removeChatTabAtom, syncChatTabAtom, type Tab } from "@/atoms/tabs/tabs.atom";
 import { currentUserAtom } from "@/atoms/user/user-query.atoms";
 import { ActionLogDialog } from "@/components/agent-action-log/action-log-dialog";
 import { AnnouncementsDialog } from "@/components/announcements/AnnouncementsDialog";
-import { SearchSpaceSettingsDialog } from "@/components/settings/search-space-settings-dialog";
 import { TeamDialog } from "@/components/settings/team-dialog";
 import {
 	AlertDialog,
@@ -380,7 +375,6 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 		setIsCreateSearchSpaceDialogOpen(true);
 	}, []);
 
-	const setSearchSpaceSettingsDialog = useSetAtom(searchSpaceSettingsDialogAtom);
 	const setTeamDialogOpen = useSetAtom(teamDialogAtom);
 	const setAnnouncementsDialog = useSetAtom(announcementsDialogAtom);
 
@@ -393,10 +387,10 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 	}, [setAnnouncementsDialog]);
 
 	const handleSearchSpaceSettings = useCallback(
-		(_space: SearchSpace) => {
-			setSearchSpaceSettingsDialog({ open: true, initialTab: "general" });
+		(space: SearchSpace) => {
+			router.push(`/dashboard/${space.id}/search-space-settings`);
 		},
-		[setSearchSpaceSettingsDialog]
+		[router]
 	);
 
 	const handleSearchSpaceDeleteClick = useCallback((space: SearchSpace) => {
@@ -568,8 +562,8 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 	);
 
 	const handleSettings = useCallback(() => {
-		setSearchSpaceSettingsDialog({ open: true, initialTab: "general" });
-	}, [setSearchSpaceSettingsDialog]);
+		router.push(`/dashboard/${searchSpaceId}/search-space-settings`);
+	}, [router, searchSpaceId]);
 
 	const handleManageMembers = useCallback(() => {
 		setTeamDialogOpen(true);
@@ -666,10 +660,12 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 	// Detect if we're on the chat page (needs overflow-hidden for chat's own scroll)
 	const isChatPage = pathname?.includes("/new-chat") ?? false;
 	const isUserSettingsPage = pathname?.endsWith("/user-settings") === true;
+	const isSearchSpaceSettingsPage = pathname?.endsWith("/search-space-settings") === true;
 	const useWorkspacePanel =
 		pathname?.endsWith("/buy-more") === true ||
 		pathname?.endsWith("/more-pages") === true ||
-		isUserSettingsPage;
+		isUserSettingsPage ||
+		isSearchSpaceSettingsPage;
 
 	return (
 		<>
@@ -709,9 +705,13 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 				isChatPage={isChatPage}
 				useWorkspacePanel={useWorkspacePanel}
 				workspacePanelViewportClassName={
-					isUserSettingsPage ? "items-start justify-center px-6 py-8 md:px-10 md:py-10" : undefined
+					isUserSettingsPage || isSearchSpaceSettingsPage
+						? "items-start justify-center px-6 py-8 md:px-10 md:py-10"
+						: undefined
+				}
+				workspacePanelContentClassName={
+					isUserSettingsPage || isSearchSpaceSettingsPage ? "max-w-5xl" : undefined
 				}
-				workspacePanelContentClassName={isUserSettingsPage ? "max-w-5xl" : undefined}
 				isLoadingChats={isLoadingThreads}
 				activeSlideoutPanel={activeSlideoutPanel}
 				onSlideoutPanelChange={setActiveSlideoutPanel}
@@ -891,7 +891,6 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 				onOpenChange={setIsCreateSearchSpaceDialogOpen}
 			/>
 
-			<SearchSpaceSettingsDialog searchSpaceId={Number(searchSpaceId)} />
 			<TeamDialog searchSpaceId={Number(searchSpaceId)} />
 			<AnnouncementsDialog />
 
diff --git a/surfsense_web/components/new-chat/chat-share-button.tsx b/surfsense_web/components/new-chat/chat-share-button.tsx
index f8a9f55ff..3b4ff0654 100644
--- a/surfsense_web/components/new-chat/chat-share-button.tsx
+++ b/surfsense_web/components/new-chat/chat-share-button.tsx
@@ -3,13 +3,13 @@
 import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { useAtomValue, useSetAtom } from "jotai";
 import { Earth, User, Users } from "lucide-react";
+import { useRouter } from "next/navigation";
 
 import { useCallback, useState } from "react";
 import { toast } from "sonner";
 import { currentThreadAtom, setThreadVisibilityAtom } from "@/atoms/chat/current-thread.atom";
 import { myAccessAtom } from "@/atoms/members/members-query.atoms";
 import { createPublicChatSnapshotMutationAtom } from "@/atoms/public-chat-snapshots/public-chat-snapshots-mutation.atoms";
-import { searchSpaceSettingsDialogAtom } from "@/atoms/settings/settings-dialog.atoms";
 import { Button } from "@/components/ui/button";
 import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
@@ -49,8 +49,8 @@ const visibilityOptions: {
 
 export function ChatShareButton({ thread, onVisibilityChange, className }: ChatShareButtonProps) {
 	const queryClient = useQueryClient();
+	const router = useRouter();
 	const [open, setOpen] = useState(false);
-	const setSearchSpaceSettingsDialog = useSetAtom(searchSpaceSettingsDialogAtom);
 
 	// Use Jotai atom for visibility (single source of truth)
 	const currentThreadState = useAtomValue(currentThreadAtom);
@@ -148,10 +148,9 @@ export function ChatShareButton({ thread, onVisibilityChange, className }: ChatS
 							variant="ghost"
 							size="icon"
 							onClick={() =>
-								setSearchSpaceSettingsDialog({
-									open: true,
-									initialTab: "public-links",
-								})
+								router.push(
+									`/dashboard/${thread.search_space_id}/search-space-settings?tab=public-links`
+								)
 							}
 							className="size-8 bg-muted/50 hover:bg-accent hover:text-accent-foreground"
 						>
diff --git a/surfsense_web/components/settings/search-space-settings-dialog.tsx b/surfsense_web/components/settings/search-space-settings-dialog.tsx
deleted file mode 100644
index 2a7ba82b6..000000000
--- a/surfsense_web/components/settings/search-space-settings-dialog.tsx
+++ /dev/null
@@ -1,140 +0,0 @@
-"use client";
-
-import { useAtom } from "jotai";
-import {
-	BookText,
-	Bot,
-	Brain,
-	CircleUser,
-	Earth,
-	ImageIcon,
-	ListChecks,
-	ScanEye,
-	UserKey,
-} from "lucide-react";
-import dynamic from "next/dynamic";
-import { useTranslations } from "next-intl";
-import type React from "react";
-import { searchSpaceSettingsDialogAtom } from "@/atoms/settings/settings-dialog.atoms";
-import { SettingsDialog } from "@/components/settings/settings-dialog";
-
-const GeneralSettingsManager = dynamic(
-	() =>
-		import("@/components/settings/general-settings-manager").then((m) => ({
-			default: m.GeneralSettingsManager,
-		})),
-	{ ssr: false }
-);
-const AgentModelManager = dynamic(
-	() =>
-		import("@/components/settings/agent-model-manager").then((m) => ({
-			default: m.AgentModelManager,
-		})),
-	{ ssr: false }
-);
-const LLMRoleManager = dynamic(
-	() =>
-		import("@/components/settings/llm-role-manager").then((m) => ({ default: m.LLMRoleManager })),
-	{ ssr: false }
-);
-const ImageModelManager = dynamic(
-	() =>
-		import("@/components/settings/image-model-manager").then((m) => ({
-			default: m.ImageModelManager,
-		})),
-	{ ssr: false }
-);
-const VisionModelManager = dynamic(
-	() =>
-		import("@/components/settings/vision-model-manager").then((m) => ({
-			default: m.VisionModelManager,
-		})),
-	{ ssr: false }
-);
-const RolesManager = dynamic(
-	() => import("@/components/settings/roles-manager").then((m) => ({ default: m.RolesManager })),
-	{ ssr: false }
-);
-const PromptConfigManager = dynamic(
-	() =>
-		import("@/components/settings/prompt-config-manager").then((m) => ({
-			default: m.PromptConfigManager,
-		})),
-	{ ssr: false }
-);
-const PublicChatSnapshotsManager = dynamic(
-	() =>
-		import("@/components/public-chat-snapshots/public-chat-snapshots-manager").then((m) => ({
-			default: m.PublicChatSnapshotsManager,
-		})),
-	{ ssr: false }
-);
-const TeamMemoryManager = dynamic(
-	() =>
-		import("@/components/settings/team-memory-manager").then((m) => ({
-			default: m.TeamMemoryManager,
-		})),
-	{ ssr: false }
-);
-
-interface SearchSpaceSettingsDialogProps {
-	searchSpaceId: number;
-}
-
-export function SearchSpaceSettingsDialog({ searchSpaceId }: SearchSpaceSettingsDialogProps) {
-	const t = useTranslations("searchSpaceSettings");
-	const [state, setState] = useAtom(searchSpaceSettingsDialogAtom);
-
-	const navItems = [
-		{ value: "general", label: t("nav_general"), icon: <CircleUser className="h-4 w-4" /> },
-		{ value: "roles", label: t("nav_role_assignments"), icon: <ListChecks className="h-4 w-4" /> },
-		{ value: "models", label: t("nav_agent_models"), icon: <Bot className="h-4 w-4" /> },
-		{
-			value: "image-models",
-			label: t("nav_image_models"),
-			icon: <ImageIcon className="h-4 w-4" />,
-		},
-		{
-			value: "vision-models",
-			label: t("nav_vision_models"),
-			icon: <ScanEye className="h-4 w-4" />,
-		},
-		{ value: "team-roles", label: t("nav_team_roles"), icon: <UserKey className="h-4 w-4" /> },
-		{
-			value: "prompts",
-			label: t("nav_system_instructions"),
-			icon: <BookText className="h-4 w-4" />,
-		},
-		{
-			value: "team-memory",
-			label: "Team Memory",
-			icon: <Brain className="h-4 w-4" />,
-		},
-		{ value: "public-links", label: t("nav_public_links"), icon: <Earth className="h-4 w-4" /> },
-	];
-
-	const content: Record<string, React.ReactNode> = {
-		general: <GeneralSettingsManager searchSpaceId={searchSpaceId} />,
-		models: <AgentModelManager searchSpaceId={searchSpaceId} />,
-		roles: <LLMRoleManager key={searchSpaceId} searchSpaceId={searchSpaceId} />,
-		"image-models": <ImageModelManager searchSpaceId={searchSpaceId} />,
-		"vision-models": <VisionModelManager searchSpaceId={searchSpaceId} />,
-		"team-roles": <RolesManager searchSpaceId={searchSpaceId} />,
-		prompts: <PromptConfigManager searchSpaceId={searchSpaceId} />,
-		"team-memory": <TeamMemoryManager searchSpaceId={searchSpaceId} />,
-		"public-links": <PublicChatSnapshotsManager searchSpaceId={searchSpaceId} />,
-	};
-
-	return (
-		<SettingsDialog
-			open={state.open}
-			onOpenChange={(open) => setState((prev) => ({ ...prev, open }))}
-			title={t("title")}
-			navItems={navItems}
-			activeItem={state.initialTab}
-			onItemChange={(tab) => setState((prev) => ({ ...prev, initialTab: tab }))}
-		>
-			<div className="pt-4">{content[state.initialTab]}</div>
-		</SettingsDialog>
-	);
-}
diff --git a/surfsense_web/components/settings/search-space-settings-panel.tsx b/surfsense_web/components/settings/search-space-settings-panel.tsx
new file mode 100644
index 000000000..248b2c585
--- /dev/null
+++ b/surfsense_web/components/settings/search-space-settings-panel.tsx
@@ -0,0 +1,245 @@
+"use client";
+
+import {
+	BookText,
+	Bot,
+	Brain,
+	CircleUser,
+	Earth,
+	ImageIcon,
+	ListChecks,
+	ScanEye,
+	UserKey,
+} from "lucide-react";
+import dynamic from "next/dynamic";
+import { useRouter } from "next/navigation";
+import { useTranslations } from "next-intl";
+import type React from "react";
+import { useCallback, useEffect, useMemo, useState } from "react";
+import { Button } from "@/components/ui/button";
+import { Separator } from "@/components/ui/separator";
+import { cn } from "@/lib/utils";
+
+const GeneralSettingsManager = dynamic(
+	() =>
+		import("@/components/settings/general-settings-manager").then((m) => ({
+			default: m.GeneralSettingsManager,
+		})),
+	{ ssr: false }
+);
+const AgentModelManager = dynamic(
+	() =>
+		import("@/components/settings/agent-model-manager").then((m) => ({
+			default: m.AgentModelManager,
+		})),
+	{ ssr: false }
+);
+const LLMRoleManager = dynamic(
+	() =>
+		import("@/components/settings/llm-role-manager").then((m) => ({ default: m.LLMRoleManager })),
+	{ ssr: false }
+);
+const ImageModelManager = dynamic(
+	() =>
+		import("@/components/settings/image-model-manager").then((m) => ({
+			default: m.ImageModelManager,
+		})),
+	{ ssr: false }
+);
+const VisionModelManager = dynamic(
+	() =>
+		import("@/components/settings/vision-model-manager").then((m) => ({
+			default: m.VisionModelManager,
+		})),
+	{ ssr: false }
+);
+const RolesManager = dynamic(
+	() => import("@/components/settings/roles-manager").then((m) => ({ default: m.RolesManager })),
+	{ ssr: false }
+);
+const PromptConfigManager = dynamic(
+	() =>
+		import("@/components/settings/prompt-config-manager").then((m) => ({
+			default: m.PromptConfigManager,
+		})),
+	{ ssr: false }
+);
+const PublicChatSnapshotsManager = dynamic(
+	() =>
+		import("@/components/public-chat-snapshots/public-chat-snapshots-manager").then((m) => ({
+			default: m.PublicChatSnapshotsManager,
+		})),
+	{ ssr: false }
+);
+const TeamMemoryManager = dynamic(
+	() =>
+		import("@/components/settings/team-memory-manager").then((m) => ({
+			default: m.TeamMemoryManager,
+		})),
+	{ ssr: false }
+);
+
+export type SearchSpaceSettingsTab =
+	| "general"
+	| "roles"
+	| "models"
+	| "image-models"
+	| "vision-models"
+	| "team-roles"
+	| "prompts"
+	| "team-memory"
+	| "public-links";
+
+interface SearchSpaceSettingsPanelProps {
+	searchSpaceId: string;
+	initialTab?: SearchSpaceSettingsTab;
+}
+
+export function SearchSpaceSettingsPanel({
+	searchSpaceId,
+	initialTab = "general",
+}: SearchSpaceSettingsPanelProps) {
+	const t = useTranslations("searchSpaceSettings");
+	const router = useRouter();
+	const numericSearchSpaceId = Number(searchSpaceId);
+	const [activeTab, setActiveTab] = useState<SearchSpaceSettingsTab>(initialTab);
+	const [tabScrollPos, setTabScrollPos] = useState<"start" | "middle" | "end">("start");
+
+	useEffect(() => {
+		setActiveTab(initialTab);
+	}, [initialTab]);
+
+	const handleTabScroll = useCallback((e: React.UIEvent<HTMLDivElement>) => {
+		const el = e.currentTarget;
+		const atStart = el.scrollLeft <= 2;
+		const atEnd = el.scrollWidth - el.scrollLeft - el.clientWidth <= 2;
+		setTabScrollPos(atStart ? "start" : atEnd ? "end" : "middle");
+	}, []);
+
+	const navItems = useMemo(
+		() => [
+			{ value: "general", label: t("nav_general"), icon: <CircleUser className="h-4 w-4" /> },
+			{ value: "roles", label: t("nav_role_assignments"), icon: <ListChecks className="h-4 w-4" /> },
+			{ value: "models", label: t("nav_agent_models"), icon: <Bot className="h-4 w-4" /> },
+			{
+				value: "image-models",
+				label: t("nav_image_models"),
+				icon: <ImageIcon className="h-4 w-4" />,
+			},
+			{
+				value: "vision-models",
+				label: t("nav_vision_models"),
+				icon: <ScanEye className="h-4 w-4" />,
+			},
+			{ value: "team-roles", label: t("nav_team_roles"), icon: <UserKey className="h-4 w-4" /> },
+			{
+				value: "prompts",
+				label: t("nav_system_instructions"),
+				icon: <BookText className="h-4 w-4" />,
+			},
+			{
+				value: "team-memory",
+				label: "Team Memory",
+				icon: <Brain className="h-4 w-4" />,
+			},
+			{ value: "public-links", label: t("nav_public_links"), icon: <Earth className="h-4 w-4" /> },
+		],
+		[t]
+	);
+
+	const selectedTab = navItems.some((item) => item.value === activeTab) ? activeTab : "general";
+	const selectedLabel = navItems.find((item) => item.value === selectedTab)?.label ?? t("title");
+
+	const handleItemChange = (tab: SearchSpaceSettingsTab) => {
+		setActiveTab(tab);
+		const suffix = tab === "general" ? "" : `?tab=${tab}`;
+		router.replace(`/dashboard/${searchSpaceId}/search-space-settings${suffix}`, { scroll: false });
+	};
+
+	return (
+		<section className="flex h-full min-h-[min(680px,calc(100vh-5rem))] w-full select-none flex-col gap-6 md:pt-6 md:flex-row">
+			<div className="md:w-[220px] md:shrink-0">
+				<h1 className="mb-4 px-1 text-2xl font-semibold tracking-tight">{t("title")}</h1>
+				<nav className="hidden flex-col gap-0.5 md:flex">
+					{navItems.map((item) => (
+						<Button
+							key={item.value}
+							type="button"
+							variant="ghost"
+							onClick={() => handleItemChange(item.value as SearchSpaceSettingsTab)}
+							className={cn(
+								"h-auto justify-start gap-3 px-3 py-2.5 text-left text-sm font-medium transition-colors duration-150 focus:outline-none focus-visible:outline-none",
+								selectedTab === item.value
+									? "bg-accent text-accent-foreground"
+									: "bg-transparent text-muted-foreground hover:bg-accent hover:text-accent-foreground"
+							)}
+						>
+							{item.icon}
+							{item.label}
+						</Button>
+					))}
+				</nav>
+				<div
+					className="overflow-x-auto border-b border-border pb-3 md:hidden"
+					onScroll={handleTabScroll}
+					style={{
+						maskImage: `linear-gradient(to right, ${tabScrollPos === "start" ? "black" : "transparent"}, black 24px, black calc(100% - 24px), ${tabScrollPos === "end" ? "black" : "transparent"})`,
+						WebkitMaskImage: `linear-gradient(to right, ${tabScrollPos === "start" ? "black" : "transparent"}, black 24px, black calc(100% - 24px), ${tabScrollPos === "end" ? "black" : "transparent"})`,
+					}}
+				>
+					<div className="flex gap-1">
+						{navItems.map((item) => (
+							<Button
+								key={item.value}
+								type="button"
+								variant="ghost"
+								onClick={() => handleItemChange(item.value as SearchSpaceSettingsTab)}
+								className={cn(
+									"h-auto shrink-0 gap-2 px-3 py-1.5 text-xs font-medium transition-colors duration-150 focus:outline-none focus-visible:outline-none",
+									selectedTab === item.value
+										? "bg-accent text-accent-foreground"
+										: "bg-transparent text-muted-foreground hover:bg-accent hover:text-accent-foreground"
+								)}
+							>
+								{item.icon}
+								{item.label}
+							</Button>
+						))}
+					</div>
+				</div>
+			</div>
+
+			<div className="min-w-0 flex-1">
+				<div className="hidden md:block">
+					<h2 className="text-lg font-semibold">{selectedLabel}</h2>
+					<Separator className="mt-4" />
+				</div>
+				<div className="min-w-0 pt-4 md:max-w-3xl">
+					{selectedTab === "general" && (
+						<GeneralSettingsManager searchSpaceId={numericSearchSpaceId} />
+					)}
+					{selectedTab === "models" && <AgentModelManager searchSpaceId={numericSearchSpaceId} />}
+					{selectedTab === "roles" && (
+						<LLMRoleManager key={searchSpaceId} searchSpaceId={numericSearchSpaceId} />
+					)}
+					{selectedTab === "image-models" && (
+						<ImageModelManager searchSpaceId={numericSearchSpaceId} />
+					)}
+					{selectedTab === "vision-models" && (
+						<VisionModelManager searchSpaceId={numericSearchSpaceId} />
+					)}
+					{selectedTab === "team-roles" && <RolesManager searchSpaceId={numericSearchSpaceId} />}
+					{selectedTab === "prompts" && (
+						<PromptConfigManager searchSpaceId={numericSearchSpaceId} />
+					)}
+					{selectedTab === "team-memory" && (
+						<TeamMemoryManager searchSpaceId={numericSearchSpaceId} />
+					)}
+					{selectedTab === "public-links" && (
+						<PublicChatSnapshotsManager searchSpaceId={numericSearchSpaceId} />
+					)}
+				</div>
+			</div>
+		</section>
+	);
+}
diff --git a/surfsense_web/components/settings/settings-dialog.tsx b/surfsense_web/components/settings/settings-dialog.tsx
deleted file mode 100644
index d3f75c2a8..000000000
--- a/surfsense_web/components/settings/settings-dialog.tsx
+++ /dev/null
@@ -1,129 +0,0 @@
-"use client";
-
-import type * as React from "react";
-import { useCallback, useRef, useState } from "react";
-import { Button } from "@/components/ui/button";
-import { Dialog, DialogContent, DialogTitle } from "@/components/ui/dialog";
-import { Separator } from "@/components/ui/separator";
-import { cn } from "@/lib/utils";
-
-interface NavItem {
-	value: string;
-	label: string;
-	icon: React.ReactNode;
-}
-
-interface SettingsDialogProps {
-	open: boolean;
-	onOpenChange: (open: boolean) => void;
-	title: string;
-	navItems: NavItem[];
-	activeItem: string;
-	onItemChange: (value: string) => void;
-	children: React.ReactNode;
-}
-
-export function SettingsDialog({
-	open,
-	onOpenChange,
-	title,
-	navItems,
-	activeItem,
-	onItemChange,
-	children,
-}: SettingsDialogProps) {
-	const activeRef = useRef<HTMLButtonElement>(null);
-	const [tabScrollPos, setTabScrollPos] = useState<"start" | "middle" | "end">("start");
-
-	const handleTabScroll = useCallback((e: React.UIEvent<HTMLDivElement>) => {
-		const el = e.currentTarget;
-		const atStart = el.scrollLeft <= 2;
-		const atEnd = el.scrollWidth - el.scrollLeft - el.clientWidth <= 2;
-		setTabScrollPos(atStart ? "start" : atEnd ? "end" : "middle");
-	}, []);
-
-	const handleItemChange = (value: string) => {
-		onItemChange(value);
-		activeRef.current?.scrollIntoView({ inline: "center", block: "nearest", behavior: "smooth" });
-	};
-
-	return (
-		<Dialog open={open} onOpenChange={onOpenChange}>
-			<DialogContent className="select-none max-w-[900px] w-[95vw] md:w-[90vw] h-[90vh] md:h-[80vh] max-h-[640px] flex flex-col md:flex-row p-0 gap-0 overflow-hidden [--card:var(--popover)]">
-				<DialogTitle className="sr-only">{title}</DialogTitle>
-
-				{/* Desktop: Left sidebar */}
-				<nav className="hidden md:flex w-[220px] shrink-0 flex-col border-r border-border p-3 pt-6">
-					<div className="flex flex-col gap-0.5">
-						{navItems.map((item) => (
-							<Button
-								key={item.value}
-								type="button"
-								variant="ghost"
-								onClick={() => onItemChange(item.value)}
-								className={cn(
-									"h-auto justify-start gap-3 rounded-lg px-3 py-2.5 text-left text-sm font-medium transition-colors focus:outline-none focus-visible:outline-none",
-									activeItem === item.value
-										? "bg-accent text-accent-foreground"
-										: "text-muted-foreground hover:bg-accent hover:text-accent-foreground"
-								)}
-							>
-								{item.icon}
-								{item.label}
-							</Button>
-						))}
-					</div>
-				</nav>
-
-				{/* Mobile: Top header + horizontal tabs */}
-				<div className="flex md:hidden flex-col shrink-0">
-					<div className="px-4 pt-4 pb-2">
-						<h2 className="text-base font-semibold">{title}</h2>
-					</div>
-					<div
-						className="overflow-x-auto scrollbar-hide border-b border-border"
-						onScroll={handleTabScroll}
-						style={{
-							maskImage: `linear-gradient(to right, ${tabScrollPos === "start" ? "black" : "transparent"}, black 24px, black calc(100% - 24px), ${tabScrollPos === "end" ? "black" : "transparent"})`,
-							WebkitMaskImage: `linear-gradient(to right, ${tabScrollPos === "start" ? "black" : "transparent"}, black 24px, black calc(100% - 24px), ${tabScrollPos === "end" ? "black" : "transparent"})`,
-						}}
-					>
-						<div className="flex gap-1 px-4 pb-2">
-							{navItems.map((item) => (
-								<Button
-									key={item.value}
-									ref={activeItem === item.value ? activeRef : undefined}
-									type="button"
-									variant="ghost"
-									onClick={() => handleItemChange(item.value)}
-									className={cn(
-										"h-auto shrink-0 gap-2 rounded-full px-3 py-1.5 text-xs font-medium transition-colors focus:outline-none focus-visible:outline-none",
-										activeItem === item.value
-											? "bg-accent text-accent-foreground"
-											: "text-muted-foreground hover:bg-accent hover:text-accent-foreground"
-									)}
-								>
-									{item.icon}
-									{item.label}
-								</Button>
-							))}
-						</div>
-					</div>
-				</div>
-
-				{/* Content area */}
-				<div className="flex flex-1 flex-col overflow-hidden min-w-0">
-					<div className="hidden md:block px-8 pt-6 pb-2">
-						<h2 className="text-lg font-semibold">
-							{navItems.find((i) => i.value === activeItem)?.label ?? title}
-						</h2>
-						<Separator className="mt-4" />
-					</div>
-					<div className="flex-1 overflow-y-auto overflow-x-hidden">
-						<div className="px-4 md:px-8 pb-6 pt-4 md:pt-0 min-w-0">{children}</div>
-					</div>
-				</div>
-			</DialogContent>
-		</Dialog>
-	);
-}
diff --git a/surfsense_web/components/settings/team-dialog.tsx b/surfsense_web/components/settings/team-dialog.tsx
index 22c2a0eda..eb601fb64 100644
--- a/surfsense_web/components/settings/team-dialog.tsx
+++ b/surfsense_web/components/settings/team-dialog.tsx
@@ -3,7 +3,7 @@
 import { useAtom } from "jotai";
 import { useTranslations } from "next-intl";
 import { TeamContent } from "@/app/dashboard/[search_space_id]/team/team-content";
-import { teamDialogAtom } from "@/atoms/settings/settings-dialog.atoms";
+import { teamDialogAtom } from "@/atoms/layout/dialogs.atom";
 import { Dialog, DialogContent, DialogTitle } from "@/components/ui/dialog";
 
 interface TeamDialogProps {

From 047871c47a52b74d1b0a891c4a22f8d8d526d8dc Mon Sep 17 00:00:00 2001
From: Matt Van Horn <455140+mvanhorn@users.noreply.github.com>
Date: Sun, 17 May 2026 22:35:51 -0700
Subject: [PATCH 77/96] fix(citation-panel): reset expanded state when chunkId
 changes

CitationPanelContent uses a single instance across different citations
(RightPanel.tsx:251 renders without a key), so when the user clicks a
new citation while the panel is open, the prior expanded state leaks
into the new citation. The reset effect had an empty dependency array,
so it only fired on mount.

Add chunkId to the effect deps so the expanded state resets each time
the citation changes.
---
 surfsense_web/components/citation-panel/citation-panel.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/surfsense_web/components/citation-panel/citation-panel.tsx b/surfsense_web/components/citation-panel/citation-panel.tsx
index ed8acd656..4c7baab50 100644
--- a/surfsense_web/components/citation-panel/citation-panel.tsx
+++ b/surfsense_web/components/citation-panel/citation-panel.tsx
@@ -32,7 +32,7 @@ export const CitationPanelContent: FC<CitationPanelContentProps> = ({ chunkId, o
 
 	useEffect(() => {
 		setExpanded(false);
-	}, []);
+	}, [chunkId]);
 
 	const chunkWindow = expanded ? EXPANDED_CHUNK_WINDOW : DEFAULT_CHUNK_WINDOW;
 

From e0ecea61f8ca9d5237621a95167222b7b0e46347 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Mon, 18 May 2026 21:40:23 +0530
Subject: [PATCH 78/96] refactor: extract user avatar color and initials logic
 into a new utility module, update related components to use the new functions

---
 .../components/ApiKeyContent.tsx              | 12 +++--
 .../components/ProfileContent.tsx             | 31 ++++++++-----
 .../assistant-ui/assistant-message.tsx        |  4 +-
 .../layout/ui/sidebar/SidebarUserProfile.tsx  | 45 ++-----------------
 .../settings/user-settings-panel.tsx          |  2 +-
 surfsense_web/lib/user-avatar.ts              | 34 ++++++++++++++
 6 files changed, 65 insertions(+), 63 deletions(-)
 create mode 100644 surfsense_web/lib/user-avatar.ts

diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/ApiKeyContent.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/ApiKeyContent.tsx
index 4ee8bad1c..74d8ab140 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/ApiKeyContent.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/ApiKeyContent.tsx
@@ -27,14 +27,12 @@ export function ApiKeyContent() {
 
 	return (
 		<div className="space-y-6 min-w-0 overflow-hidden">
-			<Alert className="bg-muted/50 py-3 md:py-4">
-				<Info className="h-3 w-3 md:h-4 md:w-4 shrink-0" />
-				<AlertDescription className="text-xs md:text-sm">
-					{t("api_key_warning_description")}
-				</AlertDescription>
+			<Alert>
+				<Info />
+				<AlertDescription>{t("api_key_warning_description")}</AlertDescription>
 			</Alert>
 
-			<div className="rounded-lg border border-border/60 bg-card p-6 min-w-0 overflow-hidden">
+			<div className="min-w-0 overflow-hidden">
 				<h3 className="mb-4 text-sm font-semibold tracking-tight">{t("your_api_key")}</h3>
 				{isLoading ? (
 					<div className="h-12 w-full animate-pulse rounded-md border border-border/60 bg-muted/30" />
@@ -70,7 +68,7 @@ export function ApiKeyContent() {
 				)}
 			</div>
 
-			<div className="rounded-lg border border-border/60 bg-card p-6 min-w-0 overflow-hidden">
+			<div className="min-w-0 overflow-hidden">
 				<h3 className="mb-2 text-sm font-semibold tracking-tight">{t("usage_title")}</h3>
 				<p className="mb-4 text-[11px] text-muted-foreground/60">{t("usage_description")}</p>
 				<div className="flex items-center gap-2 rounded-md border border-border/60 bg-muted/30 px-2.5 py-1.5">
diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/ProfileContent.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/ProfileContent.tsx
index 309bcda06..89bc362eb 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/ProfileContent.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/ProfileContent.tsx
@@ -11,8 +11,17 @@ import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
 import { Spinner } from "@/components/ui/spinner";
+import { getUserAvatarColor, getUserInitials } from "@/lib/user-avatar";
 
-function AvatarDisplay({ url, fallback }: { url?: string; fallback: string }) {
+function AvatarDisplay({
+	url,
+	fallback,
+	bgColor,
+}: {
+	url?: string;
+	fallback: string;
+	bgColor: string;
+}) {
 	const [errorUrl, setErrorUrl] = useState<string>();
 	const hasError = errorUrl === url;
 
@@ -23,15 +32,19 @@ function AvatarDisplay({ url, fallback }: { url?: string; fallback: string }) {
 				alt="Avatar"
 				width={64}
 				height={64}
-				className="h-16 w-16 rounded-xl object-cover"
+				className="h-16 w-16 rounded-full object-cover select-none"
 				onError={() => setErrorUrl(url)}
+				referrerPolicy="no-referrer"
 				unoptimized
 			/>
 		);
 	}
 
 	return (
-		<div className="flex h-16 w-16 items-center justify-center rounded-xl bg-muted text-xl font-semibold text-muted-foreground">
+		<div
+			className="flex h-16 w-16 shrink-0 items-center justify-center rounded-full text-xl font-semibold text-white select-none"
+			style={{ backgroundColor: bgColor }}
+		>
 			{fallback}
 		</div>
 	);
@@ -50,11 +63,6 @@ export function ProfileContent() {
 		}
 	}, [user]);
 
-	const getInitials = (email: string) => {
-		const name = email.split("@")[0];
-		return name.slice(0, 2).toUpperCase();
-	};
-
 	const handleSubmit = async (e: React.FormEvent) => {
 		e.preventDefault();
 
@@ -69,6 +77,7 @@ export function ProfileContent() {
 	};
 
 	const hasChanges = displayName !== (user?.display_name || "");
+	const avatarBgColor = getUserAvatarColor(user?.email || "");
 
 	return (
 		<div>
@@ -78,13 +87,13 @@ export function ProfileContent() {
 				</div>
 			) : (
 				<form onSubmit={handleSubmit} className="space-y-6">
-					<div className="rounded-lg bg-card">
+					<div className="rounded-lg bg-main-panel">
 						<div className="flex flex-col gap-6">
 							<div className="space-y-2">
-								<Label>{t("profile_avatar")}</Label>
 								<AvatarDisplay
 									url={user?.avatar_url || undefined}
-									fallback={getInitials(user?.email || "")}
+									fallback={getUserInitials(user?.email || "")}
+									bgColor={avatarBgColor}
 								/>
 							</div>
 
diff --git a/surfsense_web/components/assistant-ui/assistant-message.tsx b/surfsense_web/components/assistant-ui/assistant-message.tsx
index b15525c78..b18f536ed 100644
--- a/surfsense_web/components/assistant-ui/assistant-message.tsx
+++ b/surfsense_web/components/assistant-ui/assistant-message.tsx
@@ -316,7 +316,7 @@ const MessageInfoDropdown: FC<{ chatTurnId: string | null | undefined }> = ({ ch
 				)}
 				{hasUsage && (
 					<>
-						<ActionBarMorePrimitive.Separator className="bg-popover-border mx-2 my-1 h-px" />
+						<ActionBarMorePrimitive.Separator className="bg-popover-border mx-1 my-1 h-px" />
 						{models.length > 0 ? (
 							models.map(([model, counts]) => {
 								const { name, icon } = resolveModel(model);
@@ -586,7 +586,7 @@ const AssistantActionBar: FC = () => {
 			className="aui-assistant-action-bar-root -ml-1 col-start-3 row-start-2 flex gap-1 text-muted-foreground md:data-floating:absolute md:data-floating:rounded-md md:data-floating:p-1 [&>button]:opacity-100 md:[&>button]:opacity-[var(--aui-button-opacity,1)]"
 		>
 			<ActionBarPrimitive.Copy asChild>
-				<TooltipIconButton tooltip="Copy to clipboard">
+				<TooltipIconButton tooltip="Copy">
 					<AuiIf condition={({ message }) => message.isCopied}>
 						<CheckIcon />
 					</AuiIf>
diff --git a/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx b/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx
index 8d8cd44e0..550c83b80 100644
--- a/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx
@@ -38,6 +38,7 @@ import { usePlatform } from "@/hooks/use-platform";
 import { GITHUB_RELEASES_URL, usePrimaryDownload } from "@/lib/desktop-download-utils";
 import { APP_VERSION } from "@/lib/env-config";
 import { trackDesktopDownloadClicked } from "@/lib/posthog/events";
+import { getUserAvatarColor, getUserInitials } from "@/lib/user-avatar";
 import { cn } from "@/lib/utils";
 import type { User } from "../../types/layout.types";
 
@@ -81,46 +82,6 @@ function formatAnnouncementCount(count: number): string {
 	return `${thousands}k+`;
 }
 
-/**
- * Generates a consistent color based on email
- */
-function stringToColor(str: string): string {
-	let hash = 0;
-	for (let i = 0; i < str.length; i++) {
-		hash = str.charCodeAt(i) + ((hash << 5) - hash);
-	}
-	const colors = [
-		"#6366f1",
-		"#8b5cf6",
-		"#a855f7",
-		"#d946ef",
-		"#ec4899",
-		"#f43f5e",
-		"#ef4444",
-		"#f97316",
-		"#eab308",
-		"#84cc16",
-		"#22c55e",
-		"#14b8a6",
-		"#06b6d4",
-		"#0ea5e9",
-		"#3b82f6",
-	];
-	return colors[Math.abs(hash) % colors.length];
-}
-
-/**
- * Gets initials from email
- */
-function getInitials(email: string): string {
-	const name = email.split("@")[0];
-	const parts = name.split(/[._-]/);
-	if (parts.length >= 2) {
-		return (parts[0][0] + parts[1][0]).toUpperCase();
-	}
-	return name.slice(0, 2).toUpperCase();
-}
-
 /**
  * User avatar component - shows image if available, otherwise falls back to initials
  */
@@ -180,8 +141,8 @@ export function SidebarUserProfile({
 	const isDesktopViewport = useMediaQuery("(min-width: 768px)");
 	const { os, primary } = usePrimaryDownload();
 	const [isLoggingOut, setIsLoggingOut] = useState(false);
-	const bgColor = stringToColor(user.email);
-	const initials = getInitials(user.email);
+	const bgColor = getUserAvatarColor(user.email);
+	const initials = getUserInitials(user.email);
 	const displayName = user.name || user.email.split("@")[0];
 	const downloadUrl = primary?.url ?? GITHUB_RELEASES_URL;
 	const downloadLabel = t("download_for_os", { os });
diff --git a/surfsense_web/components/settings/user-settings-panel.tsx b/surfsense_web/components/settings/user-settings-panel.tsx
index 28e04a8d4..b4924c16a 100644
--- a/surfsense_web/components/settings/user-settings-panel.tsx
+++ b/surfsense_web/components/settings/user-settings-panel.tsx
@@ -251,7 +251,7 @@ export function UserSettingsPanel({
 			<div className="min-w-0 flex-1">
 				<div className="hidden md:block">
 					<h2 className="text-lg font-semibold">{selectedLabel}</h2>
-					<Separator className="mt-4" />
+					<Separator className="mt-4 bg-border" />
 				</div>
 				<div className="min-w-0 pt-4 md:max-w-3xl">
 					{selectedTab === "profile" && <ProfileContent />}
diff --git a/surfsense_web/lib/user-avatar.ts b/surfsense_web/lib/user-avatar.ts
new file mode 100644
index 000000000..66a972362
--- /dev/null
+++ b/surfsense_web/lib/user-avatar.ts
@@ -0,0 +1,34 @@
+const USER_AVATAR_COLORS = [
+	"#6366f1",
+	"#8b5cf6",
+	"#a855f7",
+	"#d946ef",
+	"#ec4899",
+	"#f43f5e",
+	"#ef4444",
+	"#f97316",
+	"#eab308",
+	"#84cc16",
+	"#22c55e",
+	"#14b8a6",
+	"#06b6d4",
+	"#0ea5e9",
+	"#3b82f6",
+];
+
+export function getUserAvatarColor(email: string): string {
+	let hash = 0;
+	for (let i = 0; i < email.length; i++) {
+		hash = email.charCodeAt(i) + ((hash << 5) - hash);
+	}
+	return USER_AVATAR_COLORS[Math.abs(hash) % USER_AVATAR_COLORS.length];
+}
+
+export function getUserInitials(email: string): string {
+	const name = email.split("@")[0];
+	const parts = name.split(/[._-]/);
+	if (parts.length >= 2 && parts[0]?.[0] && parts[1]?.[0]) {
+		return (parts[0][0] + parts[1][0]).toUpperCase();
+	}
+	return name.slice(0, 2).toUpperCase();
+}

From b7a6e3af3d2b342879fa915ca85ad5459892330f Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Mon, 18 May 2026 23:46:16 +0530
Subject: [PATCH 79/96] refactor: update alert components across various files
 to use a consistent structure and styling

---
 .../components/AgentPermissionsContent.tsx    |  12 +-
 .../components/CommunityPromptsContent.tsx    |  11 +-
 .../components/MemoryContent.tsx              |   6 +-
 .../components/PromptsContent.tsx             |  11 +-
 .../assistant-ui/connector-popup.tsx          |  53 ++--
 .../baidu-search-api-connect-form.tsx         |  30 ++-
 .../components/bookstack-connect-form.tsx     |   8 +-
 .../components/elasticsearch-connect-form.tsx | 241 +-----------------
 .../components/github-connect-form.tsx        |  31 ++-
 .../components/linkup-api-connect-form.tsx    |  28 +-
 .../components/luma-connect-form.tsx          |  28 +-
 .../components/obsidian-connect-form.tsx      |  23 +-
 .../components/searxng-connect-form.tsx       |  30 ++-
 .../components/tavily-api-connect-form.tsx    |  28 +-
 .../components/circleback-config.tsx          |   8 +-
 .../components/clickup-config.tsx             |  21 +-
 .../components/confluence-config.tsx          |  25 +-
 .../components/discord-config.tsx             |  20 +-
 .../components/jira-config.tsx                |  25 +-
 .../components/obsidian-config.tsx            |  28 +-
 .../components/slack-config.tsx               |  21 +-
 .../components/teams-config.tsx               |  21 +-
 .../components/webcrawler-config.tsx          |  16 +-
 .../views/connector-edit-view.tsx             |  21 +-
 .../views/indexing-configuration-view.tsx     |  19 +-
 .../views/youtube-crawler-view.tsx            |   9 +-
 .../assistant-ui/document-upload-popup.tsx    |  49 ++--
 .../public-chat-snapshots-manager.tsx         |  10 +-
 .../settings/agent-model-manager.tsx          |  38 +--
 .../settings/general-settings-manager.tsx     |   8 +-
 .../settings/image-model-manager.tsx          |  38 +--
 .../settings/prompt-config-manager.tsx        |  30 +--
 .../settings/team-memory-manager.tsx          |   6 +-
 .../settings/vision-model-manager.tsx         |  38 +--
 34 files changed, 372 insertions(+), 619 deletions(-)

diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/AgentPermissionsContent.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/AgentPermissionsContent.tsx
index b01f556ad..6d8233515 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/AgentPermissionsContent.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/AgentPermissionsContent.tsx
@@ -218,13 +218,13 @@ export function AgentPermissionsContent() {
 
 	if (isError) {
 		return (
-			<div className="rounded-lg border border-dashed border-destructive/40 p-8 text-center">
-				<AlertTriangle className="mx-auto size-8 text-destructive/60" />
-				<p className="mt-2 text-sm text-destructive">Failed to load rules</p>
-				<p className="text-xs text-muted-foreground">
+			<Alert variant="destructive">
+				<AlertTriangle />
+				<AlertTitle>Failed to load rules</AlertTitle>
+				<AlertDescription>
 					{error instanceof Error ? error.message : "Unknown error."}
-				</p>
-			</div>
+				</AlertDescription>
+			</Alert>
 		);
 	}
 
diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/CommunityPromptsContent.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/CommunityPromptsContent.tsx
index 8fe8f40ed..d37ed409c 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/CommunityPromptsContent.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/CommunityPromptsContent.tsx
@@ -5,6 +5,7 @@ import { AlertTriangle, Copy, Globe, Sparkles } from "lucide-react";
 import { useCallback, useState } from "react";
 import { copyPromptMutationAtom } from "@/atoms/prompts/prompts-mutation.atoms";
 import { publicPromptsAtom } from "@/atoms/prompts/prompts-query.atoms";
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Button } from "@/components/ui/button";
 import { Spinner } from "@/components/ui/spinner";
 
@@ -44,11 +45,11 @@ export function CommunityPromptsContent() {
 
 	if (isError) {
 		return (
-			<div className="rounded-lg border border-dashed border-destructive/40 p-8 text-center">
-				<AlertTriangle className="mx-auto size-8 text-destructive/60" />
-				<p className="mt-2 text-sm text-destructive">Failed to load community prompts</p>
-				<p className="text-xs text-muted-foreground">Please try refreshing the page.</p>
-			</div>
+			<Alert variant="destructive">
+				<AlertTriangle />
+				<AlertTitle>Failed to load community prompts</AlertTitle>
+				<AlertDescription>Please try refreshing the page.</AlertDescription>
+			</Alert>
 		);
 	}
 
diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/MemoryContent.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/MemoryContent.tsx
index 8ae2fd007..af3aefaff 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/MemoryContent.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/MemoryContent.tsx
@@ -177,9 +177,9 @@ export function MemoryContent() {
 
 	return (
 		<div className="space-y-4">
-			<Alert className="bg-muted/50 py-3 md:py-4">
-				<Info className="h-3 w-3 md:h-4 md:w-4 shrink-0" />
-				<AlertDescription className="text-xs md:text-sm">
+			<Alert>
+				<Info />
+				<AlertDescription>
 					<p>
 						SurfSense uses this personal memory to personalize your responses across all
 						conversations.
diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/PromptsContent.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/PromptsContent.tsx
index a3c824ea0..02edac148 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/PromptsContent.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/PromptsContent.tsx
@@ -20,6 +20,7 @@ import {
 	AlertDialogHeader,
 	AlertDialogTitle,
 } from "@/components/ui/alert-dialog";
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
@@ -133,11 +134,11 @@ export function PromptsContent() {
 
 	if (isError) {
 		return (
-			<div className="rounded-lg border border-dashed border-destructive/40 p-8 text-center">
-				<AlertTriangle className="mx-auto size-8 text-destructive/60" />
-				<p className="mt-2 text-sm text-destructive">Failed to load prompts</p>
-				<p className="text-xs text-muted-foreground">Please try refreshing the page.</p>
-			</div>
+			<Alert variant="destructive">
+				<AlertTriangle />
+				<AlertTitle>Failed to load prompts</AlertTitle>
+				<AlertDescription>Please try refreshing the page.</AlertDescription>
+			</Alert>
 		);
 	}
 
diff --git a/surfsense_web/components/assistant-ui/connector-popup.tsx b/surfsense_web/components/assistant-ui/connector-popup.tsx
index ed671d374..9150fb35f 100644
--- a/surfsense_web/components/assistant-ui/connector-popup.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup.tsx
@@ -380,33 +380,32 @@ export const ConnectorIndicator = forwardRef<ConnectorIndicatorHandle, Connector
 									<div className="px-4 sm:px-12 py-4 sm:py-8 pb-12 sm:pb-16">
 										{/* LLM Configuration Warning */}
 										{!llmConfigLoading && !hasDocumentSummaryLLM && (
-											<Alert
-												variant="destructive"
-												className="mb-6 bg-muted/50 rounded-xl border-destructive/30"
-											>
-												<AlertTriangle className="h-4 w-4" />
-												<AlertTitle>LLM Configuration Required</AlertTitle>
-												<AlertDescription className="mt-2">
-													<p className="mb-3">
-														{isAutoMode && !hasGlobalConfigs
-															? "Auto mode requires a global LLM configuration. Please add one in Settings"
-															: "A Document Summary LLM is required to process uploads, configure one in Settings"}
-													</p>
-													<Button
-														size="sm"
-														variant="outline"
-														onClick={() => {
-															handleOpenChange(false);
-															router.push(
-																`/dashboard/${searchSpaceId}/search-space-settings?tab=models`
-															);
-														}}
-													>
-														<Settings className="mr-2 h-4 w-4" />
-														Go to Settings
-													</Button>
-												</AlertDescription>
-											</Alert>
+											<div className="mb-6">
+												<Alert variant="destructive">
+													<AlertTriangle />
+													<AlertTitle>LLM Configuration Required</AlertTitle>
+													<AlertDescription>
+														<p>
+															{isAutoMode && !hasGlobalConfigs
+																? "Auto mode requires a global LLM configuration. Please add one in Settings"
+																: "A Document Summary LLM is required to process uploads, configure one in Settings"}
+														</p>
+														<Button
+															size="sm"
+															variant="outline"
+															onClick={() => {
+																handleOpenChange(false);
+																router.push(
+																	`/dashboard/${searchSpaceId}/search-space-settings?tab=models`
+																);
+															}}
+														>
+															<Settings className="mr-2 h-4 w-4" />
+															Go to Settings
+														</Button>
+													</AlertDescription>
+												</Alert>
+											</div>
 										)}
 
 										<TabsContent value="all" className="m-0">
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/baidu-search-api-connect-form.tsx b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/baidu-search-api-connect-form.tsx
index a4f145e06..d994b178d 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/baidu-search-api-connect-form.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/baidu-search-api-connect-form.tsx
@@ -70,20 +70,22 @@ export const BaiduSearchApiConnectForm: FC<ConnectFormProps> = ({ onSubmit, isSu
 
 	return (
 		<div className="space-y-6 pb-6">
-			<Alert className="bg-slate-400/5 dark:bg-white/5 border-slate-400/20 p-2 sm:p-3">
-				<Info className="size-4 shrink-0" />
-				<AlertTitle className="text-xs sm:text-sm">API Key Required</AlertTitle>
-				<AlertDescription className="text-[10px] sm:text-xs">
-					You'll need a Baidu AppBuilder API key to use this connector. You can get one by signing
-					up at{" "}
-					<a
-						href="https://qianfan.cloud.baidu.com/"
-						target="_blank"
-						rel="noopener noreferrer"
-						className="font-medium underline underline-offset-4"
-					>
-						qianfan.cloud.baidu.com
-					</a>
+			<Alert>
+				<Info />
+				<AlertTitle>API Key Required</AlertTitle>
+				<AlertDescription>
+					<p>
+						You'll need a Baidu AppBuilder API key to use this connector. You can get one by
+						signing up at{" "}
+						<a
+							href="https://qianfan.cloud.baidu.com/"
+							target="_blank"
+							rel="noopener noreferrer"
+							className="font-medium underline underline-offset-4"
+						>
+							qianfan.cloud.baidu.com
+						</a>
+					</p>
 				</AlertDescription>
 			</Alert>
 
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/bookstack-connect-form.tsx b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/bookstack-connect-form.tsx
index b2a6b0b25..b885df39c 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/bookstack-connect-form.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/bookstack-connect-form.tsx
@@ -96,10 +96,10 @@ export const BookStackConnectForm: FC<ConnectFormProps> = ({ onSubmit, isSubmitt
 
 	return (
 		<div className="space-y-6 pb-6">
-			<Alert className="bg-slate-400/5 dark:bg-white/5 border-slate-400/20 p-2 sm:p-3">
-				<Info className="size-4 shrink-0" />
-				<AlertTitle className="text-xs sm:text-sm">API Token Required</AlertTitle>
-				<AlertDescription className="text-[10px] sm:text-xs">
+			<Alert>
+				<Info />
+				<AlertTitle>API Token Required</AlertTitle>
+				<AlertDescription>
 					You'll need a BookStack API Token to use this connector. You can create one from your
 					BookStack instance settings.
 				</AlertDescription>
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/elasticsearch-connect-form.tsx b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/elasticsearch-connect-form.tsx
index 352a8f3bc..943b2361d 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/elasticsearch-connect-form.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/elasticsearch-connect-form.tsx
@@ -172,10 +172,10 @@ export const ElasticsearchConnectForm: FC<ConnectFormProps> = ({ onSubmit, isSub
 
 	return (
 		<div className="space-y-6 pb-6">
-			<Alert className="bg-slate-400/5 dark:bg-white/5 border-slate-400/20 p-2 sm:p-3">
-				<Info className="size-4 shrink-0" />
-				<AlertTitle className="text-xs sm:text-sm">API Key Required</AlertTitle>
-				<AlertDescription className="text-[10px] sm:text-xs">
+			<Alert>
+				<Info />
+				<AlertTitle>API Key Required</AlertTitle>
+				<AlertDescription>
 					Enter your Elasticsearch cluster endpoint URL and authentication credentials to connect.
 				</AlertDescription>
 			</Alert>
@@ -428,10 +428,10 @@ export const ElasticsearchConnectForm: FC<ConnectFormProps> = ({ onSubmit, isSub
 							</div>
 						)}
 
-						<Alert className="bg-slate-400/5 dark:bg-white/5 border-slate-400/20">
-							<Info className="h-3 w-3 sm:h-4 sm:w-4" />
-							<AlertTitle className="text-[10px] sm:text-xs">Index Selection Tips</AlertTitle>
-							<AlertDescription className="text-[9px] sm:text-[10px] mt-2">
+						<Alert>
+							<Info />
+							<AlertTitle>Index Selection Tips</AlertTitle>
+							<AlertDescription>
 								<ul className="list-disc pl-4 space-y-1">
 									<li>Use wildcards like "logs-*" to match multiple indices</li>
 									<li>Separate multiple indices with commas</li>
@@ -643,231 +643,6 @@ export const ElasticsearchConnectForm: FC<ConnectFormProps> = ({ onSubmit, isSub
 					</ul>
 				</div>
 			)}
-
-			{/* Documentation Section */}
-			<Accordion
-				type="single"
-				collapsible
-				className="w-full border border-border rounded-xl bg-slate-400/5 dark:bg-white/5"
-			>
-				<AccordionItem value="documentation" className="border-0">
-					<AccordionTrigger className="text-sm sm:text-base font-medium px-3 sm:px-6 no-underline hover:no-underline">
-						Documentation
-					</AccordionTrigger>
-					<AccordionContent className="px-3 sm:px-6 pb-3 sm:pb-6 space-y-6">
-						<div>
-							<h3 className="text-sm sm:text-base font-semibold mb-2">How it works</h3>
-							<p className="text-[10px] sm:text-xs text-muted-foreground">
-								The Elasticsearch connector allows you to search and retrieve documents from your
-								Elasticsearch cluster. Configure connection details, select specific indices, and
-								set search parameters to make your existing data searchable within SurfSense.
-							</p>
-						</div>
-
-						<div className="space-y-4">
-							<div>
-								<h3 className="text-sm sm:text-base font-semibold mb-2">Connection Setup</h3>
-								<div className="space-y-4 sm:space-y-6">
-									<div>
-										<h4 className="text-[10px] sm:text-xs font-medium mb-2">
-											Step 1: Get your Elasticsearch endpoint
-										</h4>
-										<p className="text-[10px] sm:text-xs text-muted-foreground mb-3">
-											You'll need the endpoint URL for your Elasticsearch cluster. This typically
-											looks like:
-										</p>
-										<ul className="list-disc pl-5 space-y-1 text-[10px] sm:text-xs text-muted-foreground mb-4">
-											<li>
-												Cloud:{" "}
-												<code className="bg-muted px-1 py-0.5 rounded">
-													https://your-cluster.es.region.aws.com:443
-												</code>
-											</li>
-											<li>
-												Self-hosted:{" "}
-												<code className="bg-muted px-1 py-0.5 rounded">
-													https://elasticsearch.example.com:9200
-												</code>
-											</li>
-										</ul>
-									</div>
-
-									<div>
-										<h4 className="text-[10px] sm:text-xs font-medium mb-2">
-											Step 2: Configure authentication
-										</h4>
-										<p className="text-[10px] sm:text-xs text-muted-foreground mb-3">
-											Elasticsearch requires authentication. You can use either:
-										</p>
-										<ul className="list-disc pl-5 space-y-2 text-[10px] sm:text-xs text-muted-foreground mb-4">
-											<li>
-												<strong>API Key:</strong> A base64-encoded API key. You can create one in
-												Elasticsearch by running:
-												<pre className="bg-muted p-2 rounded mt-1 text-[9px] overflow-x-auto">
-													<code>POST /_security/api_key</code>
-												</pre>
-											</li>
-											<li>
-												<strong>Username & Password:</strong> Basic authentication using your
-												Elasticsearch username and password.
-											</li>
-										</ul>
-									</div>
-
-									<div>
-										<h4 className="text-[10px] sm:text-xs font-medium mb-2">
-											Step 3: Select indices
-										</h4>
-										<p className="text-[10px] sm:text-xs text-muted-foreground mb-3">
-											Specify which indices to search. You can:
-										</p>
-										<ul className="list-disc pl-5 space-y-1 text-[10px] sm:text-xs text-muted-foreground">
-											<li>
-												Use wildcards: <code className="bg-muted px-1 py-0.5 rounded">logs-*</code>{" "}
-												to match multiple indices
-											</li>
-											<li>
-												List specific indices:{" "}
-												<code className="bg-muted px-1 py-0.5 rounded">
-													logs-2024, documents-2024
-												</code>
-											</li>
-											<li>
-												Leave empty to search all accessible indices (not recommended for
-												performance)
-											</li>
-										</ul>
-									</div>
-								</div>
-							</div>
-						</div>
-
-						<div className="space-y-4">
-							<div>
-								<h3 className="text-sm sm:text-base font-semibold mb-2">Advanced Configuration</h3>
-								<div className="space-y-4">
-									<div>
-										<h4 className="text-[10px] sm:text-xs font-medium mb-2">Search Query</h4>
-										<p className="text-[10px] sm:text-xs text-muted-foreground mb-2">
-											The default query used for searches. Use{" "}
-											<code className="bg-muted px-1 py-0.5 rounded">*</code> to match all
-											documents, or specify a more complex Elasticsearch query.
-										</p>
-									</div>
-
-									<div>
-										<h4 className="text-[10px] sm:text-xs font-medium mb-2">Search Fields</h4>
-										<p className="text-[10px] sm:text-xs text-muted-foreground mb-2">
-											Limit searches to specific fields for better performance. Common fields
-											include:
-										</p>
-										<ul className="list-disc pl-5 space-y-1 text-[10px] sm:text-xs text-muted-foreground">
-											<li>
-												<code className="bg-muted px-1 py-0.5 rounded">title</code> - Document
-												titles
-											</li>
-											<li>
-												<code className="bg-muted px-1 py-0.5 rounded">content</code> - Main content
-											</li>
-											<li>
-												<code className="bg-muted px-1 py-0.5 rounded">description</code> -
-												Descriptions
-											</li>
-										</ul>
-										<p className="text-[10px] sm:text-xs text-muted-foreground mt-2">
-											Leave empty to search all fields in your documents.
-										</p>
-									</div>
-
-									<div>
-										<h4 className="text-[10px] sm:text-xs font-medium mb-2">Maximum Documents</h4>
-										<p className="text-[10px] sm:text-xs text-muted-foreground">
-											Set a limit on the number of documents retrieved per search (1-10,000). This
-											helps control response times and resource usage. Leave empty to use
-											Elasticsearch's default limit.
-										</p>
-									</div>
-								</div>
-							</div>
-						</div>
-
-						<div className="space-y-4">
-							<div>
-								<h3 className="text-sm sm:text-base font-semibold mb-2">Troubleshooting</h3>
-								<div className="space-y-4">
-									<div>
-										<h4 className="text-[10px] sm:text-xs font-medium mb-2">Connection Issues</h4>
-										<ul className="list-disc pl-5 space-y-2 text-[10px] sm:text-xs text-muted-foreground">
-											<li>
-												<strong>Invalid URL:</strong> Ensure your endpoint URL includes the protocol
-												(https://) and port number if required.
-											</li>
-											<li>
-												<strong>SSL/TLS Errors:</strong> Verify that your cluster uses HTTPS and the
-												certificate is valid. Self-signed certificates may require additional
-												configuration.
-											</li>
-											<li>
-												<strong>Connection Timeout:</strong> Check your network connectivity and
-												firewall settings. Ensure the Elasticsearch cluster is accessible from
-												SurfSense servers.
-											</li>
-										</ul>
-									</div>
-
-									<div>
-										<h4 className="text-[10px] sm:text-xs font-medium mb-2">
-											Authentication Issues
-										</h4>
-										<ul className="list-disc pl-5 space-y-2 text-[10px] sm:text-xs text-muted-foreground">
-											<li>
-												<strong>Invalid Credentials:</strong> Double-check your username/password or
-												API key. API keys must be base64-encoded.
-											</li>
-											<li>
-												<strong>Permission Denied:</strong> Ensure your API key or user account has
-												read permissions for the indices you want to search.
-											</li>
-											<li>
-												<strong>API Key Format:</strong> Elasticsearch API keys are typically
-												base64-encoded strings. Make sure you're using the full key value.
-											</li>
-										</ul>
-									</div>
-
-									<div>
-										<h4 className="text-[10px] sm:text-xs font-medium mb-2">Search Issues</h4>
-										<ul className="list-disc pl-5 space-y-2 text-[10px] sm:text-xs text-muted-foreground">
-											<li>
-												<strong>No Results:</strong> Verify that your index selection matches
-												existing indices. Use wildcards carefully.
-											</li>
-											<li>
-												<strong>Slow Searches:</strong> Limit the number of indices or use specific
-												index names instead of wildcards. Reduce the maximum documents limit.
-											</li>
-											<li>
-												<strong>Field Not Found:</strong> Ensure the search fields you specify
-												actually exist in your Elasticsearch documents.
-											</li>
-										</ul>
-									</div>
-
-									<Alert className="bg-slate-400/5 dark:bg-white/5 border-slate-400/20 mt-4">
-										<Info className="h-3 w-3 sm:h-4 sm:w-4" />
-										<AlertTitle className="text-[10px] sm:text-xs">Need More Help?</AlertTitle>
-										<AlertDescription className="text-[9px] sm:text-[10px]">
-											If you continue to experience issues, check your Elasticsearch cluster logs
-											and ensure your cluster version is compatible. For Elasticsearch Cloud
-											deployments, verify your access policies and IP allowlists.
-										</AlertDescription>
-									</Alert>
-								</div>
-							</div>
-						</div>
-					</AccordionContent>
-				</AccordionItem>
-			</Accordion>
 		</div>
 	);
 };
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/github-connect-form.tsx b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/github-connect-form.tsx
index 68d5ef5fb..56609dbdd 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/github-connect-form.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/github-connect-form.tsx
@@ -105,20 +105,23 @@ export const GithubConnectForm: FC<ConnectFormProps> = ({ onSubmit, isSubmitting
 
 	return (
 		<div className="space-y-6 pb-6">
-			<Alert className="bg-slate-400/5 dark:bg-white/5 border-slate-400/20 p-2 sm:p-3">
-				<Info className="size-4 shrink-0" />
-				<AlertTitle className="text-xs sm:text-sm">Personal Access Token (Optional)</AlertTitle>
-				<AlertDescription className="text-[10px] sm:text-xs">
-					A GitHub PAT is only required for private repositories. Public repos work without a token.{" "}
-					<a
-						href="https://github.com/settings/tokens/new?description=surfsense&scopes=repo"
-						target="_blank"
-						rel="noopener noreferrer"
-						className="font-medium underline underline-offset-4 inline-flex items-center gap-1.5"
-					>
-						Get your token
-						<ExternalLink className="h-3 w-3 sm:h-4 sm:w-4" />
-					</a>{" "}
+			<Alert>
+				<Info />
+				<AlertTitle>Personal Access Token (Optional)</AlertTitle>
+				<AlertDescription>
+					<p>
+						A GitHub PAT is only required for private repositories. Public repos work without a
+						token.{" "}
+						<a
+							href="https://github.com/settings/tokens/new?description=surfsense&scopes=repo"
+							target="_blank"
+							rel="noopener noreferrer"
+							className="font-medium underline underline-offset-4 inline-flex items-center gap-1.5"
+						>
+							Get your token
+							<ExternalLink className="h-3 w-3 sm:h-4 sm:w-4" />
+						</a>
+					</p>
 				</AlertDescription>
 			</Alert>
 
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/linkup-api-connect-form.tsx b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/linkup-api-connect-form.tsx
index b9771e95a..46ec35b1f 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/linkup-api-connect-form.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/linkup-api-connect-form.tsx
@@ -70,19 +70,21 @@ export const LinkupApiConnectForm: FC<ConnectFormProps> = ({ onSubmit, isSubmitt
 
 	return (
 		<div className="space-y-6 pb-6">
-			<Alert className="bg-slate-400/5 dark:bg-white/5 border-slate-400/20 p-2 sm:p-3">
-				<Info className="size-4 shrink-0" />
-				<AlertTitle className="text-xs sm:text-sm">API Key Required</AlertTitle>
-				<AlertDescription className="text-[10px] sm:text-xs">
-					You'll need a Linkup API key to use this connector. You can get one by signing up at{" "}
-					<a
-						href="https://linkup.so"
-						target="_blank"
-						rel="noopener noreferrer"
-						className="font-medium underline underline-offset-4"
-					>
-						linkup.so
-					</a>
+			<Alert>
+				<Info />
+				<AlertTitle>API Key Required</AlertTitle>
+				<AlertDescription>
+					<p>
+						You'll need a Linkup API key to use this connector. You can get one by signing up at{" "}
+						<a
+							href="https://linkup.so"
+							target="_blank"
+							rel="noopener noreferrer"
+							className="font-medium underline underline-offset-4"
+						>
+							linkup.so
+						</a>
+					</p>
 				</AlertDescription>
 			</Alert>
 
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/luma-connect-form.tsx b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/luma-connect-form.tsx
index 13cc7efe1..1c45e2dd7 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/luma-connect-form.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/luma-connect-form.tsx
@@ -88,19 +88,21 @@ export const LumaConnectForm: FC<ConnectFormProps> = ({ onSubmit, isSubmitting }
 
 	return (
 		<div className="space-y-6 pb-6">
-			<Alert className="bg-slate-400/5 dark:bg-white/5 border-slate-400/20 p-2 sm:p-3">
-				<Info className="size-4 shrink-0" />
-				<AlertTitle className="text-xs sm:text-sm">API Key Required</AlertTitle>
-				<AlertDescription className="text-[10px] sm:text-xs">
-					You'll need a Luma API Key to use this connector. You can create one from{" "}
-					<a
-						href="https://lu.ma/api"
-						target="_blank"
-						rel="noopener noreferrer"
-						className="font-medium underline underline-offset-4"
-					>
-						Luma API Settings
-					</a>
+			<Alert>
+				<Info />
+				<AlertTitle>API Key Required</AlertTitle>
+				<AlertDescription>
+					<p>
+						You'll need a Luma API Key to use this connector. You can create one from{" "}
+						<a
+							href="https://lu.ma/api"
+							target="_blank"
+							rel="noopener noreferrer"
+							className="font-medium underline underline-offset-4"
+						>
+							Luma API Settings
+						</a>
+					</p>
 				</AlertDescription>
 			</Alert>
 
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/obsidian-connect-form.tsx b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/obsidian-connect-form.tsx
index 59de2b7a4..695e97d7b 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/obsidian-connect-form.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/obsidian-connect-form.tsx
@@ -1,20 +1,17 @@
 "use client";
 
 import { Check, Copy, Info } from "lucide-react";
-import { type FC, useCallback, useRef, useState } from "react";
+import type { FC } from "react";
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Button } from "@/components/ui/button";
 import { EnumConnectorName } from "@/contracts/enums/connector";
 import { useApiKey } from "@/hooks/use-api-key";
-import { copyToClipboard as copyToClipboardUtil } from "@/lib/utils";
 import { getConnectorBenefits } from "../connector-benefits";
 import type { ConnectFormProps } from "../index";
 
 const PLUGIN_RELEASES_URL =
 	"https://github.com/MODSetter/SurfSense/releases?q=obsidian&expanded=true";
 
-const BACKEND_URL = process.env.NEXT_PUBLIC_FASTAPI_BACKEND_URL ?? "https://surfsense.com";
-
 /**
  * Obsidian connect form for the plugin-only architecture.
  *
@@ -30,16 +27,6 @@ const BACKEND_URL = process.env.NEXT_PUBLIC_FASTAPI_BACKEND_URL ?? "https://surf
  */
 export const ObsidianConnectForm: FC<ConnectFormProps> = ({ onBack }) => {
 	const { apiKey, isLoading, copied, copyToClipboard } = useApiKey();
-	const [copiedUrl, setCopiedUrl] = useState(false);
-	const urlCopyTimerRef = useRef<ReturnType<typeof setTimeout> | undefined>(undefined);
-
-	const copyServerUrl = useCallback(async () => {
-		const ok = await copyToClipboardUtil(BACKEND_URL);
-		if (!ok) return;
-		setCopiedUrl(true);
-		if (urlCopyTimerRef.current) clearTimeout(urlCopyTimerRef.current);
-		urlCopyTimerRef.current = setTimeout(() => setCopiedUrl(false), 2000);
-	}, []);
 
 	const handleSubmit = (event: React.FormEvent<HTMLFormElement>) => {
 		event.preventDefault();
@@ -52,10 +39,10 @@ export const ObsidianConnectForm: FC<ConnectFormProps> = ({ onBack }) => {
 			    that just closes the dialog (see component-level docstring). */}
 			<form id="obsidian-connect-form" onSubmit={handleSubmit} />
 
-			<Alert className="bg-slate-400/5 dark:bg-white/5 border-slate-400/20 p-2 sm:p-3">
-				<Info className="size-4 shrink-0 text-purple-500" />
-				<AlertTitle className="text-xs sm:text-sm">Plugin-based sync</AlertTitle>
-				<AlertDescription className="text-[10px] sm:text-xs">
+			<Alert>
+				<Info />
+				<AlertTitle>Plugin-based sync</AlertTitle>
+				<AlertDescription>
 					SurfSense now syncs Obsidian via an official plugin that runs inside Obsidian itself.
 					Works on desktop and mobile, in cloud and self-hosted deployments.
 				</AlertDescription>
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/searxng-connect-form.tsx b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/searxng-connect-form.tsx
index 5ff54fb9e..727a1ef3f 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/searxng-connect-form.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/searxng-connect-form.tsx
@@ -123,20 +123,22 @@ export const SearxngConnectForm: FC<ConnectFormProps> = ({ onSubmit, isSubmittin
 
 	return (
 		<div className="space-y-6 pb-6">
-			<Alert className="bg-slate-400/5 dark:bg-white/5 border-slate-400/20 p-2 sm:p-3">
-				<Info className="size-4 shrink-0" />
-				<AlertTitle className="text-xs sm:text-sm">SearxNG Instance Required</AlertTitle>
-				<AlertDescription className="text-[10px] sm:text-xs">
-					You need access to a running SearxNG instance. Refer to the{" "}
-					<a
-						href="https://docs.searxng.org/admin/installation-docker.html"
-						target="_blank"
-						rel="noopener noreferrer"
-						className="font-medium underline underline-offset-4"
-					>
-						SearxNG installation guide
-					</a>{" "}
-					for setup instructions. If your instance requires an API key, include it below.
+			<Alert>
+				<Info />
+				<AlertTitle>SearxNG Instance Required</AlertTitle>
+				<AlertDescription>
+					<p>
+						You need access to a running SearxNG instance. Refer to the{" "}
+						<a
+							href="https://docs.searxng.org/admin/installation-docker.html"
+							target="_blank"
+							rel="noopener noreferrer"
+							className="font-medium underline underline-offset-4"
+						>
+							SearxNG installation guide
+						</a>{" "}
+						for setup instructions. If your instance requires an API key, include it below.
+					</p>
 				</AlertDescription>
 			</Alert>
 
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/tavily-api-connect-form.tsx b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/tavily-api-connect-form.tsx
index 57d183d44..11e5d8a03 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/tavily-api-connect-form.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/tavily-api-connect-form.tsx
@@ -70,19 +70,21 @@ export const TavilyApiConnectForm: FC<ConnectFormProps> = ({ onSubmit, isSubmitt
 
 	return (
 		<div className="space-y-6 pb-6">
-			<Alert className="bg-slate-400/5 dark:bg-white/5 border-slate-400/20 p-2 sm:p-3">
-				<Info className="size-4 shrink-0" />
-				<AlertTitle className="text-xs sm:text-sm">API Key Required</AlertTitle>
-				<AlertDescription className="text-[10px] sm:text-xs">
-					You'll need a Tavily API key to use this connector. You can get one by signing up at{" "}
-					<a
-						href="https://tavily.com"
-						target="_blank"
-						rel="noopener noreferrer"
-						className="font-medium underline underline-offset-4"
-					>
-						tavily.com
-					</a>
+			<Alert>
+				<Info />
+				<AlertTitle>API Key Required</AlertTitle>
+				<AlertDescription>
+					<p>
+						You'll need a Tavily API key to use this connector. You can get one by signing up at{" "}
+						<a
+							href="https://tavily.com"
+							target="_blank"
+							rel="noopener noreferrer"
+							className="font-medium underline underline-offset-4"
+						>
+							tavily.com
+						</a>
+					</p>
 				</AlertDescription>
 			</Alert>
 
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/circleback-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/circleback-config.tsx
index 268ab0f98..af818671a 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/circleback-config.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/circleback-config.tsx
@@ -166,10 +166,10 @@ export const CirclebackConfig: FC<CirclebackConfigProps> = ({ connector, onNameC
 				)}
 
 				{webhookInfo && (
-					<Alert className="bg-slate-400/5 dark:bg-white/5 border-slate-400/20">
-						<Info className="h-3 w-3 sm:h-4 sm:w-4" />
-						<AlertTitle className="text-xs sm:text-sm">Configuration Instructions</AlertTitle>
-						<AlertDescription className="text-[10px] sm:text-xs mt-1">
+					<Alert>
+						<Info />
+						<AlertTitle>Configuration Instructions</AlertTitle>
+						<AlertDescription>
 							Configure this URL in Circleback Settings → Automations → Create automation → Send
 							webhook request. The webhook will automatically send meeting notes, transcripts, and
 							action items to this search space.
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/clickup-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/clickup-config.tsx
index 9d203a33b..f5f75bbe8 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/clickup-config.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/clickup-config.tsx
@@ -3,6 +3,7 @@
 import { Info, KeyRound } from "lucide-react";
 import type { FC } from "react";
 import { useState } from "react";
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
 import type { ConnectorConfigProps } from "../index";
@@ -47,21 +48,17 @@ export const ClickUpConfig: FC<ClickUpConfigProps> = ({
 		return (
 			<div className="space-y-6">
 				{/* OAuth Info */}
-				<div className="rounded-xl border border-border bg-primary/5 p-4 flex items-start gap-3">
-					<div className="flex h-8 w-8 items-center justify-center rounded-lg bg-primary/10 shrink-0 mt-0.5">
-						<Info className="size-4" />
-					</div>
-					<div className="text-xs sm:text-sm">
-						<p className="font-medium text-xs sm:text-sm">Connected via OAuth</p>
-						<p className="text-muted-foreground mt-1 text-[10px] sm:text-sm">
+				<Alert>
+					<Info />
+					<AlertTitle>Connected via OAuth</AlertTitle>
+					<AlertDescription>
+						<p>
 							Workspace:{" "}
 							<code className="bg-muted px-1 py-0.5 rounded text-inherit">{workspaceName}</code>
 						</p>
-						<p className="text-muted-foreground mt-1 text-[10px] sm:text-sm">
-							To update your connection, reconnect this connector.
-						</p>
-					</div>
-				</div>
+						<p>To update your connection, reconnect this connector.</p>
+					</AlertDescription>
+				</Alert>
 			</div>
 		);
 	}
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/confluence-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/confluence-config.tsx
index 040479211..b098f3694 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/confluence-config.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/confluence-config.tsx
@@ -3,6 +3,7 @@
 import { Info, KeyRound } from "lucide-react";
 import type { FC } from "react";
 import { useState } from "react";
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
 import type { ConnectorConfigProps } from "../index";
@@ -72,23 +73,17 @@ export const ConfluenceConfig: FC<ConfluenceConfigProps> = ({
 		return (
 			<div className="space-y-6">
 				{/* OAuth Info */}
-				<div className="rounded-xl border border-border bg-primary/5 p-4 flex items-start gap-3">
-					<div className="flex h-8 w-8 items-center justify-center rounded-lg bg-primary/10 shrink-0 mt-0.5">
-						<Info className="size-4" />
-					</div>
-					<div className="text-xs sm:text-sm">
-						<p className="font-medium text-xs sm:text-sm">Connected via OAuth</p>
-						<p className="text-muted-foreground mt-1 text-[10px] sm:text-sm">
-							This connector is authenticated using OAuth 2.0. Your Confluence instance is:
-						</p>
-						<p className="text-muted-foreground mt-1 text-[10px] sm:text-sm">
+				<Alert>
+					<Info />
+					<AlertTitle>Connected via OAuth</AlertTitle>
+					<AlertDescription>
+						<p>This connector is authenticated using OAuth 2.0. Your Confluence instance is:</p>
+						<p>
 							<code className="bg-muted px-1 py-0.5 rounded text-inherit">{siteUrl}</code>
 						</p>
-						<p className="text-muted-foreground mt-1 text-[10px] sm:text-sm">
-							To update your connection, reconnect this connector.
-						</p>
-					</div>
-				</div>
+						<p>To update your connection, reconnect this connector.</p>
+					</AlertDescription>
+				</Alert>
 			</div>
 		);
 	}
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/discord-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/discord-config.tsx
index 3c00a1603..93fc3ff81 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/discord-config.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/discord-config.tsx
@@ -2,6 +2,7 @@
 
 import { AlertCircle, CheckCircle2, Hash, Info, Megaphone, RefreshCw } from "lucide-react";
 import { type FC, useCallback, useEffect, useState } from "react";
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Button } from "@/components/ui/button";
 import { Spinner } from "@/components/ui/spinner";
 import { connectorsApiService, type DiscordChannel } from "@/lib/apis/connectors-api.service";
@@ -73,17 +74,14 @@ export const DiscordConfig: FC<DiscordConfigProps> = ({ connector }) => {
 	return (
 		<div className="space-y-6">
 			{/* Info box */}
-			<div className="rounded-xl border border-border bg-primary/5 p-4 flex items-start gap-3">
-				<div className="flex h-8 w-8 items-center justify-center rounded-lg bg-primary/10 shrink-0 mt-0.5">
-					<Info className="size-4" />
-				</div>
-				<div className="text-xs sm:text-sm">
-					<p className="text-muted-foreground mt-1 text-[10px] sm:text-sm">
-						The bot needs &quot;Read Message History&quot; permission to access channels. Ask a
-						server admin to grant this permission for channels shown below.
-					</p>
-				</div>
-			</div>
+			<Alert>
+				<Info />
+				<AlertTitle>Grant Channel Permissions</AlertTitle>
+				<AlertDescription>
+					The bot needs &quot;Read Message History&quot; permission to access channels. Ask a server
+					admin to grant this permission for channels shown below.
+				</AlertDescription>
+			</Alert>
 
 			{/* Channels Section */}
 			<div className="space-y-3">
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/jira-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/jira-config.tsx
index c43bd1524..bbabb195a 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/jira-config.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/jira-config.tsx
@@ -3,6 +3,7 @@
 import { Info, KeyRound } from "lucide-react";
 import type { FC } from "react";
 import { useState } from "react";
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
 import type { ConnectorConfigProps } from "../index";
@@ -65,23 +66,17 @@ export const JiraConfig: FC<JiraConfigProps> = ({ connector, onConfigChange, onN
 		return (
 			<div className="space-y-6">
 				{/* OAuth Info */}
-				<div className="rounded-xl border border-border bg-primary/5 p-4 flex items-start gap-3">
-					<div className="flex h-8 w-8 items-center justify-center rounded-lg bg-primary/10 shrink-0 mt-0.5">
-						<Info className="size-4" />
-					</div>
-					<div className="text-xs sm:text-sm">
-						<p className="font-medium text-xs sm:text-sm">Connected via OAuth</p>
-						<p className="text-muted-foreground mt-1 text-[10px] sm:text-sm">
-							This connector is authenticated using OAuth 2.0. Your Jira instance is:
-						</p>
-						<p className="text-muted-foreground mt-1 text-[10px] sm:text-sm">
+				<Alert>
+					<Info />
+					<AlertTitle>Connected via OAuth</AlertTitle>
+					<AlertDescription>
+						<p>This connector is authenticated using OAuth 2.0. Your Jira instance is:</p>
+						<p>
 							<code className="bg-muted px-1 py-0.5 rounded text-inherit">{baseUrl}</code>
 						</p>
-						<p className="text-muted-foreground mt-1 text-[10px] sm:text-sm">
-							To update your connection, reconnect this connector.
-						</p>
-					</div>
-				</div>
+						<p>To update your connection, reconnect this connector.</p>
+					</AlertDescription>
+				</Alert>
 			</div>
 		);
 	}
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/obsidian-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/obsidian-config.tsx
index 094eb3aa0..de7ea8230 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/obsidian-config.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/obsidian-config.tsx
@@ -47,12 +47,10 @@ export const ObsidianConfig: FC<ConnectorConfigProps> = ({ connector }) => {
 const LegacyBanner: FC = () => {
 	return (
 		<div className="space-y-6">
-			<Alert className="border-amber-500/40 bg-amber-500/10">
-				<AlertTriangle className="size-4 shrink-0 text-amber-500" />
-				<AlertTitle className="text-xs sm:text-sm">
-					Sync stopped, install the plugin to migrate
-				</AlertTitle>
-				<AlertDescription className="text-[11px] sm:text-xs leading-relaxed">
+			<Alert>
+				<AlertTriangle />
+				<AlertTitle>Sync stopped, install the plugin to migrate</AlertTitle>
+				<AlertDescription>
 					This Obsidian connector used the legacy server-path scanner, which has been removed. The
 					notes already indexed remain searchable, but they no longer reflect changes made in your
 					vault.
@@ -124,10 +122,10 @@ const PluginStats: FC<{ config: Record<string, unknown> }> = ({ config }) => {
 
 	return (
 		<div className="space-y-4">
-			<Alert className="border-emerald-500/30 bg-emerald-500/10">
-				<Info className="size-4 shrink-0 text-emerald-500" />
-				<AlertTitle className="text-xs sm:text-sm">Plugin connected</AlertTitle>
-				<AlertDescription className="text-[11px] sm:text-xs">
+			<Alert>
+				<Info />
+				<AlertTitle>Plugin connected</AlertTitle>
+				<AlertDescription>
 					Your notes stay synced automatically. To stop syncing, disable or uninstall the plugin in
 					Obsidian, or delete this connector.
 				</AlertDescription>
@@ -152,11 +150,11 @@ const PluginStats: FC<{ config: Record<string, unknown> }> = ({ config }) => {
 
 const UnknownConnectorState: FC = () => (
 	<Alert>
-		<Info className="size-4 shrink-0" />
-		<AlertTitle className="text-xs sm:text-sm">Unrecognized config</AlertTitle>
-		<AlertDescription className="text-[11px] sm:text-xs">
-			This connector has neither plugin metadata nor a legacy marker. It may predate migration — you
-			can safely delete it and re-install the SurfSense Obsidian plugin to resume syncing.
+		<Info />
+		<AlertTitle>Unrecognized config</AlertTitle>
+		<AlertDescription>
+			This connector is missing plugin metadata and may predate the Obsidian plugin migration. You
+			can safely delete it and reinstall the SurfSense Obsidian plugin to resume syncing.
 		</AlertDescription>
 	</Alert>
 );
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/slack-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/slack-config.tsx
index e7a03423b..a5700c668 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/slack-config.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/slack-config.tsx
@@ -2,6 +2,7 @@
 
 import { AlertCircle, CheckCircle2, Hash, Info, Lock, RefreshCw } from "lucide-react";
 import { type FC, useCallback, useEffect, useState } from "react";
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Button } from "@/components/ui/button";
 import { Spinner } from "@/components/ui/spinner";
 import { connectorsApiService, type SlackChannel } from "@/lib/apis/connectors-api.service";
@@ -74,20 +75,18 @@ export const SlackConfig: FC<SlackConfigProps> = ({ connector }) => {
 	return (
 		<div className="space-y-6">
 			{/* Info box */}
-			<div className="rounded-xl border border-border bg-primary/5 p-4 flex items-start gap-3">
-				<div className="flex h-8 w-8 items-center justify-center rounded-lg bg-primary/10 shrink-0 mt-0.5">
-					<Info className="size-4" />
-				</div>
-				<div className="text-xs sm:text-sm">
-					<p className="font-medium text-xs sm:text-sm">Add Bot to Channels</p>
-					<p className="text-muted-foreground mt-1 text-[10px] sm:text-sm">
+			<Alert>
+				<Info />
+				<AlertTitle>Add Bot to Channels</AlertTitle>
+				<AlertDescription>
+					<p>
 						Before indexing, add the SurfSense bot to each channel you want to index. The bot can
 						only access messages from channels it's been added to. Type{" "}
-						<code className="bg-muted px-1 py-0.5 rounded text-[9px]">/invite @SurfSense</code> in
-						any channel to add it.
+						<code className="bg-muted px-1 py-0.5 rounded text-[9px]">/invite @SurfSense</code>{" "}
+						in any channel to add it.
 					</p>
-				</div>
-			</div>
+				</AlertDescription>
+			</Alert>
 
 			{/* Channels Section */}
 			<div className="space-y-3">
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/teams-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/teams-config.tsx
index 06ce21dae..aae517098 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/teams-config.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/teams-config.tsx
@@ -2,6 +2,7 @@
 
 import { Info } from "lucide-react";
 import type { FC } from "react";
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import type { ConnectorConfigProps } from "../index";
 
 export interface TeamsConfigProps extends ConnectorConfigProps {
@@ -11,19 +12,17 @@ export interface TeamsConfigProps extends ConnectorConfigProps {
 export const TeamsConfig: FC<TeamsConfigProps> = () => {
 	return (
 		<div className="space-y-6">
-			<div className="rounded-xl border border-border bg-primary/5 p-4 flex items-start gap-3">
-				<div className="flex h-8 w-8 items-center justify-center rounded-lg bg-primary/10 shrink-0 mt-0.5">
-					<Info className="size-4" />
-				</div>
-				<div className="text-xs sm:text-sm">
-					<p className="font-medium text-xs sm:text-sm">Microsoft Teams Access</p>
-					<p className="text-muted-foreground mt-1 text-[10px] sm:text-sm">
+			<Alert>
+				<Info />
+				<AlertTitle>Microsoft Teams Access</AlertTitle>
+				<AlertDescription>
+					<p>
 						Your agent can search and read messages from Teams channels you have access to, and send
-						messages on your behalf. Make sure you&#39;re a member of the teams you want to interact
-						with.
+						messages on your behalf. Make sure you&#39;re a member of the teams you want to
+						interact with.
 					</p>
-				</div>
-			</div>
+				</AlertDescription>
+			</Alert>
 		</div>
 	);
 };
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/webcrawler-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/webcrawler-config.tsx
index 365d1c020..b7fbae91c 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/webcrawler-config.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/webcrawler-config.tsx
@@ -52,13 +52,13 @@ export const WebcrawlerConfig: FC<ConnectorConfigProps> = ({ connector, onConfig
 			</div>
 
 			{/* Chat tip */}
-			<div className="flex items-start gap-3 rounded-lg border border-blue-200/50 bg-blue-50/50 dark:border-blue-500/20 dark:bg-blue-950/20 p-3 text-xs sm:text-sm">
-				<Info className="size-4 mt-0.5 shrink-0 text-blue-600 dark:text-blue-400" />
-				<p className="text-muted-foreground">
+			<Alert>
+				<Info />
+				<AlertDescription>
 					Want a quick answer from a webpage without indexing it? Just paste the URL directly into
 					the chat instead.
-				</p>
-			</div>
+				</AlertDescription>
+			</Alert>
 
 			{/* API Key Field */}
 			<div className="space-y-2">
@@ -116,9 +116,9 @@ export const WebcrawlerConfig: FC<ConnectorConfigProps> = ({ connector, onConfig
 			</div>
 
 			{/* Info Alert */}
-			<Alert className="bg-slate-400/5 dark:bg-white/5 border-slate-400/20 p-2 sm:p-3">
-				<Info className="size-4 shrink-0" />
-				<AlertDescription className="text-[10px] sm:text-xs">
+			<Alert>
+				<Info />
+				<AlertDescription>
 					Configuration is saved when you start indexing. You can update these settings anytime from
 					the connector management page.
 				</AlertDescription>
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-edit-view.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-edit-view.tsx
index 2f69df79c..b64f97414 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-edit-view.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-edit-view.tsx
@@ -5,6 +5,7 @@ import { ArrowLeft, Info, RefreshCw } from "lucide-react";
 import { type FC, useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { toast } from "sonner";
 import { activeSearchSpaceIdAtom } from "@/atoms/search-spaces/search-space-query.atoms";
+import { Alert, AlertDescription } from "@/components/ui/alert";
 import { Button } from "@/components/ui/button";
 import { Spinner } from "@/components/ui/spinner";
 import { EnumConnectorName } from "@/contracts/enums/connector";
@@ -350,20 +351,12 @@ export const ConnectorEditView: FC<ConnectorEditViewProps> = ({
 
 						{/* Info box - hidden for live connectors */}
 						{connector.is_indexable && !isLive && (
-							<div className="rounded-xl border border-border bg-primary/5 p-4 flex items-start gap-3">
-								<div className="flex h-8 w-8 items-center justify-center rounded-lg bg-primary/10 shrink-0 mt-0.5">
-									<Info className="size-4" />
-								</div>
-								<div className="text-xs sm:text-sm">
-									<p className="font-medium text-xs sm:text-sm">
-										Re-indexing runs in the background
-									</p>
-									<p className="text-muted-foreground mt-1 text-[10px] sm:text-sm">
-										You can continue using SurfSense while we sync your data. Check inbox for
-										updates.
-									</p>
-								</div>
-							</div>
+							<Alert>
+								<Info />
+								<AlertDescription>
+									You can continue using SurfSense while we sync your data. Check inbox for updates.
+								</AlertDescription>
+							</Alert>
 						)}
 					</div>
 				</div>
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/indexing-configuration-view.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/indexing-configuration-view.tsx
index cf8f32ee4..74b4fad9f 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/indexing-configuration-view.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/indexing-configuration-view.tsx
@@ -2,6 +2,7 @@
 
 import { ArrowLeft, Check, Info } from "lucide-react";
 import { type FC, useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { Alert, AlertDescription } from "@/components/ui/alert";
 import { Button } from "@/components/ui/button";
 import { Spinner } from "@/components/ui/spinner";
 import { EnumConnectorName } from "@/contracts/enums/connector";
@@ -230,18 +231,12 @@ export const IndexingConfigurationView: FC<IndexingConfigurationViewProps> = ({
 
 						{/* Info box - hidden for live connectors */}
 						{connector?.is_indexable && !isLive && (
-							<div className="rounded-xl border border-border bg-primary/5 p-4 flex items-start gap-3">
-								<div className="flex h-8 w-8 items-center justify-center rounded-lg bg-primary/10 shrink-0 mt-0.5">
-									<Info className="size-4" />
-								</div>
-								<div className="text-xs sm:text-sm">
-									<p className="font-medium text-xs sm:text-sm">Indexing runs in the background</p>
-									<p className="text-muted-foreground mt-1 text-[10px] sm:text-sm">
-										You can continue using SurfSense while we sync your data. Check inbox for
-										updates.
-									</p>
-								</div>
-							</div>
+							<Alert>
+								<Info />
+								<AlertDescription>
+									You can continue using SurfSense while we sync your data. Check inbox for updates.
+								</AlertDescription>
+							</Alert>
 						)}
 					</div>
 				</div>
diff --git a/surfsense_web/components/assistant-ui/connector-popup/views/youtube-crawler-view.tsx b/surfsense_web/components/assistant-ui/connector-popup/views/youtube-crawler-view.tsx
index 576d858d1..5bffa0dfe 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/views/youtube-crawler-view.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/views/youtube-crawler-view.tsx
@@ -7,6 +7,7 @@ import { useTranslations } from "next-intl";
 import { type FC, useCallback, useState } from "react";
 import { toast } from "sonner";
 import { createDocumentMutationAtom } from "@/atoms/documents/document-mutation.atoms";
+import { Alert, AlertDescription } from "@/components/ui/alert";
 import { Button } from "@/components/ui/button";
 import { Label } from "@/components/ui/label";
 import { Spinner } from "@/components/ui/spinner";
@@ -279,10 +280,10 @@ export const YouTubeCrawlerView: FC<YouTubeCrawlerViewProps> = ({ searchSpaceId,
 
 					{error && <div className="text-sm text-red-500 mt-2">{error}</div>}
 
-					<div className="flex items-start gap-3 rounded-lg border border-blue-200/50 bg-blue-50/50 dark:border-blue-500/20 dark:bg-blue-950/20 p-4 text-sm">
-						<Info className="size-4 mt-0.5 shrink-0 text-blue-600 dark:text-blue-400" />
-						<p className="text-muted-foreground">{t("chat_tip")}</p>
-					</div>
+					<Alert>
+						<Info />
+						<AlertDescription>{t("chat_tip")}</AlertDescription>
+					</Alert>
 
 					<div className="bg-muted/50 rounded-lg p-4 text-sm">
 						<h4 className="font-medium mb-2">{t("tips_title")}</h4>
diff --git a/surfsense_web/components/assistant-ui/document-upload-popup.tsx b/surfsense_web/components/assistant-ui/document-upload-popup.tsx
index d4482a01b..0067e25b6 100644
--- a/surfsense_web/components/assistant-ui/document-upload-popup.tsx
+++ b/surfsense_web/components/assistant-ui/document-upload-popup.tsx
@@ -147,31 +147,30 @@ const DocumentUploadPopupContent: FC<{
 
 					<div className="px-4 sm:px-6 pb-4 sm:pb-6">
 						{!isLoading && !hasDocumentSummaryLLM ? (
-							<Alert
-								variant="destructive"
-								className="mb-4 bg-muted/50 rounded-xl border-destructive/30"
-							>
-								<AlertTriangle className="h-4 w-4" />
-								<AlertTitle>LLM Configuration Required</AlertTitle>
-								<AlertDescription className="mt-2">
-									<p className="mb-3">
-										{isAutoMode && !hasGlobalConfigs
-											? "Auto mode requires a global LLM configuration. Please add one in Settings"
-											: "A Document Summary LLM is required to process uploads, configure one in Settings"}
-									</p>
-									<Button
-										size="sm"
-										variant="outline"
-										onClick={() => {
-											onOpenChange(false);
-											router.push(`/dashboard/${searchSpaceId}/search-space-settings?tab=models`);
-										}}
-									>
-										<Settings className="mr-2 h-4 w-4" />
-										Go to Settings
-									</Button>
-								</AlertDescription>
-							</Alert>
+							<div className="mb-4">
+								<Alert variant="destructive">
+									<AlertTriangle />
+									<AlertTitle>LLM Configuration Required</AlertTitle>
+									<AlertDescription>
+										<p>
+											{isAutoMode && !hasGlobalConfigs
+												? "Auto mode requires a global LLM configuration. Please add one in Settings"
+												: "A Document Summary LLM is required to process uploads, configure one in Settings"}
+										</p>
+										<Button
+											size="sm"
+											variant="outline"
+											onClick={() => {
+												onOpenChange(false);
+												router.push(`/dashboard/${searchSpaceId}/search-space-settings?tab=models`);
+											}}
+										>
+											<Settings className="mr-2 h-4 w-4" />
+											Go to Settings
+										</Button>
+									</AlertDescription>
+								</Alert>
+							</div>
 						) : (
 							<DocumentUploadTab searchSpaceId={searchSpaceId} onSuccess={handleSuccess} />
 						)}
diff --git a/surfsense_web/components/public-chat-snapshots/public-chat-snapshots-manager.tsx b/surfsense_web/components/public-chat-snapshots/public-chat-snapshots-manager.tsx
index cb7be1376..e0d2f52a9 100644
--- a/surfsense_web/components/public-chat-snapshots/public-chat-snapshots-manager.tsx
+++ b/surfsense_web/components/public-chat-snapshots/public-chat-snapshots-manager.tsx
@@ -128,8 +128,8 @@ export function PublicChatSnapshotsManager({
 	// Permission denied
 	if (!canView) {
 		return (
-			<Alert variant="destructive">
-				<Info className="h-4 w-4" />
+			<Alert>
+				<Info />
 				<AlertDescription>
 					You don't have permission to view public chat links in this search space.
 				</AlertDescription>
@@ -141,9 +141,9 @@ export function PublicChatSnapshotsManager({
 
 	return (
 		<div className="space-y-4 md:space-y-5">
-			<Alert className="bg-muted/50 py-3 md:py-4">
-				<Info className="h-3 w-3 md:h-4 md:w-4 shrink-0" />
-				<AlertDescription className="text-xs md:text-sm">
+			<Alert>
+				<Info />
+				<AlertDescription>
 					Public chat links allow anyone with the URL to view a snapshot of a chat. These links do
 					not update when the original chat changes.
 				</AlertDescription>
diff --git a/surfsense_web/components/settings/agent-model-manager.tsx b/surfsense_web/components/settings/agent-model-manager.tsx
index 6f11a9ffe..c9a5b9f54 100644
--- a/surfsense_web/components/settings/agent-model-manager.tsx
+++ b/surfsense_web/components/settings/agent-model-manager.tsx
@@ -152,26 +152,30 @@ export function AgentModelManager({ searchSpaceId }: AgentModelManagerProps) {
 			{/* Read-only / Limited permissions notice */}
 			{access && !isLoading && isReadOnly && (
 				<div>
-					<Alert className="bg-muted/50 py-3 md:py-4">
-						<Info className="h-3 w-3 md:h-4 md:w-4 shrink-0" />
-						<AlertDescription className="text-xs md:text-sm">
-							You have <span className="font-medium">read-only</span> access to LLM configurations.
-							Contact a space owner to request additional permissions.
+					<Alert>
+						<Info />
+						<AlertDescription>
+							<p>
+								You have <span className="font-medium">read-only</span> access to LLM
+								configurations. Contact a space owner to request additional permissions.
+							</p>
 						</AlertDescription>
 					</Alert>
 				</div>
 			)}
 			{access && !isLoading && !isReadOnly && (!canCreate || !canUpdate || !canDelete) && (
 				<div>
-					<Alert className="bg-muted/50 py-3 md:py-4">
-						<Info className="h-3 w-3 md:h-4 md:w-4 shrink-0" />
-						<AlertDescription className="text-xs md:text-sm">
-							You can{" "}
-							{[canCreate && "create", canUpdate && "edit", canDelete && "delete"]
-								.filter(Boolean)
-								.join(" and ")}{" "}
-							configurations
-							{!canDelete && ", but cannot delete them"}.
+					<Alert>
+						<Info />
+						<AlertDescription>
+							<p>
+								You can{" "}
+								{[canCreate && "create", canUpdate && "edit", canDelete && "delete"]
+									.filter(Boolean)
+									.join(" and ")}{" "}
+								configurations
+								{!canDelete && ", but cannot delete them"}.
+							</p>
 						</AlertDescription>
 					</Alert>
 				</div>
@@ -179,9 +183,9 @@ export function AgentModelManager({ searchSpaceId }: AgentModelManagerProps) {
 
 			{/* Global Configs Info */}
 			{globalConfigs.length > 0 && (
-				<Alert className="bg-muted/50 py-3">
-					<Info className="h-3 w-3 md:h-4 md:w-4 shrink-0" />
-					<AlertDescription className="text-xs md:text-sm">
+				<Alert>
+					<Info />
+					<AlertDescription>
 						<p>
 							<span className="font-medium">
 								{globalConfigs.length} global {globalConfigs.length === 1 ? "model" : "models"}
diff --git a/surfsense_web/components/settings/general-settings-manager.tsx b/surfsense_web/components/settings/general-settings-manager.tsx
index 796746f75..02791e4a0 100644
--- a/surfsense_web/components/settings/general-settings-manager.tsx
+++ b/surfsense_web/components/settings/general-settings-manager.tsx
@@ -135,11 +135,9 @@ export function GeneralSettingsManager({ searchSpaceId }: GeneralSettingsManager
 
 	return (
 		<div className="space-y-4 md:space-y-6">
-			<Alert className="bg-muted/50 py-3 md:py-4">
-				<Info className="h-3 w-3 md:h-4 md:w-4 shrink-0" />
-				<AlertDescription className="text-xs md:text-sm">
-					Update your search space name and description.
-				</AlertDescription>
+			<Alert>
+				<Info />
+				<AlertDescription>Update your search space name and description.</AlertDescription>
 			</Alert>
 
 			<form onSubmit={onSubmit} className="space-y-6">
diff --git a/surfsense_web/components/settings/image-model-manager.tsx b/surfsense_web/components/settings/image-model-manager.tsx
index e6c5f375e..4ee22dd52 100644
--- a/surfsense_web/components/settings/image-model-manager.tsx
+++ b/surfsense_web/components/settings/image-model-manager.tsx
@@ -153,26 +153,30 @@ export function ImageModelManager({ searchSpaceId }: ImageModelManagerProps) {
 			{/* Read-only / Limited permissions notice */}
 			{access && !isLoading && isReadOnly && (
 				<div>
-					<Alert className="bg-muted/50 py-3 md:py-4">
-						<Info className="h-3 w-3 md:h-4 md:w-4 shrink-0" />
-						<AlertDescription className="text-xs md:text-sm">
-							You have <span className="font-medium">read-only</span> access to image generation
-							configurations. Contact a space owner to request additional permissions.
+					<Alert>
+						<Info />
+						<AlertDescription>
+							<p>
+								You have <span className="font-medium">read-only</span> access to image generation
+								configurations. Contact a space owner to request additional permissions.
+							</p>
 						</AlertDescription>
 					</Alert>
 				</div>
 			)}
 			{access && !isLoading && !isReadOnly && (!canCreate || !canDelete) && (
 				<div>
-					<Alert className="bg-muted/50 py-3 md:py-4">
-						<Info className="h-3 w-3 md:h-4 md:w-4 shrink-0" />
-						<AlertDescription className="text-xs md:text-sm">
-							You can{" "}
-							{[canCreate && "create and edit", canDelete && "delete"]
-								.filter(Boolean)
-								.join(" and ")}{" "}
-							image model configurations
-							{!canDelete && ", but cannot delete them"}.
+					<Alert>
+						<Info />
+						<AlertDescription>
+							<p>
+								You can{" "}
+								{[canCreate && "create and edit", canDelete && "delete"]
+									.filter(Boolean)
+									.join(" and ")}{" "}
+								image model configurations
+								{!canDelete && ", but cannot delete them"}.
+							</p>
 						</AlertDescription>
 					</Alert>
 				</div>
@@ -180,9 +184,9 @@ export function ImageModelManager({ searchSpaceId }: ImageModelManagerProps) {
 
 			{/* Global info */}
 			{globalConfigs.filter((g) => !("is_auto_mode" in g && g.is_auto_mode)).length > 0 && (
-				<Alert className="bg-muted/50 py-3">
-					<Info className="h-3 w-3 md:h-4 md:w-4 shrink-0" />
-					<AlertDescription className="text-xs md:text-sm">
+				<Alert>
+					<Info />
+					<AlertDescription>
 						<p>
 							<span className="font-medium">
 								{globalConfigs.filter((g) => !("is_auto_mode" in g && g.is_auto_mode)).length}{" "}
diff --git a/surfsense_web/components/settings/prompt-config-manager.tsx b/surfsense_web/components/settings/prompt-config-manager.tsx
index 6bc77faa2..04e20fe17 100644
--- a/surfsense_web/components/settings/prompt-config-manager.tsx
+++ b/surfsense_web/components/settings/prompt-config-manager.tsx
@@ -4,7 +4,7 @@ import { useQuery } from "@tanstack/react-query";
 import { AlertTriangle, Info } from "lucide-react";
 import { useEffect, useState } from "react";
 import { toast } from "sonner";
-import { Alert, AlertDescription } from "@/components/ui/alert";
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Button } from "@/components/ui/button";
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
 import { Label } from "@/components/ui/label";
@@ -102,21 +102,19 @@ export function PromptConfigManager({ searchSpaceId }: PromptConfigManagerProps)
 	return (
 		<div className="space-y-4 md:space-y-6">
 			{/* Work in Progress Notice */}
-			<Alert
-				variant="default"
-				className="bg-amber-50 dark:bg-amber-950/30 border-amber-300 dark:border-amber-700 py-3 md:py-4"
-			>
-				<AlertTriangle className="h-3 w-3 md:h-4 md:w-4 text-amber-600 dark:text-amber-500 shrink-0" />
-				<AlertDescription className="text-amber-800 dark:text-amber-300 text-xs md:text-sm">
-					<span className="font-semibold">Work in Progress:</span> This functionality is currently
-					under development and not yet connected to the backend. Your instructions will be saved
-					but won't affect AI behavior until the feature is fully implemented.
+			<Alert>
+				<AlertTriangle />
+				<AlertTitle>Work in Progress</AlertTitle>
+				<AlertDescription>
+					This functionality is currently under development and not yet connected to the backend.
+					Your instructions will be saved but won't affect AI behavior until the feature is fully
+					implemented.
 				</AlertDescription>
 			</Alert>
 
-			<Alert className="bg-muted/50 py-3 md:py-4">
-				<Info className="h-3 w-3 md:h-4 md:w-4 shrink-0" />
-				<AlertDescription className="text-xs md:text-sm">
+			<Alert>
+				<Info />
+				<AlertDescription>
 					System instructions apply to all AI interactions in this search space. They guide how the
 					AI responds, its tone, focus areas, and behavior patterns.
 				</AlertDescription>
@@ -167,9 +165,9 @@ export function PromptConfigManager({ searchSpaceId }: PromptConfigManagerProps)
 						</div>
 
 						{customInstructions.trim().length === 0 && (
-							<Alert className="py-2 md:py-3">
-								<Info className="h-3 w-3 md:h-4 md:w-4 shrink-0" />
-								<AlertDescription className="text-xs md:text-sm">
+							<Alert>
+								<Info />
+								<AlertDescription>
 									No system instructions are currently set. The AI will use default behavior.
 								</AlertDescription>
 							</Alert>
diff --git a/surfsense_web/components/settings/team-memory-manager.tsx b/surfsense_web/components/settings/team-memory-manager.tsx
index 534687326..effc6a148 100644
--- a/surfsense_web/components/settings/team-memory-manager.tsx
+++ b/surfsense_web/components/settings/team-memory-manager.tsx
@@ -183,9 +183,9 @@ export function TeamMemoryManager({ searchSpaceId }: TeamMemoryManagerProps) {
 
 	return (
 		<div className="space-y-4">
-			<Alert className="bg-muted/50 py-3 md:py-4">
-				<Info className="h-3 w-3 md:h-4 md:w-4 shrink-0" />
-				<AlertDescription className="text-xs md:text-sm">
+			<Alert>
+				<Info />
+				<AlertDescription>
 					<p>
 						SurfSense uses this shared memory to provide team-wide context across all conversations
 						in this search space.
diff --git a/surfsense_web/components/settings/vision-model-manager.tsx b/surfsense_web/components/settings/vision-model-manager.tsx
index 0e528094e..167c5b31d 100644
--- a/surfsense_web/components/settings/vision-model-manager.tsx
+++ b/surfsense_web/components/settings/vision-model-manager.tsx
@@ -155,35 +155,39 @@ export function VisionModelManager({ searchSpaceId }: VisionModelManagerProps) {
 
 			{access && !isLoading && isReadOnly && (
 				<div>
-					<Alert className="bg-muted/50 py-3 md:py-4">
-						<Info className="h-3 w-3 md:h-4 md:w-4 shrink-0" />
-						<AlertDescription className="text-xs md:text-sm">
-							You have <span className="font-medium">read-only</span> access to vision model
-							configurations. Contact a space owner to request additional permissions.
+					<Alert>
+						<Info />
+						<AlertDescription>
+							<p>
+								You have <span className="font-medium">read-only</span> access to vision model
+								configurations. Contact a space owner to request additional permissions.
+							</p>
 						</AlertDescription>
 					</Alert>
 				</div>
 			)}
 			{access && !isLoading && !isReadOnly && (!canCreate || !canDelete) && (
 				<div>
-					<Alert className="bg-muted/50 py-3 md:py-4">
-						<Info className="h-3 w-3 md:h-4 md:w-4 shrink-0" />
-						<AlertDescription className="text-xs md:text-sm">
-							You can{" "}
-							{[canCreate && "create and edit", canDelete && "delete"]
-								.filter(Boolean)
-								.join(" and ")}{" "}
-							vision model configurations
-							{!canDelete && ", but cannot delete them"}.
+					<Alert>
+						<Info />
+						<AlertDescription>
+							<p>
+								You can{" "}
+								{[canCreate && "create and edit", canDelete && "delete"]
+									.filter(Boolean)
+									.join(" and ")}{" "}
+								vision model configurations
+								{!canDelete && ", but cannot delete them"}.
+							</p>
 						</AlertDescription>
 					</Alert>
 				</div>
 			)}
 
 			{globalConfigs.filter((g) => !("is_auto_mode" in g && g.is_auto_mode)).length > 0 && (
-				<Alert className="bg-muted/50 py-3">
-					<Info className="h-3 w-3 md:h-4 md:w-4 shrink-0" />
-					<AlertDescription className="text-xs md:text-sm">
+				<Alert>
+					<Info />
+					<AlertDescription>
 						<p>
 							<span className="font-medium">
 								{globalConfigs.filter((g) => !("is_auto_mode" in g && g.is_auto_mode)).length}{" "}

From 22f6b9dfe460d38a7a2aecffd3808c9684b19c94 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Tue, 19 May 2026 00:51:06 +0530
Subject: [PATCH 80/96] refactor: update Slack configuration styling and remove
 unused icon in general settings

---
 .../connector-configs/components/slack-config.tsx            | 4 +++-
 .../components/settings/general-settings-manager.tsx         | 5 +----
 surfsense_web/components/ui/alert.tsx                        | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/slack-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/slack-config.tsx
index a5700c668..7f30d751a 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/slack-config.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/slack-config.tsx
@@ -82,7 +82,9 @@ export const SlackConfig: FC<SlackConfigProps> = ({ connector }) => {
 					<p>
 						Before indexing, add the SurfSense bot to each channel you want to index. The bot can
 						only access messages from channels it's been added to. Type{" "}
-						<code className="bg-muted px-1 py-0.5 rounded text-[9px]">/invite @SurfSense</code>{" "}
+						<code className="rounded bg-popover px-1 py-0.5 text-[9px] text-popover-foreground">
+							/invite @SurfSense
+						</code>{" "}
 						in any channel to add it.
 					</p>
 				</AlertDescription>
diff --git a/surfsense_web/components/settings/general-settings-manager.tsx b/surfsense_web/components/settings/general-settings-manager.tsx
index 02791e4a0..b01342cfc 100644
--- a/surfsense_web/components/settings/general-settings-manager.tsx
+++ b/surfsense_web/components/settings/general-settings-manager.tsx
@@ -2,7 +2,7 @@
 
 import { useQuery } from "@tanstack/react-query";
 import { useAtomValue } from "jotai";
-import { FolderArchive, Info } from "lucide-react";
+import { Info } from "lucide-react";
 import { useTranslations } from "next-intl";
 import { useCallback, useEffect, useState } from "react";
 import { toast } from "sonner";
@@ -197,9 +197,6 @@ export function GeneralSettingsManager({ searchSpaceId }: GeneralSettingsManager
 					onClick={handleExportKB}
 					className="relative w-fit shrink-0"
 				>
-					<span className={isExporting ? "opacity-0" : ""}>
-						<FolderArchive className="h-3 w-3 opacity-60" />
-					</span>
 					<span className={isExporting ? "opacity-0" : ""}>Export</span>
 					{isExporting && <Spinner size="sm" className="absolute" />}
 				</Button>
diff --git a/surfsense_web/components/ui/alert.tsx b/surfsense_web/components/ui/alert.tsx
index 450b60285..bf1c4e5c2 100644
--- a/surfsense_web/components/ui/alert.tsx
+++ b/surfsense_web/components/ui/alert.tsx
@@ -8,9 +8,9 @@ const alertVariants = cva(
 	{
 		variants: {
 			variant: {
-				default: "bg-card text-card-foreground",
+				default: "border-popover-border bg-accent text-accent-foreground",
 				destructive:
-					"bg-card text-destructive *:data-[slot=alert-description]:text-destructive/90 [&>svg]:text-current",
+					"border-destructive/30 bg-destructive/10 text-destructive *:data-[slot=alert-description]:text-destructive/90 [&>svg]:text-current",
 			},
 		},
 		defaultVariants: {

From d129ddd8f7527801fa427f89f57ca57e3894849b Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Tue, 19 May 2026 01:04:59 +0530
Subject: [PATCH 81/96] refactor: implement new layout structure for search
 space and user settings with clear ownership

---
 .../search-space-settings/general/page.tsx    |  10 +
 .../image-models/page.tsx                     |  10 +
 .../search-space-settings/layout-shell.tsx    | 179 ++++++++++++
 .../search-space-settings/layout.tsx          |  19 ++
 .../search-space-settings/models/page.tsx     |  10 +
 .../search-space-settings/page.tsx            |  36 +--
 .../search-space-settings/prompts/page.tsx    |  10 +
 .../public-links/page.tsx                     |  10 +
 .../search-space-settings/roles/page.tsx      |  10 +
 .../team-memory/page.tsx                      |  10 +
 .../search-space-settings/team-roles/page.tsx |  10 +
 .../vision-models/page.tsx                    |  10 +
 .../[search_space_id]/team/team-content.tsx   |   2 +-
 .../user-settings/agent-permissions/page.tsx  |   5 +
 .../user-settings/agent-status/page.tsx       |   5 +
 .../user-settings/api-key/page.tsx            |   5 +
 .../user-settings/community-prompts/page.tsx  |   5 +
 ...hortcutsContent.tsx => HotkeysContent.tsx} |   2 +-
 .../user-settings/desktop/page.tsx            |   5 +
 .../user-settings/hotkeys/page.tsx            |   5 +
 .../user-settings/layout-shell.tsx            | 191 ++++++++++++
 .../user-settings/layout.tsx                  |  17 ++
 .../user-settings/memory/page.tsx             |   5 +
 .../[search_space_id]/user-settings/page.tsx  |  32 +--
 .../user-settings/profile/page.tsx            |   5 +
 .../user-settings/prompts/page.tsx            |   5 +
 .../user-settings/purchases/page.tsx          |   5 +
 .../assistant-ui/connector-popup.tsx          |   2 +-
 .../assistant-ui/document-upload-popup.tsx    |   2 +-
 .../layout/providers/LayoutDataProvider.tsx   |   4 +-
 .../components/new-chat/chat-share-button.tsx |   2 +-
 .../components/new-chat/prompt-picker.tsx     |   2 +-
 .../settings/search-space-settings-panel.tsx  | 245 ----------------
 .../settings/user-settings-panel.tsx          | 271 ------------------
 34 files changed, 560 insertions(+), 586 deletions(-)
 create mode 100644 surfsense_web/app/dashboard/[search_space_id]/search-space-settings/general/page.tsx
 create mode 100644 surfsense_web/app/dashboard/[search_space_id]/search-space-settings/image-models/page.tsx
 create mode 100644 surfsense_web/app/dashboard/[search_space_id]/search-space-settings/layout-shell.tsx
 create mode 100644 surfsense_web/app/dashboard/[search_space_id]/search-space-settings/layout.tsx
 create mode 100644 surfsense_web/app/dashboard/[search_space_id]/search-space-settings/models/page.tsx
 create mode 100644 surfsense_web/app/dashboard/[search_space_id]/search-space-settings/prompts/page.tsx
 create mode 100644 surfsense_web/app/dashboard/[search_space_id]/search-space-settings/public-links/page.tsx
 create mode 100644 surfsense_web/app/dashboard/[search_space_id]/search-space-settings/roles/page.tsx
 create mode 100644 surfsense_web/app/dashboard/[search_space_id]/search-space-settings/team-memory/page.tsx
 create mode 100644 surfsense_web/app/dashboard/[search_space_id]/search-space-settings/team-roles/page.tsx
 create mode 100644 surfsense_web/app/dashboard/[search_space_id]/search-space-settings/vision-models/page.tsx
 create mode 100644 surfsense_web/app/dashboard/[search_space_id]/user-settings/agent-permissions/page.tsx
 create mode 100644 surfsense_web/app/dashboard/[search_space_id]/user-settings/agent-status/page.tsx
 create mode 100644 surfsense_web/app/dashboard/[search_space_id]/user-settings/api-key/page.tsx
 create mode 100644 surfsense_web/app/dashboard/[search_space_id]/user-settings/community-prompts/page.tsx
 rename surfsense_web/app/dashboard/[search_space_id]/user-settings/components/{DesktopShortcutsContent.tsx => HotkeysContent.tsx} (99%)
 create mode 100644 surfsense_web/app/dashboard/[search_space_id]/user-settings/desktop/page.tsx
 create mode 100644 surfsense_web/app/dashboard/[search_space_id]/user-settings/hotkeys/page.tsx
 create mode 100644 surfsense_web/app/dashboard/[search_space_id]/user-settings/layout-shell.tsx
 create mode 100644 surfsense_web/app/dashboard/[search_space_id]/user-settings/layout.tsx
 create mode 100644 surfsense_web/app/dashboard/[search_space_id]/user-settings/memory/page.tsx
 create mode 100644 surfsense_web/app/dashboard/[search_space_id]/user-settings/profile/page.tsx
 create mode 100644 surfsense_web/app/dashboard/[search_space_id]/user-settings/prompts/page.tsx
 create mode 100644 surfsense_web/app/dashboard/[search_space_id]/user-settings/purchases/page.tsx
 delete mode 100644 surfsense_web/components/settings/search-space-settings-panel.tsx
 delete mode 100644 surfsense_web/components/settings/user-settings-panel.tsx

diff --git a/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/general/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/general/page.tsx
new file mode 100644
index 000000000..ac50c654e
--- /dev/null
+++ b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/general/page.tsx
@@ -0,0 +1,10 @@
+import { GeneralSettingsManager } from "@/components/settings/general-settings-manager";
+
+export default async function Page({
+	params,
+}: {
+	params: Promise<{ search_space_id: string }>;
+}) {
+	const { search_space_id } = await params;
+	return <GeneralSettingsManager searchSpaceId={Number(search_space_id)} />;
+}
diff --git a/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/image-models/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/image-models/page.tsx
new file mode 100644
index 000000000..22859859b
--- /dev/null
+++ b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/image-models/page.tsx
@@ -0,0 +1,10 @@
+import { ImageModelManager } from "@/components/settings/image-model-manager";
+
+export default async function Page({
+	params,
+}: {
+	params: Promise<{ search_space_id: string }>;
+}) {
+	const { search_space_id } = await params;
+	return <ImageModelManager searchSpaceId={Number(search_space_id)} />;
+}
diff --git a/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/layout-shell.tsx b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/layout-shell.tsx
new file mode 100644
index 000000000..96d77d131
--- /dev/null
+++ b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/layout-shell.tsx
@@ -0,0 +1,179 @@
+"use client";
+
+import {
+	BookText,
+	Bot,
+	Brain,
+	CircleUser,
+	Earth,
+	ImageIcon,
+	ListChecks,
+	ScanEye,
+	UserKey,
+} from "lucide-react";
+import Link from "next/link";
+import { useSelectedLayoutSegment } from "next/navigation";
+import { useTranslations } from "next-intl";
+import type React from "react";
+import { useCallback, useMemo, useState } from "react";
+import { Separator } from "@/components/ui/separator";
+import { cn } from "@/lib/utils";
+
+export type SearchSpaceSettingsTab =
+	| "general"
+	| "roles"
+	| "models"
+	| "image-models"
+	| "vision-models"
+	| "team-roles"
+	| "prompts"
+	| "team-memory"
+	| "public-links";
+
+const DEFAULT_TAB: SearchSpaceSettingsTab = "general";
+
+interface SearchSpaceSettingsLayoutShellProps {
+	searchSpaceId: string;
+	children: React.ReactNode;
+}
+
+export function SearchSpaceSettingsLayoutShell({
+	searchSpaceId,
+	children,
+}: SearchSpaceSettingsLayoutShellProps) {
+	const t = useTranslations("searchSpaceSettings");
+	const segment = useSelectedLayoutSegment();
+	const [tabScrollPos, setTabScrollPos] = useState<"start" | "middle" | "end">("start");
+
+	const handleTabScroll = useCallback((e: React.UIEvent<HTMLDivElement>) => {
+		const el = e.currentTarget;
+		const atStart = el.scrollLeft <= 2;
+		const atEnd = el.scrollWidth - el.scrollLeft - el.clientWidth <= 2;
+		setTabScrollPos(atStart ? "start" : atEnd ? "end" : "middle");
+	}, []);
+
+	const navItems = useMemo(
+		() => [
+			{
+				value: "general" as const,
+				label: t("nav_general"),
+				icon: <CircleUser className="h-4 w-4" />,
+			},
+			{
+				value: "roles" as const,
+				label: t("nav_role_assignments"),
+				icon: <ListChecks className="h-4 w-4" />,
+			},
+			{
+				value: "models" as const,
+				label: t("nav_agent_models"),
+				icon: <Bot className="h-4 w-4" />,
+			},
+			{
+				value: "image-models" as const,
+				label: t("nav_image_models"),
+				icon: <ImageIcon className="h-4 w-4" />,
+			},
+			{
+				value: "vision-models" as const,
+				label: t("nav_vision_models"),
+				icon: <ScanEye className="h-4 w-4" />,
+			},
+			{
+				value: "team-roles" as const,
+				label: t("nav_team_roles"),
+				icon: <UserKey className="h-4 w-4" />,
+			},
+			{
+				value: "prompts" as const,
+				label: t("nav_system_instructions"),
+				icon: <BookText className="h-4 w-4" />,
+			},
+			{
+				value: "team-memory" as const,
+				label: "Team Memory",
+				icon: <Brain className="h-4 w-4" />,
+			},
+			{
+				value: "public-links" as const,
+				label: t("nav_public_links"),
+				icon: <Earth className="h-4 w-4" />,
+			},
+		],
+		[t]
+	);
+
+	const activeTab: SearchSpaceSettingsTab =
+		segment && navItems.some((item) => item.value === segment)
+			? (segment as SearchSpaceSettingsTab)
+			: DEFAULT_TAB;
+	const selectedLabel = navItems.find((item) => item.value === activeTab)?.label ?? t("title");
+
+	const hrefFor = (tab: SearchSpaceSettingsTab) =>
+		`/dashboard/${searchSpaceId}/search-space-settings/${tab}`;
+
+	return (
+		<section className="flex h-full min-h-[min(680px,calc(100vh-5rem))] w-full select-none flex-col gap-6 md:pt-6 md:flex-row">
+			<div className="md:w-[220px] md:shrink-0">
+				<h1 className="mb-4 px-1 text-2xl font-semibold tracking-tight">{t("title")}</h1>
+				<nav className="hidden flex-col gap-0.5 md:flex">
+					{navItems.map((item) => (
+						<Link
+							key={item.value}
+							href={hrefFor(item.value)}
+							replace
+							scroll={false}
+							prefetch
+							className={cn(
+								"inline-flex h-auto items-center justify-start gap-3 rounded-md px-3 py-2.5 text-left text-sm font-medium transition-colors duration-150 focus:outline-none focus-visible:outline-none",
+								activeTab === item.value
+									? "bg-accent text-accent-foreground"
+									: "bg-transparent text-muted-foreground hover:bg-accent hover:text-accent-foreground"
+							)}
+						>
+							{item.icon}
+							{item.label}
+						</Link>
+					))}
+				</nav>
+				<div
+					className="overflow-x-auto border-b border-border pb-3 md:hidden"
+					onScroll={handleTabScroll}
+					style={{
+						maskImage: `linear-gradient(to right, ${tabScrollPos === "start" ? "black" : "transparent"}, black 24px, black calc(100% - 24px), ${tabScrollPos === "end" ? "black" : "transparent"})`,
+						WebkitMaskImage: `linear-gradient(to right, ${tabScrollPos === "start" ? "black" : "transparent"}, black 24px, black calc(100% - 24px), ${tabScrollPos === "end" ? "black" : "transparent"})`,
+					}}
+				>
+					<div className="flex gap-1">
+						{navItems.map((item) => (
+							<Link
+								key={item.value}
+								href={hrefFor(item.value)}
+								replace
+								scroll={false}
+								prefetch
+								className={cn(
+									"inline-flex h-auto shrink-0 items-center gap-2 rounded-md px-3 py-1.5 text-xs font-medium transition-colors duration-150 focus:outline-none focus-visible:outline-none",
+									activeTab === item.value
+										? "bg-accent text-accent-foreground"
+										: "bg-transparent text-muted-foreground hover:bg-accent hover:text-accent-foreground"
+								)}
+							>
+								{item.icon}
+								{item.label}
+							</Link>
+						))}
+					</div>
+				</div>
+			</div>
+
+			<div className="min-w-0 flex-1">
+				<div className="hidden md:block">
+					<h2 className="text-lg font-semibold">{selectedLabel}</h2>
+					<Separator className="mt-4" />
+				</div>
+				<div className="min-w-0 pt-4 md:max-w-3xl">{children}</div>
+			</div>
+		</section>
+	);
+}
diff --git a/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/layout.tsx b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/layout.tsx
new file mode 100644
index 000000000..330158da7
--- /dev/null
+++ b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/layout.tsx
@@ -0,0 +1,19 @@
+import type React from "react";
+import { use } from "react";
+import { SearchSpaceSettingsLayoutShell } from "./layout-shell";
+
+export default function SearchSpaceSettingsLayout({
+	params,
+	children,
+}: {
+	params: Promise<{ search_space_id: string }>;
+	children: React.ReactNode;
+}) {
+	const { search_space_id } = use(params);
+
+	return (
+		<SearchSpaceSettingsLayoutShell searchSpaceId={search_space_id}>
+			{children}
+		</SearchSpaceSettingsLayoutShell>
+	);
+}
diff --git a/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/models/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/models/page.tsx
new file mode 100644
index 000000000..b14a536ed
--- /dev/null
+++ b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/models/page.tsx
@@ -0,0 +1,10 @@
+import { AgentModelManager } from "@/components/settings/agent-model-manager";
+
+export default async function Page({
+	params,
+}: {
+	params: Promise<{ search_space_id: string }>;
+}) {
+	const { search_space_id } = await params;
+	return <AgentModelManager searchSpaceId={Number(search_space_id)} />;
+}
diff --git a/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/page.tsx
index 8dd7eb38e..27c59328b 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/page.tsx
@@ -1,40 +1,10 @@
-import {
-	SearchSpaceSettingsPanel,
-	type SearchSpaceSettingsTab,
-} from "@/components/settings/search-space-settings-panel";
-
-const SEARCH_SPACE_SETTINGS_TABS = new Set<string>([
-	"general",
-	"roles",
-	"models",
-	"image-models",
-	"vision-models",
-	"team-roles",
-	"prompts",
-	"team-memory",
-	"public-links",
-]);
-
-function getInitialTab(tab: string | string[] | undefined): SearchSpaceSettingsTab {
-	const value = Array.isArray(tab) ? tab[0] : tab;
-	return value && SEARCH_SPACE_SETTINGS_TABS.has(value)
-		? (value as SearchSpaceSettingsTab)
-		: "general";
-}
+import { redirect } from "next/navigation";
 
 export default async function SearchSpaceSettingsPage({
 	params,
-	searchParams,
 }: {
 	params: Promise<{ search_space_id: string }>;
-	searchParams: Promise<{ tab?: string | string[] }>;
 }) {
-	const [{ search_space_id }, resolvedSearchParams] = await Promise.all([params, searchParams]);
-
-	return (
-		<SearchSpaceSettingsPanel
-			searchSpaceId={search_space_id}
-			initialTab={getInitialTab(resolvedSearchParams.tab)}
-		/>
-	);
+	const { search_space_id } = await params;
+	redirect(`/dashboard/${search_space_id}/search-space-settings/general`);
 }
diff --git a/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/prompts/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/prompts/page.tsx
new file mode 100644
index 000000000..fcdafdf2d
--- /dev/null
+++ b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/prompts/page.tsx
@@ -0,0 +1,10 @@
+import { PromptConfigManager } from "@/components/settings/prompt-config-manager";
+
+export default async function Page({
+	params,
+}: {
+	params: Promise<{ search_space_id: string }>;
+}) {
+	const { search_space_id } = await params;
+	return <PromptConfigManager searchSpaceId={Number(search_space_id)} />;
+}
diff --git a/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/public-links/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/public-links/page.tsx
new file mode 100644
index 000000000..e4b5f35e7
--- /dev/null
+++ b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/public-links/page.tsx
@@ -0,0 +1,10 @@
+import { PublicChatSnapshotsManager } from "@/components/public-chat-snapshots/public-chat-snapshots-manager";
+
+export default async function Page({
+	params,
+}: {
+	params: Promise<{ search_space_id: string }>;
+}) {
+	const { search_space_id } = await params;
+	return <PublicChatSnapshotsManager searchSpaceId={Number(search_space_id)} />;
+}
diff --git a/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/roles/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/roles/page.tsx
new file mode 100644
index 000000000..8c43e7844
--- /dev/null
+++ b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/roles/page.tsx
@@ -0,0 +1,10 @@
+import { LLMRoleManager } from "@/components/settings/llm-role-manager";
+
+export default async function Page({
+	params,
+}: {
+	params: Promise<{ search_space_id: string }>;
+}) {
+	const { search_space_id } = await params;
+	return <LLMRoleManager key={search_space_id} searchSpaceId={Number(search_space_id)} />;
+}
diff --git a/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/team-memory/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/team-memory/page.tsx
new file mode 100644
index 000000000..987b36513
--- /dev/null
+++ b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/team-memory/page.tsx
@@ -0,0 +1,10 @@
+import { TeamMemoryManager } from "@/components/settings/team-memory-manager";
+
+export default async function Page({
+	params,
+}: {
+	params: Promise<{ search_space_id: string }>;
+}) {
+	const { search_space_id } = await params;
+	return <TeamMemoryManager searchSpaceId={Number(search_space_id)} />;
+}
diff --git a/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/team-roles/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/team-roles/page.tsx
new file mode 100644
index 000000000..ca2108975
--- /dev/null
+++ b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/team-roles/page.tsx
@@ -0,0 +1,10 @@
+import { RolesManager } from "@/components/settings/roles-manager";
+
+export default async function Page({
+	params,
+}: {
+	params: Promise<{ search_space_id: string }>;
+}) {
+	const { search_space_id } = await params;
+	return <RolesManager searchSpaceId={Number(search_space_id)} />;
+}
diff --git a/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/vision-models/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/vision-models/page.tsx
new file mode 100644
index 000000000..8b8a2dc6d
--- /dev/null
+++ b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/vision-models/page.tsx
@@ -0,0 +1,10 @@
+import { VisionModelManager } from "@/components/settings/vision-model-manager";
+
+export default async function Page({
+	params,
+}: {
+	params: Promise<{ search_space_id: string }>;
+}) {
+	const { search_space_id } = await params;
+	return <VisionModelManager searchSpaceId={Number(search_space_id)} />;
+}
diff --git a/surfsense_web/app/dashboard/[search_space_id]/team/team-content.tsx b/surfsense_web/app/dashboard/[search_space_id]/team/team-content.tsx
index cc83148a3..fadd617a5 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/team/team-content.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/team/team-content.tsx
@@ -545,7 +545,7 @@ function MemberRow({
 							<DropdownMenuSeparator className="dark:bg-white/5" />
 							<DropdownMenuItem
 								onClick={() =>
-									router.push(`/dashboard/${searchSpaceId}/search-space-settings?tab=team-roles`)
+									router.push(`/dashboard/${searchSpaceId}/search-space-settings/team-roles`)
 								}
 							>
 								Manage Roles
diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/agent-permissions/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/agent-permissions/page.tsx
new file mode 100644
index 000000000..2b925bd29
--- /dev/null
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/agent-permissions/page.tsx
@@ -0,0 +1,5 @@
+import { AgentPermissionsContent } from "../components/AgentPermissionsContent";
+
+export default function Page() {
+	return <AgentPermissionsContent />;
+}
diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/agent-status/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/agent-status/page.tsx
new file mode 100644
index 000000000..dc5c61d2a
--- /dev/null
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/agent-status/page.tsx
@@ -0,0 +1,5 @@
+import { AgentStatusContent } from "../components/AgentStatusContent";
+
+export default function Page() {
+	return <AgentStatusContent />;
+}
diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/api-key/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/api-key/page.tsx
new file mode 100644
index 000000000..e59e50042
--- /dev/null
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/api-key/page.tsx
@@ -0,0 +1,5 @@
+import { ApiKeyContent } from "../components/ApiKeyContent";
+
+export default function Page() {
+	return <ApiKeyContent />;
+}
diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/community-prompts/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/community-prompts/page.tsx
new file mode 100644
index 000000000..e962cbed2
--- /dev/null
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/community-prompts/page.tsx
@@ -0,0 +1,5 @@
+import { CommunityPromptsContent } from "../components/CommunityPromptsContent";
+
+export default function Page() {
+	return <CommunityPromptsContent />;
+}
diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/DesktopShortcutsContent.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/HotkeysContent.tsx
similarity index 99%
rename from surfsense_web/app/dashboard/[search_space_id]/user-settings/components/DesktopShortcutsContent.tsx
rename to surfsense_web/app/dashboard/[search_space_id]/user-settings/components/HotkeysContent.tsx
index 3abe46f6c..4f08eef3f 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/DesktopShortcutsContent.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/HotkeysContent.tsx
@@ -122,7 +122,7 @@ function HotkeyRow({
 	);
 }
 
-export function DesktopShortcutsContent() {
+export function HotkeysContent() {
 	const api = useElectronAPI();
 	const [shortcuts, setShortcuts] = useState(DEFAULT_SHORTCUTS);
 	const [shortcutsLoaded, setShortcutsLoaded] = useState(false);
diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/desktop/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/desktop/page.tsx
new file mode 100644
index 000000000..a7b0d1d27
--- /dev/null
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/desktop/page.tsx
@@ -0,0 +1,5 @@
+import { DesktopContent } from "../components/DesktopContent";
+
+export default function Page() {
+	return <DesktopContent />;
+}
diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/hotkeys/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/hotkeys/page.tsx
new file mode 100644
index 000000000..8f776f738
--- /dev/null
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/hotkeys/page.tsx
@@ -0,0 +1,5 @@
+import { HotkeysContent } from "../components/HotkeysContent";
+
+export default function Page() {
+	return <HotkeysContent />;
+}
diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/layout-shell.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/layout-shell.tsx
new file mode 100644
index 000000000..e241dbf59
--- /dev/null
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/layout-shell.tsx
@@ -0,0 +1,191 @@
+"use client";
+
+import {
+	Brain,
+	CircleUser,
+	Globe,
+	Keyboard,
+	KeyRound,
+	Monitor,
+	ReceiptText,
+	ShieldCheck,
+	Sparkles,
+	Workflow,
+} from "lucide-react";
+import Link from "next/link";
+import { useSelectedLayoutSegment } from "next/navigation";
+import { useTranslations } from "next-intl";
+import type React from "react";
+import { useCallback, useMemo, useState } from "react";
+import { Separator } from "@/components/ui/separator";
+import { usePlatform } from "@/hooks/use-platform";
+import { cn } from "@/lib/utils";
+
+export type UserSettingsTab =
+	| "profile"
+	| "api-key"
+	| "prompts"
+	| "community-prompts"
+	| "memory"
+	| "agent-permissions"
+	| "agent-status"
+	| "purchases"
+	| "desktop"
+	| "hotkeys";
+
+const DEFAULT_TAB: UserSettingsTab = "profile";
+
+interface UserSettingsLayoutShellProps {
+	searchSpaceId: string;
+	children: React.ReactNode;
+}
+
+export function UserSettingsLayoutShell({
+	searchSpaceId,
+	children,
+}: UserSettingsLayoutShellProps) {
+	const t = useTranslations("userSettings");
+	const { isDesktop } = usePlatform();
+	const segment = useSelectedLayoutSegment();
+	const [tabScrollPos, setTabScrollPos] = useState<"start" | "middle" | "end">("start");
+
+	const handleTabScroll = useCallback((e: React.UIEvent<HTMLDivElement>) => {
+		const el = e.currentTarget;
+		const atStart = el.scrollLeft <= 2;
+		const atEnd = el.scrollWidth - el.scrollLeft - el.clientWidth <= 2;
+		setTabScrollPos(atStart ? "start" : atEnd ? "end" : "middle");
+	}, []);
+
+	const navItems = useMemo(
+		() => [
+			{
+				value: "profile" as const,
+				label: t("profile_nav_label"),
+				icon: <CircleUser className="h-4 w-4" />,
+			},
+			{
+				value: "api-key" as const,
+				label: t("api_key_nav_label"),
+				icon: <KeyRound className="h-4 w-4" />,
+			},
+			{
+				value: "prompts" as const,
+				label: "My Prompts",
+				icon: <Sparkles className="h-4 w-4" />,
+			},
+			{
+				value: "community-prompts" as const,
+				label: "Community Prompts",
+				icon: <Globe className="h-4 w-4" />,
+			},
+			{
+				value: "memory" as const,
+				label: "Memory",
+				icon: <Brain className="h-4 w-4" />,
+			},
+			{
+				value: "agent-permissions" as const,
+				label: "Agent Permissions",
+				icon: <ShieldCheck className="h-4 w-4" />,
+			},
+			{
+				value: "agent-status" as const,
+				label: "Agent Status",
+				icon: <Workflow className="h-4 w-4" />,
+			},
+			{
+				value: "purchases" as const,
+				label: "Purchase History",
+				icon: <ReceiptText className="h-4 w-4" />,
+			},
+			...(isDesktop
+				? [
+						{
+							value: "desktop" as const,
+							label: "App Preferences",
+							icon: <Monitor className="h-4 w-4" />,
+						},
+						{
+							value: "hotkeys" as const,
+							label: "Hotkeys",
+							icon: <Keyboard className="h-4 w-4" />,
+						},
+					]
+				: []),
+		],
+		[t, isDesktop]
+	);
+
+	const activeTab: UserSettingsTab =
+		segment && navItems.some((item) => item.value === segment)
+			? (segment as UserSettingsTab)
+			: DEFAULT_TAB;
+	const selectedLabel = navItems.find((item) => item.value === activeTab)?.label ?? t("title");
+
+	const hrefFor = (tab: UserSettingsTab) => `/dashboard/${searchSpaceId}/user-settings/${tab}`;
+
+	return (
+		<section className="flex h-full min-h-[min(680px,calc(100vh-5rem))] w-full select-none flex-col gap-6 md:pt-10 md:flex-row">
+			<div className="md:w-[220px] md:shrink-0">
+				<h1 className="mb-4 px-1 text-2xl font-semibold tracking-tight">{t("title")}</h1>
+				<nav className="hidden flex-col gap-0.5 md:flex">
+					{navItems.map((item) => (
+						<Link
+							key={item.value}
+							href={hrefFor(item.value)}
+							replace
+							scroll={false}
+							prefetch
+							className={cn(
+								"inline-flex h-auto items-center justify-start gap-3 rounded-md px-3 py-2.5 text-left text-sm font-medium transition-colors duration-150 focus:outline-none focus-visible:outline-none",
+								activeTab === item.value
+									? "bg-accent text-accent-foreground"
+									: "bg-transparent text-muted-foreground hover:bg-accent hover:text-accent-foreground"
+							)}
+						>
+							{item.icon}
+							{item.label}
+						</Link>
+					))}
+				</nav>
+				<div
+					className="overflow-x-auto border-b border-border pb-3 md:hidden"
+					onScroll={handleTabScroll}
+					style={{
+						maskImage: `linear-gradient(to right, ${tabScrollPos === "start" ? "black" : "transparent"}, black 24px, black calc(100% - 24px), ${tabScrollPos === "end" ? "black" : "transparent"})`,
+						WebkitMaskImage: `linear-gradient(to right, ${tabScrollPos === "start" ? "black" : "transparent"}, black 24px, black calc(100% - 24px), ${tabScrollPos === "end" ? "black" : "transparent"})`,
+					}}
+				>
+					<div className="flex gap-1">
+						{navItems.map((item) => (
+							<Link
+								key={item.value}
+								href={hrefFor(item.value)}
+								replace
+								scroll={false}
+								prefetch
+								className={cn(
+									"inline-flex h-auto shrink-0 items-center gap-2 rounded-md px-3 py-1.5 text-xs font-medium transition-colors duration-150 focus:outline-none focus-visible:outline-none",
+									activeTab === item.value
+										? "bg-accent text-accent-foreground"
+										: "bg-transparent text-muted-foreground hover:bg-accent hover:text-accent-foreground"
+								)}
+							>
+								{item.icon}
+								{item.label}
+							</Link>
+						))}
+					</div>
+				</div>
+			</div>
+
+			<div className="min-w-0 flex-1">
+				<div className="hidden md:block">
+					<h2 className="text-lg font-semibold">{selectedLabel}</h2>
+					<Separator className="mt-4 bg-border" />
+				</div>
+				<div className="min-w-0 pt-4 md:max-w-3xl">{children}</div>
+			</div>
+		</section>
+	);
+}
diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/layout.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/layout.tsx
new file mode 100644
index 000000000..e1f97a903
--- /dev/null
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/layout.tsx
@@ -0,0 +1,17 @@
+import type React from "react";
+import { use } from "react";
+import { UserSettingsLayoutShell } from "./layout-shell";
+
+export default function UserSettingsLayout({
+	params,
+	children,
+}: {
+	params: Promise<{ search_space_id: string }>;
+	children: React.ReactNode;
+}) {
+	const { search_space_id } = use(params);
+
+	return (
+		<UserSettingsLayoutShell searchSpaceId={search_space_id}>{children}</UserSettingsLayoutShell>
+	);
+}
diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/memory/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/memory/page.tsx
new file mode 100644
index 000000000..b10c5bce5
--- /dev/null
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/memory/page.tsx
@@ -0,0 +1,5 @@
+import { MemoryContent } from "../components/MemoryContent";
+
+export default function Page() {
+	return <MemoryContent />;
+}
diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/page.tsx
index 48a5e7cde..dde643142 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/user-settings/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/page.tsx
@@ -1,36 +1,10 @@
-import { UserSettingsPanel, type UserSettingsTab } from "@/components/settings/user-settings-panel";
-
-const USER_SETTINGS_TABS = new Set<string>([
-	"profile",
-	"api-key",
-	"prompts",
-	"community-prompts",
-	"memory",
-	"agent-permissions",
-	"agent-status",
-	"purchases",
-	"desktop",
-	"desktop-shortcuts",
-]);
-
-function getInitialTab(tab: string | string[] | undefined): UserSettingsTab {
-	const value = Array.isArray(tab) ? tab[0] : tab;
-	return value && USER_SETTINGS_TABS.has(value) ? (value as UserSettingsTab) : "profile";
-}
+import { redirect } from "next/navigation";
 
 export default async function UserSettingsPage({
 	params,
-	searchParams,
 }: {
 	params: Promise<{ search_space_id: string }>;
-	searchParams: Promise<{ tab?: string | string[] }>;
 }) {
-	const [{ search_space_id }, resolvedSearchParams] = await Promise.all([params, searchParams]);
-
-	return (
-		<UserSettingsPanel
-			searchSpaceId={search_space_id}
-			initialTab={getInitialTab(resolvedSearchParams.tab)}
-		/>
-	);
+	const { search_space_id } = await params;
+	redirect(`/dashboard/${search_space_id}/user-settings/profile`);
 }
diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/profile/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/profile/page.tsx
new file mode 100644
index 000000000..9275ed26c
--- /dev/null
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/profile/page.tsx
@@ -0,0 +1,5 @@
+import { ProfileContent } from "../components/ProfileContent";
+
+export default function Page() {
+	return <ProfileContent />;
+}
diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/prompts/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/prompts/page.tsx
new file mode 100644
index 000000000..559ce0a95
--- /dev/null
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/prompts/page.tsx
@@ -0,0 +1,5 @@
+import { PromptsContent } from "../components/PromptsContent";
+
+export default function Page() {
+	return <PromptsContent />;
+}
diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/purchases/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/purchases/page.tsx
new file mode 100644
index 000000000..3fa08c278
--- /dev/null
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/purchases/page.tsx
@@ -0,0 +1,5 @@
+import { PurchaseHistoryContent } from "../components/PurchaseHistoryContent";
+
+export default function Page() {
+	return <PurchaseHistoryContent />;
+}
diff --git a/surfsense_web/components/assistant-ui/connector-popup.tsx b/surfsense_web/components/assistant-ui/connector-popup.tsx
index 9150fb35f..6699a5567 100644
--- a/surfsense_web/components/assistant-ui/connector-popup.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup.tsx
@@ -396,7 +396,7 @@ export const ConnectorIndicator = forwardRef<ConnectorIndicatorHandle, Connector
 															onClick={() => {
 																handleOpenChange(false);
 																router.push(
-																	`/dashboard/${searchSpaceId}/search-space-settings?tab=models`
+																	`/dashboard/${searchSpaceId}/search-space-settings/models`
 																);
 															}}
 														>
diff --git a/surfsense_web/components/assistant-ui/document-upload-popup.tsx b/surfsense_web/components/assistant-ui/document-upload-popup.tsx
index 0067e25b6..88e99e67f 100644
--- a/surfsense_web/components/assistant-ui/document-upload-popup.tsx
+++ b/surfsense_web/components/assistant-ui/document-upload-popup.tsx
@@ -162,7 +162,7 @@ const DocumentUploadPopupContent: FC<{
 											variant="outline"
 											onClick={() => {
 												onOpenChange(false);
-												router.push(`/dashboard/${searchSpaceId}/search-space-settings?tab=models`);
+												router.push(`/dashboard/${searchSpaceId}/search-space-settings/models`);
 											}}
 										>
 											<Settings className="mr-2 h-4 w-4" />
diff --git a/surfsense_web/components/layout/providers/LayoutDataProvider.tsx b/surfsense_web/components/layout/providers/LayoutDataProvider.tsx
index d46895a0a..5d1f2566b 100644
--- a/surfsense_web/components/layout/providers/LayoutDataProvider.tsx
+++ b/surfsense_web/components/layout/providers/LayoutDataProvider.tsx
@@ -659,8 +659,8 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 
 	// Detect if we're on the chat page (needs overflow-hidden for chat's own scroll)
 	const isChatPage = pathname?.includes("/new-chat") ?? false;
-	const isUserSettingsPage = pathname?.endsWith("/user-settings") === true;
-	const isSearchSpaceSettingsPage = pathname?.endsWith("/search-space-settings") === true;
+	const isUserSettingsPage = pathname?.includes("/user-settings") === true;
+	const isSearchSpaceSettingsPage = pathname?.includes("/search-space-settings") === true;
 	const useWorkspacePanel =
 		pathname?.endsWith("/buy-more") === true ||
 		pathname?.endsWith("/more-pages") === true ||
diff --git a/surfsense_web/components/new-chat/chat-share-button.tsx b/surfsense_web/components/new-chat/chat-share-button.tsx
index 3b4ff0654..101f73ade 100644
--- a/surfsense_web/components/new-chat/chat-share-button.tsx
+++ b/surfsense_web/components/new-chat/chat-share-button.tsx
@@ -149,7 +149,7 @@ export function ChatShareButton({ thread, onVisibilityChange, className }: ChatS
 							size="icon"
 							onClick={() =>
 								router.push(
-									`/dashboard/${thread.search_space_id}/search-space-settings?tab=public-links`
+									`/dashboard/${thread.search_space_id}/search-space-settings/public-links`
 								)
 							}
 							className="size-8 bg-muted/50 hover:bg-accent hover:text-accent-foreground"
diff --git a/surfsense_web/components/new-chat/prompt-picker.tsx b/surfsense_web/components/new-chat/prompt-picker.tsx
index 7700dd0b2..593e7e04f 100644
--- a/surfsense_web/components/new-chat/prompt-picker.tsx
+++ b/surfsense_web/components/new-chat/prompt-picker.tsx
@@ -72,7 +72,7 @@ export const PromptPicker = forwardRef<PromptPickerRef, PromptPickerProps>(funct
 			if (index === createPromptIndex) {
 				onDone();
 				if (searchSpaceId) {
-					router.push(`/dashboard/${searchSpaceId}/user-settings?tab=prompts`);
+					router.push(`/dashboard/${searchSpaceId}/user-settings/prompts`);
 				}
 				return;
 			}
diff --git a/surfsense_web/components/settings/search-space-settings-panel.tsx b/surfsense_web/components/settings/search-space-settings-panel.tsx
deleted file mode 100644
index 248b2c585..000000000
--- a/surfsense_web/components/settings/search-space-settings-panel.tsx
+++ /dev/null
@@ -1,245 +0,0 @@
-"use client";
-
-import {
-	BookText,
-	Bot,
-	Brain,
-	CircleUser,
-	Earth,
-	ImageIcon,
-	ListChecks,
-	ScanEye,
-	UserKey,
-} from "lucide-react";
-import dynamic from "next/dynamic";
-import { useRouter } from "next/navigation";
-import { useTranslations } from "next-intl";
-import type React from "react";
-import { useCallback, useEffect, useMemo, useState } from "react";
-import { Button } from "@/components/ui/button";
-import { Separator } from "@/components/ui/separator";
-import { cn } from "@/lib/utils";
-
-const GeneralSettingsManager = dynamic(
-	() =>
-		import("@/components/settings/general-settings-manager").then((m) => ({
-			default: m.GeneralSettingsManager,
-		})),
-	{ ssr: false }
-);
-const AgentModelManager = dynamic(
-	() =>
-		import("@/components/settings/agent-model-manager").then((m) => ({
-			default: m.AgentModelManager,
-		})),
-	{ ssr: false }
-);
-const LLMRoleManager = dynamic(
-	() =>
-		import("@/components/settings/llm-role-manager").then((m) => ({ default: m.LLMRoleManager })),
-	{ ssr: false }
-);
-const ImageModelManager = dynamic(
-	() =>
-		import("@/components/settings/image-model-manager").then((m) => ({
-			default: m.ImageModelManager,
-		})),
-	{ ssr: false }
-);
-const VisionModelManager = dynamic(
-	() =>
-		import("@/components/settings/vision-model-manager").then((m) => ({
-			default: m.VisionModelManager,
-		})),
-	{ ssr: false }
-);
-const RolesManager = dynamic(
-	() => import("@/components/settings/roles-manager").then((m) => ({ default: m.RolesManager })),
-	{ ssr: false }
-);
-const PromptConfigManager = dynamic(
-	() =>
-		import("@/components/settings/prompt-config-manager").then((m) => ({
-			default: m.PromptConfigManager,
-		})),
-	{ ssr: false }
-);
-const PublicChatSnapshotsManager = dynamic(
-	() =>
-		import("@/components/public-chat-snapshots/public-chat-snapshots-manager").then((m) => ({
-			default: m.PublicChatSnapshotsManager,
-		})),
-	{ ssr: false }
-);
-const TeamMemoryManager = dynamic(
-	() =>
-		import("@/components/settings/team-memory-manager").then((m) => ({
-			default: m.TeamMemoryManager,
-		})),
-	{ ssr: false }
-);
-
-export type SearchSpaceSettingsTab =
-	| "general"
-	| "roles"
-	| "models"
-	| "image-models"
-	| "vision-models"
-	| "team-roles"
-	| "prompts"
-	| "team-memory"
-	| "public-links";
-
-interface SearchSpaceSettingsPanelProps {
-	searchSpaceId: string;
-	initialTab?: SearchSpaceSettingsTab;
-}
-
-export function SearchSpaceSettingsPanel({
-	searchSpaceId,
-	initialTab = "general",
-}: SearchSpaceSettingsPanelProps) {
-	const t = useTranslations("searchSpaceSettings");
-	const router = useRouter();
-	const numericSearchSpaceId = Number(searchSpaceId);
-	const [activeTab, setActiveTab] = useState<SearchSpaceSettingsTab>(initialTab);
-	const [tabScrollPos, setTabScrollPos] = useState<"start" | "middle" | "end">("start");
-
-	useEffect(() => {
-		setActiveTab(initialTab);
-	}, [initialTab]);
-
-	const handleTabScroll = useCallback((e: React.UIEvent<HTMLDivElement>) => {
-		const el = e.currentTarget;
-		const atStart = el.scrollLeft <= 2;
-		const atEnd = el.scrollWidth - el.scrollLeft - el.clientWidth <= 2;
-		setTabScrollPos(atStart ? "start" : atEnd ? "end" : "middle");
-	}, []);
-
-	const navItems = useMemo(
-		() => [
-			{ value: "general", label: t("nav_general"), icon: <CircleUser className="h-4 w-4" /> },
-			{ value: "roles", label: t("nav_role_assignments"), icon: <ListChecks className="h-4 w-4" /> },
-			{ value: "models", label: t("nav_agent_models"), icon: <Bot className="h-4 w-4" /> },
-			{
-				value: "image-models",
-				label: t("nav_image_models"),
-				icon: <ImageIcon className="h-4 w-4" />,
-			},
-			{
-				value: "vision-models",
-				label: t("nav_vision_models"),
-				icon: <ScanEye className="h-4 w-4" />,
-			},
-			{ value: "team-roles", label: t("nav_team_roles"), icon: <UserKey className="h-4 w-4" /> },
-			{
-				value: "prompts",
-				label: t("nav_system_instructions"),
-				icon: <BookText className="h-4 w-4" />,
-			},
-			{
-				value: "team-memory",
-				label: "Team Memory",
-				icon: <Brain className="h-4 w-4" />,
-			},
-			{ value: "public-links", label: t("nav_public_links"), icon: <Earth className="h-4 w-4" /> },
-		],
-		[t]
-	);
-
-	const selectedTab = navItems.some((item) => item.value === activeTab) ? activeTab : "general";
-	const selectedLabel = navItems.find((item) => item.value === selectedTab)?.label ?? t("title");
-
-	const handleItemChange = (tab: SearchSpaceSettingsTab) => {
-		setActiveTab(tab);
-		const suffix = tab === "general" ? "" : `?tab=${tab}`;
-		router.replace(`/dashboard/${searchSpaceId}/search-space-settings${suffix}`, { scroll: false });
-	};
-
-	return (
-		<section className="flex h-full min-h-[min(680px,calc(100vh-5rem))] w-full select-none flex-col gap-6 md:pt-6 md:flex-row">
-			<div className="md:w-[220px] md:shrink-0">
-				<h1 className="mb-4 px-1 text-2xl font-semibold tracking-tight">{t("title")}</h1>
-				<nav className="hidden flex-col gap-0.5 md:flex">
-					{navItems.map((item) => (
-						<Button
-							key={item.value}
-							type="button"
-							variant="ghost"
-							onClick={() => handleItemChange(item.value as SearchSpaceSettingsTab)}
-							className={cn(
-								"h-auto justify-start gap-3 px-3 py-2.5 text-left text-sm font-medium transition-colors duration-150 focus:outline-none focus-visible:outline-none",
-								selectedTab === item.value
-									? "bg-accent text-accent-foreground"
-									: "bg-transparent text-muted-foreground hover:bg-accent hover:text-accent-foreground"
-							)}
-						>
-							{item.icon}
-							{item.label}
-						</Button>
-					))}
-				</nav>
-				<div
-					className="overflow-x-auto border-b border-border pb-3 md:hidden"
-					onScroll={handleTabScroll}
-					style={{
-						maskImage: `linear-gradient(to right, ${tabScrollPos === "start" ? "black" : "transparent"}, black 24px, black calc(100% - 24px), ${tabScrollPos === "end" ? "black" : "transparent"})`,
-						WebkitMaskImage: `linear-gradient(to right, ${tabScrollPos === "start" ? "black" : "transparent"}, black 24px, black calc(100% - 24px), ${tabScrollPos === "end" ? "black" : "transparent"})`,
-					}}
-				>
-					<div className="flex gap-1">
-						{navItems.map((item) => (
-							<Button
-								key={item.value}
-								type="button"
-								variant="ghost"
-								onClick={() => handleItemChange(item.value as SearchSpaceSettingsTab)}
-								className={cn(
-									"h-auto shrink-0 gap-2 px-3 py-1.5 text-xs font-medium transition-colors duration-150 focus:outline-none focus-visible:outline-none",
-									selectedTab === item.value
-										? "bg-accent text-accent-foreground"
-										: "bg-transparent text-muted-foreground hover:bg-accent hover:text-accent-foreground"
-								)}
-							>
-								{item.icon}
-								{item.label}
-							</Button>
-						))}
-					</div>
-				</div>
-			</div>
-
-			<div className="min-w-0 flex-1">
-				<div className="hidden md:block">
-					<h2 className="text-lg font-semibold">{selectedLabel}</h2>
-					<Separator className="mt-4" />
-				</div>
-				<div className="min-w-0 pt-4 md:max-w-3xl">
-					{selectedTab === "general" && (
-						<GeneralSettingsManager searchSpaceId={numericSearchSpaceId} />
-					)}
-					{selectedTab === "models" && <AgentModelManager searchSpaceId={numericSearchSpaceId} />}
-					{selectedTab === "roles" && (
-						<LLMRoleManager key={searchSpaceId} searchSpaceId={numericSearchSpaceId} />
-					)}
-					{selectedTab === "image-models" && (
-						<ImageModelManager searchSpaceId={numericSearchSpaceId} />
-					)}
-					{selectedTab === "vision-models" && (
-						<VisionModelManager searchSpaceId={numericSearchSpaceId} />
-					)}
-					{selectedTab === "team-roles" && <RolesManager searchSpaceId={numericSearchSpaceId} />}
-					{selectedTab === "prompts" && (
-						<PromptConfigManager searchSpaceId={numericSearchSpaceId} />
-					)}
-					{selectedTab === "team-memory" && (
-						<TeamMemoryManager searchSpaceId={numericSearchSpaceId} />
-					)}
-					{selectedTab === "public-links" && (
-						<PublicChatSnapshotsManager searchSpaceId={numericSearchSpaceId} />
-					)}
-				</div>
-			</div>
-		</section>
-	);
-}
diff --git a/surfsense_web/components/settings/user-settings-panel.tsx b/surfsense_web/components/settings/user-settings-panel.tsx
deleted file mode 100644
index b4924c16a..000000000
--- a/surfsense_web/components/settings/user-settings-panel.tsx
+++ /dev/null
@@ -1,271 +0,0 @@
-"use client";
-
-import {
-	Brain,
-	CircleUser,
-	Globe,
-	Keyboard,
-	KeyRound,
-	Monitor,
-	ReceiptText,
-	ShieldCheck,
-	Sparkles,
-	Workflow,
-} from "lucide-react";
-import dynamic from "next/dynamic";
-import { useRouter } from "next/navigation";
-import { useTranslations } from "next-intl";
-import { useCallback, useEffect, useMemo, useState } from "react";
-import { Button } from "@/components/ui/button";
-import { Separator } from "@/components/ui/separator";
-import { usePlatform } from "@/hooks/use-platform";
-import { cn } from "@/lib/utils";
-
-const ProfileContent = dynamic(
-	() =>
-		import("@/app/dashboard/[search_space_id]/user-settings/components/ProfileContent").then(
-			(m) => ({ default: m.ProfileContent })
-		),
-	{ ssr: false }
-);
-const ApiKeyContent = dynamic(
-	() =>
-		import("@/app/dashboard/[search_space_id]/user-settings/components/ApiKeyContent").then(
-			(m) => ({ default: m.ApiKeyContent })
-		),
-	{ ssr: false }
-);
-const PromptsContent = dynamic(
-	() =>
-		import("@/app/dashboard/[search_space_id]/user-settings/components/PromptsContent").then(
-			(m) => ({ default: m.PromptsContent })
-		),
-	{ ssr: false }
-);
-const CommunityPromptsContent = dynamic(
-	() =>
-		import(
-			"@/app/dashboard/[search_space_id]/user-settings/components/CommunityPromptsContent"
-		).then((m) => ({ default: m.CommunityPromptsContent })),
-	{ ssr: false }
-);
-const PurchaseHistoryContent = dynamic(
-	() =>
-		import(
-			"@/app/dashboard/[search_space_id]/user-settings/components/PurchaseHistoryContent"
-		).then((m) => ({ default: m.PurchaseHistoryContent })),
-	{ ssr: false }
-);
-const DesktopContent = dynamic(
-	() =>
-		import("@/app/dashboard/[search_space_id]/user-settings/components/DesktopContent").then(
-			(m) => ({ default: m.DesktopContent })
-		),
-	{ ssr: false }
-);
-const DesktopShortcutsContent = dynamic(
-	() =>
-		import(
-			"@/app/dashboard/[search_space_id]/user-settings/components/DesktopShortcutsContent"
-		).then((m) => ({ default: m.DesktopShortcutsContent })),
-	{ ssr: false }
-);
-const MemoryContent = dynamic(
-	() =>
-		import("@/app/dashboard/[search_space_id]/user-settings/components/MemoryContent").then(
-			(m) => ({ default: m.MemoryContent })
-		),
-	{ ssr: false }
-);
-const AgentPermissionsContent = dynamic(
-	() =>
-		import(
-			"@/app/dashboard/[search_space_id]/user-settings/components/AgentPermissionsContent"
-		).then((m) => ({ default: m.AgentPermissionsContent })),
-	{ ssr: false }
-);
-const AgentStatusContent = dynamic(
-	() =>
-		import("@/app/dashboard/[search_space_id]/user-settings/components/AgentStatusContent").then(
-			(m) => ({ default: m.AgentStatusContent })
-		),
-	{ ssr: false }
-);
-
-export type UserSettingsTab =
-	| "profile"
-	| "api-key"
-	| "prompts"
-	| "community-prompts"
-	| "memory"
-	| "agent-permissions"
-	| "agent-status"
-	| "purchases"
-	| "desktop"
-	| "desktop-shortcuts";
-
-interface UserSettingsPanelProps {
-	searchSpaceId: string;
-	initialTab?: UserSettingsTab;
-}
-
-export function UserSettingsPanel({
-	searchSpaceId,
-	initialTab = "profile",
-}: UserSettingsPanelProps) {
-	const t = useTranslations("userSettings");
-	const router = useRouter();
-	const { isDesktop } = usePlatform();
-	const [activeTab, setActiveTab] = useState<UserSettingsTab>(initialTab);
-	const [tabScrollPos, setTabScrollPos] = useState<"start" | "middle" | "end">("start");
-
-	useEffect(() => {
-		setActiveTab(initialTab);
-	}, [initialTab]);
-
-	const handleTabScroll = useCallback((e: React.UIEvent<HTMLDivElement>) => {
-		const el = e.currentTarget;
-		const atStart = el.scrollLeft <= 2;
-		const atEnd = el.scrollWidth - el.scrollLeft - el.clientWidth <= 2;
-		setTabScrollPos(atStart ? "start" : atEnd ? "end" : "middle");
-	}, []);
-
-	const navItems = useMemo(
-		() => [
-			{ value: "profile", label: t("profile_nav_label"), icon: <CircleUser className="h-4 w-4" /> },
-			{
-				value: "api-key",
-				label: t("api_key_nav_label"),
-				icon: <KeyRound className="h-4 w-4" />,
-			},
-			{
-				value: "prompts",
-				label: "My Prompts",
-				icon: <Sparkles className="h-4 w-4" />,
-			},
-			{
-				value: "community-prompts",
-				label: "Community Prompts",
-				icon: <Globe className="h-4 w-4" />,
-			},
-			{
-				value: "memory",
-				label: "Memory",
-				icon: <Brain className="h-4 w-4" />,
-			},
-			{
-				value: "agent-permissions",
-				label: "Agent Permissions",
-				icon: <ShieldCheck className="h-4 w-4" />,
-			},
-			{
-				value: "agent-status",
-				label: "Agent Status",
-				icon: <Workflow className="h-4 w-4" />,
-			},
-			{
-				value: "purchases",
-				label: "Purchase History",
-				icon: <ReceiptText className="h-4 w-4" />,
-			},
-			...(isDesktop
-				? [
-						{
-							value: "desktop" as const,
-							label: "App Preferences",
-							icon: <Monitor className="h-4 w-4" />,
-						},
-						{
-							value: "desktop-shortcuts" as const,
-							label: "Hotkeys",
-							icon: <Keyboard className="h-4 w-4" />,
-						},
-					]
-				: []),
-		],
-		[t, isDesktop]
-	);
-
-	const selectedTab = navItems.some((item) => item.value === activeTab) ? activeTab : "profile";
-	const selectedLabel = navItems.find((item) => item.value === selectedTab)?.label ?? t("title");
-
-	const handleItemChange = (tab: UserSettingsTab) => {
-		setActiveTab(tab);
-		const suffix = tab === "profile" ? "" : `?tab=${tab}`;
-		router.replace(`/dashboard/${searchSpaceId}/user-settings${suffix}`, { scroll: false });
-	};
-
-	return (
-		<section className="flex h-full min-h-[min(680px,calc(100vh-5rem))] w-full select-none flex-col gap-6 md:pt-10 md:flex-row">
-			<div className="md:w-[220px] md:shrink-0">
-				<h1 className="mb-4 px-1 text-2xl font-semibold tracking-tight">{t("title")}</h1>
-				<nav className="hidden flex-col gap-0.5 md:flex">
-					{navItems.map((item) => (
-						<Button
-							key={item.value}
-							type="button"
-							variant="ghost"
-							onClick={() => handleItemChange(item.value as UserSettingsTab)}
-							className={cn(
-								"h-auto justify-start gap-3 px-3 py-2.5 text-left text-sm font-medium transition-colors duration-150 focus:outline-none focus-visible:outline-none",
-								selectedTab === item.value
-									? "bg-accent text-accent-foreground"
-									: "bg-transparent text-muted-foreground hover:bg-accent hover:text-accent-foreground"
-							)}
-						>
-							{item.icon}
-							{item.label}
-						</Button>
-					))}
-				</nav>
-				<div
-					className="overflow-x-auto border-b border-border pb-3 md:hidden"
-					onScroll={handleTabScroll}
-					style={{
-						maskImage: `linear-gradient(to right, ${tabScrollPos === "start" ? "black" : "transparent"}, black 24px, black calc(100% - 24px), ${tabScrollPos === "end" ? "black" : "transparent"})`,
-						WebkitMaskImage: `linear-gradient(to right, ${tabScrollPos === "start" ? "black" : "transparent"}, black 24px, black calc(100% - 24px), ${tabScrollPos === "end" ? "black" : "transparent"})`,
-					}}
-				>
-					<div className="flex gap-1">
-						{navItems.map((item) => (
-							<Button
-								key={item.value}
-								type="button"
-								variant="ghost"
-								onClick={() => handleItemChange(item.value as UserSettingsTab)}
-								className={cn(
-									"h-auto shrink-0 gap-2 px-3 py-1.5 text-xs font-medium transition-colors duration-150 focus:outline-none focus-visible:outline-none",
-									selectedTab === item.value
-										? "bg-accent text-accent-foreground"
-										: "bg-transparent text-muted-foreground hover:bg-accent hover:text-accent-foreground"
-								)}
-							>
-								{item.icon}
-								{item.label}
-							</Button>
-						))}
-					</div>
-				</div>
-			</div>
-
-			<div className="min-w-0 flex-1">
-				<div className="hidden md:block">
-					<h2 className="text-lg font-semibold">{selectedLabel}</h2>
-					<Separator className="mt-4 bg-border" />
-				</div>
-				<div className="min-w-0 pt-4 md:max-w-3xl">
-					{selectedTab === "profile" && <ProfileContent />}
-					{selectedTab === "api-key" && <ApiKeyContent />}
-					{selectedTab === "prompts" && <PromptsContent />}
-					{selectedTab === "community-prompts" && <CommunityPromptsContent />}
-					{selectedTab === "memory" && <MemoryContent />}
-					{selectedTab === "agent-permissions" && <AgentPermissionsContent />}
-					{selectedTab === "agent-status" && <AgentStatusContent />}
-					{selectedTab === "purchases" && <PurchaseHistoryContent />}
-					{selectedTab === "desktop" && <DesktopContent />}
-					{selectedTab === "desktop-shortcuts" && <DesktopShortcutsContent />}
-				</div>
-			</div>
-		</section>
-	);
-}

From c8f0f7cb1b8aeb0fa67bdc1f9a31486eb4f0ab93 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Tue, 19 May 2026 01:41:09 +0530
Subject: [PATCH 82/96] refactor: update alert components to use warning
 variant and clean up unused alerts in settings manager

---
 .../components/obsidian-config.tsx            |  2 +-
 .../settings/general-settings-manager.tsx     | 22 ++++++++-----------
 .../settings/prompt-config-manager.tsx        | 14 +++++++-----
 surfsense_web/components/ui/alert.tsx         |  2 ++
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/obsidian-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/obsidian-config.tsx
index de7ea8230..d4f18cb3a 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/obsidian-config.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/obsidian-config.tsx
@@ -47,7 +47,7 @@ export const ObsidianConfig: FC<ConnectorConfigProps> = ({ connector }) => {
 const LegacyBanner: FC = () => {
 	return (
 		<div className="space-y-6">
-			<Alert>
+			<Alert variant="warning">
 				<AlertTriangle />
 				<AlertTitle>Sync stopped, install the plugin to migrate</AlertTitle>
 				<AlertDescription>
diff --git a/surfsense_web/components/settings/general-settings-manager.tsx b/surfsense_web/components/settings/general-settings-manager.tsx
index b01342cfc..44177e52d 100644
--- a/surfsense_web/components/settings/general-settings-manager.tsx
+++ b/surfsense_web/components/settings/general-settings-manager.tsx
@@ -2,12 +2,10 @@
 
 import { useQuery } from "@tanstack/react-query";
 import { useAtomValue } from "jotai";
-import { Info } from "lucide-react";
 import { useTranslations } from "next-intl";
 import { useCallback, useEffect, useState } from "react";
 import { toast } from "sonner";
 import { updateSearchSpaceMutationAtom } from "@/atoms/search-spaces/search-space-mutation.atoms";
-import { Alert, AlertDescription } from "@/components/ui/alert";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
@@ -41,6 +39,9 @@ export function GeneralSettingsManager({ searchSpaceId }: GeneralSettingsManager
 	const [description, setDescription] = useState("");
 	const [saving, setSaving] = useState(false);
 	const [isExporting, setIsExporting] = useState(false);
+	const hasSearchSpace = !!searchSpace;
+	const searchSpaceName = searchSpace?.name;
+	const searchSpaceDescription = searchSpace?.description;
 
 	const handleExportKB = useCallback(async () => {
 		if (isExporting) return;
@@ -74,11 +75,11 @@ export function GeneralSettingsManager({ searchSpaceId }: GeneralSettingsManager
 
 	// Initialize state from fetched search space
 	useEffect(() => {
-		if (searchSpace) {
-			setName(searchSpace.name || "");
-			setDescription(searchSpace.description || "");
+		if (hasSearchSpace) {
+			setName(searchSpaceName || "");
+			setDescription(searchSpaceDescription || "");
 		}
-	}, [searchSpace?.name, searchSpace?.description]);
+	}, [hasSearchSpace, searchSpaceName, searchSpaceDescription]);
 
 	// Derive hasChanges during render
 	const hasChanges =
@@ -98,9 +99,9 @@ export function GeneralSettingsManager({ searchSpaceId }: GeneralSettingsManager
 			});
 
 			await fetchSearchSpace();
-		} catch (error: any) {
+		} catch (error: unknown) {
 			console.error("Error saving search space details:", error);
-			toast.error(error.message || "Failed to save search space details");
+			toast.error(error instanceof Error ? error.message : "Failed to save search space details");
 		} finally {
 			setSaving(false);
 		}
@@ -135,11 +136,6 @@ export function GeneralSettingsManager({ searchSpaceId }: GeneralSettingsManager
 
 	return (
 		<div className="space-y-4 md:space-y-6">
-			<Alert>
-				<Info />
-				<AlertDescription>Update your search space name and description.</AlertDescription>
-			</Alert>
-
 			<form onSubmit={onSubmit} className="space-y-6">
 				<div className="flex flex-col gap-6">
 					<div className="space-y-2">
diff --git a/surfsense_web/components/settings/prompt-config-manager.tsx b/surfsense_web/components/settings/prompt-config-manager.tsx
index 04e20fe17..ac7da9547 100644
--- a/surfsense_web/components/settings/prompt-config-manager.tsx
+++ b/surfsense_web/components/settings/prompt-config-manager.tsx
@@ -32,13 +32,15 @@ export function PromptConfigManager({ searchSpaceId }: PromptConfigManagerProps)
 
 	const [customInstructions, setCustomInstructions] = useState("");
 	const [saving, setSaving] = useState(false);
+	const hasSearchSpace = !!searchSpace;
+	const searchSpaceInstructions = searchSpace?.qna_custom_instructions;
 
 	// Initialize state from fetched search space
 	useEffect(() => {
-		if (searchSpace) {
-			setCustomInstructions(searchSpace.qna_custom_instructions || "");
+		if (hasSearchSpace) {
+			setCustomInstructions(searchSpaceInstructions || "");
 		}
-	}, [searchSpace?.qna_custom_instructions]);
+	}, [hasSearchSpace, searchSpaceInstructions]);
 
 	// Derive hasChanges during render
 	const hasChanges =
@@ -69,9 +71,9 @@ export function PromptConfigManager({ searchSpaceId }: PromptConfigManagerProps)
 			toast.success("System instructions saved successfully");
 
 			await fetchSearchSpace();
-		} catch (error: any) {
+		} catch (error: unknown) {
 			console.error("Error saving system instructions:", error);
-			toast.error(error.message || "Failed to save system instructions");
+			toast.error(error instanceof Error ? error.message : "Failed to save system instructions");
 		} finally {
 			setSaving(false);
 		}
@@ -102,7 +104,7 @@ export function PromptConfigManager({ searchSpaceId }: PromptConfigManagerProps)
 	return (
 		<div className="space-y-4 md:space-y-6">
 			{/* Work in Progress Notice */}
-			<Alert>
+			<Alert variant="warning">
 				<AlertTriangle />
 				<AlertTitle>Work in Progress</AlertTitle>
 				<AlertDescription>
diff --git a/surfsense_web/components/ui/alert.tsx b/surfsense_web/components/ui/alert.tsx
index bf1c4e5c2..2d777db67 100644
--- a/surfsense_web/components/ui/alert.tsx
+++ b/surfsense_web/components/ui/alert.tsx
@@ -9,6 +9,8 @@ const alertVariants = cva(
 		variants: {
 			variant: {
 				default: "border-popover-border bg-accent text-accent-foreground",
+				warning:
+					"border-highlight/40 bg-highlight/10 text-foreground *:data-[slot=alert-description]:text-muted-foreground [&>svg]:text-highlight",
 				destructive:
 					"border-destructive/30 bg-destructive/10 text-destructive *:data-[slot=alert-description]:text-destructive/90 [&>svg]:text-current",
 			},

From 49e139529993fe393bd8825a7177885ca1944a8d Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Tue, 19 May 2026 11:11:14 +0530
Subject: [PATCH 83/96] refactor: enhance user settings components with updated
 icons, improved loading states, and consistent alert structures

---
 .../components/AgentPermissionsContent.tsx    | 204 ++++++++------
 .../components/AgentStatusContent.tsx         |  62 ++---
 .../components/ApiKeyContent.tsx              |   8 +-
 .../components/CommunityPromptsContent.tsx    | 137 +++++-----
 .../components/PromptsContent.tsx             | 255 ++++++++++--------
 .../user-settings/layout-shell.tsx            |   8 +-
 .../announcements/AnnouncementsDialog.tsx     |   2 +-
 .../components/new-chat/prompt-picker.tsx     |   4 +-
 .../public-chat-snapshot-row.tsx              |  64 +++--
 .../public-chat-snapshots-manager.tsx         |  36 ++-
 .../settings/agent-model-manager.tsx          | 126 ++++-----
 .../settings/image-model-manager.tsx          | 185 +++++++------
 .../components/settings/llm-role-manager.tsx  |  36 +--
 .../settings/prompt-config-manager.tsx        |  33 +--
 .../components/settings/roles-manager.tsx     |   8 +-
 .../settings/vision-model-manager.tsx         | 184 +++++++------
 16 files changed, 703 insertions(+), 649 deletions(-)

diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/AgentPermissionsContent.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/AgentPermissionsContent.tsx
index 6d8233515..0ef65d98b 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/AgentPermissionsContent.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/AgentPermissionsContent.tsx
@@ -2,7 +2,7 @@
 
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import { useAtomValue } from "jotai";
-import { AlertTriangle, Check, Plus, ShieldCheck, Trash2, X } from "lucide-react";
+import { AlertTriangle, Info, ShieldCheck, Trash2 } from "lucide-react";
 import { useCallback, useMemo, useState } from "react";
 import { toast } from "sonner";
 import { agentFlagsAtom } from "@/atoms/agent/agent-flags-query.atom";
@@ -20,8 +20,18 @@ import {
 } from "@/components/ui/alert-dialog";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
+import { Card, CardContent } from "@/components/ui/card";
+import {
+	Dialog,
+	DialogContent,
+	DialogDescription,
+	DialogFooter,
+	DialogHeader,
+	DialogTitle,
+} from "@/components/ui/dialog";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
+import { Skeleton } from "@/components/ui/skeleton";
 import {
 	Select,
 	SelectContent,
@@ -67,20 +77,29 @@ function permissionRulesQueryKey(searchSpaceId: number) {
 function ScopeBadge({ rule }: { rule: AgentPermissionRule }) {
 	if (rule.thread_id !== null) {
 		return (
-			<Badge variant="outline" className="text-[10px]">
+			<Badge
+				variant="secondary"
+				className="text-[10px] px-1.5 py-0.5 border-0 text-muted-foreground bg-muted"
+			>
 				Thread #{rule.thread_id}
 			</Badge>
 		);
 	}
 	if (rule.user_id !== null) {
 		return (
-			<Badge variant="outline" className="text-[10px]">
+			<Badge
+				variant="secondary"
+				className="text-[10px] px-1.5 py-0.5 border-0 text-muted-foreground bg-muted"
+			>
 				User-specific
 			</Badge>
 		);
 	}
 	return (
-		<Badge variant="outline" className="text-[10px]">
+		<Badge
+			variant="secondary"
+			className="text-[10px] px-1.5 py-0.5 border-0 text-muted-foreground bg-muted"
+		>
 			Search space
 		</Badge>
 	);
@@ -170,8 +189,8 @@ export function AgentPermissionsContent() {
 				permission: formData.permission.trim(),
 				pattern: formData.pattern.trim() || "*",
 			});
-			setShowForm(false);
 			setFormData(EMPTY_FORM);
+			setShowForm(false);
 		} catch (err) {
 			if (err instanceof AppError && err.message) {
 				// already toasted by onError
@@ -190,13 +209,15 @@ export function AgentPermissionsContent() {
 
 	if (!featureEnabled) {
 		return (
-			<Alert className="border-dashed">
-				<ShieldCheck className="size-4" />
+			<Alert>
+				<Info />
 				<AlertTitle>Permission middleware is disabled</AlertTitle>
 				<AlertDescription>
-					Flip{" "}
-					<code className="rounded bg-muted px-1 text-[10px]">SURFSENSE_ENABLE_PERMISSION</code> on
-					the backend to manage allow/deny/ask rules from this panel.
+					<p>
+						Flip{" "}
+						<code className="rounded bg-popover px-1 py-0.5 text-[10px] text-popover-foreground">SURFSENSE_ENABLE_PERMISSION</code> on
+						the backend to manage allow/deny/ask rules from this panel.
+					</p>
 				</AlertDescription>
 			</Alert>
 		);
@@ -208,28 +229,8 @@ export function AgentPermissionsContent() {
 		);
 	}
 
-	if (isLoading) {
-		return (
-			<div className="flex items-center justify-center py-12">
-				<Spinner className="size-6" />
-			</div>
-		);
-	}
-
-	if (isError) {
-		return (
-			<Alert variant="destructive">
-				<AlertTriangle />
-				<AlertTitle>Failed to load rules</AlertTitle>
-				<AlertDescription>
-					{error instanceof Error ? error.message : "Unknown error."}
-				</AlertDescription>
-			</Alert>
-		);
-	}
-
 	return (
-		<div className="min-w-0 space-y-6 overflow-hidden">
+		<div className="min-w-0 space-y-6 overflow-visible">
 			<div className="flex items-start justify-between gap-3">
 				<div className="space-y-1">
 					<p className="text-sm text-muted-foreground">
@@ -237,27 +238,36 @@ export function AgentPermissionsContent() {
 						patterns and are evaluated at the most specific scope first.
 					</p>
 				</div>
-				{!showForm && (
-					<Button
-						size="sm"
-						onClick={() => {
-							setShowForm(true);
-							setFormData(EMPTY_FORM);
-						}}
-						className="shrink-0 gap-1.5"
-					>
-						<Plus className="size-3.5" />
-						New rule
-					</Button>
-				)}
+				<Button
+					size="sm"
+					onClick={() => {
+						setShowForm(true);
+						setFormData(EMPTY_FORM);
+					}}
+					className="shrink-0 gap-1.5"
+				>
+					New rule
+				</Button>
 			</div>
 
-			{showForm && (
-				<div className="rounded-lg border border-border/60 bg-card p-6">
-					<div className="space-y-4">
-						<h3 className="text-sm font-semibold tracking-tight">New permission rule</h3>
+			<Dialog
+				open={showForm}
+				onOpenChange={(open) => {
+					setShowForm(open);
+					if (!open) setFormData(EMPTY_FORM);
+				}}
+			>
+				<DialogContent className="max-w-lg bg-popover text-popover-foreground">
+					<DialogHeader>
+						<DialogTitle>New permission rule</DialogTitle>
+						<DialogDescription>
+							Tell the agent whether matching tool calls should be allowed, denied, or paused for
+							approval.
+						</DialogDescription>
+					</DialogHeader>
 
-						<div className="grid grid-cols-2 gap-3">
+					<div className="space-y-4">
+						<div className="grid gap-3">
 							<div className="space-y-2">
 								<Label htmlFor="permission-name">Permission</Label>
 								<Input
@@ -306,34 +316,60 @@ export function AgentPermissionsContent() {
 								{ACTION_DESCRIPTIONS[formData.action]}
 							</p>
 						</div>
-
-						<div className="flex items-center justify-end gap-2 pt-2">
-							<Button
-								variant="ghost"
-								size="sm"
-								onClick={() => {
-									setShowForm(false);
-									setFormData(EMPTY_FORM);
-								}}
-								disabled={createMutation.isPending}
-							>
-								Cancel
-							</Button>
-							<Button
-								size="sm"
-								onClick={handleCreate}
-								disabled={createMutation.isPending || !formData.permission.trim()}
-								className="relative"
-							>
-								<span className={createMutation.isPending ? "opacity-0" : ""}>Create</span>
-								{createMutation.isPending && <Spinner className="absolute size-3.5" />}
-							</Button>
-						</div>
 					</div>
+
+					<DialogFooter>
+						<Button
+							type="button"
+							variant="secondary"
+							size="sm"
+							onClick={() => {
+								setShowForm(false);
+								setFormData(EMPTY_FORM);
+							}}
+							disabled={createMutation.isPending}
+							className="text-sm h-9"
+						>
+							Cancel
+						</Button>
+						<Button
+							size="sm"
+							onClick={handleCreate}
+							disabled={createMutation.isPending || !formData.permission.trim()}
+							className="relative text-sm h-9 min-w-[96px]"
+						>
+							<span className={createMutation.isPending ? "opacity-0" : ""}>Create</span>
+							{createMutation.isPending && <Spinner size="sm" className="absolute" />}
+						</Button>
+					</DialogFooter>
+				</DialogContent>
+			</Dialog>
+
+			{isLoading && (
+				<div className="-m-1 space-y-2 p-1">
+					{["skeleton-a", "skeleton-b", "skeleton-c"].map((key) => (
+						<Card key={key} className="border-accent bg-accent/20">
+							<CardContent className="p-4 flex flex-col gap-3 min-h-24">
+								<Skeleton className="h-4 w-32 md:w-40 bg-accent" />
+								<Skeleton className="h-3 w-full bg-accent" />
+								<Skeleton className="h-3 w-24 md:w-28 bg-accent mt-auto" />
+							</CardContent>
+						</Card>
+					))}
 				</div>
 			)}
 
-			{sortedRules.length === 0 && !showForm && (
+			{isError && (
+				<Alert variant="destructive">
+					<AlertTriangle />
+					<AlertTitle>Failed to load rules</AlertTitle>
+					<AlertDescription>
+						{error instanceof Error ? error.message : "Unknown error."}
+					</AlertDescription>
+				</Alert>
+			)}
+
+			{!isLoading && !isError && sortedRules.length === 0 && !showForm && (
 				<div className="rounded-lg border border-dashed border-border/60 p-8 text-center">
 					<ShieldCheck className="mx-auto size-8 text-muted-foreground/40" />
 					<p className="mt-2 text-sm text-muted-foreground">No rules yet</p>
@@ -343,8 +379,8 @@ export function AgentPermissionsContent() {
 				</div>
 			)}
 
-			{sortedRules.length > 0 && (
-				<div className="space-y-2">
+			{!isLoading && !isError && sortedRules.length > 0 && (
+				<div className="-m-1 space-y-2 p-1">
 					{sortedRules.map((rule) => {
 						const badge = ACTION_BADGE[rule.action];
 						const isUpdating =
@@ -352,14 +388,14 @@ export function AgentPermissionsContent() {
 						const isDeleting = deleteMutation.isPending && deleteMutation.variables === rule.id;
 
 						return (
-							<div
+							<Card
 								key={rule.id}
-								className="group flex flex-col gap-3 rounded-lg border border-border/60 bg-card p-4"
+								className="group relative overflow-hidden transition-all duration-200 border-accent bg-accent/20 hover:shadow-md h-full"
 							>
-								<div className="flex items-start justify-between gap-3">
+								<CardContent className="p-4 flex items-center justify-between gap-3 h-full">
 									<div className="flex min-w-0 flex-1 flex-col gap-1.5">
 										<div className="flex flex-wrap items-center gap-1.5">
-											<code className="truncate rounded bg-muted px-1.5 py-0.5 font-mono text-xs">
+											<code className="truncate font-mono text-sm font-medium text-foreground">
 												{rule.permission}
 											</code>
 											{rule.pattern !== "*" && (
@@ -374,7 +410,7 @@ export function AgentPermissionsContent() {
 										</p>
 									</div>
 
-									<div className="flex shrink-0 items-center gap-1">
+									<div className="flex shrink-0 items-center self-center gap-1">
 										<Select
 											value={rule.action}
 											onValueChange={(value) =>
@@ -390,8 +426,6 @@ export function AgentPermissionsContent() {
 											>
 												<SelectValue>
 													<span className="flex items-center gap-1">
-														{rule.action === "allow" && <Check className="size-3" />}
-														{rule.action === "deny" && <X className="size-3" />}
 														{badge.label}
 													</span>
 												</SelectValue>
@@ -406,7 +440,7 @@ export function AgentPermissionsContent() {
 										<Button
 											size="sm"
 											variant="ghost"
-											className="size-8 p-0 text-muted-foreground hover:text-destructive"
+											className="h-7 w-7 rounded-lg p-0 text-muted-foreground hover:text-destructive"
 											onClick={() => setDeleteTarget(rule.id)}
 											disabled={isUpdating || isDeleting}
 											aria-label="Delete rule"
@@ -414,8 +448,8 @@ export function AgentPermissionsContent() {
 											<Trash2 className="size-3.5" />
 										</Button>
 									</div>
-								</div>
-							</div>
+								</CardContent>
+							</Card>
 						);
 					})}
 				</div>
diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/AgentStatusContent.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/AgentStatusContent.tsx
index 1fa957a6a..e32e1bfc6 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/AgentStatusContent.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/AgentStatusContent.tsx
@@ -1,12 +1,11 @@
 "use client";
 
 import { useAtomValue } from "jotai";
-import { CircleCheck, CircleSlash, Cog, RotateCcw } from "lucide-react";
-import { useMemo } from "react";
+import { AlertTriangle, CircleCheck, CircleSlash, Info } from "lucide-react";
+import { Fragment, useMemo } from "react";
 import { agentFlagsAtom } from "@/atoms/agent/agent-flags-query.atom";
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Badge } from "@/components/ui/badge";
-import { Button } from "@/components/ui/button";
 import { Separator } from "@/components/ui/separator";
 import { Skeleton } from "@/components/ui/skeleton";
 import type { AgentFeatureFlags } from "@/lib/apis/agent-flags-api.service";
@@ -223,7 +222,7 @@ function FlagRow({ def, value }: { def: FlagDef; value: boolean }) {
 }
 
 export function AgentStatusContent() {
-	const { data: flags, isLoading, isError, error, refetch } = useAtomValue(agentFlagsAtom);
+	const { data: flags, isLoading, isError, error } = useAtomValue(agentFlagsAtom);
 
 	const enabledCount = useMemo(() => {
 		if (!flags) return 0;
@@ -244,19 +243,10 @@ export function AgentStatusContent() {
 	if (isError || !flags) {
 		return (
 			<Alert variant="destructive">
+				<AlertTriangle />
 				<AlertTitle>Failed to load agent status</AlertTitle>
-				<AlertDescription className="flex items-center gap-2">
+				<AlertDescription>
 					{error instanceof Error ? error.message : "Unknown error."}
-					<Button
-						type="button"
-						variant="outline"
-						size="sm"
-						onClick={() => refetch()}
-						className="ml-auto h-auto gap-1 px-2 py-0.5 text-xs hover:bg-background"
-					>
-						<RotateCcw className="size-3" />
-						Retry
-					</Button>
 				</AlertDescription>
 			</Alert>
 		);
@@ -268,28 +258,36 @@ export function AgentStatusContent() {
 		<div className="space-y-6">
 			{masterOff ? (
 				<Alert variant="destructive">
-					<Cog className="size-4" />
+					<AlertTriangle />
 					<AlertTitle>Master kill-switch is on</AlertTitle>
 					<AlertDescription>
-						<code className="rounded bg-muted px-1 text-[10px]">
-							SURFSENSE_DISABLE_NEW_AGENT_STACK=true
-						</code>
-						forces every new middleware off, regardless of the individual flags below. Restart the
-						backend after changing it.
+						<p>
+							Showing that{" "}
+							<code className="rounded bg-muted px-1 text-[10px]">
+								SURFSENSE_DISABLE_NEW_AGENT_STACK=true
+							</code>
+							, which forces every new middleware off, regardless of the individual flags below.
+							Restart the backend after changing it.
+						</p>
 					</AlertDescription>
 				</Alert>
 			) : (
 				<Alert>
-					<Cog className="size-4" />
+					<Info />
 					<AlertTitle className="flex items-center gap-2">
 						Agent stack
-						<Badge variant="secondary" className="text-[10px]">
+						<Badge
+							variant="secondary"
+							className="rounded bg-popover px-1 py-0.5 text-[9px] text-popover-foreground"
+						>
 							{enabledCount} on
 						</Badge>
 					</AlertTitle>
 					<AlertDescription>
-						Read-only mirror of the backend's <code>AgentFeatureFlags</code>. Flip an env var and
-						restart the backend to change a value.
+						<p>
+							Showing a read-only mirror of the backend's <code>AgentFeatureFlags</code>. Flip an env
+							var and restart the backend to change a value.
+						</p>
 					</AlertDescription>
 				</Alert>
 			)}
@@ -298,9 +296,9 @@ export function AgentStatusContent() {
 				const allOff = group.flags.every((f) => !flags[f.key]);
 				return (
 					<div key={group.id}>
-						{groupIdx > 0 && <Separator className="my-4" />}
+						{groupIdx > 0 && <Separator className="my-4 bg-border" />}
 						<div className="rounded-lg border border-border/60 bg-card">
-							<div className="flex items-start justify-between gap-3 border-b px-4 py-3">
+							<div className="flex items-start justify-between gap-3 px-4 py-3">
 								<div>
 									<p className="text-sm font-semibold">{group.title}</p>
 									<p className="text-xs text-muted-foreground">{group.subtitle}</p>
@@ -311,9 +309,13 @@ export function AgentStatusContent() {
 									</Badge>
 								)}
 							</div>
-							<div className="divide-y divide-border/50 px-4">
-								{group.flags.map((def) => (
-									<FlagRow key={def.key} def={def} value={flags[def.key]} />
+							<Separator className="bg-border" />
+							<div className="px-4">
+								{group.flags.map((def, flagIdx) => (
+									<Fragment key={def.key}>
+										{flagIdx > 0 && <Separator className="bg-border" />}
+										<FlagRow def={def} value={flags[def.key]} />
+									</Fragment>
 								))}
 							</div>
 						</div>
diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/ApiKeyContent.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/ApiKeyContent.tsx
index 74d8ab140..47cdf8f2d 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/ApiKeyContent.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/ApiKeyContent.tsx
@@ -5,6 +5,7 @@ import { useTranslations } from "next-intl";
 import { useCallback, useRef, useState } from "react";
 import { Alert, AlertDescription } from "@/components/ui/alert";
 import { Button } from "@/components/ui/button";
+import { Skeleton } from "@/components/ui/skeleton";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
 import { useApiKey } from "@/hooks/use-api-key";
 import { copyToClipboard as copyToClipboardUtil } from "@/lib/utils";
@@ -35,7 +36,12 @@ export function ApiKeyContent() {
 			<div className="min-w-0 overflow-hidden">
 				<h3 className="mb-4 text-sm font-semibold tracking-tight">{t("your_api_key")}</h3>
 				{isLoading ? (
-					<div className="h-12 w-full animate-pulse rounded-md border border-border/60 bg-muted/30" />
+					<div className="flex items-center gap-2 rounded-md border border-border/60 bg-muted/30 px-2.5 py-1.5">
+						<div className="min-w-0 flex-1 overflow-hidden">
+							<Skeleton className="h-3 w-full bg-accent" />
+						</div>
+						<div className="h-6 w-6 shrink-0" />
+					</div>
 				) : apiKey ? (
 					<div className="flex items-center gap-2 rounded-md border border-border/60 bg-muted/30 px-2.5 py-1.5">
 						<div className="min-w-0 flex-1 overflow-x-auto scrollbar-hide">
diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/CommunityPromptsContent.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/CommunityPromptsContent.tsx
index d37ed409c..56044de5b 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/CommunityPromptsContent.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/CommunityPromptsContent.tsx
@@ -1,12 +1,14 @@
 "use client";
 
 import { useAtomValue } from "jotai";
-import { AlertTriangle, Copy, Globe, Sparkles } from "lucide-react";
+import { AlertTriangle, Copy, Library } from "lucide-react";
 import { useCallback, useState } from "react";
 import { copyPromptMutationAtom } from "@/atoms/prompts/prompts-mutation.atoms";
 import { publicPromptsAtom } from "@/atoms/prompts/prompts-query.atoms";
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Button } from "@/components/ui/button";
+import { Card, CardContent } from "@/components/ui/card";
+import { Skeleton } from "@/components/ui/skeleton";
 import { Spinner } from "@/components/ui/spinner";
 
 export function CommunityPromptsContent() {
@@ -35,33 +37,37 @@ export function CommunityPromptsContent() {
 
 	const list = prompts ?? [];
 
-	if (isLoading) {
-		return (
-			<div className="flex items-center justify-center py-12">
-				<Spinner className="size-6" />
-			</div>
-		);
-	}
-
-	if (isError) {
-		return (
-			<Alert variant="destructive">
-				<AlertTriangle />
-				<AlertTitle>Failed to load community prompts</AlertTitle>
-				<AlertDescription>Please try refreshing the page.</AlertDescription>
-			</Alert>
-		);
-	}
-
 	return (
 		<div className="space-y-6 min-w-0 overflow-hidden">
 			<p className="text-sm text-muted-foreground">
 				Prompts shared by other users. Add any to your collection with one click.
 			</p>
 
-			{list.length === 0 && (
+			{isLoading && (
+				<div className="space-y-2">
+					{["skeleton-a", "skeleton-b", "skeleton-c"].map((key) => (
+						<Card key={key} className="border-accent bg-accent/20">
+							<CardContent className="p-4 flex flex-col gap-3 min-h-24">
+								<Skeleton className="h-4 w-32 md:w-40 bg-accent" />
+								<Skeleton className="h-3 w-full bg-accent" />
+								<Skeleton className="h-3 w-24 md:w-28 bg-accent mt-auto" />
+							</CardContent>
+						</Card>
+					))}
+				</div>
+			)}
+
+			{isError && (
+				<Alert variant="destructive">
+					<AlertTriangle />
+					<AlertTitle>Failed to load community prompts</AlertTitle>
+					<AlertDescription>Please try refreshing the page.</AlertDescription>
+				</Alert>
+			)}
+
+			{!isLoading && !isError && list.length === 0 && (
 				<div className="rounded-lg border border-dashed border-border/60 p-8 text-center">
-					<Globe className="mx-auto size-8 text-muted-foreground" />
+					<Library className="mx-auto size-8 text-muted-foreground" />
 					<p className="mt-2 text-sm text-muted-foreground">No community prompts yet</p>
 					<p className="text-xs text-muted-foreground/60">
 						Share your own prompts from the My Prompts tab
@@ -69,59 +75,58 @@ export function CommunityPromptsContent() {
 				</div>
 			)}
 
-			{list.length > 0 && (
+			{!isLoading && !isError && list.length > 0 && (
 				<div className="space-y-2">
 					{list.map((prompt) => (
-						<div
+						<Card
 							key={prompt.id}
-							className="group flex items-start gap-3 rounded-lg border border-border/60 bg-card p-4"
+							className="group relative overflow-hidden transition-all duration-200 border-accent bg-accent/20 hover:shadow-md h-full"
 						>
-							<div className="mt-0.5 shrink-0 text-muted-foreground">
-								<Sparkles className="size-4" />
-							</div>
-							<div className="flex-1 min-w-0">
-								<div className="flex items-center gap-2">
-									<span className="text-sm font-medium">{prompt.name}</span>
-									<span className="rounded-full border px-2 py-0.5 text-[10px] text-muted-foreground">
-										{prompt.mode}
-									</span>
-									{prompt.author_name && (
-										<span className="text-[11px] text-muted-foreground/60">
-											by {prompt.author_name}
+							<CardContent className="p-4 flex items-start gap-3 h-full">
+								<div className="flex-1 min-w-0">
+									<div className="flex items-center gap-2">
+										<span className="text-sm font-medium">{prompt.name}</span>
+										<span className="rounded-md border-0 bg-muted px-1.5 py-0.5 text-[10px] font-medium text-muted-foreground">
+											{prompt.mode}
 										</span>
+										{prompt.author_name && (
+											<span className="text-[11px] text-muted-foreground/60">
+												by {prompt.author_name}
+											</span>
+										)}
+									</div>
+									<p
+										className={`mt-1 text-xs text-muted-foreground ${expandedId === prompt.id ? "whitespace-pre-wrap" : "line-clamp-2"}`}
+									>
+										{prompt.prompt}
+									</p>
+									{prompt.prompt.length > 100 && (
+										<Button
+											type="button"
+											variant="link"
+											onClick={() => setExpandedId(expandedId === prompt.id ? null : prompt.id)}
+											className="mt-1 h-auto cursor-pointer px-0 py-0 text-[11px] text-primary"
+										>
+											{expandedId === prompt.id ? "See less" : "See more"}
+										</Button>
 									)}
 								</div>
-								<p
-									className={`mt-1 text-xs text-muted-foreground ${expandedId === prompt.id ? "whitespace-pre-wrap" : "line-clamp-2"}`}
+								<Button
+									variant="ghost"
+									size="sm"
+									className="h-7 shrink-0 gap-1.5 rounded-lg px-2 text-muted-foreground hover:text-accent-foreground"
+									disabled={copyingIds.has(prompt.id)}
+									onClick={() => handleCopy(prompt.id)}
 								>
-									{prompt.prompt}
-								</p>
-								{prompt.prompt.length > 100 && (
-									<Button
-										type="button"
-										variant="link"
-										onClick={() => setExpandedId(expandedId === prompt.id ? null : prompt.id)}
-										className="mt-1 h-auto cursor-pointer px-0 py-0 text-[11px] text-primary"
-									>
-										{expandedId === prompt.id ? "See less" : "See more"}
-									</Button>
-								)}
-							</div>
-							<Button
-								variant="outline"
-								size="sm"
-								className="shrink-0 gap-1.5"
-								disabled={copyingIds.has(prompt.id)}
-								onClick={() => handleCopy(prompt.id)}
-							>
-								{copyingIds.has(prompt.id) ? (
-									<Spinner className="size-3" />
-								) : (
-									<Copy className="size-3" />
-								)}
-								Add to mine
-							</Button>
-						</div>
+									{copyingIds.has(prompt.id) ? (
+										<Spinner className="size-3" />
+									) : (
+										<Copy className="size-3" />
+									)}
+									Add to mine
+								</Button>
+							</CardContent>
+						</Card>
 					))}
 				</div>
 			)}
diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/PromptsContent.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/PromptsContent.tsx
index 02edac148..10885957b 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/PromptsContent.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/PromptsContent.tsx
@@ -22,9 +22,26 @@ import {
 } from "@/components/ui/alert-dialog";
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Button } from "@/components/ui/button";
+import { Card, CardContent } from "@/components/ui/card";
+import {
+	Dialog,
+	DialogContent,
+	DialogDescription,
+	DialogFooter,
+	DialogHeader,
+	DialogTitle,
+} from "@/components/ui/dialog";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
 import { ShortcutKbd } from "@/components/ui/shortcut-kbd";
+import { Skeleton } from "@/components/ui/skeleton";
+import {
+	Select,
+	SelectContent,
+	SelectItem,
+	SelectTrigger,
+	SelectValue,
+} from "@/components/ui/select";
 import { Spinner } from "@/components/ui/spinner";
 import { Switch } from "@/components/ui/switch";
 import type { PromptRead } from "@/contracts/types/prompts.types";
@@ -124,24 +141,6 @@ export function PromptsContent() {
 
 	const list = prompts ?? [];
 
-	if (isLoading) {
-		return (
-			<div className="flex items-center justify-center py-12">
-				<Spinner className="size-6" />
-			</div>
-		);
-	}
-
-	if (isError) {
-		return (
-			<Alert variant="destructive">
-				<AlertTriangle />
-				<AlertTitle>Failed to load prompts</AlertTitle>
-				<AlertDescription>Please try refreshing the page.</AlertDescription>
-			</Alert>
-		);
-	}
-
 	return (
 		<div className="space-y-6 min-w-0 overflow-hidden">
 			<div className="flex items-center justify-between">
@@ -149,97 +148,146 @@ export function PromptsContent() {
 					Create prompt templates triggered with <ShortcutKbd keys={["/"]} className="ml-0" /> in
 					the chat composer.
 				</p>
-				{!showForm && (
-					<Button
-						size="sm"
-						onClick={() => {
-							setShowForm(true);
-							setEditingId(null);
-							setFormData(EMPTY_FORM);
-						}}
-						className="shrink-0 gap-1.5"
-					>
-						New
-					</Button>
-				)}
+				<Button
+					size="sm"
+					onClick={() => {
+						setShowForm(true);
+						setEditingId(null);
+						setFormData(EMPTY_FORM);
+					}}
+					className="shrink-0 gap-1.5"
+				>
+					New
+				</Button>
 			</div>
 
-			{showForm && (
-				<div className="rounded-lg border border-border/60 bg-card p-6 space-y-4">
-					<h3 className="text-sm font-semibold tracking-tight">
-						{editingId !== null ? "Edit prompt" : "New prompt"}
-					</h3>
+			<Dialog
+				open={showForm}
+				onOpenChange={(open) => {
+					setShowForm(open);
+					if (!open) {
+						setFormData(EMPTY_FORM);
+						setEditingId(null);
+					}
+				}}
+			>
+				<DialogContent className="max-w-lg bg-popover text-popover-foreground">
+					<DialogHeader>
+						<DialogTitle>{editingId !== null ? "Edit prompt" : "New prompt"}</DialogTitle>
+						<DialogDescription>
+							Create prompt templates triggered with / in the chat composer.
+						</DialogDescription>
+					</DialogHeader>
 
-					<div className="space-y-2">
-						<Label htmlFor="prompt-name">Name</Label>
-						<Input
-							id="prompt-name"
-							value={formData.name}
-							onChange={(e) => setFormData((p) => ({ ...p, name: e.target.value }))}
-							placeholder="e.g. Fix grammar"
-						/>
+					<div className="space-y-4">
+						<div className="space-y-2">
+							<Label htmlFor="prompt-name">Name</Label>
+							<Input
+								id="prompt-name"
+								value={formData.name}
+								onChange={(e) => setFormData((p) => ({ ...p, name: e.target.value }))}
+								placeholder="e.g. Fix grammar"
+							/>
+						</div>
+
+						<div className="space-y-2">
+							<Label htmlFor="prompt-template">Prompt template</Label>
+							<textarea
+								id="prompt-template"
+								value={formData.prompt}
+								onChange={(e) => setFormData((p) => ({ ...p, prompt: e.target.value }))}
+								placeholder="e.g. Fix the grammar in the following text:\n\n{selection}"
+								rows={4}
+								className="w-full rounded-md border border-input bg-transparent px-3 py-2 text-sm outline-none resize-none focus:ring-1 focus:ring-ring"
+							/>
+							<p className="text-xs text-muted-foreground">
+								Use{" "}
+								<code className="rounded bg-muted px-1 py-0.5 font-mono text-[11px]">
+									{"{selection}"}
+								</code>{" "}
+								to insert the input text. If omitted, the text is appended automatically.
+							</p>
+						</div>
+
+						<div className="space-y-2">
+							<Label htmlFor="prompt-mode">Mode</Label>
+							<Select
+								value={formData.mode}
+								onValueChange={(value) =>
+									setFormData((p) => ({ ...p, mode: value as "transform" | "explore" }))
+								}
+							>
+								<SelectTrigger id="prompt-mode" className="w-full">
+									<SelectValue />
+								</SelectTrigger>
+								<SelectContent>
+									<SelectItem value="transform">Transform — rewrites or modifies your text</SelectItem>
+									<SelectItem value="explore">Explore — answers a question about your text</SelectItem>
+								</SelectContent>
+							</Select>
+						</div>
+
+						<div className="flex items-center gap-2">
+							<Switch
+								id="prompt-public"
+								checked={formData.is_public}
+								onCheckedChange={(checked) => setFormData((p) => ({ ...p, is_public: checked }))}
+							/>
+							<Label htmlFor="prompt-public" className="text-sm font-normal">
+								Share with community
+							</Label>
+						</div>
 					</div>
 
-					<div className="space-y-2">
-						<Label htmlFor="prompt-template">Prompt template</Label>
-						<textarea
-							id="prompt-template"
-							value={formData.prompt}
-							onChange={(e) => setFormData((p) => ({ ...p, prompt: e.target.value }))}
-							placeholder="e.g. Fix the grammar in the following text:\n\n{selection}"
-							rows={4}
-							className="w-full rounded-md border border-input bg-transparent px-3 py-2 text-sm outline-none resize-none focus:ring-1 focus:ring-ring"
-						/>
-						<p className="text-xs text-muted-foreground">
-							Use{" "}
-							<code className="rounded bg-muted px-1 py-0.5 font-mono text-[11px]">
-								{"{selection}"}
-							</code>{" "}
-							to insert the input text. If omitted, the text is appended automatically.
-						</p>
-					</div>
-
-					<div className="space-y-2">
-						<Label htmlFor="prompt-mode">Mode</Label>
-						<select
-							id="prompt-mode"
-							value={formData.mode}
-							onChange={(e) =>
-								setFormData((p) => ({ ...p, mode: e.target.value as "transform" | "explore" }))
-							}
-							className="w-full rounded-md border border-input bg-transparent px-3 py-2 text-sm outline-none focus:ring-1 focus:ring-ring"
+					<DialogFooter>
+						<Button
+							type="button"
+							variant="secondary"
+							size="sm"
+							onClick={handleCancel}
+							disabled={isSaving}
+							className="text-sm h-9"
 						>
-							<option value="transform">Transform — rewrites or modifies your text</option>
-							<option value="explore">Explore — answers a question about your text</option>
-						</select>
-					</div>
-
-					<div className="flex items-center gap-2">
-						<Switch
-							id="prompt-public"
-							checked={formData.is_public}
-							onCheckedChange={(checked) => setFormData((p) => ({ ...p, is_public: checked }))}
-						/>
-						<Label htmlFor="prompt-public" className="text-sm font-normal">
-							Share with community
-						</Label>
-					</div>
-
-					<div className="flex items-center justify-end gap-2 pt-2">
-						<Button variant="ghost" size="sm" onClick={handleCancel}>
 							Cancel
 						</Button>
-						<Button size="sm" onClick={handleSave} disabled={isSaving} className="relative">
+						<Button
+							size="sm"
+							onClick={handleSave}
+							disabled={isSaving}
+							className="relative text-sm h-9 min-w-[96px]"
+						>
 							<span className={isSaving ? "opacity-0" : ""}>
 								{editingId !== null ? "Update" : "Create"}
 							</span>
-							{isSaving && <Spinner className="size-3.5 absolute" />}
+							{isSaving && <Spinner size="sm" className="absolute" />}
 						</Button>
-					</div>
+					</DialogFooter>
+				</DialogContent>
+			</Dialog>
+
+			{isLoading && (
+				<div className="space-y-2">
+					{["skeleton-a", "skeleton-b", "skeleton-c"].map((key) => (
+						<Card key={key} className="border-accent bg-accent/20">
+							<CardContent className="p-4 flex flex-col gap-3 min-h-24">
+								<Skeleton className="h-4 w-32 md:w-40 bg-accent" />
+								<Skeleton className="h-3 w-full bg-accent" />
+								<Skeleton className="h-3 w-24 md:w-28 bg-accent mt-auto" />
+							</CardContent>
+						</Card>
+					))}
 				</div>
 			)}
 
-			{list.length === 0 && !showForm && (
+			{isError && (
+				<Alert variant="destructive">
+					<AlertTriangle />
+					<AlertTitle>Failed to load prompts</AlertTitle>
+					<AlertDescription>Please try refreshing the page.</AlertDescription>
+				</Alert>
+			)}
+
+			{!isLoading && !isError && list.length === 0 && !showForm && (
 				<div className="rounded-lg border border-dashed border-border/60 p-8 text-center">
 					<Sparkles className="mx-auto size-8 text-muted-foreground/40" />
 					<p className="mt-2 text-sm text-muted-foreground">No prompts yet</p>
@@ -249,24 +297,21 @@ export function PromptsContent() {
 				</div>
 			)}
 
-			{list.length > 0 && (
+			{!isLoading && !isError && list.length > 0 && (
 				<div className="space-y-2">
 					{list.map((prompt) => (
 						<div
 							key={prompt.id}
-							className="group flex items-start gap-3 rounded-lg border border-border/60 bg-card p-4"
+							className="group relative flex items-start gap-3 overflow-hidden rounded-lg border border-accent bg-accent/20 p-4 transition-all duration-200 hover:shadow-md"
 						>
-							<div className="mt-0.5 shrink-0 text-muted-foreground">
-								<Sparkles className="size-4" />
-							</div>
 							<div className="flex-1 min-w-0">
 								<div className="flex items-center gap-2">
 									<span className="text-sm font-medium">{prompt.name}</span>
-									<span className="rounded-full border px-2 py-0.5 text-[10px] text-muted-foreground">
+									<span className="rounded-md border-0 bg-muted px-1.5 py-0.5 text-[10px] font-medium text-muted-foreground">
 										{prompt.mode}
 									</span>
 									{prompt.is_public && (
-										<span className="flex items-center gap-1 rounded-full border border-primary/20 bg-primary/5 px-2 py-0.5 text-[10px] text-primary">
+										<span className="flex items-center gap-1 rounded-md border-0 bg-muted px-1.5 py-0.5 text-[10px] font-medium text-muted-foreground">
 											<Globe className="size-2.5" />
 											Public
 										</span>
@@ -288,7 +333,7 @@ export function PromptsContent() {
 									</Button>
 								)}
 							</div>
-							<div className="hidden group-hover:flex items-center gap-1 shrink-0">
+							<div className="flex items-center gap-1 shrink-0 opacity-0 pointer-events-none transition-opacity duration-150 group-hover:opacity-100 group-hover:pointer-events-auto">
 								<Button
 									type="button"
 									variant="ghost"
@@ -296,7 +341,7 @@ export function PromptsContent() {
 									title={prompt.is_public ? "Make private" : "Share with community"}
 									onClick={() => handleTogglePublic(prompt)}
 									disabled={togglingPublicIds.has(prompt.id)}
-									className="size-7 text-muted-foreground hover:bg-accent hover:text-accent-foreground"
+									className="h-7 w-7 rounded-lg text-muted-foreground hover:text-accent-foreground"
 								>
 									{togglingPublicIds.has(prompt.id) ? (
 										<Spinner className="size-3.5" />
@@ -309,7 +354,7 @@ export function PromptsContent() {
 								<Button
 									variant="ghost"
 									size="icon"
-									className="size-7"
+									className="h-7 w-7 rounded-lg text-muted-foreground hover:text-accent-foreground"
 									onClick={() => handleEdit(prompt)}
 								>
 									<Pencil className="size-3.5" />
@@ -317,7 +362,7 @@ export function PromptsContent() {
 								<Button
 									variant="ghost"
 									size="icon"
-									className="size-7 text-destructive hover:text-destructive"
+									className="h-7 w-7 rounded-lg text-muted-foreground hover:text-destructive"
 									onClick={() => setDeleteTarget(prompt.id)}
 								>
 									<Trash2 className="size-3.5" />
diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/layout-shell.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/layout-shell.tsx
index e241dbf59..a942c57f7 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/user-settings/layout-shell.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/layout-shell.tsx
@@ -3,13 +3,13 @@
 import {
 	Brain,
 	CircleUser,
-	Globe,
 	Keyboard,
 	KeyRound,
+	Library,
 	Monitor,
 	ReceiptText,
 	ShieldCheck,
-	Sparkles,
+	WandSparkles,
 	Workflow,
 } from "lucide-react";
 import Link from "next/link";
@@ -71,12 +71,12 @@ export function UserSettingsLayoutShell({
 			{
 				value: "prompts" as const,
 				label: "My Prompts",
-				icon: <Sparkles className="h-4 w-4" />,
+				icon: <WandSparkles className="h-4 w-4" />,
 			},
 			{
 				value: "community-prompts" as const,
 				label: "Community Prompts",
-				icon: <Globe className="h-4 w-4" />,
+				icon: <Library className="h-4 w-4" />,
 			},
 			{
 				value: "memory" as const,
diff --git a/surfsense_web/components/announcements/AnnouncementsDialog.tsx b/surfsense_web/components/announcements/AnnouncementsDialog.tsx
index 54653b535..097103e3d 100644
--- a/surfsense_web/components/announcements/AnnouncementsDialog.tsx
+++ b/surfsense_web/components/announcements/AnnouncementsDialog.tsx
@@ -22,7 +22,7 @@ export function AnnouncementsDialog() {
 
 	return (
 		<Dialog open={open} onOpenChange={setOpen}>
-			<DialogContent className="select-none max-w-[900px] w-[95vw] md:w-[90vw] h-[90vh] md:h-[80vh] max-h-[640px] flex flex-col p-0 gap-0 overflow-hidden [--card:var(--popover)]">
+			<DialogContent className="select-none max-w-[900px] w-[95vw] md:w-[90vw] h-[90vh] md:h-[80vh] max-h-[640px] flex flex-col p-0 gap-0 overflow-hidden bg-popover text-popover-foreground">
 				<DialogTitle className="sr-only">What's New</DialogTitle>
 
 				<div className="flex flex-1 flex-col overflow-hidden min-w-0">
diff --git a/surfsense_web/components/new-chat/prompt-picker.tsx b/surfsense_web/components/new-chat/prompt-picker.tsx
index 593e7e04f..1cb9f80f5 100644
--- a/surfsense_web/components/new-chat/prompt-picker.tsx
+++ b/surfsense_web/components/new-chat/prompt-picker.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { useAtomValue } from "jotai";
-import { Plus, Zap } from "lucide-react";
+import { Plus, WandSparkles } from "lucide-react";
 import { useParams, useRouter } from "next/navigation";
 import {
 	forwardRef,
@@ -173,7 +173,7 @@ export const PromptPicker = forwardRef<PromptPickerRef, PromptPickerProps>(funct
 								)}
 							>
 								<span className="shrink-0 text-muted-foreground">
-									<Zap className="size-4" />
+									<WandSparkles className="size-4" />
 								</span>
 								<span className="flex-1 text-sm truncate">{action.name}</span>
 							</Button>
diff --git a/surfsense_web/components/public-chat-snapshots/public-chat-snapshot-row.tsx b/surfsense_web/components/public-chat-snapshots/public-chat-snapshot-row.tsx
index ce3a83791..d6a66e9e2 100644
--- a/surfsense_web/components/public-chat-snapshots/public-chat-snapshot-row.tsx
+++ b/surfsense_web/components/public-chat-snapshots/public-chat-snapshot-row.tsx
@@ -13,6 +13,7 @@ import {
 	DropdownMenuItem,
 	DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
+import { Separator } from "@/components/ui/separator";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
 import type { PublicChatSnapshotDetail } from "@/contracts/types/chat-threads.types";
 import { useMediaQuery } from "@/hooks/use-media-query";
@@ -60,8 +61,8 @@ export function PublicChatSnapshotRow({
 	const member = snapshot.created_by_user_id ? memberMap.get(snapshot.created_by_user_id) : null;
 
 	return (
-		<Card className="group relative overflow-hidden transition-all duration-200 border-border/60 hover:shadow-md h-full">
-			<CardContent className="p-4 flex flex-col gap-3 h-full">
+		<Card className="group relative overflow-hidden transition-all duration-200 border-accent bg-accent/20 hover:shadow-md h-full">
+			<CardContent className="p-4 flex flex-col gap-3 h-full min-h-32">
 				{/* Header: Title + Actions */}
 				<div className="relative flex items-center">
 					<h4
@@ -122,33 +123,38 @@ export function PublicChatSnapshotRow({
 				</div>
 
 				{/* Footer: Date + Creator */}
-				<div className="flex items-center gap-2 pt-2 border-t border-border/40 mt-auto">
-					<span className="text-[11px] text-muted-foreground/60">{formattedDate}</span>
-					{member && (
-						<>
-							<Dot className="h-4 w-4 text-muted-foreground/30" />
-							<TooltipProvider>
-								<Tooltip open={isDesktop ? undefined : false}>
-									<TooltipTrigger asChild>
-										<div className="flex items-center gap-1.5 cursor-default">
-											<Avatar className="size-4.5 shrink-0">
-												{member.avatarUrl && (
-													<AvatarImage src={member.avatarUrl} alt={member.name} />
-												)}
-												<AvatarFallback className="text-[9px]">
-													{getInitials(member.name)}
-												</AvatarFallback>
-											</Avatar>
-											<span className="text-[11px] text-muted-foreground/60 truncate max-w-[120px]">
-												{member.name}
-											</span>
-										</div>
-									</TooltipTrigger>
-									<TooltipContent side="bottom">{member.email || member.name}</TooltipContent>
-								</Tooltip>
-							</TooltipProvider>
-						</>
-					)}
+				<div className="mt-auto space-y-2">
+					<Separator className="bg-accent" />
+					<div className="flex items-center">
+						<span className="shrink-0 text-[11px] text-muted-foreground/60 whitespace-nowrap">
+							{formattedDate}
+						</span>
+						{member && (
+							<>
+								<Dot className="h-4 w-4 text-muted-foreground/30 shrink-0" />
+								<TooltipProvider>
+									<Tooltip open={isDesktop ? undefined : false}>
+										<TooltipTrigger asChild>
+											<div className="min-w-0 flex items-center gap-1.5 cursor-default">
+												<Avatar className="size-4.5 shrink-0">
+													{member.avatarUrl && (
+														<AvatarImage src={member.avatarUrl} alt={member.name} />
+													)}
+													<AvatarFallback className="text-[9px]">
+														{getInitials(member.name)}
+													</AvatarFallback>
+												</Avatar>
+											<span className="text-[11px] text-muted-foreground/60 truncate">
+													{member.name}
+												</span>
+											</div>
+										</TooltipTrigger>
+										<TooltipContent side="bottom">{member.email || member.name}</TooltipContent>
+									</Tooltip>
+								</TooltipProvider>
+							</>
+						)}
+					</div>
 				</div>
 			</CardContent>
 		</Card>
diff --git a/surfsense_web/components/public-chat-snapshots/public-chat-snapshots-manager.tsx b/surfsense_web/components/public-chat-snapshots/public-chat-snapshots-manager.tsx
index e0d2f52a9..3cf07c27a 100644
--- a/surfsense_web/components/public-chat-snapshots/public-chat-snapshots-manager.tsx
+++ b/surfsense_web/components/public-chat-snapshots/public-chat-snapshots-manager.tsx
@@ -81,30 +81,26 @@ export function PublicChatSnapshotsManager({
 	if (isLoading) {
 		return (
 			<div className="space-y-4 md:space-y-5">
-				{/* Info alert skeleton */}
-				<Skeleton className="h-12 w-full rounded-lg" />
+				<Alert>
+					<Info />
+					<AlertDescription>
+						<div className="flex min-h-[1.625em] items-center">
+							<Skeleton className="h-4 w-60 bg-accent-foreground/15" />
+						</div>
+					</AlertDescription>
+				</Alert>
 
 				{/* Cards grid skeleton */}
 				<div className="grid gap-3 grid-cols-1 sm:grid-cols-2">
 					{["skeleton-a", "skeleton-b", "skeleton-c"].map((key) => (
-						<Card key={key} className="border-border/60">
-							<CardContent className="p-4 flex flex-col gap-3">
-								{/* Header: Title */}
-								<div className="flex items-start justify-between gap-2">
-									<Skeleton className="h-4 w-36 md:w-44" />
-								</div>
-								{/* Message count badge */}
-								<div className="flex items-center gap-1.5">
-									<Skeleton className="h-5 w-24 rounded-full" />
-								</div>
-								{/* URL skeleton */}
-								<Skeleton className="h-3 w-full rounded" />
-								{/* Footer: Date + Creator */}
-								<div className="flex items-center gap-2 pt-2 border-t border-border/40">
-									<Skeleton className="h-3 w-20" />
-									<Skeleton className="h-4 w-4 rounded-full" />
-									<Skeleton className="h-3 w-16" />
-								</div>
+						<Card
+							key={key}
+							className="group relative overflow-hidden transition-all duration-200 border-accent bg-accent/20 hover:shadow-md h-full"
+						>
+							<CardContent className="p-4 flex flex-col gap-3 h-full min-h-32">
+								<Skeleton className="h-4 w-32 md:w-40 bg-accent" />
+								<Skeleton className="h-3 w-full bg-accent" />
+								<Skeleton className="h-3 w-24 md:w-28 bg-accent mt-auto" />
 							</CardContent>
 						</Card>
 					))}
diff --git a/surfsense_web/components/settings/agent-model-manager.tsx b/surfsense_web/components/settings/agent-model-manager.tsx
index c9a5b9f54..b0e13d3d7 100644
--- a/surfsense_web/components/settings/agent-model-manager.tsx
+++ b/surfsense_web/components/settings/agent-model-manager.tsx
@@ -25,6 +25,7 @@ import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import { Card, CardContent } from "@/components/ui/card";
+import { Separator } from "@/components/ui/separator";
 import { Skeleton } from "@/components/ui/skeleton";
 import { Spinner } from "@/components/ui/spinner";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
@@ -130,7 +131,7 @@ export function AgentModelManager({ searchSpaceId }: AgentModelManagerProps) {
 					<Button
 						variant="outline"
 						onClick={openNewDialog}
-						className="gap-2 bg-white text-black hover:bg-accent hover:text-accent-foreground dark:bg-white dark:text-black"
+						className="gap-2 border-transparent bg-white text-[#1f1f1f] font-medium hover:bg-zinc-100 hover:text-[#1f1f1f] dark:border-transparent dark:bg-white dark:text-[#1f1f1f]"
 					>
 						Add Model
 					</Button>
@@ -182,16 +183,22 @@ export function AgentModelManager({ searchSpaceId }: AgentModelManagerProps) {
 			)}
 
 			{/* Global Configs Info */}
-			{globalConfigs.length > 0 && (
+			{(isLoading || globalConfigs.length > 0) && (
 				<Alert>
 					<Info />
 					<AlertDescription>
-						<p>
-							<span className="font-medium">
-								{globalConfigs.length} global {globalConfigs.length === 1 ? "model" : "models"}
-							</span>{" "}
-							available from your administrator.
-						</p>
+						{isLoading ? (
+							<div className="flex min-h-[1.625em] items-center">
+								<Skeleton className="h-4 w-60 bg-accent-foreground/15" />
+							</div>
+						) : (
+							<p>
+								<span className="font-medium">
+									{globalConfigs.length} global {globalConfigs.length === 1 ? "model" : "models"}
+								</span>{" "}
+								available from your administrator.
+							</p>
+						)}
 					</AlertDescription>
 				</Alert>
 			)}
@@ -200,29 +207,11 @@ export function AgentModelManager({ searchSpaceId }: AgentModelManagerProps) {
 			{isLoading && (
 				<div className="grid gap-3 grid-cols-1 sm:grid-cols-2 xl:grid-cols-3">
 					{["skeleton-a", "skeleton-b", "skeleton-c"].map((key) => (
-						<Card key={key} className="border-border/60">
-							<CardContent className="p-4 flex flex-col gap-3">
-								{/* Header: Icon + Name */}
-								<div className="flex items-start gap-2.5">
-									<Skeleton className="size-4 rounded-full shrink-0 mt-0.5" />
-									<div className="space-y-1.5 flex-1 min-w-0">
-										<Skeleton className="h-4 w-28 md:w-32" />
-										<Skeleton className="h-3 w-40 md:w-48" />
-									</div>
-								</div>
-								{/* Feature badges */}
-								<div className="flex items-center gap-1.5">
-									<Skeleton className="h-5 w-20 rounded-full" />
-								</div>
-								{/* Footer */}
-								<div className="flex items-center pt-2 border-t border-border/40">
-									<Skeleton className="h-3 w-20 flex-1" />
-									<Skeleton className="h-3 w-3 rounded-full shrink-0 mx-1" />
-									<div className="flex-1 flex items-center justify-end gap-1.5">
-										<Skeleton className="h-4 w-4 rounded-full" />
-										<Skeleton className="h-3 w-16" />
-									</div>
-								</div>
+						<Card key={key} className="border-accent bg-accent/20">
+							<CardContent className="p-4 flex flex-col gap-3 min-h-32">
+								<Skeleton className="h-4 w-32 md:w-40 bg-accent" />
+								<Skeleton className="h-3 w-full bg-accent" />
+								<Skeleton className="h-3 w-24 md:w-28 bg-accent mt-auto" />
 							</CardContent>
 						</Card>
 					))}
@@ -252,7 +241,7 @@ export function AgentModelManager({ searchSpaceId }: AgentModelManagerProps) {
 
 								return (
 									<div key={config.id}>
-										<Card className="group relative overflow-hidden transition-all duration-200 border-border/60 hover:shadow-md h-full">
+										<Card className="group relative overflow-hidden transition-all duration-200 border-accent bg-accent/20 hover:shadow-md h-full">
 											<CardContent className="p-4 flex flex-col gap-3 h-full">
 												{/* Header: Icon + Name + Actions */}
 												<div className="flex items-center justify-between gap-2">
@@ -334,41 +323,44 @@ export function AgentModelManager({ searchSpaceId }: AgentModelManagerProps) {
 												</div>
 
 												{/* Footer: Date + Creator */}
-												<div className="flex items-center pt-2 border-t border-border/40 mt-auto">
-													<span className="shrink-0 text-[11px] text-muted-foreground/60 whitespace-nowrap">
-														{new Date(config.created_at).toLocaleDateString(undefined, {
-															year: "numeric",
-															month: "short",
-															day: "numeric",
-														})}
-													</span>
-													{member && (
-														<>
-															<Dot className="h-4 w-4 text-muted-foreground/30 shrink-0" />
-															<TooltipProvider>
-																<Tooltip open={isDesktop ? undefined : false}>
-																	<TooltipTrigger asChild>
-																		<div className="min-w-0 flex items-center gap-1.5 cursor-default">
-																			<Avatar className="size-4.5 shrink-0">
-																				{member.avatarUrl && (
-																					<AvatarImage src={member.avatarUrl} alt={member.name} />
-																				)}
-																				<AvatarFallback className="text-[9px]">
-																					{getInitials(member.name)}
-																				</AvatarFallback>
-																			</Avatar>
-																			<span className="text-[11px] text-muted-foreground/60 truncate">
-																				{member.name}
-																			</span>
-																		</div>
-																	</TooltipTrigger>
-																	<TooltipContent side="bottom">
-																		{member.email || member.name}
-																	</TooltipContent>
-																</Tooltip>
-															</TooltipProvider>
-														</>
-													)}
+												<div className="mt-auto space-y-2">
+													<Separator className="bg-accent" />
+													<div className="flex items-center">
+														<span className="shrink-0 text-[11px] text-muted-foreground/60 whitespace-nowrap">
+															{new Date(config.created_at).toLocaleDateString(undefined, {
+																year: "numeric",
+																month: "short",
+																day: "numeric",
+															})}
+														</span>
+														{member && (
+															<>
+																<Dot className="h-4 w-4 text-muted-foreground/30 shrink-0" />
+																<TooltipProvider>
+																	<Tooltip open={isDesktop ? undefined : false}>
+																		<TooltipTrigger asChild>
+																			<div className="min-w-0 flex items-center gap-1.5 cursor-default">
+																				<Avatar className="size-4.5 shrink-0">
+																					{member.avatarUrl && (
+																						<AvatarImage src={member.avatarUrl} alt={member.name} />
+																					)}
+																					<AvatarFallback className="text-[9px]">
+																						{getInitials(member.name)}
+																					</AvatarFallback>
+																				</Avatar>
+																				<span className="text-[11px] text-muted-foreground/60 truncate">
+																					{member.name}
+																				</span>
+																			</div>
+																		</TooltipTrigger>
+																		<TooltipContent side="bottom">
+																			{member.email || member.name}
+																		</TooltipContent>
+																	</Tooltip>
+																</TooltipProvider>
+															</>
+														)}
+													</div>
 												</div>
 											</CardContent>
 										</Card>
diff --git a/surfsense_web/components/settings/image-model-manager.tsx b/surfsense_web/components/settings/image-model-manager.tsx
index 4ee22dd52..494f7aae9 100644
--- a/surfsense_web/components/settings/image-model-manager.tsx
+++ b/surfsense_web/components/settings/image-model-manager.tsx
@@ -25,6 +25,7 @@ import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import { Card, CardContent } from "@/components/ui/card";
+import { Separator } from "@/components/ui/separator";
 import { Skeleton } from "@/components/ui/skeleton";
 import { Spinner } from "@/components/ui/spinner";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
@@ -133,7 +134,7 @@ export function ImageModelManager({ searchSpaceId }: ImageModelManagerProps) {
 					<Button
 						variant="outline"
 						onClick={openNewDialog}
-						className="gap-2 bg-white text-black hover:bg-accent hover:text-accent-foreground dark:bg-white dark:text-black"
+						className="gap-2 border-transparent bg-white text-[#1f1f1f] font-medium hover:bg-zinc-100 hover:text-[#1f1f1f] dark:border-transparent dark:bg-white dark:text-[#1f1f1f]"
 					>
 						Add Image Model
 					</Button>
@@ -183,37 +184,45 @@ export function ImageModelManager({ searchSpaceId }: ImageModelManagerProps) {
 			)}
 
 			{/* Global info */}
-			{globalConfigs.filter((g) => !("is_auto_mode" in g && g.is_auto_mode)).length > 0 && (
+			{(isLoading ||
+				globalConfigs.filter((g) => !("is_auto_mode" in g && g.is_auto_mode)).length > 0) && (
 				<Alert>
 					<Info />
 					<AlertDescription>
-						<p>
-							<span className="font-medium">
-								{globalConfigs.filter((g) => !("is_auto_mode" in g && g.is_auto_mode)).length}{" "}
-								global image{" "}
-								{globalConfigs.filter((g) => !("is_auto_mode" in g && g.is_auto_mode)).length === 1
-									? "model"
-									: "models"}
-							</span>{" "}
-							available from your administrator. {(() => {
-								const nonAuto = globalConfigs.filter(
-									(g) => !("is_auto_mode" in g && g.is_auto_mode)
-								);
-								const premium = nonAuto.filter(
-									(g) =>
-										"billing_tier" in g &&
-										(g as { billing_tier?: string }).billing_tier === "premium"
-								).length;
-								const free = nonAuto.length - premium;
-								if (premium > 0 && free > 0) {
-									return `${premium} premium, ${free} free.`;
-								}
-								if (premium > 0) {
-									return `All ${premium} premium — debits your shared credit pool.`;
-								}
-								return `All ${free} free.`;
-							})()}
-						</p>
+						{isLoading ? (
+							<div className="flex min-h-[1.625em] items-center">
+								<Skeleton className="h-4 w-60 bg-accent-foreground/15" />
+							</div>
+						) : (
+							<p>
+								<span className="font-medium">
+									{globalConfigs.filter((g) => !("is_auto_mode" in g && g.is_auto_mode)).length}{" "}
+									global image{" "}
+									{globalConfigs.filter((g) => !("is_auto_mode" in g && g.is_auto_mode)).length ===
+									1
+										? "model"
+										: "models"}
+								</span>{" "}
+								available from your administrator. {(() => {
+									const nonAuto = globalConfigs.filter(
+										(g) => !("is_auto_mode" in g && g.is_auto_mode)
+									);
+									const premium = nonAuto.filter(
+										(g) =>
+											"billing_tier" in g &&
+											(g as { billing_tier?: string }).billing_tier === "premium"
+									).length;
+									const free = nonAuto.length - premium;
+									if (premium > 0 && free > 0) {
+										return `${premium} premium, ${free} free.`;
+									}
+									if (premium > 0) {
+										return `All ${premium} premium — debits your shared credit pool.`;
+									}
+									return `All ${free} free.`;
+								})()}
+							</p>
+						)}
 					</AlertDescription>
 				</Alert>
 			)}
@@ -225,9 +234,6 @@ export function ImageModelManager({ searchSpaceId }: ImageModelManagerProps) {
 			{!isLoading &&
 				globalConfigs.filter((g) => !("is_auto_mode" in g && g.is_auto_mode)).length > 0 && (
 					<div className="space-y-3">
-						<h3 className="text-xs md:text-sm font-semibold text-muted-foreground">
-							Global Image Models
-						</h3>
 						<div className="grid gap-3 grid-cols-1 sm:grid-cols-2 xl:grid-cols-3">
 							{globalConfigs
 								.filter((g) => !("is_auto_mode" in g && g.is_auto_mode))
@@ -241,7 +247,7 @@ export function ImageModelManager({ searchSpaceId }: ImageModelManagerProps) {
 									return (
 										<Card
 											key={cfg.id}
-											className="border-border/60 bg-muted/20 overflow-hidden h-full"
+											className="group relative overflow-hidden transition-all duration-200 border-accent bg-accent/20 hover:shadow-md h-full"
 										>
 											<CardContent className="p-4 flex flex-col gap-3 h-full">
 												<div className="flex items-center gap-2 min-w-0">
@@ -274,10 +280,13 @@ export function ImageModelManager({ searchSpaceId }: ImageModelManagerProps) {
 														{cfg.description}
 													</p>
 												)}
-												<div className="flex items-center pt-2 border-t border-border/40 mt-auto">
-													<span className="text-[11px] text-muted-foreground/60 truncate">
-														{cfg.model_name}
-													</span>
+												<div className="mt-auto space-y-2">
+													<Separator className="bg-accent" />
+													<div className="flex items-center">
+														<span className="text-[11px] text-muted-foreground/60 truncate">
+															{cfg.model_name}
+														</span>
+													</div>
 												</div>
 											</CardContent>
 										</Card>
@@ -291,30 +300,13 @@ export function ImageModelManager({ searchSpaceId }: ImageModelManagerProps) {
 			{isLoading && (
 				<div className="space-y-4 md:space-y-6">
 					<div className="space-y-4">
-						<div className="flex items-center justify-between">
-							<Skeleton className="h-6 md:h-7 w-40 md:w-48" />
-							<Skeleton className="h-8 md:h-9 w-32 md:w-36 rounded-md" />
-						</div>
-
 						<div className="grid gap-3 grid-cols-1 sm:grid-cols-2 xl:grid-cols-3">
 							{["skeleton-a", "skeleton-b", "skeleton-c"].map((key) => (
-								<Card key={key} className="border-border/60">
-									<CardContent className="p-4 flex flex-col gap-3">
-										<div className="flex items-center gap-2.5">
-											<Skeleton className="size-4 rounded-full shrink-0" />
-											<div className="space-y-1.5 flex-1 min-w-0">
-												<Skeleton className="h-4 w-28 md:w-32" />
-												<Skeleton className="h-3 w-40 md:w-48" />
-											</div>
-										</div>
-										<div className="flex items-center pt-2 border-t border-border/40">
-											<Skeleton className="h-3 w-20 flex-1" />
-											<Skeleton className="h-3 w-3 rounded-full shrink-0 mx-1" />
-											<div className="flex-1 flex items-center justify-end gap-1.5">
-												<Skeleton className="h-4 w-4 rounded-full" />
-												<Skeleton className="h-3 w-16" />
-											</div>
-										</div>
+								<Card key={key} className="border-accent bg-accent/20">
+									<CardContent className="p-4 flex flex-col gap-3 min-h-32">
+										<Skeleton className="h-4 w-32 md:w-40 bg-accent" />
+										<Skeleton className="h-3 w-full bg-accent" />
+										<Skeleton className="h-3 w-24 md:w-28 bg-accent mt-auto" />
 									</CardContent>
 								</Card>
 							))}
@@ -344,7 +336,7 @@ export function ImageModelManager({ searchSpaceId }: ImageModelManagerProps) {
 
 								return (
 									<div key={config.id}>
-										<Card className="group relative overflow-hidden transition-all duration-200 border-border/60 hover:shadow-md h-full">
+										<Card className="group relative overflow-hidden transition-all duration-200 border-accent bg-accent/20 hover:shadow-md h-full">
 											<CardContent className="p-4 flex flex-col gap-3 h-full">
 												{/* Header: Icon + Name + Actions */}
 												<div className="flex items-center justify-between gap-2">
@@ -404,41 +396,44 @@ export function ImageModelManager({ searchSpaceId }: ImageModelManagerProps) {
 												</div>
 
 												{/* Footer: Date + Creator */}
-												<div className="flex items-center pt-2 border-t border-border/40 mt-auto">
-													<span className="shrink-0 text-[11px] text-muted-foreground/60 whitespace-nowrap">
-														{new Date(config.created_at).toLocaleDateString(undefined, {
-															year: "numeric",
-															month: "short",
-															day: "numeric",
-														})}
-													</span>
-													{member && (
-														<>
-															<Dot className="h-4 w-4 text-muted-foreground/30 shrink-0" />
-															<TooltipProvider>
-																<Tooltip open={isDesktop ? undefined : false}>
-																	<TooltipTrigger asChild>
-																		<div className="min-w-0 flex items-center gap-1.5 cursor-default">
-																			<Avatar className="size-4.5 shrink-0">
-																				{member.avatarUrl && (
-																					<AvatarImage src={member.avatarUrl} alt={member.name} />
-																				)}
-																				<AvatarFallback className="text-[9px]">
-																					{getInitials(member.name)}
-																				</AvatarFallback>
-																			</Avatar>
-																			<span className="text-[11px] text-muted-foreground/60 truncate">
-																				{member.name}
-																			</span>
-																		</div>
-																	</TooltipTrigger>
-																	<TooltipContent side="bottom">
-																		{member.email || member.name}
-																	</TooltipContent>
-																</Tooltip>
-															</TooltipProvider>
-														</>
-													)}
+												<div className="mt-auto space-y-2">
+													<Separator className="bg-accent" />
+													<div className="flex items-center">
+														<span className="shrink-0 text-[11px] text-muted-foreground/60 whitespace-nowrap">
+															{new Date(config.created_at).toLocaleDateString(undefined, {
+																year: "numeric",
+																month: "short",
+																day: "numeric",
+															})}
+														</span>
+														{member && (
+															<>
+																<Dot className="h-4 w-4 text-muted-foreground/30 shrink-0" />
+																<TooltipProvider>
+																	<Tooltip open={isDesktop ? undefined : false}>
+																		<TooltipTrigger asChild>
+																			<div className="min-w-0 flex items-center gap-1.5 cursor-default">
+																				<Avatar className="size-4.5 shrink-0">
+																					{member.avatarUrl && (
+																						<AvatarImage src={member.avatarUrl} alt={member.name} />
+																					)}
+																					<AvatarFallback className="text-[9px]">
+																						{getInitials(member.name)}
+																					</AvatarFallback>
+																				</Avatar>
+																				<span className="text-[11px] text-muted-foreground/60 truncate">
+																					{member.name}
+																				</span>
+																			</div>
+																		</TooltipTrigger>
+																		<TooltipContent side="bottom">
+																			{member.email || member.name}
+																		</TooltipContent>
+																	</Tooltip>
+																</TooltipProvider>
+															</>
+														)}
+													</div>
 												</div>
 											</CardContent>
 										</Card>
diff --git a/surfsense_web/components/settings/llm-role-manager.tsx b/surfsense_web/components/settings/llm-role-manager.tsx
index a2eb6a22e..17370b8f2 100644
--- a/surfsense_web/components/settings/llm-role-manager.tsx
+++ b/surfsense_web/components/settings/llm-role-manager.tsx
@@ -236,35 +236,11 @@ export function LLMRoleManager({ searchSpaceId }: LLMRoleManagerProps) {
 			{isLoading && (
 				<div className="grid gap-4 grid-cols-1 lg:grid-cols-2">
 					{["skeleton-a", "skeleton-b", "skeleton-c"].map((key) => (
-						<Card key={key} className="border-border/60">
-							<CardContent className="p-4 md:p-5 space-y-4">
-								{/* Header: icon + title + status */}
-								<div className="flex items-start justify-between gap-3">
-									<div className="flex items-center gap-3 min-w-0">
-										<Skeleton className="h-9 w-9 rounded-lg shrink-0" />
-										<div className="space-y-1.5 flex-1">
-											<Skeleton className="h-4 w-24 md:w-28" />
-											<Skeleton className="h-3 w-40 md:w-52" />
-										</div>
-									</div>
-									<Skeleton className="h-4 w-4 rounded-full shrink-0" />
-								</div>
-								{/* Label */}
-								<div className="space-y-1.5">
-									<Skeleton className="h-3 w-20" />
-									<Skeleton className="h-9 md:h-10 w-full rounded-md" />
-								</div>
-								{/* Summary block */}
-								<div className="rounded-lg border border-border/50 p-3 space-y-2">
-									<div className="flex items-center gap-2">
-										<Skeleton className="h-3.5 w-3.5 rounded shrink-0" />
-										<Skeleton className="h-3.5 w-28" />
-									</div>
-									<div className="flex items-center gap-1.5">
-										<Skeleton className="h-4 w-14 rounded-full" />
-										<Skeleton className="h-3 w-24" />
-									</div>
-								</div>
+						<Card key={key} className="border-accent bg-accent/20">
+							<CardContent className="p-4 flex flex-col gap-3 min-h-32">
+								<Skeleton className="h-4 w-32 md:w-40 bg-accent" />
+								<Skeleton className="h-3 w-full bg-accent" />
+								<Skeleton className="h-3 w-24 md:w-28 bg-accent mt-auto" />
 							</CardContent>
 						</Card>
 					))}
@@ -314,7 +290,7 @@ export function LLMRoleManager({ searchSpaceId }: LLMRoleManagerProps) {
 
 						return (
 							<div key={key}>
-								<Card className="group relative overflow-hidden transition-all duration-200 border-border/60 hover:shadow-md h-full">
+								<Card className="group relative overflow-hidden transition-all duration-200 border-accent bg-accent/20 hover:shadow-md h-full">
 									<CardContent className="p-4 md:p-5 space-y-4">
 										{/* Role Header */}
 										<div className="flex items-start justify-between gap-3">
diff --git a/surfsense_web/components/settings/prompt-config-manager.tsx b/surfsense_web/components/settings/prompt-config-manager.tsx
index ac7da9547..d04ee89dc 100644
--- a/surfsense_web/components/settings/prompt-config-manager.tsx
+++ b/surfsense_web/components/settings/prompt-config-manager.tsx
@@ -6,7 +6,6 @@ import { useEffect, useState } from "react";
 import { toast } from "sonner";
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Button } from "@/components/ui/button";
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
 import { Label } from "@/components/ui/label";
 import { Skeleton } from "@/components/ui/skeleton";
 import { Textarea } from "@/components/ui/textarea";
@@ -87,16 +86,16 @@ export function PromptConfigManager({ searchSpaceId }: PromptConfigManagerProps)
 	if (loading) {
 		return (
 			<div className="space-y-4 md:space-y-6">
-				<Card>
-					<CardHeader className="px-3 md:px-6 pt-3 md:pt-6 pb-2 md:pb-3">
+				<div className="space-y-3 md:space-y-4">
+					<div className="space-y-2">
 						<Skeleton className="h-5 md:h-6 w-36 md:w-48" />
 						<Skeleton className="h-3 md:h-4 w-full max-w-md mt-2" />
-					</CardHeader>
-					<CardContent className="space-y-3 md:space-y-4 px-3 md:px-6 pb-3 md:pb-6">
+					</div>
+					<div className="space-y-3 md:space-y-4">
 						<Skeleton className="h-16 md:h-20 w-full" />
 						<Skeleton className="h-24 md:h-32 w-full" />
-					</CardContent>
-				</Card>
+					</div>
+				</div>
 			</div>
 		);
 	}
@@ -124,15 +123,17 @@ export function PromptConfigManager({ searchSpaceId }: PromptConfigManagerProps)
 
 			{/* System Instructions Card */}
 			<form onSubmit={onSubmit} className="space-y-4 md:space-y-6">
-				<Card>
-					<CardHeader className="px-3 md:px-6 pt-3 md:pt-6 pb-2 md:pb-3">
-						<CardTitle className="text-base md:text-lg">Custom System Instructions</CardTitle>
-						<CardDescription className="text-xs md:text-sm">
+				<div className="space-y-3 md:space-y-4">
+					<div className="space-y-1.5 md:space-y-2">
+						<h3 className="text-base md:text-lg font-semibold tracking-tight">
+							Custom System Instructions
+						</h3>
+						<p className="text-xs md:text-sm text-muted-foreground">
 							Provide specific guidelines for how you want the AI to respond. These instructions
 							will be applied to all answers in this search space.
-						</CardDescription>
-					</CardHeader>
-					<CardContent className="space-y-3 md:space-y-4 px-3 md:px-6 pb-3 md:pb-6">
+						</p>
+					</div>
+					<div className="space-y-3 md:space-y-4">
 						<div className="space-y-1.5 md:space-y-2">
 							<Label
 								htmlFor="custom-instructions-settings"
@@ -174,8 +175,8 @@ export function PromptConfigManager({ searchSpaceId }: PromptConfigManagerProps)
 								</AlertDescription>
 							</Alert>
 						)}
-					</CardContent>
-				</Card>
+					</div>
+				</div>
 
 				{/* Action Buttons */}
 				<div className="flex justify-end pt-3 md:pt-4">
diff --git a/surfsense_web/components/settings/roles-manager.tsx b/surfsense_web/components/settings/roles-manager.tsx
index d2ddba9a0..afaa9d2c5 100644
--- a/surfsense_web/components/settings/roles-manager.tsx
+++ b/surfsense_web/components/settings/roles-manager.tsx
@@ -349,14 +349,14 @@ export function RolesManager({ searchSpaceId }: { searchSpaceId: number }) {
 function PermissionsBadge({ permissions }: { permissions: string[] }) {
 	if (permissions.includes("*")) {
 		return (
-			<div className="px-2.5 py-1 rounded-md bg-muted/50 border border-border/60 text-muted-foreground">
-				<span className="text-xs font-medium whitespace-nowrap">Full access</span>
+			<div className="rounded-md border-0 bg-muted px-1.5 py-0.5 text-muted-foreground">
+				<span className="text-[10px] font-medium whitespace-nowrap">Full access</span>
 			</div>
 		);
 	}
 	return (
-		<div className="px-2.5 py-1 rounded-md border border-border/60 bg-muted/50 text-muted-foreground">
-			<span className="text-xs font-medium whitespace-nowrap">
+		<div className="rounded-md border-0 bg-muted px-1.5 py-0.5 text-muted-foreground">
+			<span className="text-[10px] font-medium whitespace-nowrap">
 				{permissions.length} permissions
 			</span>
 		</div>
diff --git a/surfsense_web/components/settings/vision-model-manager.tsx b/surfsense_web/components/settings/vision-model-manager.tsx
index 167c5b31d..31578b4f1 100644
--- a/surfsense_web/components/settings/vision-model-manager.tsx
+++ b/surfsense_web/components/settings/vision-model-manager.tsx
@@ -25,6 +25,7 @@ import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import { Card, CardContent } from "@/components/ui/card";
+import { Separator } from "@/components/ui/separator";
 import { Skeleton } from "@/components/ui/skeleton";
 import { Spinner } from "@/components/ui/spinner";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
@@ -137,7 +138,7 @@ export function VisionModelManager({ searchSpaceId }: VisionModelManagerProps) {
 					<Button
 						variant="outline"
 						onClick={openNewDialog}
-						className="gap-2 bg-white text-black hover:bg-accent hover:text-accent-foreground dark:bg-white dark:text-black"
+						className="gap-2 border-transparent bg-white text-[#1f1f1f] font-medium hover:bg-zinc-100 hover:text-[#1f1f1f] dark:border-transparent dark:bg-white dark:text-[#1f1f1f]"
 					>
 						Add Vision Model
 					</Button>
@@ -184,37 +185,45 @@ export function VisionModelManager({ searchSpaceId }: VisionModelManagerProps) {
 				</div>
 			)}
 
-			{globalConfigs.filter((g) => !("is_auto_mode" in g && g.is_auto_mode)).length > 0 && (
+			{(isLoading ||
+				globalConfigs.filter((g) => !("is_auto_mode" in g && g.is_auto_mode)).length > 0) && (
 				<Alert>
 					<Info />
 					<AlertDescription>
-						<p>
-							<span className="font-medium">
-								{globalConfigs.filter((g) => !("is_auto_mode" in g && g.is_auto_mode)).length}{" "}
-								global vision{" "}
-								{globalConfigs.filter((g) => !("is_auto_mode" in g && g.is_auto_mode)).length === 1
-									? "model"
-									: "models"}
-							</span>{" "}
-							available from your administrator. {(() => {
-								const nonAuto = globalConfigs.filter(
-									(g) => !("is_auto_mode" in g && g.is_auto_mode)
-								);
-								const premium = nonAuto.filter(
-									(g) =>
-										"billing_tier" in g &&
-										(g as { billing_tier?: string }).billing_tier === "premium"
-								).length;
-								const free = nonAuto.length - premium;
-								if (premium > 0 && free > 0) {
-									return `${premium} premium, ${free} free.`;
-								}
-								if (premium > 0) {
-									return `All ${premium} premium — debits your shared credit pool.`;
-								}
-								return `All ${free} free.`;
-							})()}
-						</p>
+						{isLoading ? (
+							<div className="flex min-h-[1.625em] items-center">
+								<Skeleton className="h-4 w-60 bg-accent-foreground/15" />
+							</div>
+						) : (
+							<p>
+								<span className="font-medium">
+									{globalConfigs.filter((g) => !("is_auto_mode" in g && g.is_auto_mode)).length}{" "}
+									global vision{" "}
+									{globalConfigs.filter((g) => !("is_auto_mode" in g && g.is_auto_mode)).length ===
+									1
+										? "model"
+										: "models"}
+								</span>{" "}
+								available from your administrator. {(() => {
+									const nonAuto = globalConfigs.filter(
+										(g) => !("is_auto_mode" in g && g.is_auto_mode)
+									);
+									const premium = nonAuto.filter(
+										(g) =>
+											"billing_tier" in g &&
+											(g as { billing_tier?: string }).billing_tier === "premium"
+									).length;
+									const free = nonAuto.length - premium;
+									if (premium > 0 && free > 0) {
+										return `${premium} premium, ${free} free.`;
+									}
+									if (premium > 0) {
+										return `All ${premium} premium — debits your shared credit pool.`;
+									}
+									return `All ${free} free.`;
+								})()}
+							</p>
+						)}
 					</AlertDescription>
 				</Alert>
 			)}
@@ -226,9 +235,6 @@ export function VisionModelManager({ searchSpaceId }: VisionModelManagerProps) {
 			{!isLoading &&
 				globalConfigs.filter((g) => !("is_auto_mode" in g && g.is_auto_mode)).length > 0 && (
 					<div className="space-y-3">
-						<h3 className="text-xs md:text-sm font-semibold text-muted-foreground">
-							Global Vision Models
-						</h3>
 						<div className="grid gap-3 grid-cols-1 sm:grid-cols-2 xl:grid-cols-3">
 							{globalConfigs
 								.filter((g) => !("is_auto_mode" in g && g.is_auto_mode))
@@ -242,7 +248,7 @@ export function VisionModelManager({ searchSpaceId }: VisionModelManagerProps) {
 									return (
 										<Card
 											key={cfg.id}
-											className="border-border/60 bg-muted/20 overflow-hidden h-full"
+											className="group relative overflow-hidden transition-all duration-200 border-accent bg-accent/20 hover:shadow-md h-full"
 										>
 											<CardContent className="p-4 flex flex-col gap-3 h-full">
 												<div className="flex items-center gap-2 min-w-0">
@@ -275,10 +281,13 @@ export function VisionModelManager({ searchSpaceId }: VisionModelManagerProps) {
 														{cfg.description}
 													</p>
 												)}
-												<div className="flex items-center pt-2 border-t border-border/40 mt-auto">
-													<span className="text-[11px] text-muted-foreground/60 truncate">
-														{cfg.model_name}
-													</span>
+												<div className="mt-auto space-y-2">
+													<Separator className="bg-accent" />
+													<div className="flex items-center">
+														<span className="text-[11px] text-muted-foreground/60 truncate">
+															{cfg.model_name}
+														</span>
+													</div>
 												</div>
 											</CardContent>
 										</Card>
@@ -291,29 +300,13 @@ export function VisionModelManager({ searchSpaceId }: VisionModelManagerProps) {
 			{isLoading && (
 				<div className="space-y-4 md:space-y-6">
 					<div className="space-y-4">
-						<div className="flex items-center justify-between">
-							<Skeleton className="h-6 md:h-7 w-40 md:w-48" />
-							<Skeleton className="h-8 md:h-9 w-32 md:w-36 rounded-md" />
-						</div>
 						<div className="grid gap-3 grid-cols-1 sm:grid-cols-2 xl:grid-cols-3">
 							{["skeleton-a", "skeleton-b", "skeleton-c"].map((key) => (
-								<Card key={key} className="border-border/60">
-									<CardContent className="p-4 flex flex-col gap-3">
-										<div className="flex items-center gap-2.5">
-											<Skeleton className="size-4 rounded-full shrink-0" />
-											<div className="space-y-1.5 flex-1 min-w-0">
-												<Skeleton className="h-4 w-28 md:w-32" />
-												<Skeleton className="h-3 w-40 md:w-48" />
-											</div>
-										</div>
-										<div className="flex items-center pt-2 border-t border-border/40">
-											<Skeleton className="h-3 w-20 flex-1" />
-											<Skeleton className="h-3 w-3 rounded-full shrink-0 mx-1" />
-											<div className="flex-1 flex items-center justify-end gap-1.5">
-												<Skeleton className="h-4 w-4 rounded-full" />
-												<Skeleton className="h-3 w-16" />
-											</div>
-										</div>
+								<Card key={key} className="border-accent bg-accent/20">
+									<CardContent className="p-4 flex flex-col gap-3 min-h-32">
+										<Skeleton className="h-4 w-32 md:w-40 bg-accent" />
+										<Skeleton className="h-3 w-full bg-accent" />
+										<Skeleton className="h-3 w-24 md:w-28 bg-accent mt-auto" />
 									</CardContent>
 								</Card>
 							))}
@@ -342,7 +335,7 @@ export function VisionModelManager({ searchSpaceId }: VisionModelManagerProps) {
 
 								return (
 									<div key={config.id}>
-										<Card className="group relative overflow-hidden transition-all duration-200 border-border/60 hover:shadow-md h-full">
+										<Card className="group relative overflow-hidden transition-all duration-200 border-accent bg-accent/20 hover:shadow-md h-full">
 											<CardContent className="p-4 flex flex-col gap-3 h-full">
 												{/* Header: Icon + Name + Actions */}
 												<div className="flex items-center justify-between gap-2">
@@ -402,41 +395,44 @@ export function VisionModelManager({ searchSpaceId }: VisionModelManagerProps) {
 												</div>
 
 												{/* Footer: Date + Creator */}
-												<div className="flex items-center pt-2 border-t border-border/40 mt-auto">
-													<span className="shrink-0 text-[11px] text-muted-foreground/60 whitespace-nowrap">
-														{new Date(config.created_at).toLocaleDateString(undefined, {
-															year: "numeric",
-															month: "short",
-															day: "numeric",
-														})}
-													</span>
-													{member && (
-														<>
-															<Dot className="h-4 w-4 text-muted-foreground/30 shrink-0" />
-															<TooltipProvider>
-																<Tooltip open={isDesktop ? undefined : false}>
-																	<TooltipTrigger asChild>
-																		<div className="min-w-0 flex items-center gap-1.5 cursor-default">
-																			<Avatar className="size-4.5 shrink-0">
-																				{member.avatarUrl && (
-																					<AvatarImage src={member.avatarUrl} alt={member.name} />
-																				)}
-																				<AvatarFallback className="text-[9px]">
-																					{getInitials(member.name)}
-																				</AvatarFallback>
-																			</Avatar>
-																			<span className="text-[11px] text-muted-foreground/60 truncate">
-																				{member.name}
-																			</span>
-																		</div>
-																	</TooltipTrigger>
-																	<TooltipContent side="bottom">
-																		{member.email || member.name}
-																	</TooltipContent>
-																</Tooltip>
-															</TooltipProvider>
-														</>
-													)}
+												<div className="mt-auto space-y-2">
+													<Separator className="bg-accent" />
+													<div className="flex items-center">
+														<span className="shrink-0 text-[11px] text-muted-foreground/60 whitespace-nowrap">
+															{new Date(config.created_at).toLocaleDateString(undefined, {
+																year: "numeric",
+																month: "short",
+																day: "numeric",
+															})}
+														</span>
+														{member && (
+															<>
+																<Dot className="h-4 w-4 text-muted-foreground/30 shrink-0" />
+																<TooltipProvider>
+																	<Tooltip open={isDesktop ? undefined : false}>
+																		<TooltipTrigger asChild>
+																			<div className="min-w-0 flex items-center gap-1.5 cursor-default">
+																				<Avatar className="size-4.5 shrink-0">
+																					{member.avatarUrl && (
+																						<AvatarImage src={member.avatarUrl} alt={member.name} />
+																					)}
+																					<AvatarFallback className="text-[9px]">
+																						{getInitials(member.name)}
+																					</AvatarFallback>
+																				</Avatar>
+																				<span className="text-[11px] text-muted-foreground/60 truncate">
+																					{member.name}
+																				</span>
+																			</div>
+																		</TooltipTrigger>
+																		<TooltipContent side="bottom">
+																			{member.email || member.name}
+																		</TooltipContent>
+																	</Tooltip>
+																</TooltipProvider>
+															</>
+														)}
+													</div>
 												</div>
 											</CardContent>
 										</Card>

From 3b168e987d838705ece24d4ad17e37aca5052047 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Tue, 19 May 2026 11:40:06 +0530
Subject: [PATCH 84/96] feat: add TeamPage component and remove TeamDialog for
 improved team management interface

---
 .../dashboard/[search_space_id]/team/page.tsx | 15 +++++++++
 .../components/AgentPermissionsContent.tsx    |  6 ++--
 .../components/AgentStatusContent.tsx         |  4 +--
 surfsense_web/atoms/layout/dialogs.atom.ts    |  2 --
 .../layout/providers/LayoutDataProvider.tsx   | 17 +++++-----
 .../components/settings/team-dialog.tsx       | 32 -------------------
 6 files changed, 28 insertions(+), 48 deletions(-)
 create mode 100644 surfsense_web/app/dashboard/[search_space_id]/team/page.tsx
 delete mode 100644 surfsense_web/components/settings/team-dialog.tsx

diff --git a/surfsense_web/app/dashboard/[search_space_id]/team/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/team/page.tsx
new file mode 100644
index 000000000..c75eaf4e4
--- /dev/null
+++ b/surfsense_web/app/dashboard/[search_space_id]/team/page.tsx
@@ -0,0 +1,15 @@
+import { TeamContent } from "./team-content";
+
+export default async function TeamPage({
+	params,
+}: {
+	params: Promise<{ search_space_id: string }>;
+}) {
+	const { search_space_id } = await params;
+
+	return (
+		<div className="w-full select-none space-y-6">
+			<TeamContent searchSpaceId={Number(search_space_id)} />
+		</div>
+	);
+}
diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/AgentPermissionsContent.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/AgentPermissionsContent.tsx
index 0ef65d98b..e87798a14 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/AgentPermissionsContent.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/AgentPermissionsContent.tsx
@@ -307,9 +307,9 @@ export function AgentPermissionsContent() {
 									<SelectValue />
 								</SelectTrigger>
 								<SelectContent>
-									<SelectItem value="allow">Allow — run without asking</SelectItem>
-									<SelectItem value="ask">Ask — pause for approval</SelectItem>
-									<SelectItem value="deny">Deny — block silently</SelectItem>
+									<SelectItem value="allow">Allow (run without asking)</SelectItem>
+									<SelectItem value="ask">Ask (pause for approval)</SelectItem>
+									<SelectItem value="deny">Deny (block silently)</SelectItem>
 								</SelectContent>
 							</Select>
 							<p className="text-[11px] text-muted-foreground">
diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/AgentStatusContent.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/AgentStatusContent.tsx
index e32e1bfc6..fd7be1a23 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/AgentStatusContent.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/AgentStatusContent.tsx
@@ -285,8 +285,8 @@ export function AgentStatusContent() {
 					</AlertTitle>
 					<AlertDescription>
 						<p>
-							Showing a read-only mirror of the backend's <code>AgentFeatureFlags</code>. Flip an env
-							var and restart the backend to change a value.
+							Showing a read-only mirror of the backend's <code>AgentFeatureFlags</code>. Flip an
+							env var and restart the backend to change a value.
 						</p>
 					</AlertDescription>
 				</Alert>
diff --git a/surfsense_web/atoms/layout/dialogs.atom.ts b/surfsense_web/atoms/layout/dialogs.atom.ts
index e9ee0c6ea..01c4628cc 100644
--- a/surfsense_web/atoms/layout/dialogs.atom.ts
+++ b/surfsense_web/atoms/layout/dialogs.atom.ts
@@ -1,5 +1,3 @@
 import { atom } from "jotai";
 
-export const teamDialogAtom = atom<boolean>(false);
-
 export const announcementsDialogAtom = atom<boolean>(false);
diff --git a/surfsense_web/components/layout/providers/LayoutDataProvider.tsx b/surfsense_web/components/layout/providers/LayoutDataProvider.tsx
index 5d1f2566b..917d1c6e1 100644
--- a/surfsense_web/components/layout/providers/LayoutDataProvider.tsx
+++ b/surfsense_web/components/layout/providers/LayoutDataProvider.tsx
@@ -11,7 +11,7 @@ import { toast } from "sonner";
 import { currentThreadAtom, resetCurrentThreadAtom } from "@/atoms/chat/current-thread.atom";
 import { documentsSidebarOpenAtom } from "@/atoms/documents/ui.atoms";
 import { statusInboxItemsAtom } from "@/atoms/inbox/status-inbox.atom";
-import { announcementsDialogAtom, teamDialogAtom } from "@/atoms/layout/dialogs.atom";
+import { announcementsDialogAtom } from "@/atoms/layout/dialogs.atom";
 import { rightPanelCollapsedAtom } from "@/atoms/layout/right-panel.atom";
 import { deleteSearchSpaceMutationAtom } from "@/atoms/search-spaces/search-space-mutation.atoms";
 import { searchSpacesAtom } from "@/atoms/search-spaces/search-space-query.atoms";
@@ -19,7 +19,6 @@ import { removeChatTabAtom, syncChatTabAtom, type Tab } from "@/atoms/tabs/tabs.
 import { currentUserAtom } from "@/atoms/user/user-query.atoms";
 import { ActionLogDialog } from "@/components/agent-action-log/action-log-dialog";
 import { AnnouncementsDialog } from "@/components/announcements/AnnouncementsDialog";
-import { TeamDialog } from "@/components/settings/team-dialog";
 import {
 	AlertDialog,
 	AlertDialogAction,
@@ -375,7 +374,6 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 		setIsCreateSearchSpaceDialogOpen(true);
 	}, []);
 
-	const setTeamDialogOpen = useSetAtom(teamDialogAtom);
 	const setAnnouncementsDialog = useSetAtom(announcementsDialogAtom);
 
 	const handleUserSettings = useCallback(() => {
@@ -566,8 +564,8 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 	}, [router, searchSpaceId]);
 
 	const handleManageMembers = useCallback(() => {
-		setTeamDialogOpen(true);
-	}, [setTeamDialogOpen]);
+		router.push(`/dashboard/${searchSpaceId}/team`);
+	}, [router, searchSpaceId]);
 
 	const handleLogout = useCallback(async () => {
 		try {
@@ -661,11 +659,13 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 	const isChatPage = pathname?.includes("/new-chat") ?? false;
 	const isUserSettingsPage = pathname?.includes("/user-settings") === true;
 	const isSearchSpaceSettingsPage = pathname?.includes("/search-space-settings") === true;
+	const isTeamPage = pathname?.endsWith("/team") === true;
 	const useWorkspacePanel =
 		pathname?.endsWith("/buy-more") === true ||
 		pathname?.endsWith("/more-pages") === true ||
 		isUserSettingsPage ||
-		isSearchSpaceSettingsPage;
+		isSearchSpaceSettingsPage ||
+		isTeamPage;
 
 	return (
 		<>
@@ -705,12 +705,12 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 				isChatPage={isChatPage}
 				useWorkspacePanel={useWorkspacePanel}
 				workspacePanelViewportClassName={
-					isUserSettingsPage || isSearchSpaceSettingsPage
+					isUserSettingsPage || isSearchSpaceSettingsPage || isTeamPage
 						? "items-start justify-center px-6 py-8 md:px-10 md:py-10"
 						: undefined
 				}
 				workspacePanelContentClassName={
-					isUserSettingsPage || isSearchSpaceSettingsPage ? "max-w-5xl" : undefined
+					isUserSettingsPage || isSearchSpaceSettingsPage || isTeamPage ? "max-w-5xl" : undefined
 				}
 				isLoadingChats={isLoadingThreads}
 				activeSlideoutPanel={activeSlideoutPanel}
@@ -891,7 +891,6 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 				onOpenChange={setIsCreateSearchSpaceDialogOpen}
 			/>
 
-			<TeamDialog searchSpaceId={Number(searchSpaceId)} />
 			<AnnouncementsDialog />
 
 			{/* Agent action log + revert dialog */}
diff --git a/surfsense_web/components/settings/team-dialog.tsx b/surfsense_web/components/settings/team-dialog.tsx
deleted file mode 100644
index eb601fb64..000000000
--- a/surfsense_web/components/settings/team-dialog.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-"use client";
-
-import { useAtom } from "jotai";
-import { useTranslations } from "next-intl";
-import { TeamContent } from "@/app/dashboard/[search_space_id]/team/team-content";
-import { teamDialogAtom } from "@/atoms/layout/dialogs.atom";
-import { Dialog, DialogContent, DialogTitle } from "@/components/ui/dialog";
-
-interface TeamDialogProps {
-	searchSpaceId: number;
-}
-
-export function TeamDialog({ searchSpaceId }: TeamDialogProps) {
-	const t = useTranslations("sidebar");
-	const [open, setOpen] = useAtom(teamDialogAtom);
-
-	return (
-		<Dialog open={open} onOpenChange={setOpen}>
-			<DialogContent
-				className="select-none max-w-[900px] w-[95vw] md:w-[90vw] h-[90vh] md:h-[80vh] max-h-[640px] flex flex-col p-0 gap-0 overflow-hidden [--card:var(--popover)]"
-				onOpenAutoFocus={(e) => e.preventDefault()}
-			>
-				<DialogTitle className="sr-only">{t("manage_members")}</DialogTitle>
-				<div className="flex-1 overflow-y-auto overflow-x-hidden">
-					<div className="px-6 md:px-8 py-6 min-w-0">
-						<TeamContent searchSpaceId={searchSpaceId} />
-					</div>
-				</div>
-			</DialogContent>
-		</Dialog>
-	);
-}

From ca0e08787ce0498c2055d50e7ecc285f20bf94e5 Mon Sep 17 00:00:00 2001
From: Matt Van Horn <mvanhorn@gmail.com>
Date: Mon, 18 May 2026 23:46:50 -0700
Subject: [PATCH 85/96] fix(slide-out): use shared useIsMobile (768px) instead
 of ad-hoc 640px media query

Fixes #1359

The SidebarSlideOutPanel was checking '(min-width: 640px)' while the rest of
the dashboard uses the project-wide useIsMobile() at 768px. At viewports
between 640-767px the slide-out rendered the desktop side-attached overlay
while the surrounding layout had already collapsed to mobile, leaving the
panel positioned against a sidebar that was no longer there.

Aligning to the shared hook fixes the layout choice at every viewport size.
useIsMobile's 768px threshold is unchanged; only this call site adapts.
---
 .../components/layout/ui/sidebar/SidebarSlideOutPanel.tsx     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/surfsense_web/components/layout/ui/sidebar/SidebarSlideOutPanel.tsx b/surfsense_web/components/layout/ui/sidebar/SidebarSlideOutPanel.tsx
index dbfdf0304..72530eaf0 100644
--- a/surfsense_web/components/layout/ui/sidebar/SidebarSlideOutPanel.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/SidebarSlideOutPanel.tsx
@@ -2,7 +2,7 @@
 
 import { AnimatePresence, motion } from "motion/react";
 import { useCallback, useEffect } from "react";
-import { useMediaQuery } from "@/hooks/use-media-query";
+import { useIsMobile } from "@/hooks/use-mobile";
 import { SLIDEOUT_PANEL_OPENED_EVENT } from "@/lib/layout-events";
 
 interface SidebarSlideOutPanelProps {
@@ -28,7 +28,7 @@ export function SidebarSlideOutPanel({
 	width = 360,
 	children,
 }: SidebarSlideOutPanelProps) {
-	const isMobile = !useMediaQuery("(min-width: 640px)");
+	const isMobile = useIsMobile();
 
 	useEffect(() => {
 		if (open) {

From 78ad19dd6a6ba3deb45eaa533e7e9435d817f8fe Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Tue, 19 May 2026 12:59:02 +0530
Subject: [PATCH 86/96] refactor: enhance PromptsContent with dropdown menu for
 actions, update loading states, and improve styling consistency

---
 .../components/PromptsContent.tsx             | 96 +++++++++++--------
 .../assistant-ui/markdown-code-block.tsx      | 23 +----
 .../components/assistant-ui/markdown-text.tsx | 29 ++----
 .../components/assistant-ui/thread.tsx        | 10 +-
 surfsense_web/components/ui/tooltip.tsx       |  2 +-
 5 files changed, 68 insertions(+), 92 deletions(-)

diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/PromptsContent.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/PromptsContent.tsx
index 10885957b..e9415a1f2 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/PromptsContent.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/PromptsContent.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { useAtomValue } from "jotai";
-import { AlertTriangle, Globe, Lock, Pencil, Sparkles, Trash2 } from "lucide-react";
+import { AlertTriangle, Globe, Lock, MoreHorizontal, Pencil, Sparkles, Trash2 } from "lucide-react";
 import { useCallback, useState } from "react";
 import { toast } from "sonner";
 import {
@@ -10,6 +10,7 @@ import {
 	updatePromptMutationAtom,
 } from "@/atoms/prompts/prompts-mutation.atoms";
 import { promptsAtom } from "@/atoms/prompts/prompts-query.atoms";
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import {
 	AlertDialog,
 	AlertDialogAction,
@@ -20,7 +21,6 @@ import {
 	AlertDialogHeader,
 	AlertDialogTitle,
 } from "@/components/ui/alert-dialog";
-import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Button } from "@/components/ui/button";
 import { Card, CardContent } from "@/components/ui/card";
 import {
@@ -31,10 +31,14 @@ import {
 	DialogHeader,
 	DialogTitle,
 } from "@/components/ui/dialog";
+import {
+	DropdownMenu,
+	DropdownMenuContent,
+	DropdownMenuItem,
+	DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
-import { ShortcutKbd } from "@/components/ui/shortcut-kbd";
-import { Skeleton } from "@/components/ui/skeleton";
 import {
 	Select,
 	SelectContent,
@@ -42,6 +46,8 @@ import {
 	SelectTrigger,
 	SelectValue,
 } from "@/components/ui/select";
+import { ShortcutKbd } from "@/components/ui/shortcut-kbd";
+import { Skeleton } from "@/components/ui/skeleton";
 import { Spinner } from "@/components/ui/spinner";
 import { Switch } from "@/components/ui/switch";
 import type { PromptRead } from "@/contracts/types/prompts.types";
@@ -221,8 +227,12 @@ export function PromptsContent() {
 									<SelectValue />
 								</SelectTrigger>
 								<SelectContent>
-									<SelectItem value="transform">Transform — rewrites or modifies your text</SelectItem>
-									<SelectItem value="explore">Explore — answers a question about your text</SelectItem>
+									<SelectItem value="transform">
+										Transform — rewrites or modifies your text
+									</SelectItem>
+									<SelectItem value="explore">
+										Explore — answers a question about your text
+									</SelectItem>
 								</SelectContent>
 							</Select>
 						</div>
@@ -333,41 +343,45 @@ export function PromptsContent() {
 									</Button>
 								)}
 							</div>
-							<div className="flex items-center gap-1 shrink-0 opacity-0 pointer-events-none transition-opacity duration-150 group-hover:opacity-100 group-hover:pointer-events-auto">
-								<Button
-									type="button"
-									variant="ghost"
-									size="icon"
-									title={prompt.is_public ? "Make private" : "Share with community"}
-									onClick={() => handleTogglePublic(prompt)}
-									disabled={togglingPublicIds.has(prompt.id)}
-									className="h-7 w-7 rounded-lg text-muted-foreground hover:text-accent-foreground"
-								>
-									{togglingPublicIds.has(prompt.id) ? (
-										<Spinner className="size-3.5" />
-									) : prompt.is_public ? (
-										<Lock className="size-3.5" />
-									) : (
-										<Globe className="size-3.5" />
-									)}
-								</Button>
-								<Button
-									variant="ghost"
-									size="icon"
-									className="h-7 w-7 rounded-lg text-muted-foreground hover:text-accent-foreground"
-									onClick={() => handleEdit(prompt)}
-								>
-									<Pencil className="size-3.5" />
-								</Button>
-								<Button
-									variant="ghost"
-									size="icon"
-									className="h-7 w-7 rounded-lg text-muted-foreground hover:text-destructive"
-									onClick={() => setDeleteTarget(prompt.id)}
-								>
-									<Trash2 className="size-3.5" />
-								</Button>
-							</div>
+							<DropdownMenu>
+								<DropdownMenuTrigger asChild>
+									<Button
+										type="button"
+										variant="ghost"
+										size="icon"
+										className="h-7 w-7 shrink-0 self-center rounded-lg text-muted-foreground opacity-100 pointer-events-auto transition-opacity duration-150 hover:text-accent-foreground sm:opacity-0 sm:pointer-events-none sm:group-hover:opacity-100 sm:group-hover:pointer-events-auto"
+									>
+										<MoreHorizontal className="size-3.5" />
+										<span className="sr-only">Prompt actions</span>
+									</Button>
+								</DropdownMenuTrigger>
+								<DropdownMenuContent align="end">
+									<DropdownMenuItem
+										onClick={() => handleTogglePublic(prompt)}
+										disabled={togglingPublicIds.has(prompt.id)}
+									>
+										{togglingPublicIds.has(prompt.id) ? (
+											<Spinner className="size-4" />
+										) : prompt.is_public ? (
+											<Lock className="size-4" />
+										) : (
+											<Globe className="size-4" />
+										)}
+										{prompt.is_public ? "Make private" : "Share with community"}
+									</DropdownMenuItem>
+									<DropdownMenuItem onClick={() => handleEdit(prompt)}>
+										<Pencil className="size-4" />
+										Edit
+									</DropdownMenuItem>
+									<DropdownMenuItem
+										onClick={() => setDeleteTarget(prompt.id)}
+										className="text-destructive focus:text-destructive"
+									>
+										<Trash2 className="size-4" />
+										Delete
+									</DropdownMenuItem>
+								</DropdownMenuContent>
+							</DropdownMenu>
 						</div>
 					))}
 				</div>
diff --git a/surfsense_web/components/assistant-ui/markdown-code-block.tsx b/surfsense_web/components/assistant-ui/markdown-code-block.tsx
index 3c8d79ec9..e6c735d1e 100644
--- a/surfsense_web/components/assistant-ui/markdown-code-block.tsx
+++ b/surfsense_web/components/assistant-ui/markdown-code-block.tsx
@@ -7,7 +7,6 @@ import { Prism as SyntaxHighlighter } from "react-syntax-highlighter";
 import { materialDark, materialLight } from "react-syntax-highlighter/dist/esm/styles/prism";
 
 import { Button } from "@/components/ui/button";
-import { Skeleton } from "@/components/ui/skeleton";
 import { cn, copyToClipboard } from "@/lib/utils";
 
 type MarkdownCodeBlockProps = {
@@ -49,7 +48,7 @@ function MarkdownCodeBlockComponent({
 	}, [hasCopied]);
 
 	return (
-		<div className="mt-4 overflow-hidden rounded-2xl" style={{ background: "var(--syntax-bg)" }}>
+		<div className="mt-4 overflow-hidden rounded-md bg-accent">
 			<div className="flex items-center justify-between gap-4 px-4 py-2 font-semibold text-muted-foreground text-sm">
 				<span className="lowercase text-xs">{language}</span>
 				<Button
@@ -82,23 +81,3 @@ function MarkdownCodeBlockComponent({
 }
 
 export const MarkdownCodeBlock = memo(MarkdownCodeBlockComponent);
-
-export function MarkdownCodeBlockSkeleton() {
-	return (
-		<div
-			className="mt-4 overflow-hidden rounded-2xl border"
-			style={{ background: "var(--syntax-bg)" }}
-		>
-			<div className="flex items-center justify-between gap-4 border-b px-4 py-2">
-				<Skeleton className="h-3 w-16" />
-				<Skeleton className="h-8 w-8 rounded-md" />
-			</div>
-			<div className="space-y-2 p-4">
-				<Skeleton className="h-4 w-11/12" />
-				<Skeleton className="h-4 w-10/12" />
-				<Skeleton className="h-4 w-8/12" />
-				<Skeleton className="h-4 w-9/12" />
-			</div>
-		</div>
-	);
-}
diff --git a/surfsense_web/components/assistant-ui/markdown-text.tsx b/surfsense_web/components/assistant-ui/markdown-text.tsx
index 43d435d20..69c1831ca 100644
--- a/surfsense_web/components/assistant-ui/markdown-text.tsx
+++ b/surfsense_web/components/assistant-ui/markdown-text.tsx
@@ -22,7 +22,6 @@ import { MentionChip } from "@/components/assistant-ui/mention-chip";
 import "katex/dist/katex.min.css";
 import { toast } from "sonner";
 import { processChildrenWithCitations } from "@/components/citations/citation-renderer";
-import { Skeleton } from "@/components/ui/skeleton";
 import { tryGetHostname } from "@/lib/url";
 
 import {
@@ -39,30 +38,14 @@ import { getVirtualPathDisplay } from "@/lib/chat/virtual-path-display";
 import { type CitationUrlMap, preprocessCitationMarkdown } from "@/lib/citations/citation-parser";
 import { cn } from "@/lib/utils";
 
-function MarkdownCodeBlockSkeleton() {
-	return (
-		<div
-			className="mt-4 overflow-hidden rounded-2xl border"
-			style={{ background: "var(--syntax-bg)" }}
-		>
-			<div className="flex items-center justify-between gap-4 border-b px-4 py-2">
-				<Skeleton className="h-3 w-16" />
-				<Skeleton className="h-8 w-8 rounded-md" />
-			</div>
-			<div className="space-y-2 p-4">
-				<Skeleton className="h-4 w-11/12" />
-				<Skeleton className="h-4 w-10/12" />
-				<Skeleton className="h-4 w-8/12" />
-				<Skeleton className="h-4 w-9/12" />
-			</div>
-		</div>
-	);
+function MarkdownCodeBlockLoading() {
+	return <div className="mt-4 h-32 overflow-hidden rounded-md bg-accent" />;
 }
 
 const LazyMarkdownCodeBlock = dynamic(
 	() => import("./markdown-code-block").then((mod) => mod.MarkdownCodeBlock),
 	{
-		loading: () => <MarkdownCodeBlockSkeleton />,
+		loading: () => <MarkdownCodeBlockLoading />,
 	}
 );
 
@@ -443,7 +426,7 @@ const defaultComponents = memoizeMarkdownComponents({
 		<hr className={cn("aui-md-hr my-5 border-b", className)} {...props} />
 	),
 	table: ({ className, ...props }) => (
-		<div className="aui-md-table-wrapper my-5 overflow-hidden rounded-2xl border">
+		<div className="aui-md-table-wrapper my-5 overflow-hidden rounded-md border">
 			<Table className={cn("aui-md-table", className)} {...props} />
 		</div>
 	),
@@ -520,7 +503,7 @@ const defaultComponents = memoizeMarkdownComponents({
 			return (
 				<code
 					className={cn(
-						"aui-md-inline-code rounded-md border bg-muted px-1.5 py-0.5 font-mono text-[0.9em] font-normal",
+						"aui-md-inline-code rounded-md bg-primary/10 px-1.5 py-0.5 font-mono text-[0.9em] font-normal text-primary/80",
 						className
 					)}
 					{...props}
@@ -533,7 +516,7 @@ const defaultComponents = memoizeMarkdownComponents({
 			return (
 				<code
 					className={cn(
-						"aui-md-inline-code rounded-md border bg-muted px-1.5 py-0.5 font-mono text-[0.9em] font-normal",
+						"aui-md-inline-code rounded-md bg-primary/10 px-1.5 py-0.5 font-mono text-[0.9em] font-normal text-primary/80",
 						className
 					)}
 					{...props}
diff --git a/surfsense_web/components/assistant-ui/thread.tsx b/surfsense_web/components/assistant-ui/thread.tsx
index 2974ef1eb..873631a83 100644
--- a/surfsense_web/components/assistant-ui/thread.tsx
+++ b/surfsense_web/components/assistant-ui/thread.tsx
@@ -916,8 +916,8 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 								<Button
 									variant="ghost"
 									size="icon"
-									className="size-9 rounded-full p-1 font-semibold text-xs text-muted-foreground dark:border-muted-foreground/15 hover:bg-accent hover:text-accent-foreground"
-									aria-label="More actions"
+									className="h-9 w-9 rounded-full p-0 font-semibold text-xs text-muted-foreground transition-colors dark:border-muted-foreground/15 hover:bg-foreground/10 hover:text-foreground"
+									aria-label="Upload files, connect tools and more"
 									data-joyride="connector-icon"
 								>
 									<Plus className="size-5" />
@@ -1066,13 +1066,13 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 					<DropdownMenu onOpenChange={(open) => !open && setToolsPopoverOpen(false)}>
 						<DropdownMenuTrigger asChild>
 							<TooltipIconButton
-								tooltip="More actions"
+								tooltip="Upload files, connect tools and more"
 								side="bottom"
 								disableTooltip={toolsPopoverOpen}
 								variant="ghost"
 								size="icon"
-								className="size-9 rounded-full p-1 font-semibold text-xs text-muted-foreground dark:border-muted-foreground/15 hover:bg-accent hover:text-accent-foreground"
-								aria-label="More actions"
+								className="h-9 w-9 rounded-full p-0 font-semibold text-xs text-muted-foreground transition-colors dark:border-muted-foreground/15 hover:bg-foreground/10 hover:text-foreground"
+								aria-label="Upload files, connect tools and more"
 								data-joyride="connector-icon"
 							>
 								<Plus className="size-5" />
diff --git a/surfsense_web/components/ui/tooltip.tsx b/surfsense_web/components/ui/tooltip.tsx
index 80650aae3..4253c50d4 100644
--- a/surfsense_web/components/ui/tooltip.tsx
+++ b/surfsense_web/components/ui/tooltip.tsx
@@ -71,7 +71,7 @@ function TooltipContent({
 				data-slot="tooltip-content"
 				sideOffset={sideOffset}
 				className={cn(
-					"bg-neutral-800 text-white font-medium shadow-md shadow-neutral-950/40 px-3 py-1.5 dark:bg-neutral-800 dark:text-white border-none animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-fit rounded-md text-xs text-pretty pointer-events-none select-none",
+					"bg-neutral-950 text-white font-medium px-3 py-1.5 dark:bg-neutral-950 dark:text-white border-none animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-fit rounded-md text-xs text-pretty pointer-events-none select-none",
 					className
 				)}
 				{...props}

From a5bd2bea9cfb73cfb60460118d60872ce0b9c20f Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Tue, 19 May 2026 16:45:16 +0530
Subject: [PATCH 87/96] feat: integrate collapsible sections for connector
 management in ComposerAction, add new connector icons for Discord, Teams, and
 Luma

---
 .../components/assistant-ui/thread.tsx        | 369 ++++++++++++++----
 surfsense_web/components/ui/dropdown-menu.tsx |   4 +-
 surfsense_web/contracts/enums/toolIcons.tsx   |  12 +-
 3 files changed, 300 insertions(+), 85 deletions(-)

diff --git a/surfsense_web/components/assistant-ui/thread.tsx b/surfsense_web/components/assistant-ui/thread.tsx
index 873631a83..06a064840 100644
--- a/surfsense_web/components/assistant-ui/thread.tsx
+++ b/surfsense_web/components/assistant-ui/thread.tsx
@@ -12,7 +12,7 @@ import {
 	ArrowUpIcon,
 	Camera,
 	ChevronDown,
-	ChevronUp,
+	ChevronRight,
 	Clipboard,
 	Globe,
 	Plus,
@@ -72,6 +72,11 @@ import {
 import { PromptPicker, type PromptPickerRef } from "@/components/new-chat/prompt-picker";
 import { Avatar, AvatarFallback, AvatarGroup } from "@/components/ui/avatar";
 import { Button } from "@/components/ui/button";
+import {
+	Collapsible,
+	CollapsibleContent,
+	CollapsibleTrigger,
+} from "@/components/ui/collapsible";
 import {
 	Drawer,
 	DrawerContent,
@@ -378,7 +383,7 @@ const ClipboardChip: FC<{ text: string; onDismiss: () => void }> = ({ text, onDi
 						size="icon"
 						className="size-5 text-muted-foreground hover:bg-transparent hover:text-accent-foreground"
 					>
-						{expanded ? <ChevronUp className="size-3.5" /> : <ChevronDown className="size-3.5" />}
+						<ChevronDown className={cn("size-3.5 transition-transform", expanded && "rotate-180")} />
 					</Button>
 				)}
 				<Button
@@ -799,6 +804,10 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 	const mentionedDocuments = useAtomValue(mentionedDocumentsAtom);
 	const setConnectorDialogOpen = useSetAtom(connectorDialogOpenAtom);
 	const [toolsPopoverOpen, setToolsPopoverOpen] = useState(false);
+	const [openConnectorSubmenu, setOpenConnectorSubmenu] = useState<string | null>(null);
+	const [expandedConnectorGroups, setExpandedConnectorGroups] = useState<Set<string>>(
+		() => new Set()
+	);
 	const isDesktop = useMediaQuery("(min-width: 640px)");
 	const { openDialog: openUploadDialog } = useDocumentUploadDialog();
 	const pendingScreenImages = useAtomValue(pendingUserImageDataUrlsAtom);
@@ -847,6 +856,17 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 		},
 		[disabledToolsSet, setDisabledTools]
 	);
+	const setConnectorGroupExpanded = useCallback((label: string, expanded: boolean) => {
+		setExpandedConnectorGroups((prev) => {
+			const next = new Set(prev);
+			if (expanded) {
+				next.add(label);
+			} else {
+				next.delete(label);
+			}
+			return next;
+		});
+	}, []);
 
 	const hasWebSearchTool = agentTools?.some((t) => t.name === "web_search") ?? false;
 	const isWebSearchEnabled = hasWebSearchTool && !disabledToolsSet.has("web_search");
@@ -888,6 +908,9 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 
 		return result;
 	}, [filteredTools, connectedTypes]);
+	const regularToolGroups = groupedTools.filter((g) => !g.connectorIcon && g.label !== "Other");
+	const connectorToolGroups = groupedTools.filter((g) => g.connectorIcon);
+	const otherToolGroup = groupedTools.find((g) => !g.connectorIcon && g.label === "Other");
 
 	useEffect(() => {
 		hydrateDisabled();
@@ -917,17 +940,13 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 									variant="ghost"
 									size="icon"
 									className="h-9 w-9 rounded-full p-0 font-semibold text-xs text-muted-foreground transition-colors dark:border-muted-foreground/15 hover:bg-foreground/10 hover:text-foreground"
-									aria-label="Upload files, connect tools and more"
+									aria-label="Upload files, manage tools and more"
 									data-joyride="connector-icon"
 								>
 									<Plus className="size-5" />
 								</Button>
 							</DropdownMenuTrigger>
 							<DropdownMenuContent side="bottom" align="start" sideOffset={8}>
-								<DropdownMenuItem onSelect={() => setToolsPopoverOpen(true)}>
-									<Settings2 className="size-4" />
-									Manage Tools
-								</DropdownMenuItem>
 								<DropdownMenuItem onSelect={() => openUploadDialog()}>
 									<Upload className="size-4" />
 									Upload Files
@@ -952,6 +971,10 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 									<Unplug className="size-4" />
 									Manage Connectors
 								</DropdownMenuItem>
+								<DropdownMenuItem onSelect={() => setToolsPopoverOpen(true)}>
+									<Settings2 className="size-4" />
+									Manage Tools
+								</DropdownMenuItem>
 							</DropdownMenuContent>
 						</DropdownMenu>
 						<Drawer
@@ -967,9 +990,7 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 									</DrawerTitle>
 								</DrawerHeader>
 								<div className="min-h-0 flex-1 overflow-y-auto scrollbar-thin pb-6">
-									{groupedTools
-										.filter((g) => !g.connectorIcon)
-										.map((group) => (
+									{regularToolGroups.map((group) => (
 											<div key={group.label}>
 												<div className="px-4 pt-3 pb-1 text-xs text-muted-foreground/80 font-medium select-none">
 													{group.label}
@@ -996,48 +1017,115 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 												})}
 											</div>
 										))}
-									{groupedTools.some((g) => g.connectorIcon) && (
+									{connectorToolGroups.length > 0 && (
 										<div>
 											<div className="px-4 pt-3 pb-1 text-xs text-muted-foreground/80 font-medium select-none">
 												Connector Actions
 											</div>
-											{groupedTools
-												.filter((g) => g.connectorIcon)
-												.map((group) => {
+											{connectorToolGroups.map((group) => {
 													const iconKey = group.connectorIcon ?? "";
 													const iconInfo = CONNECTOR_TOOL_ICON_PATHS[iconKey];
 													const toolNames = group.tools.map((t) => t.name);
 													const allDisabled = toolNames.every((n) => disabledToolsSet.has(n));
+													const isExpanded = expandedConnectorGroups.has(group.label);
 													return (
-														<div
+														<Collapsible
 															key={group.label}
-															className="flex w-full items-center gap-3 px-4 py-2 hover:bg-accent hover:text-accent-foreground transition-colors"
+															open={isExpanded}
+															onOpenChange={(open) =>
+																setConnectorGroupExpanded(group.label, open)
+															}
 														>
-															{iconInfo ? (
-																<Image
-																	src={iconInfo.src}
-																	alt={iconInfo.alt}
-																	width={18}
-																	height={18}
-																	className="size-[18px] shrink-0 select-none pointer-events-none"
-																	draggable={false}
+															<div className="flex w-full items-center gap-3 px-4 py-2 hover:bg-accent hover:text-accent-foreground transition-colors">
+																<CollapsibleTrigger asChild>
+																	<button
+																		type="button"
+																		className="flex min-w-0 flex-1 items-center gap-3 text-left"
+																	>
+																		{iconInfo ? (
+																			<Image
+																				src={iconInfo.src}
+																				alt={iconInfo.alt}
+																				width={18}
+																				height={18}
+																				className="size-[18px] shrink-0 select-none pointer-events-none"
+																				draggable={false}
+																			/>
+																		) : (
+																			<Wrench className="size-4 shrink-0 text-muted-foreground" />
+																		)}
+																		<span className="min-w-0 flex-1 truncate text-sm font-medium">
+																			{group.label}
+																		</span>
+																		{isExpanded ? (
+																			<ChevronDown className="size-4 shrink-0 text-muted-foreground" />
+																		) : (
+																			<ChevronRight className="size-4 shrink-0 text-muted-foreground" />
+																		)}
+																	</button>
+																</CollapsibleTrigger>
+																<Switch
+																	checked={!allDisabled}
+																	onCheckedChange={() => toggleToolGroup(toolNames)}
+																	className="shrink-0"
 																/>
-															) : (
-																<Wrench className="size-4 shrink-0 text-muted-foreground" />
-															)}
-															<span className="flex-1 min-w-0 text-sm font-medium truncate">
-																{group.label}
-															</span>
-															<Switch
-																checked={!allDisabled}
-																onCheckedChange={() => toggleToolGroup(toolNames)}
-																className="shrink-0"
-															/>
-														</div>
+															</div>
+															<CollapsibleContent className="pb-1">
+																{group.tools.map((tool) => {
+																	const isDisabled = disabledToolsSet.has(tool.name);
+																	return (
+																		<div
+																			key={tool.name}
+																			className={cn(
+																				"ml-8 flex items-center gap-3 px-4 py-1.5 rounded-md transition-colors",
+																				"hover:bg-accent hover:text-accent-foreground",
+																				!isDisabled && "text-primary"
+																			)}
+																		>
+																			<span className="min-w-0 flex-1 truncate text-sm">
+																				{formatToolName(tool.name)}
+																			</span>
+																			<Switch
+																				checked={!isDisabled}
+																				onCheckedChange={() => toggleTool(tool.name)}
+																				className="shrink-0"
+																			/>
+																		</div>
+																	);
+																})}
+															</CollapsibleContent>
+														</Collapsible>
 													);
 												})}
 										</div>
 									)}
+									{otherToolGroup && (
+										<div>
+											<div className="px-4 pt-3 pb-1 text-xs text-muted-foreground/80 font-medium select-none">
+												{otherToolGroup.label}
+											</div>
+											{otherToolGroup.tools.map((tool) => {
+												const isDisabled = disabledToolsSet.has(tool.name);
+												const ToolIcon = getToolIcon(tool.name);
+												return (
+													<div
+														key={tool.name}
+														className="flex w-full items-center gap-3 px-4 py-2 hover:bg-accent hover:text-accent-foreground transition-colors"
+													>
+														<ToolIcon className="size-4 shrink-0 text-muted-foreground" />
+														<span className="flex-1 min-w-0 text-sm font-medium truncate">
+															{formatToolName(tool.name)}
+														</span>
+														<Switch
+															checked={!isDisabled}
+															onCheckedChange={() => toggleTool(tool.name)}
+															className="shrink-0"
+														/>
+													</div>
+												);
+											})}
+										</div>
+									)}
 									{!filteredTools?.length && (
 										<div className="px-4 pt-3 pb-2">
 											<Skeleton className="h-3 w-16 mb-2" />
@@ -1063,16 +1151,23 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 						</Drawer>
 					</>
 				) : (
-					<DropdownMenu onOpenChange={(open) => !open && setToolsPopoverOpen(false)}>
+					<DropdownMenu
+						onOpenChange={(open) => {
+							if (!open) {
+								setToolsPopoverOpen(false);
+								setOpenConnectorSubmenu(null);
+							}
+						}}
+					>
 						<DropdownMenuTrigger asChild>
 							<TooltipIconButton
-								tooltip="Upload files, connect tools and more"
+								tooltip="Upload files, manage tools and more"
 								side="bottom"
 								disableTooltip={toolsPopoverOpen}
 								variant="ghost"
 								size="icon"
 								className="h-9 w-9 rounded-full p-0 font-semibold text-xs text-muted-foreground transition-colors dark:border-muted-foreground/15 hover:bg-foreground/10 hover:text-foreground"
-								aria-label="Upload files, connect tools and more"
+								aria-label="Upload files, manage tools and more"
 								data-joyride="connector-icon"
 							>
 								<Plus className="size-5" />
@@ -1113,7 +1208,13 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 									/>
 								</DropdownMenuItem>
 							)}
-							<DropdownMenuSub open={toolsPopoverOpen} onOpenChange={setToolsPopoverOpen}>
+							<DropdownMenuSub
+								open={toolsPopoverOpen}
+								onOpenChange={(open) => {
+									setToolsPopoverOpen(open);
+									if (!open) setOpenConnectorSubmenu(null);
+								}}
+							>
 								<DropdownMenuSubTrigger>
 									<Settings2 className="h-4 w-4" />
 									Manage Tools
@@ -1123,10 +1224,9 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 										alignOffset={-192}
 										collisionPadding={8}
 										className="w-60 h-56 gap-1 overflow-y-auto overscroll-none"
+										onScroll={() => setOpenConnectorSubmenu(null)}
 									>
-										{groupedTools
-											.filter((g) => !g.connectorIcon)
-											.map((group) => (
+										{regularToolGroups.map((group) => (
 												<div key={group.label}>
 													<div className="px-2 pt-1.5 pb-0.5 text-[10px] text-muted-foreground/80 font-normal select-none">
 														{group.label}
@@ -1161,54 +1261,127 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 													})}
 												</div>
 											))}
-										{groupedTools.some((g) => g.connectorIcon) && (
+										{connectorToolGroups.length > 0 && (
 											<div>
 												<div className="px-2 pt-1.5 pb-0.5 text-[10px] text-muted-foreground/80 font-normal select-none">
 													Connector Actions
 												</div>
-												{groupedTools
-													.filter((g) => g.connectorIcon)
-													.map((group) => {
+												{connectorToolGroups.map((group) => {
 														const iconKey = group.connectorIcon ?? "";
 														const iconInfo = CONNECTOR_TOOL_ICON_PATHS[iconKey];
 														const toolNames = group.tools.map((t) => t.name);
 														const allDisabled = toolNames.every((n) => disabledToolsSet.has(n));
 														return (
-															<DropdownMenuItem
+															<DropdownMenuSub
 																key={group.label}
-																onSelect={(e) => {
-																	e.preventDefault();
-																	toggleToolGroup(toolNames);
-																}}
-																className={cn(
-																	"mb-1 last:mb-0 transition-all",
-																	"hover:bg-accent hover:text-accent-foreground",
-																	!allDisabled && "text-primary"
-																)}
+																open={openConnectorSubmenu === group.label}
+																onOpenChange={(open) =>
+																	setOpenConnectorSubmenu(open ? group.label : null)
+																}
 															>
-																{iconInfo ? (
-																	<Image
-																		src={iconInfo.src}
-																		alt={iconInfo.alt}
-																		width={16}
-																		height={16}
-																		className="h-4 w-4 shrink-0 select-none pointer-events-none"
-																		draggable={false}
+																<DropdownMenuSubTrigger
+																	className={cn(
+																		"mb-1 last:mb-0 transition-all",
+																		"hover:bg-accent hover:text-accent-foreground",
+																		"gap-1 [&>svg:last-child]:ml-0",
+																		!allDisabled && "text-primary"
+																	)}
+																>
+																	{iconInfo ? (
+																		<Image
+																			src={iconInfo.src}
+																			alt={iconInfo.alt}
+																			width={16}
+																			height={16}
+																			className="h-4 w-4 shrink-0 select-none pointer-events-none"
+																			draggable={false}
+																		/>
+																	) : (
+																		<Wrench className="h-4 w-4" />
+																	)}
+																	<span className="min-w-0 flex-1 truncate">{group.label}</span>
+																	<Switch
+																		checked={!allDisabled}
+																		tabIndex={-1}
+																		onPointerDown={(event) => event.stopPropagation()}
+																		onClick={(event) => event.stopPropagation()}
+																		onCheckedChange={() => toggleToolGroup(toolNames)}
+																		className="shrink-0 scale-[0.6]"
 																	/>
-																) : (
-																	<Wrench className="h-4 w-4" />
-																)}
-																<span className="flex-1 min-w-0 truncate">{group.label}</span>
-																<Switch
-																	checked={!allDisabled}
-																	tabIndex={-1}
-																	className="pointer-events-none shrink-0 scale-[0.6]"
-																/>
-															</DropdownMenuItem>
+																</DropdownMenuSubTrigger>
+																<DropdownMenuPortal>
+																	<DropdownMenuSubContent
+																		collisionPadding={8}
+																		className="w-60 max-h-56 overflow-y-auto overscroll-none"
+																	>
+																		{group.tools.map((tool) => {
+																			const isDisabled = disabledToolsSet.has(tool.name);
+																			return (
+																				<DropdownMenuItem
+																					key={tool.name}
+																					onSelect={(e) => {
+																						e.preventDefault();
+																						toggleTool(tool.name);
+																					}}
+																					className={cn(
+																						"mb-1 last:mb-0 transition-all",
+																						"hover:bg-accent hover:text-accent-foreground",
+																						!isDisabled && "text-primary"
+																					)}
+																				>
+																					<span className="min-w-0 flex-1 truncate">
+																						{formatToolName(tool.name)}
+																					</span>
+																					<Switch
+																						checked={!isDisabled}
+																						tabIndex={-1}
+																						className="pointer-events-none shrink-0 scale-[0.6]"
+																					/>
+																				</DropdownMenuItem>
+																			);
+																		})}
+																	</DropdownMenuSubContent>
+																</DropdownMenuPortal>
+															</DropdownMenuSub>
 														);
 													})}
 											</div>
 										)}
+										{otherToolGroup && (
+											<div>
+												<div className="px-2 pt-1.5 pb-0.5 text-[10px] text-muted-foreground/80 font-normal select-none">
+													{otherToolGroup.label}
+												</div>
+												{otherToolGroup.tools.map((tool) => {
+													const isDisabled = disabledToolsSet.has(tool.name);
+													const ToolIcon = getToolIcon(tool.name);
+													return (
+														<DropdownMenuItem
+															key={tool.name}
+															onSelect={(e) => {
+																e.preventDefault();
+																toggleTool(tool.name);
+															}}
+															className={cn(
+																"mb-1 last:mb-0 transition-all",
+																"hover:bg-accent hover:text-accent-foreground",
+																!isDisabled && "text-primary"
+															)}
+														>
+															<ToolIcon className="h-4 w-4" />
+															<span className="flex-1 min-w-0 truncate">
+																{formatToolName(tool.name)}
+															</span>
+															<Switch
+																checked={!isDisabled}
+																tabIndex={-1}
+																className="pointer-events-none shrink-0 scale-[0.6]"
+															/>
+														</DropdownMenuItem>
+													);
+												})}
+											</div>
+										)}
 										{!filteredTools?.length && (
 											<div className="px-2 pt-1.5 pb-1">
 												<Skeleton className="h-2 w-12 mb-1.5" />
@@ -1300,7 +1473,13 @@ const TOOL_GROUPS: ToolGroup[] = [
 	},
 	{
 		label: "Generate",
-		tools: ["generate_podcast", "generate_video_presentation", "generate_report", "generate_image"],
+		tools: [
+			"generate_podcast",
+			"generate_video_presentation",
+			"generate_report",
+			"generate_resume",
+			"generate_image",
+		],
 	},
 	{
 		label: "Memory",
@@ -1308,15 +1487,27 @@ const TOOL_GROUPS: ToolGroup[] = [
 	},
 	{
 		label: "Gmail",
-		tools: ["create_gmail_draft", "update_gmail_draft", "send_gmail_email", "trash_gmail_email"],
+		tools: [
+			"search_gmail",
+			"read_gmail_email",
+			"create_gmail_draft",
+			"update_gmail_draft",
+			"send_gmail_email",
+			"trash_gmail_email",
+		],
 		connectorIcon: "gmail",
-		tooltip: "Create drafts, update drafts, send emails, and trash emails in Gmail",
+		tooltip: "Search, read, draft, update, send, and trash emails in Gmail",
 	},
 	{
 		label: "Google Calendar",
-		tools: ["create_calendar_event", "update_calendar_event", "delete_calendar_event"],
+		tools: [
+			"search_calendar_events",
+			"create_calendar_event",
+			"update_calendar_event",
+			"delete_calendar_event",
+		],
 		connectorIcon: "google_calendar",
-		tooltip: "Create, update, and delete events in Google Calendar",
+		tooltip: "Search, create, update, and delete events in Google Calendar",
 	},
 	{
 		label: "Google Drive",
@@ -1360,6 +1551,24 @@ const TOOL_GROUPS: ToolGroup[] = [
 		connectorIcon: "confluence",
 		tooltip: "Create, update, and delete pages in Confluence",
 	},
+	{
+		label: "Discord",
+		tools: ["list_discord_channels", "read_discord_messages", "send_discord_message"],
+		connectorIcon: "discord",
+		tooltip: "List channels, read messages, and send messages in Discord",
+	},
+	{
+		label: "Microsoft Teams",
+		tools: ["list_teams_channels", "read_teams_messages", "send_teams_message"],
+		connectorIcon: "teams",
+		tooltip: "List channels, read messages, and send messages in Microsoft Teams",
+	},
+	{
+		label: "Luma",
+		tools: ["list_luma_events", "read_luma_event", "create_luma_event"],
+		connectorIcon: "luma",
+		tooltip: "List, read, and create events in Luma",
+	},
 ];
 
 const EditComposer: FC = () => {
diff --git a/surfsense_web/components/ui/dropdown-menu.tsx b/surfsense_web/components/ui/dropdown-menu.tsx
index fdbdc90d8..421bcfcd2 100644
--- a/surfsense_web/components/ui/dropdown-menu.tsx
+++ b/surfsense_web/components/ui/dropdown-menu.tsx
@@ -33,7 +33,7 @@ function DropdownMenuContent({
 				data-slot="dropdown-menu-content"
 				sideOffset={sideOffset}
 				className={cn(
-					"bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 max-h-(--radix-dropdown-menu-content-available-height) min-w-[8rem] origin-(--radix-dropdown-menu-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-md p-1 shadow-md",
+					"bg-popover text-popover-foreground border border-popover-border data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 max-h-(--radix-dropdown-menu-content-available-height) min-w-[8rem] origin-(--radix-dropdown-menu-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-md p-1 shadow-md",
 					className
 				)}
 				{...props}
@@ -201,7 +201,7 @@ function DropdownMenuSubContent({
 		<DropdownMenuPrimitive.SubContent
 			data-slot="dropdown-menu-sub-content"
 			className={cn(
-				"bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 min-w-[8rem] origin-(--radix-dropdown-menu-content-transform-origin) overflow-hidden rounded-md p-1 shadow-lg",
+				"bg-popover text-popover-foreground border border-popover-border data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 min-w-[8rem] origin-(--radix-dropdown-menu-content-transform-origin) overflow-hidden rounded-md p-1 shadow-lg",
 				className
 			)}
 			{...props}
diff --git a/surfsense_web/contracts/enums/toolIcons.tsx b/surfsense_web/contracts/enums/toolIcons.tsx
index bdb8222cb..bb87be0ba 100644
--- a/surfsense_web/contracts/enums/toolIcons.tsx
+++ b/surfsense_web/contracts/enums/toolIcons.tsx
@@ -2,7 +2,6 @@ import {
 	BookOpen,
 	Brain,
 	Calendar,
-	Check,
 	FileEdit,
 	FilePlus,
 	FileText,
@@ -23,6 +22,7 @@ import {
 	Podcast,
 	ScanLine,
 	Search,
+	SearchCheck,
 	Send,
 	Trash2,
 	Wrench,
@@ -104,7 +104,7 @@ const TOOL_ICONS: Record<string, LucideIcon> = {
 	read_luma_event: Calendar,
 	create_luma_event: Calendar,
 	// Misc
-	get_connected_accounts: Check,
+	get_connected_accounts: SearchCheck,
 	execute: Wrench,
 	execute_code: Wrench,
 };
@@ -200,7 +200,7 @@ const TOOL_DISPLAY_NAMES: Record<string, string> = {
 	read_luma_event: "Read Luma event",
 	create_luma_event: "Create Luma event",
 	// Misc
-	get_connected_accounts: "Check connected accounts",
+	get_connected_accounts: "Discover connected accounts",
 	execute: "Run command",
 	execute_code: "Run code",
 };
@@ -228,6 +228,9 @@ export const CONNECTOR_TOOL_ICON_PATHS: Record<string, { src: string; alt: strin
 	linear: { src: "/connectors/linear.svg", alt: "Linear" },
 	jira: { src: "/connectors/jira.svg", alt: "Jira" },
 	confluence: { src: "/connectors/confluence.svg", alt: "Confluence" },
+	discord: { src: "/connectors/discord.svg", alt: "Discord" },
+	teams: { src: "/connectors/microsoft-teams.svg", alt: "Microsoft Teams" },
+	luma: { src: "/connectors/luma.svg", alt: "Luma" },
 };
 
 export const CONNECTOR_ICON_TO_TYPES: Record<string, string[]> = {
@@ -240,4 +243,7 @@ export const CONNECTOR_ICON_TO_TYPES: Record<string, string[]> = {
 	linear: ["LINEAR_CONNECTOR"],
 	jira: ["JIRA_CONNECTOR"],
 	confluence: ["CONFLUENCE_CONNECTOR"],
+	discord: ["DISCORD_CONNECTOR"],
+	teams: ["TEAMS_CONNECTOR"],
+	luma: ["LUMA_CONNECTOR"],
 };

From 8fd52d340f38fca9bd4af54819cd26dc4e8bd6d2 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Tue, 19 May 2026 17:34:59 +0530
Subject: [PATCH 88/96] refactor: update styling and structure of team content,
 comment panel, and UI components

---
 .../[search_space_id]/team/team-content.tsx   | 145 ++++++++++++------
 .../comment-panel/comment-panel.tsx           |   5 +-
 surfsense_web/components/ui/calendar.tsx      |   4 +-
 surfsense_web/components/ui/input.tsx         |   2 +-
 surfsense_web/components/ui/select.tsx        |   4 +-
 surfsense_web/components/ui/textarea.tsx      |   2 +-
 6 files changed, 109 insertions(+), 53 deletions(-)

diff --git a/surfsense_web/app/dashboard/[search_space_id]/team/team-content.tsx b/surfsense_web/app/dashboard/[search_space_id]/team/team-content.tsx
index fadd617a5..5a54caaaf 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/team/team-content.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/team/team-content.tsx
@@ -240,46 +240,77 @@ export function TeamContent({ searchSpaceId }: TeamContentProps) {
 
 	if (accessLoading || membersLoading) {
 		return (
-			<div className="space-y-6">
-				<div className="flex items-center justify-between">
-					<Skeleton className="h-9 w-36 rounded-md" />
-					<Skeleton className="h-4 w-20" />
+			<div className="space-y-4 md:space-y-6">
+				<div className="flex items-center gap-2 flex-wrap">
+					<Button
+						type="button"
+						variant="outline"
+						size="sm"
+						aria-disabled="true"
+						tabIndex={-1}
+						className="pointer-events-none gap-1.5 md:gap-2 text-xs md:text-sm bg-black text-white dark:bg-white dark:text-black"
+					>
+						<UserPlus className="h-3.5 w-3.5 md:h-4 md:w-4" />
+						Invite members
+					</Button>
+					<Button
+						type="button"
+						variant="secondary"
+						size="sm"
+						aria-disabled="true"
+						tabIndex={-1}
+						className="pointer-events-none gap-1.5 md:gap-2 text-xs md:text-sm"
+					>
+						<Link2 className="h-3.5 w-3.5 md:h-4 md:w-4 rotate-315" />
+						Active invites
+						<span className="inline-flex items-center justify-center h-4 md:h-5 min-w-4 md:min-w-5 px-1 rounded-full bg-neutral-700 text-neutral-200">
+							<Skeleton className="h-2.5 w-2.5 rounded-sm bg-neutral-500/60" />
+						</span>
+					</Button>
+					<div className="flex items-center gap-1 text-xs md:text-sm text-muted-foreground whitespace-nowrap">
+						<Skeleton className="h-3 w-2 rounded-sm" />
+						members
+					</div>
 				</div>
-				<div className="rounded-lg border border-border/40 bg-background overflow-hidden">
+				<div className="rounded-lg border border-border/60 bg-accent overflow-hidden">
 					<Table className="table-fixed w-full">
 						<TableHeader>
-							<TableRow className="hover:bg-transparent border-b border-border/40">
-								<TableHead className="w-[45%] px-4 md:px-6 border-r border-border/40">
-									<Skeleton className="h-3 w-16" />
+							<TableRow className="hover:bg-transparent border-b border-border/60">
+								<TableHead className="w-[45%] px-4 md:px-6 border-r border-border/60">
+									<span className="flex items-center gap-1.5 text-sm font-medium text-muted-foreground/70">
+										<User size={14} className="opacity-60 text-muted-foreground" />
+										Name
+									</span>
 								</TableHead>
-								<TableHead className="hidden md:table-cell w-[25%] border-r border-border/40">
-									<Skeleton className="h-3 w-24" />
+								<TableHead className="hidden md:table-cell w-[25%] border-r border-border/60">
+									<span className="flex items-center gap-1.5 text-sm font-medium text-muted-foreground/70">
+										<Clock size={14} className="opacity-60 text-muted-foreground" />
+										Last logged in
+									</span>
 								</TableHead>
 								<TableHead className="w-[30%] px-4 md:px-6">
-									<div className="flex justify-end">
-										<Skeleton className="h-3 w-12" />
-									</div>
+									<span className="flex items-center gap-1.5 text-sm font-medium text-muted-foreground/70 justify-end">
+										<ShieldUser size={14} className="opacity-60 text-muted-foreground" />
+										Role
+									</span>
 								</TableHead>
 							</TableRow>
 						</TableHeader>
 						<TableBody>
-							{SKELETON_KEYS.map((id) => (
-								<TableRow key={id} className="border-b border-border/40 hover:bg-transparent">
-									<TableCell className="w-[45%] py-2.5 px-4 md:px-6 border-r border-border/40">
+							{SKELETON_KEYS.slice(0, 2).map((id) => (
+								<TableRow key={id} className="border-b border-border/60 hover:bg-transparent">
+									<TableCell className="w-[45%] py-2.5 px-4 md:px-6 border-r border-border/60">
 										<div className="flex items-center gap-3">
 											<Skeleton className="h-10 w-10 rounded-full shrink-0" />
-											<div className="flex-1 min-w-0 space-y-1.5">
-												<Skeleton className="h-4 w-[60%]" />
-												<Skeleton className="h-3 w-[40%]" />
-											</div>
+											<Skeleton className="h-4 w-28 md:w-32" />
 										</div>
 									</TableCell>
-									<TableCell className="hidden md:table-cell w-[25%] py-2.5 border-r border-border/40">
+									<TableCell className="hidden md:table-cell w-[25%] py-2.5 border-r border-border/60">
 										<Skeleton className="h-4 w-24" />
 									</TableCell>
 									<TableCell className="w-[30%] py-2.5 px-4 md:px-6">
 										<div className="flex justify-end">
-											<Skeleton className="h-4 w-16" />
+											<Skeleton className="h-4 w-12" />
 										</div>
 									</TableCell>
 								</TableRow>
@@ -294,41 +325,63 @@ export function TeamContent({ searchSpaceId }: TeamContentProps) {
 	return (
 		<div className="space-y-4 md:space-y-6">
 			<div className="flex items-center gap-2 flex-wrap">
-				{rolesLoading ? (
-					<Skeleton className="h-9 w-32 rounded-md" />
-				) : (
-					canInvite && (
+				{canInvite &&
+					(rolesLoading ? (
+						<Button
+							type="button"
+							variant="outline"
+							size="sm"
+							aria-disabled="true"
+							tabIndex={-1}
+							className="pointer-events-none gap-1.5 md:gap-2 text-xs md:text-sm bg-black text-white dark:bg-white dark:text-black"
+						>
+							<UserPlus className="h-3.5 w-3.5 md:h-4 md:w-4" />
+							Invite members
+						</Button>
+					) : (
 						<CreateInviteDialog
 							roles={roles}
 							onCreateInvite={handleCreateInvite}
 							searchSpaceId={searchSpaceId}
 						/>
-					)
-				)}
-				{invitesLoading ? (
-					<Skeleton className="h-9 w-32 rounded-md" />
-				) : (
-					canInvite &&
-					activeInvites.length > 0 && (
-						<AllInvitesDialog invites={activeInvites} onRevokeInvite={handleRevokeInvite} />
-					)
-				)}
+					))}
+				{canInvite &&
+					(invitesLoading ? (
+						<Button
+							type="button"
+							variant="secondary"
+							size="sm"
+							aria-disabled="true"
+							tabIndex={-1}
+							className="pointer-events-none gap-1.5 md:gap-2 text-xs md:text-sm"
+						>
+							<Link2 className="h-3.5 w-3.5 md:h-4 md:w-4 rotate-315" />
+							Active invites
+							<span className="inline-flex items-center justify-center h-4 md:h-5 min-w-4 md:min-w-5 px-1 rounded-full bg-neutral-700 text-neutral-200">
+								<Skeleton className="h-2.5 w-2.5 rounded-sm bg-neutral-500/60" />
+							</span>
+						</Button>
+					) : (
+						activeInvites.length > 0 && (
+							<AllInvitesDialog invites={activeInvites} onRevokeInvite={handleRevokeInvite} />
+						)
+					))}
 				<p className="text-xs md:text-sm text-muted-foreground whitespace-nowrap">
 					{members.length} {members.length === 1 ? "member" : "members"}
 				</p>
 			</div>
 
-			<div className="rounded-lg border border-border/40 bg-background overflow-hidden">
+			<div className="rounded-lg border border-border/60 bg-accent overflow-hidden">
 				<Table className="table-fixed w-full">
 					<TableHeader>
-						<TableRow className="hover:bg-transparent border-b border-border/40">
-							<TableHead className="w-[45%] px-4 md:px-6 border-r border-border/40">
+						<TableRow className="hover:bg-transparent border-b border-border/60">
+							<TableHead className="w-[45%] px-4 md:px-6 border-r border-border/60">
 								<span className="flex items-center gap-1.5 text-sm font-medium text-muted-foreground/70">
 									<User size={14} className="opacity-60 text-muted-foreground" />
 									Name
 								</span>
 							</TableHead>
-							<TableHead className="hidden md:table-cell w-[25%] border-r border-border/40">
+							<TableHead className="hidden md:table-cell w-[25%] border-r border-border/60">
 								<span className="flex items-center gap-1.5 text-sm font-medium text-muted-foreground/70">
 									<Clock size={14} className="opacity-60 text-muted-foreground" />
 									Last logged in
@@ -458,8 +511,8 @@ function MemberRow({
 	const showActions = !member.is_owner && (canManageRoles || canRemove);
 
 	return (
-		<TableRow className="border-b border-border/40 transition-colors hover:bg-accent hover:text-accent-foreground">
-			<TableCell className="w-[45%] py-2.5 px-4 md:px-6 max-w-0 border-r border-border/40">
+		<TableRow className="border-b border-border/60 transition-colors hover:bg-accent hover:text-accent-foreground">
+			<TableCell className="w-[45%] py-2.5 px-4 md:px-6 max-w-0 border-r border-border/60">
 				<div className="flex items-center gap-3">
 					<Avatar className="size-10 shrink-0">
 						{member.user_avatar_url && (
@@ -478,7 +531,7 @@ function MemberRow({
 				</div>
 			</TableCell>
 
-			<TableCell className="hidden md:table-cell w-[25%] py-2.5 text-sm text-foreground border-r border-border/40">
+			<TableCell className="hidden md:table-cell w-[25%] py-2.5 text-sm text-foreground border-r border-border/60">
 				{member.user_last_login ? formatRelativeDate(member.user_last_login) : "Never"}
 			</TableCell>
 
@@ -542,7 +595,7 @@ function MemberRow({
 									</AlertDialogContent>
 								</AlertDialog>
 							)}
-							<DropdownMenuSeparator className="dark:bg-white/5" />
+							<DropdownMenuSeparator className="bg-popover-border" />
 							<DropdownMenuItem
 								onClick={() =>
 									router.push(`/dashboard/${searchSpaceId}/search-space-settings/team-roles`)
@@ -710,7 +763,7 @@ function CreateInviteDialog({
 							<div className="space-y-2">
 								<Label htmlFor="invite-role">Role</Label>
 								<Select value={roleId} onValueChange={setRoleId}>
-									<SelectTrigger>
+									<SelectTrigger className="border-popover-border">
 										<SelectValue placeholder="Assign a role" />
 									</SelectTrigger>
 									<SelectContent>
@@ -746,7 +799,7 @@ function CreateInviteDialog({
 											<Button
 												variant="outline"
 												className={cn(
-													"w-full justify-start text-left font-normal bg-transparent",
+													"w-full justify-start text-left font-normal bg-transparent border-popover-border",
 													!expiresAt && "text-muted-foreground"
 												)}
 											>
diff --git a/surfsense_web/components/chat-comments/comment-panel/comment-panel.tsx b/surfsense_web/components/chat-comments/comment-panel/comment-panel.tsx
index 122601008..bc4c2b636 100644
--- a/surfsense_web/components/chat-comments/comment-panel/comment-panel.tsx
+++ b/surfsense_web/components/chat-comments/comment-panel/comment-panel.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { cn } from "@/lib/utils";
+import { Separator } from "@/components/ui/separator";
 import { CommentComposer } from "../comment-composer/comment-composer";
 import { CommentThread } from "../comment-thread/comment-thread";
 import type { CommentPanelProps } from "./types";
@@ -85,7 +86,9 @@ export function CommentPanel({
 				</div>
 			)}
 
-			<div className={cn("p-3", isMobile && "fixed bottom-0 left-0 right-0 z-50 bg-card border-t")}>
+			{hasThreads && !isMobile ? <Separator className="bg-sidebar-border" /> : null}
+
+			<div className={cn("p-3", isMobile && "fixed bottom-0 left-0 right-0 z-50 bg-sidebar")}>
 				<CommentComposer
 					members={members}
 					membersLoading={membersLoading}
diff --git a/surfsense_web/components/ui/calendar.tsx b/surfsense_web/components/ui/calendar.tsx
index e3e1be301..a048bbd7b 100644
--- a/surfsense_web/components/ui/calendar.tsx
+++ b/surfsense_web/components/ui/calendar.tsx
@@ -24,7 +24,7 @@ function Calendar({
 		<DayPicker
 			showOutsideDays={showOutsideDays}
 			className={cn(
-				"bg-background group/calendar p-3 [--cell-size:--spacing(8)] [[data-slot=card-content]_&]:bg-transparent [[data-slot=popover-content]_&]:bg-transparent",
+				"bg-background group/calendar rounded-md border border-popover-border p-3 [--cell-size:--spacing(8)] [[data-slot=card-content]_&]:bg-transparent [[data-slot=popover-content]_&]:bg-transparent",
 				String.raw`rtl:**:[.rdp-button\_next>svg]:rotate-180`,
 				String.raw`rtl:**:[.rdp-button\_previous>svg]:rotate-180`,
 				className
@@ -61,7 +61,7 @@ function Calendar({
 					defaultClassNames.dropdowns
 				),
 				dropdown_root: cn(
-					"relative has-focus:border-ring border border-input shadow-xs has-focus:ring-ring/50 has-focus:ring-[3px] rounded-md",
+					"relative has-focus:border-ring border border-popover-border shadow-xs has-focus:ring-ring/50 has-focus:ring-[3px] rounded-md",
 					defaultClassNames.dropdown_root
 				),
 				dropdown: cn("absolute inset-0 opacity-0", defaultClassNames.dropdown),
diff --git a/surfsense_web/components/ui/input.tsx b/surfsense_web/components/ui/input.tsx
index d2b9edec3..549a71aff 100644
--- a/surfsense_web/components/ui/input.tsx
+++ b/surfsense_web/components/ui/input.tsx
@@ -8,7 +8,7 @@ function Input({ className, type, ...props }: React.ComponentProps<"input">) {
 			type={type}
 			data-slot="input"
 			className={cn(
-				"border-input file:text-foreground placeholder:text-muted-foreground selection:bg-primary selection:text-primary-foreground flex h-9 w-full min-w-0 rounded-md border bg-transparent px-3 py-1 text-base shadow-xs transition-[color,box-shadow] outline-none file:inline-flex file:h-7 file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",
+				"border-popover-border file:text-foreground placeholder:text-muted-foreground selection:bg-primary selection:text-primary-foreground flex h-9 w-full min-w-0 rounded-md border bg-transparent px-3 py-1 text-base shadow-xs transition-[color,box-shadow] outline-none file:inline-flex file:h-7 file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",
 				"focus-visible:border-ring",
 				"aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive",
 				className
diff --git a/surfsense_web/components/ui/select.tsx b/surfsense_web/components/ui/select.tsx
index 55d208328..cf22bf6a3 100644
--- a/surfsense_web/components/ui/select.tsx
+++ b/surfsense_web/components/ui/select.tsx
@@ -27,7 +27,7 @@ function SelectTrigger({
 		<SelectPrimitive.Trigger
 			data-slot="select-trigger"
 			className={cn(
-				"border-input data-[placeholder]:text-muted-foreground [&_svg:not([class*='text-'])]:text-muted-foreground aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive flex h-9 w-fit items-center justify-between gap-2 rounded-md border bg-transparent px-3 py-2 text-sm whitespace-nowrap shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-0 focus-visible:ring-offset-0 disabled:cursor-not-allowed disabled:opacity-50 *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center *:data-[slot=select-value]:gap-2 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+				"border-popover-border data-[placeholder]:text-muted-foreground [&_svg:not([class*='text-'])]:text-muted-foreground aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive flex h-9 w-fit items-center justify-between gap-2 rounded-md border bg-transparent px-3 py-2 text-sm whitespace-nowrap shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-0 focus-visible:ring-offset-0 disabled:cursor-not-allowed disabled:opacity-50 *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center *:data-[slot=select-value]:gap-2 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
 				className
 			)}
 			{...props}
@@ -51,7 +51,7 @@ function SelectContent({
 			<SelectPrimitive.Content
 				data-slot="select-content"
 				className={cn(
-					"bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 relative z-50 max-h-96 min-w-[8rem] overflow-hidden rounded-md shadow-md",
+					"bg-popover text-popover-foreground border border-popover-border data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 relative z-50 max-h-96 min-w-[8rem] overflow-hidden rounded-md shadow-md",
 					position === "popper" &&
 						"data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1",
 					className
diff --git a/surfsense_web/components/ui/textarea.tsx b/surfsense_web/components/ui/textarea.tsx
index 8a2691aab..8ec113c9e 100644
--- a/surfsense_web/components/ui/textarea.tsx
+++ b/surfsense_web/components/ui/textarea.tsx
@@ -7,7 +7,7 @@ function Textarea({ className, ...props }: React.ComponentProps<"textarea">) {
 		<textarea
 			data-slot="textarea"
 			className={cn(
-				"border-input placeholder:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 flex field-sizing-content min-h-16 w-full rounded-md border bg-transparent px-3 py-2 text-base shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",
+				"border-popover-border placeholder:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 flex field-sizing-content min-h-16 w-full rounded-md border bg-transparent px-3 py-2 text-base shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",
 				className
 			)}
 			{...props}

From 1169b4319622d4f36bb449f6e46b1e9e80948dd7 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Tue, 19 May 2026 17:41:48 +0530
Subject: [PATCH 89/96] refactor: improve styling of MemberRow component and
 clean up agent tools imports

---
 .../app/dashboard/[search_space_id]/team/team-content.tsx   | 6 ++++--
 surfsense_web/atoms/agent-tools/agent-tools.atoms.ts        | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/surfsense_web/app/dashboard/[search_space_id]/team/team-content.tsx b/surfsense_web/app/dashboard/[search_space_id]/team/team-content.tsx
index 5a54caaaf..f003dde1b 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/team/team-content.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/team/team-content.tsx
@@ -518,7 +518,9 @@ function MemberRow({
 						{member.user_avatar_url && (
 							<AvatarImage src={member.user_avatar_url} alt={displayName} />
 						)}
-						<AvatarFallback className="text-sm">{initials}</AvatarFallback>
+						<AvatarFallback className="bg-popover text-sm text-popover-foreground">
+							{initials}
+						</AvatarFallback>
 					</Avatar>
 					<div className="min-w-0">
 						<p className="font-medium text-sm truncate select-text">{displayName}</p>
@@ -543,7 +545,7 @@ function MemberRow({
 								type="button"
 								variant="ghost"
 								size="sm"
-								className="h-auto gap-1.5 px-0 py-0 text-sm text-muted-foreground hover:bg-transparent hover:text-accent-foreground"
+								className="h-auto w-[74px] justify-end gap-1.5 px-0 py-0 text-sm text-muted-foreground hover:bg-transparent hover:text-accent-foreground has-[>svg]:px-0"
 							>
 								{roleName}
 								<ChevronDown className="h-4 w-4" />
diff --git a/surfsense_web/atoms/agent-tools/agent-tools.atoms.ts b/surfsense_web/atoms/agent-tools/agent-tools.atoms.ts
index 2c9e01fb2..84c6ed841 100644
--- a/surfsense_web/atoms/agent-tools/agent-tools.atoms.ts
+++ b/surfsense_web/atoms/agent-tools/agent-tools.atoms.ts
@@ -1,6 +1,6 @@
 import { atom } from "jotai";
 import { atomWithQuery } from "jotai-tanstack-query";
-import { type AgentToolInfo, agentToolsApiService } from "@/lib/apis/agent-tools-api.service";
+import { agentToolsApiService } from "@/lib/apis/agent-tools-api.service";
 import { cacheKeys } from "@/lib/query-client/cache-keys";
 import { activeSearchSpaceIdAtom } from "../search-spaces/search-space-query.atoms";
 

From ee3a6dc45f4be9bd6f32c49b213d21e45b13b449 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Tue, 19 May 2026 18:22:30 +0530
Subject: [PATCH 90/96] refactor: enhance DesktopContent and HotkeysContent
 components with improved loading states, updated styling, and consistent use
 of separators

---
 .../components/DesktopContent.tsx             | 75 ++++++++++++-------
 .../components/HotkeysContent.tsx             | 27 ++++---
 2 files changed, 63 insertions(+), 39 deletions(-)

diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/DesktopContent.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/DesktopContent.tsx
index 3368066c1..97debca9d 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/DesktopContent.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/DesktopContent.tsx
@@ -2,7 +2,6 @@
 
 import { useEffect, useState } from "react";
 import { toast } from "sonner";
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
 import { Label } from "@/components/ui/label";
 import {
 	Select,
@@ -11,7 +10,8 @@ import {
 	SelectTrigger,
 	SelectValue,
 } from "@/components/ui/select";
-import { Spinner } from "@/components/ui/spinner";
+import { Separator } from "@/components/ui/separator";
+import { Skeleton } from "@/components/ui/skeleton";
 import { Switch } from "@/components/ui/switch";
 import type { SearchSpace } from "@/contracts/types/search-space.types";
 import { useElectronAPI } from "@/hooks/use-platform";
@@ -77,8 +77,27 @@ export function DesktopContent() {
 
 	if (loading) {
 		return (
-			<div className="flex items-center justify-center py-12">
-				<Spinner size="md" className="text-muted-foreground" />
+			<div className="flex flex-col gap-4 md:gap-6">
+				<section>
+					<div className="flex flex-col gap-2 pb-2 md:pb-3">
+						<Skeleton className="h-6 w-48 bg-accent" />
+						<Skeleton className="h-4 w-full max-w-2xl bg-accent" />
+					</div>
+					<Skeleton className="h-10 w-full bg-accent" />
+				</section>
+
+				<Separator className="bg-border" />
+
+				<section>
+					<div className="flex flex-col gap-2 pb-2 md:pb-3">
+						<Skeleton className="h-6 w-44 bg-accent" />
+						<Skeleton className="h-4 w-full max-w-3xl bg-accent" />
+					</div>
+					<div className="flex flex-col gap-3">
+						<Skeleton className="h-20 w-full bg-accent" />
+						<Skeleton className="h-20 w-full bg-accent" />
+					</div>
+				</section>
 			</div>
 		);
 	}
@@ -124,16 +143,16 @@ export function DesktopContent() {
 	};
 
 	return (
-		<div className="space-y-4 md:space-y-6">
-			<Card>
-				<CardHeader className="px-3 md:px-6 pt-3 md:pt-6 pb-2 md:pb-3">
-					<CardTitle className="text-base md:text-lg">Default Search Space</CardTitle>
-					<CardDescription className="text-xs md:text-sm">
+		<div className="flex flex-col gap-4 md:gap-6">
+			<section>
+				<div className="pb-2 md:pb-3">
+					<h2 className="text-base md:text-lg font-semibold">Default Search Space</h2>
+					<p className="text-xs md:text-sm text-muted-foreground">
 						Choose which search space General Assist, Screenshot Assist, and Quick Assist use by
 						default.
-					</CardDescription>
-				</CardHeader>
-				<CardContent className="px-3 md:px-6 pb-3 md:pb-6">
+					</p>
+				</div>
+				<div>
 					{searchSpaces.length > 0 ? (
 						<Select value={activeSpaceId ?? undefined} onValueChange={handleSearchSpaceChange}>
 							<SelectTrigger className="w-full">
@@ -152,21 +171,23 @@ export function DesktopContent() {
 							No search spaces found. Create one first.
 						</p>
 					)}
-				</CardContent>
-			</Card>
+				</div>
+			</section>
 
-			<Card>
-				<CardHeader className="px-3 md:px-6 pt-3 md:pt-6 pb-2 md:pb-3">
-					<CardTitle className="text-base md:text-lg flex items-center gap-2">
+			<Separator className="bg-border" />
+
+			<section>
+				<div className="pb-2 md:pb-3">
+					<h2 className="text-base md:text-lg font-semibold flex items-center gap-2">
 						Launch on Startup
-					</CardTitle>
-					<CardDescription className="text-xs md:text-sm">
+					</h2>
+					<p className="text-xs md:text-sm text-muted-foreground">
 						Automatically start SurfSense when you sign in to your computer so global shortcuts and
 						folder sync are always available.
-					</CardDescription>
-				</CardHeader>
-				<CardContent className="px-3 md:px-6 pb-3 md:pb-6 space-y-3">
-					<div className="flex items-center justify-between rounded-lg border p-4">
+					</p>
+				</div>
+				<div className="flex flex-col gap-3">
+					<div className="flex items-center justify-between rounded-lg bg-accent p-4">
 						<div className="space-y-0.5">
 							<Label htmlFor="auto-launch-toggle" className="text-sm font-medium cursor-pointer">
 								Open SurfSense at login
@@ -184,7 +205,7 @@ export function DesktopContent() {
 							disabled={!autoLaunchSupported}
 						/>
 					</div>
-					<div className="flex items-center justify-between rounded-lg border p-4">
+					<div className="flex items-center justify-between rounded-lg bg-accent p-4">
 						<div className="space-y-0.5">
 							<Label
 								htmlFor="auto-launch-hidden-toggle"
@@ -193,7 +214,7 @@ export function DesktopContent() {
 								Start minimized to tray
 							</Label>
 							<p className="text-xs text-muted-foreground">
-								Skip the main window on boot — SurfSense lives in the system tray until you need it.
+								Skip the main window on boot. SurfSense lives in the system tray until you need it.
 							</p>
 						</div>
 						<Switch
@@ -203,8 +224,8 @@ export function DesktopContent() {
 							disabled={!autoLaunchSupported || !autoLaunchEnabled}
 						/>
 					</div>
-				</CardContent>
-			</Card>
+				</div>
+			</section>
 		</div>
 	);
 }
diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/HotkeysContent.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/HotkeysContent.tsx
index 4f08eef3f..9916f6cda 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/HotkeysContent.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/HotkeysContent.tsx
@@ -5,6 +5,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { toast } from "sonner";
 import { DEFAULT_SHORTCUTS, keyEventToAccelerator } from "@/components/desktop/shortcut-recorder";
 import { Button } from "@/components/ui/button";
+import { Separator } from "@/components/ui/separator";
 import { ShortcutKbd } from "@/components/ui/shortcut-kbd";
 import { Spinner } from "@/components/ui/spinner";
 import { useElectronAPI } from "@/hooks/use-platform";
@@ -78,7 +79,7 @@ function HotkeyRow({
 	);
 
 	return (
-		<div className="flex items-center justify-between gap-2.5 border-border/60 border-b py-3 last:border-b-0">
+		<div className="flex items-center justify-between gap-2.5 py-3">
 			<div className="flex items-center gap-2.5 min-w-0">
 				<div className="flex size-7 shrink-0 items-center justify-center rounded-md bg-primary/10 text-primary">
 					<Icon className="size-3.5" />
@@ -179,17 +180,19 @@ export function HotkeysContent() {
 	return shortcutsLoaded ? (
 		<div className="flex flex-col gap-3">
 			<div>
-				{HOTKEY_ROWS.map((row) => (
-					<HotkeyRow
-						key={row.key}
-						label={row.label}
-						value={shortcuts[row.key]}
-						defaultValue={DEFAULT_SHORTCUTS[row.key]}
-						icon={row.icon}
-						isMac={isMac}
-						onChange={(accel) => updateShortcut(row.key, accel)}
-						onReset={() => resetShortcut(row.key)}
-					/>
+				{HOTKEY_ROWS.map((row, index) => (
+					<div key={row.key}>
+						<HotkeyRow
+							label={row.label}
+							value={shortcuts[row.key]}
+							defaultValue={DEFAULT_SHORTCUTS[row.key]}
+							icon={row.icon}
+							isMac={isMac}
+							onChange={(accel) => updateShortcut(row.key, accel)}
+							onReset={() => resetShortcut(row.key)}
+						/>
+						{index < HOTKEY_ROWS.length - 1 ? <Separator className="bg-border" /> : null}
+					</div>
 				))}
 			</div>
 		</div>

From cd4e5ae7f2d0ba9309f85eefe81e2b42e57f2ce8 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Tue, 19 May 2026 18:57:06 +0530
Subject: [PATCH 91/96] feat: implement macOS-specific title bar adjustments
 and enhance RightPanel with toggle functionality

---
 surfsense_desktop/src/modules/window.ts       |   8 +-
 .../layout/ui/right-panel/RightPanel.tsx      |  94 +++--
 .../layout/ui/shell/LayoutShell.tsx           | 385 ++++++++++--------
 .../components/layout/ui/sidebar/Sidebar.tsx  |  23 +-
 .../ui/sidebar/SidebarCollapseButton.tsx      |  12 +-
 5 files changed, 322 insertions(+), 200 deletions(-)

diff --git a/surfsense_desktop/src/modules/window.ts b/surfsense_desktop/src/modules/window.ts
index 8b7c02133..5317005d5 100644
--- a/surfsense_desktop/src/modules/window.ts
+++ b/surfsense_desktop/src/modules/window.ts
@@ -7,6 +7,7 @@ import { setActiveSearchSpaceId } from './active-search-space';
 
 const isDev = !app.isPackaged;
 const HOSTED_FRONTEND_URL = process.env.HOSTED_FRONTEND_URL as string;
+const isMac = process.platform === 'darwin';
 
 let mainWindow: BrowserWindow | null = null;
 let isQuitting = false;
@@ -35,7 +36,12 @@ export function createMainWindow(initialPath = '/dashboard'): BrowserWindow {
       webviewTag: false,
     },
     show: false,
-    titleBarStyle: 'hiddenInset',
+    ...(isMac
+      ? {
+          titleBarStyle: 'hidden' as const,
+          trafficLightPosition: { x: 12, y: 10 },
+        }
+      : {}),
   });
 
   mainWindow.once('ready-to-show', () => {
diff --git a/surfsense_web/components/layout/ui/right-panel/RightPanel.tsx b/surfsense_web/components/layout/ui/right-panel/RightPanel.tsx
index 027a25af3..b379e58e3 100644
--- a/surfsense_web/components/layout/ui/right-panel/RightPanel.tsx
+++ b/surfsense_web/components/layout/ui/right-panel/RightPanel.tsx
@@ -3,7 +3,7 @@
 import { useAtom, useAtomValue, useSetAtom } from "jotai";
 import { PanelRight } from "lucide-react";
 import dynamic from "next/dynamic";
-import { startTransition, useEffect, type MouseEvent } from "react";
+import { type MouseEvent, startTransition, useEffect } from "react";
 import { closeReportPanelAtom, reportPanelAtom } from "@/atoms/chat/report-panel.atom";
 import { citationPanelAtom, closeCitationPanelAtom } from "@/atoms/citation/citation-panel.atom";
 import { documentsSidebarOpenAtom } from "@/atoms/documents/ui.atoms";
@@ -12,6 +12,7 @@ import { rightPanelCollapsedAtom, rightPanelTabAtom } from "@/atoms/layout/right
 import { Button } from "@/components/ui/button";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { closeHitlEditPanelAtom, hitlEditPanelAtom } from "@/features/chat-messages/hitl";
+import { cn } from "@/lib/utils";
 import { DocumentsSidebar } from "../sidebar";
 
 const EditorPanelContent = dynamic(
@@ -51,6 +52,8 @@ interface RightPanelProps {
 		open: boolean;
 		onOpenChange: (open: boolean) => void;
 	};
+	showCollapseButton?: boolean;
+	showTopBorder?: boolean;
 }
 
 function isKeyboardClick(event: MouseEvent) {
@@ -80,13 +83,66 @@ function CollapseButton({ onClick }: { onClick: () => void }) {
 	);
 }
 
+interface RightPanelToggleButtonProps {
+	className?: string;
+	iconClassName?: string;
+	disabled?: boolean;
+}
+
+export function RightPanelToggleButton({
+	className,
+	iconClassName,
+	disabled = false,
+}: RightPanelToggleButtonProps) {
+	const [collapsed, setCollapsed] = useAtom(rightPanelCollapsedAtom);
+	const documentsOpen = useAtomValue(documentsSidebarOpenAtom);
+	const reportState = useAtomValue(reportPanelAtom);
+	const editorState = useAtomValue(editorPanelAtom);
+	const hitlEditState = useAtomValue(hitlEditPanelAtom);
+	const citationState = useAtomValue(citationPanelAtom);
+	const reportOpen = reportState.isOpen && !!reportState.reportId;
+	const editorOpen =
+		editorState.isOpen &&
+		(editorState.kind === "document" ? !!editorState.documentId : !!editorState.localFilePath);
+	const hitlEditOpen = hitlEditState.isOpen && !!hitlEditState.onSave;
+	const citationOpen = citationState.isOpen && citationState.chunkId != null;
+	const hasContent = documentsOpen || reportOpen || editorOpen || hitlEditOpen || citationOpen;
+	const label = collapsed ? "Expand panel" : "Collapse panel";
+
+	if (!hasContent) return null;
+
+	return (
+		<Tooltip>
+			<TooltipTrigger asChild>
+				<Button
+					variant="ghost"
+					size="icon"
+					disabled={disabled}
+					onClick={() => {
+						if (disabled) return;
+						startTransition(() => setCollapsed((value) => !value));
+					}}
+					className={cn(
+						"h-8 w-8 shrink-0 text-muted-foreground hover:bg-accent hover:text-accent-foreground",
+						className
+					)}
+				>
+					<PanelRight className={cn("h-4 w-4", iconClassName)} />
+					<span className="sr-only">{label}</span>
+				</Button>
+			</TooltipTrigger>
+			<TooltipContent side="bottom">{label}</TooltipContent>
+		</Tooltip>
+	);
+}
+
 /**
  * Absolutely positioned expand button — renders at top-right of the main
  * container so it occupies the same screen position as the collapse button
  * inside the Documents header.
  */
 export function RightPanelExpandButton() {
-	const [collapsed, setCollapsed] = useAtom(rightPanelCollapsedAtom);
+	const [collapsed] = useAtom(rightPanelCollapsedAtom);
 	const documentsOpen = useAtomValue(documentsSidebarOpenAtom);
 	const reportState = useAtomValue(reportPanelAtom);
 	const editorState = useAtomValue(editorPanelAtom);
@@ -104,24 +160,7 @@ export function RightPanelExpandButton() {
 
 	return (
 		<div className="flex shrink-0 items-center px-0.5">
-			<Tooltip>
-				<TooltipTrigger asChild>
-					<Button
-						variant="ghost"
-						size="icon"
-						tabIndex={-1}
-						onClick={(event) => {
-							if (isKeyboardClick(event)) return;
-							startTransition(() => setCollapsed(false));
-						}}
-						className="h-8 w-8 shrink-0 -m-0.5 text-muted-foreground hover:bg-accent hover:text-accent-foreground"
-					>
-						<PanelRight className="h-4 w-4" />
-						<span className="sr-only">Expand panel</span>
-					</Button>
-				</TooltipTrigger>
-				<TooltipContent side="bottom">Expand panel</TooltipContent>
-			</Tooltip>
+			<RightPanelToggleButton className="-m-0.5" />
 		</div>
 	);
 }
@@ -134,7 +173,11 @@ const PANEL_WIDTHS = {
 	citation: 560,
 } as const;
 
-export function RightPanel({ documentsPanel }: RightPanelProps) {
+export function RightPanel({
+	documentsPanel,
+	showCollapseButton = true,
+	showTopBorder = false,
+}: RightPanelProps) {
 	const [activeTab] = useAtom(rightPanelTabAtom);
 	const reportState = useAtomValue(reportPanelAtom);
 	const closeReport = useSetAtom(closeReportPanelAtom);
@@ -208,14 +251,19 @@ export function RightPanel({ documentsPanel }: RightPanelProps) {
 	}
 
 	const targetWidth = PANEL_WIDTHS[effectiveTab];
-	const collapseButton = <CollapseButton onClick={() => setCollapsed(true)} />;
+	const collapseButton = showCollapseButton ? (
+		<CollapseButton onClick={() => setCollapsed(true)} />
+	) : null;
 
 	if (!isVisible) return null;
 
 	return (
 		<aside
 			style={{ width: targetWidth }}
-			className="flex h-full shrink-0 flex-col border-l bg-panel text-sidebar-foreground overflow-hidden transition-[width] duration-200 ease-out"
+			className={cn(
+				"flex h-full shrink-0 flex-col border-l bg-panel text-sidebar-foreground overflow-hidden transition-[width] duration-200 ease-out",
+				showTopBorder && "border-t"
+			)}
 		>
 			<div className="relative flex-1 min-h-0 overflow-hidden">
 				{effectiveTab === "sources" && documentsOpen && documentsPanel && (
diff --git a/surfsense_web/components/layout/ui/shell/LayoutShell.tsx b/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
index c090a8886..0b1d1d20b 100644
--- a/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
+++ b/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
@@ -9,6 +9,7 @@ import { Spinner } from "@/components/ui/spinner";
 import { TooltipProvider } from "@/components/ui/tooltip";
 import type { InboxItem } from "@/hooks/use-inbox";
 import { useIsMobile } from "@/hooks/use-mobile";
+import { useElectronAPI } from "@/hooks/use-platform";
 import { cn } from "@/lib/utils";
 import { SidebarProvider, useSidebarState } from "../../hooks";
 import {
@@ -19,7 +20,11 @@ import {
 import type { ChatItem, NavItem, PageUsage, SearchSpace, User } from "../../types/layout.types";
 import { Header } from "../header";
 import { IconRail } from "../icon-rail";
-import { RightPanel, RightPanelExpandButton } from "../right-panel/RightPanel";
+import {
+	RightPanel,
+	RightPanelExpandButton,
+	RightPanelToggleButton,
+} from "../right-panel/RightPanel";
 import {
 	AllPrivateChatsSidebarContent,
 	AllSharedChatsSidebarContent,
@@ -28,6 +33,7 @@ import {
 	MobileSidebar,
 	MobileSidebarTrigger,
 	Sidebar,
+	SidebarCollapseButton,
 } from "../sidebar";
 import { SidebarSlideOutPanel } from "../sidebar/SidebarSlideOutPanel";
 import { TabBar } from "../tabs/TabBar";
@@ -45,6 +51,36 @@ const DocumentTabContent = dynamic(
 	}
 );
 
+function MacDesktopTitleBar({
+	isSidebarCollapsed,
+	onToggleSidebar,
+	disableRightPanelToggle = false,
+}: {
+	isSidebarCollapsed: boolean;
+	onToggleSidebar: () => void;
+	disableRightPanelToggle?: boolean;
+}) {
+	return (
+		<div className="flex h-9 shrink-0 items-center bg-rail px-2 [app-region:drag] [-webkit-app-region:drag]">
+			<div className="ml-[72px] flex h-full items-center [app-region:no-drag] [-webkit-app-region:no-drag]">
+				<SidebarCollapseButton
+					isCollapsed={isSidebarCollapsed}
+					onToggle={onToggleSidebar}
+					className="h-6 w-6 rounded-md"
+					iconClassName="h-3.5 w-3.5"
+				/>
+			</div>
+			<div className="ml-auto flex h-full items-center [app-region:no-drag] [-webkit-app-region:no-drag]">
+				<RightPanelToggleButton
+					disabled={disableRightPanelToggle}
+					className="h-6 w-6 rounded-md"
+					iconClassName="h-3.5 w-3.5"
+				/>
+			</div>
+		</div>
+	);
+}
+
 // Per-tab data source
 interface TabDataSource {
 	items: InboxItem[];
@@ -130,22 +166,28 @@ function MainContentPanel({
 	isChatPage,
 	onTabSwitch,
 	onNewChat,
+	showRightPanelExpandButton = true,
+	showTopBorder = false,
 	children,
 }: {
 	isChatPage: boolean;
 	onTabSwitch?: (tab: Tab) => void;
 	onNewChat?: () => void;
+	showRightPanelExpandButton?: boolean;
+	showTopBorder?: boolean;
 	children: React.ReactNode;
 }) {
 	const activeTab = useAtomValue(activeTabAtom);
 	const isDocumentTab = activeTab?.type === "document";
 
 	return (
-		<div className="relative isolate flex flex-1 flex-col min-w-0">
+		<div
+			className={cn("relative isolate flex flex-1 flex-col min-w-0", showTopBorder && "border-t")}
+		>
 			<TabBar
 				onTabSwitch={onTabSwitch}
 				onNewChat={onNewChat}
-				rightActions={<RightPanelExpandButton />}
+				rightActions={showRightPanelExpandButton ? <RightPanelExpandButton /> : null}
 				className="min-w-0"
 			/>
 			<div className="relative flex flex-1 flex-col bg-panel overflow-hidden min-w-0">
@@ -221,6 +263,8 @@ export function LayoutShell({
 	onTabSwitch,
 }: LayoutShellProps) {
 	const isMobile = useIsMobile();
+	const electronAPI = useElectronAPI();
+	const isMacDesktop = electronAPI?.versions.platform === "darwin";
 	const [mobileMenuOpen, setMobileMenuOpen] = useState(false);
 	const { isCollapsed, setIsCollapsed, toggleCollapsed } = useSidebarState(defaultCollapsed);
 	const {
@@ -388,175 +432,190 @@ export function LayoutShell({
 	return (
 		<SidebarProvider value={sidebarContextValue}>
 			<TooltipProvider delayDuration={0}>
-				<div
-					className={cn(
-						"flex h-screen w-full gap-2 px-2 py-0 overflow-hidden bg-rail",
-						className
-					)}
-				>
-					<div className="hidden md:flex overflow-hidden border-r -mr-2 pr-2 bg-rail">
-						<IconRail
-							searchSpaces={searchSpaces}
-							activeSearchSpaceId={activeSearchSpaceId}
-							onSearchSpaceSelect={onSearchSpaceSelect}
-							onSearchSpaceDelete={onSearchSpaceDelete}
-							onSearchSpaceSettings={onSearchSpaceSettings}
-							onAddSearchSpace={onAddSearchSpace}
-							isSingleRailMode={false}
-							user={user}
-							onUserSettings={onUserSettings}
-							onAnnouncements={onAnnouncements}
-							announcementUnreadCount={announcementUnreadCount}
-							onLogout={onLogout}
-							theme={theme}
-							setTheme={setTheme}
+				<div className={cn("flex h-screen w-full flex-col overflow-hidden bg-rail", className)}>
+					{isMacDesktop ? (
+						<MacDesktopTitleBar
+							isSidebarCollapsed={isCollapsed}
+							onToggleSidebar={toggleCollapsed}
+							disableRightPanelToggle={useWorkspacePanel}
 						/>
-					</div>
-
-					{/* Sidebar + slide-out panels share one container; overflow visible so panels can overlay main content. Negative right margin closes the flex gap so the sidebar sits flush against the main panel, separated only by a border. */}
-					<div className="relative hidden md:flex shrink-0 z-20 -mr-2 border-r bg-panel">
-						<Sidebar
-							searchSpace={searchSpace}
-							isCollapsed={isCollapsed}
-							onToggleCollapse={toggleCollapsed}
-							navItems={navItems}
-							onNavItemClick={onNavItemClick}
-							chats={chats}
-							sharedChats={sharedChats}
-							activeChatId={activeChatId}
-							onNewChat={onNewChat}
-							onChatSelect={onChatSelect}
-							onChatRename={onChatRename}
-							onChatDelete={onChatDelete}
-							onChatArchive={onChatArchive}
-							onViewAllSharedChats={onViewAllSharedChats}
-							onViewAllPrivateChats={onViewAllPrivateChats}
-							isSharedChatsPanelOpen={activeSlideoutPanel === "shared"}
-							isPrivateChatsPanelOpen={activeSlideoutPanel === "private"}
-							user={user}
-							onSettings={onSettings}
-							onManageMembers={onManageMembers}
-							onUserSettings={onUserSettings}
-							onAnnouncements={onAnnouncements}
-							announcementUnreadCount={announcementUnreadCount}
-							onLogout={onLogout}
-							pageUsage={pageUsage}
-							theme={theme}
-							setTheme={setTheme}
-							renderUserProfile={false}
-							className="flex shrink-0"
-							isLoadingChats={isLoadingChats}
-							sidebarWidth={sidebarWidth}
-							isResizing={isResizing}
-						/>
-
-						{!isCollapsed && (
-							<hr
-								aria-orientation="vertical"
-								aria-label="Resize sidebar"
-								aria-valuemin={SIDEBAR_MIN_WIDTH}
-								aria-valuemax={SIDEBAR_MAX_WIDTH}
-								aria-valuenow={sidebarWidth}
-								tabIndex={0}
-								onPointerDown={onResizePointerDown}
-								style={{ touchAction: "none" }}
-								className={cn(
-									"absolute top-0 right-0 h-full w-4 translate-x-1/2 z-50 m-0 border-0 bg-transparent p-0 select-none cursor-col-resize",
-									"after:content-[''] after:absolute after:inset-y-0 after:left-1/2 after:w-px after:-translate-x-1/2 after:bg-transparent hover:after:bg-border/80 after:transition-colors",
-									isResizing && "after:bg-border"
-								)}
+					) : null}
+					<div className="flex min-h-0 flex-1 w-full gap-2 px-2 py-0 overflow-hidden">
+						<div className="hidden md:flex overflow-hidden -mr-2 pr-2 bg-rail">
+							<IconRail
+								searchSpaces={searchSpaces}
+								activeSearchSpaceId={activeSearchSpaceId}
+								onSearchSpaceSelect={onSearchSpaceSelect}
+								onSearchSpaceDelete={onSearchSpaceDelete}
+								onSearchSpaceSettings={onSearchSpaceSettings}
+								onAddSearchSpace={onAddSearchSpace}
+								isSingleRailMode={false}
+								user={user}
+								onUserSettings={onUserSettings}
+								onAnnouncements={onAnnouncements}
+								announcementUnreadCount={announcementUnreadCount}
+								onLogout={onLogout}
+								theme={theme}
+								setTheme={setTheme}
 							/>
-						)}
+						</div>
 
-						{/* Unified slide-out panel — shell stays open, content cross-fades */}
-						<SidebarSlideOutPanel
-							open={anySlideOutOpen}
-							onOpenChange={closeSlideout}
-							ariaLabel={panelAriaLabel}
+						{/* Sidebar + slide-out panels share one container; overflow visible so panels can overlay main content. Negative right margin closes the flex gap so the sidebar sits flush against the main panel, separated only by a border. */}
+						<div
+							className={cn(
+								"relative hidden md:flex shrink-0 z-20 -mr-2 bg-panel",
+								isMacDesktop ? "rounded-tl-xl border-t border-r border-l" : "border-r"
+							)}
 						>
-							<AnimatePresence mode="popLayout" initial={false}>
-								{activeSlideoutPanel === "inbox" && inbox && (
-									<motion.div
-										key="inbox"
-										className="h-full flex flex-col"
-										initial={{ opacity: 0 }}
-										animate={{ opacity: 1 }}
-										exit={{ opacity: 0 }}
-										transition={{ duration: 0.15 }}
-									>
-										<InboxSidebarContent
-											onOpenChange={(open) => closeSlideout(open)}
-											comments={inbox.comments}
-											status={inbox.status}
-											totalUnreadCount={inbox.totalUnreadCount}
-										/>
-									</motion.div>
-								)}
-								{activeSlideoutPanel === "shared" && allSharedChatsPanel && (
-									<motion.div
-										key="shared"
-										className="h-full flex flex-col"
-										initial={{ opacity: 0 }}
-										animate={{ opacity: 1 }}
-										exit={{ opacity: 0 }}
-										transition={{ duration: 0.15 }}
-									>
-										<AllSharedChatsSidebarContent
-											onOpenChange={(open) => closeSlideout(open)}
-											searchSpaceId={allSharedChatsPanel.searchSpaceId}
-										/>
-									</motion.div>
-								)}
-								{activeSlideoutPanel === "private" && allPrivateChatsPanel && (
-									<motion.div
-										key="private"
-										className="h-full flex flex-col"
-										initial={{ opacity: 0 }}
-										animate={{ opacity: 1 }}
-										exit={{ opacity: 0 }}
-										transition={{ duration: 0.15 }}
-									>
-										<AllPrivateChatsSidebarContent
-											onOpenChange={(open) => closeSlideout(open)}
-											searchSpaceId={allPrivateChatsPanel.searchSpaceId}
-										/>
-									</motion.div>
-								)}
-							</AnimatePresence>
-						</SidebarSlideOutPanel>
-					</div>
+							<Sidebar
+								searchSpace={searchSpace}
+								isCollapsed={isCollapsed}
+								onToggleCollapse={toggleCollapsed}
+								navItems={navItems}
+								onNavItemClick={onNavItemClick}
+								chats={chats}
+								sharedChats={sharedChats}
+								activeChatId={activeChatId}
+								onNewChat={onNewChat}
+								onChatSelect={onChatSelect}
+								onChatRename={onChatRename}
+								onChatDelete={onChatDelete}
+								onChatArchive={onChatArchive}
+								onViewAllSharedChats={onViewAllSharedChats}
+								onViewAllPrivateChats={onViewAllPrivateChats}
+								isSharedChatsPanelOpen={activeSlideoutPanel === "shared"}
+								isPrivateChatsPanelOpen={activeSlideoutPanel === "private"}
+								user={user}
+								onSettings={onSettings}
+								onManageMembers={onManageMembers}
+								onUserSettings={onUserSettings}
+								onAnnouncements={onAnnouncements}
+								announcementUnreadCount={announcementUnreadCount}
+								onLogout={onLogout}
+								pageUsage={pageUsage}
+								theme={theme}
+								setTheme={setTheme}
+								renderUserProfile={false}
+								renderCollapseButton={!isMacDesktop}
+								className={cn("flex shrink-0", isMacDesktop && "rounded-tl-xl")}
+								isLoadingChats={isLoadingChats}
+								sidebarWidth={sidebarWidth}
+								isResizing={isResizing}
+							/>
 
-					<DesktopWorkspaceRegion>
-						{useWorkspacePanel ? (
-							<WorkspacePanel
-								viewportClassName={workspacePanelViewportClassName}
-								contentClassName={workspacePanelContentClassName}
+							{!isCollapsed && (
+								<hr
+									aria-orientation="vertical"
+									aria-label="Resize sidebar"
+									aria-valuemin={SIDEBAR_MIN_WIDTH}
+									aria-valuemax={SIDEBAR_MAX_WIDTH}
+									aria-valuenow={sidebarWidth}
+									tabIndex={0}
+									onPointerDown={onResizePointerDown}
+									style={{ touchAction: "none" }}
+									className={cn(
+										"absolute top-0 right-0 h-full w-4 translate-x-1/2 z-50 m-0 border-0 bg-transparent p-0 select-none cursor-col-resize",
+										"after:content-[''] after:absolute after:inset-y-0 after:left-1/2 after:w-px after:-translate-x-1/2 after:bg-transparent hover:after:bg-border/80 after:transition-colors",
+										isResizing && "after:bg-border"
+									)}
+								/>
+							)}
+
+							{/* Unified slide-out panel — shell stays open, content cross-fades */}
+							<SidebarSlideOutPanel
+								open={anySlideOutOpen}
+								onOpenChange={closeSlideout}
+								ariaLabel={panelAriaLabel}
 							>
-								{children}
-							</WorkspacePanel>
-						) : (
-							<>
-								{/* Main content panel */}
-								<MainContentPanel
-									isChatPage={isChatPage}
-									onTabSwitch={onTabSwitch}
-									onNewChat={onNewChat}
+								<AnimatePresence mode="popLayout" initial={false}>
+									{activeSlideoutPanel === "inbox" && inbox && (
+										<motion.div
+											key="inbox"
+											className="h-full flex flex-col"
+											initial={{ opacity: 0 }}
+											animate={{ opacity: 1 }}
+											exit={{ opacity: 0 }}
+											transition={{ duration: 0.15 }}
+										>
+											<InboxSidebarContent
+												onOpenChange={(open) => closeSlideout(open)}
+												comments={inbox.comments}
+												status={inbox.status}
+												totalUnreadCount={inbox.totalUnreadCount}
+											/>
+										</motion.div>
+									)}
+									{activeSlideoutPanel === "shared" && allSharedChatsPanel && (
+										<motion.div
+											key="shared"
+											className="h-full flex flex-col"
+											initial={{ opacity: 0 }}
+											animate={{ opacity: 1 }}
+											exit={{ opacity: 0 }}
+											transition={{ duration: 0.15 }}
+										>
+											<AllSharedChatsSidebarContent
+												onOpenChange={(open) => closeSlideout(open)}
+												searchSpaceId={allSharedChatsPanel.searchSpaceId}
+											/>
+										</motion.div>
+									)}
+									{activeSlideoutPanel === "private" && allPrivateChatsPanel && (
+										<motion.div
+											key="private"
+											className="h-full flex flex-col"
+											initial={{ opacity: 0 }}
+											animate={{ opacity: 1 }}
+											exit={{ opacity: 0 }}
+											transition={{ duration: 0.15 }}
+										>
+											<AllPrivateChatsSidebarContent
+												onOpenChange={(open) => closeSlideout(open)}
+												searchSpaceId={allPrivateChatsPanel.searchSpaceId}
+											/>
+										</motion.div>
+									)}
+								</AnimatePresence>
+							</SidebarSlideOutPanel>
+						</div>
+
+						<DesktopWorkspaceRegion>
+							{useWorkspacePanel ? (
+								<WorkspacePanel
+									className={isMacDesktop ? "border-t" : undefined}
+									viewportClassName={workspacePanelViewportClassName}
+									contentClassName={workspacePanelContentClassName}
 								>
 									{children}
-								</MainContentPanel>
+								</WorkspacePanel>
+							) : (
+								<>
+									{/* Main content panel */}
+									<MainContentPanel
+										isChatPage={isChatPage}
+										onTabSwitch={onTabSwitch}
+										onNewChat={onNewChat}
+										showRightPanelExpandButton={!isMacDesktop}
+										showTopBorder={isMacDesktop}
+									>
+										{children}
+									</MainContentPanel>
 
-								{/* Right panel — tabbed Sources/Report (desktop only) */}
-								{documentsPanel ? (
-									<RightPanel
-										documentsPanel={{
-											open: documentsPanel.open,
-											onOpenChange: documentsPanel.onOpenChange,
-										}}
-									/>
-								) : null}
-							</>
-						)}
-					</DesktopWorkspaceRegion>
+									{/* Right panel — tabbed Sources/Report (desktop only) */}
+									{documentsPanel ? (
+										<RightPanel
+											documentsPanel={{
+												open: documentsPanel.open,
+												onOpenChange: documentsPanel.onOpenChange,
+											}}
+											showCollapseButton={!isMacDesktop}
+											showTopBorder={isMacDesktop}
+										/>
+									) : null}
+								</>
+							)}
+						</DesktopWorkspaceRegion>
+					</div>
 				</div>
 			</TooltipProvider>
 		</SidebarProvider>
diff --git a/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx b/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
index d290373dc..9412f01fd 100644
--- a/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
@@ -95,6 +95,7 @@ interface SidebarProps {
 	sidebarWidth?: number;
 	isResizing?: boolean;
 	renderUserProfile?: boolean;
+	renderCollapseButton?: boolean;
 }
 
 export function Sidebar({
@@ -132,6 +133,7 @@ export function Sidebar({
 	sidebarWidth = SIDEBAR_MIN_WIDTH,
 	isResizing = false,
 	renderUserProfile = true,
+	renderCollapseButton = true,
 }: SidebarProps) {
 	const t = useTranslations("sidebar");
 	const [openDropdownChatId, setOpenDropdownChatId] = useState<number | null>(null);
@@ -176,13 +178,15 @@ export function Sidebar({
 						onManageMembers={onManageMembers}
 					/>
 				</div>
-				<div className={cn("shrink-0", isCollapsed && "mx-auto")}>
-					<SidebarCollapseButton
-						isCollapsed={isCollapsed}
-						onToggle={onToggleCollapse ?? (() => {})}
-						disableTooltip={disableTooltips}
-					/>
-				</div>
+				{renderCollapseButton ? (
+					<div className={cn("shrink-0", isCollapsed && "mx-auto")}>
+						<SidebarCollapseButton
+							isCollapsed={isCollapsed}
+							onToggle={onToggleCollapse ?? (() => {})}
+							disableTooltip={disableTooltips}
+						/>
+					</div>
+				) : null}
 			</div>
 
 			<div className="flex flex-col gap-0.5 py-1.5">
@@ -383,10 +387,7 @@ function SidebarUsageFooter({
 
 	if (isCollapsed) return null;
 
-	const containerClass = cn(
-		"px-3 py-3 space-y-3",
-		hasNavSectionAbove && "border-t"
-	);
+	const containerClass = cn("px-3 py-3 space-y-3", hasNavSectionAbove && "border-t");
 
 	if (isAnonymous) {
 		return (
diff --git a/surfsense_web/components/layout/ui/sidebar/SidebarCollapseButton.tsx b/surfsense_web/components/layout/ui/sidebar/SidebarCollapseButton.tsx
index c140029dc..b100b799a 100644
--- a/surfsense_web/components/layout/ui/sidebar/SidebarCollapseButton.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/SidebarCollapseButton.tsx
@@ -6,17 +6,22 @@ import { Button } from "@/components/ui/button";
 import { ShortcutKbd } from "@/components/ui/shortcut-kbd";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { usePlatformShortcut } from "@/hooks/use-platform-shortcut";
+import { cn } from "@/lib/utils";
 
 interface SidebarCollapseButtonProps {
 	isCollapsed: boolean;
 	onToggle: () => void;
 	disableTooltip?: boolean;
+	className?: string;
+	iconClassName?: string;
 }
 
 export function SidebarCollapseButton({
 	isCollapsed,
 	onToggle,
 	disableTooltip = false,
+	className,
+	iconClassName,
 }: SidebarCollapseButtonProps) {
 	const t = useTranslations("sidebar");
 	const { shortcutKeys } = usePlatformShortcut();
@@ -26,9 +31,12 @@ export function SidebarCollapseButton({
 			variant="ghost"
 			size="icon"
 			onClick={onToggle}
-			className="h-8 w-8 shrink-0 text-muted-foreground hover:bg-accent hover:text-accent-foreground"
+			className={cn(
+				"h-8 w-8 shrink-0 text-muted-foreground hover:bg-accent hover:text-accent-foreground",
+				className
+			)}
 		>
-			<PanelLeft className="h-4 w-4" />
+			<PanelLeft className={cn("h-4 w-4", iconClassName)} />
 			<span className="sr-only">{isCollapsed ? t("expand_sidebar") : t("collapse_sidebar")}</span>
 		</Button>
 	);

From 07688263d8953b39d150a796c007dec7657d77d8 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Tue, 19 May 2026 20:04:37 +0530
Subject: [PATCH 92/96] feat: add new icon assets for macOS and update tray
 icon handling

---
 surfsense_desktop/assets/icon-128.png          | Bin 0 -> 294295 bytes
 surfsense_desktop/assets/iconTemplate.png      | Bin 0 -> 684 bytes
 surfsense_desktop/assets/iconTemplate@2x.png   | Bin 0 -> 1449 bytes
 surfsense_desktop/src/modules/tray.ts          |  11 ++++++++++-
 .../components/layout/ui/shell/LayoutShell.tsx |   7 ++++++-
 .../components/shared/llm-config-form.tsx      |   2 +-
 6 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 surfsense_desktop/assets/icon-128.png
 create mode 100644 surfsense_desktop/assets/iconTemplate.png
 create mode 100644 surfsense_desktop/assets/iconTemplate@2x.png

diff --git a/surfsense_desktop/assets/icon-128.png b/surfsense_desktop/assets/icon-128.png
new file mode 100644
index 0000000000000000000000000000000000000000..8be6ee21a6936babc4edb8bf934bd930ec506489
GIT binary patch
literal 294295
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%0DdogUUPH
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
OwrsNfEcajTNB$rCj5&b-

literal 0
HcmV?d00001

diff --git a/surfsense_desktop/assets/iconTemplate.png b/surfsense_desktop/assets/iconTemplate.png
new file mode 100644
index 0000000000000000000000000000000000000000..13d1c984075041f49f17c79c517c47ff2d43ee99
GIT binary patch
literal 684
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+0wn(&ce?|m6p}rHd>I(3)EF2VS{N990fib~
zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9fnimzvJsHSUgGKN%KnN~m`{rPj@oM(
zppa^bYeY#(Vo9o1a#1RfVlXl=GSf9M)ityXF*LC<G_x`=)iyA&GBCKQQa=?%LvDUb
zW?ChR24gEz3oAndh=!*fYb${oG~hOrWag$8mn7yEpy)BNGBShf`609Z90LR61Wy;o
z5RLP_m+U>JFiIT%c)t35s`|~!Tk^W66*bqNaNP3YP>c?zYE#>^J59&hGBmQXc%q`X
z7PU2TaY;$Z^lj_tYB}r`bV$Maqsir(sgpi$aa4BSfBN$Q{<_1TYa-bX&e|J0+kx-w
zv^^hR#S5%EXJu=}Td~%4>zWyQ(SJo8d8WMnb~0JASZwN<Qx%Vz^Pc{neaTA2r()%j
zQ%!reYnfylq%~Ot-TIm-V)b&4)x<r&*`~fOzEXZ!QHqtzEw=dL4C_s07Oz)}Yl$4~
zY0n7Gzv63~w>$l2rSiPh-@QFoFIu?6A>)*;`<)L5ws=2U*KuXW#iWR}E_V{wR^^sm
z4VImkX^_u&l~2+@IkWzZ+3u9N7xiDxZP_FC)+{5a$Z_?Fl@~VDDet?XDRd+EAm?1A
zziLO{Tz(zc5ap|+d0%F_@xvLfgSfgTJ&XBP@U%RXPeWq+arvpsWUi>{ez+OCb850t
zvUOIj$qKJy)$+QxR{P|wWnHMNH8n>_DqK1D!W7S=Tg7x{e~+HI<npvX1}gctE>-13
bKh^hKTBUqXZp|%Vd@^{t`njxgN@xNAB)$wh

literal 0
HcmV?d00001

diff --git a/surfsense_desktop/assets/iconTemplate@2x.png b/surfsense_desktop/assets/iconTemplate@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..70710f739bf208ba0b3d420b0843ede2ab812587
GIT binary patch
literal 1449
zcmY+EdpOez7{`CdA$M_v5b2Oa*k*GX%5CnKEVt(J7@OK`E}455w=OR0L|Pl-h>#KH
z)={lPWD+4OBU*)NZbxoe;p{v;&v~Byc;D~ye&6Twe4pq2<IO(l=_D(qCItY1tc$Y)
zQm8urm4v9UyGfo@6pB{3GtvV9Qgi_zEeikyLMv?!0OCOazz+ogI28a?VoEx^t%M7a
zFgGU$0H`HvLxht!$;AU9&KFaZQ#a!ytHy=aVG<&Mgh7+A@bGh3p#TsN#MBT3GXz`s
zfT3`(DI5ed0D<5j5J%_It)Bp5GzJ%u{1adThnd5{pdY}@wfbZsp!a_Q2}i`nk<i4L
zpBN|{Vg`pne=uhzmQ(>il<eYQ>*L(ZW=9g(>l(c)Z!N5?pOj2_x=GiIc_92yMpq0&
zoApH_tEpU!;uY<FLYqtwRaIBMgrQr+rBJE)H=K2&q)a+w_9uiBA`htB&F{Ge(TZ1A
zMY;}$1sYM}%y+H1fVIfpjiKe;zTJ&vUh3BOizk?R-njZFQ%#dHpvkg@_V?2Iy9eE0
zrbLd`GJJ}M9VhrsQIO%)H@U%H1@QyLc8cfwlXBPHIG;5o%^vl6i3(Z*YesIMpV1gB
z9>{~j@;g?^vEE4TQ}CTrPGT+Y)O7`!+^cKdetsB+-;75{S<f|^##(*orJT-w_}-FG
zYKNG`C-TUUoU=`x%9x3|5b|pYX-Vl1EjQuB0z)(%X_(*^qI}gU&DEEa%|Riy2aOJq
zzE-!#YfTda9a=loqg5-`1Ov=x+Evtua^l9fv5>q1y8BCuqxKu-Gk3iy_nU2=SRa4b
z*7D6Nifqrki!!rg63TVW`c(>sDkkBnG2P~uHZ!vQSSyYZ#Re@~D8UYR(_pjiX2#mB
z7*8ZOOZnIeM(`?PBCk($lBa~8DayjqK1BP=KWasBjrJzJIaDUNjufNT2aP$#L5hPv
zo;s?;G=Am3{la|+n=NL__nASH2Vbn5x;I$UVt2XFs}PfcWa`XbphHt!498||Ra*DA
zjW!J2=3Tf`JK)d7iIe(FY(b1hNU;V(V&M2biOR=yK}<F?vZ*qwy61AY6+Y8@$yaAu
zTy7jXBDzX|vKKYK<lAWB$RY}f`u<BA=}+|@hEb#Sx&r1~XiG|~4>FXCjNhKC787~q
z*YA&Qi#?kV!o9Ds#moJ3yxq5)Ej1k^@WD{(3q;aw`?39-PW_z~BI#IFlR?#{-{0Un
zH53wy36w|OoeExp%*yO>4KYsWcO`UwkJ=jQ%)#0H%V(qp$gI^gM+KR&sMf>*D7VDS
zr)DGn_))Y6o>aYvT2`q_Jzaexwlr?^g`2KkY(ww%$xJ=nF^upyIC)cx#eY<K<k_`y
z;Aj+)iQn>r*WxfUoaeOJ;)`?_N=gsjy<mQQP3IDBL5Vk$`ce<wOi&0gR&%vSK?UUS
zlspQk4n_Ml;1jHu;P=Z^Yp2{1ooPChy{)FS)t=m8)Ufku&^4z9#4$=gK!5z%*Rpcq
zOCfJxXik~>kntg}?5?#W3csV{;05l9->xT*X>WAYcsY-tCwgS&V%|Y}wETl;A6w$4
z7~LlzW^K0Z7WZF0T^L%<lio4F=dI?fa~gu%z*0d`&l@vKH?!<-YualUX_z6#G&5P=
zJo|R@u)C58mh~fPRwkqR`J|xsJ1Ot9iWW_JiTGm-SC-FAl4JEU&iVEp@7FD~<H(|9
zo6=ZEZecTjlAop+#s2hob3suF>{5<|;XPuJSJUYuL$K359wYQX3cRdunC{+i@h>&2
z@Z7hB`U!s@p)n$D9oRXRRlNZfE40iUU)6%cf$6rvM(0CF*7Ey05brF&9y#CHji>C+
z$-?n-DH$wT8~dr7^*&9j%AbekGyYh2``XpL3(RpMjb!UtFyS);To9fP59~rS{sk<(
Bn->58

literal 0
HcmV?d00001

diff --git a/surfsense_desktop/src/modules/tray.ts b/surfsense_desktop/src/modules/tray.ts
index 5fb1acbdf..f0221fe53 100644
--- a/surfsense_desktop/src/modules/tray.ts
+++ b/surfsense_desktop/src/modules/tray.ts
@@ -11,11 +11,20 @@ let registeredGeneralAssist: string | null = null;
 let registeredScreenshotAssist: string | null = null;
 
 function getTrayIcon(): NativeImage {
-  const iconName = process.platform === 'win32' ? 'icon.ico' : 'icon.png';
+  const iconName =
+    process.platform === 'darwin'
+      ? 'iconTemplate.png'
+      : process.platform === 'win32'
+        ? 'icon.ico'
+        : 'icon.png';
   const iconPath = app.isPackaged
     ? path.join(process.resourcesPath, 'assets', iconName)
     : path.join(__dirname, '..', 'assets', iconName);
   const img = nativeImage.createFromPath(iconPath);
+  if (process.platform === 'darwin') {
+    img.setTemplateImage(true);
+    return img;
+  }
   return img.resize({ width: 16, height: 16 });
 }
 
diff --git a/surfsense_web/components/layout/ui/shell/LayoutShell.tsx b/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
index 0b1d1d20b..c7d0c5186 100644
--- a/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
+++ b/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
@@ -441,7 +441,12 @@ export function LayoutShell({
 						/>
 					) : null}
 					<div className="flex min-h-0 flex-1 w-full gap-2 px-2 py-0 overflow-hidden">
-						<div className="hidden md:flex overflow-hidden -mr-2 pr-2 bg-rail">
+						<div
+							className={cn(
+								"hidden md:flex overflow-hidden -mr-2 pr-2 bg-rail",
+								!isMacDesktop && "border-r"
+							)}
+						>
 							<IconRail
 								searchSpaces={searchSpaces}
 								activeSearchSpaceId={activeSearchSpaceId}
diff --git a/surfsense_web/components/shared/llm-config-form.tsx b/surfsense_web/components/shared/llm-config-form.tsx
index 1356ed58f..06de4129b 100644
--- a/surfsense_web/components/shared/llm-config-form.tsx
+++ b/surfsense_web/components/shared/llm-config-form.tsx
@@ -251,7 +251,7 @@ export function LLMConfigForm({
 												role="combobox"
 												aria-expanded={modelComboboxOpen}
 												className={cn(
-													"w-full justify-between font-normal bg-transparent",
+													"w-full justify-between border-popover-border bg-transparent font-normal",
 													!field.value && "text-muted-foreground"
 												)}
 											>

From f1b3c883549fdc69ce8f9f79cdd2c802bd2e18ad Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Tue, 19 May 2026 20:58:19 +0530
Subject: [PATCH 93/96] feat: add collapsed header content support in
 LayoutShell and Sidebar components

---
 .../components/layout/ui/shell/LayoutShell.tsx |  6 ++++++
 .../components/layout/ui/sidebar/Sidebar.tsx   | 18 ++++++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/surfsense_web/components/layout/ui/shell/LayoutShell.tsx b/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
index c7d0c5186..2f799929b 100644
--- a/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
+++ b/surfsense_web/components/layout/ui/shell/LayoutShell.tsx
@@ -5,6 +5,7 @@ import { AnimatePresence, motion } from "motion/react";
 import dynamic from "next/dynamic";
 import { useCallback, useMemo, useState } from "react";
 import { activeTabAtom, type Tab } from "@/atoms/tabs/tabs.atom";
+import { Logo } from "@/components/Logo";
 import { Spinner } from "@/components/ui/spinner";
 import { TooltipProvider } from "@/components/ui/tooltip";
 import type { InboxItem } from "@/hooks/use-inbox";
@@ -502,6 +503,11 @@ export function LayoutShell({
 								setTheme={setTheme}
 								renderUserProfile={false}
 								renderCollapseButton={!isMacDesktop}
+								collapsedHeaderContent={
+									isMacDesktop ? (
+										<Logo disableLink priority className="h-7 w-7 rounded-md" />
+									) : undefined
+								}
 								className={cn("flex shrink-0", isMacDesktop && "rounded-tl-xl")}
 								isLoadingChats={isLoadingChats}
 								sidebarWidth={sidebarWidth}
diff --git a/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx b/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
index 9412f01fd..e0cb3072a 100644
--- a/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
@@ -4,7 +4,7 @@ import { CreditCard, Dot, SquarePen, Zap } from "lucide-react";
 import Link from "next/link";
 import { useParams } from "next/navigation";
 import { useTranslations } from "next-intl";
-import { useMemo, useState } from "react";
+import { type ReactNode, useMemo, useState } from "react";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import { Progress } from "@/components/ui/progress";
@@ -96,6 +96,7 @@ interface SidebarProps {
 	isResizing?: boolean;
 	renderUserProfile?: boolean;
 	renderCollapseButton?: boolean;
+	collapsedHeaderContent?: ReactNode;
 }
 
 export function Sidebar({
@@ -134,6 +135,7 @@ export function Sidebar({
 	isResizing = false,
 	renderUserProfile = true,
 	renderCollapseButton = true,
+	collapsedHeaderContent,
 }: SidebarProps) {
 	const t = useTranslations("sidebar");
 	const [openDropdownChatId, setOpenDropdownChatId] = useState<number | null>(null);
@@ -162,7 +164,7 @@ export function Sidebar({
 			)}
 			style={{ width: isCollapsed ? collapsedWidth : sidebarWidth }}
 		>
-			<div className="flex h-12 shrink-0 items-center gap-0 px-1 border-b">
+			<div className="relative flex h-12 shrink-0 items-center gap-0 px-1 border-b">
 				<div
 					className={cn(
 						"min-w-0 overflow-hidden",
@@ -178,6 +180,18 @@ export function Sidebar({
 						onManageMembers={onManageMembers}
 					/>
 				</div>
+				{collapsedHeaderContent ? (
+					<div
+						aria-hidden={!isCollapsed}
+						className={cn(
+							"pointer-events-none absolute inset-y-0 left-0 flex items-center justify-center transition-opacity duration-150",
+							isCollapsed ? "opacity-100 delay-150" : "opacity-0"
+						)}
+						style={{ width: collapsedWidth }}
+					>
+						{collapsedHeaderContent}
+					</div>
+				) : null}
 				{renderCollapseButton ? (
 					<div className={cn("shrink-0", isCollapsed && "mx-auto")}>
 						<SidebarCollapseButton

From d66295aeddadf713e5bd6cf6db7dc4a52dc29bda Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Tue, 19 May 2026 21:02:07 +0530
Subject: [PATCH 94/96] chore: ran linting

---
 .../[search_space_id]/logs/loading.tsx        |   5 +-
 .../new-chat/[[...chat_id]]/page.tsx          |   7 +-
 .../search-space-settings/general/page.tsx    |   6 +-
 .../image-models/page.tsx                     |   6 +-
 .../search-space-settings/models/page.tsx     |   6 +-
 .../search-space-settings/prompts/page.tsx    |   6 +-
 .../public-links/page.tsx                     |   6 +-
 .../search-space-settings/roles/page.tsx      |   6 +-
 .../team-memory/page.tsx                      |   6 +-
 .../search-space-settings/team-roles/page.tsx |   6 +-
 .../vision-models/page.tsx                    |   6 +-
 .../components/AgentPermissionsContent.tsx    |  12 +-
 .../components/MemoryContent.tsx              |   4 +-
 .../user-settings/layout-shell.tsx            |   5 +-
 surfsense_web/app/dashboard/error.tsx         |   5 +-
 surfsense_web/app/error.tsx                   |   5 +-
 .../agent-action-log/action-log-dialog.tsx    |   7 +-
 .../agent-action-log/action-log-item.tsx      |   4 +-
 .../assistant-ui/assistant-message.tsx        |   3 +-
 .../baidu-search-api-connect-form.tsx         |   4 +-
 .../components/google-drive-config.tsx        |  23 +-
 .../components/teams-config.tsx               |   4 +-
 .../assistant-ui/inline-citation.tsx          |  27 +-
 .../components/assistant-ui/markdown-text.tsx |   3 +-
 .../components/assistant-ui/thread.tsx        | 420 +++++++++---------
 .../comment-panel/comment-panel.tsx           |   2 +-
 .../member-mention-item.tsx                   |   4 +-
 .../components/free-chat/anonymous-chat.tsx   |   3 +-
 .../components/inference-params-editor.tsx    |   5 +-
 .../layout/hooks/useSidebarResize.ts          |  38 +-
 .../layout/ui/icon-rail/IconRail.tsx          |   3 +-
 .../ui/sidebar/DesktopLocalTabContent.tsx     |   2 +-
 .../layout/ui/sidebar/InboxSidebar.tsx        |   4 +-
 .../layout/ui/sidebar/MobileSidebar.tsx       |   5 +-
 .../layout/ui/sidebar/SidebarButton.tsx       |   8 +-
 .../layout/ui/sidebar/SidebarSection.tsx      |   4 +-
 .../layout/ui/sidebar/SidebarUserProfile.tsx  |   2 +-
 .../components/layout/ui/tabs/TabBar.tsx      |   5 +-
 .../public-chat-snapshot-row.tsx              |   2 +-
 .../components/report-panel/report-panel.tsx  |  78 ++--
 .../components/settings/roles-manager.tsx     |  12 +-
 .../settings/team-memory-manager.tsx          |   4 +-
 .../components/sources/DocumentUploadTab.tsx  |  13 +-
 .../components/tool-ui/citation/citation.tsx  |   6 +-
 surfsense_web/components/ui/callout-node.tsx  |   5 +-
 surfsense_web/components/ui/equation-node.tsx |   7 +-
 surfsense_web/lib/chat/thread-persistence.ts  |   1 -
 surfsense_web/lib/url.ts                      |  10 +-
 48 files changed, 372 insertions(+), 443 deletions(-)

diff --git a/surfsense_web/app/dashboard/[search_space_id]/logs/loading.tsx b/surfsense_web/app/dashboard/[search_space_id]/logs/loading.tsx
index 115125531..e734d4e53 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/logs/loading.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/logs/loading.tsx
@@ -53,7 +53,10 @@ export default function Loading() {
 
 				{/* Table Rows */}
 				{[...Array(6)].map((_, i) => (
-					<div key={i} className="border-b px-4 py-3 flex items-center gap-4 hover:bg-accent hover:text-accent-foreground">
+					<div
+						key={i}
+						className="border-b px-4 py-3 flex items-center gap-4 hover:bg-accent hover:text-accent-foreground"
+					>
 						<Skeleton className="h-4 w-4" />
 						<Skeleton className="h-6 w-12 rounded-full" />
 						<Skeleton className="h-6 w-16 rounded-full" />
diff --git a/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
index ed4ed6ce1..d439cbb67 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
@@ -44,12 +44,12 @@ import {
 } from "@/components/assistant-ui/edit-message-dialog";
 import { StepSeparatorDataUI } from "@/components/assistant-ui/step-separator";
 import { Thread } from "@/components/assistant-ui/thread";
-import { Button } from "@/components/ui/button";
 import {
 	createTokenUsageStore,
 	type TokenUsageData,
 	TokenUsageProvider,
 } from "@/components/assistant-ui/token-usage-context";
+import { Button } from "@/components/ui/button";
 import {
 	type HitlDecision,
 	PendingInterruptProvider,
@@ -79,10 +79,7 @@ import {
 	setActivePodcastTaskId,
 } from "@/lib/chat/podcast-state";
 import { createStreamFlushHelpers } from "@/lib/chat/stream-flush";
-import {
-	consumeSseEvents,
-	processSharedStreamEvent,
-} from "@/lib/chat/stream-pipeline";
+import { consumeSseEvents, processSharedStreamEvent } from "@/lib/chat/stream-pipeline";
 import {
 	applyTurnIdToAssistantMessageList,
 	mergeChatTurnIdIntoMessage,
diff --git a/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/general/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/general/page.tsx
index ac50c654e..09124b3b0 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/general/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/general/page.tsx
@@ -1,10 +1,6 @@
 import { GeneralSettingsManager } from "@/components/settings/general-settings-manager";
 
-export default async function Page({
-	params,
-}: {
-	params: Promise<{ search_space_id: string }>;
-}) {
+export default async function Page({ params }: { params: Promise<{ search_space_id: string }> }) {
 	const { search_space_id } = await params;
 	return <GeneralSettingsManager searchSpaceId={Number(search_space_id)} />;
 }
diff --git a/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/image-models/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/image-models/page.tsx
index 22859859b..b300f8078 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/image-models/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/image-models/page.tsx
@@ -1,10 +1,6 @@
 import { ImageModelManager } from "@/components/settings/image-model-manager";
 
-export default async function Page({
-	params,
-}: {
-	params: Promise<{ search_space_id: string }>;
-}) {
+export default async function Page({ params }: { params: Promise<{ search_space_id: string }> }) {
 	const { search_space_id } = await params;
 	return <ImageModelManager searchSpaceId={Number(search_space_id)} />;
 }
diff --git a/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/models/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/models/page.tsx
index b14a536ed..d68194782 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/models/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/models/page.tsx
@@ -1,10 +1,6 @@
 import { AgentModelManager } from "@/components/settings/agent-model-manager";
 
-export default async function Page({
-	params,
-}: {
-	params: Promise<{ search_space_id: string }>;
-}) {
+export default async function Page({ params }: { params: Promise<{ search_space_id: string }> }) {
 	const { search_space_id } = await params;
 	return <AgentModelManager searchSpaceId={Number(search_space_id)} />;
 }
diff --git a/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/prompts/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/prompts/page.tsx
index fcdafdf2d..cc837299d 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/prompts/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/prompts/page.tsx
@@ -1,10 +1,6 @@
 import { PromptConfigManager } from "@/components/settings/prompt-config-manager";
 
-export default async function Page({
-	params,
-}: {
-	params: Promise<{ search_space_id: string }>;
-}) {
+export default async function Page({ params }: { params: Promise<{ search_space_id: string }> }) {
 	const { search_space_id } = await params;
 	return <PromptConfigManager searchSpaceId={Number(search_space_id)} />;
 }
diff --git a/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/public-links/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/public-links/page.tsx
index e4b5f35e7..2cddfe3e0 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/public-links/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/public-links/page.tsx
@@ -1,10 +1,6 @@
 import { PublicChatSnapshotsManager } from "@/components/public-chat-snapshots/public-chat-snapshots-manager";
 
-export default async function Page({
-	params,
-}: {
-	params: Promise<{ search_space_id: string }>;
-}) {
+export default async function Page({ params }: { params: Promise<{ search_space_id: string }> }) {
 	const { search_space_id } = await params;
 	return <PublicChatSnapshotsManager searchSpaceId={Number(search_space_id)} />;
 }
diff --git a/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/roles/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/roles/page.tsx
index 8c43e7844..5bad50cd3 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/roles/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/roles/page.tsx
@@ -1,10 +1,6 @@
 import { LLMRoleManager } from "@/components/settings/llm-role-manager";
 
-export default async function Page({
-	params,
-}: {
-	params: Promise<{ search_space_id: string }>;
-}) {
+export default async function Page({ params }: { params: Promise<{ search_space_id: string }> }) {
 	const { search_space_id } = await params;
 	return <LLMRoleManager key={search_space_id} searchSpaceId={Number(search_space_id)} />;
 }
diff --git a/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/team-memory/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/team-memory/page.tsx
index 987b36513..0652b012e 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/team-memory/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/team-memory/page.tsx
@@ -1,10 +1,6 @@
 import { TeamMemoryManager } from "@/components/settings/team-memory-manager";
 
-export default async function Page({
-	params,
-}: {
-	params: Promise<{ search_space_id: string }>;
-}) {
+export default async function Page({ params }: { params: Promise<{ search_space_id: string }> }) {
 	const { search_space_id } = await params;
 	return <TeamMemoryManager searchSpaceId={Number(search_space_id)} />;
 }
diff --git a/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/team-roles/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/team-roles/page.tsx
index ca2108975..a343eaacb 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/team-roles/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/team-roles/page.tsx
@@ -1,10 +1,6 @@
 import { RolesManager } from "@/components/settings/roles-manager";
 
-export default async function Page({
-	params,
-}: {
-	params: Promise<{ search_space_id: string }>;
-}) {
+export default async function Page({ params }: { params: Promise<{ search_space_id: string }> }) {
 	const { search_space_id } = await params;
 	return <RolesManager searchSpaceId={Number(search_space_id)} />;
 }
diff --git a/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/vision-models/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/vision-models/page.tsx
index 8b8a2dc6d..06aea003a 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/vision-models/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/search-space-settings/vision-models/page.tsx
@@ -1,10 +1,6 @@
 import { VisionModelManager } from "@/components/settings/vision-model-manager";
 
-export default async function Page({
-	params,
-}: {
-	params: Promise<{ search_space_id: string }>;
-}) {
+export default async function Page({ params }: { params: Promise<{ search_space_id: string }> }) {
 	const { search_space_id } = await params;
 	return <VisionModelManager searchSpaceId={Number(search_space_id)} />;
 }
diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/AgentPermissionsContent.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/AgentPermissionsContent.tsx
index e87798a14..5af94f7e3 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/AgentPermissionsContent.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/AgentPermissionsContent.tsx
@@ -31,7 +31,6 @@ import {
 } from "@/components/ui/dialog";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
-import { Skeleton } from "@/components/ui/skeleton";
 import {
 	Select,
 	SelectContent,
@@ -39,6 +38,7 @@ import {
 	SelectTrigger,
 	SelectValue,
 } from "@/components/ui/select";
+import { Skeleton } from "@/components/ui/skeleton";
 import { Spinner } from "@/components/ui/spinner";
 import {
 	type AgentPermissionAction,
@@ -215,8 +215,10 @@ export function AgentPermissionsContent() {
 				<AlertDescription>
 					<p>
 						Flip{" "}
-						<code className="rounded bg-popover px-1 py-0.5 text-[10px] text-popover-foreground">SURFSENSE_ENABLE_PERMISSION</code> on
-						the backend to manage allow/deny/ask rules from this panel.
+						<code className="rounded bg-popover px-1 py-0.5 text-[10px] text-popover-foreground">
+							SURFSENSE_ENABLE_PERMISSION
+						</code>{" "}
+						on the backend to manage allow/deny/ask rules from this panel.
 					</p>
 				</AlertDescription>
 			</Alert>
@@ -425,9 +427,7 @@ export function AgentPermissionsContent() {
 												className={cn("h-8 gap-1 border px-2 text-[11px]", badge.className)}
 											>
 												<SelectValue>
-													<span className="flex items-center gap-1">
-														{badge.label}
-													</span>
+													<span className="flex items-center gap-1">{badge.label}</span>
 												</SelectValue>
 											</SelectTrigger>
 											<SelectContent>
diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/MemoryContent.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/MemoryContent.tsx
index af3aefaff..3542f0925 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/MemoryContent.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/MemoryContent.tsx
@@ -222,7 +222,9 @@ export function MemoryContent() {
 								onClick={handleEdit}
 								disabled={editing || !editQuery.trim()}
 								className={`h-11 w-11 shrink-0 rounded-full ${
-									editing ? "" : "bg-muted-foreground/15 hover:bg-accent hover:text-accent-foreground"
+									editing
+										? ""
+										: "bg-muted-foreground/15 hover:bg-accent hover:text-accent-foreground"
 								}`}
 							>
 								{editing ? (
diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/layout-shell.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/layout-shell.tsx
index a942c57f7..820021622 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/user-settings/layout-shell.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/layout-shell.tsx
@@ -40,10 +40,7 @@ interface UserSettingsLayoutShellProps {
 	children: React.ReactNode;
 }
 
-export function UserSettingsLayoutShell({
-	searchSpaceId,
-	children,
-}: UserSettingsLayoutShellProps) {
+export function UserSettingsLayoutShell({ searchSpaceId, children }: UserSettingsLayoutShellProps) {
 	const t = useTranslations("userSettings");
 	const { isDesktop } = usePlatform();
 	const segment = useSelectedLayoutSegment();
diff --git a/surfsense_web/app/dashboard/error.tsx b/surfsense_web/app/dashboard/error.tsx
index 85c31e1a0..28a22fe3c 100644
--- a/surfsense_web/app/dashboard/error.tsx
+++ b/surfsense_web/app/dashboard/error.tsx
@@ -40,10 +40,7 @@ export default function DashboardError({
 			)}
 
 			<div className="flex gap-2">
-				<Button
-					type="button"
-					onClick={reset}
-				>
+				<Button type="button" onClick={reset}>
 					Try again
 				</Button>
 				<Link
diff --git a/surfsense_web/app/error.tsx b/surfsense_web/app/error.tsx
index dd3a35d41..42d05cfdf 100644
--- a/surfsense_web/app/error.tsx
+++ b/surfsense_web/app/error.tsx
@@ -38,10 +38,7 @@ export default function ErrorPage({
 			)}
 
 			<div className="flex gap-2">
-				<Button
-					type="button"
-					onClick={reset}
-				>
+				<Button type="button" onClick={reset}>
 					Try again
 				</Button>
 				<a
diff --git a/surfsense_web/components/agent-action-log/action-log-dialog.tsx b/surfsense_web/components/agent-action-log/action-log-dialog.tsx
index 75f2408ae..1d0eefc17 100644
--- a/surfsense_web/components/agent-action-log/action-log-dialog.tsx
+++ b/surfsense_web/components/agent-action-log/action-log-dialog.tsx
@@ -8,12 +8,7 @@ import { actionLogDialogAtom } from "@/atoms/agent/action-log-dialog.atom";
 import { agentFlagsAtom } from "@/atoms/agent/agent-flags-query.atom";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
-import {
-	Dialog,
-	DialogContent,
-	DialogDescription,
-	DialogTitle,
-} from "@/components/ui/dialog";
+import { Dialog, DialogContent, DialogDescription, DialogTitle } from "@/components/ui/dialog";
 import { Separator } from "@/components/ui/separator";
 import { Skeleton } from "@/components/ui/skeleton";
 import { agentActionsQueryKey, useAgentActionsQuery } from "@/hooks/use-agent-actions-query";
diff --git a/surfsense_web/components/agent-action-log/action-log-item.tsx b/surfsense_web/components/agent-action-log/action-log-item.tsx
index 7b57293ad..bdd3711b6 100644
--- a/surfsense_web/components/agent-action-log/action-log-item.tsx
+++ b/surfsense_web/components/agent-action-log/action-log-item.tsx
@@ -194,9 +194,7 @@ export function ActionLogItem({ action, threadId, onRevertSuccess }: ActionLogIt
 									variant="ghost"
 									onClick={handleCopyArguments}
 									className="size-6 rounded-lg p-0 text-muted-foreground hover:bg-popover hover:text-popover-foreground"
-									aria-label={
-										copiedSection === "arguments" ? "Arguments copied" : "Copy arguments"
-									}
+									aria-label={copiedSection === "arguments" ? "Arguments copied" : "Copy arguments"}
 								>
 									{copiedSection === "arguments" ? (
 										<Check className="size-3" />
diff --git a/surfsense_web/components/assistant-ui/assistant-message.tsx b/surfsense_web/components/assistant-ui/assistant-message.tsx
index b18f536ed..ac1732441 100644
--- a/surfsense_web/components/assistant-ui/assistant-message.tsx
+++ b/surfsense_web/components/assistant-ui/assistant-message.tsx
@@ -24,8 +24,6 @@ import dynamic from "next/dynamic";
 import type { FC } from "react";
 import { useEffect, useMemo, useRef, useState } from "react";
 import { commentsEnabledAtom, targetCommentIdAtom } from "@/atoms/chat/current-thread.atom";
-import { tryGetHostname } from "@/lib/url";
-
 import {
 	globalNewLLMConfigsAtom,
 	newLLMConfigsAtom,
@@ -60,6 +58,7 @@ import { useComments } from "@/hooks/use-comments";
 import { useMediaQuery } from "@/hooks/use-media-query";
 import { useElectronAPI } from "@/hooks/use-platform";
 import { getProviderIcon } from "@/lib/provider-icons";
+import { tryGetHostname } from "@/lib/url";
 import { cn } from "@/lib/utils";
 
 // Captured once at module load — survives client-side navigations that strip the query param.
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/baidu-search-api-connect-form.tsx b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/baidu-search-api-connect-form.tsx
index d994b178d..726371f99 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/baidu-search-api-connect-form.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/baidu-search-api-connect-form.tsx
@@ -75,8 +75,8 @@ export const BaiduSearchApiConnectForm: FC<ConnectFormProps> = ({ onSubmit, isSu
 				<AlertTitle>API Key Required</AlertTitle>
 				<AlertDescription>
 					<p>
-						You'll need a Baidu AppBuilder API key to use this connector. You can get one by
-						signing up at{" "}
+						You'll need a Baidu AppBuilder API key to use this connector. You can get one by signing
+						up at{" "}
 						<a
 							href="https://qianfan.cloud.baidu.com/"
 							target="_blank"
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/google-drive-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/google-drive-config.tsx
index 6111feba3..4ece648e6 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/google-drive-config.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/google-drive-config.tsx
@@ -92,16 +92,19 @@ export const GoogleDriveConfig: FC<ConnectorConfigProps> = ({ connector, onConfi
 	const [selectedFiles, setSelectedFiles] = useState<SelectedItem[]>(existingFiles);
 	const [indexingOptions, setIndexingOptions] = useState<IndexingOptions>(existingIndexingOptions);
 
-	const updateConfig = useCallback((folders: SelectedItem[], files: SelectedItem[], options: IndexingOptions) => {
-		if (onConfigChange) {
-			onConfigChange({
-				...connector.config,
-				selected_folders: folders,
-				selected_files: files,
-				indexing_options: options,
-			});
-		}
-	}, [connector.config, onConfigChange]);
+	const updateConfig = useCallback(
+		(folders: SelectedItem[], files: SelectedItem[], options: IndexingOptions) => {
+			if (onConfigChange) {
+				onConfigChange({
+					...connector.config,
+					selected_folders: folders,
+					selected_files: files,
+					indexing_options: options,
+				});
+			}
+		},
+		[connector.config, onConfigChange]
+	);
 
 	const handlePicked = useCallback(
 		(result: PickerResult) => {
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/teams-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/teams-config.tsx
index aae517098..a1d387e90 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/teams-config.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/teams-config.tsx
@@ -18,8 +18,8 @@ export const TeamsConfig: FC<TeamsConfigProps> = () => {
 				<AlertDescription>
 					<p>
 						Your agent can search and read messages from Teams channels you have access to, and send
-						messages on your behalf. Make sure you&#39;re a member of the teams you want to
-						interact with.
+						messages on your behalf. Make sure you&#39;re a member of the teams you want to interact
+						with.
 					</p>
 				</AlertDescription>
 			</Alert>
diff --git a/surfsense_web/components/assistant-ui/inline-citation.tsx b/surfsense_web/components/assistant-ui/inline-citation.tsx
index ebfd7a65b..a788c0ce6 100644
--- a/surfsense_web/components/assistant-ui/inline-citation.tsx
+++ b/surfsense_web/components/assistant-ui/inline-citation.tsx
@@ -105,7 +105,11 @@ const NumericChunkCitation: FC<{ chunkId: number }> = ({ chunkId }) => {
 			>
 				{chunkId}
 			</Button>
-			<Drawer open={mobilePreviewOpen} onOpenChange={setMobilePreviewOpen} shouldScaleBackground={false}>
+			<Drawer
+				open={mobilePreviewOpen}
+				onOpenChange={setMobilePreviewOpen}
+				shouldScaleBackground={false}
+			>
 				<DrawerContent
 					className="h-[85vh] max-h-[85vh] z-80 overflow-hidden"
 					overlayClassName="z-80"
@@ -156,16 +160,21 @@ const SurfsenseDocCitation: FC<{ chunkId: number }> = ({ chunkId }) => {
 			>
 				<SurfsenseDocPreview chunkId={chunkId} />
 			</CitationHoverPopover>
-			<Drawer open={mobilePreviewOpen} onOpenChange={setMobilePreviewOpen} shouldScaleBackground={false}>
-				<DrawerContent
-					className="max-h-[85vh] z-80"
-					overlayClassName="z-80"
-				>
+			<Drawer
+				open={mobilePreviewOpen}
+				onOpenChange={setMobilePreviewOpen}
+				shouldScaleBackground={false}
+			>
+				<DrawerContent className="max-h-[85vh] z-80" overlayClassName="z-80">
 					<DrawerHandle />
 					<DrawerHeader className="pb-0">
 						<DrawerTitle>Surfsense documentation</DrawerTitle>
 					</DrawerHeader>
-					<SurfsenseDocPreviewContent chunkId={chunkId} query={docQuery} contentClassName="max-h-[60vh]" />
+					<SurfsenseDocPreviewContent
+						chunkId={chunkId}
+						query={docQuery}
+						contentClassName="max-h-[60vh]"
+					/>
 				</DrawerContent>
 			</Drawer>
 		</>
@@ -202,9 +211,7 @@ const SurfsenseDocPreviewContent: FC<{
 		<>
 			<div className="flex items-center justify-between gap-2 border-b px-3 py-2">
 				<div className="min-w-0">
-					<p className="truncate text-sm font-medium">
-						{data?.title ?? "Surfsense documentation"}
-					</p>
+					<p className="truncate text-sm font-medium">{data?.title ?? "Surfsense documentation"}</p>
 					<p className="text-[11px] text-muted-foreground">Chunk #{chunkId}</p>
 				</div>
 				{data?.public_url && (
diff --git a/surfsense_web/components/assistant-ui/markdown-text.tsx b/surfsense_web/components/assistant-ui/markdown-text.tsx
index 69c1831ca..ee36e8499 100644
--- a/surfsense_web/components/assistant-ui/markdown-text.tsx
+++ b/surfsense_web/components/assistant-ui/markdown-text.tsx
@@ -22,8 +22,6 @@ import { MentionChip } from "@/components/assistant-ui/mention-chip";
 import "katex/dist/katex.min.css";
 import { toast } from "sonner";
 import { processChildrenWithCitations } from "@/components/citations/citation-renderer";
-import { tryGetHostname } from "@/lib/url";
-
 import {
 	Table,
 	TableBody,
@@ -36,6 +34,7 @@ import { useElectronAPI } from "@/hooks/use-platform";
 import { documentsApiService } from "@/lib/apis/documents-api.service";
 import { getVirtualPathDisplay } from "@/lib/chat/virtual-path-display";
 import { type CitationUrlMap, preprocessCitationMarkdown } from "@/lib/citations/citation-parser";
+import { tryGetHostname } from "@/lib/url";
 import { cn } from "@/lib/utils";
 
 function MarkdownCodeBlockLoading() {
diff --git a/surfsense_web/components/assistant-ui/thread.tsx b/surfsense_web/components/assistant-ui/thread.tsx
index 06a064840..6876ce23e 100644
--- a/surfsense_web/components/assistant-ui/thread.tsx
+++ b/surfsense_web/components/assistant-ui/thread.tsx
@@ -72,11 +72,7 @@ import {
 import { PromptPicker, type PromptPickerRef } from "@/components/new-chat/prompt-picker";
 import { Avatar, AvatarFallback, AvatarGroup } from "@/components/ui/avatar";
 import { Button } from "@/components/ui/button";
-import {
-	Collapsible,
-	CollapsibleContent,
-	CollapsibleTrigger,
-} from "@/components/ui/collapsible";
+import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "@/components/ui/collapsible";
 import {
 	Drawer,
 	DrawerContent,
@@ -383,7 +379,9 @@ const ClipboardChip: FC<{ text: string; onDismiss: () => void }> = ({ text, onDi
 						size="icon"
 						className="size-5 text-muted-foreground hover:bg-transparent hover:text-accent-foreground"
 					>
-						<ChevronDown className={cn("size-3.5 transition-transform", expanded && "rotate-180")} />
+						<ChevronDown
+							className={cn("size-3.5 transition-transform", expanded && "rotate-180")}
+						/>
 					</Button>
 				)}
 				<Button
@@ -991,112 +989,110 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 								</DrawerHeader>
 								<div className="min-h-0 flex-1 overflow-y-auto scrollbar-thin pb-6">
 									{regularToolGroups.map((group) => (
-											<div key={group.label}>
-												<div className="px-4 pt-3 pb-1 text-xs text-muted-foreground/80 font-medium select-none">
-													{group.label}
-												</div>
-												{group.tools.map((tool) => {
-													const isDisabled = disabledToolsSet.has(tool.name);
-													const ToolIcon = getToolIcon(tool.name);
-													return (
-														<div
-															key={tool.name}
-															className="flex w-full items-center gap-3 px-4 py-2 hover:bg-accent hover:text-accent-foreground transition-colors"
-														>
-															<ToolIcon className="size-4 shrink-0 text-muted-foreground" />
-															<span className="flex-1 min-w-0 text-sm font-medium truncate">
-																{formatToolName(tool.name)}
-															</span>
-															<Switch
-																checked={!isDisabled}
-																onCheckedChange={() => toggleTool(tool.name)}
-																className="shrink-0"
-															/>
-														</div>
-													);
-												})}
+										<div key={group.label}>
+											<div className="px-4 pt-3 pb-1 text-xs text-muted-foreground/80 font-medium select-none">
+												{group.label}
 											</div>
-										))}
+											{group.tools.map((tool) => {
+												const isDisabled = disabledToolsSet.has(tool.name);
+												const ToolIcon = getToolIcon(tool.name);
+												return (
+													<div
+														key={tool.name}
+														className="flex w-full items-center gap-3 px-4 py-2 hover:bg-accent hover:text-accent-foreground transition-colors"
+													>
+														<ToolIcon className="size-4 shrink-0 text-muted-foreground" />
+														<span className="flex-1 min-w-0 text-sm font-medium truncate">
+															{formatToolName(tool.name)}
+														</span>
+														<Switch
+															checked={!isDisabled}
+															onCheckedChange={() => toggleTool(tool.name)}
+															className="shrink-0"
+														/>
+													</div>
+												);
+											})}
+										</div>
+									))}
 									{connectorToolGroups.length > 0 && (
 										<div>
 											<div className="px-4 pt-3 pb-1 text-xs text-muted-foreground/80 font-medium select-none">
 												Connector Actions
 											</div>
 											{connectorToolGroups.map((group) => {
-													const iconKey = group.connectorIcon ?? "";
-													const iconInfo = CONNECTOR_TOOL_ICON_PATHS[iconKey];
-													const toolNames = group.tools.map((t) => t.name);
-													const allDisabled = toolNames.every((n) => disabledToolsSet.has(n));
-													const isExpanded = expandedConnectorGroups.has(group.label);
-													return (
-														<Collapsible
-															key={group.label}
-															open={isExpanded}
-															onOpenChange={(open) =>
-																setConnectorGroupExpanded(group.label, open)
-															}
-														>
-															<div className="flex w-full items-center gap-3 px-4 py-2 hover:bg-accent hover:text-accent-foreground transition-colors">
-																<CollapsibleTrigger asChild>
-																	<button
-																		type="button"
-																		className="flex min-w-0 flex-1 items-center gap-3 text-left"
+												const iconKey = group.connectorIcon ?? "";
+												const iconInfo = CONNECTOR_TOOL_ICON_PATHS[iconKey];
+												const toolNames = group.tools.map((t) => t.name);
+												const allDisabled = toolNames.every((n) => disabledToolsSet.has(n));
+												const isExpanded = expandedConnectorGroups.has(group.label);
+												return (
+													<Collapsible
+														key={group.label}
+														open={isExpanded}
+														onOpenChange={(open) => setConnectorGroupExpanded(group.label, open)}
+													>
+														<div className="flex w-full items-center gap-3 px-4 py-2 hover:bg-accent hover:text-accent-foreground transition-colors">
+															<CollapsibleTrigger asChild>
+																<button
+																	type="button"
+																	className="flex min-w-0 flex-1 items-center gap-3 text-left"
+																>
+																	{iconInfo ? (
+																		<Image
+																			src={iconInfo.src}
+																			alt={iconInfo.alt}
+																			width={18}
+																			height={18}
+																			className="size-[18px] shrink-0 select-none pointer-events-none"
+																			draggable={false}
+																		/>
+																	) : (
+																		<Wrench className="size-4 shrink-0 text-muted-foreground" />
+																	)}
+																	<span className="min-w-0 flex-1 truncate text-sm font-medium">
+																		{group.label}
+																	</span>
+																	{isExpanded ? (
+																		<ChevronDown className="size-4 shrink-0 text-muted-foreground" />
+																	) : (
+																		<ChevronRight className="size-4 shrink-0 text-muted-foreground" />
+																	)}
+																</button>
+															</CollapsibleTrigger>
+															<Switch
+																checked={!allDisabled}
+																onCheckedChange={() => toggleToolGroup(toolNames)}
+																className="shrink-0"
+															/>
+														</div>
+														<CollapsibleContent className="pb-1">
+															{group.tools.map((tool) => {
+																const isDisabled = disabledToolsSet.has(tool.name);
+																return (
+																	<div
+																		key={tool.name}
+																		className={cn(
+																			"ml-8 flex items-center gap-3 px-4 py-1.5 rounded-md transition-colors",
+																			"hover:bg-accent hover:text-accent-foreground",
+																			!isDisabled && "text-primary"
+																		)}
 																	>
-																		{iconInfo ? (
-																			<Image
-																				src={iconInfo.src}
-																				alt={iconInfo.alt}
-																				width={18}
-																				height={18}
-																				className="size-[18px] shrink-0 select-none pointer-events-none"
-																				draggable={false}
-																			/>
-																		) : (
-																			<Wrench className="size-4 shrink-0 text-muted-foreground" />
-																		)}
-																		<span className="min-w-0 flex-1 truncate text-sm font-medium">
-																			{group.label}
+																		<span className="min-w-0 flex-1 truncate text-sm">
+																			{formatToolName(tool.name)}
 																		</span>
-																		{isExpanded ? (
-																			<ChevronDown className="size-4 shrink-0 text-muted-foreground" />
-																		) : (
-																			<ChevronRight className="size-4 shrink-0 text-muted-foreground" />
-																		)}
-																	</button>
-																</CollapsibleTrigger>
-																<Switch
-																	checked={!allDisabled}
-																	onCheckedChange={() => toggleToolGroup(toolNames)}
-																	className="shrink-0"
-																/>
-															</div>
-															<CollapsibleContent className="pb-1">
-																{group.tools.map((tool) => {
-																	const isDisabled = disabledToolsSet.has(tool.name);
-																	return (
-																		<div
-																			key={tool.name}
-																			className={cn(
-																				"ml-8 flex items-center gap-3 px-4 py-1.5 rounded-md transition-colors",
-																				"hover:bg-accent hover:text-accent-foreground",
-																				!isDisabled && "text-primary"
-																			)}
-																		>
-																			<span className="min-w-0 flex-1 truncate text-sm">
-																				{formatToolName(tool.name)}
-																			</span>
-																			<Switch
-																				checked={!isDisabled}
-																				onCheckedChange={() => toggleTool(tool.name)}
-																				className="shrink-0"
-																			/>
-																		</div>
-																	);
-																})}
-															</CollapsibleContent>
-														</Collapsible>
-													);
-												})}
+																		<Switch
+																			checked={!isDisabled}
+																			onCheckedChange={() => toggleTool(tool.name)}
+																			className="shrink-0"
+																		/>
+																	</div>
+																);
+															})}
+														</CollapsibleContent>
+													</Collapsible>
+												);
+											})}
 										</div>
 									)}
 									{otherToolGroup && (
@@ -1227,124 +1223,124 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 										onScroll={() => setOpenConnectorSubmenu(null)}
 									>
 										{regularToolGroups.map((group) => (
-												<div key={group.label}>
-													<div className="px-2 pt-1.5 pb-0.5 text-[10px] text-muted-foreground/80 font-normal select-none">
-														{group.label}
-													</div>
-													{group.tools.map((tool) => {
-														const isDisabled = disabledToolsSet.has(tool.name);
-														const ToolIcon = getToolIcon(tool.name);
-														return (
-															<DropdownMenuItem
-																key={tool.name}
-																onSelect={(e) => {
-																	e.preventDefault();
-																	toggleTool(tool.name);
-																}}
-																className={cn(
-																	"mb-1 last:mb-0 transition-all",
-																	"hover:bg-accent hover:text-accent-foreground",
-																	!isDisabled && "text-primary"
-																)}
-															>
-																<ToolIcon className="h-4 w-4" />
-																<span className="flex-1 min-w-0 truncate">
-																	{formatToolName(tool.name)}
-																</span>
-																<Switch
-																	checked={!isDisabled}
-																	tabIndex={-1}
-																	className="pointer-events-none shrink-0 scale-[0.6]"
-																/>
-															</DropdownMenuItem>
-														);
-													})}
+											<div key={group.label}>
+												<div className="px-2 pt-1.5 pb-0.5 text-[10px] text-muted-foreground/80 font-normal select-none">
+													{group.label}
 												</div>
-											))}
+												{group.tools.map((tool) => {
+													const isDisabled = disabledToolsSet.has(tool.name);
+													const ToolIcon = getToolIcon(tool.name);
+													return (
+														<DropdownMenuItem
+															key={tool.name}
+															onSelect={(e) => {
+																e.preventDefault();
+																toggleTool(tool.name);
+															}}
+															className={cn(
+																"mb-1 last:mb-0 transition-all",
+																"hover:bg-accent hover:text-accent-foreground",
+																!isDisabled && "text-primary"
+															)}
+														>
+															<ToolIcon className="h-4 w-4" />
+															<span className="flex-1 min-w-0 truncate">
+																{formatToolName(tool.name)}
+															</span>
+															<Switch
+																checked={!isDisabled}
+																tabIndex={-1}
+																className="pointer-events-none shrink-0 scale-[0.6]"
+															/>
+														</DropdownMenuItem>
+													);
+												})}
+											</div>
+										))}
 										{connectorToolGroups.length > 0 && (
 											<div>
 												<div className="px-2 pt-1.5 pb-0.5 text-[10px] text-muted-foreground/80 font-normal select-none">
 													Connector Actions
 												</div>
 												{connectorToolGroups.map((group) => {
-														const iconKey = group.connectorIcon ?? "";
-														const iconInfo = CONNECTOR_TOOL_ICON_PATHS[iconKey];
-														const toolNames = group.tools.map((t) => t.name);
-														const allDisabled = toolNames.every((n) => disabledToolsSet.has(n));
-														return (
-															<DropdownMenuSub
-																key={group.label}
-																open={openConnectorSubmenu === group.label}
-																onOpenChange={(open) =>
-																	setOpenConnectorSubmenu(open ? group.label : null)
-																}
+													const iconKey = group.connectorIcon ?? "";
+													const iconInfo = CONNECTOR_TOOL_ICON_PATHS[iconKey];
+													const toolNames = group.tools.map((t) => t.name);
+													const allDisabled = toolNames.every((n) => disabledToolsSet.has(n));
+													return (
+														<DropdownMenuSub
+															key={group.label}
+															open={openConnectorSubmenu === group.label}
+															onOpenChange={(open) =>
+																setOpenConnectorSubmenu(open ? group.label : null)
+															}
+														>
+															<DropdownMenuSubTrigger
+																className={cn(
+																	"mb-1 last:mb-0 transition-all",
+																	"hover:bg-accent hover:text-accent-foreground",
+																	"gap-1 [&>svg:last-child]:ml-0",
+																	!allDisabled && "text-primary"
+																)}
 															>
-																<DropdownMenuSubTrigger
-																	className={cn(
-																		"mb-1 last:mb-0 transition-all",
-																		"hover:bg-accent hover:text-accent-foreground",
-																		"gap-1 [&>svg:last-child]:ml-0",
-																		!allDisabled && "text-primary"
-																	)}
-																>
-																	{iconInfo ? (
-																		<Image
-																			src={iconInfo.src}
-																			alt={iconInfo.alt}
-																			width={16}
-																			height={16}
-																			className="h-4 w-4 shrink-0 select-none pointer-events-none"
-																			draggable={false}
-																		/>
-																	) : (
-																		<Wrench className="h-4 w-4" />
-																	)}
-																	<span className="min-w-0 flex-1 truncate">{group.label}</span>
-																	<Switch
-																		checked={!allDisabled}
-																		tabIndex={-1}
-																		onPointerDown={(event) => event.stopPropagation()}
-																		onClick={(event) => event.stopPropagation()}
-																		onCheckedChange={() => toggleToolGroup(toolNames)}
-																		className="shrink-0 scale-[0.6]"
+																{iconInfo ? (
+																	<Image
+																		src={iconInfo.src}
+																		alt={iconInfo.alt}
+																		width={16}
+																		height={16}
+																		className="h-4 w-4 shrink-0 select-none pointer-events-none"
+																		draggable={false}
 																	/>
-																</DropdownMenuSubTrigger>
-																<DropdownMenuPortal>
-																	<DropdownMenuSubContent
-																		collisionPadding={8}
-																		className="w-60 max-h-56 overflow-y-auto overscroll-none"
-																	>
-																		{group.tools.map((tool) => {
-																			const isDisabled = disabledToolsSet.has(tool.name);
-																			return (
-																				<DropdownMenuItem
-																					key={tool.name}
-																					onSelect={(e) => {
-																						e.preventDefault();
-																						toggleTool(tool.name);
-																					}}
-																					className={cn(
-																						"mb-1 last:mb-0 transition-all",
-																						"hover:bg-accent hover:text-accent-foreground",
-																						!isDisabled && "text-primary"
-																					)}
-																				>
-																					<span className="min-w-0 flex-1 truncate">
-																						{formatToolName(tool.name)}
-																					</span>
-																					<Switch
-																						checked={!isDisabled}
-																						tabIndex={-1}
-																						className="pointer-events-none shrink-0 scale-[0.6]"
-																					/>
-																				</DropdownMenuItem>
-																			);
-																		})}
-																	</DropdownMenuSubContent>
-																</DropdownMenuPortal>
-															</DropdownMenuSub>
-														);
-													})}
+																) : (
+																	<Wrench className="h-4 w-4" />
+																)}
+																<span className="min-w-0 flex-1 truncate">{group.label}</span>
+																<Switch
+																	checked={!allDisabled}
+																	tabIndex={-1}
+																	onPointerDown={(event) => event.stopPropagation()}
+																	onClick={(event) => event.stopPropagation()}
+																	onCheckedChange={() => toggleToolGroup(toolNames)}
+																	className="shrink-0 scale-[0.6]"
+																/>
+															</DropdownMenuSubTrigger>
+															<DropdownMenuPortal>
+																<DropdownMenuSubContent
+																	collisionPadding={8}
+																	className="w-60 max-h-56 overflow-y-auto overscroll-none"
+																>
+																	{group.tools.map((tool) => {
+																		const isDisabled = disabledToolsSet.has(tool.name);
+																		return (
+																			<DropdownMenuItem
+																				key={tool.name}
+																				onSelect={(e) => {
+																					e.preventDefault();
+																					toggleTool(tool.name);
+																				}}
+																				className={cn(
+																					"mb-1 last:mb-0 transition-all",
+																					"hover:bg-accent hover:text-accent-foreground",
+																					!isDisabled && "text-primary"
+																				)}
+																			>
+																				<span className="min-w-0 flex-1 truncate">
+																					{formatToolName(tool.name)}
+																				</span>
+																				<Switch
+																					checked={!isDisabled}
+																					tabIndex={-1}
+																					className="pointer-events-none shrink-0 scale-[0.6]"
+																				/>
+																			</DropdownMenuItem>
+																		);
+																	})}
+																</DropdownMenuSubContent>
+															</DropdownMenuPortal>
+														</DropdownMenuSub>
+													);
+												})}
 											</div>
 										)}
 										{otherToolGroup && (
diff --git a/surfsense_web/components/chat-comments/comment-panel/comment-panel.tsx b/surfsense_web/components/chat-comments/comment-panel/comment-panel.tsx
index bc4c2b636..ef569c81f 100644
--- a/surfsense_web/components/chat-comments/comment-panel/comment-panel.tsx
+++ b/surfsense_web/components/chat-comments/comment-panel/comment-panel.tsx
@@ -1,7 +1,7 @@
 "use client";
 
-import { cn } from "@/lib/utils";
 import { Separator } from "@/components/ui/separator";
+import { cn } from "@/lib/utils";
 import { CommentComposer } from "../comment-composer/comment-composer";
 import { CommentThread } from "../comment-thread/comment-thread";
 import type { CommentPanelProps } from "./types";
diff --git a/surfsense_web/components/chat-comments/member-mention-picker/member-mention-item.tsx b/surfsense_web/components/chat-comments/member-mention-picker/member-mention-item.tsx
index 8972c903d..015d56c76 100644
--- a/surfsense_web/components/chat-comments/member-mention-picker/member-mention-item.tsx
+++ b/surfsense_web/components/chat-comments/member-mention-picker/member-mention-item.tsx
@@ -31,7 +31,9 @@ export function MemberMentionItem({
 			type="button"
 			className={cn(
 				"h-auto w-full justify-start gap-3 rounded-none px-3 py-2 text-left transition-colors",
-				isHighlighted ? "bg-primary/15 text-accent-foreground" : "hover:bg-accent hover:text-accent-foreground"
+				isHighlighted
+					? "bg-primary/15 text-accent-foreground"
+					: "hover:bg-accent hover:text-accent-foreground"
 			)}
 			onClick={() => onSelect(member)}
 			onMouseEnter={onMouseEnter}
diff --git a/surfsense_web/components/free-chat/anonymous-chat.tsx b/surfsense_web/components/free-chat/anonymous-chat.tsx
index 93168d084..0164c870b 100644
--- a/surfsense_web/components/free-chat/anonymous-chat.tsx
+++ b/surfsense_web/components/free-chat/anonymous-chat.tsx
@@ -103,7 +103,8 @@ export function AnonymousChat({ model }: AnonymousChatProps) {
 						remaining: 0,
 						status: "exceeded",
 						warning_threshold: quota?.warning_threshold ?? 800000,
-						captcha_required: errorData.detail?.captcha_required ?? quota?.captcha_required ?? false,
+						captcha_required:
+							errorData.detail?.captcha_required ?? quota?.captcha_required ?? false,
 					});
 					setMessages((prev) => prev.filter((m) => m.id !== assistantId));
 					return;
diff --git a/surfsense_web/components/inference-params-editor.tsx b/surfsense_web/components/inference-params-editor.tsx
index 64de39dd8..6e9514cdc 100644
--- a/surfsense_web/components/inference-params-editor.tsx
+++ b/surfsense_web/components/inference-params-editor.tsx
@@ -128,7 +128,10 @@ export default function InferenceParamsEditor({ params, setParams }: InferencePa
 						</thead>
 						<tbody className="divide-y divide-gray-200 bg-black dark:bg-black">
 							{Object.entries(params).map(([key, val]) => (
-								<tr key={key} className="hover:bg-accent hover:text-accent-foreground transition-colors">
+								<tr
+									key={key}
+									className="hover:bg-accent hover:text-accent-foreground transition-colors"
+								>
 									<td className="px-4 py-3 font-medium text-gray-900 dark:text-white">{key}</td>
 									<td className="px-4 py-3 text-gray-700 dark:text-gray-300">{val.toString()}</td>
 									<td className="px-4 py-3">
diff --git a/surfsense_web/components/layout/hooks/useSidebarResize.ts b/surfsense_web/components/layout/hooks/useSidebarResize.ts
index 5df6be378..a13af1663 100644
--- a/surfsense_web/components/layout/hooks/useSidebarResize.ts
+++ b/surfsense_web/components/layout/hooks/useSidebarResize.ts
@@ -50,8 +50,7 @@ export function useSidebarResize(defaultWidth = SIDEBAR_MIN_WIDTH): UseSidebarRe
 					widthRef.current = parsed;
 				}
 			}
-		} catch {
-		}
+		} catch {}
 	}, []);
 
 	const persistWidth = useCallback((width: number) => {
@@ -71,32 +70,27 @@ export function useSidebarResize(defaultWidth = SIDEBAR_MIN_WIDTH): UseSidebarRe
 				if (target.hasPointerCapture(pointerId)) {
 					target.releasePointerCapture(pointerId);
 				}
-			} catch {
-			}
+			} catch {}
 		}
 		captureTargetRef.current = null;
 		pointerIdRef.current = null;
 	}, []);
 
-	const handlePointerDown = useCallback(
-		(e: React.PointerEvent<HTMLElement>) => {
-			if (e.pointerType === "mouse" && e.button !== 0) return;
+	const handlePointerDown = useCallback((e: React.PointerEvent<HTMLElement>) => {
+		if (e.pointerType === "mouse" && e.button !== 0) return;
 
-			e.preventDefault();
-			const target = e.currentTarget;
-			try {
-				target.setPointerCapture(e.pointerId);
-			} catch {
-			}
-			captureTargetRef.current = target;
-			pointerIdRef.current = e.pointerId;
-			startXRef.current = e.clientX;
-			startWidthRef.current = widthRef.current;
-			setIsDragging(true);
-			setGlobalDragCursor(true);
-		},
-		[]
-	);
+		e.preventDefault();
+		const target = e.currentTarget;
+		try {
+			target.setPointerCapture(e.pointerId);
+		} catch {}
+		captureTargetRef.current = target;
+		pointerIdRef.current = e.pointerId;
+		startXRef.current = e.clientX;
+		startWidthRef.current = widthRef.current;
+		setIsDragging(true);
+		setGlobalDragCursor(true);
+	}, []);
 
 	useEffect(() => {
 		if (!isDragging) return;
diff --git a/surfsense_web/components/layout/ui/icon-rail/IconRail.tsx b/surfsense_web/components/layout/ui/icon-rail/IconRail.tsx
index fdc4930d6..a47b00e5c 100644
--- a/surfsense_web/components/layout/ui/icon-rail/IconRail.tsx
+++ b/surfsense_web/components/layout/ui/icon-rail/IconRail.tsx
@@ -5,8 +5,7 @@ import { Button } from "@/components/ui/button";
 import { ScrollArea } from "@/components/ui/scroll-area";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { cn } from "@/lib/utils";
-import type { NavItem, SearchSpace } from "../../types/layout.types";
-import type { User } from "../../types/layout.types";
+import type { NavItem, SearchSpace, User } from "../../types/layout.types";
 import { SidebarUserProfile } from "../sidebar/SidebarUserProfile";
 import { SearchSpaceAvatar } from "./SearchSpaceAvatar";
 
diff --git a/surfsense_web/components/layout/ui/sidebar/DesktopLocalTabContent.tsx b/surfsense_web/components/layout/ui/sidebar/DesktopLocalTabContent.tsx
index 473a4894b..71d798e22 100644
--- a/surfsense_web/components/layout/ui/sidebar/DesktopLocalTabContent.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/DesktopLocalTabContent.tsx
@@ -4,6 +4,7 @@ import { useAtom } from "jotai";
 import { Folder, FolderPlus, Search, X } from "lucide-react";
 import { useCallback, useMemo, useRef, useState } from "react";
 import { localExpandedFolderKeysAtom } from "@/atoms/documents/folder.atoms";
+import { Button } from "@/components/ui/button";
 import {
 	DropdownMenu,
 	DropdownMenuContent,
@@ -11,7 +12,6 @@ import {
 	DropdownMenuLabel,
 	DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
-import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { Separator } from "@/components/ui/separator";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
diff --git a/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx
index 83f4f26f1..f757db70e 100644
--- a/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx
@@ -1047,7 +1047,9 @@ export function InboxSidebarContent({
 							<History className="mx-auto mb-2.5 h-10 w-10 text-muted-foreground" />
 						)}
 						<p className="text-xs text-muted-foreground">{getEmptyStateMessage().title}</p>
-						<p className="mt-1 text-[11px] text-muted-foreground/70">{getEmptyStateMessage().hint}</p>
+						<p className="mt-1 text-[11px] text-muted-foreground/70">
+							{getEmptyStateMessage().hint}
+						</p>
 					</div>
 				)}
 			</div>
diff --git a/surfsense_web/components/layout/ui/sidebar/MobileSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/MobileSidebar.tsx
index 02fa666be..83d423ace 100644
--- a/surfsense_web/components/layout/ui/sidebar/MobileSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/MobileSidebar.tsx
@@ -108,7 +108,10 @@ export function MobileSidebar({
 
 	return (
 		<Sheet open={isOpen} onOpenChange={onOpenChange}>
-			<SheetContent side="left" className="w-[340px] p-0 flex flex-row gap-0 bg-panel [&>button]:hidden">
+			<SheetContent
+				side="left"
+				className="w-[340px] p-0 flex flex-row gap-0 bg-panel [&>button]:hidden"
+			>
 				<SheetTitle className="sr-only">Navigation</SheetTitle>
 
 				{/* Vertical Search Spaces Rail - left side */}
diff --git a/surfsense_web/components/layout/ui/sidebar/SidebarButton.tsx b/surfsense_web/components/layout/ui/sidebar/SidebarButton.tsx
index d440fe9d3..cc7f83e1d 100644
--- a/surfsense_web/components/layout/ui/sidebar/SidebarButton.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/SidebarButton.tsx
@@ -64,17 +64,13 @@ export function SidebarButton({
 					isCollapsed ? "shrink-0" : "flex-1"
 				)}
 			>
-				<span className="flex h-3.5 w-3.5 shrink-0 items-center justify-center">
-					{iconNode}
-				</span>
+				<span className="flex h-3.5 w-3.5 shrink-0 items-center justify-center">{iconNode}</span>
 
 				<span
 					className={cn(
 						"min-w-0 overflow-hidden whitespace-nowrap text-left",
 						"transition-[max-width,opacity,margin-left] duration-200 ease-out",
-						isCollapsed
-							? "max-w-0 opacity-0 ml-0"
-							: "max-w-[260px] flex-1 opacity-100 ml-2"
+						isCollapsed ? "max-w-0 opacity-0 ml-0" : "max-w-[260px] flex-1 opacity-100 ml-2"
 					)}
 				>
 					<span className="block truncate">{label}</span>
diff --git a/surfsense_web/components/layout/ui/sidebar/SidebarSection.tsx b/surfsense_web/components/layout/ui/sidebar/SidebarSection.tsx
index 0c957e1fe..99162dddf 100644
--- a/surfsense_web/components/layout/ui/sidebar/SidebarSection.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/SidebarSection.tsx
@@ -69,9 +69,7 @@ export function SidebarSection({
 			</div>
 
 			<CollapsibleContent className={cn("overflow-hidden flex-1 flex flex-col min-h-0")}>
-				<div className={cn("px-2 flex-1 flex flex-col min-h-0 overflow-hidden")}>
-					{children}
-				</div>
+				<div className={cn("px-2 flex-1 flex flex-col min-h-0 overflow-hidden")}>{children}</div>
 			</CollapsibleContent>
 		</Collapsible>
 	);
diff --git a/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx b/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx
index 550c83b80..bc3b36efd 100644
--- a/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx
@@ -17,6 +17,7 @@ import {
 import Image from "next/image";
 import { useTranslations } from "next-intl";
 import { useState } from "react";
+import { Button } from "@/components/ui/button";
 import {
 	DropdownMenu,
 	DropdownMenuContent,
@@ -29,7 +30,6 @@ import {
 	DropdownMenuSubTrigger,
 	DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
-import { Button } from "@/components/ui/button";
 import { Spinner } from "@/components/ui/spinner";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { useLocaleContext } from "@/contexts/LocaleContext";
diff --git a/surfsense_web/components/layout/ui/tabs/TabBar.tsx b/surfsense_web/components/layout/ui/tabs/TabBar.tsx
index 3946fdc6d..c5fb91f4d 100644
--- a/surfsense_web/components/layout/ui/tabs/TabBar.tsx
+++ b/surfsense_web/components/layout/ui/tabs/TabBar.tsx
@@ -190,10 +190,7 @@ export function TabBar({
 									)}
 								/>
 							) : null}
-							<div
-								data-tab-id={tab.id}
-								className="group relative h-full w-[180px] shrink-0"
-							>
+							<div data-tab-id={tab.id} className="group relative h-full w-[180px] shrink-0">
 								<Button
 									type="button"
 									variant="ghost"
diff --git a/surfsense_web/components/public-chat-snapshots/public-chat-snapshot-row.tsx b/surfsense_web/components/public-chat-snapshots/public-chat-snapshot-row.tsx
index d6a66e9e2..99a9ad0e9 100644
--- a/surfsense_web/components/public-chat-snapshots/public-chat-snapshot-row.tsx
+++ b/surfsense_web/components/public-chat-snapshots/public-chat-snapshot-row.tsx
@@ -144,7 +144,7 @@ export function PublicChatSnapshotRow({
 														{getInitials(member.name)}
 													</AvatarFallback>
 												</Avatar>
-											<span className="text-[11px] text-muted-foreground/60 truncate">
+												<span className="text-[11px] text-muted-foreground/60 truncate">
 													{member.name}
 												</span>
 											</div>
diff --git a/surfsense_web/components/report-panel/report-panel.tsx b/surfsense_web/components/report-panel/report-panel.tsx
index fc9a9f27b..e3b8b2354 100644
--- a/surfsense_web/components/report-panel/report-panel.tsx
+++ b/surfsense_web/components/report-panel/report-panel.tsx
@@ -317,44 +317,44 @@ export function ReportPanelContent({
 		setIsEditing(false);
 	}, []);
 
-	const exportButton = !isEditing && (
-		isResume ? (
-				<Button
-					variant="ghost"
-					size="icon"
-					className="size-6"
-					onClick={() => handleExport("pdf")}
-					disabled={isLoading || !reportContent?.content || exporting !== null}
-				>
-					{exporting === "pdf" ? <Spinner size="xs" /> : <Download className="size-3.5" />}
-					<span className="sr-only">Download report</span>
-				</Button>
-			) : (
-				<DropdownMenu modal={insideDrawer ? false : undefined}>
-					<DropdownMenuTrigger asChild>
-						<Button
-							variant="ghost"
-							size="icon"
-							className="size-6"
-							disabled={isLoading || !reportContent?.content}
-						>
-							<Download className="size-3.5" />
-							<span className="sr-only">Export report</span>
-						</Button>
-					</DropdownMenuTrigger>
-					<DropdownMenuContent
-						align="end"
-						className={`min-w-[200px] select-none${insideDrawer ? " z-[100]" : ""}`}
+	const exportButton =
+		!isEditing &&
+		(isResume ? (
+			<Button
+				variant="ghost"
+				size="icon"
+				className="size-6"
+				onClick={() => handleExport("pdf")}
+				disabled={isLoading || !reportContent?.content || exporting !== null}
+			>
+				{exporting === "pdf" ? <Spinner size="xs" /> : <Download className="size-3.5" />}
+				<span className="sr-only">Download report</span>
+			</Button>
+		) : (
+			<DropdownMenu modal={insideDrawer ? false : undefined}>
+				<DropdownMenuTrigger asChild>
+					<Button
+						variant="ghost"
+						size="icon"
+						className="size-6"
+						disabled={isLoading || !reportContent?.content}
 					>
-						<ExportDropdownItems
-							onExport={handleExport}
-							exporting={exporting}
-							showAllFormats={!shareToken}
-						/>
-					</DropdownMenuContent>
-				</DropdownMenu>
-			)
-	);
+						<Download className="size-3.5" />
+						<span className="sr-only">Export report</span>
+					</Button>
+				</DropdownMenuTrigger>
+				<DropdownMenuContent
+					align="end"
+					className={`min-w-[200px] select-none${insideDrawer ? " z-[100]" : ""}`}
+				>
+					<ExportDropdownItems
+						onExport={handleExport}
+						exporting={exporting}
+						showAllFormats={!shareToken}
+					/>
+				</DropdownMenuContent>
+			</DropdownMenu>
+		));
 
 	const versionSwitcher = !isEditing && versions.length > 1 && (
 		<DropdownMenu modal={insideDrawer ? false : undefined}>
@@ -446,9 +446,7 @@ export function ReportPanelContent({
 				<>
 					{/* Header — matches the Documents panel header pattern */}
 					<div className="shrink-0 flex h-12 items-center justify-between px-3 border-b">
-						<h2 className="select-none text-lg font-semibold">
-							{isResume ? "Resume" : "Report"}
-						</h2>
+						<h2 className="select-none text-lg font-semibold">{isResume ? "Resume" : "Report"}</h2>
 						{onClose && (
 							<Button
 								variant="ghost"
diff --git a/surfsense_web/components/settings/roles-manager.tsx b/surfsense_web/components/settings/roles-manager.tsx
index afaa9d2c5..ee32f6e69 100644
--- a/surfsense_web/components/settings/roles-manager.tsx
+++ b/surfsense_web/components/settings/roles-manager.tsx
@@ -462,9 +462,7 @@ function RolesContent({
 
 					return (
 						<div key={role.id} className="rounded-lg border border-border/60 overflow-hidden">
-							<div
-								className="group/role-header flex items-center gap-4 p-4 transition-colors hover:bg-accent hover:text-accent-foreground focus-within:bg-accent focus-within:text-accent-foreground"
-							>
+							<div className="group/role-header flex items-center gap-4 p-4 transition-colors hover:bg-accent hover:text-accent-foreground focus-within:bg-accent focus-within:text-accent-foreground">
 								<Button
 									type="button"
 									variant="ghost"
@@ -697,9 +695,7 @@ function PermissionsEditor({
 
 					return (
 						<div key={category} className="rounded-lg border border-border/60 overflow-hidden">
-							<div
-								className="group/category-header flex items-center justify-between px-3 py-2.5 transition-colors hover:bg-accent hover:text-accent-foreground focus-within:bg-accent focus-within:text-accent-foreground"
-							>
+							<div className="group/category-header flex items-center justify-between px-3 py-2.5 transition-colors hover:bg-accent hover:text-accent-foreground focus-within:bg-accent focus-within:text-accent-foreground">
 								<Button
 									type="button"
 									variant="ghost"
@@ -751,7 +747,9 @@ function PermissionsEditor({
 													key={perm.value}
 													className={cn(
 														"flex items-center justify-between gap-3 px-2.5 py-2 rounded-md transition-colors",
-														isSelected ? "bg-muted/60 hover:bg-accent hover:text-accent-foreground" : "hover:bg-accent hover:text-accent-foreground"
+														isSelected
+															? "bg-muted/60 hover:bg-accent hover:text-accent-foreground"
+															: "hover:bg-accent hover:text-accent-foreground"
 													)}
 												>
 													<Button
diff --git a/surfsense_web/components/settings/team-memory-manager.tsx b/surfsense_web/components/settings/team-memory-manager.tsx
index effc6a148..9d3a40e46 100644
--- a/surfsense_web/components/settings/team-memory-manager.tsx
+++ b/surfsense_web/components/settings/team-memory-manager.tsx
@@ -228,7 +228,9 @@ export function TeamMemoryManager({ searchSpaceId }: TeamMemoryManagerProps) {
 								onClick={handleEdit}
 								disabled={editing || !editQuery.trim()}
 								className={`h-11 w-11 shrink-0 rounded-full ${
-									editing ? "" : "bg-muted-foreground/15 hover:bg-accent hover:text-accent-foreground"
+									editing
+										? ""
+										: "bg-muted-foreground/15 hover:bg-accent hover:text-accent-foreground"
 								}`}
 							>
 								{editing ? (
diff --git a/surfsense_web/components/sources/DocumentUploadTab.tsx b/surfsense_web/components/sources/DocumentUploadTab.tsx
index 842816551..ce9a5bc74 100644
--- a/surfsense_web/components/sources/DocumentUploadTab.tsx
+++ b/surfsense_web/components/sources/DocumentUploadTab.tsx
@@ -1,15 +1,7 @@
 "use client";
 
 import { useAtom } from "jotai";
-import {
-	ChevronDown,
-	Crown,
-	Dot,
-	File as FileIcon,
-	FolderOpen,
-	X,
-	Zap,
-} from "lucide-react";
+import { ChevronDown, Crown, Dot, File as FileIcon, FolderOpen, X, Zap } from "lucide-react";
 
 import { useTranslations } from "next-intl";
 import { type ChangeEvent, useCallback, useEffect, useMemo, useRef, useState } from "react";
@@ -117,7 +109,8 @@ function flattenTree(
 	depth = 0,
 	parentPath = ""
 ): { name: string; isFolder: boolean; depth: number; path: string; size?: number }[] {
-	const items: { name: string; isFolder: boolean; depth: number; path: string; size?: number }[] = [];
+	const items: { name: string; isFolder: boolean; depth: number; path: string; size?: number }[] =
+		[];
 	for (const node of nodes) {
 		const path = parentPath ? `${parentPath}/${node.name}` : node.name;
 		items.push({ name: node.name, isFolder: node.isFolder, depth, path, size: node.size });
diff --git a/surfsense_web/components/tool-ui/citation/citation.tsx b/surfsense_web/components/tool-ui/citation/citation.tsx
index 35d9d5ed7..c2f2c5e70 100644
--- a/surfsense_web/components/tool-ui/citation/citation.tsx
+++ b/surfsense_web/components/tool-ui/citation/citation.tsx
@@ -3,11 +3,11 @@
 import { ExternalLink, Globe } from "lucide-react";
 import NextImage from "next/image";
 import { Button } from "@/components/ui/button";
+import { tryGetHostname } from "@/lib/url";
 import { openSafeNavigationHref, sanitizeHref } from "../shared/media";
 import { cn } from "./_adapter";
 import { CitationHoverPopover } from "./citation-hover-popover";
 import type { CitationVariant, SerializableCitation } from "./schema";
-import { tryGetHostname } from "@/lib/url";
 import { TYPE_ICONS } from "./type-icons";
 
 const FALLBACK_LOCALE = "en-US";
@@ -115,9 +115,7 @@ export function Citation(props: CitationProps) {
 					</div>
 					<p className="text-sm leading-snug font-medium">{title}</p>
 					{snippet && (
-						<p className="text-muted-foreground line-clamp-2 text-xs leading-relaxed">
-							{snippet}
-						</p>
+						<p className="text-muted-foreground line-clamp-2 text-xs leading-relaxed">{snippet}</p>
 					)}
 				</div>
 			</CitationHoverPopover>
diff --git a/surfsense_web/components/ui/callout-node.tsx b/surfsense_web/components/ui/callout-node.tsx
index 597276511..0c8901a1d 100644
--- a/surfsense_web/components/ui/callout-node.tsx
+++ b/surfsense_web/components/ui/callout-node.tsx
@@ -60,10 +60,7 @@ export function CalloutElement({ children, ...props }: PlateElementProps<TCallou
 	}, [editor, variant, props.path]);
 
 	return (
-		<PlateElement
-			{...props}
-			className={cn(calloutVariants({ variant }), props.className)}
-		>
+		<PlateElement {...props} className={cn(calloutVariants({ variant }), props.className)}>
 			<Button
 				variant="ghost"
 				className="mt-0.5 h-auto shrink-0 cursor-pointer select-none p-0 text-lg leading-none hover:bg-transparent"
diff --git a/surfsense_web/components/ui/equation-node.tsx b/surfsense_web/components/ui/equation-node.tsx
index 5ceea83e5..54024dc52 100644
--- a/surfsense_web/components/ui/equation-node.tsx
+++ b/surfsense_web/components/ui/equation-node.tsx
@@ -84,12 +84,7 @@ export function EquationElement({ children, ...props }: PlateElementProps<TEquat
 						>
 							Cancel
 						</Button>
-						<Button
-							size="sm"
-							className="h-auto px-2 py-1 text-xs"
-							onClick={onSubmit}
-							type="button"
-						>
+						<Button size="sm" className="h-auto px-2 py-1 text-xs" onClick={onSubmit} type="button">
 							Done
 						</Button>
 					</div>
diff --git a/surfsense_web/lib/chat/thread-persistence.ts b/surfsense_web/lib/chat/thread-persistence.ts
index 18ddb4ea0..4cf9b8e68 100644
--- a/surfsense_web/lib/chat/thread-persistence.ts
+++ b/surfsense_web/lib/chat/thread-persistence.ts
@@ -231,4 +231,3 @@ export function getRegenerateUrl(threadId: number): string {
 	const backendUrl = process.env.NEXT_PUBLIC_FASTAPI_BACKEND_URL || "http://localhost:8000";
 	return `${backendUrl}/api/v1/threads/${threadId}/regenerate`;
 }
-
diff --git a/surfsense_web/lib/url.ts b/surfsense_web/lib/url.ts
index 0c9227581..7bb0488d0 100644
--- a/surfsense_web/lib/url.ts
+++ b/surfsense_web/lib/url.ts
@@ -6,9 +6,9 @@
  * `extractDomain` helpers that had subtly different error fallbacks.
  */
 export function tryGetHostname(url: string): string | undefined {
-    try {
-        return new URL(url).hostname.replace(/^www\./, "");
-    } catch {
-        return undefined;
-    }
+	try {
+		return new URL(url).hostname.replace(/^www\./, "");
+	} catch {
+		return undefined;
+	}
 }

From b285293b4e999cf9a40251789503e5c97671f16a Mon Sep 17 00:00:00 2001
From: "DESKTOP-RTLN3BA\\$punk" <vermarohanfinal@gmail.com>
Date: Wed, 20 May 2026 01:25:07 -0700
Subject: [PATCH 95/96] fix: docker one click setup

---
 .gitignore                                    |   7 +-
 docker/docker-compose.deps-only.yml           |  16 ++
 docker/docker-compose.dev.yml                 |  39 +++-
 docker/docker-compose.yml                     |  45 ++++-
 docker/scripts/install.ps1                    | 173 +++++++++++++++++-
 docker/scripts/install.sh                     | 173 +++++++++++++++++-
 surfsense_backend/Dockerfile                  |   8 +-
 surfsense_backend/app/app.py                  |  30 +++
 .../scripts/docker/entrypoint.sh              |  90 ++++++++-
 .../docker-installation/docker-compose.mdx    | 127 ++++++++++++-
 10 files changed, 681 insertions(+), 27 deletions(-)

diff --git a/.gitignore b/.gitignore
index ac2ff94c9..a99954efe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,16 +6,15 @@ node_modules/
 .venv
 .pnpm-store
 .DS_Store
-deepagents/
 debug.log
-opencode/
+
+references/
+references
 
 # Playwright (E2E test artifacts)
 surfsense_web/playwright/.auth/
 surfsense_web/playwright-report/
 surfsense_web/test-results/
 surfsense_web/blob-report/
-hermes-agent
-hermes-agent/
 
 content_research/
diff --git a/docker/docker-compose.deps-only.yml b/docker/docker-compose.deps-only.yml
index 31dcd8b26..2be0bfe6e 100644
--- a/docker/docker-compose.deps-only.yml
+++ b/docker/docker-compose.deps-only.yml
@@ -20,6 +20,18 @@
 #   - Backend .env: SEARXNG_DEFAULT_HOST=http://localhost:${SEARXNG_PORT:-8888}
 #   - Backend .env: CELERY_BROKER_URL / REDIS_APP_URL → redis://localhost:6379/0
 #   - Web .env: NEXT_PUBLIC_ZERO_CACHE_URL=http://localhost:${ZERO_CACHE_PORT:-4848}
+#
+# IMPORTANT — schema migrations:
+#   This compose file does NOT build the backend image and therefore cannot
+#   run a `migrations` service. You MUST run alembic on the host before
+#   bringing zero-cache up, or zero-cache will crash-loop with
+#   `Unknown or invalid publications. Specified: [zero_publication]`.
+#
+#   First-time / after-pull:
+#     cd surfsense_backend && uv run alembic upgrade head
+#
+#   The other compose files (docker-compose.yml, docker-compose.dev.yml)
+#   handle this automatically via a dedicated `migrations` service.
 # =============================================================================
 
 name: surfsense-deps
@@ -82,6 +94,10 @@ services:
       timeout: 5s
       retries: 5
 
+  # NOTE: zero-cache requires the `zero_publication` Postgres publication to
+  # exist before it starts. In this deps-only stack there is no backend
+  # container to run migrations, so you must run `uv run alembic upgrade head`
+  # from `surfsense_backend/` on the host BEFORE `docker compose up -d`.
   zero-cache:
     image: rocicorp/zero:1.4.0
     ports:
diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml
index 5338a649e..53b8ea1a9 100644
--- a/docker/docker-compose.dev.yml
+++ b/docker/docker-compose.dev.yml
@@ -34,6 +34,25 @@ services:
       timeout: 5s
       retries: 5
 
+  # Short-lived schema runner; see docker/docker-compose.yml `migrations`
+  # service for the full rationale. Builds from the same backend context as
+  # the dev backend/celery services.
+  migrations:
+    build: *backend-build
+    env_file:
+      - ../surfsense_backend/.env
+    environment:
+      - DATABASE_URL=${DATABASE_URL:-postgresql+asyncpg://${DB_USER:-postgres}:${DB_PASSWORD:-postgres}@${DB_HOST:-db}:${DB_PORT:-5432}/${DB_NAME:-surfsense}}
+      - PYTHONPATH=/app
+      - SERVICE_ROLE=migrate
+      - MIGRATION_TIMEOUT=${MIGRATION_TIMEOUT:-900}
+    volumes:
+      - zero_init:/zero-init
+    depends_on:
+      db:
+        condition: service_healthy
+    restart: "no"
+
   pgadmin:
     image: dpage/pgadmin4
     ports:
@@ -111,8 +130,10 @@ services:
         condition: service_healthy
       searxng:
         condition: service_healthy
+      migrations:
+        condition: service_completed_successfully
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8000/health"]
+      test: ["CMD", "curl", "-f", "http://localhost:8000/ready"]
       interval: 15s
       timeout: 5s
       retries: 30
@@ -141,6 +162,8 @@ services:
         condition: service_healthy
       redis:
         condition: service_healthy
+      migrations:
+        condition: service_completed_successfully
       backend:
         condition: service_healthy
 
@@ -160,6 +183,8 @@ services:
         condition: service_healthy
       redis:
         condition: service_healthy
+      migrations:
+        condition: service_completed_successfully
       celery_worker:
         condition: service_started
 
@@ -185,8 +210,10 @@ services:
     extra_hosts:
       - "host.docker.internal:host-gateway"
     depends_on:
-      backend:
+      db:
         condition: service_healthy
+      migrations:
+        condition: service_completed_successfully
     environment:
       - ZERO_UPSTREAM_DB=${ZERO_UPSTREAM_DB:-postgresql://${DB_USER:-postgres}:${DB_PASSWORD:-postgres}@${DB_HOST:-db}:${DB_PORT:-5432}/${DB_NAME:-surfsense}?sslmode=${DB_SSLMODE:-disable}}
       - ZERO_CVR_DB=${ZERO_CVR_DB:-postgresql://${DB_USER:-postgres}:${DB_PASSWORD:-postgres}@${DB_HOST:-db}:${DB_PORT:-5432}/${DB_NAME:-surfsense}?sslmode=${DB_SSLMODE:-disable}}
@@ -201,6 +228,12 @@ services:
       - ZERO_MUTATE_URL=${ZERO_MUTATE_URL:-http://frontend:3000/api/zero/mutate}
     volumes:
       - zero_cache_data:/data
+      - zero_init:/zero-init
+    # Wrapper: see docker/docker-compose.yml `zero-cache` for rationale.
+    entrypoint: ["sh", "-c"]
+    # Pass the script as a single list element so Compose does not tokenize it.
+    command:
+      - 'if [ -f /zero-init/needs_reset ]; then echo "[zero-init] publication change detected; wiping replica file(s) under /data" && rm -f /data/zero.db /data/zero.db-shm /data/zero.db-wal && rm -f /zero-init/needs_reset; fi; exec zero-cache'
     restart: unless-stopped
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:4848/keepalive"]
@@ -238,3 +271,5 @@ volumes:
     name: surfsense-dev-shared-temp
   zero_cache_data:
     name: surfsense-dev-zero-cache
+  zero_init:
+    name: surfsense-dev-zero-init
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 18147a189..82d77f826 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -27,6 +27,28 @@ services:
       timeout: 5s
       retries: 5
 
+  # Short-lived schema runner. Executes `alembic upgrade head` and verifies
+  # that the `zero_publication` Postgres logical-replication publication
+  # exists, then exits 0. Downstream services (backend, celery_*, zero-cache)
+  # gate on this with `condition: service_completed_successfully` so a failed
+  # migration halts the whole stack instead of silently producing a half-built
+  # system that crash-loops zero-cache on missing publications.
+  migrations:
+    image: ghcr.io/modsetter/surfsense-backend:${SURFSENSE_VERSION:-latest}
+    env_file:
+      - .env
+    environment:
+      DATABASE_URL: ${DATABASE_URL:-postgresql+asyncpg://${DB_USER:-surfsense}:${DB_PASSWORD:-surfsense}@${DB_HOST:-db}:${DB_PORT:-5432}/${DB_NAME:-surfsense}}
+      PYTHONPATH: /app
+      SERVICE_ROLE: migrate
+      MIGRATION_TIMEOUT: ${MIGRATION_TIMEOUT:-900}
+    volumes:
+      - zero_init:/zero-init
+    depends_on:
+      db:
+        condition: service_healthy
+    restart: "no"
+
   redis:
     image: redis:8-alpine
     volumes:
@@ -88,9 +110,11 @@ services:
         condition: service_healthy
       searxng:
         condition: service_healthy
+      migrations:
+        condition: service_completed_successfully
     restart: unless-stopped
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8000/health"]
+      test: ["CMD", "curl", "-f", "http://localhost:8000/ready"]
       interval: 15s
       timeout: 5s
       retries: 30
@@ -118,6 +142,8 @@ services:
         condition: service_healthy
       redis:
         condition: service_healthy
+      migrations:
+        condition: service_completed_successfully
       backend:
         condition: service_healthy
     labels:
@@ -140,6 +166,8 @@ services:
         condition: service_healthy
       redis:
         condition: service_healthy
+      migrations:
+        condition: service_completed_successfully
       celery_worker:
         condition: service_started
     labels:
@@ -182,10 +210,21 @@ services:
       ZERO_MUTATE_URL: ${ZERO_MUTATE_URL:-http://frontend:3000/api/zero/mutate}
     volumes:
       - zero_cache_data:/data
+      - zero_init:/zero-init
+    # Wrapper: if the migrations service flagged a publication change via
+    # /zero-init/needs_reset, wipe the SQLite replica before starting so
+    # zero-cache does a clean initial sync. Recovers from the half-built
+    # replica state (`_zero.tableMetadata` missing) caused by earlier crashes.
+    entrypoint: ["sh", "-c"]
+    # Pass the script as a single list element so Compose does not tokenize it.
+    command:
+      - 'if [ -f /zero-init/needs_reset ]; then echo "[zero-init] publication change detected; wiping replica file(s) under /data" && rm -f /data/zero.db /data/zero.db-shm /data/zero.db-wal && rm -f /zero-init/needs_reset; fi; exec zero-cache'
     restart: unless-stopped
     depends_on:
-      backend:
+      db:
         condition: service_healthy
+      migrations:
+        condition: service_completed_successfully
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:4848/keepalive"]
       interval: 10s
@@ -221,3 +260,5 @@ volumes:
     name: surfsense-shared-temp
   zero_cache_data:
     name: surfsense-zero-cache
+  zero_init:
+    name: surfsense-zero-init
diff --git a/docker/scripts/install.ps1 b/docker/scripts/install.ps1
index 0eb3886a2..60c4fd5df 100644
--- a/docker/scripts/install.ps1
+++ b/docker/scripts/install.ps1
@@ -97,6 +97,161 @@ function Wait-ForPostgres {
     Write-Ok "PostgreSQL is ready."
 }
 
+# ── Stack health helpers ────────────────────────────────────────────────────
+
+function Get-ComposeServices {
+    Push-Location $InstallDir
+    try {
+        $raw = Invoke-NativeSafe { docker compose ps -a --format json 2>$null }
+    } finally {
+        Pop-Location
+    }
+    if ([string]::IsNullOrWhiteSpace($raw)) { return @() }
+
+    # Compose v2.21+ emits a JSON array; older versions emit one object per line.
+    try {
+        $parsed = $raw | ConvertFrom-Json
+        if ($parsed -is [System.Collections.IEnumerable] -and -not ($parsed -is [string])) {
+            return @($parsed)
+        }
+        return @($parsed)
+    } catch {
+        $services = @()
+        foreach ($line in ($raw -split "`r?`n")) {
+            $line = $line.Trim()
+            if (-not $line) { continue }
+            try { $services += ($line | ConvertFrom-Json) } catch { }
+        }
+        return $services
+    }
+}
+
+function Wait-StackHealthy {
+    param([int]$TimeoutSec = 300)
+
+    $deadline = (Get-Date).AddSeconds($TimeoutSec)
+    $lastReport = ""
+
+    while ((Get-Date) -lt $deadline) {
+        $services = Get-ComposeServices
+        if (-not $services -or $services.Count -eq 0) {
+            Start-Sleep -Seconds 3
+            continue
+        }
+
+        $bad = @()
+        $waiting = @()
+        $good = @()
+
+        foreach ($svc in $services) {
+            $name = $svc.Service
+            $state = $svc.State
+            $health = if ($svc.PSObject.Properties.Name -contains 'Health') { $svc.Health } else { '' }
+            $exit = if ($svc.PSObject.Properties.Name -contains 'ExitCode') { $svc.ExitCode } else { $null }
+
+            if ($name -eq 'migrations') {
+                if ($state -eq 'exited' -and $exit -eq 0) { $good += $name }
+                elseif ($state -eq 'exited') { $bad += "${name} (exit=${exit})" }
+                else { $waiting += "${name} (${state})" }
+                continue
+            }
+
+            if ($state -eq 'running') {
+                if ([string]::IsNullOrEmpty($health) -or $health -eq 'healthy') {
+                    $good += $name
+                } elseif ($health -eq 'starting') {
+                    $waiting += "${name} (starting)"
+                } elseif ($health -eq 'unhealthy') {
+                    $bad += "${name} (unhealthy)"
+                } else {
+                    $waiting += "${name} (${health})"
+                }
+            } elseif ($state -eq 'restarting') {
+                $bad += "${name} (restarting)"
+            } elseif ($state -eq 'exited') {
+                $bad += "${name} (exited, code=${exit})"
+            } else {
+                $waiting += "${name} (${state})"
+            }
+        }
+
+        if ($bad.Count -gt 0) {
+            return @{ Ok = $false; Reason = 'failure'; Bad = $bad; Waiting = $waiting; Good = $good }
+        }
+        if ($waiting.Count -eq 0) {
+            return @{ Ok = $true; Reason = 'all_healthy'; Good = $good }
+        }
+
+        $report = "Waiting on: " + ($waiting -join ', ')
+        if ($report -ne $lastReport) {
+            Write-Info $report
+            $lastReport = $report
+        }
+        Start-Sleep -Seconds 5
+    }
+
+    return @{ Ok = $false; Reason = 'timeout'; Bad = $bad; Waiting = $waiting; Good = $good }
+}
+
+function Test-StaleZeroCacheVolume {
+    $raw = Invoke-NativeSafe { docker volume ls --format '{{.Name}}' 2>$null }
+    if ([string]::IsNullOrWhiteSpace($raw)) { return $false }
+    $names = $raw -split "`r?`n" | ForEach-Object { $_.Trim() } | Where-Object { $_ }
+    $hasZeroCache = $names -contains 'surfsense-zero-cache'
+    $hasZeroInit = $names -contains 'surfsense-zero-init'
+    # Pre-fix installs created surfsense-zero-cache but never surfsense-zero-init.
+    # Such a volume may hold a half-initialized SQLite replica from an earlier
+    # crash-loop. Wiping it forces zero-cache to do a fresh initial sync.
+    return ($hasZeroCache -and -not $hasZeroInit)
+}
+
+function Invoke-StaleZeroCacheCleanup {
+    if (-not (Test-StaleZeroCacheVolume)) { return }
+
+    Write-Warn "Detected pre-existing 'surfsense-zero-cache' volume from an install that"
+    Write-Warn "predates the migrations-service fix. It may contain a half-initialized"
+    Write-Warn "SQLite replica that would block zero-cache from starting."
+    Write-Warn "The volume will be removed in 5 seconds; press Ctrl+C to cancel."
+    Start-Sleep -Seconds 5
+
+    Push-Location $InstallDir
+    Invoke-NativeSafe { docker compose down --remove-orphans 2>$null } | Out-Null
+    Pop-Location
+    Invoke-NativeSafe { docker volume rm surfsense-zero-cache 2>$null } | Out-Null
+    Write-Ok "Removed surfsense-zero-cache volume; zero-cache will re-sync on next start."
+}
+
+function Write-Err-NoExit {
+    param([string]$Message)
+    Write-Host "[ERROR] $Message" -ForegroundColor Red
+}
+
+function Invoke-StackFailureReport {
+    param([hashtable]$Result)
+
+    Write-Host ""
+    Write-Err-NoExit "Stack did not reach a healthy state."
+    if ($Result.Bad.Count -gt 0) { Write-Host ("  Failed: " + ($Result.Bad -join ', ')) }
+    if ($Result.Waiting.Count -gt 0) { Write-Host ("  Stuck:  " + ($Result.Waiting -join ', ')) }
+
+    Write-Host ""
+    Write-Info "Recent logs from migrations / zero-cache / backend:"
+    Push-Location $InstallDir
+    try {
+        Invoke-NativeSafe { docker compose logs --tail=60 migrations zero-cache backend 2>&1 } | Write-Host
+    } finally {
+        Pop-Location
+    }
+
+    Write-Host ""
+    Write-Host "Recovery hints:" -ForegroundColor Yellow
+    Write-Host "  1. Inspect migrations:   cd $InstallDir; docker compose logs migrations"
+    Write-Host "  2. Verify publication:   cd $InstallDir; docker compose exec db psql -U surfsense -d surfsense -c 'SELECT pubname FROM pg_publication;'"
+    Write-Host "  3. Hard reset zero db:   cd $InstallDir; docker compose down; docker volume rm surfsense-zero-cache; docker compose up -d"
+    Write-Host ""
+    exit 1
+}
+
 # ── Download files ──────────────────────────────────────────────────────────
 
 Write-Step "Downloading SurfSense files"
@@ -191,6 +346,8 @@ if (-not (Test-Path $envPath)) {
 
 # ── Start containers ────────────────────────────────────────────────────────
 
+Invoke-StaleZeroCacheCleanup
+
 if ($MigrationMode) {
     $envContent = Get-Content $envPath
     $DbUser = ($envContent | Select-String '^DB_USER=' | ForEach-Object { ($_ -split '=',2)[1].Trim('"') }) | Select-Object -First 1
@@ -251,7 +408,13 @@ if ($MigrationMode) {
     Push-Location $InstallDir
     Invoke-NativeSafe { docker compose up -d }
     Pop-Location
-    Write-Ok "All services started."
+    Write-Ok "All containers started; waiting for stack to become healthy..."
+
+    $waitResult = Wait-StackHealthy -TimeoutSec 300
+    if (-not $waitResult.Ok) {
+        Invoke-StackFailureReport -Result $waitResult
+    }
+    Write-Ok "All services healthy."
 
     Remove-Item $KeyFile -ErrorAction SilentlyContinue
 
@@ -260,7 +423,13 @@ if ($MigrationMode) {
     Push-Location $InstallDir
     Invoke-NativeSafe { docker compose up -d }
     Pop-Location
-    Write-Ok "All services started."
+    Write-Ok "All containers started; waiting for stack to become healthy..."
+
+    $waitResult = Wait-StackHealthy -TimeoutSec 300
+    if (-not $waitResult.Ok) {
+        Invoke-StackFailureReport -Result $waitResult
+    }
+    Write-Ok "All services healthy."
 }
 
 # ── Watchtower (auto-update) ────────────────────────────────────────────────
diff --git a/docker/scripts/install.sh b/docker/scripts/install.sh
index fcab4d55a..db81f95eb 100644
--- a/docker/scripts/install.sh
+++ b/docker/scripts/install.sh
@@ -97,6 +97,163 @@ wait_for_pg() {
     success "PostgreSQL is ready."
 }
 
+# ── Stack health helpers ─────────────────────────────────────────────────────
+
+# Enumerate compose services for project `surfsense` as `service|state|health|exitcode`
+# lines. Uses `docker inspect` so we don't depend on `jq`, `python3`, or the
+# exact ordering of fields in `docker compose ps --format json` output.
+get_compose_services() {
+    local containers
+    containers=$(docker ps -a --filter "label=com.docker.compose.project=surfsense" --format '{{.Names}}' 2>/dev/null) || true
+    [[ -z "$containers" ]] && return 0
+
+    while IFS= read -r container; do
+        [[ -z "$container" ]] && continue
+        local svc state health code
+        svc=$(docker inspect -f '{{index .Config.Labels "com.docker.compose.service"}}' "$container" 2>/dev/null || echo "")
+        state=$(docker inspect -f '{{.State.Status}}' "$container" 2>/dev/null || echo "unknown")
+        health=$(docker inspect -f '{{if .State.Health}}{{.State.Health.Status}}{{end}}' "$container" 2>/dev/null || echo "")
+        code=$(docker inspect -f '{{.State.ExitCode}}' "$container" 2>/dev/null || echo "")
+        [[ -z "$svc" ]] && continue
+        printf '%s|%s|%s|%s\n' "$svc" "$state" "$health" "$code"
+    done <<< "$containers"
+}
+
+# Globals populated by wait_stack_healthy / consumed by stack_failure_report.
+STACK_BAD=()
+STACK_WAITING=()
+STACK_GOOD=()
+STACK_TIMEOUT=false
+
+wait_stack_healthy() {
+    local timeout_sec=${1:-300}
+    local deadline=$(($(date +%s) + timeout_sec))
+    local last_report=""
+    local bad=()
+    local waiting=()
+    local good=()
+
+    while [[ $(date +%s) -lt $deadline ]]; do
+        local lines
+        lines=$(get_compose_services)
+        if [[ -z "$lines" ]]; then
+            sleep 3
+            continue
+        fi
+
+        bad=()
+        waiting=()
+        good=()
+
+        while IFS='|' read -r name state health code; do
+            [[ -z "$name" ]] && continue
+            if [[ "$name" == "migrations" ]]; then
+                if [[ "$state" == "exited" && "$code" == "0" ]]; then
+                    good+=("$name")
+                elif [[ "$state" == "exited" ]]; then
+                    bad+=("${name} (exit=${code})")
+                else
+                    waiting+=("${name} (${state})")
+                fi
+                continue
+            fi
+
+            if [[ "$state" == "running" ]]; then
+                if [[ -z "$health" || "$health" == "healthy" ]]; then
+                    good+=("$name")
+                elif [[ "$health" == "starting" ]]; then
+                    waiting+=("${name} (starting)")
+                elif [[ "$health" == "unhealthy" ]]; then
+                    bad+=("${name} (unhealthy)")
+                else
+                    waiting+=("${name} (${health})")
+                fi
+            elif [[ "$state" == "restarting" ]]; then
+                bad+=("${name} (restarting)")
+            elif [[ "$state" == "exited" ]]; then
+                bad+=("${name} (exited, code=${code})")
+            else
+                waiting+=("${name} (${state})")
+            fi
+        done <<< "$lines"
+
+        if (( ${#bad[@]} > 0 )); then
+            STACK_BAD=("${bad[@]}")
+            STACK_WAITING=("${waiting[@]}")
+            STACK_GOOD=("${good[@]}")
+            return 1
+        fi
+        if (( ${#waiting[@]} == 0 )); then
+            STACK_GOOD=("${good[@]}")
+            return 0
+        fi
+
+        local report="Waiting on: ${waiting[*]}"
+        if [[ "$report" != "$last_report" ]]; then
+            info "$report"
+            last_report="$report"
+        fi
+        sleep 5
+    done
+
+    # bad/waiting/good are declared at function scope so referencing them is
+    # safe even if the polling loop never executed its body.
+    STACK_BAD=()
+    [[ ${#bad[@]} -gt 0 ]] && STACK_BAD=("${bad[@]}")
+    STACK_WAITING=()
+    [[ ${#waiting[@]} -gt 0 ]] && STACK_WAITING=("${waiting[@]}")
+    STACK_GOOD=()
+    [[ ${#good[@]} -gt 0 ]] && STACK_GOOD=("${good[@]}")
+    STACK_TIMEOUT=true
+    return 1
+}
+
+stack_failure_report() {
+    echo ""
+    echo -e "\033[31m[ERROR]\033[0m Stack did not reach a healthy state."
+    if (( ${#STACK_BAD[@]} > 0 )) && [[ -n "${STACK_BAD[0]}" ]]; then
+        echo "  Failed: ${STACK_BAD[*]}"
+    fi
+    if (( ${#STACK_WAITING[@]} > 0 )) && [[ -n "${STACK_WAITING[0]}" ]]; then
+        echo "  Stuck:  ${STACK_WAITING[*]}"
+    fi
+    echo ""
+    info "Recent logs from migrations / zero-cache / backend:"
+    (cd "${INSTALL_DIR}" && ${DC} logs --tail=60 migrations zero-cache backend 2>&1) || true
+    echo ""
+    echo "Recovery hints:"
+    echo "  1. Inspect migrations:   cd ${INSTALL_DIR} && ${DC} logs migrations"
+    echo "  2. Verify publication:   cd ${INSTALL_DIR} && ${DC} exec db psql -U surfsense -d surfsense -c 'SELECT pubname FROM pg_publication;'"
+    echo "  3. Hard reset zero db:   cd ${INSTALL_DIR} && ${DC} down && docker volume rm surfsense-zero-cache && ${DC} up -d"
+    echo ""
+    exit 1
+}
+
+# True if `surfsense-zero-cache` exists but `surfsense-zero-init` does not.
+# That signals an install that predates the migrations-service fix; the old
+# replica may be half-initialized and would block zero-cache on next start.
+test_stale_zero_cache_volume() {
+    local has_zc has_zi
+    has_zc=$(docker volume ls --format '{{.Name}}' 2>/dev/null | grep -Fx 'surfsense-zero-cache' || true)
+    has_zi=$(docker volume ls --format '{{.Name}}' 2>/dev/null | grep -Fx 'surfsense-zero-init' || true)
+    [[ -n "$has_zc" && -z "$has_zi" ]]
+}
+
+invoke_stale_zero_cache_cleanup() {
+    if ! test_stale_zero_cache_volume; then
+        return 0
+    fi
+    warn "Detected pre-existing 'surfsense-zero-cache' volume from an install that"
+    warn "predates the migrations-service fix. It may contain a half-initialized"
+    warn "SQLite replica that would block zero-cache from starting."
+    warn "The volume will be removed in 5 seconds; press Ctrl+C to cancel."
+    sleep 5
+
+    (cd "${INSTALL_DIR}" && ${DC} down --remove-orphans 2>/dev/null) || true
+    docker volume rm surfsense-zero-cache 2>/dev/null || true
+    success "Removed surfsense-zero-cache volume; zero-cache will re-sync on next start."
+}
+
 # ── Download files ───────────────────────────────────────────────────────────
 
 step "Downloading SurfSense files"
@@ -186,6 +343,8 @@ fi
 
 # ── Start containers ─────────────────────────────────────────────────────────
 
+invoke_stale_zero_cache_cleanup
+
 if $MIGRATION_MODE; then
     # Read DB credentials from .env (fall back to defaults from docker-compose.yml)
     DB_USER=$(grep '^DB_USER=' "${INSTALL_DIR}/.env" 2>/dev/null | cut -d= -f2 | tr -d '"' | head -1 || true)
@@ -243,7 +402,12 @@ if $MIGRATION_MODE; then
 
     step "Starting all SurfSense services"
     (cd "${INSTALL_DIR}" && ${DC} up -d) < /dev/null
-    success "All services started."
+    success "All containers started; waiting for stack to become healthy..."
+
+    if ! wait_stack_healthy 300; then
+        stack_failure_report
+    fi
+    success "All services healthy."
 
     # Key file is no longer needed — SECRET_KEY is now in .env
     rm -f "${KEY_FILE}"
@@ -251,7 +415,12 @@ if $MIGRATION_MODE; then
 else
     step "Starting SurfSense"
     (cd "${INSTALL_DIR}" && ${DC} up -d) < /dev/null
-    success "All services started."
+    success "All containers started; waiting for stack to become healthy..."
+
+    if ! wait_stack_healthy 300; then
+        stack_failure_report
+    fi
+    success "All services healthy."
 fi
 
 # ── Watchtower (auto-update) ─────────────────────────────────────────────────
diff --git a/surfsense_backend/Dockerfile b/surfsense_backend/Dockerfile
index 6e1b2481e..0c783f403 100644
--- a/surfsense_backend/Dockerfile
+++ b/surfsense_backend/Dockerfile
@@ -167,10 +167,14 @@ COPY scripts/docker/entrypoint.sh /app/scripts/docker/entrypoint.sh
 RUN dos2unix /app/scripts/docker/entrypoint.sh && chmod +x /app/scripts/docker/entrypoint.sh
 
 # SERVICE_ROLE controls which process this container runs:
-#   api     – FastAPI backend only (runs migrations on startup)
+#   migrate – Run alembic upgrade head, verify zero_publication exists, exit 0.
+#             Used by the dedicated `migrations` service in docker-compose.yml
+#             so downstream services gate on `service_completed_successfully`.
+#   api     – FastAPI backend only (does NOT run migrations)
 #   worker  – Celery worker only
 #   beat    – Celery beat scheduler only
-#   all     – All three (legacy / dev default)
+#   all     – migrations + api + worker + beat (legacy / dev default;
+#             fails fast on migration error)
 ENV SERVICE_ROLE=all
 
 # Celery worker tuning (only used when SERVICE_ROLE=worker or all)
diff --git a/surfsense_backend/app/app.py b/surfsense_backend/app/app.py
index 5057e7d00..fc6242643 100644
--- a/surfsense_backend/app/app.py
+++ b/surfsense_backend/app/app.py
@@ -945,6 +945,36 @@ async def health_check():
     return {"status": "ok"}
 
 
+@app.get("/ready", tags=["health"])
+@limiter.exempt
+async def readiness_check():
+    """Readiness probe.
+
+    Verifies that the schema state required by downstream services is
+    present. Specifically checks that the ``zero_publication`` Postgres
+    logical-replication publication exists; without it zero-cache crash-loops
+    on `Unknown or invalid publications`.
+
+    Returns 200 when ready, 503 otherwise. Used by the docker-compose
+    backend healthcheck and by ``install.ps1`` / ``install.sh`` post-up
+    verification.
+    """
+    from sqlalchemy import text
+
+    from app.db import async_session_maker
+
+    async with async_session_maker() as session:
+        result = await session.execute(
+            text("SELECT 1 FROM pg_publication WHERE pubname = 'zero_publication'")
+        )
+        if result.first() is None:
+            raise HTTPException(
+                status_code=503,
+                detail="zero_publication missing; run alembic upgrade head",
+            )
+    return {"status": "ready"}
+
+
 @app.get("/verify-token")
 async def authenticated_route(
     user: User = Depends(current_active_user),
diff --git a/surfsense_backend/scripts/docker/entrypoint.sh b/surfsense_backend/scripts/docker/entrypoint.sh
index 7bfcfce86..81db1ae84 100644
--- a/surfsense_backend/scripts/docker/entrypoint.sh
+++ b/surfsense_backend/scripts/docker/entrypoint.sh
@@ -4,10 +4,15 @@ set -e
 # ─────────────────────────────────────────────────────────────
 # SERVICE_ROLE controls which process(es) this container runs.
 #
-#   api     – FastAPI backend only  (runs migrations on startup)
+#   migrate – Run `alembic upgrade head`, verify zero_publication,
+#             then exit 0. Used by the dedicated `migrations` service
+#             in docker-compose.yml so downstream services can gate
+#             on `condition: service_completed_successfully`.
+#   api     – FastAPI backend only (does NOT run migrations)
 #   worker  – Celery worker only
 #   beat    – Celery beat scheduler only
-#   all     – All three in one container (legacy / dev default)
+#   all     – migrations + api + worker + beat in one container
+#             (legacy / dev default; fails fast on migration error)
 #
 # Set SERVICE_ROLE as an environment variable in Coolify for
 # each service deployment.
@@ -41,7 +46,13 @@ cleanup() {
 
 trap cleanup SIGTERM SIGINT
 
-# ── Database migrations (only for api / all) ─────────────────
+# ── Database migrations (only for migrate / all) ─────────────
+# Fail-fast contract:
+#   - alembic upgrade head must succeed within ${MIGRATION_TIMEOUT:-900}s
+#   - zero_publication must exist in pg_publication afterwards
+# Either failure exits non-zero so the dedicated `migrations` compose
+# service exits non-zero, halting the rest of the stack instead of
+# silently producing a half-built system that crash-loops zero-cache.
 run_migrations() {
     echo "Running database migrations..."
     for i in {1..30}; do
@@ -53,11 +64,66 @@ run_migrations() {
         sleep 1
     done
 
-    if timeout 300 alembic upgrade head 2>&1; then
-        echo "Migrations completed successfully."
-    else
-        echo "WARNING: Migration failed or timed out. Continuing anyway..."
-        echo "You may need to run migrations manually: alembic upgrade head"
+    local timeout_secs="${MIGRATION_TIMEOUT:-900}"
+    echo "Running alembic upgrade head (timeout=${timeout_secs}s)..."
+    if ! timeout "${timeout_secs}" alembic upgrade head; then
+        echo "ERROR: alembic upgrade head failed (or exceeded ${timeout_secs}s timeout)." >&2
+        echo "Refusing to start. Inspect the error above and re-run." >&2
+        exit 1
+    fi
+    echo "Migrations completed successfully."
+
+    echo "Verifying zero_publication exists in Postgres..."
+    local pub_oid
+    pub_oid=$(python <<'PY' 2>/dev/null || true
+import asyncio
+import sys
+from sqlalchemy import text
+from app.db import engine
+
+
+async def get_oid():
+    async with engine.connect() as conn:
+        result = await conn.execute(
+            text("SELECT oid FROM pg_publication WHERE pubname = 'zero_publication'")
+        )
+        row = result.first()
+        if row is None:
+            sys.exit(1)
+        print(int(row[0]))
+
+
+asyncio.run(get_oid())
+PY
+)
+    if [ -z "${pub_oid}" ]; then
+        echo "ERROR: zero_publication is missing from Postgres after running alembic." >&2
+        echo "This usually means migration 116 (or a later publication migration) did not run." >&2
+        echo "Inspect alembic state with:" >&2
+        echo "  docker compose exec db psql -U \"\$DB_USER\" -d \"\$DB_NAME\" -c 'SELECT * FROM alembic_version;'" >&2
+        exit 1
+    fi
+    echo "zero_publication verified (oid=${pub_oid})."
+
+    # Stale-replica safety net: if /zero-init is mounted (i.e. we are the
+    # dedicated `migrations` compose service), drop a marker file when the
+    # publication oid changed (or on first run) so the wrapped zero-cache
+    # entrypoint can wipe /data/zero.db before starting. This recovers from
+    # the case where a previous zero-cache crashed mid-init and left a
+    # half-built SQLite replica without a `_zero.tableMetadata` table.
+    if [ -d /zero-init ]; then
+        local stored_oid=""
+        [ -f /zero-init/last_pub_oid ] && stored_oid=$(cat /zero-init/last_pub_oid 2>/dev/null || true)
+        if [ -z "${stored_oid}" ] || [ "${stored_oid}" != "${pub_oid}" ]; then
+            echo "Publication oid changed (stored=${stored_oid:-<none>}, current=${pub_oid}); writing /zero-init/needs_reset."
+            : > /zero-init/needs_reset
+            chmod 666 /zero-init/needs_reset 2>/dev/null || true
+        fi
+        echo "${pub_oid}" > /zero-init/last_pub_oid
+        chmod 666 /zero-init/last_pub_oid 2>/dev/null || true
+        # World-writable dir so the (possibly non-root) zero-cache container
+        # can `rm -f /zero-init/needs_reset` after acting on the marker.
+        chmod 777 /zero-init 2>/dev/null || true
     fi
 }
 
@@ -102,8 +168,12 @@ start_beat() {
 
 # ── Main: run based on role ──────────────────────────────────
 case "${SERVICE_ROLE}" in
-    api)
+    migrate)
         run_migrations
+        echo "Migrations complete; exiting cleanly."
+        exit 0
+        ;;
+    api)
         start_api
         ;;
     worker)
@@ -121,7 +191,7 @@ case "${SERVICE_ROLE}" in
         start_beat
         ;;
     *)
-        echo "ERROR: Unknown SERVICE_ROLE '${SERVICE_ROLE}'. Use: api, worker, beat, or all"
+        echo "ERROR: Unknown SERVICE_ROLE '${SERVICE_ROLE}'. Use: migrate, api, worker, beat, or all"
         exit 1
         ;;
 esac
diff --git a/surfsense_web/content/docs/docker-installation/docker-compose.mdx b/surfsense_web/content/docs/docker-installation/docker-compose.mdx
index bd7f579d0..0155969cd 100644
--- a/surfsense_web/content/docs/docker-installation/docker-compose.mdx
+++ b/surfsense_web/content/docs/docker-installation/docker-compose.mdx
@@ -71,7 +71,7 @@ Defaults work out of the box. Change `ZERO_ADMIN_PASSWORD` for security in produ
 | `ZERO_UPSTREAM_DB` | PostgreSQL connection URL for replication (must be a direct connection, not via pgbouncer) | *(built from DB_* vars)* |
 | `ZERO_CVR_DB` | PostgreSQL connection URL for client view records | *(built from DB_* vars)* |
 | `ZERO_CHANGE_DB` | PostgreSQL connection URL for replication log entries | *(built from DB_* vars)* |
-| `ZERO_APP_PUBLICATIONS` | PostgreSQL publication restricting which tables are replicated (created by migration 116) | `zero_publication` |
+| `ZERO_APP_PUBLICATIONS` | PostgreSQL publication restricting which tables are replicated (created by migration 116, verified by the `migrations` service before `zero-cache` starts) | `zero_publication` |
 | `ZERO_NUM_SYNC_WORKERS` | Number of view-sync worker processes. Must be ≤ connection pool sizes | `4` |
 | `ZERO_UPSTREAM_MAX_CONNS` | Max connections to upstream PostgreSQL for mutations | `20` |
 | `ZERO_CVR_MAX_CONNS` | Max connections to the CVR database | `30` |
@@ -150,7 +150,9 @@ Uncomment the connectors you want to use. Redirect URIs follow the pattern `http
 | Service | Description |
 |---------|-------------|
 | `db` | PostgreSQL with pgvector extension |
+| `migrations` | Short-lived: runs `alembic upgrade head` and verifies `zero_publication`, then exits |
 | `redis` | Message broker for Celery |
+| `searxng` | Local privacy-respecting search backend |
 | `backend` | FastAPI application server |
 | `celery_worker` | Background task processing (document indexing, etc.) |
 | `celery_beat` | Periodic task scheduler (connector sync) |
@@ -159,7 +161,42 @@ Uncomment the connectors you want to use. Redirect URIs follow the pattern `http
 
 All services start automatically with `docker compose up -d`.
 
-The backend includes a health check. Dependent services (workers, frontend) wait until the API is fully ready before starting. You can monitor startup progress with `docker compose ps` (look for `(health: starting)` → `(healthy)`).
+### How startup ordering works
+
+Schema migrations run as a dedicated `migrations` service that exits 0 on
+success and non-zero on failure. Every other backend-image service gates on
+it via `condition: service_completed_successfully`:
+
+```text
+db (healthy) ──▶ migrations (alembic upgrade head + verify zero_publication)
+                     │
+                     ├── exit 0 ─▶ backend ──▶ frontend
+                     │            celery_worker
+                     │            celery_beat
+                     │            zero-cache ──▶ frontend
+                     │
+                     └── exit ≠ 0 ─▶ compose halts the rest of the stack
+```
+
+This guarantees `zero-cache` only starts after `zero_publication` exists in
+Postgres. Before this design, a silent migration failure would leave
+`zero-cache` crash-looping with `Unknown or invalid publications. Specified:
+[zero_publication]. Found: []`.
+
+### Readiness vs liveness
+
+The backend exposes two endpoints:
+
+- `GET /health` — lightweight liveness probe (always returns 200 if the
+  process is up).
+- `GET /ready` — readiness probe that confirms `zero_publication` exists.
+  Returns 503 if not. The compose `backend.healthcheck` uses `/ready` so the
+  container only reports `healthy` once the schema is actually usable by
+  zero-cache.
+
+You can also monitor startup progress with `docker compose ps` (look for
+`(health: starting)` → `(healthy)`). The install script polls these states
+automatically and times out after 5 minutes if the stack does not converge.
 
 ---
 
@@ -188,6 +225,90 @@ docker compose down -v
 
 - **Ports already in use**: Change the relevant `*_PORT` variable in `.env` and restart.
 - **Permission errors on Linux**: You may need to prefix `docker` commands with `sudo`.
-- **Zero-cache not starting**: Check `docker compose logs zero-cache`. Ensure PostgreSQL has `wal_level=logical` (configured automatically by the bundled `postgresql.conf`).
 - **Real-time updates not working**: Open DevTools → Console and check for WebSocket errors. Verify `NEXT_PUBLIC_ZERO_CACHE_URL` matches the running zero-cache address.
 - **Line ending issues on Windows**: Run `git config --global core.autocrlf true` before cloning.
+
+### Migration service exited non-zero
+
+The `migrations` service exits non-zero in two cases:
+
+1. `alembic upgrade head` failed (timeout or SQL error).
+2. `alembic` succeeded but `zero_publication` is still missing from
+   `pg_publication`.
+
+Inspect the logs and the alembic state:
+
+```bash
+docker compose logs migrations
+docker compose exec db psql -U surfsense -d surfsense \
+  -c 'SELECT * FROM alembic_version;'
+docker compose exec db psql -U surfsense -d surfsense \
+  -c 'SELECT pubname FROM pg_publication;'
+```
+
+The default migration timeout is 900 seconds. Slow disks (Windows / WSL2)
+may need more — set `MIGRATION_TIMEOUT` in `.env` to increase it.
+
+### Zero-cache stuck on `Unknown or invalid publications`
+
+Symptom (in `docker compose logs zero-cache`):
+
+```text
+Error: Unknown or invalid publications. Specified: [zero_publication]. Found: []
+```
+
+This means `zero-cache` started before `zero_publication` was created. With
+the current compose files this should be impossible — the `migrations`
+service blocks `zero-cache` from starting. If you see it, your stack
+predates the fix or you brought up `zero-cache` manually with `docker
+compose up zero-cache` before the migrations service ran.
+
+Recovery:
+
+```bash
+docker compose down
+docker volume rm surfsense-zero-cache   # wipe half-built SQLite replica
+docker compose up -d                    # migrations runs first, then zero-cache
+```
+
+The install script (`install.ps1` / `install.sh`) detects this case
+automatically: if it finds a `surfsense-zero-cache` volume from a previous
+install with no matching `surfsense-zero-init` volume, it removes the stale
+volume before bringing the stack up.
+
+### Zero-cache crashes with `_zero.tableMetadata` errors
+
+This indicates a half-initialized SQLite replica left behind by a previous
+crash. The `migrations` service writes a marker file on a shared volume
+(`surfsense-zero-init`) when the publication oid changes; zero-cache wipes
+its replica and re-syncs on next start. If the marker mechanism somehow did
+not trigger, run the recovery one-liner above.
+
+### Ensuring `wal_level = logical`
+
+Logical replication is required by zero-cache. The bundled
+`docker/postgresql.conf` sets `wal_level = logical` automatically. If you
+swap in your own config or use a managed Postgres, confirm with:
+
+```bash
+docker compose exec db psql -U surfsense -d surfsense \
+  -c "SHOW wal_level;"
+```
+
+### Using `docker-compose.deps-only.yml`
+
+`docker-compose.deps-only.yml` runs only the dependencies (Postgres, Redis,
+SearXNG, zero-cache) on Docker while the backend and frontend run on the
+host. Because there is no backend container in this stack, there is no
+`migrations` service either, and you must run alembic on the host **before**
+bringing the stack up:
+
+```bash
+cd surfsense_backend
+uv run alembic upgrade head
+cd ../docker
+docker compose -f docker-compose.deps-only.yml up -d
+```
+
+If you skip the alembic step, `zero-cache` will crash-loop with `Unknown or
+invalid publications. Specified: [zero_publication]`.

From ed22da7b95a9a413613919662bc07394088d3f59 Mon Sep 17 00:00:00 2001
From: "DESKTOP-RTLN3BA\\$punk" <vermarohanfinal@gmail.com>
Date: Wed, 20 May 2026 03:01:37 -0700
Subject: [PATCH 96/96] feat: bumped version to 0.0.24

---
 VERSION                                       |   2 +-
 surfsense_backend/pyproject.toml              |   2 +-
 surfsense_backend/uv.lock                     |   2 +-
 surfsense_browser_extension/package.json      |   2 +-
 surfsense_desktop/package.json                |   2 +-
 .../content/docs/how-to/zero-sync.mdx         |  27 ++-
 .../content/docs/manual-installation.mdx      | 183 +++++++++++++++++-
 surfsense_web/package.json                    |   2 +-
 8 files changed, 206 insertions(+), 16 deletions(-)

diff --git a/VERSION b/VERSION
index df5db66fe..b056f4120 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.0.23
+0.0.24
diff --git a/surfsense_backend/pyproject.toml b/surfsense_backend/pyproject.toml
index 523a8a1ac..26fee1bc3 100644
--- a/surfsense_backend/pyproject.toml
+++ b/surfsense_backend/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "surf-new-backend"
-version = "0.0.23"
+version = "0.0.24"
 description = "SurfSense Backend"
 requires-python = ">=3.12"
 dependencies = [
diff --git a/surfsense_backend/uv.lock b/surfsense_backend/uv.lock
index 812be636a..c4e6b5c89 100644
--- a/surfsense_backend/uv.lock
+++ b/surfsense_backend/uv.lock
@@ -7947,7 +7947,7 @@ wheels = [
 
 [[package]]
 name = "surf-new-backend"
-version = "0.0.23"
+version = "0.0.24"
 source = { editable = "." }
 dependencies = [
     { name = "alembic" },
diff --git a/surfsense_browser_extension/package.json b/surfsense_browser_extension/package.json
index 82c0a349a..028e653b3 100644
--- a/surfsense_browser_extension/package.json
+++ b/surfsense_browser_extension/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "surfsense_browser_extension",
 	"displayName": "Surfsense Browser Extension",
-	"version": "0.0.23",
+	"version": "0.0.24",
 	"description": "Extension to collect Browsing History for SurfSense.",
 	"author": "https://github.com/MODSetter",
 	"engines": {
diff --git a/surfsense_desktop/package.json b/surfsense_desktop/package.json
index b1fff79a5..68032e9f4 100644
--- a/surfsense_desktop/package.json
+++ b/surfsense_desktop/package.json
@@ -1,6 +1,6 @@
 {
   "name": "surfsense-desktop",
-  "version": "0.0.23",
+  "version": "0.0.24",
   "description": "SurfSense Desktop App",
   "main": "dist/main.js",
   "scripts": {
diff --git a/surfsense_web/content/docs/how-to/zero-sync.mdx b/surfsense_web/content/docs/how-to/zero-sync.mdx
index e764d384a..1a7762f23 100644
--- a/surfsense_web/content/docs/how-to/zero-sync.mdx
+++ b/surfsense_web/content/docs/how-to/zero-sync.mdx
@@ -43,10 +43,31 @@ zero-cache is included in the Docker Compose setup. The key environment variable
 
 ### Manual / Local Development
 
-If running the frontend outside Docker (e.g., `pnpm dev`), you need:
+If running the frontend outside Docker (e.g. `pnpm dev`), you need:
 
-1. A running zero-cache instance pointing at your PostgreSQL database
-2. `NEXT_PUBLIC_ZERO_CACHE_URL` set in your `.env` file (default: `http://localhost:4848`)
+1. **A running zero-cache instance** pointing at your PostgreSQL database. The easiest path is the official Docker image:
+
+    ```bash
+    docker run -d --name surfsense-zero-cache \
+      -p 4848:4848 \
+      --add-host=host.docker.internal:host-gateway \
+      -e ZERO_UPSTREAM_DB="postgresql://postgres:postgres@host.docker.internal:5432/surfsense?sslmode=disable" \
+      -e ZERO_CVR_DB="postgresql://postgres:postgres@host.docker.internal:5432/surfsense?sslmode=disable" \
+      -e ZERO_CHANGE_DB="postgresql://postgres:postgres@host.docker.internal:5432/surfsense?sslmode=disable" \
+      -e ZERO_REPLICA_FILE=/data/zero.db \
+      -e ZERO_ADMIN_PASSWORD=surfsense-zero-admin \
+      -e ZERO_APP_PUBLICATIONS=zero_publication \
+      -e ZERO_QUERY_URL="http://host.docker.internal:3000/api/zero/query" \
+      -e ZERO_MUTATE_URL="http://host.docker.internal:3000/api/zero/mutate" \
+      -v surfsense-zero-cache:/data \
+      rocicorp/zero:1.4.0
+    ```
+
+    Run `uv run alembic upgrade head` from `surfsense_backend/` **before** starting this container so the `zero_publication` exists.
+2. **`NEXT_PUBLIC_ZERO_CACHE_URL`** set in `surfsense_web/.env` (default: `http://localhost:4848`).
+3. **`wal_level = logical`** in your PostgreSQL config (see [Manual Installation → Configure PostgreSQL for Zero Sync](/docs/manual-installation#3-configure-postgresql-for-zero-sync)).
+
+For the full manual setup walkthrough, see the [Manual Installation guide](/docs/manual-installation).
 
 ### Custom Domain / Reverse Proxy
 
diff --git a/surfsense_web/content/docs/manual-installation.mdx b/surfsense_web/content/docs/manual-installation.mdx
index f9eed9487..599cb6238 100644
--- a/surfsense_web/content/docs/manual-installation.mdx
+++ b/surfsense_web/content/docs/manual-installation.mdx
@@ -15,9 +15,11 @@ Before beginning the manual installation, ensure you have the following installe
 ### Required Software
 - **Python 3.12+** - Backend runtime environment
 - **Node.js 20+** - Frontend runtime environment  
-- **PostgreSQL 14+** - Database server
+- **PostgreSQL 14+** - Database server (must be configured with `wal_level = logical` for [Zero real-time sync](/docs/how-to/zero-sync))
 - **PGVector** - PostgreSQL extension for vector similarity search
 - **Redis** - Message broker for Celery task queue
+- **Zero-cache** - Rocicorp Zero real-time sync server (run via Docker; see [Zero-Cache Setup](#zero-cache-setup) below)
+- **Docker** - Required to run zero-cache (the simplest way; the Postgres + Redis can be installed natively)
 - **Git** - Version control (to clone the repository)
 
 ### Required Services & API Keys
@@ -212,7 +214,82 @@ uv sync
 uv sync
 ```
 
-### 3. Start Redis Server
+### 3. Configure PostgreSQL for Zero Sync
+
+SurfSense uses [Rocicorp Zero](https://zero.rocicorp.dev/) for real-time data synchronization (notifications, document status, chat comments, indexing progress). Zero replicates data from PostgreSQL via **logical replication**, which requires a one-time PostgreSQL configuration change.
+
+Edit your `postgresql.conf` (typical locations: `/etc/postgresql/<version>/main/postgresql.conf` on Linux, `/usr/local/var/postgres/postgresql.conf` on macOS via Homebrew, `C:\Program Files\PostgreSQL\<version>\data\postgresql.conf` on Windows) and set:
+
+```ini
+wal_level = logical
+max_replication_slots = 10
+max_wal_senders = 10
+```
+
+Then restart PostgreSQL:
+
+**Linux:**
+
+```bash
+sudo systemctl restart postgresql
+```
+
+**macOS (Homebrew):**
+
+```bash
+brew services restart postgresql
+```
+
+**Windows (PowerShell, replace `17` with your major version):**
+
+```powershell
+Restart-Service postgresql-x64-17
+```
+
+Verify the change:
+
+```bash
+psql -U postgres -d surfsense -c "SHOW wal_level;"
+# Should return: logical
+```
+
+**Managed databases (RDS, Supabase, Cloud SQL, etc.):** Enable logical replication via your provider's parameter group (e.g. `rds.logical_replication=1` on RDS) and grant your database user the `REPLICATION` privilege:
+
+```sql
+ALTER USER surfsense WITH REPLICATION;
+GRANT CREATE ON DATABASE surfsense TO surfsense;
+```
+
+### 4. Run Database Migrations
+
+Before starting the backend, run Alembic migrations. This creates the schema **and** the `zero_publication` that zero-cache needs to start. Skipping this step will cause zero-cache to crash-loop with `Unknown or invalid publications. Specified: [zero_publication]`.
+
+**If using uv:**
+
+```bash
+# From surfsense_backend/
+uv run alembic upgrade head
+```
+
+**If using pip/venv:**
+
+```bash
+# Activate virtual environment first
+source .venv/bin/activate  # Linux/macOS
+# OR
+.venv\Scripts\activate     # Windows
+
+alembic upgrade head
+```
+
+Verify the publication was created:
+
+```bash
+psql -U postgres -d surfsense -c "SELECT pubname FROM pg_publication;"
+# Should include: zero_publication
+```
+
+### 5. Start Redis Server
 
 Redis is required for Celery task queue. Start the Redis server:
 
@@ -271,7 +348,7 @@ redis-cli ping
 # Should return: PONG
 ```
 
-### 4. Start Celery Worker
+### 6. Start Celery Worker
 
 In a new terminal window, start the Celery worker to handle background tasks:
 
@@ -316,7 +393,7 @@ celery -A celery_worker.celery_app flower --port=5555
 
 Access Flower at [http://localhost:5555](http://localhost:5555) to monitor your Celery tasks.
 
-### 5. Start Celery Beat (Scheduler)
+### 7. Start Celery Beat (Scheduler)
 
 In another new terminal window, start Celery Beat to enable periodic tasks (like scheduled connector indexing):
 
@@ -347,7 +424,7 @@ celery -A celery_worker.celery_app beat --loglevel=info
 
 **Important**: Celery Beat is required for the periodic indexing functionality to work. Without it, scheduled connector tasks won't run automatically. The schedule interval can be configured using the `SCHEDULE_CHECKER_INTERVAL` environment variable.
 
-### 6. Run the Backend
+### 8. Run the Backend
 
 Start the backend server:
 
@@ -378,6 +455,92 @@ python main.py --reload
 
 If everything is set up correctly, you should see output indicating the server is running on `http://localhost:8000`.
 
+## Zero-Cache Setup
+
+**zero-cache** is the Rocicorp Zero server that sits between PostgreSQL and the browser. It streams real-time updates (notifications, document indexing status, chat comments, collaboration indicators) to all connected clients via WebSocket. The frontend connects to it on startup — without zero-cache running, you will not see live updates and many parts of the UI will sit on stale data.
+
+For an overview of how Zero works and the list of synced tables, see the [Real-Time Sync with Zero](/docs/how-to/zero-sync) guide.
+
+### 1. Run Zero-Cache via Docker
+
+The simplest way to run zero-cache is the official Docker image. Open a new terminal:
+
+**Linux/macOS:**
+
+```bash
+docker run -d --name surfsense-zero-cache \
+  -p 4848:4848 \
+  --add-host=host.docker.internal:host-gateway \
+  -e ZERO_UPSTREAM_DB="postgresql://postgres:postgres@host.docker.internal:5432/surfsense?sslmode=disable" \
+  -e ZERO_CVR_DB="postgresql://postgres:postgres@host.docker.internal:5432/surfsense?sslmode=disable" \
+  -e ZERO_CHANGE_DB="postgresql://postgres:postgres@host.docker.internal:5432/surfsense?sslmode=disable" \
+  -e ZERO_REPLICA_FILE=/data/zero.db \
+  -e ZERO_ADMIN_PASSWORD=surfsense-zero-admin \
+  -e ZERO_APP_PUBLICATIONS=zero_publication \
+  -e ZERO_NUM_SYNC_WORKERS=4 \
+  -e ZERO_UPSTREAM_MAX_CONNS=20 \
+  -e ZERO_CVR_MAX_CONNS=30 \
+  -e ZERO_QUERY_URL="http://host.docker.internal:3000/api/zero/query" \
+  -e ZERO_MUTATE_URL="http://host.docker.internal:3000/api/zero/mutate" \
+  -v surfsense-zero-cache:/data \
+  rocicorp/zero:1.4.0
+```
+
+**Windows (PowerShell):**
+
+```powershell
+docker run -d --name surfsense-zero-cache `
+  -p 4848:4848 `
+  --add-host=host.docker.internal:host-gateway `
+  -e ZERO_UPSTREAM_DB="postgresql://postgres:postgres@host.docker.internal:5432/surfsense?sslmode=disable" `
+  -e ZERO_CVR_DB="postgresql://postgres:postgres@host.docker.internal:5432/surfsense?sslmode=disable" `
+  -e ZERO_CHANGE_DB="postgresql://postgres:postgres@host.docker.internal:5432/surfsense?sslmode=disable" `
+  -e ZERO_REPLICA_FILE=/data/zero.db `
+  -e ZERO_ADMIN_PASSWORD=surfsense-zero-admin `
+  -e ZERO_APP_PUBLICATIONS=zero_publication `
+  -e ZERO_NUM_SYNC_WORKERS=4 `
+  -e ZERO_UPSTREAM_MAX_CONNS=20 `
+  -e ZERO_CVR_MAX_CONNS=30 `
+  -e ZERO_QUERY_URL="http://host.docker.internal:3000/api/zero/query" `
+  -e ZERO_MUTATE_URL="http://host.docker.internal:3000/api/zero/mutate" `
+  -v surfsense-zero-cache:/data `
+  rocicorp/zero:1.4.0
+```
+
+**Adjustments to make for your setup:**
+
+- Replace `postgres:postgres` in the connection URLs with your actual `DB_USER:DB_PASSWORD`.
+- On Linux without Docker Desktop, `host.docker.internal` may not resolve. Either keep the `--add-host=host.docker.internal:host-gateway` flag (Docker 20.10+) or replace `host.docker.internal` with your host's IP / `--network=host` + `localhost`.
+- For production / custom domains, set `ZERO_QUERY_URL` and `ZERO_MUTATE_URL` to your public frontend URL (e.g. `https://app.yourdomain.com/api/zero/query`).
+
+### 2. Verify Zero-Cache
+
+Confirm zero-cache is healthy:
+
+```bash
+curl http://localhost:4848/keepalive
+# Should return HTTP 200
+```
+
+Tail the logs to confirm initial replication completed without errors:
+
+```bash
+docker logs -f surfsense-zero-cache
+```
+
+### Alternative: Use `docker-compose.deps-only.yml`
+
+If you would rather have Docker manage Postgres, Redis, SearXNG, and zero-cache together (while still running the backend and frontend natively), the repository ships a deps-only compose file. **Run alembic migrations on the host first** so `zero_publication` exists before zero-cache starts:
+
+```bash
+cd surfsense_backend
+uv run alembic upgrade head
+cd ../docker
+docker compose -f docker-compose.deps-only.yml up -d
+```
+
+The deps-only stack exposes zero-cache on port `4848` (default) — keep `NEXT_PUBLIC_ZERO_CACHE_URL=http://localhost:4848` in your `surfsense_web/.env`.
+
 ## Frontend Setup
 
 ### 1. Environment Configuration
@@ -510,9 +673,10 @@ Load the extension in your browser's developer mode and configure it with your S
 To verify your installation:
 
 1. Open your browser and navigate to `http://localhost:3000`
-2. Sign in with your Google account
+2. Sign in with your Google account (or local credentials if `AUTH_TYPE=LOCAL`)
 3. Create a search space and try uploading a document
-4. Test the chat functionality with your uploaded content
+4. Watch the upload status update live without refreshing — this confirms zero-cache is wired up correctly
+5. Test the chat functionality with your uploaded content
 
 ## Troubleshooting
 
@@ -522,6 +686,11 @@ To verify your installation:
 - **Authentication Problems**: Check your Google OAuth configuration and ensure redirect URIs are set correctly
 - **LLM Errors**: Confirm your LLM API keys are valid and the selected models are accessible
 - **File Upload Failures**: Validate your ETL service API key (Unstructured.io or LlamaCloud) or ensure Docling is properly configured
+- **Real-time updates not working / stale UI**: Verify zero-cache is running (`curl http://localhost:4848/keepalive` returns 200). Open browser DevTools → Console and look for WebSocket errors. Confirm `NEXT_PUBLIC_ZERO_CACHE_URL` in `surfsense_web/.env` matches the running zero-cache address.
+- **Zero-cache stuck on `Unknown or invalid publications. Specified: [zero_publication]`**: You skipped (or never ran) `uv run alembic upgrade head` from `surfsense_backend/`. Run it, then restart the zero-cache container with `docker restart surfsense-zero-cache`.
+- **Zero-cache crashes with `_zero.tableMetadata` errors**: A previous run left a half-built SQLite replica behind. Stop the container, remove the volume, and start fresh: `docker rm -f surfsense-zero-cache && docker volume rm surfsense-zero-cache && docker run -d ...` (re-run the command from [Zero-Cache Setup](#zero-cache-setup)).
+- **`wal_level` is not set to `logical`**: zero-cache requires logical replication. Set `wal_level = logical` in `postgresql.conf`, restart PostgreSQL, and verify with `SHOW wal_level;` in psql.
+- **Backend `/ready` returns 503**: The readiness probe verifies `zero_publication` exists. Run `uv run alembic upgrade head` to create it.
 - **Windows-specific**: If you encounter path issues, ensure you're using the correct path separator (`\` instead of `/`)
 - **macOS-specific**: If you encounter permission issues, you may need to use `sudo` for some installation commands
 
diff --git a/surfsense_web/package.json b/surfsense_web/package.json
index cae161777..640d5c207 100644
--- a/surfsense_web/package.json
+++ b/surfsense_web/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "surfsense_web",
-	"version": "0.0.23",
+	"version": "0.0.24",
 	"private": true,
 	"packageManager": "pnpm@10.26.0",
 	"description": "SurfSense Frontend",