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

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

Browse Source
This commit is contained in:
Fusion
2026-04-18 20:00:58 -07:00
committed by gsxdsm
parent a63bca856e
commit d6b7d076d5
6 changed files with 306 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1546,7 +1546,10 @@ export async function aiMergeTask(
execSync("git reset --merge", { cwd: rootDir, stdio: "pipe" });
// Audit trail: record git reset for merge cleanup (FN-1404)
await audit.git({ type: "reset:hard", target: branch, metadata: { purpose: "merge-cleanup", attempt: attemptNum } });
} catch { /* ignore cleanup errors */ }
} catch (err: unknown) {
const msg = err instanceof Error ? err.message : String(err);
mergerLog.warn(`${taskId}: git reset --merge cleanup failed during attempt ${attemptNum}: ${msg}`);
}
}
return false;
@@ -1663,7 +1666,10 @@ export async function aiMergeTask(
execSync("git reset --merge", { cwd: rootDir, stdio: "pipe" });
// Audit trail: record git reset for build retry (FN-1404)
await audit.git({ type: "reset:hard", target: branch, metadata: { purpose: "build-retry" } });
} catch { /* ignore cleanup errors */ }
} catch (err: unknown) {
const msg = err instanceof Error ? err.message : String(err);
mergerLog.warn(`${taskId}: git reset --merge cleanup failed during build-retry: ${msg}`);
}
return false; // Retry
}
throw error; // No retries left — fatal
@@ -1676,7 +1682,10 @@ export async function aiMergeTask(
execSync("git reset --merge", { cwd: rootDir, stdio: "pipe" });
// Audit trail: record git reset for retry (FN-1404)
await audit.git({ type: "reset:hard", target: branch, metadata: { purpose: "merge-retry", attempt: attemptNum } });
} catch { /* ignore cleanup errors */ }
} catch (err: unknown) {
const msg = err instanceof Error ? err.message : String(err);
mergerLog.warn(`${taskId}: git reset --merge cleanup failed during retry cleanup (attempt ${attemptNum}): ${msg}`);
}
return false; // Allow retry
}
throw error; // Last attempt or auto-resolve disabled - propagate error