fullstackgtm 0.50.0 → 0.51.0

package/CHANGELOG.md

@@ -7,6 +7,51 @@ The path to 1.0 is planned in [docs/roadmap-to-1.0.md](https://github.com/fullst
 
 ## [Unreleased]
 
+## [0.51.0] — 2026-07-11
+
+### Added
+
+- Native Clay Public API authentication and people search for governed lead
+  acquisition, including ICP-to-Clay filter translation and resumable search
+  checkpoints.
+- A provider-neutral, fill-only contact waterfall contract for work email,
+  mobile, and direct-dial enrichment, with Pipe0 as the first registered
+  provider and compatibility for existing Pipe0 email resolution.
+- Clay acquisition presets, initialization, doctor diagnostics, public API
+  exports, strategy documentation, and live-safe credential validation.
+
+### Changed
+
+- `enrich acquire` now uses the shared decision-first presentation contract:
+  compact cards by default, full evidence with `--verbose`, and a stable JSON
+  envelope with counts, cost, meter, and persistence state under `--json`.
+- Pre-enrichment deduplication and avoided-spend reporting are provider-neutral
+  so the same acquisition pipeline can support additional contact sources.
+
+## [0.50.1] — 2026-07-10
+
+### Added
+
+- Decision-first CLI presentation across plan previews, plan queues, apply
+  outcomes, doctor, schedules, signals, ICP, market, TAM, and call analysis.
+  Human defaults use compact cards and ranked summaries; `--verbose` restores
+  full audit detail and `--json` retains the stable machine contract.
+
+### Fixed
+
+- HubSpot 429/5xx responses now retry with bounded backoff, honor
+  `Retry-After`, and report accurate live throttle feedback.
+- Multi-line progress boards no longer scroll intermediate paint frames into
+  terminal history.
+- `plans sync` reconciles historical workspaces concurrently with visible
+  progress, skips absent legacy mirrors, and avoids echoing hosted-origin
+  receipts back to hosted.
+- CLI apply reports only the exact approved receipt subset to hosted while
+  retaining excluded rows in the complete local audit trail.
+- Plan and apply output now distinguish approved, applied, excluded, skipped,
+  and failed operations without exposing the immutable document's stale
+  creation-time status as the current lifecycle state.
+
 ## [0.50.0] — 2026-07-10
 
 ### Added

package/README.md

@@ -243,6 +243,13 @@ replica learns what happened rather than inferring it from plan status. A
 conflicting plan body or approval revision is surfaced for review and is never
 merged by expanding authority.
 
+Interactive command output is decision-first by default: compact cards show
+status, selected scope, expected effect, per-record outcomes, hosted links, and
+the next safe command. Use `--verbose` on supported human-facing commands for
+the complete findings/evidence/payload document; use `--json` for the stable
+machine-readable contract. Progress and warnings remain on stderr, while JSON
+and requested report data remain clean on stdout.
+
 Local signing keys and HMAC digests never upload. Operation before/after values
 do upload to the paired organization because they are required for informed
 review and hosted execution.

package/dist/cli/audit.js

@@ -11,6 +11,7 @@ import { auditReportToHtml, auditReportToMarkdown } from "../report.js";
 import { reportCounts, reportCrm, reportFindings } from "../runReport.js";
 import { connectorFor, numericOption, option, readSnapshot, saveRequested, selectedRules } from "./shared.js";
 import { colorEnabled, createChecklist, formatCount, paint, scoreColor, sparkline, stylizePlanMarkdown, table } from "./ui.js";
+import { compactPlan, verbosePlanRequested } from "./planOutput.js";
 const SEVERITY_RANK = {
     info: 0,
     warning: 1,
@@ -241,11 +242,15 @@ export async function audit(args) {
     if (args.includes("--json")) {
         console.log(JSON.stringify(plan, null, 2));
     }
+    else if (!verbosePlanRequested(args)) {
+        console.log(compactPlan(plan, { saved: saveRequested(args) }));
+        console.error(`\n${auditNextStep(args, plan)}`);
+    }
     else {
         // Default to the summary view (rule table + counts); the full per-operation
         // dump is opt-in via --full or, for a deliverable, `report`. (dx-punch-list #3)
         // Interactive terminals get the styled rendering; piped output is unchanged.
-        console.log(stylizePlanMarkdown(patchPlanToMarkdown(plan, { summary: !args.includes("--full") }), paint(colorEnabled(process.stdout))));
+        console.log(stylizePlanMarkdown(patchPlanToMarkdown(plan, { summary: false }), paint(colorEnabled(process.stdout))));
         console.error(`\n${auditNextStep(args, plan)}`);
     }
     if (threshold &&

package/dist/cli/auth.js

@@ -7,6 +7,7 @@ import { activeProfile, credentialsPath, DEFAULT_PROFILE, deleteCredential, getC
 import { activeWorkspaceProfile, readHealthTimeline, summarizeHealth } from "../health.js";
 import { resolveLlmCredential, validateLlmKey } from "../llm.js";
 import { createFilePlanStore } from "../planStore.js";
+import { validateClayApiKey } from "../connectors/clay.js";
 import { isOptionValue, numericOption, option, readPackageInfo, readSecret } from "./shared.js";
 import { box, colorEnabled, paint, scoreColor, sparkline } from "./ui.js";
 /**
@@ -351,6 +352,22 @@ export async function login(args) {
         console.log(`Stored Apollo API key in ${credentialsPath()}. \`fullstackgtm enrich append|refresh\` use it automatically.`);
         return;
     }
+    if (provider === "clay") {
+        rejectArgvSecret(args, "--token", "--key", "--api-key");
+        const key = await readSecret("Clay Public API key");
+        if (!key)
+            throw new Error("No Clay Public API key provided.");
+        if (!args.includes("--no-validate")) {
+            const validation = await validateClayApiKey(key);
+            if (!validation.ok)
+                throw new Error(validation.detail);
+            console.log(validation.detail);
+        }
+        const stamp = new Date().toISOString();
+        storeCredential("clay", { kind: "api_key", accessToken: key, createdAt: stamp, updatedAt: stamp });
+        console.log(`Stored Clay Public API key in ${credentialsPath()}. Clay connector commands resolve it automatically.`);
+        return;
+    }
     if (provider === "pipe0" || provider === "explorium" || provider === "heyreach" || provider === "theirstack") {
         rejectArgvSecret(args, "--token", "--key", "--api-key");
         const key = await readSecret(`${provider} API key`);
@@ -365,7 +382,7 @@ export async function login(args) {
         return;
     }
     if (provider !== "hubspot") {
-        throw new Error("login supports: hubspot, salesforce, stripe, anthropic, openai, apollo, pipe0, explorium, or --via <hosted url>. Usage: fullstackgtm login <provider> | fullstackgtm login --via https://gtm.example.com");
+        throw new Error("login supports: hubspot, salesforce, stripe, anthropic, openai, apollo, clay, pipe0, explorium, heyreach, theirstack, or --via <hosted url>. Usage: fullstackgtm login <provider> | fullstackgtm login --via https://gtm.example.com");
     }
     const now = new Date().toISOString();
     rejectArgvSecret(args, "--token");
@@ -450,6 +467,9 @@ export function doctorReport(env = process.env) {
         stripe: env.STRIPE_SECRET_KEY
             ? { source: "env", detail: "STRIPE_SECRET_KEY" }
             : providerStatus("stripe", broker),
+        clay: env.CLAY_API_KEY
+            ? { source: "env", detail: "CLAY_API_KEY" }
+            : providerStatus("clay", null),
     };
     const llm = resolveLlmCredential(env);
     const missingPeers = ["@modelcontextprotocol/sdk", "zod"].filter((name) => {
@@ -461,13 +481,13 @@ export function doctorReport(env = process.env) {
             return true;
         }
     });
-    const connected = Object.entries(providers).filter(([, status]) => status.source !== "none");
-    const nextSteps = connected.length === 0
+    const connectedCrm = ["hubspot", "salesforce"].filter((provider) => providers[provider].source !== "none");
+    const nextSteps = connectedCrm.length === 0
         ? [
             "fullstackgtm audit --demo            # no credentials needed",
             "fullstackgtm login hubspot           # hosted browser OAuth (default; or: login salesforce)",
         ]
-        : [`fullstackgtm audit --provider ${connected[0][0]}`];
+        : [`fullstackgtm audit --provider ${connectedCrm[0]}`];
     return {
         package: packageInfo,
         node: { version: process.versions.node, ok: nodeMajor >= 20, required: ">=20" },
@@ -579,6 +599,31 @@ export async function doctorCommand(args) {
     const healthLine = workspace.auditCount === 0
         ? p.dim("no saved audits yet (fullstackgtm audit --provider <name> --save starts the timeline)")
         : `${scoreColor(workspace.healthScore ?? 0, p)}/100${delta} — ${workspace.auditCount} audit(s) saved, last ${workspace.lastAuditAt}${healthSparkline(workspace.profile, p.enabled)}`;
+    const connectedProviders = Object.entries(report.providers).filter(([, provider]) => provider.source !== "none");
+    const blockers = [
+        ...(!report.node.ok ? [`Node v${report.node.version} is unsupported; install ${report.node.required}.`] : []),
+        ...(connectedProviders.length === 0 ? ["No CRM connected."] : []),
+        ...(workspace.pendingPlans.length > 0 ? [`${workspace.pendingPlans.length} plan${workspace.pendingPlans.length === 1 ? "" : "s"} awaiting approval.`] : []),
+    ];
+    if (!args.includes("--verbose")) {
+        const ready = report.node.ok && connectedProviders.length > 0;
+        const compact = [
+            `${ready ? p.green("Ready") : p.yellow("Setup needed")} · ${report.package.name} ${report.package.version} · profile ${report.profile}`,
+            `CRM       ${connectedProviders.length > 0 ? connectedProviders.map(([name]) => name).join(", ") : "not connected"}`,
+            `Health    ${healthLine}`,
+            `Plans     ${workspace.pendingPlans.length === 0 ? "none awaiting approval" : `${workspace.pendingPlans.length} awaiting approval · ${workspace.pendingPlans[0].id}`}`,
+            ...(blockers.length > 0 ? ["", "Attention", ...blockers.map((blocker) => `  ${blocker}`)] : []),
+            "",
+            "Next",
+            ...nextSteps.map((step) => `  ${step}`),
+            "",
+            "Run `fullstackgtm doctor --verbose` for credential paths and optional tooling checks.",
+        ];
+        console.log(p.enabled ? box(compact, p, "Workspace readiness").join("\n") : compact.join("\n"));
+        if (!report.node.ok)
+            process.exitCode = 1;
+        return;
+    }
     const lines = [
         `Package:    ${p.bold(`${report.package.name} ${report.package.version}`)}`,
         `Node:       v${report.node.version} (${report.node.required} required) ${mark(report.node.ok)}`,

package/dist/cli/backfill.js

@@ -14,6 +14,7 @@ import { progressReporter } from "../runReport.js";
 import { unknownSubcommandError } from "./suggest.js";
 import { option, readSnapshot, saveRequested } from "./shared.js";
 import { colorEnabled, createProgressRenderer, paint, stylizePlanMarkdown, table } from "./ui.js";
+import { compactPlan, verbosePlanRequested } from "./planOutput.js";
 /** STRIPE_SECRET_KEY env ∨ stored `login stripe` credential (same ladder as `--provider stripe`). */
 function resolveStripeKey() {
     const key = process.env.STRIPE_SECRET_KEY ?? getCredential("stripe")?.accessToken;
@@ -73,6 +74,9 @@ export async function backfillCommand(args) {
     if (rest.includes("--json")) {
         console.log(JSON.stringify({ plan: result.plan, counts: result.counts, unmatched: result.unmatched, proposedAccounts: result.proposedAccounts }, null, 2));
     }
+    else if (!verbosePlanRequested(rest)) {
+        console.log(compactPlan(result.plan, { saved: save && result.plan.operations.length > 0 }));
+    }
     else {
         // TTY-only styling; piped output stays byte-identical plain text.
         console.log(stylizePlanMarkdown(patchPlanToMarkdown(result.plan), paint(colorEnabled(process.stdout))));

package/dist/cli/call.js

@@ -161,11 +161,13 @@ score always needs a key (scoring is LLM work).`);
                 console.log(JSON.stringify(parsed, null, 2));
             return;
         }
-        console.log(`Call ${parsed.id}${parsed.title ? ` — ${parsed.title}` : ""} (${parsed.sourceSystem})`);
-        console.log(`${parsed.segments.length} segments · ${parsed.insights.length} insights (${parsed.summary.highImportance} high-importance)\n`);
-        for (const insight of parsed.insights) {
-            console.log(`[${insight.type}] (importance ${insight.importance}) ${insight.text}`);
-        }
+        console.log(`Call ${parsed.id}${parsed.title ? ` — ${parsed.title}` : ""}`);
+        console.log(`${parsed.segments.length} segments · ${parsed.insights.length} insights · ${parsed.summary.highImportance} high priority`);
+        const visible = rest.includes("--verbose") ? parsed.insights : parsed.insights.filter((insight) => insight.importance >= 3);
+        for (const insight of visible)
+            console.log(`\n${insight.type.replaceAll("_", " ")} · priority ${insight.importance}\n  ${insight.text.replace(/\s+/g, " ").trim()}`);
+        if (!rest.includes("--verbose") && visible.length < parsed.insights.length)
+            console.log(`\n${parsed.insights.length - visible.length} lower-priority insight(s) hidden; use --verbose to show all.`);
         return;
     }
     if (subcommand === "link") {
@@ -284,11 +286,31 @@ score always needs a key (scoring is LLM work).`);
             console.log(JSON.stringify(scorecard, null, 2));
             return;
         }
-        console.log(renderScorecard(scorecard, title));
+        console.log(rest.includes("--verbose") ? renderScorecard(scorecard, title) : renderCompactScorecard(scorecard, title));
         return;
     }
     throw new Error(`call supports: parse, classify, link, plan, score (got ${subcommand ?? "nothing"})`);
 }
+function renderCompactScorecard(scorecard, title) {
+    const lines = [
+        `${title ?? "Call"} · ${scorecard.overallScore}/${scorecard.scale}${scorecard.band ? ` · ${scorecard.band.label}` : ""}`,
+        scorecard.rubricName ? `${scorecard.rubricName}${scorecard.callType ? ` (${scorecard.callType})` : ""}` : "",
+        "",
+    ].filter((line, index) => line || index === 2);
+    for (const dimension of scorecard.dimensions) {
+        lines.push(`${dimension.score}/${dimension.maxScore}  ${dimension.name}`);
+        lines.push(`     ${dimension.coachingNote.replace(/\s+/g, " ").trim()}`);
+    }
+    if (scorecard.missedItems.length) {
+        lines.push("", "Focus next");
+        for (const item of scorecard.missedItems)
+            lines.push(`  ${item}`);
+    }
+    if (scorecard.highlights.length)
+        lines.push("", `Strengths: ${scorecard.highlights.join(" · ")}`);
+    lines.push("", "Use --verbose for the full coaching scorecard.");
+    return lines.join("\n");
+}
 function renderScorecard(scorecard, title) {
     const bandText = scorecard.band ? ` — ${scorecard.band.label}` : "";
     const rubricLine = scorecard.rubricName ? `Rubric: ${scorecard.rubricName}${scorecard.callType ? ` (${scorecard.callType})` : ""}` : "";

package/dist/cli/draft.js

@@ -7,6 +7,7 @@ import { createFileSignalStore } from "../signals.js";
 import { createFileJudgeStore } from "../judge.js";
 import { authorOpeners, DEFAULT_DRAFT_PROMPT, DRAFT_CHANNELS, draft } from "../draft.js";
 import { numericOption, option, resolveLlmBaseUrls, saveRequested } from "./shared.js";
+import { compactPlan, verbosePlanRequested } from "./planOutput.js";
 /**
  * `draft` — author ONE trigger-grounded opener per hot judge decision as a
  * governed create_task plan. Structurally a proposal: never sends, never writes
@@ -68,7 +69,16 @@ LLM key it emits a clearly-labeled stub rather than fake authored copy.`);
         channel,
         openers,
     });
-    console.log(JSON.stringify({ drafts, rejected }, null, 2));
+    if (args.includes("--json")) {
+        console.log(JSON.stringify({ drafts, rejected }, null, 2));
+    }
+    else if (verbosePlanRequested(args)) {
+        console.log(JSON.stringify({ drafts, rejected }, null, 2));
+        console.log(compactPlan(plan, { saved: save }));
+    }
+    else {
+        console.log(compactPlan(plan, { saved: save }));
+    }
     const stale = drafts.filter((d) => d.staleTrigger);
     console.error(`${drafts.length} opener(s) staged as create_task proposals (channel ${channel}, min score ${minScore})` +
         `${rejected.length ? `; ${rejected.length} rejected (ungrounded first line)` : ""}` +

package/dist/cli/enrich.js

@@ -8,6 +8,8 @@ import { createFilePlanStore } from "../planStore.js";
 import { buildAcquirePlan, buildEnrichPlan, createFileEnrichRunStore, DEFAULT_STALE_DAYS, ENRICH_CONFIG_FILE_NAME, builtinAcquirePreset, builtinEnrichPreset, enrichRunId, inferIngestObjectType, latestStamps, loadEnrichConfig, parseCsv, resolveCrmField, selectStaleWork, stagedSourceRecords, staleDaysFor } from "../enrich.js";
 import { loadMeter, remaining } from "../acquireMeter.js";
 import { crmContactKeys, fetchExploriumProspects, fetchPipe0CrustdataProspectPage, partitionFreshProspects, pipe0ResolveCompanyDomains, pipe0ResolveWorkEmails, prospectIdentityKeys } from "../connectors/prospectSources.js";
+import { createClaySearch, runClayPeopleSearchPage } from "../connectors/clay.js";
+import { runContactWaterfall } from "../contactProviders.js";
 import { loadSeen, recordSeen } from "../acquireSeen.js";
 import { acquireCheckpointId, createFileAcquireCheckpointStore } from "../acquireCheckpoint.js";
 import { readHostedAcquireCheckpoint, writeHostedAcquireCheckpoint } from "../hostedAcquireCheckpoint.js";
@@ -15,13 +17,14 @@ import { uploadHostedPatchPlan } from "../hostedPatchPlan.js";
 import { progressReporter, reportCounts, reportEvent } from "../runReport.js";
 import { ACQUIRE_STAGES, composeListeners, createProgressEmitter } from "../progress.js";
 import { createLinkedInProvider, discoverLinkedInProspects } from "../acquireLinkedIn.js";
-import { fitThreshold, icpToCrustdataFilters, icpToExploriumFilters, scoreProspectAgainstIcp } from "../icp.js";
+import { fitThreshold, icpToClayPeopleFilters, icpToCrustdataFilters, icpToExploriumFilters, scoreProspectAgainstIcp } from "../icp.js";
 import { apolloPullKeysForAppend, apolloPullKeysForRefresh, createApolloClient, pullApolloRecords } from "../enrichApollo.js";
 import { isSpoolPath, readSpoolPath } from "../spoolFiles.js";
 import { isOptionValue, loadIcp, numericOption, option, readSnapshot, saveRequested } from "./shared.js";
 import { providerKey } from "./tam.js";
 import { unknownSubcommandError } from "./suggest.js";
 import { colorEnabled, createProgressRenderer, createStatusLine, formatBar, formatDuration, paint } from "./ui.js";
+import { compactPlan, verbosePlanRequested } from "./planOutput.js";
 /**
  * The enrich layer: governed append/refresh of third-party data (Apollo pull,
  * Clay ingest) into the CRM through the normal dry-run → approval → apply
@@ -192,8 +195,8 @@ are phase 2. Recurring execution is the scheduler's job; enrich has no cron.`);
         // Meter: how many MORE leads may we create right now? --max is an
         // additional per-run ceiling, never a way to exceed the budget.
         if (apiSkippedCrm || apiSkippedSeen) {
-            console.error(`Pre-email dedup: skipped ${apiSkippedCrm} already-in-CRM + ${apiSkippedSeen} seen before paying for emails ` +
-                `(≈$${((apiSkippedCrm + apiSkippedSeen) * costPerRecord).toFixed(2)} enrichment saved).`);
+            console.error(`Pre-enrichment dedup: skipped ${apiSkippedCrm} already-in-CRM + ${apiSkippedSeen} previously seen ` +
+                `(≈$${((apiSkippedCrm + apiSkippedSeen) * costPerRecord).toFixed(2)} downstream spend avoided).`);
         }
         // `cap` is the desired create count bounded by the persistent meter. Raw
         // discovery scanning has its own --scan-limit and may cross many duplicate-
@@ -263,16 +266,16 @@ are phase 2. Recurring execution is the scheduler's job; enrich has no cron.`);
         const meterLine = formatAcquireMeter(headroom, costPerRecord);
         const gaugeLine = acquireGaugeLine(headroom, config.acquire.budget ?? {}, paint(colorEnabled(process.stdout)));
         if (!save) {
-            if (rest.includes("--json")) {
-                console.log(JSON.stringify({ plan: result.plan, counts: result.counts, estCostUsd: result.estCostUsd, meter: headroom }, null, 2));
-            }
-            else {
-                console.log(patchPlanToMarkdown(result.plan));
-                console.log(meterLine);
-                if (gaugeLine)
-                    console.log(gaugeLine);
-                console.log("\nDry run — nothing written. Re-run with --save to persist the plan, then approve + apply.");
-            }
+            printAcquireOutput({
+                args: rest,
+                result,
+                meter: headroom,
+                meterLine,
+                gaugeLine,
+                saved: false,
+                planSaved: false,
+                hostedPlanUrl: null,
+            });
             return;
         }
         const run = await openEnrichRun(store, source, "acquire", option(rest, "--run-label"), today);
@@ -318,28 +321,16 @@ are phase 2. Recurring execution is the scheduler's job; enrich has no cron.`);
         if (acquireTelemetry && acquireCheckpointSync) {
             await persistAcquireCheckpoint(acquireCheckpointSync.key, acquireTelemetry.discovery, acquireCheckpointSync.hostedVersion);
         }
-        if (planIds.length > 0) {
-            const hostedRuns = hostedRunsUrl();
-            console.log(`\nSaved plan ${result.plan.id}`);
-            console.log(`  Leads      ${result.counts.created} net-new`);
-            console.log(`  Est. cost  $${result.estCostUsd.toFixed(2)}`);
-            console.log(`  Budget     ${gaugeLine ?? meterLine}`);
-            if (hostedPlanUrl)
-                console.log(`  Plan       ${hostedPlanUrl}`);
-            if (hostedRuns)
-                console.log(`  Observe    ${hostedRuns}`);
-            console.log("\nNext steps");
-            console.log(`  Review     fullstackgtm plans show ${result.plan.id}`);
-            console.log(`  Approve    fullstackgtm plans approve ${result.plan.id} --operations all`);
-            console.log(`  Apply      fullstackgtm apply --plan-id ${result.plan.id} --provider hubspot`);
-            console.log("\nThe meter is charged only when a create lands at apply.");
-        }
-        else {
-            console.log(meterLine);
-            if (gaugeLine)
-                console.log(gaugeLine);
-            console.log("No net-new leads to create (everything sourced already matched, or was withheld by the meter).");
-        }
+        printAcquireOutput({
+            args: rest,
+            result,
+            meter: headroom,
+            meterLine,
+            gaugeLine,
+            saved: true,
+            planSaved: planIds.length > 0,
+            hostedPlanUrl,
+        });
         return;
     }
     const mode = subcommand === "refresh" ? "refresh" : "append";
@@ -460,7 +451,7 @@ are phase 2. Recurring execution is the scheduler's job; enrich has no cron.`);
             console.log(JSON.stringify(result.plan, null, 2));
         }
         else {
-            console.log(patchPlanToMarkdown(result.plan));
+            console.log(verbosePlanRequested(rest) ? patchPlanToMarkdown(result.plan) : compactPlan(result.plan));
             console.log(formatEnrichCounts(result.counts, result.ambiguities.length));
             console.log("\nDry run — nothing written. Re-run with --save to persist the plan and the run record.");
         }
@@ -500,8 +491,9 @@ function formatEnrichCounts(counts, ambiguities) {
 /**
  * Pull net-new prospects from an API acquire source into source records the
  * acquire builder dedupes + turns into create_record ops. Explorium discovers;
- * pipe0 (when resolveEmailsWith=pipe0) fills real work emails. Only rows that
- * carry the dedupe key (email) survive — you cannot resolve-first without it.
+ * A field-level provider waterfall fills missing contact data. Existing
+ * email-keyed and resolveEmailsWith=pipe0 configs translate to an implicit
+ * Pipe0 work-email step. Only rows that carry the configured dedupe key survive.
  */
 async function acquireFromApi(config, source, rest, icp, snapshot, seen, priorRun, targetFresh, persistCheckpoint, progress) {
     const acquire = config.acquire;
@@ -520,7 +512,9 @@ async function acquireFromApi(config, source, rest, icp, snapshot, seen, priorRu
         ? (icp ? icpToExploriumFilters(icp) : (disc.filters ?? {}))
         : disc.provider === "pipe0"
             ? (icp ? icpToCrustdataFilters(icp) : (disc.filters ?? {}))
-            : {};
+            : disc.provider === "clay"
+                ? (icp ? icpToClayPeopleFilters(icp) : (disc.filters ?? {}))
+                : {};
     const queryFingerprint = createHash("sha256")
         .update(JSON.stringify({ source, provider: disc.provider, listId, filters, icp: icp ?? null }))
         .digest("hex");
@@ -583,6 +577,20 @@ async function acquireFromApi(config, source, rest, icp, snapshot, seen, priorRu
             cursor = result.nextCursor;
             exhausted = result.nextCursor === null;
         }
+        else if (disc.provider === "clay") {
+            if (!cursor) {
+                progress.note("creating Clay people-search iterator");
+                cursor = await createClaySearch({
+                    apiKey: providerKey("clay"), sourceType: "people", filters,
+                });
+            }
+            const result = await runClayPeopleSearchPage({
+                apiKey: providerKey("clay"), searchId: cursor, limit: requestSize,
+            });
+            page = result.prospects;
+            offset += page.length;
+            exhausted = !result.hasMore;
+        }
         else if (disc.provider === "explorium") {
             const pageNumber = offset + 1;
             exploriumPage = pageNumber;
@@ -603,7 +611,7 @@ async function acquireFromApi(config, source, rest, icp, snapshot, seen, priorRu
             exhausted = page.length < requestSize;
         }
         else {
-            throw new Error(`enrich acquire: unknown discovery provider "${disc.provider}" (explorium | pipe0 | linkedin).`);
+            throw new Error(`enrich acquire: unknown discovery provider "${disc.provider}" (clay | explorium | pipe0 | linkedin).`);
         }
         discovered += page.length;
         progress.items(discovered, scanLimit);
@@ -649,23 +657,35 @@ async function acquireFromApi(config, source, rest, icp, snapshot, seen, priorRu
     }
     progress.stage(ACQUIRE_STAGES[1], 1, ACQUIRE_STAGES.length);
     progress.note("checking work-email requirements");
-    // 3. Resolve real work emails. Triggered either when email IS the dedupe key
-    //    (Explorium's email is hashed, Crustdata returns none) or when a source
-    //    that keys on something else opts in via `resolveEmailsWith: "pipe0"`
-    //    (e.g. LinkedIn keys on the profile URL but still wants outreach emails).
-    //    pipe0 waterfall, chunked; resolves from name + company domain/name.
-    if (matchKey === "email" || disc.resolveEmailsWith === "pipe0") {
-        // The waterfall needs a company DOMAIN; LinkedIn/HeyReach lists carry only
-        // names. Resolve domains first (pipe0 company:identity) so resolution can
-        // actually land — without it, name-only resolution fails for every lead.
-        if (prospects.some((p) => !p.companyDomain && p.companyName)) {
-            progress.note(`resolving company domains for ${prospects.length} candidate(s)`);
-            const resolved = await pipe0ResolveCompanyDomains({ apiKey: providerKey("pipe0"), prospects });
-            prospects.splice(0, prospects.length, ...resolved);
-        }
-        progress.note(`resolving work emails for ${prospects.length} candidate(s)`);
-        const resolved = await pipe0ResolveWorkEmails({ apiKey: providerKey("pipe0"), prospects });
-        prospects.splice(0, prospects.length, ...resolved);
+    // 3. Resolve contact fields through the ordered, fill-only waterfall. Keep
+    // legacy behavior: email-keyed acquisition and resolveEmailsWith=pipe0 imply
+    // a Pipe0 work-email step when no explicit waterfall is configured.
+    const implicitPipe0 = matchKey === "email" || disc.resolveEmailsWith === "pipe0";
+    const contactWaterfall = disc.contactWaterfall ?? (implicitPipe0 ? [{ provider: "pipe0", fields: ["work_email"] }] : []);
+    if (contactWaterfall.length > 0) {
+        const adapters = {
+            pipe0: {
+                provider: "pipe0",
+                resolve: async (candidates, fields) => {
+                    let resolved = candidates;
+                    if (fields.includes("work_email") && resolved.some((p) => !p.companyDomain && p.companyName)) {
+                        progress.note(`resolving company domains for ${resolved.length} candidate(s)`);
+                        resolved = await pipe0ResolveCompanyDomains({ apiKey: providerKey("pipe0"), prospects: resolved });
+                    }
+                    if (fields.includes("work_email")) {
+                        progress.note(`resolving work emails with pipe0 for ${resolved.length} candidate(s)`);
+                        resolved = await pipe0ResolveWorkEmails({ apiKey: providerKey("pipe0"), prospects: resolved });
+                    }
+                    return resolved;
+                },
+            },
+        };
+        const result = await runContactWaterfall({ prospects, steps: contactWaterfall, adapters });
+        prospects.splice(0, prospects.length, ...result.prospects);
+        for (const attempt of result.attempts) {
+            const added = Object.entries(attempt.added).map(([field, count]) => `${count} ${field}`).join(", ") || "0 fields";
+            progress.note(`${attempt.provider}: ${attempt.attempted} attempted · ${added} added`);
+        }
     }
     progress.items(prospects.length, prospects.length);
     progress.note(`${prospects.length} candidate(s) ready for planning`);
@@ -755,6 +775,53 @@ function formatAcquireMeter(headroom, costPerRecord) {
         `Spend left: ${money(headroom.spendUsd.day)}/day, ${money(headroom.spendUsd.month)}/month ` +
         `(≈$${costPerRecord.toFixed(2)}/lead).`);
 }
+function printAcquireOutput(options) {
+    const { args, result, meter, meterLine, gaugeLine, saved, planSaved, hostedPlanUrl } = options;
+    if (args.includes("--json")) {
+        console.log(JSON.stringify({
+            plan: result.plan,
+            counts: result.counts,
+            estCostUsd: result.estCostUsd,
+            meter,
+            persistence: {
+                runSaved: saved,
+                planSaved,
+                planId: planSaved ? result.plan.id : null,
+                hostedPlanUrl,
+            },
+        }, null, 2));
+        return;
+    }
+    if (verbosePlanRequested(args)) {
+        console.log(patchPlanToMarkdown(result.plan));
+        console.log(`\nAcquisition`);
+        console.log(`  Leads      ${result.counts.created} net-new · ${result.counts.unassigned} unassigned`);
+        console.log(`  Est. cost  $${result.estCostUsd.toFixed(2)}`);
+        console.log(`  Budget     ${gaugeLine ?? meterLine}`);
+        if (hostedPlanUrl)
+            console.log(`  Plan       ${hostedPlanUrl}`);
+    }
+    else if (planSaved || !saved) {
+        console.log(compactPlan(result.plan, { saved: planSaved }));
+        console.log(meterLine);
+        if (gaugeLine)
+            console.log(gaugeLine);
+    }
+    else {
+        console.log(meterLine);
+        if (gaugeLine)
+            console.log(gaugeLine);
+        console.log("No net-new leads to create (everything sourced already matched, or was withheld by the meter).");
+    }
+    if (planSaved) {
+        console.log(`\nApprove  fullstackgtm plans approve ${result.plan.id} --operations all`);
+        console.log(`Apply    fullstackgtm apply --plan-id ${result.plan.id} --provider <hubspot|salesforce>`);
+        const hostedRuns = hostedRunsUrl();
+        if (hostedRuns)
+            console.log(`Observe  ${hostedRuns}`);
+        console.log("The meter is charged only when a create lands at apply.");
+    }
+}
 function hostedRunsUrl() {
     const baseUrl = getCredential("broker")?.baseUrl?.replace(/\/+$/, "");
     return baseUrl ? `${baseUrl}/dashboard/runs` : null;

package/dist/cli/fix.js

@@ -20,6 +20,7 @@ import { APPLY_STAGES, composeListeners, createProgressEmitter } from "../progre
 import { progressReporter } from "../runReport.js";
 import { confirmRequested, connectorFor, isOptionValue, numericOption, option, readSnapshot, repeatedOption, saveRequested } from "./shared.js";
 import { box, colorEnabled, createProgressRenderer, paint } from "./ui.js";
+import { compactPlan, verbosePlanRequested } from "./planOutput.js";
 /**
  * The resolve gate: exit 0 = safe to create, exit 2 = match found (exists or
  * ambiguous — do NOT blind-create), exit 1 = error. Built for sync jobs and
@@ -101,9 +102,12 @@ async function emitPlan(plan, args) {
     if (args.includes("--json")) {
         console.log(JSON.stringify(plan, null, 2));
     }
-    else {
+    else if (verbosePlanRequested(args)) {
         console.log(patchPlanToMarkdown(plan));
     }
+    else {
+        console.log(compactPlan(plan, { saved: saveRequested(args) }));
+    }
 }
 /**
  * Governed duplicate cleanup: group by a normalized identity key, propose one
@@ -170,8 +174,7 @@ export async function reassignCommand(args) {
     for (const plan of plans) {
         if (store)
             await store.save(plan);
-        console.log(`${plan.id}  ${String(plan.operations.length).padStart(3)} operation(s)  ${plan.title}`);
-        console.log(`    ${plan.summary}`);
+        console.log(verbosePlanRequested(args) ? patchPlanToMarkdown(plan) : compactPlan(plan, { saved: Boolean(store) }));
     }
     if (store) {
         console.log(`\nSaved ${plans.length} plan(s). For each: \`fullstackgtm plans show <id>\`, \`fullstackgtm plans approve <id> --operations <ids|all>\`, then \`fullstackgtm apply --plan-id <id> --provider <name>\`.`);