Add Docker cache invalidation and improve container file organization

Implement -Update switch for DockerBuild.ps1 (Claude mode only) that updates a timestamp file to invalidate Docker layer cache, forcing plugin updates. Reorganize docker-context to use .g/ subdirectory for generated files (env.g.json, Init.g.ps1, update.timestamp). Move version counter files from %APPDATA% (Roaming) to %LOCALAPPDATA% (Local) for proper sharing between host and container. Fix container user profile to consistently use ContainerAdministrator instead of ContainerUser. Copy docker context files to c:\docker-context\ in container instead of c:\ root for cleaner organization.

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

Author: gfraiteur

.gitignore

@@ -1,22 +1,23 @@
-obj
-bin
-artifacts
-.vs
-.suo
-eng/tools
-*.Import.props
-*.g.props
-*.user
-.teamcity/.idea
-.teamcity/target
-/.config/dotnet-tools.json
-/.tools
-nuget.config
-global.json
-*.g.json
-*.g.ps1
-eng/docker-context/claude.json
-scripts/build-agents/last-execution.txt
-*.log
-copilot.data.*
-eng/docker-context/.credentials.json
+obj
+bin
+artifacts
+.vs
+.suo
+eng/tools
+*.Import.props
+*.g.props
+*.user
+.teamcity/.idea
+.teamcity/target
+/.config/dotnet-tools.json
+/.tools
+nuget.config
+global.json
+*.g.json
+*.g.ps1
+eng/docker-context/claude.json
+eng/docker-context/.g/
+scripts/build-agents/last-execution.txt
+*.log
+copilot.data.*
+eng/docker-context/.credentials.json

DockerBuild.ps1

@@ -11,6 +11,7 @@ param(
     [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.
     [switch]$NoMcp, # Do not start the MCP approval server (for -Claude mode).
+    [switch]$Update, # Update timestamp to invalidate Docker cache and force Claude/plugin updates (Claude mode only).
     [string]$ImageName, # Image name (defaults to a name based on the directory).
     [string]$BuildAgentPath = $(if ($env:TEAMCITY_JRE) { Split-Path $env:TEAMCITY_JRE -Parent } else { 'C:\BuildAgent' }),
     [switch]$LoadEnvFromKeyVault, # Forces loading environment variables form the key vault.
@@ -94,12 +95,13 @@ function New-EnvJson
     }
 
     # Convert to JSON and save
-    $jsonPath = Join-Path $dockerContextDirectory "env.g.json"
+    $gDirectory = Join-Path $dockerContextDirectory ".g"
+    $jsonPath = Join-Path $gDirectory "env.g.json"
 
     # Ensure the directory exists
-    if (-not (Test-Path $dockerContextDirectory))
+    if (-not (Test-Path $gDirectory))
     {
-        New-Item -ItemType Directory -Path $dockerContextDirectory -Force | Out-Null
+        New-Item -ItemType Directory -Path $gDirectory -Force | Out-Null
     }
 
     # Write a test JSON file with GUID first
@@ -178,12 +180,13 @@ function New-ClaudeEnvJson
     $claudeEnv["NUGET_PACKAGES"] = $nugetPackages
 
     # Convert to JSON and save
-    $jsonPath = Join-Path $dockerContextDirectory "env.g.json"
+    $gDirectory = Join-Path $dockerContextDirectory ".g"
+    $jsonPath = Join-Path $gDirectory "env.g.json"
 
     # Ensure the directory exists
-    if (-not (Test-Path $dockerContextDirectory))
+    if (-not (Test-Path $gDirectory))
     {
-        New-Item -ItemType Directory -Path $dockerContextDirectory -Force | Out-Null
+        New-Item -ItemType Directory -Path $gDirectory -Force | Out-Null
     }
 
     # Write a test JSON file with GUID first
@@ -325,6 +328,32 @@ function Copy-McpServerToTemp
     }
 }
 
+function Get-TimestampFile
+{
+    param(
+        [switch]$Update
+    )
+
+    $timestampDir = Join-Path $env:LOCALAPPDATA "PostSharp.Engineering"
+    $timestampFile = Join-Path $timestampDir "update.timestamp"
+
+    # Ensure directory exists
+    if (-not (Test-Path $timestampDir))
+    {
+        New-Item -ItemType Directory -Path $timestampDir -Force | Out-Null
+    }
+
+    # Create file if it doesn't exist OR update if -Update specified
+    if (-not (Test-Path $timestampFile) -or $Update)
+    {
+        $timestamp = [DateTime]::UtcNow.ToString("o")  # ISO 8601 format
+        Set-Content -Path $timestampFile -Value $timestamp -NoNewline -Force
+        Write-Host "Timestamp file updated: $timestamp" -ForegroundColor Cyan
+    }
+
+    return $timestampFile
+}
+
 if ($env:RUNNING_IN_DOCKER)
 {
     Write-Error "Already running in Docker."
@@ -400,6 +429,12 @@ if (-not $KeepEnv)
     {
         # Use Claude-specific environment variables (filtered and renamed)
         New-ClaudeEnvJson
+
+        # Get/update timestamp file for cache invalidation (only if building image)
+        if (-not $NoBuildImage)
+        {
+            $timestampFile = Get-TimestampFile -Update:$Update
+        }
     }
     else
     {
@@ -444,6 +479,9 @@ if (-not (Test-Path $dockerContextDirectory))
 }
 
 
+# Container user profile (matches actual Windows user in container)
+$containerUserProfile = "C:\Users\ContainerAdministrator"
+
 # Prepare volume mappings (stored as mapping strings, "-v" flags added later)
 $VolumeMappings = @("${SourceDirName}:${SourceDirName}")
 $MountPoints = @($SourceDirName)
@@ -480,6 +518,17 @@ if (-not $NoNuGetCache)
     $MountPoints += $nugetCacheDir
 }
 
+# Mount PostSharp.Engineering data directory (for version counters)
+$hostEngineeringDataDir = Join-Path $env:LOCALAPPDATA "PostSharp.Engineering"
+if (-not (Test-Path $hostEngineeringDataDir))
+{
+    New-Item -ItemType Directory -Force -Path $hostEngineeringDataDir | Out-Null
+}
+
+$containerEngineeringDataDir = Join-Path $containerUserProfile "AppData\Local\PostSharp.Engineering"
+$VolumeMappings += "${hostEngineeringDataDir}:${containerEngineeringDataDir}"
+$MountPoints += $containerEngineeringDataDir
+
 # Mount VS Remote Debugger
 if ($StartVsmon)
 {
@@ -660,7 +709,12 @@ if ($driveLetters.Count -gt 0)
 }
 
 # Create Init.g.ps1 with git configuration (safe.directory and user identity)
-$initScript = Join-Path $dockerContextDirectory "Init.g.ps1"
+$gDirectory = Join-Path $dockerContextDirectory ".g"
+if (-not (Test-Path $gDirectory))
+{
+    New-Item -ItemType Directory -Path $gDirectory -Force | Out-Null
+}
+$initScript = Join-Path $gDirectory "Init.g.ps1"
 $initScriptContent = @"
 # Auto-generated initialization script for container startup
 
@@ -692,6 +746,19 @@ foreach (`$dir in `$gitDirectories) {
 "@
 $initScriptContent | Set-Content -Path $initScript -Encoding UTF8
 
+# Copy timestamp file to docker context (for Claude mode cache invalidation)
+if ($Claude -and $timestampFile)
+{
+    $gDirectory = Join-Path $dockerContextDirectory ".g"
+    if (-not (Test-Path $gDirectory))
+    {
+        New-Item -ItemType Directory -Path $gDirectory -Force | Out-Null
+    }
+    $timestampDestination = Join-Path $gDirectory "update.timestamp"
+    Copy-Item -Path $timestampFile -Destination $timestampDestination -Force
+    Write-Host "Copied timestamp file to docker context" -ForegroundColor Cyan
+}
+
 $mountPointsAsString = $MountPoints -Join ";"
 $gitDirectoriesAsString = $GitDirectories -Join ";"
 
@@ -878,7 +945,6 @@ if (-not $BuildImage)
 
         # Container will have its own Claude profile (no mount, no copy from host)
         $hostUserProfile = $env:USERPROFILE
-        $containerUserProfile = "C:\Users\ContainerUser"
 
         # Convert volume mappings to docker args format (interleave "-v" flags)
         $volumeArgs = @()
@@ -930,7 +996,7 @@ if (-not $BuildImage)
             {
                 ""
             }
-            $inlineScript = "${substCommandsInline}& c:\Init.g.ps1; cd '$SourceDirName'; & .\eng\RunClaude.ps1 -Prompt `"$ClaudePrompt`"$mcpArg"
+            $inlineScript = "${substCommandsInline}& c:\docker-context\Init.g.ps1; cd '$SourceDirName'; & .\eng\RunClaude.ps1 -Prompt `"$ClaudePrompt`"$mcpArg"
         }
         else
         {
@@ -944,17 +1010,14 @@ if (-not $BuildImage)
             {
                 ""
             }
-            $inlineScript = "${substCommandsInline}& c:\Init.g.ps1; cd '$SourceDirName'; & .\eng\RunClaude.ps1$mcpArg"
+            $inlineScript = "${substCommandsInline}& c:\docker-context\Init.g.ps1; cd '$SourceDirName'; & .\eng\RunClaude.ps1$mcpArg"
         }
 
         $dockerArgsAsString = $dockerArgs -join " "
         $pwshPath = 'C:\Program Files\PowerShell\7\pwsh.exe'
 
-        # Set HOME/USERPROFILE so Claude finds its config in the mounted location
-        $envArgs = @(
-            "-e", "HOME=$containerUserProfile",
-            "-e", "USERPROFILE=$containerUserProfile"
-        )
+        # Environment variables to pass to container
+        $envArgs = @()
 
         # Pass MCP secret to container if MCP server is running
         if ($mcpSecret)
@@ -965,7 +1028,8 @@ if (-not $BuildImage)
         try
         {
             # Start new container with docker run
-            Write-Host "Executing: docker run --rm --memory=$Memory --cpus=$Cpus --isolation=$Isolation $dockerArgsAsString $VolumeMappingsAsString -e HOME=$containerUserProfile -e USERPROFILE=$containerUserProfile -w $ContainerSourceDir $ImageTag `"$pwshPath`" -Command `"$inlineScript`"" -ForegroundColor Cyan
+            $envArgsAsString = ($envArgs -join " ")
+            Write-Host "Executing: docker run --rm --memory=$Memory --cpus=$Cpus --isolation=$Isolation $dockerArgsAsString $VolumeMappingsAsString $envArgsAsString -w $ContainerSourceDir $ImageTag `"$pwshPath`" -Command `"$inlineScript`"" -ForegroundColor Cyan
             docker run --rm --memory=$Memory --cpus=$Cpus --isolation=$Isolation $dockerArgs @volumeArgs @envArgs -w $ContainerSourceDir $ImageTag $pwshPath -Command $inlineScript
             $dockerExitCode = $LASTEXITCODE
         }
@@ -1073,7 +1137,7 @@ if (-not $BuildImage)
         $dockerArgsAsString = $dockerArgs -join " "
 
         # Build inline script: subst drives, run init, cd to source, run build
-        $inlineScript = "${substCommandsInline}& c:\Init.g.ps1; cd '$SourceDirName'; & .\$Script $buildArgsString; $pwshExitCommand"
+        $inlineScript = "${substCommandsInline}& c:\docker-context\Init.g.ps1; cd '$SourceDirName'; & .\$Script $buildArgsString; $pwshExitCommand"
 
         $pwshPath = 'C:\Program Files\PowerShell\7\pwsh.exe'