Merge branch 'claudedo/75514ee68371402b814638290af47cca'

src/ClaudeDo.Ui/Services/Interfaces/IWorkerClient.cs

@@ -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);

src/ClaudeDo.Ui/Services/WorkerClient.cs

@@ -66,7 +66,7 @@ public partial class WorkerClient : ObservableObject, IAsyncDisposable, IWorkerC
 
     public event Action<string, string>? PlanningMergeStartedEvent;
     public event Action<string, string>? PlanningSubtaskMergedEvent;
-    public event Action<string, string, IReadOnlyList<string>>? PlanningMergeConflictEvent;
+    public event Action<string, string, IReadOnlyList<string>, bool>? PlanningMergeConflictEvent;
     public event Action<string>? PlanningMergeAbortedEvent;
     public event Action<string>? PlanningCompletedEvent;
 
@@ -182,9 +182,9 @@ public partial class WorkerClient : ObservableObject, IAsyncDisposable, IWorkerC
             Dispatcher.UIThread.Post(() => PlanningSubtaskMergedEvent?.Invoke(planningTaskId, subtaskId));
         });
 
-        _hub.On<string, string, IReadOnlyList<string>>("PlanningMergeConflict", (planningTaskId, subtaskId, conflictedFiles) =>
+        _hub.On<string, string, IReadOnlyList<string>, bool>("PlanningMergeConflict", (planningTaskId, subtaskId, conflictedFiles, externallyDriven) =>
         {
-            Dispatcher.UIThread.Post(() => PlanningMergeConflictEvent?.Invoke(planningTaskId, subtaskId, conflictedFiles));
+            Dispatcher.UIThread.Post(() => PlanningMergeConflictEvent?.Invoke(planningTaskId, subtaskId, conflictedFiles, externallyDriven));
         });
 
         _hub.On<string>("PlanningMergeAborted", planningTaskId =>
@@ -581,6 +581,10 @@ public partial class WorkerClient : ObservableObject, IAsyncDisposable, IWorkerC
         await _hub.InvokeAsync("AbortPlanningMerge", planningTaskId);
     }
 
+    public async Task<IReadOnlyList<PlanningMergeConflictStateDto>> GetActiveExternalPlanningMergeConflictsAsync()
+        => await TryInvokeAsync<List<PlanningMergeConflictStateDto>>("GetActiveExternalPlanningMergeConflicts")
+           ?? [];
+
     public async Task QueuePlanningSubtasksAsync(string parentTaskId, CancellationToken ct = default)
     {
         await _hub.InvokeAsync("QueuePlanningSubtasksAsync", parentTaskId, ct);
@@ -695,6 +699,7 @@ public sealed record LaunchSpec(
     IReadOnlyDictionary<string, string> Env);
 
 public sealed record ForceRemoveResultDto(bool Removed, string? Reason);
+public sealed record PlanningMergeConflictStateDto(string PlanningTaskId, string SubtaskId);
 public sealed record PendingQuestionDto(string TaskId, string QuestionId, string Question);
 public sealed record WorkerBuildInfoDto(string? BuildSha);