From 497c91b845de4f42732ee6520968c9d29349ab47 Mon Sep 17 00:00:00 2001 From: Fusion Date: Sat, 9 May 2026 09:09:05 -0700 Subject: [PATCH] fix(FN-3842): log pre-attempt baseline at in-merge finalize --- packages/engine/src/merger.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/engine/src/merger.ts b/packages/engine/src/merger.ts index e477aae5c..752a14d30 100644 --- a/packages/engine/src/merger.ts +++ b/packages/engine/src/merger.ts @@ -5127,6 +5127,8 @@ export async function aiMergeTask( // amend if AI agent already committed). Always rewrites the // message deterministically from branch step commits. const authorArg = getCommitAuthorArg(settings); + const { stdout: finalizeHeadOut } = await execAsync("git rev-parse HEAD", { cwd: rootDir, encoding: "utf-8" }); + mergerLog.log(`${taskId}: in-merge fix entering with preAttemptHeadSha=${preAttemptHeadSha}, currentHead=${finalizeHeadOut.trim()}`); const finalized = await commitOrAmendMergeWithFixes( rootDir, taskId, @@ -5246,6 +5248,8 @@ export async function aiMergeTask( if (fixSuccess) { const authorArg = getCommitAuthorArg(settings); + const { stdout: finalizeHeadOut } = await execAsync("git rev-parse HEAD", { cwd: rootDir, encoding: "utf-8" }); + mergerLog.log(`${taskId}: in-merge fix entering with preAttemptHeadSha=${preAttemptHeadSha}, currentHead=${finalizeHeadOut.trim()}`); const finalized = await commitOrAmendMergeWithFixes( rootDir, taskId,