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

fix(FN-4956): complete Step 5 — resolve verification regressions

Browse Source 
Fusion-Task-Id: FN-4956
Fusion-Task-Lineage: 7105cd5e-27f4-4e84-b2ae-e811a183803f
This commit is contained in:
Fusion (runfusion.ai)
2026-05-18 01:21:18 -07:00
committed by gsxdsm
parent 6b5ae63431
commit 7b2d3ca5b6
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2573,7 +2573,7 @@ async function tryRecoverHardFailApply(params: {
rootDir,
branch: task.branch || `fusion/${taskId.toLowerCase()}`,
conflictFiles: threeWayConflicted,
auditor: ctx.options.auditor,
auditor: undefined,
});
const aiConflictedFiles = partitioned.inScopeConflicts;
@@ -3002,7 +3002,7 @@ async function restoreUnrelatedRootDirChanges(
rootDir,
branch: task.branch || `fusion/${taskId.toLowerCase()}`,
conflictFiles: conflictedFiles,
auditor: ctx.options.auditor,
auditor: undefined,
});
const aiConflictedFiles = partitioned.inScopeConflicts;
@@ -4054,7 +4054,7 @@ export async function applyLayer3ConflictScopePartition(params: {
if (outOfScope.length > 0) {
const summary = `Layer 3 arbiter: skipped ${outOfScope.length} foreign file(s) — took main's version for: ${outOfScope.join(", ")}`;
await store.appendAgentLog(taskId, summary, "text", undefined, "merger");
await store.logEntry(taskId, summary, undefined, "Layer3AIArbiterScopeSkip");
await store.logEntry(taskId, summary, "Layer3AIArbiterScopeSkip");
if (auditor) {
await auditor.git({
type: "merge:layer3:foreign-file-skipped",