root/fusion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(FN-3842): log pre-attempt baseline at in-merge finalize

Browse Source
This commit is contained in:
Fusion
2026-05-09 09:09:05 -07:00
committed by gsxdsm
parent 9ce4f5ada6
commit 497c91b845
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/engine/src/merger.ts
View File

@@ -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,