update

backend/app/crm_lead_contacts.py

@@ -0,0 +1,114 @@
+"""Link CRM leads to Contacts rows (campaign replies, CTA forms, manual move)."""
+
+from __future__ import annotations
+
+from typing import Any, Dict
+
+from sqlalchemy import func
+from sqlalchemy.orm import Session
+
+from .database import Contact, CrmLead
+
+SMARTLEAD_IMPORT_FILE_ID = "smartlead-imports"
+MANUAL_CONTACT_FILE_ID = "manual-contacts"
+CTA_FORM_SOURCE = "cta_form"
+
+
+def is_cta_form_lead(lead: CrmLead) -> bool:
+    rw = lead.raw_webhook if isinstance(lead.raw_webhook, dict) else {}
+    if rw.get("source") == CTA_FORM_SOURCE:
+        return True
+    return (lead.smartlead_lead_id or "").startswith("cta-")
+
+
+def _merge_lead_fields_into_contact(contact: Contact, lead: CrmLead) -> None:
+    if lead.first_name:
+        contact.first_name = lead.first_name
+    if lead.last_name:
+        contact.last_name = lead.last_name
+    if lead.company_name:
+        contact.company = lead.company_name
+    if lead.title:
+        contact.title = lead.title
+    rd: Dict[str, Any] = dict(contact.raw_data or {})
+    rd["First Name"] = contact.first_name or rd.get("First Name", "")
+    rd["Last Name"] = contact.last_name or rd.get("Last Name", "")
+    rd["Email"] = (contact.email or lead.email or rd.get("Email", "")).strip()
+    rd["Company Name"] = contact.company or rd.get("Company Name", "")
+    rd["Title"] = contact.title or rd.get("Title", "")
+    if lead.last_reply_subject:
+        rd["last_reply_subject"] = lead.last_reply_subject
+    if lead.last_reply_body:
+        rd["last_reply_body"] = lead.last_reply_body
+    contact.raw_data = rd
+
+
+def _contact_raw_for_lead(lead: CrmLead, *, is_cta: bool) -> dict:
+    if is_cta:
+        rw = lead.raw_webhook if isinstance(lead.raw_webhook, dict) else {}
+        return {
+            "First Name": lead.first_name or "",
+            "Last Name": lead.last_name or "",
+            "Email": (lead.email or "").strip(),
+            "Company Name": lead.company_name or "",
+            "Title": lead.title or "",
+            "source": CTA_FORM_SOURCE,
+            "form_id": rw.get("form_id"),
+            "form_public_id": rw.get("form_public_id"),
+            "form_name": rw.get("form_name"),
+            "last_reply_subject": lead.last_reply_subject or "",
+            "last_reply_body": lead.last_reply_body or "",
+            "cta_form_submission": rw,
+        }
+    return {
+        "Company Name": lead.company_name or "",
+        "Title": lead.title or "",
+        "source": "smartlead_reply",
+        "smartlead_lead_id": lead.smartlead_lead_id,
+        "campaign_id": lead.campaign_id,
+        "last_reply_subject": lead.last_reply_subject,
+        "last_reply_body": lead.last_reply_body,
+        "smartlead_webhook": lead.raw_webhook,
+    }
+
+
+def link_lead_to_contact(db: Session, lead: CrmLead) -> dict:
+    """Create or link a Contact for this lead. CTA leads use manual-style contacts (enrichable)."""
+    if lead.contact_id:
+        return {"ok": True, "contact_id": lead.contact_id, "message": "Already linked to Contacts"}
+
+    email = (lead.email or "").strip()
+    if not email:
+        return {"ok": False, "error": "Lead has no email"}
+
+    is_cta = is_cta_form_lead(lead)
+    existing = (
+        db.query(Contact)
+        .filter(
+            Contact.tenant_id == lead.tenant_id,
+            func.lower(Contact.email) == email.lower(),
+        )
+        .first()
+    )
+    if existing:
+        lead.contact_id = existing.id
+        if is_cta:
+            _merge_lead_fields_into_contact(existing, lead)
+        return {"ok": True, "contact_id": existing.id, "message": "Linked to existing contact"}
+
+    contact = Contact(
+        tenant_id=lead.tenant_id,
+        file_id=MANUAL_CONTACT_FILE_ID if is_cta else SMARTLEAD_IMPORT_FILE_ID,
+        row_index=lead.id,
+        first_name=lead.first_name or "",
+        last_name=lead.last_name or "",
+        email=email,
+        company=lead.company_name or "",
+        title=lead.title or "",
+        source=CTA_FORM_SOURCE if is_cta else "smartlead",
+        raw_data=_contact_raw_for_lead(lead, is_cta=is_cta),
+    )
+    db.add(contact)
+    db.flush()
+    lead.contact_id = contact.id
+    return {"ok": True, "contact_id": contact.id, "message": "Contact created"}

backend/app/cta_forms_routes.py

@@ -15,6 +15,7 @@ from fastapi.responses import JSONResponse, PlainTextResponse, Response
 from sqlalchemy.orm import Session
 
 from .database import CrmLead, CtaForm, db_commit_with_retry, get_db
+from .crm_lead_contacts import link_lead_to_contact
 from .models import CtaFormCreateRequest, CtaFormPatchRequest, CtaFormSubmitRequest
 from .tenant_deps import TenantContext, get_tenant_context
 
@@ -269,6 +270,7 @@ def _create_lead_from_submission(
     )
     db.add(row)
     db.flush()
+    link_lead_to_contact(db, row)
     return row
 
 

backend/app/main.py

@@ -83,6 +83,11 @@ from .tenant_deps import TenantContext, get_tenant_context
 from .tenant_routes import router as tenant_router
 from .outreach_routes import router as outreach_router
 from .cta_forms_routes import router as cta_forms_router, lead_is_cta_form
+from .crm_lead_contacts import (
+    MANUAL_CONTACT_FILE_ID,
+    SMARTLEAD_IMPORT_FILE_ID,
+    link_lead_to_contact,
+)
 from .outreach_routes import (
     _format_wait_step_label,
     parse_tracking_label,
@@ -741,8 +746,6 @@ DEAL_LOST_REASON_ALLOWED = frozenset({
     "unknown",
 })
 DEAL_REVENUE_TYPE_ALLOWED = frozenset({"arr", "qrr", "mrr", "one_time"})
-SMARTLEAD_IMPORT_FILE_ID = "smartlead-imports"
-MANUAL_CONTACT_FILE_ID = "manual-contacts"
 DEMO_CONTACTS_FILE_ID = "demo-contacts-crm"
 
 
@@ -939,48 +942,7 @@ def _crm_lead_to_dict(row: CrmLead) -> dict:
 
 
 def _move_lead_to_contacts_core(db: Session, lead: CrmLead) -> dict:
-    if lead.contact_id:
-        return {"ok": True, "contact_id": lead.contact_id, "message": "Already linked to Contacts"}
-    email = (lead.email or "").strip()
-    if not email:
-        return {"ok": False, "error": "Lead has no email"}
-    existing = (
-        db.query(Contact)
-        .filter(
-            Contact.tenant_id == lead.tenant_id,
-            func.lower(Contact.email) == email.lower(),
-        )
-        .first()
-    )
-    if existing:
-        lead.contact_id = existing.id
-        return {"ok": True, "contact_id": existing.id, "message": "Linked to existing contact"}
-    raw = {
-        "Company Name": lead.company_name or "",
-        "Title": lead.title or "",
-        "source": "smartlead_reply",
-        "smartlead_lead_id": lead.smartlead_lead_id,
-        "campaign_id": lead.campaign_id,
-        "last_reply_subject": lead.last_reply_subject,
-        "last_reply_body": lead.last_reply_body,
-        "smartlead_webhook": lead.raw_webhook,
-    }
-    contact = Contact(
-        tenant_id=lead.tenant_id,
-        file_id=SMARTLEAD_IMPORT_FILE_ID,
-        row_index=lead.id,
-        first_name=lead.first_name or "",
-        last_name=lead.last_name or "",
-        email=email,
-        company=lead.company_name or "",
-        title=lead.title or "",
-        source="smartlead",
-        raw_data=raw,
-    )
-    db.add(contact)
-    db.flush()
-    lead.contact_id = contact.id
-    return {"ok": True, "contact_id": contact.id, "message": "Contact created"}
+    return link_lead_to_contact(db, lead)
 
 
 CONTACTS_TO_LEADS_CAMPAIGN_ID = "contacts_import"
@@ -3887,10 +3849,10 @@ async def enrich_contact(contact_id: int, t: TenantContext = Depends(get_tenant_
     if not contact:
         raise HTTPException(status_code=404, detail="Contact not found")
     src = (contact.source or "").strip().lower()
-    if src != "manual" and contact.file_id != MANUAL_CONTACT_FILE_ID:
+    if src not in ("manual", "cta_form") and contact.file_id != MANUAL_CONTACT_FILE_ID:
         raise HTTPException(
             status_code=400,
-            detail="Enrich is only available for manually added contacts",
+            detail="Enrich is only available for manually added or form-submission contacts",
         )
 
     seed = {
@@ -5354,6 +5316,10 @@ async def get_lead(lead_id: int, t: TenantContext = Depends(get_tenant_context))
     )
     if not row:
         raise HTTPException(status_code=404, detail="Lead not found")
+    if lead_is_cta_form(row) and not row.contact_id:
+        link_lead_to_contact(db, row)
+        db.commit()
+        db.refresh(row)
     d = _crm_lead_to_dict(row)
     if row.contact_id:
         c = (

frontend/src/pages/Contacts.jsx

@@ -405,7 +405,10 @@ export default function Contacts() {
     );
 
     const isManualContact =
-        selectedContactDetails?.source === 'manual' || selectedContact?.source === 'manual';
+        selectedContactDetails?.source === 'manual' ||
+        selectedContactDetails?.source === 'cta_form' ||
+        selectedContact?.source === 'manual' ||
+        selectedContact?.source === 'cta_form';
 
     const enrichContactFromGpt = async () => {
         if (!selectedContact?.id) return;