feat(ui): expose conflict-resolver factory and dialog seam for integrator

src/ClaudeDo.App/Program.cs

@@ -132,6 +132,9 @@ sealed class Program
         sc.AddTransient<Func<RepoImportModalViewModel>>(sp => () => sp.GetRequiredService<RepoImportModalViewModel>());
         sc.AddTransient<WeeklyReportModalViewModel>();
         sc.AddTransient<Func<WeeklyReportModalViewModel>>(sp => () => sp.GetRequiredService<WeeklyReportModalViewModel>());
+        sc.AddSingleton<Func<string, ClaudeDo.Ui.ViewModels.Conflicts.ConflictResolverViewModel>>(sp =>
+            taskId => new ClaudeDo.Ui.ViewModels.Conflicts.ConflictResolverViewModel(
+                sp.GetRequiredService<WorkerClient>(), taskId));
 
         // Islands shell VMs
         sc.AddSingleton<ListsIslandViewModel>(sp =>
@@ -149,7 +152,13 @@ sealed class Program
                 sp.GetRequiredService<WorkerClient>(),
                 sp,
                 sp.GetRequiredService<INotesApi>()));
-        sc.AddSingleton<IslandsShellViewModel>();
+        sc.AddSingleton<IslandsShellViewModel>(sp =>
+        {
+            var shell = ActivatorUtilities.CreateInstance<IslandsShellViewModel>(sp);
+            shell.ConflictResolverFactory =
+                sp.GetRequiredService<Func<string, ClaudeDo.Ui.ViewModels.Conflicts.ConflictResolverViewModel>>();
+            return shell;
+        });
 
         return sc.BuildServiceProvider();
     }

src/ClaudeDo.Ui/ViewModels/IslandsShellViewModel.cs

@@ -44,6 +44,20 @@ public sealed partial class IslandsShellViewModel : ViewModelBase
     // Set by MainWindow to open the conflict resolution dialog.
     public Func<ConflictResolutionViewModel, Task>? ShowConflictDialog { get; set; }
 
+    // Layer C seam: composition root sets the factory; MainWindow sets the dialog opener.
+    // The integrator connects Layer A/B's RequestConflictResolution(taskId, target) to this method.
+    public Func<string, ClaudeDo.Ui.ViewModels.Conflicts.ConflictResolverViewModel>? ConflictResolverFactory { get; set; }
+    public Func<ClaudeDo.Ui.ViewModels.Conflicts.ConflictResolverViewModel, Task>? ShowConflictResolver { get; set; }
+
+    public async Task RequestConflictResolutionAsync(string taskId, string targetBranch)
+    {
+        if (ConflictResolverFactory is null || ShowConflictResolver is null) return;
+        var vm = ConflictResolverFactory(taskId);
+        var hasConflicts = await vm.OpenAsync(targetBranch);
+        if (hasConflicts)
+            await ShowConflictResolver(vm);
+    }
+
     // Set by MainWindow to open the About dialog.
     public Func<AboutModalViewModel, Task>? ShowAboutModal { get; set; }
 

src/ClaudeDo.Ui/Views/MainWindow.axaml.cs

@@ -95,6 +95,11 @@ public partial class MainWindow : Window
                 connVm.CloseAction = () => dlg.Close();
                 await dlg.ShowDialog(this);
             };
+            vm.ShowConflictResolver = async (resolverVm) =>
+            {
+                var dlg = new ClaudeDo.Ui.Views.Conflicts.ConflictResolverView { DataContext = resolverVm };
+                await dlg.ShowDialog(this);
+            };
         }
     }