@sellable/mcp 0.1.127 → 0.1.129

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",
@@ -949,9 +963,10 @@
           "targetLeadCountFromConfig": "sourceTargetGoodFitLeadCount (default 300) for provider source-list materialization, not import.importLimit",
           "signalDiscoveryRequiredFields": [
             "targetEngagerCount from approved source math",
-            "maxPostsToScrape or selected post plan when available"
+            "approved promoted post ids selected with select_promising_posts",
+            "maxPostsToScrape from approved source math"
           ],
-          "signalDiscoveryRule": "For Signal Discovery, pass targetEngagerCount = ceil(sourceTargetGoodFitLeads / sampledFitRateAfterCleanup) and maxPostsToScrape = postsNeeded when known. This prevents import_leads from scraping every selected/promoted sample post by default. The first campaign review batch is still limited by confirm_lead_list targetLeadCount import.importLimit.",
+          "signalDiscoveryRule": "For Signal Discovery, promote/select the exact approved posts with select_promising_posts before import_leads. Then pass targetEngagerCount = ceil(sourceTargetGoodFitLeads / sampledFitRateAfterCleanup) and maxPostsToScrape = postsNeeded from the approved source math. If no approved promoted posts are attached to the campaign, stop and route back to find-leads; do not import from unpromoted sample/search results. The first campaign review batch is still limited by confirm_lead_list targetLeadCount import.importLimit.",
           "onZeroLeads": "escalate_hard_fail",
           "modeAddHandshake": {
             "firstCallReturns": "needsModeSelection=true + existingLeadListId",
@@ -962,7 +977,8 @@
           "defaultBranch": "normal-discovery",
           "skipWhen": "resolved source branch returns sourceLeadListId for confirm_lead_list",
           "requiredBeforeCall": [
-            "campaign_attached_source_state"
+            "campaign_attached_source_state",
+            "for Signal Discovery: approved_promoted_posts_attached_to_campaign"
           ]
         },
         {
@@ -1001,6 +1017,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 +1041,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,20 +1068,88 @@
       "watchRequired": true,
       "waitFor": "review_batch_imported",
       "transitions": {
-        "review_batch_imported": "post-lead-workstreams",
+        "review_batch_imported": "filter-choice",
         "escalation_triggered": "escalation"
       },
-      "requiredArtifacts": [
-        "brief.md",
-        "lead-review.md",
-        "lead-sample.json"
-      ],
+      "requiredArtifacts": [],
       "requiredCampaignState": [
         "campaignId",
         "providerSearchAssociation",
         "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": "Ask whether the user wants to further filter the imported leads. Say whether the selected lead list looks mixed/good/noisy based on the imported 15-row review batch, then ask Choose filters or skip. Do not say filtering the batch before rubrics are saved."
+        },
+        {
+          "action": "persist_filters_enabled_choice",
+          "tool": "update_campaign",
+          "when": "immediately after the user chooses filters_enabled",
+          "requiredValues": {
+            "enableICPFilters": true,
+            "currentStep": "create-icp-rubric",
+            "watchNarration.stage": "fit-message"
+          },
+          "watchNarrationRule": "Move the watched app to Filter Rules and show passive copy that Codex is defining the filters in chat. Do not leave the user on filter-choice after they choose filters."
+        }
+      ],
+      "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",
+        "campaignBrief",
+        "selectedLeadListId",
+        "workflowTableId"
+      ]
+    },
     {
       "id": "post-lead-workstreams",
       "label": "Post-import filter and message workstreams",
@@ -1073,9 +1169,9 @@
               "name": "filter-leads",
               "target": "filter-leads",
               "inputs": [
-                "brief.md",
-                "lead-review.md",
-                "lead-sample.json",
+                "campaignBrief",
+                "selected source decision",
+                "selectedLeadListId",
                 "workflowTableId review-batch rows"
               ],
               "producesArtifacts": [
@@ -1091,29 +1187,33 @@
               "target": "generate-messages",
               "mode": "DRY MODE",
               "inputs": [
-                "brief.md",
-                "lead-review.md",
-                "lead-sample.json",
+                "campaignBrief",
+                "selected source decision",
+                "selectedLeadListId",
                 "workflowTableId review-batch rows"
               ],
               "producesArtifacts": [
-                "message-validation.md"
+                "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"
             }
           ],
-          "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.",
-          "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.",
+          "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.",
+          "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."
         },
         {
-          "action": "wait_for_lead_filter_artifact",
+          "action": "wait_for_lead_filter_rules",
           "requiredArtifacts": [
             "lead-filter.md"
           ],
@@ -1123,7 +1223,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. 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 running while the user watches fit filtering."
         },
         {
           "action": "save_filter_rubrics_to_campaign",
@@ -1161,28 +1261,67 @@
           "when": "after_save_rubrics_succeeds_before_waiting_for_message_validation",
           "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",
           "optional": true
         },
         {
-          "action": "wait_for_message_validation_artifact",
-          "requiredArtifacts": [
-            "message-validation.md"
+          "action": "wait_for_message_draft_recommendation",
+          "requiredOutputs": [
+            "template recommendation",
+            "token fill rules",
+            "rendered sample"
           ],
           "optionalArtifacts": [
+            "message-validation.md",
             "message-prep.md",
             "message-candidate-drafts.md"
           ],
-          "reconciliationRule": "Before entering message-review, verify message-validation.md came from the same brief.md, lead-review.md, lead-sample.json, and saved lead-filter.md. lead-filter.md gates the sample rows; lead-sample.json remains the message sample source."
+          "reconciliationRule": "Before entering message-review, verify the recommendation came from the same campaignBrief, selected source state, selectedLeadListId, imported review-batch rows, and saved filters. Saved filters gate the sample rows; debug markdown files are optional only."
         }
       ],
-      "requiredArtifacts": [
-        "brief.md",
-        "lead-review.md",
-        "lead-sample.json"
-      ],
+      "requiredArtifacts": [],
       "producesArtifacts": [
         "lead-filter.md",
         "message-validation.md"
@@ -1197,6 +1336,9 @@
         "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",
@@ -1206,16 +1348,16 @@
       ],
       "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 lead-filter.md, but message-review cannot start until both lead-filter.md and message-validation.md exist and reconcile against the same lead-sample.json.",
+        "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.",
         "Do not let filter-leads create a new message sample. Do not let message-generation fetch new prospects.",
-        "Before writing message-validation.md, message-generation must either run in the post-find-leads-message-scout agent that carries the campaign-launch message rules in its prompt or load get_subskill_asset({ subskillName: \"create-campaign-v2\", assetPath: \"references/message-review-safety-gate.md\" }) in the parent-thread fallback. Do not load the full long generate-messages prompt in create-campaign-v2; if the safety gate cannot safely approve the draft, route to revise-messaging with the concrete failure.",
-        "Do not queue, enrich, attach sequence, or start until save_rubrics succeeds and the approved message set is synced into campaignBrief."
+        "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 attach sequence, start, or queue product Generate Message cells until the approved message set is synced into campaignBrief."
       ],
       "doNotAllow": [
         "create_campaign",
         "import_leads",
         "confirm_lead_list",
-        "queue_cells",
         "start_campaign",
         "check_rubric",
         "generate_messages",
@@ -1231,15 +1373,17 @@
         "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": [
         "campaignId",
+        "campaignBrief",
+        "selectedLeadListId",
         "workflowTableId"
       ],
       "debugProducesArtifacts": [
@@ -1250,6 +1394,88 @@
         "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": "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."
+        }
+      ],
+      "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",
+        "campaignBrief",
+        "selectedLeadListId",
+        "workflowTableId"
+      ]
+    },
     {
       "id": "filter-rubric",
       "label": "Lead filters and production rubrics",
@@ -1374,41 +1600,38 @@
       "onEnter": [
         {
           "action": "run_or_reconcile_subskill",
-          "target": "message-review-safety-gate",
+          "target": "generate-messages",
           "mode": "DRY MODE",
-          "sampleSource": "lead-sample.json from find-leads",
+          "sampleSource": "imported review-batch rows from selectedLeadListId",
           "toolCallRequiredBeforeArtifacts": [
-            "get_subskill_asset({ subskillName: \"create-campaign-v2\", assetPath: \"references/message-review-safety-gate.md\" }) unless the post-find-leads-message-scout agent prompt already supplied these rules"
+            "get_subskill_prompt({ subskillName: \"generate-messages\", offset, limit }) until hasMore=false",
+            "optional supplemental check: get_subskill_asset({ subskillName: \"create-campaign-v2\", assetPath: \"references/message-review-safety-gate.md\" })"
           ],
-          "skipIfFreshArtifactExists": "message-validation.md",
-          "reconcileWith": "lead-filter.md; lead-sample.json remains the sample source"
+          "skipIfFreshStateExists": "fresh messageDraftRecommendation from the same campaign/source/review-batch basis",
+          "reconcileWith": "saved filters and imported review-batch rows; optional lead-filter.md only mirrors those filters"
         },
         {
-          "action": "write_artifact",
-          "artifact": "message-validation.md"
+          "action": "return_template_recommendation",
+          "optionalArtifact": "message-validation.md"
         }
       ],
-      "requiredArtifacts": [
-        "brief.md",
-        "lead-review.md",
-        "lead-sample.json"
-      ],
+      "requiredArtifacts": [],
       "producesArtifacts": [
         "message-validation.md"
       ],
       "allowedTools": [
+        "get_subskill_prompt",
         "get_subskill_asset",
         "AskUserQuestion",
         "request_user_input"
       ],
       "toolRules": [
-        "Before writing message-validation.md, message-review.md, or a message-review AskUserQuestion, the current run must either execute inside the post-find-leads-message-scout agent that carries the campaign-launch message rules in its prompt or load get_subskill_asset({ subskillName: \"create-campaign-v2\", assetPath: \"references/message-review-safety-gate.md\" }) in the parent-thread fallback.",
-        "Lead Sample Basis must cite rows from lead-sample.json produced by find-leads. lead-filter.md only gates those rows; it is not a source for a new sample.",
-        "Do not hand-write message-validation.md from message-prep.md, message-candidate-drafts.md, or general campaign knowledge.",
-        "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."
+        "Before writing message-validation.md, message-review.md, or a message-review AskUserQuestion, load the full get_subskill_prompt({ subskillName: \"generate-messages\" }) prompt and draft from campaignBrief, selected source state, selectedLeadListId, and imported review-batch rows.",
+        "Do not use brief.md, lead-review.md, or lead-sample.json as required live state; those files are optional debug context only.",
+        "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."
       ],
       "doNotAllow": [
         "create_campaign",
@@ -1445,6 +1668,8 @@
       "interruptOnly": true,
       "requiredCampaignState": [
         "campaignId",
+        "campaignBrief",
+        "selectedLeadListId",
         "workflowTableId"
       ]
     },
@@ -1455,15 +1680,18 @@
       "resumeOnly": false,
       "onEnter": [
         {
-          "action": "read_draft_artifacts",
-          "requiredFiles": [
-            "brief.md",
-            "lead-review.md",
-            "lead-sample.json",
-            "lead-filter.md",
-            "message-validation.md"
+          "action": "read_live_message_recommendation",
+          "requiredState": [
+            "campaignBrief",
+            "selected source state",
+            "selectedLeadListId",
+            "workflowTableId",
+            "saved filters when filters are enabled",
+            "template recommendation with token fill rules and rendered sample"
           ],
-          "optionalFiles": [
+          "optionalDebugFiles": [
+            "lead-filter.md",
+            "message-validation.md",
             "message-prep.md",
             "message-candidate-drafts.md"
           ]
@@ -1582,13 +1810,12 @@
           "requires": [
             "campaignId",
             "message-review-decision.md",
-            "message-validation.md",
-            "lead-filter.md"
+            "approved template recommendation",
+            "saved filters 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 +1823,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 +1875,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 +2160,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 +2251,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 +2263,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 +2375,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 +2447,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 +2458,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 +2508,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": [