From de01579e84ed320ac268408b2b426d3838e31e84 Mon Sep 17 00:00:00 2001
From: mika kuns <mika.kuns@fb-tuning.de>
Date: Thu, 4 Jun 2026 23:36:56 +0200
Subject: [PATCH] feat(ui): add mergeability indicator and Merge button to work
 console

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 .../Views/Islands/Detail/WorkConsole.axaml        | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/ClaudeDo.Ui/Views/Islands/Detail/WorkConsole.axaml b/src/ClaudeDo.Ui/Views/Islands/Detail/WorkConsole.axaml
index bd19b7e..18f6edc 100644
--- a/src/ClaudeDo.Ui/Views/Islands/Detail/WorkConsole.axaml
+++ b/src/ClaudeDo.Ui/Views/Islands/Detail/WorkConsole.axaml
@@ -201,9 +201,24 @@
                           SelectedItem="{Binding SelectedMergeTarget, Mode=TwoWay}"
                           HorizontalAlignment="Stretch" />
               </StackPanel>
+              <!-- Mergeability at a glance: green when clean, red on conflict, muted otherwise -->
+              <StackPanel Spacing="0">
+                <TextBlock Classes="meta" Text="{Binding MergePreviewText}" TextWrapping="Wrap"
+                           Foreground="{DynamicResource MossBrush}"
+                           IsVisible="{Binding MergeIsClean}" />
+                <TextBlock Classes="meta" Text="{Binding MergePreviewText}" TextWrapping="Wrap"
+                           Foreground="{DynamicResource BloodBrush}"
+                           IsVisible="{Binding MergeIsConflict}" />
+                <TextBlock Classes="meta" Text="{Binding MergePreviewText}" TextWrapping="Wrap"
+                           Foreground="{DynamicResource TextMuteBrush}"
+                           IsVisible="{Binding ShowMergePreviewMuted}" />
+              </StackPanel>
               <WrapPanel Orientation="Horizontal">
                 <Button Classes="btn" Content="Open Diff" Margin="0,0,8,8"
                         Command="{Binding OpenDiffCommand}" />
+                <Button Classes="btn accent" Content="Merge" Margin="0,0,8,8"
+                        Command="{Binding MergeCommand}"
+                        IsVisible="{Binding ShowSingleMerge}" />
                 <Button Classes="btn" Margin="0,0,8,8"
                         Command="{Binding OpenWorktreeCommand}">
                   <StackPanel Orientation="Horizontal" Spacing="5">