refactor(merge): drop dead hunks conflict API

GetConflictsAsync/GetMergeConflicts (+ MergeConflicts/ConflictFileContent/ConflictFileDto/ConflictHunkDto DTOs and the now-orphaned GitService.ShowStageAsync) were superseded by the segment-based GetMergeConflictDocuments path and had no production callers. Removes the IWorkerClient member, both test fakes, the lingering test, and updates the Worker/Ui/Data CLAUDE.md surface notes.

src/ClaudeDo.Worker/CLAUDE.md

@@ -150,7 +150,7 @@ Each CLI invocation is recorded in the `task_runs` table via `TaskRunRepository`
 
 - Execution: `Ping`, `GetActive`, `RunNow`, `CancelTask`, `WakeQueue`, `ContinueTask`, `ResetTask`, `SetTaskStatus`, `RefineTask`
 - Review/merge: `ApproveReview(taskId, targetBranch) -> MergeResultDto` (childless task: merges its worktree then Done, conflict stays WaitingForReview; task with children: drives `PlanningMergeOrchestrator` to merge the whole unit), `ContinuePlanningMerge` / `AbortPlanningMerge` (resolve a unit-merge conflict), `PreviewMerge(taskId, targetBranch) -> MergePreviewDto` (non-destructive mergeability check), `RejectReviewToQueue`, `RejectReviewToIdle`, `CancelReview`, `MergeTask`, `GetMergeTargets`
-- Single-task conflict resolver (Layer C): `StartConflictMerge`, `GetMergeConflicts` (hunks), `WriteConflictResolution`, `ContinueConflictMerge`, `AbortConflictMerge` (service-level `TaskMergeService.ContinueMergeAsync`/`AbortMergeAsync` keep their names)
+- Single-task conflict resolver (Layer C): `StartConflictMerge`, `GetMergeConflictDocuments` (segments), `WriteConflictResolution`, `ContinueConflictMerge`, `AbortConflictMerge` (service-level `TaskMergeService.ContinueMergeAsync`/`AbortMergeAsync` keep their names)
 - Planning sessions: `StartPlanningSession`, `ResumePlanningSession`, `DiscardPlanningSession`, `FinalizePlanningSession`, `QueuePlanningSubtasks`, `GetPendingDraftCount`, `OpenInteractiveTerminal`, `GetPlanningAggregate` (per-subtask diffs), `BuildPlanningIntegrationBranch` (combined diff)
 - Worktrees: `CleanupFinishedWorktrees`, `ResetAllWorktrees`, `GetWorktreesOverview`, `SetWorktreeState`, `ForceRemoveWorktree`
 - Agents/settings/lists: `GetAgents`, `RefreshAgents`, `RestoreDefaultAgents`, `GetAppSettings`, `UpdateAppSettings`, `UpdateList`, `UpdateListConfig`, `GetListConfig`, `UpdateTaskAgentSettings`

src/ClaudeDo.Worker/Hub/WorkerHub.cs

@@ -58,9 +58,6 @@ public record ForceRemoveResultDto(bool Removed, string? Reason);
 public record MergeResultDto(string Status, IReadOnlyList<string> ConflictFiles, string? ErrorMessage);
 public record MergePreviewDto(string Status, IReadOnlyList<string> ConflictFiles, int ChangedFileCount);
 public record MergeTargetsDto(string DefaultBranch, IReadOnlyList<string> LocalBranches);
-public record MergeConflictsDto(string TaskId, IReadOnlyList<ConflictFileDto> Files);
-public record ConflictFileDto(string Path, IReadOnlyList<ConflictHunkDto> Hunks);
-public record ConflictHunkDto(string Ours, string Theirs, string? Base);
 public record MergeConflictDocumentsDto(string TaskId, IReadOnlyList<ConflictDocumentDto> Files);
 public record ConflictDocumentDto(string Path, bool IsBinary, IReadOnlyList<MergeSegmentDto> Segments);
 public record MergeSegmentDto(bool IsConflict, string Text, string Ours, string? Base, string Theirs);
@@ -375,17 +372,6 @@ public sealed class WorkerHub : Microsoft.AspNetCore.SignalR.Hub
             return new MergeResultDto(r.Status, r.ConflictFiles, r.ErrorMessage);
         });
 
-    public Task<MergeConflictsDto> GetMergeConflicts(string taskId)
-        => HubGuard(async () =>
-        {
-            var c = await _mergeService.GetConflictsAsync(taskId, CancellationToken.None);
-            return new MergeConflictsDto(
-                c.TaskId,
-                c.Files.Select(f => new ConflictFileDto(
-                    f.Path,
-                    new[] { new ConflictHunkDto(f.Ours, f.Theirs, f.Base) })).ToList());
-        });
-
     public Task<MergeConflictDocumentsDto> GetMergeConflictDocuments(string taskId)
         => HubGuard(async () =>
         {

src/ClaudeDo.Worker/Lifecycle/TaskMergeService.cs

@@ -23,16 +23,6 @@ public sealed record MergePreviewResult(
     IReadOnlyList<string> ConflictFiles,
     int ChangedFileCount);
 
-public sealed record MergeConflicts(
-    string TaskId,
-    IReadOnlyList<ConflictFileContent> Files);
-
-public sealed record ConflictFileContent(
-    string Path,
-    string Ours,
-    string Theirs,
-    string? Base);
-
 public sealed record ConflictDocuments(
     string TaskId,
     IReadOnlyList<ConflictDocumentContent> Files);
@@ -247,24 +237,6 @@ public sealed class TaskMergeService
         return new MergeResult(StatusAborted, Array.Empty<string>(), null);
     }
 
-    public async Task<MergeConflicts> GetConflictsAsync(string taskId, CancellationToken ct)
-    {
-        var (_, list, _) = await LoadMergeContextAsync(taskId, ct);
-        if (string.IsNullOrWhiteSpace(list.WorkingDir))
-            throw new InvalidOperationException("list has no working directory");
-
-        var files = await _git.ListConflictedFilesAsync(list.WorkingDir, ct);
-        var result = new List<ConflictFileContent>(files.Count);
-        foreach (var path in files)
-        {
-            var ours   = await _git.ShowStageAsync(list.WorkingDir, 2, path, ct) ?? "";
-            var theirs = await _git.ShowStageAsync(list.WorkingDir, 3, path, ct) ?? "";
-            var @base  = await _git.ShowStageAsync(list.WorkingDir, 1, path, ct);
-            result.Add(new ConflictFileContent(path, ours, theirs, @base));
-        }
-        return new MergeConflicts(taskId, result);
-    }
-
     /// <summary>
     /// Reads each conflicted working-tree file and parses its conflict markers into line-level
     /// segments (with the diff3 merge base when present). Binary files are flagged and skipped.