Add git branch display to MCP approval dialog and AI risk assessment

- Display git branch in approval dialog UI (new row in details section)
- Include git branch in AI risk assessment prompt for better context
- Create GitHelper class to consolidate duplicate git operations
- Sync GetBranch method now wraps async GetBranchAsync to avoid code duplication

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: gfraiteur

src/PostSharp.Engineering.McpApprovalServer/Mcp/Services/CommandHistoryService.cs

@@ -1,6 +1,7 @@
 // Copyright (c) SharpCrafters s.r.o. See the LICENSE.md file in the root directory of this repository root for details.
 
 using PostSharp.Engineering.McpApprovalServer.Mcp.Models;
+using PostSharp.Engineering.McpApprovalServer.Services;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -195,7 +196,7 @@ private static void AppendToAuditTrail( CommandRecord record )
             var auditFilePath = Path.Combine( _auditDirectory, $"audit-{dateStr}.log" );
 
             // Get git branch for the working directory
-            var gitBranch = GetGitBranch( record.WorkingDirectory ) ?? "N/A";
+            var gitBranch = GitHelper.GetBranch( record.WorkingDirectory );
 
             // Format: timestamp | approved/rejected | command | purpose | working_dir | branch | exit_code
             var status = record.Approved ? "APPROVED" : "REJECTED";
@@ -217,42 +218,4 @@ private static void AppendToAuditTrail( CommandRecord record )
             System.Diagnostics.Debug.WriteLine( $"Failed to append to audit trail: {ex.Message}" );
         }
     }
-
-    private static string? GetGitBranch( string workingDirectory )
-    {
-        try
-        {
-            if ( !Directory.Exists( workingDirectory ) )
-            {
-                return null;
-            }
-
-            var startInfo = new System.Diagnostics.ProcessStartInfo
-            {
-                FileName = "git",
-                Arguments = "rev-parse --abbrev-ref HEAD",
-                WorkingDirectory = workingDirectory,
-                RedirectStandardOutput = true,
-                RedirectStandardError = true,
-                UseShellExecute = false,
-                CreateNoWindow = true
-            };
-
-            using var process = System.Diagnostics.Process.Start( startInfo );
-
-            if ( process == null )
-            {
-                return null;
-            }
-
-            var output = process.StandardOutput.ReadToEnd().Trim();
-            process.WaitForExit();
-
-            return process.ExitCode == 0 ? output : null;
-        }
-        catch
-        {
-            return null;
-        }
-    }
 }

src/PostSharp.Engineering.McpApprovalServer/Mcp/Services/RiskAnalyzer.cs

@@ -1,6 +1,7 @@
 // Copyright (c) SharpCrafters s.r.o. See the LICENSE.md file in the root directory of this repository root for details.
 
 using PostSharp.Engineering.McpApprovalServer.Mcp.Models;
+using PostSharp.Engineering.McpApprovalServer.Services;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -272,6 +273,14 @@ private static async Task<string> BuildAnalysisPromptAsync(
         sb.Append( CultureInfo.InvariantCulture, $"**Command:** `{command}`" ).AppendLine();
         sb.Append( CultureInfo.InvariantCulture, $"**Claimed purpose:** {claimedPurpose}" ).AppendLine();
         sb.Append( CultureInfo.InvariantCulture, $"**Working directory:** {workingDirectory}" ).AppendLine();
+
+        var gitBranch = await GitHelper.GetBranchAsync( workingDirectory, cancellationToken );
+
+        if ( !string.IsNullOrEmpty( gitBranch ) )
+        {
+            sb.Append( CultureInfo.InvariantCulture, $"**Git branch:** {gitBranch}" ).AppendLine();
+        }
+
         sb.AppendLine();
 
         // For git push commands, include the commit diff for analysis
@@ -348,7 +357,7 @@ private static bool IsGitPushCommand( string command )
         try
         {
             // Get the list of commits that would be pushed
-            var logOutput = await RunGitCommandAsync(
+            var logOutput = await GitHelper.RunCommandAsync(
                 workingDirectory,
                 "log --oneline @{upstream}..HEAD",
                 cancellationToken );
@@ -359,7 +368,7 @@ private static bool IsGitPushCommand( string command )
             }
 
             // Get the diff of commits to be pushed (limit to reasonable size)
-            var diffOutput = await RunGitCommandAsync(
+            var diffOutput = await GitHelper.RunCommandAsync(
                 workingDirectory,
                 "diff @{upstream}..HEAD",
                 cancellationToken );
@@ -394,32 +403,4 @@ private static bool IsGitPushCommand( string command )
         }
     }
 
-    private static async Task<string> RunGitCommandAsync(
-        string workingDirectory,
-        string arguments,
-        CancellationToken cancellationToken )
-    {
-        var startInfo = new ProcessStartInfo
-        {
-            FileName = "git",
-            Arguments = arguments,
-            WorkingDirectory = workingDirectory,
-            RedirectStandardOutput = true,
-            RedirectStandardError = true,
-            UseShellExecute = false,
-            CreateNoWindow = true
-        };
-
-        using var process = Process.Start( startInfo );
-
-        if ( process == null )
-        {
-            return string.Empty;
-        }
-
-        var output = await process.StandardOutput.ReadToEndAsync( cancellationToken );
-        await process.WaitForExitAsync( cancellationToken );
-
-        return output;
-    }
 }

src/PostSharp.Engineering.McpApprovalServer/Services/ApprovalRequest.cs

@@ -19,6 +19,8 @@ public sealed class ApprovalRequest
 
     public required string WorkingDirectory { get; init; }
 
+    public required string GitBranch { get; init; }
+
     public required RiskAssessment CombinedAssessment { get; init; }
 
     public required RiskAssessment AiAssessment { get; init; }

src/PostSharp.Engineering.McpApprovalServer/Services/ApprovalRequestQueue.cs

@@ -60,6 +60,7 @@ public Task<bool> EnqueueAsync(
             Command = command,
             ClaimedPurpose = claimedPurpose,
             WorkingDirectory = workingDirectory,
+            GitBranch = GitHelper.GetBranch( workingDirectory ),
             CombinedAssessment = combinedAssessment,
             AiAssessment = aiAssessment,
             RegexAssessment = regexAssessment,

src/PostSharp.Engineering.McpApprovalServer/Services/GitHelper.cs

@@ -0,0 +1,78 @@
+// Copyright (c) SharpCrafters s.r.o. See the LICENSE.md file in the root directory of this repository root for details.
+
+using System.Diagnostics;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace PostSharp.Engineering.McpApprovalServer.Services;
+
+/// <summary>
+/// Helper class for git operations.
+/// </summary>
+internal static class GitHelper
+{
+    /// <summary>
+    /// Gets the current git branch for a directory synchronously.
+    /// This is a synchronous wrapper around <see cref="GetBranchAsync"/>.
+    /// </summary>
+    public static string GetBranch( string workingDirectory )
+    {
+        return GetBranchAsync( workingDirectory, CancellationToken.None ).GetAwaiter().GetResult()
+            ?? "(not a git repo)";
+    }
+
+    /// <summary>
+    /// Gets the current git branch for a directory asynchronously.
+    /// </summary>
+    public static async Task<string?> GetBranchAsync( string workingDirectory, CancellationToken cancellationToken = default )
+    {
+        try
+        {
+            if ( !Directory.Exists( workingDirectory ) )
+            {
+                return "(directory not found)";
+            }
+
+            var output = await RunCommandAsync( workingDirectory, "rev-parse --abbrev-ref HEAD", cancellationToken );
+
+            return string.IsNullOrWhiteSpace( output ) ? null : output.Trim();
+        }
+        catch
+        {
+            return null;
+        }
+    }
+
+    /// <summary>
+    /// Runs a git command and returns its output.
+    /// </summary>
+    public static async Task<string> RunCommandAsync(
+        string workingDirectory,
+        string arguments,
+        CancellationToken cancellationToken = default )
+    {
+        var startInfo = new ProcessStartInfo
+        {
+            FileName = "git",
+            Arguments = arguments,
+            WorkingDirectory = workingDirectory,
+            RedirectStandardOutput = true,
+            RedirectStandardError = true,
+            UseShellExecute = false,
+            CreateNoWindow = true
+        };
+
+        using var process = Process.Start( startInfo );
+
+        if ( process == null )
+        {
+            return string.Empty;
+        }
+
+        var output = await process.StandardOutput.ReadToEndAsync( cancellationToken );
+        await process.WaitForExitAsync( cancellationToken );
+
+        return output;
+    }
+}

src/PostSharp.Engineering.McpApprovalServer/ViewModels/ApprovalViewModel.cs

@@ -35,6 +35,8 @@ public ApprovalViewModel( ApprovalRequest request, ApprovalRequestQueue queue )
 
     public string WorkingDirectory => this._request.WorkingDirectory;
 
+    public string GitBranch => this._request.GitBranch;
+
     public string ReceivedAt => this._request.ReceivedAt.ToString( "yyyy-MM-dd HH:mm:ss", System.Globalization.CultureInfo.InvariantCulture );
 
     // Assessments

src/PostSharp.Engineering.McpApprovalServer/ViewModels/HistoryViewModel.cs

@@ -7,7 +7,6 @@
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.Globalization;
-using System.IO;
 using System.Linq;
 using System.Windows;
 
@@ -125,14 +124,14 @@ public HistoryItemViewModel( CommandRecord record )
     {
         this._record = record;
         this._pendingRequest = null;
-        this.GitBranch = GetGitBranch( record.WorkingDirectory );
+        this.GitBranch = GitHelper.GetBranch( record.WorkingDirectory );
     }
 
     public HistoryItemViewModel( ApprovalRequest pendingRequest )
     {
         this._record = null;
         this._pendingRequest = pendingRequest;
-        this.GitBranch = GetGitBranch( pendingRequest.WorkingDirectory );
+        this.GitBranch = GitHelper.GetBranch( pendingRequest.WorkingDirectory );
     }
 
     public bool IsPending => this._pendingRequest != null;
@@ -185,42 +184,4 @@ public string ExitCodeDisplay
             return this._record!.ExitCode?.ToString( CultureInfo.InvariantCulture ) ?? "-";
         }
     }
-
-    private static string GetGitBranch( string workingDirectory )
-    {
-        try
-        {
-            if ( !Directory.Exists( workingDirectory ) )
-            {
-                return "N/A";
-            }
-
-            var startInfo = new ProcessStartInfo
-            {
-                FileName = "git",
-                Arguments = "rev-parse --abbrev-ref HEAD",
-                WorkingDirectory = workingDirectory,
-                RedirectStandardOutput = true,
-                RedirectStandardError = true,
-                UseShellExecute = false,
-                CreateNoWindow = true
-            };
-
-            using var process = Process.Start( startInfo );
-
-            if ( process == null )
-            {
-                return "N/A";
-            }
-
-            var output = process.StandardOutput.ReadToEnd().Trim();
-            process.WaitForExit();
-
-            return process.ExitCode == 0 ? output : "N/A";
-        }
-        catch
-        {
-            return "N/A";
-        }
-    }
 }

src/PostSharp.Engineering.McpApprovalServer/Views/ApprovalWindow.xaml

@@ -56,6 +56,7 @@
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="120" />
@@ -83,16 +84,24 @@
                      Background="#F5F5F5"
                      Margin="0,5" />
 
-            <TextBlock Grid.Row="2" Grid.Column="0" Text="Purpose:" FontWeight="Bold" Margin="0,5" />
-            <TextBox Grid.Row="2" Grid.Column="1"
+            <TextBlock Grid.Row="2" Grid.Column="0" Text="Git Branch:" FontWeight="Bold" Margin="0,5" />
+            <TextBlock Grid.Row="2" Grid.Column="1"
+                       Text="{Binding GitBranch}"
+                       FontFamily="Consolas"
+                       FontWeight="SemiBold"
+                       Foreground="#1976D2"
+                       Margin="0,5" />
+
+            <TextBlock Grid.Row="3" Grid.Column="0" Text="Purpose:" FontWeight="Bold" Margin="0,5" />
+            <TextBox Grid.Row="3" Grid.Column="1"
                      Text="{Binding ClaimedPurpose, Mode=OneWay}"
                      IsReadOnly="True"
                      TextWrapping="Wrap"
                      Background="#F5F5F5"
                      Margin="0,5" />
 
-            <TextBlock Grid.Row="3" Grid.Column="0" Text="Received:" FontWeight="Bold" Margin="0,5" />
-            <TextBlock Grid.Row="3" Grid.Column="1" Text="{Binding ReceivedAt}" Margin="0,5" />
+            <TextBlock Grid.Row="4" Grid.Column="0" Text="Received:" FontWeight="Bold" Margin="0,5" />
+            <TextBlock Grid.Row="4" Grid.Column="1" Text="{Binding ReceivedAt}" Margin="0,5" />
         </Grid>
 
         <!-- Risk assessments in tabs -->