From 3596053512f8bc691fa0b4b4d0f13e5459746e5f Mon Sep 17 00:00:00 2001
From: mika kuns <mika.kuns@fb-tuning.de>
Date: Fri, 5 Jun 2026 10:32:02 +0200
Subject: [PATCH] feat(ui): fuse git tab into one approve+merge cockpit

---
 .../Views/Islands/Detail/WorkConsole.axaml    | 100 +++++++++---------
 1 file changed, 49 insertions(+), 51 deletions(-)

diff --git a/src/ClaudeDo.Ui/Views/Islands/Detail/WorkConsole.axaml b/src/ClaudeDo.Ui/Views/Islands/Detail/WorkConsole.axaml
index 383c122..e6e11de 100644
--- a/src/ClaudeDo.Ui/Views/Islands/Detail/WorkConsole.axaml
+++ b/src/ClaudeDo.Ui/Views/Islands/Detail/WorkConsole.axaml
@@ -251,64 +251,62 @@
 
         </DockPanel>
 
-        <!-- Git: merge target, approve, diff, worktree -->
+        <!-- Git: one Approve + merge cockpit -->
         <ScrollViewer IsVisible="{Binding IsGitTab}" Padding="14,10">
-          <StackPanel Spacing="14">
+          <StackPanel Spacing="12" IsVisible="{Binding ShowMergeSection}">
+            <TextBlock Classes="section-label" Text="MERGE" />
 
-            <!-- Approve (review-gated) -->
-            <StackPanel Spacing="8" IsVisible="{Binding IsWaitingForReview}">
-              <TextBlock Classes="section-label" Text="REVIEW" />
-              <Button Classes="btn accent" Content="Approve"
-                      Command="{Binding ApproveReviewCommand}" />
+            <StackPanel Spacing="4">
+              <TextBlock Classes="field-label" Text="Target branch" />
+              <ComboBox ItemsSource="{Binding MergeTargetBranches}"
+                        SelectedItem="{Binding SelectedMergeTarget, Mode=TwoWay}"
+                        HorizontalAlignment="Stretch" />
             </StackPanel>
 
-            <!-- Merge & worktree management (moved from Session tab) -->
-            <StackPanel Spacing="10" IsVisible="{Binding ShowMergeSection}">
-              <TextBlock Classes="section-label" Text="MERGE &amp; WORKTREE" />
-              <StackPanel Spacing="4">
-                <TextBlock Classes="field-label" Text="Merge target" />
-                <ComboBox ItemsSource="{Binding MergeTargetBranches}"
-                          SelectedItem="{Binding SelectedMergeTarget, Mode=TwoWay}"
-                          HorizontalAlignment="Stretch" />
-              </StackPanel>
-              <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">
-                    <TextBlock Text="Worktree" />
-                    <PathIcon Data="{StaticResource Icon.ArrowOut}" Width="11" Height="11" />
-                  </StackPanel>
-                </Button>
-                <Button Classes="btn" Content="Review Combined Diff" Margin="0,0,8,8"
-                        Command="{Binding ReviewCombinedDiffCommand}" />
-                <Button Classes="btn accent" Content="Merge All Subtasks" Margin="0,0,0,8"
-                        Command="{Binding MergeAllCommand}"
-                        IsEnabled="{Binding CanMergeAll}"
-                        ToolTip.Tip="{Binding MergeAllDisabledReason}" />
-              </WrapPanel>
-              <TextBlock Text="{Binding MergeAllError}"
+            <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}"
-                         TextWrapping="Wrap"
-                         IsVisible="{Binding MergeAllError,
-                             Converter={x:Static ObjectConverters.IsNotNull}}" />
+                         IsVisible="{Binding MergeIsConflict}" />
+              <TextBlock Classes="meta" Text="{Binding MergePreviewText}" TextWrapping="Wrap"
+                         Foreground="{DynamicResource TextMuteBrush}"
+                         IsVisible="{Binding ShowMergePreviewMuted}" />
             </StackPanel>
 
+            <!-- Primary action: Approve flows straight into the merge.
+                 Approve is the review-gated path; the plain Merge button covers
+                 already-reviewed / kept worktrees. -->
+            <WrapPanel Orientation="Horizontal">
+              <Button Classes="btn accent" Content="Approve &amp; Merge" Margin="0,0,8,8"
+                      Command="{Binding ApproveReviewCommand}"
+                      IsVisible="{Binding IsWaitingForReview}" />
+              <Button Classes="btn accent" Content="Merge" Margin="0,0,8,8"
+                      Command="{Binding MergeCommand}"
+                      IsVisible="{Binding ShowSingleMerge}" />
+              <Button Classes="btn" Content="Open Diff" Margin="0,0,8,8"
+                      Command="{Binding OpenDiffCommand}" />
+              <Button Classes="btn" Margin="0,0,8,8"
+                      Command="{Binding OpenWorktreeCommand}">
+                <StackPanel Orientation="Horizontal" Spacing="5">
+                  <TextBlock Text="Worktree" />
+                  <PathIcon Data="{StaticResource Icon.ArrowOut}" Width="11" Height="11" />
+                </StackPanel>
+              </Button>
+              <Button Classes="btn" Content="Review Combined Diff" Margin="0,0,8,8"
+                      Command="{Binding ReviewCombinedDiffCommand}" />
+              <Button Classes="btn accent" Content="Merge All Subtasks" Margin="0,0,0,8"
+                      Command="{Binding MergeAllCommand}"
+                      IsEnabled="{Binding CanMergeAll}"
+                      ToolTip.Tip="{Binding MergeAllDisabledReason}" />
+            </WrapPanel>
+
+            <TextBlock Text="{Binding MergeAllError}"
+                       Foreground="{DynamicResource BloodBrush}"
+                       TextWrapping="Wrap"
+                       IsVisible="{Binding MergeAllError,
+                           Converter={x:Static ObjectConverters.IsNotNull}}" />
           </StackPanel>
         </ScrollViewer>