Improve Docker build and MCP server experience

- Skip cleanup by default, add -Clean flag
- Map NuGet packages to same path in host/container
- Add distinct beep sounds for MCP auto-approve vs manual

Author: gfraiteur

DockerBuild.ps1

@@ -6,7 +6,7 @@ param(
     [switch]$Interactive, # Opens an interactive PowerShell session
     [switch]$BuildImage, # Only builds the image, but does not build the product.
     [switch]$NoBuildImage, # Does not build the image.
-    [switch]$NoClean, # Does not clean up.
+    [switch]$Clean, # Performs cleanup of bin and obj directories.
     [switch]$NoNuGetCache, # Does not mount the host nuget cache in the container.
     [switch]$KeepEnv, # Does not override the env.g.json file.
     [switch]$Claude, # Run Claude CLI instead of Build.ps1. Use -Claude for interactive, -Claude "prompt" for non-interactive.
@@ -52,6 +52,17 @@ function New-EnvJson
         }
     }
 
+    # Add NUGET_PACKAGES with default if not set
+    if (-not $envVariables.ContainsKey("NUGET_PACKAGES"))
+    {
+        $nugetPackages = $env:NUGET_PACKAGES
+        if ([string]::IsNullOrEmpty($nugetPackages))
+        {
+            $nugetPackages = Join-Path $env:USERPROFILE ".nuget\packages"
+        }
+        $envVariables["NUGET_PACKAGES"] = $nugetPackages
+    }
+
     # Add secrets from the PostSharpBuildEnv key vault, on our development machines.
     # On CI agents, these environment variables are supposed to be set by the host.
     if ($LoadEnvFromKeyVault -or ($env:IS_POSTSHARP_OWNED -and -not $env:IS_TEAMCITY_AGENT))
@@ -140,6 +151,14 @@ function New-ClaudeEnvJson
         $claudeEnv["GIT_USER_EMAIL"] = $gitUserEmail
     }
 
+    # Add NUGET_PACKAGES with default if not set
+    $nugetPackages = $env:NUGET_PACKAGES
+    if ([string]::IsNullOrEmpty($nugetPackages))
+    {
+        $nugetPackages = Join-Path $env:USERPROFILE ".nuget\packages"
+    }
+    $claudeEnv["NUGET_PACKAGES"] = $nugetPackages
+
     # Convert to JSON and save
     $jsonPath = Join-Path $dockerContextDirectory "env.g.json"
 
@@ -310,9 +329,9 @@ if ($Claude -and -not $NoMcp)
     }
 }
 
-# When building locally (as opposed as on the build agent), we must do a complete cleanup because
+# When building locally (as opposed as on the build agent), we can optionally do a complete cleanup because
 # obj files may point to the host filesystem.
-if (-not $env:IS_TEAMCITY_AGENT -and -not $NoClean)
+if ($Clean)
 {
     Write-Host "Cleaning up." -ForegroundColor Green
     Get-ChildItem "bin" -Recurse | Remove-Item -Force -Recurse -ErrorAction SilentlyContinue
@@ -388,15 +407,23 @@ if (Test-Path $gitSystemDir)
 # Mount the host NuGet cache in the container.
 if (-not $NoNuGetCache)
 {
-    $nugetCacheDir = Join-Path $env:USERPROFILE ".nuget\packages"
+    # Use NUGET_PACKAGES from environment or default to user profile
+    $nugetCacheDir = $env:NUGET_PACKAGES
+    if ([string]::IsNullOrEmpty($nugetCacheDir))
+    {
+        $nugetCacheDir = Join-Path $env:USERPROFILE ".nuget\packages"
+    }
+
     Write-Host "NuGet cache directory: $nugetCacheDir" -ForegroundColor Cyan
     if (-not (Test-Path $nugetCacheDir))
     {
         Write-Host "Creating NuGet cache directory on host: $nugetCacheDir"
         New-Item -ItemType Directory -Force -Path $nugetCacheDir | Out-Null
     }
 
-    $VolumeMappings += "${nugetCacheDir}:c:\packages"
+    # Mount to the same path in the container (will be transformed by Get-ContainerPath later)
+    $VolumeMappings += "${nugetCacheDir}:${nugetCacheDir}"
+    $MountPoints += $nugetCacheDir
 }
 
 # Mount VS Remote Debugger

Dockerfile

@@ -42,7 +42,6 @@ RUN Invoke-WebRequest -Uri https://github.com/PowerShell/PowerShell/releases/dow
     if ($process.ExitCode -ne 0) { exit $process.ExitCode }; `
     Remove-Item PowerShell.msi
 
-# Add PowerShell 7 to PATH using ENV directive (persists across shell switches)
 ENV PATH="C:\Program Files\PowerShell\7;${PATH}"
 
 
@@ -78,8 +77,5 @@ RUN c:\ReadEnvironmentVariables.ps1 c:\env.g.json
 # Copy Init.g.ps1 placeholder (drive mappings handled inline in docker run)
 COPY Init.g.ps1 c:\Init.g.ps1
 
-# Configure NuGet
-ENV NUGET_PACKAGES=c:\packages
-
 # Configure .NET SDK
 ENV DOTNET_NOLOGO=1

Dockerfile.claude

@@ -42,7 +42,6 @@ RUN Invoke-WebRequest -Uri https://github.com/PowerShell/PowerShell/releases/dow
     if ($process.ExitCode -ne 0) { exit $process.ExitCode }; `
     Remove-Item PowerShell.msi
 
-# Add PowerShell 7 to PATH using ENV directive (persists across shell switches)
 ENV PATH="C:\Program Files\PowerShell\7;${PATH}"
 
 
@@ -58,13 +57,11 @@ RUN & .\dotnet-install.ps1 -Version 9.0.305 -InstallDir 'C:\Program Files\dotnet
 
 
 # Install Node.js
-# Install Node.js 22.0.0 directly
 RUN Invoke-WebRequest -Uri "https://nodejs.org/dist/v22.0.0/node-v22.0.0-win-x64.zip" -OutFile node.zip; `
     Expand-Archive node.zip -DestinationPath C:\; `
     Rename-Item "C:\node-v22.0.0-win-x64" "C:\nodejs"; `
     Remove-Item node.zip
 
-# Add Node.js to PATH using ENV directive (persists across shell switches)
 ENV PATH="C:\nodejs;${PATH}"
 
 
@@ -74,7 +71,6 @@ RUN Invoke-WebRequest -Uri https://github.com/cli/cli/releases/download/v2.63.2/
     if ($process.ExitCode -ne 0) { exit $process.ExitCode }; `
     Remove-Item gh.msi
 
-# Add GitHub CLI to PATH using ENV directive (persists across shell switches)
 ENV PATH="C:\Program Files\GitHub CLI;${PATH}"
 
 
@@ -120,8 +116,5 @@ RUN c:\ReadEnvironmentVariables.ps1 c:\env.g.json
 # Copy Init.g.ps1 placeholder (drive mappings handled inline in docker run)
 COPY Init.g.ps1 c:\Init.g.ps1
 
-# Configure NuGet
-ENV NUGET_PACKAGES=c:\packages
-
 # Configure .NET SDK
 ENV DOTNET_NOLOGO=1

src/PostSharp.Engineering.BuildTools/Docker/EpilogueComponent.cs

@@ -36,9 +36,6 @@ ARG MOUNTPOINTS
             # Copy Init.g.ps1 placeholder (drive mappings handled inline in docker run)
             COPY Init.g.ps1 c:\Init.g.ps1
 
-            # Configure NuGet
-            ENV NUGET_PACKAGES=c:\packages
-
             # Configure .NET SDK
             ENV DOTNET_NOLOGO=1
             """ );

src/PostSharp.Engineering.BuildTools/Mcp/Services/ApprovalPrompter.cs

@@ -27,7 +27,32 @@ public Task<bool> RequestApprovalAsync(
         RiskAssessment regexAssessment )
 #pragma warning restore CA1822
     {
-        // Beep to alert the user
+        // Auto-approve LOW risk commands when combined assessment recommends approval
+        if ( combinedAssessment.Level == RiskLevel.Low && combinedAssessment.Recommendation == Recommendation.Approve )
+        {
+            // Pleasant single beep for auto-approve
+            try
+            {
+#pragma warning disable CA1416 // Platform compatibility - we handle non-Windows in catch
+                Console.Beep( 1200, 150 );
+#pragma warning restore CA1416
+            }
+            catch
+            {
+                // Beep may not be supported on all systems
+            }
+
+            AnsiConsole.WriteLine();
+            AnsiConsole.MarkupLine( "[green]Auto-approved (LOW risk)[/]" );
+            AnsiConsole.MarkupLine( $"[dim]Reason: {Markup.Escape( combinedAssessment.Reason )}[/]" );
+            AnsiConsole.WriteLine();
+
+            return Task.FromResult( true );
+        }
+
+        // HIGH/CRITICAL risk commands always require manual approval (no auto-reject)
+
+        // Alert beep for user approval required
         try
         {
 #pragma warning disable CA1416 // Platform compatibility - we handle non-Windows in catch
@@ -46,19 +71,6 @@ public Task<bool> RequestApprovalAsync(
 
         try
         {
-            // Auto-approve LOW risk commands when combined assessment recommends approval
-            if ( combinedAssessment.Level == RiskLevel.Low && combinedAssessment.Recommendation == Recommendation.Approve )
-            {
-                AnsiConsole.WriteLine();
-                AnsiConsole.MarkupLine( "[green]Auto-approved (LOW risk)[/]" );
-                AnsiConsole.MarkupLine( $"[dim]Reason: {Markup.Escape( combinedAssessment.Reason )}[/]" );
-                AnsiConsole.WriteLine();
-
-                return Task.FromResult( true );
-            }
-
-            // HIGH/CRITICAL risk commands always require manual approval (no auto-reject)
-
             AnsiConsole.WriteLine();
             AnsiConsole.Write( new Rule( "[yellow]Command Approval Request[/]" ) );
             AnsiConsole.WriteLine();

src/PostSharp.Engineering.BuildTools/Resources/DockerBuild.ps1

@@ -6,7 +6,7 @@ param(
     [switch]$Interactive, # Opens an interactive PowerShell session
     [switch]$BuildImage, # Only builds the image, but does not build the product.
     [switch]$NoBuildImage, # Does not build the image.
-    [switch]$NoClean, # Does not clean up.
+    [switch]$Clean, # Performs cleanup of bin and obj directories.
     [switch]$NoNuGetCache, # Does not mount the host nuget cache in the container.
     [switch]$KeepEnv, # Does not override the env.g.json file.
     [switch]$Claude, # Run Claude CLI instead of Build.ps1. Use -Claude for interactive, -Claude "prompt" for non-interactive.
@@ -52,6 +52,17 @@ function New-EnvJson
         }
     }
 
+    # Add NUGET_PACKAGES with default if not set
+    if (-not $envVariables.ContainsKey("NUGET_PACKAGES"))
+    {
+        $nugetPackages = $env:NUGET_PACKAGES
+        if ([string]::IsNullOrEmpty($nugetPackages))
+        {
+            $nugetPackages = Join-Path $env:USERPROFILE ".nuget\packages"
+        }
+        $envVariables["NUGET_PACKAGES"] = $nugetPackages
+    }
+
     # Add secrets from the PostSharpBuildEnv key vault, on our development machines.
     # On CI agents, these environment variables are supposed to be set by the host.
     if ($LoadEnvFromKeyVault -or ($env:IS_POSTSHARP_OWNED -and -not $env:IS_TEAMCITY_AGENT))
@@ -140,6 +151,14 @@ function New-ClaudeEnvJson
         $claudeEnv["GIT_USER_EMAIL"] = $gitUserEmail
     }
 
+    # Add NUGET_PACKAGES with default if not set
+    $nugetPackages = $env:NUGET_PACKAGES
+    if ([string]::IsNullOrEmpty($nugetPackages))
+    {
+        $nugetPackages = Join-Path $env:USERPROFILE ".nuget\packages"
+    }
+    $claudeEnv["NUGET_PACKAGES"] = $nugetPackages
+
     # Convert to JSON and save
     $jsonPath = Join-Path $dockerContextDirectory "env.g.json"
 
@@ -310,9 +329,9 @@ if ($Claude -and -not $NoMcp)
     }
 }
 
-# When building locally (as opposed as on the build agent), we must do a complete cleanup because
+# When building locally (as opposed as on the build agent), we can optionally do a complete cleanup because
 # obj files may point to the host filesystem.
-if (-not $env:IS_TEAMCITY_AGENT -and -not $NoClean)
+if ($Clean)
 {
     Write-Host "Cleaning up." -ForegroundColor Green
     Get-ChildItem "bin" -Recurse | Remove-Item -Force -Recurse -ErrorAction SilentlyContinue
@@ -388,15 +407,23 @@ if (Test-Path $gitSystemDir)
 # Mount the host NuGet cache in the container.
 if (-not $NoNuGetCache)
 {
-    $nugetCacheDir = Join-Path $env:USERPROFILE ".nuget\packages"
+    # Use NUGET_PACKAGES from environment or default to user profile
+    $nugetCacheDir = $env:NUGET_PACKAGES
+    if ([string]::IsNullOrEmpty($nugetCacheDir))
+    {
+        $nugetCacheDir = Join-Path $env:USERPROFILE ".nuget\packages"
+    }
+
     Write-Host "NuGet cache directory: $nugetCacheDir" -ForegroundColor Cyan
     if (-not (Test-Path $nugetCacheDir))
     {
         Write-Host "Creating NuGet cache directory on host: $nugetCacheDir"
         New-Item -ItemType Directory -Force -Path $nugetCacheDir | Out-Null
     }
 
-    $VolumeMappings += "${nugetCacheDir}:c:\packages"
+    # Mount to the same path in the container (will be transformed by Get-ContainerPath later)
+    $VolumeMappings += "${nugetCacheDir}:${nugetCacheDir}"
+    $MountPoints += $nugetCacheDir
 }
 
 # Mount VS Remote Debugger