Merge 9cadb6b into ef6ac8a

Author: ranjeshj

.github/workflows/ci.yml

@@ -85,7 +85,7 @@ jobs:
         dotnet build tests/OpenClaw.Tray.IntegrationTests -c Debug -r win-x64 --no-restore
         dotnet build tests/OpenClaw.Tray.UITests -c Debug -r win-x64 --no-restore
         dotnet build tests/OpenClawTray.FunctionalUI.Tests -c Debug -r win-x64 --no-restore
-        dotnet build tests/OpenClawTray.OnboardingV2.Tests -c Debug -r win-x64 --no-restore
+        dotnet build tests/OpenClaw.SetupEngine.Tests -c Debug -r win-x64
 
     - name: Run Shared Tests
       env:
@@ -158,14 +158,14 @@ jobs:
         --logger trx;LogFileName=OpenClaw.Tray.IntegrationTests.trx"
 
     # UI tests need a real visual tree AND a system-registered WindowsAppRuntime
-    # framework MSIX — the test fixture calls Bootstrap.Initialize(1.8, stable),
+    # framework MSIX — the test fixture calls Bootstrap.Initialize(2.0, stable),
     # which looks up the framework package by identity. The hosted windows-2025
     # runner image doesn't preinstall it, so we install it explicitly here.
-    # Version pinned to match Microsoft.WindowsAppSDK 1.8.260101001 in the csprojs.
-    - name: Install WindowsAppRuntime 1.8
+    # Version pinned to match Microsoft.WindowsAppSDK 2.0.1 in the csprojs.
+    - name: Install WindowsAppRuntime 2.0.1
       shell: pwsh
       run: |
-        $url = "https://aka.ms/windowsappsdk/1.8/1.8.260101001/windowsappruntimeinstall-x64.exe"
+        $url = "https://aka.ms/windowsappsdk/2.0/2.0.1/windowsappruntimeinstall-x64.exe"
         $exe = "$env:RUNNER_TEMP\WindowsAppRuntimeInstall.exe"
         Invoke-WebRequest -Uri $url -OutFile $exe
         & $exe --quiet
@@ -184,18 +184,18 @@ jobs:
         --results-directory TestResults\FunctionalUI
         --logger trx;LogFileName=OpenClawTray.FunctionalUI.Tests.trx"
 
-    - name: Run Onboarding V2 Tests
+    - name: Run SetupEngine Tests
       run: >
         dotnet-coverage collect
-        --output TestResults\OnboardingV2\coverage.cobertura.xml
+        --output TestResults\SetupEngine\coverage.cobertura.xml
         --output-format cobertura
-        "dotnet test tests/OpenClawTray.OnboardingV2.Tests
+        "dotnet test tests/OpenClaw.SetupEngine.Tests
         --no-build
         -c Debug
         -r win-x64
         --verbosity normal
-        --results-directory TestResults\OnboardingV2
-        --logger trx;LogFileName=OpenClawTray.OnboardingV2.Tests.trx"
+        --results-directory TestResults\SetupEngine
+        --logger trx;LogFileName=OpenClaw.SetupEngine.Tests.trx"
 
     - name: Run Tray UI Tests
       run: >
@@ -222,8 +222,72 @@ jobs:
       semVer: ${{ steps.gitversion.outputs.semVer }}
       majorMinorPatch: ${{ steps.gitversion.outputs.majorMinorPatch }}
 
+  e2etests:
+    needs: repo-hygiene
+    if: ${{ !cancelled() }}
+    runs-on: windows-latest
+    timeout-minutes: 15
+    steps:
+    - name: Fail if repo hygiene failed
+      if: ${{ needs.repo-hygiene.result != 'success' }}
+      shell: pwsh
+      run: |
+        Write-Error "repo-hygiene failed; see the repo-hygiene job output."
+        exit 1
+
+    - uses: actions/checkout@v6
+      with:
+        fetch-depth: 0
+
+    - name: Setup .NET 10
+      uses: actions/setup-dotnet@v5
+      with:
+        dotnet-version: 10.0.x
+
+    - name: Cache NuGet packages
+      uses: actions/cache@v5
+      with:
+        path: ~/.nuget/packages
+        key: nuget-${{ runner.os }}-${{ hashFiles('**/*.csproj', '**/Directory.Packages.props') }}
+        restore-keys: nuget-${{ runner.os }}-
+
+    - name: Restore dependencies
+      run: dotnet restore
+
+    - name: Build Shared Library
+      run: dotnet build src/OpenClaw.Shared -c Debug --no-restore
+
+    - name: Build SetupEngine
+      run: dotnet build src/OpenClaw.SetupEngine -c Debug --no-restore
+
+    - name: Build Tray App (WinUI)
+      run: dotnet build src/OpenClaw.Tray.WinUI -c Debug -r win-x64
+
+    - name: Build E2E Tests
+      run: dotnet build tests/OpenClaw.E2ETests -c Debug -r win-x64
+
+    - name: Run E2E Tests
+      run: >
+        dotnet test tests/OpenClaw.E2ETests
+        --no-build
+        -c Debug
+        -r win-x64
+        --verbosity normal
+        --results-directory TestResults/E2E
+        --logger "trx;LogFileName=OpenClaw.E2ETests.trx"
+        --logger "console;verbosity=detailed"
+
+    - name: Upload E2E Test Results & Logs
+      if: always()
+      uses: actions/upload-artifact@v7
+      with:
+        name: e2e-test-results
+        path: |
+          TestResults/E2E/
+        if-no-files-found: warn
+
   build:
-    needs: test
+    needs: [test, e2etests]
     runs-on: ${{ matrix.rid == 'win-arm64' && 'windows-11-arm' || 'windows-latest' }}
     strategy:
       matrix:
@@ -253,6 +317,12 @@ jobs:
     - name: Publish WinUI Tray App
       run: dotnet publish src/OpenClaw.Tray.WinUI -c Release -r ${{ matrix.rid }} --self-contained --no-restore -p:Version=${{ needs.test.outputs.semVer }} -o publish
 
+    - name: Publish SetupEngine.UI
+      run: |
+        dotnet publish src/OpenClaw.SetupEngine.UI -c Release -r ${{ matrix.rid }} --self-contained -p:Version=${{ needs.test.outputs.semVer }} -o publish-setup
+        mkdir publish\SetupEngine
+        copy publish-setup\* publish\SetupEngine\ -Recurse
+
     - name: Disable NuGet source mapping for signing
       if: startsWith(github.ref, 'refs/tags/v') && matrix.rid != 'win-arm64'
       shell: pwsh
@@ -290,7 +360,7 @@ jobs:
         path: publish/
 
   build-msix:
-    needs: test
+    needs: [test, e2etests]
     runs-on: ${{ matrix.rid == 'win-arm64' && 'windows-11-arm' || 'windows-latest' }}
     continue-on-error: true
     strategy:
@@ -382,7 +452,7 @@ jobs:
         path: ${{ steps.find-msix.outputs.msix_path }}
 
   build-extension:
-    needs: test
+    needs: [test, e2etests]
     runs-on: windows-latest
     strategy:
       matrix:
@@ -416,8 +486,8 @@ jobs:
         path: src/OpenClaw.CommandPalette/bin/${{ matrix.platform }}/Debug/
 
   release:
-    needs: [repo-hygiene, test, build, build-msix, build-extension]
-    if: startsWith(github.ref, 'refs/tags/v') && needs.repo-hygiene.result == 'success' && needs.test.result == 'success' && needs.build.result == 'success' && needs.build-extension.result == 'success' && !cancelled()
+    needs: [repo-hygiene, test, e2etests, build, build-msix, build-extension]
+    if: startsWith(github.ref, 'refs/tags/v') && needs.repo-hygiene.result == 'success' && needs.test.result == 'success' && needs.e2etests.result == 'success' && needs.build.result == 'success' && needs.build-extension.result == 'success' && !cancelled()
     runs-on: windows-latest
     permissions:
       contents: write

build.ps1

@@ -23,7 +23,7 @@
 #>
 
 param(
-    [ValidateSet("All", "Tray", "WinUI", "Shared", "CommandPalette", "Cli", "WinNodeCli")]
+    [ValidateSet("All", "Tray", "WinUI", "Shared", "CommandPalette", "Cli", "WinNodeCli", "SetupEngine")]
     [string]$Project = "All",
 
     [ValidateSet("Debug", "Release")]
@@ -204,9 +204,10 @@ $projects = @{
     "Tray" = @{ Path = "src/OpenClaw.Tray.WinUI/OpenClaw.Tray.WinUI.csproj"; UseRid = $true }
     "WinUI" = @{ Path = "src/OpenClaw.Tray.WinUI/OpenClaw.Tray.WinUI.csproj"; UseRid = $true }
     "CommandPalette" = @{ Path = "src/OpenClaw.CommandPalette/OpenClaw.CommandPalette.csproj"; UseRid = $false }
+    "SetupEngine" = @{ Path = "src/OpenClaw.SetupEngine.UI/OpenClaw.SetupEngine.UI.csproj"; UseRid = $true }
 }
 
-$toBuild = if ($Project -eq "All") { @("Shared", "Cli", "WinNodeCli", "WinUI") } else { @($Project) }
+$toBuild = if ($Project -eq "All") { @("Shared", "Cli", "WinNodeCli", "SetupEngine", "WinUI") } else { @($Project) }
 
 # Always build Shared first if building other projects
 if ($Project -ne "Shared" -and $Project -ne "All" -and $toBuild -notcontains "Shared") {
@@ -221,7 +222,23 @@ foreach ($proj in $toBuild) {
 }
 
 # =============================================================================
-# SUMMARY
+# POST-BUILD: Copy SetupEngine.UI into WinUI output so the tray can find it
+# =============================================================================
+if (($buildResults.ContainsKey("SetupEngine") -and $buildResults["SetupEngine"]) -and
+    (($buildResults.ContainsKey("WinUI") -and $buildResults["WinUI"]) -or ($buildResults.ContainsKey("Tray") -and $buildResults["Tray"]))) {
+    $setupTfm = Get-ProjectTargetFramework $projects["SetupEngine"].Path
+    $winUITfm = Get-ProjectTargetFramework $projects["WinUI"].Path
+    if ($setupTfm -and $winUITfm) {
+        $setupOutDir = "src\OpenClaw.SetupEngine.UI\bin\$Configuration\$setupTfm\$rid"
+        $winUIOutDir = "src\OpenClaw.Tray.WinUI\bin\$Configuration\$winUITfm\$rid"
+        $destDir = Join-Path $winUIOutDir "SetupEngine"
+        if (Test-Path $setupOutDir) {
+            if (-not (Test-Path $destDir)) { New-Item -ItemType Directory -Path $destDir -Force | Out-Null }
+            Copy-Item "$setupOutDir\*" $destDir -Recurse -Force
+            Write-Info "Copied SetupEngine.UI output → $destDir"
+        }
+    }
+}
 # =============================================================================
 
 Write-Header "Build Summary"