fix: report bootstrap outcomes consistently across retries

bootstrap.ps1

@@ -63,6 +63,12 @@ $SophiaDownloadUrl = "https://github.com/farag2/Sophia-Script-for-Windows/releas
 $FailedInstallsLog = Join-Path $SetupPath "failed-installs.log"
 $StepIds = @("winget", "repo", "sophia", "postInstallTweaks", "registry", "shortcut", "restoreShortcut", "optionalShortcut", "optionalWinget", "summary")
 $SetupState = $null
+$RunStartedAt = (Get-Date).ToString('o')
+$RunStepIds = @($StepIds | Where-Object { $_ -notin @('summary', 'optionalWinget') })
+if ($OptionalAppsOnly) { $RunStepIds = @('optionalWinget') }
+if ($ConfigRoot.TrimEnd('\') -ne $SetupPath.TrimEnd('\')) {
+    $RunStepIds = @($RunStepIds | Where-Object { $_ -ne 'repo' })
+}
 $SummaryItems = [System.Collections.Generic.List[object]]::new()
 $FailedItems = [System.Collections.Generic.List[object]]::new()
 $script:BackupManifestPath = $null
@@ -1043,8 +1049,8 @@ function Set-RegistryValueSafe {
         [string]$Type
     )
 
-    if (-not (Test-Path $Path)) {
-        New-Item -Path $Path -Force | Out-Null
+    if (-not (Test-Path $Path -ErrorAction Stop)) {
+        New-Item -Path $Path -Force -ErrorAction Stop | Out-Null
     }
 
     if ($Type -eq "DWord") {
@@ -1057,17 +1063,23 @@ function Set-RegistryValueSafe {
     }
 
     if ($Name -eq "(Default)") {
-        Set-Item -Path $Path -Value $typedValue -Force
+        Set-Item -Path $Path -Value $typedValue -Force -ErrorAction Stop
         return
     }
 
-    New-ItemProperty -Path $Path -Name $Name -Value $typedValue -PropertyType $propertyType -Force | Out-Null
+    New-ItemProperty -Path $Path -Name $Name -Value $typedValue -PropertyType $propertyType -Force -ErrorAction Stop | Out-Null
 }
 
 function Remove-ProvisionedAppIfPresent {
     param([Parameter(Mandatory)][string]$DisplayName)
 
-    $matches = Get-AppxProvisionedPackage -Online | Where-Object { $_.DisplayName -eq $DisplayName }
+    try {
+        $matches = Get-AppxProvisionedPackage -Online -ErrorAction Stop | Where-Object { $_.DisplayName -eq $DisplayName }
+    }
+    catch {
+        Add-FailedItem -Category "Post-Install Tweaks" -Item $DisplayName -Reason $_.Exception.Message
+        return $false
+    }
     if (-not $matches) {
         Write-Log "Provisioned app not present: $DisplayName" -Level INFO
         return $true
@@ -1095,8 +1107,9 @@ function Disable-OptionalFeatureIfPresent {
         $feature = Get-WindowsOptionalFeature -Online -FeatureName $FeatureName -ErrorAction Stop
     }
     catch {
-        Write-Log "Optional feature not found or unavailable: $FeatureName" -Level INFO
-        return $true
+        Write-Log "Cannot check optional feature ${FeatureName}: $($_.Exception.Message)" -Level WARNING
+        Add-FailedItem -Category "Post-Install Tweaks" -Item $FeatureName -Reason $_.Exception.Message
+        return $false
     }
 
     if ($feature.State -in @("Disabled", "DisabledWithPayloadRemoved")) {
@@ -1142,7 +1155,7 @@ function Invoke-PostInstallTweaks {
     try {
         Set-RegistryValueSafe -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Communications" -Name "ConfigureChatAutoInstall" -Value 0 -Type DWord
         Set-RegistryValueSafe -Path "HKLM:\SOFTWARE\Microsoft\PolicyManager\current\device\Start" -Name "ConfigureStartPins" -Value '{"pinnedList":[]}' -Type String
-        Set-RegistryValueSafe -Path "HKU:\.DEFAULT\Control Panel\Accessibility\StickyKeys" -Name "Flags" -Value "10" -Type String
+        Set-RegistryValueSafe -Path "Registry::HKEY_USERS\.DEFAULT\Control Panel\Accessibility\StickyKeys" -Name "Flags" -Value "10" -Type String
 
         Set-RegistryValueSafe -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced" -Name "HideFileExt" -Value 0 -Type DWord
         Set-RegistryValueSafe -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced" -Name "Hidden" -Value 1 -Type DWord
@@ -1338,15 +1351,13 @@ try {
 
     $isAdmin = ([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)
     if (-not $isAdmin) {
-        Write-Log "ERROR: This script must be run as Administrator" -Level ERROR
-        exit 1
+        throw "This script must be run as Administrator"
     }
 
     Write-Log "Administrator privileges verified" -Level SUCCESS
 
     if (-not (Test-Path $SetupPath)) {
-        Write-Log "ERROR: Setup directory not found at $SetupPath" -Level ERROR
-        exit 1
+        throw "Setup directory not found at $SetupPath"
     }
 
     $SetupState = Initialize-State -StatePath $StateFile -StepIds $StepIds
@@ -1678,46 +1689,14 @@ try {
         }
 
         if ($installOptionalApps) {
+            if ('optionalWinget' -notin $RunStepIds) { $RunStepIds += 'optionalWinget' }
             $null = Invoke-WingetManifestInstall -ManifestPath $OptionalAppsJson -StepId $stepId -SummaryStep "Optional Apps" -MarkerPath $OptionalWingetMarker -ManifestLabel "optional-apps.json" -MissingManifestMessage "optional-apps.json not found"
         }
     }
 
-    $stepId = "summary"
-    if (-not (Should-RunStep -StepId $stepId)) {
-        Write-Log "Step 10: Skipping summary report (already completed)" -Level INFO
-    }
-    elseif ($DryRun) {
-        Write-Log "Step 10: Dry run - skipping summary report" -Level WARNING
-        Set-StepState -StepId $stepId -Status "pending" -Message "Dry run: summary skipped"
-    }
-    else {
-        try {
-            $failedReportPath = Write-FailedInstallsReport -DesktopPath $desktopPath
-            if ($FailedItems.Count -gt 0) {
-                Write-Log "Failed installs report written to $failedReportPath ($($FailedItems.Count) item(s))" -Level WARNING
-            }
-            else {
-                Write-Log "No failed installs - report written to $failedReportPath" -Level SUCCESS
-            }
-
-            $summaryPath = Write-SummaryReport -DesktopPath $desktopPath
-            Write-Log "Summary report written to $summaryPath" -Level SUCCESS
-            Set-StepState -StepId $stepId -Status "done" -Message "Summary report written"
-        }
-        catch {
-            Write-Log "WARNING: Failed to write summary report: $($_.Exception.Message)" -Level WARNING
-            Set-StepState -StepId $stepId -Status "failed" -Message "Summary report failed"
-        }
-    }
-
-    Write-Log "========================================" -Level INFO
-    Write-Log "Windows Setup Bootstrap - Completed" -Level SUCCESS
-    Write-Log "========================================" -Level INFO
-    Write-Log "Log file saved to: $LogFile" -Level INFO
-
-    Update-SetupProgress -Phase 'Completed' -Status 'Windows setup bootstrap completed' -CurrentPackage '' -PackageIndex 0 -PackageTotal 0 -Mode 'admin'
+    $runResult = Complete-BootstrapRun -DesktopPath $desktopPath
 
-    if ($PromptRestart) {
+    if ($PromptRestart -and -not $DryRun) {
         $restartResponse = Read-Host "Restart now? (Y/N)"
         if ($restartResponse -match '^(y|yes)$') {
             Write-Log "Restarting system..." -Level WARNING
@@ -1731,6 +1710,8 @@ try {
 catch {
     Write-Log "FATAL ERROR: $($_.Exception.Message)" -Level ERROR
     Write-Log "Stack Trace: $($_.ScriptStackTrace)" -Level ERROR
-    Update-SetupProgress -Phase 'Failed' -Status $_.Exception.Message -CurrentPackage '' -PackageIndex 0 -PackageTotal 0 -Mode 'admin'
+    $null = Complete-BootstrapRun -DesktopPath ([Environment]::GetFolderPath("Desktop")) -FailureMessage $_.Exception.Message
     exit 1
 }
+
+exit $runResult.ExitCode

modules/BootstrapRun.ps1

@@ -165,7 +165,7 @@ function Update-SetupProgress {
     }
 
     $script:ProgressState.lastUpdated = (Get-Date).ToString('o')
-    [pscustomobject]$script:ProgressState | ConvertTo-Json -Depth 4 | Set-Content -Path $ProgressFile -Encoding UTF8 -Force
+    [pscustomobject]$script:ProgressState | ConvertTo-Json -Depth 4 | Set-Content -Path $ProgressFile -Encoding UTF8 -Force -ErrorAction Stop
 }
 
 function Add-SummaryItem {
@@ -187,85 +187,161 @@ function Add-SummaryItem {
     })
 }
 
+function Get-BootstrapRunResult {
+    param([string]$FailureMessage = "")
+
+    $records = @(
+        foreach ($id in $SetupState.steps.Keys) {
+            if ($id -eq 'summary') { continue }
+            $step = $SetupState.steps[$id]
+            $included = $id -in $RunStepIds
+            $origin = if ($step.lastRun -and $step.lastRun -ge $RunStartedAt) { 'Current run' } else { 'Previous result' }
+            [pscustomobject]@{
+                Step = $id
+                Status = $step.status
+                Message = $step.message
+                Origin = $origin
+                Included = $included
+            }
+        }
+    )
+    $problems = @(
+        foreach ($record in $records) {
+            if ($record.Included -and $record.Status -notin @('done', 'skipped')) {
+                [pscustomobject]@{
+                    Category = $record.Step
+                    Item = $record.Status
+                    Reason = $record.Message
+                    Status = if ($record.Status -eq 'unverified') { 'WARN' } else { 'FAIL' }
+                }
+            }
+        }
+        foreach ($item in $FailedItems) { $item }
+        foreach ($item in $SummaryItems) {
+            if ($item.Status -in @('FAIL', 'WARN')) {
+                [pscustomobject]@{ Category = $item.Step; Item = $item.Status; Reason = $item.Message; Status = $item.Status }
+            }
+        }
+        if ($FailureMessage) {
+            [pscustomobject]@{ Category = 'Bootstrap'; Item = 'Fatal error'; Reason = $FailureMessage; Status = 'FAIL' }
+        }
+    )
+    $failed = @($problems | Where-Object { $_.Status -ne 'WARN' }).Count -gt 0
+    $status = if ($failed) { 'Failed' } elseif ($problems.Count) { 'Completed with warnings' } else { 'Completed' }
+    if ($DryRun -and -not $FailureMessage) { $status = 'Preview'; $failed = $false }
+    [pscustomobject]@{
+        StartedAt = $RunStartedAt
+        Mode = if ($OptionalAppsOnly) { 'Optional apps only' } else { 'Full setup' }
+        Status = $status
+        ExitCode = if ($failed) { 1 } else { 0 }
+        Records = $records
+        Problems = $problems
+    }
+}
+
 function Write-SummaryReport {
-    param([string]$DesktopPath)
+    param([string]$DesktopPath, [Parameter(Mandatory)][object]$Result)
 
     $summaryPath = Join-Path $DesktopPath "Setup Summary.txt"
-    $summaryLines = @(
+    $lines = @(
         "Declarative Windows Setup Summary",
-        "Generated: $(Get-Date -Format 'yyyy-MM-dd HH:mm:ss')",
+        "Run started: $($Result.StartedAt)",
+        "Mode: $($Result.Mode)",
+        "Result: $($Result.Status)",
         ""
     )
-
-    foreach ($item in $SummaryItems) {
-        $statusSymbol = switch ($item.Status) {
-            "OK" { "✓" }
-            "WARN" { "⚠" }
-            "FAIL" { "✗" }
-            default { $item.Status }
-        }
-        $summaryLines += "{0} {1}: {2}" -f $statusSymbol, $item.Step, $item.Message
+    foreach ($record in $Result.Records) {
+        $scope = if ($record.Included) { 'Included' } else { 'Not selected this run' }
+        $lines += "{0}: {1} - {2} [{3}; {4}]" -f $record.Step, $record.Status, $record.Message, $record.Origin, $scope
     }
-
-    Set-Content -Path $summaryPath -Value $summaryLines -Force
+    foreach ($problem in $Result.Problems) {
+        $lines += "{0} {1}: {2} - {3}" -f $problem.Status, $problem.Category, $problem.Item, $problem.Reason
+    }
+    Set-Content -LiteralPath $summaryPath -Value $lines -Force -ErrorAction Stop
     return $summaryPath
 }
 
 function Add-FailedItem {
     param(
-        [Parameter(Mandatory)]
-        [string]$Category,
-
-        [Parameter(Mandatory)]
-        [string]$Item,
-
-        [string]$Reason = ""
+        [Parameter(Mandatory)][string]$Category,
+        [Parameter(Mandatory)][string]$Item,
+        [string]$Reason = "",
+        [ValidateSet('FAIL', 'WARN')][string]$Status = 'FAIL'
     )
 
     $FailedItems.Add([pscustomobject]@{
         Category = $Category
-        Item     = $Item
-        Reason   = $Reason
+        Item = $Item
+        Reason = $Reason
+        Status = $Status
     })
 }
 
 function Write-FailedInstallsReport {
-    param([string]$DesktopPath)
+    param([string]$DesktopPath, [Parameter(Mandatory)][object]$Result)
 
-    $timestamp = Get-Date -Format "yyyy-MM-dd HH:mm:ss"
     $lines = @(
-        "Failed Installs - $timestamp",
-        "========================================"
+        "Setup failures and warnings",
+        "Run started: $($Result.StartedAt)",
+        "Mode: $($Result.Mode)",
+        "Result: $($Result.Status)",
+        ""
     )
-
-    if ($FailedItems.Count -eq 0) {
-        $lines += ""
-        $lines += "No failures recorded. Everything installed successfully."
+    if ($Result.Problems.Count -eq 0) {
+        $lines += "No failures or warnings in the selected steps. See Setup Summary.txt for skipped and previous results."
     }
     else {
-        $categories = $FailedItems | Select-Object -ExpandProperty Category -Unique
-        foreach ($category in $categories) {
-            $lines += ""
-            $lines += "${category}:"
-            foreach ($entry in ($FailedItems | Where-Object { $_.Category -eq $category })) {
-                $detail = if ($entry.Reason) { " - $($entry.Reason)" } else { "" }
-                $lines += "  - $($entry.Item)$detail"
-            }
+        foreach ($problem in $Result.Problems) {
+            $lines += "{0} {1}: {2} - {3}" -f $problem.Status, $problem.Category, $problem.Item, $problem.Reason
         }
-        $lines += ""
-        $lines += "========================================"
-        $lines += "Review the items above and install/apply them manually."
     }
-
-    $lines | Set-Content -Path $FailedInstallsLog -Force
-
+    $reportPaths = @($FailedInstallsLog)
     if ($DesktopPath) {
         $desktopReport = Join-Path $DesktopPath "Failed Installs.txt"
-        $lines | Set-Content -Path $desktopReport -Force
-        return $desktopReport
+        $reportPaths += $desktopReport
     }
+    $writeErrors = @(
+        foreach ($path in $reportPaths) {
+            try { $lines | Set-Content -LiteralPath $path -Force -ErrorAction Stop }
+            catch { $_.Exception.Message }
+        }
+    )
+    if ($writeErrors.Count) { throw ($writeErrors -join '; ') }
+    return $reportPaths[-1]
+}
 
-    return $FailedInstallsLog
+function Complete-BootstrapRun {
+    param([string]$DesktopPath, [string]$FailureMessage = "")
+
+    $result = Get-BootstrapRunResult -FailureMessage $FailureMessage
+    $publicationErrors = @()
+    if (-not $DryRun) {
+        try {
+            $null = Write-FailedInstallsReport -DesktopPath $DesktopPath -Result $result
+            $null = Write-SummaryReport -DesktopPath $DesktopPath -Result $result
+        }
+        catch {
+            $publicationErrors += "Report generation failed: $($_.Exception.Message)"
+            $result = Get-BootstrapRunResult -FailureMessage ((@($FailureMessage) + $publicationErrors | Where-Object { $_ }) -join '; ')
+        }
+    }
+    try {
+        Update-SetupProgress -Phase $result.Status -Status "Windows setup bootstrap: $($result.Status)" -ResetPackage -Mode 'admin'
+    }
+    catch {
+        $publicationErrors += "Progress publication failed: $($_.Exception.Message)"
+        $result = Get-BootstrapRunResult -FailureMessage ((@($FailureMessage) + $publicationErrors | Where-Object { $_ }) -join '; ')
+    }
+    if ($publicationErrors.Count -and -not $DryRun) {
+        # Publish the corrected failure result to each destination still writable.
+        foreach ($writer in @('Write-FailedInstallsReport', 'Write-SummaryReport')) {
+            try { $null = & $writer -DesktopPath $DesktopPath -Result $result }
+            catch { Write-Log "Cannot publish corrected report: $($_.Exception.Message)" -Level ERROR }
+        }
+    }
+    $level = if ($result.ExitCode) { 'ERROR' } elseif ($result.Status -eq 'Completed') { 'SUCCESS' } else { 'WARNING' }
+    Write-Log "Windows Setup Bootstrap - $($result.Status)" -Level $level
+    return $result
 }
 
 function Invoke-BootstrapRunStep {

modules/WinGetInstall.ps1

@@ -429,7 +429,7 @@ function Invoke-WingetManifestInstall {
 
             if ($unverified) {
                 $unverifiedPackages.Add($packageId)
-                Add-FailedItem -Category "$SummaryStep Verification" -Item $packageId -Reason "WinGet reported success but winget list did not verify the package"
+                Add-FailedItem -Category "$SummaryStep Verification" -Item $packageId -Reason "WinGet reported success but winget list did not verify the package" -Status WARN
                 Write-Log "WARNING: $packageId install reported success, but winget list did not verify it" -Level WARNING
                 continue
             }
@@ -455,7 +455,7 @@ function Invoke-WingetManifestInstall {
 
             if ($unverifiedCount -gt 0) {
                 Add-SummaryItem -Step $SummaryStep -Status "WARN" -Message "Installed $($installedPackages.Count) package(s); $unverifiedCount verification warning(s)"
-                Set-StepState -StepId $StepId -Status "done" -Message "Installed with $unverifiedCount verification warning(s)"
+                Set-StepState -StepId $StepId -Status "unverified" -Message "Installed with $unverifiedCount verification warning(s)"
             }
             else {
                 Add-SummaryItem -Step $SummaryStep -Status "OK" -Message "Installed $($installedPackages.Count) package(s)"