@sellable/mcp 0.1.130 → 0.1.132

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sellable/mcp",
-  "version": "0.1.130",
+  "version": "0.1.132",
   "type": "module",
   "description": "Sellable MCP server for Claude Code and Codex campaign workflows",
   "main": "dist/index.js",

package/skills/create-campaign-v2/SKILL.md

@@ -482,7 +482,7 @@ until you approve the source.`
   `Lead source is set. I'll import the first 15-row review batch into the
 campaign table, then ask you to Choose filters or skip. I may let the Message
 Draft Builder prepare a template in the background, but template review waits
-until the filter choice is resolved and you choose Use Template.`
+until the filter choice is resolved and the template is ready for approval.`
 - During long post-intake work, show concise progress checkpoints before the
   next expensive stage: source being checked, source switch/tradeoff if any,
   lead sample usable, filter/message drafting, and message-review rule loading.
@@ -525,18 +525,19 @@ until the filter choice is resolved and you choose Use Template.`
   and cannot override `lead-filter.md`.
 - `message-validation.md` is the internal validation artifact produced by the
   Message Draft Builder / `message generation` stage. It is provisional until
-  the user answers filter choice and then chooses Use Template in Messages.
+  the user answers filter choice and approves the message template in chat.
 - `message-review.md` and `message-review-decision.md` are the mandatory
   message quality gate outputs between `message-validation.md` and
   `approval-packet.md`.
 - Run the dependency chain as a DAG: `create-campaign-brief` -> `find leads` ->
   bounded import/confirm. Once the source decision, lead sample, and campaign
-  table `workflowTableId` exist, the normal path is the `filter-choice` user
-  gate. If the user chooses filters, `post-lead-workstreams` launches filter
-  leads and can let the Message Draft Builder run from the same basis (live
-  campaign brief, source decision, lead sample, and the imported review-batch
-  rows) as separate workstreams when the host exposes the named Sellable
-  post-find-leads agents or real background work.
+  table `workflowTableId` exist, immediately start the Message Draft Builder
+  from the live campaign brief, approved source, source list, and imported
+  review-batch rows before telling the user it is in progress. The normal path
+  then reaches the `filter-choice` user gate. If the user chooses filters,
+  `post-lead-workstreams` launches filter leads and reuses the in-flight Message
+  Draft Builder work from the same basis as separate workstreams when the host
+  exposes the named Sellable post-find-leads agents or real background work.
   First call `get_post_find_leads_scout_registry` and use the returned
   canonical `name` values only when those names are available in the current
   runtime. In Claude Code, use both returned Task/Agent subagents in the same
@@ -548,18 +549,20 @@ until the filter choice is resolved and you choose Use Template.`
   `filter-rubric` and `message-generation` steps remain focused retry and
   resume targets.
 - Message generation does not need `lead-filter.md` to start, but it is only
-  background template drafting until the user reaches Messages. The moment the
-  bounded review batch is imported, `workflowTableId` is ready, and the user is
-  on/after filter choice, the Message Draft Builder may start from the live
-  campaign brief, source decision, lead sample, and imported campaign table
-  sample. It can prepare proof inventory, token strategy, and candidate angles
-  while filter-leads tightens keep/exclude rules. Template review cannot start
-  until filter choice is answered and the user chooses Use Template. If filters
-  are enabled, template review is locked until rubrics are saved, a bounded
-  filter run has usable passing/probably passing rows, and the draft reconciles
-  to those rows. Prefer at least 2 usable passing rows; if only 1 passes, show
-  weak-sample copy and ask whether to continue, revise, import more, or skip
-  filters.
+  background template drafting until the user approves the template. The moment
+  the bounded review batch is imported, `workflowTableId` is ready, and
+  `get_rows_minimal` proves rows exist, the Message Draft Builder must start
+  from the live campaign brief, source decision, lead sample, and imported
+  campaign table sample. Do not show `Message Draft Builder: In Progress` unless
+  the worker or parent-thread fallback has actually started. It can prepare
+  proof inventory, token strategy, and candidate angles while filter-leads
+  tightens keep/exclude rules. Template review cannot start
+  until filter choice is answered and rubrics are saved. If filters are enabled,
+  the watched browser stays on Filter Leads while the template is approved in
+  chat. After approval is saved to the campaign brief, queue the bounded
+  enrichment/filter run and prefer at least 2 usable passing rows before moving
+  to Messages. If only 1 passes, show weak-sample copy and ask whether to
+  continue, revise, import more, or skip filters.
   If a legacy/resume host starts message prep from preview rows before import,
   it still needs at least 3 probable good-fit rows and must reconcile the final
   winner against the imported review batch before message review.
@@ -590,13 +593,18 @@ until the filter choice is resolved and you choose Use Template.`
   `currentStep` before waiting on source-scout results, so relevant search tabs
   appear in real time.
 - For post-lead workstreams, first call
-  `get_post_find_leads_scout_registry` and launch exactly the returned
-  `filter-leads` and `message-generation` scouts when real subagents are
-  available. This is the two Task/Agent subagents path for the
-  `post-lead-workstreams` step. This is the same registry pattern as source scouting, but the
-  trigger is source approval and the join gate is both `lead-filter.md` and
-  `message-validation.md` existing from the same live campaign brief/source
-  decision/lead-sample basis.
+  `get_post_find_leads_scout_registry` after the review batch import confirms
+  rows. Launch the returned `message-generation` scout immediately, before the
+  filter-choice/watch copy says message work is running. When the user chooses
+  filters, launch the returned `filter-leads` scout and reuse the in-flight
+  message branch. This is the Task/Agent subagents path for the
+  `post-lead-workstreams` step. This is the same registry pattern as source
+  scouting, but the trigger is bounded review-batch import and the join gate is
+  both `lead-filter.md` and `message-validation.md` existing from the same live
+  campaign brief/source decision/imported review-batch basis. When the host can
+  launch both branches together, this is still the two Task/Agent subagents
+  path; otherwise message-generation starts first and filter-leads joins after
+  the filter choice.
 - Never run a downstream stage until the active `flow.v2.json` step's required
   campaign state and required normal inputs exist. In normal customer runs, do
   not create optional debug artifacts just to satisfy a file gate.
@@ -630,18 +638,19 @@ batch`, and a no-launch safety note. Do not leave the guide saying
   waiting for message work to finish. Persist `currentStep:
 "apply-icp-rubric"` and `watchNarration.stage: "fit-message"`, then read the
   bounded review batch with `get_rows_minimal`, but do not queue workflow cells
-  yet. Tell the user the fit rules are saved, the message template needs
-  approval next, and enrichment/filtering will start after approval. Do not call
-  `check_rubric` in the normal create-campaign-v2 path. Use Template is the
-  default message path. AI Generated is an explicit opt-out that cancels or
-  ignores the background template draft and must not let late template output
-  overwrite campaign state. Product Generate Message cells should not run from
-  the background template path until template/token rules are approved. After
-  message approval, update the campaign brief with an Approved Message Template
-  containing `{{...}}` tokens and keep `enableICPFilters: true`; then queue only
+  yet. Tell the user the fit rules are saved, the message template is being
+  finalized for approval, and enrichment/filtering will start only after that
+  approval is saved into the campaign brief. Do not call `check_rubric` in the
+  normal create-campaign-v2 path. Do not ask Use Template vs AI Generated in
+  normal runs; the Message Draft Builder template path is the default and only
+  normal path. Product Generate Message cells should not run from the background
+  template path until template/token rules are approved. After message approval,
+  update the campaign brief with an Approved Message Template containing
+  `{{...}}` tokens and keep `enableICPFilters: true`; then queue only
   pending/error `enrichCellId` values with `queue_cells` to start enrichment and
-  filtering. Generate Message detects template mode from those tokens, not from
-  `useMessagingTemplate`.
+  filtering. Once a couple review rows pass, move to Messages so Generate
+  Message can run from the approved template. Generate Message detects template
+  mode from those tokens, not from `useMessagingTemplate`.
 - During pre-import validation, do not call `check_rubric`; use the lead-filter
   artifacts and only use campaign-backed scoring after Step 13 imports the
   15-lead test batch.
@@ -697,11 +706,8 @@ There are six customer-visible gates in the net-new hosted flow:
   compressing the source decision into message review.
 - `filter-choice` asks whether to use filters or skip after the non-empty
   review batch is imported. This is the first post-import user gate.
-- `messages-mode-choice` asks whether to Use Template or choose AI Generated.
-  Use Template is recommended. AI Generated is an explicit opt-out that cancels
-  or ignores the background template draft.
-- `message-review` is the mandatory template quality gate only when the user
-  chooses Use Template. It asks only whether to proceed with the selected
+- `message-review` is the mandatory template quality gate. It asks only whether
+  to proceed with the selected
   message (`approve-message`) or run one more messaging revision
   (`revise-messaging`). `approve-message` authorizes syncing the approved
   template/token rules into the campaign brief and queueing/observing the
@@ -1124,7 +1130,10 @@ and matching `currentStep` before `lookup_sales_nav_filter`,
 `confirm_lead_list`. For example, if the user approves Sales Nav while the
 browser is still showing Signal Discovery, set `leadSourceProvider: "sales-nav"`
 and `currentStep: "sales-nav"` first so the browser switches to the Sales Nav
-lane and the user can watch the approved source progress.
+lane and the user can watch the approved source progress. Do not set
+`currentStep: "confirm-lead-list"` before `import_leads` returns the lead-list
+table/job id; `import_leads` moves there after the provider import API starts so
+the import page has progress state when it appears.
 
 If you ask for lead-source approval, the question and choices must name the
 source decision. Prefer `Approve Sales Nav with founder/CEO filters, or use
@@ -1294,27 +1303,24 @@ long prompt plus safety gate cannot safely approve the draft, stop at
 `revise-messaging` with the exact failure.
 
 Do NOT proceed to Step 4 (message review gate) unless the user has answered
-filter choice, the Messages step has shown the mode choice, the user chose Use
-Template, and `message-validation.md` contains the safety-gate required
+filter choice, the watched app is still on Filter Leads while approval is
+pending, and `message-validation.md` contains the safety-gate required
 sections, a raw sendable Selected Winner, and an explicit single-first-send
-PASS. If the user reaches Messages and chose Use Template before the draft is
-ready, say you are waiting for the Message Draft Builder and do not ask for
-approval. If the draft worker fails, produces no usable message, or has no known
-worker status, require retry/regenerate copy instead of approval copy. If
+PASS. If the draft is not ready, say you are waiting for the Message Draft
+Builder and do not ask for approval. If the draft worker fails, produces no
+usable message, or has no known worker status, require retry/regenerate copy
+instead of approval copy. If
 `message-validation.md` contains post-accept DM, follow-up, second-touch,
 cadence, branch, or other sequence-shaped copy, do not summarize it as ready;
 route back to message-generation and require a single first outbound send.
 
-Messages first shows mode choice:
-
-1. Use Template (recommended): wait for and review the Message Draft Builder
-   template. If filters are enabled, lock this review until saved rubrics and a
-   bounded filter run produce usable passing/probably passing rows. Prefer at
-   least 2 usable passing rows; if only 1 passes, use weak-sample copy and ask
-   whether to continue, revise, import more, or skip filters.
-2. AI Generated: this is an explicit opt-out. Cancel or ignore the background
-   template draft and prevent late template output from overwriting campaign
-   state.
+There is no normal Use Template vs AI Generated mode question. After rubrics are
+saved, stay on Filter Leads, wait for and review the Message Draft Builder
+template, approve/revise it in chat, then write the approved template into the
+campaign brief. Only then queue enrichment/ICP scoring for the bounded review
+batch. Prefer at least 2 usable passing rows before moving the watched browser
+to Messages; if only 1 passes, use weak-sample copy and ask whether to continue,
+revise, import more, or skip filters.
 
 Product Generate Message cells should not run from the background template path
 until template/token rules are approved.

package/skills/create-campaign-v2/core/flow.v2.json

@@ -920,7 +920,8 @@
     {
       "id": "auto-execute-leads",
       "label": "Step 13: Confirm source and import 15 lead review batch",
-      "currentStepValue": "confirm-lead-list",
+      "currentStepValue": null,
+      "visibleStepTiming": "Do not move the watched UI to confirm-lead-list on Step 13 entry. Keep currentStep on the approved provider/source lane while import_leads starts. The import_leads tool owns setting currentStep to confirm-lead-list after the provider import API returns a leadListId/jobId, so the user lands on the import page with a table/progress state already available.",
       "reference": "references/step-13-import-leads.md",
       "onEnter": [
         {
@@ -951,10 +952,11 @@
         },
         {
           "action": "watch_mode_orient",
-          "watchNarrationRule": "Before import_leads or confirm_lead_list starts, align the guide with chat by setting review-batch watchNarration to current-tense source materialization copy. Also persist the approved source provider/currentStep first: Sales Nav approval must set leadSourceProvider `sales-nav` and currentStep `sales-nav`, Signals approval must set `signal-discovery`, and Prospeo approval must set `prospeo`. Use a headline like `Preparing the source list`; explain that the browser is on the approved source lane while Codex materializes only the approved source-capacity plan, then imports only the bounded 15-row review batch into the campaign table; include a no-launch safety note."
+          "watchNarrationRule": "Before import_leads starts, align the guide with chat by setting review-batch watchNarration to current-tense source materialization copy while keeping currentStep on the approved source lane. Also persist the approved source provider/currentStep first: Sales Nav approval must set leadSourceProvider `sales-nav` and currentStep `sales-nav`, Signals approval must set `signal-discovery`, and Prospeo approval must set `prospeo`. Do not set currentStep to `confirm-lead-list` before import_leads returns a leadListId/jobId; import_leads owns that move after the provider import API call so the import page has progress state when it appears. Use a headline like `Preparing the source list`; explain that the browser is on the approved source lane while Codex materializes only the approved source-capacity plan, then imports only the bounded 15-row review batch into the campaign table; include a no-launch safety note."
         },
         {
           "tool": "import_leads",
+          "currentStepTiming": "Omit currentStep or pass `confirm-lead-list`; either way the tool must start the provider import API first, then update CampaignOffer.selectedLeadListId/currentStep after it has a leadListId/jobId. Never navigate the watched UI to confirm-lead-list with no import job/table to show.",
           "sameTurnPreflight": "Immediately before import_leads, call get_provider_prompt({ provider, campaignOfferId }) in the same resumed turn, even if source discovery loaded the provider prompt earlier.",
           "requiredFields": [
             "campaignOfferId",
@@ -1029,6 +1031,44 @@
           ],
           "rule": "If confirm_lead_list succeeds but get_rows_minimal returns zero imported review-batch rows, do not advance to filter-choice. Keep the user in source/import recovery and ask for retry import, import more from the approved source, or revise source."
         },
+        {
+          "tool": "get_post_find_leads_scout_registry",
+          "purpose": "load_post_import_message_draft_builder_registry",
+          "requiredBeforeMessageDraftLaunch": true
+        },
+        {
+          "action": "launch_message_draft_builder_after_review_batch_import",
+          "mode": "background_required_when_host_supports_subagents",
+          "registryRequired": "get_post_find_leads_scout_registry",
+          "branch": {
+            "name": "message-generation",
+            "target": "generate-messages",
+            "workerName": "post-find-leads-message-scout",
+            "inputs": [
+              "campaignBrief",
+              "selected source decision",
+              "selectedLeadListId source list",
+              "workflowTableId imported 15-row review batch"
+            ],
+            "toolCallRequiredBeforeArtifacts": [
+              "get_subskill_prompt({ subskillName: \"generate-messages\" }) until hasMore=false"
+            ],
+            "producesArtifacts": [
+              "template recommendation",
+              "token fill rules",
+              "rendered sample"
+            ],
+            "optionalProducesArtifacts": [
+              "message-validation.md",
+              "message-prep.md",
+              "message-candidate-drafts.md"
+            ],
+            "ownership": "proof inventory, token strategy, angle drafting, skeptical-prospect review, and selected winner only"
+          },
+          "requiredBeforeFilterChoiceWatchCopy": true,
+          "rule": "Immediately after get_rows_minimal proves the bounded review batch is non-empty, start the Message Draft Builder from the live campaign brief, approved source, selectedLeadListId, and imported workflowTableId rows. Do this before the watched campaign moves to filter-choice or Filter Rules so any guide copy saying Message Draft Builder is In Progress is true.",
+          "fallback": "If the host cannot launch the post-find-leads-message-scout in the background, load the full generate-messages prompt in the parent thread and start the message-generation work before reporting Message Draft Builder as In Progress. If message work cannot start, do not show running copy; surface pending/blocked template-start copy instead."
+        },
         {
           "tool": "update_campaign",
           "requiredFields": [
@@ -1039,9 +1079,10 @@
           "requiredValues": {
             "currentStep": "filter-choice",
             "watchNarration.stage": "fit-message",
-            "watchNarration.headline": "Added to Campaign"
+            "watchNarration.headline": "Added to Campaign",
+            "watchNarration.workerStatuses.messageDraftBuilder": "running_after_launch_message_draft_builder_after_review_batch_import_only"
           },
-          "watchNarrationRule": "After the bounded review batch is present and non-empty, update the watched guide to `Added to Campaign` and ask the user to Choose filters or skip. This is filter intent only: do not say filtering the batch before rubrics are saved. The Message Draft Builder may start in the background, but template review is locked until the filter path is reconciled and the user later chooses Use Template. Do not set enableICPFilters=true until save_rubrics succeeds with active criteria. Nothing enriches, validates, or sends until the user approves the message mode and template/token rules where applicable."
+          "watchNarrationRule": "After the bounded review batch is present and non-empty, and after launch_message_draft_builder_after_review_batch_import has actually started or resumed message-generation, update the watched guide to `Added to Campaign` and ask the user to Choose filters or skip. This is filter intent only: do not say filtering the batch before rubrics and message approval are saved. The Message Draft Builder should be reported as In Progress only if the worker or parent-thread fallback has actually started. No enrichment, filtering, Generate Message cells, sequence, or sending starts until the message template is approved and saved to the campaign brief. Do not set enableICPFilters=true until save_rubrics succeeds with active criteria."
         }
       ],
       "allowedTools": [
@@ -1057,7 +1098,11 @@
         "load_csv_linkedin_leads",
         "load_csv_domains",
         "get_provider_prompt",
-        "get_campaign"
+        "get_campaign",
+        "get_post_find_leads_scout_registry",
+        "get_subskill_prompt",
+        "Task",
+        "spawn_agent"
       ],
       "doNotAllow": [
         "queue_cells",
@@ -1089,10 +1134,10 @@
           "requiredVisibleContent": [
             "Choose filters or skip",
             "Use filters to keep only qualified leads",
-            "Skip filters and continue to Messages",
-            "active filtering starts only after rubrics are saved"
+            "Skip filters and continue to message template review",
+            "active filtering starts only after rubrics and the approved message template are saved"
           ],
-          "chatRenderRule": "The first post-import user gate is filter choice. Ask the user to Choose filters or skip. Make clear that active filtering starts only after rubrics are saved; do not say filtering the batch before rubrics are saved. If the user skips filters, go to Messages mode choice once the review batch is ready."
+          "chatRenderRule": "The first post-import user gate is filter choice. Ask the user to Choose filters or skip. Make clear that active filtering starts only after rubrics and the approved message template are saved; do not say filtering the batch before rubrics and message approval are saved. If the user skips filters, go directly to message template review once the review batch is ready."
         },
         {
           "tool": "update_campaign",
@@ -1139,7 +1184,7 @@
       ],
       "transitions": {
         "filters_enabled": "post-lead-workstreams",
-        "filters_skipped": "messages-mode-choice",
+        "filters_skipped": "message-generation",
         "revise_leads": "find-leads"
       },
       "interruptOnly": true,
@@ -1185,7 +1230,6 @@
             {
               "name": "message-generation",
               "target": "generate-messages",
-              "mode": "DRY MODE",
               "inputs": [
                 "campaignBrief",
                 "selected source decision",
@@ -1202,15 +1246,17 @@
                 "message-prep.md",
                 "message-candidate-drafts.md"
               ],
-              "ownership": "proof inventory, token strategy, angle drafting, skeptical-prospect review, and selected winner only"
+              "ownership": "proof inventory, token strategy, angle drafting, skeptical-prospect review, and selected winner only",
+              "mode": "background_template_builder_reuse_or_launch_if_missing",
+              "alreadyStartedBy": "auto-execute-leads.launch_message_draft_builder_after_review_batch_import"
             }
           ],
-          "earlyMessageStartRule": "After auto-execute-leads confirms the 15-row review batch, workflowTableId is ready, and the user has reached filter choice, the Message Draft Builder may start from campaignBrief, selected source state, selectedLeadListId, and imported campaign table rows, including while the user is on filter choice. This background template draft is provisional speed work only. The message worker must load the full generate-messages prompt; parent-thread fallback loads the same prompt and may use references/message-review-safety-gate.md only as a supplemental approval checklist. Legacy/resume preview prep still requires at least 3 probable good-fit rows. It may run beside filter-leads, but product Generate Message cells cannot queue until save_rubrics and update_campaign_brief both succeed.",
+          "earlyMessageStartRule": "After auto-execute-leads confirms the 15-row review batch, workflowTableId is ready, and get_rows_minimal proves rows exist, the Message Draft Builder must start immediately from campaignBrief, selected source state, selectedLeadListId, and imported campaign table rows. post-lead-workstreams must reuse that in-flight message branch; if it is missing, launch it before saving rubrics or claiming message progress. This background template draft is provisional speed work only. The message worker must load the full generate-messages prompt; parent-thread fallback loads the same prompt and may use references/message-review-safety-gate.md only as a supplemental approval checklist. It may run beside filter-leads, but no enrichment, ICP scoring, filtering, or product Generate Message cells can queue until save_rubrics and update_campaign_brief both succeed.",
           "finalMessageReconcileRule": "The message recommendation may start before lead-filter.md exists, but before message-review it must cite only imported review-batch rows that still pass the saved rubric/filter results. If the selected winner depends on a row later excluded by saved filters, revise message-generation before message review.",
-          "finalTemplateReviewLockRule": "cannot start template review until filter choice is answered and the user chooses Use Template in Messages. If filters are enabled, lock template review until saved rubrics exist, a bounded filter run has completed, and there are usable passing/probably passing rows. prefer at least 2 usable passing rows for template review; if only 1 passes, show weak-sample copy and ask whether to continue, revise, import more, or skip filters. If filters are skipped, route to Messages mode choice once the review batch is ready. AI Generated is an explicit opt-out and must cancel or ignore the background template draft.",
-          "claudeRule": "In Claude Code, launch both returned post-find-leads scouts with Task/Agent subagents in the same assistant message only when the current session lists those agent names. Do not run filter first and then message generation unless subagents/background work are unavailable.",
-          "codexRule": "In Codex, launch both returned post-find-leads scout names as disjoint subagents in the same assistant turn only when the host exposes those custom agents for this run. If the host cannot spawn them, run the same branches sequentially and say so.",
-          "fallback": "If real parallel branches are unavailable or the named agents are absent, run filter-leads and then message-generation in the parent thread with product MCP tools/assets. Do not customer-surface agent install status, and do not claim background or parallel work in that fallback."
+          "finalTemplateReviewLockRule": "template review does not require a Use Template vs AI Generated mode choice. After filters are enabled, lock template review until saved rubrics exist and the draft reconciles to the approved brief, selected source, and imported review batch. Keep the watched browser on Filter Leads while approval is pending. After approval writes the Approved Message Template into campaignBrief, queue enrichment/ICP scoring for the bounded review batch; prefer at least 2 usable passing/probably passing rows before moving the watched browser to Messages, with weak-sample escalation if only 1 passes.",
+          "claudeRule": "In Claude Code, launch the returned message-generation scout immediately after post-import rows exist, then launch/reuse the filter-leads scout when the user chooses filters. When both named agents are available and both branches are ready in the same assistant message, use Task/Agent subagents in parallel; otherwise never claim background message progress until message-generation actually started.",
+          "codexRule": "In Codex, launch the returned message-generation scout immediately after post-import rows exist, then launch/reuse filter-leads when filters are chosen. Use disjoint subagents only when the host exposes those custom agents; otherwise start the same message-generation branch in the parent thread before reporting it as running.",
+          "fallback": "If real parallel branches are unavailable or the named agents are absent, start message-generation in the parent thread immediately after post-import, then run filter-leads from the same imported review batch. Do not customer-surface agent install status, and do not claim background or parallel work unless that work actually started."
         },
         {
           "action": "wait_for_lead_filter_rules",
@@ -1223,7 +1269,7 @@
             "message-prep.md",
             "message-candidate-drafts.md"
           ],
-          "rule": "Do not wait for message-validation.md before saving rubrics and moving the watched browser to Filter Leads. lead-filter.md is a debug artifact name; the durable requirement is production-safe rubric rules derived from the live campaign table review batch. Message work may still be running while the user watches fit filtering."
+          "rule": "Do not wait for message-validation.md before saving rubrics and moving the watched browser to Filter Leads. lead-filter.md is a debug artifact name; the durable requirement is production-safe rubric rules derived from the live campaign table review batch. Message work may still be drafting while the user watches Filter Leads, but enrichment/filtering stays unqueued until the approved message template is saved to the campaign brief."
         },
         {
           "action": "save_filter_rubrics_to_campaign",
@@ -1257,50 +1303,10 @@
             "enableICPFilters": true,
             "watchNarration.stage": "fit-message"
           },
-          "watchNarrationRule": "Headline should be like `Filtering the review batch`. Body should say the browser is on Filter Leads, Codex saved the fit rules, and the review rows are being checked while the first message sample finishes. Next should point to message review.",
-          "when": "after_save_rubrics_succeeds_before_waiting_for_message_validation",
+          "watchNarrationRule": "Headline should be like `Drafting the message template`. Body should say the browser is staying on Filter Leads with fit rules saved, Codex is finishing the reusable first-message template, and no enrichment/filtering or Generate Message cells run until that template is approved and saved to the campaign brief. Next should point to message template approval in chat.",
+          "when": "after_save_rubrics_succeeds_before_waiting_for_message_validation_or_queueing_enrichment",
           "writesCampaignState": "currentStep:apply-icp-rubric"
         },
-        {
-          "tool": "get_rows_minimal",
-          "requiredValues": {
-            "tableId": "workflowTableId",
-            "limit": "import.importLimit"
-          },
-          "purpose": "read_bounded_review_batch_cell_ids_before_filter_wait",
-          "requiredBeforeCascade": true
-        },
-        {
-          "tool": "queue_cells",
-          "requiredValues": {
-            "tableId": "workflowTableId",
-            "cellSource": "bounded_review_batch_enrichCellIds",
-            "statusFilter": [
-              "pending",
-              "error",
-              "dependency_blocked"
-            ]
-          },
-          "purpose": "queue_bounded_review_batch_enrichment_before_waiting_for_rubric_results",
-          "rule": "Queue only enrichCellId values from get_rows_minimal for the bounded review batch. Do not queue icpCellId values or whole-table cells; the workflow cascade runs ICP scoring after enrichment."
-        },
-        {
-          "tool": "wait_for_rubric_results",
-          "requiredValues": {
-            "includeRows": false,
-            "minPassedCount": 1,
-            "targetCount": "bounded review batch count"
-          },
-          "purpose": "wait_for_bounded_filter_run_before_messages_mode",
-          "readVia": "stats_only_tool_result",
-          "note": "After filtered sample passes, Messages first shows mode choice. Prefer at least 2 usable passing/probably passing rows before Use Template review; if only 1 passes, show weak-sample copy and ask whether to continue, revise, import more, or skip filters."
-        },
-        {
-          "action": "require_usable_filtered_rows_before_messages_mode",
-          "after": "wait_for_rubric_results",
-          "requiredBeforeMessagesMode": true,
-          "rule": "If filters are enabled, do not show template review until saved rubrics and a bounded filter run have usable passing/probably passing rows. After the filtered sample passes, route to Messages mode choice before any template review."
-        },
         {
           "tool": "get_campaign_navigation_state",
           "purpose": "confirm the watched UI moved to Filter Leads after rubrics saved",
@@ -1336,9 +1342,6 @@
         "get_subskill_asset",
         "get_post_find_leads_scout_registry",
         "save_rubrics",
-        "get_rows_minimal",
-        "queue_cells",
-        "wait_for_rubric_results",
         "update_campaign",
         "get_campaign_navigation_state",
         "Task",
@@ -1348,10 +1351,10 @@
       ],
       "toolRules": [
         "The post-lead workstreams are disjoint: filter-leads owns lead-filter.md/rubric.json; message-generation owns message-validation.md/message-prep.md/message-candidate-drafts.md.",
-        "message-generation can start before saved filters, but message-review cannot start until saved filters and the message recommendation reconcile against the same imported review-batch rows.",
+        "message-generation must start immediately after the post-import review batch exists, before saved filters; message-review cannot start until saved filters and the message recommendation reconcile against the same imported review-batch rows.",
         "Do not let filter-leads create a new message sample. Do not let message-generation fetch new prospects.",
         "Before writing message-validation.md or returning a template recommendation, message-generation must load the full get_subskill_prompt({ subskillName: \"generate-messages\" }) prompt and use campaignBrief, selected source state, selectedLeadListId, and imported review-batch rows as the source of truth. Optional debug markdown files are not durable state.",
-        "Do not queue before saved rubrics. After save_rubrics succeeds, queue only bounded review-batch enrichCellId values from get_rows_minimal before wait_for_rubric_results.",
+        "Do not queue enrichment, ICP scoring, filtering, or Generate Message cells after saved rubrics alone. Wait until the approved message template is synced into campaignBrief, then queue only bounded review-batch enrichCellId values.",
         "Do not attach sequence, start, or queue product Generate Message cells until the approved message set is synced into campaignBrief."
       ],
       "doNotAllow": [
@@ -1369,15 +1372,14 @@
         "post_lead_workstreams_ready",
         "revise_leads",
         "revise_rubric",
-        "revise_messaging",
-        "confirm_with_user"
+        "revise_messaging"
       ],
       "transitions": {
-        "post_lead_workstreams_ready": "messages-mode-choice",
+        "post_lead_workstreams_ready": "message-review",
         "revise_leads": "find-leads",
         "revise_rubric": "filter-rubric",
         "revise_messaging": "message-generation",
-        "confirm_with_user": "messages-mode-choice"
+        "confirm_with_user": "message-review"
       },
       "interruptOnly": true,
       "requiredCampaignState": [
@@ -1397,46 +1399,12 @@
     {
       "id": "messages-mode-choice",
       "label": "Messages mode choice",
-      "currentStepValue": "messages",
-      "normalFlow": true,
+      "currentStepValue": null,
+      "normalFlow": false,
       "onEnter": [
         {
-          "tool": "update_campaign",
-          "requiredValues": {
-            "currentStep": "messages",
-            "watchNarration.stage": "fit-message"
-          },
-          "watchNarrationRule": "Messages first shows a mode choice, not final review: Use Template and AI Generated. Use Template is recommended because it uses the approved campaign brief and review-batch evidence. AI Generated is an explicit opt-out from the background template draft. Do not show Review fit and message until the user chooses a mode and a reviewable message/template exists."
-        },
-        {
-          "action": "show_messages_mode_choice",
-          "choices": [
-            "Use Template (recommended)",
-            "AI Generated"
-          ],
-          "copyRule": "Show Use Template first and mark it recommended. Explain that Use Template reviews the Message Draft Builder template before any Generate Message cells run. Explain that AI Generated is an explicit opt-out."
-        },
-        {
-          "action": "wait_for_message_draft_builder_when_use_template",
-          "when": "user chose Use Template and draft is not ready",
-          "copy": "I am waiting for the Message Draft Builder. I will show the template when it is ready; I am not asking for approval yet.",
-          "forbiddenApprovalCopy": true
-        },
-        {
-          "action": "handle_unusable_or_unknown_template_draft",
-          "when": "draft worker fails, produces no usable message, or worker status is unknown",
-          "requiredCopy": "retry or regenerate the template draft before approval",
-          "forbiddenApprovalCopy": true
-        },
-        {
-          "action": "cancel_or_ignore_background_template_on_ai_generated",
-          "when": "user chose AI Generated",
-          "rule": "AI Generated is an explicit opt-out: cancel or ignore the background template draft and must not let late background template draft output overwrite campaign state."
-        },
-        {
-          "action": "route_ai_generated_to_product_path",
-          "when": "user chose AI Generated",
-          "rule": "Continue through the explicit AI-generated product path. Route to auto-execute-messaging when product row generation is required first; do not transition to validate-sample as the normal path."
+          "action": "legacy_resume_only_notice",
+          "rule": "Do not show this question in normal create-campaign runs. Route to message-generation/message-review instead."
         }
       ],
       "allowedTools": [
@@ -1457,16 +1425,10 @@
       ],
       "watchRequired": true,
       "waitFor": [
-        "use_template_ready",
-        "use_template_waiting",
-        "ai_generated_selected",
-        "revise_messaging"
+        "legacy_resume_only"
       ],
       "transitions": {
-        "use_template_ready": "message-review",
-        "use_template_waiting": "message-generation",
-        "ai_generated_selected": "auto-execute-messaging",
-        "revise_messaging": "message-generation"
+        "legacy_resume_only": "message-generation"
       },
       "interruptOnly": true,
       "requiredCampaignState": [
@@ -1474,7 +1436,10 @@
         "campaignBrief",
         "selectedLeadListId",
         "workflowTableId"
-      ]
+      ],
+      "resumeOnly": true,
+      "deprecated": true,
+      "deprecatedReason": "Default create-campaign flow no longer asks Use Template vs AI Generated. Message Draft Builder template review is the only normal path; AI-generated mode is legacy/manual only."
     },
     {
       "id": "filter-rubric",
@@ -1631,7 +1596,7 @@
         "Do not hand-write message-validation.md from message-prep.md, message-candidate-drafts.md, stale markdown files, database reads, or general campaign knowledge.",
         "message-validation.md or the returned recommendation must prove the generate-messages workflow ran and include Token Fill Rules, good-fill and omit/fallback examples, a raw sendable selected winner, and quality gate notes before message-review can recommend approve-message.",
         "If the generate-messages output is plausible but weaker than the gold-standard rules, stop at message-review with revise-messaging. Do not continue to approval or mint just because the mechanical flow worked.",
-        "The approved message set must be written back into campaignBrief before auto-execute-messaging observes or queues product Generate Message cells. AI Generated mode uses the product's AI-generated path instead of template review."
+        "The approved message set must be written back into campaignBrief before auto-execute-messaging observes or queues product Generate Message cells. Normal create-campaign runs use the approved-template path; legacy AI-generated mode is not part of the normal flow."
       ],
       "doNotAllow": [
         "create_campaign",
@@ -1823,19 +1788,51 @@
           "writesCampaignState": "campaignBrief.Approved Message Template"
         },
         {
-          "action": "advance_watch_to_messaging_after_message_approval",
+          "tool": "get_rows_minimal",
+          "purpose": "read_bounded_review_batch_cell_ids_after_message_approval",
+          "requiredBeforeCascade": true
+        },
+        {
+          "tool": "queue_cells",
+          "requiredValues": {
+            "tableId": "workflowTableId",
+            "cellSource": "bounded_review_batch_enrichCellIds",
+            "statusFilter": [
+              "pending",
+              "error",
+              "dependency_blocked"
+            ]
+          },
+          "purpose": "queue_bounded_review_batch_enrichment_after_approved_template",
+          "rule": "Queue only enrichCellId values from get_rows_minimal for the bounded review batch after update_campaign_brief has saved the Approved Message Template. Do not queue Generate Message cells directly here; the workflow cascade runs enrichment, ICP scoring, then Generate Message for passing rows."
+        },
+        {
+          "tool": "wait_for_rubric_results",
+          "requiredValues": {
+            "includeRows": false,
+            "minPassedCount": 2,
+            "targetCount": "bounded review batch count"
+          },
+          "purpose": "wait_for_bounded_filter_run_after_message_approval_before_messages_step",
+          "readVia": "stats_only_tool_result",
+          "note": "After the approved template is saved, wait for the bounded enrichment/ICP scoring run to produce at least 2 usable passing/probably passing rows before moving the watched browser to Messages. If only 1 passes, use weak-sample escalation before continuing."
+        },
+        {
+          "action": "advance_watch_to_messaging_after_filter_passes",
           "tool": "update_campaign",
           "requires": [
             "campaignId",
-            "message-review-decision.md"
+            "message-review-decision.md",
+            "campaignBrief.Approved Message Template",
+            "bounded filter run with usable passing rows"
           ],
           "requiredValues": {
             "currentStep": "auto-execute-messaging",
             "enableICPFilters": true,
             "watchNarration.stage": "review-ready"
           },
-          "when": "after_update_campaign_brief_succeeds",
-          "requiredBeforeCascade": true,
+          "when": "after_update_campaign_brief_succeeds_and_bounded_filter_run_has_passing_rows",
+          "requiredBeforeGenerateMessageCascade": true,
           "writesCampaignState": "currentStep:auto-execute-messaging"
         }
       ],
@@ -1857,14 +1854,16 @@
         "request_user_input",
         "get_subskill_prompt",
         "update_campaign_brief",
-        "update_campaign"
+        "update_campaign",
+        "get_rows_minimal",
+        "queue_cells",
+        "wait_for_rubric_results"
       ],
       "doNotAllow": [
         "create_campaign",
         "save_rubrics",
         "import_leads",
         "confirm_lead_list",
-        "queue_cells",
         "start_campaign",
         "enrich_with_prospeo",
         "bulk_enrich_with_prospeo"
@@ -2253,7 +2252,7 @@
       "currentStepValue": "validate-sample",
       "normalFlow": false,
       "resumeOnly": true,
-      "deprecatedReason": "Recovery/legacy only. The normal Phase 135 path reaches Messages after the filtered sample passes, then routes Use Template approval or AI Generated choice to auto-execute-messaging.",
+      "deprecatedReason": "Recovery/legacy only. The normal path reaches Messages only after the approved template is saved, enrichment/ICP scoring runs, and the filtered sample has usable passing rows.",
       "reference": "references/sample-validation-loop.md",
       "counter": {
         "name": "revisionRound",
@@ -2447,7 +2446,6 @@
           "action": "verify_campaign_brief_template_mode",
           "requiredSection": "Approved Message Template",
           "requiredPattern": "{{...}}",
-          "skipWhen": "messageMode is ai-generated",
           "onFailure": "runtime_failure_before_messaging",
           "repairBoundary": "before_import_only",
           "purpose": "ensure Generate Message uses the approved template instead of full-generation mode"
@@ -2458,7 +2456,7 @@
         },
         {
           "tool": "queue_cells",
-          "cellSource": "pending_generate_message_cells_for_passing_rows; in ai-generated mode use the explicit AI-generated product path, not the background template draft",
+          "cellSource": "pending_generate_message_cells_for_passing_rows_using_approved_campaign_brief_template",
           "when": "any passing row has pending or empty Generate Message cell",
           "batchSize": 100
         },
@@ -2509,7 +2507,6 @@
         "proposed_token_never_persisted_in_rewrite",
         "generate_messages_must_re_cascade_on_newly_passed_rows",
         "campaign_brief_must_contain_approved_message_template_tokens_before_generate_message_cascade",
-        "ai_generated_mode_uses_explicit_product_path_and_ignores_background_template_draft",
         "generate_message_cells_do_not_run_from_background_template_until_template_token_rules_approved"
       ],
       "watchRequired": true,

package/skills/create-campaign-v2/references/step-13-import-leads.md

@@ -31,6 +31,13 @@ live on the campaign. Reuse that state. If anything is missing, do not replay
 the source inside Step 13; route back to find-leads so the source can be
 attached with `campaignOfferId` and the campaign UI can stay in sync.
 
+Do not navigate the watched UI to the import/confirm page before the provider
+import has started. Keep `currentStep` on the approved source lane while
+`import_leads` calls the provider import API. `import_leads` then updates
+`selectedLeadListId` and moves `currentStep` to `confirm-lead-list` only after
+it has a lead-list table/job id, so the user lands on the import page with
+progress state available instead of an empty waiting page.
+
 selectedLeadListId remains the source list; workflowTableId is the campaign
 table. The first confirm/import must preserve both identities.
 
@@ -201,6 +208,9 @@ cannot scale further without a new source lane.
 
 - `import_leads` with `mode=add` is ALWAYS a two-step handshake. Never
   treat the first `needsModeSelection=true` response as a failure.
+- Step 13 entry does NOT set `currentStep` to `confirm-lead-list`. The watched
+  UI stays on the approved source lane until `import_leads` returns a lead-list
+  table/job id and moves the campaign to `confirm-lead-list`.
 - Dedup ratios (imported / skipped / duplicates) are always surfaced for
   escalation-logic input.
 - Zero-imported + zero-skipped ⇒ hard-fail escalate.

package/skills/create-campaign-v2/references/watch-guide-narration.md

@@ -35,7 +35,7 @@ stage labels. The driver label comes from the watch URL mode (`mode=claude` or
   Apollo, or existing list.
 - During search iteration, say what you tried, what you are trying next, what
   sample you are checking, and why that helps this campaign.
-- At filter choice, do not say filtering the batch before rubrics are saved.
+- At filter choice, do not say filtering the batch before rubrics and message approval are saved.
 - Avoid internal terms: MCP, tool, currentStep, workflow table, scout, debug.
 - Do not invent time estimates.
 
@@ -206,8 +206,8 @@ After review batch import:
 
 Use this after the selected review rows are present and before filters are
 saved. This is add-filters intent, not active filtering. Tell the user to
-Choose filters or skip, and do not say filtering the batch before rubrics are
-saved. When the user chooses filters, immediately persist
+Choose filters or skip, and do not say filtering the batch before rubrics and
+message approval are saved. When the user chooses filters, immediately persist
 `enableICPFilters: true` and move to `create-icp-rubric` so the watched app
 shows Filter Rules while Codex defines the rules in chat.
 
@@ -232,10 +232,10 @@ Review ready:
 ```json
 {
   "stage": "review-ready",
-  "headline": "Choose message mode",
-  "visibleState": "The Messages step shows Use Template and AI Generated.",
-  "agentIntent": "Use Template is recommended. AI Generated is an explicit opt-out that cancels or ignores the background template draft.",
-  "nextAction": "Validation",
+  "headline": "Review the message template",
+  "visibleState": "The browser remains on Filter Leads while the message template is reviewed in chat.",
+  "agentIntent": "Codex is waiting for approval before saving the template to the campaign brief and queueing enrichment/filtering.",
+  "nextAction": "Approve or revise the template",
   "safety": "Codex will only continue after you approve."
 }
 ```
@@ -246,10 +246,10 @@ Messages waiting for template:
 {
   "stage": "review-ready",
   "headline": "Waiting for the template",
-  "visibleState": "Use Template is selected, but the Message Draft Builder is still finishing.",
+  "visibleState": "The fit rules are saved and the Message Draft Builder is still finishing.",
   "agentIntent": "Codex is waiting for the Message Draft Builder and will not ask for approval until the template can be reviewed.",
   "nextAction": "Review template",
-  "safety": "Late template output must not overwrite campaign state if AI Generated was selected."
+  "safety": "No enrichment, filtering, or Generate Message cells run until the template is approved."
 }
 ```