No more container build

* Remove docker container worktree logic (will use VSCode agent worktrees)
* Remove spinup, teardown
* Added tracing and logging for debug version of FieldWorks

Author: johnml1135

.GitHub/instructions/debugging.instructions.md

@@ -0,0 +1,63 @@
+---
+applyTo: "**/*"
+name: "debugging.instructions"
+description: "Runtime debugging and tracing guidance for FieldWorks"
+---
+
+# Debugging and Tracing
+
+## Purpose & Scope
+- Enable developers to capture actionable runtime diagnostics in Debug builds.
+- Cover trace switches, listeners, and crash evidence collection for FieldWorks desktop.
+
+## Quick Start: Enable Trace Log
+1) Copy the snippet below into `Output/Debug/FieldWorks.exe.config` (or create it by copying `Src/AppForTests.config`).
+2) Ensure `%temp%` is writable; set `AssertUiEnabled=false` to avoid modal assertion dialogs.
+3) Restart `FieldWorks.exe`; traces will append to `%temp%/FieldWorks.trace.log`.
+
+```xml
+<system.diagnostics>
+  <trace autoflush="false">
+    <listeners>
+      <clear />
+      <add name="FwTraceListener"
+           type="SIL.LCModel.Utils.EnvVarTraceListener, SIL.LCModel.Utils"
+           initializeData="assertuienabled='false' assertexceptionenabled='false' logfilename='%temp%/FieldWorks.trace.log'" />
+    </listeners>
+  </trace>
+  <switches>
+    <add name="ShowPendingMsgs" value="3" />
+    <add name="XCore.Mediator_InvokeTrace" value="3" />
+    <add name="XWorks_Timing" value="3" />
+    <add name="XWorks_LinkListener" value="3" />
+  </switches>
+</system.diagnostics>
+```
+- Switch levels: 0 Off, 1 Error, 2 Warning, 3 Info, 4 Verbose.
+- Log file path is configurable via `logfilename`; environment variable expansion (`%temp%`) is supported by `EnvVarTraceListener`.
+
+## Trace Switch Reference
+- `ShowPendingMsgs`: XCore pending message queue tracing.
+- `XCore.Mediator_InvokeTrace`: Mediator invoke and job queue tracing.
+- `XWorks_Timing`: Timing hooks in xWorks (RecordList, etc.).
+- `XWorks_LinkListener`: LinkListener diagnostics.
+- Additional Trace.WriteLine hooks exist in Debug-only helpers (`DebugProcs`, etc.).
+
+## Assertions and UI
+- `EnvVarTraceListener` honors `AssertUiEnabled` and `AssertExceptionEnabled` environment variables.
+- Set `AssertUiEnabled=false` to suppress modal assertion dialogs; exceptions are thrown only if `assertexceptionenabled` remains `true`.
+
+## Dev switch (auto config)
+- FieldWorks now supports a swappable diagnostics config via `FieldWorks.Diagnostics.config`.
+- Default is quiet. `build.ps1` now enables the dev diagnostics config automatically for Debug builds unless you override `/p:UseDevTraceConfig`. You can also force it via `UseDevTraceConfig=true` or by setting environment variable `FW_TRACE_LOG` before the build; the dev diagnostics file is copied as `FieldWorks.Diagnostics.config` in the output.
+- Dev log location: `Output/Debug/FieldWorks.trace.log` (relative to the app folder) so it’s easy to collect alongside binaries.
+- Dev config logs to `%temp%/FieldWorks.trace.log` and turns on the core switches above. Edit `Src/Common/FieldWorks/FieldWorks.Diagnostics.dev.config` to change log path or switches.
+
+## Crash Evidence
+- Check `%LOCALAPPDATA%\CrashDumps` for `FieldWorks.exe.*.dmp` (enable Windows Error Reporting local dumps if missing).
+- Windows Event Viewer → Windows Logs → Application contains `.NET Runtime` and `Application Error` entries.
+
+## Proposed Improvements (dev-only)
+- Add `Docs/FieldWorks.trace.sample.config` with the snippet above for easy reuse.
+- Introduce a dev flag (`UseDevTraceConfig=true` or `FW_TRACE_LOG` env var) that copies the dev diagnostics file next to `FieldWorks.exe` in Debug builds so tracing is on by default for local runs.
+- Document standard trace switches in `Docs/logging.md` and keep `EnvVarTraceListener` as the default listener for dev traces.

.github/copilot-instructions.md

@@ -40,6 +40,7 @@
 | Task | Reference |
 | --- | --- |
 | Build/test rules | `.github/instructions/build.instructions.md`, `.github/instructions/testing.instructions.md` |
+| Debugging | `.github/instructions/debugging.instructions.md` |
 | Managed / Native / Installer guidance | `.github/instructions/managed.instructions.md`, `.github/instructions/native.instructions.md`, `.github/instructions/installer.instructions.md` |
 | Security & PowerShell rules | `.github/instructions/security.instructions.md`, `.github/instructions/powershell.instructions.md` |
 | **Serena MCP (symbol tools)** | `.github/instructions/serena.instructions.md` |

.github/instructions/build.instructions.md

@@ -81,20 +81,17 @@ Run: msbuild Build\Src\NativeBuild\NativeBuild.csproj
 - On Linux/macOS: Use `./build.sh` and ensure `msbuild`, `dotnet`, and native build tools are installed.
 - Environment variables (`fwrt`, `Platform=x64`, etc.) are set by `SetupInclude.targets` during build.
 
-## Worktree and Container Policy
+## Concurrent Builds & Smart Kill
 
-FieldWorks uses **git worktrees** for parallel development and **Docker containers** for build isolation:
+FieldWorks supports concurrent builds in **git worktrees** (e.g., VS Code Background Agents) on the same machine.
 
-| Location | Build Method | Reason |
-|----------|--------------|--------|
-| Main repo checkout | Host via `.\build.ps1` | Direct access to COM/registry |
-| Worktree (`worktrees/agent-N`) | Container via `.\build.ps1` | COM/registry isolation |
+To prevent conflicts where one build kills another's MSBuild nodes (which hold file locks on `FwBuildTasks.dll`), `build.ps1` uses a **Smart Kill** strategy:
+1.  **Scope**: Only kills processes in the current user session.
+2.  **Filter**: Only kills processes (msbuild, dotnet, vstest) that:
+    - Have the current worktree path in their command line.
+    - Have loaded a DLL from the current worktree.
 
-**`.\build.ps1` and `.\test.ps1` handle this automatically:**
-- Detects worktree paths matching `worktrees/agent-N`
-- Checks if container `fw-agent-N` is running
-- Respawns build inside container if available
-- Use `-NoDocker` to override and build on host
+**Result**: You can run `.\build.ps1` in `worktrees/agent-1` and `worktrees/agent-2` simultaneously without interference.
 
 ### Intermediate Output Locations
 

.vscode/launch.json

@@ -9,7 +9,6 @@
       "cwd": "${workspaceFolder}\\Output\\Debug",
       "console": "externalTerminal",
       "justMyCode": false,
-      "preLaunchTask": "Build Debug"
     },
     {
       "name": "Debug NUnit Tests",

AGENTS.md

@@ -45,22 +45,16 @@ dotnet test Src/<Component>.Tests/<Component>.Tests.csproj
 Native C++ (Phase 2) must build before managed code (Phases 3+). The traversal build in `FieldWorks.proj` handles this automatically.
 
 ### COM/Registry Isolation
-Changes affecting COM registration or the Windows registry must:
-- Include appropriate tests
-- Work inside Docker containers (see `scripts/spin-up-agents.ps1`)
-- Never assume host machine registry state
-
-### NuGet Package Cache (Hybrid Architecture)
-Containers use a hybrid caching strategy:
-- **SHARED** (on named volume `fw-nuget-cache`):
-  - `C:\NuGetCache\packages\` - global-packages (download once, all agents read)
-  - `C:\NuGetCache\http-cache\` - HTTP cache (feed metadata)
-- **ISOLATED** (container-local):
-  - `C:\Temp\` - temp/NuGetScratch (extraction operations)
-
-Host builds use `packages/` in the repo (via `nuget.config`).
-
-Containers use **Hyper-V isolation** to fix the Windows Docker `MoveFile()` bug ([moby/moby#38256](https://github.com/moby/moby/issues/38256)). See `DOCKER.md` and `.cache/NUGET_CONTAINER_CACHE_ANALYSIS.md` for details.
+FieldWorks uses **Registration-Free COM** (manifest-only) for most components.
+- Registry isolation is generally not required for standard builds.
+- Worktrees run on the host by default.
+
+### NuGet Package Cache (Host Isolation)
+Worktrees running on the host use a shared package cache but isolated scratch folders:
+- **SHARED**: `C:\ProgramData\FieldWorks\NuGetCache` (packages/http-cache)
+- **ISOLATED**: `.nuget-scratch` and `.temp` inside the worktree folder
+
+Host builds use `packages/` in the repo (via `nuget.config`) unless overridden by environment variables.
 
 ### Localization
 - Use `.resx` files for localizable strings

Build/Agent/FwBuildHelpers.psm1

@@ -24,58 +24,40 @@
 
 $moduleRoot = $PSScriptRoot
 
-# Container helpers (detection, path resolution, execution)
-Import-Module (Join-Path $moduleRoot "FwContainerHelpers.psm1") -Force
-
 # Build environment (VS setup, MSBuild, VSTest)
 Import-Module (Join-Path $moduleRoot "FwBuildEnvironment.psm1") -Force
 
 # =============================================================================
 # Process Management Functions
 # =============================================================================
 
-function Stop-ContainerBuildProcesses {
-    param(
-        [string]$ContainerName
-    )
-
-    if (-not $ContainerName) { return }
-
-    $cleanupCommand = @"
-        `$processNames = @('dotnet', 'msbuild', 'VBCSCompiler', 'vstest.console', 'testhost', 'FieldWorks', 'cl', 'link', 'lib', 'nmake', 'cvtres', 'rc', 'midl', 'tracker', 'vctip', 'ml64')
-        foreach (`$name in `$processNames) {
-            Get-Process -Name `$name -ErrorAction SilentlyContinue | Stop-Process -Force -ErrorAction SilentlyContinue
-        }
-        Start-Sleep -Milliseconds 300
-"@
-
-    Write-Host "Closing build processes in container '$ContainerName'..." -ForegroundColor Yellow
-    docker exec $ContainerName powershell -NoProfile -Command $cleanupCommand 2>$null
-}
-
 function Stop-ConflictingProcesses {
     <#
     .SYNOPSIS
         Stops processes that could interfere with builds/tests.
     .DESCRIPTION
         Kills build- and test-related processes that can hold locks on artifacts
-        such as FwBuildTasks.dll. Defaults to the current session; optionally
-        kills across sessions when running inside containers. When invoked on the
-        host, can also preemptively clean running agent containers to avoid
-        cross-locks on shared temp locations.
+        such as FwBuildTasks.dll. Defaults to the current session.
+
+        Implements "Smart Kill" strategy:
+        1. Identifies processes by name (msbuild, dotnet, etc.)
+        2. Filters by current session ID
+        3. If RepoRoot is provided, filters by:
+           - Command line containing RepoRoot path
+           - Loaded modules (DLLs) within RepoRoot path
+
+        This allows concurrent builds in different worktrees to coexist without
+        killing each other's MSBuild nodes.
     #>
     param(
-        [switch]$AllSessions,
-        [switch]$CrossContainers,
         [string[]]$AdditionalProcessNames = @(),
-        [switch]$IncludeOmniSharp
+        [switch]$IncludeOmniSharp,
+        [string]$RepoRoot
     )
 
     $conflicts = @(
-        # Managed build/test hosts
-        "dotnet", "msbuild", "VBCSCompiler", "vstest.console", "testhost", "FieldWorks",
-        # Native toolchain
-        "cl", "link", "lib", "nmake", "cvtres", "rc", "midl", "tracker", "vctip", "ml64"
+        # Managed build/test hosts (Persistent lockers)
+        "dotnet", "msbuild", "VBCSCompiler", "vstest.console", "testhost", "FieldWorks"
     )
 
     if ($IncludeOmniSharp) {
@@ -94,8 +76,42 @@ function Stop-ConflictingProcesses {
         Get-Process -Name $name -ErrorAction SilentlyContinue
     }
 
-    if (-not $AllSessions) {
-        $processes = $processes | Where-Object { $_.SessionId -eq $currentSessionId }
+    # Always filter by current session
+    $processes = $processes | Where-Object { $_.SessionId -eq $currentSessionId }
+
+    # Filter by RepoRoot (Smart Kill) - only kill processes locking files in this repo
+    if ($RepoRoot) {
+        $processesToKill = @()
+        $RepoRoot = $RepoRoot.TrimEnd('\').TrimEnd('/')
+
+        foreach ($p in $processes) {
+            if ($p.Id -eq $PID) { continue } # Don't kill self
+
+            $isRelated = $false
+
+            # 1. Check Command Line (fast)
+            try {
+                $cim = Get-CimInstance Win32_Process -Filter "ProcessId = $($p.Id)" -ErrorAction SilentlyContinue
+                if ($cim.CommandLine -and $cim.CommandLine.IndexOf($RepoRoot, [System.StringComparison]::OrdinalIgnoreCase) -ge 0) {
+                    $isRelated = $true
+                }
+            } catch {}
+
+            # 2. Check Modules (slower, but catches MSBuild nodes holding DLLs)
+            if (-not $isRelated) {
+                try {
+                    # Check if any loaded module is within the RepoRoot
+                    if ($p.Modules | Where-Object { $_.FileName -and $_.FileName.StartsWith($RepoRoot, [System.StringComparison]::OrdinalIgnoreCase) }) {
+                        $isRelated = $true
+                    }
+                } catch {}
+            }
+
+            if ($isRelated) {
+                $processesToKill += $p
+            }
+        }
+        $processes = $processesToKill
     }
 
     if ($processes) {
@@ -108,16 +124,6 @@ function Stop-ConflictingProcesses {
 
         Start-Sleep -Milliseconds 500
     }
-
-    if ($CrossContainers -and -not (Test-InsideContainer)) {
-        $agentNum = Get-WorktreeAgentNumber
-        if ($null -ne $agentNum) {
-            $containerName = "fw-agent-$agentNum"
-            if (Test-DockerContainerRunning -ContainerName $containerName) {
-                Stop-ContainerBuildProcesses -ContainerName $containerName
-            }
-        }
-    }
 }
 
 function Test-IsFileLockError {
@@ -154,8 +160,6 @@ function Invoke-WithFileLockRetry {
     param(
         [Parameter(Mandatory)][ScriptBlock]$Action,
         [Parameter(Mandatory)][string]$Context,
-        [switch]$AllSessions,
-        [switch]$CrossContainers,
         [switch]$IncludeOmniSharp,
         [int]$MaxAttempts = 2
     )
@@ -170,7 +174,7 @@ function Invoke-WithFileLockRetry {
             if ($attempt -lt $MaxAttempts -and (Test-IsFileLockError -ErrorRecord $_)) {
                 $nextAttempt = $attempt + 1
                 Write-Host "[WARN] $Context hit a file lock. Cleaning and retrying (attempt $nextAttempt of $MaxAttempts)..." -ForegroundColor Yellow
-                Stop-ConflictingProcesses -AllSessions:$AllSessions -CrossContainers:$CrossContainers -IncludeOmniSharp:$IncludeOmniSharp
+                Stop-ConflictingProcesses -IncludeOmniSharp:$IncludeOmniSharp
                 Start-Sleep -Seconds 2
                 $retry = $true
             }
@@ -298,13 +302,6 @@ function Test-GitTrackedFile {
 
 # Re-export functions from sub-modules plus local functions
 Export-ModuleMember -Function @(
-    # From FwContainerHelpers.psm1
-    'Test-InsideContainer',
-    'Get-WorktreeAgentNumber',
-    'Test-DockerContainerRunning',
-    'Get-ContainerWorkDir',
-    'Invoke-InContainer',
-    'New-ContainerArgumentString',
     # From FwBuildEnvironment.psm1
     'Initialize-VsDevEnvironment',
     'Get-MSBuildPath',