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

feat(FN-4763): complete Step 5 — surface PR conflict reclaim in panel

Browse Source 
Fusion-Task-Id: FN-4763
Fusion-Task-Lineage: b3628e63-682b-4a39-9a7d-2c96278c5366
This commit is contained in:
Fusion (runfusion.ai)
2026-05-17 13:25:27 -07:00
committed by gsxdsm
parent 76b1ba8178
commit f8c20e1b96
4 changed files with 110 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/dashboard/app/api/legacy.ts
View File

@@ -2213,10 +2213,12 @@ export interface PrStatusResponse {
export interface PrRefreshResponse {
prInfo: PrInfo;
mergeReady: boolean;
mergeable?: PrInfo["mergeable"];
blockingReasons: string[];
reviewDecision: "APPROVED" | "CHANGES_REQUESTED" | "REVIEW_REQUIRED" | null;
checks: PrCheckStatus[];
automationStatus?: string | null;
conflictReclaimQueued?: boolean;
}
export interface PrMergeResponse {
@@ -2354,6 +2356,12 @@ export function refreshPrStatus(id: string, projectId?: string): Promise<PrRefre
});
}
export function reclaimPrConflict(id: string, projectId?: string): Promise<{ queued: boolean; reason?: string }> {
return api<{ queued: boolean; reason?: string }>(withProjectId(`/tasks/${id}/pr/reclaim-conflict`, projectId), {
method: "POST",
});
}
export function mergePr(id: string, method?: "merge" | "squash" | "rebase", projectId?: string): Promise<PrMergeResponse> {
return api<PrMergeResponse>(withProjectId(`/tasks/${id}/pr/merge`, projectId), {
method: "POST",