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

2026-06-05 11:00:37 +02:00
parent 8cafad370e
commit 72687e9b30
3 changed files with 29 additions and 1 deletions
--- a/src/ClaudeDo.Ui/Views/MainWindow.axaml.cs
+++ b/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);
+            };
        }
    }