@graph8/sdk 0.362.0 → 0.373.0

package/blocks/enrichment/components/bulk-enrich-panel.tsx

@@ -7,21 +7,31 @@
  *
  * SDK operations, in order:
  *   1. listEnrichmentProviders  GET  /enrichment/providers            (read)    provider choices, graph8-funded vs own key
+ *   1b. listWaterfallConfigs    GET  /enrichment/waterfall/configs?list_id (read)  the list's own pipeline for the field, if any:
+ *        a run reuses it with ITS providers, so the quote and the confirm are priced with those, not the chosen ones.
  *   2. preflightEnrichment      POST /enrichment/preflight            (read, free; nothing is written or charged)
  *        { list_id, contact_ids, mode: "waterfall", providers, target_field }  -> contact_count, not_in_list,
  *        missing_credentials, warnings, credits_per_record, max_total_credits
- *   3. startEnrichment          POST /enrichment/enrich               (billable)  202 { job_id, status }
- *        Goes through ConfirmSpendDialog first with `max_total_credits` (or 2 credits x contacts when the
- *        preflight could not price it). There is no balance read, so this is an estimate of the most it can charge.
- *   4. getEnrichmentJob         GET  /enrichment/jobs/{job_id}        (read)    polled with useJobPoll (no streams), backoff;
+ *   After ConfirmSpendDialog (with `max_total_credits`, or 2 credits x contacts when the preflight could not price it;
+ *   there is no balance read, so this is an estimate of the most it can charge):
+ *   3. createDefaultWaterfallConfig POST /enrichment/waterfall/configs { list_id, name, field, providers }  (billable tier, free)
+ *        Creates the list's pipeline for that field, or reuses the one it already has (`created: false`; it then runs
+ *        with ITS providers). The column_id is kept, so a retry after step 4 failed does not create it again.
+ *   4. runWaterfallPipeline     POST /enrichment/waterfall/enrich { column_id, list_id, record_ids }  (billable) 202 { job_id, status }
+ *        A 202 whose status is "error" (or a 502) means the job never started: shown as a failure, never polled.
+ *   5. getEnrichmentJob         GET  /enrichment/jobs/{job_id}        (read)    polled with useJobPoll (no streams), backoff;
  *        read once more with ?include_provider_errors=true when nothing was enriched or some records failed.
- *   5. cancelEnrichmentJob      POST /enrichment/jobs/{job_id}/cancel (write, free; records already done keep their data and charge)
+ *   6. cancelEnrichmentJob      POST /enrichment/jobs/{job_id}/cancel (write, free; records already done keep their data and charge)
+ *
+ * When the job ends, every cached `contacts` query is refreshed (and the page mode's ContactTable reloads) so the
+ * filled values show. The panel does not use POST /enrichment/enrich (startEnrichment): before the API fix of
+ * 2026-10-16 that route dispatched the field name instead of a pipeline and silently enriched nothing.
  *
  * The contacts must be on `listId`; ids not on it are skipped and not charged. Locked contacts are enriched
  * like any other once they sit in a list.
  */
 
-import { useState } from "react";
+import { useRef, useState } from "react";
 import { Button } from "@graph8/sdk/ui";
 import { ApiError } from "@/g8/components/api-error";
 import { ConfirmSpendDialog } from "@/g8/components/confirm-spend-dialog";
@@ -29,54 +39,90 @@ import { useG8Mutation } from "@/g8/hooks/use-g8-mutation";
 import { useG8Query } from "@/g8/hooks/use-g8-query";
 import { useJobPoll } from "@/g8/hooks/use-job-poll";
 import { g8Get, g8Post } from "@/g8/lib/g8-client";
+import { g8QueryCache } from "@/g8/lib/g8-cache";
 import { ContactTable } from "@/g8/crm/components/contact-table";
 import { ListPicker } from "@/g8/lists/components/list-picker";
+import { plural } from "@/g8/lib/plural";
 import { useProviders } from "../hooks/use-providers";
-import { CREDITS_PER_RECORD_ESTIMATE, TARGET_FIELDS, estimateCredits, isJobTerminal } from "../lib/enrichment-types";
-import type { EnrichJob, Preflight, TargetField } from "../lib/enrichment-types";
+import { CREDITS_PER_RECORD_ESTIMATE, FIELD_PROVIDERS, TARGET_FIELDS, estimateCredits, isJobTerminal, providersForField } from "../lib/enrichment-types";
+import type { EnrichJob, Preflight, TargetField, WaterfallConfigSummary, WaterfallPipelineResult } from "../lib/enrichment-types";
+import { useBrand } from "@/g8/hooks/use-brand";
 
 export interface BulkEnrichPanelProps {
   /** With `listId` and `contactIds` it is just the enrichment panel. Omit them and it is a whole page: pick a list, tick contacts, enrich. */
   listId?: number;
   contactIds?: number[];
-  /** Providers tried, in order, when the person has not chosen. Default: prospeo, dropcontact (the API's own default). */
+  /**
+   * Providers tried, in order, when the person has not chosen. Kept to the providers the field supports. Default: the
+   * API's own per field (work email: prospeo, dropcontact; phones: leadmagic, prospeo, apollo).
+   */
   defaultProviders?: string[];
   defaultField?: TargetField;
   /** Called when the job reached a final state. */
   onDone?: (job: EnrichJob) => void;
+  /** Called with the job id as soon as a run starts (to list it in a job history). */
+  onStarted?: (jobId: string) => void;
   className?: string;
 }
 
-const DEFAULT_PROVIDERS = ["prospeo", "dropcontact"];
+type StartedRun = { job: EnrichJob; pipeline: WaterfallPipelineResult; asked: string[] };
 
-function BulkEnrichCore({ listId, contactIds, defaultProviders = DEFAULT_PROVIDERS, defaultField = "work_email", onDone, className }: BulkEnrichPanelProps & { listId: number; contactIds: number[] }) {
+function BulkEnrichCore({ listId, contactIds, defaultProviders, defaultField = "work_email", onDone, onStarted, className }: BulkEnrichPanelProps & { listId: number; contactIds: number[] }) {
+  const brand = useBrand();
   const [field, setField] = useState<TargetField>(defaultField);
   const [chosen, setChosen] = useState<string[] | null>(null);
   const [confirmOpen, setConfirmOpen] = useState(false);
   const [jobId, setJobId] = useState<string | null>(null);
+  const [run, setRun] = useState<StartedRun | null>(null);
+  // The pipeline step 3 created or reused, kept per list/field/providers so a retry does not create it twice.
+  const pipelineRef = useRef<{ key: string; pipeline: WaterfallPipelineResult } | null>(null);
   const catalog = useProviders();
 
   const known = new Set(catalog.providers.map((p) => p.provider));
-  const providers = chosen ?? defaultProviders.filter((p) => known.size === 0 || known.has(p));
+  const providers = chosen ?? providersForField(field, defaultProviders).filter((p) => known.size === 0 || known.has(p));
+  const offered = catalog.providers.filter((p) => FIELD_PROVIDERS[field].includes(p.provider) && !providers.includes(p.provider));
   const column = TARGET_FIELDS.find((f) => f.value === field)!;
   const ids = [...new Set(contactIds)];
 
+  // The list's own pipeline for this field wins over the chosen providers (the API reuses it), so price that one.
+  const saved = useG8Query(
+    async (signal) => (await g8Get<{ configs: WaterfallConfigSummary[] }>("/enrichment/waterfall/configs", { list_id: listId }, { signal })).data.configs ?? [],
+    [listId],
+    { enabled: !jobId },
+  );
+  const existing = saved.data?.find((c) => c.field_to_enrich === column.target && c.providers.length > 0) ?? null;
+  const runProviders = existing ? existing.providers : providers;
+
   const preflight = useG8Query(
-    async (signal) => (await g8Post<Preflight>("/enrichment/preflight", { list_id: listId, contact_ids: ids, mode: "waterfall", providers, target_field: column.target }, { signal })).data,
-    [listId, ids.join(","), providers.join(","), field],
+    async (signal) => (await g8Post<Preflight>("/enrichment/preflight", { list_id: listId, contact_ids: ids, mode: "waterfall", providers: runProviders, target_field: column.target }, { signal })).data,
+    [listId, ids.join(","), runProviders.join(","), field],
     { enabled: ids.length > 0 && !jobId },
   );
   const quote = preflight.data;
   const credits = estimateCredits(quote, ids.length);
   const runnable = quote ? quote.contact_count - quote.not_in_list.length : ids.length;
 
-  const start = useG8Mutation(() => g8Post<{ job_id: string }>("/enrichment/enrich", { contact_ids: ids, list_id: listId, fields_config: { [column.column]: providers } }), {
-    onSuccess: (res) => { setConfirmOpen(false); setJobId(res.data.job_id); },
+  const start = useG8Mutation(async (): Promise<StartedRun> => {
+    const key = `${listId}|${column.target}|${providers.join(",")}`;
+    let pipeline = pipelineRef.current?.key === key ? pipelineRef.current.pipeline : null;
+    if (!pipeline) {
+      pipeline = (await g8Post<WaterfallPipelineResult>("/enrichment/waterfall/configs", { list_id: listId, name: `${column.label} enrichment`, field: column.target, providers })).data;
+      pipelineRef.current = { key, pipeline };
+    }
+    const job = (await g8Post<EnrichJob>("/enrichment/waterfall/enrich", { column_id: pipeline.column_id, list_id: listId, record_ids: ids })).data;
+    if (!job?.job_id || String(job.status).toLowerCase() === "error") throw new Error("The enrichment did not start, so nothing was charged. Try again in a minute.");
+    return { job, pipeline, asked: providers };
+  }, {
+    onSuccess: (res) => { setConfirmOpen(false); setRun(res); setJobId(res.job.job_id); onStarted?.(res.job.job_id); },
   });
   const job = useJobPoll<EnrichJob>(
     async (signal) => (await g8Get<EnrichJob>(`/enrichment/jobs/${jobId}`, undefined, { signal })).data,
-    { enabled: jobId != null, intervalMs: 2000, isTerminal: (j) => isJobTerminal(j.status), onDone: (j) => onDone?.(j) },
+    {
+      enabled: jobId != null, intervalMs: 2000, isTerminal: (j) => isJobTerminal(j.status),
+      onDone: (j) => { void g8QueryCache.invalidate(["contacts"]); onDone?.(j); },
+    },
   );
+  const reused = run && !run.pipeline.created && run.pipeline.providers?.length && run.pipeline.providers.join() !== run.asked.join() ? run.pipeline.providers : null;
   const cancel = useG8Mutation(() => g8Post(`/enrichment/jobs/${jobId}/cancel`, {}));
   const finished = job.status;
   const nothingWritten = job.done && ((finished?.successful_enrichments ?? 0) === 0 || (finished?.failed_enrichments ?? 0) > 0);
@@ -101,9 +147,10 @@ function BulkEnrichCore({ listId, contactIds, defaultProviders = DEFAULT_PROVIDE
     const pct = total ? Math.round(((j?.completed ?? 0) / total) * 100) : 0;
     return (
       <div className={`flex flex-col gap-3 ${className ?? ""}`} role="status">
-        <h3 className="text-base font-semibold">{job.done ? (j?.status === "completed" ? "Enrichment finished" : `Enrichment ${j?.status}`) : "Enriching..."}</h3>
+        <h3 className="text-base font-medium">{job.done ? (j?.status === "completed" ? "Enrichment finished" : `Enrichment ${j?.status}`) : "Enriching..."}</h3>
         <div className="h-2 overflow-hidden rounded bg-muted" aria-label="Progress"><div className="h-full bg-primary transition-all" style={{ width: `${job.done ? 100 : pct}%` }} /></div>
         <p className="text-sm">{j?.completed ?? 0} of {total} contacts processed{j?.successful_enrichments != null ? `, ${j.successful_enrichments} enriched, ${j.failed_enrichments ?? 0} failed` : ""}.{j?.total_credits_used != null ? ` ${j.total_credits_used} credits used.` : ""}</p>
+        {reused ? <p className="text-xs text-muted-foreground">This list already had a {column.label.toLowerCase()} pipeline, so it ran with its providers: {reused.join(" > ")}.</p> : null}
         {j?.warnings?.map((w) => <p key={w} className="text-xs text-muted-foreground">{w}</p>)}
         {job.error ? <ApiError error={job.error} title="Could not read the job" onRetry={() => job.start()} /> : null}
         {errors.data?.length ? (
@@ -114,7 +161,7 @@ function BulkEnrichCore({ listId, contactIds, defaultProviders = DEFAULT_PROVIDE
         {cancel.error ? <ApiError error={cancel.error} title="Could not cancel" /> : null}
         <div className="flex gap-2">
           {!job.done ? <Button variant="outline" size="sm" loading={cancel.loading} onClick={() => void cancel.mutate(undefined)}>Cancel</Button> : null}
-          {job.done ? <Button size="sm" variant="outline" onClick={() => { setJobId(null); job.stop(); }}>Enrich more</Button> : null}
+          {job.done ? <Button size="sm" variant="outline" onClick={() => { setJobId(null); setRun(null); job.stop(); }}>Enrich more</Button> : null}
         </div>
       </div>
     );
@@ -124,17 +171,21 @@ function BulkEnrichCore({ listId, contactIds, defaultProviders = DEFAULT_PROVIDE
     <div className={`flex flex-col gap-4 ${className ?? ""}`}>
       <div className="flex flex-wrap items-center gap-3">
         <label className="flex items-center gap-2 text-sm">Fill
-          <select aria-label="Field to fill" className="h-9 rounded-md border bg-background px-2" value={field} onChange={(e) => setField(e.target.value as TargetField)}>
+          <select aria-label="Field to fill" className="h-9 rounded-md border bg-background px-2" value={field} onChange={(e) => { setField(e.target.value as TargetField); setChosen(null); }}>
             {TARGET_FIELDS.map((f) => <option key={f.value} value={f.value}>{f.label}</option>)}
           </select>
         </label>
-        <span className="text-sm text-muted-foreground">for {ids.length.toLocaleString()} contact{ids.length === 1 ? "" : "s"}</span>
+        <span className="text-sm text-muted-foreground">for {plural(ids.length, "contact")}</span>
       </div>
 
       <fieldset className="flex flex-col gap-1">
         <legend className="mb-1 text-sm font-medium">Providers, tried in this order</legend>
         {catalog.error ? <ApiError error={catalog.error} title="Could not load providers" onRetry={() => void catalog.refetch()} /> : null}
-        {providers.map((p, i) => (
+        {existing ? (
+          <p className="text-sm text-muted-foreground" data-testid="saved-pipeline">
+            This list already has a {column.label.toLowerCase()} pipeline (&quot;{existing.name}&quot;), so a run uses its providers: {existing.providers.join(" > ")}. Delete it under Pipelines to choose others.
+          </p>
+        ) : providers.map((p, i) => (
           <div key={p} className="flex items-center gap-2 text-sm">
             <span className="w-6 text-muted-foreground">{i + 1}.</span><span className="w-32 font-medium">{p}</span>
             <Button variant="ghost" size="sm" aria-label={`Move ${p} up`} disabled={i === 0} onClick={() => move(p, -1)}>Up</Button>
@@ -143,7 +194,7 @@ function BulkEnrichCore({ listId, contactIds, defaultProviders = DEFAULT_PROVIDE
           </div>
         ))}
         <div className="flex flex-wrap gap-1">
-          {catalog.providers.filter((p) => !providers.includes(p.provider)).map((p) => (
+          {(existing ? [] : offered).map((p) => (
             <Button key={p.provider} variant="outline" size="sm" onClick={() => toggleProvider(p.provider)}>Add {p.provider}{p.byok_configured ? " (your key)" : p.system_funded ? "" : " (needs a key)"}</Button>
           ))}
         </div>
@@ -154,15 +205,15 @@ function BulkEnrichCore({ listId, contactIds, defaultProviders = DEFAULT_PROVIDE
         <div className="rounded-md border p-3 text-sm" aria-label="Preflight">
           <p><strong>{runnable.toLocaleString()}</strong> of {quote.contact_count.toLocaleString()} contacts will be enriched{quote.not_in_list.length ? `; ${quote.not_in_list.length} are not on this list and are skipped (not charged)` : ""}{quote.duplicates_removed ? `; ${quote.duplicates_removed} duplicates removed` : ""}.</p>
           <p className="mt-1">{quote.max_total_credits != null ? `At most ${quote.max_total_credits.toLocaleString()} credits (${quote.credits_per_record} per record).` : `About ${credits.toLocaleString()} credits (${CREDITS_PER_RECORD_ESTIMATE} per record, the API's flat estimate).`} Records that already have a value or find nothing cost less.</p>
-          {quote.missing_credentials.length ? <p role="alert" className="mt-1 text-amber-700">No API key for {quote.missing_credentials.join(", ")}: those steps are skipped. Add the keys in graph8 settings.</p> : null}
+          {quote.missing_credentials.length ? <p role="alert" className="mt-1 text-warning-foreground">No API key for {quote.missing_credentials.join(", ")}: those steps are skipped. Add the keys in {brand.linkLabel} settings.</p> : null}
           {quote.warnings.map((w) => <p key={w} className="mt-1 text-xs text-muted-foreground">{w}</p>)}
         </div>
       ) : null}
       {start.error ? <ApiError error={start.error} title="Could not start the enrichment" /> : null}
 
       <div className="flex justify-end">
-        <Button disabled={ids.length === 0 || providers.length === 0 || preflight.loading || runnable === 0 || Boolean(preflight.error)} onClick={() => setConfirmOpen(true)}>
-          Enrich {runnable.toLocaleString()} contact{runnable === 1 ? "" : "s"}
+        <Button disabled={ids.length === 0 || runProviders.length === 0 || preflight.loading || runnable === 0 || Boolean(preflight.error)} onClick={() => setConfirmOpen(true)}>
+          Enrich {plural(runnable, "contact")}
         </Button>
       </div>
 
@@ -170,7 +221,7 @@ function BulkEnrichCore({ listId, contactIds, defaultProviders = DEFAULT_PROVIDE
         open={confirmOpen}
         tier="billable"
         title={`Enrich ${runnable.toLocaleString()} contacts: ${column.label.toLowerCase()}`}
-        description={`Providers in order: ${providers.join(", ")}. The estimate is the most this run can charge; your balance is not checked here.`}
+        description={`Providers in order: ${runProviders.join(", ")}${existing ? ` (the list's saved ${column.label.toLowerCase()} pipeline)` : ""}. The estimate is the most this run can charge; your balance is not checked here.`}
         estimatedCredits={credits}
         affected={runnable}
         confirmLabel="Start enrichment"
@@ -189,15 +240,18 @@ function BulkEnrichCore({ listId, contactIds, defaultProviders = DEFAULT_PROVIDE
 export function BulkEnrichPanel(props: BulkEnrichPanelProps) {
   const [listId, setListId] = useState<number | undefined>(undefined);
   const [picked, setPicked] = useState<number[]>([]);
+  const [tableVersion, setTableVersion] = useState(0);
   if (props.listId != null && props.contactIds) return <BulkEnrichCore {...props} listId={props.listId} contactIds={props.contactIds} />;
   const { listId: _l, contactIds: _c, ...rest } = props;
+  // A finished run reloads the table so the filled values show (this also clears the ticked contacts).
+  const done = (job: EnrichJob) => { setTableVersion((v) => v + 1); props.onDone?.(job); };
   return (
     <div className={`flex flex-col gap-4 ${props.className ?? ""}`}>
       <ListPicker value={listId} allowCreate={false} onChange={(l) => { setListId(l.id); setPicked([]); }} />
       {listId != null ? (
         <>
-          <ContactTable listId={listId} selectable pageSize={10} onSelectionChange={(ids) => setPicked(ids)} />
-          <BulkEnrichCore {...rest} className={undefined} listId={listId} contactIds={picked} />
+          <ContactTable listId={listId} selectable pageSize={10} refreshKey={tableVersion} onSelectionChange={(ids) => setPicked(ids)} />
+          <BulkEnrichCore {...rest} className={undefined} listId={listId} contactIds={picked} onDone={done} />
         </>
       ) : <p className="text-sm text-muted-foreground">Choose a list to enrich its contacts.</p>}
     </div>

package/blocks/enrichment/components/email-verify-badge.tsx

@@ -4,6 +4,12 @@
  * EmailVerifyBadge: a small status chip next to an email address (Unverified, Valid, Risky, Invalid) with
  * a "Verify" action.
  *
+ * The verdict comes from the verifier's own result code (EmailListVerify and friends; the backend's vocabulary is
+ * shared/services/email_verification_classifier.py): `ok`/`valid` is Valid; catch-all codes (`ok_for_all`,
+ * `accept_all`) are Risky; hard failures (`email_disabled`, `invalid_mx`, `dead_server`, `no_mx`, ...) are Invalid, so a
+ * known-bad address is never offered a second paid Verify; `unknown`/`error` (the verifier was inconclusive or the call
+ * failed) is "Couldn't verify", which can be retried.
+ *
  * SDK operations, in order:
  *   1. verifyEmail   POST /enrichment/verify-email { email }   (billable)
  *        Goes through ConfirmSpendDialog first: 1 credit per verification.
@@ -20,7 +26,7 @@ import { useG8Mutation } from "@/g8/hooks/use-g8-mutation";
 import { g8Post } from "@/g8/lib/g8-client";
 import { CREDITS_PER_EMAIL_VERIFICATION, isMaskedValue } from "../lib/enrichment-types";
 
-export type VerifyState = "unverified" | "valid" | "risky" | "invalid";
+export type VerifyState = "unverified" | "valid" | "risky" | "invalid" | "unverifiable";
 
 export interface EmailVerifyBadgeProps {
   email?: string | null;
@@ -32,23 +38,37 @@ export interface EmailVerifyBadgeProps {
   className?: string;
 }
 
-/** Collapse the verifier's vocabulary into the four states the chip shows. */
+// The verifier's result codes, normalised to lowercase with "-" (shared/services/email_verification_classifier.py).
+// `error` is EmailListVerify's "delivery failed" and the classifier counts it NOT_VALID, so it is Invalid here; a
+// vendor failure reaches the client as `unknown` (the endpoint catches it and charges nothing). `role-based` and
+// `timeout` are not in the backend vocabulary; they are kept as harmless aliases from other verifiers.
+const VALID = new Set(["valid", "ok", "deliverable", "ultra-sure", "sure"]);
+const RISKY = new Set(["catch-all", "accept-all", "ok-for-all", "role-based"]);
+const INVALID = new Set([
+  "invalid", "fail", "undeliverable", "unlikely", "unsure", "email-disabled", "dead-server", "invalid-mx", "invalid-syntax",
+  "bad-mx", "no-mx", "abuse", "do-not-mail", "spamtrap", "disposable", "bounced", "error",
+]);
+const UNVERIFIABLE = new Set(["unknown", "unverifiable", "smtp-protocol", "antispam-system", "timeout"]);
+
+/** Collapse the verifier's vocabulary into the states the chip shows. */
 export function classifyVerification(status: string | null | undefined, isValid?: boolean): VerifyState {
-  const s = String(status ?? "").toLowerCase().replace(/_/g, "-");
+  const s = String(status ?? "").trim().toLowerCase().replace(/[_\s]+/g, "-");
   if (!s) return "unverified";
-  if (["catch-all", "unknown", "role-based", "accept-all"].includes(s)) return "risky";
-  if (s === "valid") return "valid";
-  if (["invalid", "do-not-mail", "spamtrap", "abuse", "disposable", "bounced"].includes(s)) return "invalid";
+  if (RISKY.has(s)) return "risky";
+  if (VALID.has(s)) return "valid";
+  if (INVALID.has(s)) return "invalid";
+  if (UNVERIFIABLE.has(s)) return "unverifiable";
   return isValid === true ? "valid" : "unverified"; // an unrecognised status is not proof of a bad address
 }
 
 const STYLE: Record<VerifyState, string> = {
   unverified: "bg-muted text-muted-foreground",
-  valid: "bg-emerald-100 text-emerald-800",
-  risky: "bg-amber-100 text-amber-800",
-  invalid: "bg-red-100 text-red-800",
+  valid: "bg-positive text-positive-foreground",
+  risky: "bg-warning text-warning-foreground",
+  invalid: "bg-error text-error-foreground",
+  unverifiable: "bg-muted text-muted-foreground",
 };
-const LABEL: Record<VerifyState, string> = { unverified: "Unverified", valid: "Valid", risky: "Risky", invalid: "Invalid" };
+const LABEL: Record<VerifyState, string> = { unverified: "Unverified", valid: "Valid", risky: "Risky", invalid: "Invalid", unverifiable: "Couldn't verify" };
 
 export function EmailVerifyBadge({ email, initialStatus, onVerified, readOnly, className }: EmailVerifyBadgeProps) {
   const [confirmOpen, setConfirmOpen] = useState(false);
@@ -72,7 +92,7 @@ export function EmailVerifyBadge({ email, initialStatus, onVerified, readOnly, c
   return (
     <span className={`inline-flex items-center gap-1 ${className ?? ""}`}>
       <span data-state={state} title={detail ?? undefined} className={`rounded-full px-2 py-0.5 text-xs font-medium ${STYLE[state]}`}>{LABEL[state]}</span>
-      {!readOnly && state === "unverified" ? <Button variant="link" size="sm" className="h-auto p-0 text-xs" onClick={() => setConfirmOpen(true)}>Verify</Button> : null}
+      {!readOnly && (state === "unverified" || state === "unverifiable") ? <Button variant="link" size="sm" className="h-auto p-0 text-xs" onClick={() => setConfirmOpen(true)}>{state === "unverifiable" ? "Try again" : "Verify"}</Button> : null}
       {verify.error ? <ApiError error={verify.error} title="Could not verify" /> : null}
       <ConfirmSpendDialog open={confirmOpen} tier="billable" title={`Verify ${email}`} description="Checks whether the address can receive mail."
         estimatedCredits={CREDITS_PER_EMAIL_VERIFICATION} confirmLabel="Verify" confirming={verify.loading}

package/blocks/enrichment/components/enrich-button.tsx

@@ -13,6 +13,11 @@
  *
  * Apply is opt-in per field: fields the record already has are shown unticked so a lookup never silently
  * overwrites good data. A locked ("***") value on the record counts as empty.
+ *
+ * "Already has" is judged on the FULL record. A list row can omit fields the record has, so unless the caller says
+ * `recordLoaded` (it passed the full record from GET /contacts/{id} or /companies/{id}), the button reads the full
+ * record itself right after the lookup (GET /contacts/{id} | /companies/{id}, read). If that read fails nothing is
+ * pre-ticked and the dialog says existing values were not checked. The record id is captured when the lookup runs.
  */
 
 import { useState } from "react";
@@ -20,7 +25,8 @@ import { Button, Dialog, DialogContent, DialogDescription, DialogFooter, DialogH
 import { ApiError } from "@/g8/components/api-error";
 import { ConfirmSpendDialog } from "@/g8/components/confirm-spend-dialog";
 import { useG8Mutation } from "@/g8/hooks/use-g8-mutation";
-import { g8Patch, g8Post } from "@/g8/lib/g8-client";
+import { g8Get, g8Patch, g8Post } from "@/g8/lib/g8-client";
+import { plural } from "@/g8/lib/plural";
 import { CREDITS_PER_FOUND_LOOKUP, isMaskedValue } from "../lib/enrichment-types";
 
 export interface PersonLookup { email?: string; linkedin_url?: string; first_name?: string; last_name?: string; company_domain?: string }
@@ -32,6 +38,8 @@ export interface EnrichButtonProps {
   lookup: PersonLookup | CompanyLookup;
   /** The CRM record the result can be applied to (its current values decide what is pre-ticked). */
   record?: { id: number } & Record<string, unknown>;
+  /** True when `record` is the full record (not a list row). Default false: the button then reads the full record itself before pre-ticking. */
+  recordLoaded?: boolean;
   label?: string;
   variant?: "default" | "outline" | "secondary" | "ghost";
   size?: "default" | "sm";
@@ -60,25 +68,39 @@ function hasIdentity(kind: EnrichButtonProps["kind"], l: PersonLookup & CompanyL
   return kind === "person" ? Boolean(l.email || l.linkedin_url || (l.first_name && l.last_name && l.company_domain)) : Boolean(l.domain || l.name);
 }
 
-export function EnrichButton({ kind, lookup, record, label, variant = "outline", size = "sm", onResult, onApplied, className }: EnrichButtonProps) {
+export function EnrichButton({ kind, lookup, record, recordLoaded = false, label, variant = "outline", size = "sm", onResult, onApplied, className }: EnrichButtonProps) {
   const [confirmOpen, setConfirmOpen] = useState(false);
   const [result, setResult] = useState<LookupResult | null>(null);
   const [ticked, setTicked] = useState<Set<string>>(new Set());
   const [applied, setApplied] = useState(false);
+  /** What the record held when the lookup ran: its id, its full values, and whether those values could be read. */
+  const [target, setTarget] = useState<{ id: number; existing: Record<string, unknown>; checked: boolean } | null>(null);
   const clean = Object.fromEntries(Object.entries(lookup).filter(([, v]) => typeof v === "string" && v.trim() && !isMaskedValue(v)));
   const ready = hasIdentity(kind, clean);
+  const path = (id: number): string => `/${kind === "person" ? "contacts" : "companies"}/${id}`;
 
-  const run = useG8Mutation(() => g8Post<LookupResult>(`/enrichment/lookup/${kind}`, clean), {
-    onSuccess: (res) => {
+  const run = useG8Mutation(async () => {
+    const res = await g8Post<LookupResult>(`/enrichment/lookup/${kind}`, clean);
+    if (!record) return { res, target: null };
+    if (recordLoaded) return { res, target: { id: record.id, existing: record, checked: true } };
+    try {
+      const full = await g8Get<Record<string, unknown>>(path(record.id));
+      return { res, target: { id: record.id, existing: full.data ?? {}, checked: true } };
+    } catch {
+      return { res, target: { id: record.id, existing: {}, checked: false } };
+    }
+  }, {
+    onSuccess: ({ res, target: t }) => {
       setConfirmOpen(false);
       setResult(res.data);
       setApplied(false);
+      setTarget(t);
       const fields = res.data.data ? normalise(kind, res.data.data) : {};
-      setTicked(new Set(Object.keys(fields).filter((k) => !record || !record[k] || isMaskedValue(record[k]))));
+      setTicked(new Set(t?.checked ? Object.keys(fields).filter((k) => !t.existing[k] || isMaskedValue(t.existing[k])) : []));
       onResult?.(res.data);
     },
   });
-  const apply = useG8Mutation((values: Record<string, string>) => g8Patch(`/${kind === "person" ? "contacts" : "companies"}/${record!.id}`, values), {
+  const apply = useG8Mutation((values: Record<string, string>) => g8Patch(path(target!.id), values), {
     onSuccess: (_r, values) => { setApplied(true); onApplied?.(values); },
   });
 
@@ -114,19 +136,20 @@ export function EnrichButton({ kind, lookup, record, label, variant = "outline",
             <ul className="flex flex-col gap-1 text-sm" aria-label="Found fields">
               {Object.entries(fields).map(([k, v]) => (
                 <li key={k} className="flex items-center gap-2">
-                  {record ? <input type="checkbox" aria-label={`Apply ${k}`} checked={ticked.has(k)} onChange={() => setTicked((t) => { const n = new Set(t); if (!n.delete(k)) n.add(k); return n; })} /> : null}
+                  {target ? <input type="checkbox" aria-label={`Apply ${k}`} checked={ticked.has(k)} onChange={() => setTicked((t) => { const n = new Set(t); if (!n.delete(k)) n.add(k); return n; })} /> : null}
                   <span className="w-36 text-muted-foreground">{k.replace(/_/g, " ")}</span><span className="truncate">{v}</span>
-                  {record && record[k] && !isMaskedValue(record[k]) && record[k] !== v ? <span className="text-xs text-amber-600">replaces {String(record[k])}</span> : null}
+                  {target?.checked && target.existing[k] && !isMaskedValue(target.existing[k]) && target.existing[k] !== v ? <span className="text-xs text-warning-foreground">replaces {String(target.existing[k])}</span> : null}
                 </li>
               ))}
               {Object.keys(fields).length === 0 ? <li className="text-muted-foreground">The match had no fields to show.</li> : null}
             </ul>
           ) : null}
+          {target && !target.checked && result?.found ? <p role="status" className="text-sm text-muted-foreground">Existing values were not checked, so nothing is ticked. Tick only what you want to write.</p> : null}
           {apply.error ? <ApiError error={apply.error} title="Could not update the record" /> : null}
           {applied ? <p role="status" className="text-sm">Updated the record.</p> : null}
           <DialogFooter>
             <Button variant="ghost" onClick={() => setResult(null)}>Close</Button>
-            {result?.found && record && !applied ? <Button loading={apply.loading} disabled={Object.keys(chosen).length === 0} onClick={() => void apply.mutate(chosen)}>Apply {Object.keys(chosen).length} field{Object.keys(chosen).length === 1 ? "" : "s"}</Button> : null}
+            {result?.found && target && !applied ? <Button loading={apply.loading} disabled={Object.keys(chosen).length === 0} onClick={() => void apply.mutate(chosen)}>Apply {plural(Object.keys(chosen).length, "field")}</Button> : null}
           </DialogFooter>
         </DialogContent>
       </Dialog>

package/blocks/enrichment/components/enrichment-job-detail.tsx

@@ -0,0 +1,78 @@
+"use client";
+
+/**
+ * EnrichmentJobDetail: one bulk enrichment job in full. Live status (polled with backoff, there are no streams),
+ * progress, how many records were enriched or failed, credits used, warnings, the provider errors that explain a
+ * failure, and Cancel while it runs.
+ *
+ * SDK operations, in order:
+ *   1. getEnrichmentJob     GET  /enrichment/jobs/{job_id}   (read) polled with useJobPoll until a final status;
+ *        read once more with ?include_provider_errors=true when nothing was enriched or some records failed
+ *        -> { status, total, completed, successful_enrichments, failed_enrichments, total_credits_used, warnings, provider_errors }
+ *   2. cancelEnrichmentJob  POST /enrichment/jobs/{job_id}/cancel   (write, free; records already done keep their data and charge)
+ */
+
+import { Button } from "@graph8/sdk/ui";
+import { ApiError } from "@/g8/components/api-error";
+import { KeyValueList } from "@/g8/components/screen/key-value-list";
+import { SectionCard } from "@/g8/components/screen/section-card";
+import { StatusPill, humanizeStatus, toneForStatus } from "@/g8/components/screen/status-pill";
+import { useG8Mutation } from "@/g8/hooks/use-g8-mutation";
+import { useG8Query } from "@/g8/hooks/use-g8-query";
+import { useJobPoll } from "@/g8/hooks/use-job-poll";
+import { g8Get, g8Post } from "@/g8/lib/g8-client";
+import { isJobTerminal } from "../lib/enrichment-types";
+import type { EnrichJob } from "../lib/enrichment-types";
+
+export interface EnrichmentJobDetailProps {
+  jobId: string;
+  /** Called when the job reached a final state. */
+  onDone?: (job: EnrichJob) => void;
+  className?: string;
+}
+
+export function EnrichmentJobDetail({ jobId, onDone, className }: EnrichmentJobDetailProps) {
+  const job = useJobPoll<EnrichJob>(
+    async (signal) => (await g8Get<EnrichJob>(`/enrichment/jobs/${jobId}`, undefined, { signal })).data,
+    { intervalMs: 2000, isTerminal: (j) => isJobTerminal(j.status), onDone },
+  );
+  const cancel = useG8Mutation(() => g8Post(`/enrichment/jobs/${jobId}/cancel`, {}));
+  const j = job.status;
+  const problems = job.done && j != null && ((j.successful_enrichments ?? 0) === 0 || (j.failed_enrichments ?? 0) > 0);
+  const errors = useG8Query(
+    async (signal) => (await g8Get<EnrichJob>(`/enrichment/jobs/${jobId}`, { include_provider_errors: true }, { signal })).data.provider_errors ?? [],
+    [jobId, job.done],
+    { enabled: problems },
+  );
+  const total = j?.total ?? 0;
+  const pct = total ? Math.min(100, Math.round(((j?.completed ?? 0) / total) * 100)) : 0;
+
+  if (job.error && !j) return <ApiError error={job.error} title="Could not read the job" onRetry={() => job.start()} />;
+  return (
+    <div className={`flex flex-col gap-4 ${className ?? ""}`} role="status">
+      <div className="flex items-center gap-2">
+        {j ? <StatusPill tone={toneForStatus(j.status)} dot>{humanizeStatus(j.status)}</StatusPill> : <span className="text-sm text-muted-foreground">Loading...</span>}
+        {!job.done && j ? <Button size="sm" variant="outline" loading={cancel.loading} onClick={() => void cancel.mutate(undefined)}>Cancel job</Button> : null}
+      </div>
+      <div className="h-2 overflow-hidden rounded bg-muted" aria-label="Progress"><div className="h-full bg-primary" style={{ width: `${job.done ? 100 : pct}%` }} /></div>
+      {cancel.error ? <ApiError error={cancel.error} title="Could not cancel" /> : null}
+      <SectionCard title="Result">
+        <KeyValueList columns={2} items={[
+          { label: "Job id", value: jobId, mono: true, wide: true },
+          { label: "Processed", value: j ? `${(j.completed ?? 0).toLocaleString()} of ${total.toLocaleString()}` : "" },
+          { label: "Enriched", value: j?.successful_enrichments != null ? j.successful_enrichments.toLocaleString() : "" },
+          { label: "Failed", value: j?.failed_enrichments != null ? j.failed_enrichments.toLocaleString() : "" },
+          { label: "Credits used", value: j?.total_credits_used != null ? j.total_credits_used.toLocaleString() : "" },
+        ]} />
+      </SectionCard>
+      {j?.warnings?.length ? <SectionCard title="Warnings"><ul className="list-disc pl-5 text-sm">{j.warnings.map((w) => <li key={w}>{w}</li>)}</ul></SectionCard> : null}
+      {errors.data?.length ? (
+        <SectionCard title="Provider errors" description="Usually a missing or invalid provider key.">
+          <ul className="list-disc pl-5 text-sm text-destructive" aria-label="Provider errors">
+            {errors.data.slice(0, 20).map((e, i) => <li key={i}>{e.provider}: {e.error}</li>)}
+          </ul>
+        </SectionCard>
+      ) : null}
+    </div>
+  );
+}