Merge branch 'claudedo/75514ee68371402b814638290af47cca'

This commit is contained in:
mika kuns
2026-08-06 12:11:38 +02:00
15 changed files with 379 additions and 14 deletions
@@ -35,7 +35,10 @@ public interface IWorkerClient : INotifyPropertyChanged
event Action<string, string>? PlanningMergeStartedEvent;
event Action<string, string>? PlanningSubtaskMergedEvent;
event Action<string, string, IReadOnlyList<string>>? PlanningMergeConflictEvent;
/// <summary>(planningTaskId, subtaskId, conflictedFiles, externallyDriven). externallyDriven
/// is true when an MCP session (not the UI) started the unit merge — the resolver must not
/// auto-open in that case.</summary>
event Action<string, string, IReadOnlyList<string>, bool>? PlanningMergeConflictEvent;
event Action<string>? PlanningMergeAbortedEvent;
event Action<string>? PlanningCompletedEvent;
@@ -117,6 +120,9 @@ public interface IWorkerClient : INotifyPropertyChanged
Task<CombinedDiffResultDto?> BuildPlanningIntegrationBranchAsync(string planningTaskId, string targetBranch);
Task ContinuePlanningMergeAsync(string planningTaskId);
Task AbortPlanningMergeAsync(string planningTaskId);
/// <summary>Unit merges currently paused on a conflict that an MCP session started. Called
/// on (re)connect to recover the "don't auto-open" banner state after a UI restart.</summary>
Task<IReadOnlyList<PlanningMergeConflictStateDto>> GetActiveExternalPlanningMergeConflictsAsync();
Task QueuePlanningSubtasksAsync(string parentTaskId, CancellationToken ct = default);
Task<string?> GetWeekReportAsync(DateOnly start, DateOnly end);
Task<string> GenerateWeekReportAsync(DateOnly start, DateOnly end);