Use emailprovider in more places

apps/web/app/(app)/[emailAccountId]/assistant/ProcessRules.tsx

@@ -24,7 +24,6 @@ import { Table, TableBody, TableRow, TableCell } from "@/components/ui/table";
 import { Card } from "@/components/ui/card";
 import type { RunRulesResult } from "@/utils/ai/choose-rule/run-rules";
 import { SearchForm } from "@/components/SearchForm";
-import { Badge } from "@/components/Badge";
 import type { BatchExecutedRulesResponse } from "@/app/api/user/executed-rules/batch/route";
 import {
   isAIRule,
@@ -370,9 +369,6 @@ function ProcessRulesRow({
             {result ? (
               <>
                 <div className="flex max-w-xs flex-col justify-center gap-0.5 whitespace-nowrap">
-                  {result.existing && (
-                    <Badge color="yellow">Already processed</Badge>
-                  )}
                   <ProcessResultDisplay
                     result={result}
                     emailAccountId={emailAccountId}

apps/web/app/(app)/[emailAccountId]/clean/onboarding/page.tsx

@@ -1,4 +1,4 @@
-import { Card } from "@/components/ui/card";
+import { Card, CardTitle } from "@/components/ui/card";
 import { IntroStep } from "@/app/(app)/[emailAccountId]/clean/IntroStep";
 import { ActionSelectionStep } from "@/app/(app)/[emailAccountId]/clean/ActionSelectionStep";
 import { CleanInstructionsStep } from "@/app/(app)/[emailAccountId]/clean/CleanInstructionsStep";
@@ -35,9 +35,13 @@ export default async function CleanPage(props: {
     },
   });
 
+  if (!emailAccount) {
+    return <CardTitle>Email account not found</CardTitle>;
+  }
+
   const emailProvider = await createEmailProvider({
     emailAccountId,
-    provider: emailAccount?.account.provider ?? null,
+    provider: emailAccount.account.provider,
   });
   const { unhandledCount } = await getUnhandledCount(emailProvider);
 

apps/web/app/(app)/[emailAccountId]/cold-email-blocker/ColdEmailList.tsx

@@ -137,7 +137,7 @@ function Row({
   mutate: () => void;
   selected: Map<string, boolean>;
   onToggleSelect: (id: string) => void;
-  markNotColdEmail: (input: { sender: string }) => Promise<any>;
+  markNotColdEmail: (input: { sender: string }) => Promise<unknown>;
   isExecuting: boolean;
 }) {
   return (

apps/web/app/(app)/[emailAccountId]/stats/Stats.tsx

@@ -124,11 +124,7 @@ export function Stats() {
 
         <RuleStatsChart
           dateRange={dateRange}
-          title={
-            isAccountOwner
-              ? "Your email workload breakdown"
-              : "Email workload breakdown"
-          }
+          title="Assistant processed emails"
         />
       </div>
 

apps/web/app/(app)/accounts/page.tsx

@@ -2,7 +2,7 @@
 
 import { useAction } from "next-safe-action/hooks";
 import Link from "next/link";
-import { Trash2, ArrowRight } from "lucide-react";
+import { Trash2, ArrowRight, BotIcon } from "lucide-react";
 import { ConfirmDialog } from "@/components/ConfirmDialog";
 import { LoadingContent } from "@/components/LoadingContent";
 import { Button } from "@/components/ui/button";
@@ -90,8 +90,13 @@ function AccountItem({
         </div>
       </CardHeader>
       <CardContent className="flex justify-end gap-2">
-        <Button variant="outline" size="sm" Icon={ArrowRight} asChild>
-          <Link href={prefixPath(emailAccount.id, "/setup")}>View</Link>
+        <Button variant="outline" size="sm" Icon={BotIcon}>
+          <Link href={prefixPath(emailAccount.id, "/automation")}>
+            Assistant
+          </Link>
+        </Button>
+        <Button variant="outline" size="sm" Icon={ArrowRight}>
+          <Link href={prefixPath(emailAccount.id, "/setup")}>Setup</Link>
         </Button>
         {!emailAccount.isPrimary && (
           <ConfirmDialog

apps/web/app/api/google/watch/all/route.ts

@@ -1,12 +1,11 @@
 import { NextResponse } from "next/server";
-import { getGmailClientWithRefresh } from "@/utils/gmail/client";
 import prisma from "@/utils/prisma";
-import { watchEmails } from "@/app/api/google/watch/controller";
 import { hasCronSecret, hasPostCronSecret } from "@/utils/cron";
 import { withError } from "@/utils/middleware";
 import { captureException } from "@/utils/error";
 import { hasAiAccess } from "@/utils/premium";
 import { createScopedLogger } from "@/utils/logger";
+import { createEmailProvider } from "@/utils/email/provider";
 
 const logger = createScopedLogger("api/google/watch/all");
 
@@ -99,14 +98,12 @@ async function watchAllEmails() {
         continue;
       }
 
-      const gmail = await getGmailClientWithRefresh({
-        accessToken: emailAccount.account.access_token,
-        refreshToken: emailAccount.account.refresh_token,
-        expiresAt: emailAccount.account.expires_at?.getTime() || null,
+      const emailProvider = await createEmailProvider({
         emailAccountId: emailAccount.id,
+        provider: "google",
       });
 
-      await watchEmails({ emailAccountId: emailAccount.id, gmail });
+      await emailProvider.watchEmails();
     } catch (error) {
       if (error instanceof Error) {
         const warn = [

apps/web/app/api/google/watch/controller.ts

@@ -1,24 +1,22 @@
-import type { gmail_v1 } from "@googleapis/gmail";
 import prisma from "@/utils/prisma";
-import { getGmailClientWithRefresh } from "@/utils/gmail/client";
 import { captureException } from "@/utils/error";
 import { createScopedLogger } from "@/utils/logger";
-import { watchGmail, unwatchGmail } from "@/utils/gmail/watch";
+import type { EmailProvider } from "@/utils/email/types";
 
 const logger = createScopedLogger("google/watch");
 
 export async function watchEmails({
   emailAccountId,
-  gmail,
+  emailProvider,
 }: {
   emailAccountId: string;
-  gmail: gmail_v1.Gmail;
+  emailProvider: EmailProvider;
 }) {
   logger.info("Watching emails", { emailAccountId });
-  const res = await watchGmail(gmail);
+  const res = await emailProvider.watchEmails();
 
-  if (res.expiration) {
-    const expirationDate = new Date(+res.expiration);
+  if (res?.expirationDate) {
+    const expirationDate = new Date(res.expirationDate);
     await prisma.emailAccount.update({
       where: { id: emailAccountId },
       data: { watchEmailsExpirationDate: expirationDate },
@@ -30,24 +28,14 @@ export async function watchEmails({
 
 export async function unwatchEmails({
   emailAccountId,
-  accessToken,
-  refreshToken,
-  expiresAt,
+  emailProvider,
 }: {
   emailAccountId: string;
-  accessToken: string | null;
-  refreshToken: string | null;
-  expiresAt: number | null;
+  emailProvider: EmailProvider;
 }) {
   try {
     logger.info("Unwatching emails", { emailAccountId });
-    const gmail = await getGmailClientWithRefresh({
-      accessToken,
-      refreshToken,
-      expiresAt,
-      emailAccountId,
-    });
-    await unwatchGmail(gmail);
+    await emailProvider.unwatchEmails();
   } catch (error) {
     if (error instanceof Error && error.message.includes("invalid_grant")) {
       logger.warn("Error unwatching emails, invalid grant", { emailAccountId });

apps/web/app/api/google/watch/route.ts

@@ -2,8 +2,8 @@ import { NextResponse } from "next/server";
 import { watchEmails } from "./controller";
 import { withAuth } from "@/utils/middleware";
 import { createScopedLogger } from "@/utils/logger";
-import { getGmailClientForEmailId } from "@/utils/account";
 import prisma from "@/utils/prisma";
+import { createEmailProvider } from "@/utils/email/provider";
 
 export const dynamic = "force-dynamic";
 
@@ -27,8 +27,14 @@ export const GET = withAuth(async (request) => {
 
   for (const { id: emailAccountId } of emailAccounts) {
     try {
-      const gmail = await getGmailClientForEmailId({ emailAccountId });
-      const expirationDate = await watchEmails({ emailAccountId, gmail });
+      const emailProvider = await createEmailProvider({
+        emailAccountId,
+        provider: "google",
+      });
+      const expirationDate = await watchEmails({
+        emailAccountId,
+        emailProvider,
+      });
 
       if (expirationDate) {
         results.push({

apps/web/app/api/resend/digest/route.ts

@@ -114,7 +114,7 @@ async function sendEmail({
 
   const emailProvider = await createEmailProvider({
     emailAccountId,
-    provider: emailAccount?.account.provider ?? null,
+    provider: emailAccount.account.provider,
   });
 
   const digestScheduleData = await getDigestSchedule({ emailAccountId });

apps/web/app/api/threads/validation.ts

@@ -6,6 +6,8 @@ export const threadsQuery = z.object({
   type: z.string().nullish(),
   nextPageToken: z.string().nullish(),
   labelId: z.string().nullish(), // For Google
+  labelIds: z.array(z.string()).nullish(), // For Google
+  excludeLabelNames: z.array(z.string()).nullish(), // For Google
   after: z.coerce.date().nullish(),
   before: z.coerce.date().nullish(),
   isUnread: z.coerce.boolean().nullish(),