test(FN-4518): cover rebase base SHA persistence in merger details

Fusion-Task-Id: FN-4518 Fusion-Task-Lineage: 48749dec-b2c9-484b-a13e-ffacc1fa9014
2026-05-14 16:43:43 -07:00
parent 6d1ced69e6
commit 8bfad91c81
2 changed files with 37 additions and 0 deletions
--- a/packages/engine/src/merger.ts
+++ b/packages/engine/src/merger.ts
@@ -7107,6 +7107,7 @@ export async function aiMergeTask(

    const mergeDetails: MergeDetails = {
      commitSha: recordedSha,
+      rebaseBaseSha: selectedPostMergeAuditStrategy === "rebase" && !mergeWasEmpty ? rebaseMergeBaseSha : undefined,
      filesChanged: recordedFilesChanged,
      insertions: recordedInsertions,
      deletions: recordedDeletions,