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

package/dist/child-process-worker.js

@@ -10046,6 +10046,7 @@ function validateForeach(node, topLevelNodeIds, columnIds) {
     );
   }
   for (const inner of templateNodes) {
+    validateReviewKind(inner, "nested");
     if (inner.kind === "foreach" || inner.kind === "loop") {
       throw new WorkflowIrError(
         `foreach node '${node.id}' template may not contain nested loop/foreach ('${inner.id}')`
@@ -10164,6 +10165,7 @@ function validateLoop(node, topLevelNodeIds, columnIds) {
     );
   }
   for (const inner of templateNodes) {
+    validateReviewKind(inner, "nested");
     if (inner.kind === "loop" || inner.kind === "foreach") {
       throw new WorkflowIrError(
         `loop node '${node.id}' template may not contain nested loop/foreach ('${inner.id}')`
@@ -10257,6 +10259,7 @@ function validateOptionalGroup(node, topLevelNodeIds, columnIds) {
     throw new WorkflowIrError(`optional-group node '${node.id}' template has duplicate node ids`);
   }
   for (const inner of templateNodes) {
+    validateReviewKind(inner, "nested");
     if (inner.kind === "loop" || inner.kind === "foreach" || inner.kind === "optional-group") {
       throw new WorkflowIrError(
         `optional-group node '${node.id}' template may not contain nested loop/foreach/optional-group ('${inner.id}')`
@@ -10928,6 +10931,19 @@ function validateColumnRecovery(column) {
     );
   }
 }
+function validateReviewKind(node, placement) {
+  const value = node.config?.reviewKind;
+  if (value === void 0) return;
+  if (value !== "plan" && value !== "code") {
+    throw new WorkflowIrError(`Workflow node '${node.id}' has invalid reviewKind '${String(value)}'; expected 'plan' or 'code'`);
+  }
+  if (placement === "nested") {
+    throw new WorkflowIrError(`Workflow node '${node.id}' has reviewKind in an unsupported nested template placement`);
+  }
+  if (node.kind !== "prompt" && node.kind !== "gate" && node.kind !== "script" && node.kind !== "optional-group") {
+    throw new WorkflowIrError(`Workflow node '${node.id}' has reviewKind on unsupported node kind '${node.kind}'`);
+  }
+}
 function validateV2(ir2) {
   validateColumns(ir2);
   for (const [index2, column] of ir2.columns.entries()) {
@@ -10950,6 +10966,7 @@ function validateV2(ir2) {
   }
   const nodesById = new Map(ir2.nodes.map((n) => [n.id, n]));
   for (const node of ir2.nodes) {
+    validateReviewKind(node, "top-level");
     validateExtensionMetadata(`Workflow node '${node.id}'`, node.extensions);
     if (node.column !== void 0 && !columnIds.has(node.column)) {
       throw new WorkflowIrError(
@@ -13413,6 +13430,7 @@ function codeReviewOptionalGroupNode(column, options = {}) {
     column,
     config: {
       name: CODE_REVIEW_NAME,
+      reviewKind: "code",
       // Default-ON: runs for every coding task by default, but operators can toggle it
       // off per task (remove `code-review` from enabledWorkflowSteps).
       defaultOn: options.defaultOn ?? true,
@@ -13558,6 +13576,7 @@ function planReviewOptionalGroupNode(column, options = {}) {
     ...column ? { column } : {},
     config: {
       name: PLAN_REVIEW_NAME,
+      reviewKind: "plan",
       defaultOn: options.defaultOn ?? true,
       /*
        * FNXC:WorkflowRemediation 2026-06-29-12:14:
@@ -127158,6 +127177,36 @@ var init_async_knowledge = __esm({
 });
 
 // ../core/src/workflows/workflow-step-results.ts
+function normalizeWorkflowReviewFindings(raw) {
+  if (!Array.isArray(raw)) return void 0;
+  const normalized = [];
+  const usedIds = /* @__PURE__ */ new Set();
+  for (const candidate of raw) {
+    if (normalized.length >= MAX_WORKFLOW_REVIEW_FINDINGS || !candidate || typeof candidate !== "object") continue;
+    const value = candidate;
+    const title = boundedTrimmedString(value.title, MAX_FINDING_TITLE_LENGTH);
+    const body = boundedTrimmedString(value.body, MAX_FINDING_BODY_LENGTH);
+    if (!title || !body) continue;
+    const baseId = boundedTrimmedString(value.id, MAX_FINDING_ID_LENGTH) || `finding-${normalized.length + 1}`;
+    let id = baseId;
+    let suffix = 2;
+    while (usedIds.has(id)) id = `${baseId.slice(0, Math.max(1, MAX_FINDING_ID_LENGTH - String(suffix).length - 1))}-${suffix++}`;
+    usedIds.add(id);
+    const filePath = boundedTrimmedString(value.filePath, MAX_FINDING_PATH_LENGTH);
+    const line2 = typeof value.line === "number" && Number.isFinite(value.line) && value.line > 0 ? Math.floor(value.line) : void 0;
+    const severity = isWorkflowReviewFindingSeverity(value.severity) ? value.severity : void 0;
+    normalized.push({ id, title, body, ...filePath ? { filePath } : {}, ...line2 ? { line: line2 } : {}, ...severity ? { severity } : {} });
+  }
+  return normalized.length > 0 ? normalized : void 0;
+}
+function boundedTrimmedString(value, maxLength) {
+  if (typeof value !== "string") return void 0;
+  const trimmed = value.trim();
+  return trimmed && trimmed.length <= maxLength ? trimmed : void 0;
+}
+function isWorkflowReviewFindingSeverity(value) {
+  return typeof value === "string" && WORKFLOW_REVIEW_FINDING_SEVERITIES.includes(value);
+}
 function isTerminalFailure(result) {
   return TERMINAL_FAILURE_STATUSES.has(result.status);
 }
@@ -127223,10 +127272,16 @@ function makeReviewLeaseRecord(args) {
     leaseOwner: args.owner
   };
 }
-var MAX_WORKFLOW_STEP_PRIOR_ATTEMPTS, TERMINAL_FAILURE_STATUSES, PLAN_REVIEW_LEASE_STALENESS_MS, TERMINAL_STEP_STATUSES;
+var WORKFLOW_REVIEW_FINDING_SEVERITIES, MAX_WORKFLOW_REVIEW_FINDINGS, MAX_FINDING_ID_LENGTH, MAX_FINDING_TITLE_LENGTH, MAX_FINDING_BODY_LENGTH, MAX_FINDING_PATH_LENGTH, MAX_WORKFLOW_STEP_PRIOR_ATTEMPTS, TERMINAL_FAILURE_STATUSES, PLAN_REVIEW_LEASE_STALENESS_MS, TERMINAL_STEP_STATUSES;
 var init_workflow_step_results = __esm({
   "../core/src/workflows/workflow-step-results.ts"() {
     "use strict";
+    WORKFLOW_REVIEW_FINDING_SEVERITIES = ["low", "medium", "high", "critical"];
+    MAX_WORKFLOW_REVIEW_FINDINGS = 20;
+    MAX_FINDING_ID_LENGTH = 128;
+    MAX_FINDING_TITLE_LENGTH = 240;
+    MAX_FINDING_BODY_LENGTH = 4e3;
+    MAX_FINDING_PATH_LENGTH = 1e3;
     MAX_WORKFLOW_STEP_PRIOR_ATTEMPTS = 5;
     TERMINAL_FAILURE_STATUSES = /* @__PURE__ */ new Set([
       "failed",
@@ -127713,6 +127768,7 @@ __export(src_exports, {
   MAX_TITLE_LENGTH: () => MAX_TITLE_LENGTH,
   MAX_TITLE_SUMMARIZE_INPUT_LENGTH: () => MAX_TITLE_SUMMARIZE_INPUT_LENGTH,
   MAX_WORKFLOW_ICON_LENGTH: () => MAX_WORKFLOW_ICON_LENGTH,
+  MAX_WORKFLOW_REVIEW_FINDINGS: () => MAX_WORKFLOW_REVIEW_FINDINGS,
   MAX_WORKFLOW_STEP_PRIOR_ATTEMPTS: () => MAX_WORKFLOW_STEP_PRIOR_ATTEMPTS,
   MEMORY_AUDIT_PATH: () => MEMORY_AUDIT_PATH,
   MEMORY_BACKEND_SETTINGS_KEYS: () => MEMORY_BACKEND_SETTINGS_KEYS,
@@ -127914,6 +127970,7 @@ __export(src_exports, {
   WAKE_DELTA_ASSIGNED_TASKS_CAP: () => WAKE_DELTA_ASSIGNED_TASKS_CAP,
   WEDGE_RENOTIFY_COOLDOWN_MS: () => WEDGE_RENOTIFY_COOLDOWN_MS,
   WORKFLOW_EXTENSION_SCHEMA_VERSION: () => WORKFLOW_EXTENSION_SCHEMA_VERSION,
+  WORKFLOW_REVIEW_FINDING_SEVERITIES: () => WORKFLOW_REVIEW_FINDING_SEVERITIES,
   WORKFLOW_SETTING_REJECTION_CODES: () => WORKFLOW_SETTING_REJECTION_CODES,
   WORKFLOW_SETTING_TYPES: () => WORKFLOW_SETTING_TYPES,
   WORKFLOW_WORK_ITEM_KINDS: () => WORKFLOW_WORK_ITEM_KINDS,
@@ -128441,6 +128498,7 @@ __export(src_exports, {
   isWipColumn: () => isWipColumn,
   isWipColumnRole: () => isWipColumnRole,
   isWorkflowOptionalGroupEnabled: () => isWorkflowOptionalGroupEnabled,
+  isWorkflowReviewFindingSeverity: () => isWorkflowReviewFindingSeverity,
   isWorkspaceTask: () => isWorkspaceTask,
   layoutForIr: () => layoutForIr,
   listActiveAiSessions: () => listActiveAiSessions,
@@ -128514,6 +128572,7 @@ __export(src_exports, {
   normalizeValidationDiagnostics: () => normalizeValidationDiagnostics,
   normalizeWorkflowIcon: () => normalizeWorkflowIcon,
   normalizeWorkflowPromptOverrides: () => normalizeWorkflowPromptOverrides,
+  normalizeWorkflowReviewFindings: () => normalizeWorkflowReviewFindings,
   notifyOperatorOfNonOperatorDelete: () => notifyOperatorOfNonOperatorDelete,
   overseerAdviceSeverityRank: () => overseerAdviceSeverityRank,
   parseAgentManifest: () => parseAgentManifest,
@@ -164660,37 +164719,6 @@ var init_code_node_runner = __esm({
   }
 });
 
-// ../engine/src/errors/transient-merge-error-classifier.ts
-function classifyTransientMergeError(error2) {
-  if (!error2) return null;
-  if (/lease-handoff-failed[^a-z]+target-not-queued/i.test(error2)) {
-    return "lease-handoff-target-not-queued";
-  }
-  if (/\bACP turn failed\b/i.test(error2) || /\bacp rpc code -32(?:603|00[0-3])\b/i.test(error2)) {
-    return "ai-provider-turn-failure";
-  }
-  if (/\bspawn(?:\s+\S+)?\s+ENO(?:TDIR|ENT)\b/i.test(error2)) {
-    return "process-spawn-failure";
-  }
-  if (/\bis not a working tree\b/i.test(error2)) {
-    return "process-spawn-failure";
-  }
-  const sameSha = error2.match(/advanced concurrently \(expected ([0-9a-f]{7,40}),\s+observed ([0-9a-f]{7,40})\)/i);
-  if (sameSha && sameSha[1].toLowerCase() === sameSha[2].toLowerCase()) {
-    return "spurious-concurrent-advance-same-sha";
-  }
-  if (isTransientError(error2)) {
-    return "network-transport-failure";
-  }
-  return null;
-}
-var init_transient_merge_error_classifier = __esm({
-  "../engine/src/errors/transient-merge-error-classifier.ts"() {
-    "use strict";
-    init_transient_error_patterns();
-  }
-});
-
 // ../engine/src/notification/ntfy-provider.ts
 function resolveParticipantLabel(metadata, kind) {
   const nameKey = kind === "from" ? "fromName" : "toName";
@@ -165164,7 +165192,50 @@ var init_webhook_provider = __esm({
   }
 });
 
+// ../engine/src/errors/transient-merge-error-classifier.ts
+function classifyTransientMergeError(error2) {
+  if (!error2) return null;
+  if (/lease-handoff-failed[^a-z]+target-not-queued/i.test(error2)) {
+    return "lease-handoff-target-not-queued";
+  }
+  if (/\bACP turn failed\b/i.test(error2) || /\bacp rpc code -32(?:603|00[0-3])\b/i.test(error2)) {
+    return "ai-provider-turn-failure";
+  }
+  if (/\bspawn(?:\s+\S+)?\s+ENO(?:TDIR|ENT)\b/i.test(error2)) {
+    return "process-spawn-failure";
+  }
+  if (/\bis not a working tree\b/i.test(error2)) {
+    return "process-spawn-failure";
+  }
+  const sameSha = error2.match(/advanced concurrently \(expected ([0-9a-f]{7,40}),\s+observed ([0-9a-f]{7,40})\)/i);
+  if (sameSha && sameSha[1].toLowerCase() === sameSha[2].toLowerCase()) {
+    return "spurious-concurrent-advance-same-sha";
+  }
+  if (isTransientError(error2)) {
+    return "network-transport-failure";
+  }
+  return null;
+}
+function hasTransientMergeRecoveryOwner(task) {
+  return classifyTransientMergeError(task.error) !== null && typeof task.mergeTransientRetryCount === "number" && Number.isInteger(task.mergeTransientRetryCount) && task.mergeTransientRetryCount >= 0 && task.mergeTransientRetryCount < MAX_AUTO_MERGE_TRANSIENT_RETRIES;
+}
+var MAX_AUTO_MERGE_TRANSIENT_RETRIES;
+var init_transient_merge_error_classifier = __esm({
+  "../engine/src/errors/transient-merge-error-classifier.ts"() {
+    "use strict";
+    init_transient_error_patterns();
+    MAX_AUTO_MERGE_TRANSIENT_RETRIES = 5;
+  }
+});
+
 // ../engine/src/notification/task-wedge-notification.ts
+function describeTaskRecoveryOwner(task) {
+  if (hasTransientMergeRecoveryOwner(task)) return { kind: "transient-merge-retry" };
+  if (typeof task.recoveryRetryCount === "number" && Number.isInteger(task.recoveryRetryCount) && task.recoveryRetryCount >= 0 && typeof task.nextRecoveryAt === "string" && Number.isFinite(Date.parse(task.nextRecoveryAt))) {
+    return { kind: "scheduled-recovery" };
+  }
+  return null;
+}
 function describeSelfHealingNoActionWedge(task, stage, metadata) {
   const description = SELF_HEALING_NO_ACTIONS[stage];
   if (!description || task.userPaused || task.paused || task.autoMerge === false) return null;
@@ -165222,6 +165293,7 @@ function describeTaskWedge(task) {
   if (/merge.*(?:blocked|verification|gate)|(?:verification|gate).*(?:failed|exhaust)/i.test(error2)) {
     return { reasonKey: "merge-blocked", reason: "Merge verification cannot progress without operator action.", action: "Fix the failing verification, then retry the task." };
   }
+  if (describeTaskRecoveryOwner(task)) return null;
   if (!error2 && (task.mergeRetries ?? 0) < 3) return null;
   return {
     reasonKey: "terminal-failed",
@@ -165233,6 +165305,7 @@ var SELF_HEALING_NO_ACTIONS;
 var init_task_wedge_notification = __esm({
   "../engine/src/notification/task-wedge-notification.ts"() {
     "use strict";
+    init_transient_merge_error_classifier();
     SELF_HEALING_NO_ACTIONS = {
       "reclaim-pr-conflict": {
         reason: "Self-healing could not reclaim a stalled pull-request conflict.",
@@ -165298,7 +165371,6 @@ var init_notification_service = __esm({
     init_src2();
     init_notifier();
     init_logger();
-    init_transient_merge_error_classifier();
     init_ntfy_provider();
     init_webhook_provider();
     init_task_wedge_notification();
@@ -165524,10 +165596,10 @@ var init_notification_service = __esm({
         }
       }
       handleTaskUpdated = (task, meta2) => {
-        const transientFailure = task.status === "failed" ? classifyTransientMergeError(task.error) : null;
-        const wedge = transientFailure ? null : describeTaskWedge(task);
+        const recoveryOwner = task.status === "failed" ? describeTaskRecoveryOwner(task) : null;
+        const wedge = describeTaskWedge(task);
         if (wedge) this.cancelPendingFailureNotification(task.id, "classified-terminal-wedge");
-        if (!transientFailure) void this.enqueueWedgeHandling(task.id, () => this.maybeNotifyTaskWedge(task, wedge));
+        void this.enqueueWedgeHandling(task.id, () => this.maybeNotifyTaskWedge(task, wedge));
         void this.maybeSuppressTransientFailedNotification(task, `status=${task.status ?? "undefined"}`);
         if (task.status === "awaiting-approval") {
           void this.writeAwaitingApprovalMailboxMessage(task);
@@ -165538,17 +165610,12 @@ var init_notification_service = __esm({
         if (!this.notificationsEnabled) {
           return;
         }
-        if (task.status === "failed" && !wedge) {
-          const transientClass = classifyTransientMergeError(task.error);
-          if (transientClass) {
-            this.failureNotificationSuppressedCount += 1;
-            schedulerLog.debug(
-              `[notify] ${task.id} transient merge failure (${transientClass}) \u2014 suppressed notification (self-heal in flight)`
-            );
-            return;
-          }
+        if (task.status === "failed" && recoveryOwner) {
+          this.failureNotificationSuppressedCount += 1;
+          schedulerLog.debug(`[notify] ${task.id} recovery-owned failure \u2014 suppressed notification`);
+        } else if (task.status === "failed" && !wedge) {
           if (this.failureNotificationMode === "all") {
-            this.maybeNotify(task.id, "failed", this.createTaskPayload(task, "failed"));
+            void this.maybeNotifyImmediateFailure(task);
           } else {
             this.scheduleFailureNotification(task);
           }
@@ -165635,7 +165702,17 @@ var init_notification_service = __esm({
         await this.enqueueWedgeHandling(task.id, () => this.maybeNotifyTaskWedge(task, descriptor));
       }
       async maybeNotifyTaskWedge(task, suppliedDescriptor) {
-        const descriptor = suppliedDescriptor ?? describeTaskWedge(task);
+        const liveTask = this.store.getTask ? await this.store.getTask(task.id) ?? task : task;
+        const recoveryOwner = describeTaskRecoveryOwner(liveTask);
+        if (recoveryOwner) {
+          if (this.activeWedgeReasons.has(task.id) || liveTask.wedgeNotification?.status === "active") {
+            this.activeWedgeReasons.delete(task.id);
+            await this.store.claimTaskWedgeNotificationEpisode?.(task.id, null);
+          }
+          return;
+        }
+        const descriptor = suppliedDescriptor ?? describeTaskWedge(liveTask);
+        task = liveTask;
         let episode;
         if (!descriptor) {
           const isActiveSelfHealingNoAction = task.wedgeNotification?.status === "active" && task.wedgeNotification.reasonKey.startsWith("self-healing-no-action:");
@@ -166002,6 +166079,14 @@ var init_notification_service = __esm({
         this.failureNotificationDelayMs = typeof settings.failureNotificationDelayMs === "number" && settings.failureNotificationDelayMs >= 0 ? settings.failureNotificationDelayMs : this.failedNotificationGraceMs;
         this.failureNotificationMode = settings.failureNotificationMode ?? "sticky-only";
       }
+      async maybeNotifyImmediateFailure(task) {
+        const liveTask = this.store.getTask ? await this.store.getTask(task.id) ?? task : task;
+        if (liveTask.status !== "failed" || describeTaskRecoveryOwner(liveTask) || describeTaskWedge(liveTask)) {
+          this.failureNotificationSuppressedCount += 1;
+          return;
+        }
+        this.maybeNotify(liveTask.id, "failed", this.createTaskPayload(liveTask, "failed"));
+      }
       scheduleFailureNotification(task) {
         if (this.pendingFailureNotifications.has(task.id)) {
           return;
@@ -166058,12 +166143,9 @@ var init_notification_service = __esm({
           schedulerLog.debug(`[notify] ${taskId} no longer failed at dispatch time \u2014 suppressed notification`);
           return;
         }
-        const transientClassAtDispatch = classifyTransientMergeError(task.error);
-        if (transientClassAtDispatch) {
+        if (describeTaskRecoveryOwner(task)) {
           this.failureNotificationSuppressedCount += 1;
-          schedulerLog.debug(
-            `[notify] ${taskId} transient merge failure (${transientClassAtDispatch}) at dispatch time \u2014 suppressed notification (self-heal in flight)`
-          );
+          schedulerLog.debug(`[notify] ${taskId} recovery-owned failure at dispatch time \u2014 suppressed notification`);
           return;
         }
         if (describeTaskWedge(task)) {
@@ -192043,10 +192125,21 @@ var Scheduler = class {
           const unmetDeps = getUnmetSchedulingDependencies(task, tasks2, schedulingDependencyOptions);
           if (unmetDeps.length > 0) {
             const normalizedUnmetDeps = [...new Set(unmetDeps)].sort();
+            let activeOverlapBlockedBy = null;
+            if (activeScopes.size > 0) {
+              try {
+                const taskScope = await getFilteredFileScope(task.id);
+                if (taskScope.length > 0 && !isCoordinationOnlyTask(task, taskScope)) {
+                  activeOverlapBlockedBy = Array.from(activeScopes.entries()).sort(([aId], [bId]) => aId.localeCompare(bId)).find(([, activeScope]) => this.pathsOverlap(taskScope, activeScope))?.[0] ?? null;
+                }
+              } catch (error2) {
+                schedulerLog.warn(`Failed to refresh file-scope overlap blocker for dependency-blocked task ${task.id}`, error2);
+              }
+            }
             await this.transitionQueuedEpisode(task, {
               signature: `dependency:${normalizedUnmetDeps.join(",")}`,
               blockedBy: unmetDeps[0] ?? null,
-              overlapBlockedBy: task.overlapBlockedBy ?? null,
+              overlapBlockedBy: activeOverlapBlockedBy,
               action: `queued \u2014 unmet dependencies: ${unmetDeps.join(", ")}`
             });
             this.options.onBlocked?.(task, unmetDeps);
@@ -194569,6 +194662,7 @@ var SESSION_CONTENTION_HOLD_VALUE = "session-contention-hold";
 var WORKFLOW_INTERRUPTED_NODE_ID_CONTEXT_KEY = "workflow:interruptedNodeId";
 var WORKFLOW_INTERRUPTED_NODE_ABORT_KIND_CONTEXT_KEY = "workflow:interruptedNodeAbortKind";
 var WORKFLOW_OPTIONAL_GROUP_CONTEXT_KEY = "workflow:optionalGroupActive";
+var WORKFLOW_REVIEW_KIND_CONTEXT_KEY = "workflow:reviewKind";
 var WORKFLOW_NODE_ENGINE_PAUSE_ABORT_KIND = "engine-pause";
 var WORKFLOW_DRIFT_PARK_CONTEXT_KEY = "workflow:driftPark";
 var WorkflowGraphSuspended = class extends Error {
@@ -194893,6 +194987,7 @@ var WorkflowGraphExecutor = class {
           phase: stepPhase,
           status: "pending",
           source: "optional-group",
+          ...this.workflowReviewKind(node) ? { reviewKind: this.workflowReviewKind(node) } : {},
           startedAt: stepStartedAt,
           // U3/KTD-4: stamp the lease owner so a concurrent/crashed re-entry
           // adopts this pending gate instead of dispatching a second reviewer.
@@ -194912,7 +195007,8 @@ var WorkflowGraphExecutor = class {
           runTemplateNode: (tNode, sig, contextOverride) => {
             const optionalGroupContext = {
               ...contextOverride ?? context,
-              [WORKFLOW_OPTIONAL_GROUP_CONTEXT_KEY]: node.id
+              [WORKFLOW_OPTIONAL_GROUP_CONTEXT_KEY]: node.id,
+              ...this.workflowReviewKind(node) ? { [WORKFLOW_REVIEW_KIND_CONTEXT_KEY]: this.workflowReviewKind(node) } : {}
             };
             return this.executeNodeWithRetries(tNode, task, settings, optionalGroupContext, ir2, sig, false);
           },
@@ -194930,6 +195026,7 @@ var WorkflowGraphExecutor = class {
         const exitContextPatch = exitResult?.contextPatch;
         let stepOutput = typeof exitContextPatch?.output === "string" ? exitContextPatch.output : void 0;
         const stepNotes = typeof exitContextPatch?.notes === "string" ? exitContextPatch.notes : void 0;
+        const stepFindings = this.workflowReviewKind(node) && Array.isArray(exitContextPatch?.findings) ? exitContextPatch.findings : void 0;
         if (stepStatus === "failed" && !verdict && stepOutput === void 0 && stepNotes === void 0) {
           const lastVisited = groupResult.visitedNodeIds[groupResult.visitedNodeIds.length - 1];
           const templateNodeId = lastVisited?.includes("::") ? lastVisited.slice(lastVisited.indexOf("::") + 2) : void 0;
@@ -194947,9 +195044,11 @@ var WorkflowGraphExecutor = class {
           phase: stepPhase,
           source: "optional-group",
           status: stepStatus,
+          ...this.workflowReviewKind(node) ? { reviewKind: this.workflowReviewKind(node) } : {},
           ...verdict ? { verdict } : {},
           ...stepOutput !== void 0 ? { output: stepOutput } : {},
           ...stepNotes !== void 0 ? { notes: stepNotes } : {},
+          ...stepFindings?.length ? { findings: stepFindings } : {},
           startedAt: stepStartedAt,
           completedAt: (/* @__PURE__ */ new Date()).toISOString()
         });
@@ -195409,9 +195508,15 @@ var WorkflowGraphExecutor = class {
     }
     return failureResult;
   }
+  /** FNXC:WorkflowReviewKind 2026-08-05-02:31: Persist only the declared closed
+   * marker; execution never derives review semantics from a label, verdict, or gate mode. */
+  workflowReviewKind(node) {
+    return node.config?.reviewKind === "plan" || node.config?.reviewKind === "code" ? node.config.reviewKind : void 0;
+  }
   shouldRecordNodeProgress(node) {
     const skillName = typeof node.config?.skillName === "string" ? node.config.skillName.trim() : "";
-    return skillName.length > 0 && (node.kind === "prompt" || node.kind === "gate");
+    const markedReview = this.workflowReviewKind(node) !== void 0;
+    return markedReview && (node.kind === "prompt" || node.kind === "gate" || node.kind === "script") || skillName.length > 0 && (node.kind === "prompt" || node.kind === "gate");
   }
   workflowNodeProgressName(node) {
     const configuredName = typeof node.config?.name === "string" ? node.config.name.trim() : "";
@@ -195425,6 +195530,7 @@ var WorkflowGraphExecutor = class {
       phase: node.config?.phase === "post-merge" ? "post-merge" : "pre-merge",
       source: "node",
       status: "pending",
+      ...this.workflowReviewKind(node) ? { reviewKind: this.workflowReviewKind(node) } : {},
       startedAt
     };
     await this.recordOptionalGroupStepResult(taskId, result);
@@ -195435,6 +195541,7 @@ var WorkflowGraphExecutor = class {
     const contextPatch = nodeResult.contextPatch ?? {};
     let output = typeof contextPatch.output === "string" ? contextPatch.output : void 0;
     const notes = typeof contextPatch.notes === "string" ? contextPatch.notes : void 0;
+    const findings = this.workflowReviewKind(node) && Array.isArray(contextPatch.findings) ? contextPatch.findings : void 0;
     if (status === "failed" && output === void 0 && notes === void 0) {
       output = this.synthesizeNonVerdictFailureOutput({
         stepLabel: this.workflowNodeProgressName(node),
@@ -195449,8 +195556,10 @@ var WorkflowGraphExecutor = class {
       phase: started?.phase ?? (node.config?.phase === "post-merge" ? "post-merge" : "pre-merge"),
       source: "node",
       status,
+      ...this.workflowReviewKind(node) ? { reviewKind: this.workflowReviewKind(node) } : {},
       ...output !== void 0 ? { output } : {},
       ...notes !== void 0 ? { notes } : {},
+      ...findings?.length ? { findings } : {},
       startedAt: started?.startedAt ?? (/* @__PURE__ */ new Date()).toISOString(),
       completedAt: (/* @__PURE__ */ new Date()).toISOString()
     });
@@ -219935,9 +220044,11 @@ function parseWorkflowStepVerdict(rawOutput) {
         verdict = "REVISE";
       }
       if (!verdict) continue;
+      const findings = normalizeWorkflowReviewFindings(parsed.findings);
       return {
         verdict,
-        notes: typeof parsed.notes === "string" ? parsed.notes : ""
+        notes: typeof parsed.notes === "string" ? parsed.notes : "",
+        ...findings ? { findings } : {}
       };
     } catch {
     }
@@ -219969,7 +220080,8 @@ function parseWorkflowStepOutput(rawOutput, options = {}) {
     return {
       output: parsed.notes || "",
       verdict: parsed.verdict,
-      notes: parsed.notes
+      notes: parsed.notes,
+      ...parsed.findings ? { findings: parsed.findings } : {}
     };
   }
   const inferred = inferWorkflowStepVerdictFromProse(trimmed);
@@ -225794,6 +225906,7 @@ ${info.feedback}`, revisionKey),
       return this.runCliAgentNode(node, await this.store.getTask(live.id), cfg);
     }
     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 isCompletionSummaryNode2 = cfg.summaryTarget === "task" || node.id === "completion-summary";
     if (live.executionMode === "fast" && !isCompletionSummaryNode2 && !optionalGroupId && !cfg.seam && (node.kind === "prompt" || node.kind === "script" || node.kind === "gate")) {
       executorLog.debug(`${live.id}: fast mode \u2014 skipping custom graph node '${node.id}'`);
@@ -225942,6 +226055,9 @@ ${prompt}`;
     if (optionalGroupId) {
       step.optionalGroupId = optionalGroupId;
     }
+    if (declaredReviewKind) {
+      step.reviewKind = declaredReviewKind;
+    }
     if (cfg.reviewCanFixInline === true) {
       step.reviewCanFixInline = true;
     }
@@ -225954,7 +226070,11 @@ ${prompt}`;
       executorLog.debug(`${live.id}: graph node '${node.id}' runtime env injected (${injected.pathEntryCount} PATH entries, ${injected.injectedKeyCount} env keys)`);
     }
     const unattended = this.graphUnattendedRuns.has(live.id);
-    const outcome = mode === "script" ? await this.executeScriptWorkflowStep(live, step, worktreePath, settings, nodeEnv) : await this.executeWorkflowStep(live, step, worktreePath, settings, nodeEnv, { unattended });
+    let outcome = mode === "script" ? await this.executeScriptWorkflowStep(live, step, worktreePath, settings, nodeEnv) : await this.executeWorkflowStep(live, step, worktreePath, settings, nodeEnv, { unattended });
+    if (declaredReviewKind && typeof outcome.output === "string") {
+      const parsedReviewOutput = parseWorkflowStepOutput(outcome.output, { requireVerdict: false });
+      if (parsedReviewOutput.findings?.length) outcome = { ...outcome, findings: parsedReviewOutput.findings };
+    }
     const awaitQuestion = parseAwaitInputSentinel(outcome.output);
     if (awaitQuestion) {
       await this.store.logEntry(
@@ -225977,6 +226097,8 @@ ${prompt}`;
     const contextPatch = {};
     if (typeof stepOutput === "string") contextPatch.output = stepOutput;
     if (typeof stepNotes === "string" && stepNotes) contextPatch.notes = stepNotes;
+    const stepFindings = outcome.findings;
+    if (stepFindings?.length) contextPatch.findings = stepFindings;
     if (cfg.summaryTarget === "task" && typeof stepOutput === "string" && stepOutput.trim()) {
       contextPatch.summary = stepOutput.trim();
     }
@@ -232479,13 +232601,14 @@ CRITICAL SCOPING RULES \u2014 read before doing anything else:
     const isSkillStep = typeof workflowStep.skillName === "string" && workflowStep.skillName.trim().length > 0;
     const isSummaryProjectionStep = workflowStep.summaryTarget === "task";
     const requireVerdict = !isSummaryProjectionStep && (workflowStep.gateMode === "gate" || !isSkillStep);
+    const reviewFindingsContract = workflowStepMetadata.reviewKind === "plan" || workflowStepMetadata.reviewKind === "code";
     const verdictBlock = requireVerdict ? `
 
 ## Feedback Format
 
 When your review is complete, your final line MUST be a single JSON object (no markdown fences):
 
-{"verdict":"APPROVE|APPROVE_WITH_NOTES|REVISE","notes":"..."}
+${reviewFindingsContract ? '{"verdict":"APPROVE|APPROVE_WITH_NOTES|REVISE","notes":"...","findings":[{"id":"stable-id","title":"concise issue","body":"actionable detail","filePath":"optional/path","line":1,"severity":"low|medium|high|critical"}]}' : '{"verdict":"APPROVE|APPROVE_WITH_NOTES|REVISE","notes":"..."}'}
 
 Rules:
 - Output exactly one trailing JSON object and stop.
@@ -232795,7 +232918,8 @@ ${detectedQuestion}
             revisionRequested,
             output: parsed.output,
             verdict: parsed.verdict,
-            notes: parsed.notes
+            notes: parsed.notes,
+            ...parsed.findings ? { findings: parsed.findings } : {}
           };
         }
         if (parsed.malformed) {
@@ -254982,7 +255106,7 @@ var ProjectEngine = class _ProjectEngine {
    *
    *  Readable (not private) so tests derive the cap from this single source of truth rather
    *  than hardcoding it — the FN-8004 bump broke two suites that had baked in the old `3`. */
-  static MAX_AUTO_MERGE_TRANSIENT_RETRIES = 5;
+  static MAX_AUTO_MERGE_TRANSIENT_RETRIES = MAX_AUTO_MERGE_TRANSIENT_RETRIES;
   static MERGE_REQUEST_RETRY_EXHAUSTED_AGE_MS = 30 * 60 * 1e3;
   /** Cap on outer in-review→in-progress bounces caused by deterministic
    *  verification failures during auto-merge. After this many failed merges