From e572dbb6f9837c818d6da322897c09f0005895ab Mon Sep 17 00:00:00 2001
From: Adam <13007539+MrgSub@users.noreply.github.com>
Date: Thu, 17 Jul 2025 21:42:55 -0700
Subject: [PATCH 01/20] improved error handling during attachment downloads.
 (#1751)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Improved Attachment Handling and UI Refinements

## Description

This PR improves email attachment handling by implementing on-demand attachment fetching and enhancing error handling. It also includes several UI refinements to the email composer and navigation components.

Key changes:
- Added a dedicated hook and API endpoint for fetching message attachments
- Improved error handling with user-facing toast notifications for attachment operations
- Updated the email composer to hide subject input when replying to messages
- Enhanced styling for compose button, categories dropdown, and search bar
- Fixed attachment loading issues by fetching data on demand instead of storing large attachment data

## Type of Change

- [x] 🐛 Bug fix (non-breaking change which fixes an issue)
- [x] ✨ New feature (non-breaking change which adds functionality)
- [x] 🎨 UI/UX improvement
- [x] ⚡ Performance improvement

## Areas Affected

- [x] Email Integration (Gmail, IMAP, etc.)
- [x] User Interface/Experience
- [x] Data Storage/Management
- [x] API Endpoints

## Testing Done

- [x] Manual testing performed

## Security Considerations

- [x] No sensitive data is exposed
- [x] Input validation is implemented

## Checklist

- [x] I have performed a self-review of my code
- [x] My changes generate no new warnings

## Additional Notes

The attachment handling improvements should resolve issues where large attachments were causing performance problems or failing to load properly. The UI refinements provide a more consistent experience across the application.
---
 .../mail/components/create/email-composer.tsx |  55 +-
 apps/mail/components/mail/mail-display.tsx    |  55 +-
 apps/mail/components/mail/mail.tsx            |   9 +-
 apps/mail/components/ui/app-sidebar.tsx       |   8 +-
 apps/mail/components/ui/nav-main.tsx          |  12 +-
 apps/mail/hooks/use-attachments.ts            |  16 +
 apps/server/package.json                      |   4 +-
 apps/server/src/lib/driver/google.ts          |  92 +-
 apps/server/src/lib/driver/types.ts           |  12 +
 apps/server/src/lib/gmail-rate-limit.ts       |   2 +-
 apps/server/src/lib/party.ts                  |  29 -
 apps/server/src/main.ts                       |   7 +-
 .../src/routes/{chat.ts => agent/index.ts}    | 862 ++----------------
 apps/server/src/routes/agent/mcp.ts           | 475 ++++++++++
 apps/server/src/routes/agent/rpc.ts           | 223 +++++
 apps/server/src/routes/agent/types.ts         |  71 ++
 apps/server/src/trpc/routes/mail.ts           |  23 +
 apps/server/wrangler.jsonc                    |  14 +-
 pnpm-lock.yaml                                |  65 +-
 19 files changed, 1107 insertions(+), 927 deletions(-)
 create mode 100644 apps/mail/hooks/use-attachments.ts
 delete mode 100644 apps/server/src/lib/party.ts
 rename apps/server/src/routes/{chat.ts => agent/index.ts} (58%)
 create mode 100644 apps/server/src/routes/agent/mcp.ts
 create mode 100644 apps/server/src/routes/agent/rpc.ts
 create mode 100644 apps/server/src/routes/agent/types.ts

diff --git a/apps/mail/components/create/email-composer.tsx b/apps/mail/components/create/email-composer.tsx
index 5a1f676476..75b37c99c8 100644
--- a/apps/mail/components/create/email-composer.tsx
+++ b/apps/mail/components/create/email-composer.tsx
@@ -149,6 +149,7 @@ export function EmailComposer({
   const [imageQuality, setImageQuality] = useState<ImageQuality>(
     settings?.settings?.imageCompression || 'medium',
   );
+  const [activeReplyId] = useQueryState('activeReplyId');
   const [toggleToolbar, setToggleToolbar] = useState(false);
   const processAndSetAttachments = async (
     filesToProcess: File[],
@@ -1224,33 +1225,35 @@ export function EmailComposer({
         </div>
 
         {/* Subject */}
-        <div className="flex items-center gap-2 border-b p-3">
-          <p className="text-sm font-medium text-[#8C8C8C]">Subject:</p>
-          <input
-            className="h-4 w-full bg-transparent text-sm font-normal leading-normal text-black placeholder:text-[#797979] focus:outline-none dark:text-white/90"
-            placeholder="Re: Design review feedback"
-            value={subjectInput}
-            onChange={(e) => {
-              const value = replaceEmojiShortcodes(e.target.value);
-              setValue('subject', value);
-              setHasUnsavedChanges(true);
-            }}
-          />
-          <button
-            onClick={handleGenerateSubject}
-            disabled={isLoading || isGeneratingSubject || messageLength < 1}
-          >
-            <div className="flex items-center justify-center gap-2.5 pl-0.5">
-              <div className="flex h-5 items-center justify-center gap-1 rounded-sm">
-                {isGeneratingSubject ? (
-                  <Loader className="h-3.5 w-3.5 animate-spin fill-black dark:fill-white" />
-                ) : (
-                  <Sparkles className="h-3.5 w-3.5 fill-black dark:fill-white" />
-                )}
+        {!activeReplyId ? (
+          <div className="flex items-center gap-2 border-b p-3">
+            <p className="text-sm font-medium text-[#8C8C8C]">Subject:</p>
+            <input
+              className="h-4 w-full bg-transparent text-sm font-normal leading-normal text-black placeholder:text-[#797979] focus:outline-none dark:text-white/90"
+              placeholder="Re: Design review feedback"
+              value={subjectInput}
+              onChange={(e) => {
+                const value = replaceEmojiShortcodes(e.target.value);
+                setValue('subject', value);
+                setHasUnsavedChanges(true);
+              }}
+            />
+            <button
+              onClick={handleGenerateSubject}
+              disabled={isLoading || isGeneratingSubject || messageLength < 1}
+            >
+              <div className="flex items-center justify-center gap-2.5 pl-0.5">
+                <div className="flex h-5 items-center justify-center gap-1 rounded-sm">
+                  {isGeneratingSubject ? (
+                    <Loader className="h-3.5 w-3.5 animate-spin fill-black dark:fill-white" />
+                  ) : (
+                    <Sparkles className="h-3.5 w-3.5 fill-black dark:fill-white" />
+                  )}
+                </div>
               </div>
-            </div>
-          </button>
-        </div>
+            </button>
+          </div>
+        ) : null}
 
         {/* From */}
         {aliases && aliases.length > 1 ? (
diff --git a/apps/mail/components/mail/mail-display.tsx b/apps/mail/components/mail/mail-display.tsx
index 92bc57e340..df2413da16 100644
--- a/apps/mail/components/mail/mail-display.tsx
+++ b/apps/mail/components/mail/mail-display.tsx
@@ -37,6 +37,7 @@ import { Tooltip, TooltipContent, TooltipTrigger } from '../ui/tooltip';
 import { Popover, PopoverContent, PopoverTrigger } from '../ui/popover';
 import type { Sender, ParsedMessage, Attachment } from '@/types';
 import { useActiveConnection } from '@/hooks/use-connections';
+import { useAttachments } from '@/hooks/use-attachments';
 import { useBrainState } from '../../hooks/use-summary';
 import { useTRPC } from '@/providers/query-provider';
 import { useThreadLabels } from '@/hooks/use-labels';
@@ -378,9 +379,20 @@ const ActionButton = ({ onClick, icon, text, shortcut }: ActionButtonProps) => {
   );
 };
 
-const downloadAttachment = (attachment: { body: string; mimeType: string; filename: string }) => {
+const downloadAttachment = async (attachment: {
+  body: string;
+  mimeType: string;
+  filename: string;
+  attachmentId: string;
+}) => {
   try {
-    const byteCharacters = atob(attachment.body);
+    let attachmentData = attachment.body;
+
+    if (!attachmentData) {
+      throw new Error('Attachment data not found');
+    }
+
+    const byteCharacters = atob(attachmentData);
     const byteNumbers: number[] = Array(byteCharacters.length);
     for (let i = 0; i < byteCharacters.length; i++) {
       byteNumbers[i] = byteCharacters.charCodeAt(i);
@@ -398,6 +410,7 @@ const downloadAttachment = (attachment: { body: string; mimeType: string; filena
     window.URL.revokeObjectURL(url);
   } catch (error) {
     console.error('Error downloading attachment:', error);
+    toast.error('Failed to download attachment');
   }
 };
 
@@ -455,9 +468,20 @@ const handleDownloadAllAttachments =
     console.log('downloaded', subject, attachments);
   };
 
-const openAttachment = (attachment: { body: string; mimeType: string; filename: string }) => {
+const openAttachment = async (attachment: {
+  body: string;
+  mimeType: string;
+  filename: string;
+  attachmentId: string;
+}) => {
   try {
-    const byteCharacters = atob(attachment.body);
+    let attachmentData = attachment.body;
+
+    if (!attachmentData) {
+      throw new Error('Attachment data not found');
+    }
+
+    const byteCharacters = atob(attachmentData);
     const byteNumbers: number[] = Array(byteCharacters.length);
     for (let i = 0; i < byteCharacters.length; i++) {
       byteNumbers[i] = byteCharacters.charCodeAt(i);
@@ -484,6 +508,7 @@ const openAttachment = (attachment: { body: string; mimeType: string; filename:
     }
   } catch (error) {
     console.error('Error opening attachment:', error);
+    toast.error('Failed to open attachment');
   }
 };
 
@@ -638,6 +663,7 @@ const MoreAboutQuery = ({
 const MailDisplay = ({ emailData, index, totalEmails, demo, threadAttachments }: Props) => {
   const [isCollapsed, setIsCollapsed] = useState<boolean>(false);
   const { data: threadData } = useThread(emailData.threadId ?? null);
+  const { data: messageAttachments } = useAttachments(emailData.id);
   //   const [unsubscribed, setUnsubscribed] = useState(false);
   //   const [isUnsubscribing, setIsUnsubscribing] = useState(false);
   const [preventCollapse, setPreventCollapse] = useState(false);
@@ -660,6 +686,7 @@ const MailDisplay = ({ emailData, index, totalEmails, demo, threadAttachments }:
   const { data: activeConnection } = useActiveConnection();
   const [researchSender, setResearchSender] = useState<Sender | null>(null);
   const [searchQuery, setSearchQuery] = useState<string | null>(null);
+  //   const trpc = useTRPC();
 
   const isLastEmail = useMemo(
     () => emailData.id === threadData?.latest?.id,
@@ -1077,11 +1104,11 @@ const MailDisplay = ({ emailData, index, totalEmails, demo, threadAttachments }:
 
             <!-- Attachments -->
             ${
-              emailData.attachments && emailData.attachments.length > 0
+              messageAttachments && messageAttachments.length > 0
                 ? `
               <div class="attachments-section">
-                <h2 class="attachments-title">Attachments (${emailData.attachments.length})</h2>
-                ${emailData.attachments
+                <h2 class="attachments-title">Attachments (${messageAttachments.length})</h2>
+                ${messageAttachments
                   .map(
                     (attachment) => `
                   <div class="attachment-item">
@@ -1491,11 +1518,11 @@ const MailDisplay = ({ emailData, index, totalEmails, demo, threadAttachments }:
                                 <Printer className="fill-iconLight dark:fill-iconDark mr-2 h-4 w-4" />
                                 {m['common.mailDisplay.print']()}
                               </DropdownMenuItem>
-                              {(emailData.attachments?.length ?? 0) > 0 && (
+                              {(messageAttachments?.length ?? 0) > 0 && (
                                 <DropdownMenuItem
-                                  disabled={!emailData.attachments?.length}
+                                  disabled={!messageAttachments?.length}
                                   className={
-                                    !emailData.attachments?.length
+                                    !messageAttachments?.length
                                       ? 'data-[disabled]:pointer-events-auto'
                                       : ''
                                   }
@@ -1504,7 +1531,7 @@ const MailDisplay = ({ emailData, index, totalEmails, demo, threadAttachments }:
                                     e.preventDefault();
                                     handleDownloadAllAttachments(
                                       emailData.subject || 'email',
-                                      emailData.attachments || [],
+                                      messageAttachments || [],
                                     )();
                                   }}
                                 >
@@ -1642,9 +1669,9 @@ const MailDisplay = ({ emailData, index, totalEmails, demo, threadAttachments }:
                   />
                 ) : null}
                 {/* mail attachments */}
-                {emailData?.attachments && emailData?.attachments.length > 0 ? (
+                {messageAttachments && messageAttachments.length > 0 ? (
                   <div className="mb-4 flex flex-wrap items-center gap-2 px-4 pt-4">
-                    {emailData?.attachments.map((attachment) => (
+                    {messageAttachments.map((attachment) => (
                       <div
                         key={`${attachment.filename}-${attachment.attachmentId}`}
                         className="flex"
@@ -1667,7 +1694,7 @@ const MailDisplay = ({ emailData, index, totalEmails, demo, threadAttachments }:
                         >
                           <HardDriveDownload className="text-muted-foreground dark:text-muted-foreground h-4 w-4 fill-[#FAFAFA] dark:fill-[#262626]" />
                         </button>
-                        {index < (emailData?.attachments?.length || 0) - 1 && (
+                        {index < (messageAttachments?.length || 0) - 1 && (
                           <div className="m-auto h-2 w-[1px] bg-[#E0E0E0] dark:bg-[#424242]" />
                         )}
                       </div>
diff --git a/apps/mail/components/mail/mail.tsx b/apps/mail/components/mail/mail.tsx
index bf333cdd4e..e6666e4e2b 100644
--- a/apps/mail/components/mail/mail.tsx
+++ b/apps/mail/components/mail/mail.tsx
@@ -531,7 +531,7 @@ export function MailLayout() {
                 <Button
                   variant="outline"
                   className={cn(
-                    'text-muted-foreground relative flex h-[1.875rem] w-full select-none items-center justify-start overflow-hidden rounded-lg border bg-white pl-2 text-left text-sm font-normal shadow-none ring-0 focus-visible:ring-0 focus-visible:ring-offset-0 dark:border-none dark:bg-[#141414]',
+                    'text-muted-foreground relative flex h-7 w-full select-none items-center justify-start overflow-hidden rounded-lg border bg-white pl-2 text-left text-sm font-normal shadow-none ring-0 focus-visible:ring-0 focus-visible:ring-offset-0 dark:border-none dark:bg-[#141414]',
                   )}
                   onClick={() => setIsCommandPaletteOpen('true')}
                 >
@@ -768,18 +768,15 @@ function CategoryDropdown({ isMultiSelectMode }: CategoryDropdownProps) {
         <Button
           variant="outline"
           className={cn(
-            'flex h-7 min-w-fit items-center gap-1 rounded-md border-none bg-[#006FFE] px-2 text-white',
+            'black:text-white text-muted-foreground flex h-7 min-w-fit items-center gap-1 rounded-md border-none px-2',
           )}
           aria-label="Filter by labels"
           aria-expanded={isOpen}
           aria-haspopup="menu"
         >
-          <div className="relative overflow-visible">
-            <Mail className="h-4 w-4 fill-white dark:fill-white" />
-          </div>
           <span className="text-xs font-medium">Categories</span>
           <ChevronDown
-            className={`h-2 w-2 text-white transition-transform duration-200 ${isOpen ? 'rotate-180' : 'rotate-0'}`}
+            className={`black:text-white text-muted-foreground h-2 w-2 transition-transform duration-200 ${isOpen ? 'rotate-180' : 'rotate-0'}`}
           />
         </Button>
       </DropdownMenuTrigger>
diff --git a/apps/mail/components/ui/app-sidebar.tsx b/apps/mail/components/ui/app-sidebar.tsx
index cdb68e79b3..4ed3a50f81 100644
--- a/apps/mail/components/ui/app-sidebar.tsx
+++ b/apps/mail/components/ui/app-sidebar.tsx
@@ -176,13 +176,13 @@ function ComposeButton() {
       <DialogDescription></DialogDescription>
 
       <DialogTrigger asChild>
-        <button className="relative mb-1.5 inline-flex h-8 w-full items-center justify-center gap-1 self-stretch overflow-hidden rounded-lg border border-gray-200 bg-white text-black dark:border-none dark:bg-[#2C2C2C] dark:text-white">
+        <button className="relative mb-1.5 inline-flex h-8 w-full items-center justify-center gap-1 self-stretch overflow-hidden rounded-lg border border-gray-200 bg-[#006FFE] text-black dark:border-none dark:text-white">
           {state === 'collapsed' && !isMobile ? (
-            <PencilCompose className="fill-iconLight dark:fill-iconDark mt-0.5 text-black" />
+            <PencilCompose className="mt-0.5 fill-white text-black" />
           ) : (
             <div className="flex items-center justify-center gap-2.5 pl-0.5 pr-1">
-              <PencilCompose className="fill-iconLight dark:fill-iconDark" />
-              <div className="justify-start text-sm leading-none">
+              <PencilCompose className="fill-white" />
+              <div className="justify-start text-sm leading-none text-white">
                 {m['common.commandPalette.commands.newEmail']()}
               </div>
             </div>
diff --git a/apps/mail/components/ui/nav-main.tsx b/apps/mail/components/ui/nav-main.tsx
index 5dc02c77eb..a6862fcc4e 100644
--- a/apps/mail/components/ui/nav-main.tsx
+++ b/apps/mail/components/ui/nav-main.tsx
@@ -1,15 +1,17 @@
 import { SidebarGroup, SidebarMenu, SidebarMenuButton, SidebarMenuItem } from './sidebar';
 import { Collapsible, CollapsibleTrigger } from '@/components/ui/collapsible';
-import { useActiveConnection, } from '@/hooks/use-connections';
+import { useCommandPalette } from '../context/command-palette-context.jsx';
 import { LabelDialog } from '@/components/labels/label-dialog';
+import { useActiveConnection } from '@/hooks/use-connections';
 import { useMutation, useQuery } from '@tanstack/react-query';
-import { Link, useLocation, } from 'react-router';
+import { useSearchValue } from '@/hooks/use-search-value.js';
 import Intercom, { show } from '@intercom/messenger-js-sdk';
 import { MessageSquare, OldPhone } from '../icons/icons';
 import { useSidebar } from '../context/sidebar-context';
 import { useTRPC } from '@/providers/query-provider';
 import { type NavItem } from '@/config/navigation';
 import type { Label as LabelType } from '@/types';
+import { Link, useLocation } from 'react-router';
 import { m } from '../../paraglide/messages.js';
 import { Button } from '@/components/ui/button';
 import { useLabels } from '@/hooks/use-labels';
@@ -55,9 +57,7 @@ export function NavMain({ items }: NavMainProps) {
   const pathname = location.pathname;
   const searchParams = new URLSearchParams();
   const [category] = useQueryState('category');
-  
-  
-  
+
   const trpc = useTRPC();
   const { data: intercomToken } = useQuery(trpc.user.getIntercomToken.queryOptions());
 
@@ -271,6 +271,7 @@ export function NavMain({ items }: NavMainProps) {
 function NavItem(item: NavItemProps & { href: string }) {
   const iconRef = useRef<IconRefType>(null);
   const { data: stats } = useStats();
+  const { clearAllFilters } = useCommandPalette();
 
   const { state, setOpenMobile } = useSidebar();
 
@@ -290,6 +291,7 @@ function NavItem(item: NavItemProps & { href: string }) {
     if (item.onClick) {
       item.onClick(e as React.MouseEvent<HTMLAnchorElement>);
     }
+    clearAllFilters();
     setOpenMobile(false);
   };
 
diff --git a/apps/mail/hooks/use-attachments.ts b/apps/mail/hooks/use-attachments.ts
new file mode 100644
index 0000000000..7305ce6ce3
--- /dev/null
+++ b/apps/mail/hooks/use-attachments.ts
@@ -0,0 +1,16 @@
+import { useTRPC } from '@/providers/query-provider';
+import { useQuery } from '@tanstack/react-query';
+import { useSession } from '@/lib/auth-client';
+
+export const useAttachments = (messageId: string) => {
+  const { data: session } = useSession();
+  const trpc = useTRPC();
+  const AttachmentsQuery = useQuery(
+    trpc.mail.getMessageAttachments.queryOptions(
+      { messageId },
+      { enabled: !!session?.user.id && !!messageId, staleTime: 1000 * 60 * 60 },
+    ),
+  );
+
+  return AttachmentsQuery;
+};
diff --git a/apps/server/package.json b/apps/server/package.json
index b187680557..ef95beff70 100644
--- a/apps/server/package.json
+++ b/apps/server/package.json
@@ -34,7 +34,7 @@
     "@hono/trpc-server": "^0.3.4",
     "@microsoft/microsoft-graph-client": "^3.0.7",
     "@microsoft/microsoft-graph-types": "^2.40.0",
-    "@modelcontextprotocol/sdk": "1.12.0",
+    "@modelcontextprotocol/sdk": "1.15.1",
     "@react-email/components": "^0.0.41",
     "@react-email/render": "1.1.0",
     "@trpc/client": "catalog:",
@@ -42,7 +42,7 @@
     "@tsndr/cloudflare-worker-jwt": "3.2.0",
     "@upstash/ratelimit": "^2.0.5",
     "@upstash/redis": "^1.34.9",
-    "agents": "0.0.93",
+    "agents": "0.0.106",
     "ai": "^4.3.13",
     "autumn-js": "catalog:",
     "base64-js": "1.5.1",
diff --git a/apps/server/src/lib/driver/google.ts b/apps/server/src/lib/driver/google.ts
index e36ac2a859..c9eef5741f 100644
--- a/apps/server/src/lib/driver/google.ts
+++ b/apps/server/src/lib/driver/google.ts
@@ -81,6 +81,51 @@ export class GoogleMailManager implements MailManager {
       { messageId, attachmentId },
     );
   }
+
+  public async getMessageAttachments(messageId: string) {
+    return this.withErrorHandler(
+      'getMessageAttachments',
+      async () => {
+        const res = await this.gmail.users.messages.get({
+          userId: 'me',
+          id: messageId,
+        });
+        const attachmentParts = res.data.payload?.parts
+          ? this.findAttachments(res.data.payload.parts)
+          : [];
+
+        const attachments = await Promise.all(
+          attachmentParts.map(async (part) => {
+            const attachmentId = part.body?.attachmentId;
+            if (!attachmentId) {
+              return null;
+            }
+
+            try {
+              const attachmentData = await this.getAttachment(messageId, attachmentId);
+              return {
+                filename: part.filename || '',
+                mimeType: part.mimeType || '',
+                size: Number(part.body?.size || 0),
+                attachmentId: attachmentId,
+                headers:
+                  part.headers?.map((h) => ({
+                    name: h.name ?? '',
+                    value: h.value ?? '',
+                  })) ?? [],
+                body: attachmentData ?? '',
+              };
+            } catch {
+              return null;
+            }
+          }),
+        ).then((attachments) => attachments.filter((a): a is NonNullable<typeof a> => a !== null));
+
+        return attachments;
+      },
+      { messageId },
+    );
+  }
   public getEmailAliases() {
     return this.withErrorHandler('getEmailAliases', async () => {
       const profile = await this.gmail.users.getProfile({
@@ -378,44 +423,23 @@ export class GoogleMailManager implements MailManager {
               });
             }
 
+            // Only store attachment metadata, not the actual attachment data
             const attachmentParts = message.payload?.parts
               ? this.findAttachments(message.payload.parts)
               : [];
 
-            const attachments = await Promise.all(
-              attachmentParts.map(async (part) => {
-                const attachmentId = part.body?.attachmentId;
-                if (!attachmentId) {
-                  return null;
-                }
-
-                try {
-                  if (!message.id) {
-                    return null;
-                  }
-                  const attachmentData = await this.getAttachment(message.id, attachmentId);
-                  return {
-                    filename: part.filename || '',
-                    mimeType: part.mimeType || '',
-                    size: Number(part.body?.size || 0),
-                    attachmentId: attachmentId,
-                    headers:
-                      part.headers?.map((h) => ({
-                        name: h.name ?? '',
-                        value: h.value ?? '',
-                      })) ?? [],
-                    body: attachmentData ?? '',
-                    replyTo: message.payload?.headers?.find(
-                      (h) => h.name?.toLowerCase() === 'reply-to',
-                    )?.value,
-                  };
-                } catch {
-                  return null;
-                }
-              }),
-            ).then((attachments) =>
-              attachments.filter((a): a is NonNullable<typeof a> => a !== null),
-            );
+            const attachments = attachmentParts.map((part) => ({
+              filename: part.filename || '',
+              mimeType: part.mimeType || '',
+              size: Number(part.body?.size || 0),
+              attachmentId: part.body?.attachmentId || '',
+              headers:
+                part.headers?.map((h) => ({
+                  name: h.name ?? '',
+                  value: h.value ?? '',
+                })) ?? [],
+              body: '', // Empty body - fetch on demand with getMessageAttachments
+            }));
 
             const fullEmailData = {
               ...parsedData,
diff --git a/apps/server/src/lib/driver/types.ts b/apps/server/src/lib/driver/types.ts
index bdd04c0b62..1b7a9da4e8 100644
--- a/apps/server/src/lib/driver/types.ts
+++ b/apps/server/src/lib/driver/types.ts
@@ -51,6 +51,18 @@ export type ManagerConfig = {
 
 export interface MailManager {
   config: ManagerConfig;
+  getMessageAttachments(
+    id: string,
+  ): Promise<
+    {
+      filename: string;
+      mimeType: string;
+      size: number;
+      attachmentId: string;
+      headers: { name: string; value: string }[];
+      body: string;
+    }[]
+  >;
   get(id: string): Promise<IGetThreadResponse>;
   create(data: IOutgoingMessage): Promise<{ id?: string | null }>;
   sendDraft(id: string, data: IOutgoingMessage): Promise<void>;
diff --git a/apps/server/src/lib/gmail-rate-limit.ts b/apps/server/src/lib/gmail-rate-limit.ts
index 113862b47b..ecdbd763ff 100644
--- a/apps/server/src/lib/gmail-rate-limit.ts
+++ b/apps/server/src/lib/gmail-rate-limit.ts
@@ -33,7 +33,7 @@ export function isRateLimit(err: unknown): boolean {
  *  – stops immediately for any other error
  */
 export const rateLimitSchedule = Schedule.recurWhile(isRateLimit)
-  .pipe(Schedule.intersect(Schedule.recurs(10))) // max 10 attempts
+  .pipe(Schedule.intersect(Schedule.recurs(3))) // max 3 attempts
   .pipe(Schedule.addDelay(() => Duration.seconds(60))); // 60s delay between retries
 
 /**
diff --git a/apps/server/src/lib/party.ts b/apps/server/src/lib/party.ts
deleted file mode 100644
index 0235a5fa6a..0000000000
--- a/apps/server/src/lib/party.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Server, type Connection, type ConnectionContext } from 'partyserver';
-import { createSimpleAuth, type SimpleAuth } from './auth';
-import { parseHeaders } from './utils';
-
-export class DurableMailbox extends Server<Env> {
-  auth: SimpleAuth;
-  constructor(ctx: DurableObjectState, env: Env) {
-    super(ctx, env);
-    this.auth = createSimpleAuth();
-  }
-
-  private async getSession(token: string) {
-    const session = await this.auth.api.getSession({ headers: parseHeaders(token) });
-    return session;
-  }
-
-  async onConnect(connection: Connection, ctx: ConnectionContext) {
-    const url = new URL(ctx.request.url);
-    const token = url.searchParams.get('token');
-    if (token) {
-      const session = await this.getSession(token);
-      if (session) {
-        await this.ctx.storage.put('email', session.user.email);
-      } else {
-        console.log('No session', token);
-      }
-    }
-  }
-}
diff --git a/apps/server/src/main.ts b/apps/server/src/main.ts
index 160e781ad9..697f6cf864 100644
--- a/apps/server/src/main.ts
+++ b/apps/server/src/main.ts
@@ -28,13 +28,12 @@ import { routePartykitRequest } from 'partyserver';
 import { enableBrainFunction } from './lib/brain';
 import { trpcServer } from '@hono/trpc-server';
 import { agentsMiddleware } from 'hono-agents';
+import { ZeroMCP } from './routes/agent/mcp';
 import { publicRouter } from './routes/auth';
-import { DurableMailbox } from './lib/party';
 import { autumnApi } from './routes/autumn';
-import { ZeroAgent } from './routes/chat';
+import { ZeroAgent } from './routes/agent';
 import type { HonoContext } from './ctx';
 import { createDb, type DB } from './db';
-import { ZeroMCP } from './routes/chat';
 import { createAuth } from './lib/auth';
 import { aiRouter } from './routes/ai';
 import { Autumn } from 'autumn-js';
@@ -790,4 +789,4 @@ export default class extends WorkerEntrypoint<typeof env> {
   }
 }
 
-export { DurableMailbox, ZeroAgent, ZeroMCP, ZeroDB };
+export { ZeroAgent, ZeroMCP, ZeroDB };
diff --git a/apps/server/src/routes/chat.ts b/apps/server/src/routes/agent/index.ts
similarity index 58%
rename from apps/server/src/routes/chat.ts
rename to apps/server/src/routes/agent/index.ts
index 700539505a..3d7bfcf805 100644
--- a/apps/server/src/routes/chat.ts
+++ b/apps/server/src/routes/agent/index.ts
@@ -1,6 +1,6 @@
 /*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * Licensed to Zero Email Inc. under one or more contributor license agreements.
+ * You may not use this file except in compliance with the Apache License, Version 2.0 (the "License").
  * You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
@@ -10,317 +10,47 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * Reuse or distribution of this file requires a license from Zero Email Inc.
  */
+
 import {
-  streamText,
   type StreamTextOnFinishCallback,
   createDataStreamResponse,
-  generateText,
+  streamText,
   appendResponseMessages,
 } from 'ai';
 import {
-  getCurrentDateContext,
-  GmailSearchAssistantSystemPrompt,
-  AiChatPrompt,
-} from '../lib/prompts';
+  IncomingMessageType,
+  OutgoingMessageType,
+  type IncomingMessage,
+  type OutgoingMessage,
+} from './types';
 import { DurableObjectOAuthClientProvider } from 'agents/mcp/do-oauth-client-provider';
-import { EPrompts, type IOutgoingMessage, type ParsedMessage } from '../types';
-import type { IGetThreadResponse, MailManager } from '../lib/driver/types';
-import { connectionToDriver, getZeroAgent } from '../lib/server-utils';
-import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import { type Connection, type WSMessage } from 'agents';
-import { ToolOrchestrator } from './agent/orchestrator';
-import type { CreateDraftData } from '../lib/schemas';
-import { withRetry } from '../lib/gmail-rate-limit';
-import { env, RpcTarget } from 'cloudflare:workers';
+import { EPrompts, type IOutgoingMessage, type ParsedMessage } from '../../types';
+import type { MailManager, IGetThreadResponse } from '../../lib/driver/types';
+import { connectionToDriver } from '../../lib/server-utils';
+import type { CreateDraftData } from '../../lib/schemas';
+import type { Connection, WSMessage } from 'partyserver';
+import { withRetry } from '../../lib/gmail-rate-limit';
+import { getPrompt } from '../../pipelines.effect';
 import { AIChatAgent } from 'agents/ai-chat-agent';
-import { tools as authTools } from './agent/tools';
-import { processToolCalls } from './agent/utils';
-import type { Message as ChatMessage } from 'ai';
+import { ToolOrchestrator } from './orchestrator';
+import { AiChatPrompt } from '../../lib/prompts';
+import { getPromptName } from '../../pipelines';
 import { anthropic } from '@ai-sdk/anthropic';
-import { getPromptName } from '../pipelines';
-import { connection } from '../db/schema';
-import { getPrompt } from '../lib/brain';
-import { FOLDERS } from '../lib/utils';
-import { and, eq } from 'drizzle-orm';
-import { McpAgent } from 'agents/mcp';
-import { createDb } from '../db';
+import { connection } from '../../db/schema';
+import { tools as authTools } from './tools';
+import { processToolCalls } from './utils';
+import { env } from 'cloudflare:workers';
+import { createDb } from '../../db';
+import { AgentRpcDO } from './rpc';
+import { eq } from 'drizzle-orm';
 import { Effect } from 'effect';
-import { z } from 'zod';
-
 const decoder = new TextDecoder();
 
-export enum IncomingMessageType {
-  UseChatRequest = 'cf_agent_use_chat_request',
-  ChatClear = 'cf_agent_chat_clear',
-  ChatMessages = 'cf_agent_chat_messages',
-  ChatRequestCancel = 'cf_agent_chat_request_cancel',
-  Mail_List = 'zero_mail_list_threads',
-  Mail_Get = 'zero_mail_get_thread',
-}
-
-export enum OutgoingMessageType {
-  ChatMessages = 'cf_agent_chat_messages',
-  UseChatResponse = 'cf_agent_use_chat_response',
-  ChatClear = 'cf_agent_chat_clear',
-  Mail_List = 'zero_mail_list_threads',
-  Mail_Get = 'zero_mail_get_thread',
-}
-
-export type IncomingMessage =
-  | {
-      type: IncomingMessageType.UseChatRequest;
-      id: string;
-      init: Pick<RequestInit, 'method' | 'headers' | 'body'>;
-    }
-  | {
-      type: IncomingMessageType.ChatClear;
-    }
-  | {
-      type: IncomingMessageType.ChatMessages;
-      messages: ChatMessage[];
-    }
-  | {
-      type: IncomingMessageType.ChatRequestCancel;
-      id: string;
-    }
-  | {
-      type: IncomingMessageType.Mail_List;
-      folder: string;
-      query: string;
-      maxResults: number;
-      labelIds: string[];
-      pageToken: string;
-    }
-  | {
-      type: IncomingMessageType.Mail_Get;
-      threadId: string;
-    };
-
-export type OutgoingMessage =
-  | {
-      type: OutgoingMessageType.ChatMessages;
-      messages: ChatMessage[];
-    }
-  | {
-      type: OutgoingMessageType.UseChatResponse;
-      id: string;
-      body: string;
-      done: boolean;
-    }
-  | {
-      type: OutgoingMessageType.ChatClear;
-    }
-  | {
-      type: OutgoingMessageType.Mail_List;
-      folder: string;
-    }
-  | {
-      type: OutgoingMessageType.Mail_Get;
-      threadId: string;
-    };
-
-export class AgentRpcDO extends RpcTarget {
-  constructor(
-    private mainDo: ZeroAgent,
-    private connectionId: string,
-  ) {
-    super();
-  }
-
-  async getUserLabels() {
-    return await this.mainDo.getUserLabels();
-  }
-
-  async getLabel(id: string) {
-    return await this.mainDo.getLabel(id);
-  }
-
-  async createLabel(label: {
-    name: string;
-    color?: { backgroundColor: string; textColor: string };
-  }) {
-    return await this.mainDo.createLabel(label);
-  }
-
-  async updateLabel(
-    id: string,
-    label: { name: string; color?: { backgroundColor: string; textColor: string } },
-  ) {
-    return await this.mainDo.updateLabel(id, label);
-  }
-
-  async deleteLabel(id: string) {
-    return await this.mainDo.deleteLabel(id);
-  }
-
-  async bulkDelete(threadIds: string[]) {
-    return await this.mainDo.bulkDelete(threadIds);
-  }
-
-  async bulkArchive(threadIds: string[]) {
-    return await this.mainDo.bulkArchive(threadIds);
-  }
-
-  async rawListThreads(params: {
-    folder: string;
-    query?: string;
-    maxResults?: number;
-    labelIds?: string[];
-    pageToken?: string;
-  }) {
-    return await this.mainDo.rawListThreads(params);
-  }
-
-  async listThreads(params: {
-    folder: string;
-    query?: string;
-    maxResults?: number;
-    labelIds?: string[];
-    pageToken?: string;
-  }) {
-    return await this.mainDo.list(params);
-  }
-
-  async getThread(threadId: string) {
-    return await this.mainDo.get(threadId);
-  }
-
-  async markThreadsRead(threadIds: string[]) {
-    const result = await this.mainDo.markThreadsRead(threadIds);
-    await Promise.all(threadIds.map((id) => this.mainDo.syncThread(id)));
-    return result;
-  }
-
-  async syncThread(threadId: string) {
-    return await this.mainDo.syncThread(threadId);
-  }
-
-  async markThreadsUnread(threadIds: string[]) {
-    const result = await this.mainDo.markThreadsUnread(threadIds);
-    await Promise.all(threadIds.map((id) => this.mainDo.syncThread(id)));
-    return result;
-  }
-
-  async modifyLabels(threadIds: string[], addLabelIds: string[], removeLabelIds: string[]) {
-    const result = await this.mainDo.modifyLabels(threadIds, addLabelIds, removeLabelIds);
-    await Promise.all(threadIds.map((id) => this.mainDo.syncThread(id)));
-    return result;
-  }
-
-  async createDraft(draftData: CreateDraftData) {
-    return await this.mainDo.createDraft(draftData);
-  }
-
-  async getDraft(id: string) {
-    return await this.mainDo.getDraft(id);
-  }
-
-  async listDrafts(params: { q?: string; maxResults?: number; pageToken?: string }) {
-    return await this.mainDo.listDrafts(params);
-  }
-
-  async count() {
-    return await this.mainDo.count();
-  }
-
-  //   async list(params: {
-  //     folder: string;
-  //     query?: string;
-  //     maxResults?: number;
-  //     labelIds?: string[];
-  //     pageToken?: string;
-  //   }) {
-  //     return await this.mainDo.list(params);
-  //   }
-
-  async markAsRead(threadIds: string[]) {
-    const result = await this.mainDo.markAsRead(threadIds);
-    await Promise.all(threadIds.map((id) => this.mainDo.syncThread(id)));
-    return result;
-  }
-
-  async markAsUnread(threadIds: string[]) {
-    const result = await this.mainDo.markAsUnread(threadIds);
-    await Promise.all(threadIds.map((id) => this.mainDo.syncThread(id)));
-    return result;
-  }
-
-  async normalizeIds(ids: string[]) {
-    return await this.mainDo.normalizeIds(ids);
-  }
-
-  //   async get(id: string) {
-  //     return await this.mainDo.get(id);
-  //   }
-
-  async sendDraft(id: string, data: IOutgoingMessage) {
-    return await this.mainDo.sendDraft(id, data);
-  }
-
-  async create(data: IOutgoingMessage) {
-    return await this.mainDo.create(data);
-  }
-
-  async delete(id: string) {
-    return await this.mainDo.delete(id);
-  }
-
-  async deleteAllSpam() {
-    return await this.mainDo.deleteAllSpam();
-  }
-
-  async getEmailAliases() {
-    return await this.mainDo.getEmailAliases();
-  }
-
-  async setupAuth(connectionId: string) {
-    return await this.mainDo.setupAuth(connectionId);
-  }
-
-  async broadcast(message: string) {
-    return this.mainDo.broadcast(message);
-  }
-
-  //   async getThreadsFromDB(params: {
-  //     labelIds?: string[];
-  //     folder?: string;
-  //     q?: string;
-  //     max?: number;
-  //     cursor?: string;
-  //   }) {
-  //     return await this.mainDo.getThreadsFromDB(params);
-  //   }
-
-  //   async getThreadFromDB(id: string) {
-  //     return await this.mainDo.getThreadFromDB(id);
-  //   }
-
-  async listHistory<T>(historyId: string) {
-    return await this.mainDo.listHistory<T>(historyId);
-  }
-
-  async syncThreads(folder: string) {
-    return await this.mainDo.syncThreads(folder);
-  }
-
-  async inboxRag(query: string) {
-    return await this.mainDo.inboxRag(query);
-  }
-
-  async searchThreads(params: {
-    query: string;
-    folder?: string;
-    maxResults?: number;
-    labelIds?: string[];
-    pageToken?: string;
-  }) {
-    return await this.mainDo.searchThreads(params);
-  }
-}
-
 const shouldDropTables = env.DROP_AGENT_TABLES === 'true';
-const maxCount = parseInt(env.THREAD_SYNC_MAX_COUNT || '40', 10);
+const maxCount = parseInt(env.THREAD_SYNC_MAX_COUNT || '10', 10);
 const shouldLoop = env.THREAD_SYNC_LOOP !== 'false';
 
 export class ZeroAgent extends AIChatAgent<typeof env> {
@@ -878,13 +608,21 @@ export class ZeroAgent extends AIChatAgent<typeof env> {
     return await this.driver.getEmailAliases();
   }
 
+  async getMessageAttachments(messageId: string) {
+    if (!this.driver) {
+      throw new Error('No driver available');
+    }
+    return await this.driver.getMessageAttachments(messageId);
+  }
+
   async getThreadCount() {
     const count = this.sql`SELECT COUNT(*) FROM threads`;
     return count[0]['COUNT(*)'] as number;
   }
 
-  async syncThread(threadId: string) {
-    if (!this.driver && this.name !== 'general') {
+  async syncThread({ threadId }: { threadId: string }) {
+    if (this.name === 'general') return;
+    if (!this.driver) {
       await this.setupAuth(this.name);
     }
 
@@ -975,6 +713,33 @@ export class ZeroAgent extends AIChatAgent<typeof env> {
     return Effect.runPromise(withRetry(Effect.tryPromise(() => this.driver!.get(threadId))));
   }
 
+  async *streamThreads(folder: string) {
+    let pageToken: string | null = null;
+    let hasMore = true;
+    let _pageCount = 0;
+
+    while (hasMore) {
+      _pageCount++;
+
+      // Rate limiting delay
+      await new Promise((resolve) => setTimeout(resolve, 2000));
+
+      const result = await this.listWithRetry({
+        folder,
+        maxResults: maxCount, // Smaller batches for streaming
+        pageToken: pageToken || undefined,
+      });
+
+      // Stream each thread individually
+      for (const thread of result.threads) {
+        yield thread;
+      }
+
+      pageToken = result.nextPageToken;
+      hasMore = pageToken !== null && shouldLoop;
+    }
+  }
+
   async syncThreads(folder: string) {
     if (!this.driver) {
       console.error('No driver available for syncThreads');
@@ -996,42 +761,22 @@ export class ZeroAgent extends AIChatAgent<typeof env> {
 
     try {
       let totalSynced = 0;
-      let pageToken: string | null = null;
-      let hasMore = true;
-      let _pageCount = 0;
-
-      while (hasMore) {
-        _pageCount++;
-
-        await new Promise((resolve) => setTimeout(resolve, 2000));
-
-        const result = await this.listWithRetry({
-          folder,
-          maxResults: maxCount,
-          pageToken: pageToken || undefined,
-        });
-
-        // Need delay to avoid rate limiting
-        await new Promise((resolve) => setTimeout(resolve, 2000));
 
-        for (const thread of result.threads) {
-          try {
-            await this.syncThread(thread.id);
-            // Need delay to avoid rate limiting
-            await new Promise((resolve) => setTimeout(resolve, 2000));
-          } catch (error) {
-            console.error(`Failed to sync thread ${thread.id}:`, error);
-          }
+      // Process threads one by one without buffering
+      for await (const thread of this.streamThreads(folder)) {
+        try {
+          const id = await this.queue('syncThread', thread.id);
+          console.log(`Synced thread ${thread.id} to queue ${id}`);
+          totalSynced++;
+        } catch (error) {
+          console.error(`Failed to sync thread ${thread.id}:`, error);
         }
 
-        this.broadcastChatMessage({
-          type: OutgoingMessageType.Mail_List,
-          folder,
-        });
-
-        totalSynced += result.threads.length;
-        pageToken = result.nextPageToken;
-        hasMore = pageToken !== null && shouldLoop;
+        // // Broadcast progress after each thread
+        // this.broadcastChatMessage({
+        //   type: OutgoingMessageType.Mail_List,
+        //   folder,
+        // });
       }
 
       return { synced: totalSynced };
@@ -1303,7 +1048,7 @@ export class ZeroAgent extends AIChatAgent<typeof env> {
         if (lastAttempt) {
           throw new Error('Thread not found in database, Sync Failed once');
         }
-        await this.syncThread(id);
+        await this.syncThread({ threadId: id });
         return this.getThreadFromDB(id, true);
       }
       const row = result[0] as any;
@@ -1328,450 +1073,3 @@ export class ZeroAgent extends AIChatAgent<typeof env> {
     }
   }
 }
-
-export class ZeroMCP extends McpAgent<typeof env, {}, { userId: string }> {
-  server = new McpServer({
-    name: 'zero-mcp',
-    version: '1.0.0',
-    description: 'Zero MCP',
-  });
-
-  activeConnectionId: string | undefined;
-
-  constructor(ctx: DurableObjectState, env: Env) {
-    super(ctx, env);
-  }
-
-  async init(): Promise<void> {
-    const { db, conn } = createDb(env.HYPERDRIVE.connectionString);
-    const _connection = await db.query.connection.findFirst({
-      where: eq(connection.userId, this.props.userId),
-    });
-    if (!_connection) {
-      throw new Error('Unauthorized');
-    }
-    this.activeConnectionId = _connection.id;
-    this.server.registerTool(
-      'getConnections',
-      {
-        description:
-          'Use this tool to get all connections for the user. This helps you know what accounts(connections) the user has available.',
-        inputSchema: {},
-      },
-      async () => {
-        const connections = await db.query.connection.findMany({
-          where: eq(connection.userId, this.props.userId),
-        });
-        return {
-          content: connections.map((c) => ({
-            type: 'text',
-            text: `Email: ${c.email} | Provider: ${c.providerId}`,
-          })),
-        };
-      },
-    );
-
-    this.server.registerTool(
-      'getActiveConnection',
-      {
-        description: 'Get the currently active email connection',
-      },
-      async () => {
-        if (!this.activeConnectionId) {
-          throw new Error('No active connection');
-        }
-        const _connection = await db.query.connection.findFirst({
-          where: eq(connection.id, this.activeConnectionId),
-        });
-        if (!_connection) {
-          throw new Error('Connection not found');
-        }
-        return {
-          content: [
-            {
-              type: 'text' as const,
-              text: `Email: ${_connection.email} | Provider: ${_connection.providerId}`,
-            },
-          ],
-        };
-      },
-    );
-
-    this.server.registerTool(
-      'setActiveConnection',
-      {
-        description: 'Set the active email connection by email address',
-        inputSchema: {
-          email: z.string(),
-        },
-      },
-      async (s) => {
-        const _connection = await db.query.connection.findFirst({
-          where: and(eq(connection.userId, this.props.userId), eq(connection.email, s.email)),
-        });
-        if (!_connection) {
-          throw new Error('Connection not found');
-        }
-        this.activeConnectionId = _connection.id;
-        return {
-          content: [
-            {
-              type: 'text' as const,
-              text: `Active connection set to ${_connection.email}`,
-            },
-          ],
-        };
-      },
-    );
-
-    this.server.registerTool(
-      'buildGmailSearchQuery',
-      {
-        description: 'Build Gmail search query using AI assistance',
-        inputSchema: {
-          query: z.string(),
-        },
-      },
-      async (s) => {
-        const result = await generateText({
-          model: anthropic(env.OPENAI_MODEL || 'claude-3-5-haiku-latest'),
-          system: GmailSearchAssistantSystemPrompt(),
-          prompt: s.query,
-        });
-        return {
-          content: [
-            {
-              type: 'text',
-              text: result.text,
-            },
-          ],
-        };
-      },
-    );
-
-    const agent = await getZeroAgent(_connection.id);
-
-    this.server.registerTool(
-      'listThreads',
-      {
-        description: 'List email threads with optional filters and pagination',
-        inputSchema: {
-          folder: z.string().default(FOLDERS.INBOX),
-          query: z.string().optional(),
-          maxResults: z.number().optional().default(5),
-          labelIds: z.array(z.string()).optional(),
-          pageToken: z.string().optional(),
-        },
-      },
-      async (s) => {
-        const result = await agent.listThreads({
-          folder: s.folder,
-          query: s.query,
-          maxResults: s.maxResults,
-          labelIds: s.labelIds,
-          pageToken: s.pageToken,
-        });
-        const content = await Promise.all(
-          result.threads.map(async (thread: any) => {
-            const loadedThread = await agent.getThread(thread.id);
-            return [
-              {
-                type: 'text' as const,
-                text: `Subject: ${loadedThread.latest?.subject} | ID: ${thread.id} | Latest Message Received: ${loadedThread.latest?.receivedOn}`,
-              },
-              {
-                type: 'text' as const,
-                text: `Latest Message Sender: ${loadedThread.latest?.sender}`,
-              },
-            ];
-          }),
-        );
-        return {
-          content: content.length
-            ? content.flat()
-            : [
-                {
-                  type: 'text' as const,
-                  text: 'No threads found',
-                },
-              ],
-        };
-      },
-    );
-
-    this.server.registerTool(
-      'getThread',
-      {
-        description: 'Get detailed information about a specific email thread',
-        inputSchema: {
-          threadId: z.string(),
-        },
-      },
-      async (s) => {
-        const thread = await agent.getThread(s.threadId);
-        const initialResponse = [
-          {
-            type: 'text' as const,
-            text: `Subject: ${thread.latest?.subject}`,
-          },
-          {
-            type: 'text' as const,
-            text: `Latest Message Received: ${thread.latest?.receivedOn}`,
-          },
-          {
-            type: 'text' as const,
-            text: `Latest Message Sender: ${thread.latest?.sender.name} <${thread.latest?.sender.email}>`,
-          },
-          {
-            type: 'text' as const,
-            text: `Latest Message Raw Content: ${thread.latest?.decodedBody}`,
-          },
-          {
-            type: 'text' as const,
-            text: `Thread ID: ${s.threadId}`,
-          },
-        ];
-        return {
-          content: initialResponse,
-        };
-      },
-    );
-
-    this.server.registerTool(
-      'markThreadsRead',
-      {
-        description: 'Mark email threads as read',
-        inputSchema: {
-          threadIds: z.array(z.string()),
-        },
-      },
-      async (s) => {
-        await agent.modifyLabels(s.threadIds, [], ['UNREAD']);
-        return {
-          content: [
-            {
-              type: 'text',
-              text: 'Threads marked as read',
-            },
-          ],
-        };
-      },
-    );
-
-    this.server.registerTool(
-      'markThreadsUnread',
-      {
-        description: 'Mark email threads as unread',
-        inputSchema: {
-          threadIds: z.array(z.string()),
-        },
-      },
-      async (s) => {
-        await agent.modifyLabels(s.threadIds, ['UNREAD'], []);
-        return {
-          content: [
-            {
-              type: 'text',
-              text: 'Threads marked as unread',
-            },
-          ],
-        };
-      },
-    );
-
-    this.server.registerTool(
-      'modifyLabels',
-      {
-        description: 'Add or remove labels from email threads',
-        inputSchema: {
-          threadIds: z.array(z.string()),
-          addLabelIds: z.array(z.string()),
-          removeLabelIds: z.array(z.string()),
-        },
-      },
-      async (s) => {
-        await agent.modifyLabels(s.threadIds, s.addLabelIds, s.removeLabelIds);
-        return {
-          content: [
-            {
-              type: 'text',
-              text: `Successfully modified ${s.threadIds.length} thread(s)`,
-            },
-          ],
-        };
-      },
-    );
-
-    this.server.registerTool(
-      'getCurrentDate',
-      {
-        description: 'Get the current date and time',
-        inputSchema: z.object({}).shape,
-      },
-      async () => {
-        return {
-          content: [
-            {
-              type: 'text',
-              text: getCurrentDateContext(),
-            },
-          ],
-        };
-      },
-    );
-
-    this.server.registerTool(
-      'getUserLabels',
-      { description: 'Get all available labels for the user' },
-      async () => {
-        const labels = await agent.getUserLabels();
-        return {
-          content: [
-            {
-              type: 'text',
-              text: labels
-                .map((label) => `Name: ${label.name} ID: ${label.id} Color: ${label.color}`)
-                .join('\n'),
-            },
-          ],
-        };
-      },
-    );
-
-    this.server.registerTool(
-      'getLabel',
-      {
-        description: 'Get details about a specific label',
-        inputSchema: {
-          id: z.string(),
-        },
-      },
-      async (s) => {
-        const label = await agent.getLabel(s.id);
-        return {
-          content: [
-            {
-              type: 'text',
-              text: `Name: ${label.name}`,
-            },
-            {
-              type: 'text',
-              text: `ID: ${label.id}`,
-            },
-          ],
-        };
-      },
-    );
-
-    this.server.registerTool(
-      'createLabel',
-      {
-        description: 'Create a new email label',
-        inputSchema: {
-          name: z.string(),
-          backgroundColor: z.string().optional(),
-          textColor: z.string().optional(),
-        },
-      },
-      async (s) => {
-        try {
-          await agent.createLabel({
-            name: s.name,
-            color:
-              s.backgroundColor && s.textColor
-                ? {
-                    backgroundColor: s.backgroundColor,
-                    textColor: s.textColor,
-                  }
-                : undefined,
-          });
-          return {
-            content: [
-              {
-                type: 'text',
-                text: 'Label has been created',
-              },
-            ],
-          };
-        } catch (e) {
-          console.error(e);
-          return {
-            content: [
-              {
-                type: 'text',
-                text: 'Failed to create label',
-              },
-            ],
-          };
-        }
-      },
-    );
-
-    // this.server.registerTool(
-    //   'bulkDelete',
-    //   {
-    //     description: 'Move multiple threads to trash',
-    //     inputSchema: {
-    //       threadIds: z.array(z.string()),
-    //     },
-    //   },
-    //   async (s) => {
-    //     try {
-    //       await agent.modifyLabels(s.threadIds, ['TRASH'], ['INBOX']);
-    //       return {
-    //         content: [
-    //           {
-    //             type: 'text',
-    //             text: 'Threads moved to trash',
-    //           },
-    //         ],
-    //       };
-    //     } catch (e) {
-    //       console.error(e);
-    //       return {
-    //         content: [
-    //           {
-    //             type: 'text',
-    //             text: 'Failed to move threads to trash',
-    //           },
-    //         ],
-    //       };
-    //     }
-    //   },
-    // );
-
-    // this.server.registerTool(
-    //   'bulkArchive',
-    //   {
-    //     description: 'Archive multiple email threads',
-    //     inputSchema: {
-    //       threadIds: z.array(z.string()),
-    //     },
-    //   },
-    //   async (s) => {
-    //     try {
-    //       await agent.modifyLabels(s.threadIds, [], ['INBOX']);
-    //       return {
-    //         content: [
-    //           {
-    //             type: 'text',
-    //             text: 'Threads archived',
-    //           },
-    //         ],
-    //       };
-    //     } catch (e) {
-    //       console.error(e);
-    //       return {
-    //         content: [
-    //           {
-    //             type: 'text',
-    //             text: 'Failed to archive threads',
-    //           },
-    //         ],
-    //       };
-    //     }
-    //   },
-    // );
-    this.ctx.waitUntil(conn.end());
-  }
-}
diff --git a/apps/server/src/routes/agent/mcp.ts b/apps/server/src/routes/agent/mcp.ts
new file mode 100644
index 0000000000..41a5f72542
--- /dev/null
+++ b/apps/server/src/routes/agent/mcp.ts
@@ -0,0 +1,475 @@
+/*
+ * Licensed to Zero Email Inc. under one or more contributor license agreements.
+ * You may not use this file except in compliance with the Apache License, Version 2.0 (the "License").
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Reuse or distribution of this file requires a license from Zero Email Inc.
+ */
+
+import { GmailSearchAssistantSystemPrompt, getCurrentDateContext } from '../../lib/prompts';
+import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { getZeroAgent } from '../../lib/server-utils';
+import { anthropic } from '@ai-sdk/anthropic';
+import { connection } from '../../db/schema';
+import { FOLDERS } from '../../lib/utils';
+import { env } from 'cloudflare:workers';
+import { eq, and } from 'drizzle-orm';
+import { McpAgent } from 'agents/mcp';
+import { createDb } from '../../db';
+import { generateText } from 'ai';
+import z from 'zod';
+
+export class ZeroMCP extends McpAgent<typeof env, {}, { userId: string }> {
+  server = new McpServer({
+    name: 'zero-mcp',
+    version: '1.0.0',
+    description: 'Zero MCP',
+  });
+
+  activeConnectionId: string | undefined;
+
+  constructor(ctx: DurableObjectState, env: Env) {
+    super(ctx, env);
+  }
+
+  async init(): Promise<void> {
+    const { db, conn } = createDb(env.HYPERDRIVE.connectionString);
+    const _connection = await db.query.connection.findFirst({
+      where: eq(connection.userId, this.props.userId),
+    });
+    if (!_connection) {
+      throw new Error('Unauthorized');
+    }
+    this.activeConnectionId = _connection.id;
+    this.server.registerTool(
+      'getConnections',
+      {
+        description:
+          'Use this tool to get all connections for the user. This helps you know what accounts(connections) the user has available.',
+        inputSchema: {},
+      },
+      async () => {
+        const connections = await db.query.connection.findMany({
+          where: eq(connection.userId, this.props.userId),
+        });
+        return {
+          content: connections.map((c) => ({
+            type: 'text',
+            text: `Email: ${c.email} | Provider: ${c.providerId}`,
+          })),
+        };
+      },
+    );
+
+    this.server.registerTool(
+      'getActiveConnection',
+      {
+        description: 'Get the currently active email connection',
+      },
+      async () => {
+        if (!this.activeConnectionId) {
+          throw new Error('No active connection');
+        }
+        const _connection = await db.query.connection.findFirst({
+          where: eq(connection.id, this.activeConnectionId),
+        });
+        if (!_connection) {
+          throw new Error('Connection not found');
+        }
+        return {
+          content: [
+            {
+              type: 'text' as const,
+              text: `Email: ${_connection.email} | Provider: ${_connection.providerId}`,
+            },
+          ],
+        };
+      },
+    );
+
+    this.server.registerTool(
+      'setActiveConnection',
+      {
+        description: 'Set the active email connection by email address',
+        inputSchema: {
+          email: z.string(),
+        },
+      },
+      async (s) => {
+        const _connection = await db.query.connection.findFirst({
+          where: and(eq(connection.userId, this.props.userId), eq(connection.email, s.email)),
+        });
+        if (!_connection) {
+          throw new Error('Connection not found');
+        }
+        this.activeConnectionId = _connection.id;
+        return {
+          content: [
+            {
+              type: 'text' as const,
+              text: `Active connection set to ${_connection.email}`,
+            },
+          ],
+        };
+      },
+    );
+
+    this.server.registerTool(
+      'buildGmailSearchQuery',
+      {
+        description: 'Build Gmail search query using AI assistance',
+        inputSchema: {
+          query: z.string(),
+        },
+      },
+      async (s) => {
+        const result = await generateText({
+          model: anthropic(env.OPENAI_MODEL || 'claude-3-5-haiku-latest'),
+          system: GmailSearchAssistantSystemPrompt(),
+          prompt: s.query,
+        });
+        return {
+          content: [
+            {
+              type: 'text',
+              text: result.text,
+            },
+          ],
+        };
+      },
+    );
+
+    const agent = await getZeroAgent(_connection.id);
+
+    this.server.registerTool(
+      'listThreads',
+      {
+        description: 'List email threads with optional filters and pagination',
+        inputSchema: {
+          folder: z.string().default(FOLDERS.INBOX),
+          query: z.string().optional(),
+          maxResults: z.number().optional().default(5),
+          labelIds: z.array(z.string()).optional(),
+          pageToken: z.string().optional(),
+        },
+      },
+      async (s) => {
+        const result = await agent.listThreads({
+          folder: s.folder,
+          query: s.query,
+          maxResults: s.maxResults,
+          labelIds: s.labelIds,
+          pageToken: s.pageToken,
+        });
+        const content = await Promise.all(
+          result.threads.map(async (thread: any) => {
+            const loadedThread = await agent.getThread(thread.id);
+            return [
+              {
+                type: 'text' as const,
+                text: `Subject: ${loadedThread.latest?.subject} | ID: ${thread.id} | Latest Message Received: ${loadedThread.latest?.receivedOn}`,
+              },
+              {
+                type: 'text' as const,
+                text: `Latest Message Sender: ${loadedThread.latest?.sender}`,
+              },
+            ];
+          }),
+        );
+        return {
+          content: content.length
+            ? content.flat()
+            : [
+                {
+                  type: 'text' as const,
+                  text: 'No threads found',
+                },
+              ],
+        };
+      },
+    );
+
+    this.server.registerTool(
+      'getThread',
+      {
+        description: 'Get detailed information about a specific email thread',
+        inputSchema: {
+          threadId: z.string(),
+        },
+      },
+      async (s) => {
+        const thread = await agent.getThread(s.threadId);
+        const initialResponse = [
+          {
+            type: 'text' as const,
+            text: `Subject: ${thread.latest?.subject}`,
+          },
+          {
+            type: 'text' as const,
+            text: `Latest Message Received: ${thread.latest?.receivedOn}`,
+          },
+          {
+            type: 'text' as const,
+            text: `Latest Message Sender: ${thread.latest?.sender.name} <${thread.latest?.sender.email}>`,
+          },
+          {
+            type: 'text' as const,
+            text: `Latest Message Raw Content: ${thread.latest?.decodedBody}`,
+          },
+          {
+            type: 'text' as const,
+            text: `Thread ID: ${s.threadId}`,
+          },
+        ];
+        return {
+          content: initialResponse,
+        };
+      },
+    );
+
+    this.server.registerTool(
+      'markThreadsRead',
+      {
+        description: 'Mark email threads as read',
+        inputSchema: {
+          threadIds: z.array(z.string()),
+        },
+      },
+      async (s) => {
+        await agent.modifyLabels(s.threadIds, [], ['UNREAD']);
+        return {
+          content: [
+            {
+              type: 'text',
+              text: 'Threads marked as read',
+            },
+          ],
+        };
+      },
+    );
+
+    this.server.registerTool(
+      'markThreadsUnread',
+      {
+        description: 'Mark email threads as unread',
+        inputSchema: {
+          threadIds: z.array(z.string()),
+        },
+      },
+      async (s) => {
+        await agent.modifyLabels(s.threadIds, ['UNREAD'], []);
+        return {
+          content: [
+            {
+              type: 'text',
+              text: 'Threads marked as unread',
+            },
+          ],
+        };
+      },
+    );
+
+    this.server.registerTool(
+      'modifyLabels',
+      {
+        description: 'Add or remove labels from email threads',
+        inputSchema: {
+          threadIds: z.array(z.string()),
+          addLabelIds: z.array(z.string()),
+          removeLabelIds: z.array(z.string()),
+        },
+      },
+      async (s) => {
+        await agent.modifyLabels(s.threadIds, s.addLabelIds, s.removeLabelIds);
+        return {
+          content: [
+            {
+              type: 'text',
+              text: `Successfully modified ${s.threadIds.length} thread(s)`,
+            },
+          ],
+        };
+      },
+    );
+
+    this.server.registerTool(
+      'getCurrentDate',
+      {
+        description: 'Get the current date and time',
+        inputSchema: z.object({}).shape,
+      },
+      async () => {
+        return {
+          content: [
+            {
+              type: 'text',
+              text: getCurrentDateContext(),
+            },
+          ],
+        };
+      },
+    );
+
+    this.server.registerTool(
+      'getUserLabels',
+      { description: 'Get all available labels for the user' },
+      async () => {
+        const labels = await agent.getUserLabels();
+        return {
+          content: [
+            {
+              type: 'text',
+              text: labels
+                .map((label) => `Name: ${label.name} ID: ${label.id} Color: ${label.color}`)
+                .join('\n'),
+            },
+          ],
+        };
+      },
+    );
+
+    this.server.registerTool(
+      'getLabel',
+      {
+        description: 'Get details about a specific label',
+        inputSchema: {
+          id: z.string(),
+        },
+      },
+      async (s) => {
+        const label = await agent.getLabel(s.id);
+        return {
+          content: [
+            {
+              type: 'text',
+              text: `Name: ${label.name}`,
+            },
+            {
+              type: 'text',
+              text: `ID: ${label.id}`,
+            },
+          ],
+        };
+      },
+    );
+
+    this.server.registerTool(
+      'createLabel',
+      {
+        description: 'Create a new email label',
+        inputSchema: {
+          name: z.string(),
+          backgroundColor: z.string().optional(),
+          textColor: z.string().optional(),
+        },
+      },
+      async (s) => {
+        try {
+          await agent.createLabel({
+            name: s.name,
+            color:
+              s.backgroundColor && s.textColor
+                ? {
+                    backgroundColor: s.backgroundColor,
+                    textColor: s.textColor,
+                  }
+                : undefined,
+          });
+          return {
+            content: [
+              {
+                type: 'text',
+                text: 'Label has been created',
+              },
+            ],
+          };
+        } catch (e) {
+          console.error(e);
+          return {
+            content: [
+              {
+                type: 'text',
+                text: 'Failed to create label',
+              },
+            ],
+          };
+        }
+      },
+    );
+
+    // this.server.registerTool(
+    //   'bulkDelete',
+    //   {
+    //     description: 'Move multiple threads to trash',
+    //     inputSchema: {
+    //       threadIds: z.array(z.string()),
+    //     },
+    //   },
+    //   async (s) => {
+    //     try {
+    //       await agent.modifyLabels(s.threadIds, ['TRASH'], ['INBOX']);
+    //       return {
+    //         content: [
+    //           {
+    //             type: 'text',
+    //             text: 'Threads moved to trash',
+    //           },
+    //         ],
+    //       };
+    //     } catch (e) {
+    //       console.error(e);
+    //       return {
+    //         content: [
+    //           {
+    //             type: 'text',
+    //             text: 'Failed to move threads to trash',
+    //           },
+    //         ],
+    //       };
+    //     }
+    //   },
+    // );
+
+    // this.server.registerTool(
+    //   'bulkArchive',
+    //   {
+    //     description: 'Archive multiple email threads',
+    //     inputSchema: {
+    //       threadIds: z.array(z.string()),
+    //     },
+    //   },
+    //   async (s) => {
+    //     try {
+    //       await agent.modifyLabels(s.threadIds, [], ['INBOX']);
+    //       return {
+    //         content: [
+    //           {
+    //             type: 'text',
+    //             text: 'Threads archived',
+    //           },
+    //         ],
+    //       };
+    //     } catch (e) {
+    //       console.error(e);
+    //       return {
+    //         content: [
+    //           {
+    //             type: 'text',
+    //             text: 'Failed to archive threads',
+    //           },
+    //         ],
+    //       };
+    //     }
+    //   },
+    // );
+    this.ctx.waitUntil(conn.end());
+  }
+}
diff --git a/apps/server/src/routes/agent/rpc.ts b/apps/server/src/routes/agent/rpc.ts
new file mode 100644
index 0000000000..9692decb71
--- /dev/null
+++ b/apps/server/src/routes/agent/rpc.ts
@@ -0,0 +1,223 @@
+/*
+ * Licensed to Zero Email Inc. under one or more contributor license agreements.
+ * You may not use this file except in compliance with the Apache License, Version 2.0 (the "License").
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Reuse or distribution of this file requires a license from Zero Email Inc.
+ */
+import type { CreateDraftData } from '../../lib/schemas';
+import type { IOutgoingMessage } from '../../types';
+import { RpcTarget } from 'cloudflare:workers';
+import { ZeroAgent } from '.';
+
+export class AgentRpcDO extends RpcTarget {
+  constructor(
+    private mainDo: ZeroAgent,
+    private connectionId: string,
+  ) {
+    super();
+  }
+
+  async getUserLabels() {
+    return await this.mainDo.getUserLabels();
+  }
+
+  async getLabel(id: string) {
+    return await this.mainDo.getLabel(id);
+  }
+
+  async createLabel(label: {
+    name: string;
+    color?: { backgroundColor: string; textColor: string };
+  }) {
+    return await this.mainDo.createLabel(label);
+  }
+
+  async updateLabel(
+    id: string,
+    label: { name: string; color?: { backgroundColor: string; textColor: string } },
+  ) {
+    return await this.mainDo.updateLabel(id, label);
+  }
+
+  async deleteLabel(id: string) {
+    return await this.mainDo.deleteLabel(id);
+  }
+
+  async bulkDelete(threadIds: string[]) {
+    return await this.mainDo.bulkDelete(threadIds);
+  }
+
+  async bulkArchive(threadIds: string[]) {
+    return await this.mainDo.bulkArchive(threadIds);
+  }
+
+  async rawListThreads(params: {
+    folder: string;
+    query?: string;
+    maxResults?: number;
+    labelIds?: string[];
+    pageToken?: string;
+  }) {
+    return await this.mainDo.rawListThreads(params);
+  }
+
+  async listThreads(params: {
+    folder: string;
+    query?: string;
+    maxResults?: number;
+    labelIds?: string[];
+    pageToken?: string;
+  }) {
+    return await this.mainDo.list(params);
+  }
+
+  async getThread(threadId: string) {
+    return await this.mainDo.get(threadId);
+  }
+
+  async markThreadsRead(threadIds: string[]) {
+    const result = await this.mainDo.markThreadsRead(threadIds);
+    await Promise.all(threadIds.map((id) => this.mainDo.syncThread({ threadId: id })));
+    return result;
+  }
+
+  async syncThread(threadId: string) {
+    return await this.mainDo.syncThread({ threadId });
+  }
+
+  async markThreadsUnread(threadIds: string[]) {
+    const result = await this.mainDo.markThreadsUnread(threadIds);
+    await Promise.all(threadIds.map((id) => this.mainDo.syncThread({ threadId: id })));
+    return result;
+  }
+
+  async modifyLabels(threadIds: string[], addLabelIds: string[], removeLabelIds: string[]) {
+    const result = await this.mainDo.modifyLabels(threadIds, addLabelIds, removeLabelIds);
+    await Promise.all(threadIds.map((id) => this.mainDo.syncThread({ threadId: id })));
+    return result;
+  }
+
+  async createDraft(draftData: CreateDraftData) {
+    return await this.mainDo.createDraft(draftData);
+  }
+
+  async getDraft(id: string) {
+    return await this.mainDo.getDraft(id);
+  }
+
+  async listDrafts(params: { q?: string; maxResults?: number; pageToken?: string }) {
+    return await this.mainDo.listDrafts(params);
+  }
+
+  async count() {
+    return await this.mainDo.count();
+  }
+
+  //   async list(params: {
+  //     folder: string;
+  //     query?: string;
+  //     maxResults?: number;
+  //     labelIds?: string[];
+  //     pageToken?: string;
+  //   }) {
+  //     return await this.mainDo.list(params);
+  //   }
+
+  async markAsRead(threadIds: string[]) {
+    const result = await this.mainDo.markAsRead(threadIds);
+    await Promise.all(threadIds.map((id) => this.mainDo.syncThread({ threadId: id })));
+    return result;
+  }
+
+  async markAsUnread(threadIds: string[]) {
+    const result = await this.mainDo.markAsUnread(threadIds);
+    await Promise.all(threadIds.map((id) => this.mainDo.syncThread({ threadId: id })));
+    return result;
+  }
+
+  async normalizeIds(ids: string[]) {
+    return await this.mainDo.normalizeIds(ids);
+  }
+
+  //   async get(id: string) {
+  //     return await this.mainDo.get(id);
+  //   }
+
+  async sendDraft(id: string, data: IOutgoingMessage) {
+    return await this.mainDo.sendDraft(id, data);
+  }
+
+  async create(data: IOutgoingMessage) {
+    return await this.mainDo.create(data);
+  }
+
+  async delete(id: string) {
+    return await this.mainDo.delete(id);
+  }
+
+  async deleteAllSpam() {
+    return await this.mainDo.deleteAllSpam();
+  }
+
+  async getEmailAliases() {
+    return await this.mainDo.getEmailAliases();
+  }
+
+  async getMessageAttachments(messageId: string) {
+    return await this.mainDo.getMessageAttachments(messageId);
+  }
+
+  async setupAuth(connectionId: string) {
+    if (connectionId !== this.connectionId) console.warn('Oops, something doesnt add up.');
+    return await this.mainDo.setupAuth(connectionId);
+  }
+
+  async broadcast(message: string) {
+    return this.mainDo.broadcast(message);
+  }
+
+  //   async getThreadsFromDB(params: {
+  //     labelIds?: string[];
+  //     folder?: string;
+  //     q?: string;
+  //     max?: number;
+  //     cursor?: string;
+  //   }) {
+  //     return await this.mainDo.getThreadsFromDB(params);
+  //   }
+
+  //   async getThreadFromDB(id: string) {
+  //     return await this.mainDo.getThreadFromDB(id);
+  //   }
+
+  async listHistory<T>(historyId: string) {
+    return await this.mainDo.listHistory<T>(historyId);
+  }
+
+  async syncThreads(folder: string) {
+    return await this.mainDo.syncThreads(folder);
+  }
+
+  async inboxRag(query: string) {
+    return await this.mainDo.inboxRag(query);
+  }
+
+  async searchThreads(params: {
+    query: string;
+    folder?: string;
+    maxResults?: number;
+    labelIds?: string[];
+    pageToken?: string;
+  }) {
+    return await this.mainDo.searchThreads(params);
+  }
+}
diff --git a/apps/server/src/routes/agent/types.ts b/apps/server/src/routes/agent/types.ts
new file mode 100644
index 0000000000..95e46254b3
--- /dev/null
+++ b/apps/server/src/routes/agent/types.ts
@@ -0,0 +1,71 @@
+import type { Message as ChatMessage } from 'ai';
+
+export enum IncomingMessageType {
+  UseChatRequest = 'cf_agent_use_chat_request',
+  ChatClear = 'cf_agent_chat_clear',
+  ChatMessages = 'cf_agent_chat_messages',
+  ChatRequestCancel = 'cf_agent_chat_request_cancel',
+  Mail_List = 'zero_mail_list_threads',
+  Mail_Get = 'zero_mail_get_thread',
+}
+
+export enum OutgoingMessageType {
+  ChatMessages = 'cf_agent_chat_messages',
+  UseChatResponse = 'cf_agent_use_chat_response',
+  ChatClear = 'cf_agent_chat_clear',
+  Mail_List = 'zero_mail_list_threads',
+  Mail_Get = 'zero_mail_get_thread',
+}
+
+export type IncomingMessage =
+  | {
+      type: IncomingMessageType.UseChatRequest;
+      id: string;
+      init: Pick<RequestInit, 'method' | 'headers' | 'body'>;
+    }
+  | {
+      type: IncomingMessageType.ChatClear;
+    }
+  | {
+      type: IncomingMessageType.ChatMessages;
+      messages: ChatMessage[];
+    }
+  | {
+      type: IncomingMessageType.ChatRequestCancel;
+      id: string;
+    }
+  | {
+      type: IncomingMessageType.Mail_List;
+      folder: string;
+      query: string;
+      maxResults: number;
+      labelIds: string[];
+      pageToken: string;
+    }
+  | {
+      type: IncomingMessageType.Mail_Get;
+      threadId: string;
+    };
+
+export type OutgoingMessage =
+  | {
+      type: OutgoingMessageType.ChatMessages;
+      messages: ChatMessage[];
+    }
+  | {
+      type: OutgoingMessageType.UseChatResponse;
+      id: string;
+      body: string;
+      done: boolean;
+    }
+  | {
+      type: OutgoingMessageType.ChatClear;
+    }
+  | {
+      type: OutgoingMessageType.Mail_List;
+      folder: string;
+    }
+  | {
+      type: OutgoingMessageType.Mail_Get;
+      threadId: string;
+    };
diff --git a/apps/server/src/trpc/routes/mail.ts b/apps/server/src/trpc/routes/mail.ts
index 9a0a53862d..83e2e96841 100644
--- a/apps/server/src/trpc/routes/mail.ts
+++ b/apps/server/src/trpc/routes/mail.ts
@@ -398,6 +398,29 @@ export const mailRouter = router({
     const agent = await getZeroAgent(activeConnection.id);
     return agent.getEmailAliases();
   }),
+  getMessageAttachments: activeDriverProcedure
+    .input(
+      z.object({
+        messageId: z.string(),
+      }),
+    )
+    .query(async ({ ctx, input }) => {
+      const { activeConnection } = ctx;
+      const agent = await getZeroAgent(activeConnection.id);
+      return agent.getMessageAttachments(input.messageId) as Promise<
+        {
+          filename: string;
+          mimeType: string;
+          size: number;
+          attachmentId: string;
+          headers: {
+            name: string;
+            value: string;
+          }[];
+          body: string;
+        }[]
+      >;
+    }),
   processEmailContent: privateProcedure
     .input(
       z.object({
diff --git a/apps/server/wrangler.jsonc b/apps/server/wrangler.jsonc
index 01472e3ed9..a29bc28921 100644
--- a/apps/server/wrangler.jsonc
+++ b/apps/server/wrangler.jsonc
@@ -39,10 +39,6 @@
             "name": "ZERO_DB",
             "class_name": "ZeroDB",
           },
-          {
-            "class_name": "DurableMailbox",
-            "name": "DURABLE_MAILBOX",
-          },
         ],
       },
       "queues": {
@@ -167,10 +163,6 @@
             "name": "ZERO_DB",
             "class_name": "ZeroDB",
           },
-          {
-            "class_name": "DurableMailbox",
-            "name": "DURABLE_MAILBOX",
-          },
         ],
       },
       "r2_buckets": [
@@ -312,10 +304,6 @@
             "name": "ZERO_DB",
             "class_name": "ZeroDB",
           },
-          {
-            "class_name": "DurableMailbox",
-            "name": "DURABLE_MAILBOX",
-          },
         ],
       },
       "queues": {
@@ -363,7 +351,7 @@
         "VITE_PUBLIC_APP_URL": "https://0.email",
         "DISABLE_CALLS": "true",
         "DROP_AGENT_TABLES": "false",
-        "THREAD_SYNC_MAX_COUNT": "40",
+        "THREAD_SYNC_MAX_COUNT": "10",
         "THREAD_SYNC_LOOP": "true",
         "DISABLE_WORKFLOWS": "true",
       },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b31c27c9cc..6639b3eac0 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -526,8 +526,8 @@ importers:
         specifier: ^2.40.0
         version: 2.40.0
       '@modelcontextprotocol/sdk':
-        specifier: 1.12.0
-        version: 1.12.0
+        specifier: 1.15.1
+        version: 1.15.1
       '@react-email/components':
         specifier: ^0.0.41
         version: 0.0.41(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
@@ -550,8 +550,8 @@ importers:
         specifier: ^1.34.9
         version: 1.35.0
       agents:
-        specifier: 0.0.93
-        version: 0.0.93(@cloudflare/workers-types@4.20250628.0)(react@19.1.0)
+        specifier: 0.0.106
+        version: 0.0.106(@cloudflare/workers-types@4.20250628.0)(react@19.1.0)
       ai:
         specifier: ^4.3.13
         version: 4.3.16(react@19.1.0)(zod@3.25.67)
@@ -596,7 +596,7 @@ importers:
         version: 4.8.3
       hono-agents:
         specifier: 0.0.83
-        version: 0.0.83(agents@0.0.93(@cloudflare/workers-types@4.20250628.0)(react@19.1.0))(hono@4.8.3)
+        version: 0.0.83(agents@0.0.106(@cloudflare/workers-types@4.20250628.0)(react@19.1.0))(hono@4.8.3)
       hono-party:
         specifier: ^0.0.12
         version: 0.0.12(@cloudflare/workers-types@4.20250628.0)(hono@4.8.3)(partyserver@0.0.71(@cloudflare/workers-types@4.20250628.0))
@@ -1872,6 +1872,10 @@ packages:
     resolution: {integrity: sha512-m//7RlINx1F3sz3KqwY1WWzVgTcYX52HYk4bJ1hkBXV3zccAEth+jRvG8DBRrdaQuRsPAJOx2MH3zaHNCKL7Zg==}
     engines: {node: '>=18'}
 
+  '@modelcontextprotocol/sdk@1.15.1':
+    resolution: {integrity: sha512-W/XlN9c528yYn+9MQkVjxiTPgPxoxt+oczfjHBDsJx0+59+O7B75Zhsp0B16Xbwbz8ANISDajh6+V7nIcPMc5w==}
+    engines: {node: '>=18'}
+
   '@noble/ciphers@0.6.0':
     resolution: {integrity: sha512-mIbq/R9QXk5/cTfESb1OKtyFnk7oc1Om/8onA1158K9/OZUQFDEVy55jVTato+xmp3XX6F6Qh0zz0Nc1AxAlRQ==}
 
@@ -4058,6 +4062,11 @@ packages:
     resolution: {integrity: sha512-kja8j7PjmncONqaTsB8fQ+wE2mSU2DJ9D4XKoJ5PFWIdRMa6SLSN1ff4mOr4jCbfRSsxR4keIiySJU0N9T5hIQ==}
     engines: {node: '>= 8.0.0'}
 
+  agents@0.0.106:
+    resolution: {integrity: sha512-HthmK2Dm++heO/6wrm8IlL4B7sHSlbW+EVB4BS3hjOskm3Exjpt4M+SjPwEOfRtokLlGKf8dA8wRAXgxPk+RJw==}
+    peerDependencies:
+      react: '*'
+
   agents@0.0.93:
     resolution: {integrity: sha512-W25kx492Txn5XYY9gx2YBhGmfC8C/N3JQzfjbmq9GjhYtAFCsJdIw6C5xbLt/ev2x3Uor/8XMHXYiw/2YbTSkQ==}
     peerDependencies:
@@ -6656,6 +6665,11 @@ packages:
     peerDependencies:
       '@cloudflare/workers-types': ^4.20240729.0
 
+  partyserver@0.0.72:
+    resolution: {integrity: sha512-mYkCQ6Q4KBIy4lFFuA6upmvNeD/FC+CQVTd4V3DYU6nsitKVI3NXxBrNNvmIxJLSwk3JQzYcEOPBkebB7ITVpQ==}
+    peerDependencies:
+      '@cloudflare/workers-types': ^4.20240729.0
+
   partysocket@1.1.4:
     resolution: {integrity: sha512-jXP7PFj2h5/v4UjDS8P7MZy6NJUQ7sspiFyxL4uc/+oKOL+KdtXzHnTV8INPGxBrLTXgalyG3kd12Qm7WrYc3A==}
 
@@ -9426,6 +9440,23 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@modelcontextprotocol/sdk@1.15.1':
+    dependencies:
+      ajv: 6.12.6
+      content-type: 1.0.5
+      cors: 2.8.5
+      cross-spawn: 7.0.6
+      eventsource: 3.0.7
+      eventsource-parser: 3.0.3
+      express: 5.1.0
+      express-rate-limit: 7.5.1(express@5.1.0)
+      pkce-challenge: 5.0.0
+      raw-body: 3.0.0
+      zod: 3.25.67
+      zod-to-json-schema: 3.24.6(zod@3.25.67)
+    transitivePeerDependencies:
+      - supports-color
+
   '@noble/ciphers@0.6.0': {}
 
   '@noble/hashes@1.8.0': {}
@@ -11756,6 +11787,21 @@ snapshots:
     dependencies:
       humanize-ms: 1.2.1
 
+  agents@0.0.106(@cloudflare/workers-types@4.20250628.0)(react@19.1.0):
+    dependencies:
+      '@modelcontextprotocol/sdk': 1.15.1
+      ai: 4.3.16(react@19.1.0)(zod@3.25.67)
+      cron-schedule: 5.0.4
+      mimetext: 3.0.27
+      nanoid: 5.1.5
+      partyserver: 0.0.72(@cloudflare/workers-types@4.20250628.0)
+      partysocket: 1.1.4
+      react: 19.1.0
+      zod: 3.25.67
+    transitivePeerDependencies:
+      - '@cloudflare/workers-types'
+      - supports-color
+
   agents@0.0.93(@cloudflare/workers-types@4.20250628.0)(react@19.1.0):
     dependencies:
       '@modelcontextprotocol/sdk': 1.12.0
@@ -13534,9 +13580,9 @@ snapshots:
     dependencies:
       react-is: 16.13.1
 
-  hono-agents@0.0.83(agents@0.0.93(@cloudflare/workers-types@4.20250628.0)(react@19.1.0))(hono@4.8.3):
+  hono-agents@0.0.83(agents@0.0.106(@cloudflare/workers-types@4.20250628.0)(react@19.1.0))(hono@4.8.3):
     dependencies:
-      agents: 0.0.93(@cloudflare/workers-types@4.20250628.0)(react@19.1.0)
+      agents: 0.0.106(@cloudflare/workers-types@4.20250628.0)(react@19.1.0)
       hono: 4.8.3
 
   hono-party@0.0.12(@cloudflare/workers-types@4.20250628.0)(hono@4.8.3)(partyserver@0.0.71(@cloudflare/workers-types@4.20250628.0)):
@@ -14767,6 +14813,11 @@ snapshots:
       '@cloudflare/workers-types': 4.20250628.0
       nanoid: 5.1.5
 
+  partyserver@0.0.72(@cloudflare/workers-types@4.20250628.0):
+    dependencies:
+      '@cloudflare/workers-types': 4.20250628.0
+      nanoid: 5.1.5
+
   partysocket@1.1.4:
     dependencies:
       event-target-polyfill: 0.0.4

From cb0822fb79c5c9d7ee9407ec11db5b0f5462a5a5 Mon Sep 17 00:00:00 2001
From: Adam <13007539+MrgSub@users.noreply.github.com>
Date: Thu, 17 Jul 2025 22:04:16 -0700
Subject: [PATCH 02/20] hotfixes (#1753)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# READ CAREFULLY THEN REMOVE

Remove bullet points that are not relevant.

PLEASE REFRAIN FROM USING AI TO WRITE YOUR CODE AND PR DESCRIPTION. IF YOU DO USE AI TO WRITE YOUR CODE PLEASE PROVIDE A DESCRIPTION AND REVIEW IT CAREFULLY. MAKE SURE YOU UNDERSTAND THE CODE YOU ARE SUBMITTING USING AI.

- Pull requests that do not follow these guidelines will be closed without review or comment.
- If you use AI to write your PR description your pr will be close without review or comment.
- If you are unsure about anything, feel free to ask for clarification.

## Description

Please provide a clear description of your changes.

---

## Type of Change

Please delete options that are not relevant.

- [ ] 🐛 Bug fix (non-breaking change which fixes an issue)
- [ ] ✨ New feature (non-breaking change which adds functionality)
- [ ] 💥 Breaking change (fix or feature with breaking changes)
- [ ] 📝 Documentation update
- [ ] 🎨 UI/UX improvement
- [ ] 🔒 Security enhancement
- [ ] ⚡ Performance improvement

## Areas Affected

Please check all that apply:

- [ ] Email Integration (Gmail, IMAP, etc.)
- [ ] User Interface/Experience
- [ ] Authentication/Authorization
- [ ] Data Storage/Management
- [ ] API Endpoints
- [ ] Documentation
- [ ] Testing Infrastructure
- [ ] Development Workflow
- [ ] Deployment/Infrastructure

## Testing Done

Describe the tests you've done:

- [ ] Unit tests added/updated
- [ ] Integration tests added/updated
- [ ] Manual testing performed
- [ ] Cross-browser testing (if UI changes)
- [ ] Mobile responsiveness verified (if UI changes)

## Security Considerations

For changes involving data or authentication:

- [ ] No sensitive data is exposed
- [ ] Authentication checks are in place
- [ ] Input validation is implemented
- [ ] Rate limiting is considered (if applicable)

## Checklist

- [ ] I have read the [CONTRIBUTING](https://github.com/Mail-0/Zero/blob/staging/.github/CONTRIBUTING.md) document
- [ ] My code follows the project's style guidelines
- [ ] I have performed a self-review of my code
- [ ] I have commented my code, particularly in complex areas
- [ ] I have updated the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that prove my fix/feature works
- [ ] All tests pass locally
- [ ] Any dependent changes are merged and published

## Additional Notes

Add any other context about the pull request here.

## Screenshots/Recordings

Add screenshots or recordings here if applicable.

---

_By submitting this pull request, I confirm that my contribution is made under the terms of the project's license._


<!-- This is an auto-generated description by cubic. -->
---

## Summary by cubic
Fixed type errors and updated function signatures in server routes and effects to resolve hotfix issues. Removed an unused import in the mail UI navigation component.

- **Bug Fixes**
  - Updated `syncThread` to accept an object with `threadId` for consistency.
  - Fixed type parameters in `ZeroMCP` class.
  - Removed unused constructor and import statements.

<!-- End of auto-generated description by cubic. -->
---
 apps/mail/components/ui/nav-main.tsx | 1 -
 apps/server/src/pipelines.effect.ts  | 2 +-
 apps/server/src/routes/agent/mcp.ts  | 6 +-----
 apps/server/src/routes/agent/rpc.ts  | 2 +-
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/apps/mail/components/ui/nav-main.tsx b/apps/mail/components/ui/nav-main.tsx
index a6862fcc4e..33158bd09b 100644
--- a/apps/mail/components/ui/nav-main.tsx
+++ b/apps/mail/components/ui/nav-main.tsx
@@ -4,7 +4,6 @@ import { useCommandPalette } from '../context/command-palette-context.jsx';
 import { LabelDialog } from '@/components/labels/label-dialog';
 import { useActiveConnection } from '@/hooks/use-connections';
 import { useMutation, useQuery } from '@tanstack/react-query';
-import { useSearchValue } from '@/hooks/use-search-value.js';
 import Intercom, { show } from '@intercom/messenger-js-sdk';
 import { MessageSquare, OldPhone } from '../icons/icons';
 import { useSidebar } from '../context/sidebar-context';
diff --git a/apps/server/src/pipelines.effect.ts b/apps/server/src/pipelines.effect.ts
index 86d5e70b13..ee9fcf879f 100644
--- a/apps/server/src/pipelines.effect.ts
+++ b/apps/server/src/pipelines.effect.ts
@@ -739,7 +739,7 @@ export const runThreadWorkflow = (
                     remove: labelsToRemove,
                   });
                   await agent.modifyLabels([threadId.toString()], labelsToAdd, labelsToRemove);
-                  await agent.syncThread(threadId.toString());
+                  await agent.syncThread({ threadId: threadId.toString() });
                   console.log('[THREAD_WORKFLOW] Successfully modified thread labels');
                 } else {
                   console.log('[THREAD_WORKFLOW] No label changes needed - labels already match');
diff --git a/apps/server/src/routes/agent/mcp.ts b/apps/server/src/routes/agent/mcp.ts
index 41a5f72542..5f1b713798 100644
--- a/apps/server/src/routes/agent/mcp.ts
+++ b/apps/server/src/routes/agent/mcp.ts
@@ -27,7 +27,7 @@ import { createDb } from '../../db';
 import { generateText } from 'ai';
 import z from 'zod';
 
-export class ZeroMCP extends McpAgent<typeof env, {}, { userId: string }> {
+export class ZeroMCP extends McpAgent<typeof env, Record<string, unknown>, { userId: string }> {
   server = new McpServer({
     name: 'zero-mcp',
     version: '1.0.0',
@@ -36,10 +36,6 @@ export class ZeroMCP extends McpAgent<typeof env, {}, { userId: string }> {
 
   activeConnectionId: string | undefined;
 
-  constructor(ctx: DurableObjectState, env: Env) {
-    super(ctx, env);
-  }
-
   async init(): Promise<void> {
     const { db, conn } = createDb(env.HYPERDRIVE.connectionString);
     const _connection = await db.query.connection.findFirst({
diff --git a/apps/server/src/routes/agent/rpc.ts b/apps/server/src/routes/agent/rpc.ts
index 9692decb71..5cb4a1a5a6 100644
--- a/apps/server/src/routes/agent/rpc.ts
+++ b/apps/server/src/routes/agent/rpc.ts
@@ -90,7 +90,7 @@ export class AgentRpcDO extends RpcTarget {
     return result;
   }
 
-  async syncThread(threadId: string) {
+  async syncThread({ threadId }: { threadId: string }) {
     return await this.mainDo.syncThread({ threadId });
   }
 

From 3136e8604ad0818a0b3df32f217e9eaaab2dae68 Mon Sep 17 00:00:00 2001
From: Adam <13007539+MrgSub@users.noreply.github.com>
Date: Thu, 17 Jul 2025 22:17:40 -0700
Subject: [PATCH 03/20] fix deployment (#1754)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# READ CAREFULLY THEN REMOVE

Remove bullet points that are not relevant.

PLEASE REFRAIN FROM USING AI TO WRITE YOUR CODE AND PR DESCRIPTION. IF YOU DO USE AI TO WRITE YOUR CODE PLEASE PROVIDE A DESCRIPTION AND REVIEW IT CAREFULLY. MAKE SURE YOU UNDERSTAND THE CODE YOU ARE SUBMITTING USING AI.

- Pull requests that do not follow these guidelines will be closed without review or comment.
- If you use AI to write your PR description your pr will be close without review or comment.
- If you are unsure about anything, feel free to ask for clarification.

## Description

Please provide a clear description of your changes.

---

## Type of Change

Please delete options that are not relevant.

- [ ] 🐛 Bug fix (non-breaking change which fixes an issue)
- [ ] ✨ New feature (non-breaking change which adds functionality)
- [ ] 💥 Breaking change (fix or feature with breaking changes)
- [ ] 📝 Documentation update
- [ ] 🎨 UI/UX improvement
- [ ] 🔒 Security enhancement
- [ ] ⚡ Performance improvement

## Areas Affected

Please check all that apply:

- [ ] Email Integration (Gmail, IMAP, etc.)
- [ ] User Interface/Experience
- [ ] Authentication/Authorization
- [ ] Data Storage/Management
- [ ] API Endpoints
- [ ] Documentation
- [ ] Testing Infrastructure
- [ ] Development Workflow
- [ ] Deployment/Infrastructure

## Testing Done

Describe the tests you've done:

- [ ] Unit tests added/updated
- [ ] Integration tests added/updated
- [ ] Manual testing performed
- [ ] Cross-browser testing (if UI changes)
- [ ] Mobile responsiveness verified (if UI changes)

## Security Considerations

For changes involving data or authentication:

- [ ] No sensitive data is exposed
- [ ] Authentication checks are in place
- [ ] Input validation is implemented
- [ ] Rate limiting is considered (if applicable)

## Checklist

- [ ] I have read the [CONTRIBUTING](https://github.com/Mail-0/Zero/blob/staging/.github/CONTRIBUTING.md) document
- [ ] My code follows the project's style guidelines
- [ ] I have performed a self-review of my code
- [ ] I have commented my code, particularly in complex areas
- [ ] I have updated the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that prove my fix/feature works
- [ ] All tests pass locally
- [ ] Any dependent changes are merged and published

## Additional Notes

Add any other context about the pull request here.

## Screenshots/Recordings

Add screenshots or recordings here if applicable.

---

_By submitting this pull request, I confirm that my contribution is made under the terms of the project's license._


<!-- This is an auto-generated description by cubic. -->
---

## Summary by cubic
Updated wrangler.jsonc to remove the DurableMailbox class from deployment configurations to fix deployment issues.

<!-- End of auto-generated description by cubic. -->
---
 apps/server/wrangler.jsonc | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/apps/server/wrangler.jsonc b/apps/server/wrangler.jsonc
index a29bc28921..34cd860ac7 100644
--- a/apps/server/wrangler.jsonc
+++ b/apps/server/wrangler.jsonc
@@ -74,6 +74,10 @@
           "tag": "v3",
           "new_classes": ["ZeroDB"],
         },
+        {
+          "tag": "v4",
+          "deleted_classes": ["DurableMailbox"],
+        },
       ],
 
       "observability": {
@@ -208,6 +212,10 @@
           "tag": "v4",
           "new_sqlite_classes": ["ZeroAgent"],
         },
+        {
+          "tag": "v5",
+          "deleted_classes": ["DurableMailbox"],
+        },
       ],
       "observability": {
         "enabled": true,
@@ -343,6 +351,10 @@
           "tag": "v4",
           "new_sqlite_classes": ["ZeroAgent"],
         },
+        {
+          "tag": "v5",
+          "deleted_classes": ["DurableMailbox"],
+        },
       ],
       "vars": {
         "NODE_ENV": "production",

From ecb2126ce6f78d290c122907c54f01492c241b07 Mon Sep 17 00:00:00 2001
From: Ahmet Kilinc <akx9@icloud.com>
Date: Sat, 19 Jul 2025 00:57:18 +0100
Subject: [PATCH 04/20] Add auto draft generation (#1645)

# Automatic Email Draft Generation Feature

This PR implements an automatic email draft generation feature that creates AI-powered responses when new emails are received. The system analyzes incoming emails, determines their intent, and generates contextually appropriate draft replies.

The feature includes:

- Smart filtering to skip newsletters, no-reply emails, user's own emails, and old messages
- Intent analysis to categorize emails (questions, requests, meetings, urgent matters)
- Context-aware responses using the full email thread history
- Proper draft formatting with correct recipients and subjects
- Integration with existing ThreadWorkflow after user notification
- Storage of draft references in the summary table

<!-- This is an auto-generated comment: release notes by coderabbit.ai -->
## Summary by CodeRabbit

* **New Features**
  * Introduced automatic draft email generation for Google provider threads, creating suggested replies based on the intent of incoming messages.
  * Drafts are generated only for relevant, recent, and non-automated emails, ensuring responses are contextually appropriate.

* **Bug Fixes**
  * Improved reliability by ensuring database connections remain open throughout the entire thread processing workflow.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
---
 apps/server/src/pipelines.effect.ts           | 102 +++++++++++++++-
 .../server/src/thread-workflow-utils/index.ts | 111 ++++++++++++++++++
 2 files changed, 210 insertions(+), 3 deletions(-)
 create mode 100644 apps/server/src/thread-workflow-utils/index.ts

diff --git a/apps/server/src/pipelines.effect.ts b/apps/server/src/pipelines.effect.ts
index ee9fcf879f..78208bfa6b 100644
--- a/apps/server/src/pipelines.effect.ts
+++ b/apps/server/src/pipelines.effect.ts
@@ -17,12 +17,17 @@ import {
   SummarizeThread,
   ThreadLabels,
 } from './lib/brain.fallback.prompts';
+import {
+  generateAutomaticDraft,
+  shouldGenerateDraft,
+  analyzeEmailIntent,
+} from './thread-workflow-utils';
 import { defaultLabels, EPrompts, EProviders, type ParsedMessage, type Sender } from './types';
 import { getZeroAgent } from './lib/server-utils';
 import { type gmail_v1 } from '@googleapis/gmail';
+import { connection, summary } from './db/schema';
 import { getPromptName } from './pipelines';
 import { env } from 'cloudflare:workers';
-import { connection } from './db/schema';
 import { Effect, Console } from 'effect';
 import * as cheerio from 'cheerio';
 import { eq } from 'drizzle-orm';
@@ -30,7 +35,7 @@ import { createDb } from './db';
 
 const showLogs = true;
 
-const log = (message: string, ...args: any[]) => {
+export const log = (message: string, ...args: any[]) => {
   if (showLogs) {
     console.log(message, ...args);
     return message;
@@ -415,7 +420,6 @@ export const runThreadWorkflow = (
             .select()
             .from(connection)
             .where(eq(connection.id, connectionId.toString()));
-          await conn.end();
           if (!foundConnection) {
             throw new Error(`Connection not found ${connectionId}`);
           }
@@ -448,6 +452,90 @@ export const runThreadWorkflow = (
         return 'Thread has no messages';
       }
 
+      const autoDraftId = yield* Effect.tryPromise({
+        try: async () => {
+          if (!shouldGenerateDraft(thread, foundConnection)) {
+            console.log('[THREAD_WORKFLOW] Skipping draft generation for thread:', threadId);
+            return null;
+          }
+
+          const latestMessage = thread.messages[thread.messages.length - 1];
+          const emailIntent = analyzeEmailIntent(latestMessage);
+
+          console.log('[THREAD_WORKFLOW] Analyzed email intent:', {
+            threadId,
+            isQuestion: emailIntent.isQuestion,
+            isRequest: emailIntent.isRequest,
+            isMeeting: emailIntent.isMeeting,
+            isUrgent: emailIntent.isUrgent,
+          });
+
+          if (
+            !emailIntent.isQuestion &&
+            !emailIntent.isRequest &&
+            !emailIntent.isMeeting &&
+            !emailIntent.isUrgent
+          ) {
+            console.log(
+              '[THREAD_WORKFLOW] Email does not require a response, skipping draft generation',
+            );
+            return null;
+          }
+
+          console.log('[THREAD_WORKFLOW] Generating automatic draft for thread:', threadId);
+          const draftContent = await generateAutomaticDraft(
+            connectionId.toString(),
+            thread,
+            foundConnection,
+          );
+
+          if (draftContent) {
+            const latestMessage = thread.messages[thread.messages.length - 1];
+
+            const replyTo = latestMessage.sender?.email || '';
+            const cc =
+              latestMessage.cc
+                ?.map((r) => r.email)
+                .filter((email) => email && email !== foundConnection.email) || [];
+
+            const originalSubject = latestMessage.subject || '';
+            const replySubject = originalSubject.startsWith('Re: ')
+              ? originalSubject
+              : `Re: ${originalSubject}`;
+
+            const draftData = {
+              to: replyTo,
+              cc: cc.join(', '),
+              bcc: '',
+              subject: replySubject,
+              message: draftContent,
+              attachments: [],
+              id: null,
+              threadId: threadId.toString(),
+              fromEmail: foundConnection.email,
+            };
+
+            try {
+              const createdDraft = await agent.createDraft(draftData);
+              console.log('[THREAD_WORKFLOW] Created automatic draft:', {
+                threadId,
+                draftId: createdDraft?.id,
+              });
+              return createdDraft?.id || null;
+            } catch (error) {
+              console.log('[THREAD_WORKFLOW] Failed to create automatic draft:', {
+                threadId,
+                error: error instanceof Error ? error.message : String(error),
+              });
+              return null;
+            }
+          }
+
+          return null;
+        },
+        catch: (error) => ({ _tag: 'DatabaseError' as const, error }),
+      });
+
       yield* Console.log('[THREAD_WORKFLOW] Processing thread messages and vectorization');
 
       const messagesToVectorize = yield* Effect.tryPromise({
@@ -805,6 +893,14 @@ export const runThreadWorkflow = (
         catch: (error) => ({ _tag: 'DatabaseError' as const, error }),
       }).pipe(Effect.orElse(() => Effect.succeed(null)));
 
+      yield* Effect.tryPromise({
+        try: async () => {
+          await conn.end();
+          console.log('[THREAD_WORKFLOW] Closed database connection');
+        },
+        catch: (error) => ({ _tag: 'DatabaseError' as const, error }),
+      }).pipe(Effect.orElse(() => Effect.succeed(null)));
+
       yield* Console.log('[THREAD_WORKFLOW] Thread processing complete');
       return 'Thread workflow completed successfully';
     } else {
diff --git a/apps/server/src/thread-workflow-utils/index.ts b/apps/server/src/thread-workflow-utils/index.ts
new file mode 100644
index 0000000000..9f8e2f00d5
--- /dev/null
+++ b/apps/server/src/thread-workflow-utils/index.ts
@@ -0,0 +1,111 @@
+import type { IGetThreadResponse } from '../lib/driver/types';
+import { composeEmail } from '../trpc/routes/ai/compose';
+import { type ParsedMessage } from '../types';
+import { log } from '../pipelines.effect';
+import { connection } from '../db/schema';
+
+const shouldGenerateDraft = (
+  thread: IGetThreadResponse,
+  foundConnection: typeof connection.$inferSelect,
+): boolean => {
+  if (!thread.messages || thread.messages.length === 0) return false;
+
+  const latestMessage = thread.messages[thread.messages.length - 1];
+
+  if (latestMessage.sender?.email?.toLowerCase() === foundConnection.email?.toLowerCase()) {
+    return false;
+  }
+
+  if (
+    latestMessage.sender?.email?.toLowerCase().includes('no-reply') ||
+    latestMessage.sender?.email?.toLowerCase().includes('noreply') ||
+    latestMessage.sender?.email?.toLowerCase().includes('donotreply') ||
+    latestMessage.sender?.email?.toLowerCase().includes('do-not-reply') ||
+    latestMessage.subject?.toLowerCase().includes('newsletter') ||
+    latestMessage.subject?.toLowerCase().includes('unsubscribe') ||
+    latestMessage.subject?.toLowerCase().includes('notification') ||
+    latestMessage.decodedBody?.toLowerCase().includes('do not reply') ||
+    latestMessage.decodedBody?.toLowerCase().includes('this is an automated')
+  ) {
+    return false;
+  }
+
+  if (latestMessage.receivedOn) {
+    const messageDate = new Date(latestMessage.receivedOn);
+    const sevenDaysAgo = new Date(Date.now() - 7 * 24 * 60 * 60 * 1000);
+    if (messageDate < sevenDaysAgo) {
+      return false;
+    }
+  }
+
+  return true;
+};
+
+const analyzeEmailIntent = (message: ParsedMessage) => {
+  const content = (message.decodedBody || message.body || '').toLowerCase();
+  const subject = (message.subject || '').toLowerCase();
+
+  return {
+    isQuestion:
+      /\?/.test(content) ||
+      /\b(what|when|where|how|why|can you|could you|would you)\b/.test(content),
+    isRequest: /\b(please|request|need|require|can you|could you|would you mind)\b/.test(content),
+    isMeeting: /\b(meeting|schedule|calendar|appointment|call|zoom|teams|meet)\b/.test(
+      content + ' ' + subject,
+    ),
+    isUrgent: /\b(urgent|asap|immediate|priority|rush)\b/.test(content + ' ' + subject),
+  };
+};
+
+const generateAutomaticDraft = async (
+  connectionId: string,
+  thread: IGetThreadResponse,
+  foundConnection: typeof connection.$inferSelect,
+): Promise<string | null> => {
+  try {
+    const latestMessage = thread.messages[thread.messages.length - 1];
+
+    const emailAnalysis = analyzeEmailIntent(latestMessage);
+
+    let prompt = 'Generate a professional and contextually appropriate reply to this email thread.';
+
+    if (emailAnalysis.isQuestion) {
+      prompt =
+        'This email contains questions. Generate a helpful response that addresses the questions asked. Be thorough but concise.';
+    } else if (emailAnalysis.isRequest) {
+      prompt =
+        'This email contains a request. Generate a response that acknowledges the request and provides next steps or asks for clarification if needed.';
+    } else if (emailAnalysis.isMeeting) {
+      prompt =
+        'This email is about scheduling or meetings. Generate an appropriate response about availability, meeting coordination, or confirmation.';
+    } else if (emailAnalysis.isUrgent) {
+      prompt =
+        'This email appears urgent. Generate a prompt acknowledgment response that addresses the urgency and provides next steps.';
+    }
+
+    const threadMessages = thread.messages.map((message) => ({
+      from: message.sender?.name || message.sender?.email || 'Unknown',
+      to: message.to?.map((r) => r.name || r.email) || [],
+      cc: message.cc?.map((r) => r.name || r.email) || [],
+      subject: message.subject || '',
+      body: message.decodedBody || message.body || '',
+    }));
+
+    const draftContent = await composeEmail({
+      prompt,
+      threadMessages,
+      username: foundConnection.name || foundConnection.email || 'User',
+      connectionId,
+    });
+
+    return draftContent;
+  } catch (error) {
+    log('[THREAD_WORKFLOW] Failed to generate automatic draft:', {
+      connectionId,
+      error: error instanceof Error ? error.message : String(error),
+    });
+    return null;
+  }
+};
+
+export { analyzeEmailIntent, generateAutomaticDraft, shouldGenerateDraft };

From 6637cb973049736547ce6ed5d7d2162a95b3ba74 Mon Sep 17 00:00:00 2001
From: Ayush Sharma <ayush.sharma74892@gmail.com>
Date: Sat, 19 Jul 2025 05:28:19 +0530
Subject: [PATCH 05/20] fix: prevent browser search from triggering on Ctrl+K
 (#1757)

---
 apps/mail/components/context/command-palette-context.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/mail/components/context/command-palette-context.tsx b/apps/mail/components/context/command-palette-context.tsx
index 83e54698ff..e6897a9ef6 100644
--- a/apps/mail/components/context/command-palette-context.tsx
+++ b/apps/mail/components/context/command-palette-context.tsx
@@ -278,8 +278,8 @@ export function CommandPalette({ children }: { children: React.ReactNode }) {
       }
     };
 
-    document.addEventListener('keydown', down);
-    return () => document.removeEventListener('keydown', down);
+    document.addEventListener('keydown', down, { capture: true });
+    return () => document.removeEventListener('keydown', down, { capture: true });
   }, [open, currentView]);
 
   const runCommand = useCallback((command: () => unknown) => {

From e4148d331d7e54ffb7e8d473bdb6f78f67f4e693 Mon Sep 17 00:00:00 2001
From: Adam <13007539+MrgSub@users.noreply.github.com>
Date: Sat, 19 Jul 2025 19:07:46 -0700
Subject: [PATCH 06/20] refactor durable objects (#1764)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Refactor Agent Architecture with Driver/Agent Split

## Description

This PR refactors the agent architecture by splitting the ZeroAgent class into two separate classes: ZeroDriver and ZeroAgent. The ZeroDriver handles mail operations and database interactions, while ZeroAgent focuses on chat functionality. This separation of concerns improves code organization and maintainability.

Key changes:
- Created a new ZeroDriver class to handle mail operations and database interactions
- Modified ZeroAgent to focus on chat functionality
- Updated RPC target from AgentRpcDO to DriverRpcDO
- Fixed variable declarations from `let` to `const` in mail-display.tsx
- Updated environment configuration in wrangler.jsonc to include the new ZeroDriver class

## Type of Change

- [x] ⚡ Performance improvement
- [x] 🎨 UI/UX improvement

## Areas Affected

- [x] Email Integration (Gmail, IMAP, etc.)
- [x] Data Storage/Management
- [x] API Endpoints
- [x] Development Workflow

## Testing Done

- [x] Manual testing performed

## Security Considerations

- [x] No sensitive data is exposed
- [x] Authentication checks are in place

## Checklist

- [x] I have performed a self-review of my code
- [x] I have commented my code, particularly in complex areas
- [x] My changes generate no new warnings

## Additional Notes

This architectural change improves separation of concerns and should make the codebase more maintainable. The ZeroDriver handles all mail-related operations while ZeroAgent focuses on chat functionality, creating a cleaner division of responsibilities.
---
 apps/mail/components/mail/mail-display.tsx |    4 +-
 apps/server/src/lib/server-utils.ts        |    4 +-
 apps/server/src/main.ts                    |    4 +-
 apps/server/src/pipelines.effect.ts        |    2 +-
 apps/server/src/routes/agent/index.ts      | 1085 ++++++++++----------
 apps/server/src/routes/agent/mcp.ts        |    2 +-
 apps/server/src/routes/agent/rpc.ts        |   11 +-
 apps/server/src/routes/agent/tools.ts      |   77 +-
 apps/server/wrangler.jsonc                 |   24 +
 9 files changed, 624 insertions(+), 589 deletions(-)

diff --git a/apps/mail/components/mail/mail-display.tsx b/apps/mail/components/mail/mail-display.tsx
index df2413da16..77c735dee6 100644
--- a/apps/mail/components/mail/mail-display.tsx
+++ b/apps/mail/components/mail/mail-display.tsx
@@ -386,7 +386,7 @@ const downloadAttachment = async (attachment: {
   attachmentId: string;
 }) => {
   try {
-    let attachmentData = attachment.body;
+    const attachmentData = attachment.body;
 
     if (!attachmentData) {
       throw new Error('Attachment data not found');
@@ -475,7 +475,7 @@ const openAttachment = async (attachment: {
   attachmentId: string;
 }) => {
   try {
-    let attachmentData = attachment.body;
+    const attachmentData = attachment.body;
 
     if (!attachmentData) {
       throw new Error('Attachment data not found');
diff --git a/apps/server/src/lib/server-utils.ts b/apps/server/src/lib/server-utils.ts
index 61d6a2dfd6..fe723c8f4a 100644
--- a/apps/server/src/lib/server-utils.ts
+++ b/apps/server/src/lib/server-utils.ts
@@ -11,9 +11,9 @@ export const getZeroDB = (userId: string) => {
 };
 
 export const getZeroAgent = async (connectionId: string) => {
-  const stub = env.ZERO_AGENT.get(env.ZERO_AGENT.idFromName(connectionId));
+  const stub = env.ZERO_DRIVER.get(env.ZERO_DRIVER.idFromName(connectionId));
   const rpcTarget = await stub.setMetaData(connectionId);
-  await rpcTarget.setupAuth(connectionId);
+  await rpcTarget.setupAuth();
   return rpcTarget;
 };
 
diff --git a/apps/server/src/main.ts b/apps/server/src/main.ts
index 697f6cf864..a1f68224dc 100644
--- a/apps/server/src/main.ts
+++ b/apps/server/src/main.ts
@@ -25,13 +25,13 @@ import { defaultUserSettings } from './lib/schemas';
 import { createLocalJWKSet, jwtVerify } from 'jose';
 import { routePartykitRequest } from 'partyserver';
 
+import { ZeroAgent, ZeroDriver } from './routes/agent';
 import { enableBrainFunction } from './lib/brain';
 import { trpcServer } from '@hono/trpc-server';
 import { agentsMiddleware } from 'hono-agents';
 import { ZeroMCP } from './routes/agent/mcp';
 import { publicRouter } from './routes/auth';
 import { autumnApi } from './routes/autumn';
-import { ZeroAgent } from './routes/agent';
 import type { HonoContext } from './ctx';
 import { createDb, type DB } from './db';
 import { createAuth } from './lib/auth';
@@ -789,4 +789,4 @@ export default class extends WorkerEntrypoint<typeof env> {
   }
 }
 
-export { ZeroAgent, ZeroMCP, ZeroDB };
+export { ZeroAgent, ZeroMCP, ZeroDB, ZeroDriver };
diff --git a/apps/server/src/pipelines.effect.ts b/apps/server/src/pipelines.effect.ts
index 78208bfa6b..0d32313b41 100644
--- a/apps/server/src/pipelines.effect.ts
+++ b/apps/server/src/pipelines.effect.ts
@@ -25,9 +25,9 @@ import {
 import { defaultLabels, EPrompts, EProviders, type ParsedMessage, type Sender } from './types';
 import { getZeroAgent } from './lib/server-utils';
 import { type gmail_v1 } from '@googleapis/gmail';
-import { connection, summary } from './db/schema';
 import { getPromptName } from './pipelines';
 import { env } from 'cloudflare:workers';
+import { connection } from './db/schema';
 import { Effect, Console } from 'effect';
 import * as cheerio from 'cheerio';
 import { eq } from 'drizzle-orm';
diff --git a/apps/server/src/routes/agent/index.ts b/apps/server/src/routes/agent/index.ts
index 3d7bfcf805..08058036d1 100644
--- a/apps/server/src/routes/agent/index.ts
+++ b/apps/server/src/routes/agent/index.ts
@@ -31,7 +31,6 @@ import { EPrompts, type IOutgoingMessage, type ParsedMessage } from '../../types
 import type { MailManager, IGetThreadResponse } from '../../lib/driver/types';
 import { connectionToDriver } from '../../lib/server-utils';
 import type { CreateDraftData } from '../../lib/schemas';
-import type { Connection, WSMessage } from 'partyserver';
 import { withRetry } from '../../lib/gmail-rate-limit';
 import { getPrompt } from '../../pipelines.effect';
 import { AIChatAgent } from 'agents/ai-chat-agent';
@@ -40,11 +39,13 @@ import { AiChatPrompt } from '../../lib/prompts';
 import { getPromptName } from '../../pipelines';
 import { anthropic } from '@ai-sdk/anthropic';
 import { connection } from '../../db/schema';
+import type { WSMessage } from 'partyserver';
 import { tools as authTools } from './tools';
 import { processToolCalls } from './utils';
 import { env } from 'cloudflare:workers';
+import type { Connection } from 'agents';
 import { createDb } from '../../db';
-import { AgentRpcDO } from './rpc';
+import { DriverRpcDO } from './rpc';
 import { eq } from 'drizzle-orm';
 import { Effect } from 'effect';
 const decoder = new TextDecoder();
@@ -53,16 +54,20 @@ const shouldDropTables = env.DROP_AGENT_TABLES === 'true';
 const maxCount = parseInt(env.THREAD_SYNC_MAX_COUNT || '10', 10);
 const shouldLoop = env.THREAD_SYNC_LOOP !== 'false';
 
-export class ZeroAgent extends AIChatAgent<typeof env> {
-  private chatMessageAbortControllers: Map<string, AbortController> = new Map();
+export const getZeroDriver = (connectionId: string) =>
+  env.ZERO_DRIVER.get(env.ZERO_DRIVER.idFromName(connectionId));
+
+export class ZeroDriver extends AIChatAgent<typeof env> {
   private foldersInSync: Map<string, boolean> = new Map();
   private syncThreadsInProgress: Map<string, boolean> = new Map();
-  private currentFolder: string | null = 'inbox';
-  driver: MailManager | null = null;
+  private driver: MailManager | null = null;
+  private agent: DurableObjectStub<ZeroAgent> = env.ZERO_AGENT.get(
+    env.ZERO_AGENT.idFromName(this.name),
+  );
   constructor(ctx: DurableObjectState, env: Env) {
     super(ctx, env);
     if (shouldDropTables) this.dropTables();
-    this.sql`
+    void this.sql`
         CREATE TABLE IF NOT EXISTS threads (
             id TEXT PRIMARY KEY,
             created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
@@ -78,556 +83,297 @@ export class ZeroAgent extends AIChatAgent<typeof env> {
     `;
   }
 
-  async dropTables() {
-    return this.sql`       
-        DROP TABLE IF EXISTS threads;`;
-  }
-
   async setMetaData(connectionId: string) {
     await this.setName(connectionId);
-    return new AgentRpcDO(this, connectionId);
+    return new DriverRpcDO(this, connectionId);
   }
 
-  async registerZeroMCP() {
-    await this.mcp.connect(env.VITE_PUBLIC_BACKEND_URL + '/sse', {
-      transport: {
-        authProvider: new DurableObjectOAuthClientProvider(
-          this.ctx.storage,
-          'zero-mcp',
-          env.VITE_PUBLIC_BACKEND_URL,
-        ),
-      },
-    });
+  async markAsRead(threadIds: string[]) {
+    if (!this.driver) {
+      throw new Error('No driver available');
+    }
+    return await this.driver.markAsRead(threadIds);
   }
 
-  onStart(): void | Promise<void> {
-    // this.registerZeroMCP();
+  async markAsUnread(threadIds: string[]) {
+    if (!this.driver) {
+      throw new Error('No driver available');
+    }
+    return await this.driver.markAsUnread(threadIds);
   }
 
-  private getDataStreamResponse(
-    onFinish: StreamTextOnFinishCallback<{}>,
-    _?: {
-      abortSignal: AbortSignal | undefined;
-    },
-  ) {
-    const dataStreamResponse = createDataStreamResponse({
-      execute: async (dataStream) => {
-        const connectionId = this.name;
-        if (connectionId === 'general') return;
-        if (!connectionId || !this.driver) {
-          console.log('Unauthorized no driver or connectionId [1]', connectionId, this.driver);
-          await this.setupAuth(connectionId);
-          if (!connectionId || !this.driver) {
-            console.log('Unauthorized no driver or connectionId', connectionId, this.driver);
-            throw new Error('Unauthorized no driver or connectionId [2]');
-          }
-        }
-        const orchestrator = new ToolOrchestrator(dataStream, connectionId);
-        // const mcpTools = await this.mcp.unstable_getAITools();
+  async normalizeIds(ids: string[]) {
+    if (!this.driver) {
+      throw new Error('No driver available');
+    }
+    return this.driver.normalizeIds(ids);
+  }
 
-        const rawTools = {
-          ...(await authTools(this, connectionId)),
-        };
-        const tools = orchestrator.processTools({});
-        const processedMessages = await processToolCalls(
-          {
-            messages: this.messages,
-            dataStream,
-            tools,
-          },
-          {},
-        );
+  async sendDraft(id: string, data: IOutgoingMessage) {
+    if (!this.driver) {
+      throw new Error('No driver available');
+    }
+    return await this.driver.sendDraft(id, data);
+  }
 
-        const result = streamText({
-          model: anthropic(env.OPENAI_MODEL || 'claude-3-5-haiku-latest'),
-          maxSteps: 10,
-          messages: processedMessages,
-          tools: rawTools,
-          onFinish,
-          onError: (error) => {
-            console.error('Error in streamText', error);
-          },
-          system: await getPrompt(getPromptName(connectionId, EPrompts.Chat), AiChatPrompt('')),
-        });
+  async create(data: IOutgoingMessage) {
+    if (!this.driver) {
+      throw new Error('No driver available');
+    }
+    return await this.driver.create(data);
+  }
 
-        result.mergeIntoDataStream(dataStream);
-      },
-    });
+  async delete(id: string) {
+    if (!this.driver) {
+      throw new Error('No driver available');
+    }
+    return await this.driver.delete(id);
+  }
 
-    return dataStreamResponse;
+  async deleteAllSpam() {
+    if (!this.driver) {
+      throw new Error('No driver available');
+    }
+    return await this.driver.deleteAllSpam();
   }
 
-  public async setupAuth(connectionId: string) {
-    if (connectionId === 'general') return;
+  async getEmailAliases() {
+    if (!this.driver) {
+      throw new Error('No driver available');
+    }
+    return await this.driver.getEmailAliases();
+  }
+
+  async getMessageAttachments(messageId: string) {
+    if (!this.driver) {
+      throw new Error('No driver available');
+    }
+    return await this.driver.getMessageAttachments(messageId);
+  }
+
+  async onConnect() {
+    await this.setupAuth();
+  }
+
+  public async setupAuth() {
+    if (this.name === 'general') return;
     if (!this.driver) {
       const { db, conn } = createDb(env.HYPERDRIVE.connectionString);
       const _connection = await db.query.connection.findFirst({
-        where: eq(connection.id, connectionId),
+        where: eq(connection.id, this.name),
       });
       if (_connection) this.driver = connectionToDriver(_connection);
       this.ctx.waitUntil(conn.end());
       this.ctx.waitUntil(this.syncThreads('inbox'));
-      this.ctx.waitUntil(this.syncThreads('sent'));
-      this.ctx.waitUntil(this.syncThreads('spam'));
-      this.ctx.waitUntil(this.syncThreads('archive'));
+      // this.ctx.waitUntil(this.syncThreads('sent'));
+      // this.ctx.waitUntil(this.syncThreads('spam'));
+      // this.ctx.waitUntil(this.syncThreads('archive'));
     }
   }
 
-  private async tryCatchChat<T>(fn: () => T | Promise<T>) {
-    try {
-      return await fn();
-    } catch (e) {
-      throw this.onError(e);
+  async rawListThreads(params: {
+    folder: string;
+    query?: string;
+    maxResults?: number;
+    labelIds?: string[];
+    pageToken?: string;
+  }) {
+    if (!this.driver) {
+      throw new Error('No driver available');
     }
+    return await this.driver.list(params);
   }
 
-  private getAbortSignal(id: string): AbortSignal | undefined {
-    // Defensive check, since we're coercing message types at the moment
-    if (typeof id !== 'string') {
-      return undefined;
+  async getThread(threadId: string) {
+    if (!this.driver) {
+      throw new Error('No driver available');
     }
+    return await this.getThreadFromDB(threadId);
+  }
 
-    if (!this.chatMessageAbortControllers.has(id)) {
-      this.chatMessageAbortControllers.set(id, new AbortController());
+  async markThreadsRead(threadIds: string[]) {
+    if (!this.driver) {
+      throw new Error('No driver available');
     }
-
-    return this.chatMessageAbortControllers.get(id)?.signal;
+    return await this.driver.modifyLabels(threadIds, {
+      addLabels: [],
+      removeLabels: ['UNREAD'],
+    });
   }
 
-  /**
-   * Remove an abort controller from the cache of pending message responses
-   */
-  private removeAbortController(id: string) {
-    this.chatMessageAbortControllers.delete(id);
+  async markThreadsUnread(threadIds: string[]) {
+    if (!this.driver) {
+      throw new Error('No driver available');
+    }
+    return await this.driver.modifyLabels(threadIds, {
+      addLabels: ['UNREAD'],
+      removeLabels: [],
+    });
   }
 
-  private broadcastChatMessage(message: OutgoingMessage, exclude?: string[]) {
-    this.broadcast(JSON.stringify(message), exclude);
+  async modifyLabels(threadIds: string[], addLabelIds: string[], removeLabelIds: string[]) {
+    if (!this.driver) {
+      throw new Error('No driver available');
+    }
+    return await this.driver.modifyLabels(threadIds, {
+      addLabels: addLabelIds,
+      removeLabels: removeLabelIds,
+    });
   }
 
-  private cancelChatRequest(id: string) {
-    if (this.chatMessageAbortControllers.has(id)) {
-      const abortController = this.chatMessageAbortControllers.get(id);
-      abortController?.abort();
+  async listHistory<T>(historyId: string) {
+    if (!this.driver) {
+      throw new Error('No driver available');
     }
+    return await this.driver.listHistory<T>(historyId);
   }
 
-  async onMessage(connection: Connection, message: WSMessage) {
-    if (typeof message === 'string') {
-      let data: IncomingMessage;
-      try {
-        data = JSON.parse(message) as IncomingMessage;
-      } catch (error) {
-        console.warn(error);
-        // silently ignore invalid messages for now
-        // TODO: log errors with log levels
-        return;
-      }
-      switch (data.type) {
-        case IncomingMessageType.UseChatRequest: {
-          if (data.init.method !== 'POST') break;
+  async getUserLabels() {
+    if (!this.driver) {
+      throw new Error('No driver available');
+    }
+    return await this.driver.getUserLabels();
+  }
 
-          const { body } = data.init;
+  async getLabel(id: string) {
+    if (!this.driver) {
+      throw new Error('No driver available');
+    }
+    return await this.driver.getLabel(id);
+  }
 
-          const { messages } = JSON.parse(body as string);
-          this.broadcastChatMessage(
-            {
-              type: OutgoingMessageType.ChatMessages,
-              messages,
-            },
-            [connection.id],
-          );
-          await this.persistMessages(messages, [connection.id]);
+  async createLabel(params: {
+    name: string;
+    color?: {
+      backgroundColor: string;
+      textColor: string;
+    };
+  }) {
+    if (!this.driver) {
+      throw new Error('No driver available');
+    }
+    return await this.driver.createLabel(params);
+  }
 
-          const chatMessageId = data.id;
-          const abortSignal = this.getAbortSignal(chatMessageId);
+  async bulkDelete(threadIds: string[]) {
+    if (!this.driver) {
+      throw new Error('No driver available');
+    }
+    return await this.driver.modifyLabels(threadIds, {
+      addLabels: ['TRASH'],
+      removeLabels: ['INBOX'],
+    });
+  }
 
-          return this.tryCatchChat(async () => {
-            const response = await this.onChatMessage(
-              async ({ response }) => {
-                const finalMessages = appendResponseMessages({
-                  messages,
-                  responseMessages: response.messages,
-                });
+  async bulkArchive(threadIds: string[]) {
+    if (!this.driver) {
+      throw new Error('No driver available');
+    }
+    return await this.driver.modifyLabels(threadIds, {
+      addLabels: [],
+      removeLabels: ['INBOX'],
+    });
+  }
 
-                await this.persistMessages(finalMessages, [connection.id]);
-                this.removeAbortController(chatMessageId);
-              },
-              abortSignal ? { abortSignal } : undefined,
-            );
-
-            if (response) {
-              await this.reply(data.id, response);
-            } else {
-              console.warn(
-                `[AIChatAgent] onChatMessage returned no response for chatMessageId: ${chatMessageId}`,
-              );
-              this.broadcastChatMessage(
-                {
-                  id: data.id,
-                  type: OutgoingMessageType.UseChatResponse,
-                  body: 'No response was generated by the agent.',
-                  done: true,
-                },
-                [connection.id],
-              );
-            }
-          });
-        }
-        case IncomingMessageType.ChatClear: {
-          this.destroyAbortControllers();
-          this.sql`delete from cf_ai_chat_agent_messages`;
-          this.messages = [];
-          this.broadcastChatMessage(
-            {
-              type: OutgoingMessageType.ChatClear,
-            },
-            [connection.id],
-          );
-          break;
-        }
-        case IncomingMessageType.ChatMessages: {
-          await this.persistMessages(data.messages, [connection.id]);
-          break;
-        }
-        case IncomingMessageType.ChatRequestCancel: {
-          this.cancelChatRequest(data.id);
-          break;
-        }
-        // case IncomingMessageType.Mail_List: {
-        //   const result = await this.getThreadsFromDB({
-        //     labelIds: data.labelIds,
-        //     folder: data.folder,
-        //     q: data.query,
-        //     max: data.maxResults,
-        //     cursor: data.pageToken,
-        //   });
-        //   this.currentFolder = data.folder;
-        //   connection.send(
-        //     JSON.stringify({
-        //       type: OutgoingMessageType.Mail_List,
-        //       result,
-        //     }),
-        //   );
-        //   break;
-        // }
-        // case IncomingMessageType.Mail_Get: {
-        //   const result = await this.getThreadFromDB(data.threadId);
-        //   connection.send(
-        //     JSON.stringify({
-        //       type: OutgoingMessageType.Mail_Get,
-        //       result,
-        //       threadId: data.threadId,
-        //     }),
-        //   );
-        //   break;
-        // }
-      }
-    }
-  }
-
-  private async reply(id: string, response: Response) {
-    // now take chunks out from dataStreamResponse and send them to the client
-    return this.tryCatchChat(async () => {
-      for await (const chunk of response.body!) {
-        const body = decoder.decode(chunk);
-
-        this.broadcastChatMessage({
-          id,
-          type: OutgoingMessageType.UseChatResponse,
-          body,
-          done: false,
-        });
-      }
-
-      this.broadcastChatMessage({
-        id,
-        type: OutgoingMessageType.UseChatResponse,
-        body: '',
-        done: true,
-      });
-    });
-  }
-
-  async onConnect() {
-    await this.setupAuth(this.name);
-  }
-
-  private destroyAbortControllers() {
-    for (const controller of this.chatMessageAbortControllers.values()) {
-      controller?.abort();
-    }
-    this.chatMessageAbortControllers.clear();
-  }
-
-  async onChatMessage(
-    onFinish: StreamTextOnFinishCallback<{}>,
-    options?: {
-      abortSignal: AbortSignal | undefined;
-    },
+  async updateLabel(
+    id: string,
+    label: { name: string; color?: { backgroundColor: string; textColor: string } },
   ) {
-    return this.getDataStreamResponse(onFinish, options);
-  }
-
-  async listThreads(params: {
-    folder: string;
-    query?: string;
-    maxResults?: number;
-    labelIds?: string[];
-    pageToken?: string;
-  }) {
     if (!this.driver) {
       throw new Error('No driver available');
     }
-    return await this.getThreadsFromDB(params);
+    return await this.driver.updateLabel(id, label);
   }
 
-  async rawListThreads(params: {
-    folder: string;
-    query?: string;
-    maxResults?: number;
-    labelIds?: string[];
-    pageToken?: string;
-  }) {
+  async deleteLabel(id: string) {
     if (!this.driver) {
       throw new Error('No driver available');
     }
-    return await this.driver.list(params);
+    return await this.driver.deleteLabel(id);
   }
 
-  async getThread(threadId: string) {
+  async createDraft(draftData: CreateDraftData) {
     if (!this.driver) {
       throw new Error('No driver available');
     }
-    return await this.getThreadFromDB(threadId);
+    return await this.driver.createDraft(draftData);
   }
 
-  async markThreadsRead(threadIds: string[]) {
+  async getDraft(id: string) {
     if (!this.driver) {
       throw new Error('No driver available');
     }
-    return await this.driver.modifyLabels(threadIds, {
-      addLabels: [],
-      removeLabels: ['UNREAD'],
-    });
+    return await this.driver.getDraft(id);
   }
 
-  async markThreadsUnread(threadIds: string[]) {
+  async listDrafts(params: { q?: string; maxResults?: number; pageToken?: string }) {
     if (!this.driver) {
       throw new Error('No driver available');
     }
-    return await this.driver.modifyLabels(threadIds, {
-      addLabels: ['UNREAD'],
-      removeLabels: [],
-    });
+    return await this.driver.listDrafts(params);
   }
 
-  async modifyLabels(threadIds: string[], addLabelIds: string[], removeLabelIds: string[]) {
+  // Additional mail operations
+  async count() {
     if (!this.driver) {
       throw new Error('No driver available');
     }
-    return await this.driver.modifyLabels(threadIds, {
-      addLabels: addLabelIds,
-      removeLabels: removeLabelIds,
-    });
+    return await this.driver.count();
   }
 
-  async listHistory<T>(historyId: string) {
-    if (!this.driver) {
-      throw new Error('No driver available');
-    }
-    return await this.driver.listHistory<T>(historyId);
-  }
+  private async listWithRetry(params: Parameters<MailManager['list']>[0]) {
+    if (!this.driver) throw new Error('No driver available');
 
-  async getUserLabels() {
-    if (!this.driver) {
-      throw new Error('No driver available');
-    }
-    return await this.driver.getUserLabels();
+    return Effect.runPromise(withRetry(Effect.tryPromise(() => this.driver!.list(params))));
   }
 
-  async getLabel(id: string) {
-    if (!this.driver) {
-      throw new Error('No driver available');
-    }
-    return await this.driver.getLabel(id);
-  }
+  private async getWithRetry(threadId: string): Promise<IGetThreadResponse> {
+    if (!this.driver) throw new Error('No driver available');
 
-  async createLabel(params: {
-    name: string;
-    color?: {
-      backgroundColor: string;
-      textColor: string;
-    };
-  }) {
-    if (!this.driver) {
-      throw new Error('No driver available');
-    }
-    return await this.driver.createLabel(params);
+    return Effect.runPromise(withRetry(Effect.tryPromise(() => this.driver!.get(threadId))));
   }
 
-  async bulkDelete(threadIds: string[]) {
-    if (!this.driver) {
-      throw new Error('No driver available');
-    }
-    return await this.driver.modifyLabels(threadIds, {
-      addLabels: ['TRASH'],
-      removeLabels: ['INBOX'],
-    });
+  private getThreadKey(threadId: string) {
+    return `${this.name}/${threadId}.json`;
   }
 
-  async bulkArchive(threadIds: string[]) {
-    if (!this.driver) {
-      throw new Error('No driver available');
-    }
-    return await this.driver.modifyLabels(threadIds, {
-      addLabels: [],
-      removeLabels: ['INBOX'],
-    });
-  }
+  async *streamThreads(folder: string) {
+    let pageToken: string | null = null;
+    let hasMore = true;
 
-  async updateLabel(
-    id: string,
-    label: { name: string; color?: { backgroundColor: string; textColor: string } },
-  ) {
-    if (!this.driver) {
-      throw new Error('No driver available');
+    while (hasMore) {
+      // Rate limiting delay
+      await new Promise((resolve) => setTimeout(resolve, 2000));
+
+      const result = await this.listWithRetry({
+        folder,
+        maxResults: maxCount, // Smaller batches for streaming
+        pageToken: pageToken || undefined,
+      });
+
+      // Stream each thread individually
+      for (const thread of result.threads) {
+        yield thread;
+      }
+
+      pageToken = result.nextPageToken;
+      hasMore = pageToken !== null && shouldLoop;
     }
-    return await this.driver.updateLabel(id, label);
   }
 
-  async deleteLabel(id: string) {
-    if (!this.driver) {
-      throw new Error('No driver available');
-    }
-    return await this.driver.deleteLabel(id);
+  async dropTables() {
+    return this.sql`
+        DROP TABLE IF EXISTS threads;`;
   }
 
-  async createDraft(draftData: CreateDraftData) {
+  async syncThread({ threadId }: { threadId: string }) {
+    if (this.name === 'general') return;
     if (!this.driver) {
-      throw new Error('No driver available');
+      await this.setupAuth();
     }
-    return await this.driver.createDraft(draftData);
-  }
 
-  async getDraft(id: string) {
     if (!this.driver) {
-      throw new Error('No driver available');
-    }
-    return await this.driver.getDraft(id);
-  }
-
-  async listDrafts(params: { q?: string; maxResults?: number; pageToken?: string }) {
-    if (!this.driver) {
-      throw new Error('No driver available');
-    }
-    return await this.driver.listDrafts(params);
-  }
-
-  // Additional mail operations
-  async count() {
-    if (!this.driver) {
-      throw new Error('No driver available');
-    }
-    return await this.driver.count();
-  }
-
-  async list(params: {
-    folder: string;
-    query?: string;
-    maxResults?: number;
-    labelIds?: string[];
-    pageToken?: string;
-  }) {
-    if (!this.driver) {
-      throw new Error('No driver available');
-    }
-    return await this.getThreadsFromDB(params);
-  }
-
-  async markAsRead(threadIds: string[]) {
-    if (!this.driver) {
-      throw new Error('No driver available');
-    }
-    return await this.driver.markAsRead(threadIds);
-  }
-
-  async markAsUnread(threadIds: string[]) {
-    if (!this.driver) {
-      throw new Error('No driver available');
-    }
-    return await this.driver.markAsUnread(threadIds);
-  }
-
-  async normalizeIds(ids: string[]) {
-    if (!this.driver) {
-      throw new Error('No driver available');
-    }
-    return this.driver.normalizeIds(ids);
-  }
-
-  async get(id: string) {
-    if (!this.driver) {
-      throw new Error('No driver available');
-    }
-    return await this.getThreadFromDB(id);
-  }
-
-  async sendDraft(id: string, data: IOutgoingMessage) {
-    if (!this.driver) {
-      throw new Error('No driver available');
-    }
-    return await this.driver.sendDraft(id, data);
-  }
-
-  async create(data: IOutgoingMessage) {
-    if (!this.driver) {
-      throw new Error('No driver available');
-    }
-    return await this.driver.create(data);
-  }
-
-  async delete(id: string) {
-    if (!this.driver) {
-      throw new Error('No driver available');
-    }
-    return await this.driver.delete(id);
-  }
-
-  async deleteAllSpam() {
-    if (!this.driver) {
-      throw new Error('No driver available');
-    }
-    return await this.driver.deleteAllSpam();
-  }
-
-  async getEmailAliases() {
-    if (!this.driver) {
-      throw new Error('No driver available');
-    }
-    return await this.driver.getEmailAliases();
-  }
-
-  async getMessageAttachments(messageId: string) {
-    if (!this.driver) {
-      throw new Error('No driver available');
-    }
-    return await this.driver.getMessageAttachments(messageId);
-  }
-
-  async getThreadCount() {
-    const count = this.sql`SELECT COUNT(*) FROM threads`;
-    return count[0]['COUNT(*)'] as number;
-  }
-
-  async syncThread({ threadId }: { threadId: string }) {
-    if (this.name === 'general') return;
-    if (!this.driver) {
-      await this.setupAuth(this.name);
-    }
-
-    if (!this.driver) {
-      console.error('No driver available for syncThread');
+      console.error('No driver available for syncThread');
       throw new Error('No driver available');
     }
 
@@ -652,14 +398,14 @@ export class ZeroAgent extends AIChatAgent<typeof env> {
           },
         });
 
-        this.sql`
+        void this.sql`
           INSERT OR REPLACE INTO threads (
-            id, 
-            thread_id, 
-            provider_id,  
-            latest_sender, 
-            latest_received_on, 
-            latest_subject, 
+            id,
+            thread_id,
+            provider_id,
+            latest_sender,
+            latest_received_on,
+            latest_subject,
             latest_label_ids,
             updated_at
           ) VALUES (
@@ -673,12 +419,10 @@ export class ZeroAgent extends AIChatAgent<typeof env> {
             CURRENT_TIMESTAMP
           )
         `;
-        if (this.currentFolder === 'inbox') {
-          this.broadcastChatMessage({
-            type: OutgoingMessageType.Mail_Get,
-            threadId,
-          });
-        }
+        this.agent.broadcastChatMessage({
+          type: OutgoingMessageType.Mail_Get,
+          threadId,
+        });
         this.syncThreadsInProgress.delete(threadId);
         console.log('Server: syncThread result', {
           threadId,
@@ -697,47 +441,9 @@ export class ZeroAgent extends AIChatAgent<typeof env> {
     }
   }
 
-  getThreadKey(threadId: string) {
-    return `${this.name}/${threadId}.json`;
-  }
-
-  private async listWithRetry(params: Parameters<MailManager['list']>[0]) {
-    if (!this.driver) throw new Error('No driver available');
-
-    return Effect.runPromise(withRetry(Effect.tryPromise(() => this.driver!.list(params))));
-  }
-
-  private async getWithRetry(threadId: string): Promise<IGetThreadResponse> {
-    if (!this.driver) throw new Error('No driver available');
-
-    return Effect.runPromise(withRetry(Effect.tryPromise(() => this.driver!.get(threadId))));
-  }
-
-  async *streamThreads(folder: string) {
-    let pageToken: string | null = null;
-    let hasMore = true;
-    let _pageCount = 0;
-
-    while (hasMore) {
-      _pageCount++;
-
-      // Rate limiting delay
-      await new Promise((resolve) => setTimeout(resolve, 2000));
-
-      const result = await this.listWithRetry({
-        folder,
-        maxResults: maxCount, // Smaller batches for streaming
-        pageToken: pageToken || undefined,
-      });
-
-      // Stream each thread individually
-      for (const thread of result.threads) {
-        yield thread;
-      }
-
-      pageToken = result.nextPageToken;
-      hasMore = pageToken !== null && shouldLoop;
-    }
+  async getThreadCount() {
+    const count = this.sql`SELECT COUNT(*) FROM threads`;
+    return count[0]['COUNT(*)'] as number;
   }
 
   async syncThreads(folder: string) {
@@ -773,7 +479,7 @@ export class ZeroAgent extends AIChatAgent<typeof env> {
         }
 
         // // Broadcast progress after each thread
-        // this.broadcastChatMessage({
+        // this.agent.broadcastChatMessage({
         //   type: OutgoingMessageType.Mail_List,
         //   folder,
         // });
@@ -786,7 +492,7 @@ export class ZeroAgent extends AIChatAgent<typeof env> {
     } finally {
       console.log('Setting isSyncing to false');
       this.foldersInSync.delete(folder);
-      this.broadcastChatMessage({
+      this.agent.broadcastChatMessage({
         type: OutgoingMessageType.Mail_List,
         folder,
       });
@@ -923,7 +629,7 @@ export class ZeroAgent extends AIChatAgent<typeof env> {
 
       if (whereConditions.length === 0) {
         // No conditions
-        result = await this.sql`
+        result = this.sql`
             SELECT id, latest_received_on
             FROM threads
             ORDER BY latest_received_on DESC
@@ -934,7 +640,7 @@ export class ZeroAgent extends AIChatAgent<typeof env> {
         const condition = whereConditions[0];
         if (condition.includes('latest_received_on <')) {
           const cursorValue = pageToken!;
-          result = await this.sql`
+          result = this.sql`
               SELECT id, latest_received_on
               FROM threads
               WHERE latest_received_on < ${cursorValue}
@@ -944,7 +650,7 @@ export class ZeroAgent extends AIChatAgent<typeof env> {
         } else if (folder) {
           // Folder condition
           const folderLabel = folder.toUpperCase();
-          result = await this.sql`
+          result = this.sql`
               SELECT id, latest_received_on
               FROM threads
               WHERE EXISTS (
@@ -956,7 +662,7 @@ export class ZeroAgent extends AIChatAgent<typeof env> {
         } else {
           // Single label condition
           const labelId = labelIds[0];
-          result = await this.sql`
+          result = this.sql`
               SELECT id, latest_received_on
               FROM threads
               WHERE EXISTS (
@@ -971,7 +677,7 @@ export class ZeroAgent extends AIChatAgent<typeof env> {
         if (folder && labelIds.length === 0 && pageToken) {
           // Folder + cursor
           const folderLabel = folder.toUpperCase();
-          result = await this.sql`
+          result = this.sql`
               SELECT id, latest_received_on
               FROM threads
               WHERE EXISTS (
@@ -983,7 +689,7 @@ export class ZeroAgent extends AIChatAgent<typeof env> {
         } else if (labelIds.length === 1 && pageToken && !folder) {
           // Single label + cursor
           const labelId = labelIds[0];
-          result = await this.sql`
+          result = this.sql`
               SELECT id, latest_received_on
               FROM threads
               WHERE EXISTS (
@@ -995,7 +701,7 @@ export class ZeroAgent extends AIChatAgent<typeof env> {
         } else {
           // For now, fallback to just cursor if complex combinations
           const cursorValue = pageToken || '';
-          result = await this.sql`
+          result = this.sql`
               SELECT id, latest_received_on
               FROM threads
               WHERE latest_received_on < ${cursorValue}
@@ -1005,20 +711,26 @@ export class ZeroAgent extends AIChatAgent<typeof env> {
         }
       }
 
-      const threads = result.map((row: any) => ({
-        id: row.id,
-        historyId: null,
-      }));
-
-      // Use latest_received_on for pagination cursor
-      const nextPageToken =
-        threads.length === maxResults && result.length > 0
-          ? result[result.length - 1].latest_received_on
-          : null;
-
+      if (result?.length) {
+        const threads = result.map((row) => ({
+          id: row.id,
+          historyId: null,
+        }));
+
+        // Use latest_received_on for pagination cursor
+        const nextPageToken =
+          threads.length === maxResults && result.length > 0
+            ? result[result.length - 1].latest_received_on
+            : null;
+
+        return {
+          threads,
+          nextPageToken,
+        };
+      }
       return {
-        threads,
-        nextPageToken,
+        threads: [],
+        nextPageToken: '',
       };
     } catch (error) {
       console.error('Failed to get threads from database:', error);
@@ -1051,7 +763,7 @@ export class ZeroAgent extends AIChatAgent<typeof env> {
         await this.syncThread({ threadId: id });
         return this.getThreadFromDB(id, true);
       }
-      const row = result[0] as any;
+      const row = result[0] as { latest_label_ids: string };
       const storedThread = await env.THREADS_BUCKET.get(this.getThreadKey(id));
 
       const messages: ParsedMessage[] = storedThread
@@ -1072,4 +784,295 @@ export class ZeroAgent extends AIChatAgent<typeof env> {
       throw error;
     }
   }
+
+  async listThreads(params: {
+    folder: string;
+    query?: string;
+    maxResults?: number;
+    labelIds?: string[];
+    pageToken?: string;
+  }) {
+    if (!this.driver) {
+      throw new Error('No driver available');
+    }
+    return await this.getThreadsFromDB(params);
+  }
+
+  async list(params: {
+    folder: string;
+    query?: string;
+    maxResults?: number;
+    labelIds?: string[];
+    pageToken?: string;
+  }) {
+    if (!this.driver) {
+      throw new Error('No driver available');
+    }
+    return await this.getThreadsFromDB(params);
+  }
+
+  async get(id: string) {
+    if (!this.driver) {
+      throw new Error('No driver available');
+    }
+    return await this.getThreadFromDB(id);
+  }
+}
+
+export class ZeroAgent extends AIChatAgent<typeof env> {
+  private chatMessageAbortControllers: Map<string, AbortController> = new Map();
+  private driver: DurableObjectStub<ZeroDriver> = getZeroDriver(this.name);
+
+  async registerZeroMCP() {
+    await this.mcp.connect(env.VITE_PUBLIC_BACKEND_URL + '/sse', {
+      transport: {
+        authProvider: new DurableObjectOAuthClientProvider(
+          this.ctx.storage,
+          'zero-mcp',
+          env.VITE_PUBLIC_BACKEND_URL,
+        ),
+      },
+    });
+  }
+
+  onStart(): void | Promise<void> {
+    // this.registerZeroMCP();
+  }
+
+  private getDataStreamResponse(
+    onFinish: StreamTextOnFinishCallback<{}>,
+    _?: {
+      abortSignal: AbortSignal | undefined;
+    },
+  ) {
+    const dataStreamResponse = createDataStreamResponse({
+      execute: async (dataStream) => {
+        if (this.name === 'general') return;
+        const connectionId = this.name;
+        const orchestrator = new ToolOrchestrator(dataStream, connectionId);
+        // const mcpTools = await this.mcp.unstable_getAITools();
+
+        const rawTools = {
+          ...(await authTools(connectionId)),
+        };
+        const tools = orchestrator.processTools({});
+        const processedMessages = await processToolCalls(
+          {
+            messages: this.messages,
+            dataStream,
+            tools,
+          },
+          {},
+        );
+
+        const result = streamText({
+          model: anthropic(env.OPENAI_MODEL || 'claude-3-5-haiku-latest'),
+          maxSteps: 10,
+          messages: processedMessages,
+          tools: rawTools,
+          onFinish,
+          onError: (error) => {
+            console.error('Error in streamText', error);
+          },
+          system: await getPrompt(getPromptName(connectionId, EPrompts.Chat), AiChatPrompt('')),
+        });
+
+        result.mergeIntoDataStream(dataStream);
+      },
+    });
+
+    return dataStreamResponse;
+  }
+
+  private async tryCatchChat<T>(fn: () => T | Promise<T>) {
+    try {
+      return await fn();
+    } catch (e) {
+      throw this.onError(e);
+    }
+  }
+
+  private getAbortSignal(id: string): AbortSignal | undefined {
+    // Defensive check, since we're coercing message types at the moment
+    if (typeof id !== 'string') {
+      return undefined;
+    }
+
+    if (!this.chatMessageAbortControllers.has(id)) {
+      this.chatMessageAbortControllers.set(id, new AbortController());
+    }
+
+    return this.chatMessageAbortControllers.get(id)?.signal;
+  }
+
+  /**
+   * Remove an abort controller from the cache of pending message responses
+   */
+  private removeAbortController(id: string) {
+    this.chatMessageAbortControllers.delete(id);
+  }
+
+  broadcastChatMessage(message: OutgoingMessage, exclude?: string[]) {
+    this.broadcast(JSON.stringify(message), exclude);
+  }
+
+  private cancelChatRequest(id: string) {
+    if (this.chatMessageAbortControllers.has(id)) {
+      const abortController = this.chatMessageAbortControllers.get(id);
+      abortController?.abort();
+    }
+  }
+
+  async onMessage(connection: Connection, message: WSMessage) {
+    if (typeof message === 'string') {
+      let data: IncomingMessage;
+      try {
+        data = JSON.parse(message) as IncomingMessage;
+      } catch (error) {
+        console.warn(error);
+        // silently ignore invalid messages for now
+        // TODO: log errors with log levels
+        return;
+      }
+      switch (data.type) {
+        case IncomingMessageType.UseChatRequest: {
+          if (data.init.method !== 'POST') break;
+
+          const { body } = data.init;
+
+          const { messages } = JSON.parse(body as string);
+          this.broadcastChatMessage(
+            {
+              type: OutgoingMessageType.ChatMessages,
+              messages,
+            },
+            [connection.id],
+          );
+          await this.persistMessages(messages, [connection.id]);
+
+          const chatMessageId = data.id;
+          const abortSignal = this.getAbortSignal(chatMessageId);
+
+          return this.tryCatchChat(async () => {
+            const response = await this.onChatMessage(
+              async ({ response }) => {
+                const finalMessages = appendResponseMessages({
+                  messages,
+                  responseMessages: response.messages,
+                });
+
+                await this.persistMessages(finalMessages, [connection.id]);
+                this.removeAbortController(chatMessageId);
+              },
+              abortSignal ? { abortSignal } : undefined,
+            );
+
+            if (response) {
+              await this.reply(data.id, response);
+            } else {
+              console.warn(
+                `[AIChatAgent] onChatMessage returned no response for chatMessageId: ${chatMessageId}`,
+              );
+              this.broadcastChatMessage(
+                {
+                  id: data.id,
+                  type: OutgoingMessageType.UseChatResponse,
+                  body: 'No response was generated by the agent.',
+                  done: true,
+                },
+                [connection.id],
+              );
+            }
+          });
+        }
+        case IncomingMessageType.ChatClear: {
+          this.destroyAbortControllers();
+          void this.sql`delete from cf_ai_chat_agent_messages`;
+          this.messages = [];
+          this.broadcastChatMessage(
+            {
+              type: OutgoingMessageType.ChatClear,
+            },
+            [connection.id],
+          );
+          break;
+        }
+        case IncomingMessageType.ChatMessages: {
+          await this.persistMessages(data.messages, [connection.id]);
+          break;
+        }
+        case IncomingMessageType.ChatRequestCancel: {
+          this.cancelChatRequest(data.id);
+          break;
+        }
+        // case IncomingMessageType.Mail_List: {
+        //   const result = await this.getThreadsFromDB({
+        //     labelIds: data.labelIds,
+        //     folder: data.folder,
+        //     q: data.query,
+        //     max: data.maxResults,
+        //     cursor: data.pageToken,
+        //   });
+        //   this.currentFolder = data.folder;
+        //   connection.send(
+        //     JSON.stringify({
+        //       type: OutgoingMessageType.Mail_List,
+        //       result,
+        //     }),
+        //   );
+        //   break;
+        // }
+        // case IncomingMessageType.Mail_Get: {
+        //   const result = await this.getThreadFromDB(data.threadId);
+        //   connection.send(
+        //     JSON.stringify({
+        //       type: OutgoingMessageType.Mail_Get,
+        //       result,
+        //       threadId: data.threadId,
+        //     }),
+        //   );
+        //   break;
+        // }
+      }
+    }
+  }
+
+  private async reply(id: string, response: Response) {
+    // now take chunks out from dataStreamResponse and send them to the client
+    return this.tryCatchChat(async () => {
+      for await (const chunk of response.body!) {
+        const body = decoder.decode(chunk);
+
+        this.broadcastChatMessage({
+          id,
+          type: OutgoingMessageType.UseChatResponse,
+          body,
+          done: false,
+        });
+      }
+
+      this.broadcastChatMessage({
+        id,
+        type: OutgoingMessageType.UseChatResponse,
+        body: '',
+        done: true,
+      });
+    });
+  }
+
+  private destroyAbortControllers() {
+    for (const controller of this.chatMessageAbortControllers.values()) {
+      controller?.abort();
+    }
+    this.chatMessageAbortControllers.clear();
+  }
+
+  async onChatMessage(
+    onFinish: StreamTextOnFinishCallback<{}>,
+    options?: {
+      abortSignal: AbortSignal | undefined;
+    },
+  ) {
+    return this.getDataStreamResponse(onFinish, options);
+  }
 }
diff --git a/apps/server/src/routes/agent/mcp.ts b/apps/server/src/routes/agent/mcp.ts
index 5f1b713798..19ed751471 100644
--- a/apps/server/src/routes/agent/mcp.ts
+++ b/apps/server/src/routes/agent/mcp.ts
@@ -166,7 +166,7 @@ export class ZeroMCP extends McpAgent<typeof env, Record<string, unknown>, { use
           pageToken: s.pageToken,
         });
         const content = await Promise.all(
-          result.threads.map(async (thread: any) => {
+          result.threads.map(async (thread) => {
             const loadedThread = await agent.getThread(thread.id);
             return [
               {
diff --git a/apps/server/src/routes/agent/rpc.ts b/apps/server/src/routes/agent/rpc.ts
index 5cb4a1a5a6..496d50f731 100644
--- a/apps/server/src/routes/agent/rpc.ts
+++ b/apps/server/src/routes/agent/rpc.ts
@@ -16,11 +16,11 @@
 import type { CreateDraftData } from '../../lib/schemas';
 import type { IOutgoingMessage } from '../../types';
 import { RpcTarget } from 'cloudflare:workers';
-import { ZeroAgent } from '.';
+import { ZeroDriver } from '.';
 
-export class AgentRpcDO extends RpcTarget {
+export class DriverRpcDO extends RpcTarget {
   constructor(
-    private mainDo: ZeroAgent,
+    private mainDo: ZeroDriver,
     private connectionId: string,
   ) {
     super();
@@ -176,9 +176,8 @@ export class AgentRpcDO extends RpcTarget {
     return await this.mainDo.getMessageAttachments(messageId);
   }
 
-  async setupAuth(connectionId: string) {
-    if (connectionId !== this.connectionId) console.warn('Oops, something doesnt add up.');
-    return await this.mainDo.setupAuth(connectionId);
+  async setupAuth() {
+    return await this.mainDo.setupAuth();
   }
 
   async broadcast(message: string) {
diff --git a/apps/server/src/routes/agent/tools.ts b/apps/server/src/routes/agent/tools.ts
index 08cb66f39f..0b84e3638f 100644
--- a/apps/server/src/routes/agent/tools.ts
+++ b/apps/server/src/routes/agent/tools.ts
@@ -3,9 +3,9 @@ import { perplexity } from '@ai-sdk/perplexity';
 import { generateText, tool } from 'ai';
 
 import { colors, GmailSearchAssistantSystemPrompt } from '../../lib/prompts';
+import { getZeroAgent } from '../../lib/server-utils';
 import { anthropic } from '@ai-sdk/anthropic';
 import { env } from 'cloudflare:workers';
-import type { ZeroAgent } from '../chat';
 import { Tools } from '../../types';
 import { z } from 'zod';
 
@@ -112,7 +112,7 @@ export const getEmbeddingVector = async (
  *
  * The tag format must be exactly: <thread id="{id}"/>
  */
-const getEmail = (_: ZeroAgent) =>
+const getEmail = () =>
   tool({
     description: 'Return a placeholder tag for a specific email thread by ID',
     parameters: z.object({
@@ -155,7 +155,7 @@ const composeEmailTool = (connectionId: string) =>
     },
   });
 
-// const listEmails = (agent: ZeroAgent) =>
+// const listEmails = (connectionId: string) =>
 //   tool({
 //     description: 'List emails in a specific folder',
 //     parameters: z.object({
@@ -173,19 +173,20 @@ const composeEmailTool = (connectionId: string) =>
 //     },
 //   });
 
-const markAsRead = (agent: ZeroAgent) =>
+const markAsRead = (connectionId: string) =>
   tool({
     description: 'Mark emails as read',
     parameters: z.object({
       threadIds: z.array(z.string()).describe('The IDs of the threads to mark as read'),
     }),
     execute: async ({ threadIds }) => {
-      await agent.markAsRead(threadIds);
+      const driver = await getZeroAgent(connectionId);
+      await driver.markAsRead(threadIds);
       return { threadIds, success: true };
     },
   });
 
-// const inboxRag = (agent: ZeroAgent, dataStream?: DataStreamWriter) =>
+// const inboxRag = (connectionId: string, dataStream?: DataStreamWriter) =>
 //   tool({
 //     description: 'Search the inbox for emails',
 //     parameters: z.object({
@@ -197,19 +198,20 @@ const markAsRead = (agent: ZeroAgent) =>
 //     },
 //   });
 
-const markAsUnread = (agent: ZeroAgent) =>
+const markAsUnread = (connectionId: string) =>
   tool({
     description: 'Mark emails as unread',
     parameters: z.object({
       threadIds: z.array(z.string()).describe('The IDs of the threads to mark as unread'),
     }),
     execute: async ({ threadIds }) => {
-      await agent.markAsUnread(threadIds);
+      const driver = await getZeroAgent(connectionId);
+      await driver.markAsUnread(threadIds);
       return { threadIds, success: true };
     },
   });
 
-const modifyLabels = (agent: ZeroAgent) =>
+const modifyLabels = (connectionId: string) =>
   tool({
     description: 'Modify labels on emails',
     parameters: z.object({
@@ -220,21 +222,23 @@ const modifyLabels = (agent: ZeroAgent) =>
       }),
     }),
     execute: async ({ threadIds, options }) => {
-      await agent.modifyLabels(threadIds, options.addLabels, options.removeLabels);
+      const driver = await getZeroAgent(connectionId);
+      await driver.modifyLabels(threadIds, options.addLabels, options.removeLabels);
       return { threadIds, options, success: true };
     },
   });
 
-const getUserLabels = (agent: ZeroAgent) =>
+const getUserLabels = (connectionId: string) =>
   tool({
     description: 'Get all user labels',
     parameters: z.object({}),
     execute: async () => {
-      return await agent.getUserLabels();
+      const driver = await getZeroAgent(connectionId);
+      return await driver.getUserLabels();
     },
   });
 
-const sendEmail = (agent: ZeroAgent) =>
+const sendEmail = (connectionId: string) =>
   tool({
     description: 'Send a new email',
     parameters: z.object({
@@ -268,16 +272,17 @@ const sendEmail = (agent: ZeroAgent) =>
     }),
     execute: async (data) => {
       try {
+        const driver = await getZeroAgent(connectionId);
         const { draftId, ...mail } = data;
 
         if (draftId) {
-          await agent.sendDraft(draftId, {
+          await driver.sendDraft(draftId, {
             ...mail,
             attachments: [],
             headers: {},
           });
         } else {
-          await agent.create({
+          await driver.create({
             ...mail,
             attachments: [],
             headers: {},
@@ -294,7 +299,7 @@ const sendEmail = (agent: ZeroAgent) =>
     },
   });
 
-const createLabel = (agent: ZeroAgent) =>
+const createLabel = (connectionId: string) =>
   tool({
     description: 'Create a new label with custom colors, if it does nto exist already',
     parameters: z.object({
@@ -313,43 +318,47 @@ const createLabel = (agent: ZeroAgent) =>
         }),
     }),
     execute: async ({ name, backgroundColor, textColor }) => {
-      await agent.createLabel({ name, color: { backgroundColor, textColor } });
+      const driver = await getZeroAgent(connectionId);
+      await driver.createLabel({ name, color: { backgroundColor, textColor } });
       return { name, backgroundColor, textColor, success: true };
     },
   });
 
-const bulkDelete = (agent: ZeroAgent) =>
+const bulkDelete = (connectionId: string) =>
   tool({
     description: 'Move multiple emails to trash by adding the TRASH label',
     parameters: z.object({
       threadIds: z.array(z.string()).describe('Array of email IDs to move to trash'),
     }),
     execute: async ({ threadIds }) => {
-      await agent.modifyLabels(threadIds, ['TRASH'], []);
+      const driver = await getZeroAgent(connectionId);
+      await driver.modifyLabels(threadIds, ['TRASH'], []);
       return { threadIds, success: true };
     },
   });
 
-const bulkArchive = (agent: ZeroAgent) =>
+const bulkArchive = (connectionId: string) =>
   tool({
     description: 'Move multiple emails to the archive by removing the INBOX label',
     parameters: z.object({
       threadIds: z.array(z.string()).describe('Array of email IDs to move to archive'),
     }),
     execute: async ({ threadIds }) => {
-      await agent.modifyLabels(threadIds, [], ['INBOX']);
+      const driver = await getZeroAgent(connectionId);
+      await driver.modifyLabels(threadIds, [], ['INBOX']);
       return { threadIds, success: true };
     },
   });
 
-const deleteLabel = (agent: ZeroAgent) =>
+const deleteLabel = (connectionId: string) =>
   tool({
     description: "Delete a label from the user's account",
     parameters: z.object({
       id: z.string().describe('The ID of the label to delete'),
     }),
     execute: async ({ id }) => {
-      await agent.deleteLabel(id);
+      const driver = await getZeroAgent(connectionId);
+      await driver.deleteLabel(id);
       return { id, success: true };
     },
   });
@@ -397,19 +406,19 @@ const buildGmailSearchQuery = () =>
     },
   });
 
-export const tools = async (agent: ZeroAgent, connectionId: string) => {
+export const tools = async (connectionId: string) => {
   return {
-    [Tools.GetThread]: getEmail(agent),
+    [Tools.GetThread]: getEmail(),
     [Tools.ComposeEmail]: composeEmailTool(connectionId),
-    [Tools.MarkThreadsRead]: markAsRead(agent),
-    [Tools.MarkThreadsUnread]: markAsUnread(agent),
-    [Tools.ModifyLabels]: modifyLabels(agent),
-    [Tools.GetUserLabels]: getUserLabels(agent),
-    [Tools.SendEmail]: sendEmail(agent),
-    [Tools.CreateLabel]: createLabel(agent),
-    [Tools.BulkDelete]: bulkDelete(agent),
-    [Tools.BulkArchive]: bulkArchive(agent),
-    [Tools.DeleteLabel]: deleteLabel(agent),
+    [Tools.MarkThreadsRead]: markAsRead(connectionId),
+    [Tools.MarkThreadsUnread]: markAsUnread(connectionId),
+    [Tools.ModifyLabels]: modifyLabels(connectionId),
+    [Tools.GetUserLabels]: getUserLabels(connectionId),
+    [Tools.SendEmail]: sendEmail(connectionId),
+    [Tools.CreateLabel]: createLabel(connectionId),
+    [Tools.BulkDelete]: bulkDelete(connectionId),
+    [Tools.BulkArchive]: bulkArchive(connectionId),
+    [Tools.DeleteLabel]: deleteLabel(connectionId),
     [Tools.WebSearch]: tool({
       description: 'Search the web for information using Perplexity AI',
       parameters: z.object({
diff --git a/apps/server/wrangler.jsonc b/apps/server/wrangler.jsonc
index 34cd860ac7..8fc8c11d7b 100644
--- a/apps/server/wrangler.jsonc
+++ b/apps/server/wrangler.jsonc
@@ -39,6 +39,10 @@
             "name": "ZERO_DB",
             "class_name": "ZeroDB",
           },
+          {
+            "name": "ZERO_DRIVER",
+            "class_name": "ZeroDriver",
+          },
         ],
       },
       "queues": {
@@ -78,6 +82,10 @@
           "tag": "v4",
           "deleted_classes": ["DurableMailbox"],
         },
+        {
+          "tag": "v5",
+          "new_sqlite_classes": ["ZeroDriver"],
+        },
       ],
 
       "observability": {
@@ -167,6 +175,10 @@
             "name": "ZERO_DB",
             "class_name": "ZeroDB",
           },
+          {
+            "name": "ZERO_DRIVER",
+            "class_name": "ZeroDriver",
+          },
         ],
       },
       "r2_buckets": [
@@ -216,6 +228,10 @@
           "tag": "v5",
           "deleted_classes": ["DurableMailbox"],
         },
+        {
+          "tag": "v6",
+          "new_sqlite_classes": ["ZeroDriver"],
+        },
       ],
       "observability": {
         "enabled": true,
@@ -312,6 +328,10 @@
             "name": "ZERO_DB",
             "class_name": "ZeroDB",
           },
+          {
+            "name": "ZERO_DRIVER",
+            "class_name": "ZeroDriver",
+          },
         ],
       },
       "queues": {
@@ -355,6 +375,10 @@
           "tag": "v5",
           "deleted_classes": ["DurableMailbox"],
         },
+        {
+          "tag": "v6",
+          "new_sqlite_classes": ["ZeroDriver"],
+        },
       ],
       "vars": {
         "NODE_ENV": "production",

From 929649dfb3d33742a0a490ad09aff5513571ecb6 Mon Sep 17 00:00:00 2001
From: Adam <13007539+MrgSub@users.noreply.github.com>
Date: Sat, 19 Jul 2025 19:15:19 -0700
Subject: [PATCH 07/20] remove unused ZeroDriver code (#1765)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# READ CAREFULLY THEN REMOVE

Remove bullet points that are not relevant.

PLEASE REFRAIN FROM USING AI TO WRITE YOUR CODE AND PR DESCRIPTION. IF YOU DO USE AI TO WRITE YOUR CODE PLEASE PROVIDE A DESCRIPTION AND REVIEW IT CAREFULLY. MAKE SURE YOU UNDERSTAND THE CODE YOU ARE SUBMITTING USING AI.

- Pull requests that do not follow these guidelines will be closed without review or comment.
- If you use AI to write your PR description your pr will be close without review or comment.
- If you are unsure about anything, feel free to ask for clarification.

## Description

Please provide a clear description of your changes.

---

## Type of Change

Please delete options that are not relevant.

- [ ] 🐛 Bug fix (non-breaking change which fixes an issue)
- [ ] ✨ New feature (non-breaking change which adds functionality)
- [ ] 💥 Breaking change (fix or feature with breaking changes)
- [ ] 📝 Documentation update
- [ ] 🎨 UI/UX improvement
- [ ] 🔒 Security enhancement
- [ ] ⚡ Performance improvement

## Areas Affected

Please check all that apply:

- [ ] Email Integration (Gmail, IMAP, etc.)
- [ ] User Interface/Experience
- [ ] Authentication/Authorization
- [ ] Data Storage/Management
- [ ] API Endpoints
- [ ] Documentation
- [ ] Testing Infrastructure
- [ ] Development Workflow
- [ ] Deployment/Infrastructure

## Testing Done

Describe the tests you've done:

- [ ] Unit tests added/updated
- [ ] Integration tests added/updated
- [ ] Manual testing performed
- [ ] Cross-browser testing (if UI changes)
- [ ] Mobile responsiveness verified (if UI changes)

## Security Considerations

For changes involving data or authentication:

- [ ] No sensitive data is exposed
- [ ] Authentication checks are in place
- [ ] Input validation is implemented
- [ ] Rate limiting is considered (if applicable)

## Checklist

- [ ] I have read the [CONTRIBUTING](https://github.com/Mail-0/Zero/blob/staging/.github/CONTRIBUTING.md) document
- [ ] My code follows the project's style guidelines
- [ ] I have performed a self-review of my code
- [ ] I have commented my code, particularly in complex areas
- [ ] I have updated the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that prove my fix/feature works
- [ ] All tests pass locally
- [ ] Any dependent changes are merged and published

## Additional Notes

Add any other context about the pull request here.

## Screenshots/Recordings

Add screenshots or recordings here if applicable.

---

_By submitting this pull request, I confirm that my contribution is made under the terms of the project's license._


<!-- This is an auto-generated description by cubic. -->
---

## Summary by cubic
Removed unused getZeroDriver function and related ZeroDriver code from the agent route to clean up the codebase.

<!-- End of auto-generated description by cubic. -->
---
 apps/server/src/routes/agent/index.ts | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/apps/server/src/routes/agent/index.ts b/apps/server/src/routes/agent/index.ts
index 08058036d1..92141748dd 100644
--- a/apps/server/src/routes/agent/index.ts
+++ b/apps/server/src/routes/agent/index.ts
@@ -53,10 +53,6 @@ const decoder = new TextDecoder();
 const shouldDropTables = env.DROP_AGENT_TABLES === 'true';
 const maxCount = parseInt(env.THREAD_SYNC_MAX_COUNT || '10', 10);
 const shouldLoop = env.THREAD_SYNC_LOOP !== 'false';
-
-export const getZeroDriver = (connectionId: string) =>
-  env.ZERO_DRIVER.get(env.ZERO_DRIVER.idFromName(connectionId));
-
 export class ZeroDriver extends AIChatAgent<typeof env> {
   private foldersInSync: Map<string, boolean> = new Map();
   private syncThreadsInProgress: Map<string, boolean> = new Map();
@@ -821,7 +817,6 @@ export class ZeroDriver extends AIChatAgent<typeof env> {
 
 export class ZeroAgent extends AIChatAgent<typeof env> {
   private chatMessageAbortControllers: Map<string, AbortController> = new Map();
-  private driver: DurableObjectStub<ZeroDriver> = getZeroDriver(this.name);
 
   async registerZeroMCP() {
     await this.mcp.connect(env.VITE_PUBLIC_BACKEND_URL + '/sse', {

From 7d9a6e41ac49a086645128d2d7b6229a86d05ddb Mon Sep 17 00:00:00 2001
From: Adam <13007539+MrgSub@users.noreply.github.com>
Date: Sat, 19 Jul 2025 19:29:34 -0700
Subject: [PATCH 08/20] Make agent property nullable in ZeroDriver (#1766)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# READ CAREFULLY THEN REMOVE

Remove bullet points that are not relevant.

PLEASE REFRAIN FROM USING AI TO WRITE YOUR CODE AND PR DESCRIPTION. IF YOU DO USE AI TO WRITE YOUR CODE PLEASE PROVIDE A DESCRIPTION AND REVIEW IT CAREFULLY. MAKE SURE YOU UNDERSTAND THE CODE YOU ARE SUBMITTING USING AI.

- Pull requests that do not follow these guidelines will be closed without review or comment.
- If you use AI to write your PR description your pr will be close without review or comment.
- If you are unsure about anything, feel free to ask for clarification.

## Description

Please provide a clear description of your changes.

---

## Type of Change

Please delete options that are not relevant.

- [ ] 🐛 Bug fix (non-breaking change which fixes an issue)
- [ ] ✨ New feature (non-breaking change which adds functionality)
- [ ] 💥 Breaking change (fix or feature with breaking changes)
- [ ] 📝 Documentation update
- [ ] 🎨 UI/UX improvement
- [ ] 🔒 Security enhancement
- [ ] ⚡ Performance improvement

## Areas Affected

Please check all that apply:

- [ ] Email Integration (Gmail, IMAP, etc.)
- [ ] User Interface/Experience
- [ ] Authentication/Authorization
- [ ] Data Storage/Management
- [ ] API Endpoints
- [ ] Documentation
- [ ] Testing Infrastructure
- [ ] Development Workflow
- [ ] Deployment/Infrastructure

## Testing Done

Describe the tests you've done:

- [ ] Unit tests added/updated
- [ ] Integration tests added/updated
- [ ] Manual testing performed
- [ ] Cross-browser testing (if UI changes)
- [ ] Mobile responsiveness verified (if UI changes)

## Security Considerations

For changes involving data or authentication:

- [ ] No sensitive data is exposed
- [ ] Authentication checks are in place
- [ ] Input validation is implemented
- [ ] Rate limiting is considered (if applicable)

## Checklist

- [ ] I have read the [CONTRIBUTING](https://github.com/Mail-0/Zero/blob/staging/.github/CONTRIBUTING.md) document
- [ ] My code follows the project's style guidelines
- [ ] I have performed a self-review of my code
- [ ] I have commented my code, particularly in complex areas
- [ ] I have updated the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that prove my fix/feature works
- [ ] All tests pass locally
- [ ] Any dependent changes are merged and published

## Additional Notes

Add any other context about the pull request here.

## Screenshots/Recordings

Add screenshots or recordings here if applicable.

---

_By submitting this pull request, I confirm that my contribution is made under the terms of the project's license._


<!-- This is an auto-generated description by cubic. -->
---

## Summary by cubic
Made the agent property in ZeroDriver nullable and added checks before calling its methods to prevent runtime errors.

<!-- End of auto-generated description by cubic. -->
---
 apps/server/src/routes/agent/index.ts | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/apps/server/src/routes/agent/index.ts b/apps/server/src/routes/agent/index.ts
index 92141748dd..ef5936e3bb 100644
--- a/apps/server/src/routes/agent/index.ts
+++ b/apps/server/src/routes/agent/index.ts
@@ -57,9 +57,7 @@ export class ZeroDriver extends AIChatAgent<typeof env> {
   private foldersInSync: Map<string, boolean> = new Map();
   private syncThreadsInProgress: Map<string, boolean> = new Map();
   private driver: MailManager | null = null;
-  private agent: DurableObjectStub<ZeroAgent> = env.ZERO_AGENT.get(
-    env.ZERO_AGENT.idFromName(this.name),
-  );
+  private agent: DurableObjectStub<ZeroAgent> | null = null;
   constructor(ctx: DurableObjectState, env: Env) {
     super(ctx, env);
     if (shouldDropTables) this.dropTables();
@@ -161,9 +159,6 @@ export class ZeroDriver extends AIChatAgent<typeof env> {
       if (_connection) this.driver = connectionToDriver(_connection);
       this.ctx.waitUntil(conn.end());
       this.ctx.waitUntil(this.syncThreads('inbox'));
-      // this.ctx.waitUntil(this.syncThreads('sent'));
-      // this.ctx.waitUntil(this.syncThreads('spam'));
-      // this.ctx.waitUntil(this.syncThreads('archive'));
     }
   }
 
@@ -415,10 +410,11 @@ export class ZeroDriver extends AIChatAgent<typeof env> {
             CURRENT_TIMESTAMP
           )
         `;
-        this.agent.broadcastChatMessage({
-          type: OutgoingMessageType.Mail_Get,
-          threadId,
-        });
+        if (this.agent)
+          this.agent.broadcastChatMessage({
+            type: OutgoingMessageType.Mail_Get,
+            threadId,
+          });
         this.syncThreadsInProgress.delete(threadId);
         console.log('Server: syncThread result', {
           threadId,
@@ -488,10 +484,11 @@ export class ZeroDriver extends AIChatAgent<typeof env> {
     } finally {
       console.log('Setting isSyncing to false');
       this.foldersInSync.delete(folder);
-      this.agent.broadcastChatMessage({
-        type: OutgoingMessageType.Mail_List,
-        folder,
-      });
+      if (this.agent)
+        this.agent.broadcastChatMessage({
+          type: OutgoingMessageType.Mail_List,
+          folder,
+        });
     }
   }
 

From bf2c8f3a604c1cf356f87428563154fac1ae81c4 Mon Sep 17 00:00:00 2001
From: amrit <iamamrit27@gmail.com>
Date: Mon, 21 Jul 2025 00:13:20 +0530
Subject: [PATCH 09/20] fix: eval lint err for extra arguments and autofix
 failing test (#1768)

fixes eval check script error due to extra arguments from past code.

<!-- This is an auto-generated description by cubic. -->
---

## Summary by cubic
Fixed eval script errors by removing extra arguments from AiChatPrompt calls in all eval tasks.

<!-- End of auto-generated description by cubic. -->



<!-- This is an auto-generated comment: release notes by coderabbit.ai -->
## Summary by CodeRabbit

* **Refactor**
  * Simplified AI Chat evaluation tests by streamlining prompt inputs.
* **Chores**
  * Disabled automatic draft generation in email thread workflows to adjust system behavior.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
---
 apps/server/evals/ai-chat-basic.eval.ts |  18 +--
 apps/server/src/pipelines.effect.ts     | 176 ++++++++++++------------
 2 files changed, 97 insertions(+), 97 deletions(-)

diff --git a/apps/server/evals/ai-chat-basic.eval.ts b/apps/server/evals/ai-chat-basic.eval.ts
index 77d8d0d43d..80f06ab65b 100644
--- a/apps/server/evals/ai-chat-basic.eval.ts
+++ b/apps/server/evals/ai-chat-basic.eval.ts
@@ -100,7 +100,7 @@ evalite("AI Chat – Basic Responses", {
   task: async (input) => {
     return safeStreamText({
       model: model,
-      system: AiChatPrompt("test-thread-id", "inbox", ""),
+      system: AiChatPrompt("test-thread-id"),
       prompt: input,
     });
   },
@@ -124,7 +124,7 @@ evalite("AI Chat – Label Management", {
   task: async (input) => {
     return safeStreamText({
       model: model,
-      system: AiChatPrompt("test-thread-id", "inbox", ""),
+      system: AiChatPrompt("test-thread-id"),
       prompt: input,
     });
   },
@@ -136,7 +136,7 @@ evalite("AI Chat – Email Organization", {
   task: async (input) => {
     return safeStreamText({
       model: model,
-      system: AiChatPrompt("test-thread-id", "inbox", ""),
+      system: AiChatPrompt("test-thread-id"),
       prompt: input,
     });
   },
@@ -148,7 +148,7 @@ evalite("AI Chat – Email Composition", {
   task: async (input) => {
     return safeStreamText({
       model: model,
-      system: AiChatPrompt("test-thread-id", "inbox", ""),
+      system: AiChatPrompt("test-thread-id"),
       prompt: input,
     });
   },
@@ -160,7 +160,7 @@ evalite("AI Chat – Smart Categorization", {
   task: async (input) => {
     return safeStreamText({
       model: model,
-      system: AiChatPrompt("test-thread-id", "inbox", ""),
+      system: AiChatPrompt("test-thread-id"),
       prompt: input,
     });
   },
@@ -172,7 +172,7 @@ evalite("AI Chat – Information Queries", {
   task: async (input) => {
     return safeStreamText({
       model: model,
-      system: AiChatPrompt("test-thread-id", "inbox", ""),
+      system: AiChatPrompt("test-thread-id"),
       prompt: input,
     });
   },
@@ -184,7 +184,7 @@ evalite("AI Chat – Complex Workflows", {
   task: async (input) => {
     return safeStreamText({
       model: model,
-      system: AiChatPrompt("test-thread-id", "inbox", ""),
+      system: AiChatPrompt("test-thread-id"),
       prompt: input,
     });
   },
@@ -196,7 +196,7 @@ evalite("AI Chat – User Intent Recognition", {
   task: async (input) => {
     return safeStreamText({
       model: model,
-      system: AiChatPrompt("test-thread-id", "inbox", ""),
+      system: AiChatPrompt("test-thread-id"),
       prompt: input,
     });
   },
@@ -208,7 +208,7 @@ evalite("AI Chat – Error Handling & Edge Cases", {
   task: async (input) => {
     return safeStreamText({
       model: model,
-      system: AiChatPrompt("test-thread-id", "inbox", ""),
+      system: AiChatPrompt("test-thread-id"),
       prompt: input,
     });
   },
diff --git a/apps/server/src/pipelines.effect.ts b/apps/server/src/pipelines.effect.ts
index 0d32313b41..7629b90503 100644
--- a/apps/server/src/pipelines.effect.ts
+++ b/apps/server/src/pipelines.effect.ts
@@ -17,11 +17,11 @@ import {
   SummarizeThread,
   ThreadLabels,
 } from './lib/brain.fallback.prompts';
-import {
-  generateAutomaticDraft,
-  shouldGenerateDraft,
-  analyzeEmailIntent,
-} from './thread-workflow-utils';
+// import {
+//   generateAutomaticDraft,
+//   shouldGenerateDraft,
+//   analyzeEmailIntent,
+// } from './thread-workflow-utils';
 import { defaultLabels, EPrompts, EProviders, type ParsedMessage, type Sender } from './types';
 import { getZeroAgent } from './lib/server-utils';
 import { type gmail_v1 } from '@googleapis/gmail';
@@ -452,89 +452,89 @@ export const runThreadWorkflow = (
         return 'Thread has no messages';
       }
 
-      const autoDraftId = yield* Effect.tryPromise({
-        try: async () => {
-          if (!shouldGenerateDraft(thread, foundConnection)) {
-            console.log('[THREAD_WORKFLOW] Skipping draft generation for thread:', threadId);
-            return null;
-          }
-
-          const latestMessage = thread.messages[thread.messages.length - 1];
-          const emailIntent = analyzeEmailIntent(latestMessage);
-
-          console.log('[THREAD_WORKFLOW] Analyzed email intent:', {
-            threadId,
-            isQuestion: emailIntent.isQuestion,
-            isRequest: emailIntent.isRequest,
-            isMeeting: emailIntent.isMeeting,
-            isUrgent: emailIntent.isUrgent,
-          });
-
-          if (
-            !emailIntent.isQuestion &&
-            !emailIntent.isRequest &&
-            !emailIntent.isMeeting &&
-            !emailIntent.isUrgent
-          ) {
-            console.log(
-              '[THREAD_WORKFLOW] Email does not require a response, skipping draft generation',
-            );
-            return null;
-          }
-
-          console.log('[THREAD_WORKFLOW] Generating automatic draft for thread:', threadId);
-          const draftContent = await generateAutomaticDraft(
-            connectionId.toString(),
-            thread,
-            foundConnection,
-          );
-
-          if (draftContent) {
-            const latestMessage = thread.messages[thread.messages.length - 1];
-
-            const replyTo = latestMessage.sender?.email || '';
-            const cc =
-              latestMessage.cc
-                ?.map((r) => r.email)
-                .filter((email) => email && email !== foundConnection.email) || [];
-
-            const originalSubject = latestMessage.subject || '';
-            const replySubject = originalSubject.startsWith('Re: ')
-              ? originalSubject
-              : `Re: ${originalSubject}`;
-
-            const draftData = {
-              to: replyTo,
-              cc: cc.join(', '),
-              bcc: '',
-              subject: replySubject,
-              message: draftContent,
-              attachments: [],
-              id: null,
-              threadId: threadId.toString(),
-              fromEmail: foundConnection.email,
-            };
-
-            try {
-              const createdDraft = await agent.createDraft(draftData);
-              console.log('[THREAD_WORKFLOW] Created automatic draft:', {
-                threadId,
-                draftId: createdDraft?.id,
-              });
-              return createdDraft?.id || null;
-            } catch (error) {
-              console.log('[THREAD_WORKFLOW] Failed to create automatic draft:', {
-                threadId,
-                error: error instanceof Error ? error.message : String(error),
-              });
-              return null;
-            }
-          }
-
-          return null;
-        },
-        catch: (error) => ({ _tag: 'DatabaseError' as const, error }),
-      });
+      // const autoDraftId = yield* Effect.tryPromise({
+      //   try: async () => {
+      //     if (!shouldGenerateDraft(thread, foundConnection)) {
+      //       console.log('[THREAD_WORKFLOW] Skipping draft generation for thread:', threadId);
+      //       return null;
+      //     }
+
+      //     const latestMessage = thread.messages[thread.messages.length - 1];
+      //     const emailIntent = analyzeEmailIntent(latestMessage);
+
+      //     console.log('[THREAD_WORKFLOW] Analyzed email intent:', {
+      //       threadId,
+      //       isQuestion: emailIntent.isQuestion,
+      //       isRequest: emailIntent.isRequest,
+      //       isMeeting: emailIntent.isMeeting,
+      //       isUrgent: emailIntent.isUrgent,
+      //     });
+
+      //     if (
+      //       !emailIntent.isQuestion &&
+      //       !emailIntent.isRequest &&
+      //       !emailIntent.isMeeting &&
+      //       !emailIntent.isUrgent
+      //     ) {
+      //       console.log(
+      //         '[THREAD_WORKFLOW] Email does not require a response, skipping draft generation',
+      //       );
+      //       return null;
+      //     }
+
+      //     console.log('[THREAD_WORKFLOW] Generating automatic draft for thread:', threadId);
+      //     const draftContent = await generateAutomaticDraft(
+      //       connectionId.toString(),
+      //       thread,
+      //       foundConnection,
+      //     );
+
+      //     if (draftContent) {
+      //       const latestMessage = thread.messages[thread.messages.length - 1];
+
+      //       const replyTo = latestMessage.sender?.email || '';
+      //       const cc =
+      //         latestMessage.cc
+      //           ?.map((r) => r.email)
+      //           .filter((email) => email && email !== foundConnection.email) || [];
+
+      //       const originalSubject = latestMessage.subject || '';
+      //       const replySubject = originalSubject.startsWith('Re: ')
+      //         ? originalSubject
+      //         : `Re: ${originalSubject}`;
+
+      //       const draftData = {
+      //         to: replyTo,
+      //         cc: cc.join(', '),
+      //         bcc: '',
+      //         subject: replySubject,
+      //         message: draftContent,
+      //         attachments: [],
+      //         id: null,
+      //         threadId: threadId.toString(),
+      //         fromEmail: foundConnection.email,
+      //       };
+
+      //       try {
+      //         const createdDraft = await agent.createDraft(draftData);
+      //         console.log('[THREAD_WORKFLOW] Created automatic draft:', {
+      //           threadId,
+      //           draftId: createdDraft?.id,
+      //         });
+      //         return createdDraft?.id || null;
+      //       } catch (error) {
+      //         console.log('[THREAD_WORKFLOW] Failed to create automatic draft:', {
+      //           threadId,
+      //           error: error instanceof Error ? error.message : String(error),
+      //         });
+      //         return null;
+      //       }
+      //     }
+
+      //     return null;
+      //   },
+      //   catch: (error) => ({ _tag: 'DatabaseError' as const, error }),
+      // });
 
       yield* Console.log('[THREAD_WORKFLOW] Processing thread messages and vectorization');
 

From 364e90b8ac3060d80f450e2baffe0b887c3ad572 Mon Sep 17 00:00:00 2001
From: Adam <13007539+MrgSub@users.noreply.github.com>
Date: Sun, 20 Jul 2025 13:01:57 -0700
Subject: [PATCH 10/20] Remove console logs and simplify AI chat prompt (#1769)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Cleanup: Remove console logs and refactor AI chat prompt

## Description

This PR removes unnecessary console logs from the codebase and refactors the AI chat prompt to be more concise and structured. The changes include:

1. Removing debug console.log statements from notification settings and hot key handling
2. Adding error handling to the AI sidebar component
3. Streamlining the AI chat prompt structure for better readability and maintenance
4. Improving the inboxRag function with better error handling and logging

## Type of Change

- 🐛 Bug fix (non-breaking change which fixes an issue)
- ⚡ Performance improvement

## Areas Affected

- [x] User Interface/Experience
- [x] API Endpoints

## Testing Done

- [x] Manual testing performed

## Checklist

- [x] I have performed a self-review of my code
- [x] My changes generate no new warnings
- [x] All tests pass locally

## Additional Notes

The AI chat prompt refactoring significantly improves readability while maintaining the same functionality. The removal of console logs helps keep the browser console clean in production.

---

_By submitting this pull request, I confirm that my contribution is made under the terms of the project's license._

<!-- This is an auto-generated comment: release notes by coderabbit.ai -->

## Summary by CodeRabbit

* **New Features**
  * Enhanced email search with improved AI-generated query refinement for more accurate results.

* **Bug Fixes**
  * Improved error handling and fallback messaging during AI-powered searches to prevent disruptions.

* **Refactor**
  * Streamlined and restructured the AI assistant’s internal prompt for clearer, more direct responses and safer actions.
  * Refined tool orchestration for chat streaming to improve reliability.

* **Chores**
  * Removed unused tools and related features to simplify the system.
  * Eliminated unnecessary console logging for cleaner operation.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
---
 .../(routes)/settings/notifications/page.tsx  |   3 +-
 apps/mail/components/ui/ai-sidebar.tsx        |   1 +
 apps/mail/hooks/use-hot-key.ts                |  13 +-
 apps/server/src/lib/prompts.ts                | 583 +++++-------------
 apps/server/src/routes/agent/index.ts         |  76 ++-
 apps/server/src/routes/agent/mcp.ts           |  28 +-
 apps/server/src/routes/agent/tools.ts         |  32 +-
 apps/server/src/trpc/routes/ai/search.ts      |   3 +-
 8 files changed, 216 insertions(+), 523 deletions(-)

diff --git a/apps/mail/app/(routes)/settings/notifications/page.tsx b/apps/mail/app/(routes)/settings/notifications/page.tsx
index a845eb90c7..101284778d 100644
--- a/apps/mail/app/(routes)/settings/notifications/page.tsx
+++ b/apps/mail/app/(routes)/settings/notifications/page.tsx
@@ -15,8 +15,8 @@ import {
 } from '@/components/ui/select';
 import { SettingsCard } from '@/components/settings/settings-card';
 import { zodResolver } from '@hookform/resolvers/zod';
-import { Button } from '@/components/ui/button';
 import { Switch } from '@/components/ui/switch';
+import { Button } from '@/components/ui/button';
 import { useForm } from 'react-hook-form';
 import { Bell } from 'lucide-react';
 import { useState } from 'react';
@@ -41,7 +41,6 @@ export default function NotificationsPage() {
   function onSubmit(values: z.infer<typeof formSchema>) {
     setIsSaving(true);
     setTimeout(() => {
-      console.log(values);
       setIsSaving(false);
     }, 1000);
   }
diff --git a/apps/mail/components/ui/ai-sidebar.tsx b/apps/mail/components/ui/ai-sidebar.tsx
index 4358e808a2..58715aec29 100644
--- a/apps/mail/components/ui/ai-sidebar.tsx
+++ b/apps/mail/components/ui/ai-sidebar.tsx
@@ -349,6 +349,7 @@ function AISidebar({ className }: AISidebarProps) {
     agent: 'ZeroAgent',
     name: activeConnection?.id ? String(activeConnection.id) : 'general',
     host: `${import.meta.env.VITE_PUBLIC_BACKEND_URL}`,
+    onError: (e) => console.log(e),
   });
 
   const chatState = useAgentChat({
diff --git a/apps/mail/hooks/use-hot-key.ts b/apps/mail/hooks/use-hot-key.ts
index 94d5d464d5..a94556e5d7 100644
--- a/apps/mail/hooks/use-hot-key.ts
+++ b/apps/mail/hooks/use-hot-key.ts
@@ -9,41 +9,37 @@ function initKeyListeners() {
     window.addEventListener('keydown', (e) => {
       // Store the key state
       keyStates.set(e.key, true);
-      
+
       // Also store specific states for modifier keys
       if (e.altKey) {
         keyStates.set('Alt', true);
         keyStates.set('AltLeft', true);
         keyStates.set('AltRight', true);
       }
-      
+
       if (e.shiftKey) {
         keyStates.set('Shift', true);
         keyStates.set('ShiftLeft', true);
         keyStates.set('ShiftRight', true);
       }
-      
-      console.log('Key down:', e.key, 'Alt:', e.altKey, 'Shift:', e.shiftKey);
     });
 
     window.addEventListener('keyup', (e) => {
       // Clear the key state
       keyStates.set(e.key, false);
-      
+
       // Also clear specific states for modifier keys
       if (e.key === 'Alt' || e.key === 'AltLeft' || e.key === 'AltRight') {
         keyStates.set('Alt', false);
         keyStates.set('AltLeft', false);
         keyStates.set('AltRight', false);
       }
-      
+
       if (e.key === 'Shift' || e.key === 'ShiftLeft' || e.key === 'ShiftRight') {
         keyStates.set('Shift', false);
         keyStates.set('ShiftLeft', false);
         keyStates.set('ShiftRight', false);
       }
-      
-      console.log('Key up:', e.key);
     });
 
     window.addEventListener('blur', () => {
@@ -51,7 +47,6 @@ function initKeyListeners() {
       keyStates.forEach((_, key) => {
         keyStates.set(key, false);
       });
-      console.log('Window blur - all keys reset');
     });
 
     listenersInit = true;
diff --git a/apps/server/src/lib/prompts.ts b/apps/server/src/lib/prompts.ts
index 781383b6c2..3eb75b51a6 100644
--- a/apps/server/src/lib/prompts.ts
+++ b/apps/server/src/lib/prompts.ts
@@ -328,464 +328,179 @@ export const OutlookSearchAssistantSystemPrompt = () =>
 
 export const AiChatPrompt = (threadId: string) =>
   dedent`
-    <system>
-      <description>
-        You are Fred, an intelligent, safety-conscious email management assistant integrated with advanced Gmail operations.
-        Your goal is to help users achieve Inbox Zero and long-term inbox hygiene by intelligently searching, analyzing, categorizing, summarizing, labeling, and organizing their emails with minimal friction and maximal relevance.
-        Zero is a tool that has complete historical context of the user's inbox and can answer questions about the mailbox or a specific thread.
-      </description>
+    <system_prompt>
+      <role>
+        You are Fred, an intelligent email management assistant integrated with Gmail operations.
+        Your mission: help users navigate and understand their inbox with complete knowledge of what's happening. You provide context, insights, and smart organization - not to achieve inbox zero, but to give users full awareness and control over their email landscape.
+      </role>
 
-      <current_date>${getCurrentDateContext()}</current_date>
-      <note>NEVER include markdown, XML tags or code formatting in the final response.</note>
-      <note>Do not use markdown formatting in your response.</note>
-      <note>NEVER use markdown lists (-, *, 1., etc.) in responses - use plain text instead.</note>
-
-      # Agency & Problem-Solving Approach
-
-      You take initiative when users ask for email management tasks, maintaining balance between:
-      1. Taking appropriate action when requested, including follow-up actions
-      2. Not surprising users with unasked actions (when users ask how to approach something, answer first before acting)
-      3. Being direct and efficient without unnecessary explanations unless requested
-
-      ## Systematic Approach
-      For complex email management tasks, follow these steps:
-      1. Use tools strategically - combine searches, analysis, and actions efficiently
-      2. For multi-step tasks, break them down and tackle systematically
-      3. Use parallel tool execution when operations are independent (e.g., searching multiple topics simultaneously)
-      4. Chain tools logically: search → analyze → act → verify
-
-      ## Tool Chaining Excellence
-      - **Parallel Execution**: When searching for different types of emails simultaneously, invoke multiple inboxRag calls
-      - **Sequential Chaining**: Search → getThread → analyze → action (label/archive/delete)
-      - **Batch Operations**: Collect thread IDs from searches, then apply bulk actions
-      - **Verification**: After bulk actions, confirm results and provide concise summary
-
-      <toolChainExamples>
-        <example name="Complex Organization">
-          User: "Find all newsletters from last month and organize them"
-          Approach: 
-          1. inboxRag multiple parallel searches for newsletter patterns
-          2. getThread for sample threads to confirm classification
-          3. getUserLabels to check existing organization
-          4. createLabel if needed for newsletter organization
-          5. modifyLabels for batch labeling
-          6. bulkArchive to clean inbox
-        </example>
-        
-        <example name="Multi-Category Cleanup">
-          User: "Clean up promotional emails and old receipts"
-          Approach:
-          1. Parallel inboxRag searches: promotions, receipts, shopping confirmations
-          2. Analyze patterns across results
-          3. Suggest organization strategy
-          4. Execute bulk actions with user confirmation
-        </example>
+      <success_criteria>
+        A correct response must:
+        1. Either make a tool call OR provide a plain-text reply (never both)
+        2. Use only plain text - no markdown, XML, bullets, or formatting
+        3. Never expose tool responses or internal reasoning to users
+        4. Confirm before affecting more than 5 threads
+        5. Be concise and action-oriented
+      </success_criteria>
 
-        <example name="Investment Tracking">
-          User: "Help me track my investment emails"
-          Approach:
-          1. Ask clarifying questions about investment types/platforms
-          2. inboxRag with targeted searches based on user's specifics
-          3. getThread for key investment emails
-          4. Suggest labeling system for ongoing organization
-          5. Create labels and apply to relevant threads
-        </example>
-      </toolChainExamples>
-  
-      <capabilities>
-        <searchAnalysis>
-          <feature>Understand natural language queries about email topics, timeframes, senders, attachments, and other metadata.</feature>
-          <feature>Construct advanced Gmail-compatible search filters covering fields like subject, body, sender, recipients, labels, and timestamps.</feature>
-          <feature>Support broad queries by intelligently identifying patterns and keywords.</feature>
-        </searchAnalysis>
-        <labelManagement>
-          <feature>Suggest, create, and manage nested or color-coded labels.</feature>
-          <feature>Check for label existence before creation to avoid duplication.</feature>
-          <feature>Apply labels with context-aware justification.</feature>
-        </labelManagement>
-        <emailOrganization>
-          <feature>Archive or triage non-urgent threads with user permission.</feature>
-          <feature>Mark threads as read/unread based on task urgency or user intent.</feature>
-          <feature>Apply batch operations safely across matching threads.</feature>
-          <feature>Balance automation with transparency, ensuring user trust and control.</feature>
-        </emailOrganization>
-      </capabilities>
-  
-      <tools>  
-        <tool name="${Tools.GetThread}">
-          <description>
-            Returns ONLY the tag &lt;thread id="{id}"/&gt;.  
-            The client will resolve the thread locally, so do **not** expect the tool
-            to return any email data.
-          </description>
-          <usageExample>getThread({ id: "17c2318b9c1e44f6" })</usageExample>
-        </tool>
+      <persona>
+        Professional, direct, efficient. Skip pleasantries. Focus on results, not process explanations.
+      </persona>
 
+      <current_date>${getCurrentDateContext()}</current_date>
+      <current_thread_id>${threadId}</current_thread_id>
+
+      <thinking_process>
+        Before responding, think step-by-step:
+        1. What is the user asking for?
+        2. Which tools do I need to use?
+        3. What order should I use them in?
+        4. What safety checks are needed?
+        Keep this reasoning internal - never show it to the user.
+      </thinking_process>
+
+      <tools>
         <tool name="${Tools.InboxRag}">
-          <description>Search the inbox for emails using natural language. Returns ONLY an array
-          of thread IDs (e.g. ["17c23…", "17c24…"]). Use getThread afterwards
-          to display or act on a specific email.</description>
-          <parameters>
-            <parameter name="query" type="string" />
-          </parameters>
-          <usageExample>inboxRag({ query: "emails about the project deadline" })</usageExample>
+          <purpose>Search inbox using natural language queries</purpose>
+          <returns>Array of thread IDs only</returns>
+          <example>inboxRag({ query: "promotional emails from last week" })</example>
         </tool>
 
-        <tool name="${Tools.WebSearch}">
-          <description>Search the web for information using Perplexity AI, use it for famous people, companies, and other things that are not in the user's inbox.</description>
-          <parameters>
-            <parameter name="query" type="string" />
-          </parameters>
-          <usageExample>webSearch({ query: "What is the weather in Tokyo?" })</usageExample>
-          <usageExample>webSearch({ query: "What is the stock price of Apple?" })</usageExample>
-          <usageExample>webSearch({ query: "Tell me about Sequoia Capital?" })</usageExample>
-          <usageExample>webSearch({ query: "What is YC / YCombinator?" })</usageExample>
+        <tool name="${Tools.GetThread}">
+          <purpose>Get thread details for a specific ID</purpose>
+          <returns>Thread tag for client resolution</returns>
+          <example>getThread({ id: "17c2318b9c1e44f6" })</example>
         </tool>
-  
-        <tool name="${Tools.BulkDelete}">
-          <description>Delete an email thread when the user confirms it's no longer needed.</description>
-          <usageExample>bulkDelete({ threadIds: ["..."] })</usageExample>
+
+        <tool name="${Tools.WebSearch}">
+          <purpose>Search web for external information</purpose>
+          <usage>For companies, people, general knowledge not in inbox</usage>
+          <example>webSearch({ query: "What is Sequoia Capital?" })</example>
         </tool>
 
         <tool name="${Tools.BulkArchive}">
-          <description>Archive an email thread.</description>
-          <usageExample>bulkArchive({ threadIds: ["..."] })</usageExample>
+          <purpose>Archive multiple threads</purpose>
+          <safety>Confirm if more than 5 threads</safety>
+          <example>bulkArchive({ threadIds: ["..."] })</example>
         </tool>
 
-        <tool name="${Tools.ModifyLabels}">
-            <description>
-                Add and/or remove labels from a list of thread IDs. This tool can be used to batch apply organizational changes.
-                <note>First use getUserLabels to get the label IDs, then use those IDs in addLabels and removeLabels arrays. Do not use label names directly.</note>
-            </description>
-            <parameters>
-                <parameter name="threadIds" type="string[]" />
-                <parameter name="options" type="object">
-                <parameter name="addLabels" type="string[]" />
-                <parameter name="removeLabels" type="string[]" />
-                </parameter>
-            </parameters>
-            <usageExample>
-                // First get label IDs
-                const labels = await getUserLabels();
-                const followUpLabel = labels.find(l => l.name === "Follow-Up")?.id;
-                const urgentLabel = labels.find(l => l.name === "Urgent")?.id;
-                const inboxLabel = labels.find(l => l.name === "INBOX")?.id;
-
-                modifyLabels({
-                threadIds: ["17892d1092d08b7e"],
-                options: {
-                    addLabels: [followUpLabel, urgentLabel],
-                    removeLabels: [inboxLabel]
-                }
-                })
-            </usageExample>
+        <tool name="${Tools.BulkDelete}">
+          <purpose>Delete multiple threads permanently</purpose>
+          <safety>Always confirm before deletion</safety>
+          <example>bulkDelete({ threadIds: ["..."] })</example>
         </tool>
 
-        <tool name="${Tools.MarkThreadsRead}">
-          <description>Mark threads as read to reduce inbox clutter when requested or inferred.</description>
-          <usageExample>markThreadsRead({ threadIds: [...] })</usageExample>
-        </tool>
-  
-        <tool name="${Tools.MarkThreadsUnread}">
-          <description>Mark threads as unread if the user wants to follow up later or missed something important.</description>
-          <usageExample>markThreadsUnread({ threadIds: [...] })</usageExample>
+        <tool name="${Tools.ModifyLabels}">
+          <purpose>Add/remove labels from threads</purpose>
+          <note>Get label IDs first with getUserLabels</note>
+          <example>modifyLabels({ threadIds: [...], options: { addLabels: [...], removeLabels: [...] } })</example>
         </tool>
-  
+
         <tool name="${Tools.CreateLabel}">
-          <description>Create a new Gmail label if it doesn't already exist, with custom colors if specified.</description>
-          <parameters>
-            <parameter name="name" type="string"/>
-            <parameter name="backgroundColor" type="string"/>
-            <parameter name="textColor" type="string"/>
-          </parameters>
-          <allowedColors>${colors.join(', ')}</allowedColors>
-          <usageExample>createLabel({ name: "Follow-Up", backgroundColor: "#FFA500", textColor: "#000000" })</usageExample>
+          <purpose>Create new Gmail label</purpose>
+          <colors>${colors.slice(0, 10).join(', ')}...</colors>
+          <example>createLabel({ name: "Follow-Up", backgroundColor: "#FFA500", textColor: "#000000" })</example>
         </tool>
 
-        <tool name="${Tools.DeleteLabel}">
-          <description>Delete a Gmail label by name.</description>
-          <parameters>
-            <parameter name="id" type="string"/>
-          </parameters>
-          <usageExample>deleteLabel({ id: "..." })</usageExample>
-        </tool>
-  
         <tool name="${Tools.GetUserLabels}">
-          <description>Fetch the user's label list to avoid duplication and suggest categories.</description>
-          <usageExample>getUserLabels()</usageExample>
+          <purpose>List all user labels</purpose>
+          <usage>Check before creating new labels</usage>
+        </tool>
+
+        <tool name="${Tools.MarkThreadsRead}">
+          <purpose>Mark threads as read</purpose>
+        </tool>
+
+        <tool name="${Tools.MarkThreadsUnread}">
+          <purpose>Mark threads as unread</purpose>
         </tool>
 
         <tool name="${Tools.ComposeEmail}">
-          <description>Compose an email using AI assistance with style matching and context awareness.</description>
-          <parameters>
-            <parameter name="prompt" type="string"/>
-            <parameter name="emailSubject" type="string" optional="true"/>
-            <parameter name="to" type="string[]" optional="true"/>
-            <parameter name="cc" type="string[]" optional="true"/>
-            <parameter name="threadMessages" type="object[]" optional="true"/>
-          </parameters>
-          <usageExample>composeEmail({ prompt: "Write a follow-up email", emailSubject: "Follow-up", to: ["recipient@example.com"] })</usageExample>
+          <purpose>Draft email with AI assistance</purpose>
+          <example>composeEmail({ prompt: "Follow-up email", to: ["email@example.com"] })</example>
         </tool>
 
         <tool name="${Tools.SendEmail}">
-          <description>Send a new email with optional CC, BCC, and attachments.</description>
-          <parameters>
-            <parameter name="to" type="object[]"/>
-            <parameter name="subject" type="string"/>
-            <parameter name="message" type="string"/>
-            <parameter name="cc" type="object[]" optional="true"/>
-            <parameter name="bcc" type="object[]" optional="true"/>
-            <parameter name="threadId" type="string" optional="true"/>
-            <parameter name="draftId" type="string" optional="true"/>
-          </parameters>
-          <usageExample>sendEmail({ to: [{ email: "recipient@example.com" }], subject: "Hello", message: "Message body" })</usageExample>
+          <purpose>Send new email</purpose>
+          <example>sendEmail({ to: [{ email: "user@example.com" }], subject: "Hello", message: "Body" })</example>
         </tool>
       </tools>
-  
-      <bestPractices>
-        <practice>Confirm with the user before applying changes to more than 5 threads.</practice>
-        <practice>Always justify label suggestions in context of sender, keywords, or pattern.</practice>
-        <practice>Never delete or permanently alter threads. Archive and label only with user intent.</practice>
-        <practice>Prefer temporal filtering (e.g. last week, today) to improve relevance.</practice>
-        <practice>Use thread grouping and sender patterns to suggest batch actions.</practice>
-        <practice>If the user refers to "this email" or "this thread", use ID: ${threadId} and <tool>getThread</tool>.</practice>
-        <practice>Check label existence with <tool>getUserLabels</tool> before creating new ones.</practice>
-        <practice>Avoid using Gmail system category labels like: ${CATEGORY_IDS.join(', ')}.</practice>
-      </bestPractices>
-  
-      <responseRules>
-        <rule>Never show raw tool responses.</rule>
-        <rule>Reply conversationally and efficiently. No "Here's what I found".</rule>
-        <rule>Use *{text}* to bold key takeaways in user-facing messages.</rule>
-        <rule>When using the listThreads tool, respond only with "Here are the emails I found" without providing any details about the emails.</rule>
-        <rule>Be direct and concise - avoid unnecessary preamble or explanations unless requested.</rule>
-        <rule>Take action when asked, don't just describe what you could do.</rule>
-        <rule>For complex tasks, break them down and execute systematically without over-explaining each step.</rule>
-        <rule>When multiple search patterns are needed, execute them in parallel for efficiency.</rule>
-      </responseRules>
-
-      <communicationStyle>
-        <principle>Professional, direct, and action-oriented communication.</principle>
-        <principle>Minimize tokens while maintaining helpfulness and accuracy.</principle>
-        <principle>Skip flattery and filler phrases - respond directly to the user's need.</principle>
-        <principle>After completing actions, provide brief confirmation rather than detailed summaries.</principle>
-        <principle>Use parallel tool execution when possible to maximize efficiency.</principle>
-        <principle>Focus on results and next steps rather than process descriptions.</principle>
-      </communicationStyle>
-  
-    <useCases>
-      <useCase name="Subscriptions">
-        <trigger>User asks about bills, subscriptions, or recurring expenses.</trigger>
-        <examples>
-          <example>What subscriptions do I have?</example>
-          <example>How much am I paying for streaming?</example>
-        </examples>
-        <detection>
-          <clue>Domains like netflix.com, spotify.com, apple.com</clue>
-          <clue>Keywords: "your subscription", "monthly charge"</clue>
-        </detection>
-        <response>
-          List subscriptions with name, amount, and frequency. Sum monthly totals.
-        </response>
-      </useCase>
-  
-      <useCase name="Newsletters">
-        <trigger>User refers to newsletters or digest-style emails.</trigger>
-        <examples>
-          <example>What newsletters am I subscribed to?</example>
-        </examples>
-        <detection>
-          <clue>Subjects containing: "newsletter", "read more", "digest"</clue>
-          <clue>Domains like substack.com, mailchimp.com</clue>
-        </detection>
-        <response>List newsletter sources and sample subject lines.</response>
-      </useCase>
-  
-      <useCase name="Meetings">
-        <trigger>User asks about scheduled meetings or events.</trigger>
-        <examples>
-          <example>Do I have any meetings today?</example>
-        </examples>
-        <detection>
-          <clue>Keywords: "Zoom", "Google Meet", "calendar invite"</clue>
-          <clue>Domains: calendly.com, zoom.us</clue>
-        </detection>
-        <response>
-          List meeting title, time, date, and platform. Highlight today's events.
-        </response>
-      </useCase>
-  
-      <useCase name="Topic Queries">
-        <trigger>User requests information about a specific topic, task, or event.</trigger>
-        <examples>
-          <example>Find emails about the hackathon.</example>
-        </examples>
-        <detection>
-          <clue>Match topic in subject, body, or participants</clue>
-        </detection>
-        <response>
-          Summarize relevant threads with participants and dates.
-        </response>
-      </useCase>
-  
-      <useCase name="Attachments">
-        <trigger>User mentions needing documents, images, or files.</trigger>
-        <examples>
-          <example>Find the tax PDF from last week.</example>
-        </examples>
-        <detection>
-          <clue>Attachments with .pdf, .jpg, .docx extensions</clue>
-        </detection>
-        <response>
-          Provide filenames, senders, and sent dates.
-        </response>
-      </useCase>
-  
-      <useCase name="Summaries">
-        <trigger>User asks for inbox activity summaries.</trigger>
-        <examples>
-          <example>What happened in my inbox this week?</example>
-        </examples>
-        <detection>
-          <clue>Date-based filtering with topic categorization</clue>
-        </detection>
-        <response>
-          Summarize messages by theme (meetings, personal, purchases, etc.).
-        </response>
-      </useCase>
-  
-      <useCase name="Projects">
-        <trigger>User mentions project-specific work or collaboration.</trigger>
-        <examples>
-          <example>Find updates on the onboarding project.</example>
-        </examples>
-        <detection>
-          <clue>Work-related keywords like "task", "deadline", "update"</clue>
-          <clue>Emails from known teammates or domains</clue>
-        </detection>
-        <response>
-          Provide summary lines and senders of relevant messages.
-        </response>
-      </useCase>
-
-      <useCase name="BulkDeletion">
-        <trigger>User asks to find and delete emails from specific senders or domains.</trigger>
-        <examples>
-          <example>Find all emails from cal.com and delete them</example>
-          <example>Delete all emails from marketing@example.com</example>
-          <example>Remove all messages from spam-domain.net</example>
-        </examples>
-        <detection>
-          <clue>Keywords: "delete", "remove", "get rid of" combined with sender/domain</clue>
-          <clue>Specific domain or email address mentioned</clue>
-        </detection>
-        <workflow>
-          <step>Use inboxRag with natural language query (e.g., "emails from cal.com" or "messages from marketing@example.com")</step>
-          <step>Extract threadIds from the returned array</step>
-          <step>Pass threadIds to bulkDelete tool</step>
-          <step>Confirm deletion count with user</step>
-        </workflow>
-        <response>
-          Confirm number of emails found and deleted. Warn if large number (>50).
-        </response>
-      </useCase>
-
-      <useCase name="FilterRedirection">
-        <trigger>User asks to show unread or starred emails.</trigger>
-        <examples>
-          <example>Show me my unread emails</example>
-          <example>Show me my starred emails</example>
-          <example>Display unread messages</example>
-        </examples>
-        <detection>
-          <clue>Keywords: "show", "display" combined with "unread", "starred"</clue>
-        </detection>
-        <response>
-          Please use the on-screen filters available to view your unread or starred emails.
-        </response>
-      </useCase>
-
-      <useCase name="InvestmentInquiry">
-        <trigger>User asks about their investments.</trigger>
-        <examples>
-          <example>Show me my investments</example>
-          <example>What investments do I have?</example>
-        </examples>
-        <detection>
-          <clue>Keywords: "investments", "portfolio", "stocks", "crypto"</clue>
-        </detection>
-        <response>
-          To help you find investment-related emails, I need more information: What type of investments are you looking for (stocks, crypto, real estate, etc.)? Also, where do you typically receive investment updates or statements (which platforms or brokers)?
-        </response>
-      </useCase>
-
-      <useCase name="AllEmailsRequest">
-        <trigger>User asks to find all their emails without specific criteria.</trigger>
-        <examples>
-          <example>Find all my emails</example>
-          <example>Show me all emails</example>
-          <example>Get all my messages</example>
-        </examples>
-        <detection>
-          <clue>Keywords: "all emails", "all messages" without specific filters</clue>
-        </detection>
-        <response>
-          I'll show you the 10 most recent emails. For more comprehensive results, please use the on-screen search functionality.
-        </response>
-        <maxResults>10</maxResults>
-      </useCase>
-
-      <useCase name="DefaultMaxResults">
-        <trigger>User doesn't specify maximum number of results for searches.</trigger>
-        <detection>
-          <clue>No explicit number mentioned in search requests</clue>
-        </detection>
-        <defaultMaxResults>5</defaultMaxResults>
-      </useCase>
-
-      <useCase name="SupportIssues">
-        <trigger>User is facing technical issues or needs help.</trigger>
-        <examples>
-          <example>I'm having trouble with the app</example>
-          <example>Something is not working</example>
-          <example>I need help</example>
-        </examples>
-        <detection>
-          <clue>Keywords: "help", "issue", "problem", "trouble", "not working", "error"</clue>
-        </detection>
-        <response>
-          For technical support and assistance, please use the live chat button available on the sidebar.
-        </response>
-      </useCase>
-
-      <useCase name="ProductInformation">
-        <trigger>User asks about Zero Email, Mail0, or 0.email.</trigger>
-        <examples>
-          <example>What is Zero Email?</example>
-          <example>Tell me about Mail0</example>
-          <example>How does 0.email work?</example>
-        </examples>
-        <detection>
-          <clue>Keywords: "Zero Email", "Mail0", "0.email"</clue>
-        </detection>
-        <response>
-          For more information about Zero Email/Mail0/0.email, please visit mail0.com.
-        </response>
-      </useCase>
-    </useCases>
-  
-    <exampleRequests>
-      <request>"Organize unread newsletters with labels."</request>
-      <request>"Label this email as 'Follow-Up'."</request>
-      <request>"Summarize important messages from last week."</request>
-      <request>"Show recent emails with receipts and invoices."</request>
-      <request>"Add a project tag to this thread."</request>
-    </exampleRequests>
-
-    <philosophy>
-      <goal>Empower users to take control of their inbox with minimal effort.</goal>
-      <goal>Automate where possible, but always explain and preserve control.</goal>
-      <goal>Never risk content loss; always act with caution and clarity.</goal>
-    </philosophy>
-  </system>
- `;
+
+      <workflow_examples>
+        <example name="simple_search">
+          <user>Find newsletters from last week</user>
+          <thinking>User wants newsletters from specific timeframe. Use inboxRag with time filter.</thinking>
+          <action>inboxRag({ query: "newsletters from last week" })</action>
+          <response>Found 3 newsletters from last week.</response>
+        </example>
+
+        <example name="organize_emails">
+          <user>Label my investment emails as "Investments"</user>
+          <thinking>
+            1. Search for investment emails
+            2. Check if "Investments" label exists
+            3. Create label if needed
+            4. Apply to found threads
+          </thinking>
+          <action_sequence>
+            1. inboxRag({ query: "investment emails portfolio statements" })
+            2. getUserLabels()
+            3. createLabel({ name: "Investments" }) [if needed]
+            4. modifyLabels({ threadIds: [...], options: { addLabels: [...] } })
+          </action_sequence>
+          <response>Labeled 5 investment emails with "Investments".</response>
+        </example>
+
+        <example name="bulk_cleanup">
+          <user>Delete all promotional emails from cal.com</user>
+          <thinking>
+            1. Search for cal.com emails
+            2. Check count - if >5, confirm first
+            3. Delete if confirmed
+          </thinking>
+          <action_sequence>
+            1. inboxRag({ query: "emails from cal.com promotional" })
+            2. [If >5 results] Ask: "Found 12 emails from cal.com. Delete all?"
+            3. bulkDelete({ threadIds: [...] })
+          </action_sequence>
+          <response>Deleted 12 promotional emails from cal.com.</response>
+        </example>
+      </workflow_examples>
+
+      <safety_rules>
+        <rule>Confirm before deleting any emails</rule>
+        <rule>Confirm before affecting more than 5 threads</rule>
+        <rule>Never delete or modify without user permission</rule>
+        <rule>Check label existence before creating duplicates</rule>
+        <rule>Use appropriate tools for each task</rule>
+      </safety_rules>
+
+      <response_guidelines>
+        <formatting>Plain text only - no markdown, bullets, or special characters</formatting>
+        <tone>Professional and direct - skip "Here's what I found" phrases</tone>
+        <length>Concise - focus on results, not process</length>
+        <action>Take action when requested - don't just describe what you could do</action>
+        <transparency>Never reveal tool outputs or internal reasoning</transparency>
+      </response_guidelines>
+
+      <common_use_cases>
+        <case name="search">When user asks to find emails, use inboxRag with descriptive query</case>
+        <case name="organize">Search → check labels → create if needed → apply labels</case>
+        <case name="cleanup">Search → confirm if many results → archive or delete</case>
+        <case name="this_email">When user says "this email", use getThread with current threadId</case>
+        <case name="time_specific">When user asks "find emails today" or "find emails this week", use inboxRag but replace relative time with actual dates from getCurrentDateContext</case>
+        <case name="investments">Ask for specifics: platforms, types, timeframes</case>
+        <case name="all_emails">Limit to 10 most recent, suggest using search filters</case>
+        <case name="unread">Direct to on-screen filters</case>
+        <case name="support">Direct to live chat button</case>
+      </common_use_cases>
+
+      <self_check>
+        Before sending each response:
+        1. Does it follow the success criteria?
+        2. Is it plain text only?
+        3. Am I being concise and helpful?
+        4. Did I follow safety rules?
+      </self_check>
+    </system_prompt>
+  `;
diff --git a/apps/server/src/routes/agent/index.ts b/apps/server/src/routes/agent/index.ts
index ef5936e3bb..fd1c5f73a0 100644
--- a/apps/server/src/routes/agent/index.ts
+++ b/apps/server/src/routes/agent/index.ts
@@ -19,6 +19,7 @@ import {
   createDataStreamResponse,
   streamText,
   appendResponseMessages,
+  generateText,
 } from 'ai';
 import {
   IncomingMessageType,
@@ -27,6 +28,7 @@ import {
   type OutgoingMessage,
 } from './types';
 import { DurableObjectOAuthClientProvider } from 'agents/mcp/do-oauth-client-provider';
+import { AiChatPrompt, GmailSearchAssistantSystemPrompt } from '../../lib/prompts';
 import { EPrompts, type IOutgoingMessage, type ParsedMessage } from '../../types';
 import type { MailManager, IGetThreadResponse } from '../../lib/driver/types';
 import { connectionToDriver } from '../../lib/server-utils';
@@ -35,7 +37,6 @@ import { withRetry } from '../../lib/gmail-rate-limit';
 import { getPrompt } from '../../pipelines.effect';
 import { AIChatAgent } from 'agents/ai-chat-agent';
 import { ToolOrchestrator } from './orchestrator';
-import { AiChatPrompt } from '../../lib/prompts';
 import { getPromptName } from '../../pipelines';
 import { anthropic } from '@ai-sdk/anthropic';
 import { connection } from '../../db/schema';
@@ -44,6 +45,7 @@ import { tools as authTools } from './tools';
 import { processToolCalls } from './utils';
 import { env } from 'cloudflare:workers';
 import type { Connection } from 'agents';
+import { openai } from '@ai-sdk/openai';
 import { createDb } from '../../db';
 import { DriverRpcDO } from './rpc';
 import { eq } from 'drizzle-orm';
@@ -493,22 +495,48 @@ export class ZeroDriver extends AIChatAgent<typeof env> {
   }
 
   async inboxRag(query: string) {
-    if (!env.AUTORAG_ID) return { result: 'Not enabled', data: [] };
-    const answer = await env.AI.autorag(env.AUTORAG_ID).aiSearch({
-      query: query,
-      //   rewrite_query: true,
-      max_num_results: 3,
-      ranking_options: {
+    if (!env.AUTORAG_ID) {
+      console.warn('[inboxRag] AUTORAG_ID not configured - RAG search disabled');
+      return { result: 'Not enabled', data: [] };
+    }
+
+    try {
+      const startTime = Date.now();
+      console.log(`[inboxRag] Executing AI search with parameters:`, {
+        query,
+        max_num_results: 3,
         score_threshold: 0.3,
-      },
-      //   stream: true,
-      filters: {
-        type: 'eq',
-        key: 'folder',
-        value: `${this.name}/`,
-      },
-    });
-    return { result: answer.response, data: answer.data };
+        folder_filter: `${this.name}/`,
+      });
+
+      const answer = await env.AI.autorag(env.AUTORAG_ID).aiSearch({
+        query: query,
+        //   rewrite_query: true,
+        max_num_results: 3,
+        ranking_options: {
+          score_threshold: 0.3,
+        },
+        //   stream: true,
+        filters: {
+          type: 'eq',
+          key: 'folder',
+          value: `${this.name}/`,
+        },
+      });
+
+      const duration = Date.now() - startTime;
+
+      return { result: answer.response, data: answer.data };
+    } catch (error) {
+      console.error(`[inboxRag] Search failed for query: "${query}"`, {
+        error: error instanceof Error ? error.message : 'Unknown error',
+        stack: error instanceof Error ? error.stack : undefined,
+        user: this.name,
+      });
+
+      // Return empty result on error to prevent breaking the flow
+      return { result: 'Search failed', data: [] };
+    }
   }
 
   async searchThreads(params: {
@@ -532,10 +560,20 @@ export class ZeroDriver extends AIChatAgent<typeof env> {
       }),
     ).pipe(Effect.catchAll(() => Effect.succeed([])));
 
+    const genQueryEffect = Effect.tryPromise(() =>
+      generateText({
+        model: openai(env.OPENAI_MODEL || 'gpt-4o'),
+        system: GmailSearchAssistantSystemPrompt(),
+        prompt: params.query,
+      }).then((response) => response.text),
+    ).pipe(Effect.catchAll(() => Effect.succeed(query)));
+
+    const genQueryResult = await Effect.runPromise(genQueryEffect);
+
     const rawEffect = Effect.tryPromise(() =>
       this.driver!.list({
         folder,
-        query,
+        query: genQueryResult,
         labelIds,
         maxResults,
         pageToken,
@@ -847,7 +885,7 @@ export class ZeroAgent extends AIChatAgent<typeof env> {
         const rawTools = {
           ...(await authTools(connectionId)),
         };
-        const tools = orchestrator.processTools({});
+        const tools = orchestrator.processTools(rawTools);
         const processedMessages = await processToolCalls(
           {
             messages: this.messages,
@@ -861,7 +899,7 @@ export class ZeroAgent extends AIChatAgent<typeof env> {
           model: anthropic(env.OPENAI_MODEL || 'claude-3-5-haiku-latest'),
           maxSteps: 10,
           messages: processedMessages,
-          tools: rawTools,
+          tools,
           onFinish,
           onError: (error) => {
             console.error('Error in streamText', error);
diff --git a/apps/server/src/routes/agent/mcp.ts b/apps/server/src/routes/agent/mcp.ts
index 19ed751471..081179eb52 100644
--- a/apps/server/src/routes/agent/mcp.ts
+++ b/apps/server/src/routes/agent/mcp.ts
@@ -14,10 +14,9 @@
  * Reuse or distribution of this file requires a license from Zero Email Inc.
  */
 
-import { GmailSearchAssistantSystemPrompt, getCurrentDateContext } from '../../lib/prompts';
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { getCurrentDateContext } from '../../lib/prompts';
 import { getZeroAgent } from '../../lib/server-utils';
-import { anthropic } from '@ai-sdk/anthropic';
 import { connection } from '../../db/schema';
 import { FOLDERS } from '../../lib/utils';
 import { env } from 'cloudflare:workers';
@@ -118,31 +117,6 @@ export class ZeroMCP extends McpAgent<typeof env, Record<string, unknown>, { use
       },
     );
 
-    this.server.registerTool(
-      'buildGmailSearchQuery',
-      {
-        description: 'Build Gmail search query using AI assistance',
-        inputSchema: {
-          query: z.string(),
-        },
-      },
-      async (s) => {
-        const result = await generateText({
-          model: anthropic(env.OPENAI_MODEL || 'claude-3-5-haiku-latest'),
-          system: GmailSearchAssistantSystemPrompt(),
-          prompt: s.query,
-        });
-        return {
-          content: [
-            {
-              type: 'text',
-              text: result.text,
-            },
-          ],
-        };
-      },
-    );
-
     const agent = await getZeroAgent(_connection.id);
 
     this.server.registerTool(
diff --git a/apps/server/src/routes/agent/tools.ts b/apps/server/src/routes/agent/tools.ts
index 0b84e3638f..e7e92efd9a 100644
--- a/apps/server/src/routes/agent/tools.ts
+++ b/apps/server/src/routes/agent/tools.ts
@@ -2,9 +2,8 @@ import { composeEmail } from '../../trpc/routes/ai/compose';
 import { perplexity } from '@ai-sdk/perplexity';
 import { generateText, tool } from 'ai';
 
-import { colors, GmailSearchAssistantSystemPrompt } from '../../lib/prompts';
 import { getZeroAgent } from '../../lib/server-utils';
-import { anthropic } from '@ai-sdk/anthropic';
+import { colors } from '../../lib/prompts';
 import { env } from 'cloudflare:workers';
 import { Tools } from '../../types';
 import { z } from 'zod';
@@ -186,18 +185,6 @@ const markAsRead = (connectionId: string) =>
     },
   });
 
-// const inboxRag = (connectionId: string, dataStream?: DataStreamWriter) =>
-//   tool({
-//     description: 'Search the inbox for emails',
-//     parameters: z.object({
-//       query: z.string().describe('The query to search the inbox for'),
-//     }),
-//     execute: async ({ query }) => {
-//       console.log('inboxRag', query);
-//       return await agent.inboxRag(query, dataStream);
-//     },
-//   });
-
 const markAsUnread = (connectionId: string) =>
   tool({
     description: 'Mark emails as unread',
@@ -390,22 +377,6 @@ export const webSearch = () =>
     },
   });
 
-const buildGmailSearchQuery = () =>
-  tool({
-    description: 'Build Gmail search query using AI assistance',
-    parameters: z.object({
-      query: z.string(),
-    }),
-    execute: async ({ query }) => {
-      const result = await generateText({
-        model: anthropic(env.OPENAI_MODEL || 'claude-3-5-haiku-latest'),
-        system: GmailSearchAssistantSystemPrompt(),
-        prompt: query,
-      });
-      return result.text;
-    },
-  });
-
 export const tools = async (connectionId: string) => {
   return {
     [Tools.GetThread]: getEmail(),
@@ -425,7 +396,6 @@ export const tools = async (connectionId: string) => {
         query: z.string().describe('The query to search the web for'),
       }),
     }),
-    [Tools.BuildGmailSearchQuery]: buildGmailSearchQuery(),
     [Tools.InboxRag]: tool({
       description:
         'Search the inbox for emails using natural language. Returns only an array of threadIds.',
diff --git a/apps/server/src/trpc/routes/ai/search.ts b/apps/server/src/trpc/routes/ai/search.ts
index 88c0c4c24d..d22d0977a8 100644
--- a/apps/server/src/trpc/routes/ai/search.ts
+++ b/apps/server/src/trpc/routes/ai/search.ts
@@ -3,9 +3,9 @@ import {
   OutlookSearchAssistantSystemPrompt,
 } from '../../../lib/prompts';
 import { activeDriverProcedure } from '../../trpc';
+import { env } from 'cloudflare:workers';
 import { openai } from '@ai-sdk/openai';
 import { generateObject } from 'ai';
-import { env } from 'cloudflare:workers';
 import { z } from 'zod';
 
 export const generateSearchQuery = activeDriverProcedure
@@ -28,6 +28,7 @@ export const generateSearchQuery = activeDriverProcedure
       schema: z.object({
         query: z.string(),
       }),
+      output: 'object',
     });
 
     return result.object;

From d040186b3c2c89c3df913dae60be5339d4bb55b8 Mon Sep 17 00:00:00 2001
From: Adam <13007539+MrgSub@users.noreply.github.com>
Date: Sun, 20 Jul 2025 13:29:16 -0700
Subject: [PATCH 11/20] Refactor Google mail count implementation and add
 staleTime to stats query (#1770)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Optimize mail app performance and refactor Google mail manager

## Description

This PR makes several improvements to the mail application:

1. Removed unused parameter in the `onSubmit` function in the notifications settings page
2. Added a 5-minute stale time to the mail count query to reduce unnecessary API calls
3. Completely refactored the Google mail manager's count method to use Effect.js more effectively:
   - Implemented concurrent fetching of user labels and archive count
   - Improved error handling with more specific error types
   - Restructured the code to be more maintainable with a cleaner data flow
   - Added better type safety throughout the implementation

## Type of Change

- [x] 🐛 Bug fix (non-breaking change which fixes an issue)
- [x] ⚡ Performance improvement

## Areas Affected

- [x] Email Integration (Gmail, IMAP, etc.)
- [x] User Interface/Experience
- [x] Performance

## Testing Done

- [x] Manual testing performed

## Checklist

- [x] I have performed a self-review of my code
- [x] My changes generate no new warnings
- [x] All tests pass locally

---

_By submitting this pull request, I confirm that my contribution is made under the terms of the project's license._
---
 .../(routes)/settings/notifications/page.tsx  |   2 +-
 apps/mail/hooks/use-stats.ts                  |   1 +
 apps/server/src/lib/driver/google.ts          | 103 ++++++++++--------
 3 files changed, 61 insertions(+), 45 deletions(-)

diff --git a/apps/mail/app/(routes)/settings/notifications/page.tsx b/apps/mail/app/(routes)/settings/notifications/page.tsx
index 101284778d..7515d11887 100644
--- a/apps/mail/app/(routes)/settings/notifications/page.tsx
+++ b/apps/mail/app/(routes)/settings/notifications/page.tsx
@@ -38,7 +38,7 @@ export default function NotificationsPage() {
     },
   });
 
-  function onSubmit(values: z.infer<typeof formSchema>) {
+  function onSubmit() {
     setIsSaving(true);
     setTimeout(() => {
       setIsSaving(false);
diff --git a/apps/mail/hooks/use-stats.ts b/apps/mail/hooks/use-stats.ts
index 7a9243f2cc..19bca66c76 100644
--- a/apps/mail/hooks/use-stats.ts
+++ b/apps/mail/hooks/use-stats.ts
@@ -9,6 +9,7 @@ export const useStats = () => {
   const statsQuery = useQuery(
     trpc.mail.count.queryOptions(void 0, {
       enabled: !!session?.user.id,
+      staleTime: 1000 * 60 * 5, // 1 hour
     }),
   );
 
diff --git a/apps/server/src/lib/driver/google.ts b/apps/server/src/lib/driver/google.ts
index c9eef5741f..0101bb5cc1 100644
--- a/apps/server/src/lib/driver/google.ts
+++ b/apps/server/src/lib/driver/google.ts
@@ -228,37 +228,33 @@ export class GoogleMailManager implements MailManager {
     return this.withErrorHandler(
       'count',
       async () => {
-        const userLabels = await this.gmail.users.labels.list({
-          userId: 'me',
-        });
+        type LabelCount = { label: string; count: number };
 
-        if (!userLabels.data.labels) {
-          return [];
-        }
+        const getUserLabelsEffect = Effect.tryPromise({
+          try: () => this.gmail.users.labels.list({ userId: 'me' }),
+          catch: (error) => ({ _tag: 'LabelListFailed' as const, error }),
+        });
 
-        const labelRequests = userLabels.data.labels.map((label) =>
-          Effect.tryPromise({
-            try: () =>
-              this.gmail.users.labels.get({
-                userId: 'me',
-                id: label.id ?? undefined,
-              }),
-            catch: (error) => ({ _tag: 'LabelFetchFailed' as const, error }),
+        const getArchiveCountEffect = Effect.tryPromise({
+          try: () => this.gmail.users.threads.list({
+            userId: 'me',
+            q: 'in:archive',
+            maxResults: 1,
           }),
-        );
-
-        const results = await Effect.runPromise(
-          Effect.all(labelRequests, { concurrency: 'unbounded' }),
-        );
-
-        type LabelCount = { label: string; count: number };
+          catch: (error) => ({ _tag: 'ArchiveFetchFailed' as const, error }),
+        });
 
-        const mapped: LabelCount[] = (
-          await Promise.all(
-            results.map(async (res) => {
-              if ('_tag' in res && res._tag === 'LabelFetchFailed') {
-                return null;
-              }
+        const processLabelEffect = (label: any) =>
+          Effect.tryPromise({
+            try: () => this.gmail.users.labels.get({
+              userId: 'me',
+              id: label.id ?? undefined,
+            }),
+            catch: (error) => ({ _tag: 'LabelFetchFailed' as const, error, labelId: label.id }),
+          }).pipe(
+            Effect.map((res) => {
+              if ('_tag' in res) return null;
+              
               let labelName = (res.data.name ?? res.data.id ?? '').toLowerCase();
               if (labelName === 'draft') {
                 labelName = 'drafts';
@@ -269,25 +265,44 @@ export class GoogleMailManager implements MailManager {
                 count: Number(isTotalLabel ? res.data.threadsTotal : res.data.threadsUnread),
               };
             }),
-          )
-        ).filter((item): item is LabelCount => item !== null);
+          );
+
+        const mainEffect = Effect.gen(function* () {
+          // Fetch user labels and archive count concurrently
+          const [userLabelsResult, archiveResult] = yield* Effect.all([
+            getUserLabelsEffect,
+            getArchiveCountEffect,
+          ], { concurrency: 'unbounded' });
+
+          // Handle label list failure
+          if ('_tag' in userLabelsResult && userLabelsResult._tag === 'LabelListFailed') {
+            return [];
+          }
 
-        // Get archive count
-        try {
-          const archiveRes = await this.gmail.users.threads.list({
-            userId: 'me',
-            q: 'in:archive',
-            maxResults: 1,
-          });
-          mapped.push({
-            label: 'archive',
-            count: Number(archiveRes.data.resultSizeEstimate ?? 0),
-          });
-        } catch (error: unknown) {
-          console.error('Failed to fetch archive count:', error);
-        }
+          const labels = userLabelsResult.data.labels || [];
+          if (labels.length === 0) {
+            return [];
+          }
+
+          // Process all labels concurrently
+          const labelEffects = labels.map(processLabelEffect);
+          const labelResults = yield* Effect.all(labelEffects, { concurrency: 'unbounded' });
+
+          // Filter and collect results
+          const mapped: LabelCount[] = labelResults.filter((item): item is LabelCount => item !== null);
+
+          // Add archive count if successful
+          if (!('_tag' in archiveResult)) {
+            mapped.push({
+              label: 'archive',
+              count: Number(archiveResult.data.resultSizeEstimate ?? 0),
+            });
+          }
+
+          return mapped;
+        });
 
-        return mapped;
+        return await Effect.runPromise(mainEffect);
       },
       { email: this.config.auth?.email },
     );

From 2e44025bd2cc8b9800604f8bfa31a1ab5b9fc6a0 Mon Sep 17 00:00:00 2001
From: Adam <13007539+MrgSub@users.noreply.github.com>
Date: Sun, 20 Jul 2025 14:25:27 -0700
Subject: [PATCH 12/20] Uncomment and enable automatic draft generation in
 thread workflow (#1771)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# READ CAREFULLY THEN REMOVE

Remove bullet points that are not relevant.

PLEASE REFRAIN FROM USING AI TO WRITE YOUR CODE AND PR DESCRIPTION. IF YOU DO USE AI TO WRITE YOUR CODE PLEASE PROVIDE A DESCRIPTION AND REVIEW IT CAREFULLY. MAKE SURE YOU UNDERSTAND THE CODE YOU ARE SUBMITTING USING AI.

- Pull requests that do not follow these guidelines will be closed without review or comment.
- If you use AI to write your PR description your pr will be close without review or comment.
- If you are unsure about anything, feel free to ask for clarification.

## Description

Please provide a clear description of your changes.

---

## Type of Change

Please delete options that are not relevant.

- [ ] 🐛 Bug fix (non-breaking change which fixes an issue)
- [ ] ✨ New feature (non-breaking change which adds functionality)
- [ ] 💥 Breaking change (fix or feature with breaking changes)
- [ ] 📝 Documentation update
- [ ] 🎨 UI/UX improvement
- [ ] 🔒 Security enhancement
- [ ] ⚡ Performance improvement

## Areas Affected

Please check all that apply:

- [ ] Email Integration (Gmail, IMAP, etc.)
- [ ] User Interface/Experience
- [ ] Authentication/Authorization
- [ ] Data Storage/Management
- [ ] API Endpoints
- [ ] Documentation
- [ ] Testing Infrastructure
- [ ] Development Workflow
- [ ] Deployment/Infrastructure

## Testing Done

Describe the tests you've done:

- [ ] Unit tests added/updated
- [ ] Integration tests added/updated
- [ ] Manual testing performed
- [ ] Cross-browser testing (if UI changes)
- [ ] Mobile responsiveness verified (if UI changes)

## Security Considerations

For changes involving data or authentication:

- [ ] No sensitive data is exposed
- [ ] Authentication checks are in place
- [ ] Input validation is implemented
- [ ] Rate limiting is considered (if applicable)

## Checklist

- [ ] I have read the [CONTRIBUTING](https://github.com/Mail-0/Zero/blob/staging/.github/CONTRIBUTING.md) document
- [ ] My code follows the project's style guidelines
- [ ] I have performed a self-review of my code
- [ ] I have commented my code, particularly in complex areas
- [ ] I have updated the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that prove my fix/feature works
- [ ] All tests pass locally
- [ ] Any dependent changes are merged and published

## Additional Notes

Add any other context about the pull request here.

## Screenshots/Recordings

Add screenshots or recordings here if applicable.

---

_By submitting this pull request, I confirm that my contribution is made under the terms of the project's license._


<!-- This is an auto-generated description by cubic. -->
---

## Summary by cubic
Enabled automatic draft generation in the thread workflow by uncommenting and activating related logic.

- **New Features**
  - Threads now automatically generate a draft reply when a response is needed, based on email intent analysis.

<!-- End of auto-generated description by cubic. -->



<!-- This is an auto-generated comment: release notes by coderabbit.ai -->

## Summary by CodeRabbit

* **New Features**
  * Automatic draft generation for certain email threads has been re-enabled, allowing drafts to be created based on message intent.

* **Bug Fixes**
  * Restored previously disabled functionality for generating and logging automatic drafts.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
---
 .../context/command-palette-context.tsx       |   2 +-
 apps/mail/components/mail/mail.tsx            | 781 +++++++++---------
 apps/server/src/pipelines.effect.ts           | 178 ++--
 3 files changed, 479 insertions(+), 482 deletions(-)

diff --git a/apps/mail/components/context/command-palette-context.tsx b/apps/mail/components/context/command-palette-context.tsx
index e6897a9ef6..92f8ef3c1b 100644
--- a/apps/mail/components/context/command-palette-context.tsx
+++ b/apps/mail/components/context/command-palette-context.tsx
@@ -739,7 +739,7 @@ export function CommandPalette({ children }: { children: React.ReactNode }) {
 
     const result: CommandGroup[] = [
       {
-        group: 'Search & Filter',
+        group: 'Search',
         items: searchCommands,
       },
       {
diff --git a/apps/mail/components/mail/mail.tsx b/apps/mail/components/mail/mail.tsx
index e6666e4e2b..b3b4990d0b 100644
--- a/apps/mail/components/mail/mail.tsx
+++ b/apps/mail/components/mail/mail.tsx
@@ -1,12 +1,12 @@
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-  DialogTrigger,
-} from '@/components/ui/dialog';
+// import {
+//   Dialog,
+//   DialogContent,
+//   DialogDescription,
+//   DialogFooter,
+//   DialogHeader,
+//   DialogTitle,
+//   DialogTrigger,
+// } from '@/components/ui/dialog';
 import {
   DropdownMenu,
   DropdownMenuItem,
@@ -14,17 +14,17 @@ import {
   DropdownMenuTrigger,
 } from '../ui/dropdown-menu';
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip';
-import { Bell, Lightning, Mail, ScanEye, Tag, Trash, User, X, Search } from '../icons/icons';
+import { Bell, Lightning, Mail, ScanEye, Tag, User, X, Search } from '../icons/icons';
 import { useCategorySettings, useDefaultCategoryId } from '@/hooks/use-categories';
 import { ResizablePanel, ResizablePanelGroup } from '@/components/ui/resizable';
-import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { useCommandPalette } from '../context/command-palette-context';
+import { useCallback, useEffect, useRef, useState } from 'react';
 import { Check, ChevronDown, RefreshCcw } from 'lucide-react';
 
 import { ThreadDisplay } from '@/components/mail/thread-display';
 import { useActiveConnection } from '@/hooks/use-connections';
-import { useMutation, useQuery } from '@tanstack/react-query';
-import { useTRPC } from '@/providers/query-provider';
+// import { useMutation, useQuery } from '@tanstack/react-query';
+// import { useTRPC } from '@/providers/query-provider';
 
 import { useMediaQuery } from '../../hooks/use-media-query';
 
@@ -33,40 +33,40 @@ import * as CustomIcons from '@/components/icons/icons';
 import { isMac } from '@/lib/hotkeys/use-hotkey-utils';
 import { MailList } from '@/components/mail/mail-list';
 import { useHotkeysContext } from 'react-hotkeys-hook';
-import SelectAllCheckbox from './select-all-checkbox';
+// import SelectAllCheckbox from './select-all-checkbox';
 import { useNavigate, useParams } from 'react-router';
 import { useMail } from '@/components/mail/use-mail';
 import { SidebarToggle } from '../ui/sidebar-toggle';
 import { PricingDialog } from '../ui/pricing-dialog';
-import { Textarea } from '@/components/ui/textarea';
-import { useBrainState } from '@/hooks/use-summary';
+// import { Textarea } from '@/components/ui/textarea';
+// import { useBrainState } from '@/hooks/use-summary';
 import { clearBulkSelectionAtom } from './use-mail';
 import AISidebar from '@/components/ui/ai-sidebar';
 import { useThreads } from '@/hooks/use-threads';
-import { useBilling } from '@/hooks/use-billing';
+// import { useBilling } from '@/hooks/use-billing';
 import AIToggleButton from '../ai-toggle-button';
 import { useIsMobile } from '@/hooks/use-mobile';
-import { Switch } from '@/components/ui/switch';
+// import { Switch } from '@/components/ui/switch';
 import { Button } from '@/components/ui/button';
 import { useLabels } from '@/hooks/use-labels';
 import { useSession } from '@/lib/auth-client';
-import { ScrollArea } from '../ui/scroll-area';
-import { Label } from '@/components/ui/label';
-import { Input } from '@/components/ui/input';
+// import { ScrollArea } from '../ui/scroll-area';
+// import { Label } from '@/components/ui/label';
+// import { Input } from '@/components/ui/input';
 
 import { cn } from '@/lib/utils';
 
 import { m } from '@/paraglide/messages';
 import { useQueryState } from 'nuqs';
 import { useAtom } from 'jotai';
-import { toast } from 'sonner';
+// import { toast } from 'sonner';
 
-interface ITag {
-  id: string;
-  name: string;
-  usecase: string;
-  text: string;
-}
+// interface ITag {
+//   id: string;
+//   name: string;
+//   usecase: string;
+//   text: string;
+// }
 
 export const defaultLabels = [
   {
@@ -101,282 +101,282 @@ export const defaultLabels = [
   },
 ];
 
-const AutoLabelingSettings = () => {
-  const trpc = useTRPC();
-  const [open, setOpen] = useState(false);
-  const { data: storedLabels, refetch: refetchStoredLabels } = useQuery(
-    trpc.brain.getLabels.queryOptions(void 0, {
-      staleTime: 1000 * 60 * 60, // 1 hour
-    }),
-  );
-  const { mutateAsync: updateLabels, isPending } = useMutation(
-    trpc.brain.updateLabels.mutationOptions({
-      onSuccess: () => {
-        refetchStoredLabels();
-      },
-    }),
-  );
-  const [, setPricingDialog] = useQueryState('pricingDialog');
-  const [labels, setLabels] = useState<ITag[]>([]);
-  const [newLabel, setNewLabel] = useState({ name: '', usecase: '' });
-  const { mutateAsync: EnableBrain, isPending: isEnablingBrain } = useMutation(
-    trpc.brain.enableBrain.mutationOptions(),
-  );
-  const { mutateAsync: DisableBrain, isPending: isDisablingBrain } = useMutation(
-    trpc.brain.disableBrain.mutationOptions(),
-  );
-  const { data: brainState, refetch: refetchBrainState } = useBrainState();
-  const { isLoading, isPro } = useBilling();
-
-  useEffect(() => {
-    if (storedLabels) {
-      setLabels(
-        storedLabels.map((label) => ({
-          id: label.name,
-          name: label.name,
-          text: label.name,
-          usecase: label.usecase,
-        })),
-      );
-    }
-  }, [storedLabels]);
-
-  const handleResetToDefault = useCallback(() => {
-    setLabels(
-      defaultLabels.map((label) => ({
-        id: label.name,
-        name: label.name,
-        text: label.name,
-        usecase: label.usecase,
-      })),
-    );
-  }, [storedLabels]);
-
-  const handleAddLabel = () => {
-    if (!newLabel.name || !newLabel.usecase) return;
-    setLabels([...labels, { id: newLabel.name, ...newLabel, text: newLabel.name }]);
-    setNewLabel({ name: '', usecase: '' });
-  };
-
-  const handleDeleteLabel = (id: string) => {
-    setLabels(labels.filter((label) => label.id !== id));
-  };
-
-  const handleUpdateLabel = (id: string, field: 'name' | 'usecase', value: string) => {
-    setLabels(
-      labels.map((label) =>
-        label.id === id
-          ? { ...label, [field]: value, text: field === 'name' ? value : label.text }
-          : label,
-      ),
-    );
-  };
-
-  const handleSubmit = async () => {
-    const updatedLabels = labels.map((label) => ({
-      name: label.name,
-      usecase: label.usecase,
-    }));
-
-    if (newLabel.name.trim() && newLabel.usecase.trim()) {
-      updatedLabels.push({
-        name: newLabel.name,
-        usecase: newLabel.usecase,
-      });
-    }
-    await updateLabels({ labels: updatedLabels });
-    setOpen(false);
-    toast.success('Labels updated successfully, Zero will start using them.');
-  };
-
-  const handleEnableBrain = useCallback(async () => {
-    toast.promise(EnableBrain, {
-      loading: 'Enabling autolabeling...',
-      success: 'Autolabeling enabled successfully',
-      error: 'Failed to enable autolabeling',
-      finally: async () => {
-        await refetchBrainState();
-      },
-    });
-  }, []);
-
-  const handleDisableBrain = useCallback(async () => {
-    toast.promise(DisableBrain, {
-      loading: 'Disabling autolabeling...',
-      success: 'Autolabeling disabled successfully',
-      error: 'Failed to disable autolabeling',
-      finally: async () => {
-        await refetchBrainState();
-      },
-    });
-  }, []);
-
-  const handleToggleAutolabeling = useCallback(() => {
-    if (brainState?.enabled) {
-      handleDisableBrain();
-    } else {
-      handleEnableBrain();
-    }
-  }, [brainState?.enabled]);
-
-  return (
-    <Dialog
-      open={open}
-      onOpenChange={(state) => {
-        if (!isPro) {
-          setPricingDialog('true');
-        } else {
-          setOpen(state);
-        }
-      }}
-    >
-      <DialogTrigger asChild>
-        <div className="flex items-center gap-2">
-          <Switch
-            disabled={isEnablingBrain || isDisablingBrain || isLoading}
-            checked={brainState?.enabled ?? false}
-          />
-          <span className="text-muted-foreground cursor-pointer text-xs font-medium">
-            Auto label
-          </span>
-        </div>
-      </DialogTrigger>
-      <DialogContent showOverlay className="max-w-2xl">
-        <DialogHeader>
-          <div className="flex items-center justify-between">
-            <DialogTitle>Label Settings</DialogTitle>
-            <button
-              onClick={handleToggleAutolabeling}
-              className="bg-offsetLight dark:bg-offsetDark flex items-center gap-2 rounded-lg border px-1.5 py-1"
-            >
-              <span className="text-muted-foreground text-sm">
-                {isEnablingBrain || isDisablingBrain
-                  ? 'Updating...'
-                  : brainState?.enabled
-                    ? 'Disable autolabeling'
-                    : 'Enable autolabeling'}
-              </span>
-              <Switch checked={brainState?.enabled} />
-            </button>
-          </div>
-          <DialogDescription className="mt-2">
-            Configure the labels that Zero uses to automatically organize your emails.
-          </DialogDescription>
-        </DialogHeader>
-
-        <ScrollArea className="h-[400px]">
-          <div className="space-y-3">
-            {labels.map((label, index) => (
-              <div
-                key={label.id}
-                className="bg-card group relative space-y-2 rounded-lg border p-4 shadow-sm transition-shadow hover:shadow-md"
-              >
-                <div className="flex items-center justify-between">
-                  <Label
-                    htmlFor={`label-name-${index}`}
-                    className="text-muted-foreground text-xs font-medium"
-                  >
-                    Label Name
-                  </Label>
-                  <Button
-                    variant="ghost"
-                    size="icon"
-                    className="h-6 w-6 transition-opacity group-hover:opacity-100"
-                    onClick={() => handleDeleteLabel(label.id)}
-                  >
-                    <Trash className="h-3 w-3 fill-[#F43F5E]" />
-                  </Button>
-                </div>
-                <Input
-                  id={`label-name-${index}`}
-                  type="text"
-                  value={label.name}
-                  onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
-                    handleUpdateLabel(label.id, 'name', e.target.value)
-                  }
-                  className="h-8"
-                  placeholder="e.g., Important, Follow-up, Archive"
-                />
-                <div className="space-y-2">
-                  <Label
-                    htmlFor={`label-usecase-${index}`}
-                    className="text-muted-foreground text-xs font-medium"
-                  >
-                    Use Case Description
-                  </Label>
-                  <Textarea
-                    id={`label-usecase-${index}`}
-                    value={label.usecase}
-                    onChange={(e: React.ChangeEvent<HTMLTextAreaElement>) =>
-                      handleUpdateLabel(label.id, 'usecase', e.target.value)
-                    }
-                    className="min-h-[60px] resize-none"
-                    placeholder="Describe when this label should be applied..."
-                  />
-                </div>
-              </div>
-            ))}
-
-            <div className="bg-muted/50 mt-3 space-y-2 rounded-lg border border-dashed p-4">
-              <div className="space-y-2">
-                <Label
-                  htmlFor="new-label-name"
-                  className="text-muted-foreground text-xs font-medium"
-                >
-                  New Label Name
-                </Label>
-                <Input
-                  id="new-label-name"
-                  type="text"
-                  value={newLabel.name}
-                  onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
-                    setNewLabel({ ...newLabel, name: e.target.value })
-                  }
-                  className="h-8 dark:bg-[#141414]"
-                  placeholder="Enter a new label name"
-                />
-              </div>
-              <div className="space-y-2">
-                <Label
-                  htmlFor="new-label-usecase"
-                  className="text-muted-foreground text-xs font-medium"
-                >
-                  Use Case Description
-                </Label>
-                <Textarea
-                  id="new-label-usecase"
-                  value={newLabel.usecase}
-                  onChange={(e: React.ChangeEvent<HTMLTextAreaElement>) =>
-                    setNewLabel({ ...newLabel, usecase: e.target.value })
-                  }
-                  className="min-h-[60px] resize-none dark:bg-[#141414]"
-                  placeholder="Describe when this label should be applied..."
-                />
-              </div>
-              <Button
-                className="mt-2 h-8 w-full"
-                onClick={handleAddLabel}
-                disabled={!newLabel.name || !newLabel.usecase}
-              >
-                Add New Label
-              </Button>
-            </div>
-          </div>
-        </ScrollArea>
-        <DialogFooter className="mt-4">
-          <div className="flex w-full justify-end gap-2">
-            <Button size="xs" variant="outline" onClick={handleResetToDefault}>
-              Default Labels
-            </Button>
-            <Button size="xs" onClick={handleSubmit} disabled={isPending}>
-              Save Changes
-            </Button>
-          </div>
-        </DialogFooter>
-      </DialogContent>
-    </Dialog>
-  );
-};
+// const AutoLabelingSettings = () => {
+//   const trpc = useTRPC();
+//   const [open, setOpen] = useState(false);
+//   const { data: storedLabels, refetch: refetchStoredLabels } = useQuery(
+//     trpc.brain.getLabels.queryOptions(void 0, {
+//       staleTime: 1000 * 60 * 60, // 1 hour
+//     }),
+//   );
+//   const { mutateAsync: updateLabels, isPending } = useMutation(
+//     trpc.brain.updateLabels.mutationOptions({
+//       onSuccess: () => {
+//         refetchStoredLabels();
+//       },
+//     }),
+//   );
+//   const [, setPricingDialog] = useQueryState('pricingDialog');
+//   const [labels, setLabels] = useState<ITag[]>([]);
+//   const [newLabel, setNewLabel] = useState({ name: '', usecase: '' });
+//   const { mutateAsync: EnableBrain, isPending: isEnablingBrain } = useMutation(
+//     trpc.brain.enableBrain.mutationOptions(),
+//   );
+//   const { mutateAsync: DisableBrain, isPending: isDisablingBrain } = useMutation(
+//     trpc.brain.disableBrain.mutationOptions(),
+//   );
+//   const { data: brainState, refetch: refetchBrainState } = useBrainState();
+//   const { isLoading, isPro } = useBilling();
+
+//   useEffect(() => {
+//     if (storedLabels) {
+//       setLabels(
+//         storedLabels.map((label) => ({
+//           id: label.name,
+//           name: label.name,
+//           text: label.name,
+//           usecase: label.usecase,
+//         })),
+//       );
+//     }
+//   }, [storedLabels]);
+
+//   const handleResetToDefault = useCallback(() => {
+//     setLabels(
+//       defaultLabels.map((label) => ({
+//         id: label.name,
+//         name: label.name,
+//         text: label.name,
+//         usecase: label.usecase,
+//       })),
+//     );
+//   }, [storedLabels]);
+
+//   const handleAddLabel = () => {
+//     if (!newLabel.name || !newLabel.usecase) return;
+//     setLabels([...labels, { id: newLabel.name, ...newLabel, text: newLabel.name }]);
+//     setNewLabel({ name: '', usecase: '' });
+//   };
+
+//   const handleDeleteLabel = (id: string) => {
+//     setLabels(labels.filter((label) => label.id !== id));
+//   };
+
+//   const handleUpdateLabel = (id: string, field: 'name' | 'usecase', value: string) => {
+//     setLabels(
+//       labels.map((label) =>
+//         label.id === id
+//           ? { ...label, [field]: value, text: field === 'name' ? value : label.text }
+//           : label,
+//       ),
+//     );
+//   };
+
+//   const handleSubmit = async () => {
+//     const updatedLabels = labels.map((label) => ({
+//       name: label.name,
+//       usecase: label.usecase,
+//     }));
+
+//     if (newLabel.name.trim() && newLabel.usecase.trim()) {
+//       updatedLabels.push({
+//         name: newLabel.name,
+//         usecase: newLabel.usecase,
+//       });
+//     }
+//     await updateLabels({ labels: updatedLabels });
+//     setOpen(false);
+//     toast.success('Labels updated successfully, Zero will start using them.');
+//   };
+
+//   const handleEnableBrain = useCallback(async () => {
+//     toast.promise(EnableBrain, {
+//       loading: 'Enabling autolabeling...',
+//       success: 'Autolabeling enabled successfully',
+//       error: 'Failed to enable autolabeling',
+//       finally: async () => {
+//         await refetchBrainState();
+//       },
+//     });
+//   }, []);
+
+//   const handleDisableBrain = useCallback(async () => {
+//     toast.promise(DisableBrain, {
+//       loading: 'Disabling autolabeling...',
+//       success: 'Autolabeling disabled successfully',
+//       error: 'Failed to disable autolabeling',
+//       finally: async () => {
+//         await refetchBrainState();
+//       },
+//     });
+//   }, []);
+
+//   const handleToggleAutolabeling = useCallback(() => {
+//     if (brainState?.enabled) {
+//       handleDisableBrain();
+//     } else {
+//       handleEnableBrain();
+//     }
+//   }, [brainState?.enabled]);
+
+//   return (
+//     <Dialog
+//       open={open}
+//       onOpenChange={(state) => {
+//         if (!isPro) {
+//           setPricingDialog('true');
+//         } else {
+//           setOpen(state);
+//         }
+//       }}
+//     >
+//       <DialogTrigger asChild>
+//         <div className="flex items-center gap-2">
+//           <Switch
+//             disabled={isEnablingBrain || isDisablingBrain || isLoading}
+//             checked={brainState?.enabled ?? false}
+//           />
+//           <span className="text-muted-foreground cursor-pointer text-xs font-medium">
+//             Auto label
+//           </span>
+//         </div>
+//       </DialogTrigger>
+//       <DialogContent showOverlay className="max-w-2xl">
+//         <DialogHeader>
+//           <div className="flex items-center justify-between">
+//             <DialogTitle>Label Settings</DialogTitle>
+//             <button
+//               onClick={handleToggleAutolabeling}
+//               className="bg-offsetLight dark:bg-offsetDark flex items-center gap-2 rounded-lg border px-1.5 py-1"
+//             >
+//               <span className="text-muted-foreground text-sm">
+//                 {isEnablingBrain || isDisablingBrain
+//                   ? 'Updating...'
+//                   : brainState?.enabled
+//                     ? 'Disable autolabeling'
+//                     : 'Enable autolabeling'}
+//               </span>
+//               <Switch checked={brainState?.enabled} />
+//             </button>
+//           </div>
+//           <DialogDescription className="mt-2">
+//             Configure the labels that Zero uses to automatically organize your emails.
+//           </DialogDescription>
+//         </DialogHeader>
+
+//         <ScrollArea className="h-[400px]">
+//           <div className="space-y-3">
+//             {labels.map((label, index) => (
+//               <div
+//                 key={label.id}
+//                 className="bg-card group relative space-y-2 rounded-lg border p-4 shadow-sm transition-shadow hover:shadow-md"
+//               >
+//                 <div className="flex items-center justify-between">
+//                   <Label
+//                     htmlFor={`label-name-${index}`}
+//                     className="text-muted-foreground text-xs font-medium"
+//                   >
+//                     Label Name
+//                   </Label>
+//                   <Button
+//                     variant="ghost"
+//                     size="icon"
+//                     className="h-6 w-6 transition-opacity group-hover:opacity-100"
+//                     onClick={() => handleDeleteLabel(label.id)}
+//                   >
+//                     <Trash className="h-3 w-3 fill-[#F43F5E]" />
+//                   </Button>
+//                 </div>
+//                 <Input
+//                   id={`label-name-${index}`}
+//                   type="text"
+//                   value={label.name}
+//                   onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
+//                     handleUpdateLabel(label.id, 'name', e.target.value)
+//                   }
+//                   className="h-8"
+//                   placeholder="e.g., Important, Follow-up, Archive"
+//                 />
+//                 <div className="space-y-2">
+//                   <Label
+//                     htmlFor={`label-usecase-${index}`}
+//                     className="text-muted-foreground text-xs font-medium"
+//                   >
+//                     Use Case Description
+//                   </Label>
+//                   <Textarea
+//                     id={`label-usecase-${index}`}
+//                     value={label.usecase}
+//                     onChange={(e: React.ChangeEvent<HTMLTextAreaElement>) =>
+//                       handleUpdateLabel(label.id, 'usecase', e.target.value)
+//                     }
+//                     className="min-h-[60px] resize-none"
+//                     placeholder="Describe when this label should be applied..."
+//                   />
+//                 </div>
+//               </div>
+//             ))}
+
+//             <div className="bg-muted/50 mt-3 space-y-2 rounded-lg border border-dashed p-4">
+//               <div className="space-y-2">
+//                 <Label
+//                   htmlFor="new-label-name"
+//                   className="text-muted-foreground text-xs font-medium"
+//                 >
+//                   New Label Name
+//                 </Label>
+//                 <Input
+//                   id="new-label-name"
+//                   type="text"
+//                   value={newLabel.name}
+//                   onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
+//                     setNewLabel({ ...newLabel, name: e.target.value })
+//                   }
+//                   className="h-8 dark:bg-[#141414]"
+//                   placeholder="Enter a new label name"
+//                 />
+//               </div>
+//               <div className="space-y-2">
+//                 <Label
+//                   htmlFor="new-label-usecase"
+//                   className="text-muted-foreground text-xs font-medium"
+//                 >
+//                   Use Case Description
+//                 </Label>
+//                 <Textarea
+//                   id="new-label-usecase"
+//                   value={newLabel.usecase}
+//                   onChange={(e: React.ChangeEvent<HTMLTextAreaElement>) =>
+//                     setNewLabel({ ...newLabel, usecase: e.target.value })
+//                   }
+//                   className="min-h-[60px] resize-none dark:bg-[#141414]"
+//                   placeholder="Describe when this label should be applied..."
+//                 />
+//               </div>
+//               <Button
+//                 className="mt-2 h-8 w-full"
+//                 onClick={handleAddLabel}
+//                 disabled={!newLabel.name || !newLabel.usecase}
+//               >
+//                 Add New Label
+//               </Button>
+//             </div>
+//           </div>
+//         </ScrollArea>
+//         <DialogFooter className="mt-4">
+//           <div className="flex w-full justify-end gap-2">
+//             <Button size="xs" variant="outline" onClick={handleResetToDefault}>
+//               Default Labels
+//             </Button>
+//             <Button size="xs" onClick={handleSubmit} disabled={isPending}>
+//               Save Changes
+//             </Button>
+//           </div>
+//         </DialogFooter>
+//       </DialogContent>
+//     </Dialog>
+//   );
+// };
 
 export function MailLayout() {
   const params = useParams<{ folder: string }>();
@@ -481,40 +481,71 @@ export function MailLayout() {
             <div className="w-full md:h-[calc(100dvh-10px)]">
               <div
                 className={cn(
-                  'sticky top-0 z-[15] flex items-center justify-between gap-1.5 p-2 transition-colors md:min-h-14',
+                  'sticky top-0 z-[15] flex items-center justify-between gap-1.5 p-2 pb-0 transition-colors',
                 )}
               >
-                <div className="flex w-full items-center justify-between gap-2">
-                  <div className="flex items-center gap-2">
-                    <SidebarToggle className="h-fit px-2" />
-                    <SelectAllCheckbox />
-                  </div>
-
-                  <div className="flex items-center gap-2">
-                    <div>
-                      {mail.bulkSelected.length > 0 ? (
-                        <div>
-                          <Tooltip>
-                            <TooltipTrigger asChild>
-                              <button
-                                onClick={() => {
-                                  setMail({ ...mail, bulkSelected: [] });
+                <div className="w-full">
+                  <div className="grid grid-cols-12 gap-2">
+                    <SidebarToggle className="col-span-1 h-fit px-2" />
+                    {mail.bulkSelected.length === 0 ? (
+                      <div className="col-span-10 flex gap-2">
+                        <Button
+                          variant="outline"
+                          className={cn(
+                            'text-muted-foreground relative flex h-8 w-full select-none items-center justify-start overflow-hidden rounded-lg border bg-white pl-2 text-left text-sm font-normal shadow-none ring-0 focus-visible:ring-0 focus-visible:ring-offset-0 dark:border-none dark:bg-[#141414]',
+                          )}
+                          onClick={() => setIsCommandPaletteOpen('true')}
+                        >
+                          <Search className="fill-[#71717A] dark:fill-[#6F6F6F]" />
+
+                          <span className="hidden truncate pr-20 lg:inline-block">
+                            {activeFilters.length > 0
+                              ? activeFilters.map((f) => f.display).join(', ')
+                              : 'Search'}
+                          </span>
+                          <span className="inline-block truncate pr-20 lg:hidden">
+                            {activeFilters.length > 0
+                              ? `${activeFilters.length} filter${activeFilters.length > 1 ? 's' : ''}`
+                              : 'Search'}
+                          </span>
+
+                          <span className="absolute right-[0rem] flex items-center gap-1">
+                            {/* {activeFilters.length > 0 && (
+                            <Badge variant="secondary" className="ml-2 h-5 rounded px-1">
+                              {activeFilters.length}
+                            </Badge>
+                          )} */}
+                            {activeFilters.length > 0 && (
+                              <Button
+                                variant="ghost"
+                                size="sm"
+                                className="my-auto h-5 rounded-xl px-1.5 text-xs"
+                                onClick={(e) => {
+                                  e.stopPropagation();
+                                  clearAllFilters();
                                 }}
-                                className="flex h-6 items-center gap-1 rounded-md bg-[#313131] px-2 text-xs text-[#A0A0A0] hover:bg-[#252525]"
                               >
-                                <X className="h-3 w-3 fill-[#A0A0A0]" />
-                                <span>esc</span>
-                              </button>
-                            </TooltipTrigger>
-                            <TooltipContent>
-                              {m['common.actions.exitSelectionModeEsc']()}
-                            </TooltipContent>
-                          </Tooltip>
-                        </div>
-                      ) : null}
-                    </div>
-                    <AutoLabelingSettings />
-                    <div className="dark:bg-iconDark/20 relative ml-2 h-3 w-0.5 rounded-full bg-[#E7E7E7]" />{' '}
+                                Clear
+                              </Button>
+                            )}
+                            <kbd className="bg-muted text-md pointer-events-none mr-0.5 hidden h-7 select-none flex-row items-center gap-1 rounded-md border-none px-2 font-medium !leading-[0] opacity-100 sm:flex dark:bg-[#262626] dark:text-[#929292]">
+                              <span
+                                className={cn(
+                                  'h-min !leading-[0.2]',
+                                  isMac ? 'mt-[1px] text-lg' : 'text-sm',
+                                )}
+                              >
+                                {isMac ? '⌘' : 'Ctrl'}{' '}
+                              </span>
+                              <span className="h-min text-sm !leading-[0.2]"> K</span>
+                            </kbd>
+                          </span>
+                        </Button>
+                        {activeConnection?.providerId === 'google' && folder === 'inbox' && (
+                          <CategoryDropdown isMultiSelectMode={mail.bulkSelected.length > 0} />
+                        )}
+                      </div>
+                    ) : null}
                     <Button
                       onClick={() => {
                         refetchThreads();
@@ -524,66 +555,30 @@ export function MailLayout() {
                     >
                       <RefreshCcw className="text-muted-foreground h-4 w-4 cursor-pointer" />
                     </Button>
+                    {mail.bulkSelected.length > 0 ? (
+                      <div className="flex items-center gap-2">
+                        <Tooltip>
+                          <TooltipTrigger asChild>
+                            <button
+                              onClick={() => {
+                                setMail({ ...mail, bulkSelected: [] });
+                              }}
+                              className="flex h-6 items-center gap-1 rounded-md bg-[#313131] px-2 text-xs text-[#A0A0A0] hover:bg-[#252525]"
+                            >
+                              <X className="h-3 w-3 fill-[#A0A0A0]" />
+                              <span>esc</span>
+                            </button>
+                          </TooltipTrigger>
+                          <TooltipContent>
+                            {m['common.actions.exitSelectionModeEsc']()}
+                          </TooltipContent>
+                        </Tooltip>
+                      </div>
+                    ) : null}
                   </div>
                 </div>
               </div>
-              <div className="flex gap-2 p-2">
-                <Button
-                  variant="outline"
-                  className={cn(
-                    'text-muted-foreground relative flex h-7 w-full select-none items-center justify-start overflow-hidden rounded-lg border bg-white pl-2 text-left text-sm font-normal shadow-none ring-0 focus-visible:ring-0 focus-visible:ring-offset-0 dark:border-none dark:bg-[#141414]',
-                  )}
-                  onClick={() => setIsCommandPaletteOpen('true')}
-                >
-                  <Search className="fill-[#71717A] dark:fill-[#6F6F6F]" />
-
-                  <span className="hidden truncate pr-20 lg:inline-block">
-                    {activeFilters.length > 0
-                      ? activeFilters.map((f) => f.display).join(', ')
-                      : 'Search & Filter'}
-                  </span>
-                  <span className="inline-block truncate pr-20 lg:hidden">
-                    {activeFilters.length > 0
-                      ? `${activeFilters.length} filter${activeFilters.length > 1 ? 's' : ''}`
-                      : 'Search & Filter'}
-                  </span>
-
-                  <span className="absolute right-[0rem] flex items-center gap-1">
-                    {/* {activeFilters.length > 0 && (
-                      <Badge variant="secondary" className="ml-2 h-5 rounded px-1">
-                        {activeFilters.length}
-                      </Badge>
-                    )} */}
-                    {activeFilters.length > 0 && (
-                      <Button
-                        variant="ghost"
-                        size="sm"
-                        className="my-auto h-5 rounded-xl px-1.5 text-xs"
-                        onClick={(e) => {
-                          e.stopPropagation();
-                          clearAllFilters();
-                        }}
-                      >
-                        Clear
-                      </Button>
-                    )}
-                    <kbd className="bg-muted text-md pointer-events-none hidden h-[1.875rem] select-none flex-row items-center gap-1 rounded-md border-none px-2 font-medium !leading-[0] opacity-100 sm:flex dark:bg-[#262626] dark:text-[#929292]">
-                      <span
-                        className={cn(
-                          'h-min !leading-[0.2]',
-                          isMac ? 'mt-[1px] text-lg' : 'text-sm',
-                        )}
-                      >
-                        {isMac ? '⌘' : 'Ctrl'}{' '}
-                      </span>
-                      <span className="h-min text-sm !leading-[0.2]"> K</span>
-                    </kbd>
-                  </span>
-                </Button>
-                {activeConnection?.providerId === 'google' && folder === 'inbox' && (
-                  <CategoryDropdown isMultiSelectMode={mail.bulkSelected.length > 0} />
-                )}
-              </div>
+
               <div
                 className={cn(
                   `${category === 'Important' ? 'bg-[#F59E0D]' : category === 'All Mail' ? 'bg-[#006FFE]' : category === 'Personal' ? 'bg-[#39ae4a]' : category === 'Updates' ? 'bg-[#8B5CF6]' : category === 'Promotions' ? 'bg-[#F43F5E]' : category === 'Unread' ? 'bg-[#FF4800]' : 'bg-[#F59E0D]'}`,
@@ -591,7 +586,7 @@ export function MailLayout() {
                   isFetching ? 'opacity-100' : 'opacity-0',
                 )}
               />
-              <div className="relative z-[1] h-[calc(100dvh-(2px+2px))] overflow-hidden pt-0 md:h-[calc(100dvh-7rem)]">
+              <div className="relative z-[1] h-[calc(100dvh-(2px+2px))] overflow-hidden pt-0 md:h-[calc(100dvh-4rem)]">
                 <MailList />
               </div>
             </div>
@@ -768,7 +763,7 @@ function CategoryDropdown({ isMultiSelectMode }: CategoryDropdownProps) {
         <Button
           variant="outline"
           className={cn(
-            'black:text-white text-muted-foreground flex h-7 min-w-fit items-center gap-1 rounded-md border-none px-2',
+            'black:text-white text-muted-foreground flex h-8 min-w-fit items-center gap-1 rounded-md border-none px-2',
           )}
           aria-label="Filter by labels"
           aria-expanded={isOpen}
diff --git a/apps/server/src/pipelines.effect.ts b/apps/server/src/pipelines.effect.ts
index 7629b90503..6dd826d62f 100644
--- a/apps/server/src/pipelines.effect.ts
+++ b/apps/server/src/pipelines.effect.ts
@@ -17,11 +17,11 @@ import {
   SummarizeThread,
   ThreadLabels,
 } from './lib/brain.fallback.prompts';
-// import {
-//   generateAutomaticDraft,
-//   shouldGenerateDraft,
-//   analyzeEmailIntent,
-// } from './thread-workflow-utils';
+import {
+  generateAutomaticDraft,
+  shouldGenerateDraft,
+  analyzeEmailIntent,
+} from './thread-workflow-utils';
 import { defaultLabels, EPrompts, EProviders, type ParsedMessage, type Sender } from './types';
 import { getZeroAgent } from './lib/server-utils';
 import { type gmail_v1 } from '@googleapis/gmail';
@@ -452,89 +452,91 @@ export const runThreadWorkflow = (
         return 'Thread has no messages';
       }
 
-      // const autoDraftId = yield* Effect.tryPromise({
-      //   try: async () => {
-      //     if (!shouldGenerateDraft(thread, foundConnection)) {
-      //       console.log('[THREAD_WORKFLOW] Skipping draft generation for thread:', threadId);
-      //       return null;
-      //     }
-
-      //     const latestMessage = thread.messages[thread.messages.length - 1];
-      //     const emailIntent = analyzeEmailIntent(latestMessage);
-
-      //     console.log('[THREAD_WORKFLOW] Analyzed email intent:', {
-      //       threadId,
-      //       isQuestion: emailIntent.isQuestion,
-      //       isRequest: emailIntent.isRequest,
-      //       isMeeting: emailIntent.isMeeting,
-      //       isUrgent: emailIntent.isUrgent,
-      //     });
-
-      //     if (
-      //       !emailIntent.isQuestion &&
-      //       !emailIntent.isRequest &&
-      //       !emailIntent.isMeeting &&
-      //       !emailIntent.isUrgent
-      //     ) {
-      //       console.log(
-      //         '[THREAD_WORKFLOW] Email does not require a response, skipping draft generation',
-      //       );
-      //       return null;
-      //     }
-
-      //     console.log('[THREAD_WORKFLOW] Generating automatic draft for thread:', threadId);
-      //     const draftContent = await generateAutomaticDraft(
-      //       connectionId.toString(),
-      //       thread,
-      //       foundConnection,
-      //     );
-
-      //     if (draftContent) {
-      //       const latestMessage = thread.messages[thread.messages.length - 1];
-
-      //       const replyTo = latestMessage.sender?.email || '';
-      //       const cc =
-      //         latestMessage.cc
-      //           ?.map((r) => r.email)
-      //           .filter((email) => email && email !== foundConnection.email) || [];
-
-      //       const originalSubject = latestMessage.subject || '';
-      //       const replySubject = originalSubject.startsWith('Re: ')
-      //         ? originalSubject
-      //         : `Re: ${originalSubject}`;
-
-      //       const draftData = {
-      //         to: replyTo,
-      //         cc: cc.join(', '),
-      //         bcc: '',
-      //         subject: replySubject,
-      //         message: draftContent,
-      //         attachments: [],
-      //         id: null,
-      //         threadId: threadId.toString(),
-      //         fromEmail: foundConnection.email,
-      //       };
-
-      //       try {
-      //         const createdDraft = await agent.createDraft(draftData);
-      //         console.log('[THREAD_WORKFLOW] Created automatic draft:', {
-      //           threadId,
-      //           draftId: createdDraft?.id,
-      //         });
-      //         return createdDraft?.id || null;
-      //       } catch (error) {
-      //         console.log('[THREAD_WORKFLOW] Failed to create automatic draft:', {
-      //           threadId,
-      //           error: error instanceof Error ? error.message : String(error),
-      //         });
-      //         return null;
-      //       }
-      //     }
-
-      //     return null;
-      //   },
-      //   catch: (error) => ({ _tag: 'DatabaseError' as const, error }),
-      // });
+      const autoDraftId = yield* Effect.tryPromise({
+        try: async () => {
+          if (!shouldGenerateDraft(thread, foundConnection)) {
+            console.log('[THREAD_WORKFLOW] Skipping draft generation for thread:', threadId);
+            return null;
+          }
+
+          const latestMessage = thread.messages[thread.messages.length - 1];
+          const emailIntent = analyzeEmailIntent(latestMessage);
+
+          console.log('[THREAD_WORKFLOW] Analyzed email intent:', {
+            threadId,
+            isQuestion: emailIntent.isQuestion,
+            isRequest: emailIntent.isRequest,
+            isMeeting: emailIntent.isMeeting,
+            isUrgent: emailIntent.isUrgent,
+          });
+
+          if (
+            !emailIntent.isQuestion &&
+            !emailIntent.isRequest &&
+            !emailIntent.isMeeting &&
+            !emailIntent.isUrgent
+          ) {
+            console.log(
+              '[THREAD_WORKFLOW] Email does not require a response, skipping draft generation',
+            );
+            return null;
+          }
+
+          console.log('[THREAD_WORKFLOW] Generating automatic draft for thread:', threadId);
+          const draftContent = await generateAutomaticDraft(
+            connectionId.toString(),
+            thread,
+            foundConnection,
+          );
+
+          if (draftContent) {
+            const latestMessage = thread.messages[thread.messages.length - 1];
+
+            const replyTo = latestMessage.sender?.email || '';
+            const cc =
+              latestMessage.cc
+                ?.map((r) => r.email)
+                .filter((email) => email && email !== foundConnection.email) || [];
+
+            const originalSubject = latestMessage.subject || '';
+            const replySubject = originalSubject.startsWith('Re: ')
+              ? originalSubject
+              : `Re: ${originalSubject}`;
+
+            const draftData = {
+              to: replyTo,
+              cc: cc.join(', '),
+              bcc: '',
+              subject: replySubject,
+              message: draftContent,
+              attachments: [],
+              id: null,
+              threadId: threadId.toString(),
+              fromEmail: foundConnection.email,
+            };
+
+            try {
+              const createdDraft = await agent.createDraft(draftData);
+              console.log('[THREAD_WORKFLOW] Created automatic draft:', {
+                threadId,
+                draftId: createdDraft?.id,
+              });
+              return createdDraft?.id || null;
+            } catch (error) {
+              console.log('[THREAD_WORKFLOW] Failed to create automatic draft:', {
+                threadId,
+                error: error instanceof Error ? error.message : String(error),
+              });
+              return null;
+            }
+          }
+
+          return null;
+        },
+        catch: (error) => ({ _tag: 'DatabaseError' as const, error }),
+      });
+
+      yield* Console.log('[THREAD_WORKFLOW] ' + autoDraftId);
 
       yield* Console.log('[THREAD_WORKFLOW] Processing thread messages and vectorization');
 

From b0177bcc17355913b06595d5629b8200e6de35b5 Mon Sep 17 00:00:00 2001
From: Adam <13007539+MrgSub@users.noreply.github.com>
Date: Sun, 20 Jul 2025 18:24:16 -0700
Subject: [PATCH 13/20] hotfix stuf (#1775)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# READ CAREFULLY THEN REMOVE

Remove bullet points that are not relevant.

PLEASE REFRAIN FROM USING AI TO WRITE YOUR CODE AND PR DESCRIPTION. IF YOU DO USE AI TO WRITE YOUR CODE PLEASE PROVIDE A DESCRIPTION AND REVIEW IT CAREFULLY. MAKE SURE YOU UNDERSTAND THE CODE YOU ARE SUBMITTING USING AI.

- Pull requests that do not follow these guidelines will be closed without review or comment.
- If you use AI to write your PR description your pr will be close without review or comment.
- If you are unsure about anything, feel free to ask for clarification.

## Description

Please provide a clear description of your changes.

---

## Type of Change

Please delete options that are not relevant.

- [ ] 🐛 Bug fix (non-breaking change which fixes an issue)
- [ ] ✨ New feature (non-breaking change which adds functionality)
- [ ] 💥 Breaking change (fix or feature with breaking changes)
- [ ] 📝 Documentation update
- [ ] 🎨 UI/UX improvement
- [ ] 🔒 Security enhancement
- [ ] ⚡ Performance improvement

## Areas Affected

Please check all that apply:

- [ ] Email Integration (Gmail, IMAP, etc.)
- [ ] User Interface/Experience
- [ ] Authentication/Authorization
- [ ] Data Storage/Management
- [ ] API Endpoints
- [ ] Documentation
- [ ] Testing Infrastructure
- [ ] Development Workflow
- [ ] Deployment/Infrastructure

## Testing Done

Describe the tests you've done:

- [ ] Unit tests added/updated
- [ ] Integration tests added/updated
- [ ] Manual testing performed
- [ ] Cross-browser testing (if UI changes)
- [ ] Mobile responsiveness verified (if UI changes)

## Security Considerations

For changes involving data or authentication:

- [ ] No sensitive data is exposed
- [ ] Authentication checks are in place
- [ ] Input validation is implemented
- [ ] Rate limiting is considered (if applicable)

## Checklist

- [ ] I have read the [CONTRIBUTING](https://github.com/Mail-0/Zero/blob/staging/.github/CONTRIBUTING.md) document
- [ ] My code follows the project's style guidelines
- [ ] I have performed a self-review of my code
- [ ] I have commented my code, particularly in complex areas
- [ ] I have updated the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that prove my fix/feature works
- [ ] All tests pass locally
- [ ] Any dependent changes are merged and published

## Additional Notes

Add any other context about the pull request here.

## Screenshots/Recordings

Add screenshots or recordings here if applicable.

---

_By submitting this pull request, I confirm that my contribution is made under the terms of the project's license._


<!-- This is an auto-generated description by cubic. -->
---

## Summary by cubic
Updated the loader function to return a static connection ID and commented out the server call. Also removed the unused HydrateFallback component.

<!-- End of auto-generated description by cubic. -->
---
 apps/mail/app/root.tsx | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/apps/mail/app/root.tsx b/apps/mail/app/root.tsx
index 7236fc2709..961585c65e 100644
--- a/apps/mail/app/root.tsx
+++ b/apps/mail/app/root.tsx
@@ -10,23 +10,22 @@ import {
   type LoaderFunctionArgs,
   type MetaFunction,
 } from 'react-router';
+import { Analytics as DubAnalytics } from '@dub/analytics/react';
 import { ServerProviders } from '@/providers/server-providers';
 import { ClientProviders } from '@/providers/client-providers';
 import { createTRPCClient, httpBatchLink } from '@trpc/client';
 import { useEffect, type PropsWithChildren } from 'react';
-import { AlertCircle, Loader2 } from 'lucide-react';
 import type { AppRouter } from '@zero/server/trpc';
 import { Button } from '@/components/ui/button';
 import { getLocale } from '@/paraglide/runtime';
 import { siteConfig } from '@/lib/site-config';
 import { signOut } from '@/lib/auth-client';
 import type { Route } from './+types/root';
+import { AlertCircle } from 'lucide-react';
 import { m } from '@/paraglide/messages';
 import { ArrowLeft } from 'lucide-react';
 import superjson from 'superjson';
 import './globals.css';
-import { Analytics as DubAnalytics } from '@dub/analytics/react';
-
 
 const getUrl = () => import.meta.env.VITE_PUBLIC_BACKEND_URL + '/api/trpc';
 
@@ -55,13 +54,13 @@ export const meta: MetaFunction = () => {
   ];
 };
 
-export async function loader({ request }: LoaderFunctionArgs) {
-  const trpc = getServerTrpc(request);
-  const defaultConnection = await trpc.connections.getDefault
-    .query()
-    .then((res) => (res?.id as string) ?? null)
-    .catch(() => null);
-  return { connectionId: defaultConnection };
+export async function loader(_: LoaderFunctionArgs) {
+  //   const trpc = getServerTrpc(request);
+  //   const defaultConnection = await trpc.connections.getDefault
+  //     .query()
+  //     .then((res) => (res?.id as string) ?? null)
+  //     .catch(() => null);
+  return { connectionId: 'defaultConnection' };
 }
 
 export function Layout({ children }: PropsWithChildren) {
@@ -84,9 +83,11 @@ export function Layout({ children }: PropsWithChildren) {
       <body className="antialiased">
         <ServerProviders connectionId={connectionId}>
           <ClientProviders>{children}</ClientProviders>
-          <DubAnalytics domainsConfig={{
-        refer: "mail0.com"
-      }} />
+          <DubAnalytics
+            domainsConfig={{
+              refer: 'mail0.com',
+            }}
+          />
         </ServerProviders>
         <ScrollRestoration />
         <Scripts />
@@ -95,13 +96,13 @@ export function Layout({ children }: PropsWithChildren) {
   );
 }
 
-export function HydrateFallback() {
-  return (
-    <div className="flex h-screen w-full items-center justify-center">
-      <Loader2 className="h-10 w-10 animate-spin" />
-    </div>
-  );
-}
+// export function HydrateFallback() {
+//   return (
+//     <div className="flex h-screen w-full items-center justify-center">
+//       <Loader2 className="h-10 w-10 animate-spin" />
+//     </div>
+//   );
+// }
 
 export default function App() {
   return <Outlet />;

From 4c3753e3f8157f10be21b8af11f9dd2c4f07d254 Mon Sep 17 00:00:00 2001
From: amrit <iamamrit27@gmail.com>
Date: Mon, 21 Jul 2025 06:55:32 +0530
Subject: [PATCH 14/20] feat: ability to snooze emails (#1477)

Co-authored-by: graphite-app[bot] <96075541+graphite-app[bot]@users.noreply.github.com>
Co-authored-by: Adam <13007539+MrgSub@users.noreply.github.com>
---
 apps/mail/app/(routes)/mail/[folder]/page.tsx |   2 +-
 .../components/context/thread-context.tsx     | 148 ++++++++++++------
 apps/mail/components/icons/icons.tsx          |   2 +
 .../mail/optimistic-thread-state.tsx          |  10 ++
 apps/mail/components/mail/snooze-dialog.tsx   |  98 ++++++++++++
 apps/mail/config/navigation.ts                |   8 +
 apps/mail/hooks/use-optimistic-actions.ts     |  61 ++++++++
 apps/mail/lib/optimistic-actions-manager.ts   |   1 +
 apps/mail/lib/thread-actions.ts               |  14 +-
 apps/mail/lib/utils.ts                        |   4 +
 apps/mail/messages/en.json                    |   3 +-
 apps/mail/store/optimistic-updates.ts         |   4 +-
 apps/server/src/lib/driver/google.ts          |  78 ++++++++-
 apps/server/src/lib/driver/types.ts           |  16 ++
 apps/server/src/lib/utils.ts                  |   4 +
 apps/server/src/main.ts                       |  45 ++++++
 apps/server/src/overrides.d.ts                |   2 +
 apps/server/src/routes/agent/index.ts         |  37 ++++-
 apps/server/src/routes/agent/rpc.ts           |   8 +
 apps/server/src/routes/agent/types.ts         |   2 +
 apps/server/src/trpc/routes/mail.ts           | 128 +++++++++++++--
 apps/server/src/types.ts                      |   7 +
 apps/server/wrangler.jsonc                    |  18 +++
 23 files changed, 623 insertions(+), 77 deletions(-)
 create mode 100644 apps/mail/components/mail/snooze-dialog.tsx

diff --git a/apps/mail/app/(routes)/mail/[folder]/page.tsx b/apps/mail/app/(routes)/mail/[folder]/page.tsx
index 95780ce9e4..0017ea4e72 100644
--- a/apps/mail/app/(routes)/mail/[folder]/page.tsx
+++ b/apps/mail/app/(routes)/mail/[folder]/page.tsx
@@ -6,7 +6,7 @@ import { authProxy } from '@/lib/auth-proxy';
 import { useEffect, useState } from 'react';
 import type { Route } from './+types/page';
 
-const ALLOWED_FOLDERS = new Set(['inbox', 'draft', 'sent', 'spam', 'bin', 'archive']);
+const ALLOWED_FOLDERS = new Set(['inbox', 'draft', 'sent', 'spam', 'bin', 'archive', 'snoozed']);
 
 export async function clientLoader({ params, request }: Route.ClientLoaderArgs) {
   if (!params.folder) return Response.redirect(`${import.meta.env.VITE_PUBLIC_APP_URL}/mail/inbox`);
diff --git a/apps/mail/components/context/thread-context.tsx b/apps/mail/components/context/thread-context.tsx
index bb8d42e89f..6d48164abb 100644
--- a/apps/mail/components/context/thread-context.tsx
+++ b/apps/mail/components/context/thread-context.tsx
@@ -27,8 +27,8 @@ import { useOptimisticThreadState } from '@/components/mail/optimistic-thread-st
 import { useOptimisticActions } from '@/hooks/use-optimistic-actions';
 import { type ThreadDestination } from '@/lib/thread-actions';
 import { useThread, useThreads } from '@/hooks/use-threads';
-import { ExclamationCircle, Mail } from '../icons/icons';
-import { useMemo, type ReactNode } from 'react';
+import { ExclamationCircle, Mail, Clock } from '../icons/icons';
+import { useMemo, type ReactNode, useState } from 'react';
 import { useLabels } from '@/hooks/use-labels';
 import { FOLDERS, LABELS } from '@/lib/utils';
 import { useMail } from '../mail/use-mail';
@@ -37,6 +37,7 @@ import { m } from '@/paraglide/messages';
 import { useParams } from 'react-router';
 import { useQueryState } from 'nuqs';
 import { toast } from 'sonner';
+import { SnoozeDialog } from '@/components/mail/snooze-dialog';
 
 interface EmailAction {
   id: string;
@@ -68,12 +69,11 @@ const LabelsList = ({ threadId, bulkSelected }: { threadId: string; bulkSelected
 
   if (!labels || !thread) return null;
 
-  const handleToggleLabel = async (labelId: string) => {
+  const handleToggleLabel = (labelId: string) => {
     if (!labelId) return;
 
-    let shouldAddLabel = false;
-
-    let hasLabel = thread.labels?.map((label) => label.id).includes(labelId) || false;
+    // Determine current label state considering optimistic updates
+    let hasLabel = thread!.labels?.some((l) => l.id === labelId) ?? false;
 
     if (rightClickedThreadOptimisticState.optimisticLabels) {
       if (rightClickedThreadOptimisticState.optimisticLabels.addedLabelIds.includes(labelId)) {
@@ -85,9 +85,7 @@ const LabelsList = ({ threadId, bulkSelected }: { threadId: string; bulkSelected
       }
     }
 
-    shouldAddLabel = !hasLabel;
-
-    optimisticToggleLabel(targetThreadIds, labelId, shouldAddLabel);
+    optimisticToggleLabel(targetThreadIds, labelId, !hasLabel);
   };
 
   return (
@@ -95,14 +93,13 @@ const LabelsList = ({ threadId, bulkSelected }: { threadId: string; bulkSelected
       {labels
         .filter((label) => label.id)
         .map((label) => {
-          let isChecked = label.id ? thread.labels?.map((l) => l.id).includes(label.id) : false;
+          let isChecked = label.id ? thread!.labels?.some((l) => l.id === label.id) ?? false : false;
 
-          const checkboxOptimisticState = useOptimisticThreadState(threadId);
-          if (label.id && checkboxOptimisticState.optimisticLabels) {
-            if (checkboxOptimisticState.optimisticLabels.addedLabelIds.includes(label.id)) {
+          if (rightClickedThreadOptimisticState.optimisticLabels) {
+            if (rightClickedThreadOptimisticState.optimisticLabels.addedLabelIds.includes(label.id)) {
               isChecked = true;
             } else if (
-              checkboxOptimisticState.optimisticLabels.removedLabelIds.includes(label.id)
+              rightClickedThreadOptimisticState.optimisticLabels.removedLabelIds.includes(label.id)
             ) {
               isChecked = false;
             }
@@ -138,7 +135,7 @@ export function ThreadContextMenu({
   const [{ isLoading, isFetching }] = useThreads();
   const currentFolder = folder ?? '';
   const isArchiveFolder = currentFolder === FOLDERS.ARCHIVE;
-
+  const isSnoozedFolder = currentFolder === FOLDERS.SNOOZED;
   const [, setMode] = useQueryState('mode');
   const [, setThreadId] = useQueryState('threadId');
   const { data: threadData } = useThread(threadId);
@@ -151,6 +148,8 @@ export function ThreadContextMenu({
     optimisticMarkAsRead,
     optimisticMarkAsUnread,
     optimisticDeleteThreads,
+    optimisticSnooze,
+    optimisticUnsnooze,
   } = useOptimisticActions();
 
   const { isUnread, isStarred, isImportant } = useMemo(() => {
@@ -359,6 +358,31 @@ export function ThreadContextMenu({
       ];
     }
 
+    if (isSnoozedFolder) {
+      return [
+        {
+          id: 'unsnooze',
+          label: 'Unsnooze',
+          icon: <Inbox className="mr-2.5 h-4 w-4 opacity-60" />,
+          action: () => {
+            const targets = mail.bulkSelected.length ? mail.bulkSelected : [threadId];
+            optimisticUnsnooze(targets, currentFolder);
+            if (mail.bulkSelected.length) {
+              setMail({ ...mail, bulkSelected: [] });
+            }
+          },
+          disabled: false,
+        },
+        {
+          id: 'move-to-bin',
+          label: m['common.mail.moveToBin'](),
+          icon: <Trash className="mr-2.5 h-4 w-4 opacity-60" />,
+          action: handleMove(LABELS.SNOOZED, LABELS.TRASH),
+          disabled: false,
+        },
+      ];
+    }
+
     if (isArchiveFolder || !isInbox) {
       return [
         {
@@ -422,6 +446,14 @@ export function ThreadContextMenu({
     ];
   }, [isSpam, isBin, isArchiveFolder, isInbox, isSent, handleMove, handleDelete]);
 
+  const [snoozeOpen, setSnoozeOpen] = useState(false);
+
+  const handleSnoozeConfirm = (wakeAt: Date) => {
+    const targets = mail.bulkSelected.length ? mail.bulkSelected : [threadId];
+    optimisticSnooze(targets, currentFolder, wakeAt);
+    setSnoozeOpen(false);
+  };
+
   const otherActions: EmailAction[] = useMemo(
     () => [
       {
@@ -453,8 +485,23 @@ export function ThreadContextMenu({
         ),
         action: handleFavorites,
       },
+      {
+        id: 'snooze',
+        label: 'Snooze',
+        icon: <Clock className="mr-2.5 h-4 w-4 opacity-60" />,
+        action: () => setSnoozeOpen(true),
+        disabled: false,
+      },
+    ],
+    [
+      isUnread,
+      isImportant,
+      isStarred,
+      m,
+      handleReadUnread,
+      handleToggleImportant,
+      handleFavorites,
     ],
-    [isUnread, isImportant, isStarred, m, handleReadUnread, handleToggleImportant, handleFavorites],
   );
 
   const renderAction = (action: EmailAction) => {
@@ -473,36 +520,43 @@ export function ThreadContextMenu({
   };
 
   return (
-    <ContextMenu>
-      <ContextMenuTrigger disabled={isLoading || isFetching} className="w-full">
-        {children}
-      </ContextMenuTrigger>
-      <ContextMenuContent
-        className="dark:bg-panelDark w-56 overflow-y-auto bg-white"
-        onContextMenu={(e) => e.preventDefault()}
-      >
-        {primaryActions.map(renderAction)}
-
-        <ContextMenuSeparator className="bg-[#E7E7E7] dark:bg-[#252525]" />
-
-        <ContextMenuSub>
-          <ContextMenuSubTrigger className="font-normal">
-            <Tag className="mr-2.5 h-4 w-4 opacity-60" />
-            {m['common.mail.labels']()}
-          </ContextMenuSubTrigger>
-          <ContextMenuSubContent className="dark:bg-panelDark max-h-[520px] w-48 overflow-y-auto bg-white">
-            <LabelsList threadId={threadId} bulkSelected={mail.bulkSelected} />
-          </ContextMenuSubContent>
-        </ContextMenuSub>
-
-        <ContextMenuSeparator className="bg-[#E7E7E7] dark:bg-[#252525]" />
-
-        {getActions.map(renderAction)}
-
-        <ContextMenuSeparator className="bg-[#E7E7E7] dark:bg-[#252525]" />
-
-        {otherActions.map(renderAction)}
-      </ContextMenuContent>
-    </ContextMenu>
+    <>
+      <ContextMenu>
+        <ContextMenuTrigger disabled={isLoading || isFetching} className="w-full">
+          {children}
+        </ContextMenuTrigger>
+        <ContextMenuContent
+          className="dark:bg-panelDark w-56 overflow-y-auto bg-white"
+          onContextMenu={(e) => e.preventDefault()}
+        >
+          {primaryActions.map(renderAction)}
+
+          <ContextMenuSeparator className="bg-[#E7E7E7] dark:bg-[#252525]" />
+
+          <ContextMenuSub>
+            <ContextMenuSubTrigger className="font-normal">
+              <Tag className="mr-2.5 h-4 w-4 opacity-60" />
+              {m['common.mail.labels']()}
+            </ContextMenuSubTrigger>
+            <ContextMenuSubContent className="dark:bg-panelDark max-h-[520px] w-48 overflow-y-auto bg-white">
+              <LabelsList threadId={threadId} bulkSelected={mail.bulkSelected} />
+            </ContextMenuSubContent>
+          </ContextMenuSub>
+
+          <ContextMenuSeparator className="bg-[#E7E7E7] dark:bg-[#252525]" />
+
+          {getActions.map(renderAction)}
+
+          <ContextMenuSeparator className="bg-[#E7E7E7] dark:bg-[#252525]" />
+
+          {otherActions.map(renderAction)}
+        </ContextMenuContent>
+      </ContextMenu>
+      <SnoozeDialog
+        open={snoozeOpen}
+        onOpenChange={setSnoozeOpen}
+        onConfirm={handleSnoozeConfirm}
+      />
+    </>
   );
 }
diff --git a/apps/mail/components/icons/icons.tsx b/apps/mail/components/icons/icons.tsx
index 725e8423d9..0a13e7c352 100644
--- a/apps/mail/components/icons/icons.tsx
+++ b/apps/mail/components/icons/icons.tsx
@@ -1625,6 +1625,8 @@ export const Clock = ({ className }: { className?: string }) => (
       fillRule="evenodd"
       clipRule="evenodd"
       d="M0 7C0 3.13401 3.13401 0 7 0C10.866 0 14 3.13401 14 7C14 10.866 10.866 14 7 14C3.13401 14 0 10.866 0 7ZM7.75 2.75C7.75 2.33579 7.41421 2 7 2C6.58579 2 6.25 2.33579 6.25 2.75V7C6.25 7.41421 6.58579 7.75 7 7.75H10.25C10.6642 7.75 11 7.41421 11 7C11 6.58579 10.6642 6.25 10.25 6.25H7.75V2.75Z"
+      fill="var(--icon-color)"
+      fillOpacity="0.5"
     />
   </svg>
 );
diff --git a/apps/mail/components/mail/optimistic-thread-state.tsx b/apps/mail/components/mail/optimistic-thread-state.tsx
index 39ca4d857d..e4b5a76d51 100644
--- a/apps/mail/components/mail/optimistic-thread-state.tsx
+++ b/apps/mail/components/mail/optimistic-thread-state.tsx
@@ -72,6 +72,16 @@ export function useOptimisticThreadState(threadId: string) {
           states.isImportant = true;
           states.optimisticImportant = action.important;
           break;
+
+        case 'SNOOZE':
+          states.shouldHide = true;
+          states.optimisticDestination = 'snoozed';
+          break;
+
+        case 'UNSNOOZE':
+          states.shouldHide = true;
+          states.optimisticDestination = 'inbox';
+          break;
       }
     });
 
diff --git a/apps/mail/components/mail/snooze-dialog.tsx b/apps/mail/components/mail/snooze-dialog.tsx
new file mode 100644
index 0000000000..f226d93fcc
--- /dev/null
+++ b/apps/mail/components/mail/snooze-dialog.tsx
@@ -0,0 +1,98 @@
+import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle, DialogTrigger } from '@/components/ui/dialog';
+import { Button } from '@/components/ui/button';
+import { Input } from '@/components/ui/input';
+import { useState } from 'react';
+import { toast } from 'sonner';
+
+type SnoozeDialogProps = {
+  trigger?: React.ReactElement;
+  onConfirm: (wakeAt: Date) => void;
+  open?: boolean;
+  onOpenChange?: (open: boolean) => void;
+};
+
+export function SnoozeDialog({ trigger, onConfirm, open: controlledOpen, onOpenChange }: SnoozeDialogProps) {
+  const [uncontrolledOpen, setUncontrolledOpen] = useState(false);
+  const open = controlledOpen !== undefined ? controlledOpen : uncontrolledOpen;
+  const setOpen = onOpenChange ?? setUncontrolledOpen;
+  const now = new Date();
+  const pad = (n: number) => n.toString().padStart(2, '0');
+  const defaultDate = `${now.getFullYear()}-${pad(now.getMonth() + 1)}-${pad(now.getDate())}`;
+  const defaultTime = `${pad(now.getHours())}:${pad(now.getMinutes())}`;
+
+  const [date, setDate] = useState<string>(defaultDate);
+  const [time, setTime] = useState<string>(defaultTime);
+
+  const timeZoneLabel = (() => {
+    try {
+      return Intl.DateTimeFormat().resolvedOptions().timeZone;
+    } catch {
+      const offsetMin = new Date().getTimezoneOffset();
+      const sign = offsetMin > 0 ? '-' : '+';
+      const abs = Math.abs(offsetMin);
+      const hrs = Math.floor(abs / 60)
+        .toString()
+        .padStart(2, '0');
+      const mins = (abs % 60).toString().padStart(2, '0');
+      return `UTC${sign}${hrs}:${mins}`;
+    }
+  })();
+
+  const handleSubmit = () => {
+    let wakeDate: Date;
+
+    if (date) {
+      wakeDate = new Date(`${date}T${time || defaultTime}`);
+    } else {
+      const today = new Date();
+      const [hours, minutes] = (time || defaultTime).split(':').map((v) => parseInt(v, 10));
+      today.setHours(hours, minutes, 0, 0);
+      wakeDate = today;
+    }
+
+    if (wakeDate.getTime() <= Date.now()) {
+      toast.error('Please choose a future date and time.');
+      return;
+    }
+
+    onConfirm(wakeDate);
+    setOpen(false);
+  };
+
+  return (
+    <Dialog open={open} onOpenChange={setOpen}>
+      {trigger && <DialogTrigger asChild>{trigger}</DialogTrigger>}
+      <DialogContent className="max-w-sm">
+        <DialogHeader>
+          <DialogTitle>Snooze until…</DialogTitle>
+          <DialogDescription>Select date and time you'd like this email to return.</DialogDescription>
+        </DialogHeader>
+        <div className="flex flex-col gap-4 py-2">
+          <label className="text-sm font-medium">
+            Date
+            <Input
+              type="date"
+              min={defaultDate}
+              value={date}
+              onChange={(e) => setDate(e.target.value)}
+            />
+          </label>
+          <label className="text-sm font-medium">
+            Time <span className="text-xs font-normal text-muted-foreground">({timeZoneLabel})</span>
+            <Input
+              type="time"
+              value={time}
+              onChange={(e) => setTime(e.target.value)}
+            />
+          </label>
+        </div>
+        <DialogFooter className="flex justify-end gap-2">
+          <Button variant="ghost" onClick={() => setOpen(false)}>
+            Cancel
+          </Button>
+          <Button onClick={handleSubmit}>Snooze</Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+} 
\ No newline at end of file
diff --git a/apps/mail/config/navigation.ts b/apps/mail/config/navigation.ts
index 266b9c42c3..7a538ea393 100644
--- a/apps/mail/config/navigation.ts
+++ b/apps/mail/config/navigation.ts
@@ -13,6 +13,7 @@ import {
   Sheet,
   Plane2,
   LockIcon,
+  Clock,
 } from '@/components/icons/icons';
 import { MessageSquareIcon } from 'lucide-react';
 import { m } from '@/paraglide/messages';
@@ -81,6 +82,13 @@ export const navigationConfig: Record<string, NavConfig> = {
             icon: Archive,
             shortcut: 'g + a',
           },
+          {
+            id: 'snoozed',
+            title: m['navigation.sidebar.snoozed'](),
+            url: '/mail/snoozed',
+            icon: Clock,
+            shortcut: 'g + z',
+          },
           {
             id: 'spam',
             title: m['navigation.sidebar.spam'](),
diff --git a/apps/mail/hooks/use-optimistic-actions.ts b/apps/mail/hooks/use-optimistic-actions.ts
index 93b5a072ca..f3f7badab0 100644
--- a/apps/mail/hooks/use-optimistic-actions.ts
+++ b/apps/mail/hooks/use-optimistic-actions.ts
@@ -20,6 +20,8 @@ enum ActionType {
   READ = 'READ',
   LABEL = 'LABEL',
   IMPORTANT = 'IMPORTANT',
+  SNOOZE = 'SNOOZE',
+  UNSNOOZE = 'UNSNOOZE',
 }
 
 const actionEventNames: Record<ActionType, (params: any) => string> = {
@@ -29,6 +31,8 @@ const actionEventNames: Record<ActionType, (params: any) => string> = {
   [ActionType.IMPORTANT]: (params) =>
     params.important ? 'email_marked_important' : 'email_unmarked_important',
   [ActionType.LABEL]: (params) => (params.add ? 'email_label_added' : 'email_label_removed'),
+  [ActionType.SNOOZE]: () => 'email_snoozed',
+  [ActionType.UNSNOOZE]: () => 'email_unsnoozed',
 };
 
 export function useOptimisticActions() {
@@ -47,6 +51,8 @@ export function useOptimisticActions() {
   const { mutateAsync: toggleImportant } = useMutation(trpc.mail.toggleImportant.mutationOptions());
 
   const { mutateAsync: bulkDeleteThread } = useMutation(trpc.mail.bulkDelete.mutationOptions());
+  const { mutateAsync: snoozeThreads } = useMutation(trpc.mail.snoozeThreads.mutationOptions());
+  const { mutateAsync: unsnoozeThreads } = useMutation(trpc.mail.unsnoozeThreads.mutationOptions());
   const { mutateAsync: modifyLabels } = useMutation(trpc.mail.modifyLabels.mutationOptions());
 
   const generatePendingActionId = () =>
@@ -427,6 +433,59 @@ export function useOptimisticActions() {
     });
   }
 
+  function optimisticSnooze(threadIds: string[], currentFolder: string, wakeAt: Date) {
+    if (!threadIds.length) return;
+
+    const optimisticId = addOptimisticAction({
+      type: 'SNOOZE',
+      threadIds,
+      wakeAt: wakeAt.toISOString(),
+    });
+
+    createPendingAction({
+      type: 'SNOOZE',
+      threadIds,
+      params: { currentFolder, wakeAt: wakeAt.toISOString() } as any,
+      optimisticId,
+      execute: async () => {
+        await snoozeThreads({ ids: threadIds, wakeAt: wakeAt.toISOString() });
+
+        if (mail.bulkSelected.length > 0) {
+          setMail({ ...mail, bulkSelected: [] });
+        }
+      },
+      undo: () => {
+        removeOptimisticAction(optimisticId);
+      },
+      toastMessage: `Snoozed until ${wakeAt.toLocaleString()}`,
+      folders: [currentFolder, 'snoozed'],
+    });
+  }
+
+  function optimisticUnsnooze(threadIds: string[], currentFolder: string) {
+    if (!threadIds.length) return;
+
+    const optimisticId = addOptimisticAction({
+      type: 'UNSNOOZE',
+      threadIds,
+    });
+
+    createPendingAction({
+      type: 'UNSNOOZE',
+      threadIds,
+      params: { currentFolder } as any,
+      optimisticId,
+      execute: async () => {
+        await unsnoozeThreads({ ids: threadIds });
+      },
+      undo: () => {
+        removeOptimisticAction(optimisticId);
+      },
+      toastMessage: 'Moved to Inbox',
+      folders: [currentFolder, 'inbox'],
+    });
+  }
+
   function undoLastAction() {
     if (!optimisticActionsManager.lastActionId) return;
 
@@ -457,6 +516,8 @@ export function useOptimisticActions() {
     optimisticDeleteThreads,
     optimisticToggleImportant,
     optimisticToggleLabel,
+    optimisticSnooze,
+    optimisticUnsnooze,
     undoLastAction,
   };
 }
diff --git a/apps/mail/lib/optimistic-actions-manager.ts b/apps/mail/lib/optimistic-actions-manager.ts
index b1b180307f..7e6479f0a2 100644
--- a/apps/mail/lib/optimistic-actions-manager.ts
+++ b/apps/mail/lib/optimistic-actions-manager.ts
@@ -2,6 +2,7 @@ import type { ThreadDestination } from '@/lib/thread-actions';
 
 type BasePendingAction = {
   id: string;
+  type: 'MOVE' | 'STAR' | 'READ' | 'LABEL' | 'IMPORTANT' | 'SNOOZE' | 'UNSNOOZE';
   threadIds: string[];
   optimisticId: string;
   execute: () => Promise<void>;
diff --git a/apps/mail/lib/thread-actions.ts b/apps/mail/lib/thread-actions.ts
index 5b100bb9ee..ad19fa6081 100644
--- a/apps/mail/lib/thread-actions.ts
+++ b/apps/mail/lib/thread-actions.ts
@@ -1,7 +1,7 @@
 import { trpcClient } from '@/providers/query-provider';
 import { LABELS, FOLDERS } from '@/lib/utils';
 
-export type ThreadDestination = 'inbox' | 'archive' | 'spam' | 'bin' | null;
+export type ThreadDestination = 'inbox' | 'archive' | 'spam' | 'bin' | 'snoozed' | null;
 export type FolderLocation = 'inbox' | 'archive' | 'spam' | 'sent' | 'bin' | string;
 
 export interface MoveThreadOptions {
@@ -42,7 +42,7 @@ export function isActionAvailable(folder: FolderLocation, action: ThreadDestinat
 }
 
 export function getAvailableActions(folder: FolderLocation): ThreadDestination[] {
-  const allPossibleActions: ThreadDestination[] = ['inbox', 'archive', 'spam', 'bin'];
+  const allPossibleActions: ThreadDestination[] = ['inbox', 'archive', 'spam', 'bin', 'snoozed'];
   return allPossibleActions.filter((action) => isActionAvailable(folder, action));
 }
 
@@ -75,6 +75,16 @@ export async function moveThreadsTo({ threadIds, currentFolder, destination }: M
         addLabel = LABELS.SPAM;
         removeLabel = isInInbox ? LABELS.INBOX : isInBin ? LABELS.TRASH : '';
         break;
+      case 'snoozed':
+        addLabel = LABELS.SNOOZED;
+        removeLabel = isInInbox
+          ? LABELS.INBOX
+          : isInSpam
+            ? LABELS.SPAM
+            : isInBin
+              ? LABELS.TRASH
+              : '';
+        break;
       case 'bin':
         addLabel = LABELS.TRASH;
         removeLabel = isInInbox ? LABELS.INBOX : isInSpam ? LABELS.SPAM : '';
diff --git a/apps/mail/lib/utils.ts b/apps/mail/lib/utils.ts
index 4bcfb479f0..9ff312cb50 100644
--- a/apps/mail/lib/utils.ts
+++ b/apps/mail/lib/utils.ts
@@ -14,6 +14,7 @@ export const FOLDERS = {
   BIN: 'bin',
   DRAFT: 'draft',
   SENT: 'sent',
+  SNOOZED: 'snoozed',
 } as const;
 
 export const LABELS = {
@@ -23,6 +24,7 @@ export const LABELS = {
   IMPORTANT: 'IMPORTANT',
   SENT: 'SENT',
   TRASH: 'TRASH',
+  SNOOZED: 'SNOOZED',
 } as const;
 
 export const FOLDER_NAMES = [
@@ -34,6 +36,7 @@ export const FOLDER_NAMES = [
   'important',
   'sent',
   'draft',
+  'snoozed',
 ];
 
 export const FOLDER_TAGS: Record<string, string[]> = {
@@ -42,6 +45,7 @@ export const FOLDER_TAGS: Record<string, string[]> = {
   [FOLDERS.ARCHIVE]: [],
   [FOLDERS.SENT]: [LABELS.SENT],
   [FOLDERS.BIN]: [LABELS.TRASH],
+  [FOLDERS.SNOOZED]: [LABELS.SNOOZED],
 };
 
 export const getFolderTags = (folder: string): string[] => {
diff --git a/apps/mail/messages/en.json b/apps/mail/messages/en.json
index 57068b5dfe..b24281dd60 100644
--- a/apps/mail/messages/en.json
+++ b/apps/mail/messages/en.json
@@ -405,7 +405,8 @@
       "livesupport": "Live Support",
       "feedback": "Feedback",
       "settings": "Settings",
-      "voice": "Voice Assistant"
+      "voice": "Voice Assistant",
+      "snoozed": "Snoozed"
     },
     "settings": {
       "general": "General",
diff --git a/apps/mail/store/optimistic-updates.ts b/apps/mail/store/optimistic-updates.ts
index 8fe4b53c14..3dbc182597 100644
--- a/apps/mail/store/optimistic-updates.ts
+++ b/apps/mail/store/optimistic-updates.ts
@@ -6,7 +6,9 @@ export type OptimisticAction =
   | { type: 'STAR'; threadIds: string[]; starred: boolean }
   | { type: 'READ'; threadIds: string[]; read: boolean }
   | { type: 'LABEL'; threadIds: string[]; labelIds: string[]; add: boolean }
-  | { type: 'IMPORTANT'; threadIds: string[]; important: boolean };
+  | { type: 'IMPORTANT'; threadIds: string[]; important: boolean }
+  | { type: 'SNOOZE'; threadIds: string[]; wakeAt: string }
+  | { type: 'UNSNOOZE'; threadIds: string[] };
 
 export const optimisticActionsAtom = atom<Record<string, OptimisticAction>>({});
 
diff --git a/apps/server/src/lib/driver/google.ts b/apps/server/src/lib/driver/google.ts
index 0101bb5cc1..b5ecd43783 100644
--- a/apps/server/src/lib/driver/google.ts
+++ b/apps/server/src/lib/driver/google.ts
@@ -27,6 +27,25 @@ export class GoogleMailManager implements MailManager {
   private auth;
   private gmail;
 
+  private labelIdCache: Record<string, string> = {};
+
+  private readonly systemLabelIds = new Set<string>([
+    'INBOX',
+    'TRASH',
+    'SPAM',
+    'DRAFT',
+    'SENT',
+    'STARRED',
+    'UNREAD',
+    'IMPORTANT',
+    'CATEGORY_PERSONAL',
+    'CATEGORY_SOCIAL',
+    'CATEGORY_UPDATES',
+    'CATEGORY_FORUMS',
+    'CATEGORY_PROMOTIONS',
+    'MUTED',
+  ]);
+
   constructor(public config: ManagerConfig) {
     this.auth = new OAuth2Client(env.GOOGLE_CLIENT_ID, env.GOOGLE_CLIENT_SECRET);
 
@@ -523,14 +542,26 @@ export class GoogleMailManager implements MailManager {
   }
   public modifyLabels(
     threadIds: string[],
-    options: { addLabels: string[]; removeLabels: string[] },
+    addOrOptions: { addLabels: string[]; removeLabels: string[] } | string[],
+    maybeRemove?: string[],
   ) {
+
+    const options = Array.isArray(addOrOptions)
+      ? { addLabels: addOrOptions as string[], removeLabels: maybeRemove ?? [] }
+      : addOrOptions;
     return this.withErrorHandler(
       'modifyLabels',
       async () => {
+        const addLabelIds = await Promise.all(
+          (options.addLabels || []).map((lbl) => this.resolveLabelId(lbl)),
+        );
+        const removeLabelIds = await Promise.all(
+          (options.removeLabels || []).map((lbl) => this.resolveLabelId(lbl)),
+        );
+
         await this.modifyThreadLabels(threadIds, {
-          addLabelIds: options.addLabels,
-          removeLabelIds: options.removeLabels,
+          addLabelIds,
+          removeLabelIds,
         });
       },
       { threadIds, options },
@@ -928,7 +959,10 @@ export class GoogleMailManager implements MailManager {
     const failures = allResults.filter((result) => result.status === 'rejected');
     if (failures.length > 0) {
       const failureReasons = failures.map((f) => ({ threadId: f.threadId, reason: f.reason }));
-      failureReasons;
+      const first = failureReasons[0];
+      throw new Error(
+        `Failed to modify labels for thread ${first.threadId}: ${JSON.stringify(first.reason)}`,
+      );
     }
   }
   private normalizeSearch(folder: string, q: string) {
@@ -945,6 +979,10 @@ export class GoogleMailManager implements MailManager {
         return { folder: undefined, q: `is:draft AND (${q})` };
       }
 
+      if (folder === 'snoozed') {
+        return { folder: undefined, q: `label:Snoozed AND (${q})` };
+      }
+
       return { folder, q: folder.trim().length ? `in:${folder} ${q}` : q };
     }
 
@@ -1362,4 +1400,36 @@ export class GoogleMailManager implements MailManager {
 
     return results;
   }
+
+  private async resolveLabelId(labelName: string): Promise<string> {
+    if (this.systemLabelIds.has(labelName)) {
+      return labelName;
+    }
+
+    if (this.labelIdCache[labelName]) {
+      return this.labelIdCache[labelName];
+    }
+
+    const userLabels = await this.getUserLabels();
+    const existing = userLabels.find(
+      (l) => l.name?.toLowerCase() === labelName.toLowerCase(),
+    );
+    if (existing && existing.id) {
+      this.labelIdCache[labelName] = existing.id;
+      return existing.id;
+    }
+    const prettifiedName = labelName.charAt(0).toUpperCase() + labelName.slice(1).toLowerCase();
+    await this.createLabel({ name: prettifiedName });
+
+    const refreshedLabels = await this.getUserLabels();
+    const created = refreshedLabels.find(
+      (l) => l.name?.toLowerCase() === prettifiedName.toLowerCase(),
+    );
+    if (!created || !created.id) {
+      throw new Error(`Failed to create or retrieve Gmail label '${labelName}'.`);
+    }
+
+    this.labelIdCache[labelName] = created.id;
+    return created.id;
+  }
 }
diff --git a/apps/server/src/lib/driver/types.ts b/apps/server/src/lib/driver/types.ts
index 1b7a9da4e8..07f909c3ea 100644
--- a/apps/server/src/lib/driver/types.ts
+++ b/apps/server/src/lib/driver/types.ts
@@ -117,3 +117,19 @@ export interface MailManager {
   revokeToken(token: string): Promise<boolean>;
   deleteAllSpam(): Promise<DeleteAllSpamResponse>;
 }
+
+export interface IGetThreadsResponse {
+  threads: { id: string; historyId: string | null; $raw?: unknown }[];
+  nextPageToken: string | null;
+}
+
+export const IGetThreadsResponseSchema = z.object({
+  threads: z.array(
+    z.object({
+      id: z.string(),
+      historyId: z.string().nullable(),
+      $raw: z.unknown().optional(),
+    }),
+  ),
+  nextPageToken: z.string().nullable(),
+});
diff --git a/apps/server/src/lib/utils.ts b/apps/server/src/lib/utils.ts
index be262a0668..df4c8d4ad3 100644
--- a/apps/server/src/lib/utils.ts
+++ b/apps/server/src/lib/utils.ts
@@ -47,6 +47,7 @@ export const FOLDERS = {
   BIN: 'bin',
   DRAFT: 'draft',
   SENT: 'sent',
+  SNOOZED: 'snoozed',
 } as const;
 
 export const LABELS = {
@@ -56,6 +57,7 @@ export const LABELS = {
   IMPORTANT: 'IMPORTANT',
   SENT: 'SENT',
   TRASH: 'TRASH',
+  SNOOZED: 'SNOOZED',
 } as const;
 
 export const FOLDER_NAMES = [
@@ -67,6 +69,7 @@ export const FOLDER_NAMES = [
   'important',
   'sent',
   'draft',
+  'snoozed',
 ];
 
 export const FOLDER_TAGS: Record<string, string[]> = {
@@ -75,6 +78,7 @@ export const FOLDER_TAGS: Record<string, string[]> = {
   [FOLDERS.ARCHIVE]: [],
   [FOLDERS.SENT]: [LABELS.SENT],
   [FOLDERS.BIN]: [LABELS.TRASH],
+  [FOLDERS.SNOOZED]: [LABELS.SNOOZED],
 };
 
 export const getFolderTags = (folder: string): string[] => {
diff --git a/apps/server/src/main.ts b/apps/server/src/main.ts
index a1f68224dc..7a37986135 100644
--- a/apps/server/src/main.ts
+++ b/apps/server/src/main.ts
@@ -14,6 +14,7 @@ import {
   userSettings,
   writingStyleMatrix,
 } from './db/schema';
+import { getZeroAgent } from './lib/server-utils';
 import { env, WorkerEntrypoint, DurableObject, RpcTarget } from 'cloudflare:workers';
 import { EProviders, type ISubscribeBatch, type IThreadBatch } from './types';
 import { oAuthDiscoveryMetadata } from 'better-auth/plugins';
@@ -754,6 +755,50 @@ export default class extends WorkerEntrypoint<typeof env> {
 
     const expiredSubscriptions: Array<{ connectionId: string; providerId: EProviders }> = [];
 
+    const nowTs = Date.now();
+
+    const unsnoozeMap: Record<string, { threadIds: string[]; keyNames: string[] }> = {};
+
+    let cursor: string | undefined = undefined;
+    do {
+      const listResp: {
+        keys: { name: string; metadata?: { wakeAt?: string } }[];
+        cursor?: string;
+      } = await env.snoozed_emails.list({ cursor, limit: 1000 });
+      cursor = listResp.cursor;
+
+      for (const key of listResp.keys) {
+        try {
+          const wakeAtIso = (key as any).metadata?.wakeAt as string | undefined;
+          if (!wakeAtIso) continue;
+          const wakeAt = new Date(wakeAtIso).getTime();
+          if (wakeAt > nowTs) continue;
+
+          const [threadId, connectionId] = key.name.split('__');
+          if (!threadId || !connectionId) continue;
+
+          if (!unsnoozeMap[connectionId]) {
+            unsnoozeMap[connectionId] = { threadIds: [], keyNames: [] };
+          }
+          unsnoozeMap[connectionId].threadIds.push(threadId);
+          unsnoozeMap[connectionId].keyNames.push(key.name);
+        } catch (error) {
+          console.error('Failed to prepare unsnooze for key', key.name, error);
+        }
+      }
+    } while (cursor);
+
+    await Promise.all(
+      Object.entries(unsnoozeMap).map(async ([connectionId, { threadIds, keyNames }]) => {
+        try {
+          const agent = await getZeroAgent(connectionId);
+          await agent.queue('unsnoozeThreadsHandler', { connectionId, threadIds, keyNames });
+        } catch (error) {
+          console.error('Failed to enqueue unsnooze tasks', { connectionId, threadIds, error });
+        }
+      }),
+    );
+
     await Promise.all(
       allAccounts.keys.map(async (key) => {
         const [connectionId, providerId] = key.name.split('__');
diff --git a/apps/server/src/overrides.d.ts b/apps/server/src/overrides.d.ts
index 240e0fb7d8..64bc592781 100644
--- a/apps/server/src/overrides.d.ts
+++ b/apps/server/src/overrides.d.ts
@@ -1,5 +1,7 @@
 declare namespace Cloudflare {
   declare interface Env {
+    snoozed_emails: KVNamespace;
+    unsnooze_queue: Queue;
     zero: Fetcher & {
       subscribe: (data: { connectionId: string; providerId: string }) => Promise<void>;
       unsubscribe: (data: { connectionId: string; providerId: string }) => Promise<void>;
diff --git a/apps/server/src/routes/agent/index.ts b/apps/server/src/routes/agent/index.ts
index fd1c5f73a0..680839cf39 100644
--- a/apps/server/src/routes/agent/index.ts
+++ b/apps/server/src/routes/agent/index.ts
@@ -28,9 +28,13 @@ import {
   type OutgoingMessage,
 } from './types';
 import { DurableObjectOAuthClientProvider } from 'agents/mcp/do-oauth-client-provider';
+import { EPrompts, type IOutgoingMessage, type ParsedMessage, type ISnoozeBatch } from '../../types';
+import type {
+  MailManager,
+  IGetThreadResponse,
+  IGetThreadsResponse,
+} from '../../lib/driver/types';
 import { AiChatPrompt, GmailSearchAssistantSystemPrompt } from '../../lib/prompts';
-import { EPrompts, type IOutgoingMessage, type ParsedMessage } from '../../types';
-import type { MailManager, IGetThreadResponse } from '../../lib/driver/types';
 import { connectionToDriver } from '../../lib/server-utils';
 import type { CreateDraftData } from '../../lib/schemas';
 import { withRetry } from '../../lib/gmail-rate-limit';
@@ -50,6 +54,7 @@ import { createDb } from '../../db';
 import { DriverRpcDO } from './rpc';
 import { eq } from 'drizzle-orm';
 import { Effect } from 'effect';
+
 const decoder = new TextDecoder();
 
 const shouldDropTables = env.DROP_AGENT_TABLES === 'true';
@@ -58,6 +63,7 @@ const shouldLoop = env.THREAD_SYNC_LOOP !== 'false';
 export class ZeroDriver extends AIChatAgent<typeof env> {
   private foldersInSync: Map<string, boolean> = new Map();
   private syncThreadsInProgress: Map<string, boolean> = new Map();
+  private currentFolder: string | null = 'inbox';
   private driver: MailManager | null = null;
   private agent: DurableObjectStub<ZeroAgent> | null = null;
   constructor(ctx: DurableObjectState, env: Env) {
@@ -163,14 +169,13 @@ export class ZeroDriver extends AIChatAgent<typeof env> {
       this.ctx.waitUntil(this.syncThreads('inbox'));
     }
   }
-
   async rawListThreads(params: {
     folder: string;
     query?: string;
     maxResults?: number;
     labelIds?: string[];
     pageToken?: string;
-  }) {
+  }): Promise<IGetThreadsResponse> {
     if (!this.driver) {
       throw new Error('No driver available');
     }
@@ -608,7 +613,7 @@ export class ZeroDriver extends AIChatAgent<typeof env> {
     q?: string;
     maxResults?: number;
     pageToken?: string;
-  }) {
+  }): Promise<IGetThreadsResponse> {
     const { labelIds = [], folder, q, maxResults = 50, pageToken } = params;
 
     try {
@@ -744,14 +749,14 @@ export class ZeroDriver extends AIChatAgent<typeof env> {
 
       if (result?.length) {
         const threads = result.map((row) => ({
-          id: row.id,
+          id: String(row.id),
           historyId: null,
         }));
 
         // Use latest_received_on for pagination cursor
         const nextPageToken =
           threads.length === maxResults && result.length > 0
-            ? result[result.length - 1].latest_received_on
+            ? String(result[result.length - 1].latest_received_on)
             : null;
 
         return {
@@ -816,6 +821,24 @@ export class ZeroDriver extends AIChatAgent<typeof env> {
     }
   }
 
+  async unsnoozeThreadsHandler(payload: ISnoozeBatch) {
+    const { connectionId, threadIds, keyNames } = payload;
+    try {
+      await this.setupAuth();
+
+      if (threadIds.length) {
+        await this.modifyLabels(threadIds, ['INBOX'], ['SNOOZED']);
+      }
+
+      if (keyNames.length) {
+        await Promise.all(keyNames.map((k: string) => env.snoozed_emails.delete(k)));
+      }
+    } catch (error) {
+      console.error('[AGENT][unsnoozeThreadsHandler] Failed', { connectionId, threadIds, error });
+      throw error;
+    }
+  }
+
   async listThreads(params: {
     folder: string;
     query?: string;
diff --git a/apps/server/src/routes/agent/rpc.ts b/apps/server/src/routes/agent/rpc.ts
index 496d50f731..53fa4f650e 100644
--- a/apps/server/src/routes/agent/rpc.ts
+++ b/apps/server/src/routes/agent/rpc.ts
@@ -219,4 +219,12 @@ export class DriverRpcDO extends RpcTarget {
   }) {
     return await this.mainDo.searchThreads(params);
   }
+
+  async queue(callbackName: string, payload: unknown): Promise<unknown> {
+    const queueFn = this.mainDo.queue;
+    if (typeof queueFn !== 'function') {
+      throw new Error('queue method not implemented on mainDo');
+    }
+    return queueFn(callbackName, payload);
+  }
 }
diff --git a/apps/server/src/routes/agent/types.ts b/apps/server/src/routes/agent/types.ts
index 95e46254b3..68d71c2685 100644
--- a/apps/server/src/routes/agent/types.ts
+++ b/apps/server/src/routes/agent/types.ts
@@ -69,3 +69,5 @@ export type OutgoingMessage =
       type: OutgoingMessageType.Mail_Get;
       threadId: string;
     };
+
+export type QueueFunc = (name: string, payload: unknown) => Promise<unknown>;
diff --git a/apps/server/src/trpc/routes/mail.ts b/apps/server/src/trpc/routes/mail.ts
index 83e2e96841..f43fe8a104 100644
--- a/apps/server/src/trpc/routes/mail.ts
+++ b/apps/server/src/trpc/routes/mail.ts
@@ -1,6 +1,10 @@
 import { updateWritingStyleMatrix } from '../../services/writing-style-service';
 import { activeDriverProcedure, router, privateProcedure } from '../trpc';
-import { IGetThreadResponseSchema } from '../../lib/driver/types';
+import {
+  IGetThreadResponseSchema,
+  IGetThreadsResponseSchema,
+  type IGetThreadsResponse,
+} from '../../lib/driver/types';
 import { processEmailHtml } from '../../lib/email-processor';
 import { defaultPageSize, FOLDERS } from '../../lib/utils';
 import { serializedFileSchema } from '../../lib/schemas';
@@ -9,6 +13,7 @@ import { getZeroAgent } from '../../lib/server-utils';
 
 import { TRPCError } from '@trpc/server';
 import { z } from 'zod';
+import { env } from 'cloudflare:workers';
 
 const senderSchema = z.object({
   name: z.string().optional(),
@@ -64,6 +69,7 @@ export const mailRouter = router({
         labelIds: z.array(z.string()).optional().default([]),
       }),
     )
+    .output(IGetThreadsResponseSchema)
     .query(async ({ ctx, input }) => {
       const { folder, maxResults, cursor, q, labelIds } = input;
       const { activeConnection } = ctx;
@@ -77,25 +83,69 @@ export const mailRouter = router({
         });
         return drafts;
       }
+
+      type ThreadItem = { id: string; historyId: string | null; $raw?: unknown };
+
+      let threadsResponse: IGetThreadsResponse;
+
       if (q) {
-        const threadsResponse = await agent.rawListThreads({
-          labelIds: labelIds,
+        // When searching, leverage the driver's raw search for best accuracy
+        threadsResponse = await agent.rawListThreads({
+          folder,
+          query: q,
           maxResults,
+          labelIds,
           pageToken: cursor,
-          query: q,
+        });
+      } else {
+        // Normal listing – include explicit folder label so that label filters work together
+        const folderLabelId = getFolderLabelId(folder);
+        const labelIdsToUse = folderLabelId ? [...labelIds, folderLabelId] : labelIds;
+
+        threadsResponse = await agent.listThreads({
           folder,
+          labelIds: labelIdsToUse,
+          maxResults,
+          pageToken: cursor,
         });
-        return threadsResponse;
       }
-      const folderLabelId = getFolderLabelId(folder);
-      const labelIdsToUse = folderLabelId ? [...labelIds, folderLabelId] : labelIds;
-      const threadsResponse = await agent.listThreads({
-        labelIds: labelIdsToUse,
-        maxResults,
-        pageToken: cursor,
-        query: q,
-        folder,
-      });
+
+      if (folder === FOLDERS.SNOOZED) {
+        const nowTs = Date.now();
+        const filtered: ThreadItem[] = [];
+
+        await Promise.all(
+          threadsResponse.threads.map(async (t: ThreadItem) => {
+            const keyName = `${t.id}__${activeConnection.id}`;
+            try {
+              const wakeAtIso = await env.snoozed_emails.get(keyName);
+              if (!wakeAtIso) {
+                filtered.push(t);
+                return;
+              }
+
+              const wakeAt = new Date(wakeAtIso).getTime();
+              if (wakeAt > nowTs) {
+                filtered.push(t);
+                return;
+              }
+
+              console.log('[UNSNOOZE_ON_ACCESS] Expired thread', t.id, {
+                wakeAtIso,
+                now: new Date(nowTs).toISOString(),
+              });
+
+              await agent.modifyLabels([t.id], ['INBOX'], ['SNOOZED']);
+              await env.snoozed_emails.delete(keyName);
+            } catch (error) {
+              console.error('[UNSNOOZE_ON_ACCESS] Failed for', t.id, error);
+              filtered.push(t);
+            }
+          }),
+        );
+
+        threadsResponse.threads = filtered;
+      }
       return threadsResponse;
     }),
   markAsRead: activeDriverProcedure
@@ -398,6 +448,56 @@ export const mailRouter = router({
     const agent = await getZeroAgent(activeConnection.id);
     return agent.getEmailAliases();
   }),
+  snoozeThreads: activeDriverProcedure
+    .input(
+      z.object({
+        ids: z.string().array(),
+        wakeAt: z.string(),
+      }),
+    )
+    .mutation(async ({ input, ctx }) => {
+      const { activeConnection } = ctx;
+      const agent = await getZeroAgent(activeConnection.id);
+
+      if (!input.ids.length) {
+        return { success: false, error: 'No thread IDs provided' };
+      }
+
+      const wakeAtDate = new Date(input.wakeAt);
+      if (wakeAtDate <= new Date()) {
+        return { success: false, error: 'Snooze time must be in the future' };
+      }
+
+      await agent.modifyLabels(input.ids, ['SNOOZED'], ['INBOX']);
+
+      const wakeAtIso = wakeAtDate.toISOString();
+      await Promise.all(
+        input.ids.map((threadId) =>
+          env.snoozed_emails.put(`${threadId}__${activeConnection.id}`, wakeAtIso, {
+            metadata: { wakeAt: wakeAtIso },
+          }),
+        ),
+      );
+
+      return { success: true };
+    }),
+  unsnoozeThreads: activeDriverProcedure
+    .input(
+      z.object({
+        ids: z.array(z.string().min(1)).nonempty(),
+      }),
+    )
+    .mutation(async ({ input, ctx }) => {
+      const { activeConnection } = ctx;
+      const agent = await getZeroAgent(activeConnection.id);
+      if (!input.ids.length) return { success: false, error: 'No thread IDs' };
+      await agent.modifyLabels(input.ids, ['INBOX'], ['SNOOZED']);
+
+      await Promise.all(
+        input.ids.map((threadId) => env.snoozed_emails.delete(`${threadId}__${activeConnection.id}`)),
+      );
+      return { success: true };
+    }),
   getMessageAttachments: activeDriverProcedure
     .input(
       z.object({
diff --git a/apps/server/src/types.ts b/apps/server/src/types.ts
index ae5abc42b6..b59392bce9 100644
--- a/apps/server/src/types.ts
+++ b/apps/server/src/types.ts
@@ -17,6 +17,13 @@ export interface IThreadBatch {
   subscriptionName: string;
 }
 
+// Batch payload for unsnoozing threads via the queue
+export interface ISnoozeBatch {
+  connectionId: string;
+  threadIds: string[];
+  keyNames: string[];
+}
+
 export const defaultLabels = [
   {
     name: 'to respond',
diff --git a/apps/server/wrangler.jsonc b/apps/server/wrangler.jsonc
index 8fc8c11d7b..728805f8cb 100644
--- a/apps/server/wrangler.jsonc
+++ b/apps/server/wrangler.jsonc
@@ -91,6 +91,9 @@
       "observability": {
         "enabled": true,
       },
+      "triggers": {
+        "crons": ["*/1 * * * *"]
+      },
       "hyperdrive": [
         {
           "binding": "HYPERDRIVE",
@@ -139,6 +142,11 @@
           "binding": "gmail_sub_age",
           "id": "c55e692bb71d4e5bae23dded092b09d5",
         },
+        {
+          "binding": "snoozed_emails",
+          "id": "11111111111111111111111111111111",
+          "preview_id": "11111111111111111111111111111111"
+        },
       ],
     },
     "staging": {
@@ -279,6 +287,11 @@
           "binding": "gmail_sub_age",
           "id": "c55e692bb71d4e5bae23dded092b09d5",
         },
+        {
+          "binding": "snoozed_emails",
+          "id": "22222222222222222222222222222222",
+          "preview_id": "22222222222222222222222222222222"
+        },
       ],
     },
     "production": {
@@ -416,6 +429,11 @@
           "binding": "gmail_sub_age",
           "id": "0591e91fffcc4675aaf00f909bee77d2",
         },
+        {
+          "binding": "snoozed_emails",
+          "id": "11111111111111111111111111111111",
+          "preview_id": "11111111111111111111111111111111"
+        },
       ],
     },
   },

From 718b30336a6bd6e58473062200ea780b01717fbb Mon Sep 17 00:00:00 2001
From: Nizzy <nizabizaher@gmail.com>
Date: Mon, 21 Jul 2025 11:26:40 -0400
Subject: [PATCH 15/20] fix alignment

---
 apps/mail/components/mail/mail.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/mail/components/mail/mail.tsx b/apps/mail/components/mail/mail.tsx
index b3b4990d0b..15edc1b1b0 100644
--- a/apps/mail/components/mail/mail.tsx
+++ b/apps/mail/components/mail/mail.tsx
@@ -485,7 +485,7 @@ export function MailLayout() {
                 )}
               >
                 <div className="w-full">
-                  <div className="grid grid-cols-12 gap-2">
+                  <div className="grid grid-cols-12 gap-2 mt-1">
                     <SidebarToggle className="col-span-1 h-fit px-2" />
                     {mail.bulkSelected.length === 0 ? (
                       <div className="col-span-10 flex gap-2">
@@ -582,7 +582,7 @@ export function MailLayout() {
               <div
                 className={cn(
                   `${category === 'Important' ? 'bg-[#F59E0D]' : category === 'All Mail' ? 'bg-[#006FFE]' : category === 'Personal' ? 'bg-[#39ae4a]' : category === 'Updates' ? 'bg-[#8B5CF6]' : category === 'Promotions' ? 'bg-[#F43F5E]' : category === 'Unread' ? 'bg-[#FF4800]' : 'bg-[#F59E0D]'}`,
-                  'relative bottom-0.5 z-[5] h-0.5 w-full transition-opacity',
+                  'relative z-[5] h-0.5 w-full transition-opacity',
                   isFetching ? 'opacity-100' : 'opacity-0',
                 )}
               />

From 6cc673031fce9180d829814a2b41c7d01d88e54a Mon Sep 17 00:00:00 2001
From: Adam <13007539+MrgSub@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:55:10 -0700
Subject: [PATCH 16/20] fix deployment (#1779)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# READ CAREFULLY THEN REMOVE

Remove bullet points that are not relevant.

PLEASE REFRAIN FROM USING AI TO WRITE YOUR CODE AND PR DESCRIPTION. IF YOU DO USE AI TO WRITE YOUR CODE PLEASE PROVIDE A DESCRIPTION AND REVIEW IT CAREFULLY. MAKE SURE YOU UNDERSTAND THE CODE YOU ARE SUBMITTING USING AI.

- Pull requests that do not follow these guidelines will be closed without review or comment.
- If you use AI to write your PR description your pr will be close without review or comment.
- If you are unsure about anything, feel free to ask for clarification.

## Description

Please provide a clear description of your changes.

---

## Type of Change

Please delete options that are not relevant.

- [ ] 🐛 Bug fix (non-breaking change which fixes an issue)
- [ ] ✨ New feature (non-breaking change which adds functionality)
- [ ] 💥 Breaking change (fix or feature with breaking changes)
- [ ] 📝 Documentation update
- [ ] 🎨 UI/UX improvement
- [ ] 🔒 Security enhancement
- [ ] ⚡ Performance improvement

## Areas Affected

Please check all that apply:

- [ ] Email Integration (Gmail, IMAP, etc.)
- [ ] User Interface/Experience
- [ ] Authentication/Authorization
- [ ] Data Storage/Management
- [ ] API Endpoints
- [ ] Documentation
- [ ] Testing Infrastructure
- [ ] Development Workflow
- [ ] Deployment/Infrastructure

## Testing Done

Describe the tests you've done:

- [ ] Unit tests added/updated
- [ ] Integration tests added/updated
- [ ] Manual testing performed
- [ ] Cross-browser testing (if UI changes)
- [ ] Mobile responsiveness verified (if UI changes)

## Security Considerations

For changes involving data or authentication:

- [ ] No sensitive data is exposed
- [ ] Authentication checks are in place
- [ ] Input validation is implemented
- [ ] Rate limiting is considered (if applicable)

## Checklist

- [ ] I have read the [CONTRIBUTING](https://github.com/Mail-0/Zero/blob/staging/.github/CONTRIBUTING.md) document
- [ ] My code follows the project's style guidelines
- [ ] I have performed a self-review of my code
- [ ] I have commented my code, particularly in complex areas
- [ ] I have updated the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that prove my fix/feature works
- [ ] All tests pass locally
- [ ] Any dependent changes are merged and published

## Additional Notes

Add any other context about the pull request here.

## Screenshots/Recordings

Add screenshots or recordings here if applicable.

---

_By submitting this pull request, I confirm that my contribution is made under the terms of the project's license._


<!-- This is an auto-generated description by cubic. -->
---

## Summary by cubic
Updated the snoozed_emails binding IDs in wrangler.jsonc to fix deployment issues.

<!-- End of auto-generated description by cubic. -->
---
 apps/server/wrangler.jsonc | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/apps/server/wrangler.jsonc b/apps/server/wrangler.jsonc
index 728805f8cb..a284c8088a 100644
--- a/apps/server/wrangler.jsonc
+++ b/apps/server/wrangler.jsonc
@@ -92,7 +92,7 @@
         "enabled": true,
       },
       "triggers": {
-        "crons": ["*/1 * * * *"]
+        "crons": ["*/1 * * * *"],
       },
       "hyperdrive": [
         {
@@ -144,8 +144,7 @@
         },
         {
           "binding": "snoozed_emails",
-          "id": "11111111111111111111111111111111",
-          "preview_id": "11111111111111111111111111111111"
+          "id": "f3a30ed7198542d890db172536bade33",
         },
       ],
     },
@@ -289,8 +288,7 @@
         },
         {
           "binding": "snoozed_emails",
-          "id": "22222222222222222222222222222222",
-          "preview_id": "22222222222222222222222222222222"
+          "id": "f3a30ed7198542d890db172536bade33",
         },
       ],
     },
@@ -431,8 +429,7 @@
         },
         {
           "binding": "snoozed_emails",
-          "id": "11111111111111111111111111111111",
-          "preview_id": "11111111111111111111111111111111"
+          "id": "f0952e9c3b024cb499c4b9dfe8bb603e",
         },
       ],
     },

From 2ace34495eace5a2c2fdfce1ea43bef05e4d23b1 Mon Sep 17 00:00:00 2001
From: Adam <13007539+MrgSub@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:55:36 -0700
Subject: [PATCH 17/20] Remove unused code and optimize database connections
 (#1778)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# READ CAREFULLY THEN REMOVE

Remove bullet points that are not relevant.

PLEASE REFRAIN FROM USING AI TO WRITE YOUR CODE AND PR DESCRIPTION. IF YOU DO USE AI TO WRITE YOUR CODE PLEASE PROVIDE A DESCRIPTION AND REVIEW IT CAREFULLY. MAKE SURE YOU UNDERSTAND THE CODE YOU ARE SUBMITTING USING AI.

- Pull requests that do not follow these guidelines will be closed without review or comment.
- If you use AI to write your PR description your pr will be close without review or comment.
- If you are unsure about anything, feel free to ask for clarification.

## Description

Please provide a clear description of your changes.

---

## Type of Change

Please delete options that are not relevant.

- [ ] 🐛 Bug fix (non-breaking change which fixes an issue)
- [ ] ✨ New feature (non-breaking change which adds functionality)
- [ ] 💥 Breaking change (fix or feature with breaking changes)
- [ ] 📝 Documentation update
- [ ] 🎨 UI/UX improvement
- [ ] 🔒 Security enhancement
- [ ] ⚡ Performance improvement

## Areas Affected

Please check all that apply:

- [ ] Email Integration (Gmail, IMAP, etc.)
- [ ] User Interface/Experience
- [ ] Authentication/Authorization
- [ ] Data Storage/Management
- [ ] API Endpoints
- [ ] Documentation
- [ ] Testing Infrastructure
- [ ] Development Workflow
- [ ] Deployment/Infrastructure

## Testing Done

Describe the tests you've done:

- [ ] Unit tests added/updated
- [ ] Integration tests added/updated
- [ ] Manual testing performed
- [ ] Cross-browser testing (if UI changes)
- [ ] Mobile responsiveness verified (if UI changes)

## Security Considerations

For changes involving data or authentication:

- [ ] No sensitive data is exposed
- [ ] Authentication checks are in place
- [ ] Input validation is implemented
- [ ] Rate limiting is considered (if applicable)

## Checklist

- [ ] I have read the [CONTRIBUTING](https://github.com/Mail-0/Zero/blob/staging/.github/CONTRIBUTING.md) document
- [ ] My code follows the project's style guidelines
- [ ] I have performed a self-review of my code
- [ ] I have commented my code, particularly in complex areas
- [ ] I have updated the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that prove my fix/feature works
- [ ] All tests pass locally
- [ ] Any dependent changes are merged and published

## Additional Notes

Add any other context about the pull request here.

## Screenshots/Recordings

Add screenshots or recordings here if applicable.

---

_By submitting this pull request, I confirm that my contribution is made under the terms of the project's license._


<!-- This is an auto-generated description by cubic. -->
---

## Summary by cubic
Removed unused code and improved database connection handling to reduce resource usage and simplify maintenance.

- **Refactors**
  - Deleted unused constants and imports.
  - Cleaned up database connection logic to avoid unnecessary connections and disposals.
  - Simplified error handling in thread retrieval.

<!-- End of auto-generated description by cubic. -->
---
 apps/server/src/lib/prompts.ts        |  2 --
 apps/server/src/main.ts               | 11 ++--------
 apps/server/src/routes/agent/index.ts | 31 +++++++++++++--------------
 apps/server/src/routes/agent/mcp.ts   |  1 -
 4 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/apps/server/src/lib/prompts.ts b/apps/server/src/lib/prompts.ts
index 3eb75b51a6..63ba478175 100644
--- a/apps/server/src/lib/prompts.ts
+++ b/apps/server/src/lib/prompts.ts
@@ -2,8 +2,6 @@ import { format } from 'date-fns';
 import { Tools } from '../types';
 import dedent from 'dedent';
 
-const CATEGORY_IDS = ['Important', 'All Mail', 'Personal', 'Updates', 'Promotions', 'Unread'];
-
 export const colors = [
   '#000000',
   '#434343',
diff --git a/apps/server/src/main.ts b/apps/server/src/main.ts
index 7a37986135..e449a19a64 100644
--- a/apps/server/src/main.ts
+++ b/apps/server/src/main.ts
@@ -14,19 +14,18 @@ import {
   userSettings,
   writingStyleMatrix,
 } from './db/schema';
-import { getZeroAgent } from './lib/server-utils';
 import { env, WorkerEntrypoint, DurableObject, RpcTarget } from 'cloudflare:workers';
 import { EProviders, type ISubscribeBatch, type IThreadBatch } from './types';
 import { oAuthDiscoveryMetadata } from 'better-auth/plugins';
 import { getZeroDB, verifyToken } from './lib/server-utils';
 import { eq, and, desc, asc, inArray } from 'drizzle-orm';
 import { EWorkflowType, runWorkflow } from './pipelines';
+import { ZeroAgent, ZeroDriver } from './routes/agent';
 import { contextStorage } from 'hono/context-storage';
 import { defaultUserSettings } from './lib/schemas';
 import { createLocalJWKSet, jwtVerify } from 'jose';
 import { routePartykitRequest } from 'partyserver';
-
-import { ZeroAgent, ZeroDriver } from './routes/agent';
+import { getZeroAgent } from './lib/server-utils';
 import { enableBrainFunction } from './lib/brain';
 import { trpcServer } from '@hono/trpc-server';
 import { agentsMiddleware } from 'hono-agents';
@@ -518,7 +517,6 @@ export default class extends WorkerEntrypoint<typeof env> {
           if (userId) {
             const db = getZeroDB(userId);
             c.set('sessionUser', await db.findUser());
-            (await db)[Symbol.dispose]?.();
           }
         }
       }
@@ -528,11 +526,6 @@ export default class extends WorkerEntrypoint<typeof env> {
 
       await next();
 
-      if (c.var.sessionUser?.id) {
-        const db = getZeroDB(c.var.sessionUser.id);
-        (await db)[Symbol.dispose]?.();
-      }
-
       c.set('sessionUser', undefined);
       c.set('autumn', undefined as any);
       c.set('auth', undefined as any);
diff --git a/apps/server/src/routes/agent/index.ts b/apps/server/src/routes/agent/index.ts
index 680839cf39..db88d524ee 100644
--- a/apps/server/src/routes/agent/index.ts
+++ b/apps/server/src/routes/agent/index.ts
@@ -27,13 +27,14 @@ import {
   type IncomingMessage,
   type OutgoingMessage,
 } from './types';
+import {
+  EPrompts,
+  type IOutgoingMessage,
+  type ParsedMessage,
+  type ISnoozeBatch,
+} from '../../types';
+import type { MailManager, IGetThreadResponse, IGetThreadsResponse } from '../../lib/driver/types';
 import { DurableObjectOAuthClientProvider } from 'agents/mcp/do-oauth-client-provider';
-import { EPrompts, type IOutgoingMessage, type ParsedMessage, type ISnoozeBatch } from '../../types';
-import type {
-  MailManager,
-  IGetThreadResponse,
-  IGetThreadsResponse,
-} from '../../lib/driver/types';
 import { AiChatPrompt, GmailSearchAssistantSystemPrompt } from '../../lib/prompts';
 import { connectionToDriver } from '../../lib/server-utils';
 import type { CreateDraftData } from '../../lib/schemas';
@@ -63,7 +64,6 @@ const shouldLoop = env.THREAD_SYNC_LOOP !== 'false';
 export class ZeroDriver extends AIChatAgent<typeof env> {
   private foldersInSync: Map<string, boolean> = new Map();
   private syncThreadsInProgress: Map<string, boolean> = new Map();
-  private currentFolder: string | null = 'inbox';
   private driver: MailManager | null = null;
   private agent: DurableObjectStub<ZeroAgent> | null = null;
   constructor(ctx: DurableObjectState, env: Env) {
@@ -506,7 +506,6 @@ export class ZeroDriver extends AIChatAgent<typeof env> {
     }
 
     try {
-      const startTime = Date.now();
       console.log(`[inboxRag] Executing AI search with parameters:`, {
         query,
         max_num_results: 3,
@@ -529,8 +528,6 @@ export class ZeroDriver extends AIChatAgent<typeof env> {
         },
       });
 
-      const duration = Date.now() - startTime;
-
       return { result: answer.response, data: answer.data };
     } catch (error) {
       console.error(`[inboxRag] Search failed for query: "${query}"`, {
@@ -774,7 +771,7 @@ export class ZeroDriver extends AIChatAgent<typeof env> {
     }
   }
 
-  async getThreadFromDB(id: string, lastAttempt = false): Promise<IGetThreadResponse> {
+  async getThreadFromDB(id: string): Promise<IGetThreadResponse> {
     try {
       const result = this.sql`
           SELECT
@@ -793,11 +790,13 @@ export class ZeroDriver extends AIChatAgent<typeof env> {
         `;
 
       if (!result || result.length === 0) {
-        if (lastAttempt) {
-          throw new Error('Thread not found in database, Sync Failed once');
-        }
-        await this.syncThread({ threadId: id });
-        return this.getThreadFromDB(id, true);
+        return {
+          messages: [],
+          latest: undefined,
+          hasUnread: false,
+          totalReplies: 0,
+          labels: [],
+        } satisfies IGetThreadResponse;
       }
       const row = result[0] as { latest_label_ids: string };
       const storedThread = await env.THREADS_BUCKET.get(this.getThreadKey(id));
diff --git a/apps/server/src/routes/agent/mcp.ts b/apps/server/src/routes/agent/mcp.ts
index 081179eb52..16ccd0d92a 100644
--- a/apps/server/src/routes/agent/mcp.ts
+++ b/apps/server/src/routes/agent/mcp.ts
@@ -23,7 +23,6 @@ import { env } from 'cloudflare:workers';
 import { eq, and } from 'drizzle-orm';
 import { McpAgent } from 'agents/mcp';
 import { createDb } from '../../db';
-import { generateText } from 'ai';
 import z from 'zod';
 
 export class ZeroMCP extends McpAgent<typeof env, Record<string, unknown>, { userId: string }> {

From b70b88028e80e6fd80122028eccc2c576996b721 Mon Sep 17 00:00:00 2001
From: Adam <13007539+MrgSub@users.noreply.github.com>
Date: Mon, 21 Jul 2025 11:10:43 -0700
Subject: [PATCH 18/20] Add agent documentation and sync additional folders in
 production (#1780)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Added Agent Documentation and Enhanced Production Thread Syncing

## Description

This PR adds comprehensive agent documentation for Zero Email and enhances the thread synchronization in production environments.

1. Added a new `AGENT.md` file with detailed documentation about the project structure, commands, tech stack, and development workflow.
2. Enhanced the `ZeroDriver` class to sync additional folders ("sent" and "spam") when running in production environments.

---

## Type of Change

- [x] ✨ New feature (non-breaking change which adds functionality)
- [x] 📝 Documentation update

## Areas Affected

- [x] Email Integration (Gmail, IMAP, etc.)
- [x] Documentation

## Testing Done

- [x] Manual testing performed

## Checklist

- [x] I have performed a self-review of my code
- [x] I have updated the documentation
- [x] My changes generate no new warnings

## Additional Notes

The additional thread syncing in production will ensure that users have a more complete view of their email data by including sent and spam folders alongside the inbox.

---

_By submitting this pull request, I confirm that my contribution is made under the terms of the project's license._
---
 AGENT.md                              | 108 ++++++++++++++++++++++++++
 apps/server/src/routes/agent/index.ts |   4 +
 2 files changed, 112 insertions(+)
 create mode 100644 AGENT.md

diff --git a/AGENT.md b/AGENT.md
new file mode 100644
index 0000000000..86fa16eaf3
--- /dev/null
+++ b/AGENT.md
@@ -0,0 +1,108 @@
+# Agent Configuration for Zero Email
+
+Zero is an open-source AI email solution built with a modern TypeScript/Next.js stack in a monorepo setup.
+
+## Project Structure
+
+This is a pnpm workspace monorepo with the following structure:
+- `apps/mail/` - Next.js frontend email client
+- `apps/server/` - Backend server
+- `apps/ios-app/` - iOS mobile app
+- `packages/cli/` - CLI tools (`nizzy` command)
+- `packages/db/` - Database schemas and utilities
+- `packages/eslint-config/` - Shared ESLint configuration
+- `packages/tailwind-config/` - Shared Tailwind configuration
+- `packages/tsconfig/` - Shared TypeScript configuration
+
+## Frequently Used Commands
+
+### Development
+- `pnpm go` - Quick start: starts database and dev servers
+- `pnpm dev` - Start all development servers (uses Turbo)
+- `pnpm docker:db:up` - Start PostgreSQL database in Docker
+- `pnpm docker:db:down` - Stop and remove database container
+- `pnpm docker:db:clean` - Stop and remove database with volumes
+
+### Build & Deploy
+- `pnpm build` - Build all packages (uses Turbo)
+- `pnpm build:frontend` - Build only the mail frontend
+- `pnpm deploy:frontend` - Deploy frontend
+- `pnpm deploy:backend` - Deploy backend
+
+### Code Quality
+- `pnpm check` - Run format check and lint
+- `pnpm lint` - Run ESLint across all packages
+- `pnpm format` - Format code with Prettier
+- `pnpm check:format` - Check code formatting
+
+### Database
+- `pnpm db:push` - Push schema changes to database
+- `pnpm db:generate` - Generate migration files
+- `pnpm db:migrate` - Apply database migrations
+- `pnpm db:studio` - Open Drizzle Studio
+
+### Testing & Evaluation
+- `pnpm test:ai` - Run AI tests
+- `pnpm eval` - Run evaluation suite
+- `pnpm eval:dev` - Run evaluation in dev mode
+- `pnpm eval:ci` - Run evaluation in CI mode
+
+### Utilities
+- `pnpm nizzy env` - Setup environment variables
+- `pnpm nizzy sync` - Sync environment variables and types
+- `pnpm scripts` - Run custom scripts
+
+## Tech Stack
+
+- **Frontend**: Next.js, React 19, TypeScript, TailwindCSS, Shadcn UI
+- **Backend**: Node.js, tRPC, Drizzle ORM
+- **Database**: PostgreSQL
+- **Authentication**: Better Auth, Google OAuth
+- **Package Manager**: pnpm (v10+)
+- **Build Tool**: Turbo
+- **Linting**: ESLint, Oxlint, Prettier
+
+## Code Style & Conventions
+
+### Formatting
+- 2-space indentation
+- Single quotes
+- 100 character line width
+- Semicolons required
+- Uses Prettier with sort-imports and Tailwind plugins
+
+### File Organization
+- TypeScript strict mode enabled
+- Workspace packages use catalog versioning for shared dependencies
+- Monorepo managed with pnpm workspaces
+
+### Important Environment Variables
+- `BETTER_AUTH_SECRET` - Auth secret key
+- `GOOGLE_CLIENT_ID` & `GOOGLE_CLIENT_SECRET` - Gmail integration
+- `AUTUMN_SECRET_KEY` - Encryption service
+- `TWILIO_*` - SMS integration
+- `DATABASE_URL` - PostgreSQL connection string
+
+## Development Setup
+
+1. Install dependencies: `pnpm install`
+2. Setup environment: `pnpm nizzy env`
+3. Sync environment: `pnpm nizzy sync`
+4. Start database: `pnpm docker:db:up`
+5. Initialize database: `pnpm db:push`
+6. Start development: `pnpm dev`
+
+## Common Workflow
+
+1. Always run `pnpm check` before committing
+2. Use `pnpm nizzy sync` after environment variable changes
+3. Run `pnpm db:push` after schema changes
+4. Use `pnpm go` for quick development startup
+
+## Notes
+
+- Uses Husky for git hooks
+- Integrates with Sentry for error tracking
+- Uses Cloudflare Workers for backend deployment
+- iOS app is part of the monorepo
+- CLI tool `nizzy` helps manage environment and sync operations
diff --git a/apps/server/src/routes/agent/index.ts b/apps/server/src/routes/agent/index.ts
index db88d524ee..d1e074fa8d 100644
--- a/apps/server/src/routes/agent/index.ts
+++ b/apps/server/src/routes/agent/index.ts
@@ -167,6 +167,10 @@ export class ZeroDriver extends AIChatAgent<typeof env> {
       if (_connection) this.driver = connectionToDriver(_connection);
       this.ctx.waitUntil(conn.end());
       this.ctx.waitUntil(this.syncThreads('inbox'));
+      if (env.NODE_ENV === 'production') {
+        this.ctx.waitUntil(this.syncThreads('sent'));
+        this.ctx.waitUntil(this.syncThreads('spam'));
+      }
     }
   }
   async rawListThreads(params: {

From 4caab6bb83dcb75baec9c7b78cb19199a2cc50df Mon Sep 17 00:00:00 2001
From: Adam <13007539+MrgSub@users.noreply.github.com>
Date: Mon, 21 Jul 2025 12:21:58 -0700
Subject: [PATCH 19/20] Implement Sentry error tracking and onboarding email
 sequence (#1781)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# READ CAREFULLY THEN REMOVE

Remove bullet points that are not relevant.

PLEASE REFRAIN FROM USING AI TO WRITE YOUR CODE AND PR DESCRIPTION. IF YOU DO USE AI TO WRITE YOUR CODE PLEASE PROVIDE A DESCRIPTION AND REVIEW IT CAREFULLY. MAKE SURE YOU UNDERSTAND THE CODE YOU ARE SUBMITTING USING AI.

- Pull requests that do not follow these guidelines will be closed without review or comment.
- If you use AI to write your PR description your pr will be close without review or comment.
- If you are unsure about anything, feel free to ask for clarification.

## Description

Please provide a clear description of your changes.

---

## Type of Change

Please delete options that are not relevant.

- [ ] 🐛 Bug fix (non-breaking change which fixes an issue)
- [ ] ✨ New feature (non-breaking change which adds functionality)
- [ ] 💥 Breaking change (fix or feature with breaking changes)
- [ ] 📝 Documentation update
- [ ] 🎨 UI/UX improvement
- [ ] 🔒 Security enhancement
- [ ] ⚡ Performance improvement

## Areas Affected

Please check all that apply:

- [ ] Email Integration (Gmail, IMAP, etc.)
- [ ] User Interface/Experience
- [ ] Authentication/Authorization
- [ ] Data Storage/Management
- [ ] API Endpoints
- [ ] Documentation
- [ ] Testing Infrastructure
- [ ] Development Workflow
- [ ] Deployment/Infrastructure

## Testing Done

Describe the tests you've done:

- [ ] Unit tests added/updated
- [ ] Integration tests added/updated
- [ ] Manual testing performed
- [ ] Cross-browser testing (if UI changes)
- [ ] Mobile responsiveness verified (if UI changes)

## Security Considerations

For changes involving data or authentication:

- [ ] No sensitive data is exposed
- [ ] Authentication checks are in place
- [ ] Input validation is implemented
- [ ] Rate limiting is considered (if applicable)

## Checklist

- [ ] I have read the [CONTRIBUTING](https://github.com/Mail-0/Zero/blob/staging/.github/CONTRIBUTING.md) document
- [ ] My code follows the project's style guidelines
- [ ] I have performed a self-review of my code
- [ ] I have commented my code, particularly in complex areas
- [ ] I have updated the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that prove my fix/feature works
- [ ] All tests pass locally
- [ ] Any dependent changes are merged and published

## Additional Notes

Add any other context about the pull request here.

## Screenshots/Recordings

Add screenshots or recordings here if applicable.

---

_By submitting this pull request, I confirm that my contribution is made under the terms of the project's license._


<!-- This is an auto-generated description by cubic. -->
---

## Summary by cubic
Added Sentry error tracking to the mail app and server, and implemented an onboarding email sequence for new users.

- **New Features**
  - Integrated Sentry for client and server error monitoring with a secure tunnel endpoint.
  - Added onboarding email campaign that sends a series of welcome and feature emails to new users.
  - Upgraded Sentry dependencies to the latest version.

<!-- End of auto-generated description by cubic. -->
---
 apps/mail/app/entry.client.tsx                |   3 +-
 apps/mail/app/instrument.ts                   |  11 +
 apps/mail/app/root.tsx                        |  30 +
 apps/mail/instrument.ts                       |  13 -
 apps/mail/package.json                        |   3 +-
 apps/server/src/lib/auth.ts                   |  86 +-
 .../src/lib}/react-emails/email-sequences.tsx |   0
 apps/server/src/main.ts                       |  32 +
 pnpm-lock.yaml                                | 991 +++++++++++++++++-
 9 files changed, 1109 insertions(+), 60 deletions(-)
 create mode 100644 apps/mail/app/instrument.ts
 delete mode 100644 apps/mail/instrument.ts
 rename apps/{mail => server/src/lib}/react-emails/email-sequences.tsx (100%)

diff --git a/apps/mail/app/entry.client.tsx b/apps/mail/app/entry.client.tsx
index accd5e23c8..6755cc2a3c 100644
--- a/apps/mail/app/entry.client.tsx
+++ b/apps/mail/app/entry.client.tsx
@@ -1,9 +1,8 @@
-import '../instrument';
-
 import { startTransition, StrictMode } from 'react';
 import { HydratedRouter } from 'react-router/dom';
 import { hydrateRoot } from 'react-dom/client';
 import * as Sentry from '@sentry/react';
+import './instrument';
 
 startTransition(() => {
   hydrateRoot(
diff --git a/apps/mail/app/instrument.ts b/apps/mail/app/instrument.ts
new file mode 100644
index 0000000000..5534f55dc4
--- /dev/null
+++ b/apps/mail/app/instrument.ts
@@ -0,0 +1,11 @@
+import * as Sentry from '@sentry/react';
+
+Sentry.init({
+  dsn: 'https://03f6397c0eb458bf1e37c4776a31797c@o4509328786915328.ingest.us.sentry.io/4509328795303936',
+  tunnel: import.meta.env.VITE_PUBLIC_BACKEND_URL + '/monitoring/sentry',
+  integrations: [Sentry.replayIntegration()],
+  tracesSampleRate: 1,
+  replaysSessionSampleRate: 0.1,
+  replaysOnErrorSampleRate: 1.0,
+  debug: false,
+});
diff --git a/apps/mail/app/root.tsx b/apps/mail/app/root.tsx
index 961585c65e..8abe90401c 100644
--- a/apps/mail/app/root.tsx
+++ b/apps/mail/app/root.tsx
@@ -24,6 +24,7 @@ import type { Route } from './+types/root';
 import { AlertCircle } from 'lucide-react';
 import { m } from '@/paraglide/messages';
 import { ArrowLeft } from 'lucide-react';
+import * as Sentry from '@sentry/react';
 import superjson from 'superjson';
 import './globals.css';
 
@@ -128,6 +129,35 @@ export function ErrorBoundary({ error }: Route.ErrorBoundaryProps) {
   useEffect(() => {
     console.error(error);
     console.error({ message, details, stack });
+
+    // Report error to Sentry
+    if (isRouteErrorResponse(error)) {
+      Sentry.captureException(new Error(`Route Error ${error.status}: ${error.statusText}`), {
+        tags: {
+          type: 'route_error',
+          status: error.status,
+        },
+        extra: {
+          statusText: error.statusText,
+          data: error.data,
+        },
+      });
+    } else if (error instanceof Error) {
+      Sentry.captureException(error, {
+        tags: {
+          type: 'app_error',
+        },
+      });
+    } else {
+      Sentry.captureException(new Error('Unknown error occurred'), {
+        tags: {
+          type: 'unknown_error',
+        },
+        extra: {
+          error: error,
+        },
+      });
+    }
   }, [error, message, details, stack]);
 
   return (
diff --git a/apps/mail/instrument.ts b/apps/mail/instrument.ts
deleted file mode 100644
index 84efdf1877..0000000000
--- a/apps/mail/instrument.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import * as Sentry from '@sentry/react';
-
-if (!import.meta.env.DEV) {
-  Sentry.init({
-    dsn: 'https://03f6397c0eb458bf1e37c4776a31797c@o4509328786915328.ingest.us.sentry.io/4509328795303936',
-    tunnel: '/monitoring',
-    integrations: [Sentry.replayIntegration()],
-    tracesSampleRate: 1,
-    replaysSessionSampleRate: 0.1,
-    replaysOnErrorSampleRate: 1.0,
-    debug: false,
-  });
-}
diff --git a/apps/mail/package.json b/apps/mail/package.json
index c68bbb23da..b0c62ea21f 100644
--- a/apps/mail/package.json
+++ b/apps/mail/package.json
@@ -28,7 +28,8 @@
     "@react-email/html": "^0.0.11",
     "@react-email/render": "1.1.0",
     "@react-router/dev": "^7.6.1",
-    "@sentry/react": "9.19.0",
+    "@sentry/react": "9.40.0",
+    "@sentry/react-router": "9.40.0",
     "@tanstack/query-sync-storage-persister": "^5.75.0",
     "@tanstack/react-query": "^5.74.4",
     "@tanstack/react-query-persist-client": "^5.75.2",
diff --git a/apps/server/src/lib/auth.ts b/apps/server/src/lib/auth.ts
index 0ae937e216..2b1bc9391f 100644
--- a/apps/server/src/lib/auth.ts
+++ b/apps/server/src/lib/auth.ts
@@ -1,3 +1,12 @@
+import {
+  AIWritingAssistantEmail,
+  AutoLabelingEmail,
+  CategoriesEmail,
+  Mail0ProEmail,
+  ShortcutsEmail,
+  SuperSearchEmail,
+  WelcomeEmail,
+} from './react-emails/email-sequences';
 import { createAuthMiddleware, phoneNumber, jwt, bearer, mcp } from 'better-auth/plugins';
 import { type Account, betterAuth, type BetterAuthOptions } from 'better-auth';
 import { getBrowserTimezone, isValidTimezone } from './timezones';
@@ -5,9 +14,8 @@ import { drizzleAdapter } from 'better-auth/adapters/drizzle';
 import { getSocialProviders } from './auth-providers';
 import { redis, resend, twilio } from './services';
 import { getContext } from 'hono/context-storage';
-import { user as _user } from '../db/schema';
+import { dubAnalytics } from '@dub/better-auth';
 import { defaultUserSettings } from './schemas';
-
 import { disableBrainFunction } from './brain';
 import { APIError } from 'better-auth/api';
 import { getZeroDB } from './server-utils';
@@ -15,10 +23,71 @@ import { type EProviders } from '../types';
 import type { HonoContext } from '../ctx';
 import { env } from 'cloudflare:workers';
 import { createDriver } from './driver';
-
 import { createDb } from '../db';
-import { dubAnalytics } from "@dub/better-auth";
-import { Dub } from "dub";
+import { Effect } from 'effect';
+import { Dub } from 'dub';
+
+const scheduleCampaign = (userInfo: { address: string; name: string }) =>
+  Effect.gen(function* () {
+    const name = userInfo.name || 'there';
+    const resendService = resend();
+
+    const sendEmail = (subject: string, react: unknown, scheduledAt?: string) =>
+      Effect.promise(() =>
+        resendService.emails
+          .send({
+            from: '0.email <onboarding@0.email>',
+            to: userInfo.address,
+            subject,
+            react: react as any,
+            ...(scheduledAt && { scheduledAt }),
+          })
+          .then(() => void 0),
+      );
+
+    const emails = [
+      {
+        subject: 'Welcome to 0.email',
+        react: WelcomeEmail({ name }),
+        scheduledAt: undefined,
+      },
+      {
+        subject: 'Mail0 Pro is here 🚀💼',
+        react: Mail0ProEmail({ name }),
+        scheduledAt: 'in 1 day',
+      },
+      {
+        subject: 'Auto-labeling is here 🎉📥',
+        react: AutoLabelingEmail({ name }),
+        scheduledAt: 'in 2 days',
+      },
+      {
+        subject: 'AI Writing Assistant is here 🤖💬',
+        react: AIWritingAssistantEmail({ name }),
+        scheduledAt: 'in 3 days',
+      },
+      {
+        subject: 'Shortcuts are here 🔧🚀',
+        react: ShortcutsEmail({ name }),
+        scheduledAt: 'in 4 days',
+      },
+      {
+        subject: 'Categories are here 📂🔍',
+        react: CategoriesEmail({ name }),
+        scheduledAt: 'in 5 days',
+      },
+      {
+        subject: 'Super Search is here 🔍🚀',
+        react: SuperSearchEmail({ name }),
+        scheduledAt: 'in 6 days',
+      },
+    ];
+
+    yield* Effect.all(
+      emails.map((email) => sendEmail(email.subject, email.react, email.scheduledAt)),
+      { concurrency: 'unbounded' },
+    );
+  });
 
 const connectionHandlerHook = async (account: Account) => {
   if (!account.accessToken || !account.refreshToken) {
@@ -39,7 +108,6 @@ const connectionHandlerHook = async (account: Account) => {
     throw new APIError('UNAUTHORIZED', { message: 'Failed to get user info' });
   });
 
-
   if (!userInfo?.address) {
     console.error('Missing email in user info:', { userInfo });
     throw new APIError('BAD_REQUEST', { message: 'Missing "email" in user info' });
@@ -61,6 +129,12 @@ const connectionHandlerHook = async (account: Account) => {
     updatingInfo,
   );
 
+  if (env.NODE_ENV === 'production') {
+    await Effect.runPromise(
+      scheduleCampaign({ address: userInfo.address, name: userInfo.name || 'there' }),
+    );
+  }
+
   if (env.GOOGLE_S_ACCOUNT && env.GOOGLE_S_ACCOUNT !== '{}') {
     await env.subscribe_queue.send({
       connectionId: result.id,
diff --git a/apps/mail/react-emails/email-sequences.tsx b/apps/server/src/lib/react-emails/email-sequences.tsx
similarity index 100%
rename from apps/mail/react-emails/email-sequences.tsx
rename to apps/server/src/lib/react-emails/email-sequences.tsx
diff --git a/apps/server/src/main.ts b/apps/server/src/main.ts
index e449a19a64..cfe648052e 100644
--- a/apps/server/src/main.ts
+++ b/apps/server/src/main.ts
@@ -42,6 +42,9 @@ import { cors } from 'hono/cors';
 import { Effect } from 'effect';
 import { Hono } from 'hono';
 
+const SENTRY_HOST = 'o4509328786915328.ingest.us.sentry.io';
+const SENTRY_PROJECT_IDS = new Set(['4509328795303936']);
+
 export class DbRpcDO extends RpcTarget {
   constructor(
     private mainDo: ZeroDB,
@@ -639,6 +642,35 @@ export default class extends WorkerEntrypoint<typeof env> {
     )
     .get('/health', (c) => c.json({ message: 'Zero Server is Up!' }))
     .get('/', (c) => c.redirect(`${env.VITE_PUBLIC_APP_URL}`))
+    .post('/monitoring/sentry', async (c) => {
+      try {
+        const envelopeBytes = await c.req.arrayBuffer();
+        const envelope = new TextDecoder().decode(envelopeBytes);
+        const piece = envelope.split('\n')[0];
+        const header = JSON.parse(piece);
+        const dsn = new URL(header['dsn']);
+        const project_id = dsn.pathname?.replace('/', '');
+
+        if (dsn.hostname !== SENTRY_HOST) {
+          throw new Error(`Invalid sentry hostname: ${dsn.hostname}`);
+        }
+
+        if (!project_id || !SENTRY_PROJECT_IDS.has(project_id)) {
+          throw new Error(`Invalid sentry project id: ${project_id}`);
+        }
+
+        const upstream_sentry_url = `https://${SENTRY_HOST}/api/${project_id}/envelope/`;
+        await fetch(upstream_sentry_url, {
+          method: 'POST',
+          body: envelopeBytes,
+        });
+
+        return c.json({}, { status: 200 });
+      } catch (e) {
+        console.error('error tunneling to sentry', e);
+        return c.json({ error: 'error tunneling to sentry' }, { status: 500 });
+      }
+    })
     .post('/a8n/notify/:providerId', async (c) => {
       if (!c.req.header('Authorization')) return c.json({ error: 'Unauthorized' }, { status: 401 });
       if (env.DISABLE_WORKFLOWS === 'true') return c.json({ message: 'OK' }, { status: 200 });
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6639b3eac0..0730db85cf 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -144,8 +144,11 @@ importers:
         specifier: ^7.6.1
         version: 7.6.3(@types/node@22.13.8)(jiti@2.4.2)(react-router@7.6.3(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(tsx@4.19.4)(typescript@5.8.3)(vite@6.3.5(@types/node@22.13.8)(jiti@2.4.2)(tsx@4.19.4)(yaml@2.8.0))(wrangler@4.22.0(@cloudflare/workers-types@4.20250628.0))(yaml@2.8.0)
       '@sentry/react':
-        specifier: 9.19.0
-        version: 9.19.0(react@19.1.0)
+        specifier: 9.40.0
+        version: 9.40.0(react@19.1.0)
+      '@sentry/react-router':
+        specifier: 9.40.0
+        version: 9.40.0(@react-router/node@7.6.3(react-router@7.6.3(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(typescript@5.8.3))(react-router@7.6.3(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(react@19.1.0)
       '@tanstack/query-sync-storage-persister':
         specifier: ^5.75.0
         version: 5.81.5
@@ -575,7 +578,7 @@ importers:
         version: 1.6.0
       drizzle-orm:
         specifier: 'catalog:'
-        version: 0.43.1(@cloudflare/workers-types@4.20250628.0)(@opentelemetry/api@1.9.0)(better-sqlite3@11.10.0)(kysely@0.28.2)(postgres@3.4.5)
+        version: 0.43.1(@cloudflare/workers-types@4.20250628.0)(@opentelemetry/api@1.9.0)(@types/pg@8.6.1)(better-sqlite3@11.10.0)(kysely@0.28.2)(postgres@3.4.5)
       effect:
         specifier: 3.16.12
         version: 3.16.12
@@ -1910,10 +1913,194 @@ packages:
   '@one-ini/wasm@0.1.1':
     resolution: {integrity: sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==}
 
+  '@opentelemetry/api-logs@0.57.2':
+    resolution: {integrity: sha512-uIX52NnTM0iBh84MShlpouI7UKqkZ7MrUszTmaypHBu4r7NofznSnQRfJ+uUeDtQDj6w8eFGg5KBLDAwAPz1+A==}
+    engines: {node: '>=14'}
+
   '@opentelemetry/api@1.9.0':
     resolution: {integrity: sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==}
     engines: {node: '>=8.0.0'}
 
+  '@opentelemetry/context-async-hooks@1.30.1':
+    resolution: {integrity: sha512-s5vvxXPVdjqS3kTLKMeBMvop9hbWkwzBpu+mUO2M7sZtlkyDJGwFe33wRKnbaYDo8ExRVBIIdwIGrqpxHuKttA==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
+  '@opentelemetry/core@1.30.1':
+    resolution: {integrity: sha512-OOCM2C/QIURhJMuKaekP3TRBxBKxG/TWWA0TL2J6nXUtDnuCtccy49LUJF8xPFXMX+0LMcxFpCo8M9cGY1W6rQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
+  '@opentelemetry/instrumentation-amqplib@0.46.1':
+    resolution: {integrity: sha512-AyXVnlCf/xV3K/rNumzKxZqsULyITJH6OVLiW6730JPRqWA7Zc9bvYoVNpN6iOpTU8CasH34SU/ksVJmObFibQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-connect@0.43.1':
+    resolution: {integrity: sha512-ht7YGWQuV5BopMcw5Q2hXn3I8eG8TH0J/kc/GMcW4CuNTgiP6wCu44BOnucJWL3CmFWaRHI//vWyAhaC8BwePw==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-dataloader@0.16.1':
+    resolution: {integrity: sha512-K/qU4CjnzOpNkkKO4DfCLSQshejRNAJtd4esgigo/50nxCB6XCyi1dhAblUHM9jG5dRm8eu0FB+t87nIo99LYQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-express@0.47.1':
+    resolution: {integrity: sha512-QNXPTWteDclR2B4pDFpz0TNghgB33UMjUt14B+BZPmtH1MwUFAfLHBaP5If0Z5NZC+jaH8oF2glgYjrmhZWmSw==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-fs@0.19.1':
+    resolution: {integrity: sha512-6g0FhB3B9UobAR60BGTcXg4IHZ6aaYJzp0Ki5FhnxyAPt8Ns+9SSvgcrnsN2eGmk3RWG5vYycUGOEApycQL24A==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-generic-pool@0.43.1':
+    resolution: {integrity: sha512-M6qGYsp1cURtvVLGDrPPZemMFEbuMmCXgQYTReC/IbimV5sGrLBjB+/hANUpRZjX67nGLdKSVLZuQQAiNz+sww==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-graphql@0.47.1':
+    resolution: {integrity: sha512-EGQRWMGqwiuVma8ZLAZnExQ7sBvbOx0N/AE/nlafISPs8S+QtXX+Viy6dcQwVWwYHQPAcuY3bFt3xgoAwb4ZNQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-hapi@0.45.2':
+    resolution: {integrity: sha512-7Ehow/7Wp3aoyCrZwQpU7a2CnoMq0XhIcioFuKjBb0PLYfBfmTsFTUyatlHu0fRxhwcRsSQRTvEhmZu8CppBpQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-http@0.57.2':
+    resolution: {integrity: sha512-1Uz5iJ9ZAlFOiPuwYg29Bf7bJJc/GeoeJIFKJYQf67nTVKFe8RHbEtxgkOmK4UGZNHKXcpW4P8cWBYzBn1USpg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-ioredis@0.47.1':
+    resolution: {integrity: sha512-OtFGSN+kgk/aoKgdkKQnBsQFDiG8WdCxu+UrHr0bXScdAmtSzLSraLo7wFIb25RVHfRWvzI5kZomqJYEg/l1iA==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-kafkajs@0.7.1':
+    resolution: {integrity: sha512-OtjaKs8H7oysfErajdYr1yuWSjMAectT7Dwr+axIoZqT9lmEOkD/H/3rgAs8h/NIuEi2imSXD+vL4MZtOuJfqQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-knex@0.44.1':
+    resolution: {integrity: sha512-U4dQxkNhvPexffjEmGwCq68FuftFK15JgUF05y/HlK3M6W/G2iEaACIfXdSnwVNe9Qh0sPfw8LbOPxrWzGWGMQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-koa@0.47.1':
+    resolution: {integrity: sha512-l/c+Z9F86cOiPJUllUCt09v+kICKvT+Vg1vOAJHtHPsJIzurGayucfCMq2acd/A/yxeNWunl9d9eqZ0G+XiI6A==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-lru-memoizer@0.44.1':
+    resolution: {integrity: sha512-5MPkYCvG2yw7WONEjYj5lr5JFehTobW7wX+ZUFy81oF2lr9IPfZk9qO+FTaM0bGEiymwfLwKe6jE15nHn1nmHg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-mongodb@0.52.0':
+    resolution: {integrity: sha512-1xmAqOtRUQGR7QfJFfGV/M2kC7wmI2WgZdpru8hJl3S0r4hW0n3OQpEHlSGXJAaNFyvT+ilnwkT+g5L4ljHR6g==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-mongoose@0.46.1':
+    resolution: {integrity: sha512-3kINtW1LUTPkiXFRSSBmva1SXzS/72we/jL22N+BnF3DFcoewkdkHPYOIdAAk9gSicJ4d5Ojtt1/HeibEc5OQg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-mysql2@0.45.2':
+    resolution: {integrity: sha512-h6Ad60FjCYdJZ5DTz1Lk2VmQsShiViKe0G7sYikb0GHI0NVvApp2XQNRHNjEMz87roFttGPLHOYVPlfy+yVIhQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-mysql@0.45.1':
+    resolution: {integrity: sha512-TKp4hQ8iKQsY7vnp/j0yJJ4ZsP109Ht6l4RHTj0lNEG1TfgTrIH5vJMbgmoYXWzNHAqBH2e7fncN12p3BP8LFg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-pg@0.51.1':
+    resolution: {integrity: sha512-QxgjSrxyWZc7Vk+qGSfsejPVFL1AgAJdSBMYZdDUbwg730D09ub3PXScB9d04vIqPriZ+0dqzjmQx0yWKiCi2Q==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-redis-4@0.46.1':
+    resolution: {integrity: sha512-UMqleEoabYMsWoTkqyt9WAzXwZ4BlFZHO40wr3d5ZvtjKCHlD4YXLm+6OLCeIi/HkX7EXvQaz8gtAwkwwSEvcQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-tedious@0.18.1':
+    resolution: {integrity: sha512-5Cuy/nj0HBaH+ZJ4leuD7RjgvA844aY2WW+B5uLcWtxGjRZl3MNLuxnNg5DYWZNPO+NafSSnra0q49KWAHsKBg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-undici@0.10.1':
+    resolution: {integrity: sha512-rkOGikPEyRpMCmNu9AQuV5dtRlDmJp2dK5sw8roVshAGoB6hH/3QjDtRhdwd75SsJwgynWUNRUYe0wAkTo16tQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.7.0
+
+  '@opentelemetry/instrumentation@0.57.2':
+    resolution: {integrity: sha512-BdBGhQBh8IjZ2oIIX6F2/Q3LKm/FDDKi6ccYKcBTeilh6SNdNKveDOLk73BkSJjQLJk6qe4Yh+hHw1UPhCDdrg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/redis-common@0.36.2':
+    resolution: {integrity: sha512-faYX1N0gpLhej/6nyp6bgRjzAKXn5GOEMYY7YhciSfCoITAktLUtQ36d24QEWNA1/WA1y6qQunCe0OhHRkVl9g==}
+    engines: {node: '>=14'}
+
+  '@opentelemetry/resources@1.30.1':
+    resolution: {integrity: sha512-5UxZqiAgLYGFjS4s9qm5mBVo433u+dSPUFWVWXmLAD4wB65oMCoXaJP1KJa9DIYYMeHu3z4BZcStG3LC593cWA==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
+  '@opentelemetry/sdk-trace-base@1.30.1':
+    resolution: {integrity: sha512-jVPgBbH1gCy2Lb7X0AVQ8XAfgg0pJ4nvl8/IiQA6nxOsPvS+0zMJaFSs2ltXe0J6C8dqjcnpyqINDJmU30+uOg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
+  '@opentelemetry/semantic-conventions@1.28.0':
+    resolution: {integrity: sha512-lp4qAiMTD4sNWW4DbKLBkfiMZ4jbAboJIGOQr5DvciMRI494OapieI9qiODpOt0XBr1LjIDy1xAGAnVs5supTA==}
+    engines: {node: '>=14'}
+
+  '@opentelemetry/semantic-conventions@1.36.0':
+    resolution: {integrity: sha512-TtxJSRD8Ohxp6bKkhrm27JRHAxPczQA7idtcTOMYI+wQRRrfgqxHv1cFbCApcSnNjtXkmzFozn6jQtFrOmbjPQ==}
+    engines: {node: '>=14'}
+
+  '@opentelemetry/sql-common@0.40.1':
+    resolution: {integrity: sha512-nSDlnHSqzC3pXn/wZEZVLuAuJ1MYMXPBwtv2qAbCa3847SaHItdE7SzUq/Jtb0KZmh1zfAbNi3AAMjztTT4Ugg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.1.0
+
   '@oxlint/darwin-arm64@1.6.0':
     resolution: {integrity: sha512-m3wyqBh1TOHjpr/dXeIZY7OoX+MQazb+bMHQdDtwUvefrafUx+5YHRvulYh1sZSQ449nQ3nk3qj5qj535vZRjg==}
     cpu: [arm64]
@@ -1976,6 +2163,11 @@ packages:
   '@popperjs/core@2.11.8':
     resolution: {integrity: sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==}
 
+  '@prisma/instrumentation@6.11.1':
+    resolution: {integrity: sha512-mrZOev24EDhnefmnZX7WVVT7v+r9LttPRqf54ONvj6re4XMF7wFTpK2tLJi4XHB7fFp/6xhYbgRel8YV7gQiyA==}
+    peerDependencies:
+      '@opentelemetry/api': ^1.8
+
   '@radix-ui/number@1.1.1':
     resolution: {integrity: sha512-MkKCwxlXTgz6CFoJx3pCwn07GKp36+aZyu/u2Ln2VrA5DcdyCZkASEDBTd8x5whTQQL5CiYf4prXKLcgQdv29g==}
 
@@ -3430,36 +3622,134 @@ packages:
   '@selderee/plugin-htmlparser2@0.11.0':
     resolution: {integrity: sha512-P33hHGdldxGabLFjPPpaTxVolMrzrcegejx+0GxjrIb9Zv48D8yAIA/QTDR2dFl7Uz7urX8aX6+5bCZslr+gWQ==}
 
-  '@sentry-internal/browser-utils@9.19.0':
-    resolution: {integrity: sha512-DlEHX4eIHe5yIuh/cFu9OiaFuk1CTnFK95zj61I7Q2fxmN43dIwC3xAAGJ/Hy+GDQi7kU+BiS2sudSHSTq81BA==}
+  '@sentry-internal/browser-utils@9.40.0':
+    resolution: {integrity: sha512-Ajvz6jN+EEMKrOHcUv2+HlhbRUh69uXhhRoBjJw8sc61uqA2vv3QWyBSmTRoHdTnLGboT5bKEhHIkzVXb+YgEw==}
     engines: {node: '>=18'}
 
-  '@sentry-internal/feedback@9.19.0':
-    resolution: {integrity: sha512-yixRrv4NfpjhFW56AuUTjVwZlignB9FWAXXyrmRP3SsFeJCFrAsSD8HOxV9RXNr9ePYl7MEU0Agi43YWhJsiAw==}
+  '@sentry-internal/feedback@9.40.0':
+    resolution: {integrity: sha512-39UbLdGWGvSJ7bAzRnkv91cBdd6fLbdkLVVvqE2ZUfegm7+rH1mRPglmEhw4VE4mQfKZM1zWr/xus2+XPqJcYw==}
     engines: {node: '>=18'}
 
-  '@sentry-internal/replay-canvas@9.19.0':
-    resolution: {integrity: sha512-YC8yrOjuKSfQgGniJnzkdbFsWEPTlNpzeeYPTxS4ouH1FwfGrSkPmcddjor2YHaLfiuHHqQ/Vvq70n+zruJH7A==}
+  '@sentry-internal/replay-canvas@9.40.0':
+    resolution: {integrity: sha512-GLoJ4R4Uipd7Vb+0LzSJA2qCyN1J6YalQIoDuOJTfYyykHvKltds5D8a/5S3Q6d8PcL/nxTn93fynauGEZt2Ow==}
     engines: {node: '>=18'}
 
-  '@sentry-internal/replay@9.19.0':
-    resolution: {integrity: sha512-i/X9brRchbAF25yjxLTI7E8eoESRPBgIyQOWoWRXXt2n51iBRTjLXSaEfGvjdN+qrMq/yd6nC1/UqJVxXHeIhA==}
+  '@sentry-internal/replay@9.40.0':
+    resolution: {integrity: sha512-WrmCvqbLJQC45IFRVN3k0J5pU5NkdX0e9o6XxjcmDiATKk00RHnW4yajnCJ8J1cPR4918yqiJHPX5xpG08BZNA==}
     engines: {node: '>=18'}
 
-  '@sentry/browser@9.19.0':
-    resolution: {integrity: sha512-efKfPQ0yQkdIkC7qJ5TIHxnecLNENGUYl1YD/TC8yyzW2JRf/3OYo5yg1hY2rhsP5RwQShXlT7uA03ABVIkA4A==}
+  '@sentry/babel-plugin-component-annotate@3.6.1':
+    resolution: {integrity: sha512-zmvUa4RpzDG3LQJFpGCE8lniz8Rk1Wa6ZvvK+yEH+snZeaHHRbSnAQBMR607GOClP+euGHNO2YtaY4UAdNTYbg==}
+    engines: {node: '>= 14'}
+
+  '@sentry/browser@9.40.0':
+    resolution: {integrity: sha512-qz/1Go817vcsbcIwgrz4/T34vi3oQ4UIqikosuaCTI9wjZvK0HyW3QmLvTbAnsE7G7h6+UZsVkpO5R16IQvQhQ==}
     engines: {node: '>=18'}
 
-  '@sentry/core@9.19.0':
-    resolution: {integrity: sha512-I41rKpMJHHZb0z0Nja+Lxto6IkEEmX3uWjnECypF8Z1HIjeJB0+PXl8p/7TeaKYqw2J2GYcRTg7jQZDmvKle1w==}
+  '@sentry/bundler-plugin-core@3.6.1':
+    resolution: {integrity: sha512-/ubWjPwgLep84sUPzHfKL2Ns9mK9aQrEX4aBFztru7ygiJidKJTxYGtvjh4dL2M1aZ0WRQYp+7PF6+VKwdZXcQ==}
+    engines: {node: '>= 14'}
+
+  '@sentry/cli-darwin@2.50.0':
+    resolution: {integrity: sha512-Aj+cLBZ0dCw+pdUxvJ1U71PnKh2YjvpzLN9h1ZTe8UI3FqmkKkSH/J8mN/5qmR7qUHjDcm2l+wfgVUaaP8CWbA==}
+    engines: {node: '>=10'}
+    os: [darwin]
+
+  '@sentry/cli-linux-arm64@2.50.0':
+    resolution: {integrity: sha512-p6hIh4Bb87qBfEz9w5dxEPAohIKcw68qoy5VUTx+cCanO8uXNWWsT78xtUNFRscW9zc6MxQMSITTWaCEIKvxRA==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [linux, freebsd, android]
+
+  '@sentry/cli-linux-arm@2.50.0':
+    resolution: {integrity: sha512-SGPAFwOY2of2C+RUBJcxMN2JXikVFEk8ypYOsQTEvV/48cLejcO/O2mHIj/YKgIkrfn3t7LlqdK6g75lkz+F8Q==}
+    engines: {node: '>=10'}
+    cpu: [arm]
+    os: [linux, freebsd, android]
+
+  '@sentry/cli-linux-i686@2.50.0':
+    resolution: {integrity: sha512-umhGmbiCUG7MvjTm8lXFmFxQjyTVtYakilBwPTVzRELmNKxxhfKRxwSSA+hUKetAUzNd8fJx8K7yqdw+qRA7Pg==}
+    engines: {node: '>=10'}
+    cpu: [x86, ia32]
+    os: [linux, freebsd, android]
+
+  '@sentry/cli-linux-x64@2.50.0':
+    resolution: {integrity: sha512-ugIIx9+wUmguxOUe9ZVacvdCffZwqtFSKwpJ06Nqes0XfL4ZER4Qlq3/miCZ8m150C4xK5ym/QCwB41ffBqI4g==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [linux, freebsd, android]
+
+  '@sentry/cli-win32-arm64@2.50.0':
+    resolution: {integrity: sha512-fMyBSKLrVHY9944t8oTpul+6osyQeuN8GGGP3diDxGQpynYL+vhcHZIpXFRH398+3kedG/IFoY7EwGgIEqWzmw==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@sentry/cli-win32-i686@2.50.0':
+    resolution: {integrity: sha512-VbC+l2Y2kB7Lsun2c8t7ZGwmljmXnyncZLW9PjdEyJSTAJ9GnEnSvyFSPXNLV/eHJnfQffzU7QTjU8vkQ7XMYg==}
+    engines: {node: '>=10'}
+    cpu: [x86, ia32]
+    os: [win32]
+
+  '@sentry/cli-win32-x64@2.50.0':
+    resolution: {integrity: sha512-nMktyF93NtQUOViAAKHpHSWACOGjOkKjiewi4pD6W3sWllFiPPyt15XoyApqWwnICDRQu2DI5vnil4ck6/k7mw==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [win32]
+
+  '@sentry/cli@2.50.0':
+    resolution: {integrity: sha512-OHRRQPUNjBpzOT6arNhxXQ71DKs5jSziCfDzmEGwAs+K8J/I1QxnvJkto88HbXE54oiWhSEJwL0pvcowFXyVbA==}
+    engines: {node: '>= 10'}
+    hasBin: true
+
+  '@sentry/core@9.40.0':
+    resolution: {integrity: sha512-cZkuz6BDna6VXSqvlWnrRsaDx4QBKq1PcfQrqhVz8ljs0M7Gcl+Mtj8dCzUxx12fkYM62hQXG72DEGNlAQpH/Q==}
     engines: {node: '>=18'}
 
-  '@sentry/react@9.19.0':
-    resolution: {integrity: sha512-tHuzPVbqKsONlFQsy7FqqGjBaujQoLRIDBLlPPMNoiGvP3rodBl6t1v5zoNAq4m47i3MhvpLEYf6C00j1w5UMQ==}
+  '@sentry/node-core@9.40.0':
+    resolution: {integrity: sha512-97JONDa8NxItX0Cz5WQPMd1gQjzodt38qQ0OzZNFvYg2Cpvxob8rxwsNA08Liu7B97rlvsvqMt+Wbgw8SAMfgQ==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.9.0
+      '@opentelemetry/context-async-hooks': ^1.30.1 || ^2.0.0
+      '@opentelemetry/core': ^1.30.1 || ^2.0.0
+      '@opentelemetry/instrumentation': '>=0.57.1 <1'
+      '@opentelemetry/resources': ^1.30.1 || ^2.0.0
+      '@opentelemetry/sdk-trace-base': ^1.30.1 || ^2.0.0
+      '@opentelemetry/semantic-conventions': ^1.34.0
+
+  '@sentry/node@9.40.0':
+    resolution: {integrity: sha512-8bVWChXzGH4QmbVw+H/yiJ6zxqPDhnx11fEAP+vpL1UBm1cAV67CoB4eS7OqQdPC8gF/BQb2sqF0TvY/12NPpA==}
+    engines: {node: '>=18'}
+
+  '@sentry/opentelemetry@9.40.0':
+    resolution: {integrity: sha512-POQ/ZFmBbi15z3EO9gmTExpxCfW0Ug+WooA8QZPJaizo24gcF5AMOgwuGFwT2YLw/2HdPWjPUPujNNGdCWM6hw==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.9.0
+      '@opentelemetry/context-async-hooks': ^1.30.1 || ^2.0.0
+      '@opentelemetry/core': ^1.30.1 || ^2.0.0
+      '@opentelemetry/sdk-trace-base': ^1.30.1 || ^2.0.0
+      '@opentelemetry/semantic-conventions': ^1.34.0
+
+  '@sentry/react-router@9.40.0':
+    resolution: {integrity: sha512-N1RzcV6OuKLFA7klaV0q1e0N0RmQ6rAO+hMjfnopVTsFxgHqpUcI6Ryt+OilQQQcW3ymPq8HZhKBb9lyo1IBRQ==}
+    engines: {node: '>=20'}
+    peerDependencies:
+      '@react-router/node': 7.x
+      react: '>=18'
+      react-router: 7.x
+
+  '@sentry/react@9.40.0':
+    resolution: {integrity: sha512-y00d33qozmQAKroQ4Kk2jxhznprPBOb55SL4LOpNPRHGEomxZCUeM3geltczrf14JsGowCr5+xlT+cZQ2XcNlA==}
     engines: {node: '>=18'}
     peerDependencies:
       react: ^16.14.0 || 17.x || 18.x || 19.x
 
+  '@sentry/vite-plugin@3.6.1':
+    resolution: {integrity: sha512-x8WMdv2K2HcGS2ezEUIEZXpT/fNeWQ9rsEeF0K9DfKXK8Z9lzRmCr6TVA6I9+yW39Is+1/0cv1Rsu0LhO7lHzg==}
+    engines: {node: '>= 14'}
+
   '@shuding/opentype.js@1.4.0-beta.0':
     resolution: {integrity: sha512-3NgmNyH3l/Hv6EvsWJbsvpcpUba6R8IREQ83nH83cyakCw7uM1arZKNfHwv1Wz6jgqrF/j4x5ELvR6PnK9nTcA==}
     engines: {node: '>= 8.0.0'}
@@ -3776,6 +4066,9 @@ packages:
   '@types/chai@5.2.2':
     resolution: {integrity: sha512-8kB30R7Hwqf40JPiKhVzodJs2Qc1ZJ5zuT3uzw5Hq/dhNCl3G3l83jfpdI1e20BP348+fV7VIL/+FxaXkqBmWg==}
 
+  '@types/connect@3.4.38':
+    resolution: {integrity: sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==}
+
   '@types/d3-array@3.2.1':
     resolution: {integrity: sha512-Y2Jn2idRrLzUfAKV2LyRImR+y4oa2AntrgID95SHJxuMUrkNXmanDSed71sRNZysveJVt1hLLemQZIady0FpEg==}
 
@@ -3863,6 +4156,9 @@ packages:
   '@types/ms@2.1.0':
     resolution: {integrity: sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==}
 
+  '@types/mysql@2.15.26':
+    resolution: {integrity: sha512-DSLCOXhkvfS5WNNPbfn2KdICAmk8lLc+/PNvnPnF7gOdMZCxopXduqv0OQ13y/yA/zXTSikZZqVgybUxOEg6YQ==}
+
   '@types/node-fetch@2.6.12':
     resolution: {integrity: sha512-8nneRWKCg3rMtF69nLQJnOYUcbafYeFSjqkw3jCRLsqkWFlHaoQrr5mXmofFGOx3DKn7UfmBMyov8ySvLRVldA==}
 
@@ -3875,6 +4171,12 @@ packages:
   '@types/node@22.15.29':
     resolution: {integrity: sha512-LNdjOkUDlU1RZb8e1kOIUpN1qQUlzGkEtbVNo53vbrwDg5om6oduhm4SiUaPW5ASTXhAiP0jInWG8Qx9fVlOeQ==}
 
+  '@types/pg-pool@2.0.6':
+    resolution: {integrity: sha512-TaAUE5rq2VQYxab5Ts7WZhKNmuN78Q6PiFonTDdpbx8a1H0M1vhy3rhiMjl+e2iHmogyMw7jZF4FrE6eJUy5HQ==}
+
+  '@types/pg@8.6.1':
+    resolution: {integrity: sha512-1Kc4oAGzAl7uqUStZCDvaLFqZrW9qWSjXOmBfdgyBP5La7Us6Mg4GBvRlSoaZMhQF/zSj1C8CtKMBkoiT8eL8w==}
+
   '@types/pluralize@0.0.33':
     resolution: {integrity: sha512-JOqsl+ZoCpP4e8TDke9W79FDcSgPAR0l6pixx2JHkhnRjvShyYiAYw2LVsnA7K08Y6DeOnaU6ujmENO4os/cYg==}
 
@@ -3895,6 +4197,12 @@ packages:
   '@types/sanitize-html@2.13.0':
     resolution: {integrity: sha512-X31WxbvW9TjIhZZNyNBZ/p5ax4ti7qsNDBDEnH4zAgmEh35YnFD1UiS6z9Cd34kKm0LslFW0KPmTQzu/oGtsqQ==}
 
+  '@types/shimmer@1.2.0':
+    resolution: {integrity: sha512-UE7oxhQLLd9gub6JKIAhDq06T0F6FnztwMNRvYgjeQSBeMc1ZG/tA47EwfduvkuQS8apbkM/lpLpWsaCeYsXVg==}
+
+  '@types/tedious@4.0.14':
+    resolution: {integrity: sha512-KHPsfX/FoVbUGbyYvk1q9MMQHLPeRZhRJZdO45Q4YjvFkv4hMNghCWTvy7rdKessBsmtz4euWCWAB6/tVpI1Iw==}
+
   '@types/trusted-types@2.0.7':
     resolution: {integrity: sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==}
 
@@ -4031,6 +4339,11 @@ packages:
     resolution: {integrity: sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==}
     engines: {node: '>= 0.6'}
 
+  acorn-import-attributes@1.9.5:
+    resolution: {integrity: sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==}
+    peerDependencies:
+      acorn: ^8
+
   acorn-jsx@5.3.2:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -4386,6 +4699,9 @@ packages:
   chownr@1.1.4:
     resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==}
 
+  cjs-module-lexer@1.4.3:
+    resolution: {integrity: sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==}
+
   class-variance-authority@0.7.1:
     resolution: {integrity: sha512-Ka+9Trutv7G8M6WT6SeiRWz792K5qEqIGEGzXKhAE6xOWAY6pPH8U+9IY3oCMv6kqTmLsv7Xh/2w2RigkePMsg==}
 
@@ -5367,6 +5683,9 @@ packages:
     resolution: {integrity: sha512-8e1++BCiTzUno9v5IZ2J6bv4RU+3UKDmqWUQD0MIMVCd9AdhWkO1gw57oo1mNEX1dMq2EGI+FbWz4B92pscSQg==}
     engines: {node: '>= 18'}
 
+  forwarded-parse@2.1.2:
+    resolution: {integrity: sha512-alTFZZQDKMporBH77856pXgzhEzaUVmLCDk+egLgIgHst3Tpndzz8MnKe+GzRJRfvVdn69HhpW7cmXzvtLvJAw==}
+
   forwarded@0.2.0:
     resolution: {integrity: sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==}
     engines: {node: '>= 0.6'}
@@ -5395,6 +5714,9 @@ packages:
   fs-constants@1.0.0:
     resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
 
+  fs.realpath@1.0.0:
+    resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
+
   fsevents@2.3.3:
     resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
     engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
@@ -5477,11 +5799,20 @@ packages:
     resolution: {integrity: sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==}
     hasBin: true
 
+  glob@11.0.1:
+    resolution: {integrity: sha512-zrQDm8XPnYEKawJScsnM0QzobJxlT/kHOOlRTio8IH/GrmxRE5fjllkzdaHclIuNjUQTJYH2xHNIGfdpJkDJUw==}
+    engines: {node: 20 || >=22}
+    hasBin: true
+
   glob@11.0.3:
     resolution: {integrity: sha512-2Nim7dha1KVkaiF4q6Dj+ngPPMdfvLJEOpZk/jKiUAkqKebpGAWQXAq9z1xu9HKu5lWfqw/FASuccEjyznjPaA==}
     engines: {node: 20 || >=22}
     hasBin: true
 
+  glob@9.3.5:
+    resolution: {integrity: sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==}
+    engines: {node: '>=16 || 14 >=14.17'}
+
   globals@11.12.0:
     resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==}
     engines: {node: '>=4'}
@@ -5674,6 +6005,9 @@ packages:
     resolution: {integrity: sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==}
     engines: {node: '>=6'}
 
+  import-in-the-middle@1.14.2:
+    resolution: {integrity: sha512-5tCuY9BV8ujfOpwtAGgsTx9CGUapcFMEEyByLv1B+v2+6DhAcw+Zr0nhQT7uwaZ7DiourxFEscghOR8e1aPLQw==}
+
   imurmurhash@0.1.4:
     resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
     engines: {node: '>=0.8.19'}
@@ -6160,6 +6494,10 @@ packages:
   magic-string@0.30.17:
     resolution: {integrity: sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==}
 
+  magic-string@0.30.8:
+    resolution: {integrity: sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==}
+    engines: {node: '>=12'}
+
   markdown-it-task-lists@2.1.1:
     resolution: {integrity: sha512-TxFAc76Jnhb2OUu+n3yz9RMu4CwGfaT788br6HhEDlvWfdeJcLUsxk1Hgw2yJio0OXsxv7pyIPmvECY7bMbluA==}
 
@@ -6337,6 +6675,10 @@ packages:
   minimatch@3.1.2:
     resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
 
+  minimatch@8.0.4:
+    resolution: {integrity: sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==}
+    engines: {node: '>=16 || 14 >=14.17'}
+
   minimatch@9.0.1:
     resolution: {integrity: sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==}
     engines: {node: '>=16 || 14 >=14.17'}
@@ -6348,6 +6690,10 @@ packages:
   minimist@1.2.8:
     resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
 
+  minipass@4.2.8:
+    resolution: {integrity: sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==}
+    engines: {node: '>=8'}
+
   minipass@7.1.2:
     resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==}
     engines: {node: '>=16 || 14 >=14.17'}
@@ -6376,6 +6722,9 @@ packages:
   ml-xsadd@3.0.1:
     resolution: {integrity: sha512-Fz2q6dwgzGM8wYKGArTUTZDGa4lQFA2Vi6orjGeTVRy22ZnQFKlJuwS9n8NRviqz1KHAHAzdKJwbnYhdo38uYg==}
 
+  module-details-from-path@1.0.4:
+    resolution: {integrity: sha512-EGWKgxALGMgzvxYF1UyGTy0HXX/2vHLkw6+NvDKW2jypWbHpjQuj4UMcqQWXHERJhVGKikolT06G3bcKe4fi7w==}
+
   motion-dom@12.19.0:
     resolution: {integrity: sha512-m96uqq8VbwxFLU0mtmlsIVe8NGGSdpBvBSHbnnOJQxniPaabvVdGgxSamhuDwBsRhwX7xPxdICgVJlOpzn/5bw==}
 
@@ -6716,6 +7065,17 @@ packages:
     resolution: {integrity: sha512-peBp3qZyuS6cNIJ2akRNG1uo1WJ1d0wTxg/fxMdZ0BqCVhx242bSFHM9eNqflfJVS9SsgkzgT/1UgnsurBOTMg==}
     engines: {node: '>=14.16'}
 
+  pg-int8@1.0.1:
+    resolution: {integrity: sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==}
+    engines: {node: '>=4.0.0'}
+
+  pg-protocol@1.10.3:
+    resolution: {integrity: sha512-6DIBgBQaTKDJyxnXaLiLR8wBpQQcGWuAESkRBX/t6OwA8YsqP+iVSiond2EDy6Y/dsGk8rh/jtax3js5NeV7JQ==}
+
+  pg-types@2.2.0:
+    resolution: {integrity: sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==}
+    engines: {node: '>=4'}
+
   picocolors@1.1.1:
     resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
 
@@ -6802,6 +7162,22 @@ packages:
     resolution: {integrity: sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==}
     engines: {node: ^10 || ^12 || >=14}
 
+  postgres-array@2.0.0:
+    resolution: {integrity: sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==}
+    engines: {node: '>=4'}
+
+  postgres-bytea@1.0.0:
+    resolution: {integrity: sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==}
+    engines: {node: '>=0.10.0'}
+
+  postgres-date@1.0.7:
+    resolution: {integrity: sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==}
+    engines: {node: '>=0.10.0'}
+
+  postgres-interval@1.2.0:
+    resolution: {integrity: sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==}
+    engines: {node: '>=0.10.0'}
+
   postgres@3.4.5:
     resolution: {integrity: sha512-cDWgoah1Gez9rN3H4165peY9qfpEo+SA61oQv65O3cRUE1pOEoJWwddwcqKE8XZYjbblOJlYDlLV4h67HrEVDg==}
     engines: {node: '>=12'}
@@ -6923,6 +7299,10 @@ packages:
     resolution: {integrity: sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==}
     engines: {node: '>= 0.6.0'}
 
+  progress@2.0.3:
+    resolution: {integrity: sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==}
+    engines: {node: '>=0.4.0'}
+
   promise-inflight@1.0.1:
     resolution: {integrity: sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==}
     peerDependencies:
@@ -7317,6 +7697,10 @@ packages:
     resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
     engines: {node: '>=0.10.0'}
 
+  require-in-the-middle@7.5.2:
+    resolution: {integrity: sha512-gAZ+kLqBdHarXB64XpAe2VCjB7rIRv+mU8tfRWziHRJ5umKsIHN2tLLv6EtMw7WCdP19S0ERVMldNvxYCHnhSQ==}
+    engines: {node: '>=8.6.0'}
+
   resend@4.1.2:
     resolution: {integrity: sha512-km0btrAj/BqIaRlS+SoLNMaCAUUWEgcEvZpycfVvoXEwAHCxU+vp/ikxPgKRkyKyiR2iDcdUq5uIBTDK9oSSSQ==}
     engines: {node: '>=18'}
@@ -7501,6 +7885,9 @@ packages:
     resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
     engines: {node: '>=8'}
 
+  shimmer@1.2.1:
+    resolution: {integrity: sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==}
+
   side-channel-list@1.0.0:
     resolution: {integrity: sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==}
     engines: {node: '>= 0.4'}
@@ -8058,6 +8445,9 @@ packages:
     resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==}
     engines: {node: '>= 0.8'}
 
+  unplugin@1.0.1:
+    resolution: {integrity: sha512-aqrHaVBWW1JVKBHmGo33T5TxeL0qWzfvjWokObHA9bYmN7eNDkwOxmLjhioHl9878qDFMAaT51XNroRyuz7WxA==}
+
   unplugin@2.3.5:
     resolution: {integrity: sha512-RyWSb5AHmGtjjNQ6gIlA67sHOsWpsbWpwDokLwTcejVdOjEkJZh7QKu14J00gDDVSh8kGH4KYC/TNBceXFZhtw==}
     engines: {node: '>=18.12.0'}
@@ -8285,6 +8675,13 @@ packages:
   webidl-conversions@3.0.1:
     resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
 
+  webpack-sources@3.3.3:
+    resolution: {integrity: sha512-yd1RBzSGanHkitROoPFd6qsrxt+oFhg/129YzheDGqeustzX0vTZJZsSsQjVQC4yzBQ56K55XU8gaNCtIzOnTg==}
+    engines: {node: '>=10.13.0'}
+
+  webpack-virtual-modules@0.5.0:
+    resolution: {integrity: sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==}
+
   webpack-virtual-modules@0.6.2:
     resolution: {integrity: sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ==}
 
@@ -8379,6 +8776,10 @@ packages:
     resolution: {integrity: sha512-Eux0i2QdDYKbdbA6AM6xE4m6ZTZr4G4xF9kahI2ukSEMCzwce2eX9WlTI5J3s+NU7hpasFsr8hWIONae7LluAQ==}
     engines: {node: '>=6.0'}
 
+  xtend@4.0.2:
+    resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}
+    engines: {node: '>=0.4'}
+
   yallist@3.1.1:
     resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==}
 
@@ -9504,8 +9905,248 @@ snapshots:
 
   '@one-ini/wasm@0.1.1': {}
 
+  '@opentelemetry/api-logs@0.57.2':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+
   '@opentelemetry/api@1.9.0': {}
 
+  '@opentelemetry/context-async-hooks@1.30.1(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+
+  '@opentelemetry/core@1.30.1(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/semantic-conventions': 1.28.0
+
+  '@opentelemetry/instrumentation-amqplib@0.46.1(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-connect@0.43.1(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
+      '@types/connect': 3.4.38
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-dataloader@0.16.1(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-express@0.47.1(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-fs@0.19.1(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-generic-pool@0.43.1(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-graphql@0.47.1(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-hapi@0.45.2(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-http@0.57.2(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
+      forwarded-parse: 2.1.2
+      semver: 7.7.2
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-ioredis@0.47.1(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/redis-common': 0.36.2
+      '@opentelemetry/semantic-conventions': 1.36.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-kafkajs@0.7.1(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-knex@0.44.1(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-koa@0.47.1(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-lru-memoizer@0.44.1(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-mongodb@0.52.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-mongoose@0.46.1(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-mysql2@0.45.2(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
+      '@opentelemetry/sql-common': 0.40.1(@opentelemetry/api@1.9.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-mysql@0.45.1(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
+      '@types/mysql': 2.15.26
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-pg@0.51.1(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
+      '@opentelemetry/sql-common': 0.40.1(@opentelemetry/api@1.9.0)
+      '@types/pg': 8.6.1
+      '@types/pg-pool': 2.0.6
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-redis-4@0.46.1(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/redis-common': 0.36.2
+      '@opentelemetry/semantic-conventions': 1.36.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-tedious@0.18.1(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
+      '@types/tedious': 4.0.14
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-undici@0.10.1(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation@0.57.2(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/api-logs': 0.57.2
+      '@types/shimmer': 1.2.0
+      import-in-the-middle: 1.14.2
+      require-in-the-middle: 7.5.2
+      semver: 7.7.2
+      shimmer: 1.2.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/redis-common@0.36.2': {}
+
+  '@opentelemetry/resources@1.30.1(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
+
+  '@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
+
+  '@opentelemetry/semantic-conventions@1.28.0': {}
+
+  '@opentelemetry/semantic-conventions@1.36.0': {}
+
+  '@opentelemetry/sql-common@0.40.1(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.30.1(@opentelemetry/api@1.9.0)
+
   '@oxlint/darwin-arm64@1.6.0':
     optional: true
 
@@ -9568,6 +10209,13 @@ snapshots:
 
   '@popperjs/core@2.11.8': {}
 
+  '@prisma/instrumentation@6.11.1(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+    transitivePeerDependencies:
+      - supports-color
+
   '@radix-ui/number@1.1.1': {}
 
   '@radix-ui/primitive@1.0.0':
@@ -11106,41 +11754,191 @@ snapshots:
       domhandler: 5.0.3
       selderee: 0.11.0
 
-  '@sentry-internal/browser-utils@9.19.0':
+  '@sentry-internal/browser-utils@9.40.0':
+    dependencies:
+      '@sentry/core': 9.40.0
+
+  '@sentry-internal/feedback@9.40.0':
     dependencies:
-      '@sentry/core': 9.19.0
+      '@sentry/core': 9.40.0
 
-  '@sentry-internal/feedback@9.19.0':
+  '@sentry-internal/replay-canvas@9.40.0':
     dependencies:
-      '@sentry/core': 9.19.0
+      '@sentry-internal/replay': 9.40.0
+      '@sentry/core': 9.40.0
 
-  '@sentry-internal/replay-canvas@9.19.0':
+  '@sentry-internal/replay@9.40.0':
     dependencies:
-      '@sentry-internal/replay': 9.19.0
-      '@sentry/core': 9.19.0
+      '@sentry-internal/browser-utils': 9.40.0
+      '@sentry/core': 9.40.0
+
+  '@sentry/babel-plugin-component-annotate@3.6.1': {}
 
-  '@sentry-internal/replay@9.19.0':
+  '@sentry/browser@9.40.0':
     dependencies:
-      '@sentry-internal/browser-utils': 9.19.0
-      '@sentry/core': 9.19.0
+      '@sentry-internal/browser-utils': 9.40.0
+      '@sentry-internal/feedback': 9.40.0
+      '@sentry-internal/replay': 9.40.0
+      '@sentry-internal/replay-canvas': 9.40.0
+      '@sentry/core': 9.40.0
 
-  '@sentry/browser@9.19.0':
+  '@sentry/bundler-plugin-core@3.6.1':
     dependencies:
-      '@sentry-internal/browser-utils': 9.19.0
-      '@sentry-internal/feedback': 9.19.0
-      '@sentry-internal/replay': 9.19.0
-      '@sentry-internal/replay-canvas': 9.19.0
-      '@sentry/core': 9.19.0
+      '@babel/core': 7.27.7
+      '@sentry/babel-plugin-component-annotate': 3.6.1
+      '@sentry/cli': 2.50.0
+      dotenv: 16.6.1
+      find-up: 5.0.0
+      glob: 9.3.5
+      magic-string: 0.30.8
+      unplugin: 1.0.1
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
 
-  '@sentry/core@9.19.0': {}
+  '@sentry/cli-darwin@2.50.0':
+    optional: true
 
-  '@sentry/react@9.19.0(react@19.1.0)':
+  '@sentry/cli-linux-arm64@2.50.0':
+    optional: true
+
+  '@sentry/cli-linux-arm@2.50.0':
+    optional: true
+
+  '@sentry/cli-linux-i686@2.50.0':
+    optional: true
+
+  '@sentry/cli-linux-x64@2.50.0':
+    optional: true
+
+  '@sentry/cli-win32-arm64@2.50.0':
+    optional: true
+
+  '@sentry/cli-win32-i686@2.50.0':
+    optional: true
+
+  '@sentry/cli-win32-x64@2.50.0':
+    optional: true
+
+  '@sentry/cli@2.50.0':
     dependencies:
-      '@sentry/browser': 9.19.0
-      '@sentry/core': 9.19.0
+      https-proxy-agent: 5.0.1
+      node-fetch: 2.7.0
+      progress: 2.0.3
+      proxy-from-env: 1.1.0
+      which: 2.0.2
+    optionalDependencies:
+      '@sentry/cli-darwin': 2.50.0
+      '@sentry/cli-linux-arm': 2.50.0
+      '@sentry/cli-linux-arm64': 2.50.0
+      '@sentry/cli-linux-i686': 2.50.0
+      '@sentry/cli-linux-x64': 2.50.0
+      '@sentry/cli-win32-arm64': 2.50.0
+      '@sentry/cli-win32-i686': 2.50.0
+      '@sentry/cli-win32-x64': 2.50.0
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+
+  '@sentry/core@9.40.0': {}
+
+  '@sentry/node-core@9.40.0(@opentelemetry/api@1.9.0)(@opentelemetry/context-async-hooks@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/core@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.57.2(@opentelemetry/api@1.9.0))(@opentelemetry/resources@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.36.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/context-async-hooks': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/core': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
+      '@sentry/core': 9.40.0
+      '@sentry/opentelemetry': 9.40.0(@opentelemetry/api@1.9.0)(@opentelemetry/context-async-hooks@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/core@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.36.0)
+      import-in-the-middle: 1.14.2
+
+  '@sentry/node@9.40.0':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/context-async-hooks': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/core': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-amqplib': 0.46.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-connect': 0.43.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-dataloader': 0.16.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-express': 0.47.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-fs': 0.19.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-generic-pool': 0.43.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-graphql': 0.47.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-hapi': 0.45.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-http': 0.57.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-ioredis': 0.47.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-kafkajs': 0.7.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-knex': 0.44.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-koa': 0.47.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-lru-memoizer': 0.44.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-mongodb': 0.52.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-mongoose': 0.46.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-mysql': 0.45.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-mysql2': 0.45.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-pg': 0.51.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-redis-4': 0.46.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-tedious': 0.18.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-undici': 0.10.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
+      '@prisma/instrumentation': 6.11.1(@opentelemetry/api@1.9.0)
+      '@sentry/core': 9.40.0
+      '@sentry/node-core': 9.40.0(@opentelemetry/api@1.9.0)(@opentelemetry/context-async-hooks@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/core@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.57.2(@opentelemetry/api@1.9.0))(@opentelemetry/resources@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.36.0)
+      '@sentry/opentelemetry': 9.40.0(@opentelemetry/api@1.9.0)(@opentelemetry/context-async-hooks@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/core@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.36.0)
+      import-in-the-middle: 1.14.2
+      minimatch: 9.0.5
+    transitivePeerDependencies:
+      - supports-color
+
+  '@sentry/opentelemetry@9.40.0(@opentelemetry/api@1.9.0)(@opentelemetry/context-async-hooks@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/core@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.36.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/context-async-hooks': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/core': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
+      '@sentry/core': 9.40.0
+
+  '@sentry/react-router@9.40.0(@react-router/node@7.6.3(react-router@7.6.3(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(typescript@5.8.3))(react-router@7.6.3(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(react@19.1.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
+      '@react-router/node': 7.6.3(react-router@7.6.3(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(typescript@5.8.3)
+      '@sentry/browser': 9.40.0
+      '@sentry/cli': 2.50.0
+      '@sentry/core': 9.40.0
+      '@sentry/node': 9.40.0
+      '@sentry/react': 9.40.0(react@19.1.0)
+      '@sentry/vite-plugin': 3.6.1
+      glob: 11.0.1
+      react: 19.1.0
+      react-router: 7.6.3(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+
+  '@sentry/react@9.40.0(react@19.1.0)':
+    dependencies:
+      '@sentry/browser': 9.40.0
+      '@sentry/core': 9.40.0
       hoist-non-react-statics: 3.3.2
       react: 19.1.0
 
+  '@sentry/vite-plugin@3.6.1':
+    dependencies:
+      '@sentry/bundler-plugin-core': 3.6.1
+      unplugin: 1.0.1
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+
   '@shuding/opentype.js@1.4.0-beta.0':
     dependencies:
       fflate: 0.7.4
@@ -11471,6 +12269,10 @@ snapshots:
     dependencies:
       '@types/deep-eql': 4.0.2
 
+  '@types/connect@3.4.38':
+    dependencies:
+      '@types/node': 22.15.29
+
   '@types/d3-array@3.2.1': {}
 
   '@types/d3-color@3.1.3': {}
@@ -11551,6 +12353,10 @@ snapshots:
 
   '@types/ms@2.1.0': {}
 
+  '@types/mysql@2.15.26':
+    dependencies:
+      '@types/node': 22.15.29
+
   '@types/node-fetch@2.6.12':
     dependencies:
       '@types/node': 22.15.29
@@ -11568,6 +12374,16 @@ snapshots:
     dependencies:
       undici-types: 6.21.0
 
+  '@types/pg-pool@2.0.6':
+    dependencies:
+      '@types/pg': 8.6.1
+
+  '@types/pg@8.6.1':
+    dependencies:
+      '@types/node': 22.15.29
+      pg-protocol: 1.10.3
+      pg-types: 2.2.0
+
   '@types/pluralize@0.0.33': {}
 
   '@types/react-dom@19.0.4(@types/react@19.0.10)':
@@ -11588,6 +12404,12 @@ snapshots:
     dependencies:
       htmlparser2: 8.0.2
 
+  '@types/shimmer@1.2.0': {}
+
+  '@types/tedious@4.0.14':
+    dependencies:
+      '@types/node': 22.15.29
+
   '@types/trusted-types@2.0.7':
     optional: true
 
@@ -11765,6 +12587,10 @@ snapshots:
       mime-types: 3.0.1
       negotiator: 1.0.0
 
+  acorn-import-attributes@1.9.5(acorn@8.15.0):
+    dependencies:
+      acorn: 8.15.0
+
   acorn-jsx@5.3.2(acorn@8.15.0):
     dependencies:
       acorn: 8.15.0
@@ -12218,6 +13044,8 @@ snapshots:
 
   chownr@1.1.4: {}
 
+  cjs-module-lexer@1.4.3: {}
+
   class-variance-authority@0.7.1:
     dependencies:
       clsx: 2.1.1
@@ -12613,10 +13441,11 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  drizzle-orm@0.43.1(@cloudflare/workers-types@4.20250628.0)(@opentelemetry/api@1.9.0)(better-sqlite3@11.10.0)(kysely@0.28.2)(postgres@3.4.5):
+  drizzle-orm@0.43.1(@cloudflare/workers-types@4.20250628.0)(@opentelemetry/api@1.9.0)(@types/pg@8.6.1)(better-sqlite3@11.10.0)(kysely@0.28.2)(postgres@3.4.5):
     optionalDependencies:
       '@cloudflare/workers-types': 4.20250628.0
       '@opentelemetry/api': 1.9.0
+      '@types/pg': 8.6.1
       better-sqlite3: 11.10.0
       kysely: 0.28.2
       postgres: 3.4.5
@@ -13331,6 +14160,8 @@ snapshots:
 
   formdata-node@6.0.3: {}
 
+  forwarded-parse@2.1.2: {}
+
   forwarded@0.2.0: {}
 
   framer-motion@12.19.2(react-dom@19.1.0(react@19.1.0))(react@19.1.0):
@@ -13348,6 +14179,8 @@ snapshots:
 
   fs-constants@1.0.0: {}
 
+  fs.realpath@1.0.0: {}
+
   fsevents@2.3.3:
     optional: true
 
@@ -13456,6 +14289,15 @@ snapshots:
       package-json-from-dist: 1.0.1
       path-scurry: 1.11.1
 
+  glob@11.0.1:
+    dependencies:
+      foreground-child: 3.3.1
+      jackspeak: 4.1.1
+      minimatch: 10.0.3
+      minipass: 7.1.2
+      package-json-from-dist: 1.0.1
+      path-scurry: 2.0.0
+
   glob@11.0.3:
     dependencies:
       foreground-child: 3.3.1
@@ -13465,6 +14307,13 @@ snapshots:
       package-json-from-dist: 1.0.1
       path-scurry: 2.0.0
 
+  glob@9.3.5:
+    dependencies:
+      fs.realpath: 1.0.0
+      minimatch: 8.0.4
+      minipass: 4.2.8
+      path-scurry: 1.11.1
+
   globals@11.12.0: {}
 
   globals@14.0.0: {}
@@ -13676,6 +14525,13 @@ snapshots:
       parent-module: 1.0.1
       resolve-from: 4.0.0
 
+  import-in-the-middle@1.14.2:
+    dependencies:
+      acorn: 8.15.0
+      acorn-import-attributes: 1.9.5(acorn@8.15.0)
+      cjs-module-lexer: 1.4.3
+      module-details-from-path: 1.0.4
+
   imurmurhash@0.1.4: {}
 
   inherits@2.0.4: {}
@@ -14126,6 +14982,10 @@ snapshots:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.5.0
 
+  magic-string@0.30.8:
+    dependencies:
+      '@jridgewell/sourcemap-codec': 1.5.0
+
   markdown-it-task-lists@2.1.1: {}
 
   markdown-it@14.1.0:
@@ -14436,6 +15296,10 @@ snapshots:
     dependencies:
       brace-expansion: 1.1.12
 
+  minimatch@8.0.4:
+    dependencies:
+      brace-expansion: 2.0.2
+
   minimatch@9.0.1:
     dependencies:
       brace-expansion: 2.0.2
@@ -14446,6 +15310,8 @@ snapshots:
 
   minimist@1.2.8: {}
 
+  minipass@4.2.8: {}
+
   minipass@7.1.2: {}
 
   mitt@3.0.1: {}
@@ -14482,6 +15348,8 @@ snapshots:
 
   ml-xsadd@3.0.1: {}
 
+  module-details-from-path@1.0.4: {}
+
   motion-dom@12.19.0:
     dependencies:
       motion-utils: 12.19.0
@@ -14852,6 +15720,18 @@ snapshots:
 
   peek-readable@5.4.2: {}
 
+  pg-int8@1.0.1: {}
+
+  pg-protocol@1.10.3: {}
+
+  pg-types@2.2.0:
+    dependencies:
+      pg-int8: 1.0.1
+      postgres-array: 2.0.0
+      postgres-bytea: 1.0.0
+      postgres-date: 1.0.7
+      postgres-interval: 1.2.0
+
   picocolors@1.1.1: {}
 
   picomatch@2.3.1: {}
@@ -14930,6 +15810,16 @@ snapshots:
       picocolors: 1.1.1
       source-map-js: 1.2.1
 
+  postgres-array@2.0.0: {}
+
+  postgres-bytea@1.0.0: {}
+
+  postgres-date@1.0.7: {}
+
+  postgres-interval@1.2.0:
+    dependencies:
+      xtend: 4.0.2
+
   postgres@3.4.5: {}
 
   posthog-js@1.256.0:
@@ -14987,6 +15877,8 @@ snapshots:
 
   process@0.11.10: {}
 
+  progress@2.0.3: {}
+
   promise-inflight@1.0.1: {}
 
   promise-retry@2.0.1:
@@ -15554,6 +16446,14 @@ snapshots:
 
   require-from-string@2.0.2: {}
 
+  require-in-the-middle@7.5.2:
+    dependencies:
+      debug: 4.4.1
+      module-details-from-path: 1.0.4
+      resolve: 1.22.10
+    transitivePeerDependencies:
+      - supports-color
+
   resend@4.1.2(react-dom@19.1.0(react@19.1.0))(react@19.1.0):
     dependencies:
       '@react-email/render': 1.0.1(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
@@ -15819,6 +16719,8 @@ snapshots:
 
   shebang-regex@3.0.0: {}
 
+  shimmer@1.2.1: {}
+
   side-channel-list@1.0.0:
     dependencies:
       es-errors: 1.3.0
@@ -16461,6 +17363,13 @@ snapshots:
 
   unpipe@1.0.0: {}
 
+  unplugin@1.0.1:
+    dependencies:
+      acorn: 8.15.0
+      chokidar: 3.6.0
+      webpack-sources: 3.3.3
+      webpack-virtual-modules: 0.5.0
+
   unplugin@2.3.5:
     dependencies:
       acorn: 8.15.0
@@ -16712,6 +17621,10 @@ snapshots:
 
   webidl-conversions@3.0.1: {}
 
+  webpack-sources@3.3.3: {}
+
+  webpack-virtual-modules@0.5.0: {}
+
   webpack-virtual-modules@0.6.2: {}
 
   whatwg-encoding@3.1.1:
@@ -16831,6 +17744,8 @@ snapshots:
 
   xmlbuilder@13.0.2: {}
 
+  xtend@4.0.2: {}
+
   yallist@3.1.1: {}
 
   yaml@2.8.0: {}

From 0602b87bf7eba76b5058bba54868ca68a9688e61 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 21 Jul 2025 12:24:57 -0700
Subject: [PATCH 20/20] feat: update translations via @LingoDotDev (#1776)

Hey team,

[**Lingo.dev**](https://lingo.dev) here with fresh translations!

### In this update

- Added missing translations
- Performed brand voice, context and glossary checks
- Enhanced translations using Lingo.dev Localization Engine

### Next Steps

- [ ] Review the changes
- [ ] Merge when ready

<!-- This is an auto-generated description by cubic. -->
---

## Summary by cubic
Added missing translations for the "snoozed" sidebar label across all supported languages in the mail app.

- **Translations**
  - Updated 20 language files to include the "snoozed" label.
  - Synced i18n lock file for consistency.

<!-- End of auto-generated description by cubic. -->
---
 apps/mail/messages/ar.json    | 3 ++-
 apps/mail/messages/ca.json    | 3 ++-
 apps/mail/messages/cs.json    | 3 ++-
 apps/mail/messages/de.json    | 3 ++-
 apps/mail/messages/es.json    | 3 ++-
 apps/mail/messages/fa.json    | 3 ++-
 apps/mail/messages/fr.json    | 3 ++-
 apps/mail/messages/hi.json    | 3 ++-
 apps/mail/messages/hu.json    | 3 ++-
 apps/mail/messages/ja.json    | 3 ++-
 apps/mail/messages/ko.json    | 3 ++-
 apps/mail/messages/lv.json    | 3 ++-
 apps/mail/messages/nl.json    | 3 ++-
 apps/mail/messages/pl.json    | 3 ++-
 apps/mail/messages/pt.json    | 3 ++-
 apps/mail/messages/ru.json    | 3 ++-
 apps/mail/messages/tr.json    | 3 ++-
 apps/mail/messages/vi.json    | 3 ++-
 apps/mail/messages/zh_CN.json | 3 ++-
 apps/mail/messages/zh_TW.json | 3 ++-
 i18n.lock                     | 1 +
 21 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/apps/mail/messages/ar.json b/apps/mail/messages/ar.json
index 42d157aff3..51be6b2020 100644
--- a/apps/mail/messages/ar.json
+++ b/apps/mail/messages/ar.json
@@ -405,7 +405,8 @@
       "livesupport": "الدعم المباشر",
       "feedback": "الملاحظات",
       "settings": "الإعدادات",
-      "voice": "المساعد الصوتي"
+      "voice": "المساعد الصوتي",
+      "snoozed": "مؤجل"
     },
     "settings": {
       "general": "عام",
diff --git a/apps/mail/messages/ca.json b/apps/mail/messages/ca.json
index ef9715fe61..93a690903c 100644
--- a/apps/mail/messages/ca.json
+++ b/apps/mail/messages/ca.json
@@ -405,7 +405,8 @@
       "livesupport": "Suport en directe",
       "feedback": "Feedback",
       "settings": "Configuració",
-      "voice": "Assistent de veu"
+      "voice": "Assistent de veu",
+      "snoozed": "Posposat"
     },
     "settings": {
       "general": "General",
diff --git a/apps/mail/messages/cs.json b/apps/mail/messages/cs.json
index b6bc7679cc..6bf0a9b05f 100644
--- a/apps/mail/messages/cs.json
+++ b/apps/mail/messages/cs.json
@@ -405,7 +405,8 @@
       "livesupport": "Živá podpora",
       "feedback": "Zpětná vazba",
       "settings": "Nastavení",
-      "voice": "Hlasový asistent"
+      "voice": "Hlasový asistent",
+      "snoozed": "Odložené"
     },
     "settings": {
       "general": "Obecné",
diff --git a/apps/mail/messages/de.json b/apps/mail/messages/de.json
index 9a5925911c..5ad52ffc2a 100644
--- a/apps/mail/messages/de.json
+++ b/apps/mail/messages/de.json
@@ -405,7 +405,8 @@
       "livesupport": "Live-Support",
       "feedback": "Rückmeldung",
       "settings": "Einstellungen",
-      "voice": "Sprachassistent"
+      "voice": "Sprachassistent",
+      "snoozed": "Zurückgestellt"
     },
     "settings": {
       "general": "Allgemein",
diff --git a/apps/mail/messages/es.json b/apps/mail/messages/es.json
index d2b3ec5b71..f9bd196fe4 100644
--- a/apps/mail/messages/es.json
+++ b/apps/mail/messages/es.json
@@ -405,7 +405,8 @@
       "livesupport": "Soporte en vivo",
       "feedback": "Sugerencias",
       "settings": "Configuración",
-      "voice": "Asistente de voz"
+      "voice": "Asistente de voz",
+      "snoozed": "Pospuestos"
     },
     "settings": {
       "general": "General",
diff --git a/apps/mail/messages/fa.json b/apps/mail/messages/fa.json
index 407cddf703..e6a031a238 100644
--- a/apps/mail/messages/fa.json
+++ b/apps/mail/messages/fa.json
@@ -405,7 +405,8 @@
       "livesupport": "پشتیبانی زنده",
       "feedback": "بازخورد",
       "settings": "تنظیمات",
-      "voice": "دستیار صوتی"
+      "voice": "دستیار صوتی",
+      "snoozed": "به تعویق افتاده"
     },
     "settings": {
       "general": "عمومی",
diff --git a/apps/mail/messages/fr.json b/apps/mail/messages/fr.json
index dca5c74f1f..edccf3d83a 100644
--- a/apps/mail/messages/fr.json
+++ b/apps/mail/messages/fr.json
@@ -405,7 +405,8 @@
       "livesupport": "Support en direct",
       "feedback": "Vos commentaires",
       "settings": "Paramètres",
-      "voice": "Assistant vocal"
+      "voice": "Assistant vocal",
+      "snoozed": "En sommeil"
     },
     "settings": {
       "general": "Général",
diff --git a/apps/mail/messages/hi.json b/apps/mail/messages/hi.json
index 1913534b7f..984a827523 100644
--- a/apps/mail/messages/hi.json
+++ b/apps/mail/messages/hi.json
@@ -405,7 +405,8 @@
       "livesupport": "लाइव सपोर्ट",
       "feedback": "प्रतिक्रिया",
       "settings": "सेटिंग्स",
-      "voice": "वॉइस असिस्टेंट"
+      "voice": "वॉइस असिस्टेंट",
+      "snoozed": "स्नूज़ किए गए"
     },
     "settings": {
       "general": "सामान्य",
diff --git a/apps/mail/messages/hu.json b/apps/mail/messages/hu.json
index 7ff2a472a1..96a37b50b8 100644
--- a/apps/mail/messages/hu.json
+++ b/apps/mail/messages/hu.json
@@ -405,7 +405,8 @@
       "livesupport": "Élő támogatás",
       "feedback": "Visszajelzés",
       "settings": "Beállítások",
-      "voice": "Hangasszisztens"
+      "voice": "Hangasszisztens",
+      "snoozed": "Elhalasztva"
     },
     "settings": {
       "general": "Általános",
diff --git a/apps/mail/messages/ja.json b/apps/mail/messages/ja.json
index d8419574ce..cff9865252 100644
--- a/apps/mail/messages/ja.json
+++ b/apps/mail/messages/ja.json
@@ -405,7 +405,8 @@
       "livesupport": "ライブサポート",
       "feedback": "フィードバック",
       "settings": "設定",
-      "voice": "音声アシスタント"
+      "voice": "音声アシスタント",
+      "snoozed": "スヌーズ済み"
     },
     "settings": {
       "general": "一般",
diff --git a/apps/mail/messages/ko.json b/apps/mail/messages/ko.json
index 6aad816c71..9c2d8660ed 100644
--- a/apps/mail/messages/ko.json
+++ b/apps/mail/messages/ko.json
@@ -405,7 +405,8 @@
       "livesupport": "실시간 지원",
       "feedback": "피드백",
       "settings": "설정",
-      "voice": "음성 비서"
+      "voice": "음성 비서",
+      "snoozed": "스누즈됨"
     },
     "settings": {
       "general": "일반",
diff --git a/apps/mail/messages/lv.json b/apps/mail/messages/lv.json
index 86e938b2d4..d59ea2fe62 100644
--- a/apps/mail/messages/lv.json
+++ b/apps/mail/messages/lv.json
@@ -405,7 +405,8 @@
       "livesupport": "Tiešsaistes atbalsts",
       "feedback": "Atsauksmes",
       "settings": "Iestatījumi",
-      "voice": "Balss asistents"
+      "voice": "Balss asistents",
+      "snoozed": "Atlikti"
     },
     "settings": {
       "general": "Vispārīgi",
diff --git a/apps/mail/messages/nl.json b/apps/mail/messages/nl.json
index 795edc0879..b3798a4bdc 100644
--- a/apps/mail/messages/nl.json
+++ b/apps/mail/messages/nl.json
@@ -405,7 +405,8 @@
       "livesupport": "Live ondersteuning",
       "feedback": "Feedback",
       "settings": "Instellingen",
-      "voice": "Spraakassistent"
+      "voice": "Spraakassistent",
+      "snoozed": "Uitgesteld"
     },
     "settings": {
       "general": "Algemeen",
diff --git a/apps/mail/messages/pl.json b/apps/mail/messages/pl.json
index fa847d5c20..5d696ad6a7 100644
--- a/apps/mail/messages/pl.json
+++ b/apps/mail/messages/pl.json
@@ -405,7 +405,8 @@
       "livesupport": "Wsparcie na żywo",
       "feedback": "Opinie",
       "settings": "Ustawienia",
-      "voice": "Asystent głosowy"
+      "voice": "Asystent głosowy",
+      "snoozed": "Odłożone"
     },
     "settings": {
       "general": "Ogólne",
diff --git a/apps/mail/messages/pt.json b/apps/mail/messages/pt.json
index a5aaefd25e..680c2e2461 100644
--- a/apps/mail/messages/pt.json
+++ b/apps/mail/messages/pt.json
@@ -405,7 +405,8 @@
       "livesupport": "Suporte ao vivo",
       "feedback": "Feedback",
       "settings": "Configurações",
-      "voice": "Assistente de voz"
+      "voice": "Assistente de voz",
+      "snoozed": "Adiados"
     },
     "settings": {
       "general": "Geral",
diff --git a/apps/mail/messages/ru.json b/apps/mail/messages/ru.json
index dfafbed5ff..9ca153f84e 100644
--- a/apps/mail/messages/ru.json
+++ b/apps/mail/messages/ru.json
@@ -405,7 +405,8 @@
       "livesupport": "Поддержка в реальном времени",
       "feedback": "Отзывы",
       "settings": "Настройки",
-      "voice": "Голосовой помощник"
+      "voice": "Голосовой помощник",
+      "snoozed": "Отложенные"
     },
     "settings": {
       "general": "Общие",
diff --git a/apps/mail/messages/tr.json b/apps/mail/messages/tr.json
index dc663baea4..2fd107d125 100644
--- a/apps/mail/messages/tr.json
+++ b/apps/mail/messages/tr.json
@@ -405,7 +405,8 @@
       "livesupport": "Canlı Destek",
       "feedback": "Geribildirim",
       "settings": "Ayarlar",
-      "voice": "Sesli Asistan"
+      "voice": "Sesli Asistan",
+      "snoozed": "Ertelendi"
     },
     "settings": {
       "general": "Genel",
diff --git a/apps/mail/messages/vi.json b/apps/mail/messages/vi.json
index 22b8870784..814fece645 100644
--- a/apps/mail/messages/vi.json
+++ b/apps/mail/messages/vi.json
@@ -405,7 +405,8 @@
       "livesupport": "Hỗ trợ trực tuyến",
       "feedback": "Phản hồi",
       "settings": "Cài đặt",
-      "voice": "Trợ lý giọng nói"
+      "voice": "Trợ lý giọng nói",
+      "snoozed": "Tạm hoãn"
     },
     "settings": {
       "general": "Chung",
diff --git a/apps/mail/messages/zh_CN.json b/apps/mail/messages/zh_CN.json
index a41a91115a..9e95378cdb 100644
--- a/apps/mail/messages/zh_CN.json
+++ b/apps/mail/messages/zh_CN.json
@@ -405,7 +405,8 @@
       "livesupport": "在线支持",
       "feedback": "反馈",
       "settings": "设置",
-      "voice": "语音助手"
+      "voice": "语音助手",
+      "snoozed": "已延后"
     },
     "settings": {
       "general": "常规",
diff --git a/apps/mail/messages/zh_TW.json b/apps/mail/messages/zh_TW.json
index 8a7f1e5489..ab47bded00 100644
--- a/apps/mail/messages/zh_TW.json
+++ b/apps/mail/messages/zh_TW.json
@@ -405,7 +405,8 @@
       "livesupport": "即時支援",
       "feedback": "意見反饋",
       "settings": "設定",
-      "voice": "語音助理"
+      "voice": "語音助理",
+      "snoozed": "已延後"
     },
     "settings": {
       "general": "一般",
diff --git a/i18n.lock b/i18n.lock
index 8b777ebbcf..667e049268 100644
--- a/i18n.lock
+++ b/i18n.lock
@@ -857,6 +857,7 @@ checksums:
     navigation/sidebar/feedback: 6fac88806e0c269a30777b283988c61c
     navigation/sidebar/settings: 8df6777277469c1fd88cc18dde2f1cc3
     navigation/sidebar/voice: 81a94ad8770dca9c3cbb5a88329b6a6f
+    navigation/sidebar/snoozed: f5f799302325bcc21586e34ea81dd086
     navigation/settings/general: b891e8f15579fc5d97bcaf3637f5ae59
     navigation/settings/connections: e03a59f742f7b798488a69760bf8a603
     navigation/settings/security: 4b34923fef858a2b9a4a914c3e822889