fix: skipped, cancelled emails cant be retried now

Author: nams1570

apps/backend/src/app/api/latest/emails/outbox/crud.tsx

@@ -381,6 +381,7 @@ export const emailOutboxCrudHandlers = createLazyProxy(() => createCrudHandlers(
       // Cancel action - mark as skipped
       set("isPaused", Prisma.sql`false`);
       set("isQueued", Prisma.sql`false`);
+      setNull("nextSendRetryAt"); // Clear any pending retry so it won't be picked up
       set("skippedReason", Prisma.sql`'MANUALLY_CANCELLED'::"EmailOutboxSkippedReason"`);
       set("skippedDetails", Prisma.sql`'{}'::jsonb`);
     } else {

apps/backend/src/lib/email-queue-step.tsx

@@ -524,6 +524,8 @@ async function prepareSendPlan(deltaSeconds: number): Promise<TenancySendBatch[]
   const tenancyIds = await globalPrismaClient.emailOutbox.findMany({
     where: {
       isPaused: false,
+      skippedReason: null, // Don't process skipped/cancelled emails
+      finishedSendingAt: null, // Don't process already-finished emails (defense in depth)
       OR: [
         // Normal case: queued, not started, and no pending retry
         { startedSendingAt: null, isQueued: true, nextSendRetryAt: null },
@@ -561,6 +563,8 @@ async function claimEmailsForSending(tx: PrismaClientTransaction, tenancyId: str
       FROM "EmailOutbox"
       WHERE "tenancyId" = ${tenancyId}::uuid
         AND "isPaused" = FALSE
+        AND "skippedReason" IS NULL  -- Don't process skipped/cancelled emails
+        AND "finishedSendingAt" IS NULL  -- Don't process already-finished emails (defense in depth)
         AND "finishedRenderingAt" IS NOT NULL
         AND (
           -- Normal case: queued, not started, and no pending retry