@runfusion/fusion 0.77.0-beta.12 → 0.77.0-beta.13

package/dist/extension.js

@@ -1513,6 +1513,199 @@ Be specific: cite the plan section or file path for every finding and explain th
   }
 });
 
+// ../core/src/workflows/workflow-merge-region.ts
+function isMergeRegionNode(node) {
+  return MERGE_REGION_ENTRY_NODE_KINDS.has(node.kind) || node.config?.seam === "merge";
+}
+function classifyWorkflowNodeMergeRegion(ir2, nodeId) {
+  if (ir2.version !== "v2" || !Array.isArray(ir2.nodes)) return "unknown";
+  const node = ir2.nodes.find((candidate) => candidate.id === nodeId);
+  if (!node) return "unknown";
+  return isMergeRegionNode(node) ? "merge-region" : "outside-merge-region";
+}
+var MERGE_REGION_ENTRY_NODE_KINDS;
+var init_workflow_merge_region = __esm({
+  "../core/src/workflows/workflow-merge-region.ts"() {
+    "use strict";
+    MERGE_REGION_ENTRY_NODE_KINDS = /* @__PURE__ */ new Set([
+      "merge-gate",
+      "merge-attempt",
+      "manual-merge-hold",
+      "retry-backoff",
+      "recovery-router",
+      "branch-group-member-integration",
+      "branch-group-promotion",
+      "pr-create",
+      "pr-respond",
+      "pr-merge"
+    ]);
+  }
+});
+
+// ../core/src/workflows/workflow-optional-steps.ts
+function isWorkflowOptionalGroupEnabled(enabledWorkflowSteps, groupId, defaultOn = false) {
+  return Array.isArray(enabledWorkflowSteps) ? enabledWorkflowSteps.includes(groupId) : defaultOn;
+}
+function isOptionalGroupNode(node) {
+  return node.kind === "optional-group";
+}
+function computeNodeExecutionRanks(ir2) {
+  const ranks = /* @__PURE__ */ new Map();
+  if (ir2.version !== "v2" || !Array.isArray(ir2.nodes) || !Array.isArray(ir2.edges)) {
+    return ranks;
+  }
+  const outgoing = /* @__PURE__ */ new Map();
+  for (const edge of ir2.edges) {
+    if (!outgoing.has(edge.from)) outgoing.set(edge.from, []);
+    outgoing.get(edge.from)?.push(edge.to);
+  }
+  const queue = [];
+  for (const node of ir2.nodes) {
+    if (node.kind === "start" || node.id === "start") {
+      queue.push({ id: node.id, rank: 0 });
+    }
+  }
+  while (queue.length > 0) {
+    const next = queue.shift();
+    if (!next) continue;
+    const current = ranks.get(next.id);
+    if (current !== void 0 && current <= next.rank) continue;
+    ranks.set(next.id, next.rank);
+    for (const target of outgoing.get(next.id) ?? []) {
+      queue.push({ id: target, rank: next.rank + 1 });
+    }
+  }
+  return ranks;
+}
+function resolveWorkflowOptionalSteps(ir2, _pluginTemplates = []) {
+  if (ir2.version !== "v2" || !Array.isArray(ir2.nodes)) return [];
+  const ranks = computeNodeExecutionRanks(ir2);
+  const resolved = [];
+  for (const [nodeIndex, node] of ir2.nodes.entries()) {
+    if (!isOptionalGroupNode(node)) continue;
+    const config3 = node.config ?? {};
+    resolved.push({
+      // Keyed by the group node id (documented above); field name preserved.
+      templateId: node.id,
+      name: typeof config3.name === "string" && config3.name.trim() ? config3.name : node.id,
+      description: "",
+      /*
+      FNXC:WorkflowOptionalSteps 2026-06-29-12:47:
+      Post-merge verification is now a graph-native optional group. Task creation and detail surfaces need the resolver to preserve `config.phase` so post-merge toggles do not look like pre-merge gates.
+      */
+      phase: config3.phase === "post-merge" ? "post-merge" : "pre-merge",
+      defaultOn: config3.defaultOn === true,
+      reportingOnly: config3.reportingOnly === true,
+      /*
+      FNXC:WorkflowDefinitionSteps 2026-06-29-00:41:
+      Definition/task creation surfaces must order optional groups by graph execution position, not raw node-array order. Derived built-ins can insert Plan Review between planning and parse while appending its node object, and operators still need the step list to show Plan Review before execution.
+      */
+      rank: ranks.get(node.id) ?? Number.MAX_SAFE_INTEGER,
+      nodeIndex
+    });
+  }
+  return resolved.sort((a, b3) => a.rank - b3.rank || a.nodeIndex - b3.nodeIndex).map(({ rank: _rank, nodeIndex: _nodeIndex, ...step }) => step);
+}
+function resolveDefaultOnOptionalGroupIds(ir2) {
+  return resolveWorkflowOptionalSteps(ir2).filter((step) => step.defaultOn).map((step) => step.templateId);
+}
+function resolveAllOptionalGroupIds(ir2) {
+  return resolveWorkflowOptionalSteps(ir2).map((step) => step.templateId);
+}
+function isReportingOnlyOptionalGroup(ir2, nodeId) {
+  if (!nodeId) return false;
+  return resolveWorkflowOptionalSteps(ir2).some((step) => step.templateId === nodeId && step.reportingOnly);
+}
+var init_workflow_optional_steps = __esm({
+  "../core/src/workflows/workflow-optional-steps.ts"() {
+    "use strict";
+  }
+});
+
+// ../core/src/workflows/workflow-fast-lane.ts
+function isFastExecutionMode(task) {
+  return task.executionMode === "fast";
+}
+function configString(node, key) {
+  const value = node.config?.[key];
+  return typeof value === "string" ? value : void 0;
+}
+function isTaskStepsForeach(node) {
+  return node.kind === "foreach" && node.config?.source === "task-steps";
+}
+function isFastLaneSkippableCustomNode(node, opts = {}) {
+  if (node.config?.summaryTarget === "task" || node.id === "completion-summary") return false;
+  if (opts.optionalGroupId) return false;
+  if (node.config?.seam) return false;
+  return node.kind === "prompt" || node.kind === "script" || node.kind === "gate";
+}
+function isFastLaneBypassedTemplateNode(node) {
+  return node.kind === "step-review";
+}
+function inactiveRoute() {
+  return {
+    active: false,
+    bypassedNodeIds: /* @__PURE__ */ new Set(),
+    bypassedPreMergeGroups: [],
+    parseStepsNodeIds: /* @__PURE__ */ new Set()
+  };
+}
+function resolveFastLaneRoute(ir2, task) {
+  if (!isFastExecutionMode(task)) return inactiveRoute();
+  const foreachNode = ir2.nodes.find(isTaskStepsForeach);
+  const executeNode = ir2.nodes.find((node) => configString(node, "seam") === "execute");
+  const implementationNode = foreachNode ?? executeNode;
+  if (!implementationNode) {
+    return { ...inactiveRoute(), unsupportedReason: "no-implementation-node" };
+  }
+  const implementationKind = foreachNode ? "foreach-steps" : "execute-seam";
+  const bypassedPreMergeGroups = resolveWorkflowOptionalSteps(ir2).filter((step) => step.phase === "pre-merge").map((step) => ({ nodeId: step.templateId, name: step.name }));
+  const bypassedGroupIds = new Set(bypassedPreMergeGroups.map((group) => group.nodeId));
+  const bypassedNodeIds = /* @__PURE__ */ new Set();
+  for (const node of ir2.nodes) {
+    if (isMergeRegionNode(node) || node.id === "completion-summary" || node.config?.summaryTarget === "task") continue;
+    if (configString(node, "seam") === "planning") {
+      bypassedNodeIds.add(node.id);
+      continue;
+    }
+    if (bypassedGroupIds.has(node.id)) {
+      bypassedNodeIds.add(node.id);
+      continue;
+    }
+    const workflowAction = configString(node, "workflowAction");
+    const groupId = configString(node, "forWorkflowStepId");
+    if (workflowAction === "plan-replan" || workflowAction === "plan-review-no-op" || workflowAction === "pre-merge-remediation" || workflowAction === "review-remediation-steps" || groupId !== void 0 && bypassedGroupIds.has(groupId)) {
+      bypassedNodeIds.add(node.id);
+    }
+  }
+  const parseStepsNodeIds = new Set(ir2.nodes.filter((node) => node.kind === "parse-steps").map((node) => node.id));
+  for (const parseNodeId of parseStepsNodeIds) {
+    if (bypassedNodeIds.has(parseNodeId)) {
+      throw new Error(`Fast lane cannot bypass parse-steps node '${parseNodeId}'`);
+    }
+  }
+  return {
+    active: true,
+    bypassedNodeIds,
+    bypassedPreMergeGroups,
+    parseStepsNodeIds,
+    implementationNodeId: implementationNode.id,
+    implementationKind
+  };
+}
+var FAST_LANE_STEP_NAME, FAST_LANE_SKIP_VALUE, FAST_MODE_BYPASS_ACTOR, FAST_LANE_STEP_REVIEW_ROUTE_VALUE;
+var init_workflow_fast_lane = __esm({
+  "../core/src/workflows/workflow-fast-lane.ts"() {
+    "use strict";
+    init_workflow_merge_region();
+    init_workflow_optional_steps();
+    FAST_LANE_STEP_NAME = "Fast implementation";
+    FAST_LANE_SKIP_VALUE = "fast-lane-skip";
+    FAST_MODE_BYPASS_ACTOR = "fast-mode";
+    FAST_LANE_STEP_REVIEW_ROUTE_VALUE = "approve";
+  }
+});
+
 // ../core/src/workflows/workflow-step-results.ts
 function isWorkflowStepNotRun(result2) {
   return result2.status === "skipped" && typeof result2.notRunReason === "string" && WORKFLOW_STEP_NOT_RUN_REASONS.includes(result2.notRunReason);
@@ -1813,6 +2006,31 @@ var init_workflow_step_results = __esm({
 });
 
 // ../core/src/merge/pre-merge-approval.ts
+function requiresContentReviewProof(workflowStepId, result2) {
+  return workflowStepId === "code-review" || result2.reviewKind === "code";
+}
+function isAuditedOperatorBypass(result2) {
+  if (result2.status !== "skipped") return false;
+  const actor = result2.bypassedBy?.trim();
+  return Boolean(
+    actor && !AUTOMATED_BYPASS_ACTORS.has(actor) && result2.bypassedAt?.trim() && result2.bypassReason?.trim()
+  );
+}
+function resolveUnprovenReviewApproval(result2, options) {
+  if ((result2.phase ?? "pre-merge") !== "pre-merge" || !requiresContentReviewProof(result2.workflowStepId, result2) || options.workspace || result2.status !== "passed" || result2.verdict !== "APPROVE" && result2.verdict !== "APPROVE_WITH_NOTES" || result2.reviewInputFingerprint !== void 0 || result2.bypassedBy !== void 0 || result2.remediationArchivedAt != null) {
+    return void 0;
+  }
+  const { verdict: _verdict, ...withoutVerdict } = result2;
+  return {
+    downgraded: {
+      ...withoutVerdict,
+      status: "failed",
+      output: UNPROVEN_REVIEW_APPROVAL_DIAGNOSTIC,
+      notes: UNPROVEN_REVIEW_APPROVAL_DIAGNOSTIC
+    },
+    reason: UNPROVEN_REVIEW_APPROVAL_DIAGNOSTIC
+  };
+}
 function evaluatePreMergeApprovals(task, options = {}) {
   const required2 = options.requiredPreMergeStepIds;
   if (!required2?.size) return [];
@@ -1823,13 +2041,16 @@ function evaluateStep(workflowStepId, results, task, descriptor) {
   const result2 = results.filter((candidate) => candidate.workflowStepId === workflowStepId).at(-1);
   if (!result2 && descriptor?.kind !== "workspace") return { workflowStepId, state: "missing" };
   if (result2) {
-    const requiresExplicitVerdict = workflowStepId === "code-review" || result2.reviewKind === "code";
+    const requiresExplicitVerdict = requiresContentReviewProof(workflowStepId, result2);
     const approvedVerdict = result2.verdict === "APPROVE" || result2.verdict === "APPROVE_WITH_NOTES";
     const isPlanDomain = workflowStepId === PLAN_REVIEW_GROUP_ID || result2.reviewKind === "plan";
     const notRunApproves = isWorkflowStepNotRun(result2) && !requiresExplicitVerdict && !isPlanDomain;
     const approved = result2.status === "passed" && (requiresExplicitVerdict ? approvedVerdict : result2.verdict === void 0 || approvedVerdict) || result2.status === "skipped" && !!result2.bypassedBy || notRunApproves;
     if (!approved || !!result2.remediationArchivedAt) return { workflowStepId, state: "not-approved" };
     if (result2.reviewKind === "plan") return { workflowStepId, state: "approved" };
+    if (isAuditedOperatorBypass(result2) && descriptor?.kind !== "workspace") {
+      return { workflowStepId, state: "approved" };
+    }
     const bindsContent = requiresExplicitVerdict || result2.reviewInputFingerprint !== void 0;
     if (!bindsContent) return { workflowStepId, state: "approved" };
   }
@@ -1860,11 +2081,15 @@ function evaluateStep(workflowStepId, results, task, descriptor) {
   if (stale2.length) return { workflowStepId, state: "stale-content", repositories: stale2 };
   return { workflowStepId, state: "approved" };
 }
+var AUTOMATED_BYPASS_ACTORS, UNPROVEN_REVIEW_APPROVAL_DIAGNOSTIC;
 var init_pre_merge_approval = __esm({
   "../core/src/merge/pre-merge-approval.ts"() {
     "use strict";
     init_builtin_plan_review_group();
+    init_workflow_fast_lane();
     init_workflow_step_results();
+    AUTOMATED_BYPASS_ACTORS = /* @__PURE__ */ new Set([FAST_MODE_BYPASS_ACTOR]);
+    UNPROVEN_REVIEW_APPROVAL_DIAGNOSTIC = "Content-binding review approval recorded without reviewInputFingerprint; approval invalidated so the gate can run again.";
   }
 });
 
@@ -11374,35 +11599,6 @@ var init_workflow_ir_types = __esm({
   }
 });
 
-// ../core/src/workflows/workflow-merge-region.ts
-function isMergeRegionNode(node) {
-  return MERGE_REGION_ENTRY_NODE_KINDS.has(node.kind) || node.config?.seam === "merge";
-}
-function classifyWorkflowNodeMergeRegion(ir2, nodeId) {
-  if (ir2.version !== "v2" || !Array.isArray(ir2.nodes)) return "unknown";
-  const node = ir2.nodes.find((candidate) => candidate.id === nodeId);
-  if (!node) return "unknown";
-  return isMergeRegionNode(node) ? "merge-region" : "outside-merge-region";
-}
-var MERGE_REGION_ENTRY_NODE_KINDS;
-var init_workflow_merge_region = __esm({
-  "../core/src/workflows/workflow-merge-region.ts"() {
-    "use strict";
-    MERGE_REGION_ENTRY_NODE_KINDS = /* @__PURE__ */ new Set([
-      "merge-gate",
-      "merge-attempt",
-      "manual-merge-hold",
-      "retry-backoff",
-      "recovery-router",
-      "branch-group-member-integration",
-      "branch-group-promotion",
-      "pr-create",
-      "pr-respond",
-      "pr-merge"
-    ]);
-  }
-});
-
 // ../core/src/workflows/workflow-extension-types.ts
 function workflowExtensionRegistryId(pluginId, extensionId) {
   return `plugin:${pluginId}:${extensionId}`;
@@ -12398,6 +12594,16 @@ function validateReviewerAgentOverrides(nodes2) {
     if (Array.isArray(templateNodes)) validateReviewerAgentOverrides(templateNodes);
   }
 }
+function validateReadonlyMcpServersConfig(nodes2) {
+  for (const node of nodes2) {
+    const value = node.config?.readonlyMcpServers;
+    if (value !== void 0 && (!Array.isArray(value) || value.some((name2) => typeof name2 !== "string" || !name2.trim()))) {
+      throw new WorkflowIrError(`Workflow node '${node.id}' readonlyMcpServers must be an array of non-empty strings when present`);
+    }
+    const templateNodes = node.config?.template?.nodes;
+    if (Array.isArray(templateNodes)) validateReadonlyMcpServersConfig(templateNodes);
+  }
+}
 function validateThinkingLevelConfig(nodes2) {
   for (const node of nodes2) {
     const value = node.config?.thinkingLevel;
@@ -13012,6 +13218,7 @@ function validateV2(ir2) {
   const topLevelIds = new Set(ir2.nodes.map((n) => n.id));
   validateStepExecutePlacement(ir2.nodes);
   validateThinkingLevelConfig(ir2.nodes);
+  validateReadonlyMcpServersConfig(ir2.nodes);
   validateCredentialInstanceIdConfig(ir2.nodes);
   validateReviewerAgentOverrides(ir2.nodes);
   for (const node of ir2.nodes) {
@@ -29082,169 +29289,6 @@ var init_explicit_duplicate_marker = __esm({
   }
 });
 
-// ../core/src/workflows/workflow-optional-steps.ts
-function isWorkflowOptionalGroupEnabled(enabledWorkflowSteps, groupId, defaultOn = false) {
-  return Array.isArray(enabledWorkflowSteps) ? enabledWorkflowSteps.includes(groupId) : defaultOn;
-}
-function isOptionalGroupNode(node) {
-  return node.kind === "optional-group";
-}
-function computeNodeExecutionRanks(ir2) {
-  const ranks = /* @__PURE__ */ new Map();
-  if (ir2.version !== "v2" || !Array.isArray(ir2.nodes) || !Array.isArray(ir2.edges)) {
-    return ranks;
-  }
-  const outgoing = /* @__PURE__ */ new Map();
-  for (const edge of ir2.edges) {
-    if (!outgoing.has(edge.from)) outgoing.set(edge.from, []);
-    outgoing.get(edge.from)?.push(edge.to);
-  }
-  const queue = [];
-  for (const node of ir2.nodes) {
-    if (node.kind === "start" || node.id === "start") {
-      queue.push({ id: node.id, rank: 0 });
-    }
-  }
-  while (queue.length > 0) {
-    const next = queue.shift();
-    if (!next) continue;
-    const current = ranks.get(next.id);
-    if (current !== void 0 && current <= next.rank) continue;
-    ranks.set(next.id, next.rank);
-    for (const target of outgoing.get(next.id) ?? []) {
-      queue.push({ id: target, rank: next.rank + 1 });
-    }
-  }
-  return ranks;
-}
-function resolveWorkflowOptionalSteps(ir2, _pluginTemplates = []) {
-  if (ir2.version !== "v2" || !Array.isArray(ir2.nodes)) return [];
-  const ranks = computeNodeExecutionRanks(ir2);
-  const resolved = [];
-  for (const [nodeIndex, node] of ir2.nodes.entries()) {
-    if (!isOptionalGroupNode(node)) continue;
-    const config3 = node.config ?? {};
-    resolved.push({
-      // Keyed by the group node id (documented above); field name preserved.
-      templateId: node.id,
-      name: typeof config3.name === "string" && config3.name.trim() ? config3.name : node.id,
-      description: "",
-      /*
-      FNXC:WorkflowOptionalSteps 2026-06-29-12:47:
-      Post-merge verification is now a graph-native optional group. Task creation and detail surfaces need the resolver to preserve `config.phase` so post-merge toggles do not look like pre-merge gates.
-      */
-      phase: config3.phase === "post-merge" ? "post-merge" : "pre-merge",
-      defaultOn: config3.defaultOn === true,
-      reportingOnly: config3.reportingOnly === true,
-      /*
-      FNXC:WorkflowDefinitionSteps 2026-06-29-00:41:
-      Definition/task creation surfaces must order optional groups by graph execution position, not raw node-array order. Derived built-ins can insert Plan Review between planning and parse while appending its node object, and operators still need the step list to show Plan Review before execution.
-      */
-      rank: ranks.get(node.id) ?? Number.MAX_SAFE_INTEGER,
-      nodeIndex
-    });
-  }
-  return resolved.sort((a, b3) => a.rank - b3.rank || a.nodeIndex - b3.nodeIndex).map(({ rank: _rank, nodeIndex: _nodeIndex, ...step }) => step);
-}
-function resolveDefaultOnOptionalGroupIds(ir2) {
-  return resolveWorkflowOptionalSteps(ir2).filter((step) => step.defaultOn).map((step) => step.templateId);
-}
-function resolveAllOptionalGroupIds(ir2) {
-  return resolveWorkflowOptionalSteps(ir2).map((step) => step.templateId);
-}
-function isReportingOnlyOptionalGroup(ir2, nodeId) {
-  if (!nodeId) return false;
-  return resolveWorkflowOptionalSteps(ir2).some((step) => step.templateId === nodeId && step.reportingOnly);
-}
-var init_workflow_optional_steps = __esm({
-  "../core/src/workflows/workflow-optional-steps.ts"() {
-    "use strict";
-  }
-});
-
-// ../core/src/workflows/workflow-fast-lane.ts
-function isFastExecutionMode(task) {
-  return task.executionMode === "fast";
-}
-function configString(node, key) {
-  const value = node.config?.[key];
-  return typeof value === "string" ? value : void 0;
-}
-function isTaskStepsForeach(node) {
-  return node.kind === "foreach" && node.config?.source === "task-steps";
-}
-function isFastLaneSkippableCustomNode(node, opts = {}) {
-  if (node.config?.summaryTarget === "task" || node.id === "completion-summary") return false;
-  if (opts.optionalGroupId) return false;
-  if (node.config?.seam) return false;
-  return node.kind === "prompt" || node.kind === "script" || node.kind === "gate";
-}
-function isFastLaneBypassedTemplateNode(node) {
-  return node.kind === "step-review";
-}
-function inactiveRoute() {
-  return {
-    active: false,
-    bypassedNodeIds: /* @__PURE__ */ new Set(),
-    bypassedPreMergeGroups: [],
-    parseStepsNodeIds: /* @__PURE__ */ new Set()
-  };
-}
-function resolveFastLaneRoute(ir2, task) {
-  if (!isFastExecutionMode(task)) return inactiveRoute();
-  const foreachNode = ir2.nodes.find(isTaskStepsForeach);
-  const executeNode = ir2.nodes.find((node) => configString(node, "seam") === "execute");
-  const implementationNode = foreachNode ?? executeNode;
-  if (!implementationNode) {
-    return { ...inactiveRoute(), unsupportedReason: "no-implementation-node" };
-  }
-  const implementationKind = foreachNode ? "foreach-steps" : "execute-seam";
-  const bypassedPreMergeGroups = resolveWorkflowOptionalSteps(ir2).filter((step) => step.phase === "pre-merge").map((step) => ({ nodeId: step.templateId, name: step.name }));
-  const bypassedGroupIds = new Set(bypassedPreMergeGroups.map((group) => group.nodeId));
-  const bypassedNodeIds = /* @__PURE__ */ new Set();
-  for (const node of ir2.nodes) {
-    if (isMergeRegionNode(node) || node.id === "completion-summary" || node.config?.summaryTarget === "task") continue;
-    if (configString(node, "seam") === "planning") {
-      bypassedNodeIds.add(node.id);
-      continue;
-    }
-    if (bypassedGroupIds.has(node.id)) {
-      bypassedNodeIds.add(node.id);
-      continue;
-    }
-    const workflowAction = configString(node, "workflowAction");
-    const groupId = configString(node, "forWorkflowStepId");
-    if (workflowAction === "plan-replan" || workflowAction === "plan-review-no-op" || workflowAction === "pre-merge-remediation" || workflowAction === "review-remediation-steps" || groupId !== void 0 && bypassedGroupIds.has(groupId)) {
-      bypassedNodeIds.add(node.id);
-    }
-  }
-  const parseStepsNodeIds = new Set(ir2.nodes.filter((node) => node.kind === "parse-steps").map((node) => node.id));
-  for (const parseNodeId of parseStepsNodeIds) {
-    if (bypassedNodeIds.has(parseNodeId)) {
-      throw new Error(`Fast lane cannot bypass parse-steps node '${parseNodeId}'`);
-    }
-  }
-  return {
-    active: true,
-    bypassedNodeIds,
-    bypassedPreMergeGroups,
-    parseStepsNodeIds,
-    implementationNodeId: implementationNode.id,
-    implementationKind
-  };
-}
-var FAST_LANE_STEP_NAME, FAST_LANE_SKIP_VALUE, FAST_LANE_STEP_REVIEW_ROUTE_VALUE;
-var init_workflow_fast_lane = __esm({
-  "../core/src/workflows/workflow-fast-lane.ts"() {
-    "use strict";
-    init_workflow_merge_region();
-    init_workflow_optional_steps();
-    FAST_LANE_STEP_NAME = "Fast implementation";
-    FAST_LANE_SKIP_VALUE = "fast-lane-skip";
-    FAST_LANE_STEP_REVIEW_ROUTE_VALUE = "approve";
-  }
-});
-
 // ../core/src/mesh/mesh-task-replication.ts
 function buildBootstrapPrompt(taskId, title, description) {
   const heading = title ? `${taskId}: ${title}` : taskId;
@@ -66445,10 +66489,10 @@ var init_migration = __esm({
           return basename6(projectPath);
         }
         try {
-          const { execFile: execFile46 } = await import("node:child_process");
-          const { promisify: promisify101 } = await import("node:util");
-          const execFileAsync40 = promisify101(execFile46);
-          const { stdout } = await execFileAsync40(
+          const { execFile: execFile47 } = await import("node:child_process");
+          const { promisify: promisify102 } = await import("node:util");
+          const execFileAsync41 = promisify102(execFile47);
+          const { stdout } = await execFileAsync41(
             "git",
             ["remote", "get-url", "origin"],
             { cwd: projectPath, timeout: 1e3 }
@@ -68643,10 +68687,10 @@ var init_central_core = __esm({
        */
       async generateProjectName(projectPath) {
         try {
-          const { execFile: execFile46 } = await import("node:child_process");
-          const { promisify: promisify101 } = await import("node:util");
-          const execFileAsync40 = promisify101(execFile46);
-          const { stdout } = await execFileAsync40(
+          const { execFile: execFile47 } = await import("node:child_process");
+          const { promisify: promisify102 } = await import("node:util");
+          const execFileAsync41 = promisify102(execFile47);
+          const { stdout } = await execFileAsync41(
             "git",
             ["remote", "get-url", "origin"],
             { cwd: projectPath, timeout: 5e3 }
@@ -85448,14 +85492,12 @@ async function listWorkflowDefinitionsImpl(store, options) {
   return pluginFiltered;
 }
 async function readAllWorkflowDefinitionsImpl(store) {
-  if (store.workflowDefinitionsCache) return store.workflowDefinitionsCache;
   const layer = store.getAsyncLayer();
   if (!layer) {
     throw new Error("workflow definitions: AsyncDataLayer not initialized in backend mode");
   }
   const rows = await listWorkflowRows(layer);
-  store.workflowDefinitionsCache = [...BUILTIN_WORKFLOWS, ...rows.map((row) => store.toWorkflowDefinition(row))];
-  return store.workflowDefinitionsCache;
+  return [...BUILTIN_WORKFLOWS, ...rows.map((row) => store.toWorkflowDefinition(row))];
 }
 async function getWorkflowDefinitionImpl(store, id) {
   const builtin = getBuiltinWorkflow(id);
@@ -85524,7 +85566,6 @@ function insertWorkflowDefinitionSyncImpl(store, input) {
       if (!isWorkflowDefinitionIdPrimaryKeyCollision(error3)) throw error3;
       continue;
     }
-    store.workflowDefinitionsCache = null;
     return definition;
   }
   throw new Error("Unable to allocate a free workflow definition id after repeated id collisions");
@@ -85914,11 +85955,6 @@ function getPluginStoreImpl(store) {
         ...pluginLayer ? { asyncLayer: pluginLayer } : {}
       }
     );
-    const clearWorkflowDefinitionCache = () => {
-      store.workflowDefinitionsCache = null;
-    };
-    store.pluginStore.on("plugin:registered", clearWorkflowDefinitionCache);
-    store.pluginStore.on("plugin:unregistered", clearWorkflowDefinitionCache);
   }
   return store.pluginStore;
 }
@@ -90290,11 +90326,11 @@ async function searchWithQmd(rootDir, options) {
   const command = "qmd";
   const limit = Math.max(1, Math.min(options.limit ?? 5, 20));
   try {
-    const execFileAsync40 = await getDefaultExecFileAsync();
-    await ensureQmdProjectMemoryCollection(rootDir, execFileAsync40);
+    const execFileAsync41 = await getDefaultExecFileAsync();
+    await ensureQmdProjectMemoryCollection(rootDir, execFileAsync41);
     scheduleQmdProjectMemoryRefresh(rootDir);
     const args = buildQmdSearchArgs(rootDir, options);
-    const { stdout } = await execFileAsync40(command, args, {
+    const { stdout } = await execFileAsync41(command, args, {
       cwd: rootDir,
       timeout: 4e3,
       maxBuffer: 1024 * 1024
@@ -90319,12 +90355,12 @@ async function searchWithQmd(rootDir, options) {
     return [];
   }
 }
-async function ensureQmdProjectMemoryCollection(rootDir, execFileAsync40) {
+async function ensureQmdProjectMemoryCollection(rootDir, execFileAsync41) {
   const collectionName = qmdMemoryCollectionName(rootDir);
   const memoryDir = memoryWorkspacePath(rootDir);
   await mkdir10(memoryDir, { recursive: true });
   try {
-    await execFileAsync40("qmd", buildQmdCollectionAddArgs(rootDir), {
+    await execFileAsync41("qmd", buildQmdCollectionAddArgs(rootDir), {
       cwd: rootDir,
       timeout: 4e3,
       maxBuffer: 512 * 1024
@@ -90422,14 +90458,14 @@ async function refreshQmdProjectMemoryIndex(rootDir, options) {
     }
   }
   const promise = (async () => {
-    const execFileAsync40 = options?.execFileAsync ?? await getDefaultExecFileAsync();
-    await ensureQmdProjectMemoryCollection(rootDir, execFileAsync40);
-    await execFileAsync40("qmd", ["update"], {
+    const execFileAsync41 = options?.execFileAsync ?? await getDefaultExecFileAsync();
+    await ensureQmdProjectMemoryCollection(rootDir, execFileAsync41);
+    await execFileAsync41("qmd", ["update"], {
       cwd: rootDir,
       timeout: 3e4,
       maxBuffer: 1024 * 1024
     });
-    await execFileAsync40("qmd", ["embed"], {
+    await execFileAsync41("qmd", ["embed"], {
       cwd: rootDir,
       timeout: 12e4,
       maxBuffer: 1024 * 1024
@@ -90465,12 +90501,12 @@ async function refreshQmdAgentMemoryIndex(rootDir, agentId, options) {
     }
   }
   const promise = (async () => {
-    const execFileAsync40 = options?.execFileAsync ?? await getDefaultExecFileAsync();
+    const execFileAsync41 = options?.execFileAsync ?? await getDefaultExecFileAsync();
     const { agentMemoryWorkspacePath: agentMemoryWorkspacePath2 } = await Promise.resolve().then(() => (init_memory_dreams(), memory_dreams_exports));
     const workspacePath = agentMemoryWorkspacePath2(rootDir, agentId);
     await mkdir10(workspacePath, { recursive: true });
     try {
-      await execFileAsync40("qmd", ["collection", "add", workspacePath, "--name", qmdAgentMemoryCollectionName(rootDir, agentId), "--mask", "**/*.md"], {
+      await execFileAsync41("qmd", ["collection", "add", workspacePath, "--name", qmdAgentMemoryCollectionName(rootDir, agentId), "--mask", "**/*.md"], {
         cwd: rootDir,
         timeout: 4e3,
         maxBuffer: 512 * 1024
@@ -90483,8 +90519,8 @@ ${stderr}`)) {
         throw err;
       }
     }
-    await execFileAsync40("qmd", ["update"], { cwd: rootDir, timeout: 3e4, maxBuffer: 1024 * 1024 });
-    await execFileAsync40("qmd", ["embed"], { cwd: rootDir, timeout: 12e4, maxBuffer: 1024 * 1024 });
+    await execFileAsync41("qmd", ["update"], { cwd: rootDir, timeout: 3e4, maxBuffer: 1024 * 1024 });
+    await execFileAsync41("qmd", ["embed"], { cwd: rootDir, timeout: 12e4, maxBuffer: 1024 * 1024 });
   })();
   qmdAgentRefreshState.set(key, { lastStartedAt: now, inFlight: promise });
   try {
@@ -90505,8 +90541,8 @@ function scheduleQmdAgentMemoryRefresh(rootDir, agentId) {
 }
 async function isQmdAvailable() {
   try {
-    const execFileAsync40 = await getDefaultExecFileAsync();
-    await execFileAsync40("qmd", ["--help"], {
+    const execFileAsync41 = await getDefaultExecFileAsync();
+    await execFileAsync41("qmd", ["--help"], {
       timeout: 3e3,
       maxBuffer: 128 * 1024,
       keepAlive: true
@@ -90517,12 +90553,12 @@ async function isQmdAvailable() {
   }
 }
 async function installQmd(options) {
-  const execFileAsync40 = options?.execFileAsync ?? await getDefaultExecFileAsync();
+  const execFileAsync41 = options?.execFileAsync ?? await getDefaultExecFileAsync();
   const [command, ...args] = QMD_INSTALL_COMMAND.split(" ");
   if (!command || args.length === 0) {
     throw new MemoryBackendError("BACKEND_UNAVAILABLE", "qmd install command is not configured", "qmd");
   }
-  await execFileAsync40(command, args, {
+  await execFileAsync41(command, args, {
     timeout: 12e4,
     maxBuffer: 1024 * 1024
   });
@@ -100037,7 +100073,6 @@ async function createWorkflowDefinitionImpl(store, input) {
         if (!isWorkflowDefinitionIdPrimaryKeyCollision(error3)) throw error3;
         continue;
       }
-      store.workflowDefinitionsCache = null;
       return definition;
     }
     throw new Error("Unable to allocate a free workflow definition id after repeated id collisions");
@@ -103621,7 +103656,6 @@ async function updateWorkflowDefinitionImpl(store, id, updates) {
       eq(project_exports.workflows.id, id),
       projectScopeFor(project_exports.workflows.projectId, layer.projectId)
     ));
-    store.workflowDefinitionsCache = null;
     return next;
   });
   if (pendingRehome) {
@@ -103656,7 +103690,6 @@ async function deleteWorkflowDefinitionImpl(store, id) {
     projectScopeFor(project_exports.workflows.projectId, layer.projectId)
   )).returning();
   if (deleted.length === 0) throw new Error(`Workflow '${id}' not found`);
-  store.workflowDefinitionsCache = null;
   await layer.db.delete(project_exports.workflowSettings).where(and(
     eq(project_exports.workflowSettings.workflowId, id),
     projectScopeFor(project_exports.workflowSettings.projectId, layer.projectId)
@@ -108250,7 +108283,6 @@ var init_store = __esm({
       taskIdIntegrityReport = { status: "ok", checkedAt: (/* @__PURE__ */ new Date()).toISOString(), anomalies: [] };
       lastTaskIdIntegrityLogSignature = null;
       workflowStepsCache = null;
-      workflowDefinitionsCache = null;
       _pluginWorkflowStepTemplates = [];
       globalSettingsStore;
       donePauseBackfillDone = false;
@@ -115880,7 +115912,7 @@ function getPostMergeFinalizeBlocker(task) {
 }
 function planConfirmedMergeChecklistReconciliation(task) {
   return {
-    skippedStepIndexes: task.steps.map((step, index2) => step.status === "pending" || step.status === "in-progress" ? index2 : -1).filter((index2) => index2 >= 0),
+    skippedStepIndexes: (task.steps ?? []).map((step, index2) => step.status === "pending" || step.status === "in-progress" ? index2 : -1).filter((index2) => index2 >= 0),
     reconciledWorkflowStepIds: (task.workflowStepResults ?? []).filter((result2) => result2.status === "pending").map((result2) => result2.workflowStepId)
   };
 }
@@ -135930,11 +135962,11 @@ var require_extract_zip = __commonJS({
     var { createWriteStream, promises: fs10 } = __require("fs");
     var getStream = require_get_stream();
     var path13 = __require("path");
-    var { promisify: promisify101 } = __require("util");
+    var { promisify: promisify102 } = __require("util");
     var stream = __require("stream");
     var yauzl = require_yauzl();
-    var openZip = promisify101(yauzl.open);
-    var pipeline = promisify101(stream.pipeline);
+    var openZip = promisify102(yauzl.open);
+    var pipeline = promisify102(stream.pipeline);
     var Extractor = class {
       constructor(zipPath, opts) {
         this.zipPath = zipPath;
@@ -136016,7 +136048,7 @@ var require_extract_zip = __commonJS({
         await fs10.mkdir(destDir, mkdirOptions);
         if (isDir) return;
         debug("opening read stream", dest);
-        const readStream = await promisify101(this.zipfile.openReadStream.bind(this.zipfile))(entry);
+        const readStream = await promisify102(this.zipfile.openReadStream.bind(this.zipfile))(entry);
         if (symlink) {
           const link = await getStream(readStream);
           debug("creating symlink", link, dest);
@@ -137455,6 +137487,7 @@ async function updateChatSession(handle2, id, input) {
   if (input.status !== void 0) setValues.status = input.status;
   if (input.modelProvider !== void 0) setValues.modelProvider = input.modelProvider;
   if (input.modelId !== void 0) setValues.modelId = input.modelId;
+  if (input.agentId !== void 0) setValues.agentId = input.agentId;
   if (input.thinkingLevel !== void 0) setValues.thinkingLevel = input.thinkingLevel;
   if (input.memoryFocus !== void 0) setValues.memoryFocus = input.memoryFocus;
   if (input.pinnedAt !== void 0) setValues.pinnedAt = input.pinnedAt;
@@ -138508,6 +138541,7 @@ var init_cli_session_store = __esm({
 });
 
 // ../core/src/secrets/oauth-credential-interop.ts
+import { createHash as createHash22 } from "node:crypto";
 import { existsSync as existsSync40, readFileSync as readFileSync11 } from "node:fs";
 import { homedir as homedir7 } from "node:os";
 import { join as join55 } from "node:path";
@@ -138567,6 +138601,22 @@ function getLastRefreshFallbackExpiryMs(lastRefresh) {
   }
   return parsed + CODEX_REFRESH_FALLBACK_WINDOW_MS;
 }
+function isSameStoredCredentialMaterial(left, right) {
+  if (!left || !right || left.type !== right.type) {
+    return false;
+  }
+  return left.key === right.key && left.access === right.access && left.refresh === right.refresh;
+}
+function computeStoredCredentialAccountFingerprint(credential) {
+  if (!credential) {
+    return void 0;
+  }
+  const material = typeof credential.refresh === "string" && credential.refresh.length > 0 ? credential.refresh : typeof credential.access === "string" && credential.access.length > 0 ? credential.access : typeof credential.key === "string" && credential.key.length > 0 ? credential.key : void 0;
+  if (!material) {
+    return void 0;
+  }
+  return createHash22("sha256").update(`${credential.type ?? ""}\0${material}`).digest("hex").slice(0, 16);
+}
 function isStoredAuthCredential(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) {
     return false;
@@ -139537,7 +139587,7 @@ var init_task_timing = __esm({
 });
 
 // ../core/src/task-recommendation-notice.ts
-import { createHash as createHash22 } from "node:crypto";
+import { createHash as createHash23 } from "node:crypto";
 function registerTaskRecommendationNoticeMailbox(store, mailbox) {
   mailboxes2.set(store, mailbox);
   return () => {
@@ -139562,7 +139612,7 @@ function buildTaskRecommendationNoticeContent(task, recommendations) {
 }
 function buildTaskRecommendationNoticeIdempotencyKey(taskId, recommendations) {
   const ids = recommendations.map(({ id }) => id).sort().join("\n");
-  const digest = createHash22("sha256").update(ids, "utf8").digest("hex").slice(0, 16);
+  const digest = createHash23("sha256").update(ids, "utf8").digest("hex").slice(0, 16);
   return `task-recommendation-notice:${taskId}:${digest}`;
 }
 async function notifyOperatorOfTaskRecommendations(store, task, recommendations, settings) {
@@ -140008,6 +140058,7 @@ __export(src_exports, {
   APPROVAL_REQUEST_STATUSES: () => APPROVAL_REQUEST_STATUSES,
   ARCHIVED_TASK_DOCUMENT_ADDITION_BOUNDARY: () => ARCHIVED_TASK_DOCUMENT_ADDITION_BOUNDARY,
   ARCHIVED_TASK_DOCUMENT_PUBLICATION_REJECTED: () => ARCHIVED_TASK_DOCUMENT_PUBLICATION_REJECTED,
+  AUTOMATED_BYPASS_ACTORS: () => AUTOMATED_BYPASS_ACTORS,
   AUTOMATION_PRESETS: () => AUTOMATION_PRESETS,
   AUTOMATION_SELECTABLE_TOOLS: () => AUTOMATION_SELECTABLE_TOOLS,
   AUTOPILOT_STATES: () => AUTOPILOT_STATES,
@@ -140203,6 +140254,7 @@ __export(src_exports, {
   FAST_LANE_SKIP_VALUE: () => FAST_LANE_SKIP_VALUE,
   FAST_LANE_STEP_NAME: () => FAST_LANE_STEP_NAME,
   FAST_LANE_STEP_REVIEW_ROUTE_VALUE: () => FAST_LANE_STEP_REVIEW_ROUTE_VALUE,
+  FAST_MODE_BYPASS_ACTOR: () => FAST_MODE_BYPASS_ACTOR,
   FEATURE_LOOP_REPAIR_TRANSITIONS: () => FEATURE_LOOP_REPAIR_TRANSITIONS,
   FEATURE_LOOP_STATES: () => FEATURE_LOOP_STATES,
   FEATURE_STATUSES: () => FEATURE_STATUSES,
@@ -140767,6 +140819,7 @@ __export(src_exports, {
   computeRetrySummary: () => computeRetrySummary,
   computeSkillId: () => computeSkillId,
   computeSnapshotChecksum: () => computeSnapshotChecksum,
+  computeStoredCredentialAccountFingerprint: () => computeStoredCredentialAccountFingerprint,
   computeWorkflowIrPin: () => computeWorkflowIrPin,
   configurationTargetKey: () => configurationTargetKey,
   configureApprovalRequestTtls: () => configureApprovalRequestTtls,
@@ -141089,6 +141142,7 @@ __export(src_exports, {
   isApprovalRequestExpired: () => isApprovalRequestExpired,
   isArchivedColumnRole: () => isArchivedColumnRole,
   isArchivedRemediationCarrier: () => isArchivedRemediationCarrier,
+  isAuditedOperatorBypass: () => isAuditedOperatorBypass,
   isBlockingFinding: () => isBlockingFinding,
   isBranchGroupComplete: () => isBranchGroupComplete,
   isBranchGroupMemberLanded: () => isBranchGroupMemberLanded,
@@ -141176,6 +141230,7 @@ __export(src_exports, {
   isReviewColumnRole: () => isReviewColumnRole,
   isRunRecord: () => isRunRecord,
   isRunningAgentTask: () => isRunningAgentTask,
+  isSameStoredCredentialMaterial: () => isSameStoredCredentialMaterial,
   isSanctionedEngineBackwardMove: () => isSanctionedEngineBackwardMove,
   isSandboxExperimentalEnabled: () => isSandboxExperimentalEnabled,
   isSecretAccessPolicy: () => isSecretAccessPolicy,
@@ -141454,6 +141509,7 @@ __export(src_exports, {
   renderTriagePolicyPlaceholders: () => renderTriagePolicyPlaceholders,
   renderValidationCause: () => renderValidationCause,
   renderValidationFailureDescription: () => renderValidationFailureDescription,
+  requiresContentReviewProof: () => requiresContentReviewProof,
   requiresPlannerConfirmation: () => requiresPlannerConfirmation,
   requiresWorktrunkInstallVerification: () => requiresWorktrunkInstallVerification,
   resetGhAvailabilityCache: () => resetGhAvailabilityCache,
@@ -141617,6 +141673,7 @@ __export(src_exports, {
   resolveTitleSummarizerSettingsModel: () => resolveTitleSummarizerSettingsModel,
   resolveToolOutputBudget: () => resolveToolOutputBudget,
   resolveTrailingVerificationStepIndex: () => resolveTrailingVerificationStepIndex,
+  resolveUnprovenReviewApproval: () => resolveUnprovenReviewApproval,
   resolveUpdateAutomationSettings: () => resolveUpdateAutomationSettings,
   resolveUpdateTargetVersion: () => resolveUpdateTargetVersion,
   resolveUpdatesExternallyManaged: () => resolveUpdatesExternallyManaged,
@@ -142251,7 +142308,7 @@ var init_logger3 = __esm({
 });
 
 // ../engine/src/agents/agent-logger.ts
-import { createHash as createHash23 } from "node:crypto";
+import { createHash as createHash24 } from "node:crypto";
 function truncateToolResultDetail(value) {
   if (value.length <= TOOL_RESULT_DETAIL_LIMIT) return value;
   return `${value.slice(0, TOOL_RESULT_DETAIL_LIMIT)}${TOOL_RESULT_DETAIL_TRUNCATION_NOTICE}`;
@@ -142359,7 +142416,7 @@ function summarizeToolArgs(name2, args) {
     return `${key}=${clipToolArgValue(compactToolArgValue(args[key]), maximum)}`;
   }).join(", ");
   if (rendered.length <= TOOL_ARG_SUMMARY_MAX) return rendered;
-  const hash3 = createHash23("sha256").update(fullArgsJson).digest("hex").slice(0, STRUCTURED_ARG_HASH_HEX_LEN);
+  const hash3 = createHash24("sha256").update(fullArgsJson).digest("hex").slice(0, STRUCTURED_ARG_HASH_HEX_LEN);
   const suffix = `\u2026#${hash3}`;
   const keep = Math.max(0, TOOL_ARG_SUMMARY_MAX - suffix.length);
   return `${rendered.slice(0, keep)}${suffix}`;
@@ -144126,6 +144183,14 @@ function resolveAiMergeRootPath(rootDir, settings) {
 function resolveLegacyAiMergeRootPath(rootDir) {
   return join58(rootDir, ".fusion", "ai-merge");
 }
+function resolveAiMergeSearchRoots(rootDir, settings) {
+  const roots = [
+    resolveAiMergeRootPath(rootDir, settings),
+    resolveLegacyAiMergeRootPath(rootDir),
+    ...settings?.worktreesDir ? [] : [join58(resolveLegacyWorktreesDirLayout(rootDir), AI_MERGE_DIRNAME)]
+  ];
+  return [...new Set(roots)];
+}
 function resolveWorktreesDir(rootDir, settings, workspaceContext) {
   return resolveWorktreesDirLayout(rootDir, settings, workspaceContext);
 }
@@ -145884,18 +145949,25 @@ function parseWorktreesFromPorcelain(porcelain) {
   if (current.path) rows.push({ path: current.path, branch: current.branch });
   return rows;
 }
+function isRegenerableIgnoredPorcelainEntry(entry) {
+  const path13 = entry.slice(3).replace(/\/$/, "");
+  if (!path13 || path13.startsWith('"')) return false;
+  const lastSegment = path13.split("/").at(-1);
+  return lastSegment !== void 0 && REGENERABLE_IGNORED_DIR_NAMES.has(lastSegment);
+}
 function classifyWorktreeRemovalContent(porcelain) {
   const entries = porcelain.split(/\r?\n/).filter((line2) => line2.trim().length > 0);
   if (entries.length === 0) return "clean";
-  return entries.every((line2) => line2.startsWith("!!")) ? "ignored-only" : "deliverable";
+  if (entries.some((line2) => !line2.startsWith("!! "))) return "deliverable";
+  return entries.every(isRegenerableIgnoredPorcelainEntry) ? "regenerable-ignored" : "ignored-only";
 }
 async function assertCleanForDefensiveRemoval(worktreePath) {
   if (!existsSync44(worktreePath)) {
-    return "clean";
+    return { classification: "clean", entryCount: 0 };
   }
   let stdout;
   try {
-    ({ stdout } = await execFileAsync6("git", ["status", "--porcelain=v1", "--ignored", "--untracked-files=normal"], {
+    ({ stdout } = await execFileAsync6("git", ["status", "--porcelain=v1", "--ignored=matching", "--untracked-files=normal"], {
       cwd: worktreePath,
       encoding: "utf-8",
       timeout: 15e3,
@@ -145908,7 +145980,10 @@ async function assertCleanForDefensiveRemoval(worktreePath) {
   if (classification === "deliverable") {
     throw new Error(`preserving ${worktreePath}: uncommitted or ignored content present`);
   }
-  return classification;
+  return {
+    classification,
+    entryCount: stdout.split(/\r?\n/).filter((line2) => line2.trim().length > 0).length
+  };
 }
 async function removeWorktree(input) {
   const logger3 = {
@@ -145925,9 +146000,12 @@ async function removeWorktree(input) {
   }
   const requiresCleanWorktree = DEFENSIVE_REMOVAL_REASONS.has(input.reason);
   let contentClassification;
+  let contentEntryCount = 0;
   if (requiresCleanWorktree) {
     try {
-      contentClassification = await assertCleanForDefensiveRemoval(input.worktreePath);
+      const contentProbe = await assertCleanForDefensiveRemoval(input.worktreePath);
+      contentClassification = contentProbe.classification;
+      contentEntryCount = contentProbe.entryCount;
     } catch (error3) {
       const classification = error3 instanceof Error && error3.message.includes(": status probe failed (") ? "unverifiable" : "deliverable";
       await input.audit?.git({
@@ -145944,6 +146022,17 @@ async function removeWorktree(input) {
       throw error3;
     }
     if (contentClassification === "ignored-only" && !input.postLandingProof) {
+      await input.audit?.git({
+        type: "worktree:removal-preserved",
+        target: input.worktreePath,
+        metadata: {
+          taskId: input.taskId,
+          reason: input.reason,
+          source: void 0,
+          classification: "ignored-only",
+          hasPostLandingProof: false
+        }
+      }).catch(() => void 0);
       throw new Error(`preserving ${input.worktreePath}: uncommitted or ignored content present`);
     }
   }
@@ -145963,6 +146052,17 @@ async function removeWorktree(input) {
     } catch {
     }
   };
+  const recordRegenerableDiscard = async () => {
+    if (contentClassification !== "regenerable-ignored") return;
+    try {
+      await input.audit?.git({
+        type: "worktree:removal-discarded-regenerable-content",
+        target: input.worktreePath,
+        metadata: { taskId: input.taskId, reason: input.reason, entryCount: contentEntryCount }
+      });
+    } catch {
+    }
+  };
   if (input.expectedOwnerTaskId && input.liveOwnerProbe) {
     const reconciled = reconcileSelfOwnedActiveSessionForRemoval(
       activeSessionRegistry,
@@ -146016,6 +146116,7 @@ async function removeWorktree(input) {
   try {
     await backend.remove(removeInput);
     await recordIgnoredOnlyDiscard();
+    await recordRegenerableDiscard();
     if (input.audit) {
       await input.audit.git({
         type: backend.kind === "worktrunk" ? "worktree:worktrunk-remove" : "worktree:remove",
@@ -146043,6 +146144,7 @@ async function removeWorktree(input) {
     try {
       await native.remove(removeInput);
       await recordIgnoredOnlyDiscard();
+      await recordRegenerableDiscard();
       await input.audit?.git({ type: "worktree:remove", target: input.worktreePath });
       return { removed: true, classification: "removed" };
     } catch (nativeError) {
@@ -146064,7 +146166,7 @@ function resolveWorktreeBackend(settings, deps = {}) {
   }
   return new NativeWorktreeBackend({ logger: deps.logger, settings, audit: deps.audit });
 }
-var execAsync9, execFileAsync6, NATIVE_TIMEOUT_MS, REMOVE_TIMEOUT_MS, MAX_BUFFER3, HARMLESS_MERGE_REMOVE_ERROR_PATTERNS, WORKTRUNK_TIMEOUTS_MS, WORKTREE_BACKEND_MARKER, WorktrunkOperationError, NativeWorktreeBackend, WorktrunkWorktreeBackend, RemovalReason, ALLOWED_FORCE_REASONS, DEFENSIVE_REMOVAL_REASONS, POST_LANDING_PROOF_REASONS, InvalidForceUsageError, InvalidPostLandingProofUsageError, ActiveSessionWorktreeRemovalError;
+var execAsync9, execFileAsync6, NATIVE_TIMEOUT_MS, REMOVE_TIMEOUT_MS, MAX_BUFFER3, HARMLESS_MERGE_REMOVE_ERROR_PATTERNS, WORKTRUNK_TIMEOUTS_MS, WORKTREE_BACKEND_MARKER, WorktrunkOperationError, NativeWorktreeBackend, WorktrunkWorktreeBackend, RemovalReason, ALLOWED_FORCE_REASONS, DEFENSIVE_REMOVAL_REASONS, POST_LANDING_PROOF_REASONS, InvalidForceUsageError, InvalidPostLandingProofUsageError, ActiveSessionWorktreeRemovalError, REGENERABLE_IGNORED_DIR_NAMES;
 var init_worktree_backend = __esm({
   "../engine/src/worktree/worktree-backend.ts"() {
     "use strict";
@@ -146804,6 +146906,27 @@ ${getErrorStderr(error3) ?? ""}`;
         this.name = "ActiveSessionWorktreeRemovalError";
       }
     };
+    REGENERABLE_IGNORED_DIR_NAMES = /* @__PURE__ */ new Set([
+      "node_modules",
+      "dist",
+      "build",
+      "out",
+      "target",
+      "bin",
+      "obj",
+      "coverage",
+      ".next",
+      ".nuxt",
+      ".turbo",
+      ".svelte-kit",
+      ".parcel-cache",
+      ".pytest_cache",
+      ".mypy_cache",
+      "__pycache__",
+      ".gradle",
+      ".venv",
+      "venv"
+    ]);
   }
 });
 
@@ -147423,7 +147546,7 @@ var init_gating_classifications = __esm({
 });
 
 // ../engine/src/agents/agent-action-gate.ts
-import { createHash as createHash24 } from "node:crypto";
+import { createHash as createHash25 } from "node:crypto";
 function getExemptTools() {
   if (!_exemptTools) {
     _exemptTools = new Set(DEFAULT_EXEMPT_TOOLS);
@@ -147475,7 +147598,7 @@ function evaluateAgentActionGate(params) {
   if (params.toolName === "bash") {
     const command = extractShellCommand(args);
     const git11 = classifyGitCommand(command);
-    resourceId = command ? `cmd:${createHash24("sha256").update(command).digest("hex").slice(0, 16)}` : void 0;
+    resourceId = command ? `cmd:${createHash25("sha256").update(command).digest("hex").slice(0, 16)}` : void 0;
     if (git11?.write) {
       category = "git_write";
       operation = git11.operation;
@@ -149241,6 +149364,15 @@ async function withOAuthRefreshLock(authPath, providerId, refresh) {
     await release3();
   }
 }
+async function withOAuthInstanceLoginLock(authPath, providerId, operation) {
+  const safeProviderId = providerId.replace(/[^a-zA-Z0-9._-]/g, "_");
+  const release3 = await import_proper_lockfile.default.lock(`${authPath}.${safeProviderId}.instance-login`, AUTH_LOCK_OPTIONS);
+  try {
+    return await operation();
+  } finally {
+    await release3();
+  }
+}
 function readDefaultInstanceMap(data) {
   const candidate = data.__fusionDefaultInstances;
   if (!candidate || typeof candidate !== "object" || Array.isArray(candidate)) return {};
@@ -149530,7 +149662,7 @@ function createFusionAuthStorage() {
       primary.reload();
       const selectPersistedRefreshCredential = () => {
         const storedCredential = primary.get(storageProvider);
-        if (refreshLockProvider !== ANTHROPIC_PROVIDER_ID2) {
+        if (storedCredential?.type === "oauth" || refreshLockProvider !== ANTHROPIC_PROVIDER_ID2) {
           return storedCredential;
         }
         const legacyCredential = primary.get(ANTHROPIC_PROVIDER_ID2);
@@ -149660,18 +149792,16 @@ function createFusionAuthStorage() {
       if (rawKey) return rawKey;
     }
     const subscriptionLoggedOut = loggedOutProviders.has(ANTHROPIC_SUBSCRIPTION_PROVIDER_ID);
-    const legacyAnthropicOAuthCredential = rawProviderLoggedOut ? void 0 : selectStoredCredentialByType(ANTHROPIC_PROVIDER_ID2, "oauth");
+    const subscriptionCredential = subscriptionLoggedOut ? void 0 : selectStoredCredential(ANTHROPIC_SUBSCRIPTION_PROVIDER_ID);
+    if (subscriptionCredential?.type === "oauth") {
+      const subscriptionKey = await resolveRefreshableCredentialApiKey(ANTHROPIC_SUBSCRIPTION_PROVIDER_ID, subscriptionCredential);
+      if (subscriptionKey) return subscriptionKey;
+    }
+    const legacyAnthropicOAuthCredential = rawProviderLoggedOut || subscriptionCredential ? void 0 : selectStoredCredentialByType(ANTHROPIC_PROVIDER_ID2, "oauth");
     if (!subscriptionLoggedOut && legacyAnthropicOAuthCredential) {
       const legacyKey = await resolveRefreshableCredentialApiKey(ANTHROPIC_PROVIDER_ID2, legacyAnthropicOAuthCredential);
       if (legacyKey) return legacyKey;
     }
-    if (!subscriptionLoggedOut) {
-      const subscriptionCredential = selectStoredCredential(ANTHROPIC_SUBSCRIPTION_PROVIDER_ID);
-      if (subscriptionCredential?.type === "oauth") {
-        const subscriptionKey = await resolveRefreshableCredentialApiKey(ANTHROPIC_SUBSCRIPTION_PROVIDER_ID, subscriptionCredential);
-        if (subscriptionKey) return subscriptionKey;
-      }
-    }
     if (preferSubscription) {
       const rawKey = resolveRawApiKey();
       if (rawKey) return rawKey;
@@ -149848,8 +149978,15 @@ function createFusionAuthStorage() {
               return void 0;
             }
             if (sourceProvider !== ANTHROPIC_SUBSCRIPTION_PROVIDER_ID) {
-              await primary.set(ANTHROPIC_SUBSCRIPTION_PROVIDER_ID, subscriptionCredential);
-              loggedOutProviders.delete(ANTHROPIC_SUBSCRIPTION_PROVIDER_ID);
+              const legacyKey = await resolveRefreshableCredentialApiKey(ANTHROPIC_PROVIDER_ID2, subscriptionCredential);
+              primary.reload();
+              const storedSubscription = primary.get(ANTHROPIC_SUBSCRIPTION_PROVIDER_ID);
+              const refreshedLegacyCredential = primary.get(ANTHROPIC_PROVIDER_ID2);
+              if (!storedSubscription && refreshedLegacyCredential?.type === "oauth") {
+                await primary.set(ANTHROPIC_SUBSCRIPTION_PROVIDER_ID, refreshedLegacyCredential);
+                loggedOutProviders.delete(ANTHROPIC_SUBSCRIPTION_PROVIDER_ID);
+              }
+              return legacyKey;
             }
             return resolveRefreshableCredentialApiKey(ANTHROPIC_SUBSCRIPTION_PROVIDER_ID, subscriptionCredential);
           }
@@ -149894,6 +150031,9 @@ var init_auth_storage = __esm({
       }
       data = {};
       modelRuntime;
+      async withProviderInstanceLoginLock(providerId, operation) {
+        return withOAuthInstanceLoginLock(this.authPath, providerId, operation);
+      }
       ensureFile() {
         const parent = dirname26(this.authPath);
         if (!existsSync45(parent)) mkdirSync7(parent, { recursive: true, mode: 448 });
@@ -150236,6 +150376,35 @@ var init_model_registry_refresh = __esm({
 });
 
 // ../engine/src/auth/provider-auth.ts
+async function withProviderInstanceLoginLock(authStorage, providerId, operation) {
+  let locks = instanceLoginLocks.get(authStorage);
+  if (!locks) {
+    locks = /* @__PURE__ */ new Map();
+    instanceLoginLocks.set(authStorage, locks);
+  }
+  const previous = locks.get(providerId);
+  let release3;
+  const gate = new Promise((resolve65) => {
+    release3 = resolve65;
+  });
+  const queued = (previous ?? Promise.resolve()).catch(() => void 0).then(() => gate);
+  locks.set(providerId, queued);
+  await (previous ?? Promise.resolve()).catch(() => void 0);
+  try {
+    if (!authStorage.withProviderInstanceLoginLock) {
+      return await operation();
+    }
+    return await authStorage.withProviderInstanceLoginLock(providerId, async () => {
+      authStorage.reload();
+      return await operation();
+    });
+  } finally {
+    release3();
+    if (locks.get(providerId) === queued) {
+      locks.delete(providerId);
+    }
+  }
+}
 function toApiKeyStorageProviderId(providerId) {
   return providerId === ANTHROPIC_API_KEY_PROVIDER_ID2 ? ANTHROPIC_STORAGE_PROVIDER_ID : providerId;
 }
@@ -150273,7 +150442,18 @@ function wrapAuthStorageWithApiKeyProviders(authStorage, modelRegistry, readFall
         providerId,
         callbacks
       );
-      return;
+      const credential = authStorage.get(providerId);
+      if (credential?.type !== "oauth") {
+        return credential;
+      }
+      const stampedCredential = {
+        ...credential,
+        ...computeStoredCredentialAccountFingerprint(credential) ? {
+          accountFingerprint: computeStoredCredentialAccountFingerprint(credential)
+        } : {}
+      };
+      await authStorage.set(providerId, stampedCredential);
+      return stampedCredential;
     }
     const existingApiKey = mergedAuthStorage.get(ANTHROPIC_STORAGE_PROVIDER_ID);
     await mergedAuthStorage.login(
@@ -150282,19 +150462,29 @@ function wrapAuthStorageWithApiKeyProviders(authStorage, modelRegistry, readFall
     );
     const oauthCredential = authStorage.get(ANTHROPIC_STORAGE_PROVIDER_ID);
     if (oauthCredential?.type === "oauth") {
-      await mergedAuthStorage.set(ANTHROPIC_SUBSCRIPTION_STORAGE_PROVIDER_ID, oauthCredential);
+      const stampedCredential = {
+        ...oauthCredential,
+        ...computeStoredCredentialAccountFingerprint(oauthCredential) ? {
+          accountFingerprint: computeStoredCredentialAccountFingerprint(oauthCredential)
+        } : {}
+      };
+      await mergedAuthStorage.set(ANTHROPIC_SUBSCRIPTION_STORAGE_PROVIDER_ID, stampedCredential);
       if (existingApiKey?.type === "api_key") {
         await mergedAuthStorage.set(ANTHROPIC_STORAGE_PROVIDER_ID, existingApiKey);
       } else {
         await authStorage.remove(ANTHROPIC_STORAGE_PROVIDER_ID);
       }
+      return stampedCredential;
     }
+    return void 0;
   };
   return {
     reload: () => mergedAuthStorage.reload(),
     getOAuthProviders: () => mergedAuthStorage.getOAuthProviders().map((provider) => provider.id === ANTHROPIC_STORAGE_PROVIDER_ID ? { id: ANTHROPIC_STORAGE_PROVIDER_ID, name: "Anthropic Subscription" } : { id: provider.id, name: provider.name }),
     hasAuth: (provider) => provider === ANTHROPIC_STORAGE_PROVIDER_ID || provider === ANTHROPIC_SUBSCRIPTION_STORAGE_PROVIDER_ID ? Boolean(getAnthropicSubscriptionCredential()) : mergedAuthStorage.hasAuth(provider),
-    login,
+    login: async (providerId, callbacks) => {
+      await login(providerId, callbacks);
+    },
     logout: async (provider) => {
       if (provider !== ANTHROPIC_STORAGE_PROVIDER_ID && provider !== ANTHROPIC_SUBSCRIPTION_STORAGE_PROVIDER_ID) {
         await mergedAuthStorage.logout(provider);
@@ -150378,19 +150568,33 @@ function wrapAuthStorageWithApiKeyProviders(authStorage, modelRegistry, readFall
     },
     loginInstance: async (ref, callbacks, label) => {
       const providerId = ref.providerId === ANTHROPIC_STORAGE_PROVIDER_ID ? ANTHROPIC_SUBSCRIPTION_STORAGE_PROVIDER_ID : ref.providerId;
-      const target = { providerId, instanceId: ref.instanceId };
-      const previousDefault = mergedAuthStorage.getDefaultInstance(providerId);
-      const previousCredential = previousDefault && mergedAuthStorage.getInstance(previousDefault);
-      await login(providerId, callbacks);
-      const credential = mergedAuthStorage.get(providerId);
-      if (!credential) return;
-      await mergedAuthStorage.setInstance(target, { ...credential, ...label ? { label } : {} });
-      if (previousDefault && previousCredential && previousDefault.instanceId !== target.instanceId) {
-        await mergedAuthStorage.setInstance(previousDefault, previousCredential);
-      } else if (!previousDefault && target.instanceId !== DEFAULT_PROVIDER_INSTANCE_ID) {
-        await mergedAuthStorage.removeInstance({ providerId, instanceId: DEFAULT_PROVIDER_INSTANCE_ID });
-        await mergedAuthStorage.setDefaultInstance(target);
-      }
+      return withProviderInstanceLoginLock(authStorage, providerId, async () => {
+        const target = { providerId, instanceId: ref.instanceId };
+        const previousDefault = mergedAuthStorage.getDefaultInstance(providerId);
+        const previousCredential = previousDefault && mergedAuthStorage.getInstance(previousDefault);
+        const preLoginInstances = mergedAuthStorage.listInstances(providerId).map((instanceRef) => ({ ref: instanceRef, credential: mergedAuthStorage.getInstance(instanceRef) })).filter((entry) => Boolean(entry.credential));
+        const credential = await login(providerId, callbacks);
+        if (!credential) return;
+        const duplicate = preLoginInstances.find(
+          (entry) => entry.ref.instanceId !== target.instanceId && isSameStoredCredentialMaterial(credential, entry.credential)
+        );
+        if (duplicate) {
+          if (previousDefault && previousCredential) {
+            await mergedAuthStorage.setInstance(previousDefault, previousCredential);
+          }
+          const conflictingAccount = duplicate.credential.label || duplicate.ref.instanceId;
+          throw new Error(
+            `This login authorized the account already stored as ${conflictingAccount}. Sign out of the provider in your browser and retry.`
+          );
+        }
+        await mergedAuthStorage.setInstance(target, { ...credential, ...label ? { label } : {} });
+        if (previousDefault && previousCredential && previousDefault.instanceId !== target.instanceId) {
+          await mergedAuthStorage.setInstance(previousDefault, previousCredential);
+        } else if (!previousDefault && target.instanceId !== DEFAULT_PROVIDER_INSTANCE_ID) {
+          await mergedAuthStorage.removeInstance({ providerId, instanceId: DEFAULT_PROVIDER_INSTANCE_ID });
+          await mergedAuthStorage.setDefaultInstance(target);
+        }
+      });
     },
     logoutInstance: async (ref) => {
       await mergedAuthStorage.removeInstance({
@@ -150634,7 +150838,7 @@ function createReadOnlyAuthFileStorage(authPaths) {
     }
   };
 }
-var ANTHROPIC_API_KEY_PROVIDER_ID2, ANTHROPIC_STORAGE_PROVIDER_ID, ANTHROPIC_SUBSCRIPTION_STORAGE_PROVIDER_ID, BUILT_IN_API_KEY_PROVIDERS, CLI_PROVIDER_IDS;
+var ANTHROPIC_API_KEY_PROVIDER_ID2, ANTHROPIC_STORAGE_PROVIDER_ID, ANTHROPIC_SUBSCRIPTION_STORAGE_PROVIDER_ID, BUILT_IN_API_KEY_PROVIDERS, CLI_PROVIDER_IDS, instanceLoginLocks;
 var init_provider_auth = __esm({
   "../engine/src/auth/provider-auth.ts"() {
     "use strict";
@@ -150654,6 +150858,7 @@ var init_provider_auth = __esm({
       { id: "zai", name: "Zai" }
     ];
     CLI_PROVIDER_IDS = /* @__PURE__ */ new Set(["pi-claude-cli", "droid-cli"]);
+    instanceLoginLocks = /* @__PURE__ */ new WeakMap();
   }
 });
 
@@ -151039,7 +151244,7 @@ var init_plan_review_continuation = __esm({
 });
 
 // ../engine/src/execution/hold-release.ts
-import { createHash as createHash25 } from "node:crypto";
+import { createHash as createHash26 } from "node:crypto";
 import { readFile as readFile36 } from "node:fs/promises";
 function findColumn2(ir2, columnId) {
   if (ir2.version !== "v2") return void 0;
@@ -151077,9 +151282,9 @@ async function checkAndRecordUnplannedExecutionBlock(store, task, ir2) {
       promptContent = "";
     }
   }
-  const promptMarker = promptContent.length > 0 ? createHash25("sha256").update(promptContent).digest("hex") : "missing";
+  const promptMarker = promptContent.length > 0 ? createHash26("sha256").update(promptContent).digest("hex") : "missing";
   const dependencies = [...task.dependencies ?? []].sort();
-  const episode = createHash25("sha256").update(JSON.stringify({
+  const episode = createHash26("sha256").update(JSON.stringify({
     planReviewNode,
     promptMarker,
     dependencies,
@@ -175048,6 +175253,7 @@ async function connectMcpSessionTools(servers, opts = {}) {
   const clients = [];
   const closedClients = /* @__PURE__ */ new WeakSet();
   const usedToolNames = /* @__PURE__ */ new Set();
+  const serverByToolName = /* @__PURE__ */ new Map();
   let disposed = false;
   const closeOnce = async (client) => {
     if (closedClients.has(client)) return;
@@ -175097,7 +175303,9 @@ async function connectMcpSessionTools(servers, opts = {}) {
             opts.logger?.log?.(connectMsg);
           }
           for (const tool of listedTools) {
-            tools.push(wrapMcpTool(server.name, tool, client, usedToolNames));
+            const wrappedTool = wrapMcpTool(server.name, tool, client, usedToolNames);
+            tools.push(wrappedTool);
+            serverByToolName.set(wrappedTool.name, server.name);
           }
           break;
         } catch (error3) {
@@ -175124,7 +175332,7 @@ async function connectMcpSessionTools(servers, opts = {}) {
       await closeAll();
     }
   }
-  return { tools, connected, skipped, dispose: closeAll };
+  return { tools, connected, skipped, serverByToolName, dispose: closeAll };
 }
 function normalizeMaxAttempts(value) {
   if (value === void 0 || !Number.isFinite(value)) return DEFAULT_MAX_ATTEMPTS;
@@ -178264,8 +178472,10 @@ async function createPiAgentSessionRaw(options) {
   const createSessionWithModel = async (modelOverride) => {
     let mcpToolset;
     const allowReadonlyMcpTools = options.allowMcpToolsInReadonly === true;
-    if (forwardedMcpServers.length > 0 && (!isReadonly || allowReadonlyMcpTools)) {
-      mcpToolset = await connectMcpSessionTools(forwardedMcpServers, {
+    const readonlyMcpServerAllowlist = options.readonlyMcpServerAllowlist === void 0 ? void 0 : new Set(options.readonlyMcpServerAllowlist.map((name2) => name2.trim()).filter(Boolean));
+    const mcpServersToConnect = isReadonly && allowReadonlyMcpTools && readonlyMcpServerAllowlist !== void 0 ? forwardedMcpServers.filter((server) => readonlyMcpServerAllowlist.has(server.name)) : forwardedMcpServers;
+    if (mcpServersToConnect.length > 0 && (!isReadonly || allowReadonlyMcpTools)) {
+      mcpToolset = await connectMcpSessionTools(mcpServersToConnect, {
         cwd: options.cwd,
         clientFactory: options.mcpClientFactory,
         logger: piLog,
@@ -178276,7 +178486,8 @@ async function createPiAgentSessionRaw(options) {
         piLog.warn(`MCP session continuing with unavailable servers: count=${bootstrapFailures.length}`);
       }
     } else if (forwardedMcpServers.length > 0 && isReadonly) {
-      piLog.debug(`readonly session \u2014 MCP servers (${forwardedMcpServers.length}) skipped`);
+      const reason = !allowReadonlyMcpTools ? "no-readonly-opt-in" : "readonly-allowlist-no-match";
+      piLog.log(`readonly session \u2014 MCP servers (${forwardedMcpServers.length}) skipped: reason=${reason}`);
     }
     const mcpReadonlyTools = new Set(mcpToolset?.tools ?? []);
     const candidateCustomTools = [
@@ -178285,7 +178496,9 @@ async function createPiAgentSessionRaw(options) {
     ];
     const readonlyFilteredCustomTools = isReadonly ? filterCustomToolsForReadonly(
       candidateCustomTools,
-      allowReadonlyMcpTools ? { allowTool: (tool) => mcpReadonlyTools.has(tool) } : {}
+      allowReadonlyMcpTools ? {
+        allowTool: (tool) => readonlyMcpServerAllowlist === void 0 ? mcpReadonlyTools.has(tool) : readonlyMcpServerAllowlist.has(mcpToolset?.serverByToolName?.get(tool.name) ?? "")
+      } : {}
     ) : { allowed: candidateCustomTools, denied: [] };
     const allowlistFilteredCustomTools = {
       ...readonlyFilteredCustomTools,
@@ -180297,7 +180510,7 @@ var init_retry_burned_logger = __esm({
 
 // ../engine/src/merge/merge-dependency-sync.ts
 import { exec as exec18 } from "node:child_process";
-import { createHash as createHash26 } from "node:crypto";
+import { createHash as createHash27 } from "node:crypto";
 import { existsSync as existsSync49, readFileSync as readFileSync19, writeFileSync as writeFileSync6 } from "node:fs";
 import { join as join67 } from "node:path";
 import { promisify as promisify23 } from "node:util";
@@ -180330,7 +180543,7 @@ function computeLockfileHash(rootDir) {
     const p2 = join67(rootDir, name2);
     if (existsSync49(p2)) {
       try {
-        return createHash26("sha256").update(readFileSync19(p2)).digest("hex");
+        return createHash27("sha256").update(readFileSync19(p2)).digest("hex");
       } catch {
         return null;
       }
@@ -180460,7 +180673,7 @@ var init_merge_dependency_sync = __esm({
 });
 
 // ../engine/src/worktree/worktree-dependency-install.ts
-import { createHash as createHash27 } from "node:crypto";
+import { createHash as createHash28 } from "node:crypto";
 import { existsSync as existsSync50, readFileSync as readFileSync20, readdirSync as readdirSync8, statSync as statSync11, writeFileSync as writeFileSync7 } from "node:fs";
 import { delimiter as delimiter2, join as join68 } from "node:path";
 function rootEntries(rootDir) {
@@ -180558,7 +180771,7 @@ function isCommandAvailable(binary, env = process.env) {
   );
 }
 function hashParts(parts) {
-  const hash3 = createHash27("sha256");
+  const hash3 = createHash28("sha256");
   for (const [name2, value] of [...parts].sort(([left], [right]) => left.localeCompare(right))) {
     hash3.update(name2).update("\0").update(value).update("\0");
   }
@@ -186546,7 +186759,7 @@ var init_mission_feature_sync = __esm({
 // ../engine/src/agent-tools.ts
 import { appendFile as appendFile3, mkdir as mkdir27, readFile as readFile40, readdir as readdir11, realpath, stat as stat11, writeFile as writeFile23 } from "node:fs/promises";
 import { existsSync as existsSync53 } from "node:fs";
-import { createHash as createHash28, randomUUID as randomUUID48 } from "node:crypto";
+import { createHash as createHash29, randomUUID as randomUUID48 } from "node:crypto";
 import { tmpdir as tmpdir6 } from "node:os";
 import { extname as extname4, isAbsolute as isAbsolute14, join as join71, relative as relative13, resolve as resolve40, sep as sep11 } from "node:path";
 import { Type as Type2 } from "@earendil-works/pi-ai";
@@ -186590,7 +186803,7 @@ async function readAgentMemoryWorkspaceLongTerm(rootDir, agentId) {
   }
 }
 function qmdAgentMemoryCollectionName2(rootDir, agentId) {
-  const hash3 = createHash28("sha1").update(`${rootDir}:${agentId}`).digest("hex").slice(0, 12);
+  const hash3 = createHash29("sha1").update(`${rootDir}:${agentId}`).digest("hex").slice(0, 12);
   return `fusion-agent-memory-${sanitizeAgentMemoryId(agentId).toLowerCase()}-${hash3}`;
 }
 function buildQmdAgentMemoryCollectionAddArgs(rootDir, agentId) {
@@ -186719,11 +186932,11 @@ async function refreshAgentMemoryQmdIndex(rootDir, agentMemory) {
     return;
   }
   const promise = (async () => {
-    const { execFile: execFile46 } = await import("node:child_process");
-    const { promisify: promisify101 } = await import("node:util");
-    const execFileAsync40 = promisify101(execFile46);
+    const { execFile: execFile47 } = await import("node:child_process");
+    const { promisify: promisify102 } = await import("node:util");
+    const execFileAsync41 = promisify102(execFile47);
     try {
-      await execFileAsync40("qmd", buildQmdAgentMemoryCollectionAddArgs(rootDir, agentMemory.agentId), {
+      await execFileAsync41("qmd", buildQmdAgentMemoryCollectionAddArgs(rootDir, agentMemory.agentId), {
         cwd: rootDir,
         timeout: 4e3,
         maxBuffer: 512 * 1024
@@ -186736,8 +186949,8 @@ ${stderr}`)) {
         throw error3;
       }
     }
-    await execFileAsync40("qmd", ["update"], { cwd: rootDir, timeout: 3e4, maxBuffer: 1024 * 1024 });
-    await execFileAsync40("qmd", ["embed"], { cwd: rootDir, timeout: 12e4, maxBuffer: 1024 * 1024 });
+    await execFileAsync41("qmd", ["update"], { cwd: rootDir, timeout: 3e4, maxBuffer: 1024 * 1024 });
+    await execFileAsync41("qmd", ["embed"], { cwd: rootDir, timeout: 12e4, maxBuffer: 1024 * 1024 });
   })();
   agentQmdRefreshState.set(key, { lastStartedAt: now, inFlight: promise });
   try {
@@ -186792,10 +187005,10 @@ async function searchAgentMemoryWithQmd(rootDir, agentMemory, query, limit) {
   }
   try {
     await refreshAgentMemoryQmdIndex(rootDir, agentMemory);
-    const { execFile: execFile46 } = await import("node:child_process");
-    const { promisify: promisify101 } = await import("node:util");
-    const execFileAsync40 = promisify101(execFile46);
-    const { stdout } = await execFileAsync40("qmd", buildQmdAgentMemorySearchArgs(rootDir, agentMemory.agentId, query, limit), {
+    const { execFile: execFile47 } = await import("node:child_process");
+    const { promisify: promisify102 } = await import("node:util");
+    const execFileAsync41 = promisify102(execFile47);
+    const { stdout } = await execFileAsync41("qmd", buildQmdAgentMemorySearchArgs(rootDir, agentMemory.agentId, query, limit), {
       cwd: rootDir,
       timeout: 4e3,
       maxBuffer: 1024 * 1024
@@ -198085,7 +198298,7 @@ var init_workspace_review_remediation = __esm({
 });
 
 // ../engine/src/worktree/secrets-env-writer.ts
-import { createHash as createHash29 } from "node:crypto";
+import { createHash as createHash30 } from "node:crypto";
 import { execFile as execFile14 } from "node:child_process";
 import { promises as fs6 } from "node:fs";
 import path3 from "node:path";
@@ -198094,7 +198307,7 @@ function isValidFilename(filename) {
   return !!filename && !filename.includes("/") && !filename.includes("\\") && !filename.includes("..") && !filename.includes("\0") && filename !== FINGERPRINT_FILE;
 }
 function sha2562(content) {
-  return createHash29("sha256").update(Buffer.from(content, "utf8")).digest("hex");
+  return createHash30("sha256").update(Buffer.from(content, "utf8")).digest("hex");
 }
 function quote(value) {
   return `"${value.replaceAll("\\", "\\\\").replaceAll('"', '\\"').replaceAll("\n", "\\n").replaceAll("\r", "\\r").replaceAll("	", "\\t")}"`;
@@ -200653,7 +200866,7 @@ var init_workflow_graph_executor = __esm({
                 phase: "pre-merge",
                 source: "optional-group",
                 status: "skipped",
-                bypassedBy: "fast-mode",
+                bypassedBy: FAST_MODE_BYPASS_ACTOR,
                 bypassedAt,
                 bypassReason: "Fast mode bypasses pre-merge workflow gates",
                 bypassedFromStatus: "absent",
@@ -200857,7 +201070,7 @@ var init_workflow_graph_executor = __esm({
             const stepFindings = this.workflowReviewKind(node) && Array.isArray(exitContextPatch?.findings) ? exitContextPatch.findings : void 0;
             const repositoryReviewOutcomes = this.workflowReviewKind(node) && Array.isArray(exitContextPatch?.repositoryReviewOutcomes) ? exitContextPatch.repositoryReviewOutcomes : void 0;
             const repositoryScopeRevision = this.workflowReviewKind(node) && typeof exitContextPatch?.repositoryScopeRevision === "number" ? exitContextPatch.repositoryScopeRevision : void 0;
-            const reviewInputFingerprint = this.workflowReviewKind(node) && typeof exitContextPatch?.reviewInputFingerprint === "string" ? exitContextPatch.reviewInputFingerprint : void 0;
+            const reviewInputFingerprint = requiresContentReviewProof(node.id, { reviewKind: this.workflowReviewKind(node) }) && typeof exitContextPatch?.reviewInputFingerprint === "string" ? exitContextPatch.reviewInputFingerprint : void 0;
             const reviewedCommitSha = this.workflowReviewKind(node) && typeof exitContextPatch?.reviewedCommitSha === "string" ? exitContextPatch.reviewedCommitSha : void 0;
             const supersededFindingSourceWorkflowStepId = this.workflowReviewKind(node) && typeof exitContextPatch?.supersededFindingSourceWorkflowStepId === "string" ? exitContextPatch.supersededFindingSourceWorkflowStepId : void 0;
             const supersededFindingIds = supersededFindingSourceWorkflowStepId && this.workflowReviewKind(node) && Array.isArray(exitContextPatch?.supersededFindingIds) ? exitContextPatch.supersededFindingIds.filter((id) => typeof id === "string") : void 0;
@@ -201596,7 +201809,7 @@ ${stepOutput}` : ""}`);
         const findings = this.workflowReviewKind(node) && Array.isArray(contextPatch.findings) ? contextPatch.findings : void 0;
         const repositoryReviewOutcomes = this.workflowReviewKind(node) && Array.isArray(contextPatch.repositoryReviewOutcomes) ? contextPatch.repositoryReviewOutcomes : void 0;
         const repositoryScopeRevision = this.workflowReviewKind(node) && typeof contextPatch.repositoryScopeRevision === "number" ? contextPatch.repositoryScopeRevision : void 0;
-        const reviewInputFingerprint = this.workflowReviewKind(node) && typeof contextPatch.reviewInputFingerprint === "string" ? contextPatch.reviewInputFingerprint : void 0;
+        const reviewInputFingerprint = requiresContentReviewProof(node.id, { reviewKind: this.workflowReviewKind(node) }) && typeof contextPatch.reviewInputFingerprint === "string" ? contextPatch.reviewInputFingerprint : void 0;
         const reviewedCommitSha = this.workflowReviewKind(node) && typeof contextPatch.reviewedCommitSha === "string" ? contextPatch.reviewedCommitSha : void 0;
         const supersededFindingSourceWorkflowStepId = this.workflowReviewKind(node) && typeof contextPatch.supersededFindingSourceWorkflowStepId === "string" ? contextPatch.supersededFindingSourceWorkflowStepId : void 0;
         const supersededFindingIds = supersededFindingSourceWorkflowStepId && this.workflowReviewKind(node) && Array.isArray(contextPatch.supersededFindingIds) ? contextPatch.supersededFindingIds.filter((id) => typeof id === "string") : void 0;
@@ -202977,17 +203190,141 @@ var init_agent_binding_pure = __esm({
   }
 });
 
-// ../engine/src/worktree/review-diff-fingerprint.ts
-import { createHash as createHash30 } from "node:crypto";
-import { execFile as execFile15 } from "node:child_process";
+// ../engine/src/executor/worktree-git-refs.ts
+import { exec as exec25, execFile as execFile15, execSync as execSync3 } from "node:child_process";
 import { promisify as promisify32 } from "node:util";
+async function preExecutionWorktreeHasWork(worktreePath) {
+  try {
+    const { stdout: dirty } = await execFileAsync9("git", ["status", "--porcelain"], { cwd: worktreePath, timeout: 3e4 });
+    if (dirty.trim()) return true;
+    const { stdout: ahead } = await execFileAsync9("git", ["log", "--oneline", "@{upstream}..HEAD"], { cwd: worktreePath, timeout: 3e4 }).catch(async () => await execFileAsync9("git", ["log", "--oneline", "-1", "HEAD", "--not", "--remotes", "--branches=main", "--branches=master"], { cwd: worktreePath, timeout: 3e4 }));
+    return Boolean(ahead.trim());
+  } catch {
+    return true;
+  }
+}
+async function resolveContaminationBaseRef(worktreePath) {
+  try {
+    const { stdout } = await execAsync22(
+      "git merge-base HEAD main 2>/dev/null || git merge-base HEAD origin/main",
+      { cwd: worktreePath, encoding: "utf-8" }
+    );
+    const ref = stdout.trim();
+    return ref || void 0;
+  } catch (err) {
+    const errorMessage2 = err instanceof Error ? err.message : String(err);
+    executorLog.warn(`Failed merge-base lookup for contamination check in ${worktreePath}: ${errorMessage2}`);
+    return void 0;
+  }
+}
+async function resolveDiffBaseRef(worktreePath, baseCommitSha) {
+  if (baseCommitSha) return baseCommitSha;
+  try {
+    const { stdout } = await execAsync22(
+      "git merge-base HEAD origin/main 2>/dev/null || git merge-base HEAD main",
+      { cwd: worktreePath, encoding: "utf-8" }
+    );
+    const ref = stdout.trim();
+    if (ref) return ref;
+  } catch (mergeBaseErr) {
+    const mergeBaseMsg = mergeBaseErr instanceof Error ? mergeBaseErr.message : String(mergeBaseErr);
+    executorLog.warn(`Failed merge-base lookup for diff base in ${worktreePath}, trying HEAD~1 fallback: ${mergeBaseMsg}`);
+  }
+  try {
+    const { stdout } = await execAsync22("git rev-parse HEAD~1", {
+      cwd: worktreePath,
+      encoding: "utf-8"
+    });
+    return stdout.trim() || void 0;
+  } catch {
+    executorLog.debug(`Could not determine base commit for diff in ${worktreePath}`);
+    return void 0;
+  }
+}
+async function captureBaseCommitSha(store, task, worktreePath, audit, options = { isResume: false }) {
+  try {
+    if (options.isResume && task.baseCommitSha) {
+      try {
+        execSync3(`git merge-base --is-ancestor ${task.baseCommitSha} HEAD`, {
+          cwd: worktreePath,
+          stdio: "pipe"
+        });
+        executorLog.log(`${task.id}: preserved baseCommitSha ${task.baseCommitSha.slice(0, 7)} (resume)`);
+        await audit.git({
+          type: "commit:create",
+          target: task.baseCommitSha,
+          metadata: { purpose: "base", preserved: true }
+        });
+        return;
+      } catch {
+      }
+    }
+    const baseCommitSha = await resolveCapturedBaseCommitSha(worktreePath, {
+      warn: (msg) => executorLog.warn(`${task.id}: ${msg}`)
+    });
+    if (!baseCommitSha) {
+      throw new Error("could not resolve base commit SHA");
+    }
+    await store.updateTask(task.id, { baseCommitSha });
+    executorLog.debug(`${task.id}: captured baseCommitSha ${baseCommitSha.slice(0, 7)}`);
+    await audit.git({ type: "commit:create", target: baseCommitSha, metadata: { purpose: "base", preserved: false } });
+  } catch (err) {
+    const errorMessage2 = err instanceof Error ? err.message : String(err);
+    executorLog.debug(`Failed to capture baseCommitSha for ${task.id}: ${errorMessage2}`);
+  }
+}
+var execAsync22, execFileAsync9;
+var init_worktree_git_refs = __esm({
+  "../engine/src/executor/worktree-git-refs.ts"() {
+    "use strict";
+    init_base_commit_capture();
+    init_logger3();
+    execAsync22 = promisify32(exec25);
+    execFileAsync9 = promisify32(execFile15);
+  }
+});
+
+// ../engine/src/worktree/review-diff-fingerprint.ts
+import { createHash as createHash31 } from "node:crypto";
+import { execFile as execFile16 } from "node:child_process";
+import { promisify as promisify33 } from "node:util";
+function gitCaptureOptions(cwd) {
+  return {
+    cwd,
+    encoding: "utf8",
+    maxBuffer: REVIEW_DIFF_GIT_MAX_BUFFER_BYTES,
+    timeout: REVIEW_DIFF_GIT_TIMEOUT_MS
+  };
+}
+function isGitDiffBufferOverflow(error3) {
+  if (typeof error3 !== "object" || error3 === null) return false;
+  const candidate = error3;
+  return candidate.code === "ERR_CHILD_PROCESS_STDIO_MAXBUFFER" || typeof candidate.message === "string" && candidate.message.includes("maxBuffer");
+}
+async function resolveContentReviewInputProof(worktreePath, diffBaseCommitSha) {
+  let baseRef;
+  try {
+    baseRef = await resolveDiffBaseRef(worktreePath, diffBaseCommitSha);
+  } catch {
+    return { kind: "unprovable", reason: "no-diff-base" };
+  }
+  if (!baseRef) return { kind: "unprovable", reason: "no-diff-base" };
+  const probe = await probeReviewDiffFingerprint(worktreePath, baseRef);
+  if (probe.state === "empty") {
+    return { kind: "fingerprint", fingerprint: EMPTY_REVIEW_DIFF_FINGERPRINT };
+  }
+  return probe.state === "fingerprint" ? { kind: "fingerprint", fingerprint: probe.fingerprint } : { kind: "unprovable", reason: probe.reason };
+}
 async function probeReviewDiffFingerprint(worktreePath, baseRef, targetRef = "HEAD") {
   if (!worktreePath || !baseRef) return { state: "unavailable", reason: "missing-worktree-or-base" };
   try {
-    const { stdout } = await execFileAsync9("git", ["diff", "--binary", `${baseRef}..${targetRef}`], { cwd: worktreePath, encoding: "utf8" });
-    return stdout ? { state: "fingerprint", fingerprint: createHash30("sha256").update(stdout).digest("hex") } : { state: "empty" };
-  } catch {
-    return { state: "unavailable", reason: "git-diff-failed" };
+    const { stdout } = await execFileAsync10("git", ["diff", "--binary", `${baseRef}..${targetRef}`], gitCaptureOptions(worktreePath));
+    return stdout ? { state: "fingerprint", fingerprint: createHash31("sha256").update(stdout).digest("hex") } : { state: "empty" };
+  } catch (error3) {
+    return {
+      state: "unavailable",
+      reason: isGitDiffBufferOverflow(error3) ? "git-diff-too-large" : "git-diff-failed"
+    };
   }
 }
 async function probeReviewChangesSinceCommit(worktreePath, reviewedCommitSha) {
@@ -202995,14 +203332,11 @@ async function probeReviewChangesSinceCommit(worktreePath, reviewedCommitSha) {
     return { state: "unavailable", reason: "missing-worktree-or-reviewed-commit" };
   }
   try {
-    await execFileAsync9("git", ["cat-file", "-e", `${reviewedCommitSha}^{commit}`], {
-      cwd: worktreePath,
-      encoding: "utf8"
-    });
+    await execFileAsync10("git", ["cat-file", "-e", `${reviewedCommitSha}^{commit}`], gitCaptureOptions(worktreePath));
     const [{ stdout: countOutput }, { stdout: filesOutput }, { stdout: shortstatOutput }] = await Promise.all([
-      execFileAsync9("git", ["rev-list", "--count", `${reviewedCommitSha}..HEAD`], { cwd: worktreePath, encoding: "utf8" }),
-      execFileAsync9("git", ["diff", "--name-only", "-z", `${reviewedCommitSha}..HEAD`], { cwd: worktreePath, encoding: "utf8" }),
-      execFileAsync9("git", ["diff", "--shortstat", `${reviewedCommitSha}..HEAD`], { cwd: worktreePath, encoding: "utf8" })
+      execFileAsync10("git", ["rev-list", "--count", `${reviewedCommitSha}..HEAD`], gitCaptureOptions(worktreePath)),
+      execFileAsync10("git", ["diff", "--name-only", "-z", `${reviewedCommitSha}..HEAD`], gitCaptureOptions(worktreePath)),
+      execFileAsync10("git", ["diff", "--shortstat", `${reviewedCommitSha}..HEAD`], gitCaptureOptions(worktreePath))
     ]);
     const commitCount = Number.parseInt(countOutput.trim(), 10);
     if (!Number.isSafeInteger(commitCount) || commitCount < 0) {
@@ -203031,22 +203365,30 @@ async function computeCodeReviewInputFingerprint(worktreePath, baseRef, targetRe
   if (result2.state === "empty") return EMPTY_REVIEW_DIFF_FINGERPRINT;
   return result2.state === "fingerprint" ? result2.fingerprint : void 0;
 }
-var execFileAsync9, MAX_REVIEW_CHANGED_FILES, EMPTY_REVIEW_DIFF_FINGERPRINT;
+var execFileAsync10, REVIEW_DIFF_GIT_MAX_BUFFER_BYTES, REVIEW_DIFF_GIT_TIMEOUT_MS, MAX_REVIEW_CHANGED_FILES, EMPTY_REVIEW_DIFF_FINGERPRINT;
 var init_review_diff_fingerprint = __esm({
   "../engine/src/worktree/review-diff-fingerprint.ts"() {
     "use strict";
-    execFileAsync9 = promisify32(execFile15);
+    init_worktree_git_refs();
+    execFileAsync10 = promisify33(execFile16);
+    REVIEW_DIFF_GIT_MAX_BUFFER_BYTES = 10 * 1024 * 1024;
+    REVIEW_DIFF_GIT_TIMEOUT_MS = 12e4;
     MAX_REVIEW_CHANGED_FILES = 100;
     EMPTY_REVIEW_DIFF_FINGERPRINT = "empty-review-input:v1";
   }
 });
 
 // ../engine/src/worktree/workspace-review-evidence.ts
-import { execFile as execFile16 } from "node:child_process";
-import { promisify as promisify33 } from "node:util";
+import { execFile as execFile17 } from "node:child_process";
+import { promisify as promisify34 } from "node:util";
 import { join as join76 } from "node:path";
 async function git3(args, cwd) {
-  const { stdout } = await execFileAsync10("git", args, { cwd, encoding: "utf8" });
+  const { stdout } = await execFileAsync11("git", args, {
+    cwd,
+    encoding: "utf8",
+    maxBuffer: REVIEW_DIFF_GIT_MAX_BUFFER_BYTES,
+    timeout: REVIEW_DIFF_GIT_TIMEOUT_MS
+  });
   return stdout.trim();
 }
 async function captureWorkspaceReviewEvidence(options) {
@@ -203099,13 +203441,60 @@ async function captureWorkspaceReviewEvidence(options) {
     outOfScopeRepositories
   };
 }
-var execFileAsync10;
+var execFileAsync11;
 var init_workspace_review_evidence = __esm({
   "../engine/src/worktree/workspace-review-evidence.ts"() {
     "use strict";
     init_workspace_base_branch();
     init_review_diff_fingerprint();
-    execFileAsync10 = promisify33(execFile16);
+    execFileAsync11 = promisify34(execFile17);
+  }
+});
+
+// ../engine/src/worktree/review-inline-fix-recapture.ts
+import { execFile as execFile18 } from "node:child_process";
+import { promisify as promisify35 } from "node:util";
+function classifyReviewInlineFixRecapture(input) {
+  if (input.reviewKind === "plan") return { recapture: false, reason: "plan-domain" };
+  if (input.verdict !== "APPROVE" && input.verdict !== "APPROVE_WITH_NOTES") {
+    return { recapture: false, reason: "not-approval-verdict" };
+  }
+  if (!input.reviewedCommitSha || !input.currentHeadSha || !input.baseRef) {
+    return { recapture: false, reason: "missing-anchor" };
+  }
+  if (input.reviewedCommitSha === input.currentHeadSha) return { recapture: false, reason: "head-unchanged" };
+  if (input.fastForwardAdvance === void 0 || input.baseIsAncestor === void 0) {
+    return { recapture: false, reason: "probe-unavailable" };
+  }
+  if (!input.fastForwardAdvance) return { recapture: false, reason: "history-rewritten" };
+  if (!input.baseIsAncestor) return { recapture: false, reason: "base-not-ancestor" };
+  if (!input.fingerprintProbeAvailable) return { recapture: false, reason: "probe-unavailable" };
+  return { recapture: true, reason: "recaptured" };
+}
+async function readHeadSha(worktreePath) {
+  if (!worktreePath) return void 0;
+  try {
+    const { stdout } = await execFileAsync12("git", ["rev-parse", "HEAD"], { cwd: worktreePath, encoding: "utf8" });
+    return stdout.trim() || void 0;
+  } catch {
+    return void 0;
+  }
+}
+async function isFastForwardAdvance(worktreePath, fromSha, toSha) {
+  if (!worktreePath || !fromSha || !toSha) return void 0;
+  try {
+    await execFileAsync12("git", ["merge-base", "--is-ancestor", fromSha, toSha], { cwd: worktreePath, encoding: "utf8" });
+    return true;
+  } catch (error3) {
+    const code = error3?.code;
+    return code === 1 ? false : void 0;
+  }
+}
+var execFileAsync12;
+var init_review_inline_fix_recapture = __esm({
+  "../engine/src/worktree/review-inline-fix-recapture.ts"() {
+    "use strict";
+    execFileAsync12 = promisify35(execFile18);
   }
 });
 
@@ -203295,8 +203684,8 @@ var init_workspace_zero_acquire = __esm({
 });
 
 // ../engine/src/execution/branch-attribution.ts
-import { exec as exec25 } from "node:child_process";
-import { promisify as promisify34 } from "node:util";
+import { exec as exec26 } from "node:child_process";
+import { promisify as promisify36 } from "node:util";
 function quoteShellArg6(value) {
   return `'${value.replace(/'/g, `'\\''`)}'`;
 }
@@ -203334,7 +203723,7 @@ function taskIdsMatch(a, b3) {
   return a.toUpperCase() === b3.toUpperCase();
 }
 async function collectOwnTaskCommitsForRange(opts) {
-  const execImpl = opts.execAsyncImpl ?? execAsync22;
+  const execImpl = opts.execAsyncImpl ?? execAsync23;
   let logOutput;
   try {
     const result2 = await execImpl(
@@ -203375,7 +203764,7 @@ async function collectOwnTaskCommitsForRange(opts) {
   return { ownCommitCount: ownCommitShas.length, ownCommitShas };
 }
 async function filterFilesToOwnTaskCommits(opts) {
-  const execImpl = opts.execAsyncImpl ?? execAsync22;
+  const execImpl = opts.execAsyncImpl ?? execAsync23;
   const runGit10 = async (command) => {
     try {
       const { stdout } = await execImpl(command, {
@@ -203441,11 +203830,11 @@ async function filterFilesToOwnTaskCommits(opts) {
     commitAttributions
   };
 }
-var execAsync22, GIT_TIMEOUT_MS5, GIT_MAX_BUFFER2, BranchAttributionError, SilentNoOpAttributionMismatchError;
+var execAsync23, GIT_TIMEOUT_MS5, GIT_MAX_BUFFER2, BranchAttributionError, SilentNoOpAttributionMismatchError;
 var init_branch_attribution = __esm({
   "../engine/src/execution/branch-attribution.ts"() {
     "use strict";
-    execAsync22 = promisify34(exec25);
+    execAsync23 = promisify36(exec26);
     GIT_TIMEOUT_MS5 = 3e4;
     GIT_MAX_BUFFER2 = 10 * 1024 * 1024;
     BranchAttributionError = class extends Error {
@@ -203479,103 +203868,9 @@ var init_branch_attribution = __esm({
   }
 });
 
-// ../engine/src/executor/worktree-git-refs.ts
-import { exec as exec26, execFile as execFile17, execSync as execSync3 } from "node:child_process";
-import { promisify as promisify35 } from "node:util";
-async function preExecutionWorktreeHasWork(worktreePath) {
-  try {
-    const { stdout: dirty } = await execFileAsync11("git", ["status", "--porcelain"], { cwd: worktreePath, timeout: 3e4 });
-    if (dirty.trim()) return true;
-    const { stdout: ahead } = await execFileAsync11("git", ["log", "--oneline", "@{upstream}..HEAD"], { cwd: worktreePath, timeout: 3e4 }).catch(async () => await execFileAsync11("git", ["log", "--oneline", "-1", "HEAD", "--not", "--remotes", "--branches=main", "--branches=master"], { cwd: worktreePath, timeout: 3e4 }));
-    return Boolean(ahead.trim());
-  } catch {
-    return true;
-  }
-}
-async function resolveContaminationBaseRef(worktreePath) {
-  try {
-    const { stdout } = await execAsync23(
-      "git merge-base HEAD main 2>/dev/null || git merge-base HEAD origin/main",
-      { cwd: worktreePath, encoding: "utf-8" }
-    );
-    const ref = stdout.trim();
-    return ref || void 0;
-  } catch (err) {
-    const errorMessage2 = err instanceof Error ? err.message : String(err);
-    executorLog.warn(`Failed merge-base lookup for contamination check in ${worktreePath}: ${errorMessage2}`);
-    return void 0;
-  }
-}
-async function resolveDiffBaseRef(worktreePath, baseCommitSha) {
-  if (baseCommitSha) return baseCommitSha;
-  try {
-    const { stdout } = await execAsync23(
-      "git merge-base HEAD origin/main 2>/dev/null || git merge-base HEAD main",
-      { cwd: worktreePath, encoding: "utf-8" }
-    );
-    const ref = stdout.trim();
-    if (ref) return ref;
-  } catch (mergeBaseErr) {
-    const mergeBaseMsg = mergeBaseErr instanceof Error ? mergeBaseErr.message : String(mergeBaseErr);
-    executorLog.warn(`Failed merge-base lookup for diff base in ${worktreePath}, trying HEAD~1 fallback: ${mergeBaseMsg}`);
-  }
-  try {
-    const { stdout } = await execAsync23("git rev-parse HEAD~1", {
-      cwd: worktreePath,
-      encoding: "utf-8"
-    });
-    return stdout.trim() || void 0;
-  } catch {
-    executorLog.debug(`Could not determine base commit for diff in ${worktreePath}`);
-    return void 0;
-  }
-}
-async function captureBaseCommitSha(store, task, worktreePath, audit, options = { isResume: false }) {
-  try {
-    if (options.isResume && task.baseCommitSha) {
-      try {
-        execSync3(`git merge-base --is-ancestor ${task.baseCommitSha} HEAD`, {
-          cwd: worktreePath,
-          stdio: "pipe"
-        });
-        executorLog.log(`${task.id}: preserved baseCommitSha ${task.baseCommitSha.slice(0, 7)} (resume)`);
-        await audit.git({
-          type: "commit:create",
-          target: task.baseCommitSha,
-          metadata: { purpose: "base", preserved: true }
-        });
-        return;
-      } catch {
-      }
-    }
-    const baseCommitSha = await resolveCapturedBaseCommitSha(worktreePath, {
-      warn: (msg) => executorLog.warn(`${task.id}: ${msg}`)
-    });
-    if (!baseCommitSha) {
-      throw new Error("could not resolve base commit SHA");
-    }
-    await store.updateTask(task.id, { baseCommitSha });
-    executorLog.debug(`${task.id}: captured baseCommitSha ${baseCommitSha.slice(0, 7)}`);
-    await audit.git({ type: "commit:create", target: baseCommitSha, metadata: { purpose: "base", preserved: false } });
-  } catch (err) {
-    const errorMessage2 = err instanceof Error ? err.message : String(err);
-    executorLog.debug(`Failed to capture baseCommitSha for ${task.id}: ${errorMessage2}`);
-  }
-}
-var execAsync23, execFileAsync11;
-var init_worktree_git_refs = __esm({
-  "../engine/src/executor/worktree-git-refs.ts"() {
-    "use strict";
-    init_base_commit_capture();
-    init_logger3();
-    execAsync23 = promisify35(exec26);
-    execFileAsync11 = promisify35(execFile17);
-  }
-});
-
 // ../engine/src/executor/worktree-capture-modified-files.ts
 import { exec as exec27 } from "node:child_process";
-import { promisify as promisify36 } from "node:util";
+import { promisify as promisify37 } from "node:util";
 async function captureModifiedFiles(worktreePath, baseCommitSha, taskId, audit, source = "unspecified") {
   try {
     const baseRef = await resolveDiffBaseRef(worktreePath, baseCommitSha);
@@ -203661,7 +203956,7 @@ var init_worktree_capture_modified_files = __esm({
     init_branch_attribution();
     init_logger3();
     init_worktree_git_refs();
-    execAsync24 = promisify36(exec27);
+    execAsync24 = promisify37(exec27);
   }
 });
 
@@ -203826,6 +204121,27 @@ ${result2.review}`);
     summarySections.push(`[${repoRel}] ${result2.verdict}: ${result2.summary}`);
   }
   const aggregateVerdict = reviewedResults.some(({ result: result2 }) => result2.verdict === "RETHINK") ? "RETHINK" : reviewedResults.some(({ result: result2 }) => result2.verdict === "REVISE") ? "REVISE" : reviewedResults.some(({ result: result2 }) => !isApprovalFamilyVerdict(result2.verdict)) ? "UNAVAILABLE" : "APPROVE";
+  let publishedModifiedFiles = modifiedFiles;
+  if (isApprovalFamilyVerdict(aggregateVerdict) && evidence && options.workspaceRootDir) {
+    try {
+      const refreshed = await captureWorkspaceReviewEvidence({ task, workspaceRootDir: options.workspaceRootDir, settings: options.settings ?? {} });
+      if (refreshed.outOfScopeRepositories.size > 0) {
+        return { verdict: "UNAVAILABLE", retryable: false, review: "Workspace Code Review cannot approve changes outside confirmed scope after review.", summary: "Unavailable: changes outside confirmed scope after review", repositoryScopeRevision };
+      }
+      for (const updated of refreshed.repositories) {
+        const original = evidence.repositories.find((candidate) => candidate.repository === updated.repository);
+        const worktreePath = workspaceWorktrees[updated.repository]?.worktreePath;
+        const outcome = repositoryReviewOutcomes.find((candidate) => candidate.repository === updated.repository && candidate.status === "REVIEWED");
+        if (!original || !worktreePath || !updated.fingerprint || !outcome || !repositoryScope.has(updated.repository)) continue;
+        if (await isFastForwardAdvance(worktreePath, original.branch, updated.branch)) {
+          repositoryDiffFingerprints[updated.repository] = updated.fingerprint;
+          outcome.fingerprint = updated.fingerprint;
+        }
+      }
+      publishedModifiedFiles = refreshed.modifiedFiles;
+    } catch {
+    }
+  }
   const blockingRepositories = reviewedResults.filter(({ result: result2 }) => !isApprovalFamilyVerdict(result2.verdict)).map(({ repository }) => repository);
   const blockingSummary = blockingRepositories.length > 0 ? `blocking repositories: ${blockingRepositories.join(", ")}` : `all ${repoKeys.length} modified in-scope repositories approved`;
   const coverageNotice = noVerdictRepositories.length > 0 ? `
@@ -203837,7 +204153,7 @@ Not covered by a verdict: ${noVerdictRepositories.join(", ")}.` : "";
 ${reviewSections.join("\n\n")}`,
     summary: `${aggregateVerdict} \u2014 ${blockingSummary} \u2014 ${summarySections.join(" | ")}`,
     repositoryDiffFingerprints,
-    repositoryModifiedFiles: modifiedFiles,
+    repositoryModifiedFiles: publishedModifiedFiles,
     repositoryReviewOutcomes,
     ...findings.length > 0 ? { findings } : {},
     repositoryScopeRevision
@@ -203848,6 +204164,7 @@ var init_workspace_review_per_repo = __esm({
   "../engine/src/executor/workspace-review-per-repo.ts"() {
     "use strict";
     init_workspace_review_evidence();
+    init_review_inline_fix_recapture();
     init_workspace_zero_acquire();
     init_worktree_capture_modified_files();
     hasRepositoryPrefix = (value, repoRel, separator) => value === repoRel || value?.startsWith(`${repoRel}${separator}`) === true;
@@ -205212,6 +205529,8 @@ async function runGraphCustomNode(deps, node, nodeTask, settings, columnBinding,
   }
   const optionalGroupId = typeof graphContext?.[WORKFLOW_OPTIONAL_GROUP_CONTEXT_KEY] === "string" ? graphContext[WORKFLOW_OPTIONAL_GROUP_CONTEXT_KEY] : void 0;
   const declaredReviewKind = cfg.reviewKind === "plan" || cfg.reviewKind === "code" ? cfg.reviewKind : graphContext?.[WORKFLOW_REVIEW_KIND_CONTEXT_KEY] === "plan" || graphContext?.[WORKFLOW_REVIEW_KIND_CONTEXT_KEY] === "code" ? graphContext[WORKFLOW_REVIEW_KIND_CONTEXT_KEY] : void 0;
+  const effectiveStepId = optionalGroupId ?? node.id;
+  const isContentBindingStep = requiresContentReviewProof(effectiveStepId, { reviewKind: declaredReviewKind });
   if (isFastExecutionMode(live) && graphContext?.["workflow:fast-lane-active"] === true && isFastLaneSkippableCustomNode(node, { optionalGroupId })) {
     executorLog.debug(`${live.id}: fast mode \u2014 skipping custom graph node '${node.id}'`);
     await deps.store.logEntry(
@@ -205406,6 +205725,7 @@ ${prompt}`;
   const now = (/* @__PURE__ */ new Date()).toISOString();
   const stepSkillName = executorKind === "skill" && typeof cfg.skillName === "string" && cfg.skillName.trim() ? cfg.skillName.trim() : void 0;
   const stepThinkingLevel = typeof cfg.thinkingLevel === "string" && WORKFLOW_THINKING_LEVEL_SET2.has(cfg.thinkingLevel) ? cfg.thinkingLevel : void 0;
+  const readonlyMcpServers = Array.isArray(cfg.readonlyMcpServers) ? [...new Set(cfg.readonlyMcpServers.filter((name2) => typeof name2 === "string").map((name2) => name2.trim()).filter(Boolean))] : [];
   const step = {
     id: `graph:${node.id}`,
     name: typeof cfg.name === "string" && cfg.name.trim() ? cfg.name : node.id,
@@ -205422,7 +205742,8 @@ ${prompt}`;
     ...stepSkillName ? { skillName: stepSkillName } : {},
     ...cfg.requiresBrowser === true ? { requiresBrowser: true } : {},
     ...modelProvider && modelId ? { modelProvider, modelId } : {},
-    ...stepThinkingLevel ? { thinkingLevel: stepThinkingLevel } : {}
+    ...stepThinkingLevel ? { thinkingLevel: stepThinkingLevel } : {},
+    ...readonlyMcpServers.length > 0 ? { readonlyMcpServers } : {}
   };
   if (cfg.summaryTarget === "task") {
     step.summaryTarget = "task";
@@ -205536,12 +205857,36 @@ ${prompt}`;
       outcome = buildWorkspaceReviewOutcome(aggregate, { superseded: reviewSuperseded });
     }
   } else {
-    outcome = mode === "script" ? await deps.executeScriptWorkflowStep(live, step, worktreePath, settings, nodeEnv) : await deps.executeWorkflowStep(live, step, worktreePath, settings, nodeEnv, {
-      unattended,
-      principalAgentId,
-      outputLanguage,
-      ...nodeSessionBoundary ? { sessionBoundary: nodeSessionBoundary } : {}
-    });
+    const dispatchSingularStep = async (reviewInputFingerprint) => {
+      if (mode === "script") {
+        const scriptOutcome = await deps.executeScriptWorkflowStep(live, step, worktreePath, settings, nodeEnv);
+        return reviewInputFingerprint === void 0 ? scriptOutcome : { ...scriptOutcome, reviewInputFingerprint };
+      }
+      return deps.executeWorkflowStep(live, step, worktreePath, settings, nodeEnv, {
+        unattended,
+        principalAgentId,
+        outputLanguage,
+        ...nodeSessionBoundary ? { sessionBoundary: nodeSessionBoundary } : {},
+        ...reviewInputFingerprint !== void 0 ? { reviewInputFingerprint } : {}
+      });
+    };
+    if (isContentBindingStep && !workspaceConfig) {
+      const proof = await resolveContentReviewInputProof(worktreePath, executionTarget.baseCommitSha);
+      if (proof.kind === "unprovable") {
+        const diagnostic = `${step.name} review input is unprovable (${proof.reason}); reviewer dispatch refused.`;
+        await deps.store.logEntry(
+          live.id,
+          `[pre-merge] ${diagnostic}`,
+          void 0,
+          deps.getRunContextFor(live.id)
+        );
+        outcome = { success: false, error: diagnostic, failureValue: "review-input-unprovable" };
+      } else {
+        outcome = await dispatchSingularStep(proof.fingerprint);
+      }
+    } else {
+      outcome = await dispatchSingularStep();
+    }
   }
   if (declaredReviewKind && typeof outcome.output === "string") {
     const rawReviewOutput = outcome.output;
@@ -205628,6 +205973,7 @@ var init_run_graph_custom_node = __esm({
     init_create_authoritative_workflow_seams();
     init_verification_gate();
     init_worktree_dependency_install();
+    init_review_diff_fingerprint();
     WORKFLOW_THINKING_LEVEL_SET2 = new Set(THINKING_LEVELS);
     WORKFLOW_STEP_NOT_RUN_REASON_SET2 = new Set(WORKFLOW_STEP_NOT_RUN_REASONS);
     WORKSPACE_REPO_REVIEW_NO_NOTES_NOTICE = "The repository reviewer recorded no notes for this verdict.";
@@ -207687,7 +208033,7 @@ var init_agent_heartbeat_error_recovery = __esm({
 
 // ../engine/src/agent-heartbeat.ts
 import { Type as Type3 } from "@earendil-works/pi-ai";
-import { createHash as createHash31 } from "node:crypto";
+import { createHash as createHash32 } from "node:crypto";
 async function resolveHeartbeatReboundColumn(taskStore, taskId) {
   try {
     return resolveReboundTarget(await resolveWorkflowIrForTask(taskStore, taskId)) ?? "todo";
@@ -207842,7 +208188,7 @@ function truncatePrompt(text3, maxChars) {
 ... (truncated, ${text3.length} chars)`;
 }
 function shortContentHash(value) {
-  return createHash31("sha256").update(value).digest("hex").slice(0, 8);
+  return createHash32("sha256").update(value).digest("hex").slice(0, 8);
 }
 function buildIdentitySnapshot(args) {
   const { agent, resolvedInstructions, workspaceMemory } = args;
@@ -212275,6 +212621,91 @@ var init_auto_merge_finalization = __esm({
   }
 });
 
+// ../engine/src/merge/merge-content-capture.ts
+async function captureMergeContentDescriptor(task, deps) {
+  if (describeMergeContentShape(task) === "workspace") {
+    try {
+      const evidence = await captureWorkspaceReviewEvidence({
+        task,
+        workspaceRootDir: deps.workspaceRootDir,
+        settings: deps.settings
+      });
+      return {
+        kind: "workspace",
+        repositories: {
+          state: "captured",
+          fingerprints: Object.fromEntries(evidence.repositories.filter((repository) => repository.fingerprint).map((repository) => [repository.repository, repository.fingerprint])),
+          inScopeModified: [...evidence.modifiedRepositories].sort()
+        }
+      };
+    } catch {
+      return { kind: "workspace", repositories: { state: "unavailable", reason: "workspace-evidence-capture-failed" } };
+    }
+  }
+  const baseRef = task.worktree ? await resolveDiffBaseRef(task.worktree, task.baseCommitSha) : void 0;
+  const probe = await probeReviewDiffFingerprint(task.worktree, baseRef);
+  return { kind: "singular", diff: probe };
+}
+var init_merge_content_capture = __esm({
+  "../engine/src/merge/merge-content-capture.ts"() {
+    "use strict";
+    init_src2();
+    init_worktree_git_refs();
+    init_review_diff_fingerprint();
+    init_workspace_review_evidence();
+  }
+});
+
+// ../engine/src/merge/stale-content-review-reroute.ts
+function isContentReviewNode(node) {
+  if (node.kind !== "optional-group" && node.kind !== "step-review") return false;
+  const name2 = typeof node.config?.name === "string" ? node.config.name : "";
+  return node.id === "code-review" || node.config?.reviewKind === "code" || /code review/i.test(name2);
+}
+async function rerouteSingularStaleContentToReview(store, task, options) {
+  const mergeContent = options.mergeContent;
+  if (mergeContent.kind !== "singular" || task.workspaceWorktrees !== void 0) {
+    return { rerouted: false, reason: "not-singular" };
+  }
+  if (task.paused || task.userPaused || task.deletedAt || task.autoMerge === false) {
+    return { rerouted: false, reason: "operator-held" };
+  }
+  if (mergeContent.diff.state !== "fingerprint") return { rerouted: false, reason: "no-progress" };
+  const currentFingerprint = mergeContent.diff.fingerprint;
+  const ir2 = await resolveWorkflowIrForTask(store, task.id);
+  const selection = store.getTaskWorkflowSelectionAsync ? await store.getTaskWorkflowSelectionAsync(task.id) : store.getTaskWorkflowSelection(task.id);
+  const selected = selection?.stepIds ?? [];
+  const nodes2 = ir2.nodes.filter((node2) => {
+    if (!isContentReviewNode(node2) || !options.requiredPreMergeStepIds.has(node2.id)) return false;
+    return node2.config?.defaultOn === true || selected.includes(node2.id);
+  });
+  const node = nodes2.find((candidate) => {
+    const latest = task.workflowStepResults?.filter((result3) => result3.workflowStepId === candidate.id).at(-1);
+    return latest?.reviewInputFingerprint !== currentFingerprint;
+  });
+  if (!node) return { rerouted: false, reason: nodes2.length ? "no-progress" : "no-review-route" };
+  const items = await store.listWorkflowWorkItemsForTask(task.id);
+  const result2 = await store.seedWorkspaceCodeReviewContinuationIfIdle({
+    taskId: task.id,
+    nodeId: node.id,
+    kind: "task",
+    state: "runnable",
+    runId: `${task.id}:stale-content-review-reroute:${node.id}:${items.length}`,
+    stableWorkflowRunId: `${task.id}:${ir2.name}`,
+    continuationSequence: items.length,
+    sourceColumn: task.column,
+    targetColumn: node.column ?? task.column,
+    irHash: computeWorkflowIrPin(ir2, node.id).irHash
+  });
+  return result2.seeded ? { rerouted: true, reason: "seeded", nodeId: node.id, workflowStepId: node.id } : { rerouted: false, reason: "active-continuation", nodeId: node.id, workflowStepId: node.id };
+}
+var init_stale_content_review_reroute = __esm({
+  "../engine/src/merge/stale-content-review-reroute.ts"() {
+    "use strict";
+    init_src2();
+  }
+});
+
 // ../engine/src/healing/auto-recovery.ts
 function actionForMode(mode, failureClass) {
   if (mode === "off") return "pause";
@@ -212431,10 +212862,10 @@ var init_stranded_continuation_reclaim = __esm({
 });
 
 // ../engine/src/merge/workspace-land-predicate.ts
-import { execFile as execFile18 } from "node:child_process";
-import { promisify as promisify37 } from "node:util";
+import { execFile as execFile19 } from "node:child_process";
+import { promisify as promisify38 } from "node:util";
 async function git4(args, cwd, opts = {}) {
-  const { stdout } = await execFileAsync12("git", args, {
+  const { stdout } = await execFileAsync13("git", args, {
     cwd,
     encoding: "utf-8",
     timeout: opts.timeout ?? 12e4,
@@ -212513,11 +212944,11 @@ async function isRepoLanded(repoRootDir, integrationBranch, landedSha, taskId, b
     await findProvenLandedCommit(repoRootDir, integrationBranch, landedSha, taskId, branch, revertBoundarySha, taskCreatedAt)
   );
 }
-var execFileAsync12, FUSION_TASK_ID_TRAILER_KEY2, TRAILER_SCAN_CLOCK_SKEW_MS, UNBOUNDED_TRAILER_SCAN_WINDOW_MS, UNBOUNDED_TRAILER_SCAN_MAX_COMMITS;
+var execFileAsync13, FUSION_TASK_ID_TRAILER_KEY2, TRAILER_SCAN_CLOCK_SKEW_MS, UNBOUNDED_TRAILER_SCAN_WINDOW_MS, UNBOUNDED_TRAILER_SCAN_MAX_COMMITS;
 var init_workspace_land_predicate = __esm({
   "../engine/src/merge/workspace-land-predicate.ts"() {
     "use strict";
-    execFileAsync12 = promisify37(execFile18);
+    execFileAsync13 = promisify38(execFile19);
     FUSION_TASK_ID_TRAILER_KEY2 = "Fusion-Task-Id";
     TRAILER_SCAN_CLOCK_SKEW_MS = 24 * 60 * 60 * 1e3;
     UNBOUNDED_TRAILER_SCAN_WINDOW_MS = 30 * 24 * 60 * 60 * 1e3;
@@ -212542,7 +212973,7 @@ var init_workspace_land_failure = __esm({
 
 // ../engine/src/merge/already-merged-detector.ts
 import { exec as exec28, execSync as execSync4 } from "node:child_process";
-import { promisify as promisify38 } from "node:util";
+import { promisify as promisify39 } from "node:util";
 function shellQuote(value) {
   return `'${value.replace(/'/g, "'\\''")}'`;
 }
@@ -212818,7 +213249,7 @@ var init_already_merged_detector = __esm({
   "../engine/src/merge/already-merged-detector.ts"() {
     "use strict";
     init_worktree_names();
-    execAsync25 = promisify38(exec28);
+    execAsync25 = promisify39(exec28);
   }
 });
 
@@ -212950,10 +213381,10 @@ var init_review_empty_content_close = __esm({
 });
 
 // ../engine/src/merge/merger-ref-update-advance.ts
-import { execFile as execFile19 } from "node:child_process";
-import { promisify as promisify39 } from "node:util";
+import { execFile as execFile20 } from "node:child_process";
+import { promisify as promisify40 } from "node:util";
 async function runGit3(args, cwd) {
-  return await execFileAsync13("git", args, {
+  return await execFileAsync14("git", args, {
     cwd,
     encoding: "utf-8",
     timeout: 3e4
@@ -213100,11 +213531,11 @@ async function advanceIntegrationBranchRef(args) {
     };
   }
 }
-var execFileAsync13, testHooks, IntegrationBranchConcurrentAdvanceError;
+var execFileAsync14, testHooks, IntegrationBranchConcurrentAdvanceError;
 var init_merger_ref_update_advance = __esm({
   "../engine/src/merge/merger-ref-update-advance.ts"() {
     "use strict";
-    execFileAsync13 = promisify39(execFile19);
+    execFileAsync14 = promisify40(execFile20);
     testHooks = {
       runGit: runGit3
     };
@@ -213132,7 +213563,7 @@ var init_merger_ref_update_advance = __esm({
 
 // ../engine/src/merge/group-merge-coordinator.ts
 import * as childProcess2 from "node:child_process";
-import { promisify as promisify40 } from "node:util";
+import { promisify as promisify41 } from "node:util";
 function evaluateBranchGroupCompletion(input) {
   const landedMemberIds = [];
   const pendingMemberIds = [];
@@ -213172,10 +213603,10 @@ function evaluateBranchGroupPromotion(input) {
 }
 async function ensureGroupBranchExists(rootDir, branchName, startPoint) {
   try {
-    await execFileAsync14("git", ["show-ref", "--verify", "--quiet", `refs/heads/${branchName}`], { cwd: rootDir });
+    await execFileAsync15("git", ["show-ref", "--verify", "--quiet", `refs/heads/${branchName}`], { cwd: rootDir });
     return;
   } catch {
-    await execFileAsync14("git", ["branch", branchName, startPoint], { cwd: rootDir });
+    await execFileAsync15("git", ["branch", branchName, startPoint], { cwd: rootDir });
   }
 }
 function throwIfPromotionAborted(signal) {
@@ -213280,14 +213711,14 @@ async function promoteBranchGroupInner(input) {
   if (!needsPrRepair && !isPrMode) {
     throwIfPromotionAborted(input.signal);
     await ensureGroupBranchExists(input.rootDir, group.branchName, integrationBranch);
-    const currentBranch2 = (await execFileAsync14("git", ["rev-parse", "--abbrev-ref", "HEAD"], { cwd: input.rootDir })).stdout.trim();
+    const currentBranch2 = (await execFileAsync15("git", ["rev-parse", "--abbrev-ref", "HEAD"], { cwd: input.rootDir })).stdout.trim();
     try {
       throwIfPromotionAborted(input.signal);
-      await execFileAsync14("git", ["checkout", integrationBranch], { cwd: input.rootDir, signal: input.signal });
+      await execFileAsync15("git", ["checkout", integrationBranch], { cwd: input.rootDir, signal: input.signal });
       throwIfPromotionAborted(input.signal);
-      await execFileAsync14("git", ["merge", "--no-ff", "--no-edit", group.branchName], { cwd: input.rootDir, signal: input.signal });
+      await execFileAsync15("git", ["merge", "--no-ff", "--no-edit", group.branchName], { cwd: input.rootDir, signal: input.signal });
     } finally {
-      await execFileAsync14("git", ["checkout", currentBranch2], { cwd: input.rootDir });
+      await execFileAsync15("git", ["checkout", currentBranch2], { cwd: input.rootDir });
     }
   }
   let prNumber = group.prNumber;
@@ -213411,20 +213842,20 @@ async function resolveBranchGroupMergeRouting(input) {
     )
   };
 }
-var execFileAsync14, promotionLocks;
+var execFileAsync15, promotionLocks;
 var init_group_merge_coordinator = __esm({
   "../engine/src/merge/group-merge-coordinator.ts"() {
     "use strict";
     init_src2();
     init_integration_branch();
-    execFileAsync14 = (file, args, opts) => promisify40(childProcess2.execFile)(file, args, opts);
+    execFileAsync15 = (file, args, opts) => promisify41(childProcess2.execFile)(file, args, opts);
     promotionLocks = /* @__PURE__ */ new Map();
   }
 });
 
 // ../engine/src/merge/merger-bare-subject.ts
 import { exec as exec29 } from "node:child_process";
-import { promisify as promisify41 } from "node:util";
+import { promisify as promisify42 } from "node:util";
 function quoteArg(value) {
   return `'${value.replace(/'/g, "'\\''")}'`;
 }
@@ -213464,7 +213895,7 @@ var init_merger_bare_subject = __esm({
     "use strict";
     init_src2();
     init_logger3();
-    execAsync26 = promisify41(exec29);
+    execAsync26 = promisify42(exec29);
     BARE_MERGE_SUBJECT_RE = /^[a-z]+(?:\([^)]+\))?!?:\s*merge\s+\S+\s*$/i;
   }
 });
@@ -213472,7 +213903,7 @@ var init_merger_bare_subject = __esm({
 // ../engine/src/recovery/foreign-only-contamination.ts
 import { exec as exec30 } from "node:child_process";
 import { existsSync as existsSync62 } from "node:fs";
-import { promisify as promisify42 } from "node:util";
+import { promisify as promisify43 } from "node:util";
 function quote3(value) {
   return `'${value.replace(/'/g, `'\\''`)}'`;
 }
@@ -213580,7 +214011,7 @@ var init_foreign_only_contamination = __esm({
     init_lifecycle_move();
     init_branch_conflicts();
     init_worktree_pool();
-    execAsync27 = promisify42(exec30);
+    execAsync27 = promisify43(exec30);
     GIT_TIMEOUT_MS6 = 3e4;
     GIT_MAX_BUFFER3 = 10 * 1024 * 1024;
   }
@@ -213677,7 +214108,7 @@ var init_surfacing_sweeps = __esm({
 });
 
 // ../engine/src/self-healing-git-evidence.ts
-import { promisify as promisify43 } from "node:util";
+import { promisify as promisify44 } from "node:util";
 import { exec as exec31 } from "node:child_process";
 function classifyBranchProbeError(error3) {
   if (typeof error3 === "object" && error3 !== null && "code" in error3 && error3.code === 1 && !error3.killed && (error3.signal === null || error3.signal === void 0)) {
@@ -213721,7 +214152,7 @@ var init_self_healing_git_evidence = __esm({
     init_already_merged_detector();
     init_logger3();
     log32 = createLogger2("self-healing");
-    execAsync28 = promisify43(exec31);
+    execAsync28 = promisify44(exec31);
     SelfHealingGitEvidence = class {
       async findLandedTaskCommit(task, options) {
         const rebaseBaseSha = task.mergeDetails?.rebaseBaseSha;
@@ -214083,12 +214514,12 @@ var init_self_healing_constants = __esm({
 });
 
 // ../engine/src/healing/self-healing-branch.ts
-import { promisify as promisify44 } from "node:util";
-import { execFile as execFile21 } from "node:child_process";
+import { promisify as promisify45 } from "node:util";
+import { execFile as execFile22 } from "node:child_process";
 async function isBranchAheadOfBase(task, rootDir, preferredBaseRef) {
   const branchName = resolveTaskWorkingBranch(task);
   try {
-    await execFileAsync15("git", ["rev-parse", "--verify", branchName], {
+    await execFileAsync16("git", ["rev-parse", "--verify", branchName], {
       cwd: rootDir,
       timeout: 3e4
     });
@@ -214098,14 +214529,14 @@ async function isBranchAheadOfBase(task, rootDir, preferredBaseRef) {
   const requestedBaseRef = preferredBaseRef || task.mergeDetails?.mergeTargetBranch || await resolveIntegrationBranch(rootDir, void 0);
   let resolvedBaseRef = requestedBaseRef;
   try {
-    await execFileAsync15("git", ["rev-parse", "--verify", requestedBaseRef], {
+    await execFileAsync16("git", ["rev-parse", "--verify", requestedBaseRef], {
       cwd: rootDir,
       timeout: 3e4
     });
   } catch {
     const remoteRef = `origin/${requestedBaseRef}`;
     try {
-      await execFileAsync15("git", ["rev-parse", "--verify", remoteRef], {
+      await execFileAsync16("git", ["rev-parse", "--verify", remoteRef], {
         cwd: rootDir,
         timeout: 3e4
       });
@@ -214115,7 +214546,7 @@ async function isBranchAheadOfBase(task, rootDir, preferredBaseRef) {
     }
   }
   try {
-    const { stdout } = await execFileAsync15(
+    const { stdout } = await execFileAsync16(
       "git",
       ["rev-list", "--count", `${resolvedBaseRef}..${branchName}`],
       { cwd: rootDir, timeout: 3e4 }
@@ -214133,7 +214564,7 @@ async function isBranchAheadOfBase(task, rootDir, preferredBaseRef) {
     return null;
   }
 }
-var log33, execFileAsync15;
+var log33, execFileAsync16;
 var init_self_healing_branch = __esm({
   "../engine/src/healing/self-healing-branch.ts"() {
     "use strict";
@@ -214141,7 +214572,7 @@ var init_self_healing_branch = __esm({
     init_integration_branch();
     init_logger3();
     log33 = createLogger2("self-healing");
-    execFileAsync15 = promisify44(execFile21);
+    execFileAsync16 = promisify45(execFile22);
   }
 });
 
@@ -214978,7 +215409,7 @@ var init_merger_workspace_test_commands = __esm({
 });
 
 // ../engine/src/merge/merger-file-scope.ts
-import { promisify as promisify45 } from "node:util";
+import { promisify as promisify46 } from "node:util";
 import { exec as exec32 } from "node:child_process";
 function parseDiffStat(diffStat) {
   const entries = [];
@@ -215190,7 +215621,7 @@ var init_merger_file_scope = __esm({
     init_merger_glob();
     init_logger3();
     init_merge_trait();
-    execAsync29 = promisify45(exec32);
+    execAsync29 = promisify46(exec32);
     FileScopeViolationError = class extends Error {
       taskId;
       stagedFiles;
@@ -215250,7 +215681,7 @@ var init_merger_errors = __esm({
 });
 
 // ../engine/src/merge/merger-owned-landed.ts
-import { promisify as promisify46 } from "node:util";
+import { promisify as promisify47 } from "node:util";
 import * as childProcess3 from "node:child_process";
 function escapeRegexForOwnership(value) {
   return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
@@ -215267,8 +215698,8 @@ function commitOwnedByTask2(taskId, subject, body) {
 async function findOwnedLandedCommitForTask(rootDir, task) {
   const tryHydrate = async (sha) => {
     try {
-      await execFileAsync16("git", ["merge-base", "--is-ancestor", sha, "HEAD"], { cwd: rootDir });
-      const { stdout } = await execFileAsync16("git", ["log", "-1", "--format=%H%x1f%s%x1f%b", sha], {
+      await execFileAsync17("git", ["merge-base", "--is-ancestor", sha, "HEAD"], { cwd: rootDir });
+      const { stdout } = await execFileAsync17("git", ["log", "-1", "--format=%H%x1f%s%x1f%b", sha], {
         cwd: rootDir,
         encoding: "utf-8"
       });
@@ -215276,7 +215707,7 @@ async function findOwnedLandedCommitForTask(rootDir, task) {
       if (!resolvedSha || !commitOwnedByTask2(task.id, subject, body)) return null;
       const owned = { sha: resolvedSha, subject };
       try {
-        const { stdout: statsOut } = await execFileAsync16("git", ["show", "--shortstat", "--format=", resolvedSha], {
+        const { stdout: statsOut } = await execFileAsync17("git", ["show", "--shortstat", "--format=", resolvedSha], {
           cwd: rootDir,
           encoding: "utf-8"
         });
@@ -215299,7 +215730,7 @@ async function findOwnedLandedCommitForTask(rootDir, task) {
   ];
   for (const args of searches) {
     try {
-      const { stdout } = await execFileAsync16("git", args, { cwd: rootDir, encoding: "utf-8" });
+      const { stdout } = await execFileAsync17("git", args, { cwd: rootDir, encoding: "utf-8" });
       const first = stdout.trim().split("\n").find(Boolean);
       if (!first) continue;
       const [sha] = first.split("");
@@ -215320,14 +215751,14 @@ async function classifyOwnedLandedEvidence(rootDir, task, opts) {
   const ownedCommit = await findOwnedLandedCommitForTask(rootDir, task);
   if (ownedCommit) {
     try {
-      await execFileAsync16("git", ["merge-base", "--is-ancestor", ownedCommit.sha, mergeTargetBranch], { cwd: rootDir });
+      await execFileAsync17("git", ["merge-base", "--is-ancestor", ownedCommit.sha, mergeTargetBranch], { cwd: rootDir });
       return { kind: "owned-commit", commit: ownedCommit };
     } catch {
     }
   }
   let aheadCount = null;
   try {
-    const { stdout } = await execFileAsync16("git", ["rev-list", "--count", `${mergeTargetBranch}..${branch}`], {
+    const { stdout } = await execFileAsync17("git", ["rev-list", "--count", `${mergeTargetBranch}..${branch}`], {
       cwd: rootDir,
       encoding: "utf-8"
     });
@@ -215339,7 +215770,7 @@ async function classifyOwnedLandedEvidence(rootDir, task, opts) {
   let baseReachableFromTarget = false;
   if (task.baseCommitSha) {
     try {
-      await execFileAsync16("git", ["merge-base", "--is-ancestor", task.baseCommitSha, mergeTargetBranch], { cwd: rootDir });
+      await execFileAsync17("git", ["merge-base", "--is-ancestor", task.baseCommitSha, mergeTargetBranch], { cwd: rootDir });
       baseReachableFromTarget = true;
     } catch {
       baseReachableFromTarget = false;
@@ -215350,7 +215781,7 @@ async function classifyOwnedLandedEvidence(rootDir, task, opts) {
   }
   if (aheadCount !== null && aheadCount > 0) {
     try {
-      const { stdout: mergeBaseOut } = await execFileAsync16(
+      const { stdout: mergeBaseOut } = await execFileAsync17(
         "git",
         ["merge-base", mergeTargetBranch, branch],
         { cwd: rootDir, encoding: "utf-8" }
@@ -215359,7 +215790,7 @@ async function classifyOwnedLandedEvidence(rootDir, task, opts) {
       if (mergeBase) {
         let ownDiffEmpty = false;
         try {
-          await execFileAsync16(
+          await execFileAsync17(
             "git",
             ["diff", "--quiet", `${mergeBase}..${branch}`],
             { cwd: rootDir }
@@ -215372,7 +215803,7 @@ async function classifyOwnedLandedEvidence(rootDir, task, opts) {
           let mergeBaseReachable = baseReachableFromTarget;
           if (!mergeBaseReachable) {
             try {
-              await execFileAsync16(
+              await execFileAsync17(
                 "git",
                 ["merge-base", "--is-ancestor", mergeBase, mergeTargetBranch],
                 { cwd: rootDir }
@@ -215392,7 +215823,7 @@ async function classifyOwnedLandedEvidence(rootDir, task, opts) {
   }
   let branchExists = false;
   try {
-    await execFileAsync16("git", ["show-ref", "--verify", "--quiet", `refs/heads/${branch}`], { cwd: rootDir });
+    await execFileAsync17("git", ["show-ref", "--verify", "--quiet", `refs/heads/${branch}`], { cwd: rootDir });
     branchExists = true;
   } catch {
     branchExists = false;
@@ -215410,7 +215841,7 @@ async function classifyOwnedLandedEvidence(rootDir, task, opts) {
   }
   if (task.baseCommitSha && !baseReachableFromTarget) {
     try {
-      const { stdout } = await execFileAsync16("git", ["for-each-ref", "--format=%(refname:short)", "refs/heads/fusion"], {
+      const { stdout } = await execFileAsync17("git", ["for-each-ref", "--format=%(refname:short)", "refs/heads/fusion"], {
         cwd: rootDir,
         encoding: "utf-8"
       });
@@ -215418,7 +215849,7 @@ async function classifyOwnedLandedEvidence(rootDir, task, opts) {
       for (const ref of refs) {
         if (ref === branch) continue;
         try {
-          await execFileAsync16("git", ["merge-base", "--is-ancestor", task.baseCommitSha, ref], { cwd: rootDir });
+          await execFileAsync17("git", ["merge-base", "--is-ancestor", task.baseCommitSha, ref], { cwd: rootDir });
           return {
             kind: "unproven",
             reason: "foreign-start-point",
@@ -215432,7 +215863,7 @@ async function classifyOwnedLandedEvidence(rootDir, task, opts) {
   }
   if (aheadCount !== null && aheadCount > 0) {
     try {
-      const { stdout } = await execFileAsync16("git", ["log", "--format=%s%x1f%b", `${mergeTargetBranch}..${branch}`], {
+      const { stdout } = await execFileAsync17("git", ["log", "--format=%s%x1f%b", `${mergeTargetBranch}..${branch}`], {
         cwd: rootDir,
         encoding: "utf-8"
       });
@@ -215473,20 +215904,20 @@ async function classifyOwnedLandedEvidence(rootDir, task, opts) {
     }
   };
 }
-var execFileAsync16, FUSION_TASK_ID_TRAILER_KEY3;
+var execFileAsync17, FUSION_TASK_ID_TRAILER_KEY3;
 var init_merger_owned_landed = __esm({
   "../engine/src/merge/merger-owned-landed.ts"() {
     "use strict";
     init_merger_file_scope();
     init_worktree_names();
-    execFileAsync16 = (file, args, opts) => promisify46(childProcess3.execFile)(file, args, opts);
+    execFileAsync17 = (file, args, opts) => promisify47(childProcess3.execFile)(file, args, opts);
     FUSION_TASK_ID_TRAILER_KEY3 = "Fusion-Task-Id";
   }
 });
 
 // ../engine/src/merge/merger-conflict-resolution.ts
-import { promisify as promisify47 } from "node:util";
-import { exec as exec33, execFile as execFile23 } from "node:child_process";
+import { promisify as promisify48 } from "node:util";
+import { exec as exec33, execFile as execFile24 } from "node:child_process";
 async function getConflictedFiles(cwd) {
   try {
     const { stdout } = await execAsync30("git diff --name-only --diff-filter=U", {
@@ -215502,7 +215933,7 @@ async function getConflictedFiles(cwd) {
 }
 async function isTrivialWhitespaceConflict(filePath, cwd) {
   try {
-    const { stdout } = await execFileAsync17(
+    const { stdout } = await execFileAsync18(
       "git",
       ["diff", "-p", "-w", `:2:${filePath}`, `:3:${filePath}`],
       { cwd, encoding: "utf-8" }
@@ -215538,8 +215969,8 @@ async function classifyConflict(filePath, cwd) {
 }
 async function resolveWithOurs(filePath, cwd) {
   try {
-    await execFileAsync17("git", ["checkout", "--ours", "--", filePath], { cwd });
-    await execFileAsync17("git", ["add", "--", filePath], { cwd });
+    await execFileAsync18("git", ["checkout", "--ours", "--", filePath], { cwd });
+    await execFileAsync18("git", ["add", "--", filePath], { cwd });
     mergerLog.debug(`Auto-resolved ${filePath} using --ours`);
   } catch (error3) {
     throw new Error(`Failed to auto-resolve ${filePath} with ours: ${error3}`);
@@ -215547,8 +215978,8 @@ async function resolveWithOurs(filePath, cwd) {
 }
 async function resolveWithTheirs(filePath, cwd) {
   try {
-    await execFileAsync17("git", ["checkout", "--theirs", "--", filePath], { cwd });
-    await execFileAsync17("git", ["add", "--", filePath], { cwd });
+    await execFileAsync18("git", ["checkout", "--theirs", "--", filePath], { cwd });
+    await execFileAsync18("git", ["add", "--", filePath], { cwd });
     mergerLog.debug(`Auto-resolved ${filePath} using --theirs`);
   } catch (error3) {
     throw new Error(`Failed to auto-resolve ${filePath} with theirs: ${error3}`);
@@ -215556,8 +215987,8 @@ async function resolveWithTheirs(filePath, cwd) {
 }
 async function resolveTrivialWhitespace(filePath, cwd) {
   try {
-    await execFileAsync17("git", ["checkout", "--ours", "--", filePath], { cwd });
-    await execFileAsync17("git", ["add", "--", filePath], { cwd });
+    await execFileAsync18("git", ["checkout", "--ours", "--", filePath], { cwd });
+    await execFileAsync18("git", ["add", "--", filePath], { cwd });
     mergerLog.debug(`Auto-resolved ${filePath} (trivial whitespace)`);
   } catch (error3) {
     throw new Error(`Failed to auto-resolve ${filePath} trivial conflict: ${error3}`);
@@ -215603,14 +216034,14 @@ async function resolveConflicts(categories2, rootDir) {
   }
   return remainingComplex;
 }
-var execAsync30, execFileAsync17;
+var execAsync30, execFileAsync18;
 var init_merger_conflict_resolution = __esm({
   "../engine/src/merge/merger-conflict-resolution.ts"() {
     "use strict";
     init_merger_glob();
     init_logger3();
-    execAsync30 = promisify47(exec33);
-    execFileAsync17 = (file, args, opts) => promisify47(execFile23)(file, args, opts);
+    execAsync30 = promisify48(exec33);
+    execFileAsync18 = (file, args, opts) => promisify48(execFile24)(file, args, opts);
   }
 });
 
@@ -215734,8 +216165,8 @@ var init_merger_autostash_labels = __esm({
 });
 
 // ../engine/src/merge/merger-squash-audit.ts
-import { execFile as execFile24 } from "node:child_process";
-import { promisify as promisify48 } from "node:util";
+import { execFile as execFile25 } from "node:child_process";
+import { promisify as promisify49 } from "node:util";
 async function auditSquashMerge(input) {
   const normalizedLookback = normalizeMergeOverlapLookback(input.lookback);
   if (input.strategy === "rebase") {
@@ -215853,7 +216284,7 @@ async function collectTouchedFileOverlaps(rootDir, touchedFiles, recentMainCommi
   return touchedFileOverlaps;
 }
 async function git5(rootDir, args) {
-  const { stdout } = await execFileAsync18("git", args, {
+  const { stdout } = await execFileAsync19("git", args, {
     cwd: rootDir,
     encoding: "utf-8",
     maxBuffer: GIT_OUTPUT_MAX_BUFFER
@@ -215886,19 +216317,19 @@ function normalizeMergeOverlapLookback(value) {
   }
   return Math.trunc(value);
 }
-var execFileAsync18, MERGER_MAIN_OVERLAP_LOOKBACK_COMMITS, GIT_OUTPUT_MAX_BUFFER;
+var execFileAsync19, MERGER_MAIN_OVERLAP_LOOKBACK_COMMITS, GIT_OUTPUT_MAX_BUFFER;
 var init_merger_squash_audit = __esm({
   "../engine/src/merge/merger-squash-audit.ts"() {
     "use strict";
-    execFileAsync18 = promisify48(execFile24);
+    execFileAsync19 = promisify49(execFile25);
     MERGER_MAIN_OVERLAP_LOOKBACK_COMMITS = 30;
     GIT_OUTPUT_MAX_BUFFER = 10 * 1024 * 1024;
   }
 });
 
 // ../engine/src/merge/merger-overlap-guard.ts
-import { execFile as execFile25 } from "node:child_process";
-import { promisify as promisify49 } from "node:util";
+import { execFile as execFile26 } from "node:child_process";
+import { promisify as promisify50 } from "node:util";
 async function getBranchTouchedFiles({
   rootDir,
   branch,
@@ -215974,7 +216405,7 @@ async function restoreBranchWinsFiles({
 }
 async function gitLines(rootDir, args, context2) {
   try {
-    const { stdout } = await execFileAsync19("git", args, {
+    const { stdout } = await execFileAsync20("git", args, {
       cwd: rootDir,
       encoding: "utf-8",
       maxBuffer: GIT_OUTPUT_MAX_BUFFER2
@@ -215992,7 +216423,7 @@ function normalizeLines3(value) {
 }
 async function gitRun(rootDir, args, context2) {
   try {
-    await execFileAsync19("git", args, {
+    await execFileAsync20("git", args, {
       cwd: rootDir,
       encoding: "utf-8",
       maxBuffer: GIT_OUTPUT_MAX_BUFFER2
@@ -216004,7 +216435,7 @@ async function gitRun(rootDir, args, context2) {
 }
 async function gitExitCode2(rootDir, args) {
   try {
-    await execFileAsync19("git", args, {
+    await execFileAsync20("git", args, {
       cwd: rootDir,
       encoding: "utf-8",
       maxBuffer: GIT_OUTPUT_MAX_BUFFER2
@@ -216017,20 +216448,20 @@ async function gitExitCode2(rootDir, args) {
 function formatErrorMessage(error3) {
   return error3 instanceof Error ? error3.message : String(error3);
 }
-var execFileAsync19, GIT_OUTPUT_MAX_BUFFER2;
+var execFileAsync20, GIT_OUTPUT_MAX_BUFFER2;
 var init_merger_overlap_guard = __esm({
   "../engine/src/merge/merger-overlap-guard.ts"() {
     "use strict";
     init_logger3();
     init_merger_squash_audit();
-    execFileAsync19 = promisify49(execFile25);
+    execFileAsync20 = promisify50(execFile26);
     GIT_OUTPUT_MAX_BUFFER2 = 10 * 1024 * 1024;
   }
 });
 
 // ../engine/src/merge/merger-auto-prerebase.ts
 import { exec as exec34 } from "node:child_process";
-import { promisify as promisify50 } from "node:util";
+import { promisify as promisify51 } from "node:util";
 async function probeDivergence(opts) {
   const mainRef = opts.mainRef ?? "HEAD";
   const range = `${opts.baseCommitSha}..${mainRef}`;
@@ -216117,13 +216548,13 @@ var execAsync31;
 var init_merger_auto_prerebase = __esm({
   "../engine/src/merge/merger-auto-prerebase.ts"() {
     "use strict";
-    execAsync31 = promisify50(exec34);
+    execAsync31 = promisify51(exec34);
   }
 });
 
 // ../engine/src/execution/branch-autocorrect.ts
 import { exec as exec35 } from "node:child_process";
-import { promisify as promisify51 } from "node:util";
+import { promisify as promisify52 } from "node:util";
 function quoteShellArg7(value) {
   return `'${value.replace(/'/g, `'\\''`)}'`;
 }
@@ -216192,7 +216623,7 @@ var execAsync32, GIT_TIMEOUT_MS7, GIT_MAX_BUFFER4;
 var init_branch_autocorrect = __esm({
   "../engine/src/execution/branch-autocorrect.ts"() {
     "use strict";
-    execAsync32 = promisify51(exec35);
+    execAsync32 = promisify52(exec35);
     GIT_TIMEOUT_MS7 = 1e4;
     GIT_MAX_BUFFER4 = 1024 * 1024;
   }
@@ -216656,9 +217087,9 @@ var init_mesh_lease_manager = __esm({
 });
 
 // ../engine/src/merge/merger-integration-worktree.ts
-import { createHash as createHash32 } from "node:crypto";
-import { exec as exec36, execFile as execFile26 } from "node:child_process";
-import { promisify as promisify52 } from "node:util";
+import { createHash as createHash33 } from "node:crypto";
+import { exec as exec36, execFile as execFile27 } from "node:child_process";
+import { promisify as promisify53 } from "node:util";
 function quoteAutostashArg(value) {
   return `"${value.replace(/(["\\$`])/g, "\\$1")}"`;
 }
@@ -216735,15 +217166,15 @@ async function snapshotDirtyFilesLocal(rootDir) {
   const paths3 = /* @__PURE__ */ new Set();
   try {
     const [unstagedOut, stagedOut, porcelainOut] = await Promise.all([
-      execFileAsync20("git", ["diff", "-z", "--name-only"], { cwd: rootDir, encoding: "utf-8" }).then(
+      execFileAsync21("git", ["diff", "-z", "--name-only"], { cwd: rootDir, encoding: "utf-8" }).then(
         (r) => r.stdout,
         () => ""
       ),
-      execFileAsync20("git", ["diff", "-z", "--cached", "--name-only"], { cwd: rootDir, encoding: "utf-8" }).then(
+      execFileAsync21("git", ["diff", "-z", "--cached", "--name-only"], { cwd: rootDir, encoding: "utf-8" }).then(
         (r) => r.stdout,
         () => ""
       ),
-      execFileAsync20("git", ["status", "-z", "--porcelain"], { cwd: rootDir, encoding: "utf-8" }).then(
+      execFileAsync21("git", ["status", "-z", "--porcelain"], { cwd: rootDir, encoding: "utf-8" }).then(
         (r) => r.stdout,
         () => ""
       )
@@ -216768,18 +217199,18 @@ async function snapshotDirtyFilesLocal(rootDir) {
 async function gitDirtyFingerprintLocal(rootDir) {
   try {
     const [diffOut, statusOut] = await Promise.all([
-      execFileAsync20("git", ["diff", "HEAD"], {
+      execFileAsync21("git", ["diff", "HEAD"], {
         cwd: rootDir,
         encoding: "utf-8",
         maxBuffer: 64 * 1024 * 1024
       }).then((r) => r.stdout, () => ""),
-      execFileAsync20("git", ["status", "-z", "--porcelain"], { cwd: rootDir, encoding: "utf-8" }).then(
+      execFileAsync21("git", ["status", "-z", "--porcelain"], { cwd: rootDir, encoding: "utf-8" }).then(
         (r) => r.stdout,
         () => ""
       )
     ]);
     if (!diffOut && !statusOut) return "";
-    return createHash32("sha256").update(diffOut).update("\0").update(statusOut).digest("hex");
+    return createHash33("sha256").update(diffOut).update("\0").update(statusOut).digest("hex");
   } catch {
     return "";
   }
@@ -216796,7 +217227,7 @@ async function probeIntegrationWorktreeState(input) {
     const dirtyFingerprint = await gitDirtyFingerprintLocal(registeredPath);
     let untrackedCount = 0;
     try {
-      const { stdout } = await execFileAsync20("git", ["status", "-z", "--porcelain"], {
+      const { stdout } = await execFileAsync21("git", ["status", "-z", "--porcelain"], {
         cwd: registeredPath,
         encoding: "utf-8"
       });
@@ -217157,7 +217588,7 @@ async function releaseReuseHandoff(input) {
     }
   });
 }
-var execAsync33, execFileAsync20, MERGE_HANDOFF_WORKER_ID, MergeHandoffRefusedError;
+var execAsync33, execFileAsync21, MERGE_HANDOFF_WORKER_ID, MergeHandoffRefusedError;
 var init_merger_integration_worktree = __esm({
   "../engine/src/merge/merger-integration-worktree.ts"() {
     "use strict";
@@ -217168,8 +217599,8 @@ var init_merger_integration_worktree = __esm({
     init_mesh_lease_manager();
     init_worktree_pool();
     init_worktree_names();
-    execAsync33 = promisify52(exec36);
-    execFileAsync20 = promisify52(execFile26);
+    execAsync33 = promisify53(exec36);
+    execFileAsync21 = promisify53(execFile27);
     MERGE_HANDOFF_WORKER_ID = "merger-reuse-handoff";
     MergeHandoffRefusedError = class extends Error {
       reason;
@@ -217198,13 +217629,13 @@ var init_push_after_merge_policy = __esm({
 });
 
 // ../engine/src/worktree/worktree-ref-sync.ts
-import { execFile as execFile27, spawn as spawn7 } from "node:child_process";
-import { promisify as promisify53 } from "node:util";
+import { execFile as execFile28, spawn as spawn7 } from "node:child_process";
+import { promisify as promisify54 } from "node:util";
 import { copyFileSync, existsSync as existsSync64, mkdirSync as mkdirSync8, mkdtempSync as mkdtempSync2, readFileSync as readFileSync22, rmSync as rmSync5, writeFileSync as writeFileSync8 } from "node:fs";
 import { dirname as dirname39, join as join80 } from "node:path";
 import { tmpdir as tmpdir7 } from "node:os";
 async function runGit5(args, cwd, timeoutMs) {
-  const result2 = await execFileAsync21("git", ["-c", "core.quotePath=false", ...args], {
+  const result2 = await execFileAsync22("git", ["-c", "core.quotePath=false", ...args], {
     cwd,
     timeout: timeoutMs,
     maxBuffer: 64 * 1024 * 1024,
@@ -217438,11 +217869,11 @@ async function syncWorktreeToHead(input) {
     }
   }
 }
-var execFileAsync21;
+var execFileAsync22;
 var init_worktree_ref_sync = __esm({
   "../engine/src/worktree/worktree-ref-sync.ts"() {
     "use strict";
-    execFileAsync21 = promisify53(execFile27);
+    execFileAsync22 = promisify54(execFile28);
   }
 });
 
@@ -217450,7 +217881,7 @@ var init_worktree_ref_sync = __esm({
 import { exec as exec37 } from "node:child_process";
 import { readFile as readFile44, writeFile as writeFile26 } from "node:fs/promises";
 import { join as join81 } from "node:path";
-import { promisify as promisify54 } from "node:util";
+import { promisify as promisify55 } from "node:util";
 function quoteArg4(value) {
   return `'${value.replace(/'/g, `'\\''`)}'`;
 }
@@ -217626,7 +218057,7 @@ var init_merger_scope_auto_widen = __esm({
     "use strict";
     init_src2();
     init_merger();
-    execAsync34 = promisify54(exec37);
+    execAsync34 = promisify55(exec37);
     GIT_MAX_BUFFER5 = 10 * 1024 * 1024;
     ScopeAutoWidenPersistError = class extends Error {
       constructor(message) {
@@ -217760,9 +218191,9 @@ __export(merger_exports, {
 });
 import { execSync as execSync6, exec as exec38 } from "node:child_process";
 import * as childProcess4 from "node:child_process";
-import { promisify as promisify55 } from "node:util";
+import { promisify as promisify56 } from "node:util";
 import { existsSync as existsSync65, readFileSync as readFileSync23, writeFileSync as writeFileSync9, unlinkSync as unlinkSync3, renameSync as renameSync4 } from "node:fs";
-import { createHash as createHash33 } from "node:crypto";
+import { createHash as createHash34 } from "node:crypto";
 import { join as join82, resolve as resolve48 } from "node:path";
 import { hostname as hostname3 } from "node:os";
 import { Type as Type4 } from "typebox";
@@ -217973,15 +218404,15 @@ async function snapshotDirtyFiles(rootDir) {
   const paths3 = /* @__PURE__ */ new Set();
   try {
     const [unstagedOut, stagedOut, porcelainOut] = await Promise.all([
-      execFileAsync22("git", ["diff", "-z", "--name-only"], { cwd: rootDir, encoding: "utf-8" }).then(
+      execFileAsync23("git", ["diff", "-z", "--name-only"], { cwd: rootDir, encoding: "utf-8" }).then(
         (r) => r.stdout,
         () => ""
       ),
-      execFileAsync22("git", ["diff", "-z", "--cached", "--name-only"], { cwd: rootDir, encoding: "utf-8" }).then(
+      execFileAsync23("git", ["diff", "-z", "--cached", "--name-only"], { cwd: rootDir, encoding: "utf-8" }).then(
         (r) => r.stdout,
         () => ""
       ),
-      execFileAsync22("git", ["status", "-z", "--porcelain"], { cwd: rootDir, encoding: "utf-8" }).then(
+      execFileAsync23("git", ["status", "-z", "--porcelain"], { cwd: rootDir, encoding: "utf-8" }).then(
         (r) => r.stdout,
         () => ""
       )
@@ -218006,18 +218437,18 @@ async function snapshotDirtyFiles(rootDir) {
 async function gitDirtyFingerprint(rootDir) {
   try {
     const [diffOut, statusOut] = await Promise.all([
-      execFileAsync22("git", ["diff", "HEAD"], {
+      execFileAsync23("git", ["diff", "HEAD"], {
         cwd: rootDir,
         encoding: "utf-8",
         maxBuffer: 64 * 1024 * 1024
       }).then((r) => r.stdout, () => ""),
-      execFileAsync22("git", ["status", "-z", "--porcelain"], { cwd: rootDir, encoding: "utf-8" }).then(
+      execFileAsync23("git", ["status", "-z", "--porcelain"], { cwd: rootDir, encoding: "utf-8" }).then(
         (r) => r.stdout,
         () => ""
       )
     ]);
     if (!diffOut && !statusOut) return "";
-    return createHash33("sha256").update(diffOut).update("\0").update(statusOut).digest("hex");
+    return createHash34("sha256").update(diffOut).update("\0").update(statusOut).digest("hex");
   } catch {
     return "";
   }
@@ -219979,7 +220410,7 @@ function splitNulDelimited(output2) {
   return text3.split(NUL).filter((entry) => entry.length > 0);
 }
 async function countStagedPaths(rootDir) {
-  const { stdout } = await execFileAsync22("git", ["diff", "--cached", "--name-only", "-z"], {
+  const { stdout } = await execFileAsync23("git", ["diff", "--cached", "--name-only", "-z"], {
     cwd: rootDir,
     encoding: "buffer",
     maxBuffer: 10 * 1024 * 1024
@@ -219988,7 +220419,7 @@ async function countStagedPaths(rootDir) {
 }
 async function filterStagedGitignoredPaths(rootDir, taskId) {
   try {
-    const { stdout: stagedOut } = await execFileAsync22("git", ["diff", "--cached", "--name-only", "-z"], {
+    const { stdout: stagedOut } = await execFileAsync23("git", ["diff", "--cached", "--name-only", "-z"], {
       cwd: rootDir,
       encoding: "buffer",
       maxBuffer: 10 * 1024 * 1024
@@ -220002,7 +220433,7 @@ async function filterStagedGitignoredPaths(rootDir, taskId) {
     for (let i = 0; i < stagedPaths.length; i += batchSize) {
       const batch = stagedPaths.slice(i, i + batchSize);
       try {
-        const { stdout } = await execFileAsync22("git", ["check-ignore", "--no-index", "--", ...batch], {
+        const { stdout } = await execFileAsync23("git", ["check-ignore", "--no-index", "--", ...batch], {
           cwd: rootDir,
           encoding: "utf-8",
           maxBuffer: 10 * 1024 * 1024
@@ -220025,7 +220456,7 @@ async function filterStagedGitignoredPaths(rootDir, taskId) {
         `${taskId}: refusing to stage gitignored path "${path13}" \u2014 unstaging (agents must not bypass .gitignore via \`git add -f\`)`
       );
       try {
-        await execFileAsync22("git", ["reset", "HEAD", "--", path13], {
+        await execFileAsync23("git", ["reset", "HEAD", "--", path13], {
           cwd: rootDir,
           encoding: "utf-8",
           maxBuffer: 10 * 1024 * 1024
@@ -220057,7 +220488,7 @@ async function commitOrAmendMergeWithFixes(rootDir, taskId, branch, commitLog, i
       encoding: "utf-8"
     });
     const unstaged = new Set(unstagedOut.split("\n").map((l) => l.trim()).filter(Boolean));
-    const { stdout: porcelainOut } = await execFileAsync22("git", ["status", "-z", "--porcelain"], {
+    const { stdout: porcelainOut } = await execFileAsync23("git", ["status", "-z", "--porcelain"], {
       cwd: rootDir,
       encoding: "utf-8"
     });
@@ -220078,7 +220509,7 @@ async function commitOrAmendMergeWithFixes(rootDir, taskId, branch, commitLog, i
       }
     }
     if (unstagedToStage.length > 0) {
-      await execFileAsync22("git", ["add", "--", ...unstagedToStage], { cwd: rootDir });
+      await execFileAsync23("git", ["add", "--", ...unstagedToStage], { cwd: rootDir });
     }
     const untrackedToStage = [];
     for (const p2 of untracked) {
@@ -220091,7 +220522,7 @@ async function commitOrAmendMergeWithFixes(rootDir, taskId, branch, commitLog, i
       }
     }
     if (untrackedToStage.length > 0) {
-      await execFileAsync22("git", ["add", "--", ...untrackedToStage], { cwd: rootDir });
+      await execFileAsync23("git", ["add", "--", ...untrackedToStage], { cwd: rootDir });
     }
     const cap = (arr, n = 20) => arr.length <= n ? arr.join(", ") : `${arr.slice(0, n).join(", ")} ... (+${arr.length - n} more)`;
     mergerLog.debug(
@@ -221562,7 +221993,7 @@ function isNonFastForwardPushError(message) {
 }
 async function probeRebaseInProgress(rootDir) {
   const gitPath = async (name2) => {
-    const { stdout } = await execFileAsync22("git", ["rev-parse", "--git-path", name2], {
+    const { stdout } = await execFileAsync23("git", ["rev-parse", "--git-path", name2], {
       cwd: rootDir,
       encoding: "utf-8",
       timeout: PUSH_TIMEOUT_MS
@@ -225747,7 +226178,7 @@ async function completeTask(store, taskId, result2) {
   }
   store.emit("task:merged", result2);
 }
-var execAsync35, execFileAsync22, LEGACY_COMPLETE_LANES2, DEPENDENCY_SYNC_TRIGGER_PATTERNS, PULL_REBASE_TIMEOUT_MS, PUSH_TIMEOUT_MS, PUSH_NON_FF_MAX_RETRIES, PUSH_NON_FF_RETRY_BACKOFF_MS, PUSH_TRANSIENT_RETRY_BACKOFF_MS, TRANSIENT_GIT_PUSH_PATTERNS, MERGE_COMMIT_LOG_MAX_CHARS, MERGE_DIFF_STAT_MAX_CHARS, MERGE_USER_COMMENTS_MAX_CHARS, summarizeVerificationOutputLocal, VERIFICATION_EXTRA_ENV, ACTIVE_MERGER_STATUS_FILENAME, __test__, AutostashCreationFailedError, NUL, SquashAuditError;
+var execAsync35, execFileAsync23, LEGACY_COMPLETE_LANES2, DEPENDENCY_SYNC_TRIGGER_PATTERNS, PULL_REBASE_TIMEOUT_MS, PUSH_TIMEOUT_MS, PUSH_NON_FF_MAX_RETRIES, PUSH_NON_FF_RETRY_BACKOFF_MS, PUSH_TRANSIENT_RETRY_BACKOFF_MS, TRANSIENT_GIT_PUSH_PATTERNS, MERGE_COMMIT_LOG_MAX_CHARS, MERGE_DIFF_STAT_MAX_CHARS, MERGE_USER_COMMENTS_MAX_CHARS, summarizeVerificationOutputLocal, VERIFICATION_EXTRA_ENV, ACTIVE_MERGER_STATUS_FILENAME, __test__, AutostashCreationFailedError, NUL, SquashAuditError;
 var init_merger = __esm({
   "../engine/src/merger.ts"() {
     "use strict";
@@ -225819,8 +226250,8 @@ var init_merger = __esm({
     init_merger_scope_auto_widen();
     init_lifecycle_move();
     init_merger_ref_update_advance();
-    execAsync35 = promisify55(exec38);
-    execFileAsync22 = (file, args, opts) => promisify55(childProcess4.execFile)(file, args, opts);
+    execAsync35 = promisify56(exec38);
+    execFileAsync23 = (file, args, opts) => promisify56(childProcess4.execFile)(file, args, opts);
     LEGACY_COMPLETE_LANES2 = ["done"];
     DEPENDENCY_SYNC_TRIGGER_PATTERNS = [
       "package.json",
@@ -225924,9 +226355,6 @@ function isDependencySatisfiedWithoutWorkflowMetadata(column) {
 function isLegacyCompleteColumnForWorkspaceTeardown(column) {
   return column === "done";
 }
-function resolveRepoLocalAiMergeRoot(rootDir, settings) {
-  return resolveAiMergeRootPath(rootDir, settings);
-}
 async function classifyOwnedLandedEvidenceForSelfHealing(rootDir, task, mergeTargetBranch) {
   const { classifyOwnedLandedEvidence: classifyOwnedLandedEvidence2 } = await Promise.resolve().then(() => (init_merger(), merger_exports));
   return classifyOwnedLandedEvidence2(rootDir, task, { mergeTargetBranch });
@@ -226013,6 +226441,8 @@ var init_self_healing = __esm({
     init_branch_conflicts();
     init_run_audit();
     init_auto_merge_finalization();
+    init_merge_content_capture();
+    init_stale_content_review_reroute();
     init_post_landing_worktree_cleanup();
     init_auto_recovery();
     init_active_session_registry();
@@ -226181,6 +226611,7 @@ var init_self_healing = __esm({
       symbolLockNoActionAudited = false;
       maintenanceTickCounter = 0;
       taskLifecycleRetentionLastPrunedAt = /* @__PURE__ */ new Map();
+      staleContentRerouteAuditKeys = /* @__PURE__ */ new Set();
       githubCheckStateRetentionLastPrunedAt = /* @__PURE__ */ new Map();
       processBootStartedAt = Date.now();
       lastDbCorruptionNotifiedAt = null;
@@ -226896,6 +227327,7 @@ var init_self_healing = __esm({
           // flight" to all of them (the merge gate included), which is the two-hour
           // stall-deadlock ride this sweep exists to prevent.
           { name: "reconcile-orphaned-pending-step-results", fn: () => this.reconcileOrphanedPendingStepResults().then(() => void 0) },
+          { name: "reconcile-unproven-review-approvals", fn: () => this.reconcileUnprovenReviewApprovals().then(() => void 0) },
           /*
           FNXC:WorkspaceContention 2026-08-23-08:00:
           `contention-hold` is owned by an in-memory retry timer. After a process restart that
@@ -227776,6 +228208,7 @@ var init_self_healing = __esm({
               Keep them adjacent and in this order.
               */
               { name: "reconcile-orphaned-pending-step-results", fn: () => this.reconcileOrphanedPendingStepResults() },
+              { name: "reconcile-unproven-review-approvals", fn: () => this.reconcileUnprovenReviewApprovals() },
               { name: "recover-failed-pre-merge-steps", fn: () => this.recoverReviewTasksWithFailedPreMergeSteps() },
               { name: "recover-missing-worktree-review-failures", fn: () => this.recoverMissingWorktreeReviewFailures() },
               { name: "recover-interrupted-merging", fn: () => this.recoverInterruptedMergingTasks() },
@@ -232222,6 +232655,95 @@ var init_self_healing = __esm({
           return 0;
         }
       }
+      /*
+        FNXC:ReviewInputProof 2026-09-01-11:28:
+        Prevention cannot release cards that already persisted a proofless `passed` content review. Repair
+        only the invalid result in place, including when auto-merge is off, so automatic recovery can re-run
+        eligible gates and a human-held card gains the failed result its audited bypass needs. The
+        `needsOperatorBypass` label is therefore truthful rather than aspirational; no lifecycle state moves.
+      
+        FNXC:ReviewInputProof 2026-09-01-11:57:
+        Reconciliation must recompute from the lock-held task inside `updateTaskAtomic`; a graph writer can
+        publish a proof-bound approval or another gate after the preliminary read, and a stale array write
+        would discard that valid result. Re-check lane, user pause, workspace ownership, and session liveness
+        in the callback, then log and audit only a repair whose atomic mutation actually applied.
+        */
+      async reconcileUnprovenReviewApprovals() {
+        try {
+          const reviewColumns = await resolveProjectColumnsForRoles(this.store, REVIEW_ROLES);
+          const candidates = /* @__PURE__ */ new Map();
+          for (const column of reviewColumns) {
+            for (const task of await this.store.listTasks({ column, slim: true })) candidates.set(task.id, task);
+          }
+          const settings = await this.store.getSettings().catch(() => void 0);
+          let repairedTasks = 0;
+          const isSessionLive = (taskId) => {
+            const livePaths = activeSessionRegistry.pathsForTask(taskId);
+            return livePaths.some((path13) => activeSessionRegistry.isPathActive(path13)) || executingTaskLock.has(taskId) || this.options.isTaskActive?.(taskId) === true;
+          };
+          for (const candidate of candidates.values()) {
+            if (candidate.userPaused === true || candidate.workspaceWorktrees !== void 0 || isSessionLive(candidate.id)) continue;
+            if (!candidate.workflowStepResults?.some((result2) => resolveUnprovenReviewApproval(result2, { workspace: false }))) continue;
+            const fresh = await this.store.getTask(candidate.id);
+            if (!fresh || !reviewColumns.has(fresh.column) || fresh.userPaused === true || fresh.workspaceWorktrees !== void 0 || isSessionLive(fresh.id)) continue;
+            let repair;
+            try {
+              await this.store.updateTaskAtomic(fresh.id, (live) => {
+                repair = void 0;
+                if (!reviewColumns.has(live.column) || live.userPaused === true || live.workspaceWorktrees !== void 0 || isSessionLive(live.id)) return null;
+                const repairedStepIds = [];
+                let repairReason;
+                const results = (live.workflowStepResults ?? []).map((result2) => {
+                  const resolution = resolveUnprovenReviewApproval(result2, { workspace: false });
+                  if (!resolution) return result2;
+                  repairedStepIds.push(result2.workflowStepId);
+                  repairReason ??= resolution.reason;
+                  return resolution.downgraded;
+                });
+                if (repairedStepIds.length === 0 || !repairReason) return null;
+                repair = {
+                  stepIds: repairedStepIds,
+                  reason: repairReason,
+                  column: live.column,
+                  resultCount: results.length,
+                  needsOperatorBypass: settings ? !allowsAutoMergeProcessing(live, settings) : void 0
+                };
+                return { workflowStepResults: results };
+              });
+              if (!repair) continue;
+              repairedTasks += 1;
+            } catch (error3) {
+              log34.warn(`reconcileUnprovenReviewApprovals: failed for ${fresh.id}: ${error3 instanceof Error ? error3.message : String(error3)}`);
+              continue;
+            }
+            await this.store.logEntry(
+              fresh.id,
+              `[pre-merge] Invalid proofless approval repaired for ${repair.stepIds.join(", ")}: ${repair.reason}`
+            ).catch(() => void 0);
+            await emitBoundedRunAudit2(this.store, {
+              taskId: fresh.id,
+              agentId: "self-healing",
+              runId: generateSyntheticRunId("reconcile-unproven-review-approval", fresh.id),
+              domain: "database",
+              mutationType: "task:reconcile-unproven-review-approval",
+              target: fresh.id,
+              metadata: {
+                taskId: fresh.id,
+                column: repair.column,
+                workflowStepId: repair.stepIds[0],
+                repairedCount: repair.stepIds.length,
+                resultCount: repair.resultCount,
+                needsOperatorBypass: repair.needsOperatorBypass
+              }
+            }, { log: log34 });
+          }
+          if (repairedTasks > 0) log34.log(`Repaired unproven review approvals on ${repairedTasks} task(s)`);
+          return repairedTasks;
+        } catch (error3) {
+          log34.error(`reconcileUnprovenReviewApprovals failed: ${error3 instanceof Error ? error3.message : String(error3)}`);
+          return 0;
+        }
+      }
       /**
        * Backward lifecycle move gated on triple proof (FN-5335).
        * When the unproven fallback predicate fails, emits `task:finalize-no-op-review-no-action` and skips lifecycle mutation.
@@ -232575,6 +233097,66 @@ var init_self_healing = __esm({
         }
         return allowsAutoMergeProcessing(task, settings) && resolveEffectiveAutoMerge(task, settings) !== false;
       }
+      /*
+      FNXC:PreMergeApproval 2026-09-01-14:05:
+      Self-healing must not treat a stale content-bound approval as mergeable just because the cheap
+      blocker check lacks a fresh Git descriptor. Capture the same merge content the merge queue uses and
+      seed the graph back at Code Review, so cards like FN-9234 stop looping through doomed merge retries.
+      */
+      async routeStaleSingularApprovalBackToReview(task, reviewColumns, settings) {
+        let mergeGate;
+        try {
+          mergeGate = await resolvePreMergeGateForTask(this.store, task.id, task.enabledWorkflowSteps, task);
+        } catch {
+          return false;
+        }
+        if (mergeGate.provenance === "default" && !mergeGate.selectionAbsent) return false;
+        const mergeContent = await captureMergeContentDescriptor(task, {
+          workspaceRootDir: this.options.rootDir,
+          settings
+        });
+        const blocker = getTaskMergeBlocker(task, {
+          reviewColumns,
+          requiredPreMergeStepIds: mergeGate.requiredPreMergeStepIds,
+          mergeContent
+        });
+        if (blocker !== "task has a pre-merge approval recorded against different content" || mergeContent.kind !== "singular") {
+          return false;
+        }
+        const reroute = await rerouteSingularStaleContentToReview(this.store, task, {
+          requiredPreMergeStepIds: mergeGate.requiredPreMergeStepIds,
+          mergeContent
+        }).catch(() => ({
+          rerouted: false,
+          reason: "no-progress",
+          nodeId: void 0,
+          workflowStepId: void 0
+        }));
+        if (reroute.rerouted) {
+          await this.store.logEntry(task.id, "[pre-merge] Self-healing re-seeded Code Review after stale content evidence blocked merge.");
+          log34.warn(`Stale content approval for ${task.id} re-seeded at ${reroute.nodeId ?? "code-review"}`);
+        }
+        const auditKey = `${task.id}:${reroute.reason}:${reroute.nodeId ?? ""}`;
+        if (!this.staleContentRerouteAuditKeys.has(auditKey)) {
+          this.staleContentRerouteAuditKeys.add(auditKey);
+          await emitBoundedRunAudit2(this.store, {
+            taskId: task.id,
+            agentId: "self-healing",
+            runId: generateSyntheticRunId("self-healing", task.id),
+            domain: "database",
+            mutationType: "task:merge-stale-content-review-rerouted",
+            target: task.id,
+            metadata: {
+              taskId: task.id,
+              nodeId: reroute.nodeId,
+              workflowStepId: reroute.workflowStepId,
+              reason: reroute.reason,
+              source: "self-healing"
+            }
+          });
+        }
+        return true;
+      }
       /**
        * Recover `in-review` tasks that are fully mergeable but never had
        * `mergeTask()` invoked.
@@ -232628,6 +233210,7 @@ var init_self_healing = __esm({
           for (const task of mergeable) {
             const reviewColumns = await ownReviewLanesFor(task);
             if (!reviewColumns.has(task.column)) continue;
+            if (await this.routeStaleSingularApprovalBackToReview(task, reviewColumns, settings)) continue;
             if (getTaskMergeBlocker(task, { reviewColumns }) !== void 0) continue;
             laneQualifiedMergeable.push(task);
           }
@@ -235194,8 +235777,7 @@ This review is not retried until its findings change. Re-run the review after ad
       }
       async listAiMergeWorktreeCandidates(taskId, settings) {
         const roots = Array.from(/* @__PURE__ */ new Set([
-          resolveRepoLocalAiMergeRoot(this.options.rootDir, settings),
-          resolveLegacyAiMergeRootPath(this.options.rootDir),
+          ...resolveAiMergeSearchRoots(this.options.rootDir, settings),
           tmpdir8()
         ]));
         const testWorkerRoot = process.env.FUSION_TEST_WORKER_ROOT;
@@ -237729,9 +238311,7 @@ This review is not retried until its findings change. Re-run the review after ad
             log34.debug("[self-healing] temp-dir sweep: worktrunk enabled \u2014 AI merge clean-room worktrees use Fusion's dedicated clean-room root, proceeding with native sweep");
           }
           const roots = Array.from(/* @__PURE__ */ new Set([
-            resolveRepoLocalAiMergeRoot(this.options.rootDir, settings),
-            resolveLegacyAiMergeRootPath(this.options.rootDir),
-            ...settings.worktreesDir ? [] : [join83(resolveLegacyWorktreesDirLayout(this.options.rootDir), ".ai-merge")],
+            ...resolveAiMergeSearchRoots(this.options.rootDir, settings),
             tmpdir8()
           ]));
           const auditor = createRunAuditor(this.store, {
@@ -238284,7 +238864,7 @@ import { exec as exec39 } from "node:child_process";
 import { existsSync as existsSync67 } from "node:fs";
 import { readFile as readFile46, writeFile as writeFile27, rm as rm11 } from "node:fs/promises";
 import { join as join84 } from "node:path";
-import { promisify as promisify56 } from "node:util";
+import { promisify as promisify57 } from "node:util";
 function getPlanningLifecycleLockTransportFailure(task) {
   const candidate = task.customFields?.[PLANNING_LIFECYCLE_LOCK_TRANSPORT_FAILURE_KEY];
   if (!candidate || typeof candidate !== "object" || Array.isArray(candidate)) return null;
@@ -241681,7 +242261,7 @@ ${lines.join("\n")}` }],
               written,
               {
                 cwd: this.rootDir,
-                exec: promisify56(exec39)
+                exec: promisify57(exec39)
               }
             ),
             new Promise((resolve65) => setTimeout(() => resolve65(null), 15e3))
@@ -241935,7 +242515,7 @@ var init_workflow_gate_activity = __esm({
 
 // ../engine/src/executor/browser-probe.ts
 import { exec as exec40 } from "node:child_process";
-import { promisify as promisify57 } from "node:util";
+import { promisify as promisify58 } from "node:util";
 function isAgentBrowserNotFoundError(error3) {
   const err = error3;
   const code = typeof err?.code === "string" || typeof err?.code === "number" ? String(err.code) : void 0;
@@ -241991,7 +242571,7 @@ var execAsync36, AGENT_BROWSER_NAVIGATION_SKILL_ID;
 var init_browser_probe = __esm({
   "../engine/src/executor/browser-probe.ts"() {
     "use strict";
-    execAsync36 = promisify57(exec40);
+    execAsync36 = promisify58(exec40);
     AGENT_BROWSER_NAVIGATION_SKILL_ID = "agent-browser-navigation";
   }
 });
@@ -242510,7 +243090,7 @@ var init_workflow_failure_scope_guard = __esm({
 // ../engine/src/executor/worktree-registry-helpers.ts
 import { isAbsolute as isAbsolute21, relative as relative20, resolve as resolvePath3 } from "node:path";
 import { exec as exec41 } from "node:child_process";
-import { promisify as promisify58 } from "node:util";
+import { promisify as promisify59 } from "node:util";
 async function isRegisteredWorktree(rootDir, path13) {
   return isRegisteredGitWorktree(rootDir, path13);
 }
@@ -242554,7 +243134,7 @@ var init_worktree_registry_helpers = __esm({
   "../engine/src/executor/worktree-registry-helpers.ts"() {
     "use strict";
     init_worktree_pool();
-    execAsync37 = promisify58(exec41);
+    execAsync37 = promisify59(exec41);
     NonRetryableWorktreeError = class extends Error {
     };
   }
@@ -242783,7 +243363,7 @@ var init_worktree_ownership = __esm({
 
 // ../engine/src/executor/worktree-stale-branch.ts
 import { exec as exec42 } from "node:child_process";
-import { promisify as promisify59 } from "node:util";
+import { promisify as promisify60 } from "node:util";
 async function cleanupStaleBranch(rootDir, store, branch, taskId) {
   const task = await store.getTask?.(taskId);
   if (!task || !isFusionDeletableBranch(task, branch)) {
@@ -242839,13 +243419,13 @@ var init_worktree_stale_branch = __esm({
   "../engine/src/executor/worktree-stale-branch.ts"() {
     "use strict";
     init_src2();
-    execAsync38 = promisify59(exec42);
+    execAsync38 = promisify60(exec42);
   }
 });
 
 // ../engine/src/executor/worktree-squash-import-plan.ts
 import { exec as exec43 } from "node:child_process";
-import { promisify as promisify60 } from "node:util";
+import { promisify as promisify61 } from "node:util";
 async function planSquashImportFromDep(rootDir, store, _taskId, depTip, originalStartPoint) {
   let settings;
   try {
@@ -242919,7 +243499,7 @@ var init_worktree_squash_import_plan = __esm({
   "../engine/src/executor/worktree-squash-import-plan.ts"() {
     "use strict";
     init_shell_quote();
-    execAsync39 = promisify60(exec43);
+    execAsync39 = promisify61(exec43);
   }
 });
 
@@ -243670,7 +244250,7 @@ var init_optional_step_revision = __esm({
 
 // ../engine/src/executor/execute-workflow-step.ts
 import { exec as exec44 } from "node:child_process";
-import { promisify as promisify61 } from "node:util";
+import { promisify as promisify62 } from "node:util";
 function findReusableReviewResult(task, workflowStepId, reviewInputFingerprint, repositoryScopeRevision) {
   if (!reviewInputFingerprint) return void 0;
   return (task.workflowStepResults ?? []).find(
@@ -243708,6 +244288,8 @@ async function executeWorkflowStep(deps, task, workflowStep, worktreePath, setti
   const unattended = stepOptions?.unattended === true;
   const workflowStepMetadata = workflowStep;
   const optionalGroupId = workflowStepMetadata.optionalGroupId;
+  const effectiveWorkflowStepId = optionalGroupId ?? workflowStep.id.replace(/^graph:/, "");
+  const isContentBindingStep = requiresContentReviewProof(effectiveWorkflowStepId, workflowStepMetadata);
   const isPlanReviewStep = workflowStep.id === "graph:plan-review-step" || workflowStep.name === "Plan Review" || optionalGroupId === PLAN_REVIEW_GROUP_ID;
   const planReviewRevisionKey = optionalStepRevisionKey2(optionalGroupId, workflowStep.name);
   const isReviewTypeWorkflowStep = isPlanReviewStep || workflowStepMetadata.reviewCanFixInline === true || /(?:^|\b)(?:review|verification)(?:\b|$)/i.test(workflowStep.name) || optionalGroupId === "plan-review" || optionalGroupId === "code-review" || optionalGroupId === "browser-verification";
@@ -243718,6 +244300,8 @@ async function executeWorkflowStep(deps, task, workflowStep, worktreePath, setti
     toolMode = "coding";
   }
   const requireExternalIntegrationEvidence = workflowStepMetadata.requireExternalIntegrationEvidence === true;
+  const readonlyMcpServerAllowlist = toolMode === "readonly" ? [...new Set((workflowStepMetadata.readonlyMcpServers ?? []).map((name2) => name2.trim()).filter(Boolean))] : [];
+  const allowReadonlyMcpTools = toolMode === "readonly" && readonlyMcpServerAllowlist.length > 0;
   let workflowReviewSpecArtifact;
   if (isReviewTypeWorkflowStep) {
     try {
@@ -243736,7 +244320,7 @@ async function executeWorkflowStep(deps, task, workflowStep, worktreePath, setti
   const workflowReviewSpecText = typeof workflowReviewSpecArtifact === "string" ? workflowReviewSpecArtifact : "";
   const planReviewSpecText = isPlanReviewStep ? workflowReviewSpecText : "";
   const latestTaskForUserComments = await deps.store.getTask(task.id).catch(() => task);
-  const sameGateStepId = workflowStep.id.replace(/^graph:/, "");
+  const sameGateStepId = effectiveWorkflowStepId;
   const planReviewConvergenceContext = isPlanReviewStep ? buildGraphPlanReviewConvergenceContext(latestTaskForUserComments, planReviewRevisionKey) : "";
   const planReviewEnvironmentCapabilities = isPlanReviewStep ? await probeEnvironmentCapabilities({
     extraCommands: [
@@ -243784,21 +244368,44 @@ async function executeWorkflowStep(deps, task, workflowStep, worktreePath, setti
   let diffShortstat;
   let reviewInputFingerprint;
   let reviewedCommitSha;
+  let baseRef;
   try {
-    const baseRef = await resolveDiffBaseRef(worktreePath, diffBaseCommitSha);
-    if (baseRef) {
-      const { stdout } = await execAsync40(`git diff --shortstat ${baseRef}..HEAD`, {
-        cwd: worktreePath,
-        encoding: "utf-8"
-      });
-      diffShortstat = stdout.trim() || void 0;
+    baseRef = await resolveDiffBaseRef(worktreePath, diffBaseCommitSha);
+  } catch {
+  }
+  if (isContentBindingStep && task.workspaceWorktrees === void 0) {
+    const suppliedFingerprint = stepOptions?.reviewInputFingerprint?.trim();
+    const proof = suppliedFingerprint ? { kind: "fingerprint", fingerprint: suppliedFingerprint } : await resolveContentReviewInputProof(worktreePath, diffBaseCommitSha);
+    if (proof.kind === "unprovable") {
+      const diagnostic = `${workflowStep.name} review input is unprovable (${proof.reason}); reviewer dispatch refused.`;
+      await deps.store.logEntry(
+        task.id,
+        `[pre-merge] ${diagnostic}`,
+        void 0,
+        deps.getRunContextFor(task.id)
+      );
+      return { success: false, error: diagnostic, failureValue: "review-input-unprovable" };
+    }
+    reviewInputFingerprint = proof.fingerprint;
+  } else if (baseRef) {
+    try {
       if (workflowStepMetadata.reviewKind === "code") {
         reviewInputFingerprint = await computeCodeReviewInputFingerprint(worktreePath, baseRef);
       } else if (isReviewTypeWorkflowStep) {
         reviewInputFingerprint = await computeReviewDiffFingerprint(worktreePath, baseRef);
       }
+    } catch {
+    }
+  }
+  if (baseRef) {
+    try {
+      const { stdout } = await execAsync40(`git diff --shortstat ${baseRef}..HEAD`, {
+        cwd: worktreePath,
+        encoding: "utf-8"
+      });
+      diffShortstat = stdout.trim() || void 0;
+    } catch {
     }
-  } catch {
   }
   if (isReviewTypeWorkflowStep) {
     try {
@@ -244108,6 +244715,12 @@ ${workflowStepUserCommentSection}` : ""}${priorFindingsBlock}
     const workflowStepThinkingSource = workflowStep.thinkingLevel ?? (isReviewTypeWorkflowStep ? task.validatorThinkingLevel ?? task.thinkingLevel : task.thinkingLevel);
     const workflowStepThinkingLevel = attemptLabel === "fallback" ? isReviewTypeWorkflowStep ? resolveValidatorFallbackThinkingLevel(workflowStepThinkingSource, settings) : resolveExecutorFallbackThinkingLevel(workflowStepThinkingSource, settings) : isReviewTypeWorkflowStep ? resolveValidatorThinkingLevel(workflowStepThinkingSource, settings) : resolveExecutorThinkingLevel(workflowStepThinkingSource, settings);
     const workflowStepFallbackThinkingLevel = isReviewTypeWorkflowStep ? resolveValidatorFallbackThinkingLevel(workflowStepThinkingSource, settings) : resolveExecutorFallbackThinkingLevel(workflowStepThinkingSource, settings);
+    if (allowReadonlyMcpTools) {
+      await deps.store.logEntry(
+        task.id,
+        `Workflow step '${workflowStep.name}' enabled read-only MCP servers: ${readonlyMcpServerAllowlist.join(", ")}`
+      );
+    }
     const { session } = await createResolvedAgentSession({
       sessionPurpose: "executor",
       taskExecutionSession: true,
@@ -244128,6 +244741,10 @@ ${workflowStepUserCommentSection}` : ""}${priorFindingsBlock}
       settings,
       taskEnv: stepEnv,
       mcpServers: await deps.resolveMcpServers(void 0),
+      ...allowReadonlyMcpTools ? {
+        allowMcpToolsInReadonly: true,
+        readonlyMcpServerAllowlist
+      } : {},
       // FNXC:SessionRouting 2026-06-24-11:20:
       // #1675: propagate task id so workflow-step requests carry the same
       // X-Session-Id/X-Session-Affinity as the primary session.
@@ -244343,6 +244960,60 @@ ${detectedQuestion}
           });
         }
         const revisionRequested = effectiveVerdict === "REVISE";
+        if (isReviewTypeWorkflowStep && !isPlanReviewStep && !revisionRequested) {
+          const priorReviewedCommitSha = reviewedCommitSha;
+          const currentHeadSha = await readHeadSha(worktreePath);
+          const fastForwardAdvance = await isFastForwardAdvance(worktreePath, priorReviewedCommitSha, currentHeadSha);
+          const baseIsAncestor = await isFastForwardAdvance(worktreePath, baseRef, currentHeadSha);
+          const decision = classifyReviewInlineFixRecapture({
+            verdict: effectiveVerdict,
+            reviewKind: workflowStepMetadata.reviewKind,
+            reviewedCommitSha: priorReviewedCommitSha,
+            currentHeadSha,
+            baseRef,
+            fastForwardAdvance,
+            baseIsAncestor,
+            fingerprintProbeAvailable: true
+          });
+          if (decision.recapture) {
+            try {
+              const recapturedFingerprint = workflowStepMetadata.reviewKind === "code" ? await computeCodeReviewInputFingerprint(worktreePath, baseRef) : await computeReviewDiffFingerprint(worktreePath, baseRef);
+              const finalDecision = classifyReviewInlineFixRecapture({
+                verdict: effectiveVerdict,
+                reviewKind: workflowStepMetadata.reviewKind,
+                reviewedCommitSha: priorReviewedCommitSha,
+                currentHeadSha,
+                baseRef,
+                fastForwardAdvance,
+                baseIsAncestor,
+                fingerprintProbeAvailable: recapturedFingerprint !== void 0
+              });
+              if (finalDecision.recapture && currentHeadSha) {
+                reviewInputFingerprint = recapturedFingerprint;
+                reviewedCommitSha = currentHeadSha;
+                const resolvedInReviewFindingCount = parsed.findings?.filter((finding) => finding.resolution === "resolved-in-review").length ?? 0;
+                await deps.store.logEntry(task.id, `[pre-merge] ${workflowStep.name} re-captured its own review identity after fast-forward ${priorReviewedCommitSha?.slice(0, 7)} \u2192 ${currentHeadSha.slice(0, 7)} (${finalDecision.reason})`);
+                const runContext = deps.getRunContextFor(task.id);
+                if (runContext) await emitBoundedRunAudit2(deps.store, {
+                  taskId: task.id,
+                  agentId: runContext.agentId,
+                  runId: runContext.runId,
+                  domain: "git",
+                  mutationType: "task:review-input-recaptured",
+                  target: task.id,
+                  metadata: {
+                    taskId: task.id,
+                    workflowStepId: workflowStep.id,
+                    verdict: effectiveVerdict,
+                    resolvedInReviewFindingCount,
+                    reason: finalDecision.reason
+                  }
+                });
+              }
+            } catch {
+            }
+          }
+        }
         if (workflowStep.requiresBrowser === true) {
           await logBrowserVerificationActivity(`[browser-verification] finished browser verification for task ${task.id}: verdict ${effectiveVerdict}`);
         }
@@ -244487,9 +245158,10 @@ var init_execute_workflow_step = __esm({
     init_workflow_step_verdict();
     init_worktree_git_refs();
     init_review_diff_fingerprint();
+    init_review_inline_fix_recapture();
     init_optional_step_revision();
     init_agent_usage_telemetry();
-    execAsync40 = promisify61(exec44);
+    execAsync40 = promisify62(exec44);
     WORKFLOW_STEP_NOTES_REPAIR_TIMEOUT_MS = 12e4;
   }
 });
@@ -245123,7 +245795,7 @@ var init_public_reexports = __esm({
 
 // ../engine/src/executor/worktree-create-conflict.ts
 import { exec as exec45 } from "node:child_process";
-import { promisify as promisify62 } from "node:util";
+import { promisify as promisify63 } from "node:util";
 import { existsSync as existsSync69 } from "node:fs";
 import { rm as rm12 } from "node:fs/promises";
 async function tryCreateWorktree(deps, branch, path13, taskId, startPoint, attemptNumber = 0, recoveryDepth = 0, allowSiblingBranchRename = false, settings = {}) {
@@ -245418,13 +246090,13 @@ var init_worktree_create_conflict = __esm({
     init_logger3();
     init_worktree_conflict_info();
     init_worktree_registry_helpers();
-    execAsync41 = promisify62(exec45);
+    execAsync41 = promisify63(exec45);
   }
 });
 
 // ../engine/src/executor/worktree-cleanup-conflicting.ts
 import { exec as exec46 } from "node:child_process";
-import { promisify as promisify63 } from "node:util";
+import { promisify as promisify64 } from "node:util";
 import { existsSync as existsSync70, lstatSync as lstatSync3, realpathSync as realpathSync11 } from "node:fs";
 import { rm as rm13 } from "node:fs/promises";
 async function cleanupConflictingWorktree(deps, worktreePath, branch, taskId) {
@@ -245543,13 +246215,13 @@ var init_worktree_cleanup_conflicting = __esm({
     init_src2();
     init_worktree_pool();
     init_logger3();
-    execAsync42 = promisify63(exec46);
+    execAsync42 = promisify64(exec46);
   }
 });
 
 // ../engine/src/executor/worktree-create-outer.ts
 import { exec as exec47 } from "node:child_process";
-import { promisify as promisify64 } from "node:util";
+import { promisify as promisify65 } from "node:util";
 import { existsSync as existsSync71 } from "node:fs";
 import { isAbsolute as isAbsolute22 } from "node:path";
 async function resolveWorktreeStartPoint(rootDir, store, startPoint, taskId) {
@@ -245754,13 +246426,13 @@ var init_worktree_create_outer = __esm({
     init_logger3();
     init_shell_quote();
     init_worktree_registry_helpers();
-    execAsync43 = promisify64(exec47);
+    execAsync43 = promisify65(exec47);
   }
 });
 
 // ../engine/src/executor/worktree-branch-conflict-handle.ts
 import { exec as exec48 } from "node:child_process";
-import { promisify as promisify65 } from "node:util";
+import { promisify as promisify66 } from "node:util";
 async function reclaimExistingWorktree(deps, task, livePath, branch, tipSha, count2, settings) {
   const targetPath = preservedWorktreeTargetPathForTask(task.id, livePath, settings, deps.rootDir);
   const normalizedPath = await deps.normalizeReclaimableWorktreePath(livePath, targetPath, task.id, settings);
@@ -245909,7 +246581,7 @@ var init_worktree_branch_conflict_handle = __esm({
     init_worktree_git_refs();
     init_worktree_registry_helpers();
     init_branch_conflict_format();
-    execAsync44 = promisify65(exec48);
+    execAsync44 = promisify66(exec48);
   }
 });
 
@@ -246064,10 +246736,10 @@ var init_session_worktree_paths = __esm({
 });
 
 // ../engine/src/execution/external-execution-checkout.ts
-import { execFile as execFile29 } from "node:child_process";
+import { execFile as execFile30 } from "node:child_process";
 import { existsSync as existsSync72, realpathSync as realpathSync13, statSync as statSync14 } from "node:fs";
 import { isAbsolute as isAbsolute23 } from "node:path";
-import { promisify as promisify66 } from "node:util";
+import { promisify as promisify67 } from "node:util";
 function readSourceMetadata(task) {
   if (!task || typeof task !== "object") return void 0;
   const sourceMetadata = task.sourceMetadata;
@@ -246086,7 +246758,7 @@ async function inspectExternalGitCheckout(candidate, options = {}) {
       return { valid: false, reason: `checkoutPath is not a directory: ${checkoutPath}` };
     }
     const canonicalCheckout = realpathSync13(checkoutPath);
-    const { stdout: topLevelOutput } = await execFileAsync23("git", ["rev-parse", "--show-toplevel"], {
+    const { stdout: topLevelOutput } = await execFileAsync24("git", ["rev-parse", "--show-toplevel"], {
       cwd: canonicalCheckout,
       encoding: "utf-8",
       timeout: 1e4
@@ -246099,7 +246771,7 @@ async function inspectExternalGitCheckout(candidate, options = {}) {
         reason: `checkoutPath must be the Git top-level (observed ${canonicalTopLevel})`
       };
     }
-    const { stdout: branchOutput } = await execFileAsync23("git", ["symbolic-ref", "--quiet", "--short", "HEAD"], {
+    const { stdout: branchOutput } = await execFileAsync24("git", ["symbolic-ref", "--quiet", "--short", "HEAD"], {
       cwd: canonicalCheckout,
       encoding: "utf-8",
       timeout: 1e4
@@ -246109,7 +246781,7 @@ async function inspectExternalGitCheckout(candidate, options = {}) {
       return { valid: false, reason: "checkoutPath must have a checked-out branch" };
     }
     if (options.requireClean) {
-      const { stdout: statusOutput } = await execFileAsync23("git", ["status", "--porcelain=v1"], {
+      const { stdout: statusOutput } = await execFileAsync24("git", ["status", "--porcelain=v1"], {
         cwd: canonicalCheckout,
         encoding: "utf-8",
         timeout: 1e4
@@ -246157,11 +246829,11 @@ async function resolveExternalExecutionCheckoutRoute(task) {
   }
   return { configured: true, ...inspection };
 }
-var execFileAsync23;
+var execFileAsync24;
 var init_external_execution_checkout = __esm({
   "../engine/src/execution/external-execution-checkout.ts"() {
     "use strict";
-    execFileAsync23 = promisify66(execFile29);
+    execFileAsync24 = promisify67(execFile30);
   }
 });
 
@@ -246185,7 +246857,7 @@ var init_resolve_authoritative_external_execution_route = __esm({
 import { exec as exec49 } from "node:child_process";
 import { existsSync as existsSync73, promises as fs7 } from "node:fs";
 import path4 from "node:path";
-import { promisify as promisify67 } from "node:util";
+import { promisify as promisify68 } from "node:util";
 function workspaceExecutionAnchor(task) {
   const executionValues = [task.firstExecutionAt, task.executionStartedAt].map((value) => typeof value === "string" ? Date.parse(value) : Number.NaN).filter(Number.isFinite);
   const values2 = executionValues.length ? executionValues : [typeof task.createdAt === "string" ? Date.parse(task.createdAt) : Number.NaN].filter(Number.isFinite);
@@ -246309,14 +246981,14 @@ var init_workspace_main_checkout_guard = __esm({
     init_workspace_paths();
     init_worktree_paths();
     init_workflow_feedback_paths();
-    execAsync45 = promisify67(exec49);
+    execAsync45 = promisify68(exec49);
     probeOptions = { encoding: "utf-8", timeout: 1e4, maxBuffer: 1024 * 1024 };
   }
 });
 
 // ../engine/src/executor/worktree-verify-invariants.ts
 import { exec as exec50 } from "node:child_process";
-import { promisify as promisify68 } from "node:util";
+import { promisify as promisify69 } from "node:util";
 import { existsSync as existsSync74 } from "node:fs";
 async function verifyWorktreeInvariants(deps, task, worktreePathOverride, allowReanchor = true, options) {
   const workspaceConfig = deps.ensureWorkspaceConfig ? await deps.ensureWorkspaceConfig() : deps.workspaceConfig;
@@ -246737,17 +247409,17 @@ var init_worktree_verify_invariants = __esm({
     init_no_commit_eligibility();
     init_resolve_authoritative_external_execution_route();
     init_workspace_main_checkout_guard();
-    execAsync46 = promisify68(exec50);
+    execAsync46 = promisify69(exec50);
   }
 });
 
 // ../engine/src/executor/worktree-task-done-scope-leak.ts
-import { execFile as execFile30 } from "node:child_process";
+import { execFile as execFile31 } from "node:child_process";
 import { access as access10 } from "node:fs/promises";
-import { promisify as promisify69 } from "node:util";
+import { promisify as promisify70 } from "node:util";
 async function verifyRepositoryCaptureEvidence(worktreePath) {
   await access10(worktreePath);
-  const { stdout } = await execFileAsync24("git", ["rev-parse", "--is-inside-work-tree"], {
+  const { stdout } = await execFileAsync25("git", ["rev-parse", "--is-inside-work-tree"], {
     cwd: worktreePath,
     encoding: "utf8"
   });
@@ -246764,7 +247436,7 @@ async function captureRepositoryChangeEvidence(worktreePath, baseCommitSha) {
   } else {
     commands.push(["rev-parse", "--verify", "HEAD"]);
   }
-  const results = await Promise.all(commands.map((args) => execFileAsync24("git", args, {
+  const results = await Promise.all(commands.map((args) => execFileAsync25("git", args, {
     cwd: worktreePath,
     encoding: "utf8"
   })));
@@ -246893,7 +247565,7 @@ async function evaluateTaskDoneScopeLeak(deps, task, worktreePath, promptContent
   }
   return { blocked: false };
 }
-var execFileAsync24;
+var execFileAsync25;
 var init_worktree_task_done_scope_leak = __esm({
   "../engine/src/executor/worktree-task-done-scope-leak.ts"() {
     "use strict";
@@ -246901,7 +247573,7 @@ var init_worktree_task_done_scope_leak = __esm({
     init_logger3();
     init_prompt_derived_eligibility();
     init_workflow_feedback_paths();
-    execFileAsync24 = promisify69(execFile30);
+    execFileAsync25 = promisify70(execFile31);
   }
 });
 
@@ -247311,7 +247983,7 @@ var init_task_done_refusal_handler = __esm({
 
 // ../engine/src/executor/dep-abort-cleanup.ts
 import { exec as exec51 } from "node:child_process";
-import { promisify as promisify70 } from "node:util";
+import { promisify as promisify71 } from "node:util";
 async function handleDepAbortCleanup(deps, taskId, worktreePath) {
   executorLog.log(`${taskId} dependency added \u2014 work discarded, moved to triage for re-planning`);
   const task = await deps.store.getTask(taskId);
@@ -247362,7 +248034,7 @@ var init_dep_abort_cleanup = __esm({
     init_logger3();
     init_external_execution_checkout();
     init_lifecycle_columns();
-    execAsync47 = promisify70(exec51);
+    execAsync47 = promisify71(exec51);
   }
 });
 
@@ -247886,7 +248558,7 @@ var init_no_merge_complete_column = __esm({
 // ../engine/src/execution/step-runner.ts
 import { exec as exec52 } from "node:child_process";
 import { existsSync as existsSync75, statSync as statSync15 } from "node:fs";
-import { promisify as promisify71 } from "node:util";
+import { promisify as promisify72 } from "node:util";
 async function runTaskStep(deps, task, stepIndex, opts = {}) {
   const { store, worktreePath } = deps;
   const gitRevParse = deps.gitRevParse ?? defaultGitRevParse;
@@ -248070,7 +248742,7 @@ var init_step_runner = __esm({
   "../engine/src/execution/step-runner.ts"() {
     "use strict";
     init_logger3();
-    execAsync48 = promisify71(exec52);
+    execAsync48 = promisify72(exec52);
   }
 });
 
@@ -250029,7 +250701,7 @@ var init_recover_failed_pre_merge_step = __esm({
 
 // ../engine/src/executor/reconcile-steps-from-git-history.ts
 import { exec as exec53 } from "node:child_process";
-import { promisify as promisify72 } from "node:util";
+import { promisify as promisify73 } from "node:util";
 async function reconcileStepsFromGitHistory(deps, taskId, detail, worktreePath) {
   const baseCommitSha = detail.baseCommitSha;
   if (!baseCommitSha) return;
@@ -250117,7 +250789,7 @@ var init_reconcile_steps_from_git_history = __esm({
     "use strict";
     init_src2();
     init_logger3();
-    execAsync49 = promisify72(exec53);
+    execAsync49 = promisify73(exec53);
   }
 });
 
@@ -252401,7 +253073,14 @@ async function persistWorkflowStepResultWithOutcome(deps, taskId, result2, fence
         scopeSuperseded = true;
         return null;
       }
-      const built = buildWorkflowStepResultPatch(current, result2, isPlanReviewResult);
+      const unprovenApproval = resolveUnprovenReviewApproval(result2, {
+        workspace: current.workspaceWorktrees !== void 0
+      });
+      const built = buildWorkflowStepResultPatch(
+        current,
+        unprovenApproval?.downgraded ?? result2,
+        isPlanReviewResult
+      );
       activityResult = built.resultToPersist;
       activityResults = built.results;
       return built.patch;
@@ -252438,21 +253117,30 @@ async function persistWorkflowStepResultWithOutcome(deps, taskId, result2, fence
     if (scopeSuperseded) return { scopeCurrent: false, persisted: false };
     if (fenceRefused) return { scopeCurrent: true, persisted: false };
     const persistedResult = activityResults?.find((entry) => entry.workflowStepId === result2.workflowStepId) ?? activityResult;
-    if (isTerminalStepResult(result2)) {
-      const passed = result2.status === "passed" || result2.status === "skipped" || result2.verdict === "APPROVE" || result2.verdict === "APPROVE_WITH_NOTES" || result2.verdict === "CLOSE_NO_OP";
+    const approvalDowngraded = result2.status === "passed" && persistedResult.status === "failed" && result2.reviewInputFingerprint === void 0 && persistedResult.verdict === void 0;
+    if (approvalDowngraded) {
+      await deps.store.logEntry(
+        taskId,
+        `[pre-merge] ${result2.workflowStepName} approval invalidated: ${persistedResult.notes ?? persistedResult.output ?? "review input proof missing"}`,
+        void 0,
+        deps.getRunContextFor(taskId)
+      ).catch(() => void 0);
+    }
+    if (isTerminalStepResult(persistedResult)) {
+      const passed = persistedResult.status === "passed" || persistedResult.status === "skipped" || persistedResult.verdict === "APPROVE" || persistedResult.verdict === "APPROVE_WITH_NOTES" || persistedResult.verdict === "CLOSE_NO_OP";
       try {
         await deps.store.recordAgentActivity({
           type: passed ? "workflow:gate-passed" : "workflow:gate-failed",
           attributionClaim: resolveWorkflowGateActivityClaim(
-            deps.workflowGateActivityPrincipals?.get(`${taskId}\0${result2.workflowStepId}`) ?? deps.activeWorkflowPrincipals?.get(taskId)?.agentId,
+            deps.workflowGateActivityPrincipals?.get(`${taskId}\0${persistedResult.workflowStepId}`) ?? deps.activeWorkflowPrincipals?.get(taskId)?.agentId,
             live?.assignedAgentId
           ),
           taskId,
-          occurredAt: result2.completedAt ?? result2.startedAt ?? (/* @__PURE__ */ new Date()).toISOString(),
-          discriminator: `${result2.workflowStepId}:${result2.startedAt ?? result2.completedAt ?? result2.status}`,
-          metadata: buildWorkflowGateActivityMetadata(result2, persistedResult)
+          occurredAt: persistedResult.completedAt ?? persistedResult.startedAt ?? (/* @__PURE__ */ new Date()).toISOString(),
+          discriminator: `${persistedResult.workflowStepId}:${persistedResult.startedAt ?? persistedResult.completedAt ?? persistedResult.status}`,
+          metadata: buildWorkflowGateActivityMetadata(persistedResult, persistedResult)
         });
-        deps.workflowGateActivityPrincipals?.delete(`${taskId}\0${result2.workflowStepId}`);
+        deps.workflowGateActivityPrincipals?.delete(`${taskId}\0${persistedResult.workflowStepId}`);
       } catch (error3) {
         executorLog.warn(`[agent-activity] ${taskId}: failed to record workflow gate activity: ${error3 instanceof Error ? error3.message : String(error3)}`);
       }
@@ -254463,7 +255151,7 @@ var init_run_spawned_child = __esm({
 
 // ../engine/src/auto-recovery-handlers/file-scope.ts
 import { exec as exec54 } from "node:child_process";
-import { promisify as promisify73 } from "node:util";
+import { promisify as promisify74 } from "node:util";
 function createFileScopeAutoRecoveryHandler(deps) {
   return new FileScopeAutoRecoveryHandler({
     ...deps,
@@ -254474,7 +255162,7 @@ var execAsync50, FileScopeAutoRecoveryHandler;
 var init_file_scope2 = __esm({
   "../engine/src/auto-recovery-handlers/file-scope.ts"() {
     "use strict";
-    execAsync50 = promisify73(exec54);
+    execAsync50 = promisify74(exec54);
     FileScopeAutoRecoveryHandler = class {
       constructor(deps) {
         this.deps = deps;
@@ -254490,7 +255178,7 @@ var init_file_scope2 = __esm({
 // ../engine/src/auto-recovery-handlers/branch-worktree.ts
 import { exec as exec55 } from "node:child_process";
 import { existsSync as existsSync78 } from "node:fs";
-import { promisify as promisify74 } from "node:util";
+import { promisify as promisify75 } from "node:util";
 var execAsync51, baseLog2, GIT_TIMEOUT_MS8, GIT_MAX_BUFFER6, BranchWorktreeAutoRecoveryHandler;
 var init_branch_worktree = __esm({
   "../engine/src/auto-recovery-handlers/branch-worktree.ts"() {
@@ -254500,7 +255188,7 @@ var init_branch_worktree = __esm({
     init_active_session_registry();
     init_integration_branch();
     init_logger3();
-    execAsync51 = promisify74(exec55);
+    execAsync51 = promisify75(exec55);
     baseLog2 = createLogger2("auto-recovery:branch-worktree");
     GIT_TIMEOUT_MS8 = 3e4;
     GIT_MAX_BUFFER6 = 10 * 1024 * 1024;
@@ -255567,7 +256255,7 @@ var init_run_raw_cli_command = __esm({
 
 // ../engine/src/executor/reset-steps-if-work-lost.ts
 import { exec as exec56 } from "node:child_process";
-import { promisify as promisify75 } from "node:util";
+import { promisify as promisify76 } from "node:util";
 async function resetStepsIfWorkLost(deps, task) {
   const completedSteps = task.steps.filter(
     (s3) => s3.status === "done" || s3.status === "in-progress"
@@ -255608,7 +256296,7 @@ var init_reset_steps_if_work_lost = __esm({
     init_src2();
     init_worktree_names();
     init_logger3();
-    execAsync52 = promisify75(exec56);
+    execAsync52 = promisify76(exec56);
   }
 });
 
@@ -255655,7 +256343,7 @@ var init_route_retryable_remediation = __esm({
 
 // ../engine/src/executor/build-foreach-worktree-deps.ts
 import { exec as exec57 } from "node:child_process";
-import { promisify as promisify76 } from "node:util";
+import { promisify as promisify77 } from "node:util";
 function buildForeachWorktreeDeps(deps, task, runId) {
   const taskId = task.id;
   const instancePaths = /* @__PURE__ */ new Map();
@@ -255849,20 +256537,20 @@ var init_build_foreach_worktree_deps = __esm({
     init_worktree_names();
     init_worktree_paths();
     init_logger3();
-    execAsync53 = promisify76(exec57);
+    execAsync53 = promisify77(exec57);
     WORKSPACE_ISOLATION_UNSUPPORTED_MESSAGE = "per-instance worktree isolation is not supported for workspace projects";
   }
 });
 
 // ../engine/src/executor/derive-remediation-steps.ts
-import { createHash as createHash34 } from "node:crypto";
+import { createHash as createHash35 } from "node:crypto";
 function normalizeVerificationEvidence(output2) {
   if (!output2?.trim()) return "";
   return output2.replace(ansiEscapeSequence, "").replace(/\r\n?/g, "\n").split("\n").map((line2) => line2.trim().replace(isoTimestamp, "<timestamp>").replace(bareTimestamp, "<timestamp>").replace(elapsedDuration, "<duration>").replace(/\s+/g, " ")).filter(Boolean).join("\n");
 }
 function verificationEvidenceDigest(output2) {
   const evidence = normalizeVerificationEvidence(output2);
-  return evidence ? createHash34("sha256").update(evidence).digest("hex").slice(0, 16) : void 0;
+  return evidence ? createHash35("sha256").update(evidence).digest("hex").slice(0, 16) : void 0;
 }
 function verificationCandidates(input) {
   const detail = input.verificationCommandLabel ?? "verification command";
@@ -260565,10 +261253,10 @@ var init_pending_review_block = __esm({
 });
 
 // ../engine/src/merge/merger-orphan-rehome.ts
-import { execFile as execFile31 } from "node:child_process";
-import { promisify as promisify77 } from "node:util";
+import { execFile as execFile32 } from "node:child_process";
+import { promisify as promisify78 } from "node:util";
 async function runGit6(args, cwd) {
-  const { stdout } = await execFileAsync25("git", args, {
+  const { stdout } = await execFileAsync26("git", args, {
     cwd,
     encoding: "utf-8",
     timeout: 3e4
@@ -260577,7 +261265,7 @@ async function runGit6(args, cwd) {
 }
 async function isAncestor3(repoDir, ancestor, descendant) {
   try {
-    await execFileAsync25(
+    await execFileAsync26(
       "git",
       ["merge-base", "--is-ancestor", ancestor, descendant],
       { cwd: repoDir, encoding: "utf-8", timeout: 3e4 }
@@ -260672,13 +261360,13 @@ async function rehomeOrphanOntoIntegration(input) {
     newTipSha: advanceResult.newSha
   };
 }
-var execFileAsync25;
+var execFileAsync26;
 var init_merger_orphan_rehome = __esm({
   "../engine/src/merge/merger-orphan-rehome.ts"() {
     "use strict";
     init_src2();
     init_merger_ref_update_advance();
-    execFileAsync25 = promisify77(execFile31);
+    execFileAsync26 = promisify78(execFile32);
   }
 });
 
@@ -260705,7 +261393,7 @@ var init_merge_execution_exclusion = __esm({
 
 // ../engine/src/executor/run-implementation.ts
 import { exec as exec58 } from "node:child_process";
-import { promisify as promisify78 } from "node:util";
+import { promisify as promisify79 } from "node:util";
 import { existsSync as existsSync81 } from "node:fs";
 import { join as join93 } from "node:path";
 import { SessionManager as SessionManager2 } from "@earendil-works/pi-coding-agent";
@@ -263541,7 +264229,7 @@ var init_run_implementation = __esm({
     init_worktree_acquisition();
     init_worktree_paths();
     init_worktree_pool();
-    execAsync54 = promisify78(exec58);
+    execAsync54 = promisify79(exec58);
     MAX_TASK_DONE_SESSION_RETRIES = 3;
   }
 });
@@ -267267,8 +267955,8 @@ var init_worktree_create_binders = __esm({
 });
 
 // ../engine/src/executor/wire-executor-lifecycle.ts
-import { execFile as execFile32 } from "node:child_process";
-import { promisify as promisify79 } from "node:util";
+import { execFile as execFile33 } from "node:child_process";
+import { promisify as promisify80 } from "node:util";
 async function releaseWorkspaceAcquireClaims(store, taskId) {
   for (const entry of activeSessionRegistry.entriesByKind("workspace-repo-acquire")) {
     if (entry.taskId === taskId) activeSessionRegistry.unregisterPath(entry.path);
@@ -267316,7 +268004,7 @@ function wireExecutorLifecycle(deps) {
         if (await canonicalizeWorktreePath(entry.worktreePath) === await canonicalizeWorktreePath(entry.repoRootDir)) throw new Error("Refusing to remove workspace repository root");
         activeSessionRegistry.unregisterPath(entry.worktreePath);
         await removeWorktree({ worktreePath: entry.worktreePath, rootDir: entry.repoRootDir, settings: await deps.store.getSettings(), taskId: task.id, reason: RemovalReason.ExecutorDispose, force: true });
-        await execFileAsync26("git", ["branch", "-D", entry.branch], { cwd: entry.repoRootDir, timeout: 12e4, maxBuffer: 10 * 1024 * 1024 });
+        await execFileAsync27("git", ["branch", "-D", entry.branch], { cwd: entry.repoRootDir, timeout: 12e4, maxBuffer: 10 * 1024 * 1024 });
         if (task.workspaceWorktrees) for (const repoRel of [entry.repoRel, ...entry.aliasRepoRels]) delete task.workspaceWorktrees[repoRel];
         removed.push(entry.repoRel);
       } catch (error3) {
@@ -267744,7 +268432,7 @@ function wireTaskExecutorLifecycle(host) {
   h.workflowAgentCapacity = new WorkflowAgentCapacity(h.options?.agentStore ?? void 0);
   applyWireExecutorLifecycleDisposers(host, wireExecutorLifecycle(buildWireExecutorLifecycleDeps(host)));
 }
-var execFileAsync26, WIRE_LIFECYCLE_FIELDS, WIRE_LIFECYCLE_METHODS;
+var execFileAsync27, WIRE_LIFECYCLE_FIELDS, WIRE_LIFECYCLE_METHODS;
 var init_wire_executor_lifecycle = __esm({
   "../engine/src/executor/wire-executor-lifecycle.ts"() {
     "use strict";
@@ -267761,7 +268449,7 @@ var init_wire_executor_lifecycle = __esm({
     init_task_predicates();
     init_facade_methods();
     init_workflow_agent_capacity();
-    execFileAsync26 = promisify79(execFile32);
+    execFileAsync27 = promisify80(execFile33);
     WIRE_LIFECYCLE_FIELDS = [
       "activeConfiguredCommandControllers",
       "activeSessions",
@@ -270658,7 +271346,7 @@ import { promises as fs9 } from "node:fs";
 import os7 from "node:os";
 import path5 from "node:path";
 import { exec as exec59 } from "node:child_process";
-import { promisify as promisify80 } from "node:util";
+import { promisify as promisify81 } from "node:util";
 var execAsync55, verifyLog, GitCheckoutMaterializer;
 var init_mission_verification = __esm({
   "../engine/src/missions/mission-verification.ts"() {
@@ -270668,7 +271356,7 @@ var init_mission_verification = __esm({
     init_sandbox_exec_detect();
     init_verification_utils();
     init_logger3();
-    execAsync55 = promisify80(exec59);
+    execAsync55 = promisify81(exec59);
     verifyLog = createLogger2("mission-verify");
     GitCheckoutMaterializer = class {
       async materialize(rootDir, revision) {
@@ -270711,14 +271399,14 @@ ${stdout.trim()}`);
 
 // ../engine/src/missions/mission-execution-loop.ts
 import { EventEmitter as EventEmitter25 } from "node:events";
-import { createHash as createHash35 } from "node:crypto";
+import { createHash as createHash36 } from "node:crypto";
 import { exec as exec60 } from "node:child_process";
-import { promisify as promisify81 } from "node:util";
+import { promisify as promisify82 } from "node:util";
 function quoteShellArg8(value) {
   return `'${value.replace(/'/g, `'\\''`)}'`;
 }
 function fingerprintMissionValidationInput(landedSha, provider, modelId, systemPrompt, userPrompt) {
-  return createHash35("sha256").update(Buffer.from(JSON.stringify(["mission-validation-input-v1", landedSha, provider, modelId, systemPrompt, userPrompt]), "utf8")).digest("hex");
+  return createHash36("sha256").update(Buffer.from(JSON.stringify(["mission-validation-input-v1", landedSha, provider, modelId, systemPrompt, userPrompt]), "utf8")).digest("hex");
 }
 var execAsync56, loopLog, VALIDATION_TIMEOUT_MS, MAX_VALIDATION_RESPONSE_BYTES, MAX_VALIDATION_JSON_CANDIDATES, VALIDATION_FAILURE_BUDGET_PER_FINGERPRINT, MissionExecutionLoop;
 var init_mission_execution_loop = __esm({
@@ -270734,7 +271422,7 @@ var init_mission_execution_loop = __esm({
     init_fallback_model_observer();
     init_mcp_resolution();
     init_run_audit();
-    execAsync56 = promisify81(exec60);
+    execAsync56 = promisify82(exec60);
     loopLog = createLogger2("mission-loop");
     VALIDATION_TIMEOUT_MS = 10 * 60 * 1e3;
     MAX_VALIDATION_RESPONSE_BYTES = 256 * 1024;
@@ -272248,44 +272936,9 @@ ${taskContext}` : ""}`;
   }
 });
 
-// ../engine/src/merge/merge-content-capture.ts
-async function captureMergeContentDescriptor(task, deps) {
-  if (describeMergeContentShape(task) === "workspace") {
-    try {
-      const evidence = await captureWorkspaceReviewEvidence({
-        task,
-        workspaceRootDir: deps.workspaceRootDir,
-        settings: deps.settings
-      });
-      return {
-        kind: "workspace",
-        repositories: {
-          state: "captured",
-          fingerprints: Object.fromEntries(evidence.repositories.filter((repository) => repository.fingerprint).map((repository) => [repository.repository, repository.fingerprint])),
-          inScopeModified: [...evidence.modifiedRepositories].sort()
-        }
-      };
-    } catch {
-      return { kind: "workspace", repositories: { state: "unavailable", reason: "workspace-evidence-capture-failed" } };
-    }
-  }
-  const baseRef = task.worktree ? await resolveDiffBaseRef(task.worktree, task.baseCommitSha) : void 0;
-  const probe = await probeReviewDiffFingerprint(task.worktree, baseRef);
-  return { kind: "singular", diff: probe };
-}
-var init_merge_content_capture = __esm({
-  "../engine/src/merge/merge-content-capture.ts"() {
-    "use strict";
-    init_src2();
-    init_worktree_git_refs();
-    init_review_diff_fingerprint();
-    init_workspace_review_evidence();
-  }
-});
-
 // ../engine/src/merge/merger-ai-squash-gates.ts
-import { execFile as execFile33 } from "node:child_process";
-import { promisify as promisify82 } from "node:util";
+import { execFile as execFile34 } from "node:child_process";
+import { promisify as promisify83 } from "node:util";
 function resolveRepoDeclaredScopeTransform({ repoRel, repoKeys }) {
   return {
     transform(scope) {
@@ -272316,8 +272969,8 @@ async function enforceAiMergeSquashGates(params) {
     });
   } catch (error3) {
     if (!(error3 instanceof FileScopeViolationError)) throw error3;
-    await execFileAsync27("git", ["reset", "--hard", params.tipSha], { cwd: params.mergeRoot });
-    await execFileAsync27("git", ["clean", "-fd"], { cwd: params.mergeRoot });
+    await execFileAsync28("git", ["reset", "--hard", params.tipSha], { cwd: params.mergeRoot });
+    await execFileAsync28("git", ["clean", "-fd"], { cwd: params.mergeRoot });
     try {
       await params.store.updateTask(params.taskId, { aiMergeReviewReconciliation: null });
     } catch {
@@ -272325,13 +272978,13 @@ async function enforceAiMergeSquashGates(params) {
     throw error3;
   }
 }
-var execFileAsync27;
+var execFileAsync28;
 var init_merger_ai_squash_gates = __esm({
   "../engine/src/merge/merger-ai-squash-gates.ts"() {
     "use strict";
     init_workspace_paths();
     init_merger_file_scope();
-    execFileAsync27 = promisify82(execFile33);
+    execFileAsync28 = promisify83(execFile34);
   }
 });
 
@@ -272831,11 +273484,11 @@ var init_workspace_merge_readiness = __esm({
 });
 
 // ../engine/src/merge/workspace-fence-ref.ts
-import { execFile as execFile34 } from "node:child_process";
-import { createHash as createHash36 } from "node:crypto";
-import { promisify as promisify83 } from "node:util";
+import { execFile as execFile35 } from "node:child_process";
+import { createHash as createHash37 } from "node:crypto";
+import { promisify as promisify84 } from "node:util";
 async function git6(args, cwd) {
-  const { stdout } = await execFileAsync28("git", args, {
+  const { stdout } = await execFileAsync29("git", args, {
     cwd,
     encoding: "utf8",
     maxBuffer: 1024 * 1024
@@ -272848,7 +273501,7 @@ async function remoteRefSha(remote, ref, cwd) {
   return /^[0-9a-f]{40,64}$/i.test(sha ?? "") ? sha : void 0;
 }
 function workspaceLandFenceRef(repoRelPath) {
-  const slug2 = createHash36("sha256").update(repoRelPath).digest("hex").slice(0, 24);
+  const slug2 = createHash37("sha256").update(repoRelPath).digest("hex").slice(0, 24);
   return `refs/fusion/workspace-lease/${slug2}`;
 }
 function mergeDispatchFenceRef(taskId) {
@@ -272857,7 +273510,7 @@ function mergeDispatchFenceRef(taskId) {
 async function createFenceObject(cwd, handle2) {
   const tree = await git6(["hash-object", "-w", "-t", "tree", "/dev/null"], cwd);
   const message = `workspace lease ${handle2.leaseKey} ${handle2.owner.taskId} ${handle2.owner.nodeId} ${handle2.owner.incarnationId} ${handle2.fenceToken}`;
-  const { stdout } = await execFileAsync28("git", [
+  const { stdout } = await execFileAsync29("git", [
     "-c",
     "user.name=Fusion",
     "-c",
@@ -272987,11 +273640,11 @@ async function publishWorkspaceIntegrationRef(input) {
   await pushWithWorkspaceFence({ ...input, expectedTargetSha: observedTargetSha });
   return { republishedFromObservedTip: true, observedTargetSha };
 }
-var execFileAsync28, WorkspaceFenceRefError;
+var execFileAsync29, WorkspaceFenceRefError;
 var init_workspace_fence_ref = __esm({
   "../engine/src/merge/workspace-fence-ref.ts"() {
     "use strict";
-    execFileAsync28 = promisify83(execFile34);
+    execFileAsync29 = promisify84(execFile35);
     WorkspaceFenceRefError = class extends Error {
       constructor(message, kind) {
         super(message);
@@ -273003,10 +273656,10 @@ var init_workspace_fence_ref = __esm({
 });
 
 // ../engine/src/merge/workspace-integration-target.ts
-import { execFile as execFile35 } from "node:child_process";
-import { promisify as promisify84 } from "node:util";
+import { execFile as execFile36 } from "node:child_process";
+import { promisify as promisify85 } from "node:util";
 async function git7(args, cwd) {
-  const { stdout } = await execFileAsync29("git", args, { cwd, encoding: "utf8" });
+  const { stdout } = await execFileAsync30("git", args, { cwd, encoding: "utf8" });
   return stdout.trim();
 }
 async function resolveWorkspaceIntegrationTarget(input) {
@@ -273046,11 +273699,11 @@ async function resolveWorkspaceIntegrationTarget(input) {
     `Workspace repository ${input.repository} has ambiguous integration remotes: ${remotes.join(", ")}`
   );
 }
-var execFileAsync29, WorkspaceEnvironmentError, WorkspaceIntegrationTargetError;
+var execFileAsync30, WorkspaceEnvironmentError, WorkspaceIntegrationTargetError;
 var init_workspace_integration_target = __esm({
   "../engine/src/merge/workspace-integration-target.ts"() {
     "use strict";
-    execFileAsync29 = promisify84(execFile35);
+    execFileAsync30 = promisify85(execFile36);
     WorkspaceEnvironmentError = class extends Error {
       constructor(repository, resource, action, message) {
         super(message);
@@ -273073,14 +273726,14 @@ var init_workspace_integration_target = __esm({
 });
 
 // ../engine/src/merge/merger-ai-worktree.ts
-import { execFile as execFile36 } from "node:child_process";
+import { execFile as execFile37 } from "node:child_process";
 import { appendFileSync as appendFileSync2, existsSync as existsSync84, mkdirSync as mkdirSync10, readdirSync as readdirSync12, readFileSync as readFileSync26, realpathSync as realpathSync14, rmSync as rmSync7, statSync as statSync16 } from "node:fs";
 import { rm as rm17 } from "node:fs/promises";
 import { tmpdir as tmpdir11 } from "node:os";
 import { isAbsolute as isAbsolute25, join as join95, relative as relative22 } from "node:path";
-import { promisify as promisify85 } from "node:util";
+import { promisify as promisify86 } from "node:util";
 async function git8(args, cwd, opts = {}) {
-  const { stdout } = await execFileAsync30("git", args, {
+  const { stdout } = await execFileAsync31("git", args, {
     cwd,
     encoding: "utf-8",
     timeout: opts.timeout ?? 12e4,
@@ -273109,14 +273762,7 @@ function ensureAiMergeRootIgnored(projectRootDir, settings) {
   if (!existsSync84(excludePath)) return;
   try {
     const current = readFileSync26(excludePath, "utf-8");
-    const legacyAiMergeRoot = resolveLegacyAiMergeRootPath(projectRootDir);
-    const legacyRelativeAiMergeRoot = relative22(projectRootDir, legacyAiMergeRoot);
-    const entries = [`${legacyRelativeAiMergeRoot.replaceAll("\\", "/")}/`];
-    const aiMergeRoot = resolveAiMergeRootPath(projectRootDir, settings);
-    const relativeAiMergeRoot = relative22(projectRootDir, aiMergeRoot);
-    if (relativeAiMergeRoot && !relativeAiMergeRoot.startsWith("..") && !isAbsolute25(relativeAiMergeRoot)) {
-      entries.push(`${relativeAiMergeRoot.replaceAll("\\", "/")}/`);
-    }
+    const entries = resolveAiMergeSearchRoots(projectRootDir, settings).map((root) => relative22(projectRootDir, root)).filter((root) => root && !root.startsWith("..") && !isAbsolute25(root)).map((root) => `${root.replaceAll("\\", "/")}/`);
     const missing = entries.filter((entry) => !current.split(/\r?\n/).includes(entry));
     if (missing.length > 0) {
       appendFileSync2(excludePath, `${current.endsWith("\n") ? "" : "\n"}${missing.join("\n")}
@@ -273132,7 +273778,7 @@ function resolveAiMergeRoot(projectRootDir, settings) {
   return root;
 }
 function getAiMergeTempSearchRoots(projectRootDir, settings) {
-  const roots = [resolveAiMergeRoot(projectRootDir, settings), resolveLegacyAiMergeRootPath(projectRootDir), tmpdir11()];
+  const roots = [resolveAiMergeRoot(projectRootDir, settings), ...resolveAiMergeSearchRoots(projectRootDir, settings), tmpdir11()];
   const testWorkerRoot = process.env.FUSION_TEST_WORKER_ROOT;
   if (testWorkerRoot) {
     try {
@@ -273185,7 +273831,7 @@ async function pruneExistingAiMergeWorktrees(taskId, projectRootDir, audit, log4
       let alreadyAbsent = false;
       try {
         cleanupAttempted = true;
-        await execFileAsync30("git", ["worktree", "remove", "--force", canonicalPath], {
+        await execFileAsync31("git", ["worktree", "remove", "--force", canonicalPath], {
           cwd: projectRootDir,
           timeout: 3e4
         });
@@ -273216,7 +273862,7 @@ async function pruneExistingAiMergeWorktrees(taskId, projectRootDir, audit, log4
   }
   if (cleanupAttempted) {
     try {
-      await execFileAsync30("git", ["worktree", "prune"], { cwd: projectRootDir, timeout: 3e4 });
+      await execFileAsync31("git", ["worktree", "prune"], { cwd: projectRootDir, timeout: 3e4 });
     } catch (err) {
       await log42(`AI merge pre-merge prune: git worktree prune failed: ${describeCleanupError(err)}`);
     }
@@ -273282,7 +273928,7 @@ async function cleanupAiMergeWorktree(input) {
     await audit.git({ type: "merge:ai-worktree-cleanup", target: canonicalRoot, metadata: { ...cleanupMetadata, phase: "git-prune", success: false, error: error3, ...code ? { code } : {} } });
   }
 }
-var execFileAsync30;
+var execFileAsync31;
 var init_merger_ai_worktree = __esm({
   "../engine/src/merge/merger-ai-worktree.ts"() {
     "use strict";
@@ -273290,7 +273936,7 @@ var init_merger_ai_worktree = __esm({
     init_self_healing();
     init_worktree_paths();
     init_worktree_removal_retry();
-    execFileAsync30 = promisify85(execFile36);
+    execFileAsync31 = promisify86(execFile37);
   }
 });
 
@@ -273642,8 +274288,8 @@ var init_merger_ai_prompts = __esm({
 });
 
 // ../engine/src/merge/merger-ai.ts
-import { execFile as execFile37 } from "node:child_process";
-import { promisify as promisify86 } from "node:util";
+import { execFile as execFile38 } from "node:child_process";
+import { promisify as promisify87 } from "node:util";
 import { realpathSync as realpathSync15, readdirSync as readdirSync13 } from "node:fs";
 import { mkdtemp as mkdtemp5 } from "node:fs/promises";
 import { tmpdir as tmpdir12 } from "node:os";
@@ -273671,7 +274317,7 @@ function writeTransientMergeStatus(store, taskId, signal, status) {
   return fence.write("lifecycle", () => store.updateTask(taskId, { status }).catch(() => void 0));
 }
 async function git9(args, cwd, opts = {}) {
-  const { stdout } = await execFileAsync31("git", args, {
+  const { stdout } = await execFileAsync32("git", args, {
     cwd,
     encoding: "utf-8",
     timeout: opts.timeout ?? 12e4,
@@ -273711,7 +274357,7 @@ function boundBlockingReviewReasons(reasons) {
 }
 function listAiMergeWorktreeCandidates(taskId, projectRootDir, settings) {
   const prefix = `fusion-ai-merge-${taskId.toLowerCase()}-`;
-  const roots = Array.from(/* @__PURE__ */ new Set([resolveAiMergeRoot(projectRootDir, settings), resolveLegacyAiMergeRootPath(projectRootDir), tmpdir12()]));
+  const roots = Array.from(/* @__PURE__ */ new Set([resolveAiMergeRoot(projectRootDir, settings), ...resolveAiMergeSearchRoots(projectRootDir, settings), tmpdir12()]));
   const testWorkerRoot = process.env.FUSION_TEST_WORKER_ROOT;
   if (testWorkerRoot) {
     try {
@@ -276060,7 +276706,7 @@ async function finalizeTask(store, taskId, result2, audit, log42, rootDir, fence
 function throwIfAborted3(signal, taskId) {
   assertMergeGenerationOwned(signal, taskId);
 }
-var execFileAsync31, aiMergeLog, MAX_CONCURRENT_ADVANCE_RETRIES, MAX_BLOCKING_REVIEW_REASONS, AiMergeBlockedError, AiMergeReviewReconciliationInvalidatedError, LEGACY_COMPLETE_COLUMN, LEGACY_ARCHIVED_COLUMN, LEGACY_TERMINAL_COLUMNS3, LEGACY_REBOUND_COLUMN2, STRONG_LANDED_STRATEGIES, RecordedMergeBranchTipChangedError, WORKSPACE_REPO_LAND_OWNER_KEY, WorkspaceRepoLandBusyError, WorkspaceMergeTechnicalError, WorkspacePartialLandError, WorkspaceFinalizeBlockedError, WorkspaceReviewRequiredError, WorkspaceMergeDispatchSupersededError;
+var execFileAsync32, aiMergeLog, MAX_CONCURRENT_ADVANCE_RETRIES, MAX_BLOCKING_REVIEW_REASONS, AiMergeBlockedError, AiMergeReviewReconciliationInvalidatedError, LEGACY_COMPLETE_COLUMN, LEGACY_ARCHIVED_COLUMN, LEGACY_TERMINAL_COLUMNS3, LEGACY_REBOUND_COLUMN2, STRONG_LANDED_STRATEGIES, RecordedMergeBranchTipChangedError, WORKSPACE_REPO_LAND_OWNER_KEY, WorkspaceRepoLandBusyError, WorkspaceMergeTechnicalError, WorkspacePartialLandError, WorkspaceFinalizeBlockedError, WorkspaceReviewRequiredError, WorkspaceMergeDispatchSupersededError;
 var init_merger_ai = __esm({
   "../engine/src/merge/merger-ai.ts"() {
     "use strict";
@@ -276110,7 +276756,7 @@ var init_merger_ai = __esm({
     init_merger_ai_prompts();
     init_merger_ai_worktree();
     init_merger_ai_prompts();
-    execFileAsync31 = promisify86(execFile37);
+    execFileAsync32 = promisify87(execFile38);
     aiMergeLog = createLogger2("merger-ai");
     MAX_CONCURRENT_ADVANCE_RETRIES = 3;
     MAX_BLOCKING_REVIEW_REASONS = 8;
@@ -276262,7 +276908,7 @@ var init_workspace_merge_dispatch_lease = __esm({
 // ../engine/src/execution/task-revert.ts
 import { exec as exec61 } from "node:child_process";
 import { join as join97 } from "node:path";
-import { promisify as promisify87 } from "node:util";
+import { promisify as promisify88 } from "node:util";
 function quoteShellArg9(value) {
   return `'${value.replace(/'/g, `'\\''`)}'`;
 }
@@ -277131,7 +277777,7 @@ var init_task_revert = __esm({
     init_branch_attribution();
     init_workspace_base_branch();
     init_run_audit();
-    defaultExecAsync2 = promisify87(exec61);
+    defaultExecAsync2 = promisify88(exec61);
     GIT_TIMEOUT_MS9 = 3e4;
     GIT_MAX_BUFFER7 = 10 * 1024 * 1024;
     TaskRevertError = class extends Error {
@@ -277150,10 +277796,10 @@ var init_task_revert = __esm({
 });
 
 // ../engine/src/merge/smart-pull.ts
-import { execFile as execFile38 } from "node:child_process";
-import { promisify as promisify88 } from "node:util";
+import { execFile as execFile39 } from "node:child_process";
+import { promisify as promisify89 } from "node:util";
 async function runGit8(args, cwd, timeoutMs) {
-  const result2 = await execFileAsync32("git", args, {
+  const result2 = await execFileAsync33("git", args, {
     cwd,
     timeout: timeoutMs,
     maxBuffer: 10 * 1024 * 1024,
@@ -277304,11 +277950,11 @@ async function smartPull(input) {
     return { kind: "stash-pop-conflict", fromSha, toSha, stashSha, stashLabel, conflictedFiles };
   }
 }
-var execFileAsync32;
+var execFileAsync33;
 var init_smart_pull = __esm({
   "../engine/src/merge/smart-pull.ts"() {
     "use strict";
-    execFileAsync32 = promisify88(execFile38);
+    execFileAsync33 = promisify89(execFile39);
   }
 });
 
@@ -278954,7 +279600,7 @@ var init_finalize_types = __esm({
 
 // ../engine/src/experiment/git-ops.ts
 import { exec as exec62 } from "node:child_process";
-import { promisify as promisify89 } from "node:util";
+import { promisify as promisify90 } from "node:util";
 async function runGit9(cwd, args) {
   const command = `git ${args.join(" ")}`;
   try {
@@ -279061,7 +279707,7 @@ var init_git_ops = __esm({
     "use strict";
     init_git_identity();
     init_finalize_types();
-    execAsync57 = promisify89(exec62);
+    execAsync57 = promisify90(exec62);
     GIT_TIMEOUT_MS10 = 3e4;
     GIT_MAX_BUFFER8 = 10 * 1024 * 1024;
   }
@@ -283685,9 +284331,9 @@ var init_routine_scheduler = __esm({
 });
 
 // ../engine/src/healing/stuck-task-detector.ts
-import { createHash as createHash37 } from "node:crypto";
+import { createHash as createHash38 } from "node:crypto";
 function hashToolDetail(detail) {
-  return createHash37("sha256").update(detail).digest("hex").slice(0, TOOL_DETAIL_HASH_HEX_LEN);
+  return createHash38("sha256").update(detail).digest("hex").slice(0, TOOL_DETAIL_HASH_HEX_LEN);
 }
 function buildToolFingerprint(toolName, toolDetail) {
   const name2 = toolName.trim().toLowerCase() || "tool";
@@ -286963,11 +287609,11 @@ var init_adapters = __esm({
 
 // ../engine/src/cli-agent/resume-coordinator.ts
 import { existsSync as existsSync87 } from "node:fs";
-import { execFile as execFile39 } from "node:child_process";
-import { promisify as promisify90 } from "node:util";
+import { execFile as execFile40 } from "node:child_process";
+import { promisify as promisify91 } from "node:util";
 async function defaultIsWorktreeDirty(worktreePath) {
   try {
-    const { stdout } = await execFileAsync33("git", ["status", "--porcelain"], {
+    const { stdout } = await execFileAsync34("git", ["status", "--porcelain"], {
       cwd: worktreePath
     });
     return stdout.trim().length > 0;
@@ -286975,13 +287621,13 @@ async function defaultIsWorktreeDirty(worktreePath) {
     return false;
   }
 }
-var execFileAsync33, ORPHANED_LIVE_STATES, DEFAULT_MAX_RESUME_ATTEMPTS, DEFAULT_RESUME_BACKOFF_BASE_MS, CliResumeCoordinator;
+var execFileAsync34, ORPHANED_LIVE_STATES, DEFAULT_MAX_RESUME_ATTEMPTS, DEFAULT_RESUME_BACKOFF_BASE_MS, CliResumeCoordinator;
 var init_resume_coordinator = __esm({
   "../engine/src/cli-agent/resume-coordinator.ts"() {
     "use strict";
     init_session_manager();
     init_state_machine();
-    execFileAsync33 = promisify90(execFile39);
+    execFileAsync34 = promisify91(execFile40);
     ORPHANED_LIVE_STATES = /* @__PURE__ */ new Set([
       "starting",
       "ready",
@@ -287268,7 +287914,7 @@ var init_node_dispatch_validation = __esm({
 });
 
 // ../engine/src/runtimes/in-process-runtime.ts
-import { createHash as createHash38 } from "node:crypto";
+import { createHash as createHash39 } from "node:crypto";
 import { EventEmitter as EventEmitter26 } from "node:events";
 import { setImmediate as setImmediateCb4 } from "node:timers";
 function createDiscoveryPluginLoaderOptions(scopedStore) {
@@ -287533,7 +288179,7 @@ function stableNotificationJson(value) {
   return `{${fields.join(",")}}`;
 }
 function buildCliAgentNotificationDedupeKey(input) {
-  const notificationFingerprint = createHash38("sha256").update(stableNotificationJson(input.info.notification ?? null)).digest("hex").slice(0, 16);
+  const notificationFingerprint = createHash39("sha256").update(stableNotificationJson(input.info.notification ?? null)).digest("hex").slice(0, 16);
   const waitingEpoch = input.session?.updatedAt ?? "unknown-waiting-epoch";
   return [
     "cli-agent",
@@ -291614,8 +292260,8 @@ var init_provider_adapters = __esm({
 
 // ../engine/src/remote-access/tunnel-process-manager.ts
 import { EventEmitter as EventEmitter31 } from "node:events";
-import { exec as exec64, execFile as execFile40, spawn as spawn9 } from "node:child_process";
-import { promisify as promisify91 } from "node:util";
+import { exec as exec64, execFile as execFile41, spawn as spawn9 } from "node:child_process";
+import { promisify as promisify92 } from "node:util";
 function serveConfigScopes(config3) {
   const foreground = Object.values(config3.Foreground ?? {}).filter(
     (scope) => Boolean(scope)
@@ -291661,7 +292307,7 @@ function toStateError(code, err) {
     at: nowIso2()
   };
 }
-var DEFAULT_MAX_LOG_ENTRIES, DEFAULT_STOP_TIMEOUT_MS2, DEFAULT_RESTART_BASE_DELAY_MS, DEFAULT_RESTART_MAX_DELAY_MS, execFileAsync34, execAsync58, LineBuffer, TunnelProcessManager;
+var DEFAULT_MAX_LOG_ENTRIES, DEFAULT_STOP_TIMEOUT_MS2, DEFAULT_RESTART_BASE_DELAY_MS, DEFAULT_RESTART_MAX_DELAY_MS, execFileAsync35, execAsync58, LineBuffer, TunnelProcessManager;
 var init_tunnel_process_manager = __esm({
   "../engine/src/remote-access/tunnel-process-manager.ts"() {
     "use strict";
@@ -291672,8 +292318,8 @@ var init_tunnel_process_manager = __esm({
     DEFAULT_STOP_TIMEOUT_MS2 = 5e3;
     DEFAULT_RESTART_BASE_DELAY_MS = 1e3;
     DEFAULT_RESTART_MAX_DELAY_MS = 3e4;
-    execFileAsync34 = promisify91(execFile40);
-    execAsync58 = promisify91(exec64);
+    execFileAsync35 = promisify92(execFile41);
+    execAsync58 = promisify92(exec64);
     LineBuffer = class {
       pending = "";
       push(chunk) {
@@ -291778,7 +292424,7 @@ var init_tunnel_process_manager = __esm({
           return null;
         }
         try {
-          const { stdout } = await execFileAsync34("tailscale", ["status", "--json"], { timeout: 3e3 });
+          const { stdout } = await execFileAsync35("tailscale", ["status", "--json"], { timeout: 3e3 });
           const data = JSON.parse(String(stdout));
           const dnsName = data.Self?.DNSName?.replace(/\.$/, "");
           if (!dnsName) {
@@ -291801,7 +292447,7 @@ var init_tunnel_process_manager = __esm({
         ];
         for (const resetCommand of resetCommands) {
           try {
-            await execFileAsync34(resetCommand.command, resetCommand.args, { timeout: 5e3 });
+            await execFileAsync35(resetCommand.command, resetCommand.args, { timeout: 5e3 });
             return;
           } catch {
           }
@@ -291907,7 +292553,7 @@ var init_tunnel_process_manager = __esm({
       async detectActiveFunnel() {
         let stdout = "";
         try {
-          const result2 = await execFileAsync34("tailscale", ["serve", "status", "--json"], { timeout: 5e3 });
+          const result2 = await execFileAsync35("tailscale", ["serve", "status", "--json"], { timeout: 5e3 });
           stdout = String(result2.stdout ?? "");
         } catch (error3) {
           const failure = error3;
@@ -292325,8 +292971,8 @@ var init_tunnel_process_manager = __esm({
 });
 
 // ../engine/src/remote-access/remote-tunnel-service.ts
-import { execFile as execFile41 } from "node:child_process";
-import { promisify as promisify92 } from "node:util";
+import { execFile as execFile42 } from "node:child_process";
+import { promisify as promisify93 } from "node:util";
 function remoteTunnelScopeKey(input) {
   const projectId2 = input.projectId?.trim();
   if (projectId2) return `project:${projectId2}`;
@@ -292369,14 +293015,14 @@ async function shutdownAllRemoteTunnels() {
 function __resetRemoteTunnelServicesForTests() {
   remoteTunnelServices.clear();
 }
-var execFileAsync35, isRemoteActive, RemoteTunnelService, remoteTunnelServices;
+var execFileAsync36, isRemoteActive, RemoteTunnelService, remoteTunnelServices;
 var init_remote_tunnel_service = __esm({
   "../engine/src/remote-access/remote-tunnel-service.ts"() {
     "use strict";
     init_logger3();
     init_local_dashboard_port();
     init_tunnel_process_manager();
-    execFileAsync35 = promisify92(execFile41);
+    execFileAsync36 = promisify93(execFile42);
     isRemoteActive = (ra) => ra?.activeProvider != null && (ra.providers[ra.activeProvider]?.enabled ?? false);
     RemoteTunnelService = class {
       manager = new TunnelProcessManager();
@@ -292725,7 +293371,7 @@ var init_remote_tunnel_service = __esm({
       async checkTailscaleDaemonReady() {
         let stdout = "";
         try {
-          const result2 = await execFileAsync35("tailscale", ["status", "--json"], {
+          const result2 = await execFileAsync36("tailscale", ["status", "--json"], {
             timeout: 5e3,
             maxBuffer: 8 * 1024 * 1024
           });
@@ -292773,7 +293419,7 @@ var init_remote_tunnel_service = __esm({
       async checkExecutableAvailable(command) {
         const checker = process.platform === "win32" ? "where" : "which";
         try {
-          await execFileAsync35(checker, [command]);
+          await execFileAsync36(checker, [command]);
           return { available: true };
         } catch {
           return {
@@ -292788,8 +293434,8 @@ var init_remote_tunnel_service = __esm({
 });
 
 // ../engine/src/project-engine.ts
-import { execFile as execFile42 } from "node:child_process";
-import { promisify as promisify93 } from "node:util";
+import { execFile as execFile43 } from "node:child_process";
+import { promisify as promisify94 } from "node:util";
 function emitMergeRequestShadowDequeueParityAudit(store, legacyTaskId, shadowTaskId) {
   const agree = shadowTaskId === legacyTaskId;
   void emitBoundedRunAudit2(store, {
@@ -292844,7 +293490,7 @@ async function verifyMergeConfirmedReachability(args) {
     return { reachable: true, skipped: "no-integration-branch" };
   }
   try {
-    await execFileAsync36("git", ["cat-file", "-e", `${commitSha}^{commit}`], {
+    await execFileAsync37("git", ["cat-file", "-e", `${commitSha}^{commit}`], {
       cwd,
       timeout: 1e4
     });
@@ -292853,7 +293499,7 @@ async function verifyMergeConfirmedReachability(args) {
     return { reachable: false, reason: "commit-missing", diagnostic };
   }
   try {
-    await execFileAsync36(
+    await execFileAsync37(
       "git",
       ["merge-base", "--is-ancestor", commitSha, `refs/heads/${integrationBranch}`],
       { cwd, timeout: 1e4 }
@@ -292869,7 +293515,7 @@ async function verifyMergeConfirmedReachability(args) {
     return { reachable: false, reason: "git-error", diagnostic };
   }
 }
-var WorkspaceMergeDispatchBusyError2, execFileAsync36, MERGE_HANDOFF_GRACE_MS, PR_MERGE_RETRY_BACKOFF_BASE_MS, deterministicMergerModeDeprecationWarnedProjects, ProjectEngine;
+var WorkspaceMergeDispatchBusyError2, execFileAsync37, MERGE_HANDOFF_GRACE_MS, PR_MERGE_RETRY_BACKOFF_BASE_MS, deterministicMergerModeDeprecationWarnedProjects, ProjectEngine;
 var init_project_engine = __esm({
   "../engine/src/project-engine.ts"() {
     "use strict";
@@ -292902,6 +293548,7 @@ var init_project_engine = __esm({
     init_merger_ai();
     init_group_merge_coordinator();
     init_workspace_review_reroute();
+    init_stale_content_review_reroute();
     init_workspace_integration_target();
     init_concurrency();
     init_merge_reclaim_policy();
@@ -292928,7 +293575,7 @@ var init_project_engine = __esm({
       }
       retryable = true;
     };
-    execFileAsync36 = promisify93(execFile42);
+    execFileAsync37 = promisify94(execFile43);
     MERGE_HANDOFF_GRACE_MS = 300;
     PR_MERGE_RETRY_BACKOFF_BASE_MS = 5e3;
     deterministicMergerModeDeprecationWarnedProjects = /* @__PURE__ */ new Set();
@@ -292992,6 +293639,7 @@ var init_project_engine = __esm({
           }
         });
       }
+      staleContentRerouteAuditKeys = /* @__PURE__ */ new Set();
       runtime;
       started = false;
       specDriftReconciler;
@@ -294788,11 +295436,44 @@ ${detail}`);
           workspaceRootDir: this.config.workingDirectory,
           settings
         });
-        return getTaskMergeBlocker(task, {
+        const blocker = getTaskMergeBlocker(task, {
           reviewColumns: mergeGate.reviewColumns.size > 0 ? mergeGate.reviewColumns : /* @__PURE__ */ new Set(["in-review"]),
           requiredPreMergeStepIds: mergeGate.requiredPreMergeStepIds,
           mergeContent
         });
+        if (blocker === "task has a pre-merge approval recorded against different content" && mergeContent.kind === "singular") {
+          const reroute = await rerouteSingularStaleContentToReview(store, task, {
+            requiredPreMergeStepIds: mergeGate.requiredPreMergeStepIds,
+            mergeContent
+          }).catch(() => ({
+            rerouted: false,
+            reason: "no-progress",
+            nodeId: void 0,
+            workflowStepId: void 0
+          }));
+          if (reroute.rerouted) {
+            await store.logEntry(task.id, `[pre-merge] Code Review re-entry is owned by the workflow graph after stale content evidence was refused.`);
+          }
+          const auditKey = `${task.id}:${reroute.reason}`;
+          if (!this.staleContentRerouteAuditKeys.has(auditKey)) {
+            this.staleContentRerouteAuditKeys.add(auditKey);
+            await emitBoundedRunAudit2(store, {
+              taskId: task.id,
+              agentId: "merge-gate",
+              runId: `${task.id}:merge-gate`,
+              domain: "database",
+              mutationType: "task:merge-stale-content-review-rerouted",
+              target: task.id,
+              metadata: {
+                taskId: task.id,
+                nodeId: reroute.nodeId,
+                workflowStepId: reroute.workflowStepId,
+                reason: reroute.reason
+              }
+            });
+          }
+        }
+        return blocker;
       }
       /**
        * Remove and return the highest-priority taskId from the merge queue.
@@ -295638,7 +296319,7 @@ ${detail}`);
                   }
                   const checklist = planConfirmedMergeChecklistReconciliation(task);
                   if (checklist.skippedStepIndexes.length > 0 || checklist.reconciledWorkflowStepIds.length > 0) {
-                    const steps = task.steps.map((step, index2) => checklist.skippedStepIndexes.includes(index2) ? { ...step, status: "skipped" } : step);
+                    const steps = (task.steps ?? []).map((step, index2) => checklist.skippedStepIndexes.includes(index2) ? { ...step, status: "skipped" } : step);
                     const workflowStepResults = (task.workflowStepResults ?? []).map((result2) => checklist.reconciledWorkflowStepIds.includes(result2.workflowStepId) ? { ...result2, status: "skipped" } : result2);
                     await store.updateTask(taskId, { steps, workflowStepResults });
                     task.steps = steps;
@@ -297384,9 +298065,9 @@ import { access as access12, unlink as unlink12, writeFile as writeFile31 } from
 import net2 from "node:net";
 import { platform as platform3, tmpdir as tmpdir13 } from "node:os";
 import { join as join100 } from "node:path";
-import { createHash as createHash39 } from "node:crypto";
+import { createHash as createHash40 } from "node:crypto";
 function projectHash(projectId2) {
-  return createHash39("sha1").update(projectId2).digest("hex").slice(0, 16);
+  return createHash40("sha1").update(projectId2).digest("hex").slice(0, 16);
 }
 function computeEngineSocketPath(projectId2) {
   const hash3 = projectHash(projectId2);
@@ -299004,8 +299685,8 @@ var init_remote_access = __esm({
 });
 
 // ../engine/src/healing/archive-worktree-disposer-install.ts
-import { execFile as execFile43 } from "node:child_process";
-import { promisify as promisify94 } from "node:util";
+import { execFile as execFile44 } from "node:child_process";
+import { promisify as promisify95 } from "node:util";
 function installBaselineArchiveWorktreeDisposer(store, input) {
   const allowLiveRemoval = input.allowLiveRemoval ?? (() => false);
   const unregisterSingle = getArchiveWorktreeDisposer(store) ? () => {
@@ -299027,7 +299708,7 @@ function installBaselineArchiveWorktreeDisposer(store, input) {
       try {
         if (await canonicalizeWorktreePath(entry.worktreePath) === await canonicalizeWorktreePath(entry.repoRootDir)) throw new Error("Refusing to remove workspace repository root");
         await removeWorktree({ worktreePath: entry.worktreePath, rootDir: entry.repoRootDir, settings: await input.getSettings(), taskId: task.id, reason: RemovalReason.ExecutorDispose, force: true });
-        await execFileAsync37("git", ["branch", "-D", entry.branch], { cwd: entry.repoRootDir, timeout: 12e4, maxBuffer: 10 * 1024 * 1024 });
+        await execFileAsync38("git", ["branch", "-D", entry.branch], { cwd: entry.repoRootDir, timeout: 12e4, maxBuffer: 10 * 1024 * 1024 });
         if (task.workspaceWorktrees) for (const repoRel of [entry.repoRel, ...entry.aliasRepoRels]) delete task.workspaceWorktrees[repoRel];
         removed.push(entry.repoRel);
       } catch (error3) {
@@ -299041,13 +299722,13 @@ function installBaselineArchiveWorktreeDisposer(store, input) {
     unregisterSingle();
   };
 }
-var execFileAsync37;
+var execFileAsync38;
 var init_archive_worktree_disposer_install = __esm({
   "../engine/src/healing/archive-worktree-disposer-install.ts"() {
     "use strict";
     init_src2();
     init_worktree_backend();
-    execFileAsync37 = promisify94(execFile43);
+    execFileAsync38 = promisify95(execFile44);
   }
 });
 
@@ -300900,7 +301581,7 @@ import { exec as exec65 } from "node:child_process";
 import { mkdtemp as mkdtemp7, rm as rm18 } from "node:fs/promises";
 import { tmpdir as tmpdir14 } from "node:os";
 import { join as join101 } from "node:path";
-import { promisify as promisify95 } from "node:util";
+import { promisify as promisify96 } from "node:util";
 function resolveCommentAuthor(input) {
   const login = input.login || "unknown";
   const authorIsBot = Boolean(
@@ -301369,7 +302050,7 @@ var init_github = __esm({
     "use strict";
     init_src2();
     init_issue_image_attachments();
-    execAsync59 = promisify95(exec65);
+    execAsync59 = promisify96(exec65);
     DiscussionsDisabledError = class extends Error {
       name = "DiscussionsDisabledError";
       constructor(owner, repo, cause) {
@@ -308726,7 +309407,7 @@ var init_knowledge_index_refresh = __esm({
 });
 
 // ../dashboard/src/pr-metadata-generator.ts
-import { promisify as promisify96 } from "node:util";
+import { promisify as promisify97 } from "node:util";
 import { exec as execCb } from "node:child_process";
 import { access as access13, readFile as readFile52 } from "node:fs/promises";
 import { join as join102 } from "node:path";
@@ -309018,7 +309699,7 @@ var init_pr_metadata_generator = __esm({
     "use strict";
     init_src2();
     init_src5();
-    execAsync60 = promisify96(execCb);
+    execAsync60 = promisify97(execCb);
     PR_METADATA_TIMEOUT_MS = 6e4;
     PR_METADATA_SYSTEM_PROMPT = [
       "You generate GitHub pull request metadata for Fusion tasks.",
@@ -309035,13 +309716,13 @@ var init_pr_metadata_generator = __esm({
 });
 
 // ../dashboard/src/routes/resolve-diff-base.ts
-import { execFile as execFile44 } from "node:child_process";
-import { promisify as promisify97 } from "node:util";
-var execFileAsync38;
+import { execFile as execFile45 } from "node:child_process";
+import { promisify as promisify98 } from "node:util";
+var execFileAsync39;
 var init_resolve_diff_base = __esm({
   "../dashboard/src/routes/resolve-diff-base.ts"() {
     "use strict";
-    execFileAsync38 = promisify97(execFile44);
+    execFileAsync39 = promisify98(execFile45);
   }
 });
 
@@ -309082,7 +309763,7 @@ var init_git_worktree_safety = __esm({
 
 // ../dashboard/src/routes/register-git-github.ts
 import { exec as execCb2, spawn as spawn10 } from "node:child_process";
-import { promisify as promisify98 } from "node:util";
+import { promisify as promisify99 } from "node:util";
 var severityAuditLog30, execAsync61, PR_ROUTE_MAX_BUFFER_BYTES, GITHUB_TRACKING_RECONCILE_INTERVAL_MS;
 var init_register_git_github = __esm({
   "../dashboard/src/routes/register-git-github.ts"() {
@@ -309114,7 +309795,7 @@ var init_register_git_github = __esm({
     init_resolve_diff_base();
     init_git_worktree_safety();
     severityAuditLog30 = createLogger("dashboard-register-git-github");
-    execAsync61 = promisify98(execCb2);
+    execAsync61 = promisify99(execCb2);
     PR_ROUTE_MAX_BUFFER_BYTES = 10 * 1024 * 1024;
     GITHUB_TRACKING_RECONCILE_INTERVAL_MS = 15 * 60 * 1e3;
   }
@@ -316051,13 +316732,13 @@ var init_register_agents_projects_nodes = __esm({
 });
 
 // ../dashboard/src/exec-file.ts
-import { execFile as execFile45 } from "node:child_process";
-import { promisify as promisify99 } from "node:util";
-var execFileAsync39;
+import { execFile as execFile46 } from "node:child_process";
+import { promisify as promisify100 } from "node:util";
+var execFileAsync40;
 var init_exec_file = __esm({
   "../dashboard/src/exec-file.ts"() {
     "use strict";
-    execFileAsync39 = promisify99(execFile45);
+    execFileAsync40 = promisify100(execFile46);
   }
 });
 
@@ -327335,7 +328016,7 @@ var init_register_fn_binary_routes = __esm({
 
 // ../dashboard/src/update-check.ts
 import { exec as exec66 } from "node:child_process";
-import { promisify as promisify100 } from "node:util";
+import { promisify as promisify101 } from "node:util";
 var INSTALL_MAX_BUFFER, DAY_MS, execAsync62;
 var init_update_check = __esm({
   "../dashboard/src/update-check.ts"() {
@@ -327343,7 +328024,7 @@ var init_update_check = __esm({
     init_src2();
     INSTALL_MAX_BUFFER = 10 * 1024 * 1024;
     DAY_MS = 24 * 60 * 60 * 1e3;
-    execAsync62 = promisify100(exec66);
+    execAsync62 = promisify101(exec66);
   }
 });
 
@@ -327434,7 +328115,7 @@ var init_types5 = __esm({
 });
 
 // ../dashboard/src/stt/model-manager.ts
-import { createHash as createHash40, randomUUID as randomUUID63 } from "node:crypto";
+import { createHash as createHash41, randomUUID as randomUUID63 } from "node:crypto";
 import { mkdir as mkdir34, open as open5, readFile as readFile56, readdir as readdir14, rename as rename13, rm as rm21, stat as stat15, writeFile as writeFile33 } from "node:fs/promises";
 import { join as join121, relative as relative25, resolve as resolve62, sep as sep20 } from "node:path";
 function parseSafeTarListing(listing) {
@@ -327523,7 +328204,7 @@ function createVoiceModelManager(options = {}) {
         if (!response.ok || !response.body) throw Object.assign(new Error("download failed"), { voiceReason: "network" });
         if (!current(g2, signal)) return state;
         const total = Number(response.headers.get("content-length")) || void 0;
-        const hash3 = createHash40("sha256");
+        const hash3 = createHash41("sha256");
         let bytes = 0;
         for await (const chunk of response.body) {
           if (!current(g2, signal)) return state;