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

feat(FN-2279): merge fusion/fn-2279

Browse Source
This commit is contained in:
gsxdsm
2026-04-22 23:01:34 -07:00
parent 1af35c4ce2
commit 0141ea9f3f
5 changed files with 67 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2041,7 +2041,7 @@ export async function aiMergeTask(
// Try in-merge fix attempts before propagating
if (error.name === "VerificationError") {
const verificationErr = error as VerificationError;
const maxFixRetries = Math.min(settings.verificationFixRetries ?? 1, 3);
const maxFixRetries = Math.min(settings.verificationFixRetries ?? 3, 3);
if (maxFixRetries > 0 && (verificationErr.verificationResult.testResult || verificationErr.verificationResult.buildResult)) {
mergerLog.log(`${taskId}: deterministic verification failed — attempting in-merge fix (up to ${maxFixRetries} attempts)`);
@@ -2098,7 +2098,7 @@ export async function aiMergeTask(
// Check if it's a build verification failure
if (error.message?.includes("Build verification failed")) {
const maxFixRetries = Math.min(settings.verificationFixRetries ?? 1, 3);
const maxFixRetries = Math.min(settings.verificationFixRetries ?? 3, 3);
// Try in-merge fix before falling back to build retry
if (maxFixRetries > 0 && (effectiveTestCommand || effectiveBuildCommand)) {