update

backend/app/main.py

@@ -709,6 +709,43 @@ async def bulk_convert_contacts_to_leads(body: BulkContactIdsRequest, db: Sessio
     return {"converted": converted, "errors": errors}
 
 
+@app.get("/api/company-names")
+async def search_company_names(
+    q: str = Query("", description="Substring match on Contact.company"),
+    limit: int = Query(25, ge=1, le=100),
+    db: Session = Depends(get_db),
+):
+    """Distinct company strings from contacts for deal/account linking."""
+    raw_q = _safe_str(q)
+    pattern = f"%{raw_q}%" if raw_q else "%"
+    rows = (
+        db.query(Contact.company)
+        .filter(
+            Contact.company.isnot(None),
+            Contact.company != "",
+            Contact.company.ilike(pattern),
+        )
+        .distinct()
+        .order_by(Contact.company.asc())
+        .limit(limit * 4)
+        .all()
+    )
+    names: List[str] = []
+    seen = set()
+    for (co,) in rows:
+        s = _safe_str(co)
+        if not s:
+            continue
+        lk = s.lower()
+        if lk in seen:
+            continue
+        seen.add(lk)
+        names.append(s)
+        if len(names) >= limit:
+            break
+    return {"names": names}
+
+
 @app.get("/api/contacts/{contact_id}")
 async def get_contact(contact_id: int, db: Session = Depends(get_db)):
     contact = db.query(Contact).filter(Contact.id == contact_id).first()
@@ -799,13 +836,28 @@ def _deal_fallback_company_details(d: CrmDeal) -> dict:
     }
 
 
+def _format_contact_display(contact: Contact) -> str:
+    fn = _safe_str(contact.first_name)
+    ln = _safe_str(contact.last_name)
+    person = " ".join(filter(None, [fn, ln])).strip()
+    return person or _safe_str(contact.email)
+
+
 def _enrich_deal_response(db: Session, row: CrmDeal) -> dict:
     out = _deal_to_dict(row)
+    out["linked_contact"] = None
     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
+            out["linked_contact"] = {
+                "id": c.id,
+                "first_name": c.first_name or "",
+                "last_name": c.last_name or "",
+                "email": c.email or "",
+                "title": c.title or "",
+            }
         else:
             out["company_details"] = _deal_fallback_company_details(row)
     else:
@@ -1844,6 +1896,7 @@ async def get_lead(lead_id: int, db: Session = Depends(get_db)):
                 "company": c.company,
                 "title": c.title,
             }
+            d["company_details"] = _contact_company_details_dict(c)
     return d
 
 
@@ -2069,6 +2122,18 @@ async def patch_deal(deal_id: int, body: CrmDealPatchRequest, db: Session = Depe
     data = body.model_dump(exclude_unset=True)
     if not data:
         raise HTTPException(status_code=400, detail="No fields to update")
+    if "contact_id" in data:
+        cid = data["contact_id"]
+        if cid is None:
+            row.contact_id = None
+        else:
+            contact = db.query(Contact).filter(Contact.id == int(cid)).first()
+            if not contact:
+                raise HTTPException(status_code=404, detail="Contact not found")
+            row.contact_id = contact.id
+            row.contact_display = _format_contact_display(contact)
+            if "account_name" not in data and _safe_str(contact.company):
+                row.account_name = _safe_str(contact.company)
     if "name" in data:
         row.name = _safe_str(data["name"])
     if "owner_initials" in data:

backend/app/models.py

@@ -106,6 +106,7 @@ class CrmDealPatchRequest(BaseModel):
     contact_display: Optional[str] = None
     account_name: Optional[str] = None
     last_interaction_at: Optional[str] = None  # ISO date or datetime
+    contact_id: Optional[int] = None  # set CRM contact on deal; JSON null clears link
     # 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

frontend/src/components/workspace/CompanyDetailsEditor.jsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import { Loader2 } from 'lucide-react';
+import { Loader2, Sparkles } from 'lucide-react';
 import { Button } from '@/components/ui/button';
 import { Input } from '@/components/ui/input';
 import { cn } from '@/lib/utils';
@@ -61,6 +61,10 @@ export default function CompanyDetailsEditor({
     dealLinkedContact = false,
     onSave,
     className,
+    showFetch = false,
+    onFetch,
+    fetchLoading = false,
+    fetchError = '',
 }) {
     const [form, setForm] = useState(() => formFromDetails(companyDetails, fallbackCompanyName));
     const [saving, setSaving] = useState(false);
@@ -97,13 +101,33 @@ export default function CompanyDetailsEditor({
     );
 
     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>
+        <div className={cn('rounded-xl border border-slate-200 bg-slate-50/50 p-4 flex flex-col gap-4 mb-6', className)}>
+            <div className="flex flex-wrap items-start justify-between gap-2">
+                <h4 className="text-sm font-semibold text-slate-700">Company details</h4>
+                {showFetch && onFetch ? (
+                    <Button
+                        type="button"
+                        variant="outline"
+                        size="sm"
+                        className="gap-1.5 shrink-0 text-violet-700 border-violet-200 hover:bg-violet-50"
+                        onClick={() => onFetch()}
+                        disabled={fetchLoading}
+                    >
+                        {fetchLoading ? (
+                            <Loader2 className="h-3.5 w-3.5 animate-spin shrink-0" aria-hidden />
+                        ) : (
+                            <Sparkles className="h-3.5 w-3.5 shrink-0" aria-hidden />
+                        )}
+                        Fetch
+                    </Button>
+                ) : null}
+            </div>
+
+            {fetchError ? (
+                <p className="text-xs text-red-600" role="alert">
+                    {fetchError}
+                </p>
+            ) : null}
 
             {dealLimited ? (
                 <p className="text-xs text-slate-500">

frontend/src/components/workspace/ContactIdentityEditor.jsx

@@ -0,0 +1,105 @@
+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';
+
+/**
+ * Editable person fields (first / last name, email, title) + Save — slide-over top section.
+ */
+export default function ContactIdentityEditor({
+    firstName = '',
+    lastName = '',
+    email = '',
+    title = '',
+    onSave,
+    disabled = false,
+    className,
+    heading = 'Contact details',
+}) {
+    const [form, setForm] = useState({
+        firstName,
+        lastName,
+        email,
+        title,
+    });
+    const [saving, setSaving] = useState(false);
+
+    useEffect(() => {
+        setForm({ firstName, lastName, email, title });
+    }, [firstName, lastName, email, title]);
+
+    const setField = (key, value) => setForm((f) => ({ ...f, [key]: value }));
+
+    const handleSave = async () => {
+        if (!onSave || disabled) return;
+        setSaving(true);
+        try {
+            await onSave({
+                first_name: form.firstName,
+                last_name: form.lastName,
+                email: form.email,
+                title: form.title,
+            });
+        } finally {
+            setSaving(false);
+        }
+    };
+
+    return (
+        <div className={cn('rounded-xl border border-slate-200 bg-white p-4 mb-6', className)}>
+            <h4 className="text-sm font-semibold text-slate-800 mb-3">{heading}</h4>
+            <div className="grid grid-cols-1 sm:grid-cols-2 gap-3 text-sm">
+                <div>
+                    <label className="block text-xs font-medium text-slate-500 mb-1">First name</label>
+                    <Input
+                        value={form.firstName}
+                        onChange={(e) => setField('firstName', e.target.value)}
+                        disabled={disabled}
+                        className="text-sm"
+                    />
+                </div>
+                <div>
+                    <label className="block text-xs font-medium text-slate-500 mb-1">Last name</label>
+                    <Input
+                        value={form.lastName}
+                        onChange={(e) => setField('lastName', e.target.value)}
+                        disabled={disabled}
+                        className="text-sm"
+                    />
+                </div>
+                <div className="sm:col-span-2">
+                    <label className="block text-xs font-medium text-slate-500 mb-1">Email</label>
+                    <Input
+                        type="email"
+                        value={form.email}
+                        onChange={(e) => setField('email', e.target.value)}
+                        disabled={disabled}
+                        className="text-sm"
+                    />
+                </div>
+                <div className="sm:col-span-2">
+                    <label className="block text-xs font-medium text-slate-500 mb-1">Title</label>
+                    <Input
+                        value={form.title}
+                        onChange={(e) => setField('title', e.target.value)}
+                        disabled={disabled}
+                        className="text-sm"
+                    />
+                </div>
+            </div>
+            <div className="mt-4">
+                <Button type="button" className="w-full sm:w-auto" onClick={handleSave} disabled={disabled || saving}>
+                    {saving ? (
+                        <>
+                            <Loader2 className="h-4 w-4 animate-spin mr-2" aria-hidden />
+                            Saving…
+                        </>
+                    ) : (
+                        'Save'
+                    )}
+                </Button>
+            </div>
+        </div>
+    );
+}

frontend/src/components/workspace/DealLinkSearch.jsx

@@ -0,0 +1,181 @@
+import React, { useEffect, useState } from 'react';
+import { Loader2, Search, UserPlus, Building2 } from 'lucide-react';
+import { Button } from '@/components/ui/button';
+import { Input } from '@/components/ui/input';
+import { cn } from '@/lib/utils';
+
+/** Search CRM contacts and link one to the deal (`PATCH contact_id`). */
+export function DealContactSearch({ linkedContactId, onPatchDeal, className }) {
+    const [q, setQ] = useState('');
+    const [results, setResults] = useState([]);
+    const [loading, setLoading] = useState(false);
+    const [linking, setLinking] = useState(false);
+
+    useEffect(() => {
+        if (!q.trim()) {
+            setResults([]);
+            return;
+        }
+        const t = setTimeout(async () => {
+            setLoading(true);
+            try {
+                const res = await fetch(
+                    `/api/contacts?search=${encodeURIComponent(q.trim())}&limit=12&sort_by=created_at&sort_dir=desc`
+                );
+                const data = await res.json().catch(() => ({}));
+                setResults(res.ok ? data.contacts || [] : []);
+            } catch {
+                setResults([]);
+            } finally {
+                setLoading(false);
+            }
+        }, 280);
+        return () => clearTimeout(t);
+    }, [q]);
+
+    const pick = async (c) => {
+        setLinking(true);
+        try {
+            await onPatchDeal({ contact_id: c.id });
+            setQ('');
+            setResults([]);
+        } finally {
+            setLinking(false);
+        }
+    };
+
+    const unlink = async () => {
+        setLinking(true);
+        try {
+            await onPatchDeal({ contact_id: null });
+        } finally {
+            setLinking(false);
+        }
+    };
+
+    return (
+        <div className={cn('rounded-lg border border-slate-200 bg-slate-50/80 p-3 mb-3', className)}>
+            <div className="flex items-center gap-2 text-xs font-medium text-slate-600 mb-2">
+                <UserPlus className="h-3.5 w-3.5 shrink-0" />
+                Link contact from CRM
+            </div>
+            <div className="relative">
+                <Search className="absolute left-2.5 top-1/2 -translate-y-1/2 h-4 w-4 text-slate-400 pointer-events-none" />
+                <Input
+                    value={q}
+                    onChange={(e) => setQ(e.target.value)}
+                    placeholder="Search name, email, company…"
+                    className="pl-9 text-sm bg-white"
+                    disabled={linking}
+                />
+                {loading ? (
+                    <Loader2 className="absolute right-2.5 top-1/2 -translate-y-1/2 h-4 w-4 animate-spin text-slate-400" />
+                ) : null}
+            </div>
+            {results.length > 0 ? (
+                <ul className="mt-2 max-h-40 overflow-y-auto rounded-md border border-slate-200 bg-white text-sm divide-y divide-slate-100">
+                    {results.map((c) => (
+                        <li key={c.id}>
+                            <button
+                                type="button"
+                                disabled={linking || linkedContactId === c.id}
+                                className="w-full text-left px-3 py-2 hover:bg-violet-50 disabled:opacity-50"
+                                onClick={() => pick(c)}
+                            >
+                                <div className="font-medium text-slate-800 truncate">
+                                    {[c.first_name, c.last_name].filter(Boolean).join(' ') || '—'}
+                                </div>
+                                <div className="text-xs text-slate-500 truncate">{c.email || '—'}</div>
+                                <div className="text-xs text-slate-400 truncate">{c.company || ''}</div>
+                            </button>
+                        </li>
+                    ))}
+                </ul>
+            ) : null}
+            {linkedContactId ? (
+                <div className="mt-2 flex justify-end">
+                    <Button type="button" variant="ghost" size="sm" className="text-slate-600" onClick={unlink} disabled={linking}>
+                        Remove contact link
+                    </Button>
+                </div>
+            ) : null}
+        </div>
+    );
+}
+
+/** Search distinct company names from contacts; sets deal `account_name`. */
+export function DealCompanySearch({ onPatchDeal, className }) {
+    const [q, setQ] = useState('');
+    const [results, setResults] = useState([]);
+    const [loading, setLoading] = useState(false);
+    const [applying, setApplying] = useState(false);
+
+    useEffect(() => {
+        if (!q.trim()) {
+            setResults([]);
+            return;
+        }
+        const t = setTimeout(async () => {
+            setLoading(true);
+            try {
+                const res = await fetch(`/api/company-names?q=${encodeURIComponent(q.trim())}&limit=20`);
+                const data = await res.json().catch(() => ({}));
+                setResults(res.ok ? data.names || [] : []);
+            } catch {
+                setResults([]);
+            } finally {
+                setLoading(false);
+            }
+        }, 280);
+        return () => clearTimeout(t);
+    }, [q]);
+
+    const pick = async (name) => {
+        setApplying(true);
+        try {
+            await onPatchDeal({ account_name: name });
+            setQ('');
+            setResults([]);
+        } finally {
+            setApplying(false);
+        }
+    };
+
+    return (
+        <div className={cn('rounded-lg border border-slate-200 bg-slate-50/80 p-3 mb-3', className)}>
+            <div className="flex items-center gap-2 text-xs font-medium text-slate-600 mb-2">
+                <Building2 className="h-3.5 w-3.5 shrink-0" />
+                Add company from CRM (account name)
+            </div>
+            <div className="relative">
+                <Search className="absolute left-2.5 top-1/2 -translate-y-1/2 h-4 w-4 text-slate-400 pointer-events-none" />
+                <Input
+                    value={q}
+                    onChange={(e) => setQ(e.target.value)}
+                    placeholder="Search company names…"
+                    className="pl-9 text-sm bg-white"
+                    disabled={applying}
+                />
+                {loading ? (
+                    <Loader2 className="absolute right-2.5 top-1/2 -translate-y-1/2 h-4 w-4 animate-spin text-slate-400" />
+                ) : null}
+            </div>
+            {results.length > 0 ? (
+                <ul className="mt-2 max-h-36 overflow-y-auto rounded-md border border-slate-200 bg-white text-sm divide-y divide-slate-100">
+                    {results.map((name) => (
+                        <li key={name}>
+                            <button
+                                type="button"
+                                disabled={applying}
+                                className="w-full text-left px-3 py-2 hover:bg-violet-50"
+                                onClick={() => pick(name)}
+                            >
+                                {name}
+                            </button>
+                        </li>
+                    ))}
+                </ul>
+            ) : null}
+        </div>
+    );
+}

frontend/src/pages/Contacts.jsx

@@ -2,9 +2,6 @@ import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import {
     Users,
-    Mail,
-    Building2,
-    Briefcase,
     FileText,
     SlidersHorizontal,
     Loader2,
@@ -13,19 +10,18 @@ import {
     ArrowUpDown,
     Check,
     X,
-    Sparkles,
     Trash2,
     Handshake,
     Pencil,
 } from 'lucide-react';
 import { Input } from '@/components/ui/input';
-import { Badge } from '@/components/ui/badge';
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
 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 ContactIdentityEditor from '@/components/workspace/ContactIdentityEditor';
 import { EditableCell } from '@/components/workspace/EditableCell';
 import { cn } from '@/lib/utils';
 
@@ -968,60 +964,39 @@ export default function Contacts() {
                 }
                 subtitle={(selectedContactDetails?.email || selectedContact?.email) || ''}
                 widthClassName="max-w-xl"
-                headerActions={
-                    isManualContact ? (
-                        <Button
-                            type="button"
-                            variant="outline"
-                            size="sm"
-                            className="gap-1.5 text-violet-700 border-violet-200 hover:bg-violet-50"
-                            onClick={enrichContactFromGpt}
-                            disabled={enrichLoading}
-                            aria-label="Fetch AI-enriched company and contact details"
-                        >
-                            {enrichLoading ? (
-                                <Loader2 className="h-3.5 w-3.5 animate-spin shrink-0" aria-hidden />
-                            ) : (
-                                <Sparkles className="h-3.5 w-3.5 shrink-0" aria-hidden />
-                            )}
-                            Fetch
-                        </Button>
-                    ) : null
-                }
             >
                 {selectedContact && (
-                    <div>
-                        {enrichError ? (
-                            <p className="mb-3 text-sm text-red-600" role="alert">
-                                {enrichError}
-                            </p>
-                        ) : null}
-                        <div className="mb-6 flex flex-wrap gap-2 text-xs text-slate-600">
-                            <Badge variant="outline" className="gap-1">
-                                <Mail className="h-3 w-3" />
-                                {(selectedContactDetails?.email || selectedContact.email) || 'N/A'}
-                            </Badge>
-                            <Badge variant="outline" className="gap-1">
-                                <Building2 className="h-3 w-3" />
-                                {(selectedContactDetails?.company || selectedContact.company) || 'N/A'}
-                            </Badge>
-                            <Badge variant="outline" className="gap-1">
-                                <Briefcase className="h-3 w-3" />
-                                {(selectedContactDetails?.title || selectedContact.title) || 'N/A'}
-                            </Badge>
-                        </div>
-
-                        {contactCompanyDetailsForEditor && selectedContact && (
-                            <CompanyDetailsEditor
-                                variant="contact"
-                                companyDetails={contactCompanyDetailsForEditor}
-                                fallbackCompanyName={
-                                    selectedContactDetails?.company || selectedContact.company || ''
-                                }
+                    <div className="flex flex-col">
+                        {selectedContactDetails && (
+                            <ContactIdentityEditor
+                                firstName={selectedContactDetails.first_name || ''}
+                                lastName={selectedContactDetails.last_name || ''}
+                                email={selectedContactDetails.email || ''}
+                                title={selectedContactDetails.title || ''}
                                 onSave={(patch) => patchContact(selectedContact.id, patch)}
+                                disabled={!selectedContact}
                             />
                         )}
 
+                        <div className="mt-8 pt-6 border-t border-slate-100">
+                            {contactCompanyDetailsForEditor && selectedContact && (
+                                <CompanyDetailsEditor
+                                    variant="contact"
+                                    companyDetails={contactCompanyDetailsForEditor}
+                                    fallbackCompanyName={
+                                        selectedContactDetails?.company || selectedContact.company || ''
+                                    }
+                                    onSave={(patch) => patchContact(selectedContact.id, patch)}
+                                    className="mb-0"
+                                    showFetch={isManualContact}
+                                    onFetch={enrichContactFromGpt}
+                                    fetchLoading={enrichLoading}
+                                    fetchError={enrichError}
+                                />
+                            )}
+                        </div>
+
+                        <div className="mt-8 pt-6 border-t border-slate-100">
                         <h4 className="text-sm font-semibold text-slate-800 mb-2 flex items-center gap-2">
                             <FileText className="h-4 w-4" />
                             Generated sequences
@@ -1051,6 +1026,7 @@ export default function Contacts() {
                                 ))}
                             </div>
                         )}
+                        </div>
                     </div>
                 )}
             </SlideOverPanel>

frontend/src/pages/Deals.jsx

@@ -7,6 +7,8 @@ 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 ContactIdentityEditor from '@/components/workspace/ContactIdentityEditor';
+import { DealContactSearch, DealCompanySearch } from '@/components/workspace/DealLinkSearch';
 import { EditableCell, EditableDateCell } from '@/components/workspace/EditableCell';
 import { SearchableCountryPicker } from '@/components/workspace/SearchableCountryPicker';
 import { cn } from '@/lib/utils';
@@ -587,6 +589,8 @@ export default function Deals() {
     const [tableEditRowId, setTableEditRowId] = useState(null);
     const [dealsView, setDealsView] = useState('main');
     const [createBusy, setCreateBusy] = useState(false);
+    const [companyFetchLoading, setCompanyFetchLoading] = useState(false);
+    const [companyFetchError, setCompanyFetchError] = useState('');
 
     const fetchDeals = useCallback(async () => {
         setLoading(true);
@@ -753,6 +757,55 @@ export default function Deals() {
         }
     };
 
+    const refreshDealDetail = async (dealId) => {
+        try {
+            const res = await fetch(`/api/deals/${dealId}`);
+            if (res.ok) {
+                const d = await res.json();
+                setDealDetail(d);
+            }
+        } catch (e) {
+            console.error(e);
+        }
+    };
+
+    const patchLinkedContact = async (contactId, patch) => {
+        try {
+            const res = await fetch(`/api/contacts/${contactId}`, {
+                method: 'PATCH',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify(patch),
+            });
+            const data = await res.json().catch(() => ({}));
+            if (!res.ok) {
+                throw new Error(typeof data.detail === 'string' ? data.detail : 'Update failed');
+            }
+            if (dealDetail?.id) await refreshDealDetail(dealDetail.id);
+        } catch (e) {
+            console.error(e);
+            alert(e.message || 'Could not save contact');
+        }
+    };
+
+    const fetchDealCompanyAi = async () => {
+        if (!dealDetail?.contact_id) return;
+        setCompanyFetchLoading(true);
+        setCompanyFetchError('');
+        try {
+            const res = await fetch(`/api/contacts/${dealDetail.contact_id}/enrich`, { method: 'POST' });
+            const data = await res.json().catch(() => ({}));
+            if (!res.ok) {
+                setCompanyFetchError(typeof data.detail === 'string' ? data.detail : 'Could not fetch enrichment');
+                return;
+            }
+            if (dealDetail?.id) await refreshDealDetail(dealDetail.id);
+        } catch (e) {
+            setCompanyFetchError(e.message || 'Fetch failed');
+        } finally {
+            setCompanyFetchLoading(false);
+        }
+    };
+
     const updateStage = (dealId, stage) => patchDeal(dealId, { stage });
 
     const openDeal = async (deal, opts = {}) => {
@@ -1009,15 +1062,39 @@ export default function Deals() {
                 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 className="space-y-6 text-sm">
+                        <section>
+                            <h4 className="text-sm font-semibold text-slate-800 mb-2">Contact details</h4>
+                            <DealContactSearch
+                                linkedContactId={dealDetail.contact_id}
+                                onPatchDeal={(patch) => patchDeal(dealDetail.id, patch)}
+                            />
+                            {dealDetail.linked_contact ? (
+                                <>
+                                    <ContactIdentityEditor
+                                        firstName={dealDetail.linked_contact.first_name || ''}
+                                        lastName={dealDetail.linked_contact.last_name || ''}
+                                        email={dealDetail.linked_contact.email || ''}
+                                        title={dealDetail.linked_contact.title || ''}
+                                        onSave={(patch) =>
+                                            patchLinkedContact(dealDetail.linked_contact.id, patch)
+                                        }
+                                        className="mb-0"
+                                    />
+                                    <div className="mt-2">
+                                        <Button asChild variant="outline" size="sm">
+                                            <Link to="/contacts">Open in Contacts</Link>
+                                        </Button>
+                                    </div>
+                                </>
+                            ) : (
+                                <p className="text-xs text-slate-500">
+                                    Search for a person above to link them to this deal and edit their details.
+                                </p>
+                            )}
+                        </section>
+
+                        <dl className="space-y-3 border-t border-slate-100 pt-6">
                             <div>
                                 <dt className="text-slate-500">Deal value</dt>
                                 <dd className="font-medium tabular-nums">{fmtMoney(dealDetail.deal_value)}</dd>
@@ -1031,7 +1108,7 @@ export default function Deals() {
                                 <dd>{fmtDate(dealDetail.expected_close_date)}</dd>
                             </div>
                             <div>
-                                <dt className="text-slate-500">Contact</dt>
+                                <dt className="text-slate-500">Contact (display)</dt>
                                 <dd>{dealDetail.contact_display || '—'}</dd>
                             </div>
                             <div>
@@ -1045,11 +1122,23 @@ export default function Deals() {
                                 </div>
                             ) : null}
                         </dl>
-                        {dealDetail.contact_id ? (
-                            <Button asChild variant="outline" size="sm">
-                                <Link to="/contacts">View linked contact</Link>
-                            </Button>
-                        ) : null}
+
+                        <section className="border-t border-slate-100 pt-6 mt-2">
+                            <h4 className="text-sm font-semibold text-slate-800 mb-2">Company details</h4>
+                            <DealCompanySearch onPatchDeal={(patch) => patchDeal(dealDetail.id, patch)} />
+                            <CompanyDetailsEditor
+                                variant="deal"
+                                dealLinkedContact={!!dealDetail.contact_id}
+                                companyDetails={dealDetail.company_details}
+                                fallbackCompanyName={dealDetail.account_name || ''}
+                                onSave={(patch) => patchDeal(dealDetail.id, patch)}
+                                className="mb-0"
+                                showFetch={!!dealDetail.contact_id}
+                                onFetch={fetchDealCompanyAi}
+                                fetchLoading={companyFetchLoading}
+                                fetchError={companyFetchError}
+                            />
+                        </section>
                     </div>
                 )}
             </SlideOverPanel>

frontend/src/pages/Leads.jsx

@@ -18,6 +18,7 @@ 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 ContactIdentityEditor from '@/components/workspace/ContactIdentityEditor';
 import { EditableCell } from '@/components/workspace/EditableCell';
 import { cn } from '@/lib/utils';
 
@@ -64,6 +65,8 @@ export default function Leads() {
     const [selected, setSelected] = useState(null);
     const [threadLoading, setThreadLoading] = useState(false);
     const [threadData, setThreadData] = useState(null);
+    const [companyFetchLoading, setCompanyFetchLoading] = useState(false);
+    const [companyFetchError, setCompanyFetchError] = useState('');
     const [seedBusy, setSeedBusy] = useState(false);
     const [rowSelection, setRowSelection] = useState({});
     const [bulkBusy, setBulkBusy] = useState(null);
@@ -148,6 +151,28 @@ export default function Leads() {
         }
     };
 
+    const fetchLeadCompanyAi = async () => {
+        if (!selected?.contact_id) return;
+        setCompanyFetchLoading(true);
+        setCompanyFetchError('');
+        try {
+            const res = await fetch(`/api/contacts/${selected.contact_id}/enrich`, { method: 'POST' });
+            const data = await res.json().catch(() => ({}));
+            if (!res.ok) {
+                setCompanyFetchError(typeof data.detail === 'string' ? data.detail : 'Could not fetch enrichment');
+                return;
+            }
+            const res2 = await fetch(`/api/leads/${selected.id}`);
+            if (res2.ok) {
+                setSelected(await res2.json());
+            }
+        } catch (e) {
+            setCompanyFetchError(e.message || 'Fetch failed');
+        } finally {
+            setCompanyFetchLoading(false);
+        }
+    };
+
     const updateStatus = (leadId, crmStatus) => patchLead(leadId, { crm_status: crmStatus });
 
     const loadThread = async (leadId) => {
@@ -677,40 +702,36 @@ export default function Leads() {
             >
                 {selected && (
                     <>
-                        <CompanyDetailsEditor
-                            variant="lead"
-                            companyDetails={selected.company_details}
-                            fallbackCompanyName={selected.company_name || ''}
+                        <ContactIdentityEditor
+                            firstName={selected.first_name || ''}
+                            lastName={selected.last_name || ''}
+                            email={selected.email || ''}
+                            title={selected.title || ''}
                             onSave={(patch) => patchLead(selected.id, patch)}
                         />
-                        <dl className="space-y-3 text-sm">
-                            <div>
-                                <dt className="text-slate-500">Name</dt>
-                                <dd className="font-medium">
-                                    {[selected.first_name, selected.last_name].filter(Boolean).join(' ') || '—'}
-                                </dd>
-                            </div>
-                            <div>
-                                <dt className="text-slate-500">Email</dt>
-                                <dd>{selected.email || '—'}</dd>
-                            </div>
-                            <div>
-                                <dt className="text-slate-500">Title</dt>
-                                <dd>{selected.title || '—'}</dd>
-                            </div>
-                            {selected.contact && (
-                                <div>
-                                    <dt className="text-slate-500">Linked contact</dt>
-                                    <dd>
-                                        <a href="/contacts" className="text-violet-600 hover:underline">
-                                            View in Contacts
-                                        </a>
-                                    </dd>
-                                </div>
-                            )}
-                        </dl>
+                        {selected.contact ? (
+                            <p className="text-xs text-violet-700 mb-4">
+                                <a href="/contacts" className="underline font-medium">
+                                    View linked contact in Contacts
+                                </a>
+                            </p>
+                        ) : null}
+
+                        <div className="mt-8 pt-6 border-t border-slate-100">
+                            <CompanyDetailsEditor
+                                variant="lead"
+                                companyDetails={selected.company_details}
+                                fallbackCompanyName={selected.company_name || ''}
+                                onSave={(patch) => patchLead(selected.id, patch)}
+                                className="mb-0"
+                                showFetch={!!selected.contact_id}
+                                onFetch={fetchLeadCompanyAi}
+                                fetchLoading={companyFetchLoading}
+                                fetchError={companyFetchError}
+                            />
+                        </div>
 
-                        <div className="mt-6">
+                        <div className="mt-8 pt-6 border-t border-slate-100">
                             <div className="flex items-center justify-between mb-2">
                                 <h4 className="font-semibold text-slate-800">Their reply</h4>
                                 <Button