update

backend/app/main.py

@@ -297,6 +297,7 @@ def _crm_lead_to_dict(row: CrmLead) -> dict:
         "contact_id": row.contact_id,
         "created_at": row.created_at.isoformat() if row.created_at else None,
         "updated_at": row.updated_at.isoformat() if row.updated_at else None,
+        "company_details": _lead_company_details_dict(row),
     }
 
 
@@ -728,6 +729,90 @@ async def get_contact(contact_id: int, db: Session = Depends(get_db)):
     }
 
 
+# Merged into Contact.raw_data["Company Name for Emails"], etc. (Apollo CSV keys)
+COMPANY_DETAIL_PATCH_FIELDS = {
+    "company_name_for_emails": "Company Name for Emails",
+    "industry": "Industry",
+    "employees": "# Employees",
+    "annual_revenue": "Annual Revenue",
+    "last_raised_at": "Last Raised At",
+    "website": "Website",
+    "city": "City",
+    "state": "State",
+    "country_region": "Country",
+}
+
+
+def _contact_company_details_dict(c: Contact) -> dict:
+    rd = c.raw_data or {}
+    return {
+        "Company Name": _safe_str(c.company or rd.get("Company Name")),
+        "Company Name for Emails": _safe_str(rd.get("Company Name for Emails")),
+        "Industry": _safe_str(rd.get("Industry")),
+        "# Employees": _safe_str(rd.get("# Employees")),
+        "Annual Revenue": _safe_str(rd.get("Annual Revenue")),
+        "Last Raised At": _safe_str(rd.get("Last Raised At")),
+        "Website": _safe_str(rd.get("Website")),
+        "City": _safe_str(rd.get("City")),
+        "State": _safe_str(rd.get("State")),
+        "Country": _safe_str(rd.get("Country")),
+    }
+
+
+def _merge_contact_raw_company_details(contact: Contact, patch: dict) -> None:
+    rd = dict(contact.raw_data or {})
+    for py_key, raw_key in COMPANY_DETAIL_PATCH_FIELDS.items():
+        if py_key in patch:
+            rd[raw_key] = _safe_str(patch[py_key])
+    contact.raw_data = rd
+
+
+def _lead_company_details_dict(row: CrmLead) -> dict:
+    rw = row.raw_webhook if isinstance(row.raw_webhook, dict) else {}
+    cd = rw.get("company_details") if isinstance(rw.get("company_details"), dict) else {}
+    return {
+        "Company Name": _safe_str(row.company_name or cd.get("Company Name")),
+        "Company Name for Emails": _safe_str(cd.get("Company Name for Emails")),
+        "Industry": _safe_str(cd.get("Industry")),
+        "# Employees": _safe_str(cd.get("# Employees")),
+        "Annual Revenue": _safe_str(cd.get("Annual Revenue")),
+        "Last Raised At": _safe_str(cd.get("Last Raised At")),
+        "Website": _safe_str(cd.get("Website")),
+        "City": _safe_str(cd.get("City")),
+        "State": _safe_str(cd.get("State")),
+        "Country": _safe_str(cd.get("Country")),
+    }
+
+
+def _deal_fallback_company_details(d: CrmDeal) -> dict:
+    return {
+        "Company Name": _safe_str(d.account_name),
+        "Company Name for Emails": "",
+        "Industry": "",
+        "# Employees": "",
+        "Annual Revenue": "",
+        "Last Raised At": "",
+        "Website": "",
+        "City": "",
+        "State": "",
+        "Country": _safe_str(d.country),
+    }
+
+
+def _enrich_deal_response(db: Session, row: CrmDeal) -> dict:
+    out = _deal_to_dict(row)
+    if row.contact_id:
+        c = db.query(Contact).filter(Contact.id == row.contact_id).first()
+        if c:
+            out["company_details"] = _contact_company_details_dict(c)
+            out["company_details_contact_id"] = c.id
+        else:
+            out["company_details"] = _deal_fallback_company_details(row)
+    else:
+        out["company_details"] = _deal_fallback_company_details(row)
+    return out
+
+
 def _sync_contact_raw_from_columns(contact: Contact) -> None:
     rd = dict(contact.raw_data or {})
     rd["First Name"] = contact.first_name or ""
@@ -767,6 +852,7 @@ async def patch_contact(contact_id: int, body: ContactPatchRequest, db: Session
     if "title" in data:
         contact.title = _safe_str(data["title"])
     _sync_contact_raw_from_columns(contact)
+    _merge_contact_raw_company_details(contact, data)
     db.commit()
     db.refresh(contact)
     return {
@@ -1805,6 +1891,14 @@ async def patch_lead(lead_id: int, body: CrmLeadPatchRequest, db: Session = Depe
                     detail="Another lead already uses this email",
                 )
         row.email = email
+    rw = dict(row.raw_webhook) if isinstance(row.raw_webhook, dict) else {}
+    cd = dict(rw.get("company_details") or {}) if isinstance(rw.get("company_details"), dict) else {}
+    cd["Company Name"] = row.company_name or ""
+    for py_key, raw_key in COMPANY_DETAIL_PATCH_FIELDS.items():
+        if py_key in data:
+            cd[raw_key] = _safe_str(data[py_key])
+    rw["company_details"] = cd
+    row.raw_webhook = rw
     row.updated_at = datetime.utcnow()
     db.commit()
     db.refresh(row)
@@ -1964,7 +2058,7 @@ async def get_deal(deal_id: int, db: Session = Depends(get_db)):
     row = db.query(CrmDeal).filter(CrmDeal.id == deal_id).first()
     if not row:
         raise HTTPException(status_code=404, detail="Deal not found")
-    return _deal_to_dict(row)
+    return _enrich_deal_response(db, row)
 
 
 @app.patch("/api/deals/{deal_id}")
@@ -2002,10 +2096,27 @@ async def patch_deal(deal_id: int, body: CrmDealPatchRequest, db: Session = Depe
     if "last_interaction_at" in data:
         ts = _to_datetime(data["last_interaction_at"])
         row.last_interaction_at = ts
+
+    c = None
+    if row.contact_id:
+        c = db.query(Contact).filter(Contact.id == row.contact_id).first()
+    if "account_name" in data and c:
+        c.company = row.account_name
+    if c:
+        _sync_contact_raw_from_columns(c)
+        if any(k in data for k in COMPANY_DETAIL_PATCH_FIELDS):
+            _merge_contact_raw_company_details(c, data)
+        if "country_region" in data:
+            row.country = _safe_str(data["country_region"])
+        if "country" in data and "country_region" not in data:
+            rd = dict(c.raw_data or {})
+            rd["Country"] = _safe_str(data["country"])
+            c.raw_data = rd
+        db.add(c)
     row.updated_at = datetime.utcnow()
     db.commit()
     db.refresh(row)
-    return _deal_to_dict(row)
+    return _enrich_deal_response(db, row)
 
 
 @app.post("/api/deals/seed-demo")

backend/app/models.py

@@ -42,6 +42,16 @@ class CrmLeadPatchRequest(BaseModel):
     title: Optional[str] = None
     last_reply_subject: Optional[str] = None
     last_reply_body: Optional[str] = None
+    # Stored under raw_webhook["company_details"] (same Apollo keys as Contacts raw_data)
+    company_name_for_emails: Optional[str] = None
+    industry: Optional[str] = None
+    employees: Optional[str] = None
+    annual_revenue: Optional[str] = None
+    last_raised_at: Optional[str] = None
+    website: Optional[str] = None
+    city: Optional[str] = None
+    state: Optional[str] = None
+    country_region: Optional[str] = None
 
 
 class ContactCreateRequest(BaseModel):
@@ -58,6 +68,16 @@ class ContactPatchRequest(BaseModel):
     email: Optional[str] = None
     company: Optional[str] = None
     title: Optional[str] = None
+    # Merged into raw_data (Apollo CSV-style keys)
+    company_name_for_emails: Optional[str] = None
+    industry: Optional[str] = None
+    employees: Optional[str] = None
+    annual_revenue: Optional[str] = None
+    last_raised_at: Optional[str] = None
+    website: Optional[str] = None
+    city: Optional[str] = None
+    state: Optional[str] = None
+    country_region: Optional[str] = None  # raw_data["Country"]
 
 
 class BulkLeadIdsRequest(BaseModel):
@@ -86,6 +106,16 @@ class CrmDealPatchRequest(BaseModel):
     contact_display: Optional[str] = None
     account_name: Optional[str] = None
     last_interaction_at: Optional[str] = None  # ISO date or datetime
+    # When deal has contact_id, merged into that contact's raw_data (Apollo keys)
+    company_name_for_emails: Optional[str] = None
+    industry: Optional[str] = None
+    employees: Optional[str] = None
+    annual_revenue: Optional[str] = None
+    last_raised_at: Optional[str] = None
+    website: Optional[str] = None
+    city: Optional[str] = None
+    state: Optional[str] = None
+    country_region: Optional[str] = None
 
 
 class SmartleadRunResponse(BaseModel):

frontend/src/components/workspace/CompanyDetailsEditor.jsx

@@ -0,0 +1,142 @@
+import React, { useEffect, useState } from 'react';
+import { Loader2 } from 'lucide-react';
+import { Button } from '@/components/ui/button';
+import { Input } from '@/components/ui/input';
+import { cn } from '@/lib/utils';
+
+function formFromDetails(cd, fallbackCompany = '') {
+    const d = cd || {};
+    return {
+        companyName: d['Company Name'] || fallbackCompany || '',
+        companyNameForEmails: d['Company Name for Emails'] || '',
+        industry: d['Industry'] || '',
+        employees: d['# Employees'] || '',
+        annualRevenue: d['Annual Revenue'] || '',
+        lastRaisedAt: d['Last Raised At'] || '',
+        website: d['Website'] || '',
+        city: d['City'] || '',
+        state: d['State'] || '',
+        country: d['Country'] || '',
+    };
+}
+
+function buildPatch(variant, form, dealLinkedContact) {
+    const detail = {
+        company_name_for_emails: form.companyNameForEmails,
+        industry: form.industry,
+        employees: form.employees,
+        annual_revenue: form.annualRevenue,
+        last_raised_at: form.lastRaisedAt,
+        website: form.website,
+        city: form.city,
+        state: form.state,
+        country_region: form.country,
+    };
+    if (variant === 'contact') {
+        return { company: form.companyName, ...detail };
+    }
+    if (variant === 'lead') {
+        return { company_name: form.companyName, ...detail };
+    }
+    if (variant === 'deal') {
+        if (dealLinkedContact) {
+            return { account_name: form.companyName, ...detail };
+        }
+        return {
+            account_name: form.companyName,
+            country: form.country,
+        };
+    }
+    return detail;
+}
+
+/**
+ * Editable “Company details” card (two-column grid) + Save, for Contacts / Leads / Deals slide-overs.
+ * `companyDetails` uses Apollo-style keys from the API (`company_details` or contact `raw_data`).
+ */
+export default function CompanyDetailsEditor({
+    variant,
+    companyDetails,
+    fallbackCompanyName = '',
+    dealLinkedContact = false,
+    onSave,
+    className,
+}) {
+    const [form, setForm] = useState(() => formFromDetails(companyDetails, fallbackCompanyName));
+    const [saving, setSaving] = useState(false);
+
+    useEffect(() => {
+        setForm(formFromDetails(companyDetails, fallbackCompanyName));
+    }, [companyDetails, fallbackCompanyName]);
+
+    const dealLimited = variant === 'deal' && !dealLinkedContact;
+    const isInputDisabled = (key) => dealLimited && key !== 'companyName' && key !== 'country';
+
+    const setField = (key, value) => setForm((f) => ({ ...f, [key]: value }));
+
+    const handleSave = async () => {
+        setSaving(true);
+        try {
+            await onSave(buildPatch(variant, form, dealLinkedContact));
+        } finally {
+            setSaving(false);
+        }
+    };
+
+    const row = (label, key, opts = {}) => (
+        <div className={opts.span === 2 ? 'sm:col-span-2' : ''}>
+            <label className="block text-xs font-medium text-slate-500 mb-1">{label}</label>
+            <Input
+                value={form[key]}
+                onChange={(e) => setField(key, e.target.value)}
+                disabled={isInputDisabled(key)}
+                className="text-sm bg-white"
+                placeholder={opts.placeholder}
+            />
+        </div>
+    );
+
+    return (
+        <div
+            className={cn(
+                'rounded-xl border border-slate-200 bg-slate-50/50 p-4 mb-6 flex flex-col gap-4',
+                className
+            )}
+        >
+            <h4 className="text-sm font-semibold text-slate-700">Company details</h4>
+
+            {dealLimited ? (
+                <p className="text-xs text-slate-500">
+                    Link this deal to a contact to edit full company attributes. Account name and country can be edited
+                    below.
+                </p>
+            ) : null}
+
+            <div className="grid grid-cols-1 sm:grid-cols-2 gap-3 text-sm">
+                {row('Company Name', 'companyName')}
+                {row('Company Name for Emails', 'companyNameForEmails')}
+                {row('Industry', 'industry', { span: 2 })}
+                {row('Employees', 'employees', { detail: true })}
+                {row('Annual Revenue', 'annualRevenue', { detail: true })}
+                {row('Last Raised At', 'lastRaisedAt', { detail: true })}
+                {row('Website', 'website', { detail: true, placeholder: 'https://' })}
+                {row('City', 'city', { detail: true })}
+                {row('State', 'state', { detail: true })}
+                {row('Country', 'country', { detail: true })}
+            </div>
+
+            <div className="pt-2 border-t border-slate-200/80">
+                <Button type="button" className="w-full" onClick={handleSave} disabled={saving}>
+                    {saving ? (
+                        <>
+                            <Loader2 className="h-4 w-4 animate-spin mr-2" aria-hidden />
+                            Saving…
+                        </>
+                    ) : (
+                        'Save'
+                    )}
+                </Button>
+            </div>
+        </div>
+    );
+}

frontend/src/pages/Contacts.jsx

@@ -25,6 +25,7 @@ import { Button } from '@/components/ui/button';
 import AppShell from '@/components/layout/AppShell';
 import MainTableWorkspace from '@/components/workspace/MainTableWorkspace';
 import SlideOverPanel from '@/components/workspace/SlideOverPanel';
+import CompanyDetailsEditor from '@/components/workspace/CompanyDetailsEditor';
 import { EditableCell } from '@/components/workspace/EditableCell';
 import { cn } from '@/lib/utils';
 
@@ -72,6 +73,23 @@ export default function Contacts() {
         [rowSelection]
     );
 
+    const contactCompanyDetailsForEditor = useMemo(() => {
+        if (!selectedContactDetails) return null;
+        const rd = selectedContactDetails.raw_data || {};
+        return {
+            'Company Name': rd['Company Name'] ?? selectedContactDetails.company ?? '',
+            'Company Name for Emails': rd['Company Name for Emails'] ?? '',
+            Industry: rd['Industry'] ?? '',
+            '# Employees': rd['# Employees'] ?? '',
+            'Annual Revenue': rd['Annual Revenue'] ?? '',
+            'Last Raised At': rd['Last Raised At'] ?? '',
+            Website: rd['Website'] ?? '',
+            City: rd['City'] ?? '',
+            State: rd['State'] ?? '',
+            Country: rd['Country'] ?? '',
+        };
+    }, [selectedContactDetails]);
+
     const allPageSelected = contacts.length > 0 && contacts.every((c) => rowSelection[c.id]);
 
     useEffect(() => {
@@ -993,68 +1011,15 @@ export default function Contacts() {
                             </Badge>
                         </div>
 
-                        {selectedContactDetails?.raw_data && (
-                            <div className="mb-6 rounded-xl border border-slate-200 bg-slate-50/50 p-4">
-                                <h4 className="text-sm font-semibold text-slate-700 mb-3">Company details</h4>
-                                <div className="grid grid-cols-1 sm:grid-cols-2 gap-2 text-sm">
-                                    <div>
-                                        <span className="text-slate-500">Company Name:</span>{' '}
-                                        <span className="text-slate-800">
-                                            {selectedContactDetails.raw_data['Company Name'] ||
-                                                selectedContactDetails.company ||
-                                                'N/A'}
-                                        </span>
-                                    </div>
-                                    <div>
-                                        <span className="text-slate-500">Company Name for Emails:</span>{' '}
-                                        <span className="text-slate-800">
-                                            {selectedContactDetails.raw_data['Company Name for Emails'] || 'N/A'}
-                                        </span>
-                                    </div>
-                                    <div>
-                                        <span className="text-slate-500">Industry:</span>{' '}
-                                        <span className="text-slate-800">
-                                            {selectedContactDetails.raw_data['Industry'] || 'N/A'}
-                                        </span>
-                                    </div>
-                                    <div>
-                                        <span className="text-slate-500">Employees:</span>{' '}
-                                        <span className="text-slate-800">
-                                            {selectedContactDetails.raw_data['# Employees'] || 'N/A'}
-                                        </span>
-                                    </div>
-                                    <div>
-                                        <span className="text-slate-500">Annual Revenue:</span>{' '}
-                                        <span className="text-slate-800">
-                                            {selectedContactDetails.raw_data['Annual Revenue'] || 'N/A'}
-                                        </span>
-                                    </div>
-                                    <div>
-                                        <span className="text-slate-500">Last Raised At:</span>{' '}
-                                        <span className="text-slate-800">
-                                            {selectedContactDetails.raw_data['Last Raised At'] || 'N/A'}
-                                        </span>
-                                    </div>
-                                    <div>
-                                        <span className="text-slate-500">Website:</span>{' '}
-                                        <span className="text-slate-800">
-                                            {selectedContactDetails.raw_data['Website'] || 'N/A'}
-                                        </span>
-                                    </div>
-                                    <div>
-                                        <span className="text-slate-500">Location:</span>{' '}
-                                        <span className="text-slate-800">
-                                            {[
-                                                selectedContactDetails.raw_data['City'],
-                                                selectedContactDetails.raw_data['State'],
-                                                selectedContactDetails.raw_data['Country'],
-                                            ]
-                                                .filter(Boolean)
-                                                .join(', ') || 'N/A'}
-                                        </span>
-                                    </div>
-                                </div>
-                            </div>
+                        {contactCompanyDetailsForEditor && selectedContact && (
+                            <CompanyDetailsEditor
+                                variant="contact"
+                                companyDetails={contactCompanyDetailsForEditor}
+                                fallbackCompanyName={
+                                    selectedContactDetails?.company || selectedContact.company || ''
+                                }
+                                onSave={(patch) => patchContact(selectedContact.id, patch)}
+                            />
                         )}
 
                         <h4 className="text-sm font-semibold text-slate-800 mb-2 flex items-center gap-2">

frontend/src/pages/Deals.jsx

@@ -6,6 +6,7 @@ import { Select, SelectTrigger, SelectContent, SelectItem } from '@/components/u
 import AppShell from '@/components/layout/AppShell';
 import MainTableWorkspace from '@/components/workspace/MainTableWorkspace';
 import SlideOverPanel from '@/components/workspace/SlideOverPanel';
+import CompanyDetailsEditor from '@/components/workspace/CompanyDetailsEditor';
 import { EditableCell, EditableDateCell } from '@/components/workspace/EditableCell';
 import { SearchableCountryPicker } from '@/components/workspace/SearchableCountryPicker';
 import { cn } from '@/lib/utils';
@@ -1005,10 +1006,17 @@ export default function Deals() {
                         ? `Stage: ${stageMeta(dealDetail.stage).label} · Forecast ${fmtMoney(dealDetail.forecast_value)}`
                         : ''
                 }
-                widthClassName="max-w-lg"
+                widthClassName="max-w-xl"
             >
                 {dealDetail && (
                     <div className="space-y-5 text-sm">
+                        <CompanyDetailsEditor
+                            variant="deal"
+                            dealLinkedContact={!!dealDetail.contact_id}
+                            companyDetails={dealDetail.company_details}
+                            fallbackCompanyName={dealDetail.account_name || ''}
+                            onSave={(patch) => patchDeal(dealDetail.id, patch)}
+                        />
                         <dl className="space-y-3">
                             <div>
                                 <dt className="text-slate-500">Deal value</dt>
@@ -1026,14 +1034,6 @@ export default function Deals() {
                                 <dt className="text-slate-500">Contact</dt>
                                 <dd>{dealDetail.contact_display || '—'}</dd>
                             </div>
-                            <div>
-                                <dt className="text-slate-500">Account</dt>
-                                <dd>{dealDetail.account_name || '—'}</dd>
-                            </div>
-                            <div>
-                                <dt className="text-slate-500">Country</dt>
-                                <dd>{dealDetail.country || '—'}</dd>
-                            </div>
                             <div>
                                 <dt className="text-slate-500">Last interaction</dt>
                                 <dd>{fmtDate(dealDetail.last_interaction_at)}</dd>

frontend/src/pages/Leads.jsx

@@ -17,6 +17,7 @@ import { Select, SelectTrigger, SelectContent, SelectItem } from '@/components/u
 import AppShell from '@/components/layout/AppShell';
 import MainTableWorkspace from '@/components/workspace/MainTableWorkspace';
 import SlideOverPanel from '@/components/workspace/SlideOverPanel';
+import CompanyDetailsEditor from '@/components/workspace/CompanyDetailsEditor';
 import { EditableCell } from '@/components/workspace/EditableCell';
 import { cn } from '@/lib/utils';
 
@@ -672,9 +673,16 @@ export default function Leads() {
                         ? `Campaign: ${selected.campaign_name || selected.campaign_id || '—'}`
                         : ''
                 }
+                widthClassName="max-w-xl"
             >
                 {selected && (
                     <>
+                        <CompanyDetailsEditor
+                            variant="lead"
+                            companyDetails={selected.company_details}
+                            fallbackCompanyName={selected.company_name || ''}
+                            onSave={(patch) => patchLead(selected.id, patch)}
+                        />
                         <dl className="space-y-3 text-sm">
                             <div>
                                 <dt className="text-slate-500">Name</dt>
@@ -686,10 +694,6 @@ export default function Leads() {
                                 <dt className="text-slate-500">Email</dt>
                                 <dd>{selected.email || '—'}</dd>
                             </div>
-                            <div>
-                                <dt className="text-slate-500">Company</dt>
-                                <dd>{selected.company_name || '—'}</dd>
-                            </div>
                             <div>
                                 <dt className="text-slate-500">Title</dt>
                                 <dd>{selected.title || '—'}</dd>