feat(FN-3834): short-circuit no-op merges and auto-finalize review tasks

Merged FN-3834 to add a no-op merge recovery flow to the merger, including a branch-ahead detector, short-circuit logic to exclude no-op merges from the mergeable sweep, and finalization of no-op review tasks — backed by substantial test coverage across merger and self-healing modules.

Fusion-Task-Id: FN-3834
This commit is contained in:
Fusion
2026-05-11 03:44:10 -07:00
committed by gsxdsm
parent 6f2e8c4fc9
commit d6da4ebf8d
10 changed files with 494 additions and 9 deletions

View File

@@ -1002,6 +1002,8 @@ export interface MergeDetails {
mergeCommitMessage?: string;
mergedAt?: string;
mergeConfirmed?: boolean;
noOpMerge?: boolean;
noOpReason?: string;
prNumber?: number;
mergeTargetBranch?: string;
mergeTargetSource?: "task-base-branch" | "task-branch-context" | "project-default" | "legacy-main";
@@ -1096,7 +1098,7 @@ export interface TaskBranchContext {
export interface Task {
id: string;
/** Immutable lineage identity used for durable commit/task attribution. */
lineageId: string;
lineageId?: string;
title?: string;
description: string;
/**
@@ -2577,6 +2579,7 @@ export interface MergeResult extends MergeDetails {
task: Task;
branch: string;
merged: boolean;
noOp?: boolean;
worktreeRemoved: boolean;
branchDeleted: boolean;
error?: string;