Adjust support for MCP roots

build/ci/templates/dotnet-install.yml

@@ -11,24 +11,16 @@ steps:
 
   - pwsh: |
       echo "##vso[task.setvariable variable=DOTNET_INSTALL_DIR;]$(Build.SourcesDirectory)/.dotnet"
+      echo "##vso[task.setvariable variable=DOTNET_ROOT;]$(Build.SourcesDirectory)/.dotnet"
     displayName: "Set DOTNET_INSTALL_DIR for macOS/Linux"
     condition: or(eq(variables['Agent.OS'], 'Linux'), eq(variables['Agent.OS'], 'Darwin'))
 
   - pwsh: |
       echo "##vso[task.setvariable variable=DOTNET_INSTALL_DIR;]$(Build.SourcesDirectory)\.dotnet"
+      echo "##vso[task.setvariable variable=DOTNET_ROOT;]$(Build.SourcesDirectory)\.dotnet"
     displayName: "Set DOTNET_INSTALL_DIR for Windows"
     condition: eq(variables['Agent.OS'], 'Windows_NT')
 
-  - task: UseDotNet@2
-    displayName: 'Install .NET 9 Runtime'
-    retryCountOnTaskFailure: 3
-    inputs:
-      packageType: sdk
-      useGlobalJson: false
-      includePreviewVersions: false
-      version: 9.0.300
-      installationPath: $(DOTNET_INSTALL_DIR)
-
   - task: UseDotNet@2
     displayName: 'Use .NET SDK from global.json'
     retryCountOnTaskFailure: 3

build/ci/tests/.azure-devops-tests-templates.yml

@@ -255,8 +255,16 @@ jobs:
     inputs:
       artifactName: 'Nuget_Packages'
 
+  # Install the .NET 10 SDK in the default system location so 
+  # the devserver tests can find them.
+  - task: UseDotNet@2
+    displayName: Install .NET 10 SDK
+    inputs:
+      packageType: 'sdk'
+      version: '10.0.100'
+
   - template: ../templates/gitversion.yml
-  - template: ../templates/dotnet-mobile-install-windows.yml
+  - template: ../templates/dotnet-install.yml
   - template: ../templates/uno-dev-feed.yml
 
   - task: CopyFiles@2
@@ -289,3 +297,6 @@ jobs:
       BUILD_SOURCESDIRECTORY: $(BUILD.SOURCESDIRECTORY)
       NBGV_SemVer2: $(NBGV_SemVer2)
       WasmCachePath: $(WasmCachePath)
+      CODEX_API_KEY: $(OPENAPI_TOKEN)
+      UNO_STUDIO_LICENSES_BIN: $(UNO_STUDIO_LICENSES_BIN)
+      UNO_STUDIO_USER_JSON: $(UNO_STUDIO_USER_JSON)

build/test-scripts/run-devserver-cli-tests.ps1

@@ -1,4 +1,4 @@
-Set-PSDebug -Trace 1
+# Set-PSDebug -Trace 1
 
 $ErrorActionPreference = 'Stop'
 Set-StrictMode -Version Latest
@@ -91,6 +91,237 @@ function Get-PortFromCsprojUser([string]$UserFilePath) {
     return $null
 }
 
+function Ensure-CodexCli {
+    $codexCommand = Get-Command codex -ErrorAction SilentlyContinue
+    if ($codexCommand) {
+        Write-Log "Codex CLI already available at $($codexCommand.Source)"
+        return $true
+    }
+
+    Write-Log "Codex CLI not detected. Attempting installation via npm."
+
+    $npmCommand = Get-Command npm -ErrorAction SilentlyContinue
+    if (-not $npmCommand) {
+        Write-Log "npm command not found. Cannot install Codex CLI automatically."
+        return $false
+    }
+
+    $packageName = '@openai/codex'
+    $npmArgs = @('install', '-g', $packageName)
+
+    & npm @npmArgs
+    if ($LASTEXITCODE -ne 0) {
+        Write-Log "npm could not install Codex CLI package $packageName (exit code $LASTEXITCODE)."
+        return $false
+    }
+
+    $codexCommand = Get-Command codex -ErrorAction SilentlyContinue
+    if (-not $codexCommand) {
+        Write-Log "Codex CLI still unavailable after npm install attempt."
+        return $false
+    }
+
+    Write-Log "Codex CLI installed via npm at $($codexCommand.Source)"
+    return $true
+}
+
+function Invoke-CodexMcpAdd {
+    param(
+        [string]$Name,
+        [string[]]$Arguments
+    )
+
+    Write-Log "Registering Codex MCP '$Name'"
+    & codex mcp add $Name @Arguments
+    if ($LASTEXITCODE -ne 0) {
+        Write-Log "codex mcp add '$Name' exited with code $LASTEXITCODE. Continuing."
+    }
+}
+
+function Register-UnoCodexMcps {
+    param([string]$WorkingDirectory)
+
+    Push-Location $WorkingDirectory
+    try {
+        Invoke-CodexMcpAdd -Name "uno" -Arguments @("--url", "https://mcp.platform.uno/v1")
+        Invoke-CodexMcpAdd -Name "uno-app" -Arguments @("--", "dotnet", "uno-devserver", "--mcp-app", "-l", "trace")
+    }
+    finally {
+        Pop-Location
+    }
+}
+
+function Invoke-CodexToolEnumerationTest {
+    param([string]$WorkingDirectory)
+
+    $toolsFile = Join-Path $WorkingDirectory "codex-tools.json"
+    if (Test-Path $toolsFile) {
+        Remove-Item $toolsFile -Force
+    }
+
+    $toolsFileName = Split-Path $toolsFile -Leaf
+    $instructions = @"
+You are running inside an automated CI validation for the Uno Platform devserver CLI.
+
+Tasks:
+1. Create a list of all MCP tools available to you
+2. Create or overwrite a JSON file named '$toolsFileName' in the current working directory.
+    The JSON must be an object that contains a property ``"tools"`` whose value is an alphabetically sorted array listing every tool identifier you discovered.
+3. Confirm completion and exit when finished.
+
+Begin now.
+"@
+
+    $stdOutFile = [System.IO.Path]::GetTempFileName()
+    $stdErrFile = [System.IO.Path]::GetTempFileName()
+    $instructionsFile = [System.IO.Path]::GetTempFileName()
+
+    Set-Content -Path $instructionsFile -Value $instructions -Encoding utf8
+
+    $model = if (-not [string]::IsNullOrWhiteSpace($env:CODEX_MODEL)) { $env:CODEX_MODEL } else { "gpt-5-mini" }
+
+    Write-Log "Invoking Codex CLI to enumerate MCP tools."
+    $codexArgs = @(
+        '--ask-for-approval','never',
+        'exec',
+        '-m',$model,
+        '--sandbox','workspace-write',
+        '-c','mcp_servers."uno-app".startup_timeout_sec=120',
+        '-c','features.web_search_request=true',
+        '-c','features.rmcp_client=true',
+        '-c','sandbox_workspace_write.network_access=true'
+    )
+
+    $codexExecutable = "codex"
+    $codexArguments = $codexArgs
+    if ($IsWindows) {
+        # npm exposes Codex CLI through a .cmd shim on Windows, so run it via cmd.exe
+        $codexExecutable = "cmd.exe"
+        $codexArguments = @("/c", "codex") + $codexArgs
+    }
+
+    $previousRustLog = $env:RUST_LOG
+    $env:RUST_LOG = 'debug'
+    try {
+        $process = Start-Process -FilePath $codexExecutable -ArgumentList $codexArguments -WorkingDirectory $WorkingDirectory -RedirectStandardOutput $stdOutFile -RedirectStandardError $stdErrFile -RedirectStandardInput $instructionsFile -PassThru
+
+        $timeoutMs = 300000
+        if (-not $process.WaitForExit($timeoutMs)) {
+            try { $process.Kill() } catch {}
+            $stdErrContent = Get-Content $stdErrFile -ErrorAction SilentlyContinue -Raw
+            throw "Codex CLI timed out after $($timeoutMs / 1000) seconds. STDERR:`n$stdErrContent"
+        }
+
+        $stdout = Get-Content $stdOutFile -ErrorAction SilentlyContinue -Raw
+        $stderr = Get-Content $stdErrFile -ErrorAction SilentlyContinue -Raw
+
+        Remove-Item $stdOutFile -ErrorAction SilentlyContinue
+        Remove-Item $stdErrFile -ErrorAction SilentlyContinue
+        Remove-Item $instructionsFile -ErrorAction SilentlyContinue
+
+        if ($process.ExitCode -ne 0) {
+            throw "Codex CLI exited with code $($process.ExitCode).`nSTDOUT:`n$stdout`nSTDERR:`n$stderr"
+        }
+        else{
+            Write-Log "Codex CLI completed successfully."
+            Write-Log "STDOUT:`n$stdout`nSTDERR:`n$stderr"
+        }
+    }
+    finally {
+        if ($null -ne $previousRustLog) {
+            $env:RUST_LOG = $previousRustLog
+        }
+        else {
+            Remove-Item Env:RUST_LOG -ErrorAction SilentlyContinue
+        }
+    }
+
+    if (-not (Test-Path $toolsFile)) {
+        throw "Codex CLI did not create $toolsFile.`nSTDOUT:`n$stdout`nSTDERR:`n$stderr"
+    }
+
+    $jsonText = Get-Content $toolsFile -Raw -ErrorAction Stop
+    try {
+        $json = $jsonText | ConvertFrom-Json -ErrorAction Stop
+    }
+    catch {
+        throw "codex-tools.json is not valid JSON: $($_.Exception.Message)"
+    }
+
+    if (-not $json.tools -or $json.tools.Count -eq 0) {
+        throw "codex-tools.json does not contain a non-empty 'tools' array."
+    }
+
+    Write-Log "Codex CLI reported $($json.tools.Count) tools via codex-tools.json:"
+    foreach ($tool in $json.tools) {
+        Write-Log " - $tool"
+    }
+
+    $screenshotTool = $json.tools | Where-Object { $_ -like '*uno_app_get_screenshot*' } | Select-Object -First 1
+    if (-not $screenshotTool) {
+        throw "Codex CLI did not report the required 'uno_app_get_screenshot' tool."
+    }
+}
+
+function Setup-UnoStudioLicenses {
+    param([string]$WorkDirectory)
+
+    if ($IsWindows) {
+        $dataRoot = if (-not [string]::IsNullOrWhiteSpace($env:LOCALAPPDATA)) { $env:LOCALAPPDATA } else { Join-Path $WorkDirectory '.local' }
+    }
+    elseif ($IsMacOS) {
+        $homePath = if (-not [string]::IsNullOrWhiteSpace($env:HOME)) { $env:HOME } else { $WorkDirectory }
+        $dataRoot = Join-Path $homePath 'Library/Application Support'
+    }
+    else {
+        $dataRoot = Join-Path $WorkDirectory '.local'
+        $env:XDG_DATA_HOME = $dataRoot
+        Write-Log "Set XDG_DATA_HOME to $dataRoot"
+    }
+
+    if (-not (Test-Path $dataRoot)) {
+        try { New-Item -ItemType Directory -Path $dataRoot -Force | Out-Null; Write-Log "Ensured application data folder: $dataRoot" }
+        catch { Write-Warning "Failed to create application data folder '$dataRoot': $_" }
+    }
+
+    $unoDir = Join-Path $dataRoot 'Uno Platform'
+    if (-not (Test-Path $unoDir)) {
+        try { New-Item -ItemType Directory -Path $unoDir -Force | Out-Null; Write-Log "Created Uno data folder: $unoDir" }
+        catch { Write-Warning "Failed to create Uno data folder '$unoDir': $_" }
+    }
+
+    # Setting up license files this way is temporary until we get API keys.
+    if ($env:UNO_STUDIO_LICENSES_BIN) {
+        $licensesPath = Join-Path $unoDir 'licenses.bin'
+        try {
+            $env:UNO_STUDIO_LICENSES_BIN | Out-File -FilePath $licensesPath -Encoding utf8 -Force
+            Write-Log "Wrote UNO_STUDIO_LICENSES_BIN to: $licensesPath"
+        }
+        catch {
+            Write-Warning "Failed to write UNO_STUDIO_LICENSES_BIN to $licensesPath : $_"
+        }
+    }
+    else {
+        Write-Log "UNO_STUDIO_LICENSES_BIN environment variable not set. Skipping license setup."
+    }
+
+    if ($env:UNO_STUDIO_USER_JSON) {
+        $userJsonPath = Join-Path $unoDir 'user.json'
+        try {
+            $env:UNO_STUDIO_USER_JSON | Out-File -FilePath $userJsonPath -Encoding utf8 -Force
+            Write-Log "Wrote UNO_STUDIO_USER_JSON to: $userJsonPath"
+        }
+        catch {
+            Write-Warning "Failed to write UNO_STUDIO_USER_JSON to $userJsonPath : $_"
+        }
+    }
+    else {
+        Write-Log "UNO_STUDIO_USER_JSON environment variable not set. Skipping user.json setup."
+    }
+
+    return $unoDir
+}
+
 try {
     cd $env:BUILD_SOURCESDIRECTORY/src/SolutionTemplate
     & $env:BUILD_SOURCESDIRECTORY/build/test-scripts/update-uno-sdk-globaljson.ps1
@@ -104,11 +335,14 @@ try {
     $csprojPath = "$env:BUILD_SOURCESDIRECTORY/src/SolutionTemplate/5.6/uno56netcurrent/uno56netcurrent/uno56netcurrent.csproj"
     $csprojDir = Split-Path $csprojPath -Parent
     $slnDir = Split-Path $csprojDir -Parent
+    $workDir = $slnDir
 
     if (-not (Test-Path $csprojDir)) {
         throw "Project directory not found: $csprojDir"
     }
 
+    Setup-UnoStudioLicenses -WorkDirectory $workDir
+
     Set-Location $slnDir
 
     # Default port
@@ -153,6 +387,21 @@ try {
 
     & dotnet uno-devserver stop
 
+    $openApiToken = $env:CODEX_API_KEY
+    if ([string]::IsNullOrWhiteSpace($openApiToken)) {
+        Write-Log "CODEX_API_KEY not provided. Skipping Codex MCP integration test."
+    }
+    else {
+        Write-Log "CODEX_API_KEY detected. Starting Codex MCP integration test."
+        if (Ensure-CodexCli) {
+            Register-UnoCodexMcps -WorkingDirectory $slnDir
+            Invoke-CodexToolEnumerationTest -WorkingDirectory $slnDir
+        }
+        else {
+            Write-Log "Codex CLI unavailable after installation attempt. Skipping Codex MCP integration test."
+        }
+    }
+
     exit 0
 }
 catch {

doc/articles/dev-server.md

@@ -39,7 +39,7 @@ You can manage the Dev Server from the command line using the dotnet tool `Uno.D
 - `uno-devserver list`: List running Dev Server instances
 - `uno-devserver cleanup`: Terminate stale Dev Server processes
 - `uno-devserver login`: Open the Uno Platform settings application
-- `--mcp`: Run an MCP proxy mode for integration with MCP-based tooling
+- `--mcp-app`: Run an MCP proxy mode for integration with MCP-based tooling
 - `--port | -p <int>`: Optional port value for MCP proxy mode
 
 ## Hot Reload

doc/articles/get-started-ai-codex.md

@@ -12,7 +12,14 @@ This guide will walk you through the setup process for getting started with Code
 
 ## Setting up Uno Platform MCPs
 
-1. Install [Codex CLI](https://developers.openai.com/codex/cli)
+1. Install [Codex CLI](https://developers.openai.com/codex/cli) using the official commands, for example:
+
+    ```bash
+    npm i -g @openai/codex
+    # or on macOS
+    brew install --cask codex
+    ```
+
 1. Register the Uno Platform MCPs:
 
     ```bash

src/SamplesApp/UITests.Shared/UITests.Shared.projitems

@@ -4346,7 +4346,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-
     <Page Include="$(MSBuildThisFileDirectory)Microsoft_UI_Xaml_Controls\WebView2Tests\WebView2_TargetBlank.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -10227,4 +10226,4 @@
     </Compile>
   </ItemGroup>
   <Import Project="ItemExclusions.props" />
-</Project>
+</Project>