releases/ClaudeDo
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Packages Projects Releases 12 Wiki Activity

fix(ui): discard stale mergeability probe after task or target switch

Browse Source 
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
mika kuns
2026-06-04 23:41:59 +02:00
parent de01579e84
commit 6e3f90d289
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ClaudeDo.Ui/ViewModels/Islands/DetailsIslandViewModel.cs
View File

@@ -1147,7 +1147,11 @@ public sealed partial class DetailsIslandViewModel : ViewModelBase
MergePreviewText = label; MergeIsClean = false; MergeIsConflict = false; MergePreviewText = label; MergeIsClean = false; MergeIsConflict = false;
return; return;
} }
var dto = await _worker.PreviewMergeAsync(Task.Id, SelectedMergeTarget ?? ""); var capturedTaskId = Task.Id;
var capturedTarget = SelectedMergeTarget;
var dto = await _worker.PreviewMergeAsync(capturedTaskId, capturedTarget ?? "");
// Discard a probe that resolved after the user switched task or target.
if (Task?.Id != capturedTaskId || SelectedMergeTarget != capturedTarget) return;
var (text, clean, conflict) = MergePreviewPresenter.Describe(dto); var (text, clean, conflict) = MergePreviewPresenter.Describe(dto);
MergePreviewText = text; MergeIsClean = clean; MergeIsConflict = conflict; MergePreviewText = text; MergeIsClean = clean; MergeIsConflict = conflict;
} }