Sync Category across Company/Contact/Lead, link contacts, add company-level lead conversion

- Category is now a true company-level attribute: editing it from the
Company page, a Contact, a Lead, or a Deal linked to a contact
propagates to the Company row and every Contact/Lead sharing that
company name (case-insensitive), so it never drifts between the
four places it's editable.
- Fixed a gap where converting a contact to a lead didn't carry its
Category into the lead's company snapshot.
- Associated contacts in the Company detail panel are now clickable —
navigates to Contacts and opens that exact contact's detail panel
(via a short-lived ?contact= deep link, cleaned from the URL after
use).
- New "Convert to Leads" action on the Company detail panel, mirroring
the existing per-contact "Copy to Leads," but scoped to every
contact associated with that company in one action.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

backend/app/main.py

@@ -1045,6 +1045,7 @@ def _convert_contact_to_lead_core(db: Session, contact: Contact) -> dict:
         "City": _safe_str(rd.get("City")),
         "State": _safe_str(rd.get("State")),
         "Country": _safe_str(rd.get("Country")),
+        "Category": _safe_str(rd.get("Category")),
     }
     raw = {
         "source": "contacts_convert",
@@ -3875,6 +3876,8 @@ async def patch_contact(contact_id: int, body: ContactPatchRequest, t: TenantCon
         contact.title = _safe_str(data["title"])
     _sync_contact_raw_from_columns(contact)
     _merge_contact_raw_company_details(contact, data)
+    if "category" in data:
+        _propagate_category_everywhere(db, t.tenant_id, contact.company, data["category"])
     db.commit()
     db.refresh(contact)
     return {
@@ -4143,6 +4146,7 @@ def _sync_companies_from_contacts(db: Session, tenant_id: int) -> int:
             Company(
                 tenant_id=tenant_id,
                 name=name,
+                category=details.get("Category", ""),
                 company_name_for_emails=details.get("Company Name for Emails", ""),
                 industry=details.get("Industry", ""),
                 employees=details.get("# Employees", ""),
@@ -4161,6 +4165,67 @@ def _sync_companies_from_contacts(db: Session, tenant_id: int) -> int:
     return created
 
 
+def _propagate_category_to_contacts_and_leads(
+    db: Session, tenant_id: int, company_name: str, category: str
+) -> None:
+    """Category is a company-level attribute — whenever it's set anywhere (the Company page, or
+    a Contact/Lead/Deal's Company details card), every other record sharing that company name
+    (case-insensitive) is updated to match, so it never drifts between the four places it's
+    editable. Does NOT touch the Company row itself — callers that aren't already the Company
+    row use _propagate_category_everywhere for that."""
+    name = _safe_str(company_name).strip()
+    if not name:
+        return
+    category = _safe_str(category)
+
+    contacts = (
+        db.query(Contact)
+        .filter(Contact.tenant_id == tenant_id, func.lower(func.trim(Contact.company)) == name.lower())
+        .all()
+    )
+    for c in contacts:
+        rd = dict(c.raw_data or {})
+        rd["Category"] = category
+        c.raw_data = rd
+
+    leads = (
+        db.query(CrmLead)
+        .filter(
+            CrmLead.tenant_id == tenant_id,
+            func.lower(func.trim(CrmLead.company_name)) == name.lower(),
+        )
+        .all()
+    )
+    for lead in leads:
+        rw = dict(lead.raw_webhook) if isinstance(lead.raw_webhook, dict) else {}
+        cd = dict(rw.get("company_details") or {}) if isinstance(rw.get("company_details"), dict) else {}
+        cd["Category"] = category
+        rw["company_details"] = cd
+        lead.raw_webhook = rw
+        lead.updated_at = datetime.utcnow()
+
+    db_commit_with_retry(db)
+
+
+def _propagate_category_everywhere(db: Session, tenant_id: int, company_name: str, category: str) -> None:
+    """Like _propagate_category_to_contacts_and_leads, but also upserts the Company row itself —
+    for callers (Contact/Lead/Deal patches) that aren't already editing the Company row directly."""
+    name = _safe_str(company_name).strip()
+    if not name:
+        return
+    company = (
+        db.query(Company)
+        .filter(Company.tenant_id == tenant_id, func.lower(Company.name) == name.lower())
+        .first()
+    )
+    if company:
+        company.category = _safe_str(category)
+        company.updated_at = datetime.utcnow()
+    else:
+        db.add(Company(tenant_id=tenant_id, name=name, category=_safe_str(category), source="synced_from_contacts"))
+    _propagate_category_to_contacts_and_leads(db, tenant_id, name, category)
+
+
 @app.get("/api/companies")
 async def list_companies(
     search: str = Query("", description="Search by name/industry/city/country"),
@@ -4342,6 +4407,8 @@ async def patch_company(
         if field in data:
             setattr(company, field, _safe_str(data[field]))
     company.updated_at = datetime.utcnow()
+    if "category" in data:
+        _propagate_category_to_contacts_and_leads(db, t.tenant_id, company.name, data["category"])
     db.commit()
     db.refresh(company)
     contacts = _contacts_for_company(db, t.tenant_id, company.name)
@@ -4409,6 +4476,36 @@ async def create_company_contact(
     }
 
 
+@app.post("/api/companies/{company_id}/convert-to-leads")
+async def convert_company_contacts_to_leads(
+    company_id: int, t: TenantContext = Depends(get_tenant_context)
+):
+    """Converts every contact associated with this company into a lead — same per-contact rules
+    as POST /api/contacts/bulk-convert-to-leads (skips contacts with no email or where a lead
+    with that email already exists). Contacts are not removed."""
+    db = t.db
+    company = (
+        db.query(Company)
+        .filter(Company.tenant_id == t.tenant_id, Company.id == company_id)
+        .first()
+    )
+    if not company:
+        raise HTTPException(status_code=404, detail="Company not found")
+    contacts = _contacts_for_company(db, t.tenant_id, company.name)
+    if not contacts:
+        return {"converted": 0, "errors": []}
+    converted = 0
+    errors: List[dict] = []
+    for contact in contacts:
+        r = _convert_contact_to_lead_core(db, contact)
+        if not r["ok"]:
+            errors.append({"contact_id": contact.id, "error": r.get("error", "failed")})
+        else:
+            converted += 1
+    db.commit()
+    return {"converted": converted, "errors": errors}
+
+
 @app.post("/api/save-prompts")
 async def save_prompts(request: PromptSaveRequest, t: TenantContext = Depends(get_tenant_context)):
     """Save prompt templates for products"""
@@ -5832,6 +5929,8 @@ async def patch_lead(lead_id: int, body: CrmLeadPatchRequest, t: TenantContext =
     rw["company_details"] = cd
     row.raw_webhook = rw
     row.updated_at = datetime.utcnow()
+    if "category" in data:
+        _propagate_category_everywhere(db, t.tenant_id, row.company_name, data["category"])
     db.commit()
     db.refresh(row)
     return _crm_lead_to_dict(row)
@@ -6367,6 +6466,8 @@ async def patch_deal(deal_id: int, body: CrmDealPatchRequest, t: TenantContext =
             rd = dict(c.raw_data or {})
             rd["Country"] = _safe_str(data["country"])
             c.raw_data = rd
+        if "category" in data:
+            _propagate_category_everywhere(db, t.tenant_id, c.company, data["category"])
         db.add(c)
     row.updated_at = datetime.utcnow()
     db.commit()

frontend/src/pages/Companies.jsx

@@ -1,4 +1,5 @@
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { useNavigate } from 'react-router-dom';
 import {
     Building2,
     Globe,
@@ -8,6 +9,7 @@ import {
     X,
     Mail,
     Users,
+    Handshake,
 } from 'lucide-react';
 import { Button } from '@/components/ui/button';
 import { Input } from '@/components/ui/input';
@@ -30,6 +32,7 @@ function isRowUiTarget(e) {
 }
 
 export default function Companies() {
+    const navigate = useNavigate();
     const [companies, setCompanies] = useState([]);
     const [total, setTotal] = useState(0);
     const [loading, setLoading] = useState(true);
@@ -40,6 +43,7 @@ export default function Companies() {
     const [rowSelection, setRowSelection] = useState({});
     const [bulkBusy, setBulkBusy] = useState(false);
     const [syncBusy, setSyncBusy] = useState(false);
+    const [convertBusy, setConvertBusy] = useState(false);
 
     const [addingInline, setAddingInline] = useState(false);
     const [inlineDraft, setInlineDraft] = useState({ name: '', category: '' });
@@ -188,6 +192,35 @@ export default function Companies() {
         }
     };
 
+    const convertToLeads = async () => {
+        if (!selected) return;
+        setConvertBusy(true);
+        try {
+            const res = await apiFetch(`/api/companies/${selected.id}/convert-to-leads`, { method: 'POST' });
+            const data = await res.json().catch(() => ({}));
+            if (!res.ok) {
+                throw new Error(typeof data.detail === 'string' ? data.detail : 'Convert failed');
+            }
+            const conv = data.converted ?? 0;
+            if (conv === 0) {
+                alert(
+                    data.errors?.length
+                        ? 'No contacts were converted. Typical reasons: missing email, or a lead with the same email already exists. See console for per-row errors.'
+                        : 'This company has no contacts to convert.'
+                );
+                if (data.errors?.length) console.warn(data.errors);
+                return;
+            }
+            if (data.errors?.length) console.warn(data.errors);
+            navigate('/leads');
+        } catch (e) {
+            console.error(e);
+            alert(e.message || 'Could not convert to leads');
+        } finally {
+            setConvertBusy(false);
+        }
+    };
+
     const beginAddCompany = () => {
         setAddingInline(true);
         setInlineDraft({ name: '', category: '' });
@@ -560,9 +593,27 @@ export default function Companies() {
                         />
 
                         <div className="mt-8 pt-6 border-t border-slate-100">
-                            <h4 className="mb-3 font-semibold text-slate-800">
-                                Associated contacts ({(selected.contacts || []).length})
-                            </h4>
+                            <div className="mb-3 flex items-center justify-between gap-2">
+                                <h4 className="font-semibold text-slate-800">
+                                    Associated contacts ({(selected.contacts || []).length})
+                                </h4>
+                                <Button
+                                    type="button"
+                                    variant="outline"
+                                    size="sm"
+                                    className="gap-1.5 text-violet-700 border-violet-200 hover:bg-violet-50"
+                                    title="Convert this company's contacts to leads (contacts remain in Contacts)"
+                                    disabled={convertBusy || (selected.contacts || []).length === 0}
+                                    onClick={convertToLeads}
+                                >
+                                    {convertBusy ? (
+                                        <Loader2 className="h-4 w-4 animate-spin" />
+                                    ) : (
+                                        <Handshake className="h-4 w-4" />
+                                    )}
+                                    Convert to Leads
+                                </Button>
+                            </div>
                             {(selected.contacts || []).length === 0 ? (
                                 <p className="text-sm text-slate-500 mb-4">No contacts linked to this company yet.</p>
                             ) : (
@@ -570,24 +621,24 @@ export default function Companies() {
                                     {selected.contacts.map((c) => {
                                         const name = [c.first_name, c.last_name].filter(Boolean).join(' ') || c.email;
                                         return (
-                                            <li
-                                                key={c.id}
-                                                className="rounded-lg border border-slate-200 bg-white px-3 py-2 text-sm"
-                                            >
-                                                <p className="font-medium text-slate-800">{name}</p>
-                                                <p className="text-xs text-slate-500 flex items-center gap-1.5">
-                                                    {c.title ? <span>{c.title}</span> : null}
-                                                    {c.title && c.email ? <span>·</span> : null}
-                                                    {c.email ? (
-                                                        <a
-                                                            href={`mailto:${c.email}`}
-                                                            className="inline-flex items-center gap-1 text-violet-600 hover:underline"
-                                                        >
-                                                            <Mail className="h-3 w-3" />
-                                                            {c.email}
-                                                        </a>
-                                                    ) : null}
-                                                </p>
+                                            <li key={c.id}>
+                                                <button
+                                                    type="button"
+                                                    onClick={() => navigate(`/contacts?contact=${c.id}`)}
+                                                    className="w-full rounded-lg border border-slate-200 bg-white px-3 py-2 text-left text-sm hover:bg-violet-50/60 hover:border-violet-200 transition-colors"
+                                                >
+                                                    <p className="font-medium text-violet-800">{name}</p>
+                                                    <p className="text-xs text-slate-500 flex items-center gap-1.5">
+                                                        {c.title ? <span>{c.title}</span> : null}
+                                                        {c.title && c.email ? <span>·</span> : null}
+                                                        {c.email ? (
+                                                            <span className="inline-flex items-center gap-1">
+                                                                <Mail className="h-3 w-3" />
+                                                                {c.email}
+                                                            </span>
+                                                        ) : null}
+                                                    </p>
+                                                </button>
                                             </li>
                                         );
                                     })}

frontend/src/pages/Contacts.jsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useMemo, useRef, useState } from 'react';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate, useSearchParams } from 'react-router-dom';
 import {
     Users,
     FileText,
@@ -40,6 +40,7 @@ function makeFilterRow() {
 
 export default function Contacts() {
     const navigate = useNavigate();
+    const [searchParams, setSearchParams] = useSearchParams();
     const [contacts, setContacts] = useState([]);
     const [fields, setFields] = useState([]);
     const [selectedContact, setSelectedContact] = useState(null);
@@ -266,6 +267,24 @@ export default function Contacts() {
         }
     };
 
+    // Deep-link support: /contacts?contact=<id> (used by the Companies page's associated-contact
+    // list) opens that contact's detail panel on load, then clears the param so a later refresh
+    // doesn't keep re-opening it.
+    useEffect(() => {
+        const contactId = searchParams.get('contact');
+        if (!contactId) return;
+        openContact({ id: Number(contactId) });
+        setSearchParams(
+            (prev) => {
+                const next = new URLSearchParams(prev);
+                next.delete('contact');
+                return next;
+            },
+            { replace: true }
+        );
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
+
     const closePanel = () => {
         setTableEditRowId(null);
         setSelectedContact(null);