diff --git a/apps/mail/components/create/ai-chat.tsx b/apps/mail/components/create/ai-chat.tsx
index 40c0860e1c..42c953914a 100644
--- a/apps/mail/components/create/ai-chat.tsx
+++ b/apps/mail/components/create/ai-chat.tsx
@@ -26,12 +26,12 @@ import VoiceChat from './voice';
 const renderThread = (thread: { id: string; title: string; snippet: string }) => {
   const [, setThreadId] = useQueryState('threadId');
   const { data: getThread } = useThread(thread.id);
-  const [, setAiSidebarOpen] = useQueryState('aiSidebar');
+  //   const [, setAiSidebarOpen] = useQueryState('aiSidebar');
   const [, setIsFullScreen] = useQueryState('isFullScreen');
 
   const handleClick = () => {
     setThreadId(thread.id);
-    setAiSidebarOpen(null);
+    // setAiSidebarOpen(null);
     setIsFullScreen(null);
   };
 
@@ -275,6 +275,7 @@ export function AIChat({
       messagesEndRef.current.scrollIntoView({ behavior: 'smooth' });
     }
   }, []);
+  const [aiSidebarOpen] = useQueryState('aiSidebar');
 
   const editor = useComposeEditor({
     placeholder: 'Ask Zero to do anything...',
@@ -298,6 +299,12 @@ export function AIChat({
     scrollToBottom();
   }, [messages, scrollToBottom]);
 
+  useEffect(() => {
+    if (aiSidebarOpen === 'true') {
+      editor.commands.focus();
+    }
+  }, [aiSidebarOpen, editor]);
+
   return (
     <div className={cn('flex h-full flex-col', isFullScreen ? 'mx-auto max-w-xl' : '')}>
       <div className="no-scrollbar flex-1 overflow-y-auto" ref={messagesContainerRef}>
diff --git a/apps/mail/components/mail/mail.tsx b/apps/mail/components/mail/mail.tsx
index fbc6558c1b..b784074448 100644
--- a/apps/mail/components/mail/mail.tsx
+++ b/apps/mail/components/mail/mail.tsx
@@ -433,11 +433,6 @@ export function MailLayout() {
   }, [threadId, enableScope, disableScope]);
   const [, setActiveReplyId] = useQueryState('activeReplyId');
 
-  const handleClose = useCallback(() => {
-    setThreadId(null);
-    setActiveReplyId(null);
-  }, [setThreadId]);
-
   // Add mailto protocol handler registration
   useEffect(() => {
     // Register as a mailto protocol handler if browser supports it
@@ -626,8 +621,6 @@ export function MailLayout() {
 
 function BulkSelectActions() {
   const t = useTranslations();
-  const [errorQty, setErrorQty] = useState(0);
-  const [threadId, setThreadId] = useQueryState('threadId');
   const [isLoading, setIsLoading] = useState(false);
   const [isUnsub, setIsUnsub] = useState(false);
   const [mail, setMail] = useMail();
@@ -635,17 +628,12 @@ function BulkSelectActions() {
   const folder = params?.folder ?? 'inbox';
   const [{ refetch: refetchThreads }] = useThreads();
   const { refetch: refetchStats } = useStats();
-  const trpc = useTRPC();
-  const { mutateAsync: markAsImportant } = useMutation(trpc.mail.markAsImportant.mutationOptions());
-  const { mutateAsync: bulkDeleteThread } = useMutation(trpc.mail.bulkDelete.mutationOptions());
-  const queryClient = useQueryClient();
   const {
     optimisticMarkAsRead,
     optimisticToggleStar,
     optimisticMoveThreadsTo,
     optimisticDeleteThreads,
   } = useOptimisticActions();
-  const [, setBackgroundQueue] = useAtom(backgroundQueueAtom);
 
   const handleMassUnsubscribe = async () => {
     setIsLoading(true);
@@ -659,7 +647,6 @@ function BulkSelectActions() {
             if (firstEmail)
               return handleUnsubscribe({ emailData: firstEmail }).catch((e) => {
                 toast.error(e.message ?? 'Unknown error while unsubscribing');
-                setErrorQty((eq) => eq++);
               });
           }
         }),
@@ -678,18 +665,6 @@ function BulkSelectActions() {
     );
   };
 
-  const onMoveSuccess = useCallback(async () => {
-    if (threadId && mail.bulkSelected.includes(threadId)) setThreadId(null);
-    refetchThreads();
-    refetchStats();
-    await Promise.all(
-      mail.bulkSelected.map((threadId) =>
-        queryClient.invalidateQueries({ queryKey: trpc.mail.get.queryKey({ id: threadId }) }),
-      ),
-    );
-    setMail({ ...mail, bulkSelected: [] });
-  }, [mail, setMail, refetchThreads, refetchStats, threadId, setThreadId]);
-
   return (
     <div className="flex items-center gap-2">
       <button
diff --git a/apps/mail/components/ui/ai-sidebar.tsx b/apps/mail/components/ui/ai-sidebar.tsx
index 38a1557a4a..4232af4d18 100644
--- a/apps/mail/components/ui/ai-sidebar.tsx
+++ b/apps/mail/components/ui/ai-sidebar.tsx
@@ -290,26 +290,17 @@ export function useAISidebar() {
     [setViewModeQuery],
   );
 
-  // Function to set open state and save to localStorage
   const setOpen = useCallback(
     (openState: boolean) => {
-      // For closing, we need to handle state updates more carefully
       if (!openState) {
-        // First remove from localStorage immediately
         if (typeof window !== 'undefined') {
           localStorage.removeItem('ai-sidebar-open');
         }
-
-        // Use setTimeout to ensure the query update happens in the next tick
-        // This helps prevent the need for double-clicking
         setTimeout(() => {
           setOpenQuery(null).catch(console.error);
         }, 0);
       } else {
-        // For opening, we can use the normal flow
         setOpenQuery('true').catch(console.error);
-
-        // Save to localStorage
         if (typeof window !== 'undefined') {
           localStorage.setItem('ai-sidebar-open', 'true');
         }
@@ -318,13 +309,8 @@ export function useAISidebar() {
     [setOpenQuery],
   );
 
-  // Toggle open state
-  const toggleOpen = useCallback(() => {
-    const newState = !(open === 'true');
-    setOpen(newState);
-  }, [open, setOpen]);
+  const toggleOpen = useCallback(() => setOpen(open !== 'true'), [open, setOpen]);
 
-  // Sync with query parameters on mount or when they change
   useEffect(() => {
     if (viewModeQuery && viewModeQuery !== viewMode) {
       setViewModeState(viewModeQuery as ViewMode);
diff --git a/apps/server/package.json b/apps/server/package.json
index aa6f9d2985..633da239dd 100644
--- a/apps/server/package.json
+++ b/apps/server/package.json
@@ -20,6 +20,7 @@
   },
   "dependencies": {
     "@ai-sdk/google": "^1.2.18",
+    "@ai-sdk/groq": "1.2.9",
     "@ai-sdk/openai": "^1.3.21",
     "@ai-sdk/perplexity": "1.1.9",
     "@ai-sdk/ui-utils": "1.2.11",
diff --git a/apps/server/src/routes/chat.ts b/apps/server/src/routes/chat.ts
index f6d2c059a3..6d2b32b5db 100644
--- a/apps/server/src/routes/chat.ts
+++ b/apps/server/src/routes/chat.ts
@@ -24,6 +24,7 @@ import { connection } from '../db/schema';
 import { env } from 'cloudflare:workers';
 import { openai } from '@ai-sdk/openai';
 import { McpAgent } from 'agents/mcp';
+import { groq } from '@ai-sdk/groq';
 import { eq } from 'drizzle-orm';
 import { createDb } from '../db';
 import { z } from 'zod';
@@ -57,7 +58,7 @@ export class ZeroAgent extends AIChatAgent<typeof env> {
         );
 
         const result = streamText({
-          model: openai('gpt-4o'),
+          model: groq('meta-llama/llama-4-maverick-17b-128e-instruct'),
           messages: processedMessages,
           tools,
           onFinish,
diff --git a/apps/server/src/trpc/routes/ai/search.ts b/apps/server/src/trpc/routes/ai/search.ts
index 5151d02d9c..3f87f9bc3d 100644
--- a/apps/server/src/trpc/routes/ai/search.ts
+++ b/apps/server/src/trpc/routes/ai/search.ts
@@ -1,17 +1,14 @@
-import { type CoreMessage, generateText, tool, generateObject } from 'ai';
 import { GmailSearchAssistantSystemPrompt } from '../../../lib/prompts';
 import { activeDriverProcedure } from '../../trpc';
-import type { gmail_v1 } from '@googleapis/gmail';
-import { TRPCError } from '@trpc/server';
-import { openai } from '@ai-sdk/openai';
-import dedent from 'dedent';
+import { groq } from '@ai-sdk/groq';
+import { generateObject } from 'ai';
 import { z } from 'zod';
 
 export const generateSearchQuery = activeDriverProcedure
   .input(z.object({ query: z.string() }))
   .mutation(async ({ input }) => {
     const result = await generateObject({
-      model: openai('gpt-4o'),
+      model: groq('meta-llama/llama-4-maverick-17b-128e-instruct'),
       system: GmailSearchAssistantSystemPrompt(),
       prompt: input.query,
       schema: z.object({
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ac49f63ac2..48bee94591 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -443,6 +443,9 @@ importers:
       '@ai-sdk/google':
         specifier: ^1.2.18
         version: 1.2.18(zod@3.25.42)
+      '@ai-sdk/groq':
+        specifier: 1.2.9
+        version: 1.2.9(zod@3.25.42)
       '@ai-sdk/openai':
         specifier: ^1.3.21
         version: 1.3.22(zod@3.25.42)
@@ -665,6 +668,12 @@ packages:
     peerDependencies:
       zod: ^3.0.0
 
+  '@ai-sdk/groq@1.2.9':
+    resolution: {integrity: sha512-7MoDaxm8yWtiRbD1LipYZG0kBl+Xe0sv/EeyxnHnGPZappXdlgtdOgTZVjjXkT3nWP30jjZi9A45zoVrBMb3Xg==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      zod: ^3.0.0
+
   '@ai-sdk/openai@1.3.22':
     resolution: {integrity: sha512-QwA+2EkG0QyjVR+7h6FE7iOu2ivNqAVMm9UJZkVxxTk5OIq5fFJDTEI/zICEMuHImTTXR2JjsL6EirJ28Jc4cw==}
     engines: {node: '>=18'}
@@ -7321,6 +7330,12 @@ snapshots:
       '@ai-sdk/provider-utils': 2.2.8(zod@3.25.42)
       zod: 3.25.42
 
+  '@ai-sdk/groq@1.2.9(zod@3.25.42)':
+    dependencies:
+      '@ai-sdk/provider': 1.1.3
+      '@ai-sdk/provider-utils': 2.2.8(zod@3.25.42)
+      zod: 3.25.42
+
   '@ai-sdk/openai@1.3.22(zod@3.25.42)':
     dependencies:
       '@ai-sdk/provider': 1.1.3