v1.2.7 - Outreach tracked per campaign.

GenRevo89 · web-flow · commit 5cbace0c679b · 2026-03-25T14:54:03.000-06:00
diff --git a/app/(routes)/crm/accounts/lists/[listId]/page.tsx b/app/(routes)/crm/accounts/lists/[listId]/page.tsx
@@ -441,7 +441,7 @@ export default function AccountListDetailsPage() {
                                                 variant="ghost"
                                                 size="icon"
                                                 className="text-muted-foreground hover:text-destructive hover:bg-destructive/10 transition-colors"
-                                                onClick={() => setLeadToDelete(lead)}
+                                                onClick={(e) => { e.stopPropagation(); setLeadToDelete(lead); }}
                                                 disabled={deleting === lead.id}
                                             >
                                                 {deleting === lead.id ? (
diff --git a/app/api/campaigns/route.ts b/app/api/campaigns/route.ts
@@ -235,6 +235,11 @@ export async function POST(req: Request) {
             },
         });
 
+        // NOTE: Lead-level outreach_status is NOT reset here. The send route
+        // (POST /api/outreach/send) overwrites outreach_status to "SENT" for each
+        // lead as emails are dispatched. Old campaign data in crm_Outreach_Items
+        // remains untouched — each campaign tracks replies/opens via its own items.
+
         // Register CRON job for auto follow-ups if enabled
         if (followupConfig?.enabled && user?.team_id) {
             try {
diff --git a/app/api/email/inbound/route.ts b/app/api/email/inbound/route.ts
@@ -62,21 +62,21 @@ export async function POST(req: Request) {
       const normalizeId = (id?: string) => id?.replace(/[<>]/g, "").trim();
       const inReplyTo = normalizeId(inReplyToHeader);
       
-      let matchedOutreachItem = null;
+      let matchedOutreachItem: any = null;
 
       // Match via In-Reply-To — try both normalized and raw formats
       if (inReplyTo) {
         // First try without angle brackets (normalized)
         matchedOutreachItem = await prismadb.crm_Outreach_Items.findFirst({
           where: { message_id: inReplyTo },
-          select: { id: true, campaign: true, lead: true, account_id: true, subject: true },
+          select: { id: true, campaign: true, lead: true, account_id: true, subject: true, sender_email: true },
         });
         
         // Also try with angle brackets (some providers store them that way)
         if (!matchedOutreachItem && inReplyToHeader) {
           matchedOutreachItem = await prismadb.crm_Outreach_Items.findFirst({
             where: { message_id: inReplyToHeader.trim() },
-            select: { id: true, campaign: true, lead: true, account_id: true, subject: true },
+            select: { id: true, campaign: true, lead: true, account_id: true, subject: true, sender_email: true },
           });
         }
       }
@@ -89,7 +89,7 @@ export async function POST(req: Request) {
         if (allRefs.length > 0) {
           matchedOutreachItem = await prismadb.crm_Outreach_Items.findFirst({
             where: { message_id: { in: allRefs } },
-            select: { id: true, campaign: true, lead: true, account_id: true, subject: true },
+            select: { id: true, campaign: true, lead: true, account_id: true, subject: true, sender_email: true },
           });
         }
       }
@@ -106,6 +106,18 @@ export async function POST(req: Request) {
         });
       }
 
+      // Resolve the correct user for routing: prefer sender_email lookup over campaign owner
+      let resolvedUserId = campaignRecord?.user || undefined;
+      if (matchedOutreachItem?.sender_email) {
+        try {
+          const senderUser = await prismadb.users.findFirst({
+            where: { email: matchedOutreachItem.sender_email },
+            select: { id: true },
+          });
+          if (senderUser) resolvedUserId = senderUser.id;
+        } catch { /* fall back to campaign owner */ }
+      }
+
       let finalLeadId = matchedOutreachItem?.lead || undefined;
       let sentimentResult: any = null;
 
@@ -119,7 +131,7 @@ export async function POST(req: Request) {
               originalSubject: matchedOutreachItem.subject || subject,
               leadName: isAccountOnly ? "Account Contact" : undefined,
             },
-            campaignRecord?.user || "sysadm"
+            resolvedUserId || "sysadm"
           );
 
           if (isAccountOnly && sentimentResult?.extractedContact) {
@@ -155,7 +167,7 @@ export async function POST(req: Request) {
       const newThread = await prismadb.crm_Email_Thread.create({
         data: {
           team_id: campaignRecord?.team_id || "600000000000000000000000",
-          user: campaignRecord?.user || undefined,
+          user: resolvedUserId,
           lead: finalLeadId,
           campaign: matchedOutreachItem?.campaign || undefined,
           outreach_item: matchedOutreachItem?.id || undefined,
diff --git a/app/api/outreach/send/route.ts b/app/api/outreach/send/route.ts
@@ -587,19 +587,32 @@ export async function POST(req: Request) {
           const resolvedSenderName = senderName || session.user.name || "Outreach";
           const replyToAddress = `"${resolvedSenderName}" <${userEmailPrefix}@${inboundDomain}>`;
 
+          // Track the actual sender email for inbound routing
+          let actualSenderEmail = session.user.email || '';
+
           if (senderMode === "personal") {
             // Personal mode: send via Amazon SES using the user's identity
+            actualSenderEmail = session.user.email || process.env.SES_FROM_ADDRESS || 'noreply@basalthq.com';
             await sendSystemEmail({
               to: toEmail,
               subject,
               text,
               html,
-              from: `"${resolvedSenderName}" <${session.user.email || process.env.SES_FROM_ADDRESS || 'noreply@basalthq.com'}>`,
+              from: `"${resolvedSenderName}" <${actualSenderEmail}>`,
               replyTo: replyToAddress,
             }).then(id => { messageId = id || `ses_personal_${Date.now()}`; });
           } else {
             // Company mode: use team email config
             try {
+              // Resolve the team's outbound email for tracking
+              try {
+                const teamOutbound = await prismadb.teamEmailConfig.findUnique({
+                  where: { team_id_purpose: { team_id: user.team_id!, purpose: "OUTREACH" } },
+                  select: { smtp_user: true },
+                });
+                if (teamOutbound?.smtp_user) actualSenderEmail = teamOutbound.smtp_user;
+              } catch { /* keep session email */ }
+
               const teamMsgId = await sendTeamEmail(user.team_id, {
                 to: toEmail,
                 subject,
@@ -613,12 +626,13 @@ export async function POST(req: Request) {
               // Team email not configured — for test mode, fall back to system email
               if (testMode) {
                 systemLogger.warn("[OUTREACH_SEND] Team email failed in test mode, falling back to system email:", teamErr?.message);
+                actualSenderEmail = process.env.SES_FROM_ADDRESS || 'noreply@basalthq.com';
                 const fallbackMsgId = await sendSystemEmail({
                   to: toEmail,
                   subject,
                   text,
                   html,
-                  from: process.env.SES_FROM_ADDRESS || 'noreply@basalthq.com',
+                  from: actualSenderEmail,
                   replyTo: replyToAddress,
                 });
                 messageId = fallbackMsgId || `test_system_sent_${Date.now()}`;
@@ -673,6 +687,7 @@ export async function POST(req: Request) {
                   candidate_job_title: lead.jobTitle || undefined,
                   account_id: pipelineResult.accountId,
                   contact_id: pipelineResult.contactId,
+                  sender_email: actualSenderEmail,
                 },
               });
 
@@ -744,6 +759,7 @@ export async function POST(req: Request) {
                       candidate_name: [lead.firstName, lead.lastName].filter(Boolean).join(" ") || null,
                       candidate_company: lead.company || null,
                       candidate_job_title: lead.jobTitle || null,
+                      sender_email: actualSenderEmail,
                     } as any,
                   });
                 } catch (itemErr: any) {
@@ -778,6 +794,7 @@ export async function POST(req: Request) {
                     candidate_company: lead.company || null,
                     candidate_job_title: lead.jobTitle || null,
                     account_id: lead.id,
+                    sender_email: actualSenderEmail,
                   } as any,
                 }).catch((e: any) => systemLogger.warn(`[OUTREACH_SEND] Failed to create outreach item for account ${lead.id}: ${e?.message}`));
               }
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -551,6 +551,9 @@ model crm_Outreach_Items {
   error_message String?
   retry_count   Int     @default(0)
 
+  // Sender tracking (which email address was used to send this item)
+  sender_email  String?
+
   // Relations
   assigned_campaign crm_Outreach_Campaigns? @relation(fields: [campaign], references: [id])
   assigned_lead     crm_Leads?              @relation(name: "OutreachItemsLead", fields: [lead], references: [id])

Original file line number	Diff line number	Diff line change
`@@ -441,7 +441,7 @@ export default function AccountListDetailsPage() {`
`441`	`441`	`variant="ghost"`
`442`	`442`	`size="icon"`
`443`	`443`	`className="text-muted-foreground hover:text-destructive hover:bg-destructive/10 transition-colors"`
`444`		`- onClick={() => setLeadToDelete(lead)}`
	`444`	`+ onClick={(e) => { e.stopPropagation(); setLeadToDelete(lead); }}`
`445`	`445`	`disabled={deleting === lead.id}`
`446`	`446`	`>`
`447`	`447`	`{deleting === lead.id ? (`