@runfusion/fusion 0.75.1-beta.1 → 0.75.1-beta.2

package/dist/child-process-worker.js

@@ -1181,6 +1181,9 @@ function isFusionSiblingBranch(branch) {
 function resolveEffectiveAutoMerge(task, settings) {
   return task.autoMerge ?? settings.autoMerge;
 }
+function hasUserAutoMergeHold(task) {
+  return task.autoMerge === false && task.autoMergeProvenance === "user";
+}
 function allowsAutoMergeProcessing(task, settings) {
   return (settings.autoMerge !== false || task.autoMerge === true) && !taskHasManualOpenPullRequest(task);
 }
@@ -63421,7 +63424,7 @@ function rowToTask(row) {
     executionStartBranch: row.executionStartBranch || void 0,
     branch: row.branch || void 0,
     autoMerge: row.autoMerge === null ? void 0 : row.autoMerge === 1,
-    autoMergeProvenance: row.autoMergeProvenance === "user" || row.autoMergeProvenance === "legacy-stamp" ? row.autoMergeProvenance : void 0,
+    autoMergeProvenance: row.autoMergeProvenance === "user" || row.autoMergeProvenance === "mission" || row.autoMergeProvenance === "legacy-stamp" ? row.autoMergeProvenance : void 0,
     baseCommitSha: row.baseCommitSha || void 0,
     scopeOverride: row.scopeOverride ? true : void 0,
     scopeOverrideReason: row.scopeOverrideReason || void 0,
@@ -72937,10 +72940,10 @@ ${feature.acceptanceCriteria}`);
               Apply the selected Missions header workflow atomically during TaskStore.createTask so newly triaged features land in the intended workflow lane. Duplicate-guard reuses skip this create path, preserving existing duplicate tasks without workflow mutation.
               */
               /*
-              FNXC:MissionAutoMerge 2026-07-18-12:00:
-              An autoMerge:false mission stamps each newly triaged task so its shared branch produces one PR instead of per-task auto-merges. Duplicate reuse intentionally bypasses this create-only override.
+              FNXC:MissionAutoMerge 2026-08-05-22:50:
+              An autoMerge:false mission stamps each newly triaged task as mission policy so its shared branch produces one PR instead of per-task auto-merges. Duplicate reuse intentionally bypasses this create-only override; policy must not impersonate an operator manual-hold choice.
               */
-              ...mission?.autoMerge === false ? { autoMerge: false } : {},
+              ...mission?.autoMerge === false ? { autoMerge: false, autoMergeProvenance: "mission" } : {},
               // FNXC:MissionTaskPrefix 2026-07-26-12:00: thread the mission's optional taskPrefix into TaskCreateInput for distributed id minting.
               ...mission?.taskPrefix ? { taskPrefix: mission.taskPrefix } : {},
               ...branchOptions?.workflowId !== void 0 ? { workflowId: branchOptions.workflowId } : {}
@@ -76118,10 +76121,10 @@ ${feature.acceptanceCriteria}`);
                 }
               } : {},
               /*
-              FNXC:MissionAutoMerge 2026-07-18-12:00:
-              An autoMerge:false mission stamps each newly triaged task so its shared branch produces one PR instead of per-task auto-merges. Duplicate reuse intentionally bypasses this create-only override.
+              FNXC:MissionAutoMerge 2026-08-05-22:50:
+              An autoMerge:false mission stamps each newly triaged task as mission policy so its shared branch produces one PR instead of per-task auto-merges. Duplicate reuse intentionally bypasses this create-only override; policy must not impersonate an operator manual-hold choice.
               */
-              ...mission?.autoMerge === false ? { autoMerge: false } : {},
+              ...mission?.autoMerge === false ? { autoMerge: false, autoMergeProvenance: "mission" } : {},
               // FNXC:MissionTaskPrefix 2026-07-26-12:00: thread the mission's optional taskPrefix into TaskCreateInput so the distributed allocator mints ERR-N (etc.) instead of the project prefix.
               ...mission?.taskPrefix ? { taskPrefix: mission.taskPrefix } : {},
               ...branchOptions?.workflowId !== void 0 ? { workflowId: branchOptions.workflowId } : {}
@@ -86472,7 +86475,9 @@ async function _createTaskInternalBackendImpl(store, input, title, resolvedWorkf
     sourceMetadata: withTaskBranchContextInSourceMetadata(input.source?.sourceMetadata, input.branchContext),
     branchContext: input.branchContext,
     autoMerge: input.autoMerge,
-    autoMergeProvenance: input.autoMerge === void 0 ? void 0 : "user",
+    // FNXC:SharedBranchMemberHold 2026-08-05-22:50: trusted mission creation
+    // preserves policy provenance; operator/API create requests retain user provenance.
+    autoMergeProvenance: input.autoMerge === void 0 ? void 0 : input.autoMergeProvenance ?? "user",
     // FNXC:CodingIdeasWorkflow 2026-07-05-19:45: land the task in its
     // workflow's manual intake column (e.g. Coding (Ideas) → "ideas") when
     // no explicit column is given (main FN-7591 parity).
@@ -127350,6 +127355,7 @@ var init_task_timing = __esm({
 });
 
 // ../core/src/session-identity-registry.ts
+import { AsyncLocalStorage } from "node:async_hooks";
 import { resolve as resolve21 } from "node:path";
 import { realpathSync as realpathSync5 } from "node:fs";
 function getRegistry() {
@@ -127361,6 +127367,16 @@ function getRegistry() {
   }
   return registry3;
 }
+function getActiveInvocationStorage() {
+  const holder = globalThis;
+  const existing = holder[ACTIVE_INVOCATION_KEY];
+  if (existing instanceof AsyncLocalStorage) {
+    return existing;
+  }
+  const storage = new AsyncLocalStorage();
+  holder[ACTIVE_INVOCATION_KEY] = storage;
+  return storage;
+}
 function canonicalizeCwd(cwd) {
   const resolved = resolve21(cwd);
   try {
@@ -127388,8 +127404,13 @@ function registerFusionSessionIdentity(cwd, identity) {
   };
 }
 function resolveFusionSessionPrincipal(cwd) {
+  const canonicalCwd = canonicalizeCwd(cwd);
+  const activeInvocation = getActiveInvocationStorage().getStore();
+  if (activeInvocation?.cwdKeys.has(canonicalCwd)) {
+    return { kind: "agent", identity: activeInvocation.identity };
+  }
   const registry3 = getRegistry();
-  const list = registry3.get(canonicalizeCwd(cwd));
+  const list = registry3.get(canonicalCwd);
   if (!list || list.length === 0) {
     return { kind: "operator" };
   }
@@ -127398,14 +127419,24 @@ function resolveFusionSessionPrincipal(cwd) {
   }
   return { kind: "ambiguous", identities: [...list] };
 }
+function runWithFusionSessionIdentity(cwdKeys, identity, callback) {
+  const invocation = {
+    identity: { ...identity, registeredAt: Date.now() },
+    cwdKeys: new Set(cwdKeys.map(canonicalizeCwd))
+  };
+  return getActiveInvocationStorage().run(invocation, callback);
+}
 function __clearFusionSessionIdentityRegistryForTests() {
-  globalThis[REGISTRY_KEY] = /* @__PURE__ */ new Map();
+  const holder = globalThis;
+  holder[REGISTRY_KEY] = /* @__PURE__ */ new Map();
+  holder[ACTIVE_INVOCATION_KEY] = new AsyncLocalStorage();
 }
-var REGISTRY_KEY;
+var REGISTRY_KEY, ACTIVE_INVOCATION_KEY;
 var init_session_identity_registry = __esm({
   "../core/src/session-identity-registry.ts"() {
     "use strict";
     REGISTRY_KEY = "__FUSION_SESSION_IDENTITY_REGISTRY_V1__";
+    ACTIVE_INVOCATION_KEY = "__FUSION_SESSION_IDENTITY_ACTIVE_INVOCATION_V1__";
   }
 });
 
@@ -128376,6 +128407,7 @@ __export(src_exports, {
   hasRoleOverrides: () => hasRoleOverrides,
   hasSyncPassphraseConfigured: () => hasSyncPassphraseConfigured,
   hasTitleIdDrift: () => hasTitleIdDrift,
+  hasUserAutoMergeHold: () => hasUserAutoMergeHold,
   hashWorkflowIr: () => hashWorkflowIr,
   healSchemaDrift: () => healSchemaDrift,
   importMcpServersJson: () => importMcpServersJson,
@@ -128836,6 +128868,7 @@ __export(src_exports, {
   runMemoryBackupCommand: () => runMemoryBackupCommand,
   runReconciliationAbort: () => runReconciliationAbort,
   runScheduledEvalBatch: () => runScheduledEvalBatch,
+  runWithFusionSessionIdentity: () => runWithFusionSessionIdentity,
   sanitizeBranchSegment: () => sanitizeBranchSegment,
   sanitizeCliAgentSettings: () => sanitizeCliAgentSettings,
   sanitizeCliAgentsSettings: () => sanitizeCliAgentsSettings,
@@ -158234,6 +158267,7 @@ import { existsSync as existsSync49, readFileSync as readFileSync16, realpathSyn
 import { exec as exec11, execFile as execFile9 } from "node:child_process";
 import { promisify as promisify15 } from "node:util";
 import { createRequire as createRequire5 } from "node:module";
+import { randomUUID as randomUUID42 } from "node:crypto";
 import { basename as basename16, dirname as dirname24, join as join59, relative as relative8, isAbsolute as isAbsolute10, resolve as resolve30 } from "node:path";
 import {
   createAgentSession,
@@ -159938,7 +159972,8 @@ async function createFnAgent2(options) {
     });
   };
   const sessionIdentity = (() => {
-    const principalAgentId = options.actionGateContext?.agentId ?? options.permanentAgentGating?.requester?.actorId ?? "engine-session";
+    const namedAgentId = options.actionGateContext?.agentId ?? options.permanentAgentGating?.requester?.actorId;
+    const principalAgentId = namedAgentId ?? `engine-session-${randomUUID42()}`;
     const principalAgentName = options.actionGateContext?.agentName ?? options.permanentAgentGating?.requester?.actorName;
     return {
       agentId: principalAgentId,
@@ -159950,6 +159985,14 @@ async function createFnAgent2(options) {
   const sessionIdentityKeys = [...new Set([options.cwd, resolvedProjectRoot].filter((key) => Boolean(key)))];
   const attachSessionIdentity = (session) => {
     const identityDisposers = sessionIdentityKeys.map((key) => registerFusionSessionIdentity(key, sessionIdentity));
+    const sessionInvocations = session;
+    const wrapInvocation = (methodName) => {
+      const original = sessionInvocations[methodName];
+      if (typeof original !== "function") return;
+      sessionInvocations[methodName] = (...args) => runWithFusionSessionIdentity(sessionIdentityKeys, sessionIdentity, () => original.apply(session, args));
+    };
+    wrapInvocation("prompt");
+    wrapInvocation("promptWithFallback");
     const disposeBeforeIdentity = typeof session.dispose === "function" ? session.dispose.bind(session) : () => void 0;
     session.dispose = async () => {
       for (const disposeIdentity of identityDisposers) {
@@ -162745,10 +162788,11 @@ function createMergeAttemptHandler(deps) {
     );
   };
 }
-function createMergeGateHandler() {
+function createMergeGateHandler(deps = {}) {
   return async (_node, ctx) => {
     const settingsAutoMerge = ctx.settings?.autoMerge;
-    const autoMerge = ctx.task.autoMerge !== false && settingsAutoMerge !== false;
+    const settings = { autoMerge: settingsAutoMerge ?? true };
+    const autoMerge = !hasUserAutoMergeHold(ctx.task) && (await deps.isLiveSharedBranchMember?.(ctx.task, settings) === true || ctx.task.autoMerge !== false && settings.autoMerge !== false);
     return {
       outcome: "success",
       value: autoMerge ? "auto-on" : "auto-off"
@@ -162758,6 +162802,7 @@ function createMergeGateHandler() {
 var init_merge_runner = __esm({
   "../engine/src/workflow-node-runners/merge-runner.ts"() {
     "use strict";
+    init_src2();
     init_workflow_merge_nodes();
   }
 });
@@ -163101,7 +163146,7 @@ function createDefaultNodeHandlers(seams, runCustomNode, deps) {
     "parse-steps": parseSteps,
     code: createCodeNodeHandler(deps?.runCode),
     notify: createNotifyHandler(deps?.notifyDispatch),
-    "merge-gate": createMergeGateHandler(),
+    "merge-gate": createMergeGateHandler({ isLiveSharedBranchMember: deps?.isLiveSharedBranchMember }),
     "merge-attempt": createMergeAttemptHandler({
       primitives: deps?.primitives,
       seams,
@@ -169712,7 +169757,7 @@ var init_goal_anchoring_audit = __esm({
 // ../engine/src/agent-tools.ts
 import { appendFile as appendFile3, mkdir as mkdir26, readFile as readFile34, readdir as readdir9, realpath, stat as stat9, writeFile as writeFile24 } from "node:fs/promises";
 import { existsSync as existsSync52 } from "node:fs";
-import { createHash as createHash19, randomUUID as randomUUID42 } from "node:crypto";
+import { createHash as createHash19, randomUUID as randomUUID43 } from "node:crypto";
 import { tmpdir as tmpdir6 } from "node:os";
 import { extname as extname3, isAbsolute as isAbsolute13, join as join64, relative as relative11, resolve as resolve33, sep as sep9 } from "node:path";
 import { Type as Type2 } from "@earendil-works/pi-ai";
@@ -170358,7 +170403,7 @@ function createTaskCreateTool(store, provenance, options) {
               toType: "user",
               type: "agent-to-user",
               content: `Task proposal awaiting validation: ${title}`,
-              metadata: { kind: "task-proposal", proposalStatus: "pending", proposalIdempotencyKey: randomUUID42(), taskId: options.sourceTaskId, proposedTask: { title, description: params.description, priority: params.priority, workflowId: params.workflow_id, dependencies: params.dependencies } }
+              metadata: { kind: "task-proposal", proposalStatus: "pending", proposalIdempotencyKey: randomUUID43(), taskId: options.sourceTaskId, proposedTask: { title, description: params.description, priority: params.priority, workflowId: params.workflow_id, dependencies: params.dependencies } }
             });
             return { content: [{ type: "text", text: "Task proposal submitted to the operator for validation; no task was created." }], details: { proposed: true } };
           }
@@ -194766,7 +194811,8 @@ var WorkflowGraphExecutor = class {
         parseSteps: deps.parseStepsDeps,
         runCode: deps.runCode,
         notifyDispatch: deps.notifyDispatch,
-        prNodes: deps.prNodes
+        prNodes: deps.prNodes,
+        isLiveSharedBranchMember: deps.isLiveSharedBranchMember
       }),
       ...deps.runnerRegistry?.toHandlers() ?? {},
       ...deps.handlers ?? {}
@@ -196009,6 +196055,10 @@ var WorkflowGraphTaskRunner = class {
         runCode: this.deps.runCode,
         notifyDispatch: this.deps.notifyDispatch,
         prNodes: this.deps.prNodes,
+        // FNXC:SharedBranchMemberHold 2026-08-06-00:24: carry the executor's
+        // live group resolver into the graph merge gate; omitting it turns
+        // mission-policy members into manual holds before integration.
+        isLiveSharedBranchMember: this.deps.isLiveSharedBranchMember,
         /*
         FNXC:WorkflowResume 2026-06-29-08:49:
         Production graph runs must fetch live task steps during foreach replay. The runner is the workflow boundary that has store access, so it supplies the fresh projection seam instead of making executor self-healing guess after a stale step node fails.
@@ -207415,16 +207465,29 @@ var SelfHealingManager = class _SelfHealingManager extends SelfHealingGitEvidenc
       activeWork: await this.resolveActiveWorkColumnsFor(taskId, cache)
     };
   }
-  classifyPausedAbortWorkflowRecovery(task, settings, isExecuting, columns) {
+  /*
+  FNXC:SharedBranchMemberHold 2026-08-05-23:35:
+  Pause-abort recovery must resolve the same live intermediate-group predicate as
+  merge admission. Shared metadata alone is stale after group closure or a
+  default-branch collision, so it cannot suppress that task's standalone hold.
+  */
+  async isLiveSharedMemberIntegration(task, settings) {
+    const groupId = task.branchContext?.groupId?.trim();
+    const group = groupId ? await this.store.getBranchGroup?.(groupId) : null;
+    const defaultBranch = await resolveIntegrationBranch(this.options.rootDir, settings);
+    return isLiveSharedBranchGroupMemberIntegration(task, group, defaultBranch);
+  }
+  async classifyPausedAbortWorkflowRecovery(task, settings, isExecuting, columns) {
     const isPausedAbortPark = task.status === "failed" && typeof task.error === "string" && task.error.includes(PAUSE_ABORT_PARK_OPERATOR_MARKER) && task.error.includes(PAUSE_ABORT_PARK_ERROR_MARKER);
     if (!isPausedAbortPark) return { kind: "no-action", reason: "not-pause-abort" };
     if (task.paused || task.userPaused || isExecuting) return { kind: "no-action", reason: "unsafe-or-not-routable" };
     const errorText = typeof task.error === "string" ? task.error.toLowerCase() : "";
     const isTerminalMergePark = errorText.includes("conflict") || errorText.includes("contamination") || errorText.includes("foreign") || errorText.includes("retry-exhausted") || errorText.includes("retries exhausted") || errorText.includes("max retries");
     const completedSteps = task.steps.length > 0 && task.steps.every((step) => step.status === "done" || step.status === "skipped");
-    const sharedBranchMember = isSharedBranchGroupMemberIntegration(task);
-    const hasReviewProgress = columns.review.has(task.column) && allowsAutoMergeProcessing(task, settings) && task.mergeDetails?.mergeConfirmed !== true && !isTerminalMergePark && completedSteps;
-    const hasManualMergeHoldProgress = columns.review.has(task.column) && (!allowsAutoMergeProcessing(task, settings) || resolveEffectiveAutoMerge(task, settings) === false) && !sharedBranchMember && task.mergeDetails?.mergeConfirmed !== true && !isTerminalMergePark && completedSteps;
+    const liveSharedBranchMember = await this.isLiveSharedMemberIntegration(task, settings);
+    const autoMergeProcessing = allowsAutoMergeProcessing(task, settings) || liveSharedBranchMember;
+    const hasReviewProgress = columns.review.has(task.column) && autoMergeProcessing && task.mergeDetails?.mergeConfirmed !== true && !isTerminalMergePark && completedSteps;
+    const hasManualMergeHoldProgress = columns.review.has(task.column) && (hasUserAutoMergeHold(task) || !allowsAutoMergeProcessing(task, settings) || resolveEffectiveAutoMerge(task, settings) === false) && (!liveSharedBranchMember || hasUserAutoMergeHold(task)) && task.mergeDetails?.mergeConfirmed !== true && !isTerminalMergePark && completedSteps;
     if (hasManualMergeHoldProgress) {
       return { kind: "work-item-resume", reason: "pause-abort-manual-merge-hold" };
     }
@@ -213092,8 +213155,23 @@ var SelfHealingManager = class _SelfHealingManager extends SelfHealingGitEvidenc
         return own.length > 0 ? new Set(own) : /* @__PURE__ */ new Set(["in-review"]);
       };
       const executingIds = this.options.getExecutingTaskIds?.() ?? /* @__PURE__ */ new Set();
+      const canRecoverMergeableReviewTask = async (task) => {
+        if (hasUserAutoMergeHold(task)) return false;
+        const groupId = task.branchContext?.groupId?.trim();
+        const branchGroup = groupId ? await this.store.getBranchGroup(groupId) : null;
+        const projectDefaultBranch = await resolveIntegrationBranch(this.options.rootDir, settings);
+        if (isLiveSharedBranchGroupMemberIntegration(task, branchGroup, projectDefaultBranch)) {
+          return true;
+        }
+        return allowsAutoMergeProcessing(task, settings) && resolveEffectiveAutoMerge(task, settings) !== false;
+      };
+      const mergeAdmission = await Promise.all(tasks2.map(async (task) => [
+        task.id,
+        await canRecoverMergeableReviewTask(task)
+      ]));
+      const mergeAdmissionByTaskId = new Map(mergeAdmission);
       const mergeable = tasks2.filter(
-        (t) => allowsAutoMergeProcessing(t, settings) && !t.paused && !executingIds.has(t.id) && t.status !== "failed" && // Exclude transient merge statuses. Active merges should be left alone;
+        (t) => mergeAdmissionByTaskId.get(t.id) === true && !t.paused && !executingIds.has(t.id) && t.status !== "failed" && // Exclude transient merge statuses. Active merges should be left alone;
         // stale ones are handled by recoverStaleMergingStatus().
         t.status !== "merging" && t.status !== "merging-pr" && // FNXC:Workspace 2026-06-22-09:30 (Phase D U1, KTD1 — admit workspace tasks):
         // A workspace task has task.worktree===null (its worktrees live per-repo in
@@ -216140,7 +216218,7 @@ var SelfHealingManager = class _SelfHealingManager extends SelfHealingGitEvidenc
       for (const t of tasks2) {
         if (!this.isPauseAbortParkCandidate(t)) continue;
         const columns = await this.resolvePauseAbortColumnsFor(t.id, columnCache);
-        if (this.classifyPausedAbortWorkflowRecovery(t, settings, executingIds.has(t.id), columns).kind !== "no-action") {
+        if ((await this.classifyPausedAbortWorkflowRecovery(t, settings, executingIds.has(t.id), columns)).kind !== "no-action") {
           parked.push(t);
         }
       }
@@ -216157,7 +216235,7 @@ var SelfHealingManager = class _SelfHealingManager extends SelfHealingGitEvidenc
             continue;
           }
           const freshColumns = await this.resolvePauseAbortColumnsFor(fresh.id, columnCache);
-          const route = this.classifyPausedAbortWorkflowRecovery(fresh, settings, latestExecutingIds.has(fresh.id), freshColumns);
+          const route = await this.classifyPausedAbortWorkflowRecovery(fresh, settings, latestExecutingIds.has(fresh.id), freshColumns);
           if (route.kind === "no-action") {
             continue;
           }
@@ -222882,6 +222960,7 @@ ${feedback}`,
     if (info.phase !== "pre-merge") return false;
     if (info.status !== "advisory_failure" && info.status !== "failed") return false;
     const liveTask = await this.store.getTask(taskId).catch(() => fallbackTask);
+    if (hasUserAutoMergeHold(liveTask)) return false;
     const missingArtifactKeys = parseRequiredArtifactMissingValue(info.failureValue);
     if (missingArtifactKeys) {
       await this.recoverMissingRequiredArtifacts(liveTask, missingArtifactKeys, {
@@ -223138,6 +223217,7 @@ ${info.feedback}`, revisionKey),
    */
   async recoverFailedPreMergeWorkflowStep(task) {
     try {
+      if (hasUserAutoMergeHold(task)) return false;
       const failed = (task.workflowStepResults ?? []).filter((r) => (r.phase || "pre-merge") === "pre-merge" && r.status === "failed").sort((a, b3) => {
         const aTs = Date.parse(a.completedAt || a.startedAt || "");
         const bTs = Date.parse(b3.completedAt || b3.startedAt || "");
@@ -223664,6 +223744,7 @@ ${info.feedback}`, revisionKey),
           getTask: (taskId) => this.store.getTask(taskId)
         },
         runId: resolvedRunId,
+        isLiveSharedBranchMember: (nodeTask) => this.isLiveSharedBranchGroupMember(nodeTask),
         primitives: this.createAuthoritativeWorkflowPrimitives(settings),
         seams: this.createAuthoritativeWorkflowSeams(settings),
         prepareNodeExecution: (node, nodeTask, requirement) => this.prepareGraphNodeExecution(node, nodeTask, settings, requirement),
@@ -226605,6 +226686,7 @@ Graph value: ${failureValue}` : ""}`, budget.key),
     } catch {
       return false;
     }
+    if (hasUserAutoMergeHold(live)) return false;
     const sharedBranchMember = await this.isLiveSharedBranchGroupMember(live);
     if (!sharedBranchMember && !allowsAutoMergeProcessing(live, settings)) return false;
     if (!sharedBranchMember && resolveEffectiveAutoMerge(live, settings) === false) return false;
@@ -226666,8 +226748,8 @@ Graph value: ${failureValue}` : ""}`, budget.key),
     } catch {
       return false;
     }
-    if (await this.isLiveSharedBranchGroupMember(live)) return false;
-    return !allowsAutoMergeProcessing(live, settings) || resolveEffectiveAutoMerge(live, settings) === false;
+    if (await this.isLiveSharedBranchGroupMember(live) && !hasUserAutoMergeHold(live)) return false;
+    return hasUserAutoMergeHold(live) || !allowsAutoMergeProcessing(live, settings) || resolveEffectiveAutoMerge(live, settings) === false;
   }
   async handleStaleInReviewPlanPauseAbortReplay(live, result, abortProvenance, pausedAborted, userCanceled, resumeLanesMemo) {
     if (!pausedAborted) return false;
@@ -226831,9 +226913,9 @@ Graph value: ${failureValue}` : ""}`, budget.key),
       if (settings.globalPause === true) return false;
     }
     if (live.column === resumeLanes.review) {
-      if (live.autoMerge === false) return false;
       if (!settings) return false;
       const sharedBranchMember = await this.isLiveSharedBranchGroupMember(live);
+      if (hasUserAutoMergeHold(live) || live.autoMerge === false && !sharedBranchMember) return false;
       if (!sharedBranchMember && !allowsAutoMergeProcessing(live, settings)) return false;
       if (live.mergeDetails?.mergeConfirmed === true) return false;
     }
@@ -247890,6 +247972,7 @@ var InProcessRuntime = class extends EventEmitter27 {
         }
       }
       const prNodeGithubOps = this.config.prNodeGithubOps;
+      const secretsStore = await this.taskStore.getSecretsStore();
       const executorOptions = {
         /*
         FNXC:PlanReviewLease 2026-07-26-21:12:
@@ -247905,6 +247988,7 @@ var InProcessRuntime = class extends EventEmitter27 {
         cliAgentRuntime: this.cliAgentRuntime?.bundle,
         pluginRunner: this.pluginRunner,
         messageStore: this.messageStore,
+        secretsStore,
         missionStore,
         reflectionService,
         // PR-entity nodes (U3): assemble the handler deps from the CLI-injected
@@ -248006,6 +248090,7 @@ var InProcessRuntime = class extends EventEmitter27 {
           reflectionService,
           selfImproveService,
           credentialRotator: this.credentialRotator,
+          secretsStore,
           snapshotManager: autoClaimSnapshotManager,
           onMissed: (agentId, reason) => {
             runtimeLog.warn(`Agent ${agentId} missed heartbeat: ${reason}`);
@@ -255045,7 +255130,21 @@ var ProjectEngine = class _ProjectEngine {
   Cleared on the first non-busy outcome (success path resets it).
   */
   workspaceBusyReenqueues = /* @__PURE__ */ new Map();
+  workspaceBusyReenqueueTimers = /* @__PURE__ */ new Set();
   static WORKSPACE_BUSY_MAX_REENQUEUES = 10;
+  /*
+  FNXC:WorkspaceMergeDispatch 2026-08-05-23:56:
+  Workspace lease-contention retries are engine-owned lifecycle work, not detached callbacks.
+  Track only these busy re-enqueue timers so stop() can cancel them and tests can measure the
+  capped workspace ladder without confusing it with merge-body or maintenance timers.
+  */
+  scheduleWorkspaceBusyReenqueue(taskId, delayMs) {
+    const timer2 = setTimeout(() => {
+      this.workspaceBusyReenqueueTimers.delete(timer2);
+      if (!this.shuttingDown) this.internalEnqueueMerge(taskId);
+    }, delayMs);
+    this.workspaceBusyReenqueueTimers.add(timer2);
+  }
   /**
    * Pending manual merge resolvers — keyed by taskId.
    * When `onMerge` is called, the task is enqueued like auto-merge but a
@@ -255580,6 +255679,10 @@ ${detail}`);
       clearInterval(this.mergeActiveReconcileTimer);
       this.mergeActiveReconcileTimer = null;
     }
+    for (const timer2 of this.workspaceBusyReenqueueTimers) {
+      clearTimeout(timer2);
+    }
+    this.workspaceBusyReenqueueTimers.clear();
     for (const [taskId, deferred] of this.capacityDeferredMerges) {
       clearTimeout(deferred.timer);
       for (const resolver of deferred.resolvers) {
@@ -256879,16 +256982,15 @@ ${detail}`);
    * older low-priority task would start before a later urgent one.
    */
   async allowInReviewMergeProcessing(task, settings, store = this.runtime.getTaskStore()) {
-    if (allowsAutoMergeProcessing(task, settings)) {
-      return true;
-    }
+    if (hasUserAutoMergeHold(task)) return false;
     const groupId = task.branchContext?.groupId?.trim();
     const branchGroup = groupId ? await store.getBranchGroup?.(groupId) : null;
-    if (!branchGroup || branchGroup.status !== "open" || !branchGroup.branchName.trim()) {
-      return false;
-    }
     const projectDefaultBranch = await resolveIntegrationBranch(this.config.workingDirectory, settings);
-    return isLiveSharedBranchGroupMemberIntegration(task, branchGroup, projectDefaultBranch);
+    if (isLiveSharedBranchGroupMemberIntegration(task, branchGroup, projectDefaultBranch)) {
+      return true;
+    }
+    if (task.autoMerge === false && groupId) return false;
+    return allowsAutoMergeProcessing(task, settings);
   }
   async emitLegacyAutoMergeStampAdvisory(store) {
     if (this.legacyAutoMergeStampAdvisoryEmitted) {
@@ -257841,9 +257943,7 @@ ${detail}`);
               runtimeLog.log(
                 `Workspace land busy re-enqueue ${busyCount + 1}/${_ProjectEngine.WORKSPACE_BUSY_MAX_REENQUEUES} for ${taskId} in ${delayMs / 1e3}s (no mergeRetry consumed \u2014 pure lease contention)`
               );
-              setTimeout(() => {
-                if (!this.shuttingDown) this.internalEnqueueMerge(taskId);
-              }, delayMs);
+              this.scheduleWorkspaceBusyReenqueue(taskId, delayMs);
             } else {
               this.workspaceBusyReenqueues.delete(taskId);
               await store.updateTask(taskId, { status: "failed", error: errorMsg }).catch(() => void 0);