Merge pull request #68 from philnach/fix/windows-stale-path

windows: refresh PATH and assert required tools in scenario run scripts

Author: jewilder

scenarios/windows/fast_api/fast_api.py

@@ -14,7 +14,7 @@
 class FastApi(core.app_scenario.Scenario):
 
     module = __module__.split('.')[-1]
-    prep_version = "4"
+    prep_version = "5"
     resources = module + "_resources"
 
 

scenarios/windows/fast_api/fast_api_resources/fast_api_run.ps1

@@ -281,6 +281,19 @@ Set-OptimizedPathOrder
 # PATH is now optimized: pyenv first (from User PATH), then system dirs (from Machine PATH)
 # Windows Store Python is at the end with lowest priority
 
+# Verify required commands are findable on PATH after Set-OptimizedPathOrder.
+# Fail fast with a clear diagnostic instead of a chain of "term not recognized" errors.
+foreach ($cmd in @('pyenv', 'python')) {
+    $resolved = Get-Command $cmd -ErrorAction SilentlyContinue
+    if (-not $resolved) {
+        " ERROR - Required command '$cmd' not found on PATH after PATH optimization." | log
+        " ERROR - Prep may not have completed, or the RPC service has a stale PATH." | log
+        " ERROR - PATH: $env:Path" | log
+        Exit 1
+    }
+    "Found ${cmd}: $($resolved.Source)" | log
+}
+
 Set-Location "$scriptDrive\FastAPI"
 
 "Setting Python global version to $pythonVersion..." | log

scenarios/windows/foundrylocal/foundrylocal.py

@@ -14,7 +14,7 @@
 class Foundrylocal(core.app_scenario.Scenario):
 
     module = __module__.split('.')[-1]
-    prep_version = "6"
+    prep_version = "7"
     resources = module + "_resources"
 
 

scenarios/windows/foundrylocal/foundrylocal_resources/foundrylocal_run.ps1

@@ -109,6 +109,19 @@ Write-RunPhaseMarker "phase.run_prep.start"
 # Refresh PATH to ensure foundry is available
 $Env:Path = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User")
 
+# Verify required commands are findable on PATH after refresh.
+# Fail fast with a clear diagnostic instead of a chain of "term not recognized" errors.
+foreach ($cmd in @('foundry')) {
+    $resolved = Get-Command $cmd -ErrorAction SilentlyContinue
+    if (-not $resolved) {
+        " ERROR - Required command '$cmd' not found on PATH after refresh." | log
+        " ERROR - Prep may not have completed, or the RPC service has a stale PATH." | log
+        " ERROR - PATH: $env:Path" | log
+        Exit 1
+    }
+    "Found ${cmd}: $($resolved.Source)" | log
+}
+
 # Output directory for results
 $outputDir = "$scriptDrive\hobl_data"
 if (-not (Test-Path $outputDir)) {

scenarios/windows/llvm/llvm.py

@@ -14,7 +14,7 @@
 class Llvm(scenarios.app_scenario.Scenario):
 
     module = __module__.split('.')[-1]
-    prep_version = "7"
+    prep_version = "8"
     resources = module + "_resources"
 
 

scenarios/windows/llvm/llvm_resources/llvm_run.ps1

@@ -132,6 +132,19 @@ Write-RunPhaseMarker "phase.run_prep.start"
 
 $Env:Path = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User")
 
+# Verify required commands are findable on PATH after refresh.
+# Fail fast with a clear diagnostic instead of a chain of "term not recognized" errors.
+foreach ($cmd in @('ninja')) {
+    $resolved = Get-Command $cmd -ErrorAction SilentlyContinue
+    if (-not $resolved) {
+        " ERROR - Required command '$cmd' not found on PATH after refresh." | log
+        " ERROR - Prep may not have completed, or the RPC service has a stale PATH." | log
+        " ERROR - PATH: $env:Path" | log
+        Exit 1
+    }
+    "Found ${cmd}: $($resolved.Source)" | log
+}
+
 # --- Initialize Visual Studio Developer Command environment ---
 # VsDevCmd.bat sets up LIB, INCLUDE, and PATH so that MSVC libraries and headers
 # are discoverable during the build (e.g., ATL/MFC, Windows SDK, UCRT).

scenarios/windows/net_aspire/net_aspire.py

@@ -14,7 +14,7 @@
 class NetAspire(core.app_scenario.Scenario):
 
     module = __module__.split('.')[-1]
-    prep_version = "8"
+    prep_version = "9"
     resources = module + "_resources"
 
 

scenarios/windows/net_aspire/net_aspire_resources/net_aspire_run.ps1

@@ -51,6 +51,18 @@ function Write-RunPhaseMarker {
 # Configuration
 $scriptDrive = Split-Path -Qualifier $PSScriptRoot
 
+# Refresh PATH from Machine+User environment so dotnet (installed via winget during prep)
+# is visible to this session. The HOBL RPC service started before prep ran, so the inherited
+# PATH is stale and does not include C:\Program Files\dotnet without this refresh.
+$env:Path = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User")
+
+# Fallback: ensure the default dotnet install directory is on PATH even if the env var
+# was not updated (e.g. dotnet installed by a non-winget installer that did not update PATH).
+$dotnetDir = "C:\Program Files\dotnet"
+if ((Test-Path "$dotnetDir\dotnet.exe") -and (";$env:Path;" -notlike "*;$dotnetDir;*")) {
+    $env:Path = "$dotnetDir;$env:Path"
+}
+
 if (-not (Test-Path "$scriptDrive\hobl_data")) {
     Write-Host " ERROR - Required directory not found: $scriptDrive\hobl_data" -ForegroundColor Red
     Exit 1
@@ -125,7 +137,13 @@ if (-not (Test-Path ".\Aspire.slnx")) {
 # that doesn't inherit env vars set during prep.
 $env:DOTNET_INSTALL_DIR = "C:\Program Files\dotnet"
 "-- DOTNET_INSTALL_DIR set to '$($env:DOTNET_INSTALL_DIR)' (prevents Arcade SDK from downloading x64 runtimes)" | log
-"-- dotnet on PATH: $(Get-Command dotnet -ErrorAction SilentlyContinue | Select-Object -ExpandProperty Source)" | log
+$dotnetCmd = Get-Command dotnet -ErrorAction SilentlyContinue
+if (-not $dotnetCmd) {
+    " ERROR - dotnet not found on PATH. Prep may not have completed, or PATH was not refreshed." | log
+    " ERROR - PATH: $env:Path" | log
+    Exit 1
+}
+"-- dotnet on PATH: $($dotnetCmd.Source)" | log
 "-- Active SDK version: $(dotnet --version 2>&1)" | log
 "-- All installed SDKs:" | log
 dotnet --list-sdks 2>&1 | ForEach-Object { "   $_" | log }

scenarios/windows/net_aspire/net_aspire_resources/net_aspire_teardown.ps1

@@ -10,6 +10,15 @@ if (-not $logFile) { $logFile = "$scriptDrive\hobl_data\net_aspire_teardown.log"
 
 [Console]::OutputEncoding = [System.Text.Encoding]::UTF8
 
+# Refresh PATH from Machine+User environment so dotnet (installed via winget during prep)
+# is visible to this session. The HOBL RPC service started before prep ran, so the inherited
+# PATH is stale and does not include C:\Program Files\dotnet without this refresh.
+$env:Path = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User")
+$dotnetDir = "C:\Program Files\dotnet"
+if ((Test-Path "$dotnetDir\dotnet.exe") -and (";$env:Path;" -notlike "*;$dotnetDir;*")) {
+    $env:Path = "$dotnetDir;$env:Path"
+}
+
 # Determine processor architecture for log file naming
 $osInfo = Get-CimInstance Win32_OperatingSystem
 $arch = $osInfo.OSArchitecture

scenarios/windows/nodejs/nodejs.py

@@ -14,7 +14,7 @@
 class Nodejs(core.app_scenario.Scenario):
 
     module = __module__.split('.')[-1]
-    prep_version = "6"
+    prep_version = "7"
     resources = module + "_resources"