@sellable/mcp 0.1.510 → 0.1.511

package/dist/tools/refill-sends.js

@@ -1,6 +1,5 @@
 import { getApi, SellableApiError } from "../api.js";
 import { startPrepareCampaignMessages } from "./campaign-message-preparation.js";
-import { startCampaign } from "./campaigns.js";
 import { confirmLeadList, importLeads, searchSignals, selectPromisingPosts, } from "./leads.js";
 import { markProviderPromptLoaded } from "./provider-preflight.js";
 import { getRefillTargetPlan } from "./refill-target-plan.js";
@@ -12,8 +11,6 @@ const PAID_INMAIL_REFRESH_RETRY_DELAY_MS = Number(process.env.SELLABLE_MCP_PAID_
 const SIGNAL_DISCOVERY_MIN_REFILL_POSTS = 3;
 const SIGNAL_DISCOVERY_MAX_REFILL_POSTS = 10;
 const SIGNAL_DISCOVERY_TARGET_ROWS_PER_POST = 150;
-const YOLO_MAX_ACTIONS = Math.max(1, Math.floor(Number(process.env.SELLABLE_MCP_REFILL_YOLO_MAX_ACTIONS ?? "24")));
-const YOLO_SCHEDULER_POLL_DELAY_MS = Math.max(0, Math.floor(Number(process.env.SELLABLE_MCP_REFILL_YOLO_POLL_DELAY_MS ?? "0")));
 function normalizeStrings(values) {
     if (!Array.isArray(values))
         return [];
@@ -90,7 +87,7 @@ function userAddedRowsLimitPayloadFromError(error) {
 export const refillSendsToolDefinitions = [
     {
         name: "refill_sends",
-        description: "Typed command entrypoint for Sellable refill sends. Accepts --yolo semantics and optional sender selectors, then returns the bounded execution contract for the skill-led refill workflow. In --yolo, it may refresh stale paid InMail credit cache facts once, then run a bounded loop of safe primitives from target.globalActionQueue[0] (start exact selected paused campaign, bounded existing-row preparation, bounded same-source copy, bounded generated-message approval, safe Signal Discovery continuation, or read-only scheduler wait) with a fresh target-plan reread after each primitive. It does not run unbounded approval, lower paid InMail thresholds, switch source families outside the selected packet, create campaigns, schedule sends, archive, delete, or write scheduler rows.",
+        description: "Typed command entrypoint for Sellable refill sends. Accepts --yolo semantics and optional sender selectors, then returns the bounded execution contract for the skill-led refill workflow. In --yolo, it may refresh stale paid InMail credit cache facts once, or execute exactly one safe primitive from target.globalActionQueue[0] (bounded existing-row preparation, bounded same-source copy, bounded generated-message approval, or read-only wait) and reread. It does not run unbounded approval, lower paid InMail thresholds, switch source families, create campaigns, schedule sends, launch, archive, delete, or write scheduler rows.",
         inputSchema: {
             type: "object",
             properties: {
@@ -191,6 +188,10 @@ export function refillSendsCommand(input = {}) {
         tool: "refill_sends",
         promptName: "refill-sends",
         workflowPromptName: "refill-sends-workflow",
+        workflowAsset: {
+            subskillName: "refill-sends-workflow",
+            assetPath: "core/flow.v1.json",
+        },
         yolo,
         executionMode,
         workspaceId,
@@ -232,6 +233,7 @@ export function refillSendsCommand(input = {}) {
         },
         firstOperationalSteps: [
             'Load get_subskill_prompt({ subskillName: "refill-sends-workflow" }) before any product operation.',
+            'Load get_subskill_asset({ subskillName: "refill-sends-workflow", assetPath: "core/flow.v1.json" }) before any product operation; continue chunks until hasMore is false, parse JSON, and verify workflow:"refill-sends-workflow" with a v1 version.',
             "A skill cannot create or invoke /goal by itself. If this refill is already running inside an active Codex goal, keep that goal open until every selected sender lane is horizon-filled by projected coverage (sent + scheduled), Christian explicitly stops/statuses the run, or a concrete non-scheduler blocker appears.",
             `Call get_refill_target_plan({ intent: "${intent}"${workspaceId ? `, workspaceId: "${workspaceId}"` : ""}${input.campaignId ? `, campaignId: "${input.campaignId}"` : ""}${input.tableId ? `, tableId: "${input.tableId}"` : ""}${senderIds.length > 0 ? `, senderIds: ${JSON.stringify(senderIds)}` : ""}${senderNames.length > 0
                 ? `, senderNames: ${JSON.stringify(senderNames)}`
@@ -264,14 +266,14 @@ export function refillSendsCommand(input = {}) {
             "Fresh reread get_campaign_refill_state immediately before any import, prep, approval, or horizon-fill mutation.",
             "Maintain a target-window saturation ledger per selected sender from get_refill_target_plan: selected days, gross capacity, actual sent counts, future scheduler-owned scheduled counts, projected counts, ready-to-schedule buffer, remaining projected gap, paid InMail threshold feasibility, targetShapeRevision, stateRevision, and next MCP primitive.",
             "In --yolo, this tool automatically maintains a run-local refreshedPaidInmailSenderIds set: when the first target plan returns refresh_paid_inmail_credits candidates for selected paid-InMail lanes, it refreshes each exact sender at most once, reruns get_refill_target_plan, and returns the post-refresh targetPlan before any prep/source-copy/bounded-approval/read-only wait action is chosen.",
+            "Freshness gate precedes scheduler wait: if any selected target.senderRefillPlans[].paidInmail.status is missing_credit_facts or stale_credit_facts, or the target plan contains refresh_paid_inmail_credits, do not enter wait_for_scheduler even when remainingReadyOrProjectedGap is 0; refresh exact sender credit facts once, reread get_refill_target_plan, then choose scheduler wait only if freshness is clean.",
             "Do not present paid-credit refresh as the next operator action after refill_sends returns autoPaidInmailRefresh and the post-refresh targetPlan.",
             "If paid InMail feasibility remains below threshold after that automatic refresh, report the exact sender/campaign/table/column threshold action or same-campaign connection fallback; --yolo must not lower paid InMail thresholds or create campaigns.",
             "In --yolo or after one Accept, continue through every safe selected sender/campaign action covered by the rendered target packet; sent/scheduled-count progress changes stateRevision and should continue while targetShapeRevision is stable.",
-            "A start_paused_campaign action is safe in --yolo only when it is target.globalActionQueue[0] for the exact selected PAUSED campaign in the current refill target plan and the request has explicit workspaceId.",
             "Do not complete a fill/schedule request until a final get_refill_target_plan or refill-state reread proves projected coverage (sent + scheduled) fills the scheduler-forward target window. Treat awaiting_scheduler_after_ready_buffer as loaded, awaiting scheduler when ready buffer covers the gap; do not import/prep more rows in that state, and keep polling unless Christian stops/statuses the run or a concrete non-scheduler blocker such as paid_inmail_below_threshold appears.",
         ],
         approvalContract: yolo
-            ? "Auto-accept only the rendered bounded refill target packet after get_refill_target_plan and fresh reread. Execute one globally ranked primitive from target.globalActionQueue at a time, then rerun get_refill_target_plan before taking another action. Continue through every safe prep/source-copy/bounded-approval/start exact selected paused campaign/safe same-source continuation/read-only wait action inside that packet. Unbounded approval, source-family switches outside the selected packet, threshold changes, and campaign creation require their own explicit gates. After each safe action, rerun get_refill_target_plan; keep going while targetShapeRevision is stable and projected coverage (sent + scheduled) progresses toward the target, even though stateRevision changes. Ready-to-schedule rows are buffer, not completion. If ready buffer covers the projected gap, use only persistent read-only scheduler wait/reread and keep the run open until projected coverage fills or Christian stops/statuses it. Stop immediately if targetShapeRevision changes because sender set, route, ids, caps, dates, blockers, action class, paid InMail threshold feasibility, or side-effect class drifts. --yolo does not authorize lowering paid InMail thresholds or creating connection campaigns."
+            ? "Auto-accept only the rendered bounded refill target packet after get_refill_target_plan and fresh reread. Execute one globally ranked primitive from target.globalActionQueue at a time, then rerun get_refill_target_plan before taking another action. Continue through every safe prep/source-copy/bounded-approval/read-only wait action inside that packet. Unbounded approval, start_campaign, source-family switches, threshold changes, and campaign creation require their own explicit gates. After each safe action, rerun get_refill_target_plan; keep going while targetShapeRevision is stable and projected coverage (sent + scheduled) progresses toward the target, even though stateRevision changes. Ready-to-schedule rows are buffer, not completion. If ready buffer covers the projected gap, use only persistent read-only scheduler wait/reread and keep the run open until projected coverage fills or Christian stops/statuses it. Stop immediately if targetShapeRevision changes because sender set, route, ids, caps, dates, blockers, action class, paid InMail threshold feasibility, or side-effect class drifts. --yolo does not authorize lowering paid InMail thresholds or creating connection campaigns."
             : hasSenderSelectors
                 ? "Before mutation, post the full bounded refill packet in normal chat as Markdown, including workspace, sender scope, campaign table, exact ids, caps/dates, gross target, sent count, scheduled count, projected count, ready buffer, remaining projected gap, paid InMail threshold feasibility, targetShapeRevision/stateRevision, side effects, forbidden actions, and stop condition. Then ask the final Accept/Decline structured approval question with a compact body that refers back to the posted packet instead of duplicating it. Only ask when get_refill_target_plan reports a positive remaining projected/ready gap. If target is complete by projected coverage, no-op without approval. If ready buffer covers the projected gap, run only persistent read-only scheduler wait/reread and keep the run open until projected coverage fills or Christian stops/statuses it. Threshold changes and campaign creation need separate explicit approval."
                 : "Ask which eligible enrolled senders to refill first, then, before mutation, post the full bounded refill packet in normal chat as Markdown and ask the final Accept/Decline structured approval question with a compact body that refers back to the posted packet.",
@@ -409,6 +411,35 @@ function paidRefreshActionFrom(value) {
         action,
     };
 }
+function targetPlanFingerprint(plan) {
+    const root = recordValue(plan);
+    return {
+        targetRevision: stringValue(root?.targetRevision) ?? null,
+        targetShapeRevision: stringValue(root?.targetShapeRevision) ?? null,
+        stateRevision: stringValue(root?.stateRevision) ?? null,
+        generatedAt: stringValue(root?.generatedAt) ?? null,
+    };
+}
+function paidRefreshApprovalPacket(params) {
+    const action = params.action.action ?? {};
+    const ids = actionIds(action);
+    const threshold = numberValue(action.oldThreshold) ?? numberValue(action.threshold);
+    return {
+        approvalSource: "explicit_yolo_flag",
+        workspaceId: params.workspaceId ?? null,
+        senderId: params.action.senderId,
+        actionKey: params.action.actionKey ?? null,
+        actionType: stringValue(action.actionType),
+        campaignId: stringValue(ids.campaignId) ?? stringValue(action.campaignId) ?? null,
+        tableId: stringValue(ids.tableId) ?? stringValue(action.tableId) ?? null,
+        columnId: stringValue(ids.columnId) ?? stringValue(action.columnId) ?? null,
+        threshold: threshold ?? null,
+        maxStalenessSeconds: numberValue(action.maxStalenessSeconds) ??
+            numberValue(action.paidInmailCreditsMaxStalenessSeconds) ??
+            null,
+        targetPlanFingerprint: targetPlanFingerprint(params.targetPlan),
+    };
+}
 function collectPaidInmailRefreshActions(plan) {
     const root = recordValue(plan);
     const target = recordValue(root?.target);
@@ -429,6 +460,35 @@ function collectPaidInmailRefreshActions(plan) {
             : [];
         for (const action of nextActions)
             add(action);
+        const paidInmail = recordValue(planRecord?.paidInmail);
+        const paidStatus = stringValue(paidInmail?.status);
+        const senderId = stringValue(planRecord?.senderId) ?? stringValue(paidInmail?.senderId);
+        if (senderId &&
+            (paidStatus === "missing_credit_facts" ||
+                paidStatus === "stale_credit_facts")) {
+            add({
+                type: "refresh_paid_inmail_credits",
+                actionKey: [
+                    "refresh_paid_inmail_credits",
+                    senderId,
+                    stringValue(paidInmail?.campaignId) ?? "unknown",
+                    stringValue(paidInmail?.columnId) ?? "unknown",
+                ].join(":"),
+                actionType: "send_inmail_closed",
+                senderId,
+                campaignId: stringValue(paidInmail?.campaignId) ?? undefined,
+                tableId: stringValue(paidInmail?.tableId) ?? undefined,
+                columnId: stringValue(paidInmail?.columnId) ?? undefined,
+                oldThreshold: numberValue(paidInmail?.threshold) ?? undefined,
+                maxStalenessSeconds: numberValue(paidInmail?.maxStalenessSeconds) ?? undefined,
+                ids: {
+                    senderId,
+                    campaignId: stringValue(paidInmail?.campaignId) ?? undefined,
+                    tableId: stringValue(paidInmail?.tableId) ?? undefined,
+                    columnId: stringValue(paidInmail?.columnId) ?? undefined,
+                },
+            });
+        }
     }
     const globalActionQueue = Array.isArray(target?.globalActionQueue)
         ? target.globalActionQueue
@@ -451,65 +511,6 @@ function firstGlobalAction(plan) {
     const [first] = globalActionQueue;
     return recordValue(first);
 }
-function planTarget(plan) {
-    return recordValue(recordValue(plan)?.target);
-}
-function planStatus(plan) {
-    return stringValue(recordValue(plan)?.status);
-}
-function planTargetShapeRevision(plan) {
-    const root = recordValue(plan);
-    return (stringValue(root?.targetShapeRevision) ?? stringValue(root?.targetRevision));
-}
-function planStateRevision(plan) {
-    return stringValue(recordValue(plan)?.stateRevision);
-}
-function planSummary(plan) {
-    const target = planTarget(plan);
-    const senderPlans = Array.isArray(target?.senderRefillPlans)
-        ? target.senderRefillPlans
-        : [];
-    const firstSenderPlan = recordValue(senderPlans[0]);
-    return {
-        status: planStatus(plan),
-        targetShapeRevision: planTargetShapeRevision(plan),
-        stateRevision: planStateRevision(plan),
-        grossTarget: numberValue(target?.grossTarget),
-        sent: numberValue(target?.sent),
-        scheduled: numberValue(target?.scheduled),
-        projected: numberValue(target?.projected),
-        readyBuffer: numberValue(target?.readyBuffer),
-        remainingProjectedGap: numberValue(target?.remainingProjectedGap),
-        remainingReadyOrProjectedGap: numberValue(target?.remainingReadyOrProjectedGap),
-        actionType: stringValue(firstSenderPlan?.actionType),
-    };
-}
-function planIsComplete(plan) {
-    const summary = planSummary(plan);
-    return summary.status === "complete" || summary.remainingProjectedGap === 0;
-}
-function yoloLoopExecution(params) {
-    const lastAction = params.actions[params.actions.length - 1];
-    return {
-        enabled: true,
-        status: params.status,
-        stopReason: params.stopReason,
-        selectedAction: params.selectedAction ??
-            params.actions[0]?.selectedAction ??
-            firstGlobalAction(params.initialPlan),
-        actions: params.actions,
-        actionCount: params.actions.length,
-        result: params.result ?? lastAction?.primitive.result,
-        targetPlanReread: params.targetPlanRereads > 0,
-        targetPlanRereads: params.targetPlanRereads,
-        initialTargetShapeRevision: planTargetShapeRevision(params.initialPlan),
-        finalTargetShapeRevision: planTargetShapeRevision(params.finalPlan),
-        finalStateRevision: planStateRevision(params.finalPlan),
-        maxActions: YOLO_MAX_ACTIONS,
-        refusalReason: params.refusalReason ?? lastAction?.primitive.refusalReason,
-        postActionFirstAction: firstGlobalAction(params.finalPlan),
-    };
-}
 function actionIds(action) {
     return recordValue(action.ids) ?? {};
 }
@@ -657,16 +658,13 @@ async function approveGeneratedMessagesBatch(action, workspaceId) {
     }
     const api = getApi();
     const requestOptions = workspaceRequestOptions(workspaceId);
-    const body = {
+    const result = await api.post("/api/v3/workflow-tables/cells/approve-batch", {
         tableId,
         ...(columnId ? { columnId } : {}),
         limit,
         scope: "generated_unapproved",
         ...(workspaceId ? { workspaceId } : {}),
-    };
-    const result = requestOptions
-        ? await api.post("/api/v3/workflow-tables/cells/approve-batch", body, requestOptions)
-        : await api.post("/api/v3/workflow-tables/cells/approve-batch", body);
+    }, requestOptions);
     return { status: "executed_and_reread", result };
 }
 async function continueSignalDiscoverySource(action, workspaceId) {
@@ -674,7 +672,6 @@ async function continueSignalDiscoverySource(action, workspaceId) {
     const sourceLeadListId = actionSourceLeadListId(action);
     const sourceFingerprint = actionSourceFingerprint(action);
     const toolInput = actionToolInput(action);
-    const requestOptions = workspaceRequestOptions(workspaceId);
     const sourceRowLimit = Math.min(1500, Math.max(100, Math.floor(numberValue(toolInput.sourceRowLimit) ??
         numberValue(toolInput.targetRows) ??
         numberValue(action.targetRows) ??
@@ -696,9 +693,8 @@ async function continueSignalDiscoverySource(action, workspaceId) {
         };
     }
     const api = getApi();
-    const campaign = requestOptions
-        ? await api.get(`/api/v2/campaign-offers/${campaignOfferId}`, requestOptions)
-        : await api.get(`/api/v2/campaign-offers/${campaignOfferId}`);
+    const requestOptions = workspaceRequestOptions(workspaceId);
+    const campaign = await api.get(`/api/v2/campaign-offers/${campaignOfferId}`, requestOptions);
     if (campaign.leadSourceProvider !== "signal-discovery" &&
         campaign.leadSourceProvider !== "campaign-tracked-post") {
         return {
@@ -713,16 +709,12 @@ async function continueSignalDiscoverySource(action, workspaceId) {
             refusalReason: "campaign selectedLeadListId changed since the plan packet; rerun get_refill_target_plan before source continuation",
         };
     }
-    const sourceMeta = requestOptions
-        ? await api.get(`/api/v3/workflow-tables/${sourceLeadListId}?mode=meta`, requestOptions)
-        : await api.get(`/api/v3/workflow-tables/${sourceLeadListId}?mode=meta`);
+    const sourceMeta = await api.get(`/api/v3/workflow-tables/${sourceLeadListId}?mode=meta`, requestOptions);
     const sourceConfig = sourceMeta.table?.config ?? null;
     const headlineICPCriteria = stringArray(sourceConfig?.headlineICPCriteria).length > 0
         ? stringArray(sourceConfig?.headlineICPCriteria)
         : stringArray(sourceConfig?.rubricGuidelines);
-    const tabsResponse = requestOptions
-        ? await api.get(`/api/v3/campaigns/${campaignOfferId}/signal-discovery/tabs`, requestOptions)
-        : await api.get(`/api/v3/campaigns/${campaignOfferId}/signal-discovery/tabs`);
+    const tabsResponse = await api.get(`/api/v3/campaigns/${campaignOfferId}/signal-discovery/tabs`, requestOptions);
     const signalTabs = tabsResponse.tabs ?? [];
     const keywords = keywordsFromSignalTabs(signalTabs);
     const excludedPostIds = selectedPostIdsFromSignalTabs(signalTabs);
@@ -738,7 +730,6 @@ async function continueSignalDiscoverySource(action, workspaceId) {
     });
     const searchSummary = await searchSignals({
         type: "keywords",
-        ...(workspaceId ? { workspaceId } : {}),
         keywords: keywords.map((keyword) => ({
             keyword,
             source: "refill-sends-source-continuation",
@@ -749,6 +740,7 @@ async function continueSignalDiscoverySource(action, workspaceId) {
         rubricGuidelines: headlineICPCriteria,
         confirmed: true,
         limit: 50,
+        ...(workspaceId ? { workspaceId } : {}),
     });
     const selectedPostIds = postIdsFromSignalSearch(searchSummary, maxPostsToScrape, { excludePostIds: excludedPostIds });
     if (selectedPostIds.length === 0) {
@@ -760,7 +752,6 @@ async function continueSignalDiscoverySource(action, workspaceId) {
     }
     const selectionResult = await selectPromisingPosts({
         campaignOfferId,
-        ...(workspaceId ? { workspaceId } : {}),
         selections: selectedPostIds.map((postId) => ({
             postId,
             reason: "refill_sends same-source continuation: recent post from the campaign's existing Signal Discovery keyword family",
@@ -769,6 +760,7 @@ async function continueSignalDiscoverySource(action, workspaceId) {
         currentStep: null,
         selectionMode: "replace",
         scrapePlanMode: "all-selected",
+        ...(workspaceId ? { workspaceId } : {}),
     });
     if (selectionResult.success === false) {
         return {
@@ -780,7 +772,6 @@ async function continueSignalDiscoverySource(action, workspaceId) {
     }
     const importResult = await importLeads({
         campaignOfferId,
-        ...(workspaceId ? { workspaceId } : {}),
         provider: "signal-discovery",
         sourceLeadListId,
         currentStep: null,
@@ -789,6 +780,7 @@ async function continueSignalDiscoverySource(action, workspaceId) {
         confirmed: true,
         maxPostsToScrape: selectedPostIds.length,
         allowInvalidSignalPosts: true,
+        ...(workspaceId ? { workspaceId } : {}),
     });
     const importRecord = recordValue(importResult);
     if (importRecord?.error) {
@@ -829,7 +821,7 @@ async function refreshPaidInmailCreditsWithRetry(senderId, workspaceId) {
         try {
             const receipt = await refreshPaidInmailCredits({
                 senderId,
-                ...(workspaceId ? { workspaceId } : {}),
+                workspaceId,
             });
             return { receipt, attempts: attempt, errors };
         }
@@ -846,7 +838,7 @@ async function refreshPaidInmailCreditsWithRetry(senderId, workspaceId) {
         errors,
     };
 }
-async function executeOneYoloPrimitive(action, context = {}) {
+async function executeOneYoloPrimitive(action, workspaceId) {
     if (!action)
         return { status: "no_action" };
     if (action.yoloEligible === false) {
@@ -878,7 +870,7 @@ async function executeOneYoloPrimitive(action, context = {}) {
             const result = await startPrepareCampaignMessages({
                 campaignId,
                 tableId,
-                workspaceId: context.workspaceId,
+                ...(workspaceId ? { workspaceId } : {}),
                 targetPreparedMessages,
                 maxRowsToCheck: numberValue(toolInput.maxRowsToCheck) ?? 300,
                 approvalMode,
@@ -921,10 +913,10 @@ async function executeOneYoloPrimitive(action, context = {}) {
             }
             const copyInput = {
                 campaignOfferId,
-                workspaceId: context.workspaceId,
                 sourceLeadListId,
                 currentStep: null,
                 confirmed: true,
+                ...(workspaceId ? { workspaceId } : {}),
                 sourceRowIds: sourceRowIds.length > 0 ? sourceRowIds : undefined,
                 sourceRowLimit: sourceRowIds.length > 0 ? undefined : (sourceRowLimit ?? undefined),
                 reviewBatchLimit: sourceRowIds.length > 0
@@ -995,23 +987,9 @@ async function executeOneYoloPrimitive(action, context = {}) {
             return { status: "executed_and_reread", result };
         }
         case "continue_signal_discovery_source":
-            return continueSignalDiscoverySource(action, context.workspaceId);
+            return continueSignalDiscoverySource(action, workspaceId);
         case "approve_messages":
-            return approveGeneratedMessagesBatch(action, context.workspaceId);
-        case "start_paused_campaign": {
-            const campaignId = actionCampaignId(action);
-            if (!campaignId || !context.workspaceId) {
-                return {
-                    status: "refused",
-                    refusalReason: "start_paused_campaign action is missing campaignId or explicit workspaceId",
-                };
-            }
-            const result = await startCampaign({
-                campaignId,
-                workspaceId: context.workspaceId,
-            });
-            return { status: "executed_and_reread", result };
-        }
+            return approveGeneratedMessagesBatch(action, workspaceId);
         default:
             return {
                 status: "refused",
@@ -1019,154 +997,6 @@ async function executeOneYoloPrimitive(action, context = {}) {
             };
     }
 }
-async function executeYoloPrimitiveLoop(params) {
-    let currentPlan = params.initialPlan;
-    const actions = [];
-    let targetPlanRereads = 0;
-    let targetPlanBeforeYoloPrimitive = null;
-    const initialTargetShapeRevision = planTargetShapeRevision(currentPlan);
-    if (planIsComplete(currentPlan)) {
-        return {
-            finalTargetPlan: currentPlan,
-            targetPlanBeforeYoloPrimitive: null,
-            execution: yoloLoopExecution({
-                status: "complete",
-                stopReason: "target_complete",
-                actions,
-                targetPlanRereads,
-                initialPlan: params.initialPlan,
-                finalPlan: currentPlan,
-            }),
-        };
-    }
-    for (let attempt = 1; attempt <= YOLO_MAX_ACTIONS; attempt += 1) {
-        const selectedAction = firstGlobalAction(currentPlan);
-        if (!selectedAction) {
-            return {
-                finalTargetPlan: currentPlan,
-                targetPlanBeforeYoloPrimitive,
-                execution: yoloLoopExecution({
-                    status: "no_action",
-                    stopReason: "no_global_action",
-                    actions,
-                    targetPlanRereads,
-                    initialPlan: params.initialPlan,
-                    finalPlan: currentPlan,
-                    selectedAction: null,
-                }),
-            };
-        }
-        const before = planSummary(currentPlan);
-        if (!targetPlanBeforeYoloPrimitive) {
-            targetPlanBeforeYoloPrimitive = currentPlan;
-        }
-        if (selectedAction.type === "wait_for_scheduler" &&
-            YOLO_SCHEDULER_POLL_DELAY_MS > 0) {
-            await sleep(YOLO_SCHEDULER_POLL_DELAY_MS);
-        }
-        const primitive = await executeOneYoloPrimitive(selectedAction, {
-            workspaceId: params.workspaceId,
-        });
-        const shouldReread = primitive.status === "executed_and_reread" ||
-            primitive.status === "read_only_reread";
-        const nextPlan = shouldReread
-            ? await getRefillTargetPlan(params.targetPlanInput)
-            : null;
-        if (shouldReread)
-            targetPlanRereads += 1;
-        const receipt = {
-            attempt,
-            selectedAction,
-            before,
-            primitive,
-            after: nextPlan ? planSummary(nextPlan) : null,
-            postActionFirstAction: nextPlan ? firstGlobalAction(nextPlan) : null,
-        };
-        actions.push(receipt);
-        if (primitive.status === "refused") {
-            return {
-                finalTargetPlan: currentPlan,
-                targetPlanBeforeYoloPrimitive,
-                execution: yoloLoopExecution({
-                    status: "refused",
-                    stopReason: "primitive_refused",
-                    actions,
-                    targetPlanRereads,
-                    initialPlan: params.initialPlan,
-                    finalPlan: currentPlan,
-                    selectedAction,
-                    result: primitive.result,
-                    refusalReason: primitive.refusalReason,
-                }),
-            };
-        }
-        if (!nextPlan) {
-            return {
-                finalTargetPlan: currentPlan,
-                targetPlanBeforeYoloPrimitive,
-                execution: yoloLoopExecution({
-                    status: primitive.status,
-                    stopReason: "no_global_action",
-                    actions,
-                    targetPlanRereads,
-                    initialPlan: params.initialPlan,
-                    finalPlan: currentPlan,
-                    selectedAction,
-                    result: primitive.result,
-                }),
-            };
-        }
-        currentPlan = nextPlan;
-        const nextTargetShapeRevision = planTargetShapeRevision(currentPlan);
-        if (initialTargetShapeRevision &&
-            nextTargetShapeRevision &&
-            nextTargetShapeRevision !== initialTargetShapeRevision &&
-            !planIsComplete(currentPlan)) {
-            return {
-                finalTargetPlan: currentPlan,
-                targetPlanBeforeYoloPrimitive,
-                execution: yoloLoopExecution({
-                    status: "target_shape_drift",
-                    stopReason: "target_shape_drift",
-                    actions,
-                    targetPlanRereads,
-                    initialPlan: params.initialPlan,
-                    finalPlan: currentPlan,
-                    selectedAction,
-                    result: primitive.result,
-                }),
-            };
-        }
-        if (planIsComplete(currentPlan)) {
-            return {
-                finalTargetPlan: currentPlan,
-                targetPlanBeforeYoloPrimitive,
-                execution: yoloLoopExecution({
-                    status: "complete",
-                    stopReason: "target_complete",
-                    actions,
-                    targetPlanRereads,
-                    initialPlan: params.initialPlan,
-                    finalPlan: currentPlan,
-                    selectedAction,
-                    result: primitive.result,
-                }),
-            };
-        }
-    }
-    return {
-        finalTargetPlan: currentPlan,
-        targetPlanBeforeYoloPrimitive,
-        execution: yoloLoopExecution({
-            status: "max_actions_reached",
-            stopReason: "max_actions_reached",
-            actions,
-            targetPlanRereads,
-            initialPlan: params.initialPlan,
-            finalPlan: currentPlan,
-        }),
-    };
-}
 export async function executeRefillSendsCommand(input = {}) {
     const yolo = input.yolo === true;
     const executionMode = input.executionMode ?? (yolo ? "yolo" : "manual");
@@ -1213,7 +1043,23 @@ export async function executeRefillSendsCommand(input = {}) {
     const failedPaidInmailRefreshes = [];
     const refreshReceipts = [];
     for (const action of refreshActions) {
-        const refreshResult = await refreshPaidInmailCreditsWithRetry(action.senderId, workspaceId ?? undefined);
+        const approvalPacket = paidRefreshApprovalPacket({
+            action,
+            workspaceId,
+            targetPlan: targetPlanBeforePaidRefresh,
+        });
+        if (!workspaceId) {
+            failedPaidInmailRefreshes.push({
+                senderId: action.senderId,
+                attempts: 0,
+                error: "workspaceId is required before refreshing paid InMail credit facts.",
+                errors: [
+                    "workspaceId is required before refreshing paid InMail credit facts.",
+                ],
+            });
+            continue;
+        }
+        const refreshResult = await refreshPaidInmailCreditsWithRetry(action.senderId, workspaceId);
         if (refreshResult.receipt) {
             refreshedPaidInmailSenderIds.push(action.senderId);
             refreshReceipts.push({
@@ -1221,6 +1067,8 @@ export async function executeRefillSendsCommand(input = {}) {
                 actionKey: action.actionKey ?? null,
                 attempts: refreshResult.attempts,
                 retryErrors: refreshResult.errors,
+                approvalSource: "explicit_yolo_flag",
+                approvalPacket,
                 receipt: refreshResult.receipt,
             });
         }
@@ -1237,17 +1085,21 @@ export async function executeRefillSendsCommand(input = {}) {
     const targetPlan = refreshActions.length > 0
         ? await getRefillTargetPlan(targetPlanInput)
         : targetPlanBeforePaidRefresh;
-    const yoloLoop = await executeYoloPrimitiveLoop({
-        initialPlan: targetPlan,
-        targetPlanInput,
-        workspaceId: workspaceId ?? undefined,
-    });
-    const finalTargetPlan = yoloLoop.finalTargetPlan;
+    const selectedAction = refreshActions.length > 0 ? null : firstGlobalAction(targetPlan);
+    const primitiveAttempt = refreshActions.length > 0
+        ? null
+        : await executeOneYoloPrimitive(selectedAction, workspaceId ?? undefined);
+    const shouldRereadAfterPrimitive = primitiveAttempt?.status === "executed_and_reread" ||
+        primitiveAttempt?.status === "read_only_reread";
+    const postActionTargetPlan = shouldRereadAfterPrimitive
+        ? await getRefillTargetPlan(targetPlanInput)
+        : null;
+    const finalTargetPlan = postActionTargetPlan ?? targetPlan;
     return {
         ...command,
         targetPlan: finalTargetPlan,
         targetPlanBeforePaidRefresh: refreshActions.length > 0 ? targetPlanBeforePaidRefresh : null,
-        targetPlanBeforeYoloPrimitive: yoloLoop.targetPlanBeforeYoloPrimitive,
+        targetPlanBeforeYoloPrimitive: refreshActions.length === 0 && postActionTargetPlan ? targetPlan : null,
         autoPaidInmailRefresh: {
             enabled: true,
             status: refreshActions.length === 0
@@ -1263,9 +1115,26 @@ export async function executeRefillSendsCommand(input = {}) {
             workspaceId,
             workspaceResolution: workspaceId ? "explicit" : "active_config",
             note: refreshActions.length > 0
-                ? "refill_sends refreshed stale paid InMail credit facts internally with bounded retries, once per sender, reran the target plan, then continued the bounded yolo primitive loop from the post-refresh targetPlan."
+                ? "refill_sends refreshed stale paid InMail credit facts internally with bounded retries, once per sender, then returned the post-refresh targetPlan."
                 : "No stale or missing paid InMail credit refresh candidates were present in the initial target plan.",
         },
-        yoloExecution: yoloLoop.execution,
+        yoloExecution: refreshActions.length > 0
+            ? {
+                enabled: true,
+                status: "skipped_after_paid_refresh",
+                selectedAction: null,
+                targetPlanReread: true,
+            }
+            : {
+                enabled: true,
+                status: primitiveAttempt?.status ?? "no_action",
+                selectedAction,
+                result: primitiveAttempt?.result,
+                targetPlanReread: shouldRereadAfterPrimitive,
+                refusalReason: primitiveAttempt?.refusalReason,
+                postActionFirstAction: postActionTargetPlan
+                    ? firstGlobalAction(postActionTargetPlan)
+                    : null,
+            },
     };
 }