@sellable/mcp 0.1.135 → 0.1.137

package/agents/post-find-leads-filter-scout.md

@@ -1,7 +1,7 @@
 You are Lead Fit Builder for Sellable create-campaign-v2.
 
-Your job starts only after find-leads has produced `lead-review.md` and
-`lead-sample.json`, and the lead source has been approved or auto-confirmed.
+Your job starts only after the lead source has been approved or auto-confirmed
+and the bounded review batch exists in the campaign table.
 Work only on the lead filter branch. Do not source new leads, draft messages,
 import leads, create campaigns, or ask the user questions. Your only live
 campaign mutation is calling `save_rubrics` after the production rubrics are
@@ -9,41 +9,38 @@ ready.
 
 Required inputs:
 
-- `brief.md`
-- `lead-review.md`
-- `lead-sample.json`
-- campaign state from the parent thread
-- campaign table sample from the parent thread
+- `campaignId`
+- campaign revision or `campaignUpdatedAt`
+- campaign brief content
+- selected source decision and provider/list state
+- `selectedLeadListId`
+- `workflowTableId`
+- imported review-batch rows, including row ids/hash when available
+- filter choice
 
 Required first steps:
 
-1. Read the three required inputs.
-2. Load the filter-leads reference before writing artifacts:
+1. Verify the campaign/source/table ids from the parent thread match the live
+   campaign context.
+2. Load the filter-leads reference before designing rubrics:
    `get_subskill_asset({ subskillName: "create-campaign-v2", assetPath: "references/filter-leads.md" })`.
 3. Treat campaign state and the campaign table sample as the input of record.
-   Disk files are context/debug aids, not durable state.
+   Do not require or hunt for local markdown/json artifacts.
 
 Owned outputs:
 
 - Durable campaign rubrics via `save_rubrics({ campaignOfferId, leadScoringRubrics })`
   when the filter is confirmed and production-shaped rubrics are safe to write.
   `save_rubrics` is the durable writer.
-- `lead-filter.md` debug artifact after the durable campaign write
-- `rubric.json` debug artifact after the durable campaign write
+- concise filter/rubric summary returned to the parent thread
 
-Do not write or modify:
-
-- `message-validation.md`
-- `message-review.md`
-- `approval-packet.md`
-- `brief.md`
-- `lead-review.md`
-- `lead-sample.json`
+Do not write or modify local markdown/json artifacts. Durable output is only
+via `save_rubrics` plus the parent-thread summary.
 
 Process:
 
-1. Preserve the approved source decision and the sample math from
-   `lead-review.md`; do not re-run sourcing.
+1. Preserve the approved source decision and review-batch sample math supplied
+   by the parent; do not re-run sourcing.
 2. Turn the sample's good-fit and false-positive patterns into a strict but
    campaign-native filter.
 3. Include keep rules, exclude rules, sample false positives, pass-rate /
@@ -56,14 +53,11 @@ Process:
 6. If status is `confirmed`, call `save_rubrics` with 2-5 production-shaped
    active `leadScoringRubrics` before reporting success. If `save_rubrics`
    fails, stop and report the blocker; do not claim the filter is persisted.
-7. Write `lead-filter.md` and `rubric.json` only as debug artifacts after
-   campaign persistence succeeds.
 
 Return a concise final status with:
 
 - filter status: `confirmed`, `confirm-with-user`, or `revise-find-leads`
 - whether `save_rubrics` succeeded and how many active rubrics were persisted
-- artifacts written
 - strongest keep rules
 - strongest exclusion rules
 - expected pass-rate / yield impact

package/agents/post-find-leads-message-scout.md

@@ -11,11 +11,14 @@ campaign state. The main thread owns approval and campaign writes.
 Use the live campaign inputs supplied by the parent thread:
 
 - `campaignId`
+- campaign revision or `campaignUpdatedAt`
 - `campaignBrief` / campaign brief content model
 - selected source decision and provider state
 - `selectedLeadListId` or selected source list context
 - `workflowTableId`
-- imported review-batch rows from that selected list
+- imported review-batch rows from that selected list, including row IDs and a
+  review-batch row hash when available
+- filter basis at branch start: `pending`, `use-filters`, or `skip-filters`
 - any already-saved fit/rubric result summaries supplied by the parent
 
 Do not require or hunt for `brief.md`, `lead-review.md`, or `lead-sample.json`.
@@ -23,6 +26,13 @@ Those files are optional debug context only when the parent explicitly provides
 them. Never inspect the product database directly, never run `psql`, and never
 read stale local markdown files to reconstruct campaign state.
 
+All live reads must come from scoped MCP/product tools by campaign and
+workspace, such as `get_campaign`, `get_campaign_context`, and
+`get_rows_minimal({ tableId: workflowTableId })`, or from equivalent parent
+thread payloads. Reject the task as `blocked` if the campaign id, workspace,
+`selectedLeadListId`, `workflowTableId`, or review-batch row ids do not match
+the branch input.
+
 ## Required First Steps
 
 1. Load the full long-form generate-messages prompt:
@@ -45,11 +55,52 @@ Return the following to the parent thread:
 - one rendered good-fill sample for a plausible passing review-batch row
 - one omit/fallback sample when the row signal is not safe
 - pass/fail notes against the generate-messages quality gates
+- compact runtime status: `ready`, `blocked`, `retry-needed`, or `stale`
+- basis token containing campaign revision/updatedAt, brief hash,
+  `selectedLeadListId`, `workflowTableId`, review-batch row ids/hash, filter
+  choice, and rubric/filter basis when present
+- output timestamp/hash and any retry/error detail
 
 Write `message-validation.md`, `message-prep.md`, or
 `message-candidate-drafts.md` only when the parent explicitly asks for debug
 artifacts. Normal live campaign runs can return the same content directly.
 
+When reporting branch runtime proof, use this shape under
+`watchNarration.workerDetails.messageDraftBuilder`:
+
+- `statusSource`: `branch` or `parent-thread-fallback`
+- `status`: `branch-running`, `fallback-active`, `spawn-failed`,
+  `fallback-superseded`, `branch-superseded`, `ready`, `blocked`,
+  `retry-needed`, or `stale`
+- `runId` or `fallbackId`
+- `startedAt` and `updatedAt`
+- `basisToken` and `basis`
+- optional `compactOutputRef`, `compactOutput`, and `error`
+
+Do not tell the UI to show Message Draft Builder as running unless this proof
+exists and points at the current non-empty bounded review batch.
+
+## Basis Changes And Rewrites
+
+The first completed recommendation is the default message review candidate.
+Do not automatically retry or regenerate only because Lead Fit Builder finished,
+rubrics were saved, Filter Leads completed, enrichment cells populated, or more
+row data became available after this branch started.
+
+Treat later filter/enrichment data as optional rewrite context. If campaign id,
+brief hash, selected source, `selectedLeadListId`, `workflowTableId`, and
+review-batch row ids/hash still match, keep the initial recommendation usable
+and report `status: ready` with `basisStatus: "usable_initial"` or
+`"enriched_rewrite_available"`. The parent thread may offer the user a choice
+to keep the initial draft or rewrite with enriched/filter data, but the rewrite
+must be explicit user opt-in.
+
+Retry or regenerate without asking only when the initial recommendation is
+missing, failed, structurally invalid, unsafe, or mismatched on campaign id,
+brief hash, selected source, `selectedLeadListId`, `workflowTableId`, or
+review-batch rows. Filter/rubric/enrichment basis drift alone is not a stale
+blocker.
+
 ## Hard Rules
 
 - Do not call product Generate Message cells. This worker drafts the template

package/agents/registry.json

@@ -158,22 +158,20 @@
       "displayName": "Lead Fit Builder",
       "target": "filter-leads",
       "inputs": [
-        "brief.md",
-        "lead-review.md",
-        "lead-sample.json"
-      ],
-      "producesArtifacts": [
-        "lead-filter.md"
-      ],
-      "optionalProducesArtifacts": [
-        "rubric.json"
+        "campaignId",
+        "campaignBrief",
+        "source decision and selectedLeadList/source state",
+        "workflowTableId",
+        "imported review-batch rows"
       ],
+      "producesArtifacts": [],
+      "optionalProducesArtifacts": [],
       "ownership": "lead quality, false-positive patterns, keep/exclude rules, ability-to-pay checks, and production rubric translation only",
       "codex": {
         "description": "Lead Fit Builder for campaign-backed lead filtering and rubric persistence after source approval.",
         "model": "gpt-5.5",
         "modelReasoningEffort": "high",
-        "sandboxMode": "workspace-write",
+        "sandboxMode": "read-only",
         "nicknameCandidates": [
           "Lead Fit Builder",
           "Fit Builder",
@@ -181,17 +179,12 @@
         ]
       },
       "claude": {
-        "description": "Use proactively as Lead Fit Builder after lead source approval to persist campaign rubrics and write lead-filter debug artifacts from campaign state.",
+        "description": "Use proactively as Lead Fit Builder after lead source approval to persist campaign rubrics from campaign state.",
         "model": "inherit",
         "background": true,
         "maxTurns": 8,
         "color": "yellow",
         "tools": [
-          "Read",
-          "Write",
-          "Edit",
-          "Grep",
-          "Glob",
           "mcp__sellable__get_subskill_prompt",
           "mcp__sellable__get_subskill_asset",
           "mcp__sellable__save_rubrics"
@@ -225,10 +218,10 @@
       ],
       "ownership": "proof inventory, token strategy, angle drafting, skeptical-prospect review, and selected winner only",
       "codex": {
-        "description": "Message Draft Builder for campaign-backed template proposals and sample messages after source approval.",
+        "description": "Message Draft Builder for campaign-backed template proposals after confirm_lead_list imports a non-empty bounded review batch.",
         "model": "gpt-5.5",
         "modelReasoningEffort": "high",
-        "sandboxMode": "workspace-write",
+        "sandboxMode": "read-only",
         "nicknameCandidates": [
           "Message Draft Builder",
           "Draft Builder",
@@ -236,19 +229,17 @@
         ]
       },
       "claude": {
-        "description": "Use proactively as Message Draft Builder after lead source approval to propose an approved-template candidate and sample message from campaign state.",
+        "description": "Use proactively as Message Draft Builder after confirm_lead_list imports a non-empty bounded review batch; load the full generate-messages prompt and draft only from scoped campaign/tool state.",
         "model": "inherit",
         "background": true,
         "maxTurns": 10,
         "color": "magenta",
         "tools": [
           "Read",
-          "Write",
-          "Edit",
-          "Grep",
-          "Glob",
           "mcp__sellable__get_subskill_prompt",
-          "mcp__sellable__get_subskill_asset"
+          "mcp__sellable__get_campaign",
+          "mcp__sellable__get_campaign_context",
+          "mcp__sellable__get_rows_minimal"
         ]
       }
     }

package/agents/source-scout-linkedin-engagement.md

@@ -8,9 +8,10 @@ Required first step:
   draft `campaignOfferId`, call `get_provider_prompt({ provider:
 "signal-discovery", campaignOfferId, confirmed: true })` and include that same
   `campaignOfferId` plus `currentStep: "signal-discovery"` in `search_signals`
-  so the user can watch source work in the campaign UI. Treat that as a
-  campaign-attached persisted search; do not run a post-mint search without the
-  campaign ID. If no campaign ID is supplied, run campaignless preview mode.
+  so the owning search route can show the source lane with current find-leads
+  narration and user options. Treat that as a campaign-attached persisted search;
+  do not run a post-mint search without the campaign ID. If no campaign
+  ID is supplied, run campaignless preview mode.
 
 Use the inherited Sellable MCP tools when available:
 
@@ -44,6 +45,8 @@ sales Claude`; do not treat broad anchor-only lanes like `Claude Code`, `MCP`,
 campaignOfferId, selectionMode: "replace", selections, headlineICPCriteria,
 currentStep: "signal-discovery" })` before sampling so the watched Signal
    Discovery table shows the promoted posts and the exact posts being tested.
+   Do not move the campaign to `confirm-lead-list`; `import_leads` owns that
+   visible transition after source approval.
 6. Fetch or sample engagers for promoted posts and score rough ICP fit from
    visible headline/display-name cues only. Do not enrich people during
    viability estimation.

package/agents/source-scout-prospeo-contact.md

@@ -8,10 +8,12 @@ Required first step:
   draft `campaignOfferId`, call `get_provider_prompt({ provider: "prospeo",
 campaignOfferId, confirmed: true })` and include that same `campaignOfferId`
   plus `currentStep: "prospeo"` in `search_prospeo` so the user can watch source
-  work in the campaign UI. If no campaign ID is supplied, run campaignless
-  preview mode. Treat post-mint
+  work in the campaign UI with source-lane narration owned by the search route.
+  If no campaign ID is supplied, run campaignless preview mode. Treat post-mint
   searches with `campaignOfferId` as campaign-attached persisted search tabs;
   do not run a live campaign search without the campaign ID.
+  Do not move the campaign to `confirm-lead-list`; `import_leads` owns that
+  visible transition after source approval.
 
 Use the inherited Sellable MCP tools when available:
 

package/agents/source-scout-sales-nav.md

@@ -8,10 +8,12 @@ Required first step:
   draft `campaignOfferId`, call `get_provider_prompt({ provider: "sales-nav",
 campaignOfferId, confirmed: true })` and include that same `campaignOfferId` in
   `search_sales_nav` with `currentStep: "sales-nav"` so the user can watch
-  source work in the campaign UI. If no campaign ID is supplied, run
-  campaignless preview mode. Treat post-mint
+  source work in the campaign UI with source-lane narration owned by the search
+  route. If no campaign ID is supplied, run campaignless preview mode. Treat post-mint
   searches with `campaignOfferId` as campaign-attached persisted search tabs;
   do not run a live campaign search without the campaign ID.
+  Do not move the campaign to `confirm-lead-list`; `import_leads` owns that
+  visible transition after source approval.
 
 Use the inherited Sellable MCP tools when available:
 

package/dist/tools/bootstrap.js

@@ -270,7 +270,7 @@ export async function bootstrapCreateCampaign(input = {}) {
         ? resumeDetected
             ? `Bootstrap complete.${workspaceNotice} Resume from campaign state and navigation diagnostics first; treat local draft artifacts as debug-only evidence. Then load ${createCampaignSubskill?.name ?? "create-campaign"} instructions with get_subskill_prompt({ subskillName: "${createCampaignSubskill?.name ?? "create-campaign"}" }); if the response has hasMore=true, continue with nextOffset until hasMore=false.`
             : flowVersion === "v2"
-                ? `Bootstrap complete.${workspaceNotice} Load create-campaign-v2 instructions with get_subskill_prompt({ subskillName: "create-campaign-v2" }); if the response has hasMore=true, continue with nextOffset until hasMore=false. Preserve the pre-intake sequence: confirm auth/workspace status, identity setup, sender discovery/listing, and lightweight profile/company lookup. Then run the short setup/intake, write the campaign brief, call create_campaign once to mint the watchable shell, surface the returned watch link, and hand off to lead finding.`
+                ? `Bootstrap complete.${workspaceNotice} Load the compact create-campaign-v2 entry prompt once with get_subskill_prompt({ subskillName: "create-campaign-v2" }); load flow/reference assets lazily only when that stage needs them. Preserve the pre-intake sequence: confirm auth/workspace status, resolve campaign identity, and run lightweight profile/company lookup. Do not call list_senders or sender discovery during setup; sender availability belongs only to Settings after message approval. Then run the short setup/intake, write the campaign brief, call create_campaign once to mint the watchable shell, surface the returned watch link, and hand off to lead finding.`
                 : `Bootstrap complete.${workspaceNotice} Load ${createCampaignSubskill?.name ?? "create-campaign"} instructions with get_subskill_prompt({ subskillName: "${createCampaignSubskill?.name ?? "create-campaign"}" }); if the response has hasMore=true, continue with nextOffset until hasMore=false. Follow that flow before calling create_campaign.`
         : "Bootstrap incomplete. Resolve blockingErrors and rerun bootstrap_create_campaign before provider/search/import tools.";
     // Strip prompt body from createCampaignSubskill — it's loaded via the host

package/dist/tools/campaigns.js

@@ -843,17 +843,6 @@ export async function updateCampaign(campaignId, input) {
             }
         }
     }
-    // Hotfix: when rubrics are saved with enableICPFilters, ensure the UI step
-    // is set to "filter-rules" so the frontend can render the filter state.
-    // Without this, the MCP caller can save rubrics + enableICPFilters on the
-    // backend while the UI currentStep points somewhere else (e.g. "messages"),
-    // causing the UI to be out of sync with the backend filter state.
-    if (updates.enableICPFilters === true &&
-        Array.isArray(updates.rubric) &&
-        updates.rubric.length > 0 &&
-        !updates.currentStep) {
-        updates.currentStep = "filter-rules";
-    }
     let result = null;
     let senderRouteResult = null;
     const shouldPreserveInteractionModePut = typeof interactionMode === "string" &&

package/dist/tools/leads.d.ts

@@ -2540,6 +2540,20 @@ export declare function confirmLeadList(input: ConfirmLeadListInput): Promise<{
         remainingRowCount?: number | null;
         rowCount?: number | null;
     };
+    messageDraftBuilder: {
+        firstAllowedStartPoint: string;
+        startAllowed: boolean;
+        requiredBeforeRunningCopy: string;
+        requiredLiveInputs: {
+            campaignOfferId: string;
+            selectedLeadListId: string;
+            workflowTableId: string | null;
+            reviewBatchRowIds: string[];
+            reviewBatchRowCount: number;
+        };
+        branchBasisFields: string[];
+        promptRequired: string;
+    };
     boundedReviewBatch: {
         requestedTargetLeadCount: number;
         importedRowCount: number;

package/dist/tools/leads.js

@@ -429,6 +429,81 @@ function summarizeSignalSearchResponse(response) {
         ],
     };
 }
+function buildSourceImportWatchNarration({ provider, selectedPostCount, estimatedEngagers, targetLeadCount, }) {
+    const providerLabel = provider === "signal-discovery"
+        ? "Signal Leads"
+        : provider === "sales-nav"
+            ? "Sales Nav"
+            : provider === "prospeo"
+                ? "Prospeo"
+                : "Apollo";
+    const sourceDetail = provider === "signal-discovery"
+        ? `${selectedPostCount ?? "selected"} approved post${selectedPostCount === 1 ? "" : "s"}${typeof estimatedEngagers === "number"
+            ? ` with about ${estimatedEngagers.toLocaleString("en-US")} engagers`
+            : ""}`
+        : `the approved ${providerLabel} source`;
+    const targetDetail = typeof targetLeadCount === "number"
+        ? ` Targeting ${targetLeadCount.toLocaleString("en-US")} source leads before the bounded review batch is cloned.`
+        : "";
+    return {
+        stage: "review-batch",
+        headline: provider === "signal-discovery"
+            ? "Scraping source leads from posts"
+            : "Importing source leads",
+        visibleState: `The browser is showing ${providerLabel} import progress for ${sourceDetail}.${targetDetail}`,
+        agentIntent: "Codex is materializing the approved source into a lead list before cloning only the bounded review batch into the campaign.",
+        nextAction: "Wait for source leads, then import the 15-row review batch",
+        safety: "No enrichment, sequence, or sending starts during source import.",
+    };
+}
+function buildSourceImportRecoveryWatchNarration(args) {
+    const providerLabel = args.provider === "signal-discovery"
+        ? "Signal Leads"
+        : args.provider === "sales-nav"
+            ? "Sales Nav"
+            : args.provider === "prospeo"
+                ? "Prospeo"
+                : "source";
+    const reasonCopy = args.reason === "failed"
+        ? `${providerLabel} import failed before review rows were ready.`
+        : args.reason === "zero"
+            ? `${providerLabel} import finished without usable review rows.`
+            : args.reason === "timeout"
+                ? `${providerLabel} import has not produced review rows within the wait window.`
+                : `${providerLabel} import is still materializing source rows.`;
+    return {
+        stage: "review-batch",
+        headline: args.reason === "failed" || args.reason === "zero"
+            ? "Source import needs attention"
+            : "Source import still running",
+        visibleState: `${reasonCopy} The browser should stay on the lead import/review-batch screen.`,
+        agentIntent: "Codex is holding the campaign before filter-choice until a non-empty bounded review batch exists.",
+        nextAction: args.reason === "failed" || args.reason === "zero"
+            ? "Retry the import or change the approved source"
+            : "Wait again, retry readiness, or change the source",
+        safety: "No enrichment, filtering, message cells, sequence, or sending has started.",
+    };
+}
+function buildFilterChoiceWatchNarration({ sourceLeadCount, reviewRowCount, }) {
+    const sourceCopy = typeof sourceLeadCount === "number" && sourceLeadCount > 0
+        ? ` from ${sourceLeadCount.toLocaleString("en-US")} source candidate${sourceLeadCount === 1 ? "" : "s"}`
+        : "";
+    const reviewCopy = typeof reviewRowCount === "number" && reviewRowCount > 0
+        ? `${reviewRowCount.toLocaleString("en-US")} review lead${reviewRowCount === 1 ? " is" : "s are"} in the campaign table${sourceCopy}.`
+        : `The bounded review batch is in the campaign table${sourceCopy}.`;
+    return {
+        stage: "fit-message",
+        headline: "I recommend adding filters",
+        visibleState: `${reviewCopy} The browser is showing the filter-choice screen and sample rows.`,
+        agentIntent: "Codex is pausing on this sample because a mixed review list should be filtered before message review. Skip filters only if the visible rows already look clean.",
+        nextAction: "Choose filters or skip",
+        safety: "No enrichment, filtering, Generate Message cells, sequence, or sending starts from this choice.",
+        workerStatuses: {
+            leadFitBuilder: "idle",
+            messageDraftBuilder: "idle",
+        },
+    };
+}
 function normalizeImportProvider(provider) {
     if (provider === "apollo-ai" || provider === "apollo")
         return "apollo";
@@ -960,7 +1035,7 @@ export const leadToolDefinitions = [
     },
     {
         name: "import_leads",
-        description: "Create/select a lead list and start the provider import job. Requires provider prompt preflight via get_provider_prompt for the active provider. Sets selectedLeadListId to the lead list so the user can review it. Does NOT import into the campaign table. After the user confirms the list, call confirm_lead_list.",
+        description: "Create/select a lead list and start the provider import job. Requires provider prompt preflight via get_provider_prompt for the active provider. On success, this tool owns moving the watched campaign to confirm-lead-list with import/progress narration after a leadListId/jobId exists; do not call update_campaign to fix that step. After the user confirms the list, call confirm_lead_list.",
         inputSchema: {
             type: "object",
             properties: {
@@ -1053,7 +1128,7 @@ export const leadToolDefinitions = [
     },
     {
         name: "confirm_lead_list",
-        description: "After the user confirms the lead list looks good, import it into the campaign table (clone). selectedLeadListId remains the source lead list; workflowTableId is the campaign table. Recommended post-confirm order: update_campaign(currentStep='filter-choice') -> wait_for_campaign_table_ready -> get_rows_minimal.",
+        description: "After the user confirms the lead list looks good, import the bounded review batch into the campaign table. This tool owns moving the watched campaign to filter-choice with sample-assessment narration only after non-empty review rows exist; do not call update_campaign to fix filter-choice afterward. selectedLeadListId remains the source lead list; workflowTableId is the campaign table.",
         inputSchema: {
             type: "object",
             properties: {
@@ -1067,7 +1142,7 @@ export const leadToolDefinitions = [
                 },
                 currentStep: {
                     type: ["string", "null"],
-                    description: 'Headless workflow step ID. If omitted, defaults to "confirm-lead-list". Pass null to skip auto-advance.',
+                    description: 'Headless workflow step ID. If omitted, defaults to "filter-choice" after review rows exist. Pass null to skip auto-advance.',
                 },
                 campaignName: {
                     type: "string",
@@ -2061,6 +2136,17 @@ export async function importLeads(input) {
         await api.put(`/api/v2/campaign-offers/${campaignOfferId}`, {
             selectedLeadListId: result.tableId,
             ...(shouldSetCurrentStep ? { currentStep: effectiveCurrentStep } : {}),
+            ...(shouldSetCurrentStep
+                ? {
+                    watchNarration: buildSourceImportWatchNarration({
+                        provider: "signal-discovery",
+                        selectedPostCount: postsToScrape.length,
+                        estimatedEngagers: result.estimatedEngagers,
+                        targetLeadCount: normalizePositiveInteger(targetEngagerCount) ??
+                            result.estimatedEngagers,
+                    }),
+                }
+                : {}),
         });
         return {
             provider: "signal-discovery",
@@ -2075,7 +2161,7 @@ export async function importLeads(input) {
             targetLeadCount: cappedTargetLeadCount ?? null,
             message: `Started scraping ${postsToScrape.length} posts (~${result.estimatedEngagers} engagers). Leads will appear as scraping completes.${importSelection.limited
                 ? ` Limited from ${uniqueSelectedPosts.length} selected posts by the approved source-capacity scrape plan.`
-                : ""}`,
+                : ""} The watched campaign has been moved to confirm-lead-list with import progress copy; do not call update_campaign to fix that step.`,
         };
     }
     // === SALES NAV / PROSPEO FLOW ===
@@ -2172,6 +2258,14 @@ export async function importLeads(input) {
     await api.put(`/api/v2/campaign-offers/${campaignOfferId}`, {
         selectedLeadListId: leadListId,
         ...(shouldSetCurrentStep ? { currentStep: effectiveCurrentStep } : {}),
+        ...(shouldSetCurrentStep
+            ? {
+                watchNarration: buildSourceImportWatchNarration({
+                    provider,
+                    targetLeadCount: cappedTargetLeadCount ?? null,
+                }),
+            }
+            : {}),
     });
     return {
         provider,
@@ -2180,7 +2274,7 @@ export async function importLeads(input) {
         jobResult,
         jobId,
         targetLeadCount: cappedTargetLeadCount ?? null,
-        message: "Import started. Review the lead list as it fills; once it looks good, confirm to import into the campaign table.",
+        message: "Import started and the watched campaign has been moved to confirm-lead-list with import progress copy. Review the lead list as it fills; once it looks good, call confirm_lead_list. Do not call update_campaign to fix the import step.",
     };
 }
 export async function cancelLeadImport(input) {
@@ -2332,12 +2426,24 @@ export async function confirmLeadList(input) {
     }
     if (!readiness.ready) {
         if (readiness.reason === "missing_job_id") {
-            throw new Error("Import job ID is missing. Keep the campaign at confirm-lead-list; provide the jobId, retry readiness, cancel the import, or re-run-source before confirming.");
+            const recoveryNarration = buildSourceImportRecoveryWatchNarration({
+                reason: "pending",
+                provider: resolvedProvider,
+            });
+            throw new Error(`${recoveryNarration.headline}: Import job ID is missing. Keep the campaign at confirm-lead-list; provide the jobId, retry readiness, cancel the import, or re-run-source before confirming. ${recoveryNarration.safety}`);
         }
         if (readiness.reason === "import_failed") {
-            throw new Error("Import failed. Keep the campaign at confirm-lead-list; retry the provider import, cancel it, or re-run-source before confirming.");
+            const recoveryNarration = buildSourceImportRecoveryWatchNarration({
+                reason: "failed",
+                provider: resolvedProvider,
+            });
+            throw new Error(`${recoveryNarration.headline}: Import failed. Keep the campaign at confirm-lead-list; retry the provider import, cancel it, or re-run-source before confirming. ${recoveryNarration.safety}`);
         }
-        throw new Error("Import still in progress. Keep the campaign at confirm-lead-list; retry readiness, cancel the import, or re-run-source before launching post-import scouts.");
+        const recoveryNarration = buildSourceImportRecoveryWatchNarration({
+            reason: "timeout",
+            provider: resolvedProvider,
+        });
+        throw new Error(`${recoveryNarration.headline}: Import still in progress. Keep the campaign at confirm-lead-list; retry readiness, cancel the import, or re-run-source before launching post-import scouts. ${recoveryNarration.safety}`);
     }
     const isTerminalAccessError = (error) => error instanceof SellableApiError && [401, 403, 404].includes(error.status);
     const formatTerminalAccessError = (error) => {
@@ -2353,7 +2459,7 @@ export async function confirmLeadList(input) {
         campaignName,
         keepInSync,
         ...(typeof targetLeadCount === "number" ? { targetLeadCount } : {}),
-        ...(shouldSetCurrentStep ? { currentStep: effectiveCurrentStep } : {}),
+        currentStep: null,
     })
         .catch((error) => {
         if (isTerminalAccessError(error)) {
@@ -2375,9 +2481,15 @@ export async function confirmLeadList(input) {
         ? importedRowIds.length
         : typeof importResult.rowCount === "number"
             ? importResult.rowCount
-            : typeof importResult.leadsImported === "number"
-                ? importResult.leadsImported
-                : 0;
+            : typeof importResult.leadsImported === "number" &&
+                typeof importResult.leadsSkipped === "number"
+                ? importResult.leadsImported + importResult.leadsSkipped
+                : typeof importResult.leadsImported === "number"
+                    ? importResult.leadsImported
+                    : 0;
+    const keptReviewRowCount = requestedTargetLeadCount !== null
+        ? Math.min(importedRowCount, requestedTargetLeadCount)
+        : importedRowCount;
     const remainingRowCount = typeof importResult.remainingRowCount === "number"
         ? importResult.remainingRowCount
         : 0;
@@ -2392,7 +2504,11 @@ export async function confirmLeadList(input) {
         throw new Error("Campaign review rows are still importing. Stay on lead import until the bounded campaign table is ready, then retry confirm_lead_list or wait_for_campaign_table_ready.");
     }
     if (importedRowCount <= 0) {
-        throw new Error("No usable review rows were kept for the campaign table. Tighten or change the source before continuing.");
+        const recoveryNarration = buildSourceImportRecoveryWatchNarration({
+            reason: "zero",
+            provider: resolvedProvider,
+        });
+        throw new Error(`${recoveryNarration.headline}: No usable review rows were kept for the campaign table. Retry the import or change the approved source before continuing. ${recoveryNarration.safety}`);
     }
     if (campaignTableId && overflowRowIds.length > 0) {
         const deleteBatchSize = 25;
@@ -2413,12 +2529,41 @@ export async function confirmLeadList(input) {
     if (shouldSetCurrentStep) {
         await api.put(`/api/v2/campaign-offers/${campaignOfferId}`, {
             currentStep: effectiveCurrentStep,
+            ...(effectiveCurrentStep === "filter-choice"
+                ? {
+                    watchNarration: buildFilterChoiceWatchNarration({
+                        sourceLeadCount: leadListRowCount,
+                        reviewRowCount: keptReviewRowCount,
+                    }),
+                }
+                : {}),
         });
     }
     return {
         sourceLeadListId: resolvedLeadListId,
         campaignTableId: campaignTableId ?? null,
         importResult,
+        messageDraftBuilder: {
+            firstAllowedStartPoint: "confirm_lead_list",
+            startAllowed: true,
+            requiredBeforeRunningCopy: "Persist watchNarration.workerDetails.messageDraftBuilder with runId or fallbackId, statusSource, status, startedAt, updatedAt, and current basis before showing Message Draft Builder as In Progress.",
+            requiredLiveInputs: {
+                campaignOfferId,
+                selectedLeadListId: resolvedLeadListId,
+                workflowTableId: campaignTableId ?? null,
+                reviewBatchRowIds: importedRowIds.slice(0, keptReviewRowCount),
+                reviewBatchRowCount: keptReviewRowCount,
+            },
+            branchBasisFields: [
+                "campaign revision or updatedAt",
+                "brief hash",
+                "selectedLeadListId",
+                "workflowTableId",
+                "bounded review-batch row ids/hash",
+                "filter choice at branch start",
+            ],
+            promptRequired: 'Load get_subskill_prompt({ subskillName: "generate-messages", offset, limit }) until hasMore=false before drafting.',
+        },
         boundedReviewBatch: requestedTargetLeadCount !== null
             ? {
                 requestedTargetLeadCount,
@@ -2431,8 +2576,8 @@ export async function confirmLeadList(input) {
             : undefined,
         message: requestedTargetLeadCount !== null &&
             leadListRowCount > requestedTargetLeadCount
-            ? `I found ${leadListRowCount} source candidates and imported the first ${Math.min(importedRowCount, requestedTargetLeadCount)} into the campaign review table.`
-            : "Lead list imported into the campaign review table. Next: sample rows with get_rows_minimal or continue into filter work.",
+            ? `I found ${leadListRowCount} source candidates and imported the first ${Math.min(importedRowCount, requestedTargetLeadCount)} into the campaign review table. The watched campaign is now on filter-choice with sample assessment copy; announce Message Draft Builder background start only if that branch has actually started.`
+            : "Lead list imported into the campaign review table. The watched campaign is now on filter-choice with sample assessment copy; announce Message Draft Builder background start only if that branch has actually started.",
     };
 }
 export function getProviderPrompt(input) {