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

2
packages/engine/src/run-audit.ts
View File

@@ -135,6 +135,8 @@ export type GitMutationType =
| "merge:start" | "merge:start"
| "merge:resolve" | "merge:resolve"
| "merge:file-scope-violation" | "merge:file-scope-violation"
| "merge:layer3:foreign-file-skipped"
| "merge:layer3:scope-override-bypass"
| "merge:audit-failure" | "merge:audit-failure"
| "branch:auto-reclaim" | "branch:auto-reclaim"
| "branch:stale-active-reclaim" | "branch:stale-active-reclaim"