refactor(ui): redesign list settings and merge modals with custom chrome

Both modals now use SystemDecorations=None with a draggable title bar,
sectioned layout matching the rest of the island shell, Escape-to-cancel,
and themed brushes instead of hard-coded colours. ListSettings adds a
Browse... button that reads agent frontmatter from arbitrary .md files.

src/ClaudeDo.Ui/Views/Modals/ListSettingsModalView.axaml

@@ -4,77 +4,177 @@
         x:Class="ClaudeDo.Ui.Views.Modals.ListSettingsModalView"
         x:DataType="vm:ListSettingsModalViewModel"
         Title="List settings"
-        Width="520" Height="600"
+        Width="520" Height="720"
+        CanResize="True"
+        MinWidth="460" MinHeight="520"
+        SystemDecorations="None"
+        ExtendClientAreaToDecorationsHint="True"
         WindowStartupLocation="CenterOwner"
-        CanResize="False">
-    <DockPanel Margin="16">
-        <StackPanel DockPanel.Dock="Bottom" Orientation="Horizontal" HorizontalAlignment="Right" Spacing="8" Margin="0,16,0,0">
-            <Button Content="Cancel" Command="{Binding CancelCommand}" />
-            <Button Content="Save" Command="{Binding SaveCommand}" Classes="accent" />
-        </StackPanel>
+        Background="{DynamicResource SurfaceBrush}">
 
-        <ScrollViewer>
-            <StackPanel Spacing="16">
-                <TextBlock Text="General" FontSize="16" FontWeight="SemiBold" />
+  <Window.KeyBindings>
+    <KeyBinding Gesture="Escape" Command="{Binding CancelCommand}"/>
+  </Window.KeyBindings>
 
+  <Window.Styles>
+    <Style Selector="TextBlock.section-label">
+      <Setter Property="FontFamily" Value="{DynamicResource MonoFont}"/>
+      <Setter Property="FontSize" Value="10"/>
+      <Setter Property="LetterSpacing" Value="1.4"/>
+      <Setter Property="Foreground" Value="{DynamicResource TextFaintBrush}"/>
+      <Setter Property="Margin" Value="4,0,0,6"/>
+    </Style>
+    <Style Selector="TextBlock.field-label">
+      <Setter Property="FontSize" Value="11"/>
+      <Setter Property="Foreground" Value="{DynamicResource TextDimBrush}"/>
+      <Setter Property="Margin" Value="0,0,0,4"/>
+    </Style>
+    <Style Selector="Border.section">
+      <Setter Property="BorderBrush" Value="{DynamicResource LineBrush}"/>
+      <Setter Property="BorderThickness" Value="1"/>
+      <Setter Property="CornerRadius" Value="6"/>
+      <Setter Property="Padding" Value="14"/>
+      <Setter Property="Background" Value="{DynamicResource DeepBrush}"/>
+    </Style>
+    <Style Selector="Button.primary">
+      <Setter Property="Background" Value="{DynamicResource AccentBrush}"/>
+      <Setter Property="Foreground" Value="{DynamicResource DeepBrush}"/>
+      <Setter Property="FontWeight" Value="SemiBold"/>
+    </Style>
+  </Window.Styles>
+
+  <Border Background="{DynamicResource SurfaceBrush}"
+          BorderBrush="{DynamicResource LineBrush}"
+          BorderThickness="1">
+    <Grid RowDefinitions="36,*,52">
+
+      <!-- Title bar -->
+      <Border Grid.Row="0"
+              x:Name="TitleBar"
+              Background="{DynamicResource DeepBrush}"
+              BorderBrush="{DynamicResource LineBrush}"
+              BorderThickness="0,0,0,1"
+              PointerPressed="TitleBar_PointerPressed">
+        <Grid ColumnDefinitions="*,Auto" Margin="14,0">
+          <TextBlock Text="LIST SETTINGS"
+                     FontFamily="{DynamicResource MonoFont}"
+                     FontSize="11"
+                     LetterSpacing="1.4"
+                     Foreground="{DynamicResource TextBrush}"
+                     VerticalAlignment="Center"/>
+          <Button Grid.Column="1"
+                  Classes="icon-btn"
+                  Content="✕"
+                  FontSize="12"
+                  Command="{Binding CancelCommand}"
+                  VerticalAlignment="Center"/>
+        </Grid>
+      </Border>
+
+      <!-- Body -->
+      <ScrollViewer Grid.Row="1" Padding="20,16">
+        <StackPanel Spacing="18">
+
+          <!-- GENERAL -->
+          <StackPanel Spacing="0">
+            <TextBlock Classes="section-label" Text="GENERAL"/>
+            <Border Classes="section">
+              <StackPanel Spacing="12">
                 <StackPanel Spacing="4">
-                    <TextBlock Text="Name" />
-                    <TextBox Text="{Binding Name}" />
+                  <TextBlock Classes="field-label" Text="Name"/>
+                  <TextBox Text="{Binding Name}" />
                 </StackPanel>
 
                 <StackPanel Spacing="4">
-                    <TextBlock Text="Working directory" />
-                    <Grid ColumnDefinitions="*,Auto">
-                        <TextBox Grid.Column="0" Text="{Binding WorkingDir}" PlaceholderText="(none)" />
-                        <Button Grid.Column="1" Content="Browse..." Margin="8,0,0,0" Click="BrowseClicked" />
-                    </Grid>
+                  <TextBlock Classes="field-label" Text="Working directory"/>
+                  <Grid ColumnDefinitions="*,Auto">
+                    <TextBox Grid.Column="0" Text="{Binding WorkingDir}" Watermark="(none)" />
+                    <Button Grid.Column="1" Content="Browse..." Margin="8,0,0,0" Click="BrowseClicked" />
+                  </Grid>
                 </StackPanel>
 
                 <StackPanel Spacing="4">
-                    <TextBlock Text="Default commit type" />
-                    <ComboBox ItemsSource="{Binding CommitTypeOptions}"
-                              SelectedItem="{Binding DefaultCommitType, Mode=TwoWay}"
-                              HorizontalAlignment="Left" MinWidth="160" />
+                  <TextBlock Classes="field-label" Text="Default commit type"/>
+                  <ComboBox ItemsSource="{Binding CommitTypeOptions}"
+                            SelectedItem="{Binding DefaultCommitType, Mode=TwoWay}"
+                            HorizontalAlignment="Left" MinWidth="160" />
                 </StackPanel>
+              </StackPanel>
+            </Border>
+          </StackPanel>
 
-                <Separator Margin="0,8,0,8" />
-
-                <Grid ColumnDefinitions="*,Auto">
-                    <TextBlock Grid.Column="0" Text="Agent" FontSize="16" FontWeight="SemiBold" />
-                    <Button Grid.Column="1" Content="Reset agent settings"
-                            Command="{Binding ResetAgentSettingsCommand}" />
-                </Grid>
-
+          <!-- AGENT -->
+          <StackPanel Spacing="0">
+            <Grid ColumnDefinitions="*,Auto" Margin="4,0,0,6">
+              <TextBlock Classes="section-label" Text="AGENT" Margin="0"/>
+              <Button Grid.Column="1" Content="Reset agent settings"
+                      Command="{Binding ResetAgentSettingsCommand}" />
+            </Grid>
+            <Border Classes="section">
+              <StackPanel Spacing="12">
                 <StackPanel Spacing="4">
-                    <TextBlock Text="Model" />
-                    <ComboBox ItemsSource="{Binding ModelOptions}"
-                              SelectedItem="{Binding SelectedModel, Mode=TwoWay}"
-                              HorizontalAlignment="Left" MinWidth="160" />
+                  <TextBlock Classes="field-label" Text="Model"/>
+                  <ComboBox ItemsSource="{Binding ModelOptions}"
+                            SelectedItem="{Binding SelectedModel, Mode=TwoWay}"
+                            HorizontalAlignment="Left" MinWidth="160" />
                 </StackPanel>
 
                 <StackPanel Spacing="4">
-                    <TextBlock Text="System prompt (appended)" />
-                    <TextBox Text="{Binding SystemPrompt, Mode=TwoWay}"
-                             AcceptsReturn="True" TextWrapping="Wrap"
-                             MinHeight="80" />
+                  <TextBlock Classes="field-label" Text="System prompt (appended)"/>
+                  <TextBox Text="{Binding SystemPrompt, Mode=TwoWay}"
+                           AcceptsReturn="True" TextWrapping="Wrap"
+                           MinHeight="80" />
                 </StackPanel>
 
                 <StackPanel Spacing="4">
-                    <TextBlock Text="Agent file" />
-                    <ComboBox ItemsSource="{Binding Agents}"
+                  <TextBlock Classes="field-label" Text="Agent file"/>
+                  <Grid ColumnDefinitions="*,Auto">
+                    <ComboBox Grid.Column="0"
+                              ItemsSource="{Binding Agents}"
                               SelectedItem="{Binding SelectedAgent, Mode=TwoWay}"
-                              HorizontalAlignment="Left" MinWidth="240">
-                        <ComboBox.ItemTemplate>
-                            <DataTemplate>
-                                <StackPanel>
-                                    <TextBlock Text="{Binding Name}" />
-                                    <TextBlock Text="{Binding Description}" Opacity="0.6" FontSize="11" />
-                                </StackPanel>
-                            </DataTemplate>
-                        </ComboBox.ItemTemplate>
+                              HorizontalAlignment="Stretch">
+                      <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                          <StackPanel>
+                            <TextBlock Text="{Binding Name}"
+                                       Foreground="{DynamicResource TextBrush}"/>
+                            <TextBlock Text="{Binding Description}"
+                                       Foreground="{DynamicResource TextMuteBrush}"
+                                       FontSize="11" />
+                          </StackPanel>
+                        </DataTemplate>
+                      </ComboBox.ItemTemplate>
                     </ComboBox>
+                    <Button Grid.Column="1" Content="Browse..."
+                            Margin="8,0,0,0" Click="BrowseAgentClicked" />
+                  </Grid>
+                  <TextBlock Text="{Binding SelectedAgent.Path}"
+                             FontFamily="{DynamicResource MonoFont}"
+                             FontSize="11"
+                             Foreground="{DynamicResource TextFaintBrush}"
+                             TextTrimming="PrefixCharacterEllipsis"
+                             IsVisible="{Binding SelectedAgent.Path, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>
                 </StackPanel>
-            </StackPanel>
-        </ScrollViewer>
-    </DockPanel>
+              </StackPanel>
+            </Border>
+          </StackPanel>
+
+        </StackPanel>
+      </ScrollViewer>
+
+      <!-- Footer -->
+      <Border Grid.Row="2"
+              Background="{DynamicResource DeepBrush}"
+              BorderBrush="{DynamicResource LineBrush}"
+              BorderThickness="0,1,0,0">
+        <StackPanel Orientation="Horizontal" Spacing="8"
+                    HorizontalAlignment="Right" VerticalAlignment="Center"
+                    Margin="16,0">
+          <Button Content="Cancel" Command="{Binding CancelCommand}" MinWidth="90"/>
+          <Button Content="Save" Classes="primary" Command="{Binding SaveCommand}" MinWidth="90"/>
+        </StackPanel>
+      </Border>
+
+    </Grid>
+  </Border>
 </Window>

src/ClaudeDo.Ui/Views/Modals/ListSettingsModalView.axaml.cs

@@ -1,6 +1,8 @@
 using Avalonia.Controls;
+using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Platform.Storage;
+using ClaudeDo.Data.Models;
 using ClaudeDo.Ui.ViewModels.Modals;
 
 namespace ClaudeDo.Ui.Views.Modals;
@@ -12,6 +14,63 @@ public partial class ListSettingsModalView : Window
         InitializeComponent();
     }
 
+    private void TitleBar_PointerPressed(object? sender, PointerPressedEventArgs e)
+    {
+        if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
+            BeginMoveDrag(e);
+    }
+
+    private async void BrowseAgentClicked(object? sender, RoutedEventArgs e)
+    {
+        if (DataContext is not ListSettingsModalViewModel vm) return;
+        var top = TopLevel.GetTopLevel(this);
+        if (top is null) return;
+
+        var files = await top.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
+        {
+            Title = "Choose agent file",
+            AllowMultiple = false,
+            FileTypeFilter = new[]
+            {
+                new FilePickerFileType("Agent files (*.md)") { Patterns = new[] { "*.md" } },
+                new FilePickerFileType("All files") { Patterns = new[] { "*" } },
+            },
+        });
+        if (files.Count == 0) return;
+
+        var path = files[0].Path.LocalPath;
+        var existing = vm.Agents.FirstOrDefault(a => string.Equals(a.Path, path, StringComparison.OrdinalIgnoreCase));
+        if (existing is not null)
+        {
+            vm.SelectedAgent = existing;
+            return;
+        }
+
+        var (name, description) = ReadFrontmatter(path);
+        var agent = new AgentInfo(name, description, path);
+        vm.Agents.Add(agent);
+        vm.SelectedAgent = agent;
+    }
+
+    private static (string name, string description) ReadFrontmatter(string filePath)
+    {
+        var fallback = System.IO.Path.GetFileNameWithoutExtension(filePath);
+        try
+        {
+            using var reader = new System.IO.StreamReader(filePath);
+            if (reader.ReadLine()?.Trim() != "---") return (fallback, "");
+            string name = fallback, description = "";
+            while (reader.ReadLine() is { } line)
+            {
+                if (line.Trim() == "---") break;
+                if (line.StartsWith("name:")) name = line["name:".Length..].Trim();
+                else if (line.StartsWith("description:")) description = line["description:".Length..].Trim();
+            }
+            return (name, description);
+        }
+        catch { return (fallback, ""); }
+    }
+
     private async void BrowseClicked(object? sender, RoutedEventArgs e)
     {
         if (DataContext is not ListSettingsModalViewModel vm) return;

src/ClaudeDo.Ui/Views/Modals/MergeModalView.axaml

@@ -4,77 +4,135 @@
         x:Class="ClaudeDo.Ui.Views.Modals.MergeModalView"
         x:DataType="vm:MergeModalViewModel"
         Title="Merge worktree"
-        Width="560" Height="420"
+        Width="560" Height="460"
         CanResize="False"
-        WindowStartupLocation="CenterOwner">
-  <Grid Margin="20" RowDefinitions="Auto,Auto,Auto,Auto,Auto,*,Auto">
+        SystemDecorations="None"
+        ExtendClientAreaToDecorationsHint="True"
+        WindowStartupLocation="CenterOwner"
+        Background="{DynamicResource SurfaceBrush}">
 
-    <TextBlock Grid.Row="0"
-               Text="{Binding TaskTitle, StringFormat='Merging: {0}'}"
-               FontWeight="SemiBold" Margin="0,0,0,12" />
+  <Window.KeyBindings>
+    <KeyBinding Gesture="Escape" Command="{Binding CancelCommand}"/>
+  </Window.KeyBindings>
 
-    <StackPanel Grid.Row="1" Orientation="Vertical" Margin="0,0,0,8">
-      <TextBlock Text="Target branch" Margin="0,0,0,4" />
-      <ComboBox ItemsSource="{Binding Branches}"
-                SelectedItem="{Binding SelectedBranch}"
-                HorizontalAlignment="Stretch"
-                IsEnabled="{Binding !IsBusy}" />
-    </StackPanel>
+  <Window.Styles>
+    <Style Selector="TextBlock.field-label">
+      <Setter Property="FontSize" Value="11"/>
+      <Setter Property="Foreground" Value="{DynamicResource TextDimBrush}"/>
+      <Setter Property="Margin" Value="0,0,0,4"/>
+    </Style>
+    <Style Selector="Button.primary">
+      <Setter Property="Background" Value="{DynamicResource AccentBrush}"/>
+      <Setter Property="Foreground" Value="{DynamicResource DeepBrush}"/>
+      <Setter Property="FontWeight" Value="SemiBold"/>
+    </Style>
+  </Window.Styles>
 
-    <CheckBox Grid.Row="2"
-              Content="Remove worktree after merge"
-              IsChecked="{Binding RemoveWorktree}"
-              IsEnabled="{Binding !IsBusy}"
-              Margin="0,0,0,8" />
+  <Border Background="{DynamicResource SurfaceBrush}"
+          BorderBrush="{DynamicResource LineBrush}"
+          BorderThickness="1">
+    <Grid RowDefinitions="36,*,52">
 
-    <StackPanel Grid.Row="3" Orientation="Vertical" Margin="0,0,0,8">
-      <TextBlock Text="Commit message" Margin="0,0,0,4" />
-      <TextBox Text="{Binding CommitMessage}"
-               AcceptsReturn="True"
-               TextWrapping="Wrap"
-               Height="70"
-               IsEnabled="{Binding !IsBusy}" />
-    </StackPanel>
+      <!-- Title bar -->
+      <Border Grid.Row="0"
+              x:Name="TitleBar"
+              Background="{DynamicResource DeepBrush}"
+              BorderBrush="{DynamicResource LineBrush}"
+              BorderThickness="0,0,0,1"
+              PointerPressed="TitleBar_PointerPressed">
+        <Grid ColumnDefinitions="*,Auto" Margin="14,0">
+          <TextBlock Text="MERGE WORKTREE"
+                     FontFamily="{DynamicResource MonoFont}"
+                     FontSize="11"
+                     LetterSpacing="1.4"
+                     Foreground="{DynamicResource TextBrush}"
+                     VerticalAlignment="Center"/>
+          <Button Grid.Column="1"
+                  Classes="icon-btn"
+                  Content="✕"
+                  FontSize="12"
+                  Command="{Binding CancelCommand}"
+                  VerticalAlignment="Center"/>
+        </Grid>
+      </Border>
 
-    <TextBlock Grid.Row="4"
-               Text="{Binding ErrorMessage}"
-               Foreground="IndianRed"
-               TextWrapping="Wrap"
-               IsVisible="{Binding ErrorMessage, Converter={x:Static ObjectConverters.IsNotNull}}"
-               Margin="0,0,0,8" />
+      <!-- Body -->
+      <ScrollViewer Grid.Row="1" Padding="20,16">
+        <StackPanel Spacing="12">
 
-    <Border Grid.Row="5"
-            BorderBrush="IndianRed"
-            BorderThickness="1"
-            Padding="8"
-            IsVisible="{Binding HasConflict}">
-      <StackPanel>
-        <TextBlock Text="Conflicted files:" FontWeight="SemiBold" Margin="0,0,0,4" />
-        <ItemsControl ItemsSource="{Binding ConflictFiles}">
-          <ItemsControl.ItemTemplate>
-            <DataTemplate>
-              <TextBlock Text="{Binding}" />
-            </DataTemplate>
-          </ItemsControl.ItemTemplate>
-        </ItemsControl>
-      </StackPanel>
-    </Border>
+          <TextBlock Text="{Binding TaskTitle, StringFormat='Merging: {0}'}"
+                     FontWeight="SemiBold"
+                     Foreground="{DynamicResource TextBrush}" />
 
-    <StackPanel Grid.Row="6" Orientation="Horizontal"
-                HorizontalAlignment="Right" Margin="0,12,0,0">
-      <TextBlock Text="{Binding SuccessMessage}"
-                 Foreground="SeaGreen"
-                 VerticalAlignment="Center"
-                 Margin="0,0,12,0"
-                 IsVisible="{Binding SuccessMessage, Converter={x:Static ObjectConverters.IsNotNull}}" />
-      <Button Content="Cancel"
-              Command="{Binding CancelCommand}"
-              Margin="0,0,8,0" />
-      <Button Content="Merge"
-              Command="{Binding SubmitCommand}"
-              IsDefault="True"
-              Classes="accent" />
-    </StackPanel>
+          <StackPanel Spacing="4">
+            <TextBlock Classes="field-label" Text="Target branch"/>
+            <ComboBox ItemsSource="{Binding Branches}"
+                      SelectedItem="{Binding SelectedBranch}"
+                      HorizontalAlignment="Stretch"
+                      IsEnabled="{Binding !IsBusy}" />
+          </StackPanel>
 
-  </Grid>
+          <CheckBox Content="Remove worktree after merge"
+                    IsChecked="{Binding RemoveWorktree}"
+                    IsEnabled="{Binding !IsBusy}" />
+
+          <StackPanel Spacing="4">
+            <TextBlock Classes="field-label" Text="Commit message"/>
+            <TextBox Text="{Binding CommitMessage}"
+                     AcceptsReturn="True"
+                     TextWrapping="Wrap"
+                     Height="70"
+                     IsEnabled="{Binding !IsBusy}" />
+          </StackPanel>
+
+          <TextBlock Text="{Binding ErrorMessage}"
+                     Foreground="{DynamicResource BloodBrush}"
+                     TextWrapping="Wrap"
+                     IsVisible="{Binding ErrorMessage, Converter={x:Static ObjectConverters.IsNotNull}}" />
+
+          <Border BorderBrush="{DynamicResource BloodBrush}"
+                  BorderThickness="1"
+                  CornerRadius="6"
+                  Padding="12,10"
+                  IsVisible="{Binding HasConflict}">
+            <StackPanel Spacing="4">
+              <TextBlock Text="Conflicted files:"
+                         FontWeight="SemiBold"
+                         Foreground="{DynamicResource TextBrush}" />
+              <ItemsControl ItemsSource="{Binding ConflictFiles}">
+                <ItemsControl.ItemTemplate>
+                  <DataTemplate>
+                    <TextBlock Text="{Binding}"
+                               FontFamily="{DynamicResource MonoFont}"
+                               FontSize="11"
+                               Foreground="{DynamicResource TextDimBrush}" />
+                  </DataTemplate>
+                </ItemsControl.ItemTemplate>
+              </ItemsControl>
+            </StackPanel>
+          </Border>
+
+          <TextBlock Text="{Binding SuccessMessage}"
+                     Foreground="{DynamicResource MossBrightBrush}"
+                     IsVisible="{Binding SuccessMessage, Converter={x:Static ObjectConverters.IsNotNull}}" />
+        </StackPanel>
+      </ScrollViewer>
+
+      <!-- Footer -->
+      <Border Grid.Row="2"
+              Background="{DynamicResource DeepBrush}"
+              BorderBrush="{DynamicResource LineBrush}"
+              BorderThickness="0,1,0,0">
+        <StackPanel Orientation="Horizontal" Spacing="8"
+                    HorizontalAlignment="Right" VerticalAlignment="Center"
+                    Margin="16,0">
+          <Button Content="Cancel" Command="{Binding CancelCommand}" MinWidth="90"/>
+          <Button Content="Merge" Classes="primary"
+                  Command="{Binding SubmitCommand}"
+                  IsDefault="True" MinWidth="90"/>
+        </StackPanel>
+      </Border>
+
+    </Grid>
+  </Border>
 </Window>

src/ClaudeDo.Ui/Views/Modals/MergeModalView.axaml.cs

@@ -1,4 +1,5 @@
 using Avalonia.Controls;
+using Avalonia.Input;
 using ClaudeDo.Ui.ViewModels.Modals;
 
 namespace ClaudeDo.Ui.Views.Modals;
@@ -16,4 +17,10 @@ public partial class MergeModalView : Window
             }
         };
     }
+
+    private void TitleBar_PointerPressed(object? sender, PointerPressedEventArgs e)
+    {
+        if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
+            BeginMoveDrag(e);
+    }
 }