More progress + add MCP server for winapp

Author: johnml1135

.github/skills/fieldworks-installer-diagnostics/SKILL.md

@@ -28,6 +28,16 @@ This skill is evidence-first. Installer problems are often ambiguous until Burn
 5. If the UI exits silently, capture Event Viewer entries and crash dumps.
 6. Summarize the first failing layer: Burn bootstrapper, chained package/MSI, custom action, Windows Installer engine, or environment.
 
+## WinApp MCP Runtime Evidence
+
+When the WinApp MCP server is available, use it to make UI diagnostics repeatable:
+
+- Launch or attach to installer windows and wait for input idle before diagnosing UI state.
+- If the app snapshot is empty, list visible desktop windows and use `get_focused_element` plus keyboard navigation to identify and exercise controls.
+- Record the observed focus path and control names in the evidence notes, especially for silent/blank UI, MSI handoff, uninstall prompts, and ARP uninstall hangs.
+- For safe UI-only smoke tests, stop after proving the license checkbox/Install/Cancel path; do not proceed into install unless the scenario requires machine changes.
+- For hangs, combine WinApp focused-element/window evidence with bundle/MSI logs, before/after snapshots, Event Viewer entries, and process lists.
+
 ## Commands
 
 Prefer the repo helper for repeatable runs:

.github/skills/fieldworks-wix6-migration-coordinator/SKILL.md

@@ -39,6 +39,15 @@ Use this as the routing and guardrail skill for FieldWorks installer migration w
 4. Make the smallest change that addresses the root cause.
 5. Validate with the relevant build/test/evidence checklist, or clearly report why validation could not be run.
 
+## WinApp MCP UI Automation
+
+When the WinApp MCP server is installed, prefer it for Windows installer UI proof before falling back to raw screenshots or manual notes.
+
+- Use WinApp app/window tools to launch or attach to `FieldWorksBundle.exe`, `FieldWorksOfflineBundle.exe`, or `msiexec.exe` and collect UI snapshots where available.
+- WixStdBA may expose little or no UI Automation tree at the launcher PID. If the app snapshot is empty, inspect visible desktop windows, use the focused element, and drive the UI with keyboard navigation (`Tab`, `Shift+Tab`, `Space`, `Return`, `Esc`) or coordinates.
+- For safe click-through smoke tests, prove focus and interaction by toggling the license checkbox, reaching the Install button, then canceling and confirming exit. Do not click Install unless the task explicitly calls for an install/upgrade/uninstall run on that machine.
+- Always pair WinApp UI evidence with bundle/MSI logs in `Output/InstallerEvidence/<RunId>/` or the VM evidence folder.
+
 ## Source Credibility
 
 Prefer sources in this order:

.github/skills/fieldworks-wix6-ui/SKILL.md

@@ -18,7 +18,7 @@ This skill keeps FieldWorks installer UI work grounded in the actual Burn + MSI
 2. Inspect `FLExInstaller/wix6/Shared/Base/Bundle.wxs`, `OfflineBundle.wxs`, `BundleTheme.xml`, `BundleTheme.wxl`, and `FieldWorks.Bundle.wixproj` for bundle UI behavior.
 3. Inspect `Framework.wxs`, `WixUI_DialogFlow.wxs`, `GIInstallDirDlg.wxs`, and `GICustomizeDlg.wxs` for MSI UI behavior.
 4. If custom actions affect UI, inspect `Shared/CustomActions/CustomActions/CustomAction.cs` and the custom action IDs in `Framework.wxs`.
-5. Gather screenshots/logs before changing visual or sequencing behavior.
+5. Gather screenshots/logs before changing visual or sequencing behavior. If WinApp MCP is available, use it to drive the visible installer UI and record the controls/states observed.
 
 ## Mental Model
 
@@ -55,9 +55,23 @@ This skill keeps FieldWorks installer UI work grounded in the actual Burn + MSI
 4. Preserve localization: put translatable strings in existing `.wxl`/`.resx` patterns, not hardcoded source where localization is expected.
 5. Validate full, passive, and quiet modes when changing `DisplayInternalUICondition` or dialog sequencing.
 
+## WinApp MCP Click-Through Workflow
+
+Use WinApp MCP for bundle/MSI UI smoke tests whenever the server is available.
+
+1. Launch the bundle with an explicit log path, for example `FieldWorksBundle.exe /log Output\InstallerEvidence\<RunId>\bundle.log`.
+2. Wait for input idle, then request a UI snapshot. If the app-root snapshot has no accessible elements, list desktop windows and use the focused element/keyboard navigation.
+3. Safe bundle smoke test: focus Cancel, Tab/Shift+Tab through `license terms`, `I agree to the license terms.`, `Install`, and `Cancel`; press Space on the license checkbox; verify focus can reach `Install`; then Cancel and confirm exit.
+4. For install-intent tests, click `Install` only when the machine/VM is prepared for an install run and evidence collection is in place.
+5. If the MSI internal UI opens, attach to or inspect the visible `msiexec` window and capture the Destination Folders and feature-selection screens.
+
+Known behavior: the Burn launcher PID may not own the visible WixStdBA window after startup. If `get_snapshot` returns no accessible elements, use desktop window discovery, `get_focused_element`, keyboard commands, or coordinate clicks rather than concluding the UI is untestable.
+
 ## Evidence Checklist
 
 - Bundle command and UI level used.
+- WinApp MCP app/window IDs or visible window title/PID used for automation.
+- Focus/click path used to reach key controls when UI Automation does not expose a full element tree.
 - Screenshot of bundle welcome/license screen.
 - Screenshot of MSI destination folders dialog.
 - Screenshot of feature selection dialog if touched.

.github/skills/fieldworks-wix6-upgrade-patching/SKILL.md

@@ -61,6 +61,15 @@ When Programs and Features shows duplicate or strange FieldWorks entries:
 4. Use Windows Installer product inventory and registry snapshots to identify which product/package registered each ARP row.
 5. Verify uninstall from ARP does not hang and removes the expected entry only.
 
+## WinApp MCP For Upgrade/Uninstall Runs
+
+Use WinApp MCP to observe and drive UI during upgrade, repair, and uninstall evidence runs:
+
+- Attach to the visible bundle/MSI/ARP window and capture the title, PID, focused element, and any prompt text before clicking.
+- For ARP uninstall hangs, use WinApp to identify whether focus is on a hidden prompt, MSI dialog, bundle confirmation, or UAC-adjacent window before changing authoring.
+- During WiX 3 to WiX 6 upgrade tests, use WinApp screenshots/focus traces for the bundle welcome/license page, MSI destination folders page, feature tree, progress, completion, and any maintenance prompt.
+- Do not use WinApp to bypass prompts silently. The point is to document and reproduce the user-visible path while bundle/MSI logs and snapshots capture the underlying state.
+
 ## MSP Patch Gate
 
 Before creating a WiX 6 MSP path, classify the change:

.github/workflows/CI.yml

@@ -61,6 +61,103 @@ jobs:
             ./Output/**/*.log
             ./Output/**/*.log.stderr
 
+  wix6_installer_build:
+    name: Build WiX 6 installer artifacts
+    runs-on: windows-latest
+    env:
+      CROWDIN_API_KEY: ${{ secrets.FLEX_CROWDIN_API }}
+      LcmRootDir: ${{ github.workspace }}/Localizations/LCM
+    steps:
+      - name: Checkout Files
+        uses: actions/checkout@v6
+        id: checkout
+
+      - name: Checkout Helps
+        uses: actions/checkout@v6
+        with:
+          repository: 'sillsdev/FwHelps'
+          ref: 'develop'
+          fetch-depth: 0
+          path: 'DistFiles/Helps'
+
+      - name: Checkout Localizations
+        uses: actions/checkout@v6
+        with:
+          repository: 'sillsdev/FwLocalizations'
+          ref: 'develop'
+          fetch-depth: 0
+          path: 'Localizations'
+
+      - name: Checkout liblcm
+        uses: actions/checkout@v6
+        with:
+          repository: 'sillsdev/liblcm'
+          ref: 'master'
+          fetch-depth: 0
+          path: 'Localizations/LCM'
+
+      - name: Setup dotnet
+        uses: actions/setup-dotnet@v5
+        with:
+          dotnet-version: |
+            8.0.x
+
+      - name: Validate installer prerequisites
+        shell: powershell
+        run: |
+          .\Build\Agent\Setup-InstallerBuild.ps1 -ValidateOnly
+          if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
+
+      - name: Build WiX 6 installer
+        shell: powershell
+        run: |
+          $buildLog = Join-Path $pwd 'wix6-installer-build.log'
+          $exitCode = 0
+          Start-Transcript -Path $buildLog -Force
+          try {
+            .\build.ps1 -BuildInstaller -InstallerToolset Wix6 -Configuration Release -Verbosity detailed -MsBuildArgs @('/bl:wix6-installer-build.binlog','/p:FastBundleBuild=0')
+            $exitCode = $LASTEXITCODE
+          }
+          catch {
+            Write-Error $_
+            $exitCode = 1
+          }
+          finally {
+            Stop-Transcript
+          }
+          if ($exitCode -ne 0) { exit $exitCode }
+
+      - name: Audit WiX 6 installer evidence
+        shell: powershell
+        run: |
+          .\Build\Agent\Test-Wix6InstallerBuildEvidence.ps1 -Configuration Release -Platform x64 -BuildLogPath .\wix6-installer-build.log -ReportPath .\Output\InstallerEvidence\wix6-ci-build-audit.txt
+          if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
+
+      - name: Upload WiX 6 installer artifacts
+        uses: actions/upload-artifact@v7
+        if: ${{ !cancelled() }}
+        with:
+          name: wix6-installer-artifacts
+          if-no-files-found: error
+          path: |
+            FLExInstaller/wix6/bin/x64/Release/FieldWorksBundle.exe
+            FLExInstaller/wix6/bin/x64/Release/FieldWorksBundle.wixpdb
+            FLExInstaller/wix6/bin/x64/Release/FieldWorksOfflineBundle.exe
+            FLExInstaller/wix6/bin/x64/Release/FieldWorksOfflineBundle.wixpdb
+            FLExInstaller/wix6/bin/x64/Release/en-US/FieldWorks.msi
+            FLExInstaller/wix6/bin/x64/Release/en-US/FieldWorks.wixpdb
+
+      - name: Upload WiX 6 build evidence
+        uses: actions/upload-artifact@v7
+        if: ${{ always() }}
+        with:
+          name: wix6-installer-build-evidence
+          if-no-files-found: warn
+          path: |
+            wix6-installer-build.log
+            wix6-installer-build.binlog
+            Output/InstallerEvidence/**
+
   publish_test_results:
     name: Publish Test Results
     if: ${{ !cancelled() }}

.github/workflows/base-installer-cd.yml

@@ -1,6 +1,8 @@
-name: Base Installer
+name: Legacy Base Installer (WiX 3)
 
 # Builds the FieldWorks Base Installers (On- and Offline) (x64).
+# Transitional WiX 3 release lane: this workflow still checks out PatchableInstaller/genericinstaller.
+# The WiX 6 migration lane lives in CI.yml and must not depend on PatchableInstaller.
 # If `make_release` is true:
 #  - Uploads installers to https://flex-updates.s3.amazonaws.com/?prefix=jobs/FieldWorks-Win-all-Release-Base.
 #  - Tags the repository.
@@ -23,7 +25,7 @@ on:
         required: false
         default: 'develop'
       installer_ref:
-        description: 'Commit-ish for PatchableInstaller repository'
+        description: 'Commit-ish for PatchableInstaller repository (legacy WiX 3 lane only)'
         required: false
         default: 'master'
       localizations_ref:
@@ -40,7 +42,7 @@ on:
         default: 'false'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:
@@ -49,7 +51,7 @@ jobs:
       CROWDIN_API_KEY: ${{ secrets.FLEX_CROWDIN_API }}
       LcmRootDir: ${{ github.workspace }}/Localizations/LCM
       FILESTOSIGNLATER: ./signExternally
-    name: Build Debug and run Tests
+    name: Build legacy WiX 3 base installer and run tests
     runs-on: windows-latest
     steps:
       - name: Compute build number
@@ -60,6 +62,7 @@ jobs:
           $combined = $lastJenkins + $githubRun
           echo "Calculated build number: $combined"
           echo "FW_BUILD_NUMBER=$combined" >> $env:GITHUB_ENV
+          echo "fw_build_number=$combined" >> $env:GITHUB_OUTPUT
 
       - name: Checkout Files
         uses: actions/checkout@v6
@@ -77,7 +80,7 @@ jobs:
           fetch-depth: 0
           path: 'DistFiles/Helps'
 
-      - name: Checkout PatchableInstaller
+      - name: Checkout PatchableInstaller (legacy WiX 3 only)
         uses: actions/checkout@v6
         id: installer-checkout
         with:
@@ -295,8 +298,8 @@ jobs:
         uses: softprops/action-gh-release@153bb8e04406b158c6c84fc1615b65b24149a1fe
         with:
             target_commitish: ${{ github.event.inputs.fw_ref || github.ref }}
-            tag_name: build-${{ env.FW_BUILD_NUMBER }}
-            name: "FieldWorks Base Build #${{ env.FW_BUILD_NUMBER }}"
+            tag_name: build-${{ steps.build_number.outputs.fw_build_number }}
+            name: "FieldWorks Base Build #${{ steps.build_number.outputs.fw_build_number }}"
             draft: false
             prerelease: true
             fail_on_unmatched_files: true

.github/workflows/patch-installer-cd.yml

@@ -1,6 +1,8 @@
-name: Patch Installer
+name: Legacy Patch Installer (WiX 3)
 
 # Builds the FieldWorks Patch Installer on the specified `base_release`
+# Transitional WiX 3 patch lane: WiX 6 patch/MSP support is deferred and not provided by this workflow.
+# This workflow still checks out PatchableInstaller/genericinstaller for the legacy patch process.
 # If `make_release` is true, uploads installers to https://flex-updates.s3.amazonaws.com/?prefix=jobs/FieldWorks-Win-all-Release-Patch.
 # Saves the build log as an artifact of the workflow run.
 # Note: FW_BUILD_NUMBER is higher than GITHUB_RUN_NUMBER because it needs to be higher than the build number on artifacts from our previous system.
@@ -23,7 +25,7 @@ on:
         required: false
         default: 'develop'
       installer_ref:
-        description: 'Commit-ish for PatchableInstaller repository'
+        description: 'Commit-ish for PatchableInstaller repository (legacy WiX 3 lane only)'
         required: false
         default: 'master'
       localizations_ref:
@@ -50,7 +52,7 @@ on:
         default: 'true'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:
@@ -63,7 +65,7 @@ jobs:
       FILESTOSIGNLATER: ./signExternally
       GH_TOKEN: ${{ github.token }}
       BASE_BUILD_NUMBER: ${{ inputs.base_build_number || '1416' }}
-    name: Build Debug and run Tests
+    name: Build legacy WiX 3 patch installer and run tests
     runs-on: windows-latest
     steps:
       - name: Compute build number for archival
@@ -92,7 +94,7 @@ jobs:
           fetch-depth: 0
           path: 'DistFiles/Helps'
 
-      - name: Checkout PatchableInstaller
+      - name: Checkout PatchableInstaller (legacy WiX 3 only)
         uses: actions/checkout@v6
         id: installer-checkout
         with: