@sellable/mcp 0.1.141 → 0.1.143

package/README.md

@@ -21,7 +21,9 @@ There are two public Sellable entrypoints shared across hosts:
 - `sellable:create-campaign`
 - `sellable:interview`
 
-The create-campaign public wrapper loads the approval-gated workflow from:
+The create-campaign public wrapper at
+`mcp/sellable/skills/create-campaign/SKILL.md` handles auth/bootstrap and loads
+the approval-gated workflow from:
 
 - `mcp/sellable/skills/create-campaign-v2/SKILL.md`
 
@@ -30,9 +32,7 @@ from:
 
 - `mcp/sellable/skills/interview/SKILL.md`
 
-The older `mcp/sellable/skills/create-campaign/SKILL.md` prompt is kept as an
-internal legacy prompt for compatibility only. Do not advertise it as a public
-command.
+Keep `create-campaign-v2` internal. Do not advertise it as a public command.
 
 ### 1. One-Command Agent Install
 
@@ -68,6 +68,7 @@ startup/auth update check and tells the agent to run
 Publish from the repo root with:
 
 ```bash
+npm run validate:sellable-skills
 npm run mcp:publish
 ```
 

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

@@ -61,9 +61,9 @@ Return the following to the parent thread:
   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.
+Do not write local markdown/json artifacts in normal live campaign runs. Return
+the recommendation directly to the parent thread. Emit debug artifacts only when
+the parent explicitly asks for debug/UAT output.
 
 When reporting branch runtime proof, use this shape under
 `watchNarration.workerDetails.messageDraftBuilder`:

package/agents/registry.json

@@ -211,11 +211,7 @@
         "token fill rules",
         "rendered sample"
       ],
-      "optionalProducesArtifacts": [
-        "message-validation.md",
-        "message-prep.md",
-        "message-candidate-drafts.md"
-      ],
+      "optionalProducesArtifacts": [],
       "ownership": "proof inventory, token strategy, angle drafting, skeptical-prospect review, and selected winner only",
       "codex": {
         "description": "Message Draft Builder for campaign-backed template proposals after confirm_lead_list imports a non-empty bounded review batch.",

package/dist/server.js

@@ -2,35 +2,36 @@ import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { CallToolRequestSchema, GetPromptRequestSchema, ListPromptsRequestSchema, ListToolsRequestSchema, } from "@modelcontextprotocol/sdk/types.js";
 import { getSkillByName, listSkills } from "./skills.js";
-import { authToolDefinitions, getAuthStatus } from "./tools/auth.js";
-import { blueprintCommitToolDefinitions, handleAddColumn, handleCommitBlueprint, } from "./tools/blueprint-commit.js";
-import { bootstrapCreateCampaign, bootstrapToolDefinitions, } from "./tools/bootstrap.js";
-import { campaignToolDefinitions, createCampaign, getCampaign, getCampaignMessagesPreview, getCampaigns, pauseCampaign, startCampaign, updateCampaign, updateCampaignBrief, } from "./tools/campaigns.js";
-import { cellToolDefinitions, queueCells, updateCell } from "./tools/cells.js";
-import { handleStartCliLogin, handleWaitForCliLogin, startCliLoginToolDef, waitForCliLoginToolDef, } from "./tools/cli-login.js";
-import { contextToolDefinitions, getCampaignContext, hydrateCampaignContextFromCampaign, markCampaignContextDirty, } from "./tools/context.js";
-import { addToCommentCampaign, addToConnectionCampaign, addToInmailCampaign, directCampaignToolDefinitions, getEngagedPosts, getOrCreateDirectCampaignTable, pauseDirectCampaign, startDirectCampaign, } from "./tools/direct-campaigns.js";
-import { bootstrapEngage, bootstrapEngageMulti, engageBootstrapToolDefinitions, } from "./tools/engage-bootstrap.js";
-import { engageDiscoveryToolDefinitions, searchEngagementPosts, } from "./tools/engage-discovery.js";
-import { copySenderConfigTool, engageMemoryToolDefinitions, getEngageMemoryTool, migrateFlatConfigsTool, recordEngageProvenSearchTool, setEngageStyleGuideTool, upsertEngageTrackedPersonTool, } from "./tools/engage-memory.js";
-import { engageStateToolDefinitions, getEngageStateTool, setEngageStateTool, } from "./tools/engage-state.js";
-import { bulkEnrichWithProspeo, enrichmentToolDefinitions, enrichWithProspeo, getProspeoCredits, } from "./tools/enrichment.js";
-import { frameworkToolDefinitions, getCampaignFramework, } from "./tools/framework.js";
-import { cancelLeadImport, confirmLeadList, getProviderPrompt, importLeads, leadToolDefinitions, loadCsvDomains, loadCsvLinkedinLeads, lookupSalesNavFilter, saveDomainFilters, searchApollo, searchProspeo, searchSalesNav, searchSignals, selectPromisingPosts, setHeadlineICPCriteria, } from "./tools/leads.js";
-import { fetchCompany, fetchCompanyPosts, fetchLinkedInPosts, fetchLinkedInProfile, fetchPostEngagers, getLinkedInProfile, getUserPosts, linkedinToolDefinitions, } from "./tools/linkedin.js";
-import { getCampaignNavigationState, navigationToolDefinitions, } from "./tools/navigation.js";
-import { addOnDemandLeads, createOnDemandCampaign, createOnDemandTable, initOnDemandSequence, onDemandToolDefinitions, pauseOnDemandCampaign, startOnDemandCampaign, } from "./tools/one-off.js";
-import { processingToolDefinitions, upsertRubric } from "./tools/processing.js";
-import { completeSenderResearch, getMessagePrompt, getPostFindLeadsScoutRegistry, getSourceScoutRegistry, getSubskillAsset, getSubskillPrompt, listSubskillPrompts, promptToolDefinitions, searchSubskillPrompts, } from "./tools/prompts.js";
-import { readinessToolDefinitions, waitForCampaignTableReady, waitForLeadListReady, } from "./tools/readiness.js";
-import { getRows, getTableRows, getTableRowsMinimal, rowToolDefinitions, } from "./tools/rows.js";
-import { addRubricItem, checkRubric, deleteRubricItem, draftRubrics, rubricToolDefinitions, saveRubrics, selectNecessaryRubrics, updateRubricItem, waitForRubricResults, } from "./tools/rubrics.js";
-import { getSender, listSenders, senderToolDefinitions, } from "./tools/senders.js";
-import { attachRecommendedSequence, attachSequence, createWorkflowTable, sequencerToolDefinitions, } from "./tools/sequencer.js";
-import { listTables, tableToolDefinitions } from "./tools/tables.js";
-import { handleVerifyTableRow, verifyRowToolDefinitions, } from "./tools/verify-row.js";
+import { getAuthStatus } from "./tools/auth.js";
+import { handleAddColumn, handleCommitBlueprint, } from "./tools/blueprint-commit.js";
+import { bootstrapCreateCampaign } from "./tools/bootstrap.js";
+import { createCampaign, getCampaign, getCampaignMessagesPreview, getCampaigns, pauseCampaign, startCampaign, updateCampaign, updateCampaignBrief, } from "./tools/campaigns.js";
+import { queueCells, updateCell } from "./tools/cells.js";
+import { handleStartCliLogin, handleWaitForCliLogin, } from "./tools/cli-login.js";
+import { getCampaignContext, hydrateCampaignContextFromCampaign, markCampaignContextDirty, } from "./tools/context.js";
+import { addToCommentCampaign, addToConnectionCampaign, addToInmailCampaign, getEngagedPosts, getOrCreateDirectCampaignTable, pauseDirectCampaign, startDirectCampaign, } from "./tools/direct-campaigns.js";
+import { bootstrapEngage, bootstrapEngageMulti, } from "./tools/engage-bootstrap.js";
+import { searchEngagementPosts } from "./tools/engage-discovery.js";
+import { copySenderConfigTool, getEngageMemoryTool, migrateFlatConfigsTool, recordEngageProvenSearchTool, setEngageStyleGuideTool, upsertEngageTrackedPersonTool, } from "./tools/engage-memory.js";
+import { getEngageStateTool, setEngageStateTool, } from "./tools/engage-state.js";
+import { bulkEnrichWithProspeo, enrichWithProspeo, getProspeoCredits, } from "./tools/enrichment.js";
+import { getCampaignFramework } from "./tools/framework.js";
+import { cancelLeadImport, confirmLeadList, getProviderPrompt, importLeads, loadCsvDomains, loadCsvLinkedinLeads, lookupSalesNavFilter, saveDomainFilters, searchApollo, searchProspeo, searchSalesNav, searchSignals, selectPromisingPosts, setHeadlineICPCriteria, } from "./tools/leads.js";
+import { fetchCompany, fetchCompanyPosts, fetchLinkedInPosts, fetchLinkedInProfile, fetchPostEngagers, getLinkedInProfile, getUserPosts, } from "./tools/linkedin.js";
+import { getCampaignNavigationState } from "./tools/navigation.js";
+import { addOnDemandLeads, createOnDemandCampaign, createOnDemandTable, initOnDemandSequence, pauseOnDemandCampaign, startOnDemandCampaign, } from "./tools/one-off.js";
+import { upsertRubric } from "./tools/processing.js";
+import { completeSenderResearch, getMessagePrompt, getPostFindLeadsScoutRegistry, getSourceScoutRegistry, getSubskillAsset, getSubskillPrompt, listSubskillPrompts, searchSubskillPrompts, } from "./tools/prompts.js";
+import { waitForCampaignTableReady, waitForLeadListReady, } from "./tools/readiness.js";
+import { allTools } from "./tools/registry.js";
+import { getRows, getTableRows, getTableRowsMinimal } from "./tools/rows.js";
+import { addRubricItem, checkRubric, deleteRubricItem, draftRubrics, saveRubrics, selectNecessaryRubrics, updateRubricItem, waitForRubricResults, } from "./tools/rubrics.js";
+import { getSender, listSenders } from "./tools/senders.js";
+import { attachRecommendedSequence, attachSequence, createWorkflowTable, } from "./tools/sequencer.js";
+import { listTables } from "./tools/tables.js";
+import { handleVerifyTableRow } from "./tools/verify-row.js";
 import { sanitizeWatchUrlsForMcpResult } from "./tools/watch-url-security.js";
-import { addTeammate, createWorkspace, getActiveWorkspace, listWorkspaces, setActiveWorkspace, workspaceToolDefinitions, } from "./tools/workspaces.js";
+import { addTeammate, createWorkspace, getActiveWorkspace, listWorkspaces, setActiveWorkspace, } from "./tools/workspaces.js";
 import { checkForUpdates, logUpdateNotice } from "./update-check.js";
 const server = new Server({
     name: "sellable-mcp",
@@ -41,37 +42,6 @@ const server = new Server({
         prompts: {},
     },
 });
-const allTools = [
-    ...campaignToolDefinitions,
-    ...authToolDefinitions,
-    startCliLoginToolDef,
-    waitForCliLoginToolDef,
-    ...bootstrapToolDefinitions,
-    ...engageBootstrapToolDefinitions,
-    ...engageDiscoveryToolDefinitions,
-    ...workspaceToolDefinitions,
-    ...frameworkToolDefinitions,
-    ...contextToolDefinitions,
-    ...navigationToolDefinitions,
-    ...leadToolDefinitions,
-    ...enrichmentToolDefinitions,
-    ...processingToolDefinitions,
-    ...rubricToolDefinitions,
-    ...readinessToolDefinitions,
-    ...rowToolDefinitions,
-    ...cellToolDefinitions,
-    ...promptToolDefinitions,
-    ...linkedinToolDefinitions,
-    ...onDemandToolDefinitions,
-    ...directCampaignToolDefinitions,
-    ...senderToolDefinitions,
-    ...engageStateToolDefinitions,
-    ...engageMemoryToolDefinitions,
-    ...sequencerToolDefinitions,
-    ...tableToolDefinitions,
-    ...blueprintCommitToolDefinitions,
-    ...verifyRowToolDefinitions,
-];
 function parseOptionalNumber(value) {
     if (typeof value === "number" && Number.isFinite(value))
         return value;

package/dist/tools/auth.js

@@ -22,7 +22,7 @@ function appendUpdateNotice(notice, update) {
 export const authToolDefinitions = [
     {
         name: "get_auth_status",
-        description: "Verify Sellable authentication early. Call this before any campaign work. Also performs a cached Sellable package update check. Returns ok=false with clear guidance when the token is missing, revoked, or the active workspace is not set. IMPORTANT: When auth succeeds, ALWAYS tell the user the _userNotice message so they know which workspace is active and whether an update is available. CRITICAL: When auth FAILS with a missing/invalid token (error.type is 'config' or 'auth'), the response includes an `agentInstruction` field with the verbatim FTUX magic-link signup flow. Follow agentInstruction VERBATIM. Do NOT show the user error.guidance — that's a fallback for non-interactive contexts only.",
+        description: "Verify Sellable authentication early. Call this before any campaign work. Also performs a cached Sellable package update check. Returns ok=false with clear guidance when the token is missing, revoked, or the active workspace is not set. When auth succeeds, use _userNotice when workspace context is useful; it is written in customer-facing product language and may include update guidance. CRITICAL: When auth FAILS with a missing/invalid token (error.type is 'config' or 'auth'), the response includes an `agentInstruction` field with the verbatim FTUX magic-link signup flow. Follow agentInstruction VERBATIM. Do NOT show the user error.guidance — that's a fallback for non-interactive contexts only.",
         inputSchema: {
             type: "object",
             properties: {},
@@ -92,8 +92,8 @@ export async function getAuthStatus() {
         const envLabel = config.activeEnvName || null;
         const wsLabel = workspaceName || activeWorkspaceId;
         const notice = envLabel
-            ? `Workspace: ${wsLabel} (${envLabel})`
-            : `Workspace: ${wsLabel}`;
+            ? `I’m building this in ${wsLabel} (${envLabel}).`
+            : `I’m building this in ${wsLabel}.`;
         return {
             ok: true,
             configPath,
@@ -138,8 +138,8 @@ export async function getAuthStatus() {
             "5) Call `mcp__sellable__wait_for_cli_login({ sessionId })` using the sessionId returned by start_cli_login. " +
             "6) If the result is `error.type === 'tool_timeout_guard'`, IMMEDIATELY re-call wait_for_cli_login with the SAME sessionId — do not narrate, do not call start_cli_login again. Loop until you get a different result. " +
             "7) On `ok: true`, the user is signed in and `~/.sellable/config.json` has been written. Branch on `isReturningUser`: " +
-            "if true, say `You're in — {activeWorkspaceName} workspace, ready to roll.\\n\\nNow — paste the LinkedIn profile URL of the person you'll be sending campaigns from. Usually that's you (the founder), or whoever's voice the messages should sound like.\\n\\ne.g. https://www.linkedin.com/in/your-handle`; " +
-            "if false, say `You're set up — your {activeWorkspaceName} workspace is ready.\\n\\nNow — paste the LinkedIn profile URL of the person you'll be sending campaigns from. Usually that's you (the founder), or whoever's voice the messages should sound like.\\n\\ne.g. https://www.linkedin.com/in/your-handle`";
+            "if true, say `You're in — {activeWorkspaceName} workspace, ready to roll.\\n\\nNow — paste the LinkedIn profile or company website for the client/company this campaign is for. I’ll use that to resolve the campaign identity before we pick the target, offer, proof, and lead source.\\n\\ne.g. https://example.com or https://www.linkedin.com/in/client-handle`; " +
+            "if false, say `You're set up — your {activeWorkspaceName} workspace is ready.\\n\\nNow — paste the LinkedIn profile or company website for the client/company this campaign is for. I’ll use that to resolve the campaign identity before we pick the target, offer, proof, and lead source.\\n\\ne.g. https://example.com or https://www.linkedin.com/in/client-handle`";
         if (error instanceof SellableApiError && error.isAuthError) {
             return {
                 ...base,

package/dist/tools/leads.d.ts

@@ -128,8 +128,6 @@ export type ImportLeadsInput = {
     maxPostsToScrape?: number;
     rubricGuidelines?: string[];
 };
-type ImportLeadProvider = NonNullable<ImportLeadsInput["provider"]>;
-type Phase126ImportProvider = Exclude<ImportLeadProvider, "apollo">;
 export type CancelLeadImportInput = {
     campaignOfferId: string;
     tableId: string;
@@ -2349,6 +2347,45 @@ export declare function searchSignals(input: SignalSearchInput): Promise<{
     notes: string[];
 }>;
 export declare function importLeads(input: ImportLeadsInput): Promise<{
+    provider: string;
+    leadListId: string;
+    existingLeadListId: string;
+    reusedExistingSourceList: boolean;
+    message: string;
+    suggestedToolCalls: ({
+        tool: string;
+        args: {
+            campaignOfferId: string;
+            leadListId: string;
+            provider: string;
+            sourceLeadListId?: undefined;
+            confirmed?: undefined;
+        };
+    } | {
+        tool: string;
+        args: {
+            campaignOfferId: string;
+            sourceLeadListId: string;
+            confirmed: boolean;
+            leadListId?: undefined;
+            provider?: undefined;
+        };
+    })[];
+    error?: undefined;
+    needsModeSelection?: undefined;
+    modeOptions?: undefined;
+    jobId?: undefined;
+    estimatedEngagers?: undefined;
+    selectedPostCount?: undefined;
+    availableSelectedPostCount?: undefined;
+    targetEngagerCount?: undefined;
+    maxPostsToScrape?: undefined;
+    limitedSelectedPosts?: undefined;
+    targetLeadCount?: undefined;
+    existingCount?: undefined;
+    createdLeadList?: undefined;
+    jobResult?: undefined;
+} | {
     error: string;
     message: string;
     existingLeadListId: string;
@@ -2373,6 +2410,7 @@ export declare function importLeads(input: ImportLeadsInput): Promise<{
     }[];
     provider?: undefined;
     leadListId?: undefined;
+    reusedExistingSourceList?: undefined;
     needsModeSelection?: undefined;
     modeOptions?: undefined;
     jobId?: undefined;
@@ -2387,7 +2425,7 @@ export declare function importLeads(input: ImportLeadsInput): Promise<{
     createdLeadList?: undefined;
     jobResult?: undefined;
 } | {
-    provider: Phase126ImportProvider;
+    provider: "signal-discovery" | "sales-nav" | "prospeo";
     leadListId: string;
     existingLeadListId: string;
     needsModeSelection: boolean;
@@ -2412,6 +2450,7 @@ export declare function importLeads(input: ImportLeadsInput): Promise<{
             rubricGuidelines?: string[];
         };
     }[];
+    reusedExistingSourceList?: undefined;
     error?: undefined;
     jobId?: undefined;
     estimatedEngagers?: undefined;
@@ -2436,9 +2475,10 @@ export declare function importLeads(input: ImportLeadsInput): Promise<{
     limitedSelectedPosts: boolean;
     targetLeadCount: number | null;
     message: string;
-    error?: undefined;
     existingLeadListId?: undefined;
+    reusedExistingSourceList?: undefined;
     suggestedToolCalls?: undefined;
+    error?: undefined;
     needsModeSelection?: undefined;
     modeOptions?: undefined;
     existingCount?: undefined;
@@ -2471,6 +2511,7 @@ export declare function importLeads(input: ImportLeadsInput): Promise<{
             rubricGuidelines?: string[];
         };
     }[];
+    reusedExistingSourceList?: undefined;
     error?: undefined;
     jobId?: undefined;
     estimatedEngagers?: undefined;
@@ -2490,9 +2531,10 @@ export declare function importLeads(input: ImportLeadsInput): Promise<{
     jobId: string | undefined;
     targetLeadCount: number | null;
     message: string;
-    error?: undefined;
     existingLeadListId?: undefined;
+    reusedExistingSourceList?: undefined;
     suggestedToolCalls?: undefined;
+    error?: undefined;
     needsModeSelection?: undefined;
     modeOptions?: undefined;
     estimatedEngagers?: undefined;

package/dist/tools/leads.js

@@ -504,6 +504,39 @@ function buildFilterChoiceWatchNarration({ sourceLeadCount, reviewRowCount, }) {
         },
     };
 }
+function buildSignalDiscoverySearchWatchNarration() {
+    return {
+        stage: "find-leads",
+        headline: "Searching Signal Discovery",
+        visibleState: "The browser is showing Signal Discovery while LinkedIn post searches run.",
+        agentIntent: "Codex is searching the approved post themes and will ask before scraping selected engagers into a source list.",
+        nextAction: "Review selected posts before scraping",
+        safety: "Search only stores post candidates; it does not import leads, enrich, generate messages, create a sequence, or send.",
+    };
+}
+function buildSignalDiscoveryResultsWatchNarration(postsReturned) {
+    const postCopy = typeof postsReturned === "number"
+        ? `${postsReturned.toLocaleString("en-US")} post${postsReturned === 1 ? "" : "s"} matched the approved search themes and are visible in Signal Discovery.`
+        : "Signal Discovery results are visible for review.";
+    return {
+        stage: "find-leads",
+        headline: "Review Signal Discovery posts",
+        visibleState: postCopy,
+        agentIntent: "Codex is promoting the strongest posts, then it will ask before scraping the selected engager pool.",
+        nextAction: "Approve selected posts before scraping",
+        safety: "Post results do not import leads, enrich, generate messages, create a sequence, or send.",
+    };
+}
+function buildSelectedPostApprovalWatchNarration(selectedPostCount) {
+    return {
+        stage: "find-leads",
+        headline: "Approve selected-post scrape",
+        visibleState: `${selectedPostCount.toLocaleString("en-US")} LinkedIn post${selectedPostCount === 1 ? "" : "s"} selected in Signal Discovery.`,
+        agentIntent: "Codex is asking before scraping this selected engager pool into a source list and cloning only the bounded review batch into the campaign.",
+        nextAction: `Scrape ${selectedPostCount.toLocaleString("en-US")} selected post${selectedPostCount === 1 ? "" : "s"} for the bounded review batch`,
+        safety: "Post selection does not import leads, enrich, generate messages, create a sequence, or send.",
+    };
+}
 function normalizeImportProvider(provider) {
     if (provider === "apollo-ai" || provider === "apollo")
         return "apollo";
@@ -1951,9 +1984,20 @@ export async function searchSignals(input) {
     });
     const api = getApi();
     const { campaignOfferId, headlineICPCriteria, rubricGuidelines } = input;
+    const searchCurrentStep = input.currentStep === null
+        ? undefined
+        : (input.currentStep ?? "signal-discovery");
     const effectiveHeadlineICPCriteria = headlineICPCriteria && headlineICPCriteria.length > 0
         ? headlineICPCriteria
         : rubricGuidelines;
+    if (campaignOfferId) {
+        await api.put(`/api/v2/campaign-offers/${campaignOfferId}`, {
+            leadSourceType: "new",
+            leadSourceProvider: "signal-discovery",
+            ...(searchCurrentStep ? { currentStep: searchCurrentStep } : {}),
+            watchNarration: buildSignalDiscoverySearchWatchNarration(),
+        });
+    }
     // Persist criteria early so user take-over has filters ready.
     if (campaignOfferId && effectiveHeadlineICPCriteria?.length) {
         await api.patch(`/api/v3/campaigns/${campaignOfferId}/signal-discovery/posts`, {
@@ -1964,7 +2008,14 @@ export async function searchSignals(input) {
         });
     }
     const response = await api.post(`/api/v1/signal-discovery/search-signals`, input);
-    return summarizeSignalSearchResponse(response);
+    const summary = summarizeSignalSearchResponse(response);
+    if (campaignOfferId) {
+        await api.put(`/api/v2/campaign-offers/${campaignOfferId}`, {
+            ...(searchCurrentStep ? { currentStep: searchCurrentStep } : {}),
+            watchNarration: buildSignalDiscoveryResultsWatchNarration(summary.postsReturned),
+        });
+    }
+    return summary;
 }
 export async function importLeads(input) {
     const api = getApi();
@@ -2009,6 +2060,35 @@ export async function importLeads(input) {
     const shouldSetCurrentStep = typeof effectiveCurrentStep === "string" && effectiveCurrentStep.length > 0;
     const normalizedMode = mode === "add" || mode === "replace" ? mode : undefined;
     assertPhase126ImportProvider(provider, campaignOfferId);
+    if (provider === "signal-discovery" &&
+        !sourceLeadListId &&
+        campaignSelectedLeadListId) {
+        return {
+            provider: "signal-discovery",
+            leadListId: campaignSelectedLeadListId,
+            existingLeadListId: campaignSelectedLeadListId,
+            reusedExistingSourceList: true,
+            message: "A Signal Discovery source list already exists for the approved selected-post scrape. Reuse it and continue with wait_for_lead_list_ready or confirm_lead_list; do not ask add/replace and do not rescrape unless the user approves a different selected-post scrape.",
+            suggestedToolCalls: [
+                {
+                    tool: "wait_for_lead_list_ready",
+                    args: {
+                        campaignOfferId,
+                        leadListId: campaignSelectedLeadListId,
+                        provider: "signal-discovery",
+                    },
+                },
+                {
+                    tool: "confirm_lead_list",
+                    args: {
+                        campaignOfferId,
+                        sourceLeadListId: campaignSelectedLeadListId,
+                        confirmed: true,
+                    },
+                },
+            ],
+        };
+    }
     // If no sourceLeadListId but campaign has one selected, handle mode selection
     if (!sourceLeadListId && campaignSelectedLeadListId) {
         // If mode is provided but sourceLeadListId is missing, remind LLM to pass it
@@ -2614,7 +2694,7 @@ export function getProviderPrompt(input) {
 }
 export async function selectPromisingPosts(input) {
     const api = getApi();
-    const { campaignOfferId, selections, headlineICPCriteria, currentStep, selectionMode, mode, } = input;
+    const { campaignOfferId, selections, headlineICPCriteria, selectionMode, mode, } = input;
     const effectiveMode = selectionMode ?? mode ?? "add";
     // Update post selections via API
     const postIds = selections.map((s) => s.postId);
@@ -2642,18 +2722,16 @@ export async function selectPromisingPosts(input) {
             message: "No Signal Discovery posts were selected for this campaign. Do not import yet. Re-run a campaign-scoped search_signals call, use recommendedPostIds from the current campaign search state, or ask the user to promote posts in the UI before retrying select_promising_posts.",
         };
     }
-    // Update currentStep if provided (via v2 endpoint)
-    if (currentStep) {
-        await api.put(`/api/v2/campaign-offers/${campaignOfferId}`, {
-            currentStep,
-        });
-    }
+    await api.put(`/api/v2/campaign-offers/${campaignOfferId}`, {
+        currentStep: "signal-discovery",
+        watchNarration: buildSelectedPostApprovalWatchNarration(selectionResult.selectedCount),
+    });
     return {
         success: true,
         selectedCount: selectionResult.selectedCount,
         unselectedCount: selectionResult.unselectedCount,
         criteriaCount: selectionResult.criteriaCount,
-        message: `Selected ${selectionResult.selectedCount} posts with ${selectionResult.criteriaCount} ICP criteria (persisted). Criteria are already saved to the campaign. If the user has already approved the lead-source decision for create-campaign-v2, call import_leads with provider: "signal-discovery", confirmed: true, the approved source-capacity targetLeadCount, and targetEngagerCount/postsNeeded from the approval math. Otherwise ask the user to confirm before importing.`,
+        message: `Selected ${selectionResult.selectedCount} posts with ${selectionResult.criteriaCount} ICP criteria (persisted). Criteria are already saved to the campaign. Ask the user to approve scraping these selected posts before calling import_leads; the earlier source-plan approval only authorized search/scouting.`,
     };
 }
 export async function setHeadlineICPCriteria(input) {
@@ -2666,15 +2744,14 @@ export async function setHeadlineICPCriteria(input) {
         headlineICPCriteria,
         rubricGuidelines: headlineICPCriteria,
     });
-    // Update currentStep if provided (via v2 endpoint)
-    if (currentStep) {
-        await api.put(`/api/v2/campaign-offers/${campaignOfferId}`, {
-            currentStep,
-        });
-    }
+    const criteriaCurrentStep = currentStep === null ? undefined : (currentStep ?? "signal-discovery");
+    await api.put(`/api/v2/campaign-offers/${campaignOfferId}`, {
+        ...(criteriaCurrentStep ? { currentStep: criteriaCurrentStep } : {}),
+        watchNarration: buildSignalDiscoveryResultsWatchNarration(),
+    });
     return {
         success: true,
         criteriaCount: headlineICPCriteria.length,
-        message: `Prepared ${headlineICPCriteria.length} ICP criteria (persisted). Call import_leads with provider: "signal-discovery". Criteria are already saved to the campaign.`,
+        message: `Prepared ${headlineICPCriteria.length} ICP criteria (persisted). Select posts and ask for selected-post scrape approval before calling import_leads with provider: "signal-discovery".`,
     };
 }

package/dist/tools/navigation.js

@@ -537,6 +537,9 @@ export function computeCampaignNavigationStateFromCampaign(campaign, options) {
         computedStep = isRunningCampaign(campaign) ? "running" : "send";
     }
     const stepForHeadless = blockedAt ?? computedStep;
+    const waitingOnMessageTemplateAfterFilters = blockedAt === "messages" &&
+        campaign.enableICPFilters === true &&
+        hasActiveRubrics(campaign);
     const expectedHeadlessStep = stepForHeadless === "campaign-created"
         ? "create-offer"
         : stepForHeadless === "provider-search"
@@ -544,7 +547,9 @@ export function computeCampaignNavigationStateFromCampaign(campaign, options) {
             : stepForHeadless === "filter-rules"
                 ? "create-icp-rubric"
                 : stepForHeadless === "messages"
-                    ? "messages"
+                    ? waitingOnMessageTemplateAfterFilters
+                        ? "apply-icp-rubric"
+                        : "messages"
                     : stepForHeadless === "settings"
                         ? "settings"
                         : stepForHeadless === "sequence"