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

feat(FN-4688): complete Step 1 — ungate rebase base persistence

Browse Source 
Fusion-Task-Id: FN-4688
Fusion-Task-Lineage: 49abde1d-3480-4127-beb0-5dadce30b9e1
This commit is contained in:
Fusion (runfusion.ai)
2026-05-15 16:28:04 -07:00
committed by gsxdsm
parent eaaec4ff22
commit 6c542462ed
2 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
packages/engine/src/__tests__/merger-rebase-base-sha.test.ts
View File

@@ -143,6 +143,37 @@ describe("aiMergeTask rebaseBaseSha persistence", () => {
expect(mergeDetailsCall?.[1].mergeDetails.rebaseBaseSha).toBe("rebasebase123");
});
it("stores rebaseBaseSha for rebase-routed merges even when post-merge audit is off", async () => {
const store = createMockStore({
getSettings: vi.fn().mockResolvedValue({
...DEFAULT_SETTINGS,
directMergeCommitStrategy: "always-rebase",
postMergeAuditMode: "off",
}),
});
mockedExecSync.mockImplementation((cmd: any) => {
const cmdStr = String(cmd);
if (cmdStr.includes("rev-parse --verify")) return Buffer.from("abc123");
if (cmdStr === "git rev-parse HEAD" || cmdStr.startsWith("git rev-parse HEAD ")) return "rebasemergedsha";
if (cmdStr.includes("git log")) return "- feat: something";
if (cmdStr.includes("merge-base")) return Buffer.from("abc123");
if (cmdStr.includes("rev-parse \"abc123\"")) return "rebasebase123";
if (cmdStr.includes("rev-list --reverse \"rebasebase123..fusion/FN-050\"")) return "";
if (cmdStr.includes("status --porcelain")) return "";
if (cmdStr.includes("rev-parse --git-path CHERRY_PICK_HEAD")) return ".git/CHERRY_PICK_HEAD";
if (cmdStr.includes("rev-parse --git-path sequencer")) return ".git/sequencer";
if (cmdStr.includes("diff --shortstat \"rebasebase123..HEAD\"")) return "2 files changed, 5 insertions(+), 1 deletions(-)";
if (cmdStr.includes("branch -d") || cmdStr.includes("branch -D")) return Buffer.from("");
if (cmdStr.includes("worktree remove")) return Buffer.from("");
return Buffer.from("");
});
await aiMergeTask(store, "/tmp/root", "FN-050");
const mergeDetailsCall = (store.updateTask as ReturnType<typeof vi.fn>).mock.calls.find((call: any[]) => call[1]?.mergeDetails);
expect(mergeDetailsCall?.[1].mergeDetails.rebaseBaseSha).toBe("rebasebase123");
});
it("leaves rebaseBaseSha undefined for squash merges", async () => {
const store = createMockStore();

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

@@ -7291,7 +7291,7 @@ export async function aiMergeTask(
let landedFiles: string[] | undefined;
try {
const statsCommand = selectedPostMergeAuditStrategy === "rebase" && rebaseMergeBaseSha
const statsCommand = rebaseMergeBaseSha
? `git diff --shortstat ${quoteArg(`${rebaseMergeBaseSha}..HEAD`)}`
: "git show --shortstat --format= HEAD";
const { stdout: statsOutput } = await execAsync(statsCommand, {
@@ -7410,7 +7410,7 @@ export async function aiMergeTask(
if (!isEmptyCommit && !mergeWasEmpty && recordedSha) {
try {
const landedFilesCommand = selectedPostMergeAuditStrategy === "rebase" && rebaseMergeBaseSha
const landedFilesCommand = rebaseMergeBaseSha
? `git diff --name-only ${quoteArg(`${rebaseMergeBaseSha}..${recordedSha}`)}`
: `git show --name-only --format= ${quoteArg(recordedSha)}`;
const { stdout: landedFilesOutput } = await execAsync(landedFilesCommand, {
@@ -7432,7 +7432,7 @@ export async function aiMergeTask(
const mergeDetails: MergeDetails = {
commitSha: recordedSha,
rebaseBaseSha: selectedPostMergeAuditStrategy === "rebase" && !mergeWasEmpty ? rebaseMergeBaseSha : undefined,
rebaseBaseSha: !mergeWasEmpty && rebaseMergeBaseSha ? rebaseMergeBaseSha : undefined,
landedFiles,
filesChanged: recordedFilesChanged,
insertions: recordedInsertions,