From aa0207436cf303623fc446d1dc6b880aabdc1bcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Padez?= <andre.padez@gmail.com>
Date: Wed, 4 Mar 2026 23:13:55 +0000
Subject: [PATCH] improve gmail sync: email input, permanent errors, auto-dock

- add isync to setup.sh
- ask for gmail address alongside app password in integrations
- add PermanentError to job queue (skips retries for non-recoverable failures)
- use PermanentError for missing credentials, missing executable, auth failures
- auto-add /email to dock after successful gmail sync
- invalidate dock cache on sync completion for seamless UI update

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 scripts/setup.sh                              |  9 ++
 .../IntegrationsSettings/GoogleAccount.tsx    | 84 ++++++++++++++-----
 src/servers/api/integrations/integrations.ts  |  9 +-
 src/servers/queue/engine.ts                   | 19 +++--
 src/servers/queue/handlers/gmail-sync.ts      | 48 ++++++++---
 src/servers/queue/index.ts                    | 12 ++-
 src/servers/queue/types.ts                    |  8 ++
 7 files changed, 146 insertions(+), 43 deletions(-)

diff --git a/scripts/setup.sh b/scripts/setup.sh
index 955cd265..d1c2eb42 100755
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -135,6 +135,15 @@ if has sqlite3; then skip "sqlite3"; else
   esac
 fi
 
+# isync (provides mbsync for Gmail IMAP sync)
+if has mbsync; then skip "isync (mbsync)"; else
+  case $PM in
+    apt)    CORE_PKGS+=(isync) ;;
+    pacman) CORE_PKGS+=(isync) ;;
+    brew)   CORE_PKGS+=(isync) ;;
+  esac
+fi
+
 # ripgrep
 if has rg; then skip "ripgrep"; else
   case $PM in
diff --git a/src/apps/officer-web/Screens/Dashboard/Settings/IntegrationsSettings/GoogleAccount.tsx b/src/apps/officer-web/Screens/Dashboard/Settings/IntegrationsSettings/GoogleAccount.tsx
index cf0f32de..992b5a15 100644
--- a/src/apps/officer-web/Screens/Dashboard/Settings/IntegrationsSettings/GoogleAccount.tsx
+++ b/src/apps/officer-web/Screens/Dashboard/Settings/IntegrationsSettings/GoogleAccount.tsx
@@ -3,6 +3,8 @@ import { toast } from 'sonner';
 import { RefreshCw, Loader2, CheckCircle2, XCircle } from 'lucide-react';
 import { Button } from '@/components/ui/button';
 import { useClient } from 'hooks/useClient';
+import { useAuth } from 'hooks/useAuth';
+import { useQueryClient } from '@tanstack/react-query';
 import { useJobs } from 'hooks/useJobs';
 
 type GoogleStatus = {
@@ -20,8 +22,17 @@ const formatTime = (ts: number | string) => {
 
 export const GoogleAccount = () => {
   const client = useClient();
+  const { user } = useAuth();
+  const queryClient = useQueryClient();
   const [isLoading, setIsLoading] = useState(true);
-  const [status, setStatus] = useState<GoogleStatus>({ connected: false, email: null, picture: null, configured: false, hasAppPassword: false });
+  const [status, setStatus] = useState<GoogleStatus>({
+    connected: false,
+    email: null,
+    picture: null,
+    configured: false,
+    hasAppPassword: false,
+  });
+  const [gmailEmail, setGmailEmail] = useState('');
   const [appPassword, setAppPassword] = useState('');
   const [showPasswordInput, setShowPasswordInput] = useState(false);
   const [savingPassword, setSavingPassword] = useState(false);
@@ -34,7 +45,10 @@ export const GoogleAccount = () => {
   const fetchStatus = () => {
     client
       .get<GoogleStatus>('/integrations/google/status')
-      .then(setStatus)
+      .then((s) => {
+        setStatus(s);
+        setGmailEmail(s.email ?? user?.email ?? '');
+      })
       .catch(() => {})
       .finally(() => setIsLoading(false));
     client
@@ -57,10 +71,14 @@ export const GoogleAccount = () => {
     }
   }, []);
 
-  // Refresh sync status from DB when a job finishes
+  // Refresh sync status and dock when a job finishes
   useEffect(() => {
     if (!activeJob && lastJob?.status === 'completed') {
-      client.get<{ lastSyncAt: string | null }>('/email/sync-status').then((res) => setLastSyncAt(res.lastSyncAt)).catch(() => {});
+      client
+        .get<{ lastSyncAt: string | null }>('/email/sync-status')
+        .then((res) => setLastSyncAt(res.lastSyncAt))
+        .catch(() => {});
+      queryClient.invalidateQueries({ queryKey: ['DOCK'] });
     }
   }, [activeJob, lastJob?.status]);
 
@@ -93,11 +111,14 @@ export const GoogleAccount = () => {
   };
 
   const handleSaveAppPassword = async () => {
-    if (!appPassword.trim()) return;
+    if (!appPassword.trim() || !gmailEmail.trim()) return;
     setSavingPassword(true);
     try {
-      await client.put('/integrations/google/app-password', { appPassword: appPassword.trim() });
-      setStatus({ ...status, hasAppPassword: true });
+      await client.put('/integrations/google/app-password', {
+        appPassword: appPassword.trim(),
+        email: gmailEmail.trim(),
+      });
+      setStatus({ ...status, hasAppPassword: true, email: gmailEmail.trim() });
       setAppPassword('');
       setShowPasswordInput(false);
       toast.success('App password saved');
@@ -130,6 +151,9 @@ export const GoogleAccount = () => {
           {status.hasAppPassword && !showPasswordInput ? (
             <div className="flex items-center gap-2">
               <span className="text-xs text-green-600 dark:text-green-400">Configured</span>
+              {status.email && (
+                <span className="text-xs text-duck-dark/50 dark:text-foreground/50">({status.email})</span>
+              )}
               <button
                 onClick={() => setShowPasswordInput(true)}
                 className="text-xs text-duck-dark/50 dark:text-foreground/50 underline hover:opacity-70 cursor-pointer"
@@ -158,23 +182,32 @@ export const GoogleAccount = () => {
                   <li>Copy the 16-character password and paste it below</li>
                 </ol>
               </div>
-              <div className="flex gap-2">
+              <div className="grid gap-2">
                 <input
-                  type="password"
-                  value={appPassword}
-                  onChange={(ev) => setAppPassword(ev.target.value)}
-                  placeholder="xxxx xxxx xxxx xxxx"
-                  className="flex-1 h-9 rounded-md border border-duck-dark/10 dark:border-foreground/10 bg-transparent px-3 text-sm"
+                  type="email"
+                  value={gmailEmail}
+                  onChange={(ev) => setGmailEmail(ev.target.value)}
+                  placeholder="your@gmail.com"
+                  className="h-9 rounded-md border border-duck-dark/10 dark:border-foreground/10 bg-transparent px-3 text-sm"
                 />
-                <Button
-                  type="button"
-                  variant="outline"
-                  disabled={!appPassword.trim() || savingPassword}
-                  onClick={handleSaveAppPassword}
-                  className="h-9 cursor-pointer"
-                >
-                  {savingPassword ? <Loader2 className="h-4 w-4 animate-spin" /> : 'Save'}
-                </Button>
+                <div className="flex gap-2">
+                  <input
+                    type="password"
+                    value={appPassword}
+                    onChange={(ev) => setAppPassword(ev.target.value)}
+                    placeholder="xxxx xxxx xxxx xxxx"
+                    className="flex-1 h-9 rounded-md border border-duck-dark/10 dark:border-foreground/10 bg-transparent px-3 text-sm"
+                  />
+                  <Button
+                    type="button"
+                    variant="outline"
+                    disabled={!appPassword.trim() || !gmailEmail.trim() || savingPassword}
+                    onClick={handleSaveAppPassword}
+                    className="h-9 cursor-pointer"
+                  >
+                    {savingPassword ? <Loader2 className="h-4 w-4 animate-spin" /> : 'Save'}
+                  </Button>
+                </div>
               </div>
             </>
           )}
@@ -250,7 +283,12 @@ export const GoogleAccount = () => {
                   <p className="text-xs text-duck-dark/50 dark:text-foreground/50 truncate">{status.email}</p>
                 </div>
                 {status.picture && (
-                  <img src={status.picture} alt="" className="h-9 w-9 rounded-full shrink-0" referrerPolicy="no-referrer" />
+                  <img
+                    src={status.picture}
+                    alt=""
+                    className="h-9 w-9 rounded-full shrink-0"
+                    referrerPolicy="no-referrer"
+                  />
                 )}
               </div>
               <Button type="button" variant="outline" onClick={handleDisconnect} className="w-full h-11 cursor-pointer">
diff --git a/src/servers/api/integrations/integrations.ts b/src/servers/api/integrations/integrations.ts
index 94556acc..02cfb312 100644
--- a/src/servers/api/integrations/integrations.ts
+++ b/src/servers/api/integrations/integrations.ts
@@ -110,7 +110,7 @@ integrationsRouter.get('/google/verify', async (ctx) => {
   const body = await res.json();
   const valid = body.error === 'invalid_grant' || body.error === 'redirect_uri_mismatch';
 
-  return ctx.json({ valid, error: valid ? null : body.error_description ?? body.error });
+  return ctx.json({ valid, error: valid ? null : (body.error_description ?? body.error) });
 });
 
 // --- Personal: Google account connection status ---
@@ -132,17 +132,20 @@ integrationsRouter.get('/google/status', async (ctx) => {
 
 integrationsRouter.put('/google/app-password', async (ctx) => {
   const user = ctx.get('user');
-  const body = ctx.get('body') as { appPassword?: string };
+  const body = ctx.get('body') as { appPassword?: string; email?: string };
   if (!body.appPassword) throw BAD_REQUEST('Missing appPassword');
 
   const connection = await getUserIntegration(user.id, 'google');
   const connConfig = (connection?.config as Record<string, unknown>) ?? {};
 
+  const updated: Record<string, unknown> = { ...connConfig, imapAppPassword: body.appPassword };
+  if (body.email) updated.email = body.email;
+
   await upsertUserIntegration({
     userId: user.id,
     provider: 'google',
     serverIntegrationId: connection?.serverIntegrationId ?? undefined,
-    config: { ...connConfig, imapAppPassword: body.appPassword },
+    config: updated,
   });
 
   return ctx.json({ ok: true });
diff --git a/src/servers/queue/engine.ts b/src/servers/queue/engine.ts
index 77ef9ecd..4b22d03b 100644
--- a/src/servers/queue/engine.ts
+++ b/src/servers/queue/engine.ts
@@ -1,4 +1,4 @@
-import type { Job, JobProgress, EnqueueParams, StepContext } from './types';
+import { type Job, type JobProgress, type EnqueueParams, type StepContext, PermanentError } from './types';
 import { readJob, writeJob, listAllJobs } from './storage';
 import { getHandler } from './handler-registry';
 import { sendMail } from 'emailer';
@@ -103,7 +103,9 @@ async function processNextInLane(lane: string) {
     console.error(`[queue] Lane ${lane} processing error:`, err);
   } finally {
     const jobs = await listAllJobs();
-    const hasMore = jobs.some((j) => j.lane === lane && j.status === 'queued' && (!j.retryAt || j.retryAt <= Date.now()));
+    const hasMore = jobs.some(
+      (j) => j.lane === lane && j.status === 'queued' && (!j.retryAt || j.retryAt <= Date.now()),
+    );
     if (hasMore) {
       processNextInLane(lane);
     } else {
@@ -127,7 +129,9 @@ async function runJob(job: Job) {
   job.retryAt = undefined;
   await writeJob(job);
   const isRetry = (job.retries ?? 0) > 0;
-  console.log(`[queue] ${isRetry ? 'Resuming' : 'Running'} job ${job.id} (${job.type})${isRetry ? ` retry ${job.retries}` : ''}`);
+  console.log(
+    `[queue] ${isRetry ? 'Resuming' : 'Running'} job ${job.id} (${job.type})${isRetry ? ` retry ${job.retries}` : ''}`,
+  );
 
   const sharedMeta: Record<string, unknown> = { ...(job.meta ?? {}) };
 
@@ -182,9 +186,10 @@ async function runJob(job: Job) {
       step.error = errorMessage;
       step.completedAt = Date.now();
 
-      // Check if handler supports retry
+      // Check if handler supports retry (PermanentError skips retries)
+      const isPermanent = err instanceof PermanentError;
       const retries = (fresh.retries ?? 0) + 1;
-      if (handler.retry && retries <= handler.retry.maxRetries) {
+      if (!isPermanent && handler.retry && retries <= handler.retry.maxRetries) {
         // Schedule retry: reset failed step to pending, re-queue
         step.status = 'pending';
         step.error = undefined;
@@ -198,7 +203,9 @@ async function runJob(job: Job) {
         fresh.retries = retries;
         fresh.retryAt = Date.now() + handler.retry.delayMs;
         await writeJob(fresh);
-        console.log(`[queue] Job ${fresh.id} will retry (${retries}/${handler.retry.maxRetries}) in ${handler.retry.delayMs / 1000}s — failed at step "${step.name}": ${errorMessage}`);
+        console.log(
+          `[queue] Job ${fresh.id} will retry (${retries}/${handler.retry.maxRetries}) in ${handler.retry.delayMs / 1000}s — failed at step "${step.name}": ${errorMessage}`,
+        );
         scheduleRetry(fresh.lane, handler.retry.delayMs);
         return;
       }
diff --git a/src/servers/queue/handlers/gmail-sync.ts b/src/servers/queue/handlers/gmail-sync.ts
index 21d9ae82..bed17d2d 100644
--- a/src/servers/queue/handlers/gmail-sync.ts
+++ b/src/servers/queue/handlers/gmail-sync.ts
@@ -2,10 +2,10 @@ import type { Database } from 'bun:sqlite';
 import { createHash } from 'node:crypto';
 import { join } from 'node:path';
 import { readdir, readFile, writeFile, unlink, mkdir, stat } from 'node:fs/promises';
-import type { JobHandler } from '../types';
+import { type JobHandler, PermanentError } from '../types';
 import { registerHandler } from '../handler-registry';
 import { openEmailDb, upsertFromRawEml, setSyncMeta } from '../../api/email/email-db';
-import { getUserByEmail, getUserIntegration } from 'officerdb';
+import { getUserByEmail, getUserIntegration, getDockPaths, setDockPaths } from 'officerdb';
 import { getMaildirPath } from '@@/data-path';
 
 // ── Credentials ──
@@ -14,12 +14,12 @@ type ImapCredentials = { email: string; appPassword: string };
 
 async function loadImapCredentials(userEmail: string): Promise<ImapCredentials> {
   const dbUser = await getUserByEmail(userEmail);
-  if (!dbUser) throw new Error('User not found');
+  if (!dbUser) throw new PermanentError('User not found');
 
   const userGoogle = await getUserIntegration(dbUser.id, 'google');
   const config = userGoogle?.config as Record<string, unknown> | undefined;
   if (!config?.imapAppPassword) {
-    throw new Error('Gmail App Password not configured — set it in Settings → Integrations');
+    throw new PermanentError('Gmail App Password not configured — set it in Settings → Integrations');
   }
 
   const gmailEmail = (config.email as string) ?? userEmail;
@@ -235,15 +235,21 @@ const gmailSyncHandler: JobHandler = {
         await ctx.updateProgress({ current: 0, total: 0, label: 'Running mbsync...' });
 
         try {
-          const proc = Bun.spawn(['mbsync', '-c', configPath, '-a', '-V'], {
-            stdout: 'pipe',
-            stderr: 'pipe',
-          });
+          let proc: ReturnType<typeof Bun.spawn>;
+          try {
+            proc = Bun.spawn(['mbsync', '-c', configPath, '-a', '-V'], {
+              stdout: 'pipe',
+              stderr: 'pipe',
+            });
+          } catch (spawnErr) {
+            const msg = spawnErr instanceof Error ? spawnErr.message : String(spawnErr);
+            throw new PermanentError(`Failed to start mbsync: ${msg}`);
+          }
 
           // Stream stderr for live progress
           let lastLine = '';
           let stderrBuf = '';
-          const reader = proc.stderr.getReader();
+          const reader = (proc.stderr as ReadableStream<Uint8Array>).getReader();
           const decoder = new TextDecoder();
           const readLoop = (async () => {
             while (true) {
@@ -285,6 +291,7 @@ const gmailSyncHandler: JobHandler = {
                 ctx.meta.gmailSyncRecoverable = true;
                 ctx.meta.gmailSyncEmailCount = emailCount;
                 ctx.meta.gmailSyncIsAuthFail = true;
+                throw new PermanentError(`Authentication failed — check your App Password`);
               }
               throw new Error(`mbsync exited with code ${exitCode}: ${stderrBuf.slice(-500)}`);
             }
@@ -315,11 +322,32 @@ const gmailSyncHandler: JobHandler = {
             });
           });
 
-          console.log(`[gmail-sync] Import done: saved ${result.saved}, skipped ${result.skipped}, errors ${result.errors}`);
+          console.log(
+            `[gmail-sync] Import done: saved ${result.saved}, skipped ${result.skipped}, errors ${result.errors}`,
+          );
 
           setSyncMeta(db, 'last_sync_date', new Date().toISOString().split('T')[0]!);
           setSyncMeta(db, 'last_sync_at', new Date().toISOString());
 
+          // Auto-add /email to dock if not already present
+          if (result.saved > 0) {
+            try {
+              const dbUser = await getUserByEmail(ctx.job.userId);
+              if (dbUser) {
+                const paths = await getDockPaths(dbUser.id);
+                if (!paths) {
+                  // User hasn't customized dock — initialize with defaults + /email
+                  const defaults = ['/', '/files', '/automation', '/projects', '/dashboards', '/chat'];
+                  await setDockPaths(dbUser.id, [...defaults, '/email']);
+                } else if (!paths.includes('/email')) {
+                  await setDockPaths(dbUser.id, [...paths, '/email']);
+                }
+              }
+            } catch {
+              // Non-fatal — dock update is best-effort
+            }
+          }
+
           await ctx.updateProgress({ current: 1, total: 1, label: `Done — ${result.saved} new emails` });
         } finally {
           db.close();
diff --git a/src/servers/queue/index.ts b/src/servers/queue/index.ts
index 82b761d8..97439080 100644
--- a/src/servers/queue/index.ts
+++ b/src/servers/queue/index.ts
@@ -5,7 +5,17 @@ import './handlers';
 export { enqueue, cancelJob } from './engine';
 export { readJob, listAllJobs } from './storage';
 export { registerHandler } from './handler-registry';
-export type { Job, JobStep, JobStatus, JobProgress, StepContext, JobHandler, JobHandlerStep, EnqueueParams } from './types';
+export { PermanentError } from './types';
+export type {
+  Job,
+  JobStep,
+  JobStatus,
+  JobProgress,
+  StepContext,
+  JobHandler,
+  JobHandlerStep,
+  EnqueueParams,
+} from './types';
 
 export async function initQueue() {
   await ensureQueueDir();
diff --git a/src/servers/queue/types.ts b/src/servers/queue/types.ts
index 77685df5..e0ad4ea8 100644
--- a/src/servers/queue/types.ts
+++ b/src/servers/queue/types.ts
@@ -65,3 +65,11 @@ export type EnqueueParams = {
   meta?: Record<string, unknown>;
   notify?: boolean;
 };
+
+/** Throw this from a step to fail the job immediately without retrying. */
+export class PermanentError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = 'PermanentError';
+  }
+}