@sellable/mcp 0.1.127 → 0.1.128

package/package.json

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

package/skills/create-campaign/SKILL.md

@@ -71,8 +71,10 @@ Disk artifacts are optional debug/UAT diagnostics; normal customer runs should
 not create, link, or surface local draft files unless the user explicitly asks
 for them. Resume, gating, and handoff read campaign state first. The
 watchable campaign exists after the short brief; lead import is bounded to the
-first review batch, and enrichment/message generation waits until rubrics and
-the approved message template are saved on the campaign.
+first review batch. After that, the user chooses whether to use filters or skip,
+then Messages first shows Use Template and AI Generated. The Message Draft
+Builder may work in the background, but template review waits for the filter
+path and an explicit Use Template choice.
 
 ## Opening Turn Contract
 
@@ -145,9 +147,13 @@ registry pattern for the two post-lead branches. The create-campaign-v2 subskill
 calls `get_post_find_leads_scout_registry`, then launches the returned
 filter-leads scout and message-generation scout together when real subagents are
 available and the current session exposes the returned names. Message
-generation must not wait for the filter unless the host cannot run the two
-branches concurrently. If the post-lead agents are absent, the main thread still
-orchestrates the same branches from the compact context with MCP tools/assets.
+generation is the provisional Message Draft Builder: it may start after the
+review batch exists, including while the user is on filter choice, but template
+review cannot start until the user answers filter choice and chooses Use
+Template in Messages. AI Generated is an explicit opt-out that cancels or
+ignores the background template draft. If the post-lead agents are absent, the
+main thread still orchestrates the same branches from the compact context with
+MCP tools/assets.
 
 Use rendered Markdown for user review surfaces, not fenced code blocks. Keep
 lines short, use indexed section labels and bullets, and translate internal
@@ -200,7 +206,7 @@ After every `update_campaign({ campaignId, currentStep })`, use
 `get_campaign_navigation_state` when available as a compact orientation check:
 match the saved campaign state to the expected watch-link step, explain the
 current state in one sentence, and only then continue. Sender selection belongs
-at Settings after message approval and 10-row validation. After message
+at Settings after message approval and 15-row validation. After message
 validation, use Settings to help the user connect or select a LinkedIn sender.
 Explain Slack reply review before launch. After sender selection, attach the
 recommended sequence and move the watched UI to Send. Do not start the campaign
@@ -567,21 +573,25 @@ updates.
 5. Create the campaign shell early with the v1 brief so the user can open the
    watch link and see useful setup state immediately. Import only the first
    bounded review batch after the source is attached to the campaign; do not
-   queue workflow cells, attach a sequence, or start until
-   `message-validation.md` proves the message-review safety-gate workflow ran,
-   `message-review.md` approves the template, rubrics are saved, and the
-   approved message set is synced into the campaign brief.
+   queue workflow cells, attach a sequence, or start until the filter choice is
+   resolved, Messages has shown Use Template / AI Generated, template/token
+   rules are approved when Use Template is chosen, rubrics are saved when
+   filters are enabled, and the approved message set is synced into the campaign
+   brief. Product Generate Message cells must not run from the background
+   template path before that template/token approval.
    Do not ask the user to approve the brief before shell creation unless they
    explicitly requested a no-write draft; the shell itself is the review surface.
 6. The main thread owns watch navigation. Call
    `mcp__sellable__update_campaign({ campaignId, currentStep })` before major
    visible work so the user can watch progress in the app: `create-offer` for
    the brief, `pick-provider` or the selected provider step while sourcing,
-   `filter-choice` after the 10-row review batch, `messages` or
-   `auto-execute-messaging` for message work, `validate-sample` for validation,
-   `awaiting-user-greenlight` for the final handoff, `settings` for sender
-   selection, `sequence` after sender attach, and `send` once the recommended
-   sequence is attached. Do not advance the step backward.
+   `filter-choice` after the 15-row review batch, `messages` for the Use
+   Template / AI Generated mode choice, `auto-execute-messaging` for approved
+   message work or the product's AI-generated path, `awaiting-user-greenlight`
+   for the final handoff, `settings` for sender selection, `sequence` after
+   sender attach, and `send` once the recommended sequence is attached.
+   `validate-sample` is recovery/legacy only if reached. Do not advance the
+   step backward.
 7. Keep `selectedLeadListId` as the source list and `workflowTableId` as the
    campaign table. Do not use disk files as the post-mint source of truth.
 8. Do not ask the user to run another command.

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

@@ -50,8 +50,10 @@ template, senderIds, sequence template, and running state.
 There is no separate approval-packet, commit-gate, or mint step in the active
 shell-first flow. The campaign exists early for watch mode. The hard boundary
 is import/enrichment: no leads are imported, no workflow cells are queued, no
-sequence is attached, and nothing starts until the source is selected, rubrics
-are saved, and the approved message set is synced into the campaign brief.
+sequence is attached, and nothing starts until the source is selected, filter
+choice is resolved, rubrics are saved when filters are enabled, and Messages
+has either approved template/token rules or selected the product's AI-generated
+path.
 </objective>
 
 <files>
@@ -96,8 +98,8 @@ Optional debug/UAT draft directory, disabled in normal customer runs:
   state. Use `create-offer` for the brief, `pick-provider` or the selected
   provider step while sourcing, `filter-choice` after the 15-row review batch is
   imported, `messages`/`auto-execute-messaging` for message work,
-  `validate-sample` for the 15-row validation cascade, and
-  `awaiting-user-greenlight` for Settings. Do not advance `currentStep` backward.
+  `awaiting-user-greenlight` for Settings, and `validate-sample` only for
+  recovery/legacy validation if reached. Do not advance `currentStep` backward.
 - After the shell is minted, normal resume paths read the CampaignOffer first.
   Use debug files to explain or reconstruct work, not to decide whether a
   post-mint gate is allowed. validation/debug artifacts are not durable campaign
@@ -442,11 +444,12 @@ brief`, `Revise target`, `Revise offer/proof`, and `Other / custom`.
   not given a specific source direction, use the default sequential source
   funnel:
   `Cool. I'm going to find people who are both a good fit and active enough to
-be worth a LinkedIn test. I'll start with warm LinkedIn post engagement because
-that gives the strongest message context if enough ICP-looking people are
-engaging. If that does not clear a quick viability check, I'll switch to Sales
-Nav with recent activity, then broader Sales Nav, and use Prospeo only as the
-fallback. No leads import until you approve the source.`
+be worth a LinkedIn test. I'll start with people engaging with relevant LinkedIn
+posts because that gives the strongest message context if enough ICP-looking
+people are engaging. If that does not clear a quick viability check, I'll switch
+to Sales Nav to find ICP people actively posting on LinkedIn, then search by
+titles, and use Prospeo for a broader account/contact path. No leads import
+until you approve the source.`
   The watched campaign should still be on Pick Provider while this source logic
   is being explained. If the default first lane is Signal Discovery, say clearly
   that Codex is about to test Signal Discovery as a viability path, not import
@@ -463,19 +466,23 @@ fallback. No leads import until you approve the source.`
   - explicit compare request -> compare only the requested sources
 - In watch mode, do not skip the Pick Provider checkpoint. First move the
   campaign to `pick-provider` and narrate the source-selection reasoning there.
-  After that visible checkpoint, move the campaign to the first source lane that
-  will actually be tested (`signal-discovery`, `sales-nav`, `prospeo`, or the
+  While the watched browser is still on Pick Provider, ask for approval before
+  starting Signal Discovery or a user-directed first lane. After that visible
+  checkpoint and approval, move the campaign to the first source lane that will
+  actually be tested (`signal-discovery`, `sales-nav`, `prospeo`, or the
   user-directed lane), then run the campaign-attached provider prompt + provider
   search in the parent thread with `campaignOfferId`, `confirmed: true`, and
-  `currentStep` when the tool accepts it. If that lane fails the quick viability
-  gate, update the campaign step and watchNarration before trying the next lane
-  so the user sees the source switch happen in the app.
+  `currentStep` when the tool accepts it. If that lane has timeout/error, zero
+  raw results, weak ICP fit, or weak message context, update the campaign step
+  and watchNarration before trying the next approved lane or ask the user to
+  revise the source/target before import. All lanes failed is a terminal
+  revise-source state, not an import state.
 - After the lead sample/source decision is ready and approved,
   show the next progress line:
   `Lead source is set. I'll import the first 15-row review batch into the
-campaign table, then add fit filters and draft the first message from that same
-sample. You can inspect filters once they are saved, but enrichment and message
-checks wait until the message draft is ready and approved.`
+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.`
 - 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.
@@ -517,17 +524,19 @@ checks wait until the message draft is ready and approved.`
   candidate messages and element tests, but it cannot select the final winner
   and cannot override `lead-filter.md`.
 - `message-validation.md` is the internal validation artifact produced by the
-  user-facing `message generation` stage.
+  Message Draft Builder / `message generation` stage. It is provisional until
+  the user answers filter choice and then chooses Use Template in Messages.
 - `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
-  `post-lead-workstreams` step. Launch `filter leads` and `message generation`
-  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, 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.
   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
@@ -538,14 +547,19 @@ checks wait until the message draft is ready and approved.`
   context. Do not surface agent install status to the customer. The existing
   `filter-rubric` and `message-generation` steps remain focused retry and
   resume targets.
-- Message generation does not need `lead-filter.md` to start. The moment the
-  bounded review batch is imported and `workflowTableId` is ready, start the
-  message-generation workstream from the live campaign brief, source decision,
-  lead sample, and the imported campaign table sample. It can prepare
-  proof inventory, token strategy, and candidate angles while filter-leads
-  tightens keep/exclude rules. Approval still waits for both `lead-filter.md`
-  and `message-validation.md`, then reconciles that the selected message basis
-  rows still pass the final filter.
+- 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.
   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.
@@ -612,15 +626,29 @@ workstreams`, `in parallel`, or `background` unless parallel branches were
 batch`, and a no-launch safety note. Do not leave the guide saying
   `source approved` or `I'll show the review-batch outcome` once import is
   starting.
+- After the bounded review batch is present, update the watched browser to
+  `currentStep: "filter-choice"` with `watchNarration.stage: "fit-message"` and
+  ask the user to Choose filters or skip. If import succeeds but row readback
+  returns zero rows, do not move to filter choice; keep the user in source/import
+  recovery and ask whether to retry import, import more from the approved
+  source, or revise source. Active filtering starts only after rubrics are
+  saved; do not say filtering the batch before rubrics are saved.
 - After Lead Fit Builder saves rubrics, move the watched browser to Filter
   Leads before waiting for message work to finish. Persist
   `enableICPFilters: true`, `currentStep: "apply-icp-rubric"`, and
   `watchNarration.stage: "fit-message"` so the user can see fit filtering
-  happen while the first message sample finishes. After message approval,
-  persist `useMessagingTemplate: true` and keep `enableICPFilters: true`;
-  sample validation then runs the review-batch cascade, and the user should be
-  walked through fit results, generated message results, and
-  Settings/sender/sequence handoff.
+  happen while the Message Draft Builder finishes. The next user-facing Messages
+  screen must show mode choice first: Use Template and AI Generated. Use
+  Template is recommended. 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`; Generate
+  Message detects template mode from those tokens, not from
+  `useMessagingTemplate`. Sample validation then runs the review-batch cascade,
+  and the user should be walked through fit results, generated message results,
+  and Settings/sender/sequence handoff.
 - 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.
@@ -666,7 +694,7 @@ batch`, and a no-launch safety note. Do not leave the guide saying
 
 <conditional_gates>
 
-There are four customer-visible gates in the net-new hosted flow:
+There are six customer-visible gates in the net-new hosted flow:
 
 - `brief-review` asks whether to approve the rendered campaign brief before
   Find Leads starts. Do not skip this by inferring approval from setup
@@ -674,11 +702,17 @@ There are four customer-visible gates in the net-new hosted flow:
 - `lead-review` / source decision asks whether to approve the selected source
   path and sample before moving into filter/message work. Do not skip this by
   compressing the source decision into message review.
-- `message-review` is the mandatory pre-import message 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 message set into the campaign brief, saving rubrics,
-  importing the bounded 15-lead test batch, and queueing/observing that sample.
+- `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 (`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
+  review-batch cascade.
 - The sender/settings/sequence handoff is the launch gate. After message
   validation, use Settings to help the user connect or select a LinkedIn sender.
   Explain Slack reply review before launch. After sender selection, attach the
@@ -814,6 +848,12 @@ Required behavior:
   watched campaign moving, not to compare every plausible lane in parallel.
   Run only enough evidence for the current lane to pass or fail the quick gate,
   then stop on the first viable source unless the user asked to compare.
+  User-facing fallback copy should stay fifth-grade clear: people engaging with
+  relevant LinkedIn posts -> Sales Nav to find ICP people actively posting on
+  LinkedIn -> search by titles -> Prospeo for a broader account/contact path.
+  The older provider label `broader Sales Nav` maps to the plain-language
+  `search by titles` fallback; `Prospeo only as the fallback` maps to the
+  plain-language broader account/contact path. Keep user-facing copy simple.
   1. Start with LinkedIn Engagement / active LinkedIn posts (internal provider:
      Signals / `signal-discovery`) because recent engagement gives the strongest
      message context and expected reply-rate upside. Search intersection keyword
@@ -842,6 +882,10 @@ Required behavior:
   start with Signal Discovery. If they name titles/personas/company filters,
   start with Sales Nav. If they explicitly ask for a comparison, compare only
   those requested sources.
+- failed or empty source lanes do not import leads. A timeout/error, zero raw
+  results, weak ICP fit, or weak message context must trigger the next approved
+  lane or a revision question before import. All lanes failed is a terminal
+  revise-source state, not an import state.
 - run source scouts in parallel only when the user explicitly requested a
   comparison, the current turn is resuming from already-started parallel scouts,
   or the first viable source is borderline and one cheap fallback check is
@@ -1237,11 +1281,11 @@ Do not:
 
 ## Step 3: Generate Message
 
-Step 3 is orchestrated by the main thread and executed either by the
-`post-find-leads-message-scout` worker or by the parent-thread fallback. The
-worker carries the campaign-launch message rules in its agent prompt. The
-parent-thread fallback must load the small safety-gate reference before writing
-message artifacts:
+Step 3 is the Message Draft Builder path. It is orchestrated by the main thread
+and executed either by the `post-find-leads-message-scout` worker or by the
+parent-thread fallback. The worker carries the campaign-launch message rules in
+its agent prompt. The parent-thread fallback must load the small safety-gate
+reference before writing message artifacts:
 
 ```
 mcp__sellable__get_subskill_asset({ subskillName: "create-campaign-v2", assetPath: "references/message-review-safety-gate.md" })
@@ -1255,12 +1299,31 @@ is missing a needed campaign-specific rule or the draft fails quality gates, sto
 at `revise-messaging` with the exact failure instead of pulling the long prompt
 into the main thread.
 
-Do NOT proceed to Step 4 (message review gate) unless `message-validation.md`
-contains the safety-gate required sections, a raw sendable Selected Winner, and an
-explicit single-first-send PASS. 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.
+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
+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
+`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.
+
+Product Generate Message cells should not run from the background template path
+until template/token rules are approved.
 
 After the main-chat message approval, update_campaign_brief writes `## Approved
 Message Template` with `{{...}}` tokens before any Generate Message cascade is

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

@@ -515,6 +515,12 @@
           "sales-nav-general",
           "prospeo"
         ],
+        "userFacingFallbackOrder": [
+          "people engaging with relevant LinkedIn posts",
+          "Sales Nav to find ICP people actively posting on LinkedIn",
+          "search by titles",
+          "Prospeo for a broader account/contact path."
+        ],
         "sourceDirectionOverrides": {
           "postEngagement": "signal-discovery",
           "creatorOrCommentSignals": "signal-discovery",
@@ -526,6 +532,13 @@
           "explicitCompare": "compare-requested-sources"
         },
         "quickViabilityRule": "Run only enough of the current lane to decide whether it can supply relevant, reachable ICP-looking leads. For Signals, viability requires sampled ICP-fit rate normalized to good-fit prospects per 100 engagers, required engagers to scrape, average reachable engagers per right-content post, projected good-fit prospects per post after cleanup, and posts-needed math against the 300-good-fit source target, not raw post count or the 15-row review-batch import limit. Stop on the first viable source unless the user asked for comparison.",
+        "sourceFailureHandling": [
+          "timeout/error: try the next approved lane or ask the user to revise the source/target before import",
+          "zero raw results: try the next approved lane or ask the user to revise the source/target before import",
+          "weak ICP fit: try the next approved lane or ask the user to revise the source/target before import",
+          "weak message context: try the next approved lane or ask the user to revise the source/target before import"
+        ],
+        "allLanesFailedState": "revise-source",
         "parallelAllowedOnlyWhen": [
           "user explicitly requested source comparison",
           "resuming already-started parallel scouts",
@@ -547,8 +560,9 @@
           },
           "when": "before_sequential_source_funnel",
           "requiresVisibleCheckpointBeforeProviderLane": true,
+          "askApprovalBeforeFirstLane": true,
           "forbidDirectPlanToProviderLane": true,
-          "chatRenderRule": "Move the campaign watch view to the Pick Provider step before the main thread starts source viability work. This must be a distinct visible checkpoint: do not jump directly from Plan to Signal Discovery, Sales Nav, Prospeo, or another provider lane in the same visible beat. While the watched browser is on Pick Provider, explain the source-selection logic. If the user did not specify a source, explain the default order: start with warm LinkedIn post engagement because it gives stronger message context and expected reply-rate upside when enough ICP-looking engagers exist; if it is not viable, switch to Sales Nav with recent activity, then broader Sales Nav, and use Prospeo only as the fallback. If starting with Signal Discovery, explicitly say this is a viability test: Codex will look for relevant posts, sample engagers, estimate ICP fit, and only continue if the source math works. If the user did specify hiring signals, domains/accounts, supplied lists, posts/comments, or titles/personas, explain that the matching source overrides the default funnel. State that no leads import until a source is approved. The watchNarration headline/body must name the first lane being considered, why this lane now, the quick viability gate, and the safety boundary. Do not mention MCP or local artifacts."
+          "chatRenderRule": "Move the campaign watch view to the Pick Provider step before the main thread starts source viability work. This must be a distinct visible checkpoint: do not jump directly from Plan to Signal Discovery, Sales Nav, Prospeo, or another provider lane in the same visible beat. While the watched browser is on Pick Provider, explain the source-selection logic and ask for approval before starting Signal Discovery or a user-directed first lane. If the user did not specify a source, explain the default order in plain language: people engaging with relevant LinkedIn posts, then Sales Nav to find ICP people actively posting on LinkedIn, then search by titles, then Prospeo for a broader account/contact path. Keep the legacy provider mapping clear: Signal Discovery first, then Sales Nav with recent activity, then broader Sales Nav, and Prospeo only as the fallback. If starting with Signal Discovery, explicitly say this is a viability test: Codex will look for relevant posts, sample engagers, estimate ICP fit, and only continue if the source math works. If the user did specify hiring signals, domains/accounts, supplied lists, posts/comments, or titles/personas, explain that the matching source overrides the default funnel and still needs user approval before the lane starts. State that no leads import until a source is approved. The watchNarration headline/body must name the first lane being considered, why this lane now, the quick viability gate, and the safety boundary. Do not mention MCP or local artifacts."
         },
         {
           "action": "advance_watch_to_initial_source_lane",
@@ -1001,6 +1015,18 @@
           "stripCarryData": true,
           "sampleSizeFromConfig": "sample.sampleSize (15)"
         },
+        {
+          "action": "require_non_empty_review_batch_before_filter_choice",
+          "after": "get_rows_minimal",
+          "blocksCurrentStep": "filter-choice",
+          "onZeroRows": "source-import-recovery",
+          "recoveryChoices": [
+            "retry import",
+            "import more from approved source",
+            "revise source"
+          ],
+          "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": "update_campaign",
           "requiredFields": [
@@ -1013,7 +1039,7 @@
             "watchNarration.stage": "fit-message",
             "watchNarration.headline": "Added to Campaign"
           },
-          "watchNarrationRule": "After the bounded review batch is present, update the watched guide to `Added to Campaign`. Say Codex is adding fit filters so every send stays qualified while drafting the first message in the background. This persists add-filters intent by currentStep/watchNarration only; do not set enableICPFilters=true until save_rubrics succeeds with active criteria. Nothing enriches, validates, or sends until the first message is ready and approved."
+          "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."
         }
       ],
       "allowedTools": [
@@ -1040,7 +1066,7 @@
       "watchRequired": true,
       "waitFor": "review_batch_imported",
       "transitions": {
-        "review_batch_imported": "post-lead-workstreams",
+        "review_batch_imported": "filter-choice",
         "escalation_triggered": "escalation"
       },
       "requiredArtifacts": [
@@ -1054,6 +1080,65 @@
         "selectedLeadListId"
       ]
     },
+    {
+      "id": "filter-choice",
+      "label": "Filter choice",
+      "currentStepValue": "filter-choice",
+      "normalFlow": true,
+      "onEnter": [
+        {
+          "action": "show_filter_choice",
+          "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"
+          ],
+          "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."
+        },
+        {
+          "tool": "update_campaign",
+          "requiredValues": {
+            "currentStep": "filter-choice",
+            "watchNarration.stage": "fit-message"
+          },
+          "watchNarrationRule": "Show Added to Campaign with a Choose filters or skip decision. Do not say filtering the batch before rubrics are saved."
+        }
+      ],
+      "allowedTools": [
+        "AskUserQuestion",
+        "request_user_input",
+        "update_campaign",
+        "get_campaign_navigation_state"
+      ],
+      "doNotAllow": [
+        "create_campaign",
+        "save_rubrics",
+        "import_leads",
+        "confirm_lead_list",
+        "queue_cells",
+        "start_campaign",
+        "generate_messages",
+        "enrich_with_prospeo",
+        "bulk_enrich_with_prospeo"
+      ],
+      "watchRequired": true,
+      "waitFor": [
+        "filters_enabled",
+        "filters_skipped",
+        "revise_leads"
+      ],
+      "transitions": {
+        "filters_enabled": "post-lead-workstreams",
+        "filters_skipped": "messages-mode-choice",
+        "revise_leads": "find-leads"
+      },
+      "interruptOnly": true,
+      "requiredCampaignState": [
+        "campaignId",
+        "workflowTableId"
+      ]
+    },
     {
       "id": "post-lead-workstreams",
       "label": "Post-import filter and message workstreams",
@@ -1106,8 +1191,9 @@
               "ownership": "proof inventory, token strategy, angle drafting, skeptical-prospect review, and selected winner only"
             }
           ],
-          "earlyMessageStartRule": "After auto-execute-leads confirms the 15-row review batch and workflowTableId is ready, launch message-generation from brief.md, lead-review.md, lead-sample.json, and the imported campaign table sample. The message worker carries the campaign-launch message rules in its agent prompt; parent-thread fallback loads references/message-review-safety-gate.md. Legacy/resume preview prep still requires at least 3 probable good-fit rows. It may run beside filter-leads, but the cascade 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 the user has reached filter choice, the Message Draft Builder may start from brief.md, lead-review.md, lead-sample.json, and the imported campaign table sample, including while the user is on filter choice. This background template draft is provisional speed work only. The message worker carries the campaign-launch message rules in its agent prompt; parent-thread fallback loads references/message-review-safety-gate.md. Legacy/resume preview prep still requires at least 3 probable good-fit rows. It may run beside filter-leads, but the cascade cannot queue until save_rubrics and update_campaign_brief both succeed.",
           "finalMessageReconcileRule": "message-validation.md may start before lead-filter.md exists, but before message-review it must cite only imported review-batch rows that still pass lead-filter.md. If the selected winner depends on a row later excluded by lead-filter.md, 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."
@@ -1161,6 +1247,22 @@
           "when": "after_save_rubrics_succeeds_before_waiting_for_message_validation",
           "writesCampaignState": "currentStep:apply-icp-rubric"
         },
+        {
+          "tool": "wait_for_rubric_results",
+          "requiredValues": {
+            "includeRows": false,
+            "minPassedCount": 1
+          },
+          "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",
@@ -1197,6 +1299,7 @@
         "get_subskill_asset",
         "get_post_find_leads_scout_registry",
         "save_rubrics",
+        "wait_for_rubric_results",
         "update_campaign",
         "get_campaign_navigation_state",
         "Task",
@@ -1231,11 +1334,11 @@
         "confirm_with_user"
       ],
       "transitions": {
-        "post_lead_workstreams_ready": "message-review",
+        "post_lead_workstreams_ready": "messages-mode-choice",
         "revise_leads": "find-leads",
         "revise_rubric": "filter-rubric",
         "revise_messaging": "message-generation",
-        "confirm_with_user": "message-review"
+        "confirm_with_user": "messages-mode-choice"
       },
       "interruptOnly": true,
       "requiredCampaignState": [
@@ -1250,6 +1353,86 @@
         "message-candidate-drafts.md"
       ]
     },
+    {
+      "id": "messages-mode-choice",
+      "label": "Messages mode choice",
+      "currentStepValue": "messages",
+      "normalFlow": true,
+      "onEnter": [
+        {
+          "tool": "update_campaign",
+          "requiredValues": {
+            "currentStep": "messages",
+            "watchNarration.stage": "review-ready"
+          },
+          "watchNarrationRule": "Messages first shows a mode choice: 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."
+        },
+        {
+          "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."
+        }
+      ],
+      "allowedTools": [
+        "AskUserQuestion",
+        "request_user_input",
+        "update_campaign",
+        "get_campaign_navigation_state"
+      ],
+      "doNotAllow": [
+        "create_campaign",
+        "import_leads",
+        "confirm_lead_list",
+        "queue_cells",
+        "start_campaign",
+        "generate_messages",
+        "enrich_with_prospeo",
+        "bulk_enrich_with_prospeo"
+      ],
+      "watchRequired": true,
+      "waitFor": [
+        "use_template_ready",
+        "use_template_waiting",
+        "ai_generated_selected",
+        "revise_messaging"
+      ],
+      "transitions": {
+        "use_template_ready": "message-review",
+        "use_template_waiting": "message-generation",
+        "ai_generated_selected": "auto-execute-messaging",
+        "revise_messaging": "message-generation"
+      },
+      "interruptOnly": true,
+      "requiredCampaignState": [
+        "campaignId",
+        "workflowTableId"
+      ]
+    },
     {
       "id": "filter-rubric",
       "label": "Lead filters and production rubrics",
@@ -1408,7 +1591,7 @@
         "message-validation.md must prove the message-review safety-gate workflow ran: Gold Standard Strategy Map, Campaign Element Pool, Current Campaign Translation, Token Fill Rules, Token Adherence Table, Angle Drafts, Kill / Combine Review, Finalizer Pass, Gold-Standard Quality Gate, Skeptical Prospect Review, Winner Gate, and a raw sendable Selected Winner are required before message-review can recommend approve-message.",
         "If the hosted output is plausible but weaker than the safety-gate gold-standard rules, stop at message-review with revise-messaging. Do not continue to approval or mint just because the mechanical flow worked.",
         "Do not load the full generate-messages subskill in create-campaign-v2. If the safety gate is missing a needed campaign-specific rule or the first safety-gate draft fails quality gates, route to revise-messaging with the concrete failure instead of loading the long prompt.",
-        "The approved message set must be written back into campaignBrief before validate-sample queues the review-batch cascade."
+        "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."
       ],
       "doNotAllow": [
         "create_campaign",
@@ -1583,12 +1766,11 @@
             "campaignId",
             "message-review-decision.md",
             "message-validation.md",
-            "lead-filter.md"
+            "lead-filter.md when filters are enabled"
           ],
-          "when": "after_message_approved_before_import",
+          "when": "after_message_approved_before_product_messaging",
           "fields": [
-            "campaignBrief with ## Approved Message Template, Token Fill Rules, Token Fill Examples",
-            "useMessagingTemplate:true"
+            "campaignBrief with ## Approved Message Template containing {{...}} tokens, Token Fill Rules, Token Fill Examples"
           ],
           "requiredBeforeImport": false,
           "onFailure": "stop_before_import_or_enrichment",
@@ -1596,30 +1778,31 @@
           "writesCampaignState": "campaignBrief.Approved Message Template"
         },
         {
-          "action": "advance_watch_to_validation_after_message_approval",
+          "action": "advance_watch_to_messaging_after_message_approval",
           "tool": "update_campaign",
           "requires": [
             "campaignId",
             "message-review-decision.md"
           ],
           "requiredValues": {
-            "currentStep": "validate-sample",
+            "currentStep": "auto-execute-messaging",
             "enableICPFilters": true,
-            "useMessagingTemplate": true,
             "watchNarration.stage": "review-ready"
           },
           "when": "after_update_campaign_brief_succeeds",
           "requiredBeforeCascade": true,
-          "writesCampaignState": "currentStep:validate-sample"
+          "writesCampaignState": "currentStep:auto-execute-messaging"
         }
       ],
       "requiredArtifacts": [
         "brief.md",
         "lead-review.md",
         "lead-sample.json",
-        "lead-filter.md",
         "message-validation.md"
       ],
+      "optionalRequiredArtifacts": [
+        "lead-filter.md"
+      ],
       "producesArtifacts": [
         "message-review.md",
         "message-review-decision.md"
@@ -1647,14 +1830,13 @@
         "revise_messaging"
       ],
       "transitions": {
-        "message_approved": "validate-sample",
+        "message_approved": "auto-execute-messaging",
         "revise_messaging": "message-generation"
       },
       "interruptOnly": true,
       "requiredCampaignState": [
         "campaignId",
-        "workflowTableId",
-        "leadScoringRubrics"
+        "workflowTableId"
       ]
     },
     {
@@ -1933,8 +2115,7 @@
           "fields": [
             "campaignBrief",
             "leadSourceType",
-            "leadSourceProvider",
-            "useMessagingTemplate"
+            "leadSourceProvider"
           ],
           "skipWhen": "create_campaign minted a new campaign with the final approved brief and currentStep already set"
         },
@@ -2025,6 +2206,9 @@
       "id": "validate-sample",
       "label": "Step 14: Validate 15-lead test batch",
       "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.",
       "reference": "references/sample-validation-loop.md",
       "counter": {
         "name": "revisionRound",
@@ -2034,6 +2218,14 @@
         "capFromConfig": "sample.maxRevisionRounds"
       },
       "onEnter": [
+        {
+          "action": "resolve_messages_mode",
+          "branches": {
+            "use-template": "Use the approved template/token rules already synced into CampaignOffer.campaignBrief.",
+            "ai-generated": "Use the explicit AI-generated product path and cancel or ignore any background template draft."
+          },
+          "rule": "AI Generated mode must not read, apply, or be overwritten by the background Message Draft Builder template."
+        },
         {
           "action": "watch_mode_orient"
         },
@@ -2138,7 +2330,8 @@
         "first_passing_row_unblocks_generate_message_observation",
         "timeout_never_repeats_without_customer_handoff",
         "timeout_or_underfloor_sample_never_advances_to_settings",
-        "review_batch_cascade_waits_for_saved_rubrics_and_approved_template"
+        "review_batch_cascade_waits_for_saved_rubrics_and_approved_template",
+        "generate_message_cells_do_not_run_from_background_template_until_template_token_rules_approved"
       ],
       "watchRequired": true,
       "waitFor": [
@@ -2209,6 +2402,7 @@
           "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"
@@ -2219,7 +2413,7 @@
         },
         {
           "tool": "queue_cells",
-          "cellSource": "pending_generate_message_cells_for_passing_rows",
+          "cellSource": "pending_generate_message_cells_for_passing_rows; in ai-generated mode use the explicit AI-generated product path, not the background template draft",
           "when": "any passing row has pending or empty Generate Message cell",
           "batchSize": 100
         },
@@ -2269,7 +2463,9 @@
         "opus_reserved_for_highest_value_subset",
         "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"
+        "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,
       "waitFor": [

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

@@ -35,6 +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.
 - Avoid internal terms: MCP, tool, currentStep, workflow table, scout, debug.
 - Do not invent time estimates.
 
@@ -81,7 +82,7 @@ Default source funnel:
   "stage": "find-leads",
   "headline": "Choosing the lead source",
   "visibleState": "The browser is on Pick Provider while Codex explains the source path before opening a provider lane.",
-  "agentIntent": "Codex will start with Signal Discovery when warm LinkedIn engagement looks plausible, then switch to Sales Nav or Prospeo only if the quick viability math fails.",
+  "agentIntent": "Codex will start with people engaging with relevant LinkedIn posts when that looks plausible, then switch to Sales Nav to find ICP people actively posting on LinkedIn, then search by titles, and use Prospeo for a broader account/contact path. Sales Nav with recent activity remains the first LinkedIn fallback.",
   "nextAction": "Review source",
   "safety": "No leads import until you approve the source."
 }
@@ -193,8 +194,8 @@ After review batch import:
   "stage": "fit-message",
   "headline": "Added to Campaign",
   "visibleState": "The first review batch is in the campaign.",
-  "agentIntent": "Codex is adding fit filters to keep every send qualified while drafting the first message in the background.",
-  "nextAction": "Review fit rules and message",
+  "agentIntent": "Codex is asking you to Choose filters or skip. The Message Draft Builder may prepare a template in the background, but review waits until the filter path is settled.",
+  "nextAction": "Choose filters or skip",
   "safety": "Nothing enriches, validates, or sends until the message is ready and approved.",
   "workerStatuses": {
     "leadFitBuilder": "running",
@@ -204,8 +205,10 @@ 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. `enableICPFilters`
-only becomes true after active filter criteria are saved.
+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. `enableICPFilters` only becomes true after active filter criteria are
+saved.
 
 Fit + message:
 
@@ -228,14 +231,27 @@ Review ready:
 ```json
 {
   "stage": "review-ready",
-  "headline": "Review fit and message",
-  "visibleState": "The fit rules and message sample are ready.",
-  "agentIntent": "Approve them or ask for changes in chat.",
+  "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",
   "safety": "Codex will only continue after you approve."
 }
 ```
 
+Messages waiting for template:
+
+```json
+{
+  "stage": "review-ready",
+  "headline": "Waiting for the template",
+  "visibleState": "Use Template is selected, but 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."
+}
+```
+
 Blocked/recovering:
 
 ```json