@sellable/mcp 0.1.725 → 0.1.727

package/dist/tools/refill-sends.d.ts

@@ -682,6 +682,22 @@ export declare function approvedPacketComparison(input: RefillSendsCommandInput,
     shapeChanged: boolean;
     actionChanged: boolean;
 };
+type ApproveDriftSettleResult = {
+    resolved: "proceed";
+    plan: unknown;
+    actionKey: string | null;
+} | {
+    resolved: "terminal";
+    plan: unknown;
+    comparison: ReturnType<typeof approvedPacketComparison>;
+};
+export declare function settleApprovedApproveDrift(params: {
+    input: RefillSendsCommandInput;
+    plan: unknown;
+    comparison: ReturnType<typeof approvedPacketComparison>;
+    delayMs?: number;
+    maxReads?: number;
+}): Promise<ApproveDriftSettleResult>;
 type RefillSenderSelectorMatch = {
     selector: string;
     senderId: string;
@@ -3127,117 +3143,6 @@ export declare function executeRefillSendsCommand(input?: RefillSendsCommandInpu
     workspaceResolution: string;
     intent: RefillSendsIntent;
 } | {
-    status: "blocked";
-    blocker: string;
-    guidance: string;
-    conflicts: string[];
-    runId: string | undefined;
-    readOnly: boolean;
-    forbiddenActions: string[];
-    boundedAuthority: string;
-    ok: boolean;
-    targetDate: string | null;
-    untilDate: string | null;
-    horizonSendDays: number | null;
-    fillWindow: {
-        mode: string;
-        targetDate: string;
-        description: string;
-        untilDate?: undefined;
-        horizonSendDays?: undefined;
-        horizonHours?: undefined;
-    } | {
-        mode: string;
-        untilDate: string;
-        description: string;
-        targetDate?: undefined;
-        horizonSendDays?: undefined;
-        horizonHours?: undefined;
-    } | {
-        mode: string;
-        horizonSendDays: number | null;
-        horizonHours: number | null;
-        description: string;
-        targetDate?: undefined;
-        untilDate?: undefined;
-    };
-    approvalMode: RefillSendsApprovalMode;
-    campaignId: string | null;
-    tableId: string | null;
-    targetConfig: RefillTargetConfigV1 | null;
-    runHandle: RefillRunHandleV1 | null;
-    reportingContext: RefillReportingContextV2 | null;
-    messageTemplateRevision: MessageTemplateRevisionV1 | null;
-    senderScope: string;
-    senderSelectors: {
-        senders: string[];
-        senderIds: string[];
-        senderNames: string[];
-    };
-    firstOperationalSteps: string[];
-    approvalContract: string;
-    hostExamples: {
-        claude: string[];
-        codex: string[];
-        mcpTool: {
-            name: string;
-            arguments: {
-                workspaceRunState?: Record<string, unknown> | undefined;
-                workspaceCoordinator?: boolean | undefined;
-                messageTemplateRevision?: MessageTemplateRevisionV1 | undefined;
-                reportingContext?: RefillReportingContextV2 | undefined;
-                targetConfig?: RefillTargetConfigV1 | undefined;
-                runHandle?: RefillRunHandleV1 | undefined;
-                fence?: number | undefined;
-                runId?: string | undefined;
-                expectedActionKey?: string | undefined;
-                expectedTargetShapeRevision?: string | undefined;
-                targetDate: string | null;
-                untilDate: string | null;
-                horizonSendDays: number | null;
-                campaignId: string | undefined;
-                tableId: string | undefined;
-                intent: RefillSendsIntent;
-                approvalMode: RefillSendsApprovalMode;
-                workspaceId: string | null;
-                actionTypes?: ("send_invite" | "send_inmail_closed")[] | undefined;
-                yolo: boolean;
-                senders: string[];
-                senderIds: string[];
-                senderNames: string[];
-            };
-        };
-    };
-    actionTypes?: ("send_invite" | "send_inmail_closed")[] | undefined;
-    command: string;
-    tool: string;
-    promptName: string;
-    workflowPromptName: string;
-    workflowAsset: {
-        subskillName: string;
-        assetPath: string;
-        expectedVersion: string;
-    };
-    yolo: boolean;
-    executionMode: RefillSendsExecutionMode;
-    workspaceId: string | null;
-    workspaceResolution: string;
-    intent: RefillSendsIntent;
-} | {
-    readOnly: boolean;
-    mode: string;
-    forbiddenActions: string[];
-    boundedAuthority: string;
-    blocker: string;
-    workspaceId: string;
-    guidance: string;
-    warnings: string[];
-    journalPath: string | null;
-    text: string;
-    workspaceResolution: string;
-    status?: undefined;
-    conflicts?: undefined;
-    runId?: undefined;
     ok: boolean;
     targetDate: string | null;
     untilDate: string | null;
@@ -3279,513 +3184,7 @@ export declare function executeRefillSendsCommand(input?: RefillSendsCommandInpu
     };
     firstOperationalSteps: string[];
     approvalContract: string;
-    hostExamples: {
-        claude: string[];
-        codex: string[];
-        mcpTool: {
-            name: string;
-            arguments: {
-                workspaceRunState?: Record<string, unknown> | undefined;
-                workspaceCoordinator?: boolean | undefined;
-                messageTemplateRevision?: MessageTemplateRevisionV1 | undefined;
-                reportingContext?: RefillReportingContextV2 | undefined;
-                targetConfig?: RefillTargetConfigV1 | undefined;
-                runHandle?: RefillRunHandleV1 | undefined;
-                fence?: number | undefined;
-                runId?: string | undefined;
-                expectedActionKey?: string | undefined;
-                expectedTargetShapeRevision?: string | undefined;
-                targetDate: string | null;
-                untilDate: string | null;
-                horizonSendDays: number | null;
-                campaignId: string | undefined;
-                tableId: string | undefined;
-                intent: RefillSendsIntent;
-                approvalMode: RefillSendsApprovalMode;
-                workspaceId: string | null;
-                actionTypes?: ("send_invite" | "send_inmail_closed")[] | undefined;
-                yolo: boolean;
-                senders: string[];
-                senderIds: string[];
-                senderNames: string[];
-            };
-        };
-    };
-    actionTypes?: ("send_invite" | "send_inmail_closed")[] | undefined;
-    command: string;
-    tool: string;
-    promptName: string;
-    workflowPromptName: string;
-    workflowAsset: {
-        subskillName: string;
-        assetPath: string;
-        expectedVersion: string;
-    };
-    yolo: boolean;
-    executionMode: RefillSendsExecutionMode;
-    intent: RefillSendsIntent;
-} | {
-    readOnly: boolean;
-    mode: string;
     forbiddenActions: string[];
-    boundedAuthority: string;
-    warnings: any[];
-    journalPath: string | null;
-    text: string;
-    workspaceId: string;
-    workspaceResolution: string;
-    blocker?: undefined;
-    guidance?: undefined;
-    status?: undefined;
-    conflicts?: undefined;
-    runId?: undefined;
-    ok: boolean;
-    targetDate: string | null;
-    untilDate: string | null;
-    horizonSendDays: number | null;
-    fillWindow: {
-        mode: string;
-        targetDate: string;
-        description: string;
-        untilDate?: undefined;
-        horizonSendDays?: undefined;
-        horizonHours?: undefined;
-    } | {
-        mode: string;
-        untilDate: string;
-        description: string;
-        targetDate?: undefined;
-        horizonSendDays?: undefined;
-        horizonHours?: undefined;
-    } | {
-        mode: string;
-        horizonSendDays: number | null;
-        horizonHours: number | null;
-        description: string;
-        targetDate?: undefined;
-        untilDate?: undefined;
-    };
-    approvalMode: RefillSendsApprovalMode;
-    campaignId: string | null;
-    tableId: string | null;
-    targetConfig: RefillTargetConfigV1 | null;
-    runHandle: RefillRunHandleV1 | null;
-    reportingContext: RefillReportingContextV2 | null;
-    messageTemplateRevision: MessageTemplateRevisionV1 | null;
-    senderScope: string;
-    senderSelectors: {
-        senders: string[];
-        senderIds: string[];
-        senderNames: string[];
-    };
-    firstOperationalSteps: string[];
-    approvalContract: string;
-    hostExamples: {
-        claude: string[];
-        codex: string[];
-        mcpTool: {
-            name: string;
-            arguments: {
-                workspaceRunState?: Record<string, unknown> | undefined;
-                workspaceCoordinator?: boolean | undefined;
-                messageTemplateRevision?: MessageTemplateRevisionV1 | undefined;
-                reportingContext?: RefillReportingContextV2 | undefined;
-                targetConfig?: RefillTargetConfigV1 | undefined;
-                runHandle?: RefillRunHandleV1 | undefined;
-                fence?: number | undefined;
-                runId?: string | undefined;
-                expectedActionKey?: string | undefined;
-                expectedTargetShapeRevision?: string | undefined;
-                targetDate: string | null;
-                untilDate: string | null;
-                horizonSendDays: number | null;
-                campaignId: string | undefined;
-                tableId: string | undefined;
-                intent: RefillSendsIntent;
-                approvalMode: RefillSendsApprovalMode;
-                workspaceId: string | null;
-                actionTypes?: ("send_invite" | "send_inmail_closed")[] | undefined;
-                yolo: boolean;
-                senders: string[];
-                senderIds: string[];
-                senderNames: string[];
-            };
-        };
-    };
-    actionTypes?: ("send_invite" | "send_inmail_closed")[] | undefined;
-    command: string;
-    tool: string;
-    promptName: string;
-    workflowPromptName: string;
-    workflowAsset: {
-        subskillName: string;
-        assetPath: string;
-        expectedVersion: string;
-    };
-    yolo: boolean;
-    executionMode: RefillSendsExecutionMode;
-    intent: RefillSendsIntent;
-} | {
-    runSnapshot: unknown;
-    readOnly: boolean;
-    forbiddenActions: string[];
-    boundedAuthority: string;
-    status: "dry_run";
-    plan: Record<string, unknown>;
-    blocker?: undefined;
-    guidance?: undefined;
-    conflicts?: undefined;
-    runId?: undefined;
-    ok: boolean;
-    targetDate: string | null;
-    untilDate: string | null;
-    horizonSendDays: number | null;
-    fillWindow: {
-        mode: string;
-        targetDate: string;
-        description: string;
-        untilDate?: undefined;
-        horizonSendDays?: undefined;
-        horizonHours?: undefined;
-    } | {
-        mode: string;
-        untilDate: string;
-        description: string;
-        targetDate?: undefined;
-        horizonSendDays?: undefined;
-        horizonHours?: undefined;
-    } | {
-        mode: string;
-        horizonSendDays: number | null;
-        horizonHours: number | null;
-        description: string;
-        targetDate?: undefined;
-        untilDate?: undefined;
-    };
-    approvalMode: RefillSendsApprovalMode;
-    campaignId: string | null;
-    tableId: string | null;
-    targetConfig: RefillTargetConfigV1 | null;
-    runHandle: RefillRunHandleV1 | null;
-    reportingContext: RefillReportingContextV2 | null;
-    messageTemplateRevision: MessageTemplateRevisionV1 | null;
-    senderScope: string;
-    senderSelectors: {
-        senders: string[];
-        senderIds: string[];
-        senderNames: string[];
-    };
-    firstOperationalSteps: string[];
-    approvalContract: string;
-    hostExamples: {
-        claude: string[];
-        codex: string[];
-        mcpTool: {
-            name: string;
-            arguments: {
-                workspaceRunState?: Record<string, unknown> | undefined;
-                workspaceCoordinator?: boolean | undefined;
-                messageTemplateRevision?: MessageTemplateRevisionV1 | undefined;
-                reportingContext?: RefillReportingContextV2 | undefined;
-                targetConfig?: RefillTargetConfigV1 | undefined;
-                runHandle?: RefillRunHandleV1 | undefined;
-                fence?: number | undefined;
-                runId?: string | undefined;
-                expectedActionKey?: string | undefined;
-                expectedTargetShapeRevision?: string | undefined;
-                targetDate: string | null;
-                untilDate: string | null;
-                horizonSendDays: number | null;
-                campaignId: string | undefined;
-                tableId: string | undefined;
-                intent: RefillSendsIntent;
-                approvalMode: RefillSendsApprovalMode;
-                workspaceId: string | null;
-                actionTypes?: ("send_invite" | "send_inmail_closed")[] | undefined;
-                yolo: boolean;
-                senders: string[];
-                senderIds: string[];
-                senderNames: string[];
-            };
-        };
-    };
-    actionTypes?: ("send_invite" | "send_inmail_closed")[] | undefined;
-    command: string;
-    tool: string;
-    promptName: string;
-    workflowPromptName: string;
-    workflowAsset: {
-        subskillName: string;
-        assetPath: string;
-        expectedVersion: string;
-    };
-    yolo: boolean;
-    executionMode: RefillSendsExecutionMode;
-    workspaceId: string | null;
-    workspaceResolution: string;
-    intent: RefillSendsIntent;
-} | {
-    runSnapshot: unknown;
-    readOnly: boolean;
-    forbiddenActions: string[];
-    boundedAuthority: string;
-    status: "in_progress";
-    runId: string;
-    fence: number;
-    gate: import("../refill-run-loop.js").RefillLoopGate;
-    guidance: string;
-    journalPath?: string | null;
-    targetConfig: RefillTargetConfigV1 | null;
-    runHandle: RefillRunHandleV1 | null;
-    refillReporting?: Record<string, unknown>;
-    blocker?: undefined;
-    conflicts?: undefined;
-    ok: boolean;
-    targetDate: string | null;
-    untilDate: string | null;
-    horizonSendDays: number | null;
-    fillWindow: {
-        mode: string;
-        targetDate: string;
-        description: string;
-        untilDate?: undefined;
-        horizonSendDays?: undefined;
-        horizonHours?: undefined;
-    } | {
-        mode: string;
-        untilDate: string;
-        description: string;
-        targetDate?: undefined;
-        horizonSendDays?: undefined;
-        horizonHours?: undefined;
-    } | {
-        mode: string;
-        horizonSendDays: number | null;
-        horizonHours: number | null;
-        description: string;
-        targetDate?: undefined;
-        untilDate?: undefined;
-    };
-    approvalMode: RefillSendsApprovalMode;
-    campaignId: string | null;
-    tableId: string | null;
-    reportingContext: RefillReportingContextV2 | null;
-    messageTemplateRevision: MessageTemplateRevisionV1 | null;
-    senderScope: string;
-    senderSelectors: {
-        senders: string[];
-        senderIds: string[];
-        senderNames: string[];
-    };
-    firstOperationalSteps: string[];
-    approvalContract: string;
-    hostExamples: {
-        claude: string[];
-        codex: string[];
-        mcpTool: {
-            name: string;
-            arguments: {
-                workspaceRunState?: Record<string, unknown> | undefined;
-                workspaceCoordinator?: boolean | undefined;
-                messageTemplateRevision?: MessageTemplateRevisionV1 | undefined;
-                reportingContext?: RefillReportingContextV2 | undefined;
-                targetConfig?: RefillTargetConfigV1 | undefined;
-                runHandle?: RefillRunHandleV1 | undefined;
-                fence?: number | undefined;
-                runId?: string | undefined;
-                expectedActionKey?: string | undefined;
-                expectedTargetShapeRevision?: string | undefined;
-                targetDate: string | null;
-                untilDate: string | null;
-                horizonSendDays: number | null;
-                campaignId: string | undefined;
-                tableId: string | undefined;
-                intent: RefillSendsIntent;
-                approvalMode: RefillSendsApprovalMode;
-                workspaceId: string | null;
-                actionTypes?: ("send_invite" | "send_inmail_closed")[] | undefined;
-                yolo: boolean;
-                senders: string[];
-                senderIds: string[];
-                senderNames: string[];
-            };
-        };
-    };
-    actionTypes?: ("send_invite" | "send_inmail_closed")[] | undefined;
-    command: string;
-    tool: string;
-    promptName: string;
-    workflowPromptName: string;
-    workflowAsset: {
-        subskillName: string;
-        assetPath: string;
-        expectedVersion: string;
-    };
-    yolo: boolean;
-    executionMode: RefillSendsExecutionMode;
-    workspaceId: string | null;
-    workspaceResolution: string;
-    intent: RefillSendsIntent;
-} | {
-    runSnapshot: unknown;
-    readOnly: boolean;
-    forbiddenActions: string[];
-    boundedAuthority: string;
-    status: "blocked";
-    blocker: string;
-    runId?: string;
-    fence?: number;
-    gate?: import("../refill-run-loop.js").RefillLoopGate;
-    guidance: string;
-    holderRunId?: string;
-    report?: Record<string, unknown>;
-    journalPath?: string | null;
-    targetConfig: RefillTargetConfigV1 | null;
-    runHandle: RefillRunHandleV1 | null;
-    refillReporting?: Record<string, unknown>;
-    conflicts?: undefined;
-    ok: boolean;
-    targetDate: string | null;
-    untilDate: string | null;
-    horizonSendDays: number | null;
-    fillWindow: {
-        mode: string;
-        targetDate: string;
-        description: string;
-        untilDate?: undefined;
-        horizonSendDays?: undefined;
-        horizonHours?: undefined;
-    } | {
-        mode: string;
-        untilDate: string;
-        description: string;
-        targetDate?: undefined;
-        horizonSendDays?: undefined;
-        horizonHours?: undefined;
-    } | {
-        mode: string;
-        horizonSendDays: number | null;
-        horizonHours: number | null;
-        description: string;
-        targetDate?: undefined;
-        untilDate?: undefined;
-    };
-    approvalMode: RefillSendsApprovalMode;
-    campaignId: string | null;
-    tableId: string | null;
-    reportingContext: RefillReportingContextV2 | null;
-    messageTemplateRevision: MessageTemplateRevisionV1 | null;
-    senderScope: string;
-    senderSelectors: {
-        senders: string[];
-        senderIds: string[];
-        senderNames: string[];
-    };
-    firstOperationalSteps: string[];
-    approvalContract: string;
-    hostExamples: {
-        claude: string[];
-        codex: string[];
-        mcpTool: {
-            name: string;
-            arguments: {
-                workspaceRunState?: Record<string, unknown> | undefined;
-                workspaceCoordinator?: boolean | undefined;
-                messageTemplateRevision?: MessageTemplateRevisionV1 | undefined;
-                reportingContext?: RefillReportingContextV2 | undefined;
-                targetConfig?: RefillTargetConfigV1 | undefined;
-                runHandle?: RefillRunHandleV1 | undefined;
-                fence?: number | undefined;
-                runId?: string | undefined;
-                expectedActionKey?: string | undefined;
-                expectedTargetShapeRevision?: string | undefined;
-                targetDate: string | null;
-                untilDate: string | null;
-                horizonSendDays: number | null;
-                campaignId: string | undefined;
-                tableId: string | undefined;
-                intent: RefillSendsIntent;
-                approvalMode: RefillSendsApprovalMode;
-                workspaceId: string | null;
-                actionTypes?: ("send_invite" | "send_inmail_closed")[] | undefined;
-                yolo: boolean;
-                senders: string[];
-                senderIds: string[];
-                senderNames: string[];
-            };
-        };
-    };
-    actionTypes?: ("send_invite" | "send_inmail_closed")[] | undefined;
-    command: string;
-    tool: string;
-    promptName: string;
-    workflowPromptName: string;
-    workflowAsset: {
-        subskillName: string;
-        assetPath: string;
-        expectedVersion: string;
-    };
-    yolo: boolean;
-    executionMode: RefillSendsExecutionMode;
-    workspaceId: string | null;
-    workspaceResolution: string;
-    intent: RefillSendsIntent;
-} | {
-    runSnapshot: unknown;
-    readOnly: boolean;
-    forbiddenActions: string[];
-    boundedAuthority: string;
-    status: "terminal";
-    doneReason: string;
-    report: Record<string, unknown>;
-    runId: string;
-    guidance?: string;
-    journalPath?: string | null;
-    targetConfig: RefillTargetConfigV1 | null;
-    runHandle: RefillRunHandleV1 | null;
-    refillReporting?: Record<string, unknown>;
-    runState?: Record<string, unknown>;
-    blocker?: undefined;
-    conflicts?: undefined;
-    ok: boolean;
-    targetDate: string | null;
-    untilDate: string | null;
-    horizonSendDays: number | null;
-    fillWindow: {
-        mode: string;
-        targetDate: string;
-        description: string;
-        untilDate?: undefined;
-        horizonSendDays?: undefined;
-        horizonHours?: undefined;
-    } | {
-        mode: string;
-        untilDate: string;
-        description: string;
-        targetDate?: undefined;
-        horizonSendDays?: undefined;
-        horizonHours?: undefined;
-    } | {
-        mode: string;
-        horizonSendDays: number | null;
-        horizonHours: number | null;
-        description: string;
-        targetDate?: undefined;
-        untilDate?: undefined;
-    };
-    approvalMode: RefillSendsApprovalMode;
-    campaignId: string | null;
-    tableId: string | null;
-    reportingContext: RefillReportingContextV2 | null;
-    messageTemplateRevision: MessageTemplateRevisionV1 | null;
-    senderScope: string;
-    senderSelectors: {
-        senders: string[];
-        senderIds: string[];
-        senderNames: string[];
-    };
-    firstOperationalSteps: string[];
-    approvalContract: string;
     hostExamples: {
         claude: string[];
         codex: string[];

package/dist/tools/refill-sends.js

@@ -736,6 +736,60 @@ function workspaceCoordinatorInput(input) {
     delete coordinatorInput.backgroundWait;
     return coordinatorInput;
 }
+// fix(112ad): the agent-keywords broaden handoff template must carry the COMPLETE
+// original invocation surface, not just the fence handle + campaign/table that
+// 0b680f407 added. The run loop renders a minimal argumentsTemplate (workspaceId,
+// runId, fence, campaignId, tableId, agentKeywords); without the window
+// (targetDate/untilDate/horizonSendDays), the lane (actionTypes/approvalMode/
+// intent), and the coordinator envelope (executionMode/workspaceCoordinator/
+// workspaceRunState), the agent's filled re-invocation defaults targetDate=null ->
+// fillWindow scheduler_forward_48h -> the re-rendered authority mismatches the
+// fenced targetConfig -> approval_scope_changed with no safe continuation (Clover
+// 7-29, calls 10-11). Merge the coordinator envelope UNDER the base template so the
+// fence handle + exact target win and the missing scope fields are filled — the
+// identical continuation contract every other coordinator handoff carries.
+function withKeywordsHandoffScope(result, scopedInput) {
+    const report = recordValue(result.report);
+    const continuation = report ? recordValue(report.continuation) : null;
+    const template = continuation
+        ? recordValue(continuation.argumentsTemplate)
+        : null;
+    if (!report || !continuation || !template)
+        return result;
+    const scopeAdditions = {
+        ...(scopedInput.targetDate ? { targetDate: scopedInput.targetDate } : {}),
+        ...(scopedInput.untilDate ? { untilDate: scopedInput.untilDate } : {}),
+        ...(typeof scopedInput.horizonSendDays === "number"
+            ? { horizonSendDays: scopedInput.horizonSendDays }
+            : {}),
+        ...(scopedInput.actionTypes
+            ? { actionTypes: scopedInput.actionTypes }
+            : {}),
+        ...(scopedInput.approvalMode
+            ? { approvalMode: scopedInput.approvalMode }
+            : {}),
+        ...(scopedInput.intent ? { intent: scopedInput.intent } : {}),
+        ...(scopedInput.executionMode
+            ? { executionMode: scopedInput.executionMode }
+            : {}),
+        ...(scopedInput.workspaceCoordinator === true
+            ? { workspaceCoordinator: true }
+            : {}),
+        ...(scopedInput.workspaceRunState
+            ? { workspaceRunState: scopedInput.workspaceRunState }
+            : {}),
+    };
+    return {
+        ...result,
+        report: {
+            ...report,
+            continuation: {
+                ...continuation,
+                argumentsTemplate: { ...scopeAdditions, ...template },
+            },
+        },
+    };
+}
 const BACKGROUND_WAIT_FAST_PATH_TTL_MS = 10 * 60 * 1000;
 const BACKGROUND_WAIT_MIN_RETRY_MS = 5_000;
 // Action families whose successful exact terminal means NEW ROWS landed on
@@ -2217,6 +2271,67 @@ export function approvedPacketComparison(input, targetPlan) {
         actionChanged,
     };
 }
+const APPROVE_DRIFT_SETTLE_MAX_READS = 3;
+const APPROVE_DRIFT_SETTLE_DELAY_MS = 4_000;
+// fix(112y): approve_messages is a MUTATION whose actionKey content-hashes the
+// bounded needsApproval cohort. While background prep workers land generated /
+// approved rows the cohort recomputes and the key drifts on every fresh read even
+// though the semantic scope (targetShapeRevision) is unchanged — Dotwork td7-27:
+// five consecutive reads drifted 0688fe33 -> 53269881 -> 9313b4b9 -> b75167a7 ->
+// e032b1e8 -> eb45f373 while targetShapeRevision stayed d5f6cb46 and prep job
+// cmrymi5on ran (activeCellCount 1). The approval fence three-struck a full host
+// rerun each time. Unlike the scheduler sweep (112q) we must NOT blanket re-pin a
+// drifting mutation key. Instead, when ONLY the approve key drifts (shape stable)
+// and prep workers are still active on the lane, settle-wait and re-read until two
+// consecutive reads agree or the workers drain, then re-pin the fresh stable key
+// and execute. A genuinely thrashing cohort still terminals honestly after the
+// bounded number of reads.
+export async function settleApprovedApproveDrift(params) {
+    const { comparison } = params;
+    const settleable = comparison.changed &&
+        comparison.actionChanged &&
+        !comparison.shapeChanged &&
+        stringValue(firstGlobalAction(params.plan)?.type) === "approve_messages" &&
+        activePrepJobWaitFallback(params.plan) !== null;
+    if (!settleable) {
+        return { resolved: "terminal", plan: params.plan, comparison };
+    }
+    const delayMs = params.delayMs ?? APPROVE_DRIFT_SETTLE_DELAY_MS;
+    const maxReads = params.maxReads ?? APPROVE_DRIFT_SETTLE_MAX_READS;
+    let lastKey = stringValue(firstGlobalAction(params.plan)?.actionKey) ?? null;
+    let latestPlan = params.plan;
+    for (let read = 0; read < maxReads; read += 1) {
+        await waitForYoloReread(delayMs);
+        const fresh = await getRefillTargetPlan(targetPlanInputFor(params.input));
+        latestPlan = fresh;
+        const freshHead = firstGlobalAction(fresh);
+        const freshKey = stringValue(freshHead?.actionKey) ?? null;
+        const freshShape = stringValue(recordValue(fresh)?.targetShapeRevision) ?? null;
+        // A genuine scope change — the shape moved, or the head is no longer an
+        // approve mutation — is a real terminal, not a settle case.
+        if (stringValue(freshHead?.type) !== "approve_messages" ||
+            freshShape !== comparison.actualTargetShapeRevision) {
+            return {
+                resolved: "terminal",
+                plan: fresh,
+                comparison: approvedPacketComparison(params.input, fresh),
+            };
+        }
+        // Two consecutive reads agree, or the prep workers drained: the cohort is
+        // stable, so re-pin the fresh key and let the approve mutation execute.
+        if (freshKey === lastKey || activePrepJobWaitFallback(fresh) === null) {
+            return { resolved: "proceed", plan: fresh, actionKey: freshKey };
+        }
+        lastKey = freshKey;
+    }
+    // Drift-strike bound reached while the cohort still thrashes under active prep
+    // work: return the honest approval_scope_changed terminal on the latest read.
+    return {
+        resolved: "terminal",
+        plan: latestPlan,
+        comparison: approvedPacketComparison(params.input, latestPlan),
+    };
+}
 function paidRefreshApprovalPacket(params) {
     const action = params.action.action ?? {};
     const ids = actionIds(action);
@@ -2735,32 +2850,46 @@ export async function executeRefillSendsCommand(input = {}) {
             coordinatorWorkspacePlanBeforeDispatch = await getRefillTargetPlan(targetPlanInputFor(workspaceCoordinatorInput(scopedInput)));
             const approvedPacket = approvedPacketComparison(scopedInput, coordinatorWorkspacePlanBeforeDispatch);
             if (approvedPacket.changed) {
-                return {
-                    ...command,
-                    ok: false,
-                    code: "approval_scope_changed",
-                    targetPlan: coordinatorWorkspacePlanBeforeDispatch,
-                    targetPlanBeforePaidRefresh: null,
-                    targetPlanBeforeYoloPrimitive: null,
-                    ...approvedPacket,
-                    autoPaidInmailRefresh: {
-                        enabled: false,
-                        status: "skipped_approval_scope_changed",
-                        refreshedPaidInmailSenderIds: [],
-                        failedPaidInmailRefreshes: [],
-                        attemptedSenderIds: [],
-                        targetPlanReread: false,
-                        workspaceId,
-                        workspaceResolution: "explicit",
-                        note: "Approved refill scope changed before paid-credit refresh or primitive execution.",
-                    },
-                    yoloExecution: {
-                        enabled: yolo,
-                        status: "approval_scope_changed",
-                        selectedAction: firstGlobalAction(coordinatorWorkspacePlanBeforeDispatch),
-                        targetPlanReread: false,
-                    },
-                };
+                // fix(112y): a drifting approve mutation key on a stable shape with active
+                // prep work is settle-waited and re-pinned instead of terminaling the
+                // coordinator fence. This is the CR-Dotwork td7-27 path (workspace
+                // coordinator, approve head, prep job cmrymi5on active).
+                const settled = await settleApprovedApproveDrift({
+                    input: workspaceCoordinatorInput(scopedInput),
+                    plan: coordinatorWorkspacePlanBeforeDispatch,
+                    comparison: approvedPacket,
+                });
+                if (settled.resolved === "terminal") {
+                    return {
+                        ...command,
+                        ok: false,
+                        code: "approval_scope_changed",
+                        targetPlan: settled.plan,
+                        targetPlanBeforePaidRefresh: null,
+                        targetPlanBeforeYoloPrimitive: null,
+                        ...settled.comparison,
+                        autoPaidInmailRefresh: {
+                            enabled: false,
+                            status: "skipped_approval_scope_changed",
+                            refreshedPaidInmailSenderIds: [],
+                            failedPaidInmailRefreshes: [],
+                            attemptedSenderIds: [],
+                            targetPlanReread: false,
+                            workspaceId,
+                            workspaceResolution: "explicit",
+                            note: "Approved refill scope changed before paid-credit refresh or primitive execution.",
+                        },
+                        yoloExecution: {
+                            enabled: yolo,
+                            status: "approval_scope_changed",
+                            selectedAction: firstGlobalAction(settled.plan),
+                            targetPlanReread: false,
+                        },
+                    };
+                }
+                // Settled: the approve cohort stabilized (or prep workers drained), so
+                // dispatch off the fresh re-pinned workspace plan.
+                coordinatorWorkspacePlanBeforeDispatch = settled.plan;
             }
         }
         if (isWorkspaceCoordinator && !exactTargetConfig && !scopedInput.runId) {
@@ -3123,7 +3252,11 @@ export async function executeRefillSendsCommand(input = {}) {
         if ("blocker" in result &&
             stringValue(result.blocker) ===
                 "agent_supplied_signal_keywords_required") {
-            return { ...command, ok: false, ...result };
+            // fix(112ad): complete the handoff template with the original window + lane
+            // + coordinator envelope so the agent's filled re-invocation re-renders the
+            // SAME fenced target instead of defaulting to the scheduler-forward window.
+            const scopedResult = withKeywordsHandoffScope(result, scopedInput);
+            return { ...command, ok: false, ...scopedResult };
         }
         const continuationHandle = "status" in result &&
             result.status === "in_progress" &&
@@ -3722,35 +3855,47 @@ export async function executeRefillSendsCommand(input = {}) {
         };
     }
     const targetPlanInput = targetPlanInputFor(scopedInput);
-    const targetPlanBeforePaidRefresh = await getRefillTargetPlan(targetPlanInput);
+    let targetPlanBeforePaidRefresh = await getRefillTargetPlan(targetPlanInput);
     const approvedPacket = approvedPacketComparison(scopedInput, targetPlanBeforePaidRefresh);
     if (approvedPacket.changed) {
-        return {
-            ...command,
-            ok: false,
-            code: "approval_scope_changed",
-            targetPlan: targetPlanBeforePaidRefresh,
-            targetPlanBeforePaidRefresh: null,
-            targetPlanBeforeYoloPrimitive: null,
-            ...approvedPacket,
-            autoPaidInmailRefresh: {
-                enabled: false,
-                status: "skipped_approval_scope_changed",
-                refreshedPaidInmailSenderIds: [],
-                failedPaidInmailRefreshes: [],
-                attemptedSenderIds: [],
-                targetPlanReread: false,
-                workspaceId,
-                workspaceResolution: workspaceId ? "explicit" : "active_config",
-                note: "Approved refill scope changed before paid-credit refresh or primitive execution.",
-            },
-            yoloExecution: {
-                enabled: yolo,
-                status: "approval_scope_changed",
-                selectedAction: firstGlobalAction(targetPlanBeforePaidRefresh),
-                targetPlanReread: false,
-            },
-        };
+        // fix(112y): a drifting approve mutation key on a stable shape with active
+        // prep work is settle-waited and re-pinned instead of terminaling the fence.
+        const settled = await settleApprovedApproveDrift({
+            input: scopedInput,
+            plan: targetPlanBeforePaidRefresh,
+            comparison: approvedPacket,
+        });
+        if (settled.resolved === "terminal") {
+            return {
+                ...command,
+                ok: false,
+                code: "approval_scope_changed",
+                targetPlan: settled.plan,
+                targetPlanBeforePaidRefresh: null,
+                targetPlanBeforeYoloPrimitive: null,
+                ...settled.comparison,
+                autoPaidInmailRefresh: {
+                    enabled: false,
+                    status: "skipped_approval_scope_changed",
+                    refreshedPaidInmailSenderIds: [],
+                    failedPaidInmailRefreshes: [],
+                    attemptedSenderIds: [],
+                    targetPlanReread: false,
+                    workspaceId,
+                    workspaceResolution: workspaceId ? "explicit" : "active_config",
+                    note: "Approved refill scope changed before paid-credit refresh or primitive execution.",
+                },
+                yoloExecution: {
+                    enabled: yolo,
+                    status: "approval_scope_changed",
+                    selectedAction: firstGlobalAction(settled.plan),
+                    targetPlanReread: false,
+                },
+            };
+        }
+        // Settled: the approve cohort stabilized (or the prep workers drained), so
+        // proceed on the fresh re-pinned plan.
+        targetPlanBeforePaidRefresh = settled.plan;
     }
     const refreshActions = collectPaidInmailRefreshActions(targetPlanBeforePaidRefresh);
     const refreshedPaidInmailSenderIds = [];

package/package.json

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