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

feat(ui): add conflict-resolution worker contract (foundation for merge rework)

Browse Source
This commit is contained in:
mika kuns
2026-06-05 10:20:42 +02:00
parent dd3b03b9e4
commit 2dfc4559b1
4 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ClaudeDo.Ui/Services/Interfaces/IWorkerClient.cs
View File

@@ -43,6 +43,13 @@ public interface IWorkerClient : INotifyPropertyChanged
Task RejectReviewToQueueAsync(string taskId, string feedback);
Task RejectReviewToIdleAsync(string taskId);
Task CancelReviewAsync(string taskId);
// ── Conflict resolution (worker hub side implemented by Layer C) ──
Task<MergeResultDto> StartConflictMergeAsync(string taskId, string targetBranch);
Task<MergeConflictsDto> GetMergeConflictsAsync(string taskId);
Task WriteConflictResolutionAsync(string taskId, string path, string resolvedContent);
Task<MergeResultDto> ContinueMergeAsync(string taskId);
Task AbortMergeAsync(string taskId);
Task StartPlanningSessionAsync(string taskId, CancellationToken ct = default);
Task OpenInteractiveTerminalAsync(string taskId, CancellationToken ct = default);
Task ResumePlanningSessionAsync(string taskId, CancellationToken ct = default);