Merge pull request #45 from xtr-dev/dev

Fix TypeScript compilation error in MailingService
Bump version to 0.4.5
2025-12-10 08:13:23 +00:00 · 2025-09-14 20:03:42 +02:00 · 2025-09-14 20:03:34 +02:00 · 2025-09-14 20:02:08 +02:00 · 2025-09-14 20:00:46 +02:00 · 2025-09-14 19:56:19 +02:00
31 changed files with 1830 additions and 844 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,6 @@ node_modules/
 payload-docs
 dist/
 /dev/payload.db
+/dev/dev.db
+dev.db
 tsconfig.tsbuildinfo
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -126,9 +126,10 @@ When you start the dev server, look for these messages:
 🎯 Test interface will be available at: /mailing-test

 ✅ Example email templates created successfully
-PayloadCMS Mailing Plugin initialized successfully
 ```

+**Note**: The plugin initializes silently on success (no "initialized successfully" message). If you see no errors, the plugin loaded correctly.
+
 ## Troubleshooting

 ### Server won't start
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@

 📧 **Template-based email system with scheduling and job processing for PayloadCMS**

-✨ **Simplified API**: Starting from v0.1.0, this plugin uses a simplified API that leverages PayloadCMS collections directly for better type safety and flexibility.
+⚠️ **Pre-release Warning**: This package is currently in active development (v0.0.x). Breaking changes may occur before v1.0.0. Not recommended for production use.

 ## Features

@@ -28,26 +28,31 @@ npm install @xtr-dev/payload-mailing

 ## Quick Start

-### 1. Add the plugin to your Payload config
+### 1. Configure email in your Payload config and add the plugin

 ```typescript
 import { buildConfig } from 'payload/config'
 import { mailingPlugin } from '@xtr-dev/payload-mailing'
+import { nodemailerAdapter } from '@payloadcms/email-nodemailer'

 export default buildConfig({
  // ... your config
+  email: nodemailerAdapter({
+    defaultFromAddress: 'noreply@yoursite.com',
+    defaultFromName: 'Your Site',
+    transport: {
+      host: 'smtp.gmail.com',
+      port: 587,
+      auth: {
+        user: process.env.EMAIL_USER,
+        pass: process.env.EMAIL_PASS,
+      },
+    },
+  }),
  plugins: [
    mailingPlugin({
      defaultFrom: 'noreply@yoursite.com',
-      transport: {
-        host: 'smtp.gmail.com',
-        port: 587,
-        secure: false,
-        auth: {
-          user: process.env.EMAIL_USER,
-          pass: process.env.EMAIL_PASS,
-        },
-      },
+      defaultFromName: 'Your Site Name',
      retryAttempts: 3,
      retryDelay: 300000, // 5 minutes
      queue: 'email-queue', // optional
@@ -56,53 +61,55 @@ export default buildConfig({
 })
 ```

-### 2. Send emails using Payload collections
+### 2. Send emails with type-safe helper

 ```typescript
-import { renderTemplate } from '@xtr-dev/payload-mailing'
+// sendEmail is a primary export for easy access
+import { sendEmail } from '@xtr-dev/payload-mailing'
+import { Email } from './payload-types' // Your generated types

-// Option 1: Using templates with variables
-const { html, text, subject } = await renderTemplate(payload, 'welcome-email', {
-  firstName: 'John',
-  welcomeUrl: 'https://yoursite.com/welcome'
-})
-
-// Create email using Payload's collection API (full type safety!)
-const email = await payload.create({
-  collection: 'emails',
+// Option 1: Using templates with full type safety
+const email = await sendEmail<Email>(payload, {
+  template: {
+    slug: 'welcome-email',
+    variables: {
+      firstName: 'John',
+      welcomeUrl: 'https://yoursite.com/welcome'
+    }
+  },
  data: {
-    to: ['user@example.com'],
-    subject,
-    html,
-    text,
+    to: 'user@example.com',
    // Schedule for later (optional)
    scheduledAt: new Date(Date.now() + 24 * 60 * 60 * 1000),
-    // Add any custom fields you've defined
    priority: 1,
-    customField: 'your-value', // Your custom collection fields work!
+    // Your custom fields are type-safe!
+    customField: 'your-value',
  }
 })

-// Option 2: Direct HTML email (no template needed)
-const directEmail = await payload.create({
-  collection: 'emails',
+// Option 2: Direct HTML email (no template)
+const directEmail = await sendEmail<Email>(payload, {
  data: {
-    to: ['user@example.com'],
+    to: ['user@example.com', 'another@example.com'],
    subject: 'Welcome!',
    html: '<h1>Welcome John!</h1><p>Thanks for joining!</p>',
    text: 'Welcome John! Thanks for joining!',
+    // All your custom fields work with TypeScript autocomplete!
+    customField: 'value',
+  }
+})
+
+// Option 3: Use payload.create() directly for full control
+const manualEmail = await payload.create({
+  collection: 'emails',
+  data: {
+    to: ['user@example.com'],
+    subject: 'Hello',
+    html: '<p>Hello World</p>',
  }
 })
 ```

-## Why This Approach is Better
-
- ✅ **Full Type Safety**: Use your generated Payload types
- ✅ **No Learning Curve**: Just use `payload.create()` like any collection
- ✅ **Maximum Flexibility**: Add any custom fields to your email collection
- ✅ **Payload Integration**: Leverage validation, hooks, access control
- ✅ **Consistent API**: One way to create data in Payload
-
 ## Configuration

 ### Plugin Options
@@ -117,13 +124,6 @@ mailingPlugin({
    return yourCustomEngine.render(template, variables)
  },

-  // Email transport
-  transport: {
-    host: 'smtp.gmail.com',
-    port: 587,
-    auth: { user: '...', pass: '...' }
-  },
-
  // Collection names (optional)
  collections: {
    templates: 'email-templates',  // default
@@ -137,13 +137,21 @@ mailingPlugin({
  retryDelay: 300000,            // 5 minutes (default)

  // Advanced options
-  emailWrapper: (email) => ({    // optional layout wrapper
-    ...email,
-    html: `<html><body>${email.html}</body></html>`
-  }),
  richTextEditor: lexicalEditor(),  // optional custom editor
  onReady: async (payload) => {     // optional initialization hook
    console.log('Mailing plugin ready!')
+  },
+
+  // beforeSend hook - modify emails before sending
+  beforeSend: async (options, email) => {
+    // Add attachments, modify headers, etc.
+    options.attachments = [
+      { filename: 'invoice.pdf', content: pdfBuffer }
+    ]
+    options.headers = {
+      'X-Campaign-ID': email.campaignId
+    }
+    return options
  }
 })
 ```
@@ -225,7 +233,7 @@ Thanks for joining {{siteName}}. We're excited to have you!

 **What you can do:**
 • Create beautiful emails with rich text formatting
-• Use the emailWrapper hook to add custom layouts  
+  
 • Queue and schedule emails effortlessly

 Your account was created on {{formatDate createdAt "long"}}.
@@ -236,282 +244,6 @@ The {{siteName}} Team

 ## Advanced Features

-### Custom HTML Layouts with Email Wrapper Hook
-
-The `emailWrapper` hook allows you to apply consistent HTML layouts and styling to all emails sent through the plugin. This is perfect for adding company branding, headers, footers, and responsive styling.
-
-#### Basic Email Wrapper
-
-```typescript
-mailingPlugin({
-  // ... other config
-  emailWrapper: (email) => {
-    const wrappedHtml = `
-      <!DOCTYPE html>
-      <html>
-      <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <title>${email.subject}</title>
-        <style>
-          body { font-family: Arial, sans-serif; margin: 0; padding: 20px; background-color: #f4f4f4; }
-          .container { max-width: 600px; margin: 0 auto; background: white; border-radius: 8px; overflow: hidden; }
-          .header { background: #007bff; color: white; padding: 20px; text-align: center; }
-          .content { padding: 30px; line-height: 1.6; }
-          .footer { background: #f8f9fa; padding: 15px; text-align: center; color: #6c757d; font-size: 14px; }
-
-          /* Responsive styles */
-          @media only screen and (max-width: 600px) {
-            .container { margin: 0 10px; }
-            .content { padding: 20px; }
-          }
-        </style>
-      </head>
-      <body>
-        <div class="container">
-          <div class="header">
-            <h1>My Company</h1>
-          </div>
-          <div class="content">
-            ${email.html}
-          </div>
-          <div class="footer">
-            © 2024 My Company. All rights reserved.<br>
-            <a href="#" style="color: #007bff;">Unsubscribe</a> |
-            <a href="#" style="color: #007bff;">Contact Support</a>
-          </div>
-        </div>
-      </body>
-      </html>
-    `
-
-    return {
-      ...email,
-      html: wrappedHtml,
-      text: `MY COMPANY\n\n${email.text}\n\n© 2024 My Company\nUnsubscribe: [link] | Contact Support: [link]`
-    }
-  }
-})
-```
-
-#### Advanced Email Wrapper with Dynamic Content
-
-```typescript
-mailingPlugin({
-  // ... other config
-  emailWrapper: (email) => {
-    // You can access email properties and customize based on content
-    const isTransactional = email.subject?.includes('Receipt') || email.subject?.includes('Confirmation');
-    const headerColor = isTransactional ? '#28a745' : '#007bff';
-    const headerText = isTransactional ? 'Order Confirmation' : 'My Company';
-
-    const wrappedHtml = `
-      <!DOCTYPE html>
-      <html lang="en">
-      <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <title>${email.subject}</title>
-        <!--[if mso]>
-        <noscript>
-          <xml>
-            <o:OfficeDocumentSettings>
-              <o:PixelsPerInch>96</o:PixelsPerInch>
-            </o:OfficeDocumentSettings>
-          </xml>
-        </noscript>
-        <![endif]-->
-        <style>
-          /* Reset styles */
-          body, table, td, a { -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; }
-          table, td { mso-table-lspace: 0pt; mso-table-rspace: 0pt; }
-          img { -ms-interpolation-mode: bicubic; border: 0; outline: none; text-decoration: none; }
-
-          /* Base styles */
-          body {
-            margin: 0 !important;
-            padding: 0 !important;
-            background-color: #f4f4f4;
-            font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
-          }
-
-          .email-container {
-            max-width: 600px;
-            margin: 0 auto;
-            background-color: #ffffff;
-            border-radius: 8px;
-            overflow: hidden;
-            box-shadow: 0 2px 10px rgba(0,0,0,0.1);
-          }
-
-          .email-header {
-            background: linear-gradient(135deg, ${headerColor}, ${headerColor}dd);
-            color: white;
-            padding: 30px 20px;
-            text-align: center;
-          }
-
-          .email-content {
-            padding: 30px;
-            color: #333333;
-            line-height: 1.6;
-          }
-
-          .email-footer {
-            background-color: #f8f9fa;
-            padding: 20px;
-            text-align: center;
-            color: #6c757d;
-            font-size: 14px;
-            border-top: 1px solid #e9ecef;
-          }
-
-          .email-footer a {
-            color: ${headerColor};
-            text-decoration: none;
-          }
-
-          /* Responsive */
-          @media only screen and (max-width: 600px) {
-            .email-container {
-              margin: 0 10px !important;
-            }
-            .email-header, .email-content {
-              padding: 20px !important;
-            }
-          }
-        </style>
-      </head>
-      <body>
-        <div class="email-container">
-          <div class="email-header">
-            <h1 style="margin: 0; font-size: 24px;">${headerText}</h1>
-          </div>
-          <div class="email-content">
-            ${email.html}
-          </div>
-          <div class="email-footer">
-            <p style="margin: 0 0 10px;">© ${new Date().getFullYear()} My Company. All rights reserved.</p>
-            <p style="margin: 0;">
-              <a href="mailto:support@mycompany.com">Contact Support</a> |
-              <a href="#">Privacy Policy</a> |
-              <a href="#">Unsubscribe</a>
-            </p>
-          </div>
-        </div>
-      </body>
-      </html>
-    `
-
-    // Also enhance the plain text version
-    const wrappedText = `
-${headerText.toUpperCase()}
-${'='.repeat(headerText.length)}
-
-${email.text || email.html?.replace(/<[^>]*>/g, '')}
-
---
-© ${new Date().getFullYear()} My Company. All rights reserved.
-Contact Support: support@mycompany.com
-Privacy Policy: [link]
-Unsubscribe: [link]
-    `.trim();
-
-    return {
-      ...email,
-      html: wrappedHtml,
-      text: wrappedText
-    }
-  }
-})
-```
-
-#### External CSS and Assets
-
-You can also reference external stylesheets and assets:
-
-```typescript
-mailingPlugin({
-  emailWrapper: (email) => {
-    const wrappedHtml = `
-      <!DOCTYPE html>
-      <html>
-      <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <title>${email.subject}</title>
-        <!-- External CSS -->
-        <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;600&display=swap" rel="stylesheet">
-        <style>
-          body { font-family: 'Inter', sans-serif; }
-          /* Your custom styles here */
-        </style>
-      </head>
-      <body>
-        <div style="max-width: 600px; margin: 0 auto;">
-          <img src="https://mycompany.com/email-header.png" alt="My Company" style="width: 100%; height: auto;">
-          <div style="padding: 20px;">
-            ${email.html}
-          </div>
-          <img src="https://mycompany.com/email-footer.png" alt="Footer" style="width: 100%; height: auto;">
-        </div>
-      </body>
-      </html>
-    `;
-
-    return { ...email, html: wrappedHtml };
-  }
-})
-```
-
-#### Template-Specific Layouts
-
-You can customize layouts based on email templates:
-
-```typescript
-mailingPlugin({
-  emailWrapper: (email, context) => {
-    // Access template information if available
-    const templateSlug = context?.templateSlug;
-
-    let layoutClass = 'default-layout';
-    let headerColor = '#007bff';
-
-    if (templateSlug === 'welcome-email') {
-      layoutClass = 'welcome-layout';
-      headerColor = '#28a745';
-    } else if (templateSlug === 'invoice-email') {
-      layoutClass = 'invoice-layout';
-      headerColor = '#dc3545';
-    }
-
-    const wrappedHtml = `
-      <!DOCTYPE html>
-      <html>
-      <head>
-        <meta charset="utf-8">
-        <title>${email.subject}</title>
-        <style>
-          .${layoutClass} { /* template-specific styles */ }
-          .header { background-color: ${headerColor}; }
-        </style>
-      </head>
-      <body>
-        <div class="${layoutClass}">
-          ${email.html}
-        </div>
-      </body>
-      </html>
-    `;
-
-    return { ...email, html: wrappedHtml };
-  }
-})
-```
-
-The `emailWrapper` hook receives the email object with `html`, `text`, and `subject` properties, and should return the modified email object with your custom layout applied.
-
 ### Custom Rich Text Editor

 Override the rich text editor used for templates:
@@ -533,6 +265,56 @@ mailingPlugin({
 })
 ```

+### beforeSend Hook
+
+Modify emails before they are sent to add attachments, custom headers, or make other changes:
+
+```typescript
+mailingPlugin({
+  // ... other config
+  beforeSend: async (options, email) => {
+    // Add attachments dynamically
+    if (email.invoiceId) {
+      const invoice = await generateInvoicePDF(email.invoiceId)
+      options.attachments = [
+        {
+          filename: `invoice-${email.invoiceId}.pdf`,
+          content: invoice.buffer,
+          contentType: 'application/pdf'
+        }
+      ]
+    }
+
+    // Add custom headers
+    options.headers = {
+      'X-Campaign-ID': email.campaignId,
+      'X-Customer-ID': email.customerId,
+      'X-Priority': email.priority === 1 ? 'High' : 'Normal'
+    }
+
+    // Modify recipients based on conditions
+    if (process.env.NODE_ENV === 'development') {
+      // Redirect all emails to test address in dev
+      options.to = ['test@example.com']
+      options.subject = `[TEST] ${options.subject}`
+    }
+
+    // Add BCC for compliance
+    if (email.requiresAudit) {
+      options.bcc = ['audit@company.com']
+    }
+
+    return options
+  }
+})
+```
+
+The `beforeSend` hook receives:
+- `options`: The nodemailer mail options that will be sent
+- `email`: The full email document from the database
+
+You must return the modified options object.
+
 ### Initialization Hooks

 Control plugin initialization order and add post-initialization logic:
@@ -598,6 +380,102 @@ await processEmails(payload)
 await retryFailedEmails(payload)
 ```

+## PayloadCMS Integration
+
+The plugin provides PayloadCMS tasks for email processing:
+
+### 1. Add the task to your Payload config
+
+```typescript
+import { buildConfig } from 'payload/config'
+import { sendTemplateEmailTask } from '@xtr-dev/payload-mailing'
+
+export default buildConfig({
+  // ... your config
+  jobs: {
+    tasks: [
+      sendTemplateEmailTask,
+      // ... your other tasks
+    ]
+  }
+})
+```
+
+### 2. Queue emails from your code
+
+```typescript
+import type { SendTemplateEmailInput } from '@xtr-dev/payload-mailing'
+
+// Queue a template email
+const result = await payload.jobs.queue({
+  task: 'send-template-email',
+  input: {
+    templateSlug: 'welcome-email',
+    to: ['user@example.com'],
+    cc: ['manager@example.com'],
+    variables: {
+      firstName: 'John',
+      activationUrl: 'https://example.com/activate/123'
+    },
+    priority: 1,
+    // Add any custom fields from your email collection
+    customField: 'value'
+  } as SendTemplateEmailInput
+})
+
+// Queue a scheduled email
+await payload.jobs.queue({
+  task: 'send-template-email',
+  input: {
+    templateSlug: 'reminder-email',
+    to: ['user@example.com'],
+    variables: { eventName: 'Product Launch' },
+    scheduledAt: new Date('2024-01-15T10:00:00Z').toISOString(),
+    priority: 3
+  }
+})
+```
+
+### 3. Use in admin panel workflows
+
+The task can also be triggered from the Payload admin panel with a user-friendly form interface that includes:
+- Template slug selection
+- Email recipients (to, cc, bcc)
+- Template variables as JSON
+- Optional scheduling
+- Priority setting
+- Any custom fields you've added to your email collection
+
+### Task Benefits
+
+- ✅ **Easy Integration**: Just add to your tasks array
+- ✅ **Type Safety**: Full TypeScript support with `SendTemplateEmailInput`
+- ✅ **Admin UI**: Ready-to-use form interface
+- ✅ **Flexible**: Supports all your custom email collection fields
+- ✅ **Error Handling**: Comprehensive error reporting
+- ✅ **Queue Management**: Leverage Payload's job queue system
+
+### Immediate Processing
+
+The send email task now supports immediate processing. Enable the `processImmediately` option to send emails instantly:
+
+```typescript
+await payload.jobs.queue({
+  task: 'send-email',
+  input: {
+    processImmediately: true, // Send immediately (default: false)
+    templateSlug: 'welcome-email',
+    to: ['user@example.com'],
+    variables: { name: 'John' }
+  }
+})
+```
+
+**Benefits**:
+- No separate workflow needed
+- Unified task interface
+- Optional immediate processing when needed
+
 ## Job Processing

 The plugin automatically adds a unified email processing job to PayloadCMS:
@@ -773,6 +651,55 @@ import {
 } from '@xtr-dev/payload-mailing'
 ```

+## API Reference
+
+### `sendEmail<T>(payload, options)`
+
+Type-safe email sending with automatic template rendering and validation.
+
+```typescript
+import { sendEmail } from '@xtr-dev/payload-mailing'
+import { Email } from './payload-types'
+
+const email = await sendEmail<Email>(payload, {
+  template: {
+    slug: 'template-slug',
+    variables: { /* template variables */ }
+  },
+  data: {
+    to: 'user@example.com',
+    // Your custom fields are type-safe here!
+  }
+})
+```
+
+**Type Parameters:**
+- `T extends BaseEmailData` - Your generated Email type for full type safety
+
+**Options:**
+- `template.slug` - Template slug to render
+- `template.variables` - Variables to pass to template
+- `data` - Email data (merged with template output)
+- `collectionSlug` - Custom collection name (defaults to 'emails')
+
+### `renderTemplate(payload, slug, variables)`
+
+Render an email template without sending.
+
+```typescript
+const { html, text, subject } = await renderTemplate(
+  payload,
+  'welcome-email',
+  { name: 'John' }
+)
+```
+
+### Helper Functions
+
+- `getMailing(payload)` - Get mailing context
+- `processEmails(payload)` - Manually trigger email processing
+- `retryFailedEmails(payload)` - Manually retry failed emails
+
 ## Migration Guide (v0.0.x → v0.1.0)

 **🚨 BREAKING CHANGES**: The API has been simplified to use Payload collections directly.
--- a/dev/.env.local
+++ b/dev/.env.local
@@ -0,0 +1,2 @@
+USE_MEMORY_DB=true
+PAYLOAD_SECRET=YOUR_SECRET_HERE
--- a/dev/README.md
+++ b/dev/README.md
@@ -184,25 +184,43 @@ The plugin automatically processes the outbox every 5 minutes and retries failed
 ## Plugin API Usage

 ```javascript
-import { sendEmail, scheduleEmail } from '@xtr-dev/payload-mailing'
+import { sendEmail } from '@xtr-dev/payload-mailing'

-// Send immediate email
-const emailId = await sendEmail(payload, {
-  templateId: 'welcome-template-id',
-  to: 'user@example.com',
-  variables: {
-    firstName: 'John',
-    siteName: 'My App'
+// Send immediate email with template
+const email = await sendEmail(payload, {
+  template: {
+    slug: 'welcome-email',
+    variables: {
+      firstName: 'John',
+      siteName: 'My App'
+    }
+  },
+  data: {
+    to: 'user@example.com',
  }
 })

-// Schedule email
-const scheduledId = await scheduleEmail(payload, {
-  templateId: 'reminder-template-id', 
-  to: 'user@example.com',
-  scheduledAt: new Date(Date.now() + 24 * 60 * 60 * 1000), // 24 hours
-  variables: {
-    eventName: 'Product Launch'
+// Schedule email for later
+const scheduledEmail = await sendEmail(payload, {
+  template: {
+    slug: 'reminder',
+    variables: {
+      eventName: 'Product Launch'
+    }
+  },
+  data: {
+    to: 'user@example.com',
+    scheduledAt: new Date(Date.now() + 24 * 60 * 60 * 1000), // 24 hours
+  }
+})
+
+// Send direct HTML email (no template)
+const directEmail = await sendEmail(payload, {
+  data: {
+    to: 'user@example.com',
+    subject: 'Direct Email',
+    html: '<h1>Hello World</h1>',
+    text: 'Hello World'
  }
 })
 ```
--- a/dev/app/(frontend)/dashboard/page.tsx
+++ b/dev/app/(frontend)/dashboard/page.tsx
@@ -0,0 +1,310 @@
+'use client'
+
+import { useState, useEffect } from 'react'
+import Link from 'next/link'
+
+interface EmailStats {
+  total: number
+  sent: number
+  pending: number
+  failed: number
+  processing: number
+}
+
+export default function HomePage() {
+  const [emailStats, setEmailStats] = useState<EmailStats>({
+    total: 0,
+    sent: 0,
+    pending: 0,
+    failed: 0,
+    processing: 0
+  })
+  const [loading, setLoading] = useState<boolean>(true)
+
+  useEffect(() => {
+    fetchEmailStats()
+  }, [])
+
+  const fetchEmailStats = async () => {
+    try {
+      const response = await fetch('/api/test-email')
+      const data = await response.json()
+
+      if (data.outbox?.emails) {
+        const emails = data.outbox.emails
+        const stats: EmailStats = {
+          total: emails.length,
+          sent: emails.filter((email: any) => email.status === 'sent').length,
+          pending: emails.filter((email: any) => email.status === 'pending').length,
+          failed: emails.filter((email: any) => email.status === 'failed').length,
+          processing: emails.filter((email: any) => email.status === 'processing').length
+        }
+        setEmailStats(stats)
+      }
+    } catch (error) {
+      console.error('Error fetching email statistics:', error)
+    } finally {
+      setLoading(false)
+    }
+  }
+
+  const StatCard = ({ label, value, color, description }: { label: string; value: number; color: string; description: string }) => (
+    <div style={{
+      backgroundColor: 'white',
+      border: '1px solid #e5e7eb',
+      borderRadius: '12px',
+      padding: '24px',
+      textAlign: 'center',
+      boxShadow: '0 1px 3px rgba(0, 0, 0, 0.1)',
+    }}>
+      <div style={{
+        fontSize: '3rem',
+        fontWeight: 'bold',
+        color: color,
+        marginBottom: '8px'
+      }}>
+        {value}
+      </div>
+      <div style={{
+        fontSize: '1.1rem',
+        fontWeight: '600',
+        color: '#374151',
+        marginBottom: '4px'
+      }}>
+        {label}
+      </div>
+      <div style={{
+        fontSize: '0.875rem',
+        color: '#6b7280'
+      }}>
+        {description}
+      </div>
+    </div>
+  )
+
+  return (
+    <div style={{
+      backgroundColor: '#f9fafb',
+      padding: '40px 20px',
+      minHeight: 'calc(100vh - 80px)'
+    }}>
+      <div style={{
+        maxWidth: '1200px',
+        margin: '0 auto'
+      }}>
+        {/* Header */}
+        <div style={{ textAlign: 'center', marginBottom: '48px' }}>
+          <h1 style={{
+            fontSize: '3rem',
+            fontWeight: 'bold',
+            color: '#1f2937',
+            marginBottom: '16px'
+          }}>
+            📧 PayloadCMS Mailing Plugin
+          </h1>
+          <p style={{
+            fontSize: '1.25rem',
+            color: '#6b7280',
+            marginBottom: '24px'
+          }}>
+            Development Dashboard
+          </p>
+
+          <div style={{ display: 'flex', gap: '16px', justifyContent: 'center', flexWrap: 'wrap' }}>
+            <Link
+              href="/admin"
+              style={{
+                backgroundColor: '#3b82f6',
+                color: 'white',
+                padding: '12px 24px',
+                borderRadius: '8px',
+                textDecoration: 'none',
+                fontWeight: '500',
+                transition: 'background-color 0.2s'
+              }}
+            >
+              📊 Admin Panel
+            </Link>
+            <Link
+              href="/mailing-test"
+              style={{
+                backgroundColor: '#10b981',
+                color: 'white',
+                padding: '12px 24px',
+                borderRadius: '8px',
+                textDecoration: 'none',
+                fontWeight: '500',
+                transition: 'background-color 0.2s'
+              }}
+            >
+              🧪 Test Interface
+            </Link>
+          </div>
+        </div>
+
+        {/* Email Statistics */}
+        <div style={{ marginBottom: '48px' }}>
+          <div style={{
+            display: 'flex',
+            justifyContent: 'space-between',
+            alignItems: 'center',
+            marginBottom: '24px'
+          }}>
+            <h2 style={{
+              fontSize: '2rem',
+              fontWeight: 'bold',
+              color: '#1f2937'
+            }}>
+              Email Statistics
+            </h2>
+            <button
+              onClick={fetchEmailStats}
+              disabled={loading}
+              style={{
+                backgroundColor: loading ? '#9ca3af' : '#6b7280',
+                color: 'white',
+                padding: '8px 16px',
+                borderRadius: '6px',
+                border: 'none',
+                cursor: loading ? 'not-allowed' : 'pointer',
+                fontWeight: '500'
+              }}
+            >
+              {loading ? 'Loading...' : 'Refresh'}
+            </button>
+          </div>
+
+          {loading ? (
+            <div style={{ textAlign: 'center', padding: '48px' }}>
+              <div style={{ color: '#6b7280', fontSize: '1.1rem' }}>Loading email statistics...</div>
+            </div>
+          ) : (
+            <div style={{
+              display: 'grid',
+              gridTemplateColumns: 'repeat(auto-fit, minmax(250px, 1fr))',
+              gap: '24px'
+            }}>
+              <StatCard
+                label="Total Emails"
+                value={emailStats.total}
+                color="#1f2937"
+                description="All emails in the system"
+              />
+              <StatCard
+                label="Successfully Sent"
+                value={emailStats.sent}
+                color="#10b981"
+                description="Delivered successfully"
+              />
+              <StatCard
+                label="Pending"
+                value={emailStats.pending}
+                color="#f59e0b"
+                description="Waiting to be sent"
+              />
+              <StatCard
+                label="Failed"
+                value={emailStats.failed}
+                color="#ef4444"
+                description="Failed to send"
+              />
+              {emailStats.processing > 0 && (
+                <StatCard
+                  label="Processing"
+                  value={emailStats.processing}
+                  color="#3b82f6"
+                  description="Currently being sent"
+                />
+              )}
+            </div>
+          )}
+        </div>
+
+        {/* Quick Actions */}
+        <div style={{
+          backgroundColor: 'white',
+          borderRadius: '12px',
+          padding: '32px',
+          border: '1px solid #e5e7eb',
+          boxShadow: '0 1px 3px rgba(0, 0, 0, 0.1)'
+        }}>
+          <h3 style={{
+            fontSize: '1.5rem',
+            fontWeight: 'bold',
+            color: '#1f2937',
+            marginBottom: '16px'
+          }}>
+            Quick Actions
+          </h3>
+          <div style={{
+            display: 'grid',
+            gridTemplateColumns: 'repeat(auto-fit, minmax(300px, 1fr))',
+            gap: '16px'
+          }}>
+            <div style={{ padding: '16px', backgroundColor: '#f9fafb', borderRadius: '8px' }}>
+              <h4 style={{ marginBottom: '8px', color: '#1f2937' }}>🎯 Test Email Sending</h4>
+              <p style={{ color: '#6b7280', marginBottom: '12px', fontSize: '0.9rem' }}>
+                Send test emails using templates with the interactive testing interface.
+              </p>
+              <Link
+                href="/mailing-test"
+                style={{
+                  color: '#3b82f6',
+                  textDecoration: 'none',
+                  fontWeight: '500'
+                }}
+              >
+                Open Test Interface →
+              </Link>
+            </div>
+
+            <div style={{ padding: '16px', backgroundColor: '#f9fafb', borderRadius: '8px' }}>
+              <h4 style={{ marginBottom: '8px', color: '#1f2937' }}>📝 Manage Templates</h4>
+              <p style={{ color: '#6b7280', marginBottom: '12px', fontSize: '0.9rem' }}>
+                Create and edit email templates in the Payload admin interface.
+              </p>
+              <Link
+                href="/admin/collections/email-templates"
+                style={{
+                  color: '#3b82f6',
+                  textDecoration: 'none',
+                  fontWeight: '500'
+                }}
+              >
+                Manage Templates →
+              </Link>
+            </div>
+
+            <div style={{ padding: '16px', backgroundColor: '#f9fafb', borderRadius: '8px' }}>
+              <h4 style={{ marginBottom: '8px', color: '#1f2937' }}>📬 Email Queue</h4>
+              <p style={{ color: '#6b7280', marginBottom: '12px', fontSize: '0.9rem' }}>
+                View and manage the email outbox and delivery status.
+              </p>
+              <Link
+                href="/admin/collections/emails"
+                style={{
+                  color: '#3b82f6',
+                  textDecoration: 'none',
+                  fontWeight: '500'
+                }}
+              >
+                View Email Queue →
+              </Link>
+            </div>
+          </div>
+        </div>
+
+        {/* Footer */}
+        <div style={{
+          textAlign: 'center',
+          marginTop: '48px',
+          padding: '24px',
+          color: '#6b7280',
+          fontSize: '0.875rem'
+        }}>
+          PayloadCMS Mailing Plugin Development Environment
+        </div>
+      </div>
+    </div>
+  )
+}
--- a/dev/app/(frontend)/layout.tsx
+++ b/dev/app/(frontend)/layout.tsx
@@ -0,0 +1,24 @@
+import type { Metadata } from 'next'
+
+export const metadata: Metadata = {
+  title: 'PayloadCMS Mailing Plugin - Development',
+  description: 'Development environment for PayloadCMS Mailing Plugin',
+}
+
+export default function FrontendLayout({
+  children,
+}: {
+  children: React.ReactNode
+}) {
+  return (
+    <html lang="en">
+      <body style={{
+        margin: 0,
+        padding: 0,
+        fontFamily: '-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif'
+      }}>
+        {children}
+      </body>
+    </html>
+  )
+}
--- a/dev/app/(frontend)/mailing-test/page.tsx
+++ b/dev/app/(frontend)/mailing-test/page.tsx
@@ -33,6 +33,8 @@ export default function MailingTestPage() {
  const [selectedTemplate, setSelectedTemplate] = useState<string>('')
  const [toEmail, setToEmail] = useState<string>('test@example.com')
  const [variables, setVariables] = useState<Record<string, any>>({})
+  const [jsonVariables, setJsonVariables] = useState<string>('{}')
+  const [jsonError, setJsonError] = useState<string>('')
  const [emailType, setEmailType] = useState<'send' | 'schedule'>('send')
  const [scheduleDate, setScheduleDate] = useState<string>('')
  const [loading, setLoading] = useState<boolean>(false)
@@ -58,6 +60,23 @@ export default function MailingTestPage() {
    const template = templates.find(t => t.slug === templateSlug)
    if (template?.previewData) {
      setVariables(template.previewData)
+      setJsonVariables(JSON.stringify(template.previewData, null, 2))
+    } else {
+      setVariables({})
+      setJsonVariables('{}')
+    }
+    setJsonError('')
+  }
+
+  const handleJsonVariablesChange = (jsonString: string) => {
+    setJsonVariables(jsonString)
+    setJsonError('')
+
+    try {
+      const parsed = JSON.parse(jsonString)
+      setVariables(parsed)
+    } catch (error) {
+      setJsonError(error instanceof Error ? error.message : 'Invalid JSON')
    }
  }

@@ -67,6 +86,11 @@ export default function MailingTestPage() {
      return
    }

+    if (jsonError) {
+      setMessage('Please fix the JSON syntax error before sending')
+      return
+    }
+
    setLoading(true)
    setMessage('')

@@ -88,7 +112,8 @@ export default function MailingTestPage() {
      const result = await response.json()
      
      if (result.success) {
-        setMessage(`✅ ${result.message} (ID: ${result.emailId})`)
+        const statusIcon = result.status === 'sent' ? '📧' : '📫'
+        setMessage(`✅ ${statusIcon} ${result.message} (ID: ${result.emailId})`)
        fetchData() // Refresh email queue
      } else {
        setMessage(`❌ Error: ${result.error}`)
@@ -204,28 +229,43 @@ export default function MailingTestPage() {
            </div>
          )}

-          {selectedTemplateData?.variables && (
+          {selectedTemplate && (
            <div style={{ marginBottom: '15px' }}>
-              <h3>Template Variables:</h3>
-              {selectedTemplateData.variables.map(variable => (
-                <div key={variable.name} style={{ marginBottom: '10px' }}>
-                  <label style={{ display: 'block', marginBottom: '5px' }}>
-                    {variable.name} {variable.required && <span style={{ color: 'red' }}>*</span>}
-                    {variable.description && <small style={{ color: '#666' }}> - {variable.description}</small>}
-                  </label>
-                  <input
-                    type={variable.type === 'number' ? 'number' : variable.type === 'date' ? 'datetime-local' : 'text'}
-                    value={variables[variable.name] || ''}
-                    onChange={(e) => setVariables({
-                      ...variables,
-                      [variable.name]: variable.type === 'number' ? Number(e.target.value) : 
-                                     variable.type === 'boolean' ? e.target.checked : 
-                                     e.target.value
-                    })}
-                    style={{ width: '100%', padding: '8px', borderRadius: '4px', border: '1px solid #ddd' }}
-                  />
+              <label style={{ display: 'block', marginBottom: '5px' }}>
+                <strong>Template Variables (JSON):</strong>
+                {selectedTemplateData?.variables && (
+                  <small style={{ color: '#666', marginLeft: '8px' }}>
+                    Available variables: {selectedTemplateData.variables.map(v => v.name).join(', ')}
+                  </small>
+                )}
+              </label>
+              <textarea
+                value={jsonVariables}
+                onChange={(e) => handleJsonVariablesChange(e.target.value)}
+                placeholder='{\n  "firstName": "John",\n  "siteName": "MyApp",\n  "createdAt": "2023-01-01T00:00:00Z"\n}'
+                style={{
+                  width: '100%',
+                  height: '150px',
+                  padding: '8px',
+                  borderRadius: '4px',
+                  border: jsonError ? '2px solid #dc3545' : '1px solid #ddd',
+                  fontFamily: 'monaco, "Courier New", monospace',
+                  fontSize: '13px',
+                  resize: 'vertical'
+                }}
+              />
+              {jsonError && (
+                <div style={{
+                  color: '#dc3545',
+                  fontSize: '12px',
+                  marginTop: '5px',
+                  padding: '5px',
+                  backgroundColor: '#f8d7da',
+                  borderRadius: '4px'
+                }}>
+                  Invalid JSON: {jsonError}
                </div>
-              ))}
+              )}
            </div>
          )}

--- a/dev/app/api/process-emails/route.ts
+++ b/dev/app/api/process-emails/route.ts
@@ -5,16 +5,17 @@ export async function POST(request: Request) {
  try {
    const payload = await getPayload({ config })

-    // Queue the combined email queue processing job
-    const job = await payload.jobs.queue({
-      task: 'process-email-queue',
-      input: {},
+    // Run jobs in the default queue (the plugin already schedules email processing on init)
+    const results = await payload.jobs.run({
+      queue: 'default',
    })

+    const processedCount = Array.isArray(results) ? results.length : (results ? 1 : 0)
+
    return Response.json({
      success: true,
-      message: 'Email queue processing job queued successfully (will process both pending and failed emails)',
-      jobId: job.id,
+      message: `Email queue processing completed. Processed ${processedCount} jobs.`,
+      processedJobs: processedCount,
    })
  } catch (error) {
    console.error('Process emails error:', error)
--- a/dev/app/api/test-email/route.ts
+++ b/dev/app/api/test-email/route.ts
@@ -1,37 +1,89 @@
 import { getPayload } from 'payload'
 import config from '@payload-config'
-import { sendEmail, scheduleEmail } from '@xtr-dev/payload-mailing'
+import { sendEmail, processEmailById } from '@xtr-dev/payload-mailing'

 export async function POST(request: Request) {
  try {
    const payload = await getPayload({ config })
    const body = await request.json()
-    const { type = 'send', templateSlug, to, variables, scheduledAt } = body
+    const { type = 'send', templateSlug, to, variables, scheduledAt, subject, html, text } = body

-    let result
-    if (type === 'send') {
-      // Send immediately
-      result = await sendEmail(payload, {
-        templateSlug,
+    // Validate required fields
+    if (!to) {
+      return Response.json(
+        { error: 'Recipient email address (to) is required' },
+        { status: 400 }
+      )
+    }
+
+    // Validate email has either template or direct content
+    if (!templateSlug && (!subject || !html)) {
+      return Response.json(
+        { error: 'Either templateSlug or both subject and html must be provided' },
+        { status: 400 }
+      )
+    }
+
+    // Use the new sendEmail API
+    const emailOptions: any = {
+      data: {
        to,
-        variables,
-      })
-    } else if (type === 'schedule') {
-      // Schedule for later
-      result = await scheduleEmail(payload, {
-        templateSlug,
-        to,
-        variables,
-        scheduledAt: scheduledAt ? new Date(scheduledAt) : new Date(Date.now() + 60000), // Default to 1 minute
-      })
+      }
+    }
+
+    // Add template if provided
+    if (templateSlug) {
+      emailOptions.template = {
+        slug: templateSlug,
+        variables: variables || {}
+      }
+    } else if (subject && html) {
+      // Direct email without template
+      emailOptions.data.subject = subject
+      emailOptions.data.html = html
+      if (text) {
+        emailOptions.data.text = text
+      }
    } else {
-      return Response.json({ error: 'Invalid type. Use "send" or "schedule"' }, { status: 400 })
+      return Response.json({
+        error: 'Either templateSlug or subject+html must be provided'
+      }, { status: 400 })
+    }
+
+    // Add scheduling if needed
+    if (type === 'schedule' || scheduledAt) {
+      emailOptions.data.scheduledAt = scheduledAt ? new Date(scheduledAt) : new Date(Date.now() + 60000)
+    }
+
+    const result = await sendEmail(payload, emailOptions)
+
+    // If it's "send now" (not scheduled), process the email immediately
+    if (type === 'send' && !scheduledAt) {
+      try {
+        await processEmailById(payload, String(result.id))
+        return Response.json({
+          success: true,
+          emailId: result.id,
+          message: 'Email sent successfully',
+          status: 'sent'
+        })
+      } catch (processError) {
+        // If immediate processing fails, return that it's queued
+        console.warn('Failed to process email immediately, left in queue:', processError)
+        return Response.json({
+          success: true,
+          emailId: result.id,
+          message: 'Email queued successfully (immediate processing failed)',
+          status: 'queued'
+        })
+      }
    }

    return Response.json({
      success: true,
-      emailId: result,
-      message: type === 'send' ? 'Email sent successfully' : 'Email scheduled successfully',
+      emailId: result.id,
+      message: scheduledAt ? 'Email scheduled successfully' : 'Email queued successfully',
+      status: scheduledAt ? 'scheduled' : 'queued'
    })
  } catch (error) {
    console.error('Test email error:', error)
@@ -69,8 +121,8 @@ export async function GET() {
        total: totalDocs,
      },
      mailing: {
-        pluginActive: !!(payload as any).mailing,
-        service: !!(payload as any).mailing?.service,
+        pluginActive: 'mailing' in payload && !!payload.mailing,
+        service: 'mailing' in payload && payload.mailing && 'service' in payload.mailing && !!payload.mailing.service,
      },
    })
  } catch (error) {
--- a/dev/app/page.tsx
+++ b/dev/app/page.tsx
@@ -0,0 +1,11 @@
+import { Metadata } from 'next'
+import {redirect} from "next/navigation.js"
+
+export const metadata: Metadata = {
+  title: 'PayloadCMS Mailing Plugin - Development',
+  description: 'Development environment for PayloadCMS Mailing Plugin',
+}
+
+export default function HomePage() {
+  redirect('/dashboard')
+}
--- a/dev/payload-types.ts
+++ b/dev/payload-types.ts
@@ -90,7 +90,7 @@ export interface Config {
    'payload-migrations': PayloadMigrationsSelect<false> | PayloadMigrationsSelect<true>;
  };
  db: {
-    defaultIDType: string;
+    defaultIDType: number;
  };
  globals: {};
  globalsSelect: {};
@@ -100,7 +100,8 @@ export interface Config {
  };
  jobs: {
    tasks: {
-      'process-email-queue': ProcessEmailQueueJob;
+      'process-emails': ProcessEmailsTask;
+      'send-email': TaskSendEmail;
      inline: {
        input: unknown;
        output: unknown;
@@ -132,7 +133,7 @@ export interface UserAuthOperations {
 * via the `definition` "users".
 */
 export interface User {
-  id: string;
+  id: number;
  firstName?: string | null;
  lastName?: string | null;
  updatedAt: string;
@@ -158,7 +159,7 @@ export interface User {
 * via the `definition` "posts".
 */
 export interface Post {
-  id: string;
+  id: number;
  updatedAt: string;
  createdAt: string;
 }
@@ -167,7 +168,7 @@ export interface Post {
 * via the `definition` "media".
 */
 export interface Media {
-  id: string;
+  id: number;
  updatedAt: string;
  createdAt: string;
  url?: string | null;
@@ -185,7 +186,7 @@ export interface Media {
 * via the `definition` "email-templates".
 */
 export interface EmailTemplate {
-  id: string;
+  id: number;
  /**
   * A descriptive name for this email template
   */
@@ -226,31 +227,31 @@ export interface EmailTemplate {
 * via the `definition` "emails".
 */
 export interface Email {
-  id: string;
+  id: number;
  /**
   * Email template used (optional if custom content provided)
   */
-  template?: (string | null) | EmailTemplate;
+  template?: (number | null) | EmailTemplate;
  /**
-   * Template slug used for this email
+   * Recipient email addresses
   */
-  templateSlug?: string | null;
+  to: string[];
  /**
-   * Recipient email address(es), comma-separated
+   * CC email addresses
   */
-  to: string;
+  cc?: string[] | null;
  /**
-   * CC email address(es), comma-separated
+   * BCC email addresses
   */
-  cc?: string | null;
-  /**
-   * BCC email address(es), comma-separated
-   */
-  bcc?: string | null;
+  bcc?: string[] | null;
  /**
   * Sender email address (optional, uses default if not provided)
   */
  from?: string | null;
+  /**
+   * Sender display name (optional, e.g., "John Doe" for "John Doe <john@example.com>")
+   */
+  fromName?: string | null;
  /**
   * Reply-to email address
   */
@@ -315,7 +316,7 @@ export interface Email {
 * via the `definition` "payload-jobs".
 */
 export interface PayloadJob {
-  id: string;
+  id: number;
  /**
   * Input data provided to the job
   */
@@ -362,7 +363,7 @@ export interface PayloadJob {
    | {
        executedAt: string;
        completedAt: string;
-        taskSlug: 'inline' | 'process-email-queue';
+        taskSlug: 'inline' | 'process-emails' | 'send-email';
        taskID: string;
        input?:
          | {
@@ -395,7 +396,7 @@ export interface PayloadJob {
        id?: string | null;
      }[]
    | null;
-  taskSlug?: ('inline' | 'process-email-queue') | null;
+  taskSlug?: ('inline' | 'process-emails' | 'send-email') | null;
  queue?: string | null;
  waitUntil?: string | null;
  processing?: boolean | null;
@@ -407,36 +408,36 @@ export interface PayloadJob {
 * via the `definition` "payload-locked-documents".
 */
 export interface PayloadLockedDocument {
-  id: string;
+  id: number;
  document?:
    | ({
        relationTo: 'users';
-        value: string | User;
+        value: number | User;
      } | null)
    | ({
        relationTo: 'posts';
-        value: string | Post;
+        value: number | Post;
      } | null)
    | ({
        relationTo: 'media';
-        value: string | Media;
+        value: number | Media;
      } | null)
    | ({
        relationTo: 'email-templates';
-        value: string | EmailTemplate;
+        value: number | EmailTemplate;
      } | null)
    | ({
        relationTo: 'emails';
-        value: string | Email;
+        value: number | Email;
      } | null)
    | ({
        relationTo: 'payload-jobs';
-        value: string | PayloadJob;
+        value: number | PayloadJob;
      } | null);
  globalSlug?: string | null;
  user: {
    relationTo: 'users';
-    value: string | User;
+    value: number | User;
  };
  updatedAt: string;
  createdAt: string;
@@ -446,10 +447,10 @@ export interface PayloadLockedDocument {
 * via the `definition` "payload-preferences".
 */
 export interface PayloadPreference {
-  id: string;
+  id: number;
  user: {
    relationTo: 'users';
-    value: string | User;
+    value: number | User;
  };
  key?: string | null;
  value?:
@@ -469,7 +470,7 @@ export interface PayloadPreference {
 * via the `definition` "payload-migrations".
 */
 export interface PayloadMigration {
-  id: string;
+  id: number;
  name?: string | null;
  batch?: number | null;
  updatedAt: string;
@@ -542,11 +543,11 @@ export interface EmailTemplatesSelect<T extends boolean = true> {
 */
 export interface EmailsSelect<T extends boolean = true> {
  template?: T;
-  templateSlug?: T;
  to?: T;
  cc?: T;
  bcc?: T;
  from?: T;
+  fromName?: T;
  replyTo?: T;
  subject?: T;
  html?: T;
@@ -627,12 +628,87 @@ export interface PayloadMigrationsSelect<T extends boolean = true> {
 }
 /**
 * This interface was referenced by `Config`'s JSON-Schema
- * via the `definition` "ProcessEmailQueueJob".
+ * via the `definition` "ProcessEmailsTask".
 */
-export interface ProcessEmailQueueJob {
+export interface ProcessEmailsTask {
  input?: unknown;
  output?: unknown;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "TaskSend-email".
+ */
+export interface TaskSendEmail {
+  input: {
+    /**
+     * Process and send the email immediately instead of waiting for the queue processor
+     */
+    processImmediately?: boolean | null;
+    /**
+     * Use a template (leave empty for direct email)
+     */
+    templateSlug?: string | null;
+    /**
+     * JSON object with variables for template rendering
+     */
+    variables?:
+      | {
+          [k: string]: unknown;
+        }
+      | unknown[]
+      | string
+      | number
+      | boolean
+      | null;
+    /**
+     * Email subject (required if not using template)
+     */
+    subject?: string | null;
+    /**
+     * HTML email content (required if not using template)
+     */
+    html?: string | null;
+    /**
+     * Plain text email content (optional)
+     */
+    text?: string | null;
+    /**
+     * Comma-separated list of email addresses
+     */
+    to: string;
+    /**
+     * Optional comma-separated list of CC email addresses
+     */
+    cc?: string | null;
+    /**
+     * Optional comma-separated list of BCC email addresses
+     */
+    bcc?: string | null;
+    /**
+     * Optional sender email address (uses default if not provided)
+     */
+    from?: string | null;
+    /**
+     * Optional sender display name (e.g., "John Doe")
+     */
+    fromName?: string | null;
+    /**
+     * Optional reply-to email address
+     */
+    replyTo?: string | null;
+    /**
+     * Optional date/time to schedule email for future delivery
+     */
+    scheduledAt?: string | null;
+    /**
+     * Email priority (1 = highest, 10 = lowest)
+     */
+    priority?: number | null;
+  };
+  output: {
+    id?: string | null;
+  };
+}
 /**
 * This interface was referenced by `Config`'s JSON-Schema
 * via the `definition` "auth".
--- a/dev/payload.config.ts
+++ b/dev/payload.config.ts
@@ -1,14 +1,11 @@
-import { mongooseAdapter } from '@payloadcms/db-mongodb'
+import { sqliteAdapter } from '@payloadcms/db-sqlite'
 import { lexicalEditor } from '@payloadcms/richtext-lexical'
 import {
-  BlocksFeature,
  FixedToolbarFeature,
  HeadingFeature,
  HorizontalRuleFeature,
  InlineToolbarFeature,
-  lexicalHTML,
 } from '@payloadcms/richtext-lexical'
-import { MongoMemoryReplSet } from 'mongodb-memory-server'
 import path from 'path'
 import { buildConfig } from 'payload'
 import sharp from 'sharp'
@@ -17,7 +14,7 @@ import { fileURLToPath } from 'url'
 import { testEmailAdapter } from './helpers/testEmailAdapter.js'
 import { seed, seedUser } from './seed.js'
 import mailingPlugin from "../src/plugin.js"
-import { sendEmail } from "../src/utils/helpers.js"
+import {sendEmail} from "@xtr-dev/payload-mailing"

 const filename = fileURLToPath(import.meta.url)
 const dirname = path.dirname(filename)
@@ -26,36 +23,7 @@ if (!process.env.ROOT_DIR) {
  process.env.ROOT_DIR = dirname
 }

-const buildConfigWithMemoryDB = async () => {
-  // Use in-memory MongoDB for development and testing
-  if (process.env.NODE_ENV === 'test' || process.env.USE_MEMORY_DB === 'true' || !process.env.DATABASE_URI) {
-    console.log('🚀 Starting MongoDB in-memory database...')
-
-    const memoryDB = await MongoMemoryReplSet.create({
-      replSet: {
-        count: 1, // Single instance for dev (faster startup)
-        dbName: process.env.NODE_ENV === 'test' ? 'payloadmemory' : 'payload-mailing-dev',
-        storageEngine: 'wiredTiger',
-      },
-    })
-
-    const uri = `${memoryDB.getUri()}&retryWrites=true`
-    process.env.DATABASE_URI = uri
-
-    console.log('✅ MongoDB in-memory database started')
-    console.log(`📊 Database URI: ${uri.replace(/mongodb:\/\/[^@]*@/, 'mongodb://***@')}`)
-
-    // Graceful shutdown
-    process.on('SIGINT', async () => {
-      console.log('🛑 Stopping MongoDB in-memory database...')
-      await memoryDB.stop()
-      process.exit(0)
-    })
-  } else {
-    console.log(`🔗 Using external MongoDB: ${process.env.DATABASE_URI?.replace(/mongodb:\/\/[^@]*@/, 'mongodb://***@')}`)
-  }
-
-  return buildConfig({
+export default buildConfig({
    admin: {
      importMap: {
        baseDir: path.resolve(dirname),
@@ -85,15 +53,19 @@ const buildConfigWithMemoryDB = async () => {

                  // Queue the welcome email using template slug
                  const emailId = await sendEmail(req.payload, {
-                    templateSlug: 'welcome-email',
-                    to: doc.email,
-                    variables: {
-                      firstName: doc.firstName || doc.email?.split('@')?.[0],
-                      siteName: 'PayloadCMS Mailing Demo',
-                      createdAt: new Date().toISOString(),
-                      isPremium: false,
-                      dashboardUrl: 'http://localhost:3000/admin',
+                    template: {
+                      slug: 'welcome-email',
+                      variables: {
+                        firstName: doc.firstName || doc.email?.split('@')?.[0],
+                        siteName: 'PayloadCMS Mailing Demo',
+                        createdAt: new Date().toISOString(),
+                        isPremium: false,
+                        dashboardUrl: 'http://localhost:3000/admin',
+                      },
                    },
+                    data: {
+                      to: doc.email,
+                    }
                  })

                  console.log('✅ Welcome email queued successfully. Email ID:', emailId)
@@ -120,31 +92,36 @@ const buildConfigWithMemoryDB = async () => {
        },
      },
    ],
-    db: mongooseAdapter({
-      ensureIndexes: true,
-      url: process.env.DATABASE_URI || '',
+    db: sqliteAdapter({
+      client: {
+        url: process.env.DATABASE_URI || 'file:./dev.db',
+      },
    }),
    editor: lexicalEditor(),
    email: testEmailAdapter,
    onInit: async (payload) => {
      await seed(payload)
    },
+    jobs: {
+      jobsCollectionOverrides: c => {
+        if (c.defaultJobsCollection.admin) c.defaultJobsCollection.admin.hidden = false
+        return c.defaultJobsCollection
+      },
+      autoRun: [
+        {
+          cron: '*/1 * * * *', // every minute
+          limit: 10, // limit jobs to process each run
+          queue: 'default', // name of the queue
+        },
+      ],
+    },
    plugins: [
      mailingPlugin({
        defaultFrom: 'noreply@test.com',
        initOrder: 'after',
-        transport: {
-          host: 'localhost',
-          port: 1025, // MailHog port for dev
-          secure: false,
-          auth: {
-            user: 'test',
-            pass: 'test',
-          },
-        },
        retryAttempts: 3,
        retryDelay: 60000, // 1 minute for dev
-        queue: 'email-queue',
+        queue: 'default',

        // Example: Collection overrides for customization
        // Uncomment and modify as needed for your use case
@@ -280,56 +257,6 @@ const buildConfigWithMemoryDB = async () => {
          ],
        }),

-        emailWrapper: (email) => {
-          // Example: wrap email content in a custom layout
-          const wrappedHtml = `
-            <!DOCTYPE html>
-            <html>
-            <head>
-              <meta charset="utf-8">
-              <meta name="viewport" content="width=device-width, initial-scale=1">
-              <title>${email.subject}</title>
-              <style>
-                body { font-family: Arial, sans-serif; margin: 0; padding: 20px; background-color: #f5f5f5; }
-                .container { max-width: 600px; margin: 0 auto; background: white; border-radius: 8px; overflow: hidden; }
-                .header { background: #007bff; color: white; padding: 20px; text-align: center; }
-                .content { padding: 30px; }
-                .footer { background: #f8f9fa; padding: 15px; text-align: center; font-size: 12px; color: #6c757d; }
-              </style>
-            </head>
-            <body>
-              <div class="container">
-                <div class="header">
-                  <h1>My Company</h1>
-                </div>
-                <div class="content">
-                  ${email.html}
-                </div>
-                <div class="footer">
-                  This email was sent from My Company. If you have questions, contact support@mycompany.com
-                </div>
-              </div>
-            </body>
-            </html>
-          `
-
-          const wrappedText = `
-MY COMPANY
-==========
-
-${email.text || email.html?.replace(/<[^>]*>/g, '')}
-
---
-This email was sent from My Company.
-If you have questions, contact support@mycompany.com
-          `
-
-          return {
-            ...email,
-            html: wrappedHtml,
-            text: wrappedText.trim(),
-          }
-        },

        // Called after mailing plugin is fully initialized
        onReady: async (payload) => {
@@ -343,6 +270,3 @@ If you have questions, contact support@mycompany.com
      outputFile: path.resolve(dirname, 'payload-types.ts'),
    },
  })
-}
-
-export default buildConfigWithMemoryDB()
--- a/dev/seed.ts
+++ b/dev/seed.ts
@@ -102,7 +102,7 @@ export const seed = async (payload: Payload) => {
                        format: 0,
                        mode: 'normal',
                        style: '',
-                        text: 'Use the emailWrapper hook to add custom layouts',
+                        text: 'Create beautiful emails with rich text formatting',
                        type: 'text',
                        version: 1,
                      },
--- a/dev/start-dev.js
+++ b/dev/start-dev.js
@@ -3,26 +3,14 @@
 // Development startup script for PayloadCMS Mailing Plugin
 // This ensures proper environment setup and provides helpful information

-console.log('🚀 PayloadCMS Mailing Plugin - Development Mode')
-console.log('=' .repeat(50))
-
 // Set development environment
 process.env.NODE_ENV = process.env.NODE_ENV || 'development'

-// Enable in-memory MongoDB by default for development
+// Set default SQLite database for development
 if (!process.env.DATABASE_URI) {
-  process.env.USE_MEMORY_DB = 'true'
-  console.log('📦 Using in-memory MongoDB (no installation required)')
-} else {
-  console.log(`🔗 Using external MongoDB: ${process.env.DATABASE_URI}`)
+  process.env.DATABASE_URI = 'file:./dev.db'
 }

-console.log('')
-console.log('🔧 Starting development server...')
-console.log('📧 Mailing plugin configured with test transport')
-console.log('🎯 Test interface will be available at: /mailing-test')
-console.log('')
-
 // Import and start Next.js
 import('next/dist/cli/next-dev.js')
  .then(({ nextDev }) => {
@@ -35,11 +23,9 @@ import('next/dist/cli/next-dev.js')

 // Handle graceful shutdown
 process.on('SIGTERM', () => {
-  console.log('\n🛑 Shutting down development server...')
  process.exit(0)
 })

 process.on('SIGINT', () => {
-  console.log('\n🛑 Shutting down development server...')
  process.exit(0)
 })
--- a/dev/test-hook-validation.ts
+++ b/dev/test-hook-validation.ts
@@ -0,0 +1,113 @@
+// Test hook validation in the dev environment
+import { getPayload } from 'payload'
+import config from './payload.config.js'
+
+async function testHookValidation() {
+  const payload = await getPayload({ config: await config })
+
+  console.log('\n🧪 Testing beforeSend hook validation...\n')
+
+  // Test 1: Create an email to process
+  const email = await payload.create({
+    collection: 'emails',
+    data: {
+      to: ['test@example.com'],
+      subject: 'Test Email for Validation',
+      html: '<p>Testing hook validation</p>',
+      text: 'Testing hook validation',
+      status: 'pending'
+    }
+  })
+
+  console.log('✅ Test email created:', email.id)
+
+  // Get the mailing service
+  const mailingService = (payload as any).mailing.service
+
+  // Test 2: Temporarily replace the config with a bad hook
+  const originalBeforeSend = mailingService.config.beforeSend
+
+  console.log('\n📝 Test: Hook that removes "from" field...')
+  mailingService.config.beforeSend = async (options: any, email: any) => {
+    delete options.from
+    return options
+  }
+
+  try {
+    await mailingService.processEmails()
+    console.log('❌ Should have thrown error for missing "from"')
+  } catch (error: any) {
+    if (error.message.includes('must not remove the "from" property')) {
+      console.log('✅ Correctly caught missing "from" field')
+    } else {
+      console.log('❌ Unexpected error:', error.message)
+    }
+  }
+
+  console.log('\n📝 Test: Hook that empties "to" array...')
+  mailingService.config.beforeSend = async (options: any, email: any) => {
+    options.to = []
+    return options
+  }
+
+  try {
+    await mailingService.processEmails()
+    console.log('❌ Should have thrown error for empty "to"')
+  } catch (error: any) {
+    if (error.message.includes('must not remove or empty the "to" property')) {
+      console.log('✅ Correctly caught empty "to" array')
+    } else {
+      console.log('❌ Unexpected error:', error.message)
+    }
+  }
+
+  console.log('\n📝 Test: Hook that removes "subject"...')
+  mailingService.config.beforeSend = async (options: any, email: any) => {
+    delete options.subject
+    return options
+  }
+
+  try {
+    await mailingService.processEmails()
+    console.log('❌ Should have thrown error for missing "subject"')
+  } catch (error: any) {
+    if (error.message.includes('must not remove the "subject" property')) {
+      console.log('✅ Correctly caught missing "subject" field')
+    } else {
+      console.log('❌ Unexpected error:', error.message)
+    }
+  }
+
+  console.log('\n📝 Test: Hook that removes both "html" and "text"...')
+  mailingService.config.beforeSend = async (options: any, email: any) => {
+    delete options.html
+    delete options.text
+    return options
+  }
+
+  try {
+    await mailingService.processEmails()
+    console.log('❌ Should have thrown error for missing content')
+  } catch (error: any) {
+    if (error.message.includes('must not remove both "html" and "text" properties')) {
+      console.log('✅ Correctly caught missing content fields')
+    } else {
+      console.log('❌ Unexpected error:', error.message)
+    }
+  }
+
+  // Restore original hook
+  mailingService.config.beforeSend = originalBeforeSend
+
+  console.log('\n✅ All validation tests completed!\n')
+
+  // Clean up
+  await payload.delete({
+    collection: 'emails',
+    id: email.id
+  })
+
+  process.exit(0)
+}
+
+testHookValidation().catch(console.error)
--- a/dev/test-plugin.mjs
+++ b/dev/test-plugin.mjs
@@ -1,10 +1,10 @@
 // Simple test to verify plugin can be imported and initialized
-import { mailingPlugin, sendEmail, scheduleEmail } from '@xtr-dev/payload-mailing'
+import { mailingPlugin, sendEmail, renderTemplate } from '@xtr-dev/payload-mailing'

 console.log('✅ Plugin imports successfully')
 console.log('✅ mailingPlugin:', typeof mailingPlugin)
 console.log('✅ sendEmail:', typeof sendEmail)
-console.log('✅ scheduleEmail:', typeof scheduleEmail)
+console.log('✅ renderTemplate:', typeof renderTemplate)

 // Test plugin configuration
 try {
--- a/dev/tsconfig.json
+++ b/dev/tsconfig.json
@@ -19,13 +19,13 @@
      "@payload-config": [
        "./payload.config.ts"
      ],
-      "temp-project": [
+      "@xtr-dev/payload-mailing": [
        "../src/index.ts"
      ],
-      "temp-project/client": [
+      "@xtr-dev/payload-mailing/client": [
        "../src/exports/client.ts"
      ],
-      "temp-project/rsc": [
+      "@xtr-dev/payload-mailing/rsc": [
        "../src/exports/rsc.ts"
      ]
    },
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@xtr-dev/payload-mailing",
-  "version": "0.1.2",
+  "version": "0.4.5",
  "description": "Template-based email system with scheduling and job processing for PayloadCMS",
  "type": "module",
  "main": "dist/index.js",
@@ -23,8 +23,6 @@
    "dev:generate-importmap": "npm run dev:payload generate:importmap",
    "dev:generate-types": "npm run dev:payload generate:types",
    "dev:payload": "cross-env PAYLOAD_CONFIG_PATH=./dev/payload.config.ts payload",
-    "generate:importmap": "npm run dev:generate-importmap",
-    "generate:types": "npm run dev:generate-types",
    "lint": "eslint",
    "lint:fix": "eslint ./src --fix",
    "prepublishOnly": "npm run clean && npm run build",
--- a/src/collections/Emails.ts
+++ b/src/collections/Emails.ts
@@ -49,6 +49,13 @@ const Emails: CollectionConfig = {
        description: 'Sender email address (optional, uses default if not provided)',
      },
    },
+    {
+      name: 'fromName',
+      type: 'text',
+      admin: {
+        description: 'Sender display name (optional, e.g., "John Doe" for "John Doe <john@example.com>")',
+      },
+    },
    {
      name: 'replyTo',
      type: 'text',
--- a/src/index.ts
+++ b/src/index.ts
@@ -11,7 +11,13 @@ export { MailingService } from './services/MailingService.js'
 export { default as EmailTemplates, createEmailTemplatesCollection } from './collections/EmailTemplates.js'
 export { default as Emails } from './collections/Emails.js'

-// Jobs are integrated into the plugin configuration
+// Jobs (includes the send email task)
+export { mailingJobs, sendEmailJob } from './jobs/index.js'
+export type { SendEmailTaskInput } from './jobs/sendEmailTask.js'
+
+// Main email sending function
+export { sendEmail, type SendEmailOptions } from './sendEmail.js'
+export { default as sendEmailDefault } from './sendEmail.js'

 // Utility functions for developers
 export {
@@ -19,4 +25,8 @@ export {
  renderTemplate,
  processEmails,
  retryFailedEmails,
+  parseAndValidateEmails,
 } from './utils/helpers.js'
+
+// Email processing utilities
+export { processEmailById, processAllEmails } from './utils/emailProcessor.js'
--- a/src/jobs/index.ts
+++ b/src/jobs/index.ts
@@ -1,19 +1,14 @@
-import { processEmailsJob, ProcessEmailsJobData } from './processEmailsJob.js'
-import { MailingService } from '../services/MailingService.js'
+import { processEmailsJob } from './processEmailsTask.js'
+import { sendEmailJob } from './sendEmailTask.js'

-export const createMailingJobs = (mailingService: MailingService): any[] => {
-  return [
-    {
-      slug: 'processEmails',
-      handler: async ({ job, req }: { job: any; req: any }) => {
-        return processEmailsJob(
-          job as { data: ProcessEmailsJobData },
-          { req, mailingService }
-        )
-      },
-      interfaceName: 'ProcessEmailsJob',
-    },
-  ]
-}
+/**
+ * All mailing-related jobs that get registered with Payload
+ */
+export const mailingJobs = [
+  processEmailsJob,
+  sendEmailJob,
+]

-export * from './processEmailsJob.js'
+// Re-export everything from individual job files
+export * from './processEmailsTask.js'
+export * from './sendEmailTask.js'
--- a/src/jobs/processEmailsJob.ts
+++ b/src/jobs/processEmailsJob.ts
@@ -1,50 +0,0 @@
-import type { PayloadRequest } from 'payload'
-import { MailingService } from '../services/MailingService.js'
-
-export interface ProcessEmailsJobData {
-  type: 'process-emails' | 'retry-failed'
-}
-
-export const processEmailsJob = async (
-  job: { data: ProcessEmailsJobData },
-  context: { req: PayloadRequest; mailingService: MailingService }
-) => {
-  const { mailingService } = context
-  const { type } = job.data
-
-  try {
-    if (type === 'process-emails') {
-      await mailingService.processEmails()
-      console.log('Email processing completed successfully')
-    } else if (type === 'retry-failed') {
-      await mailingService.retryFailedEmails()
-      console.log('Failed email retry completed successfully')
-    }
-  } catch (error) {
-    console.error(`${type} job failed:`, error)
-    throw error
-  }
-}
-
-export const scheduleEmailsJob = async (
-  payload: any,
-  queueName: string,
-  jobType: 'process-emails' | 'retry-failed',
-  delay?: number
-) => {
-  if (!payload.jobs) {
-    console.warn('PayloadCMS jobs not configured - emails will not be processed automatically')
-    return
-  }
-
-  try {
-    await payload.jobs.queue({
-      queue: queueName,
-      task: 'processEmails',
-      input: { type: jobType },
-      waitUntil: delay ? new Date(Date.now() + delay) : undefined,
-    })
-  } catch (error) {
-    console.error(`Failed to schedule ${jobType} job:`, error)
-  }
-}
--- a/src/jobs/processEmailsTask.ts
+++ b/src/jobs/processEmailsTask.ts
@@ -0,0 +1,84 @@
+import type { PayloadRequest, Payload } from 'payload'
+import { processAllEmails } from '../utils/emailProcessor.js'
+
+/**
+ * Data passed to the process emails task
+ */
+export interface ProcessEmailsTaskData {
+  // Currently no data needed - always processes both pending and failed emails
+}
+
+/**
+ * Handler function for processing emails
+ * Used internally by the task definition
+ */
+export const processEmailsTaskHandler = async (
+  job: { data: ProcessEmailsTaskData },
+  context: { req: PayloadRequest }
+) => {
+  const { req } = context
+  const payload = (req as any).payload
+
+  // Use the shared email processing logic
+  await processAllEmails(payload)
+}
+
+/**
+ * Task definition for processing emails
+ * This is what gets registered with Payload's job system
+ */
+export const processEmailsTask = {
+  slug: 'process-emails',
+  handler: async ({ job, req }: { job: any; req: any }) => {
+    // Get mailing context from payload
+    const payload = (req as any).payload
+    const mailingContext = payload.mailing
+
+    if (!mailingContext) {
+      throw new Error('Mailing plugin not properly initialized')
+    }
+
+    // Use the task handler
+    await processEmailsTaskHandler(
+      job as { data: ProcessEmailsTaskData },
+      { req }
+    )
+
+    return {
+      output: {
+        success: true,
+        message: 'Email queue processing completed successfully'
+      }
+    }
+  },
+  interfaceName: 'ProcessEmailsTask',
+}
+
+// For backward compatibility, export as processEmailsJob
+export const processEmailsJob = processEmailsTask
+
+/**
+ * Helper function to schedule an email processing job
+ * Used by the plugin during initialization and can be used by developers
+ */
+export const scheduleEmailsJob = async (
+  payload: Payload,
+  queueName: string,
+  delay?: number
+) => {
+  if (!payload.jobs) {
+    console.warn('PayloadCMS jobs not configured - emails will not be processed automatically')
+    return
+  }
+
+  try {
+    await payload.jobs.queue({
+      queue: queueName,
+      task: 'process-emails',
+      input: {},
+      waitUntil: delay ? new Date(Date.now() + delay) : undefined,
+    } as any)
+  } catch (error) {
+    console.error('Failed to schedule email processing job:', error)
+  }
+}
--- a/src/jobs/sendEmailTask.ts
+++ b/src/jobs/sendEmailTask.ts
@@ -0,0 +1,256 @@
+import { sendEmail } from '../sendEmail.js'
+import { BaseEmailDocument } from '../types/index.js'
+import { processEmailById } from '../utils/emailProcessor.js'
+
+export interface SendEmailTaskInput {
+  // Template mode fields
+  templateSlug?: string
+  variables?: Record<string, any>
+
+  // Direct email mode fields
+  subject?: string
+  html?: string
+  text?: string
+
+  // Common fields
+  to: string | string[]
+  cc?: string | string[]
+  bcc?: string | string[]
+  from?: string
+  fromName?: string
+  replyTo?: string
+  scheduledAt?: string | Date // ISO date string or Date object
+  priority?: number
+  processImmediately?: boolean // If true, process the email immediately instead of waiting for the queue
+
+  // Allow any additional fields that users might have in their email collection
+  [key: string]: any
+}
+
+/**
+ * Transforms task input into sendEmail options by separating template and data fields
+ */
+function transformTaskInputToSendEmailOptions(taskInput: SendEmailTaskInput) {
+  const sendEmailOptions: any = {
+    data: {}
+  }
+
+  // If using template mode, set template options
+  if (taskInput.templateSlug) {
+    sendEmailOptions.template = {
+      slug: taskInput.templateSlug,
+      variables: taskInput.variables || {}
+    }
+  }
+
+  // Standard email fields that should be copied to data
+  const standardFields = ['to', 'cc', 'bcc', 'from', 'fromName', 'replyTo', 'subject', 'html', 'text', 'scheduledAt', 'priority']
+
+  // Fields that should not be copied to data
+  const excludedFields = ['templateSlug', 'variables', 'processImmediately']
+
+  // Copy standard fields to data
+  standardFields.forEach(field => {
+    if (taskInput[field] !== undefined) {
+      sendEmailOptions.data[field] = taskInput[field]
+    }
+  })
+
+  // Copy any additional custom fields that aren't excluded or standard fields
+  Object.keys(taskInput).forEach(key => {
+    if (!excludedFields.includes(key) && !standardFields.includes(key)) {
+      sendEmailOptions.data[key] = taskInput[key]
+    }
+  })
+
+  return sendEmailOptions
+}
+
+/**
+ * Job definition for sending emails
+ * Can be used through Payload's job queue system to send emails programmatically
+ */
+export const sendEmailJob = {
+  slug: 'send-email',
+  label: 'Send Email',
+  inputSchema: [
+    {
+      name: 'processImmediately',
+      type: 'checkbox' as const,
+      label: 'Process Immediately',
+      defaultValue: false,
+      admin: {
+        description: 'Process and send the email immediately instead of waiting for the queue processor'
+      }
+    },
+    {
+      name: 'templateSlug',
+      type: 'text' as const,
+      label: 'Template Slug',
+      admin: {
+        description: 'Use a template (leave empty for direct email)',
+        condition: (data: any) => !data.subject && !data.html
+      }
+    },
+    {
+      name: 'variables',
+      type: 'json' as const,
+      label: 'Template Variables',
+      admin: {
+        description: 'JSON object with variables for template rendering',
+        condition: (data: any) => Boolean(data.templateSlug)
+      }
+    },
+    {
+      name: 'subject',
+      type: 'text' as const,
+      label: 'Subject',
+      admin: {
+        description: 'Email subject (required if not using template)',
+        condition: (data: any) => !data.templateSlug
+      }
+    },
+    {
+      name: 'html',
+      type: 'textarea' as const,
+      label: 'HTML Content',
+      admin: {
+        description: 'HTML email content (required if not using template)',
+        condition: (data: any) => !data.templateSlug
+      }
+    },
+    {
+      name: 'text',
+      type: 'textarea' as const,
+      label: 'Text Content',
+      admin: {
+        description: 'Plain text email content (optional)',
+        condition: (data: any) => !data.templateSlug
+      }
+    },
+    {
+      name: 'to',
+      type: 'text' as const,
+      required: true,
+      label: 'To (Email Recipients)',
+      admin: {
+        description: 'Comma-separated list of email addresses'
+      }
+    },
+    {
+      name: 'cc',
+      type: 'text' as const,
+      label: 'CC (Carbon Copy)',
+      admin: {
+        description: 'Optional comma-separated list of CC email addresses'
+      }
+    },
+    {
+      name: 'bcc',
+      type: 'text' as const,
+      label: 'BCC (Blind Carbon Copy)',
+      admin: {
+        description: 'Optional comma-separated list of BCC email addresses'
+      }
+    },
+    {
+      name: 'from',
+      type: 'text' as const,
+      label: 'From Email',
+      admin: {
+        description: 'Optional sender email address (uses default if not provided)'
+      }
+    },
+    {
+      name: 'fromName',
+      type: 'text' as const,
+      label: 'From Name',
+      admin: {
+        description: 'Optional sender display name (e.g., "John Doe")'
+      }
+    },
+    {
+      name: 'replyTo',
+      type: 'text' as const,
+      label: 'Reply To',
+      admin: {
+        description: 'Optional reply-to email address'
+      }
+    },
+    {
+      name: 'scheduledAt',
+      type: 'date' as const,
+      label: 'Schedule For',
+      admin: {
+        description: 'Optional date/time to schedule email for future delivery',
+        condition: (data: any) => !data.processImmediately
+      }
+    },
+    {
+      name: 'priority',
+      type: 'number' as const,
+      label: 'Priority',
+      min: 1,
+      max: 10,
+      defaultValue: 5,
+      admin: {
+        description: 'Email priority (1 = highest, 10 = lowest)'
+      }
+    }
+  ],
+  outputSchema: [
+    {
+      name: 'id',
+      type: 'text' as const
+    }
+  ],
+  handler: async ({ input, payload }: any) => {
+    // Cast input to our expected type
+    const taskInput = input as SendEmailTaskInput
+    const shouldProcessImmediately = taskInput.processImmediately || false
+
+    try {
+      // Transform task input into sendEmail options using helper function
+      const sendEmailOptions = transformTaskInputToSendEmailOptions(taskInput)
+
+      // Use the sendEmail helper to create the email
+      const email = await sendEmail<BaseEmailDocument>(payload, sendEmailOptions)
+
+      // If processImmediately is true, process the email now
+      if (shouldProcessImmediately) {
+        console.log(`⚡ Processing email ${email.id} immediately...`)
+        await processEmailById(payload, String(email.id))
+        console.log(`✅ Email ${email.id} processed and sent immediately`)
+
+        return {
+          output: {
+            success: true,
+            id: email.id,
+            status: 'sent',
+            processedImmediately: true
+          }
+        }
+      }
+
+      return {
+        output: {
+          success: true,
+          id: email.id,
+          status: 'queued',
+          processedImmediately: false
+        }
+      }
+
+    } catch (error) {
+      // Re-throw Error instances to preserve stack trace and error context
+      if (error instanceof Error) {
+        throw error
+      } else {
+        // Only wrap non-Error values
+        throw new Error(`Failed to process email: ${String(error)}`)
+      }
+    }
+  }
+}
+
+export default sendEmailJob
--- a/src/plugin.ts
+++ b/src/plugin.ts
@@ -3,62 +3,12 @@ import { MailingPluginConfig, MailingContext } from './types/index.js'
 import { MailingService } from './services/MailingService.js'
 import { createEmailTemplatesCollection } from './collections/EmailTemplates.js'
 import Emails from './collections/Emails.js'
+import { mailingJobs, scheduleEmailsJob } from './jobs/index.js'

-// Helper function to schedule the email processing job
-async function scheduleEmailProcessingJob(payload: any, queueName: string, delayMs: number = 60000): Promise<boolean> {
-  if (!queueName || typeof queueName !== 'string') {
-    throw new Error('Invalid queueName: must be a non-empty string')
-  }
-
-  const jobSlug = 'process-email-queue'
-
-  // Check if there's already a scheduled job for this task
-  const existingJobs = await payload.find({
-    collection: 'payload-jobs',
-    where: {
-      and: [
-        {
-          taskSlug: {
-            equals: jobSlug,
-          },
-        },
-        {
-          hasCompleted: {
-            equals: false,
-          },
-        },
-      ],
-    },
-    limit: 1,
-  })
-
-  // If no existing job, schedule a new one
-  if (existingJobs.docs.length === 0) {
-    await payload.create({
-      collection: 'payload-jobs',
-      data: {
-        taskSlug: jobSlug,
-        input: {},
-        queue: queueName,
-        waitUntil: new Date(Date.now() + delayMs),
-      },
-    })
-    console.log(`🔄 Scheduled email processing job in queue: ${queueName}`)
-    return true
-  } else {
-    console.log(`✅ Email processing job already scheduled in queue: ${queueName}`)
-    return false
-  }
-}

 export const mailingPlugin = (pluginConfig: MailingPluginConfig) => (config: Config): Config => {
  const queueName = pluginConfig.queue || 'default'

-  // Validate queueName
-  if (!queueName || typeof queueName !== 'string') {
-    throw new Error('Invalid queue configuration: queue must be a non-empty string')
-  }
-
  // Handle templates collection configuration
  const templatesConfig = pluginConfig.collections?.templates
  const templatesSlug = typeof templatesConfig === 'string' ? templatesConfig : 'email-templates'
@@ -118,10 +68,15 @@ export const mailingPlugin = (pluginConfig: MailingPluginConfig) => (config: Con
    }),
  } satisfies CollectionConfig

+  // Filter out any existing collections with the same slugs to prevent duplicates
+  const existingCollections = (config.collections || []).filter(
+    (collection) => collection.slug !== templatesSlug && collection.slug !== emailsSlug
+  )
+
  return {
    ...config,
    collections: [
-      ...(config.collections || []),
+      ...existingCollections,
      templatesCollection,
      emailsCollection,
    ],
@@ -129,61 +84,7 @@ export const mailingPlugin = (pluginConfig: MailingPluginConfig) => (config: Con
      ...(config.jobs || {}),
      tasks: [
        ...(config.jobs?.tasks || []),
-        {
-          slug: 'process-email-queue',
-          handler: async ({ job, req }: { job: any; req: any }) => {
-            const payload = (req as any).payload
-            let jobResult = null
-
-            try {
-              const mailingService = new MailingService(payload, pluginConfig)
-
-              console.log('🔄 Processing email queue (pending + failed emails)...')
-
-              // Process pending emails first
-              await mailingService.processEmails()
-
-              // Then retry failed emails
-              await mailingService.retryFailedEmails()
-
-              jobResult = {
-                output: {
-                  success: true,
-                  message: 'Email queue processed successfully (pending and failed emails)'
-                }
-              }
-
-              console.log('✅ Email queue processing completed successfully')
-
-            } catch (error) {
-              console.error('❌ Error processing email queue:', error)
-              const errorMessage = error instanceof Error ? error.message : 'Unknown error'
-
-              jobResult = new Error(`Email queue processing failed: ${errorMessage}`)
-            }
-
-            // Always reschedule the next job (success or failure) using duplicate prevention
-            let rescheduled = false
-            try {
-              rescheduled = await scheduleEmailProcessingJob(payload, queueName, 300000) // Reschedule in 5 minutes
-              if (rescheduled) {
-                console.log(`🔄 Rescheduled next email processing job in ${queueName} queue`)
-              }
-            } catch (rescheduleError) {
-              console.error('❌ Failed to reschedule email processing job:', rescheduleError)
-              // If rescheduling fails, we should warn but not fail the current job
-              // since the email processing itself may have succeeded
-              console.warn('⚠️  Email processing completed but next job could not be scheduled')
-            }
-
-            // Return the original result or throw the error
-            if (jobResult instanceof Error) {
-              throw jobResult
-            }
-            return jobResult
-          },
-          interfaceName: 'ProcessEmailQueueJob',
-        },
+        ...mailingJobs,
      ],
    },
    onInit: async (payload: any) => {
@@ -191,7 +92,7 @@ export const mailingPlugin = (pluginConfig: MailingPluginConfig) => (config: Con
        await config.onInit(payload)
      }

-      // Initialize mailing service
+      // Initialize mailing service with proper payload instance
      const mailingService = new MailingService(payload, pluginConfig)

      // Add mailing context to payload for developer access
@@ -205,11 +106,9 @@ export const mailingPlugin = (pluginConfig: MailingPluginConfig) => (config: Con
        },
      } as MailingContext

-      console.log('PayloadCMS Mailing Plugin initialized successfully')
-
-      // Schedule the email processing job if not already scheduled
+      // Schedule the initial email processing job
      try {
-        await scheduleEmailProcessingJob(payload, queueName)
+        await scheduleEmailsJob(payload, queueName, 60000) // Schedule in 1 minute
      } catch (error) {
        console.error('Failed to schedule email processing job:', error)
      }
--- a/src/sendEmail.ts
+++ b/src/sendEmail.ts
@@ -0,0 +1,145 @@
+import { Payload } from 'payload'
+import { getMailing, renderTemplate, parseAndValidateEmails } from './utils/helpers.js'
+import { BaseEmailDocument } from './types/index.js'
+
+// Options for sending emails
+export interface SendEmailOptions<T extends BaseEmailDocument = BaseEmailDocument> {
+  // Template-based email
+  template?: {
+    slug: string
+    variables?: Record<string, any>
+  }
+  // Direct email data
+  data?: Partial<T>
+  // Common options
+  collectionSlug?: string // defaults to 'emails'
+}
+
+/**
+ * Send an email with full type safety
+ *
+ * @example
+ * ```typescript
+ * // With your generated Email type
+ * import { Email } from './payload-types'
+ *
+ * const email = await sendEmail<Email>(payload, {
+ *   template: {
+ *     slug: 'welcome',
+ *     variables: { name: 'John' }
+ *   },
+ *   data: {
+ *     to: 'user@example.com',
+ *     customField: 'value' // Your custom fields are type-safe!
+ *   }
+ * })
+ * ```
+ */
+export const sendEmail = async <TEmail extends BaseEmailDocument = BaseEmailDocument>(
+  payload: Payload,
+  options: SendEmailOptions<TEmail>
+): Promise<TEmail> => {
+  const mailing = getMailing(payload)
+  const collectionSlug = options.collectionSlug || mailing.collections.emails || 'emails'
+
+  let emailData: Partial<TEmail> = { ...options.data } as Partial<TEmail>
+
+  // If using a template, render it first
+  if (options.template) {
+    const { html, text, subject } = await renderTemplate(
+      payload,
+      options.template.slug,
+      options.template.variables || {}
+    )
+
+    // Template values take precedence over data values
+    emailData = {
+      ...emailData,
+      subject,
+      html,
+      text,
+    } as Partial<TEmail>
+  }
+
+  // Validate required fields
+  if (!emailData.to) {
+    throw new Error('Field "to" is required for sending emails')
+  }
+
+  // Validate required fields based on whether template was used
+  if (options.template) {
+    // When using template, subject and html should have been set by renderTemplate
+    if (!emailData.subject || !emailData.html) {
+      throw new Error(`Template rendering failed: template "${options.template.slug}" did not provide required subject and html content`)
+    }
+  } else {
+    // When not using template, user must provide subject and html directly
+    if (!emailData.subject || !emailData.html) {
+      throw new Error('Fields "subject" and "html" are required when sending direct emails without a template')
+    }
+  }
+
+  // Process email addresses using shared validation (handle null values)
+  if (emailData.to) {
+    emailData.to = parseAndValidateEmails(emailData.to as string | string[])
+  }
+  if (emailData.cc) {
+    emailData.cc = parseAndValidateEmails(emailData.cc as string | string[])
+  }
+  if (emailData.bcc) {
+    emailData.bcc = parseAndValidateEmails(emailData.bcc as string | string[])
+  }
+  if (emailData.replyTo) {
+    const validated = parseAndValidateEmails(emailData.replyTo as string | string[])
+    // replyTo should be a single email, so take the first one if array
+    emailData.replyTo = validated && validated.length > 0 ? validated[0] : undefined
+  }
+  if (emailData.from) {
+    const validated = parseAndValidateEmails(emailData.from as string | string[])
+    // from should be a single email, so take the first one if array
+    emailData.from = validated && validated.length > 0 ? validated[0] : undefined
+  }
+
+  // Sanitize fromName to prevent header injection
+  if (emailData.fromName) {
+    emailData.fromName = emailData.fromName
+      .trim()
+      // Remove/replace newlines and carriage returns to prevent header injection
+      .replace(/[\r\n]/g, ' ')
+      // Remove control characters (except space and printable characters)
+      .replace(/[\x00-\x1F\x7F-\x9F]/g, '')
+      // Note: We don't escape quotes here as that's handled in MailingService
+  }
+
+  // Normalize Date objects to ISO strings for consistent database storage
+  if (emailData.scheduledAt instanceof Date) {
+    emailData.scheduledAt = emailData.scheduledAt.toISOString()
+  }
+  if (emailData.sentAt instanceof Date) {
+    emailData.sentAt = emailData.sentAt.toISOString()
+  }
+  if (emailData.lastAttemptAt instanceof Date) {
+    emailData.lastAttemptAt = emailData.lastAttemptAt.toISOString()
+  }
+  if (emailData.createdAt instanceof Date) {
+    emailData.createdAt = emailData.createdAt.toISOString()
+  }
+  if (emailData.updatedAt instanceof Date) {
+    emailData.updatedAt = emailData.updatedAt.toISOString()
+  }
+
+  // Create the email in the collection with proper typing
+  const email = await payload.create({
+    collection: collectionSlug,
+    data: emailData
+  })
+
+  // Validate that the created email has the expected structure
+  if (!email || typeof email !== 'object' || !email.id) {
+    throw new Error('Failed to create email: invalid response from database')
+  }
+
+  return email as TEmail
+}
+
+export default sendEmail
--- a/src/services/MailingService.ts
+++ b/src/services/MailingService.ts
@@ -1,21 +1,17 @@
 import { Payload } from 'payload'
 import { Liquid } from 'liquidjs'
-import nodemailer, { Transporter } from 'nodemailer'
 import {
  MailingPluginConfig,
  TemplateVariables,
  MailingService as IMailingService,
-  EmailTemplate,
-  QueuedEmail,
-  MailingTransportConfig,
-  EmailObject
+  BaseEmail, BaseEmailTemplate, BaseEmailDocument, BaseEmailTemplateDocument
 } from '../types/index.js'
 import { serializeRichTextToHTML, serializeRichTextToText } from '../utils/richTextSerializer.js'

 export class MailingService implements IMailingService {
-  private payload: Payload
+  public payload: Payload
  private config: MailingPluginConfig
-  private transporter!: Transporter | any
+  private emailAdapter: any
  private templatesCollection: string
  private emailsCollection: string
  private liquid: Liquid | null | false = null
@@ -30,22 +26,46 @@ export class MailingService implements IMailingService {
    const emailsConfig = config.collections?.emails
    this.emailsCollection = typeof emailsConfig === 'string' ? emailsConfig : 'emails'

-    this.initializeTransporter()
+    // Use Payload's configured email adapter
+    if (!this.payload.email) {
+      throw new Error('Payload email configuration is required. Please configure email in your Payload config.')
+    }
+    this.emailAdapter = this.payload.email
  }

-  private initializeTransporter(): void {
-    if (this.config.transport) {
-      if ('sendMail' in this.config.transport) {
-        this.transporter = this.config.transport
-      } else {
-        this.transporter = nodemailer.createTransport(this.config.transport as MailingTransportConfig)
-      }
-    } else if (this.payload.email && 'sendMail' in this.payload.email) {
-      // Use Payload's configured mailer (cast to any to handle different adapter types)
-      this.transporter = this.payload.email as any
-    } else {
-      throw new Error('Email transport configuration is required either in plugin config or Payload config')
+  private ensureInitialized(): void {
+    if (!this.payload || !this.payload.db) {
+      throw new Error('MailingService payload not properly initialized')
    }
+    if (!this.emailAdapter) {
+      throw new Error('Email adapter not configured. Please ensure Payload has email configured.')
+    }
+  }
+
+  /**
+   * Sanitizes a display name for use in email headers to prevent header injection
+   * and ensure proper formatting
+   */
+  private sanitizeDisplayName(name: string): string {
+    return name
+      .trim()
+      // Remove/replace newlines and carriage returns to prevent header injection
+      .replace(/[\r\n]/g, ' ')
+      // Remove control characters (except space and printable characters)
+      .replace(/[\x00-\x1F\x7F-\x9F]/g, '')
+      // Escape quotes to prevent malformed headers
+      .replace(/"/g, '\\"')
+  }
+
+  /**
+   * Formats an email address with optional display name
+   */
+  private formatEmailAddress(email: string, displayName?: string | null): string {
+    if (displayName && displayName.trim()) {
+      const sanitizedName = this.sanitizeDisplayName(displayName)
+      return `"${sanitizedName}" <${email}>`
+    }
+    return email
  }

  private getDefaultFrom(): string {
@@ -54,9 +74,7 @@ export class MailingService implements IMailingService {

    // Check if fromName exists, is not empty after trimming, and fromEmail exists
    if (fromName && fromName.trim() && fromEmail) {
-      // Escape quotes in the display name to prevent malformed headers
-      const escapedName = fromName.replace(/"/g, '\\"')
-      return `"${escapedName}" <${fromEmail}>`
+      return this.formatEmailAddress(fromEmail, fromName)
    }

    return fromEmail || ''
@@ -108,6 +126,7 @@ export class MailingService implements IMailingService {
  }

  async renderTemplate(templateSlug: string, variables: TemplateVariables): Promise<{ html: string; text: string; subject: string }> {
+    this.ensureInitialized()
    const template = await this.getTemplateBySlug(templateSlug)

    if (!template) {
@@ -115,7 +134,7 @@ export class MailingService implements IMailingService {
    }

    const emailContent = await this.renderEmailTemplate(template, variables)
-    const subject = await this.renderTemplateString(template.subject, variables)
+    const subject = await this.renderTemplateString(template.subject || '', variables)

    return {
      html: emailContent.html,
@@ -125,6 +144,7 @@ export class MailingService implements IMailingService {
  }

  async processEmails(): Promise<void> {
+    this.ensureInitialized()
    const currentTime = new Date().toISOString()

    const { docs: pendingEmails } = await this.payload.find({
@@ -162,6 +182,7 @@ export class MailingService implements IMailingService {
  }

  async retryFailedEmails(): Promise<void> {
+    this.ensureInitialized()
    const maxAttempts = this.config.retryAttempts || 3
    const retryDelay = this.config.retryDelay || 300000 // 5 minutes
    const retryTime = new Date(Date.now() - retryDelay).toISOString()
@@ -204,7 +225,7 @@ export class MailingService implements IMailingService {
    }
  }

-  private async processEmailItem(emailId: string): Promise<void> {
+  async processEmailItem(emailId: string): Promise<void> {
    try {
      await this.payload.update({
        collection: this.emailsCollection as any,
@@ -218,10 +239,18 @@ export class MailingService implements IMailingService {
      const email = await this.payload.findByID({
        collection: this.emailsCollection as any,
        id: emailId,
-      }) as QueuedEmail
+      }) as BaseEmailDocument

-      let emailObject: EmailObject = {
-        from: email.from || this.getDefaultFrom(),
+      // Combine from and fromName for nodemailer using proper sanitization
+      let fromField: string
+      if (email.from) {
+        fromField = this.formatEmailAddress(email.from, email.fromName)
+      } else {
+        fromField = this.getDefaultFrom()
+      }
+
+      let mailOptions: any = {
+        from: fromField,
        to: email.to,
        cc: email.cc || undefined,
        bcc: email.bcc || undefined,
@@ -229,26 +258,34 @@ export class MailingService implements IMailingService {
        subject: email.subject,
        html: email.html,
        text: email.text || undefined,
-        variables: email.variables,
      }

-      // Apply emailWrapper hook if configured
-      if (this.config.emailWrapper) {
-        emailObject = await this.config.emailWrapper(emailObject)
+      // Call beforeSend hook if configured
+      if (this.config.beforeSend) {
+        try {
+          mailOptions = await this.config.beforeSend(mailOptions, email)
+
+          // Validate required properties remain intact after hook execution
+          if (!mailOptions.from) {
+            throw new Error('beforeSend hook must not remove the "from" property')
+          }
+          if (!mailOptions.to || (Array.isArray(mailOptions.to) && mailOptions.to.length === 0)) {
+            throw new Error('beforeSend hook must not remove or empty the "to" property')
+          }
+          if (!mailOptions.subject) {
+            throw new Error('beforeSend hook must not remove the "subject" property')
+          }
+          if (!mailOptions.html && !mailOptions.text) {
+            throw new Error('beforeSend hook must not remove both "html" and "text" properties')
+          }
+        } catch (error) {
+          console.error('Error in beforeSend hook:', error)
+          throw new Error(`beforeSend hook failed: ${error instanceof Error ? error.message : 'Unknown error'}`)
+        }
      }

-      const mailOptions = {
-        from: emailObject.from,
-        to: emailObject.to,
-        cc: emailObject.cc || undefined,
-        bcc: emailObject.bcc || undefined,
-        replyTo: emailObject.replyTo || undefined,
-        subject: emailObject.subject,
-        html: emailObject.html,
-        text: emailObject.text || undefined,
-      }
-
-      await this.transporter.sendMail(mailOptions)
+      // Send email using Payload's email adapter
+      await this.emailAdapter.sendEmail(mailOptions)

      await this.payload.update({
        collection: this.emailsCollection as any,
@@ -284,9 +321,9 @@ export class MailingService implements IMailingService {
    const email = await this.payload.findByID({
      collection: this.emailsCollection as any,
      id: emailId,
-    }) as QueuedEmail
+    })

-    const newAttempts = (email.attempts || 0) + 1
+    const newAttempts = ((email as any).attempts || 0) + 1

    await this.payload.update({
      collection: this.emailsCollection as any,
@@ -299,7 +336,7 @@ export class MailingService implements IMailingService {
    return newAttempts
  }

-  private async getTemplateBySlug(templateSlug: string): Promise<EmailTemplate | null> {
+  private async getTemplateBySlug(templateSlug: string): Promise<BaseEmailTemplateDocument | null> {
    try {
      const { docs } = await this.payload.find({
        collection: this.templatesCollection as any,
@@ -311,7 +348,7 @@ export class MailingService implements IMailingService {
        limit: 1,
      })

-      return docs.length > 0 ? docs[0] as EmailTemplate : null
+      return docs.length > 0 ? docs[0] as BaseEmailTemplateDocument : null
    } catch (error) {
      console.error(`Template with slug '${templateSlug}' not found:`, error)
      return null
@@ -376,7 +413,7 @@ export class MailingService implements IMailingService {
    })
  }

-  private async renderEmailTemplate(template: EmailTemplate, variables: Record<string, any> = {}): Promise<{ html: string; text: string }> {
+  private async renderEmailTemplate(template: BaseEmailTemplateDocument, variables: Record<string, any> = {}): Promise<{ html: string; text: string }> {
    if (!template.content) {
      return { html: '', text: '' }
    }
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -1,25 +1,67 @@
 import { Payload } from 'payload'
-import type { CollectionConfig, RichTextField, TypedCollection } from 'payload'
-import { Transporter } from 'nodemailer'
+import type { CollectionConfig, RichTextField } from 'payload'

-export interface EmailObject {
-  to: string | string[]
-  cc?: string | string[]
-  bcc?: string | string[]
-  from?: string
-  replyTo?: string
+// JSON value type that matches Payload's JSON field type
+export type JSONValue = string | number | boolean | { [k: string]: unknown } | unknown[] | null | undefined
+
+// Generic base interfaces that work with any ID type and null values
+export interface BaseEmailDocument {
+  id: string | number
+  template?: any
+  to: string[]
+  cc?: string[] | null
+  bcc?: string[] | null
+  from?: string | null
+  fromName?: string | null
+  replyTo?: string | null
  subject: string
  html: string
-  text?: string
-  variables?: Record<string, any>
+  text?: string | null
+  variables?: JSONValue
+  scheduledAt?: string | Date | null
+  sentAt?: string | Date | null
+  status?: 'pending' | 'processing' | 'sent' | 'failed' | null
+  attempts?: number | null
+  lastAttemptAt?: string | Date | null
+  error?: string | null
+  priority?: number | null
+  createdAt?: string | Date | null
+  updatedAt?: string | Date | null
 }

-export type EmailWrapperHook = (email: EmailObject) => EmailObject | Promise<EmailObject>
+export interface BaseEmailTemplateDocument {
+  id: string | number
+  name: string
+  slug: string
+  subject?: string | null
+  content?: any
+  createdAt?: string | Date | null
+  updatedAt?: string | Date | null
+}
+
+export type BaseEmail<TEmail extends BaseEmailDocument = BaseEmailDocument, TEmailTemplate extends BaseEmailTemplateDocument = BaseEmailTemplateDocument> = Omit<TEmail, 'id' | 'template'> & {template: Omit<TEmailTemplate, 'id'> | TEmailTemplate['id'] | undefined | null}
+
+export type BaseEmailTemplate<TEmailTemplate extends BaseEmailTemplateDocument = BaseEmailTemplateDocument> = Omit<TEmailTemplate, 'id'>

 export type TemplateRendererHook = (template: string, variables: Record<string, any>) => string | Promise<string>

 export type TemplateEngine = 'liquidjs' | 'mustache' | 'simple'

+export interface BeforeSendMailOptions {
+  from: string
+  to: string[]
+  cc?: string[]
+  bcc?: string[]
+  replyTo?: string
+  subject: string
+  html: string
+  text?: string
+  attachments?: any[]
+  [key: string]: any
+}
+
+export type BeforeSendHook = (options: BeforeSendMailOptions, email: BaseEmailDocument) => BeforeSendMailOptions | Promise<BeforeSendMailOptions>
+
 export interface MailingPluginConfig {
  collections?: {
    templates?: string | Partial<CollectionConfig>
@@ -27,58 +69,37 @@ export interface MailingPluginConfig {
  }
  defaultFrom?: string
  defaultFromName?: string
-  transport?: Transporter | MailingTransportConfig
  queue?: string
  retryAttempts?: number
  retryDelay?: number
-  emailWrapper?: EmailWrapperHook
  templateRenderer?: TemplateRendererHook
  templateEngine?: TemplateEngine
  richTextEditor?: RichTextField['editor']
+  beforeSend?: BeforeSendHook
  onReady?: (payload: any) => Promise<void>
  initOrder?: 'before' | 'after'
 }

-export interface MailingTransportConfig {
-  host: string
-  port: number
-  secure?: boolean
-  auth?: {
-    user: string
-    pass: string
-  }
-}
-
-export interface EmailTemplate {
-  id: string
-  name: string
-  slug: string
-  subject: string
-  content: any // Lexical editor state
-  createdAt: string
-  updatedAt: string
-}
-
-
 export interface QueuedEmail {
  id: string
-  template?: string
+  template?: string | null
  to: string[]
-  cc?: string[]
-  bcc?: string[]
-  from?: string
-  replyTo?: string
+  cc?: string[] | null
+  bcc?: string[] | null
+  from?: string | null
+  fromName?: string | null
+  replyTo?: string | null
  subject: string
  html: string
-  text?: string
-  variables?: Record<string, any>
-  scheduledAt?: string
-  sentAt?: string
+  text?: string | null
+  variables?: JSONValue
+  scheduledAt?: string | Date | null
+  sentAt?: string | Date | null
  status: 'pending' | 'processing' | 'sent' | 'failed'
  attempts: number
-  lastAttemptAt?: string
-  error?: string
-  priority?: number
+  lastAttemptAt?: string | Date | null
+  error?: string | null
+  priority?: number | null
  createdAt: string
  updatedAt: string
 }
@@ -90,6 +111,7 @@ export interface TemplateVariables {

 export interface MailingService {
  processEmails(): Promise<void>
+  processEmailItem(emailId: string): Promise<void>
  retryFailedEmails(): Promise<void>
  renderTemplate(templateSlug: string, variables: TemplateVariables): Promise<{ html: string; text: string; subject: string }>
 }
--- a/src/utils/emailProcessor.ts
+++ b/src/utils/emailProcessor.ts
@@ -0,0 +1,61 @@
+import type { Payload } from 'payload'
+
+/**
+ * Processes a single email by ID using the mailing service
+ * @param payload Payload instance
+ * @param emailId The ID of the email to process
+ * @returns Promise that resolves when email is processed
+ */
+export async function processEmailById(payload: Payload, emailId: string): Promise<void> {
+  // Get mailing context from payload
+  const mailingContext = (payload as any).mailing
+
+  if (!mailingContext) {
+    throw new Error(
+      'Mailing plugin not found on payload instance. ' +
+      'Ensure the mailingPlugin is properly configured in your Payload config plugins array.'
+    )
+  }
+
+  if (!mailingContext.service) {
+    throw new Error(
+      'Mailing service not available. ' +
+      'The plugin may not have completed initialization. ' +
+      'Check that email configuration is properly set up in your Payload config.'
+    )
+  }
+
+  // Process the specific email
+  await mailingContext.service.processEmailItem(emailId)
+}
+
+/**
+ * Processes all pending and failed emails using the mailing service
+ * @param payload Payload instance
+ * @returns Promise that resolves when all emails are processed
+ */
+export async function processAllEmails(payload: Payload): Promise<void> {
+  // Get mailing context from payload
+  const mailingContext = (payload as any).mailing
+
+  if (!mailingContext) {
+    throw new Error(
+      'Mailing plugin not found on payload instance. ' +
+      'Ensure the mailingPlugin is properly configured in your Payload config plugins array.'
+    )
+  }
+
+  if (!mailingContext.service) {
+    throw new Error(
+      'Mailing service not available. ' +
+      'The plugin may not have completed initialization. ' +
+      'Check that email configuration is properly set up in your Payload config.'
+    )
+  }
+
+  // Process pending emails first
+  await mailingContext.service.processEmails()
+
+  // Then retry failed emails
+  await mailingContext.service.retryFailedEmails()
+}
--- a/src/utils/helpers.ts
+++ b/src/utils/helpers.ts
@@ -1,6 +1,41 @@
 import { Payload } from 'payload'
 import { TemplateVariables } from '../types/index.js'

+/**
+ * Parse and validate email addresses
+ * @internal
+ */
+export const parseAndValidateEmails = (emails: string | string[] | null | undefined): string[] | undefined => {
+  if (!emails || emails === null) return undefined
+
+  let emailList: string[]
+  if (Array.isArray(emails)) {
+    emailList = emails
+  } else {
+    emailList = emails.split(',').map(email => email.trim()).filter(Boolean)
+  }
+
+  // RFC 5322 compliant email validation
+  const emailRegex = /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/
+  const invalidEmails = emailList.filter(email => {
+    // Check basic format
+    if (!emailRegex.test(email)) return true
+    // Check for common invalid patterns
+    if (email.includes('..') || email.startsWith('.') || email.endsWith('.')) return true
+    if (email.includes('@.') || email.includes('.@')) return true
+    // Check domain has at least one dot
+    const parts = email.split('@')
+    if (parts.length !== 2 || !parts[1].includes('.')) return true
+    return false
+  })
+
+  if (invalidEmails.length > 0) {
+    throw new Error(`Invalid email addresses: ${invalidEmails.join(', ')}`)
+  }
+
+  return emailList
+}
+
 export const getMailing = (payload: Payload) => {
  const mailing = (payload as any).mailing
  if (!mailing) {