update

backend/app/main.py

@@ -40,6 +40,7 @@ from .models import (
     BulkContactIdsRequest,
     CrmDealPatchRequest,
     ContactCreateRequest,
+    ContactPatchRequest,
 )
 from .gpt_service import generate_email_sequence, enrich_manual_contact_profile
 from .smartlead_client import SmartleadClient
@@ -726,6 +727,62 @@ async def get_contact(contact_id: int, db: Session = Depends(get_db)):
     }
 
 
+def _sync_contact_raw_from_columns(contact: Contact) -> None:
+    rd = dict(contact.raw_data or {})
+    rd["First Name"] = contact.first_name or ""
+    rd["Last Name"] = contact.last_name or ""
+    rd["Email"] = (contact.email or "").strip()
+    rd["Company Name"] = contact.company or ""
+    rd["Title"] = contact.title or ""
+    contact.raw_data = rd
+
+
+@app.patch("/api/contacts/{contact_id}")
+async def patch_contact(contact_id: int, body: ContactPatchRequest, db: Session = Depends(get_db)):
+    contact = db.query(Contact).filter(Contact.id == contact_id).first()
+    if not contact:
+        raise HTTPException(status_code=404, detail="Contact not found")
+    data = body.model_dump(exclude_unset=True)
+    if not data:
+        raise HTTPException(status_code=400, detail="No fields to update")
+    if "email" in data:
+        email = _safe_str(data["email"]).lower()
+        if not email:
+            raise HTTPException(status_code=400, detail="Email cannot be empty")
+        taken = (
+            db.query(Contact)
+            .filter(Contact.id != contact_id, func.lower(Contact.email) == email)
+            .first()
+        )
+        if taken:
+            raise HTTPException(status_code=409, detail="Another contact already uses this email")
+        contact.email = email
+    if "first_name" in data:
+        contact.first_name = _safe_str(data["first_name"])
+    if "last_name" in data:
+        contact.last_name = _safe_str(data["last_name"])
+    if "company" in data:
+        contact.company = _safe_str(data["company"])
+    if "title" in data:
+        contact.title = _safe_str(data["title"])
+    _sync_contact_raw_from_columns(contact)
+    db.commit()
+    db.refresh(contact)
+    return {
+        "id": contact.id,
+        "file_id": contact.file_id,
+        "row_index": contact.row_index,
+        "first_name": contact.first_name or _pick_from_raw(contact.raw_data, ["first name", "firstname", "first_name"]),
+        "last_name": contact.last_name or _pick_from_raw(contact.raw_data, ["last name", "lastname", "last_name"]),
+        "email": contact.email or _pick_from_raw(contact.raw_data, ["email", "work email", "email address", "secondary email", "tertiary email"]),
+        "company": contact.company or _pick_from_raw(contact.raw_data, ["company", "company name", "company name for emails", "organization name", "account name"]),
+        "title": contact.title or _pick_from_raw(contact.raw_data, ["title", "job title"]),
+        "source": contact.source or "apollo_csv",
+        "created_at": contact.created_at.isoformat() if contact.created_at else None,
+        "raw_data": contact.raw_data or {},
+    }
+
+
 @app.post("/api/contacts/{contact_id}/enrich")
 async def enrich_contact(contact_id: int, db: Session = Depends(get_db)):
     """
@@ -1705,15 +1762,49 @@ async def get_lead(lead_id: int, db: Session = Depends(get_db)):
 
 @app.patch("/api/leads/{lead_id}")
 async def patch_lead(lead_id: int, body: CrmLeadPatchRequest, db: Session = Depends(get_db)):
-    if body.crm_status not in CRM_STATUS_ALLOWED:
-        raise HTTPException(
-            status_code=400,
-            detail=f"crm_status must be one of: {sorted(CRM_STATUS_ALLOWED)}",
-        )
     row = db.query(CrmLead).filter(CrmLead.id == lead_id).first()
     if not row:
         raise HTTPException(status_code=404, detail="Lead not found")
-    row.crm_status = body.crm_status
+    data = body.model_dump(exclude_unset=True)
+    if not data:
+        raise HTTPException(status_code=400, detail="No fields to update")
+    if "crm_status" in data:
+        if data["crm_status"] not in CRM_STATUS_ALLOWED:
+            raise HTTPException(
+                status_code=400,
+                detail=f"crm_status must be one of: {sorted(CRM_STATUS_ALLOWED)}",
+            )
+        row.crm_status = data["crm_status"]
+    if "first_name" in data:
+        row.first_name = _safe_str(data["first_name"])
+    if "last_name" in data:
+        row.last_name = _safe_str(data["last_name"])
+    if "company_name" in data:
+        row.company_name = _safe_str(data["company_name"])
+    if "title" in data:
+        row.title = _safe_str(data["title"])
+    if "last_reply_subject" in data:
+        row.last_reply_subject = _safe_str(data["last_reply_subject"])
+    if "last_reply_body" in data:
+        row.last_reply_body = _safe_str(data["last_reply_body"])
+    if "email" in data:
+        email = _safe_str(data["email"]).lower()
+        if email:
+            taken = (
+                db.query(CrmLead)
+                .filter(
+                    CrmLead.id != lead_id,
+                    func.lower(CrmLead.email) == email,
+                )
+                .first()
+            )
+            if taken:
+                raise HTTPException(
+                    status_code=409,
+                    detail="Another lead already uses this email",
+                )
+        row.email = email
+    row.updated_at = datetime.utcnow()
     db.commit()
     db.refresh(row)
     return _crm_lead_to_dict(row)
@@ -1849,22 +1940,37 @@ async def patch_deal(deal_id: int, body: CrmDealPatchRequest, db: Session = Depe
     row = db.query(CrmDeal).filter(CrmDeal.id == deal_id).first()
     if not row:
         raise HTTPException(status_code=404, detail="Deal not found")
-    if body.stage is not None:
-        if body.stage not in DEAL_STAGE_ALLOWED:
+    data = body.model_dump(exclude_unset=True)
+    if not data:
+        raise HTTPException(status_code=400, detail="No fields to update")
+    if "name" in data:
+        row.name = _safe_str(data["name"])
+    if "owner_initials" in data:
+        row.owner_initials = _safe_str(data["owner_initials"])[:8]
+    if "contact_display" in data:
+        row.contact_display = _safe_str(data["contact_display"])
+    if "account_name" in data:
+        row.account_name = _safe_str(data["account_name"])
+    if "stage" in data:
+        if data["stage"] not in DEAL_STAGE_ALLOWED:
             raise HTTPException(
                 status_code=400,
                 detail=f"stage must be one of: {sorted(DEAL_STAGE_ALLOWED)}",
             )
-        row.stage = body.stage
-    if body.deal_value is not None:
-        row.deal_value = body.deal_value
-    if body.close_probability is not None:
-        row.close_probability = max(0, min(100, body.close_probability))
-    if body.country is not None:
-        row.country = body.country
-    if body.expected_close_date is not None:
-        ts = _to_datetime(body.expected_close_date)
+        row.stage = data["stage"]
+    if "deal_value" in data:
+        row.deal_value = data["deal_value"]
+    if "close_probability" in data:
+        row.close_probability = max(0, min(100, int(data["close_probability"])))
+    if "country" in data:
+        row.country = _safe_str(data["country"])
+    if "expected_close_date" in data:
+        ts = _to_datetime(data["expected_close_date"])
         row.expected_close_date = ts
+    if "last_interaction_at" in data:
+        ts = _to_datetime(data["last_interaction_at"])
+        row.last_interaction_at = ts
+    row.updated_at = datetime.utcnow()
     db.commit()
     db.refresh(row)
     return _deal_to_dict(row)

backend/app/models.py

@@ -34,7 +34,14 @@ class SmartleadPushRequest(BaseModel):
 
 
 class CrmLeadPatchRequest(BaseModel):
-    crm_status: str
+    crm_status: Optional[str] = None
+    first_name: Optional[str] = None
+    last_name: Optional[str] = None
+    email: Optional[str] = None
+    company_name: Optional[str] = None
+    title: Optional[str] = None
+    last_reply_subject: Optional[str] = None
+    last_reply_body: Optional[str] = None
 
 
 class ContactCreateRequest(BaseModel):
@@ -45,6 +52,14 @@ class ContactCreateRequest(BaseModel):
     title: str = ""
 
 
+class ContactPatchRequest(BaseModel):
+    first_name: Optional[str] = None
+    last_name: Optional[str] = None
+    email: Optional[str] = None
+    company: Optional[str] = None
+    title: Optional[str] = None
+
+
 class BulkLeadIdsRequest(BaseModel):
     lead_ids: List[int]
 
@@ -54,11 +69,16 @@ class BulkContactIdsRequest(BaseModel):
 
 
 class CrmDealPatchRequest(BaseModel):
+    name: Optional[str] = None
     stage: Optional[str] = None
+    owner_initials: Optional[str] = None
     deal_value: Optional[int] = None
     close_probability: Optional[int] = None
     expected_close_date: Optional[str] = None  # ISO date or datetime
     country: Optional[str] = None
+    contact_display: Optional[str] = None
+    account_name: Optional[str] = None
+    last_interaction_at: Optional[str] = None  # ISO date or datetime
 
 
 class SmartleadRunResponse(BaseModel):

frontend/src/components/workspace/EditableCell.jsx

@@ -0,0 +1,106 @@
+import React, { useEffect, useState } from 'react';
+import { cn } from '@/lib/utils';
+
+const baseInput =
+    'w-full min-w-0 rounded-md border border-transparent bg-transparent px-1.5 py-0.5 text-sm text-slate-800 ' +
+    'hover:border-slate-200 focus:border-violet-300 focus:bg-white focus:outline-none focus:ring-1 focus:ring-violet-200';
+
+/**
+ * Inline text / email / number field: blur or Enter commits if the value changed.
+ */
+export function EditableCell({
+    value,
+    onCommit,
+    className = '',
+    inputClassName = '',
+    type = 'text',
+    multiline = false,
+    disabled = false,
+}) {
+    const str = value == null || value === undefined ? '' : String(value);
+    const [local, setLocal] = useState(str);
+
+    useEffect(() => {
+        setLocal(str);
+    }, [str]);
+
+    const commit = () => {
+        if (disabled) return;
+        const next = multiline ? local : local.trim();
+        const prev = multiline ? str : str.trim();
+        if (next !== prev) onCommit(next);
+    };
+
+    const stop = (e) => e.stopPropagation();
+
+    if (multiline) {
+        return (
+            <textarea
+                className={cn(baseInput, 'resize-y min-h-[2.5rem] max-w-full', className, inputClassName)}
+                value={local}
+                onChange={(e) => setLocal(e.target.value)}
+                onBlur={commit}
+                onKeyDown={stop}
+                onClick={stop}
+                disabled={disabled}
+                rows={2}
+            />
+        );
+    }
+
+    return (
+        <input
+            type={type}
+            className={cn(baseInput, className, inputClassName)}
+            value={local}
+            onChange={(e) => setLocal(e.target.value)}
+            onBlur={commit}
+            onKeyDown={(e) => {
+                stop(e);
+                if (e.key === 'Enter') {
+                    e.preventDefault();
+                    e.currentTarget.blur();
+                }
+            }}
+            onClick={stop}
+            disabled={disabled}
+        />
+    );
+}
+
+function toDateInputValue(iso) {
+    if (!iso) return '';
+    const d = new Date(iso);
+    if (Number.isNaN(d.getTime())) return '';
+    return d.toISOString().slice(0, 10);
+}
+
+/**
+ * ISO datetime from API → date input; onCommit receives YYYY-MM-DD or empty string for clear.
+ */
+export function EditableDateCell({ value, onCommit, className = '', disabled = false }) {
+    const [local, setLocal] = useState(() => toDateInputValue(value));
+
+    useEffect(() => {
+        setLocal(toDateInputValue(value));
+    }, [value]);
+
+    const commit = () => {
+        if (disabled) return;
+        const prev = toDateInputValue(value);
+        if (local !== prev) onCommit(local);
+    };
+
+    return (
+        <input
+            type="date"
+            className={cn(baseInput, 'max-w-[11rem]', className)}
+            value={local}
+            onChange={(e) => setLocal(e.target.value)}
+            onBlur={commit}
+            onKeyDown={(e) => e.stopPropagation()}
+            onClick={(e) => e.stopPropagation()}
+            disabled={disabled}
+        />
+    );
+}

frontend/src/pages/Contacts.jsx

@@ -24,6 +24,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 { EditableCell } from '@/components/workspace/EditableCell';
 import { cn } from '@/lib/utils';
 
 export default function Contacts() {
@@ -117,6 +118,27 @@ export default function Contacts() {
         }
     };
 
+    const patchContact = 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');
+            }
+            setContacts((prev) => prev.map((c) => (c.id === contactId ? { ...c, ...data } : c)));
+            setSelectedContact((c) => (c && c.id === contactId ? { ...c, ...data } : c));
+            setSelectedContactDetails((d) => (d && d.id === contactId ? { ...d, ...data } : d));
+        } catch (e) {
+            console.error(e);
+            alert(e.message || 'Could not save changes');
+            await fetchContacts();
+        }
+    };
+
     const fetchContacts = async () => {
         setLoading(true);
         try {
@@ -741,17 +763,54 @@ export default function Contacts() {
                                                         aria-label={`Select ${displayName}`}
                                                     />
                                                 </td>
-                                                <td className="px-3 py-2 font-medium text-violet-800">
-                                                    {displayName}
+                                                <td
+                                                    className="px-3 py-2 align-top"
+                                                    onClick={(e) => e.stopPropagation()}
+                                                >
+                                                    <div className="flex flex-col gap-1 min-w-[140px] max-w-[200px]">
+                                                        <EditableCell
+                                                            value={contact.first_name || ''}
+                                                            onCommit={(v) =>
+                                                                patchContact(contact.id, { first_name: v })
+                                                            }
+                                                            inputClassName="font-medium text-violet-800"
+                                                        />
+                                                        <EditableCell
+                                                            value={contact.last_name || ''}
+                                                            onCommit={(v) =>
+                                                                patchContact(contact.id, { last_name: v })
+                                                            }
+                                                            inputClassName="font-medium text-violet-800"
+                                                        />
+                                                    </div>
                                                 </td>
-                                                <td className="px-3 py-2 text-slate-700 truncate max-w-[220px]">
-                                                    {contact.email || '—'}
+                                                <td
+                                                    className="px-3 py-2 align-top max-w-[240px]"
+                                                    onClick={(e) => e.stopPropagation()}
+                                                >
+                                                    <EditableCell
+                                                        type="email"
+                                                        value={contact.email || ''}
+                                                        onCommit={(v) => patchContact(contact.id, { email: v })}
+                                                    />
                                                 </td>
-                                                <td className="px-3 py-2 text-slate-700 truncate max-w-[200px]">
-                                                    {contact.company || '—'}
+                                                <td
+                                                    className="px-3 py-2 align-top max-w-[220px]"
+                                                    onClick={(e) => e.stopPropagation()}
+                                                >
+                                                    <EditableCell
+                                                        value={contact.company || ''}
+                                                        onCommit={(v) => patchContact(contact.id, { company: v })}
+                                                    />
                                                 </td>
-                                                <td className="px-3 py-2 text-slate-600 truncate max-w-[180px]">
-                                                    {contact.title || '—'}
+                                                <td
+                                                    className="px-3 py-2 align-top max-w-[200px]"
+                                                    onClick={(e) => e.stopPropagation()}
+                                                >
+                                                    <EditableCell
+                                                        value={contact.title || ''}
+                                                        onCommit={(v) => patchContact(contact.id, { title: v })}
+                                                    />
                                                 </td>
                                             </tr>
                                         );

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 { EditableCell, EditableDateCell } from '@/components/workspace/EditableCell';
 import { cn } from '@/lib/utils';
 
 const STAGES = [
@@ -88,23 +89,28 @@ export default function Deals() {
         }
     };
 
-    const updateStage = async (dealId, stage) => {
+    const patchDeal = async (dealId, patch) => {
         try {
             const res = await fetch(`/api/deals/${dealId}`, {
                 method: 'PATCH',
                 headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify({ stage }),
+                body: JSON.stringify(patch),
             });
-            if (!res.ok) throw new Error('Update failed');
-            const updated = await res.json();
-            setDeals((prev) => prev.map((d) => (d.id === dealId ? { ...d, ...updated } : d)));
-            setDealDetail((cur) => (cur && cur.id === dealId ? { ...cur, ...updated } : cur));
+            const data = await res.json().catch(() => ({}));
+            if (!res.ok) {
+                throw new Error(typeof data.detail === 'string' ? data.detail : 'Update failed');
+            }
+            setDeals((prev) => prev.map((d) => (d.id === dealId ? { ...d, ...data } : d)));
+            setDealDetail((cur) => (cur && cur.id === dealId ? { ...cur, ...data } : cur));
         } catch (e) {
             console.error(e);
-            alert('Could not update stage');
+            alert(e.message || 'Could not save deal');
+            await fetchDeals();
         }
     };
 
+    const updateStage = (dealId, stage) => patchDeal(dealId, { stage });
+
     const openDeal = async (deal) => {
         setPanelOpen(true);
         setDealDetail(deal);
@@ -210,7 +216,16 @@ export default function Deals() {
                                             <td className="px-2 py-2" onClick={(e) => e.stopPropagation()}>
                                                 <input type="checkbox" className="rounded border-slate-300" />
                                             </td>
-                                            <td className="px-3 py-2 font-medium text-slate-900">{deal.name}</td>
+                                            <td
+                                                className="px-3 py-2 align-top max-w-[220px] font-medium"
+                                                onClick={(e) => e.stopPropagation()}
+                                            >
+                                                <EditableCell
+                                                    value={deal.name || ''}
+                                                    onCommit={(v) => patchDeal(deal.id, { name: v })}
+                                                    inputClassName="font-medium text-slate-900"
+                                                />
+                                            </td>
                                             <td className="px-3 py-2" onClick={(e) => e.stopPropagation()}>
                                                 <Select
                                                     value={safeStage}
@@ -246,45 +261,112 @@ export default function Deals() {
                                                     </SelectContent>
                                                 </Select>
                                             </td>
-                                            <td className="px-3 py-2">
-                                                <div className="h-8 w-8 rounded-full bg-violet-100 text-violet-700 text-xs font-semibold flex items-center justify-center border border-violet-200">
-                                                    {deal.owner_initials || '?'}
-                                                </div>
+                                            <td className="px-3 py-2 align-top" onClick={(e) => e.stopPropagation()}>
+                                                <EditableCell
+                                                    value={deal.owner_initials || ''}
+                                                    onCommit={(v) =>
+                                                        patchDeal(deal.id, {
+                                                            owner_initials: (v || '').slice(0, 8).toUpperCase(),
+                                                        })
+                                                    }
+                                                    inputClassName="text-center uppercase tracking-wide max-w-[4.5rem] font-semibold"
+                                                />
                                             </td>
-                                            <td className="px-3 py-2 text-slate-700 tabular-nums">
-                                                {fmtMoney(deal.deal_value)}
+                                            <td
+                                                className="px-3 py-2 align-top tabular-nums max-w-[120px]"
+                                                onClick={(e) => e.stopPropagation()}
+                                            >
+                                                <EditableCell
+                                                    type="number"
+                                                    value={deal.deal_value != null ? String(deal.deal_value) : ''}
+                                                    onCommit={(v) => {
+                                                        if (v.trim() === '') {
+                                                            patchDeal(deal.id, { deal_value: null });
+                                                            return;
+                                                        }
+                                                        const n = Math.round(Number(v));
+                                                        if (!Number.isFinite(n)) return;
+                                                        patchDeal(deal.id, { deal_value: n });
+                                                    }}
+                                                />
                                             </td>
-                                            <td className="px-3 py-2">
-                                                {deal.contact_display ? (
-                                                    <span className="inline-flex rounded-md bg-slate-100 px-2 py-0.5 text-xs font-medium text-slate-800">
-                                                        {deal.contact_display}
-                                                    </span>
-                                                ) : (
-                                                    '—'
-                                                )}
+                                            <td
+                                                className="px-3 py-2 align-top max-w-[180px]"
+                                                onClick={(e) => e.stopPropagation()}
+                                            >
+                                                <EditableCell
+                                                    value={deal.contact_display || ''}
+                                                    onCommit={(v) => patchDeal(deal.id, { contact_display: v })}
+                                                    inputClassName="text-xs"
+                                                />
                                             </td>
-                                            <td className="px-3 py-2">
-                                                {deal.account_name ? (
-                                                    <span className="inline-flex rounded-md bg-violet-50 px-2 py-0.5 text-xs font-medium text-violet-800">
-                                                        {deal.account_name}
-                                                    </span>
-                                                ) : (
-                                                    '—'
-                                                )}
+                                            <td
+                                                className="px-3 py-2 align-top max-w-[200px]"
+                                                onClick={(e) => e.stopPropagation()}
+                                            >
+                                                <EditableCell
+                                                    value={deal.account_name || ''}
+                                                    onCommit={(v) => patchDeal(deal.id, { account_name: v })}
+                                                    inputClassName="text-xs"
+                                                />
                                             </td>
-                                            <td className="px-3 py-2 text-slate-600">
-                                                {fmtDate(deal.expected_close_date)}
+                                            <td className="px-3 py-2 align-top" onClick={(e) => e.stopPropagation()}>
+                                                <EditableDateCell
+                                                    value={deal.expected_close_date}
+                                                    onCommit={(dateStr) =>
+                                                        patchDeal(deal.id, {
+                                                            expected_close_date: dateStr || null,
+                                                        })
+                                                    }
+                                                />
                                             </td>
-                                            <td className="px-3 py-2 tabular-nums text-slate-700">
-                                                {deal.close_probability ?? '—'}%
+                                            <td
+                                                className="px-3 py-2 align-top tabular-nums max-w-[90px]"
+                                                onClick={(e) => e.stopPropagation()}
+                                            >
+                                                <EditableCell
+                                                    type="number"
+                                                    value={
+                                                        deal.close_probability != null
+                                                            ? String(deal.close_probability)
+                                                            : ''
+                                                    }
+                                                    onCommit={(v) => {
+                                                        if (v.trim() === '') {
+                                                            patchDeal(deal.id, { close_probability: 0 });
+                                                            return;
+                                                        }
+                                                        const n = Math.min(100, Math.max(0, Math.round(Number(v))));
+                                                        if (!Number.isFinite(n)) return;
+                                                        patchDeal(deal.id, { close_probability: n });
+                                                    }}
+                                                />
                                             </td>
-                                            <td className="px-3 py-2 tabular-nums text-slate-700">
+                                            <td
+                                                className="px-3 py-2 tabular-nums text-slate-700"
+                                                title="Forecast = deal value × close %"
+                                            >
                                                 {fmtMoney(deal.forecast_value)}
                                             </td>
-                                            <td className="px-3 py-2 text-slate-600">
-                                                {fmtDate(deal.last_interaction_at)}
+                                            <td className="px-3 py-2 align-top" onClick={(e) => e.stopPropagation()}>
+                                                <EditableDateCell
+                                                    value={deal.last_interaction_at}
+                                                    onCommit={(dateStr) =>
+                                                        patchDeal(deal.id, {
+                                                            last_interaction_at: dateStr || null,
+                                                        })
+                                                    }
+                                                />
+                                            </td>
+                                            <td
+                                                className="px-3 py-2 align-top max-w-[120px]"
+                                                onClick={(e) => e.stopPropagation()}
+                                            >
+                                                <EditableCell
+                                                    value={deal.country || ''}
+                                                    onCommit={(v) => patchDeal(deal.id, { country: v })}
+                                                />
                                             </td>
-                                            <td className="px-3 py-2 text-slate-700">{deal.country || '—'}</td>
                                         </tr>
                                     );
                                 })}

frontend/src/pages/Leads.jsx

@@ -16,6 +16,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 { EditableCell } from '@/components/workspace/EditableCell';
 import { cn } from '@/lib/utils';
 
 const CRM_STATUSES = [
@@ -110,23 +111,28 @@ export default function Leads() {
         return () => clearTimeout(t);
     }, [fetchLeads]);
 
-    const updateStatus = async (leadId, crmStatus) => {
+    const patchLead = async (leadId, patch) => {
         try {
             const res = await fetch(`/api/leads/${leadId}`, {
                 method: 'PATCH',
                 headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify({ crm_status: crmStatus }),
+                body: JSON.stringify(patch),
             });
-            if (!res.ok) throw new Error(await res.text());
-            const updated = await res.json();
-            setLeads((prev) => prev.map((l) => (l.id === leadId ? { ...l, ...updated } : l)));
-            setSelected((s) => (s && s.id === leadId ? { ...s, ...updated } : s));
+            const data = await res.json().catch(() => ({}));
+            if (!res.ok) {
+                throw new Error(typeof data.detail === 'string' ? data.detail : 'Update failed');
+            }
+            setLeads((prev) => prev.map((l) => (l.id === leadId ? { ...l, ...data } : l)));
+            setSelected((s) => (s && s.id === leadId ? { ...s, ...data } : s));
         } catch (e) {
             console.error(e);
-            alert('Could not update status');
+            alert(e.message || 'Could not update lead');
+            await fetchLeads();
         }
     };
 
+    const updateStatus = (leadId, crmStatus) => patchLead(leadId, { crm_status: crmStatus });
+
     const loadThread = async (leadId) => {
         setThreadLoading(true);
         setThreadData(null);
@@ -440,10 +446,24 @@ export default function Leads() {
                                                     aria-label={`Select ${displayName}`}
                                                 />
                                             </td>
-                                            <td className="px-3 py-2">
-                                                <span className="font-medium text-violet-800">{displayName}</span>
+                                            <td
+                                                className="px-3 py-2 align-top max-w-[200px]"
+                                                onClick={(e) => e.stopPropagation()}
+                                            >
+                                                <div className="flex flex-col gap-1">
+                                                    <EditableCell
+                                                        value={lead.first_name || ''}
+                                                        onCommit={(v) => patchLead(lead.id, { first_name: v })}
+                                                        inputClassName="font-medium text-violet-800"
+                                                    />
+                                                    <EditableCell
+                                                        value={lead.last_name || ''}
+                                                        onCommit={(v) => patchLead(lead.id, { last_name: v })}
+                                                        inputClassName="font-medium text-violet-800"
+                                                    />
+                                                </div>
                                                 {lead.contact_id ? (
-                                                    <span className="ml-2 text-xs text-emerald-600">
+                                                    <span className="mt-1 text-xs text-emerald-600">
                                                         (in Contacts)
                                                     </span>
                                                 ) : null}
@@ -487,39 +507,60 @@ export default function Leads() {
                                                     </SelectContent>
                                                 </Select>
                                             </td>
-                                            <td className="px-3 py-2 text-slate-700">
-                                                <span className="inline-flex items-center gap-1">
-                                                    <Building2 className="h-3.5 w-3.5 text-slate-400" />
-                                                    {lead.company_name || '—'}
+                                            <td
+                                                className="px-3 py-2 align-top max-w-[220px]"
+                                                onClick={(e) => e.stopPropagation()}
+                                            >
+                                                <span className="inline-flex items-start gap-1.5 w-full">
+                                                    <Building2 className="h-3.5 w-3.5 text-slate-400 shrink-0 mt-1" />
+                                                    <EditableCell
+                                                        value={lead.company_name || ''}
+                                                        onCommit={(v) => patchLead(lead.id, { company_name: v })}
+                                                    />
                                                 </span>
                                             </td>
-                                            <td className="px-3 py-2 text-slate-700">
-                                                <span className="inline-flex items-center gap-1">
-                                                    <Briefcase className="h-3.5 w-3.5 text-slate-400" />
-                                                    {lead.title || '—'}
+                                            <td
+                                                className="px-3 py-2 align-top max-w-[200px]"
+                                                onClick={(e) => e.stopPropagation()}
+                                            >
+                                                <span className="inline-flex items-start gap-1.5 w-full">
+                                                    <Briefcase className="h-3.5 w-3.5 text-slate-400 shrink-0 mt-1" />
+                                                    <EditableCell
+                                                        value={lead.title || ''}
+                                                        onCommit={(v) => patchLead(lead.id, { title: v })}
+                                                    />
                                                 </span>
                                             </td>
-                                            <td className="px-3 py-2" onClick={(e) => e.stopPropagation()}>
-                                                {lead.email ? (
-                                                    <a
-                                                        href={`mailto:${lead.email}`}
-                                                        className="text-violet-600 hover:underline inline-flex items-center gap-1"
-                                                    >
-                                                        <Mail className="h-3.5 w-3.5" />
-                                                        {lead.email}
-                                                    </a>
-                                                ) : (
-                                                    '—'
-                                                )}
+                                            <td className="px-3 py-2 align-top max-w-[260px]" onClick={(e) => e.stopPropagation()}>
+                                                <div className="flex items-start gap-1.5">
+                                                    <EditableCell
+                                                        type="email"
+                                                        value={lead.email || ''}
+                                                        onCommit={(v) => patchLead(lead.id, { email: v })}
+                                                        className="min-w-0 flex-1"
+                                                    />
+                                                    {lead.email ? (
+                                                        <a
+                                                            href={`mailto:${lead.email}`}
+                                                            className="mt-1 shrink-0 text-violet-600 hover:text-violet-800"
+                                                            title="Send email"
+                                                            onClick={(e) => e.stopPropagation()}
+                                                        >
+                                                            <Mail className="h-3.5 w-3.5" />
+                                                        </a>
+                                                    ) : null}
+                                                </div>
                                             </td>
                                             <td
-                                                className="px-3 py-2 text-slate-600 max-w-[200px] truncate"
-                                                title={lead.last_reply_body}
+                                                className="px-3 py-2 align-top text-slate-600 max-w-[280px]"
+                                                onClick={(e) => e.stopPropagation()}
                                             >
-                                                {lead.last_reply_body
-                                                    ? lead.last_reply_body.slice(0, 80) +
-                                                      (lead.last_reply_body.length > 80 ? '…' : '')
-                                                    : '—'}
+                                                <EditableCell
+                                                    multiline
+                                                    value={lead.last_reply_body || ''}
+                                                    onCommit={(v) => patchLead(lead.id, { last_reply_body: v })}
+                                                    inputClassName="text-xs"
+                                                />
                                             </td>
                                         </tr>
                                     );