diff --git a/.agents/skills/openclaw-proof-validation/SKILL.md b/.agents/skills/openclaw-proof-validation/SKILL.md
new file mode 100644
index 000000000..098aeb71e
--- /dev/null
+++ b/.agents/skills/openclaw-proof-validation/SKILL.md
@@ -0,0 +1,80 @@
+---
+name: openclaw-proof-validation
+description: "Plan and collect OpenClaw Windows validation/proof: tests, rubber-duck review, UI evidence, MCP output, and gateway runtime proof."
+---
+
+# OpenClaw Proof and Validation
+
+Use for changes that affect tray UX, Settings, onboarding, chat/canvas, Command Center, Windows node capabilities, local MCP, gateway connection/pairing, permissions, diagnostics, or agent-facing instructions.
+
+## Rules
+
+- Required automated/focused tests are mandatory. Do not ask to skip them.
+- Prefer isolated tray data so proof does not mutate `%APPDATA%\OpenClawTray`.
+- Computer-use is usually a batched closeout proof pass, not a continuous dev-loop tool. Mid-development use is fine when explicitly requested or needed to unblock work; ask first whether to run it or provide manual screenshot/output steps.
+- Local MCP is part of every Windows node command contract: command discovery and invocation must work through `winnode` or raw MCP JSON-RPC.
+- Rubber-duck review is required before PR publication for non-trivial UI/MCP/node-command/setup/pairing/security/permissions/diagnostics work; it is also useful mid-development when extra design/testing validation is requested.
+- Report blockers explicitly. Do not turn missing UI, MCP, gateway, camera, screen, or permission proof into success-shaped wording.
+
+## Required validation
+
+```powershell
+$env:OPENCLAW_REPO_ROOT = (Get-Location).Path
+.\build.ps1
+dotnet test .\tests\OpenClaw.Shared.Tests\OpenClaw.Shared.Tests.csproj --no-restore
+dotnet test .\tests\OpenClaw.Tray.Tests\OpenClaw.Tray.Tests.csproj --no-restore
+```
+
+Fresh worktrees may need a first run without `--no-restore`, or a project build first, so tests do not no-op before `bin\` exists.
+
+For `winnode`, command descriptions, or new/renamed node commands, also run:
+
+```powershell
+dotnet test .\tests\OpenClaw.WinNode.Cli.Tests\OpenClaw.WinNode.Cli.Tests.csproj --no-restore
+```
+
+## Proof checklist
+
+| Surface | Proof to collect |
+|---|---|
+| UI / WinUI | Launch `.\run-app-local.ps1 -Isolated`, exercise the changed path with computer-use or developer-provided screenshots/output, and include visible evidence or blocker. If the developer captures manually, provide exact steps and confirm screenshot/artifact links resolve after updating the PR body. |
+| Local MCP | Enable **Local MCP Server**, run `winnode --list-tools`, then invoke the changed command with `winnode --command <name> --params '<json-object>'`. |
+| Raw MCP HTTP | For protocol/server-shape changes, paste JSON-RPC `tools/list` and `tools/call` responses from `http://127.0.0.1:8765/`. |
+| Gateway path | When relevant and available, prove `openclaw nodes invoke --command <name> --params '<json-object>'`; otherwise state the gateway blocker. |
+| Rubber-duck | Ask a rubber-duck reviewer to inspect the final implementation/proof plan; verify any finding before changing code. |
+
+For isolated tray runs, copy the data directory printed by `run-app-local.ps1 -Isolated` and set it before MCP proof commands:
+
+```powershell
+$env:OPENCLAW_TRAY_DATA_DIR = '<isolated-data-dir-from-run-app-local>'
+```
+
+Raw token lookup:
+
+```powershell
+$tokenPath = if ($env:OPENCLAW_TRAY_DATA_DIR) {
+    Join-Path $env:OPENCLAW_TRAY_DATA_DIR 'mcp-token.txt'
+} else {
+    Join-Path $env:APPDATA 'OpenClawTray\mcp-token.txt'
+}
+$token = Get-Content $tokenPath -Raw
+```
+
+## New Windows node command checklist
+
+1. Register the command in the same `INodeCapability` path used by the gateway node.
+2. Add/update `McpToolBridge.CommandDescriptions`.
+3. Update `src/OpenClaw.WinNode.Cli/skill.md` with input shape, output shape, side effects, permissions, and examples.
+4. Add/update capability, MCP bridge, `winnode`, and UI/gateway tests as applicable.
+5. Prove discovery and invocation with `winnode` or raw MCP JSON-RPC.
+6. Prove the gateway path when the behavior is gateway-mediated and a gateway is available.
+
+## PR proof package
+
+Before publishing or updating a PR, collect:
+
+1. `## Validation` with exact commands and pass/fail counts.
+2. `## Real behavior proof` with current-head after-change evidence that directly shows the changed behavior: copied live output, screenshot/video, developer-provided screenshot, copied UI diagnostics, `winnode`, raw MCP JSON-RPC, gateway invoke output, redacted runtime log, or linked artifact. For UI changes, prefer screenshots/video of the active changed state, not only adjacent or empty UI.
+3. PR body proof must stay in sync with current behavior: remove stale screenshots/claims after design changes and verify embedded image/artifact links resolve.
+4. Rubber-duck notes for non-trivial UI/MCP-sensitive work, or why skipped.
+5. `Not verified / blocked` notes for focused proof or unavailable dependencies.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index ea618d645..8b7a3122f 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "gitversion.tool": {
-      "version": "6.7.0",
+      "version": "6.8.1",
       "commands": [
         "dotnet-gitversion"
       ],
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 000000000..0dbd805de
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,89 @@
+## Summary
+
+<!-- Describe the problem and fix in 2-5 bullets. -->
+
+- Problem:
+- Why it matters:
+- What changed:
+- User impact:
+- What did NOT change (scope boundary):
+
+## Change Type (select all)
+
+<!-- Select all that apply. -->
+
+- [ ] Bug fix
+- [ ] Feature
+- [ ] Refactor
+- [ ] Docs / instructions
+- [ ] Tests / validation
+- [ ] Security hardening
+- [ ] Chore / infra
+
+## Scope (select all touched areas)
+
+- [ ] Tray / WinUI UX
+- [ ] Windows node capability
+- [ ] Local MCP / `winnode`
+- [ ] Gateway / connection / pairing
+- [ ] Setup / onboarding
+- [ ] Permissions / privacy / security
+- [ ] Tests / CI / docs
+
+## Linked Issue/PR
+
+- Closes #
+- Related #
+- [ ] Related to a bug or regression
+
+## Validation
+
+<!-- Include exact commands and pass/fail counts. Baseline after code changes:
+- .\build.ps1
+- dotnet test .\tests\OpenClaw.Shared.Tests\OpenClaw.Shared.Tests.csproj --no-restore
+- dotnet test .\tests\OpenClaw.Tray.Tests\OpenClaw.Tray.Tests.csproj --no-restore
+Add focused tests when relevant, for example WinNode CLI tests for command/MCP docs changes.
+In fresh worktrees, make sure tests actually ran and report non-zero test counts.
+-->
+
+## Real behavior proof
+
+<!-- Paste at least one current-head after-change proof item that directly demonstrates the changed behavior.
+Use whatever proof best matches the change: copied live output, screenshot/video,
+developer-provided screenshot, copied UI diagnostics, winnode output, raw MCP
+JSON-RPC tools/list + tools/call, gateway invoke output, redacted runtime log,
+or linked artifact. For UI changes, prefer screenshots/video of the active
+changed state, not only adjacent or empty UI. -->
+
+- Environment tested:
+- PR head / commit tested:
+- Exact steps or command run:
+- Evidence after fix:
+- Observed result:
+- Screenshot/artifact links verified? (`Yes/No/N/A`)
+- Not verified / blocked:
+
+<!-- Optional: add rubber-duck review notes in addition to runtime proof above. -->
+
+## Security Impact (required)
+
+- New permissions/capabilities? (`Yes/No`)
+- Secrets/tokens handling changed? (`Yes/No`)
+- New/changed network calls? (`Yes/No`)
+- Command/tool execution surface changed? (`Yes/No`)
+- Data access scope changed? (`Yes/No`)
+- If any `Yes`, explain risk + mitigation:
+
+## Compatibility / Migration
+
+- Backward compatible? (`Yes/No`)
+- Config/env changes? (`Yes/No`)
+- Migration needed? (`Yes/No`)
+- If yes, exact upgrade steps:
+
+## Review Conversations
+
+- [ ] I replied to or resolved every bot review conversation I addressed in this PR.
+- [ ] I left unresolved only conversations that still need reviewer or maintainer judgment.
+
+If a bot review conversation is addressed by this PR, resolve that conversation yourself. Do not leave bot review conversation cleanup for maintainers.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 90182d08f..47c846885 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -91,7 +91,7 @@ jobs:
 
     - name: Cache NuGet packages
       continue-on-error: true
-      uses: actions/cache@v5
+      uses: actions/cache@v6
       with:
         path: ~/.nuget/packages
         key: nuget-${{ runner.os }}-${{ hashFiles('**/*.csproj', '**/Directory.Packages.props') }}
@@ -275,7 +275,55 @@ jobs:
         -r win-x64
         --verbosity normal
         --results-directory TestResults\TrayUI
-        --logger trx;LogFileName=OpenClaw.Tray.UITests.trx"
+        --logger trx;LogFileName=OpenClaw.Tray.UITests.trx
+        --filter Category!=Accessibility"
+
+    # Accessibility Insights CI pass: scans each page in the real app process.
+    - name: Run Accessibility Tests (Axe.Windows)
+      id: a11y
+      run: >
+        dotnet test tests/OpenClaw.Tray.UITests
+        --no-build
+        -c Debug
+        -r win-x64
+        --verbosity normal
+        --results-directory TestResults\Accessibility
+        --logger "trx;LogFileName=Accessibility.trx"
+        --filter Category=Accessibility
+
+    - name: Accessibility test summary
+      if: always() && steps.a11y.outcome != 'skipped'
+      shell: pwsh
+      run: |
+        if ("${{ steps.a11y.outcome }}" -eq "failure") {
+          "### :x: Accessibility violations detected" >> $env:GITHUB_STEP_SUMMARY
+          "" >> $env:GITHUB_STEP_SUMMARY
+          "Axe.Windows scans found WCAG violations in one or more pages." >> $env:GITHUB_STEP_SUMMARY
+          "See the `Accessibility.trx` artifact for details." >> $env:GITHUB_STEP_SUMMARY
+        } else {
+          "### :white_check_mark: Accessibility scans passed" >> $env:GITHUB_STEP_SUMMARY
+          "" >> $env:GITHUB_STEP_SUMMARY
+          "All pages passed Axe.Windows accessibility validation." >> $env:GITHUB_STEP_SUMMARY
+        }
+
+    - name: Verify DevBuild identity marker
+      shell: pwsh
+      run: |
+        dotnet build src/OpenClaw.Tray.WinUI -c Debug -r win-x64 -p:DevBuild=true --no-restore
+        $marker = Get-ChildItem -Path src\OpenClaw.Tray.WinUI\bin\Debug -Recurse -Filter app-identity.txt |
+          Where-Object { $_.FullName -like '*\win-x64\app-identity.txt' } |
+          Sort-Object LastWriteTimeUtc -Descending |
+          Select-Object -First 1
+        if ($null -eq $marker) {
+          throw "Dev identity marker was not produced by the DevBuild."
+        }
+
+        $identity = (Get-Content -LiteralPath $marker.FullName -Raw).Trim()
+        if ($identity -ne "dev") {
+          throw "Expected DevBuild identity marker 'dev' but found '$identity' at $($marker.FullName)."
+        }
+
+        Write-Host "DevBuild identity marker verified at $($marker.FullName): $identity"
 
     - name: Upload Test Results
       if: always()
@@ -293,16 +341,19 @@ jobs:
     needs: repo-hygiene
     if: ${{ !cancelled() }}
     runs-on: windows-latest
-    timeout-minutes: 25
+    timeout-minutes: ${{ matrix.timeout_minutes }}
     strategy:
       fail-fast: false
       matrix:
         include:
           - name: setup-connect
-            filter: FullyQualifiedName~OpenClaw.E2ETests.Setup.SetupAndConnectTests
+            timeout_minutes: 45
+            filter: "FullyQualifiedName~OpenClaw.E2ETests.Setup.SetupAndConnectTests|FullyQualifiedName~OpenClaw.E2ETests.Setup.MxcSetupAndConnectTests"
           - name: revocation-recovery
+            timeout_minutes: 25
             filter: FullyQualifiedName~OpenClaw.E2ETests.Setup.RevocationAndRecoveryTests
           - name: network-recovery
+            timeout_minutes: 25
             filter: FullyQualifiedName~OpenClaw.E2ETests.Setup.NetworkRecoveryTests
     steps:
     - name: Fail if repo hygiene failed
@@ -323,7 +374,7 @@ jobs:
 
     - name: Cache NuGet packages
       continue-on-error: true
-      uses: actions/cache@v5
+      uses: actions/cache@v6
       with:
         path: ~/.nuget/packages
         key: nuget-${{ runner.os }}-${{ hashFiles('**/*.csproj', '**/Directory.Packages.props') }}
@@ -366,6 +417,36 @@ jobs:
           Write-Error "E2E shard '${{ matrix.name }}' executed zero tests. Check OPENCLAW_RUN_E2E gating/filter before merging."
           exit 1
         }
+        if ("${{ matrix.name }}" -eq "setup-connect") {
+          $mxcProofNames = @(
+            "RealGateway_SystemRun_ExecutesThroughWindowsNodeMxcSandbox",
+            "RealGateway_SystemRun_BlocksWritesToTrayDataDirectoryInMxcSandbox"
+          )
+
+          foreach ($mxcProofName in $mxcProofNames) {
+            $mxcProof = @($trx.TestRun.Results.UnitTestResult | Where-Object { $_.testName -like "*$mxcProofName*" }) | Select-Object -First 1
+            if ($null -eq $mxcProof) {
+              Write-Error "E2E shard '${{ matrix.name }}' did not report the MXC proof test '$mxcProofName'. Check the setup-connect filter before merging."
+              exit 1
+            }
+
+            $mxcOutcome = [string]$mxcProof.outcome
+            if ($mxcOutcome -eq "Passed") {
+              Write-Host "MXC E2E proof passed: $mxcProofName"
+            } elseif ($mxcOutcome -eq "NotExecuted" -or $mxcOutcome -eq "Skipped") {
+              $mxcSkipReason = @($mxcProof.Output.ErrorInfo.Message, $mxcProof.Output.StdOut) |
+                Where-Object { -not [string]::IsNullOrWhiteSpace($_) } |
+                Select-Object -First 1
+              if ([string]::IsNullOrWhiteSpace($mxcSkipReason)) {
+                $mxcSkipReason = "skip reason was not present in the trx output"
+              }
+              Write-Warning "MXC E2E proof skipped: $mxcProofName; $mxcSkipReason"
+            } else {
+              Write-Error "MXC E2E proof '$mxcProofName' had unexpected outcome '$mxcOutcome'."
+              exit 1
+            }
+          }
+        }
 
     - name: Upload E2E Test Results & Logs
       if: always()
@@ -395,7 +476,7 @@ jobs:
 
     - name: Cache NuGet packages
       continue-on-error: true
-      uses: actions/cache@v5
+      uses: actions/cache@v6
       with:
         path: ~/.nuget/packages
         key: nuget-${{ runner.os }}-${{ hashFiles('**/*.csproj', '**/Directory.Packages.props') }}
@@ -479,7 +560,7 @@ jobs:
 
     - name: Cache NuGet packages
       continue-on-error: true
-      uses: actions/cache@v5
+      uses: actions/cache@v6
       with:
         path: ~/.nuget/packages
         key: nuget-${{ runner.os }}-${{ hashFiles('**/*.csproj', '**/Directory.Packages.props') }}
diff --git a/.github/workflows/copilot-setup-steps.yml b/.github/workflows/copilot-setup-steps.yml
index 6b926f18f..a0a21cd0f 100644
--- a/.github/workflows/copilot-setup-steps.yml
+++ b/.github/workflows/copilot-setup-steps.yml
@@ -21,6 +21,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v7
       - name: Install gh-aw extension
-        uses: github/gh-aw-actions/setup-cli@bee9622162d2319e68ef2594442f58c815f28d7f # v0.80.8
+        uses: github/gh-aw-actions/setup-cli@3fac1cfa7a5a375a6a5eb9839178f6dad7adb60a # v0.82.2
         with:
           version: v0.72.1
diff --git a/AGENTS.md b/AGENTS.md
index 6c288035f..cc42d2f9d 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -13,6 +13,8 @@ Required steps:
 3. Run tray tests:
    - `dotnet test ./tests/OpenClaw.Tray.Tests/OpenClaw.Tray.Tests.csproj --no-restore`
 
+This is the required local closeout subset for agents. CI also builds and runs additional connection, setup, CLI, UI, accessibility, integration, and E2E suites; see `docs/TEST_COVERAGE.md` for the broader test inventory and `.github/workflows/ci.yml` for the workflow source of truth.
+
 If a command fails:
 
 1. Fix the issue.
@@ -22,13 +24,51 @@ If a command fails:
 Notes:
 
 - If a build/test is blocked by an environmental lock (for example running executable locking output assemblies), stop/close the locking process and rerun.
+- If validation is blocked by missing local Windows prerequisites, run `.\scripts\setup-dev.ps1` to install/verify developer and agent prerequisites, then rerun validation. Use `.\scripts\setup-dev.ps1 -CheckOnly` when you only need diagnostics.
 - **First-run gotcha**: `dotnet test --no-restore` silently no-ops in a fresh worktree where the test `bin/` doesn't exist yet (reports "Build succeeded in 0.5s" then exits 0 with no tests run). For first-run validation, either omit `--no-restore` OR run `dotnet build` on the test project first. Subsequent reruns honor `--no-restore` correctly.
 - In linked git worktrees, set `OPENCLAW_REPO_ROOT` to the worktree path before running tests that discover the repository root, for example:
-  - `$env:OPENCLAW_REPO_ROOT='D:\github\moltbot-windows-hub.<worktree-name>'`
+  - `$env:OPENCLAW_REPO_ROOT='D:\github\openclaw-windows-node.<worktree-name>'`
 - Tray tests must isolate `SettingsManager` from real user settings. Do not use `new SettingsManager()` in tests unless the test intentionally reads `%APPDATA%\OpenClawTray\settings.json`; pass a temp settings directory or set `OPENCLAW_TRAY_DATA_DIR` before the test process starts.
 - Prefer isolated worktrees for PR validation. Use `git-wt` for worktree workflows; `wt.exe` may resolve to WorkTrunk instead of Windows Terminal, so use the full Windows Terminal path when explicitly launching Terminal.
 - Do not claim completion without reporting validation results.
 
+## Targeted Validation Paths
+
+Run the required validation above for every code change, then add the targeted path that matches the touched subsystem.
+
+### MXC / `system.run` / Windows node command execution
+
+When changing MXC sandboxing, `system.run`, exec approvals, Windows node command execution, gateway setup/connect E2E behavior, or files under `src\OpenClaw.Shared\Mxc`, run:
+
+```powershell
+.\scripts\validate-mxc-e2e.ps1
+```
+
+The script sets `OPENCLAW_RUN_E2E` and `OPENCLAW_RUN_MXC_E2E` itself, then runs the real WSL Gateway -> Windows node -> `system.run` MXC E2E proofs. It fails if the MXC proof skips. Use `-AllowSkip` only to document that the current host is not MXC-capable; do not report an `-AllowSkip` run as merge validation for MXC-related work.
+
+## UI, MCP, and PR Proof
+
+Use `.agents/skills/openclaw-proof-validation/SKILL.md` when a change touches tray UX, Settings, onboarding, chat/canvas, Command Center, Windows node capabilities, MCP, gateway connection/pairing, permissions, diagnostics, or agent-facing instructions.
+
+Policy:
+
+- Required automated/focused tests are mandatory; do not ask to skip them.
+- Prefer computer-use as a batched closeout proof pass before PRs. If UI proof is useful mid-development, first ask whether to run computer-use now or provide manual steps so the developer can capture screenshots/output.
+- For UI claims, collect current-head visible proof of the active changed state: computer-use screenshot/video, developer-provided screenshot, copied UI diagnostics, or an explicit blocker.
+- If the developer captures UI proof manually, run or point them at the current isolated app, provide exact reproduction/capture steps, and verify any PR screenshot/artifact links after updating the PR body.
+- For node/MCP changes, prove discovery and invocation with `winnode --list-tools` plus `winnode --command ...`, or raw MCP JSON-RPC `tools/list` plus `tools/call`.
+- For gateway-mediated behavior, prove the real gateway path when available; otherwise state the blocker and keep MCP proof.
+- Run rubber-duck review before PR publication for non-trivial UI, MCP, node-command, setup, pairing, security, permissions, or diagnostics changes.
+- PRs should include `## Validation` and `## Real behavior proof`; proof must directly show the changed behavior from the current PR head. Fill `Not verified / blocked` for focused proof or unavailable dependencies.
+
+Every new Windows node call must be exposed, documented, and tested through MCP before completion:
+
+1. Register the capability/command in the tray node capability registry.
+2. Add/update `McpToolBridge.CommandDescriptions`.
+3. Update `src/OpenClaw.WinNode.Cli/skill.md`.
+4. Add/update capability, MCP bridge, `winnode`, and UI/gateway tests as appropriate.
+5. Run required validation plus `dotnet test .\tests\OpenClaw.WinNode.Cli.Tests\OpenClaw.WinNode.Cli.Tests.csproj --no-restore` when `winnode`, MCP output, or command docs change.
+
 ## Architecture Context for New Agents
 
 Start with these docs before changing connection, pairing, node, MCP, or tray UX behavior:
@@ -37,6 +77,19 @@ Start with these docs before changing connection, pairing, node, MCP, or tray UX
 - `docs/MCP_MODE.md` - local MCP server mode and the `EnableNodeMode` / `EnableMcpServer` matrix.
 - `docs/WINDOWS_NODE_TESTING.md` - Windows node capabilities, manual smokes, and gateway-dependent behavior.
 - `docs/ONBOARDING_WIZARD.md` - first-run setup flow, setup-code/bootstrap pairing, and test isolation.
+- `docs/SETUP_ENGINE_REDESIGN.md` - setup pipeline, rollback/logging, Windows node context injection, and setup CLI contract.
+- `docs/WSL_EXE_ARGV_PITFALL.md` - wsl.exe argv variable-expansion pitfall; required reading before adding any multi-line WSL script through `RunInWslAsync`.
+
+## Architecture Guardrails for Large Refactors
+
+`src\OpenClaw.Tray.WinUI\App.xaml.cs` and `src\OpenClaw.Tray.WinUI\Pages\ConnectionPage.xaml.cs` are active god-file reduction targets. When touching either file:
+
+- Prefer completing a real ownership transfer over moving code to partial classes. A new partial file is not progress unless it introduces a narrower owner, pure projection, policy, service, or tested seam.
+- Keep `App` as the composition root. Shrink it by delegating cohesive behavior to focused services, but do not relocate startup ordering into another god object.
+- Keep `ConnectionPage.xaml.cs` as the WinUI applicator until a pure row/plan/workflow seam exists. Do not move named-control setters into a presenter that just wraps the page.
+- Add characterization tests before moving startup, credential, pairing, node/MCP, tray action, or direct-connect rollback behavior. Source-text contract tests are acceptable for WinUI-only seams, but prefer pure unit tests for policies and projections.
+- Keep PRs small and reviewable: one seam per PR, with a clear invariant protected by tests. Stop and re-plan if a PR moves hundreds of lines without behavior coverage.
+- In PR descriptions and handoffs, name the old owner, new owner, preserved invariant, and validation run so future agents do not reintroduce duplicate paths or grow new god objects.
 
 Important current facts:
 
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index f7f93754c..d60c18d99 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -18,14 +18,19 @@ A comprehensive guide for building, running, and contributing to the OpenClaw Wi
 
 - **.NET 10 SDK** - [Download here](https://dotnet.microsoft.com/download)
 - **Windows 10/11** - WinUI 3 and Windows App SDK require Windows 10 version 1903 or later
+- **Node.js LTS with npm** - Required by the WinUI build to restore JavaScript build assets
+- **Windows 10 SDK** - Required for WinUI builds
 - **WebView2 Runtime** - Usually pre-installed on Windows 10+ ([Manual download](https://developer.microsoft.com/microsoft-edge/webview2/))
 - **Visual Studio 2022** (optional) - For easier development and debugging with WinUI 3 designer support
 
+Run `.\scripts\setup-dev.ps1` from the repository root to install or verify local prerequisites with winget. Agents can use `.\scripts\setup-dev.ps1 -RunValidation` to prepare the worktree and run the required closeout validation.
+
 ### For Testing
 
-- **A running OpenClaw gateway instance** - The gateway provides the backend for chat, sessions, and notifications
+- **A running OpenClaw gateway instance** - The gateway provides the backend for chat, sessions, and notifications when validating gateway-mediated flows
   - Default gateway URL: `ws://localhost:18789`
   - You'll need a valid authentication token from your OpenClaw instance
+- **Local MCP Server** - Windows node capabilities can also be validated without a gateway by enabling Local MCP Server in the tray Settings UI and using `winnode`
 
 ## Project Structure
 
@@ -39,14 +44,24 @@ openclaw-windows-hub/
 │   │   ├── Models.cs                 # Data models (SessionInfo, ChannelHealth, etc.)
 │   │   └── IOpenClawLogger.cs        # Logging interface
 │   │
+│   ├── OpenClaw.Connection/          # Gateway registry, credentials, connection manager
+│   │
 │   ├── OpenClaw.Chat/                # Native chat model and reducer
 │   │   ├── ChatModels.cs             # Threads, entries, events, provider contract
 │   │   └── ChatTimelineReducer.cs    # Timeline state transitions
 │   │
+│   ├── OpenClaw.Cli/                 # WebSocket connect/send/probe validator
+│   │
+│   ├── OpenClaw.WinNode.Cli/         # winnode local MCP/Windows-node CLI
+│   │
+│   ├── OpenClaw.SetupEngine/         # Local WSL gateway setup and setup-code support
+│   │
+│   ├── OpenClaw.SetupEngine.UI/      # WinUI setup wizard pages hosted by the tray app
+│   │
 │   ├── OpenClawTray.FunctionalUI/    # Small in-repo declarative WinUI helper
 │   │   └── FunctionalUI.cs           # Components, hooks, elements, host control
 │   │
-│   ├── OpenClaw.Tray.WinUI/          # WinUI 3 system tray application (primary)
+│   └── OpenClaw.Tray.WinUI/          # WinUI 3 system tray application (primary)
 │   │   ├── App.xaml.cs               # Main application, tray icon, gateway connection
 │   │   ├── Services/                 # Settings, logging, hotkeys, deep links
 │   │   ├── Windows/                  # UI windows (Settings, WebChat, Status, etc.)
@@ -54,11 +69,15 @@ openclaw-windows-hub/
 │   │   └── Helpers/                  # Icon generation, utilities
 │   │
 ├── tests/
-│   ├── OpenClaw.Shared.Tests/        # Unit tests for shared library
-│   └── OpenClaw.Tray.Tests/          # Tests for tray helpers (menu, settings, deep links)
-│
-├── tools/
-│   └── icongen/                      # Icon generation tool
+│   ├── OpenClaw.Shared.Tests/        # Unit tests for shared library/capabilities/MCP
+│   ├── OpenClaw.Connection.Tests/    # Gateway registry and connection manager tests
+│   ├── OpenClaw.Tray.Tests/          # Tests for tray helpers (menu, settings, deep links)
+│   ├── OpenClaw.WinNode.Cli.Tests/   # winnode CLI contract tests
+│   ├── OpenClaw.SetupEngine.Tests/      # Setup engine tests
+│   ├── OpenClaw.Tray.UITests/           # Native WinUI/A2UI UI tests
+│   ├── OpenClawTray.FunctionalUI.Tests/ # FunctionalUI smoke tests
+│   ├── OpenClaw.Tray.IntegrationTests/  # Real-process tray/MCP integration tests
+│   └── OpenClaw.E2ETests/               # Gateway-mediated setup/connect E2E suites
 │
 ├── .github/workflows/
 │   └── ci.yml                        # GitHub Actions CI/CD workflow
@@ -71,9 +90,11 @@ openclaw-windows-hub/
 ### Project Dependencies
 
 ```
-OpenClaw.Tray.WinUI  ──depends on──▶  OpenClaw.Shared
-OpenClaw.Shared.Tests  ──tests──▶  OpenClaw.Shared
-OpenClaw.Tray.Tests  ──tests──▶  OpenClaw.Shared
+OpenClaw.Tray.WinUI  ──depends on──▶  OpenClaw.Shared + OpenClaw.Connection + OpenClaw.Chat + OpenClaw.SetupEngine.UI
+OpenClaw.WinNode.Cli  ──depends on──▶  OpenClaw.Shared
+OpenClaw.SetupEngine.UI  ──wraps──▶  OpenClaw.SetupEngine
+OpenClaw.SetupEngine  ──supports──▶  local WSL gateway setup
+OpenClaw.*.Tests  ──test──▶  corresponding shared, connection, tray, setup, and CLI surfaces
 ```
 
 ### Key Subsystems
@@ -81,6 +102,7 @@ OpenClaw.Tray.Tests  ──tests──▶  OpenClaw.Shared
 | Subsystem | Location | Purpose |
 |-----------|----------|---------|
 | **Gateway Communication** | `OpenClaw.Shared/OpenClawGatewayClient.cs` | WebSocket client with protocol v3, reconnect/backoff logic |
+| **Connection Management** | `OpenClaw.Connection/` | Gateway registry, credential precedence, pairing, tunnels, and reconnect policy |
 | **Notification System** | `OpenClaw.Tray.WinUI/App.xaml.cs` | Event routing, toast notifications, classification |
 | **WebView2 Integration** | `OpenClaw.Tray.WinUI/Windows/ChatWindow.xaml.cs` | Embedded chat panel with lifecycle management |
 | **Tray Icon Management** | `OpenClaw.Tray.WinUI/Helpers/IconHelper.cs` | GDI handle management, dynamic icon generation |
@@ -94,11 +116,10 @@ OpenClaw.Tray.Tests  ──tests──▶  OpenClaw.Shared
 From the repository root:
 
 ```bash
-dotnet restore
-dotnet build
+./build.ps1
 ```
 
-This builds all projects (shared library, tray app, setup engine, and CLI tools).
+This restores prerequisites as needed and builds the shared library, tray app, setup engine, and CLI tools with the required Windows runtime identifiers.
 
 ### Build Individual Projects
 
@@ -109,7 +130,7 @@ dotnet build src/OpenClaw.Shared
 
 **Tray App (WinUI):**
 ```bash
-dotnet build src/OpenClaw.Tray.WinUI
+dotnet build src/OpenClaw.Tray.WinUI -r win-x64
 ```
 
 ### Platform and Architecture Notes
@@ -136,7 +157,7 @@ dotnet build
 The WinUI Tray app is Windows-only but can be built on Linux using:
 
 ```bash
-dotnet build -p:EnableWindowsTargeting=true
+dotnet build src/OpenClaw.Tray.WinUI -r win-x64 -p:EnableWindowsTargeting=true
 ```
 
 ### Running in Debug Mode
@@ -150,13 +171,13 @@ dotnet build -p:EnableWindowsTargeting=true
 #### Command Line
 
 ```bash
-dotnet run --project src/OpenClaw.Tray.WinUI
+dotnet run --project src/OpenClaw.Tray.WinUI -r win-x64
 ```
 
 For verbose output:
 
 ```bash
-dotnet run --project src/OpenClaw.Tray.WinUI -c Debug
+dotnet run --project src/OpenClaw.Tray.WinUI -c Debug -r win-x64
 ```
 
 ### Publishing (Self-Contained)
@@ -186,6 +207,26 @@ Use the local helper to build unsigned installer EXEs without waiting for CI:
 
 `-Fast` uses ZIP/no-solid compression for quick local iteration. CI release builds keep the default LZMA solid compression and Azure signing.
 
+#### Dev identity and side-by-side installs
+
+Release identity is the default for every configuration. Use `-DevBuild` on `build.ps1` or `-Dev` on `run-app-local.ps1` when you explicitly want the side-by-side dev identity:
+
+```powershell
+.\build.ps1 -Project WinUI -DevBuild
+.\run-app-local.ps1 -Dev -Isolated
+```
+
+`-DevBuild` passes `-p:DevBuild=true` to the WinUI project and produces the dev app identity marker that CI verifies in the **Verify DevBuild identity marker** step. `installer.iss` also accepts `/DDevBuild=1` for side-by-side dev installers; `.\scripts\build-inno-local.ps1 -Dev` wires that flag for local installer iteration.
+
+#### Onboarding and setup workflow helpers
+
+The first-run Windows gateway onboarding wizard lives in `OpenClaw.SetupEngine.UI` and is hosted by `OpenClaw.Tray.WinUI`; see [docs/ONBOARDING_WIZARD.md](docs/ONBOARDING_WIZARD.md) for the page flow. The setup pipeline itself is documented in [docs/SETUP_ENGINE_REDESIGN.md](docs/SETUP_ENGINE_REDESIGN.md), including the Windows node context step that injects agent instructions into the WSL workspace.
+
+Useful local scripts:
+
+- `.\scripts\dev-reset-rebuild-launch.ps1` resets tray data, rebuilds, and optionally launches the app; add `-WipeWslDistro` for a full local WSL gateway reset.
+- `.\scripts\validate-mxc-e2e.ps1` runs the formal WSL Gateway -> Windows node -> `system.run` MXC proof path for MXC-sensitive changes.
+
 ## Architecture Overview
 
 ### Native chat surface (FunctionalUI + OpenClaw.Chat)
@@ -200,9 +241,9 @@ settings-controlled fallback.
 **Layering:**
 
 ```
-src/OpenClaw.Tray.WinUI/Chat/    OpenClawChatTimeline · OpenClawComposer · OpenClawSessionHeader
+src/OpenClaw.Tray.WinUI/Chat/    ChatTimeline · ChatComposer · OpenClawSessionHeader
                                  OpenClawChatDataProvider (adapts OpenClawGatewayClient → IChatDataProvider)
-                                 OpenClawChatRoot         (FunctionalUI component composing the chat surface)
+                                 ChatRoot                 (FunctionalUI component composing the chat surface)
                                  FunctionalChatHostExtensions (mounts FunctionalUI into a XAML <Border>)
                                  IChatGatewayBridge       (testability seam over OpenClawGatewayClient)
         ▲ depends on
@@ -424,9 +465,28 @@ Sensitive data (authentication tokens) are never logged.
 
 ## Testing
 
+Required agent validation lives in [AGENTS.md](AGENTS.md). For changes touching
+tray UX, Settings, onboarding, chat/canvas, Command Center, Windows node
+capabilities, local MCP, gateway pairing/connection, permissions, or
+diagnostics, use the repo-local skill
+`.agents/skills/openclaw-proof-validation/SKILL.md`: run the build/tests,
+validate local MCP with `winnode --list-tools` plus the changed command, run
+rubber-duck review for non-trivial changes, then launch the tray from this
+worktree and drive the changed UI with computer-use / desktop automation as one
+batched closeout pass before PR publication. Mid-development rubber-duck,
+computer-use, or MCP validation is also appropriate when explicitly requested or
+needed to unblock the work; agents should ask whether to run computer-use or
+provide manual UI proof steps, while still enforcing required automated tests.
+
+PRs should include `## Validation` and `## Real behavior proof` sections. Paste concrete
+after-change output, visible UI evidence for visual changes, `winnode` output or
+raw MCP server JSON-RPC output for node commands, and gateway invoke output for
+gateway-mediated behavior when available; the default PR template includes these
+prompts.
+
 ### Running Unit Tests
 
-Two test projects cover the shared library and tray helpers:
+The repository has multiple unit, UI, integration, and E2E test projects. Use [docs/TEST_COVERAGE.md](docs/TEST_COVERAGE.md) as the inventory of record.
 
 ```bash
 # Run local-dev tests. E2E is intentionally excluded from the solution and
@@ -441,9 +501,10 @@ dotnet test --filter "FullyQualifiedName~AgentActivityTests"
 ```
 
 **Test Coverage:**
-- ✅ **1182 tests** in `OpenClaw.Shared.Tests` — models, gateway client, exec approvals, capabilities, URL helpers, notification categorization, shell quoting, MCP, device identity, and WinNode client coverage
-- ✅ **388 tests** in `OpenClaw.Tray.Tests` — settings round-trip, deep link parsing, onboarding state, setup code decoder, gateway health/chat helpers, security validation, wizard step parsing, gateway discovery, localization validation
-- ✅ All tests are pure unit tests (no network, no file system, no external dependencies)
+- `OpenClaw.Shared.Tests` covers models, gateway client behavior, capabilities, URL helpers, notification categorization, shell quoting, MCP, device identity, and WinNode client contracts.
+- `OpenClaw.Tray.Tests` covers settings isolation, deep link parsing, onboarding state, setup code decoding, gateway health/chat helpers, security validation, wizard step parsing, gateway discovery, localization, and tray UI helpers.
+- Additional projects cover connection management, setup engine behavior, `winnode`, FunctionalUI, native UI/A2UI, integration, and gateway-mediated E2E flows.
+- See [docs/TEST_COVERAGE.md](docs/TEST_COVERAGE.md) for current method counts, runtime totals, and which lanes require network, WSL, real-process, or desktop prerequisites.
 
 See [tests/OpenClaw.Shared.Tests/README.md](tests/OpenClaw.Shared.Tests/README.md) for detailed test documentation.
 
diff --git a/Directory.Build.props b/Directory.Build.props
index 50095e8b8..024ed3aaa 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <MicrosoftWindowsAppSDKVersion>2.2.0</MicrosoftWindowsAppSDKVersion>
-    <MicrosoftWindowsSdkBuildToolsVersion>10.0.28000.1839</MicrosoftWindowsSdkBuildToolsVersion>
+    <MicrosoftWindowsSdkBuildToolsVersion>10.0.28000.2270</MicrosoftWindowsSdkBuildToolsVersion>
   </PropertyGroup>
 
 </Project>
diff --git a/README.md b/README.md
index a2d4870d7..3424a7162 100644
--- a/README.md
+++ b/README.md
@@ -21,27 +21,54 @@ This monorepo contains the Windows hub, shared client libraries, and CLI utiliti
 | Project | Description |
 |---------|-------------|
 | **OpenClaw.Tray.WinUI** | System tray application (WinUI 3) for quick access to OpenClaw |
-| **OpenClaw.Shared** | Shared gateway client library |
+| **OpenClaw.Connection** | Gateway registry, credential resolution, and connection manager |
+| **OpenClaw.Shared** | Shared gateway client library, capabilities, and MCP bridge |
+| **OpenClaw.Chat** | Native chat model and timeline reducer |
 | **OpenClaw.Cli** | CLI validator for WebSocket connect/send/probe using tray settings |
+| **OpenClaw.WinNode.Cli** | `winnode` CLI for invoking local Windows node/MCP capabilities |
+| **OpenClaw.SetupEngine** | Local gateway setup, WSL installation, and setup-code support |
+| **OpenClaw.SetupEngine.UI** | WinUI setup wizard pages hosted by the tray app |
+| **OpenClawTray.FunctionalUI** | In-repo declarative WinUI helper used by native chat and newer UI surfaces |
 
 ## 🚀 Quick Start
 
 > **End-user installer?** Download the latest stable x64 or ARM64 installer from the [OpenClaw Windows docs](https://docs.openclaw.ai/platforms/windows), or see [docs/SETUP.md](docs/SETUP.md) for step-by-step installation (no build required).
 >
 > **Managed WSL gateway?** Local setup creates a locked-down app-owned `OpenClawGateway` distro. See [docs/WSL_GATEWAY_ADMIN.md](docs/WSL_GATEWAY_ADMIN.md) for editing `openclaw.json` as the `openclaw` user and using root for protected-file administration.
+>
+> **Operator or node?** Start with [Operator and node concepts](docs/OPERATOR_NODE_CONCEPTS.md) for the beginner-facing glossary of gateway, operator, node, pairing, reapproval, and allowlisted node capabilities.
 
-Direct downloads from the latest OpenClaw release:
+Direct downloads from the latest OpenClaw Windows release:
 
-- [OpenClawCompanion-Setup-x64.exe](https://github.com/openclaw/openclaw/releases/latest/download/OpenClawCompanion-Setup-x64.exe)
-- [OpenClawCompanion-Setup-arm64.exe](https://github.com/openclaw/openclaw/releases/latest/download/OpenClawCompanion-Setup-arm64.exe)
-- [OpenClawCompanion-SHA256SUMS.txt](https://github.com/openclaw/openclaw/releases/latest/download/OpenClawCompanion-SHA256SUMS.txt)
+- [OpenClawCompanion-Setup-x64.exe](https://github.com/openclaw/openclaw-windows-node/releases/latest/download/OpenClawCompanion-Setup-x64.exe)
+- [OpenClawCompanion-Setup-arm64.exe](https://github.com/openclaw/openclaw-windows-node/releases/latest/download/OpenClawCompanion-Setup-arm64.exe)
+- [OpenClawCompanion-SHA256SUMS.txt](https://github.com/openclaw/openclaw-windows-node/releases/latest/download/OpenClawCompanion-SHA256SUMS.txt)
 
 ### Prerequisites
 - Windows 10 (20H2+) or Windows 11
 - .NET 10.0 SDK - https://dotnet.microsoft.com/download/dotnet/10.0
+- Node.js LTS with npm (for WinUI build assets)
 - Windows 10 SDK (for WinUI build) - install via Visual Studio or standalone
 - WebView2 Runtime - pre-installed on modern Windows, or get from https://developer.microsoft.com/microsoft-edge/webview2
 
+### Developer / Agent Setup
+
+Use the setup script to install or verify local Windows build prerequisites:
+
+```powershell
+# Install missing prerequisites with winget, trust the checkout, and verify setup
+.\scripts\setup-dev.ps1
+
+# Check only; do not install packages or change git safe.directory
+.\scripts\setup-dev.ps1 -CheckOnly
+
+# Install/verify prerequisites without adding the checkout to git safe.directory
+.\scripts\setup-dev.ps1 -NoTrustRepository
+
+# Setup and run the required build/test validation
+.\scripts\setup-dev.ps1 -RunValidation
+```
+
 ### Build
 
 Use the build script to check prerequisites and build:
@@ -84,6 +111,9 @@ dotnet build src/OpenClaw.Tray.WinUI -r win-x64 -p:PackageMsix=true    # x64 MSI
 # Run isolated from your normal tray settings so multiple worktrees can run together
 .\run-app-local.ps1 -Isolated
 
+# Opt into side-by-side dev identity (separate mutex, protocol, gateway distro, and port)
+.\run-app-local.ps1 -Dev -Isolated
+
 # Alpha update testing from a Release build
 .\run-app-local.ps1 -Configuration Release -Isolated -UpdateChannel alpha
 
@@ -118,7 +148,7 @@ dotnet run --project src/OpenClaw.Cli -- --url ws://127.0.0.1:18789 --token "<to
 Modern Windows 11-style system tray companion that connects to your local OpenClaw gateway.
 
 ### Features
-- 🦞 **Lobster branding** - Pixel-art lobster tray icon with status colors
+- 🎨 **OpenClaw branding** - OpenClaw tray icon with status colors
 - 🎨 **Modern UI** - Windows 11 flyout menu with dark/light mode support
 - 💬 **Quick Send** - Send messages via global hotkey (Ctrl+Alt+Shift+C)
 - 🔄 **Auto-updates** - Automatic updates from GitHub Releases
@@ -132,7 +162,7 @@ Modern Windows 11-style system tray companion that connects to your local OpenCl
 - ⏱ **Cron Jobs** - Quick access to scheduled tasks
 - 🚀 **Auto-start** - Launch with Windows
 - ⚙️ **Settings** - Full configuration page
-- 🎯 **First-run onboarding** — 6-screen setup wizard (connection, permissions, chat, configuration)
+- 🎯 **First-run onboarding** — native WSL gateway setup with capability, permission, install, onboard, and completion screens
 
 #### Quick Send scope requirement
 
@@ -191,10 +221,12 @@ These features are available in Windows but not in the Mac app:
 | Channel control | Start/stop Telegram & WhatsApp |
 | Modern flyout menu | Windows 11-style with dark/light mode |
 | Deep links | `openclaw://` URL scheme with IPC |
-| First-run onboarding | 6-screen guided setup wizard (Welcome → Connection → Wizard → Permissions → Chat → Ready) |
+| First-run onboarding | Native setup flow: Security notice → Welcome/Advanced → Capabilities and permissions → Install progress → OpenClaw onboard → Complete |
 
 ### 🔌 Node Mode (Agent Control)
 
+If the operator/node split is new to you, read [Operator and node concepts](docs/OPERATOR_NODE_CONCEPTS.md) before enabling Node Mode.
+
 When Node Mode is enabled in Settings, your Windows PC becomes a **node** that the OpenClaw agent can control - just like the Mac app! The agent can:
 
 | Capability | Commands | Description |
@@ -371,21 +403,8 @@ Shared library containing:
 ## Development
 
 ### Project Structure
-```
-openclaw-windows-node/
-├── src/
-│   ├── OpenClaw.Shared/           # Shared gateway library
-│   └── OpenClaw.Tray.WinUI/       # System tray app (WinUI 3)
-├── tests/
-│   ├── OpenClaw.Shared.Tests/     # Shared library tests
-│   └── OpenClaw.Tray.Tests/       # Tray app helper tests
-├── docs/
-│   └── images/                    # Screenshots
-├── openclaw-windows-node.slnx     # Solution file
-├── README.md
-├── LICENSE
-└── .gitignore
-```
+
+See [DEVELOPMENT.md](DEVELOPMENT.md#project-structure) for the complete and current `src/` and `tests/` project inventory.
 
 ### Configuration
 
@@ -399,14 +418,15 @@ Default gateway: `ws://localhost:18789`
 
 ### First Run
 
-On first run, Molty launches a guided onboarding wizard that walks you through setup:
+On first run, Molty launches a guided setup flow:
 
-1. **Welcome** — introduces OpenClaw and starts the setup flow
-2. **Connection** — choose Local gateway, Remote gateway, or configure later. Paste a setup code or enter gateway URL and token manually. Tests the connection with Ed25519 device authentication.
-3. **Wizard** — gateway-driven configuration steps (AI provider selection, personality setup, communication channels). Steps are defined by your gateway.
-4. **Permissions** — reviews Windows system permissions (notifications, camera, microphone, screen capture, location) and links to system settings to grant them.
-5. **Chat** — meet your agent in a live chat powered by the gateway's web UI.
-6. **Ready** — summary of available features, option to launch at startup, and a Finish button.
+1. **Security notice** — confirms this is a trusted PC before local setup starts.
+2. **Welcome** — choose **Install a local gateway (WSL)** or connect to an existing gateway from Connections.
+3. **Capabilities** — choose a profile, review matching Windows permission status, and see exactly what setup will install.
+4. **Progress** — installs the app-owned `OpenClawGateway` WSL instance and keeps Live activity available but collapsed by default.
+5. **Gateway installed** — confirms the WSL gateway is running before moving into OpenClaw onboard.
+6. **OpenClaw onboard** — gateway-driven provider/model/key setup rendered as a transcript.
+7. **All set** — summary of available features, startup preference, and Finish.
 
 For detailed setup instructions, see [docs/SETUP.md](docs/SETUP.md). For the full onboarding architecture, see [docs/ONBOARDING_WIZARD.md](docs/ONBOARDING_WIZARD.md).
 
diff --git a/build.ps1 b/build.ps1
index 9426ebeda..9e9275b6b 100644
--- a/build.ps1
+++ b/build.ps1
@@ -1,4 +1,4 @@
-<#
+<#
 .SYNOPSIS
     Build script for OpenClaw Windows Hub
 
@@ -6,7 +6,7 @@
     Builds all projects, checks prerequisites, and provides clear guidance.
 
 .PARAMETER Project
-    Which project to build: All, Tray, WinUI, Shared, Cli
+    Which project to build: All, Tray, WinUI, Shared, Cli, WinNodeCli, SetupEngine
     Default: All
 
 .PARAMETER Configuration
@@ -16,6 +16,10 @@
 .PARAMETER CheckOnly
     Only check prerequisites, don't build
 
+.PARAMETER DevBuild
+    Build the WinUI app with the side-by-side dev identity. Defaults off so
+    release identity remains the default for every configuration.
+
 .PARAMETER NoTrustRepository
     Do not automatically add this checkout to git safe.directory when GitVersion
     cannot read a repo owned by a different Windows account/group. The script
@@ -36,6 +40,8 @@ param(
     
     [switch]$CheckOnly,
 
+    [switch]$DevBuild,
+
     [switch]$NoTrustRepository
 )
 
@@ -54,6 +60,15 @@ function Write-Info($text) { Write-Host "   $text" -ForegroundColor Gray }
 # Track issues
 $issues = @()
 
+function Test-WindowsHost {
+    $isWindowsVariable = Get-Variable -Name IsWindows -ErrorAction SilentlyContinue
+    if ($isWindowsVariable) {
+        return [bool]$isWindowsVariable.Value
+    }
+
+    return [System.Environment]::OSVersion.Platform -eq [System.PlatformID]::Win32NT
+}
+
 function ConvertTo-GitSafeDirectoryPath($path) {
     return ([System.IO.Path]::GetFullPath($path).TrimEnd("\") -replace "\\", "/")
 }
@@ -129,6 +144,24 @@ function Ensure-GitVersionRepositoryTrust {
     Write-Success "Repository trusted for GitVersion"
 }
 
+function Ensure-GitVersionRepositoryHistory {
+    $insideWorkTree = & git -C $repoRoot rev-parse --is-inside-work-tree 2>$null
+    if ($LASTEXITCODE -ne 0 -or $insideWorkTree -ne "true") {
+        Write-Error "Git metadata not found. GitVersion requires a git clone with full history."
+        Write-Info "Clone the repository with git, then rerun .\build.ps1."
+        $script:issues += "Repository is missing git metadata required by GitVersion"
+        return
+    }
+
+    $isShallow = & git -C $repoRoot rev-parse --is-shallow-repository 2>$null
+    if ($LASTEXITCODE -eq 0 -and $isShallow -eq "true") {
+        Write-Error "Repository is a shallow clone. GitVersion requires full git history."
+        Write-Info "Run this once, then retry the build:"
+        Write-Info "git fetch --unshallow --tags origin"
+        $script:issues += "Repository is shallow; GitVersion requires full history"
+    }
+}
+
 Write-Host @"
 
   🦞 OpenClaw Windows Hub - Build Script
@@ -143,7 +176,7 @@ Write-Host @"
 Write-Header "Checking Prerequisites"
 
 # Check OS
-if ($env:OS -ne "Windows_NT") {
+if (-not (Test-WindowsHost)) {
     Write-Error "This project requires Windows"
     exit 1
 }
@@ -191,6 +224,7 @@ if (-not $git) {
     }
 
     Ensure-GitVersionRepositoryTrust
+    Ensure-GitVersionRepositoryHistory
 }
 
 # Check Node.js + npm (WinUI build runs `npm ci` to restore @microsoft/mxc-sdk
@@ -219,11 +253,23 @@ if (-not $nodeVersion) {
 # Check Windows SDK (for WinUI)
 $windowsSdkPath = "${env:ProgramFiles(x86)}\Windows Kits\10\Include"
 if (Test-Path $windowsSdkPath) {
-    $sdkVersions = Get-ChildItem $windowsSdkPath -Directory | Select-Object -ExpandProperty Name | Sort-Object -Descending
-    Write-Success "Windows SDK: $($sdkVersions[0])"
+    $sdkVersions = @(
+        Get-ChildItem $windowsSdkPath -Directory |
+            Where-Object { $_.Name -match "^\d+\.\d+\.\d+\.\d+$" } |
+            Sort-Object { [version]$_.Name } -Descending |
+            Select-Object -ExpandProperty Name
+    )
+
+    if ($sdkVersions.Count -gt 0) {
+        Write-Success "Windows SDK: $($sdkVersions[0])"
+    } else {
+        Write-Warning "Windows 10 SDK not found (needed for WinUI build)"
+        Write-Info "Install via Visual Studio Installer, standalone SDK, or: winget install --id Microsoft.WindowsSDK.10.0.26100 -e"
+        $issues += "Windows 10 SDK not detected"
+    }
 } else {
     Write-Warning "Windows 10 SDK not found (needed for WinUI build)"
-    Write-Info "Install via Visual Studio Installer or standalone SDK"
+    Write-Info "Install via Visual Studio Installer, standalone SDK, or: winget install --id Microsoft.WindowsSDK.10.0.26100 -e"
     $issues += "Windows 10 SDK not detected"
 }
 
@@ -282,7 +328,10 @@ if ($issues.Count -gt 0) {
 Write-Header "Building Projects ($Configuration)"
 
 # Detect runtime identifier based on architecture
-$rid = if ($arch -eq "ARM64") { "win-arm64" } else { "win-x64" }
+$rid = switch ($arch) {
+    "ARM64" { "win-arm64" }
+    default { "win-x64" }
+}
 Write-Info "Runtime identifier: $rid"
 
 $buildResults = @{}
@@ -310,6 +359,9 @@ function Build-Project($name, $path, $useRid = $false) {
     if ($useRid) {
         $dotnetArgs += @("-r", $rid)
     }
+    if ($DevBuild -and ($name -eq "WinUI" -or $name -eq "Tray")) {
+        $dotnetArgs += "-p:DevBuild=true"
+    }
     $result = Invoke-DotNetCaptured $dotnetArgs
     $exitCode = $LASTEXITCODE
     
@@ -407,9 +459,11 @@ if ($failCount -eq 0) {
         if ($winUITargetFramework) {
             $winUIOutputDirectory = ".\$winUIProjectDirectory\bin\$Configuration\$winUITargetFramework\$rid"
             $winUIManifestPath = ".\$winUIProjectDirectory\Package.appxmanifest"
-            Write-Host "  WinUI:    .\run-app-local.ps1 -NoBuild" -ForegroundColor White
-            Write-Host "  Isolated: .\run-app-local.ps1 -NoBuild -Isolated" -ForegroundColor White
-            Write-Host "  WinApp:   .\run-app-local.ps1 -NoBuild -UseWinApp" -ForegroundColor White
+            $runIdentitySwitch = if ($DevBuild) { " -Dev" } else { "" }
+            Write-Host "  WinUI:    .\run-app-local.ps1 -NoBuild$runIdentitySwitch" -ForegroundColor White
+            Write-Host "  Isolated: .\run-app-local.ps1 -NoBuild -Isolated$runIdentitySwitch" -ForegroundColor White
+            Write-Host "  Dev:      .\run-app-local.ps1 -Dev" -ForegroundColor White
+            Write-Host "  WinApp:   .\run-app-local.ps1 -NoBuild -UseWinApp$runIdentitySwitch" -ForegroundColor White
             Write-Host "            Direct launch is default. -UseWinApp runs: winapp run `"$winUIOutputDirectory`" --manifest `"$winUIManifestPath`" --executable `"OpenClaw.Tray.WinUI.exe`" --debug-output" -ForegroundColor DarkGray
         } else {
             Write-Warning "Unable to determine WinUI target framework from $winUIProjectPath"
diff --git a/docs/A2UI_NATIVE_WINUI.md b/docs/A2UI_NATIVE_WINUI.md
index 4ed6f23cc..c37ba9eeb 100644
--- a/docs/A2UI_NATIVE_WINUI.md
+++ b/docs/A2UI_NATIVE_WINUI.md
@@ -1,22 +1,24 @@
 # Native WinUI A2UI Canvas — Design Spec
 
-> **Status:** Draft / proposal
-> **Audience:** Contributors implementing a native A2UI renderer for the Windows node
+> **Status:** Implemented; historical design rationale
+> **Audience:** Contributors maintaining the native A2UI renderer for the Windows node
 > **Target version:** A2UI v0.8 (parity with current openclaw clients), with a v0.9 migration path
 
+The native WinUI renderer is implemented under `src\OpenClaw.Tray.WinUI\A2UI\`. This file preserves the original design rationale; the current source of truth for protocol and component details lives in `docs\a2ui\` (`README.md`, `protocol.md`, `components.md`, and grading notes). Phase 4 / A2UI v0.9 migration has not started.
+
 ## 1. Motivation
 
-Today the Windows node renders A2UI by hosting a WebView2 control (`CanvasWindow`) that navigates to an HTTP page served by the openclaw gateway at `/__openclaw__/a2ui/`. That page bundles `@a2ui/lit` and openclaw's bridge JS. Pushed messages travel `agent → gateway → node (canvas.a2ui.push) → WebView2 → window.__a2ui.receive(msg)`.
+Before the native renderer landed, the Windows node rendered A2UI by hosting a WebView2 control (`CanvasWindow`) that navigated to an HTTP page served by the openclaw gateway at `/__openclaw__/a2ui/`. That page bundled `@a2ui/lit` and openclaw's bridge JS. Pushed messages traveled `agent → gateway → node (canvas.a2ui.push) → WebView2 → window.__a2ui.receive(msg)`.
 
-That works, but it has costs:
+That worked, but it had costs:
 
-- **Hard gateway dependency.** A node running in MCP-only mode (no gateway connection) silently drops A2UI pushes — `OnCanvasA2UIPush` bails when `_a2uiHostUrl` is null. The renderer code physically lives at the gateway.
+- **Hard gateway dependency.** A node running in MCP-only mode (no gateway connection) could silently drop A2UI pushes because the WebView2 renderer code lived at the gateway.
 - **WebView2 surface area.** Drag/drop, IME, accessibility, focus, DPI, and keyboard shortcuts inherit WebView2 quirks instead of XAML's native behavior. The canvas always feels like an embedded browser.
 - **Bootstrapping latency.** Each cold start has to ensure WebView2 is ready, navigate, and wait for `window.__a2ui` to register before any message can be delivered (`EnsureA2UIHostAsync` + `ensureA2uiReady` polling).
 - **Theming drift.** WinUI windows around the canvas use Mica/Fluent; the canvas uses Lit components styled with CSS. Achieving consistent visuals requires duplicate theme work.
 - **Hardening.** Surface area for arbitrary script execution remains larger than necessary for what is fundamentally a declarative UI tree.
 
-A native WinUI renderer renders A2UI surfaces directly into XAML — no WebView, no HTTP host, no JS bridge. The node becomes self-contained: it can render A2UI whether it's connected to a gateway, an MCP client, or both.
+The implemented native WinUI renderer renders A2UI surfaces directly into XAML — no WebView, no HTTP host, no JS bridge. The node is self-contained: it can render A2UI whether it's connected to a gateway, an MCP client, or both.
 
 ## 2. Goals & non-goals
 
@@ -267,12 +269,14 @@ Mirror what `CanvasCapability` already logs:
 
 ## 13. Phasing
 
+This table is historical. Phases 0-3 are now implemented by the native renderer path; no `--canvas=web` coexistence flag shipped. Phase 4 / v0.9 migration has not started.
+
 | Phase | Scope | Exit criteria |
 |---|---|---|
 | **0 — Spike** | `Text`, `Column`, `Button` only; one surface; no data model | Single button click round-trips to agent |
 | **1 — Catalog parity** | All v0.8 standard catalog types; data model + bindings; modal/tabs | Full conformance fixtures pass |
 | **2 — Polish** | Theming, transitions, focus management, accessibility (Narrator), keyboard nav | A11y audit clean; UX review against Lit version |
-| **3 — Coexistence** | Native window default; WebView2 path retained behind `--canvas=web` flag for parity testing | No regressions in WebView2 path |
+| **3 — Native default** | Native window default for A2UI rendering | Native path covers the v0.8 surface without the WebView2 host |
 | **4 — v0.9 migration** | Bidirectional messages, modular schemas, prompt-first | Tracks Google A2UI v0.9 release |
 
 ## 14. Open questions
diff --git a/docs/ACCESSIBILITY.md b/docs/ACCESSIBILITY.md
new file mode 100644
index 000000000..a994c4959
--- /dev/null
+++ b/docs/ACCESSIBILITY.md
@@ -0,0 +1,28 @@
+# Accessibility validation
+
+OpenClaw Companion treats accessibility as a CI quality gate for the WinUI app. The Build and Test workflow runs real-process Axe.Windows scans against the tray UI test project after the normal native UI tests.
+
+## What CI enforces
+
+The `.github\workflows\ci.yml` **Run Accessibility Tests (Axe.Windows)** step runs:
+
+```powershell
+dotnet test tests\OpenClaw.Tray.UITests --no-build -c Debug -r win-x64 --filter Category=Accessibility
+```
+
+Those tests launch the app in a real Windows desktop process and scan pages for WCAG violations through Axe.Windows. Failures are summarized in the GitHub Actions step summary and written to `Accessibility.trx`.
+
+## Running locally
+
+From the repository root:
+
+```powershell
+dotnet build tests\OpenClaw.Tray.UITests -c Debug -r win-x64
+dotnet test tests\OpenClaw.Tray.UITests -c Debug -r win-x64 --no-build --filter Category=Accessibility
+```
+
+Run this lane for UI changes that add or modify pages, dialogs, controls, focus behavior, labels, contrast-sensitive visuals, or keyboard navigation.
+
+## Relationship to other validation
+
+Accessibility scans do not replace the required agent closeout validation in `AGENTS.md`. They are an additional focused lane for WinUI accessibility work and a formal CI gate documented in `docs\TEST_COVERAGE.md`.
diff --git a/docs/CONNECTION_ARCHITECTURE.md b/docs/CONNECTION_ARCHITECTURE.md
index e0b19c00d..63629b340 100644
--- a/docs/CONNECTION_ARCHITECTURE.md
+++ b/docs/CONNECTION_ARCHITECTURE.md
@@ -69,17 +69,21 @@ Inbound chat and agent timeline events must include the gateway's canonical `ses
 ## Startup wiring (App.xaml.cs)
 
 ```
-1. Create GatewayRegistry(dataDir)
-2. Create CredentialResolver(identityReader)
-3. Create GatewayClientFactory()
-4. Create NodeConnector(logger)
-5. Create SshTunnelManager(tunnelService, logger)
-6. Create GatewayConnectionManager(resolver, factory, registry, ...,
-                                    nodeConnector, tunnelManager)
-7. Subscribe to StateChanged → update tray icon + hub window
-8. Subscribe to OperatorClientChanged → wire/unwire 25+ data event handlers
-9. Subscribe to NodeConnector.ClientCreated → NodeService.AttachClient
-10. Call ConnectAsync() → connects to active gateway
+1. Create GatewayRegistry(SettingsManager.SettingsDirectoryPath)
+2. Load gateway registry from gateways.json
+3. Create CredentialResolver(DeviceIdentityFileReader.Instance)
+4. Create GatewayClientFactory()
+5. Create ConnectionDiagnostics()
+6. Create NodeConnector(logger, diagnostics)
+7. Wire NodeConnector.ClientCreated → NodeService.AttachClient
+8. Create SshTunnelService(logger)
+9. Create GatewayConnectionManager(resolver, factory, registry, logger,
+                                    identityStore, nodeConnector, node mode flag,
+                                    diagnostics, tunnelService)
+10. Subscribe to OperatorClientChanged → wire/unwire 25+ data event handlers
+11. Subscribe to StateChanged → update tray icon + hub window
+12. Ensure NodeService exists before gateway initialization
+13. Call InitializeGatewayClient() → connects to active gateway
 ```
 
 Settings changes are classified by `SettingsChangeClassifier.Classify()` which compares `ConnectionSettingsSnapshot` before/after to determine the minimum reconnect action:
@@ -114,7 +118,10 @@ Idle → Connecting → Connected
 | Connected | Error/Rejected | Degraded |
 | Connected | PairingRequired | PairingRequired |
 | Connected | Connecting | Connecting |
-| Connected | Disabled/Off | Connected |
+| Connected | Idle while Node mode is intended | Degraded |
+| Connected | Disabled/Off | Ready |
+
+`GatewayConnectionSnapshot.NodeConnectionIntended` records the Node mode intent used by the manager's state machine. If Node mode is enabled but node startup is skipped, blocked, or missing a node credential, the manager publishes a blocked node snapshot (`NodeState=Error`, `NodeError=...`) instead of leaving the node idle and letting tray surfaces report a healthy connection.
 
 ## Gateway registry and persistence
 
@@ -126,7 +133,7 @@ Idle → Connecting → Connected
 %APPDATA%\OpenClawTray\gateways\<id>\device-key-ed25519.json  — keypair + tokens
 ```
 
-Each `GatewayRecord` contains: `Id`, `Url`, `FriendlyName`, `SharedGatewayToken`, `BootstrapToken`, `LastConnected`, `SshTunnel` config, and an `IdentityDirName`.
+Each `GatewayRecord` contains: `Id`, `Url`, `FriendlyName`, `SharedGatewayToken`, `BootstrapToken`, `LastConnected`, `SshTunnel` config, `IsLocal`, `RequiresV2Signature`, `SetupManagedDistroName`, and `BrowserControlPort`. The `IdentityDirName` property is computed from `Id`.
 
 `SettingsManager` still owns general tray settings (node mode, MCP mode, SSH tunnel toggles, notifications, UI preferences). It may read legacy `Token` / `BootstrapToken` JSON fields into memory for migration, but save must not write those legacy credential fields back.
 
@@ -143,6 +150,13 @@ The invariant is that a paired device token always wins. Do not downgrade a pair
 
 **`CredentialResolver`** implements the precedence for WebSocket connections (operator and node roles).
 
+Node credential precedence follows the same invariant with a distinct stored token:
+
+1. **Stored node device token** in the per-gateway identity directory.
+2. **`GatewayRecord.SharedGatewayToken`** — shared token fallback when no paired node token exists.
+3. **`GatewayRecord.BootstrapToken`** — one-time setup, limited scopes.
+4. **No credential** — caller logs and skips node client init.
+
 **`InteractiveGatewayCredentialResolver`** resolves credentials for HTTP surfaces (chat URL `?token=` auth). It **prefers SharedGatewayToken** over DeviceToken because HTTP endpoints expect the shared token, not the per-device WebSocket token.
 
 ## Client instance lifecycle
@@ -168,9 +182,15 @@ Setup codes (from QR scan or paste) decode to `{ url, bootstrapToken }` via `Set
 
 **Approval boundaries**: `GatewayConnectionManager` leaves node-pair command-trust requests and reapproval pending for explicit operator approval. It may automatically approve and reconnect only an explicitly typed device-pair request used for a device role upgrade.
 
+## Inbound pairing approval (operator)
+
+When **another** device or node requests pairing, the gateway broadcasts `device.pair.requested` / `node.pair.requested` to operators with pairing scope. `OpenClawGatewayClient` refreshes the pending lists and raises `DevicePairListUpdated` / `NodePairListUpdated`, which `GatewayService` forwards via its `PairListsChanged` event.
+
+`PairingApprovalCoordinator` (tray) reconciles those snapshots through the pure `PairingApprovalQueue` (OpenClaw.Connection) into add/resolve deltas, de-duplicating, suppressing already-decided requests, and filtering out the local node's own pending request (handled by the auto-approve path above). For genuinely new requests — when `ShowPairingApprovalDialog` is enabled and the operator holds pairing scope — it raises `ApprovalRequested`, and the app presents a focused **`PairingApprovalDialog`** plus an awareness toast (with a "Review" action). The dialog shows the requester's identity and the **operator scopes being granted** (mapped to friendly text by `PairingScopeDescriptions`), with Approve / Reject / Decide-later. Approve is briefly disabled on each new request to prevent click-through. Approve/Reject call the `IOperatorGatewayClient.{Device,Node}Pair{Approve,Reject}Async` RPCs; the queue advances and the dialog closes when empty. The existing Connections-page "Pending approvals" banner remains as the passive fallback when the dialog is disabled. Pure queue/scope logic is unit-tested in `OpenClaw.Connection.Tests`.
+
 ## SSH tunnel integration
 
-`SshTunnelService` manages an SSH local port-forward process. `SshTunnelManager` wraps it behind `ISshTunnelManager` for the connection manager.
+`SshTunnelService` manages an SSH local port-forward process and implements `ISshTunnelManager` directly for the connection manager.
 
 When a `GatewayRecord` has `SshTunnel` config, the connection manager starts the tunnel before connecting the WebSocket client to `ws://localhost:<localPort>`. The config stores the SSH daemon port (`sshPort`, default `22`) separately from the remote gateway port forwarded by `-L`.
 
@@ -194,8 +214,9 @@ The `EnableMcpServer=true`, `EnableNodeMode=false` path creates a local-only `No
 Tray actions should never silently no-op on common pairing/configuration issues:
 
 - Chat resolves credentials from the active registry record and per-gateway identity. If no usable credential exists, it opens Connection settings instead.
-- Canvas opens only when the Windows node is initialized and paired; otherwise it opens Connection settings.
+- Canvas opens only when the Windows node is initialized, paired, and the Canvas capability is enabled in settings; otherwise it opens Connection settings.
 - Quick Send uses the live operator client and surfaces scope/pairing errors from gateway calls.
+- `system.run` and `system.run.prepare` are gated by `NodeSystemRunEnabled` (default `true` for backward compatibility). When disabled, those commands are dropped from advertised capabilities and invocations are rejected.
 
 ## Legacy migration
 
diff --git a/docs/CONNECTION_PROTOCOL_RESEARCH.md b/docs/CONNECTION_PROTOCOL_RESEARCH.md
index d072f90fd..e35151058 100644
--- a/docs/CONNECTION_PROTOCOL_RESEARCH.md
+++ b/docs/CONNECTION_PROTOCOL_RESEARCH.md
@@ -47,7 +47,7 @@ Public upstream gateway sources reviewed:
 - `https://github.com/openclaw/openclaw/blob/main/src/gateway/server-methods/nodes.ts`
 - `https://github.com/openclaw/openclaw/blob/main/packages/gateway-protocol/src/schema/frames.ts`
 
-The setup engine currently pins gateway LKG `2026.6.1` in
+The setup engine currently pins gateway LKG `2026.6.11` in
 `src/OpenClaw.SetupEngine/GatewayLkgVersion.cs`. Before implementing behavior
 that depends on newer upstream `main`, compare the installed LKG against the
 reviewed upstream docs/code.
diff --git a/docs/DATA_FLOW_ARCHITECTURE.md b/docs/DATA_FLOW_ARCHITECTURE.md
index 42cedf07e..d33643a70 100644
--- a/docs/DATA_FLOW_ARCHITECTURE.md
+++ b/docs/DATA_FLOW_ARCHITECTURE.md
@@ -47,7 +47,7 @@ src/OpenClaw.Tray.WinUI/Services/AppState.cs
 
 ### GatewayService (`Services/GatewayService.cs`)
 
-Owns all 27 operator gateway client event subscriptions. Moved from App.xaml.cs to separate concerns.
+Owns the operator gateway client event subscriptions, including data events and connection lifecycle events. Moved from App.xaml.cs to separate concerns.
 
 ```
 src/OpenClaw.Tray.WinUI/Services/GatewayService.cs
diff --git a/docs/MCP_MODE.md b/docs/MCP_MODE.md
index 9868d2acf..0065dd2d3 100644
--- a/docs/MCP_MODE.md
+++ b/docs/MCP_MODE.md
@@ -4,7 +4,7 @@
 
 ## Summary
 
-The Windows tray app now ships a **local Model Context Protocol (MCP) server** alongside its existing OpenClaw gateway client. The same node capabilities the agent reaches over the OpenClaw gateway WebSocket — `system.run`, `screen.snapshot`, `canvas.*`, `camera.list`, `camera.snap`, `camera.clip`, `location.get`, `tts.speak`, `system.notify`, `system.execApprovals.*` — are advertised, on the same machine, as MCP tools over `http://127.0.0.1:8765/`.
+The Windows tray app now ships a **local Model Context Protocol (MCP) server** alongside its existing OpenClaw gateway client. The same node capabilities the agent reaches over the OpenClaw gateway WebSocket — `system.*`, `screen.*`, `canvas.*`, `camera.*`, `location.get`, `tts.*`, `stt.*`, `device.*`, and `browser.proxy` — are advertised, on the same machine, as MCP tools over `http://127.0.0.1:8765/`. Local-only `app.*` and `app.connection.*` tools are also exposed to MCP clients for tray automation and connection/pairing workflows; those are not registered with the remote gateway node transport.
 
 This means any local MCP client (Claude Desktop, Claude Code, Cursor, an MCP-aware CLI, a custom dev script) can reach into the running tray and drive Windows-native capabilities directly, without an OpenClaw gateway in the loop. The tray app can run in **MCP-only mode** with no gateway connection at all.
 
@@ -100,17 +100,19 @@ public bool EnableNodeMode { get; set; }      // open WebSocket to gateway
 public bool EnableMcpServer { get; set; }     // run local MCP HTTP server
 ```
 
-| `EnableNodeMode` | `EnableMcpServer` | Result |
+| `EnableNodeMode` | `EnableMcpServer` | Behavior |
 |---|---|---|
-| off | off | Operator-only (legacy default) |
-| off | on | **MCP server only, no gateway** |
-| on | off | Gateway node, no MCP |
-| on | on | Gateway node + MCP |
+| false | false | Operator-only (legacy default) |
+| false | true | **MCP server only, no gateway** |
+| true | false | Gateway node, no MCP |
+| true | true | Gateway node + MCP |
 
 Settings UI exposes both toggles in the Advanced section, with the live MCP endpoint URL and current status (`Listening` / `Stopped — save and restart to start` / `Disabled`).
 
 A legacy `McpOnlyMode` field is migrated automatically on load and never re-written.
 
+MCP startup is reported from the actual listener state. `NodeService.McpStartupError` is populated when capability registration or the HTTP listener fails, and MCP-only startup is not treated as successful unless the loopback MCP server is running. Tray, Permissions, and Command Center surfaces show local MCP-only separately from gateway connectivity so a working local MCP listener is never presented as a gateway connection.
+
 ## Why this matters
 
 ### Testing
@@ -151,6 +153,34 @@ The exact same node tools the OpenClaw gateway uses are now invocable by any loc
 
 In all cases the user gets a Windows-native agent experience without OpenClaw infrastructure. They can be entirely offline w.r.t. an OpenClaw gateway and still hand the LLM a working set of "do something on my Windows box" tools.
 
+### Current command surface
+
+The canonical command descriptions live in `OpenClaw.Shared\Mcp\McpToolBridge.CommandDescriptions`; `OpenClaw.WinNode.Cli.Tests\SkillMdDriftTests` keeps `src\OpenClaw.WinNode.Cli\skill.md` in sync with that documented capability surface. The live `tools/list` output may also include newly registered capabilities with fallback descriptions before prose is updated.
+
+Gateway/node command groups currently include:
+
+- `system.notify`, `system.run`, `system.run.prepare`, `system.which`, `system.execApprovals.get`, `system.execApprovals.set`
+- `canvas.present`, `canvas.hide`, `canvas.navigate`, `canvas.eval`, `canvas.snapshot`, `canvas.a2ui.push`, `canvas.a2ui.reset`, `canvas.a2ui.dump`, `canvas.caps`, `canvas.a2ui.pushJSONL`
+- `screen.snapshot`, `screen.record`
+- `camera.list`, `camera.snap`, `camera.clip`
+- `stt.transcribe`, `stt.listen`, `stt.status`
+- `tts.speak`, `tts.status`
+- `location.get`
+- `device.info`, `device.status`
+- `browser.proxy`
+
+Local MCP-only app control commands currently include:
+
+- `app.navigate`, `app.status`, `app.sessions`, `app.agents`, `app.nodes`, `app.config.get`, `app.settings.get`, `app.settings.set`, `app.menu`, `app.search`, `app.dashboard.url`
+- Chat automation: `app.chat.snapshot`, `app.chat.send`, `app.chat.reset`
+- Connection automation: `app.connection.applySetupCode`, `app.connection.connectSharedToken`, `app.connection.pendingApprovals`, `app.connection.approveDevicePairing`, `app.connection.rejectDevicePairing`, `app.connection.approveNodePairing`, `app.connection.rejectNodePairing`, `app.connection.reconnect`, `app.connection.reconnectNode`
+
+Example chat automation smoke:
+
+```powershell
+winnode --command app.chat.send --params '{"message":"hello from local MCP"}'
+```
+
 ### Dev acceleration when building new features
 
 This is the strongest argument for making MCP a first-class citizen, not an afterthought.
@@ -271,6 +301,22 @@ curl -s -X POST http://127.0.0.1:8765/ `
 For a simpler local CLI smoke test, run `winnode --list-tools`; it loads the
 same token file automatically.
 
+For agent-driven validation, use the repo-local skill
+`.agents/skills/openclaw-proof-validation/SKILL.md`. MCP/node changes need live
+tool discovery plus invocation proof using `winnode` or raw MCP JSON-RPC.
+
+## Adding or changing node commands
+
+Every new Windows node command must remain first-class over local MCP. Register
+it in the capability path used by `NodeService`, update
+`McpToolBridge.CommandDescriptions`, update
+`src/OpenClaw.WinNode.Cli/skill.md`, and add focused tests. `SkillMdDriftTests`
+guards against drift between capabilities, MCP descriptions, and `winnode` docs.
+
+PR proof for a new command should paste `winnode --list-tools` plus the command
+invocation, or raw MCP `tools/list` plus `tools/call`; include gateway invoke
+output when gateway-mediated behavior changed and a gateway is available.
+
 For Claude Code, drop this into `.mcp.json` at the repo root or `~/.claude.json`:
 
 ```json
diff --git a/docs/MISSION_CONTROL.md b/docs/MISSION_CONTROL.md
index 3c1394ed8..d3629853d 100644
--- a/docs/MISSION_CONTROL.md
+++ b/docs/MISSION_CONTROL.md
@@ -22,7 +22,7 @@ The main product decision is deliberate: **do not make a native Windows gateway
 
 Windows now has a strong foundation:
 
-- Node Mode with canvas, camera, screen snapshot/record, location, device info/status, system commands, notifications, and exec approval policy.
+- Node Mode with canvas, camera, screen snapshot/record, location, device info/status, system commands, notifications, exec approval policy, and local MCP `app.chat.*` automation commands.
 - Command Center status detail window with channels, sessions, usage, local/operator node inventory, allowlist diagnostics, pairing warnings, and activity stream.
 - SSH tunnel settings and service.
 - Activity Stream and support-bundle copy path that avoid storing invoke payloads.
@@ -465,6 +465,15 @@ Deliverables:
 - Hover HUD / richer tray tooltip: **implemented with topology, channel, node, warning, and activity summary**
 - Update status: **implemented in Command Center support/debug section and copied support context, including current version, latest prompted version when known, and last check outcome**
 
+Recent native chat behavior implemented during this phase:
+
+- Queued-message UI tracks local send state (`Queued`, `Sending`, `Failed`) until the gateway confirms or rejects the turn.
+- Timeline virtualization keeps long chat histories responsive while preserving stable render identity for visible entries.
+- Completed sessions are hidden by default in the native chat session list, with active/in-progress sessions surfaced first.
+- TTS notification speech preserves full assistant text while UI preview truncation remains visual-only.
+- Slash-command suggestions use the gateway command catalog grouped into Mac-compatible command buckets.
+- Local MCP chat automation exposes `app.chat.snapshot`, `app.chat.send`, and `app.chat.reset` for current-thread inspection, send, and reset flows.
+
 Risk: medium; mostly UI and gateway method plumbing.
 
 ### Phase 8: Optional local Windows gateway convenience
diff --git a/docs/ONBOARDING_V2.md b/docs/ONBOARDING_V2.md
deleted file mode 100644
index abfbeb07b..000000000
--- a/docs/ONBOARDING_V2.md
+++ /dev/null
@@ -1,162 +0,0 @@
-# OpenClaw Setup — V2 (redesigned onboarding flow)
-
-Status: **the only setup UI shell in the app**. Setup is now scoped to
-installing a new app-owned local WSL gateway. Existing and remote gateway
-management lives in the tray app's Connections tab.
-
-## Where the V2 code lives
-
-| Project / file | Role |
-| --- | --- |
-| `src/OpenClawTray.OnboardingV2/` | New class library: state, app shell, page components, animations, V2Strings. Builds against `OpenClawTray.FunctionalUI` (the "minimal Reactor"). |
-| `src/OpenClawTray.OnboardingV2/Pages/` | One file per page: `WelcomePage.cs`, `LocalSetupProgressPage.cs`, `GatewayWelcomePage.cs`, `PermissionsPage.cs`, `AllSetPage.cs`. |
-| `src/OpenClawTray.OnboardingV2/Animations.cs` | Composition-animation helpers (`WithEntranceFadeIn`, `WithEntrancePopIn`, `WithSlideInFromBelow`, `WithBreathe`). All gated on `ShouldAnimate` (false in capture mode and when `UISettings.AnimationsEnabled == false`). |
-| `src/OpenClawTray.OnboardingV2/V2Strings.cs` | Resource-key dictionary + settable `Resolver` delegate. `Get(key)` falls back to the bundled English values when the resolver returns null/empty/echoes the key. |
-| `src/OpenClawTray.OnboardingV2/OnboardingV2State.cs` | Mutable shared state with property setters that raise `StateChanged` (the V2 app subscribes and bumps a render tick). Includes cutover-staged shape: `GatewayUrl`, `GatewayHealthy`, `LaunchAtStartup`, `Permissions` (`IReadOnlyList<PermissionRowSnapshot>?`), `PermissionRowSnapshot`, `PermissionSeverity`. |
-| `src/OpenClawTray.OnboardingV2/OnboardingV2App.cs` | Root `Component<OnboardingV2State>`. Owns the page area + nav bar (Back / Next-or-Finish + dot indicator). Welcome has no chrome by design. |
-| `src/OpenClaw.SetupPreview/` | Standalone WinUI 3 unpackaged exe used for the inner-loop. Mounts the V2 tree against a fake `OnboardingV2State`. Reads env vars to switch page / scenario / locale and to enter capture mode (`OPENCLAW_PREVIEW_CAPTURE=1`). |
-| `tools/v2_visual_diff.py` | Renders side-by-side `expected | actual` PNGs by spawning the SetupPreview exe in capture mode for each page scenario. The agent then *views* those PNGs and judges visual parity. |
-| `tools/v2-design-refs/Dialog{,-1..-6}.png` | Designer source of truth (committed). |
-
-## How the inner loop works
-
-```
-edit V2 page  →  python tools/v2_visual_diff.py --pages welcome
-              →  view out/v2-visual/welcome/diff.png
-              →  iterate
-```
-
-`v2_visual_diff.py` does an incremental `dotnet build` of
-`OpenClaw.SetupPreview` once per invocation (cached so `--all` only
-builds once). Each page render takes ~2-3 s on a warm tree.
-
-Page scenarios baked into `PAGES` in `tools/v2_visual_diff.py`:
-
-| Key | Page | Notes |
-| --- | --- | --- |
-| `welcome` | Welcome | `Dialog.png` — no chrome, lobster + CTA + Advanced setup. |
-| `progress-running` | LocalSetupProgress (in-flight) | `Dialog-1.png` — running stage card. |
-| `progress-failed` | LocalSetupProgress (failure) | `Dialog-6.png` — pink Try-again card slides in. |
-| `gateway` | GatewayWelcome | `Dialog-2.png` — gateway URL + health checkmark. |
-| `permissions` | Permissions | `Dialog-5.png` — 5 capability rows + Refresh status. |
-| `allset` | AllSet (node-mode active) | `Dialog-4.png` — amber Node-Mode card + Launch toggle. |
-| `allset-no-node` | AllSet (node-mode off) | Variant — no amber card. |
-
-## Cutover
-
-The V2 flow is mounted in the live app via `OnboardingWindow`. The old
-standalone/fallback v1 setup shell and pages have been removed. The
-provider/model setup experience is hosted by the explicit tray-side
-`GatewayWizardPage` / `GatewayWizardState` pair and embedded inside V2's
-`GatewayWelcomePage`.
-
-Service wiring is centralised in
-[`OnboardingV2Bridge`](../src/OpenClaw.Tray.WinUI/Onboarding/V2/OnboardingV2Bridge.cs):
-
-| Real service | V2 state field | Notes |
-| --- | --- | --- |
-| `LocalGatewaySetupEngine.StateChanged` | `LocalSetupRows`, `LocalSetupErrorMessage` | Re-uses `LocalSetupProgressStageMap` so setup stage behavior stays consistent. |
-| `PermissionChecker.CheckAllAsync` + `SubscribeToAccessChanges` | `Permissions` | Snapshot list of `PermissionRowSnapshot`. Marshals back to UI thread. |
-| `SettingsManager.GetEffectiveGatewayUrl` | `GatewayUrl` | Flips `ws://` → `http://` for the browser-launch link. |
-| `SettingsManager.AutoStart` ↔ `LaunchAtStartup` | `LaunchAtStartup` | Two-way: initial value from settings; toggle change calls `_settings.Save()`. |
-| `Settings.EnableNodeMode` | `NodeModeActive` | Seeded once at construction. |
-| `GatewayRegistry` + WSL distro probe | `ExistingGateway` | Drives Welcome CTA/warning behavior for none, app-owned local WSL, and external-only connections. |
-
-Threading: every cross-thread mutation marshals through
-`DispatcherQueue.TryEnqueue`. The V2 state's `StateChanged` event fires
-on the UI thread, bumping a render tick in
-[`OnboardingV2App.UseEffect`](../src/OpenClawTray.OnboardingV2/OnboardingV2App.cs).
-
-Completion: `OnboardingWindow.TryCompleteOnboarding` treats
-`V2Route.AllSet` as the terminal setup page. The bridge's `Finished` event
-closes the window, which routes through the shared completion logic —
-persisting `Settings.AutoStart` via `AutoStartManager`, firing
-`OnboardingCompleted`, and launching `HubWindow` on the chat tab when
-setup is complete.
-
-Advanced setup: Welcome's "Advanced setup" link raises
-`OnboardingV2State.AdvancedSetupRequested`; `OnboardingWindow` closes setup
-without completing it and opens `HubWindow` on the Connections tab. Users
-connect to existing, remote, or manual gateways there.
-
-Existing connections: first-run setup no longer opens automatically when
-there is any usable saved gateway connection. Users can intentionally start
-local setup from the Connections tab via **Install new WSL Gateway**.
-
-Welcome CTA/warnings:
-
-1. No existing gateway: primary CTA stays **Set up locally**.
-2. Existing app-owned WSL gateway: primary CTA becomes **Install new WSL Gateway**; confirmation warns that the current OpenClaw WSL gateway and `OpenClawGateway` distro will be deleted before a fresh install.
-3. External-only gateway: primary CTA stays **Set up locally**; confirmation says a new local WSL gateway will be installed and connected, while the external gateway remains available in Connections.
-
-## Follow-up backlog
-
-The cutover deliberately scopes down to the items below to keep this PR
-reviewable. None are blocking — V2 works end-to-end without them.
-
-1. **Restyle the gateway wizard to native V2 UI.** The current
-   `GatewayWizardPage` is no longer part of the v1 shell, but it still owns
-   its own card/buttons while the gateway-driven provider/model flow remains
-   embedded in V2.
-2. **Real translations for V2_* keys.** `tools/seed_v2_resw.py` seeds
-   every V2_* key into all five `.resw` locales with the English value
-   and the `Resources_AreTranslatedAllOrNoneAcrossNonEnglishLocales`
-   test is taught (via a `key.StartsWith("V2_")` predicate) that they
-   are intentionally English-only at first ship. Translations land in
-   a follow-up by replacing each non-en-us value.
-
-## Animation discipline
-
-- All animations live in `src/OpenClawTray.OnboardingV2/Animations.cs`.
-  Pages opt in via extension methods (`element.WithEntranceFadeIn(...)`).
-- Pages must call `ElementCompositionPreview.SetIsTranslationEnabled(fe, true)`
-  before animating `Translation`. The helper does this for you.
-- The `ShouldAnimate` predicate gates every helper. It returns `false`
-  if `V2Animations.DisableForCapture` is set OR if
-  `Windows.UI.ViewManagement.UISettings.AnimationsEnabled` is `false`
-  (Windows reduce-motion). The SetupPreview sets `DisableForCapture` in
-  capture mode so screenshots are deterministic.
-- Don't add page-local `Composition` calls; extend `Animations.cs` so
-  the gating stays centralised.
-
-## Accessibility checklist
-
-- [x] Re-enabled WinUI's system focus visuals (cyan ring) on every V2
-      button by removing `UseSystemFocusVisuals = false`.
-- [x] Stable `AutomationProperties.AutomationId` on Back / Next /
-      Finish nav buttons and on every page CTA.
-- [x] `AutomationProperties.Name` on the AllSet launch-at-startup
-      `ToggleSwitch` (which uses empty `OnContent`/`OffContent` so the
-      "On" label can render to the toggle's left, matching the design).
-- [x] `AutomationProperties.Name` on the custom title bar, the lobster
-      icon, and the title text.
-- [ ] Keyboard nav verified end-to-end against the live UI (cutover
-      gate — capture mode skips animation, we should manually confirm
-      tab order in interactive mode).
-- [ ] Screen reader smoke-test (Narrator + NVDA) at cutover.
-
-## Visual validation
-
-`python tools/v2_visual_diff.py --all` regenerates side-by-side
-PNGs under `out/v2-visual/<page>/diff.png`. A human (or the agent
-running this codebase) opens those PNGs and judges parity directly
-against the designer references in `tools/v2-design-refs/`. We
-intentionally do not pixel-diff — small, intentional rendering
-differences (DPI scaling, font hinting, drop shadows) would dominate
-the signal.
-
-When running visual validation:
-
-1. Render all pages: `python tools/v2_visual_diff.py --all`.
-2. View each `diff.png` and note any discrepancies in:
-   - Layout / spacing / alignment
-   - Typography (size, weight)
-   - Color (especially accent cyan, accent green, error pink, amber
-     warning)
-   - Iconography (asset / size / position)
-   - Copy (the V2Strings dictionary holds the source of truth — the
-     designer mocks contain a couple of typos we intentionally fixed:
-     `localhost18789` → `http://localhost:18789`, `Stays` → `stays`,
-     and `Acvtive` → `Active`).
-3. If any discrepancy matters, edit the relevant page, re-render, and
-   visually re-check until parity is restored.
diff --git a/docs/ONBOARDING_WIZARD.md b/docs/ONBOARDING_WIZARD.md
index d2e3944a6..26d6ba6d6 100644
--- a/docs/ONBOARDING_WIZARD.md
+++ b/docs/ONBOARDING_WIZARD.md
@@ -1,32 +1,41 @@
 # Onboarding Wizard
 
-The onboarding wizard is now the V2 setup flow for installing a new app-owned local WSL gateway on Windows.
+The onboarding wizard installs a new app-owned local WSL gateway on Windows and then runs OpenClaw onboard.
 
 ## Overview
 
 On first launch, the wizard appears only when there is no usable saved gateway connection. Users with existing gateways manage connections from the tray app's Connections tab. The local WSL setup affordance in Connections is shown only when setup has not already created an app-owned WSL gateway on this device.
 
-The V2 setup flow walks users through:
+The setup flow walks users through:
 
-1. **Welcome** — Greeting and introduction
-2. **Local setup progress** — Fresh app-owned `OpenClawGateway` WSL installation
-3. **Gateway setup** — Gateway-driven provider/model configuration hosted by `GatewayWizardPage`
-4. **Permissions** — Windows system permission review
-5. **All set** — Feature summary and completion
+1. **Security notice** — Device-trust warning before setup choices
+2. **Welcome / Advanced** — Install app-owned WSL gateway or connect existing gateway from Settings
+3. **Capabilities** — Recommended profile, inline Windows permission status, and install review
+4. **Local setup progress** — Fresh app-owned `OpenClawGateway` WSL installation
+5. **Gateway installed** — Explicit handoff from infrastructure setup to OpenClaw onboard
+6. **OpenClaw onboard** — Gateway-driven provider/model/key configuration
+7. **All set** — Feature summary, startup preference, and completion
 
-The setup flow no longer configures remote/manual gateways. The Welcome page's **Advanced setup** link closes setup and opens the tray app's Connections tab.
+The setup flow no longer configures remote/manual gateways inline. The Welcome page's **Connect to an existing gateway** option routes through `AdvancedSetupPage`, closes setup, and opens the tray app's Connections tab.
 
 ## Screen Details
 
 ### Welcome
-Displays the OpenClaw lobster icon, app title, and a brief description. If an app-owned local WSL gateway already exists, the primary CTA reads **Install new WSL Gateway** and confirmation warns that the current OpenClaw WSL gateway and distro will be deleted. If only an external gateway exists, the CTA remains **Set up locally** and confirmation explains that the external connection remains available in Connections.
+Displays the OpenClaw icon, app title, and a brief description. If an app-owned local WSL gateway already exists, the primary CTA reads **Install new WSL Gateway** and confirmation warns that the current OpenClaw WSL gateway and distro will be deleted. If only an external gateway exists, the CTA remains **Set up locally** and confirmation explains that the external connection remains available in Connections.
 
 ### Local setup progress
 Installs and connects a new app-owned `OpenClawGateway` WSL instance from a clean WSL baseline. Setup does not export from or mutate an existing user Ubuntu distro; if WSL cannot create the named app-owned distro directly, setup fails with an actionable update message. When replacing an app-owned local gateway, the removal step is shown as part of progress and can be retried on failure.
 
 The managed distro is locked down and is not intended to be a normal interactive Ubuntu profile. For editing `openclaw.json` as the `openclaw` user and using root for protected-file administration, see [Managing the locked-down WSL gateway](WSL_GATEWAY_ADMIN.md).
 
-### Wizard
+### Capabilities and Windows permissions
+
+The Capabilities page applies the selected profile to both setup config and runtime `Node*` settings. Inline Windows permission rows are shown only for capabilities that need OS-level state (camera, microphone, location, screen capture). Notifications are always shown as an app-level permission. Screen capture is passive: Windows asks what to share each capture through the Graphics Capture picker.
+
+### OpenClaw onboard
+
+After OpenClaw onboard completes—or when the user explicitly skips it—local setup runs the pinned gateway CLI's non-interactive baseline initializer against the final runtime workspace, then writes fixed Windows-node guidance into a setup-owned managed section of that workspace's `AGENTS.md`. The section is replaced idempotently between markers, preserves user-authored `AGENTS.md` content and file permissions outside those markers, and does not modify OpenClaw source files. This helps the initial companion-app OpenClaw session know to use the Windows node / `nodes` tool for Windows desktop, files, screenshots, camera, notifications, browser proxy, and Windows command tasks.
+
 Renders server-defined setup steps via RPC (`wizard.start` / `wizard.next`). The gateway controls the flow — steps can be:
 - **Note** — informational messages
 - **Confirm** — yes/no decisions
@@ -38,18 +47,10 @@ If the gateway doesn't support the wizard protocol or is unreachable, this scree
 
 The wizard keeps recovery choices visible while setup steps are running so users can start the wizard again or skip it for now if an auth flow stalls. If the gateway restarts or the wizard connection is lost while setup is running, the same recovery choices are presented in the error state so the user is not trapped retrying a broken session.
 
-### Permissions
-Checks 5 Windows permissions using native APIs and registry:
-- Notifications (Toast capability)
-- Camera (Windows.Devices.Enumeration)
-- Microphone (Windows.Devices.Enumeration)
-- Screen Capture (Graphics.Capture)
-- Location (optional, registry-based)
-
-Each permission shows its current status (Enabled/Disabled/Allowed/Denied) with an "Open Settings" button linking to the relevant `ms-settings:` URI.
+When the gateway config wizard surfaces an error and the active gateway is an app-managed WSL distro, the error state also offers **Open terminal** and **Restart gateway**. The wizard does not parse or classify the gateway's error text; it leaves the message visible and selectable so the user can copy any command the gateway reports. The buttons reuse the shared `GatewayTerminalLauncher` and `WslGatewayController` (in `OpenClaw.Connection`, also used by the Connections tab). Restart re-enters the gateway config wizard (the provider/model onboarding step — not the whole V2 onboarding, and without re-installing the WSL distro) so fixes such as newly-installed tools are picked up on `PATH`. Because the gateway restart clears its wizard session, this resumes at the first config question rather than the exact step that failed. Detection is gated on `GatewayRecord.SetupManagedDistroName`, so it never appears for remote/SSH gateways.
 
 ### All set
-Displays a completion summary, a Launch at startup toggle, and a Finish button that saves settings and closes setup.
+Displays a completion summary, a Launch at startup toggle, and a Finish button that saves the startup preference before restarting the tray. Launch at startup defaults on so OpenClaw is ready after reboot.
 
 ## Security
 
@@ -85,16 +86,15 @@ Use a temp settings directory for tests that construct `SettingsManager`, or set
 
 | Path | Purpose |
 |------|---------|
-| `Onboarding/OnboardingWindow.cs` | Host window for the V2 setup shell |
-| `src/OpenClawTray.OnboardingV2/OnboardingV2App.cs` | V2 Functional UI root component and page navigation |
-| `src/OpenClawTray.OnboardingV2/OnboardingV2State.cs` | V2 shared setup state |
-| `Onboarding/GatewayWizard/GatewayWizardState.cs` | Host-owned state for the embedded gateway wizard |
-| `Onboarding/GatewayWizard/GatewayWizardPage.cs` | Embedded provider/model setup page inside V2 |
-| `Services/LocalGatewaySetup/SetupCodeDecoder.cs` | Base64url setup code parsing used from Connections |
-| `Onboarding/Services/InputValidator.cs` | Security input validation |
-| `Onboarding/Services/WizardStepParser.cs` | Wizard JSON step parsing |
-| `Onboarding/Services/LocalGatewayApprover.cs` | Local gateway URL classification |
-| `Onboarding/Services/PermissionChecker.cs` | Windows permission checks |
-| `Services/Connection/GatewayRegistry.cs` | Persistent gateway records and migration target |
-| `Services/Connection/GatewayConnectionManager.cs` | Operator/node connection lifecycle used by onboarding |
-| `Services/SetupExistingGatewayClassifier.cs` | Existing gateway classification for V2 Welcome and startup gating |
+| `src/OpenClaw.SetupEngine.UI/SetupWindow.xaml(.cs)` | Tray-hosted setup shell, run lock, preview routing, and page navigation |
+| `src/OpenClaw.SetupEngine.UI/Pages/SecurityNoticePage.xaml(.cs)` | First-run device-trust warning before setup choices |
+| `src/OpenClaw.SetupEngine.UI/Pages/WelcomePage.xaml(.cs)` | Install-new-WSL vs connect-existing choice and existing-gateway replacement prompt |
+| `src/OpenClaw.SetupEngine.UI/Pages/AdvancedSetupPage.xaml(.cs)` | Connect-existing handoff to Connection settings |
+| `src/OpenClaw.SetupEngine.UI/Pages/CapabilitiesPage.xaml(.cs)` | Capability profile, inline Windows permission status, and install review |
+| `src/OpenClaw.SetupEngine.UI/Pages/ProgressPage.xaml(.cs)` | WSL gateway install progress and gateway-installed handoff |
+| `src/OpenClaw.SetupEngine.UI/Pages/WizardPage.xaml(.cs)` | OpenClaw onboard provider/model/key wizard driven by gateway `wizard.*` frames |
+| `src/OpenClaw.SetupEngine.UI/Pages/CompletePage.xaml(.cs)` | Success, failure, log/help, and startup preference summary |
+| `src/OpenClaw.SetupEngine.UI/Pages/SetupPermissionHelper.cs` | Passive Windows permission checks and inline permission rows |
+| `src/OpenClaw.Connection/GatewayRegistry.cs` | Persistent gateway records and migration target |
+| `src/OpenClaw.Connection/GatewayConnectionManager.cs` | Operator/node connection lifecycle used by onboarding |
+| `src/OpenClaw.Tray.WinUI/Services/SetupExistingGatewayClassifier.cs` | Existing gateway classification for Welcome and startup gating |
diff --git a/docs/OPERATOR_NODE_CONCEPTS.md b/docs/OPERATOR_NODE_CONCEPTS.md
new file mode 100644
index 000000000..d317c9c09
--- /dev/null
+++ b/docs/OPERATOR_NODE_CONCEPTS.md
@@ -0,0 +1,82 @@
+# Operator and Node Concepts
+
+OpenClaw Companion connects a Windows PC to an OpenClaw gateway in two separate
+roles. A new install can use both roles at once, but they have different jobs and
+different approval paths.
+
+## Quick Glossary
+
+| Term | Meaning |
+| --- | --- |
+| Gateway | The OpenClaw service that coordinates agents, channels, sessions, devices, and nodes. The Windows app talks to it over WebSocket. |
+| Local WSL gateway | A dedicated `OpenClawGateway` WSL distro installed by the Windows onboarding flow. It is app-owned and locked down rather than a general-purpose Ubuntu profile. |
+| Operator | The user-facing control role. The tray app uses the operator connection for Quick Send, chat, diagnostics, channel controls, setup, and approving pairing requests. |
+| Node | The controllable Windows machine role. When Node Mode is enabled, the tray app advertises Windows capabilities such as screenshots, canvas, camera, notifications, and approved command execution. |
+| Pairing | The gateway approval flow that turns a new device or node request into a trusted identity with a stored device token. |
+| Reapproval | A later approval request when a paired node asks for new or changed trust, such as command capability access. |
+| Allowlisted node capability | A node command the gateway is explicitly allowed to invoke, configured in the gateway `allowCommands` list. Windows-side settings and policies can still block the command. |
+
+## How the Roles Work Together
+
+The operator role is the control surface. It signs in to the gateway, sends chat
+messages, shows status, opens diagnostics, and approves device or node pairing
+requests when the gateway says approval is required.
+
+The node role is the Windows capability surface. It tells the gateway which
+Windows-native tools are available, then waits for approved gateway calls. Node
+Mode does not mean every tool can run automatically. A capability has to be
+enabled in Windows settings, allowed by the gateway, and in some cases approved
+by a local Windows policy prompt.
+
+A typical local setup uses this sequence:
+
+1. OpenClaw Companion installs or connects to a gateway.
+2. The tray app connects as an operator so you can send messages and manage setup.
+3. If Node Mode is enabled, the same Windows app also connects as a node.
+4. The gateway asks for pairing approval before trusting the new device or node.
+5. After approval, the gateway can invoke only the node capabilities that are
+   enabled locally and allowlisted by gateway policy.
+
+## Local WSL Gateway Versus Existing Gateway
+
+The default onboarding path installs a local WSL gateway for users who do not
+already have one. That gateway runs on the same Windows PC and is managed by the
+OpenClaw Companion setup flow.
+
+Advanced setup is for users who already have a local, remote, or manually
+managed gateway. In that case, the Windows app still uses the same operator and
+node roles; only the gateway location and credentials are different.
+
+## Pairing, Tokens, and Reapproval
+
+Pairing is gateway-owned. Setup codes, bootstrap tokens, and shared gateway
+tokens can help the app connect for the first time, but a paired device token
+takes precedence after approval. This keeps long-lived operator and node
+identity scoped to the gateway record that issued it.
+
+Some trust decisions are intentionally not automatic. Node command trust and
+capability reapproval stay pending until an operator explicitly approves them,
+so a new or changed node capability is visible before the gateway can use it.
+
+## Capability Allowlist
+
+Node Mode advertises available Windows commands, but the gateway decides which
+commands it may call through `gateway.nodes.allowCommands` in
+`~/.openclaw/openclaw.json`. Add exact command names such as `screen.snapshot`,
+`canvas.present`, or `system.run`; wildcard entries are not expanded by the
+gateway.
+
+Privacy-sensitive commands, especially `screen.record`, `camera.snap`,
+`camera.clip`, `stt.transcribe`, `tts.speak`, and `system.run`, should only be
+allowlisted when you want the gateway to be able to request that behavior.
+Windows permissions, Node Mode toggles, and the local exec policy can still add
+stricter checks.
+
+## Where to Go Next
+
+- Follow [Installation and setup](SETUP.md) for first-run onboarding and
+  troubleshooting.
+- See [Node Mode](../README.md#-node-mode-agent-control) for capability names
+  and allowlist examples.
+- Read [Connection architecture](CONNECTION_ARCHITECTURE.md) for contributor
+  details about token precedence, pairing, and connection lifecycle.
diff --git a/docs/RELEASING.md b/docs/RELEASING.md
index b24bc8a62..87f3b429f 100644
--- a/docs/RELEASING.md
+++ b/docs/RELEASING.md
@@ -161,12 +161,11 @@ For alpha tags, the **Build and Test** workflow should run:
 
 - `repo-hygiene`
 - `test`
-- `e2etests`
-- `build (win-x64)`
-- `build (win-arm64)`
+- `e2etests` shards: `setup-connect`, `revocation-recovery`, and `network-recovery`
+- `build` matrix entries shown by GitHub as `build (win-x64)` and `build (win-arm64)`
 - `release`
 
-MSIX jobs may appear as skipped while MSIX is paused.
+The `setup-connect` E2E shard contains the MXC proof tests for the gateway -> Windows node -> `system.run` path and validates that the expected proof test names appear in the TRX output. GitHub-hosted runners may report those MXC proofs as skipped when the host is not MXC-capable; use `.\scripts\validate-mxc-e2e.ps1` for required local/self-hosted MXC merge validation. The `build-msix` job is disabled with `if: false` while MSIX is paused for alpha releases, so it should not appear in the required run list.
 
 The release job should:
 
diff --git a/docs/SETUP.md b/docs/SETUP.md
index f804f6501..5ed6d17ad 100644
--- a/docs/SETUP.md
+++ b/docs/SETUP.md
@@ -9,7 +9,9 @@ Before installing, make sure you have:
 - **Windows 10 (20H2 or later)** or **Windows 11**
 - **WebView2 Runtime** — pre-installed on Windows 11 and most up-to-date Windows 10 systems. If missing, download from [Microsoft Edge WebView2](https://developer.microsoft.com/microsoft-edge/webview2/).
 
-You do **not** need a pre-existing local OpenClaw gateway before installing. On first launch, OpenClaw Companion can install a dedicated local WSL gateway for you, or you can use **Advanced setup** to connect to an existing local, remote, or manually configured gateway.
+You do **not** need a pre-existing local OpenClaw gateway before installing. On first launch, OpenClaw Companion can install a dedicated local WSL gateway for you, or you can use **Advanced setup** to connect to an existing local, remote, or manually configured gateway. See [Onboarding Wizard](ONBOARDING_WIZARD.md) for the install-new-WSL and connect-existing handoff flow.
+
+New to the OpenClaw roles? Read [Operator and node concepts](OPERATOR_NODE_CONCEPTS.md) for a short glossary of gateway, local WSL gateway, operator, node, pairing, reapproval, and allowlisted node capabilities before starting setup.
 
 ## Step-by-Step Installation
 
@@ -19,9 +21,9 @@ Download the latest stable installer from the canonical OpenClaw release assets:
 
 | File | Architecture |
 |------|-------------|
-| [OpenClawCompanion-Setup-x64.exe](https://github.com/openclaw/openclaw/releases/latest/download/OpenClawCompanion-Setup-x64.exe) | Intel / AMD (most PCs) |
-| [OpenClawCompanion-Setup-arm64.exe](https://github.com/openclaw/openclaw/releases/latest/download/OpenClawCompanion-Setup-arm64.exe) | ARM64 (Surface Pro X, Snapdragon laptops) |
-| [OpenClawCompanion-SHA256SUMS.txt](https://github.com/openclaw/openclaw/releases/latest/download/OpenClawCompanion-SHA256SUMS.txt) | SHA-256 checksums |
+| [OpenClawCompanion-Setup-x64.exe](https://github.com/openclaw/openclaw-windows-node/releases/latest/download/OpenClawCompanion-Setup-x64.exe) | Intel / AMD (most PCs) |
+| [OpenClawCompanion-Setup-arm64.exe](https://github.com/openclaw/openclaw-windows-node/releases/latest/download/OpenClawCompanion-Setup-arm64.exe) | ARM64 (Surface Pro X, Snapdragon laptops) |
+| [OpenClawCompanion-SHA256SUMS.txt](https://github.com/openclaw/openclaw-windows-node/releases/latest/download/OpenClawCompanion-SHA256SUMS.txt) | SHA-256 checksums |
 
 If you're unsure, use the **x64** installer.
 
@@ -40,7 +42,7 @@ The installer offers optional shortcuts and startup integration:
 
 ### 4. First Launch
 
-After the installer finishes, OpenClaw Companion starts automatically. Look for the 🦞 lobster icon in the system tray (bottom-right corner of the taskbar, near the clock).
+After the installer finishes, OpenClaw Companion starts automatically. Look for the OpenClaw icon in the system tray (bottom-right corner of the taskbar, near the clock).
 
 If you don't see it, check the **hidden icons** area (the `^` arrow next to the tray).
 
@@ -50,26 +52,21 @@ The installer also creates a Start Menu group with shortcuts for **OpenClaw Comp
 
 On first launch, Molty opens the onboarding wizard when there is no usable saved gateway connection. The default flow installs and configures a dedicated app-owned local WSL gateway:
 
-1. **Welcome** — A friendly greeting introducing OpenClaw and Molty. Click **Install new WSL Gateway** to install a new local WSL gateway.
+1. **Security notice** — Confirms this is a trusted PC before local setup starts.
 
-   If you already have a local or remote gateway, choose **Advanced setup** instead. This opens the tray app's Connections tab, where you can connect with an existing gateway URL, token, or setup code without installing a new local WSL gateway.
+2. **Welcome** — Choose **Install a local gateway (WSL)** to install the app-owned WSL gateway, or **Connect to an existing gateway** to open the tray app's Connections tab.
 
-2. **Capabilities** — Reviews the Windows node capabilities that can be enabled, such as system commands, canvas, screen capture, camera, location, browser automation, device controls, text-to-speech, and speech-to-text.
+   For the role split behind these choices, see [Operator and node concepts](OPERATOR_NODE_CONCEPTS.md).
 
-3. **Local setup progress** — Installs a fresh app-owned `OpenClawGateway` WSL instance and connects Molty to it. This does not modify an existing user Ubuntu distro.
+3. **Capabilities** — Choose a capability profile, review matching Windows permission status, and see exactly what setup will install before anything runs.
 
-4. **Gateway setup** — If your gateway supports it, this screen walks you through gateway-driven configuration steps (AI provider selection, personality setup, communication channels). The steps are defined by your gateway via RPC. If the gateway doesn't support wizard mode, this screen is skipped automatically.
+4. **Local setup progress** — Installs a fresh app-owned `OpenClawGateway` WSL instance and connects Molty to it. This does not modify an existing user Ubuntu distro.
 
-5. **Permissions** — Reviews Windows system permissions needed for full functionality:
-   - **Notifications** — for toast alerts
-   - **Camera** — for camera capture
-   - **Microphone** — for voice input
-   - **Screen Capture** — for screenshots
-   - **Location** — optional, for location-aware features; packaged installs declare this capability so Windows may prompt for location consent the first time it is used
+5. **Gateway installed** — Confirms the private gateway is running and offers **Start OpenClaw onboard**.
 
-   Each permission shows its current status. Click **Open Settings** next to any permission to jump directly to the relevant Windows Settings page.
+6. **OpenClaw onboard** — Gateway-driven provider/model/key setup rendered as a transcript. Recovery options stay available if the gateway wizard needs attention.
 
-6. **All set** — A summary of available features (tray menu, channels, voice, canvas, skills). Toggle **Launch at Login** to start Molty with Windows, then click **Finish** to complete setup.
+7. **All set** — A summary of available features and startup preference. Fresh setup defaults launch-at-startup on; direct OpenClaw onboard preserves any existing startup preference.
 
 After the wizard, the tray icon turns green when connected. You can re-run the wizard or change settings anytime from the tray menu.
 
@@ -188,7 +185,7 @@ Settings are stored at `%APPDATA%\OpenClawTray\settings.json`. If this file is c
 
 ## Updating
 
-OpenClaw Companion checks for updates automatically and shows a notification when a new version is available. Click **Update** to download and apply the update. You can also manually check by re-downloading from the [OpenClaw Windows docs](https://docs.openclaw.ai/platforms/windows) or the [latest OpenClaw release](https://github.com/openclaw/openclaw/releases/latest).
+OpenClaw Companion checks for updates automatically and shows a notification when a new version is available. Click **Update** to download and apply the update. You can also manually check by re-downloading from the [OpenClaw Windows docs](https://docs.openclaw.ai/platforms/windows) or the [latest OpenClaw Windows release](https://github.com/openclaw/openclaw-windows-node/releases/latest).
 
 ## Uninstalling
 
diff --git a/docs/SETUP_ENGINE_REDESIGN.md b/docs/SETUP_ENGINE_REDESIGN.md
index c8538e958..0fcc7111a 100644
--- a/docs/SETUP_ENGINE_REDESIGN.md
+++ b/docs/SETUP_ENGINE_REDESIGN.md
@@ -4,12 +4,14 @@
 
 The Setup Engine is a **config-driven system** for provisioning an OpenClaw WSL gateway from scratch. It consists of two setup projects plus the tray host:
 
-1. **`OpenClaw.SetupEngine`** — Headless pipeline library. Runs 18 steps sequentially with full JSONL logging, transaction journal, and rollback support.
+1. **`OpenClaw.SetupEngine`** — Headless pipeline library. Runs 19 steps sequentially with full JSONL logging, transaction journal, and rollback support.
 2. **`OpenClaw.SetupEngine.UI`** — WinUI3 setup window/pages that wrap the same pipeline with a fluent wizard UI.
 3. **`OpenClaw.Tray.WinUI`** — The only shipped WinUI executable. It hosts `SetupWindow` directly and self-restarts after successful setup.
 
 The bundled `default-config.json` ships with the tray executable and provides secure defaults (loopback bind, WSL isolation, systemd enabled). Defaults can be overridden via config file or environment variables.
 
+> **Status note (2026-07-06):** Current default setup includes `WindowsNodeBootstrapContextStep`, which injects Windows-node context into the WSL workspace `AGENTS.md` after onboarding.
+
 ---
 
 ## Architecture
@@ -18,7 +20,7 @@ The bundled `default-config.json` ships with the tray executable and provides se
 ┌─────────────────────────────────────────────────────────────┐
 │  OpenClaw.SetupEngine (net10.0 library)                     │
 │                                                             │
-│  SetupPipeline ──→ 18 SetupStep classes ──→ StepResult      │
+│  SetupPipeline ──→ 19 SetupStep classes ──→ StepResult      │
 │       │                    │                                │
 │  SetupContext         CommandRunner (WSL + Process)          │
 │  SetupConfig          TransactionJournal (JSONL)            │
@@ -31,7 +33,7 @@ The bundled `default-config.json` ships with the tray executable and provides se
 ┌─────────────────────────────────────────────────────────────┐
 │  OpenClaw.SetupEngine.UI (net10.0-windows10.0.22621, WinUI3)│
 │  SetupWindow + pages, direct code-behind, no MVVM           │
-│  Welcome → Capabilities → Progress → Permissions → Complete │
+│  Security → Welcome → Capabilities → Progress → Onboard → Complete │
 └─────────────────────────────────────────────────────────────┘
          ▲ hosted by project reference
          │
@@ -63,11 +65,12 @@ src/OpenClaw.SetupEngine.UI/
 ├── OpenClaw.SetupEngine.UI.csproj # WinAppSDK library referenced by tray
 ├── SetupWindow.xaml / .xaml.cs    # 720×820 window, Mica, title bar, navigation, setup events
 └── Pages/
-    ├── WelcomePage.xaml / .cs     # Logo, info card, Install button + ContentDialog
-    ├── CapabilitiesPage.xaml / .cs # 2-column grid with icons + descriptions
-    ├── ProgressPage.xaml / .cs    # Live step rows + streaming log viewer
-    ├── PermissionsPage.xaml / .cs # 5 permission checks + Open Settings buttons
-    └── CompletePage.xaml / .cs    # Party popper, amber banner, startup toggle
+    ├── SecurityNoticePage.xaml / .cs # Device-trust warning
+    ├── WelcomePage.xaml / .cs        # Install WSL gateway vs connect existing
+    ├── CapabilitiesPage.xaml / .cs   # Profile, inline permissions, install review
+    ├── ProgressPage.xaml / .cs       # Live step rows + gateway-installed handoff
+    ├── WizardPage.xaml / .cs         # OpenClaw onboard transcript
+    └── CompletePage.xaml / .cs       # Mascot status badge, summary, startup toggle
 ```
 
 **Total engine code: ~1,882 lines across 8 files.** UI adds ~10 more files.
@@ -163,7 +166,7 @@ src/OpenClaw.SetupEngine.UI/
 
 ---
 
-## Pipeline Steps (18 total)
+## Pipeline Steps (19 total)
 
 Executed sequentially. Each step is a small class (30–120 lines) in `SetupSteps.cs`.
 
@@ -186,7 +189,8 @@ Executed sequentially. Each step is a small class (30–120 lines) in `SetupStep
 | 15 | `PairNodeStep` | WebSocket node connection + capability registration |
 | 16 | `VerifyEndToEndStep` | End-to-end health check (operator → node round trip) |
 | 17 | `RunGatewayWizardStep` | Run/configure the gateway wizard unless skipped |
-| 18 | `StartKeepaliveStep` | Background WSL keepalive to prevent VM shutdown |
+| 18 | `WindowsNodeBootstrapContextStep` | Inject Windows-node context into the WSL workspace `AGENTS.md` |
+| 19 | `StartKeepaliveStep` | Background WSL keepalive to prevent VM shutdown |
 
 ### Step Base Class
 
@@ -252,7 +256,7 @@ Structured JSONL logger. Records sanitized entries for:
 - State transitions
 - Errors with stack traces
 
-Log path defaults to `%APPDATA%\OpenClawTray\Logs\Setup\setup-<timestamp>.log`
+Log path defaults to `%APPDATA%\OpenClawTray\Logs\Setup\setup-engine-<yyyyMMdd-HHmmss>.jsonl` for setup and `uninstall-engine-<yyyyMMdd-HHmmss>.jsonl` for uninstall.
 
 ---
 
@@ -260,42 +264,42 @@ Log path defaults to `%APPDATA%\OpenClawTray\Logs\Setup\setup-<timestamp>.log`
 
 The WinUI app is a **thin shell** — no business logic, just rendering pipeline state. End-user UI runs default to `RollbackOnFailure=true`; `--no-rollback-on-failure` preserves an explicit debugging opt-out.
 
-### Page Flow: Welcome → Capabilities → Progress → Permissions → Complete
+### Page Flow: Security → Welcome → Capabilities → Progress → OpenClaw onboard → Complete
+
+**SecurityNoticePage**
+- Native warning InfoBar for device-trust and setup transparency
 
 **WelcomePage**
-- Lobster icon + "OpenClaw Setup" title bar
-- Info card explaining what will be installed
-- "Install new WSL Gateway" button with ContentDialog confirmation
-- "Advanced setup" link → launches tray with `--page connection`
+- OpenClaw icon + "OpenClaw Setup" title bar
+- Install app-owned WSL gateway (recommended) or connect to existing gateway
+- Replacement prompt when an app-owned WSL gateway already exists
 
 **CapabilitiesPage**
-- 2-column grid showing capabilities from config
-- Icons + descriptions for each (System, Canvas, Screen, Camera, etc.)
-- "Continue" proceeds to Progress
+- Capability profile defaults to Standard
+- Inline Windows permission status for selected capabilities
+- Install review showing WSL distro, OpenClaw CLI, local gateway service, and possible UAC
 
 **ProgressPage**
 - Step rows with spinning ProgressRing → ✓/✗ badges
-- Live streaming log viewer (monospace, auto-scroll)
-- On success → navigates to Permissions
+- Live activity ledger collapsed by default
+- On success → gateway-installed milestone with explicit OpenClaw onboard CTA
 - On failure → navigates to Complete(success=false)
 
-**PermissionsPage**
-- 5 permission rows: Notifications, Camera, Microphone, Location, Screen Capture
-- Live status checks (registry, DeviceAccessInformation, GraphicsCaptureSession)
-- "Open Settings" buttons launch `ms-settings://` URIs
-- "Refresh status" button, "Continue" proceeds to Complete
+**WizardPage**
+- Transcript-style gateway `wizard.*` flow for provider/model/key setup
+- Error state uses More options plus gateway recovery actions when available
 
 **CompletePage**
-- Party popper image
+- OpenClaw mascot with corner status badge
 - "All set!" / error heading
-- Amber "Node Mode Active" warning banner
-- "Launch OpenClaw at startup?" toggle (reported to tray host)
-- "Finish" button asks the tray host to self-restart and open chat
+- Native InfoBar for node mode
+- "Launch OpenClaw at startup" toggle defaults on and is persisted before restart
+- "Finish" asks the tray host to self-restart and open chat
 
 ### Window Properties
 - 720×820 logical pixels (DPI-scaled)
 - Mica backdrop
-- Custom title bar with lobster icon
+- Custom title bar with OpenClaw icon
 
 ---
 
@@ -313,7 +317,9 @@ OpenClaw.SetupEngine.Program.Main(["--no-rollback-on-failure"])
 OpenClaw.SetupEngine.Program.Main(["--log-path", "./trace.log"])
 ```
 
-Exit codes: 0 = success, 1 = failure
+Common flags include `--config`, `--headless`, `--dry-run`, `--rollback-on-failure`, `--no-rollback-on-failure`, `--log-path`, `--gateway-port`, and uninstall safety flags such as `--uninstall` plus `--confirm-destructive`.
+
+Exit codes: 0 = success, 1 = pipeline failure, 2 = bad arguments or setup lock/safety failure, 3 = cancelled
 
 ### UI (hosted by tray)
 
diff --git a/docs/TEST_COVERAGE.md b/docs/TEST_COVERAGE.md
index 67889f6cf..84b0c0cb0 100644
--- a/docs/TEST_COVERAGE.md
+++ b/docs/TEST_COVERAGE.md
@@ -1,6 +1,6 @@
 # Test Coverage Summary
 
-**Last audited**: 2026-05-22<br>
+**Last audited**: 2026-07-06<br>
 **Framework**: xUnit / .NET 10.0<br>
 **Required validation status**: passing (`.\build.ps1`, Shared tests, Tray tests)
 
@@ -11,27 +11,27 @@ These are the suites every agent must run after code changes, as documented in
 
 | Suite | Latest runtime result |
 |---|---:|
-| `OpenClaw.Shared.Tests` | 1,920 total: 1,891 passed, 29 skipped |
-| `OpenClaw.Tray.Tests` | 1,178 total: 1,178 passed, 0 skipped |
+| `OpenClaw.Shared.Tests` | 2,734 total: 2,703 passed, 31 skipped |
+| `OpenClaw.Tray.Tests` | 1,584 total: 1,584 passed, 0 skipped |
 
-Runtime totals come from `dotnet test` on 2026-05-22. They are higher than
+Runtime totals come from `dotnet test` on 2026-07-06. They are higher than
 method counts because some `[Theory]` tests expand into multiple cases.
 
 ## Test project inventory
 
 | Project | Primary scope | Test methods |
 |---|---|---:|
-| `OpenClaw.Connection.Tests` | Gateway registry, credential resolution, connection manager/state machine, setup codes, pairing, diagnostics | 189 |
-| `OpenClaw.Shared.Tests` | Shared models, gateway client, capabilities, MCP, exec approval, A2UI security, URL handling, notification categorization | 1,347 |
-| `OpenClaw.Tray.Tests` | Tray state/UI helpers, settings isolation, onboarding, connection page behavior, localization, local gateway setup/uninstall | 786 |
-| `OpenClaw.Tray.UITests` | Native WinUI/A2UI control and rendering coverage | 50 |
-| `OpenClaw.WinNode.Cli.Tests` | Windows node CLI argument parsing, command behavior, JSON output, uninstall flow | 79 |
-| `OpenClawTray.FunctionalUI.Tests` | Functional UI smoke coverage | 8 |
-| `OpenClawTray.OnboardingV2.Tests` | Onboarding V2 page flow and state coverage | 9 |
-| `OpenClaw.Tray.IntegrationTests` | Integration-test project scaffold; no `[Fact]`/`[Theory]` methods currently | 0 |
-
-The method inventory is a source scan of `[Fact]` and `[Theory]` attributes. Use
-`dotnet test` for authoritative runtime totals.
+| `OpenClaw.Connection.Tests` | Gateway registry, credential resolution, connection manager/state machine, setup codes, pairing, diagnostics | 325 |
+| `OpenClaw.Shared.Tests` | Shared models, gateway client, capabilities, MCP, exec approval, A2UI security, URL handling, notification categorization | 1,977 |
+| `OpenClaw.Tray.Tests` | Tray state/UI helpers, settings isolation, onboarding, connection page behavior, localization, local gateway setup/uninstall | 1,240 |
+| `OpenClaw.Tray.UITests` | Native WinUI/A2UI control, rendering, and accessibility scan coverage | 64 |
+| `OpenClaw.WinNode.Cli.Tests` | Windows node CLI argument parsing, command behavior, JSON output, uninstall flow | 89 |
+| `OpenClaw.SetupEngine.Tests` | Setup engine, WSL gateway installation, setup-code, and local setup policy coverage | 284 |
+| `OpenClawTray.FunctionalUI.Tests` | Functional UI smoke coverage | 10 |
+| `OpenClaw.E2ETests` | Gateway-mediated setup/connect, revocation recovery, and network recovery suites | 21 |
+| `OpenClaw.Tray.IntegrationTests` | Real-process tray/MCP integration tests gated by `OPENCLAW_RUN_INTEGRATION=1` | 18 |
+
+The method inventory is a source scan of `[Fact]`, `[Theory]`, and repo custom xUnit attributes such as `[E2EFact]`, `[MxcE2EFact]`, and `[IntegrationFact]`. Use `dotnet test` for authoritative runtime totals.
 
 ## Coverage highlights
 
@@ -57,7 +57,26 @@ The method inventory is a source scan of `[Fact]` and `[Theory]` attributes. Use
 - **OpenClaw.Connection.Tests** keeps connection architecture tests separate from tray UI concerns.
 - **OpenClaw.Tray.UITests** covers A2UI/native WinUI rendering behavior that is awkward to validate through pure unit tests.
 - **OpenClaw.WinNode.Cli.Tests** covers the standalone Windows node CLI contract.
-- **OpenClawTray.OnboardingV2.Tests** and **OpenClawTray.FunctionalUI.Tests** cover newer UI surfaces outside the main tray test project.
+- **OpenClaw.SetupEngine.Tests** covers gateway setup and local WSL installation policy.
+- **OpenClawTray.FunctionalUI.Tests** covers newer UI surfaces outside the main tray test project.
+- **OpenClaw.E2ETests** uses custom `[E2EFact]` / `[MxcE2EFact]` attributes that inherit xUnit `FactAttribute`; CI exercises them with shard filters.
+- **OpenClaw.Tray.IntegrationTests** uses custom `[IntegrationFact]` attributes and runs only when `OPENCLAW_RUN_INTEGRATION=1`.
+- **PackagingTests** is a PowerShell-script lane under `tests\PackagingTests\`, not a dotnet test project.
+
+## Formal validation paths
+
+Use the smallest lane that proves the changed subsystem, but always include the
+required closeout lane for code changes.
+
+| Lane | Entry point | Required when |
+|---|---|---|
+| Required closeout | `.\build.ps1`, Shared tests, Tray tests | Every code change and every agent closeout |
+| GitHub-hosted PR/main CI | `.github\workflows\ci.yml` | Every pull request and push to `main`; runs normal E2E shards but skips MXC proofs on hosted runners |
+| Accessibility scan | `dotnet test .\tests\OpenClaw.Tray.UITests\OpenClaw.Tray.UITests.csproj -r win-x64 --filter Category=Accessibility` | UI changes and CI quality gate; runs real-process Axe.Windows scans; see `docs\ACCESSIBILITY.md` |
+| Local E2E | `OPENCLAW_RUN_E2E=1` with `OpenClaw.E2ETests` | Gateway setup/connect, recovery, or pairing changes that need real WSL Gateway coverage |
+| Local MXC E2E | `.\scripts\validate-mxc-e2e.ps1` | MXC sandboxing, `system.run`, exec approvals, Windows node command execution, gateway setup/connect changes that affect MXC |
+| Product WSL setup validation | `.\scripts\validate-wsl-gateway.ps1` | Tray onboarding/setup-engine changes that must prove the product WSL install path |
+| Packaging script checks | `powershell -File .\tests\PackagingTests\Test-InnoUninstallOrdering.ps1` | Installer script changes that affect uninstall or cleanup ordering |
 
 ## Running tests
 
@@ -76,6 +95,13 @@ dotnet test
 $env:OPENCLAW_RUN_E2E = "1"
 dotnet test .\tests\OpenClaw.E2ETests\OpenClaw.E2ETests.csproj -r win-x64
 
+# Formal MXC validation path. This sets the required integration/E2E env vars
+# itself and fails when MXC proofs skip unless -AllowSkip is explicitly supplied.
+.\scripts\validate-mxc-e2e.ps1
+
+# Accessibility scan, matching the CI quality gate.
+dotnet test .\tests\OpenClaw.Tray.UITests\OpenClaw.Tray.UITests.csproj -r win-x64 --filter Category=Accessibility
+
 # Single project
 dotnet test .\tests\OpenClaw.Connection.Tests\OpenClaw.Connection.Tests.csproj
 
@@ -97,3 +123,14 @@ first so `dotnet test --no-restore` cannot no-op before `bin\` exists.
   and memory usage over multi-day sessions.
 - Manual visual acceptance for complex WinUI surfaces where screenshot
   comparison would be brittle.
+
+For these gaps, affected changes must include the manual UI/MCP smoke described
+in `AGENTS.md` and `.agents/skills/openclaw-proof-validation/SKILL.md`: launch
+the tray from the current worktree, use computer-use / desktop automation for
+visible WinUI paths, and validate local MCP with `winnode --list-tools` plus the
+changed command when node capabilities are involved.
+
+When node command surfaces change, include
+`OpenClaw.WinNode.Cli.Tests` in focused validation because `SkillMdDriftTests`
+guards the capability registry, MCP descriptions, and `winnode` skill reference
+from drifting apart.
diff --git a/docs/VERSIONING.md b/docs/VERSIONING.md
index 931261a18..3314672d1 100644
--- a/docs/VERSIONING.md
+++ b/docs/VERSIONING.md
@@ -15,6 +15,8 @@ imports GitVersion through `src\Directory.Build.props`, so normal `dotnet build`
 `.\build.ps1`, `.\run-app-local.ps1`, and CI builds all derive assembly metadata
 from the same tag history.
 
+The repository-local tool manifest (`.config\dotnet-tools.json`) and MSBuild package reference (`src\Directory.Build.props`) are the authoritative local tool/package pins and currently target GitVersion 6.8.1. The CI workflow's `gittools/actions/gitversion/setup` step currently pins `6.4.x` for workflow output computation; if workflow files are being changed, prefer aligning that setup action to `6.8.x`. Until then, CI's tag/SemVer verification remains the release-blocking guard against version drift.
+
 ## Tagged and untagged builds
 
 Tagged releases must resolve to the exact tag SemVer:
diff --git a/docs/WINDOWS_NODE_TESTING.md b/docs/WINDOWS_NODE_TESTING.md
index b408a803e..52cb4815b 100644
--- a/docs/WINDOWS_NODE_TESTING.md
+++ b/docs/WINDOWS_NODE_TESTING.md
@@ -12,8 +12,26 @@ The Windows Node feature allows the tray app to receive commands from the OpenCl
 4. Toggle "Enable Node Mode" ON
 5. Click Save
 
+## Companion-App Setup Guidance
+
+For app-owned local WSL setup, after OpenClaw onboard completes or is explicitly skipped, setup runs the pinned gateway CLI's non-interactive baseline initializer against the final runtime workspace and then injects fixed Windows-node guidance into that workspace's `AGENTS.md`. The injected block is setup-owned and idempotently replaced between managed markers, preserving user-authored content and file permissions outside those markers and leaving OpenClaw source files unchanged.
+
+**Note on the apply script's WSL invocation.** The `WindowsNodeBootstrapContextStep` apply and rollback scripts are piped to `bash -s` via stdin (`RunInWslAsync(..., inputViaStdin: true)`) rather than the default `bash -c` argv path. This is required because `wsl.exe` performs shell variable expansion on argv before invoking bash, which would drop user-defined `$var` references in the multi-line script (`workspace='...'` followed by `mkdir -p "$workspace"` becomes `mkdir -p ""`). See `docs/WSL_EXE_ARGV_PITFALL.md` for the full writeup.
+
+The guidance helps the first companion-app OpenClaw session route Windows desktop, files, screenshots, camera, notifications, browser proxy, and Windows command tasks through the Windows node / `nodes` tool.
+
 ## What You Can Test Now
 
+### Agent-driven UI and MCP validation
+
+For changes touching tray UX, Settings, onboarding, chat/canvas, Command Center, Windows node capabilities, local MCP, gateway pairing/connection, permissions, or diagnostics, use `.agents/skills/openclaw-proof-validation/SKILL.md`.
+
+Short version: run required tests, collect a closeout proof pass with `.\run-app-local.ps1 -Isolated` when UI is involved, use computer-use or developer-provided screenshots/output for the active changed UI state, prove MCP with `winnode` or raw JSON-RPC, prove gateway paths when available, and include current-head concrete output under `## Real behavior proof`. Mid-development computer-use/MCP/rubber-duck validation is fine when explicitly requested or needed to unblock work.
+
+### New command MCP contract
+
+Every new Windows node call must be exposed through local MCP and `winnode`: register the capability, update `McpToolBridge.CommandDescriptions`, update `src/OpenClaw.WinNode.Cli/skill.md`, add focused tests, and prove discovery/invocation with `winnode` or raw MCP JSON-RPC.
+
 ### 1. Settings Toggle
 - Verify the toggle appears in Settings under "ADVANCED"
 - Verify it saves and persists across app restarts
@@ -59,7 +77,9 @@ These features need the gateway to send `node.invoke` commands:
 | `screen.snapshot` | Take screenshot | Captures screen, shows notification, returns base64 |
 | `screen.record` | Record short screen clip | Returns MP4/base64 metadata; requires explicit gateway allowlist |
 | `system.notify` | Show notification | Displays toast notification |
-| `system.run` / `system.which` | Controlled command execution | Uses local exec approval policy; `prompt` decisions show a Windows Allow once / Always allow / Deny dialog |
+| `system.run` | Controlled command execution | Uses local exec approval policy; `prompt` decisions show a Windows Allow once / Always allow / Deny dialog |
+| `system.run.prepare` | Pre-flight command execution | Parses and validates a `system.run` invocation without executing it |
+| `system.which` | Resolve executables | Returns absolute paths for requested binaries |
 | `camera.list` | Enumerate cameras | Returns device IDs and names |
 | `camera.snap` | Capture photo | Returns base64 image (NV12 fallback) |
 | `camera.clip` | Capture video clip | Returns MP4/base64 metadata |
@@ -67,6 +87,9 @@ These features need the gateway to send `node.invoke` commands:
 | `device.info` / `device.status` | Device metadata/status | Returns host/app/locale plus battery/storage/network/uptime payloads |
 | `browser.proxy` | Proxy browser-control host requests | Requires Browser proxy bridge enabled, a compatible browser-control host listening on gateway port + 2, and matching browser-control auth |
 | `tts.speak` | Speak text aloud | Requires Text-to-speech playback enabled in Settings; gateway mode also requires `tts.speak` in `gateway.nodes.allowCommands` |
+| `stt.transcribe` | Bounded microphone transcription | Requires Speech-to-text enabled in Settings; uses local Whisper.net |
+| `stt.listen` | Voice-activity microphone transcription | Returns when the user stops speaking or timeout expires |
+| `stt.status` | Speech-to-text readiness | Returns Whisper.net model download/readiness state |
 
 ## Capabilities Advertised
 
@@ -79,6 +102,9 @@ When the node connects, it advertises these capabilities:
 - `device` - Host/app metadata and lightweight status
 - `browser` - Local `browser.proxy` bridge to a browser-control host on gateway port + 2, when enabled in Settings
 - `tts` - Windows speech synthesis or ElevenLabs playback, when enabled in Settings
+- `stt` - Local speech-to-text via Whisper.net, when enabled in Settings
+
+Local MCP clients also see MCP-only `app.*` commands such as `app.navigate`, `app.status`, `app.chat.snapshot`/`app.chat.send`/`app.chat.reset`, and `app.chat.queue.list`/`app.chat.queue.cancel`. These are local testing and automation hooks registered with the tray's MCP server and are not advertised to the gateway WebSocket.
 
 ## Security Features
 
@@ -122,35 +148,59 @@ When the node connects, it advertises these capabilities:
 ### Local sandbox validation
 - Sandbox integration tests are intended for local Windows development machines and may skip when the required local sandbox prerequisites are unavailable.
 - Build the tray app before running local sandbox validation so the required sandbox helper binaries are present in the app output.
+- For MXC-related merge validation, prefer the formal script below because it sets the required gates and fails if MXC is skipped.
+
+  ```powershell
+  .\scripts\validate-mxc-e2e.ps1
+  ```
+
+### Full Gateway `system.run` MXC runtime proof
+- The focused E2E below provisions a fresh WSL Gateway, starts an isolated tray instance, sets a local exec approval rule through MCP, invokes `system.run` through the real Gateway `node.invoke` path, and verifies tray MXC diagnostics show contained `mxc-direct-appc` execution for both allowed execution and denied writes to the tray data directory.
+- Run it when validating the Gateway/Windows node runtime path, not just direct MCP or shared library behavior.
+- GitHub-hosted Actions runners do not provide a working MXC/AppContainer runtime. The regular cloud E2E matrix should report these MXC proofs as skipped while still running the rest of setup-connect. Run the proof on a local MXC-enabled Windows machine. Only set `OPENCLAW_RUN_MXC_E2E=1` in GitHub Actions when using an MXC-enabled self-hosted runner.
+- Use `.\scripts\validate-mxc-e2e.ps1` for normal local validation. It sets `OPENCLAW_RUN_E2E` and `OPENCLAW_RUN_MXC_E2E`, runs the real Gateway MXC proofs, and fails if the MXC proof skips. `-AllowSkip` is only for documenting a non-MXC host, not for merge validation of MXC-related work.
+- When reproducing this manually against an existing Gateway, make sure `gateway.nodes.allowCommands` includes `system.run`, `system.run.prepare`, and `system.which`, then approve any `pending-reapproval` request with `openclaw nodes approve <pendingRequestId>`. The node can advertise `system.run` while the Gateway still blocks it until both gates are updated.
 
   ```powershell
   .\build.ps1
-  $env:OPENCLAW_RUN_INTEGRATION='1'
-  dotnet test .\tests\OpenClaw.Shared.Tests\OpenClaw.Shared.Tests.csproj --filter "FullyQualifiedName~Mxc"
+  $env:OPENCLAW_REPO_ROOT = (Get-Location).Path
+  $env:OPENCLAW_RUN_E2E = "1"
+  dotnet test .\tests\OpenClaw.E2ETests\OpenClaw.E2ETests.csproj `
+    --no-restore `
+    --filter "FullyQualifiedName~RealGateway_SystemRun_ExecutesThroughWindowsNodeMxcSandbox" `
+    --logger "console;verbosity=normal" `
+    -r win-x64
   ```
 
+- Expected proof markers:
+  - Gateway response contains `OPENCLAW_GATEWAY_SYSTEM_RUN_MXC_OK` with `exitCode=0`.
+  - The denied-write proof targets a fresh file under the isolated tray data directory, returns non-zero, and leaves that file absent.
+  - `openclaw-tray.log` contains `[mxc] system.run sandbox request` with `executor=mxc-direct-appc`, `contained=True`, and `shell=cmd`.
+  - `openclaw-tray.log` contains `[mxc] system.run sandbox result` with `containment=mxc` for both the successful execution and the denied write.
+- E2E artifacts are written under `TestResults\E2E\<run-id>` and skip known secret-bearing files such as gateway records and settings.
+
 ## Remaining Work (Roadmap)
 
 1. ~~**system.run + exec approvals**~~ ✅ Implemented
-   - `system.run` with PowerShell/cmd support
-   - `system.run.prepare` pre-flight command
-   - `system.which` command lookup
-   - `system.execApprovals` allowlist flow with base-hash optimistic concurrency for remote edits
-   - `system.run` environment override sanitizer blocks path/toolchain injection and secret-looking variables
+    - `system.run` with PowerShell/cmd support
+    - `system.run.prepare` pre-flight command
+    - `system.which` command lookup
+    - `system.execApprovals` allowlist flow with base-hash optimistic concurrency for remote edits
+    - `system.run` environment override sanitizer blocks path/toolchain injection and secret-looking variables
 2. ~~**screen.record**~~ ✅ Implemented
-   - Graphics Capture video recording (MP4/base64)
+    - Graphics Capture video recording (MP4/base64)
 3. ~~**camera.clip**~~ ✅ Implemented
-   - Short webcam video capture (MediaCapture + encoding)
+    - Short webcam video capture (MediaCapture + encoding)
 4. ~~**A2UI pushJSONL alias + device status**~~ ✅ Implemented
-   - Legacy `canvas.a2ui.pushJSONL`
-   - Safe `device.info` / `device.status`
+    - Legacy `canvas.a2ui.pushJSONL`
+    - Safe `device.info` / `device.status`
 5. ~~**Command Center diagnostics**~~ ✅ Implemented
-   - Channel/node/usage/pairing/allowlist diagnostics and recent invoke timeline
+    - Channel/node/usage/pairing/allowlist diagnostics and recent invoke timeline
 6. **Packaging & consent prompts**
-   - MSIX packaging with camera/screen capabilities for system prompts
+    - MSIX packaging with camera/screen capabilities for system prompts
 7. **Test matrix & polish**
-   - Canvas/screen/camera regression tests
-   - Handle timeouts/disconnects, reduce verbose logging
+    - Canvas/screen/camera regression tests
+    - Handle timeouts/disconnects, reduce verbose logging
 
 ## Files Involved
 
diff --git a/docs/WSL_EXE_ARGV_PITFALL.md b/docs/WSL_EXE_ARGV_PITFALL.md
new file mode 100644
index 000000000..aee6d6977
--- /dev/null
+++ b/docs/WSL_EXE_ARGV_PITFALL.md
@@ -0,0 +1,134 @@
+# WSL.exe argv variable-expansion pitfall
+
+## Summary
+
+`wsl.exe -- bash -c <script>` expands shell-variable references in argv before invoking `bash`, so Bash receives an already-mutated script string; any `$var` or `${var}` not defined in the Windows process environment at `wsl.exe` invocation time is dropped to an empty string.
+
+## Reproduction
+
+```powershell
+function Invoke-Wsl([string[]]$arr) {
+  $psi = New-Object System.Diagnostics.ProcessStartInfo
+  $psi.FileName = "wsl.exe"
+  $psi.RedirectStandardOutput = $true
+  $psi.RedirectStandardError = $true
+  $psi.UseShellExecute = $false
+  $psi.CreateNoWindow = $true
+  foreach ($a in $arr) { [void]$psi.ArgumentList.Add($a) }
+  $p = [System.Diagnostics.Process]::Start($psi)
+  $out = $p.StandardOutput.ReadToEnd()
+  $err = $p.StandardError.ReadToEnd()
+  $p.WaitForExit()
+  "EXIT=$($p.ExitCode) STDOUT=[$out] STDERR=[$err]"
+}
+
+# BROKEN: argv path — $x is dropped before bash sees it
+Invoke-Wsl @("-d","Ubuntu-26.04","--","bash","-c","x=abc; echo VAL=`$x")
+# → EXIT=0 STDOUT=[VAL=]  ← assignment ran, but $x was already expanded to empty
+
+# WORKING: stdin path — script bytes arrive at bash intact
+$psi = New-Object System.Diagnostics.ProcessStartInfo
+$psi.FileName = "wsl.exe"
+$psi.RedirectStandardOutput = $true
+$psi.RedirectStandardInput = $true
+$psi.UseShellExecute = $false
+foreach ($a in @("-d","Ubuntu-26.04","--","bash","-s")) { [void]$psi.ArgumentList.Add($a) }
+$p = [System.Diagnostics.Process]::Start($psi)
+$p.StandardInput.WriteLine("x=abc; echo VAL=`$x")
+$p.StandardInput.Close()
+$p.StandardOutput.ReadToEnd()
+# → VAL=abc
+```
+
+## What bash actually receives
+
+Empirical results from dumping `/proc/$$/cmdline` inside Bash on a fresh Ubuntu-26.04 WSL distro:
+
+| Pattern in script string | What bash actually receives |
+|---|---|
+| `$PATH` (defined in Windows env at `wsl.exe` invocation time) | the full Windows `PATH` expansion |
+| `$workspace` (not defined in Windows env) | **removed (empty)** |
+| `${workspace}` braced (not defined in Windows env) | **removed (empty)** |
+| `$$` | `wsl.exe` parent process's PID, not the Bash PID |
+| `\$workspace` backslash-escaped | preserved as `$workspace`; Bash then expands it normally |
+| `$(echo hi)` command substitution | preserved; Bash expands it |
+| Single-quoted `'$workspace'` | still expanded; single quotes do not help because `wsl.exe` runs before Bash |
+| Double-quoted `"$workspace"` | still expanded |
+| Subshell `( workspace=x; echo $workspace )` | the inner `$workspace` is still dropped |
+| Prefix assignment `x=abc echo $x` | `$x` is still dropped |
+
+Concrete failure mode:
+
+```bash
+workspace='/home/openclaw/.openclaw/workspace'
+mkdir -p "$workspace"   # → mkdir: cannot create directory '': No such file or directory
+```
+
+The assignment runs because it has no `$var` reference, but `$workspace` on the next line is removed during `wsl.exe` argv translation.
+
+## Why
+
+`wsl.exe`'s argv translation layer treats argv strings as command-line text and performs shell metacharacter expansion before launching the target process. By the time `bash -c` runs, the original `$var` syntax is gone and Bash cannot recover it. This behavior is consistent across single quotes, double quotes, braces, subshells, and prefix assignment because they are all interpreted by `wsl.exe` before Bash sees the script.
+
+## Fixes (in order of preference)
+
+### 1. Pipe the script over stdin via `RunInWslAsync(..., inputViaStdin: true)`
+
+`wsl.exe` does not rewrite stdin. Prefer this for any multi-line script that uses Bash variables, `${...}`, or `$$`.
+
+```csharp
+var script = """
+workspace='/home/openclaw/.openclaw/workspace'
+mkdir -p "$workspace"
+printf 'bash pid=%s\n' "$$"
+""";
+
+await commandRunner.RunInWslAsync(
+    distroName,
+    script,
+    cancellationToken,
+    inputViaStdin: true);
+```
+
+### 2. C#-interpolate every value into the script string
+
+Do not store values in Bash variables; bake the values into the script literally. This is the workaround used by `src/OpenClaw.SetupEngine/SetupSteps.cs:936-945` in `ValidateWslLockdownStep`. It is acceptable for short scripts with a small fixed value set and no spaces in values.
+
+```csharp
+var workspace = "/home/openclaw/.openclaw/workspace";
+var script = $"mkdir -p {workspace} && test -d {workspace}";
+
+await commandRunner.RunInWslAsync(distroName, script, cancellationToken);
+```
+
+### 3. Backslash-escape `\$var`
+
+Escaping the dollar sign preserves it through `wsl.exe` and lets Bash expand it later.
+
+```powershell
+wsl.exe -d Ubuntu-26.04 -- bash -c "x=abc; echo VAL=\`$x"
+```
+
+This works for single isolated references, but it is fragile and easy to miss in any non-trivial script. Treat it as a last resort.
+
+## What does NOT work
+
+All of these failed workarounds were verified empirically:
+
+- **Single quotes** — `'$workspace'` is still rewritten before Bash sees the quotes.
+- **Double quotes** — `"$workspace"` is also rewritten before Bash sees the quotes.
+- **Braces** — `${workspace}` is removed just like `$workspace`.
+- **Subshells** — `( workspace=x; echo $workspace )` still loses the inner `$workspace`.
+- **Prefix assignment** — `x=abc echo $x` still expands `$x` before the assignment can matter.
+- **`-e VAR=val` flag forwarding** — forwarded environment values do not prevent argv rewriting before Bash receives the script.
+- **Switching to `/bin/sh`** — the mutation happens in `wsl.exe`, before any shell starts.
+
+## Where this matters in the codebase
+
+- `src/OpenClaw.SetupEngine/CommandRunner.cs` — `RunInWslAsync` exposes the opt-in `inputViaStdin` parameter.
+- `src/OpenClaw.SetupEngine/SetupSteps.cs:936-945` — `ValidateWslLockdownStep` uses workaround #2, C# interpolation.
+- `src/OpenClaw.SetupEngine/SetupSteps.cs` `WindowsNodeBootstrapContextStep` — uses workaround #1, stdin.
+
+## Related
+
+- `docs/XAML_COMPILER_BUG.md` — sibling footgun doc for XAML compiler crashes.
diff --git a/docs/gateway-protocol-drift-guard.md b/docs/gateway-protocol-drift-guard.md
new file mode 100644
index 000000000..4e044606b
--- /dev/null
+++ b/docs/gateway-protocol-drift-guard.md
@@ -0,0 +1,233 @@
+# Gateway Protocol Drift Guard
+
+> Source of truth: [`openclaw/openclaw` — `packages/gateway-protocol/src/schema/{sessions,commands}.ts`](https://github.com/openclaw/openclaw/tree/main/packages/gateway-protocol/src/schema)
+
+## Why this exists
+
+The Windows companion can silently drift from the upstream OpenClaw gateway
+protocol — when methods or session fields change upstream but the Windows client
+(`OpenClawGatewayClient`) keeps sending the old shapes. Because the gateway
+tolerates unknown/extra fields, such drift ships without any test failing.
+
+The **drift guard** pins a hand-maintained mirror of the upstream gateway protocol
+for the `sessions` / `files` / `commands` / compaction surface and fails the test
+suite whenever the typed client and the pinned schema diverge.
+
+The typed client implements the richer protocol surface —
+`commands.list`, the extended `sessions.patch` field set, `sessions.files.list`/
+`get`, and `sessions.compaction.list`/`get`/`branch`/`restore` — across
+`OpenClawGatewayClient.Protocol.cs` and the DTO/payload builders in
+`GatewayProtocolModels.cs`. This guard pins that whole surface.
+
+It is intentionally **deterministic and repo-contained**: it requires neither a
+clone of the upstream `openclaw/openclaw` repo nor any network access, so it runs
+in the normal `OpenClaw.Shared.Tests` suite. It **complements** the behavioural
+parser tests in `GatewayProtocolModelsTests` (which parse sample JSON and assert
+DTO mapping) by statically guarding the method / request-field / response-envelope
+*surface*, so an upstream rename or a dropped API is caught even when the parser
+unit tests still pass on their fixed sample payloads.
+
+## Files
+
+| File | Role |
+| --- | --- |
+| `tests/OpenClaw.Shared.Tests/Protocol/gateway-protocol-snapshot.json` | The pinned canonical schema mirror. **Edit this when upstream changes.** |
+| `tests/OpenClaw.Shared.Tests/Protocol/GatewayProtocolDriftTests.cs` | The guard. Cross-checks the snapshot against `OpenClawGatewayClient*.cs` + `GatewayProtocolModels.cs`. |
+
+## What the guard checks
+
+1. **Method surface** (`ScopedMethodSurface_matches_snapshot`)
+   - Every in-scope method the client actually *wires* — request methods it
+     **dispatches** (a method literal passed as a call argument to any dispatcher,
+     e.g. `TrySendTrackedRequestAsync("sessions.patch", …)`,
+     `TryRequestPayloadAsync("commands.list", …)`, or the private
+     `MutateCompactionAsync("sessions.compaction.branch", …)` forwarder), plus
+     notifications it **handles** via `case "…":` — must be pinned in the snapshot.
+   - Every method pinned `windowsUsage: "used"` must still be wired in the way its
+     `kind` implies: a **request** must still be *dispatched* (a leftover `case`
+     label, a `method is "…"` predicate, or a log sentence is not enough), a
+     **notification** must still be *handled*. Dropping one is the classic
+     drift regression.
+   - A `planned` method must **not** already be wired — if the client starts using
+     it, the guard forces you to flip it to `used` and verify its response shape.
+     (None currently — the typed client wires the whole surface.)
+2. **`sessions.list` response shape** (`SessionsList_responseShape_matches_snapshot`)
+   - The session wire-fields the client parses (scoped to the two session-parsing
+     methods) must exactly equal the snapshot's `responseFields` (both directions).
+3. **Request parameters** (`RequestParameterNames_arePresentInConstructionRegion`)
+   - For each `used` request method, the set of wire keys the client actually
+     constructs in the request-construction region must **exactly equal** the pinned
+     `requestFields` (modulo a per-method `allowedExtraRequestFields` allowlist).
+     The comparison is **bidirectional**:
+     - **missing** (pinned − constructed): the client no longer sends a field the
+       schema expects — e.g. renaming a wire key while the old name survives as a
+       local/parameter (`new { sessionKey = key }` when `key` is still pinned) is
+       caught, because the check compares *constructed keys*, not token presence.
+     - **unexpected** (constructed − pinned − allowed): the client still constructs
+       a stale/extra key that is no longer in the schema. Strict gateways
+       (`additionalProperties:false`) reject the whole request on an unknown field,
+       so this is real drift. Set `allowedExtraRequestFields` on a method to declare
+       an intentional client-only extra the gateway tolerates.
+   - A constructed wire key is an anonymous-object member (`new { sessionKey = key,
+     path }`) or a dictionary string key (`payload["model"] = …`) in the region.
+   - The region is the enclosing block of an actual dispatch call, or — when the
+     payload is built by a helper rather than inline — the explicit
+     `requestFieldsSource` builder body (the extended `sessions.patch` fields are
+     checked against `SessionPatch.ToPayload`; the compaction `branch`/`restore`
+     params against `MutateCompactionAsync`). `requestFieldsSource` must resolve
+     **uniquely** to a body that actually constructs keys, and a dispatch from an
+     expression-bodied member (where the region would degrade to the whole type)
+     **fails closed** asking for a `requestFieldsSource`.
+4. **Response envelope** (`ResponseEnvelopes_areReadByClient`)
+   - For each `used` method that pins a `responseEnvelope`, the client must read
+     that property — `TryGetProperty("…")` **or** `TryGetArray(payload, "…")` —
+     **inside that method's own parser body** (pinned via `responseEnvelopeSource`),
+     so one parser reading the same property name (e.g. several read `"checkpoint"`)
+     cannot satisfy a different method's envelope. An upstream envelope rename forces
+     client reconciliation.
+5. **Snapshot integrity** (`Snapshot_isWellFormed_andCoversFoundationShapes`)
+   - The snapshot stays well-formed, keeps covering every protocol-foundation shape
+     (`commands.list`, `sessions.list`/`patch`/`compact`, `agents.files.list`/`get`,
+     `sessions.files.list`/`get`, `sessions.compaction.list`/`get`/`branch`/
+     `restore`), and keeps its honesty invariant: `provisionalResponseFields` may
+     only be set while `windowsUsage: "planned"`.
+6. **Tri-state clear contract** (`TriStateClearContract_isWiredInClient`)
+   - Upstream `SessionsPatchParamsSchema` types every `sessions.patch` field as
+     `Union([<value>, Null])`, where an explicit null **removes** a session
+     override. The client models this with a tri-state `PatchField<T>`: **unset**
+     (null reference) → omitted, a **value** → sent (blank string omitted), and
+     `SessionPatch.Clear` → **explicit JSON null**. For any method declaring
+     `requestFieldSemantics: "tristate-nullable"`, this guard statically verifies
+     the builder source still wires the clear→null routing, the blank-omit guard,
+     and the value-state gate, and that the `PatchField<T>` type still exposes its
+     three states — so a refactor that removes the machinery is caught structurally
+     here, independent of the behavioural emission tests. (Runtime emission is
+     covered by `GatewayProtocolModelsTests`.)
+
+> Extraction is intent-specific and resilient: request-method literals are read
+> from real dispatch call sites (excluding logging sinks) and notifications from
+> `case` labels — not comments, `method is "…"` predicates, or log strings. Each
+> source is preprocessed into two index-aligned views: a *code* view with comments
+> blanked (literal extraction, so commented-out code never counts) and a *masked*
+> view with comments **and** string/char literals blanked (brace structure, so
+> braces inside literals/comments cannot desync the matcher). A self-check asserts
+> the masked view stays brace-balanced.
+
+### Enforced vs. documentation-only fields
+
+Not every field in the snapshot is cross-checked against the client. Refreshers
+should know which edits are actually validated:
+
+| Snapshot field | Enforced against the client? |
+| --- | --- |
+| `methods[].method` (in-scope) | **Yes** — must match what the client dispatches/handles. |
+| `windowsUsage` (`used`/`planned`) | **Yes** — drives the dispatch/handle requirement and the planned-not-wired check. |
+| `sessions.list.responseFields` | **Yes** — exact set vs. the session parser. |
+| `requestFields` of `used` request methods | **Yes** — bidirectional: must exactly equal the wire keys constructed in the region (missing **and** unexpected both fail). |
+| `allowedExtraRequestFields` | **Yes** — exempts the listed client-only extras from the "unexpected" direction; everything else still fails. |
+| `requestFieldsSource` | **Yes** — must resolve uniquely to a body that constructs keys; that body is the region. |
+| `responseEnvelope` of `used` methods | **Yes** — must be read (`TryGetProperty`/`TryGetArray`) by the pinned parser. |
+| `responseEnvelopeSource` | **Yes** — required when `responseEnvelope` is pinned; must resolve uniquely to the parser body that reads the envelope (no whole-client fallback). |
+| `tristateContract` (markers + state members) | **Yes** — for `requestFieldSemantics: "tristate-nullable"`, the builder source must implement every marker and the `PatchField<T>` type must expose every state. |
+| `kind`, `scopePrefixes`, foundation coverage | **Yes** — snapshot-integrity invariants. |
+| `itemFields` (per-item descriptor fields) | **No** — documentation-only; behaviour covered by `GatewayProtocolModelsTests` parsers. |
+| `_comment`, `_note`, `_itemFieldsNote`, provenance | **No** — documentation-only. |
+
+
+## Tri-state clear contract (`sessions.patch`)
+
+Upstream `SessionsPatchParamsSchema` types every `sessions.patch` field as
+`Union([<value>, Null])`. A field can therefore be in one of three states, and the
+Windows client mirrors this with the tri-state `PatchField<T>`:
+
+| State | How the client expresses it | Wire result |
+| --- | --- | --- |
+| **unset** | leave the `PatchField<T>` default / assign a null reference | field **omitted** from the request |
+| **set** | assign a value (`patch.Model = "gpt-5"`) | field sent with the value (a **blank** string is omitted per `NonEmptyString`) |
+| **clear** | assign the sentinel (`patch.Model = SessionPatch.Clear`) | field sent as **explicit JSON `null`** (removes the session override) |
+
+The drift guard pins this contract in the snapshot under
+`sessions.patch.tristateContract` and checks it statically (Guard 6): the
+`SessionPatch` builder must keep the clear→null routing, the blank-omit guard, and
+the value-state gate, and `PatchField<T>` must keep its `IsSpecified`/`IsClear`/
+`HasValue` states. The actual JSON emission for each state is covered behaviourally
+by `GatewayProtocolModelsTests` (`SessionPatch_ToPayload_ClearEmitsExplicitNull*`,
+`…MixesSetAndClearAndUnset`, `PatchField_TriStateFlags`) and end-to-end by
+`GatewayProtocolLiveRoundTripTests` (a loopback-WebSocket test capturing the real
+wire frames) — the guard is the static, upstream-mirrored complement, not a duplicate.
+
+## `windowsUsage` semantics
+
+| Value | Meaning |
+| --- | --- |
+| `used` | The client dispatches/handles this method today. The guard **requires** it to remain wired up. |
+| `planned` | Defined upstream but not yet consumed by the Windows client. The shape is pinned so future adoption matches upstream, but the client is not required to use it yet. (None currently — the typed client wires the whole surface.) |
+
+## How to refresh the snapshot when upstream changes
+
+When the upstream gateway protocol changes (a new `sessions.*` method, a renamed
+session field, a new `commands.list` descriptor field, etc.):
+
+1. Open the upstream schema on `main`:
+   - `packages/gateway-protocol/src/schema/sessions.ts`
+   - `packages/gateway-protocol/src/schema/commands.ts`
+2. Update `tests/OpenClaw.Shared.Tests/Protocol/gateway-protocol-snapshot.json`:
+   - Add/rename/remove methods under `methods[]`.
+   - Update `requestFields` / `responseFields` / `responseEnvelope` to match the
+     wire field names. Field/method names may use letters, digits and underscores.
+   - When a method's request payload is built by a helper rather than inline at the
+     dispatch site (e.g. `SessionPatch.ToPayload`, `MutateCompactionAsync`), point
+     `requestFieldsSource` at a unique fragment of that builder's declaration so
+     Guard C searches the right body.
+   - When a method pins a `responseEnvelope`, also set `responseEnvelopeSource` to a
+     unique fragment of the parser body that reads it (Guard D requires it).
+   - If upstream changes a field's nullability semantics (e.g. a field becomes
+     `Union([<value>, Null])`, making explicit null a "clear" signal), update the
+     `tristateContract` markers for that method and confirm the client's tri-state
+     `PatchField<T>` builder still implements them (Guard 6).
+   - Bump `snapshotUpdated` to today's date and set `upstreamCommit` to the exact
+     upstream schema commit SHA you mirrored (so the pin is reproducible/auditable;
+     `upstreamRef: "main"` alone is not).
+   - For a method upstream added that the Windows client doesn't consume yet, set
+     `windowsUsage: "planned"`; pin its shape and, if the response fields are not
+     yet verified against upstream, set `provisionalResponseFields: true`.
+3. Run the guard:
+   ```powershell
+   $env:OPENCLAW_REPO_ROOT = (Get-Location).Path
+   dotnet test ./tests/OpenClaw.Shared.Tests/OpenClaw.Shared.Tests.csproj --filter GatewayProtocolDriftTests
+   ```
+4. If the guard fails, reconcile the typed client (`OpenClawGatewayClient.cs`,
+   `OpenClawGatewayClient.Protocol.cs`, and the DTOs in `GatewayProtocolModels.cs` /
+   `SessionInfo` in `Models.cs`) with the new schema — that reconciliation is the
+   whole point of the guard. Update the snapshot only to reflect upstream, never to
+   silence a real client gap.
+
+## Known limitation: snapshot ↔ upstream staleness
+
+Every guard checks the client against the **snapshot**, not against upstream
+directly (a deliberate trade-off for the offline/repo-contained guarantee). If
+upstream changes and nobody refreshes the snapshot, the tests stay green while the
+client silently drifts from real upstream — the original regression class, moved
+up one level.
+
+Mitigations:
+
+- The snapshot records `upstreamVerified` (date + the exact `sessions.ts`/`commands.ts`
+  blob SHAs the pin was checked against) so each verification is auditable and
+  reproducible. **Last verified 2026-06-23** against `openclaw/openclaw` main:
+  all enforced request fields / response envelopes / the `sessions.patch` tri-state
+  nullable contract matched exactly; the snapshot is a deliberate subset (see the
+  `upstreamVerified.result` note for the upstream-only `sessions.patch` fields the
+  Windows client does not yet implement).
+- Treat a gateway-protocol bump in upstream as a trigger to re-verify and refresh,
+  the same way `docs/gateway-node-integration.md` is refreshed.
+- Re-verify by fetching `packages/gateway-protocol/src/schema/{sessions,commands}.ts`
+  from `openclaw/openclaw` main, diffing against the pinned methods/fields, and
+  updating `upstreamVerified` with the new blob SHAs.
+
+## Scope
+
+The guard deliberately covers only the `sessions` / `files` / `commands` /
+compaction surface (`scopePrefixes` in the snapshot), which is where the
+drift-critical session and command APIs live. Other gateway namespaces
+(`cron.*`, `config.*`, `device.pair.*`, …) are out of scope for this guard.
diff --git a/docs/setup-wizard-ux/01-welcome-security.png b/docs/setup-wizard-ux/01-welcome-security.png
new file mode 100644
index 000000000..c0cbf11b7
Binary files /dev/null and b/docs/setup-wizard-ux/01-welcome-security.png differ
diff --git a/docs/setup-wizard-ux/02-setup-mode-listview.png b/docs/setup-wizard-ux/02-setup-mode-listview.png
new file mode 100644
index 000000000..5baeab004
Binary files /dev/null and b/docs/setup-wizard-ux/02-setup-mode-listview.png differ
diff --git a/docs/setup-wizard-ux/03-config-handling.png b/docs/setup-wizard-ux/03-config-handling.png
new file mode 100644
index 000000000..ea35d1689
Binary files /dev/null and b/docs/setup-wizard-ux/03-config-handling.png differ
diff --git a/docs/setup-wizard-ux/04-provider-collapsed.png b/docs/setup-wizard-ux/04-provider-collapsed.png
new file mode 100644
index 000000000..f2737404e
Binary files /dev/null and b/docs/setup-wizard-ux/04-provider-collapsed.png differ
diff --git a/docs/setup-wizard-ux/05-provider-expanded.png b/docs/setup-wizard-ux/05-provider-expanded.png
new file mode 100644
index 000000000..4ff72ee78
Binary files /dev/null and b/docs/setup-wizard-ux/05-provider-expanded.png differ
diff --git a/docs/setup-wizard-ux/06-auth-method.png b/docs/setup-wizard-ux/06-auth-method.png
new file mode 100644
index 000000000..d8728a3c3
Binary files /dev/null and b/docs/setup-wizard-ux/06-auth-method.png differ
diff --git a/docs/setup-wizard-ux/07-text-input.png b/docs/setup-wizard-ux/07-text-input.png
new file mode 100644
index 000000000..956ffe96b
Binary files /dev/null and b/docs/setup-wizard-ux/07-text-input.png differ
diff --git a/docs/setup-wizard-ux/08-capabilities-a11y-fixed.png b/docs/setup-wizard-ux/08-capabilities-a11y-fixed.png
new file mode 100644
index 000000000..100ba4532
Binary files /dev/null and b/docs/setup-wizard-ux/08-capabilities-a11y-fixed.png differ
diff --git a/docs/setup-wizard-ux/README.md b/docs/setup-wizard-ux/README.md
new file mode 100644
index 000000000..a9c93c22d
--- /dev/null
+++ b/docs/setup-wizard-ux/README.md
@@ -0,0 +1,47 @@
+# Setup wizard UX refresh — screens & accessibility proof
+
+Screenshots captured from the live isolated dev app (`OPENCLAW_FORCE_ONBOARDING=1`,
+`run-app-local.ps1 -NoBuild -Isolated`) walking the full gateway setup + onboard flow.
+Accessibility was scanned per-screen with a standalone Axe.Windows (v2.4.1) scanner
+against the live process — the same engine Accessibility Insights uses.
+
+## Screens
+
+| # | Screen | Notes |
+|---|--------|-------|
+| 01 | Welcome + security notice | Selectable RichTextBlock body |
+| 02 | Setup mode | Single-selection `ListView` (ItemContainer), first item selected by default |
+| 03 | Config handling | Single-selection list, standardized bottom bar |
+| 04 | Model/auth provider (collapsed) | "Skip for now" pinned to top, subtle **More ▾** expander |
+| 05 | Model/auth provider (expanded) | One-click expand keeps "Skip for now"; full provider list |
+| 06 | Auth method | Single-selection list |
+| 07 | Text input step | API-key entry |
+| 08 | Capabilities | Radio group with accessible names (a11y fix) |
+
+Bottom action bar across steps: standard **Back** button, `AccentButtonStyle`
+primary (Continue), subtle **More options** / **Skip** / **Start over** controls.
+
+## Accessibility results (Axe.Windows, actionable violations)
+
+All refactored surfaces flagged `NameNotNull` (focusable element with a null
+accessible Name) before the fix; every one is 0 after.
+
+| Screen | Before | After |
+|--------|:------:|:-----:|
+| Capabilities radio group | 3 | 0 |
+| Setup mode ListView | 2 | 0 |
+| Provider list (collapsed) | 6 | 0 |
+| Provider list (expanded) | 7 | 0 |
+| Welcome / Confirm / Auth / Text input | 0 | 0 |
+
+### Fixes
+- `WizardPage` option lists: each `ListViewItem` (and multiselect `CheckBox`) now
+  gets `AutomationProperties.Name` = label + hint via a shared `CreateOptionItem`
+  helper.
+- `CapabilitiesPage`: the three profile radio buttons (Read-only / Standard /
+  Full access) now set `AutomationProperties.Name`.
+
+### Known framework limitation (not fixed)
+Inline `Hyperlink` elements inside a `RichTextBlock` (security disclaimer link)
+report a null `BoundingRectangle` to UIA when scrolled out of view. This is a
+WinUI framework behavior for inline hyperlinks, not a control we construct.
diff --git a/installer.iss b/installer.iss
index d4dbd9aaf..e4a5ea4c5 100644
--- a/installer.iss
+++ b/installer.iss
@@ -1,6 +1,27 @@
 ; OpenClaw Companion Inno Setup Script (WinUI version)
-#define MyAppName "OpenClaw Companion"
-#define MyAppPublisher "Scott Hanselman"
+; Pass /DDevBuild=1 to produce a side-by-side dev installer.
+#ifdef DevBuild
+  #define MyAppName "OpenClaw Companion (Dev)"
+  #define MyAppId "{{M0LTB0T-TRAY-4PP1-DEV}"
+  #define MyInstallDir "OpenClawTray-Dev"
+  #define MyMutex "OpenClawTray-Dev"
+  #define MyAutoStartName "OpenClawTray-Dev"
+  #define MyStartupTaskName "OpenClaw Companion (Dev)"
+  #define MyDistroName "OpenClawGateway-Dev"
+  #define MyProtocol "openclaw-dev"
+  #define MyOutputSuffix "-Dev"
+#else
+  #define MyAppName "OpenClaw Companion"
+  #define MyAppId "{{M0LTB0T-TRAY-4PP1-D3N7}"
+  #define MyInstallDir "OpenClawTray"
+  #define MyMutex "OpenClawTray"
+  #define MyAutoStartName "OpenClawTray"
+  #define MyStartupTaskName "OpenClaw Companion"
+  #define MyDistroName "OpenClawGateway"
+  #define MyProtocol "openclaw"
+  #define MyOutputSuffix ""
+#endif
+#define MyAppPublisher "OpenClaw Foundation"
 #define MyAppURL "https://github.com/openclaw/openclaw-windows-node"
 #define MyAppExeName "OpenClaw.Tray.WinUI.exe"
 
@@ -20,17 +41,17 @@
 [Setup]
 ; Inno requires "{{" to emit a literal opening brace in AppId.
 ; Do not add a second closing brace here; that creates a malformed uninstall registry key.
-AppId={{M0LTB0T-TRAY-4PP1-D3N7}
+AppId={#MyAppId}
 AppName={#MyAppName}
 AppVersion={#MyAppVersion}
 AppPublisher={#MyAppPublisher}
 AppPublisherURL={#MyAppURL}
 AppSupportURL=https://github.com/openclaw/openclaw-windows-node/issues
 AppUpdatesURL=https://github.com/openclaw/openclaw-windows-node/releases
-DefaultDirName={localappdata}\OpenClawTray
+DefaultDirName={localappdata}\{#MyInstallDir}
 DefaultGroupName={#MyAppName}
 DisableProgramGroupPage=yes
-OutputBaseFilename=OpenClawCompanion-Setup-{#MyAppArch}
+OutputBaseFilename=OpenClawCompanion{#MyOutputSuffix}-Setup-{#MyAppArch}
 Compression={#MyCompression}
 SolidCompression={#MySolidCompression}
 WizardStyle=modern
@@ -38,10 +59,9 @@ PrivilegesRequired=lowest
 SetupIconFile=src\OpenClaw.Tray.WinUI\Assets\openclaw.ico
 UninstallDisplayIcon={app}\{#MyAppExeName}
 ; Round 2 (Scott #5): block install/uninstall while the tray is running.
-; Mutex name matches App.xaml.cs (`new Mutex(true, "OpenClawTray", …)`).
-; Tray and Inno run in the same user session, so the bare name resolves
-; against Local\OpenClawTray — no Global\ prefix needed.
-AppMutex=OpenClawTray
+; Mutex name matches AppIdentity.MutexBaseName for this build variant.
+; Tray and Inno run in the same user session, so no Global\ prefix is needed.
+AppMutex={#MyMutex}
 #if MyAppArch == "arm64"
 ArchitecturesInstallIn64BitMode=arm64
 ArchitecturesAllowed=arm64
@@ -74,7 +94,7 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 
 [Tasks]
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-Name: "startupicon"; Description: "Start OpenClaw Companion when Windows starts"; GroupDescription: "Startup:"; Flags: unchecked
+Name: "startupicon"; Description: "Start {#MyAppName} when Windows starts"; GroupDescription: "Startup:"; Flags: unchecked
 
 [Files]
 ; WinUI Tray app - include all files (WinUI needs DLLs, not single-file)
@@ -86,17 +106,17 @@ Source: "{#vcRedist}"; DestDir: "{tmp}"; DestName: "vc_redist.exe"; Flags: delet
 #endif
 
 [Registry]
-Root: HKCU; Subkey: "Software\Classes\openclaw"; ValueType: string; ValueName: ""; ValueData: "URL:OpenClaw Protocol"; Flags: uninsdeletekey
-Root: HKCU; Subkey: "Software\Classes\openclaw"; ValueType: string; ValueName: "URL Protocol"; ValueData: ""
-Root: HKCU; Subkey: "Software\Classes\openclaw\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"",0"
-Root: HKCU; Subkey: "Software\Classes\openclaw\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"" ""%1"""
+Root: HKCU; Subkey: "Software\Classes\{#MyProtocol}"; ValueType: string; ValueName: ""; ValueData: "URL:OpenClaw Protocol"; Flags: uninsdeletekey
+Root: HKCU; Subkey: "Software\Classes\{#MyProtocol}"; ValueType: string; ValueName: "URL Protocol"; ValueData: ""
+Root: HKCU; Subkey: "Software\Classes\{#MyProtocol}\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"",0"
+Root: HKCU; Subkey: "Software\Classes\{#MyProtocol}\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"" ""%1"""
 
 [Icons]
 Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
-Name: "{group}\OpenClaw Gateway Setup"; Filename: "{app}\{#MyAppExeName}"; Parameters: "openclaw://setup"; IconFilename: "{app}\{#MyAppExeName}"
-Name: "{group}\OpenClaw Companion Settings"; Filename: "{app}\{#MyAppExeName}"; Parameters: "openclaw://commandcenter"; IconFilename: "{app}\{#MyAppExeName}"
-Name: "{group}\OpenClaw Chat"; Filename: "{app}\{#MyAppExeName}"; Parameters: "openclaw://chat"; IconFilename: "{app}\{#MyAppExeName}"
-Name: "{group}\Check for Updates"; Filename: "{app}\{#MyAppExeName}"; Parameters: "openclaw://check-updates"; IconFilename: "{app}\{#MyAppExeName}"
+Name: "{group}\OpenClaw Gateway Setup"; Filename: "{app}\{#MyAppExeName}"; Parameters: "{#MyProtocol}://setup"; IconFilename: "{app}\{#MyAppExeName}"
+Name: "{group}\OpenClaw Companion Settings"; Filename: "{app}\{#MyAppExeName}"; Parameters: "{#MyProtocol}://commandcenter"; IconFilename: "{app}\{#MyAppExeName}"
+Name: "{group}\OpenClaw Chat"; Filename: "{app}\{#MyAppExeName}"; Parameters: "{#MyProtocol}://chat"; IconFilename: "{app}\{#MyAppExeName}"
+Name: "{group}\Check for Updates"; Filename: "{app}\{#MyAppExeName}"; Parameters: "{#MyProtocol}://check-updates"; IconFilename: "{app}\{#MyAppExeName}"
 Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
 Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
 Name: "{userstartup}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: startupicon
@@ -170,7 +190,7 @@ begin
     LocalGatewayCleanupRequested :=
       MsgBox(
         'Do you also want to remove the OpenClaw local WSL gateway?' + #13#10#13#10 +
-        'Choose Yes to unregister the OpenClawGateway WSL distro and remove generated local gateway state.' + #13#10 +
+        'Choose Yes to unregister the {#MyDistroName} WSL distro and remove generated local gateway state.' + #13#10 +
         'Choose No to leave the local gateway and generated local state on this computer.',
         mbConfirmation,
         MB_YESNO) = IDYES;
@@ -212,7 +232,11 @@ begin
 
   Params :=
     '-NoProfile -ExecutionPolicy Bypass -File ' + AddQuotes(TempScriptPath) +
-    ' -AppRoot ' + AddQuotes(ExpandConstant('{app}'));
+    ' -AppRoot ' + AddQuotes(ExpandConstant('{app}')) +
+    ' -DataDirectoryName ' + AddQuotes('{#MyInstallDir}') +
+    ' -AutoStartName ' + AddQuotes('{#MyAutoStartName}') +
+    ' -StartupTaskName ' + AddQuotes('{#MyStartupTaskName}') +
+    ' -DistroName ' + AddQuotes('{#MyDistroName}');
 
   Log('Running local gateway cleanup script from {tmp}.');
   Result :=
@@ -282,10 +306,38 @@ begin
     Log('Generated app state in {app} could not be fully deleted; continuing uninstall.');
 end;
 
+procedure RemoveAppAutoStart;
+var
+  ResultCode: Integer;
+  Started: Boolean;
+begin
+  if RegDeleteValue(
+      HKCU,
+      'SOFTWARE\Microsoft\Windows\CurrentVersion\Run',
+      '{#MyAutoStartName}') then
+    Log('Removed {#MyAutoStartName} autostart registry value.')
+  else
+    Log('{#MyAutoStartName} autostart registry value already absent.');
+
+  Started :=
+    Exec(
+      ExpandConstant('{sys}\schtasks.exe'),
+      '/Delete /TN ' + AddQuotes('{#MyStartupTaskName}') + ' /F',
+      '',
+      SW_HIDE,
+      ewWaitUntilTerminated,
+      ResultCode);
+  if Started and (ResultCode = 0) then
+    Log('Removed {#MyStartupTaskName} startup task.')
+  else
+    Log('{#MyStartupTaskName} startup task already absent or unavailable.');
+end;
+
 procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
 begin
   if CurUninstallStep = usUninstall then
   begin
+    RemoveAppAutoStart;
     EnsureLocalGatewayCleanupChoice;
     RunLocalGatewayCleanup;
   end
diff --git a/package-lock.json b/package-lock.json
index 89138e7fb..e79537159 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,13 +8,13 @@
       "name": "openclaw-windows-node-mxc",
       "version": "0.0.0",
       "dependencies": {
-        "@microsoft/mxc-sdk": "^0.6.1"
+        "@microsoft/mxc-sdk": "^0.7.0"
       }
     },
     "node_modules/@microsoft/mxc-sdk": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/@microsoft/mxc-sdk/-/mxc-sdk-0.6.1.tgz",
-      "integrity": "sha512-jpbJU/xfF4qLWcNMplDTUX/q13m2A6vYao1QN3lkZaQlzsRce95H+iU0Qu0wlweJZ2gx6eY1PRQU+/bnQki/dw==",
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/@microsoft/mxc-sdk/-/mxc-sdk-0.7.0.tgz",
+      "integrity": "sha512-EWhz2pKkcPluZHAOI1yneV+JK0NO/3hdh7nABBb0x4PjyUWMeSWPTBAjtIu+BhtMYOqlaijSPZMZ0Hs/J4ZL4A==",
       "license": "MIT",
       "dependencies": {
         "node-pty": "^1.2.0-beta.12",
diff --git a/package.json b/package.json
index f15e5a605..4ce10fd77 100644
--- a/package.json
+++ b/package.json
@@ -4,6 +4,6 @@
   "private": true,
   "description": "MXC sandbox dependency used by the OpenClaw tray build to copy wxc-exec.exe into the app output.",
   "dependencies": {
-    "@microsoft/mxc-sdk": "^0.6.1"
+    "@microsoft/mxc-sdk": "^0.7.0"
   }
 }
diff --git a/run-app-local.ps1 b/run-app-local.ps1
index abbffbc92..9c09c8422 100644
--- a/run-app-local.ps1
+++ b/run-app-local.ps1
@@ -1,4 +1,4 @@
-<#
+<#
 .SYNOPSIS
     Builds and launches the WinUI tray app for local development.
 
@@ -9,8 +9,9 @@
     Use -UseWinApp when you specifically want Microsoft WinAppCLI (`winapp run`)
     to launch with Package.appxmanifest for packaged/MSIX-adjacent validation.
 
-    Use -Isolated (or -DataDir) to run multiple worktrees side-by-side without
-    sharing settings, logs, run markers, device identities, or mutex names.
+    Use -Isolated (or -DataDir) to avoid sharing settings, logs, run markers,
+    and device identities. Use -Dev to opt into the side-by-side dev app
+    identity with separate mutex, protocol, gateway distro, and gateway port.
 
     By default this helper refuses to run outside `main` to avoid accidentally
     launching a stale or experimental worktree. Use -AllowNonMain when you
@@ -22,6 +23,10 @@
 .PARAMETER Configuration
     Build/output configuration to use. Defaults to Debug.
 
+.PARAMETER Dev
+    Build and launch with the side-by-side dev app identity. Defaults off so
+    release identity remains the default local-launch behavior.
+
 .PARAMETER AllowNonMain
     Allow launching from a branch other than main.
 
@@ -59,6 +64,9 @@
 .EXAMPLE
     .\run-app-local.ps1 -Isolated
 
+.EXAMPLE
+    .\run-app-local.ps1 -Dev -Isolated
+
 .EXAMPLE
     .\run-app-local.ps1 -Configuration Release -Isolated -UpdateChannel alpha -AllowNonMain
 
@@ -72,6 +80,8 @@ param(
     [ValidateSet("Debug", "Release")]
     [string]$Configuration = "Debug",
 
+    [switch]$Dev,
+
     [switch]$AllowNonMain,
 
     [switch]$Isolated,
@@ -132,7 +142,14 @@ if ($branch -ne "main" -and -not $AllowNonMain) {
 }
 
 if (-not $NoBuild) {
-    & "$repoRoot\build.ps1" -Configuration $Configuration
+    $buildArgs = @{
+        Configuration = $Configuration
+    }
+    if ($Dev) {
+        $buildArgs["DevBuild"] = $true
+    }
+
+    & "$repoRoot\build.ps1" @buildArgs
     if ($LASTEXITCODE -ne 0) {
         exit $LASTEXITCODE
     }
@@ -146,10 +163,20 @@ if (-not $targetFramework) {
     throw "Unable to determine TargetFramework from $projectPath."
 }
 
-$architecture = [System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture
-$runtimeIdentifier = if ($architecture -eq [System.Runtime.InteropServices.Architecture]::Arm64) { "win-arm64" } else { "win-x64" }
+# Match build.ps1's architecture detection so this script looks in the same
+# output folder the build wrote to. build.ps1 uses $env:PROCESSOR_ARCHITECTURE,
+# which reflects the PowerShell process architecture (and therefore the RID that
+# `dotnet build -r` produced). Using [RuntimeInformation]::OSArchitecture here can
+# disagree (e.g. an x64-emulated shell on an ARM64 device), sending us to a folder
+# that was never built.
+$architecture = $env:PROCESSOR_ARCHITECTURE
+$runtimeIdentifier = switch ($architecture) {
+    "ARM64" { "win-arm64" }
+    default { "win-x64" }
+}
 $outputDir = Join-Path $repoRoot "src\OpenClaw.Tray.WinUI\bin\$Configuration\$targetFramework\$runtimeIdentifier"
 $exePath = Join-Path $outputDir "OpenClaw.Tray.WinUI.exe"
+$identityMarkerPath = Join-Path $outputDir "app-identity.txt"
 
 if (-not (Test-Path $outputDir)) {
     throw "Build output folder not found: $outputDir. Run without -NoBuild first."
@@ -157,6 +184,15 @@ if (-not (Test-Path $outputDir)) {
 if (-not (Test-Path $exePath)) {
     throw "Tray executable not found: $exePath. Run without -NoBuild first."
 }
+if (-not (Test-Path $identityMarkerPath)) {
+    throw "App identity marker not found: $identityMarkerPath. Run without -NoBuild first."
+}
+
+$expectedIdentity = if ($Dev) { "dev" } else { "release" }
+$actualIdentity = (Get-Content -LiteralPath $identityMarkerPath -Raw -Encoding UTF8).Trim()
+if ($actualIdentity -ne $expectedIdentity) {
+    throw "Build output identity '$actualIdentity' does not match requested '$expectedIdentity'. Run without -NoBuild or choose the matching -Dev option."
+}
 
 $winapp = $null
 if ($UseWinApp) {
@@ -204,6 +240,7 @@ try {
     Write-Host "Launching OpenClaw Tray" -ForegroundColor Cyan
     Write-Host "  Branch:        $branch"
     Write-Host "  Configuration: $Configuration"
+    Write-Host "  Identity:      $(if ($actualIdentity -eq 'dev') { 'Dev (opt-in)' } else { 'Release (default)' })"
     Write-Host "  Runtime:       $runtimeIdentifier"
     Write-Host "  Output:        $outputDir"
     Write-Host "  Mode:          $(if ($UseWinApp) { 'WinAppCLI manifest activation' } else { 'Direct unpackaged executable' })"
@@ -233,6 +270,7 @@ try {
     } else {
         $process = Start-Process -FilePath $exePath -WorkingDirectory $outputDir -PassThru
         Write-Host "Started OpenClaw Tray (PID: $($process.Id))" -ForegroundColor Green
+        Write-Host "Hint: Look for the 🦞 OpenClaw tray icon in the system tray (bottom-right). It may be hidden under the ^ button." -ForegroundColor Cyan
         $exitCode = 0
     }
 } finally {
diff --git a/scripts/Uninstall-LocalGateway.ps1 b/scripts/Uninstall-LocalGateway.ps1
index f8eefbf81..8b7999a6b 100644
--- a/scripts/Uninstall-LocalGateway.ps1
+++ b/scripts/Uninstall-LocalGateway.ps1
@@ -11,17 +11,27 @@
 
 [CmdletBinding()]
 param(
-    [string]$AppRoot = $PSScriptRoot
+    [string]$AppRoot = $PSScriptRoot,
+    [string]$DataDirectoryName = 'OpenClawTray',
+    [string]$AutoStartName = 'OpenClawTray',
+    [string]$StartupTaskName = 'OpenClaw Companion',
+    [string]$DistroName = 'OpenClawGateway'
 )
 
 $ErrorActionPreference = 'Stop'
 
-$DistroName = 'OpenClawGateway'
 $resultPath = Join-Path $AppRoot 'uninstall-gateway-result.json'
 $errorPath = Join-Path $AppRoot 'uninstall-gateway-error.log'
 $wslLogPath = Join-Path $AppRoot 'uninstall-gateway-wsl.log'
 $cleanupWarnings = New-Object 'System.Collections.Generic.List[string]'
 
+if ($DataDirectoryName -notmatch '^[A-Za-z0-9._-]+$') {
+    throw "Invalid data directory name '$DataDirectoryName'."
+}
+if ($DistroName -notmatch '^[A-Za-z0-9._-]+$') {
+    throw "Invalid WSL distro name '$DistroName'."
+}
+
 function Ensure-AppRoot {
     if (-not [string]::IsNullOrWhiteSpace($AppRoot) -and -not (Test-Path -LiteralPath $AppRoot)) {
         New-Item -ItemType Directory -Path $AppRoot -Force | Out-Null
@@ -74,19 +84,19 @@ function Resolve-AppDataDir {
             return $env:OPENCLAW_TRAY_DATA_DIR
         }
 
-        return Join-Path ([Environment]::GetFolderPath([Environment+SpecialFolder]::ApplicationData)) 'OpenClawTray'
+        return Join-Path ([Environment]::GetFolderPath([Environment+SpecialFolder]::ApplicationData)) $DataDirectoryName
     }
 
     function Resolve-LocalDataDir {
         if ($env:OPENCLAW_TRAY_LOCALAPPDATA_DIR) {
-            return Join-Path $env:OPENCLAW_TRAY_LOCALAPPDATA_DIR 'OpenClawTray'
+            return Join-Path $env:OPENCLAW_TRAY_LOCALAPPDATA_DIR $DataDirectoryName
         }
 
         if ($env:OPENCLAW_TRAY_LOCAL_DATA_DIR) {
             return $env:OPENCLAW_TRAY_LOCAL_DATA_DIR
         }
 
-        return Join-Path ([Environment]::GetFolderPath([Environment+SpecialFolder]::LocalApplicationData)) 'OpenClawTray'
+        return Join-Path ([Environment]::GetFolderPath([Environment+SpecialFolder]::LocalApplicationData)) $DataDirectoryName
     }
 
     function Get-JsonPropertyValue {
@@ -228,15 +238,34 @@ function Resolve-AppDataDir {
     function Remove-AutostartRegistryValue {
         $runKey = 'HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Run'
         try {
-            $value = Get-ItemProperty -LiteralPath $runKey -Name 'OpenClawTray' -ErrorAction SilentlyContinue
+            $value = Get-ItemProperty -LiteralPath $runKey -Name $AutoStartName -ErrorAction SilentlyContinue
             if ($null -ne $value) {
-                Remove-ItemProperty -LiteralPath $runKey -Name 'OpenClawTray' -ErrorAction Stop
-                Write-GatewayLog 'Removed OpenClawTray autostart registry value.'
+                Remove-ItemProperty -LiteralPath $runKey -Name $AutoStartName -ErrorAction Stop
+                Write-GatewayLog "Removed $AutoStartName autostart registry value."
+            } else {
+                Write-GatewayLog "$AutoStartName autostart registry value already absent."
+            }
+        } catch {
+            Add-CleanupWarning "Failed to remove $AutoStartName autostart registry value: $($_.Exception.Message)"
+        }
+    }
+
+    function Remove-ScheduledStartupTask {
+        $schtasks = Join-Path $env:WINDIR 'System32\schtasks.exe'
+        if (-not (Test-Path -LiteralPath $schtasks)) {
+            Add-CleanupWarning "schtasks.exe was not found; could not remove startup task '$StartupTaskName'."
+            return
+        }
+
+        try {
+            $output = & $schtasks /Delete /TN $StartupTaskName /F 2>&1
+            if ($LASTEXITCODE -eq 0) {
+                Write-GatewayLog "Removed startup task '$StartupTaskName'."
             } else {
-                Write-GatewayLog 'OpenClawTray autostart registry value already absent.'
+                Write-GatewayLog "Startup task '$StartupTaskName' was absent or could not be removed: $output"
             }
         } catch {
-            Add-CleanupWarning "Failed to remove OpenClawTray autostart registry value: $($_.Exception.Message)"
+            Add-CleanupWarning "Failed to remove startup task '$StartupTaskName': $($_.Exception.Message)"
         }
     }
 
@@ -418,6 +447,7 @@ function Resolve-AppDataDir {
         Write-GatewayLog "Cleaning Windows-side local gateway artifacts. AppData='$dataDir'; LocalData='$localDataDir'."
 
         Remove-AutostartRegistryValue
+        Remove-ScheduledStartupTask
         Remove-FileIfExists -Path (Join-Path $dataDir 'setup-state.json') -Label 'legacy setup-state.json'
         Remove-FileIfExists -Path (Join-Path $localDataDir 'setup-state.json') -Label 'setup-state.json'
         Remove-FileIfExists -Path (Join-Path $localDataDir 'run.marker') -Label 'run.marker'
@@ -538,7 +568,7 @@ function Test-DistroListed {
 }
 
 function Remove-GatewayDirectory {
-    $gatewayDirectory = Join-Path $AppRoot 'wsl\OpenClawGateway'
+    $gatewayDirectory = Join-Path $AppRoot "wsl\$DistroName"
 
     if (-not (Test-Path -LiteralPath $gatewayDirectory)) {
         Write-GatewayLog "Gateway directory does not exist: $gatewayDirectory"
@@ -592,10 +622,6 @@ try {
         Write-GatewayLog "Ignoring terminate exit code $($terminateResult.ExitCode); unregister handles stopped or missing distros."
     }
 
-    $shutdownResult = Invoke-Wsl -Arguments @('--shutdown')
-    if ($shutdownResult.ExitCode -ne 0) {
-        Write-GatewayLog "Ignoring shutdown exit code $($shutdownResult.ExitCode); unregister will still be attempted."
-    }
     Start-Sleep -Seconds 2
 
     $unregisterResult = Invoke-Wsl -Arguments @('--unregister', $DistroName)
diff --git a/scripts/build-inno-local.ps1 b/scripts/build-inno-local.ps1
index d882fd0bd..f6b63bf86 100644
--- a/scripts/build-inno-local.ps1
+++ b/scripts/build-inno-local.ps1
@@ -11,6 +11,7 @@
 
 .EXAMPLE
     .\scripts\build-inno-local.ps1 -Arch x64 -Fast
+    .\scripts\build-inno-local.ps1 -Arch x64 -Dev -Fast
     .\scripts\build-inno-local.ps1 -Arch All
     .\scripts\build-inno-local.ps1 -Arch x64 -NoPublish -Fast
 #>
@@ -29,6 +30,8 @@ param(
 
     [switch]$Fast,
 
+    [switch]$Dev,
+
     [switch]$InstallInno
 )
 
@@ -63,8 +66,9 @@ function Resolve-InnoCompiler {
 
     if ($InstallInno) {
         Write-Step "Installing Inno Setup with winget"
-        winget install --id JRSoftware.InnoSetup -e --accept-source-agreements --accept-package-agreements --disable-interactivity
-        if ($LASTEXITCODE -ne 0) {
+        winget install --id JRSoftware.InnoSetup -e --accept-source-agreements --accept-package-agreements --disable-interactivity 2>&1 | Out-Host
+        $wingetExitCode = $LASTEXITCODE
+        if ($wingetExitCode -ne 0) {
             throw "winget failed to install Inno Setup."
         }
         return Resolve-InnoCompiler
@@ -100,7 +104,8 @@ function Publish-ArchitecturePayload {
         "-r", $RuntimeIdentifier,
         "--self-contained",
         "-o", $publishDir,
-        "-v:minimal"
+        "-v:minimal",
+        "-p:DevBuild=$($Dev.IsPresent.ToString().ToLowerInvariant())"
     )
     if ($PublishVersion) {
         $trayPublishArgs += "-p:Version=$PublishVersion"
@@ -122,6 +127,16 @@ function Assert-PayloadReady {
         throw "Missing tray payload at $trayExe. Rerun without -NoPublish."
     }
 
+    $identityMarker = Join-Path $publishDir "app-identity.txt"
+    $expectedIdentity = if ($Dev) { "dev" } else { "release" }
+    if (-not (Test-Path -LiteralPath $identityMarker)) {
+        throw "Missing payload identity marker at $identityMarker. Rerun without -NoPublish."
+    }
+    $actualIdentity = (Get-Content -LiteralPath $identityMarker -Raw).Trim()
+    if ($actualIdentity -ne $expectedIdentity) {
+        throw "Payload identity '$actualIdentity' does not match requested '$expectedIdentity' installer. Rerun without -NoPublish."
+    }
+
     $setupExe = Get-ChildItem -LiteralPath $publishDir -Recurse -File -Filter "OpenClaw.SetupEngine.UI.exe" -ErrorAction SilentlyContinue | Select-Object -First 1
     if ($setupExe) {
         throw "SetupEngine.UI.exe should not be present in the installer payload: $($setupExe.FullName)"
@@ -151,6 +166,10 @@ function Invoke-InnoCompiler {
         $args += "/DMySolidCompression=no"
     }
 
+    if ($Dev) {
+        $args += "/DDevBuild=1"
+    }
+
     $args += ".\installer.iss"
 
     & $InnoCompiler @args
@@ -176,6 +195,7 @@ $architectures = if ($Arch -eq "All") { @("x64", "arm64") } else { @($Arch) }
 Write-Step "Using ISCC: $iscc"
 Write-Host "Version: $Version"
 Write-Host "Configuration: $Configuration"
+Write-Host "Identity: $(if ($Dev) { 'dev' } else { 'release' })"
 Write-Host "Fast compression: $($Fast.IsPresent)"
 Write-Host "No publish: $($NoPublish.IsPresent)"
 
@@ -191,7 +211,7 @@ foreach ($architecture in $architectures) {
 }
 
 Write-Step "Built installers"
-Get-ChildItem -Path (Join-Path $repoRoot "Output\OpenClawCompanion-Setup-*.exe") |
+Get-ChildItem -Path (Join-Path $repoRoot "Output\OpenClawCompanion*-Setup-*.exe") |
     Sort-Object Name |
     ForEach-Object {
         "{0}`t{1:N2} MB`t{2}" -f $_.FullName, ($_.Length / 1MB), $_.LastWriteTime
diff --git a/scripts/setup-dev.ps1 b/scripts/setup-dev.ps1
new file mode 100644
index 000000000..ab6dd45cf
--- /dev/null
+++ b/scripts/setup-dev.ps1
@@ -0,0 +1,274 @@
+<#
+.SYNOPSIS
+    Prepares a Windows checkout for OpenClaw developer and agent work.
+
+.DESCRIPTION
+    Installs missing local prerequisites with winget, refreshes the current
+    process PATH, trusts the checkout for GitVersion, and runs the repository
+    prerequisite check. Use -CheckOnly to report what is missing without
+    installing anything.
+
+.PARAMETER CheckOnly
+    Check prerequisites without installing or changing git safe.directory.
+
+.PARAMETER RunValidation
+    After setup, run the full build plus the required shared and tray test
+    projects used by AGENTS.md closeout validation.
+
+.PARAMETER NoTrustRepository
+    Do not add this checkout to git safe.directory.
+
+.EXAMPLE
+    .\scripts\setup-dev.ps1
+    .\scripts\setup-dev.ps1 -CheckOnly
+    .\scripts\setup-dev.ps1 -RunValidation
+#>
+
+param(
+    [switch]$CheckOnly,
+    [switch]$RunValidation,
+    [switch]$NoTrustRepository
+)
+
+$ErrorActionPreference = "Stop"
+
+$repoRoot = Split-Path -Parent $PSScriptRoot
+Set-Location $repoRoot
+
+function Write-Header($text) { Write-Host "`n=== $text ===" -ForegroundColor Cyan }
+function Write-Success($text) { Write-Host "[OK] $text" -ForegroundColor Green }
+function Write-WarningMessage($text) { Write-Host "[WARN] $text" -ForegroundColor Yellow }
+function Write-ErrorMessage($text) { Write-Host "[ERROR] $text" -ForegroundColor Red }
+function Write-Info($text) { Write-Host "  $text" -ForegroundColor Gray }
+
+function Test-WindowsHost {
+    $isWindowsVariable = Get-Variable -Name IsWindows -ErrorAction SilentlyContinue
+    if ($isWindowsVariable) {
+        return [bool]$isWindowsVariable.Value
+    }
+
+    return [System.Environment]::OSVersion.Platform -eq [System.PlatformID]::Win32NT
+}
+
+function Update-ProcessPath {
+    $machinePath = [Environment]::GetEnvironmentVariable("Path", "Machine")
+    $userPath = [Environment]::GetEnvironmentVariable("Path", "User")
+    $env:Path = @($machinePath, $userPath) -join ";"
+}
+
+function Test-CommandAvailable($name) {
+    return $null -ne (Get-Command $name -ErrorAction SilentlyContinue)
+}
+
+function Test-DotNet10Sdk {
+    if (-not (Test-CommandAvailable "dotnet")) {
+        return $false
+    }
+
+    $sdks = & dotnet --list-sdks 2>$null
+    return $LASTEXITCODE -eq 0 -and ($sdks | Where-Object { $_ -match "^10\." })
+}
+
+function Test-NodeAndNpm {
+    return (Test-CommandAvailable "node") -and (Test-CommandAvailable "npm")
+}
+
+function Get-WindowsSdkVersion {
+    $windowsSdkPath = "${env:ProgramFiles(x86)}\Windows Kits\10\Include"
+    if (-not (Test-Path $windowsSdkPath)) {
+        return $null
+    }
+
+    $versions = @(
+        Get-ChildItem $windowsSdkPath -Directory |
+            Where-Object { $_.Name -match "^\d+\.\d+\.\d+\.\d+$" } |
+            Sort-Object { [version]$_.Name } -Descending |
+            Select-Object -ExpandProperty Name
+    )
+
+    if ($versions.Count -eq 0) {
+        return $null
+    }
+
+    return $versions[0]
+}
+
+function Get-WebView2RuntimeVersion {
+    $keys = @(
+        "HKLM:\SOFTWARE\WOW6432Node\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}",
+        "HKCU:\SOFTWARE\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}"
+    )
+
+    foreach ($key in $keys) {
+        if (Test-Path $key) {
+            $version = (Get-ItemProperty $key -ErrorAction SilentlyContinue).pv
+            if ($version) {
+                return $version
+            }
+        }
+    }
+
+    return $null
+}
+
+function Install-WingetPackage($id, $displayName) {
+    if ($CheckOnly) {
+        Write-WarningMessage "$displayName is missing."
+        Write-Info "Install with: winget install --id $id -e"
+        return
+    }
+
+    if (-not (Test-CommandAvailable "winget")) {
+        throw "winget is not available. Install App Installer from the Microsoft Store, then rerun this script."
+    }
+
+    Write-Header "Installing $displayName"
+    $arguments = @(
+        "install",
+        "--id", $id,
+        "-e",
+        "--accept-source-agreements",
+        "--accept-package-agreements",
+        "--disable-interactivity"
+    )
+    & winget @arguments
+    if ($LASTEXITCODE -ne 0) {
+        throw "winget failed to install $displayName ($id)."
+    }
+
+    Update-ProcessPath
+}
+
+function ConvertTo-GitSafeDirectoryPath($path) {
+    return ([System.IO.Path]::GetFullPath($path).TrimEnd("\") -replace "\\", "/")
+}
+
+function Test-GitSafeDirectoryContains($path) {
+    if (-not (Test-CommandAvailable "git")) {
+        return $false
+    }
+
+    $expected = (ConvertTo-GitSafeDirectoryPath $path).ToLowerInvariant()
+    $safeDirectories = & git config --global --get-all safe.directory 2>$null
+    if ($LASTEXITCODE -ne 0 -or -not $safeDirectories) {
+        return $false
+    }
+
+    foreach ($safeDirectory in $safeDirectories) {
+        if ($safeDirectory -eq "*") {
+            return $true
+        }
+
+        $normalized = ($safeDirectory.Trim().TrimEnd("\", "/") -replace "\\", "/").ToLowerInvariant()
+        if ($normalized -eq $expected) {
+            return $true
+        }
+    }
+
+    return $false
+}
+
+function Ensure-RepositoryTrust {
+    if ($NoTrustRepository -or $CheckOnly -or -not (Test-CommandAvailable "git")) {
+        return
+    }
+
+    if (-not (Test-Path (Join-Path $repoRoot ".git"))) {
+        return
+    }
+
+    if (Test-GitSafeDirectoryContains $repoRoot) {
+        Write-Success "Repository already trusted for GitVersion."
+        return
+    }
+
+    $safeDirectory = ConvertTo-GitSafeDirectoryPath $repoRoot
+    Write-Info "Adding git safe.directory entry: $safeDirectory"
+    & git config --global --add safe.directory $safeDirectory
+    if ($LASTEXITCODE -ne 0) {
+        throw "Failed to add git safe.directory entry for $safeDirectory."
+    }
+    Write-Success "Repository trusted for GitVersion."
+}
+
+function Require-Prerequisite($name, $isAvailable, $packageId) {
+    if ($isAvailable) {
+        Write-Success "$name detected."
+        return
+    }
+
+    Install-WingetPackage $packageId $name
+}
+
+if (-not (Test-WindowsHost)) {
+    throw "OpenClaw Windows development requires Windows."
+}
+
+Write-Header "OpenClaw developer setup"
+if ($CheckOnly) {
+    Write-Info "CheckOnly mode: no packages will be installed and git safe.directory will not be changed."
+}
+
+Update-ProcessPath
+
+Require-Prerequisite "Git" (Test-CommandAvailable "git") "Git.Git"
+Require-Prerequisite ".NET 10 SDK" (Test-DotNet10Sdk) "Microsoft.DotNet.SDK.10"
+Require-Prerequisite "Node.js LTS with npm" (Test-NodeAndNpm) "OpenJS.NodeJS.LTS"
+Require-Prerequisite "Windows SDK 10.0.26100" ([bool](Get-WindowsSdkVersion)) "Microsoft.WindowsSDK.10.0.26100"
+
+$webView2Version = Get-WebView2RuntimeVersion
+if ($webView2Version) {
+    Write-Success "WebView2 Runtime detected ($webView2Version)."
+} else {
+    Install-WingetPackage "Microsoft.EdgeWebView2Runtime" "WebView2 Runtime"
+}
+
+Update-ProcessPath
+Ensure-RepositoryTrust
+
+$missing = @()
+if (-not (Test-CommandAvailable "git")) { $missing += "Git" }
+if (-not (Test-DotNet10Sdk)) { $missing += ".NET 10 SDK" }
+if (-not (Test-NodeAndNpm)) { $missing += "Node.js LTS with npm" }
+if (-not (Get-WindowsSdkVersion)) { $missing += "Windows SDK 10.0.26100" }
+if (-not (Get-WebView2RuntimeVersion)) { $missing += "WebView2 Runtime" }
+
+if ($missing.Count -gt 0) {
+    Write-ErrorMessage "Setup is incomplete:"
+    foreach ($item in $missing) {
+        Write-Info "- $item"
+    }
+
+    if (-not $CheckOnly) {
+        Write-Info "If packages were just installed, open a new terminal and rerun .\scripts\setup-dev.ps1 -CheckOnly."
+    }
+    exit 1
+}
+
+Write-Header "Repository prerequisite check"
+& "$repoRoot\build.ps1" -CheckOnly
+if ($LASTEXITCODE -ne 0) {
+    exit $LASTEXITCODE
+}
+
+if ($RunValidation) {
+    Write-Header "Required validation"
+    $env:OPENCLAW_REPO_ROOT = $repoRoot
+
+    & "$repoRoot\build.ps1"
+    if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
+
+    dotnet build "$repoRoot\tests\OpenClaw.Shared.Tests\OpenClaw.Shared.Tests.csproj"
+    if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
+
+    dotnet build "$repoRoot\tests\OpenClaw.Tray.Tests\OpenClaw.Tray.Tests.csproj"
+    if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
+
+    dotnet test "$repoRoot\tests\OpenClaw.Shared.Tests\OpenClaw.Shared.Tests.csproj" --no-restore
+    if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
+
+    dotnet test "$repoRoot\tests\OpenClaw.Tray.Tests\OpenClaw.Tray.Tests.csproj" --no-restore
+    if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
+}
+
+Write-Success "OpenClaw developer setup is ready."
diff --git a/scripts/validate-mxc-e2e.ps1 b/scripts/validate-mxc-e2e.ps1
new file mode 100644
index 000000000..cdd2b8be4
--- /dev/null
+++ b/scripts/validate-mxc-e2e.ps1
@@ -0,0 +1,213 @@
+<#
+.SYNOPSIS
+    Runs the formal local MXC validation path.
+
+.DESCRIPTION
+    Builds the required Windows projects, enables the E2E/MXC gates, and runs
+    the real WSL Gateway -> Windows node -> system.run MXC E2E proofs.
+
+    This script is intentionally stricter than the regular GitHub-hosted E2E
+    shard: MXC skips fail by default so MXC-related work cannot accidentally
+    claim end-to-end validation on a host that did not exercise MXC.
+
+.PARAMETER NoBuild
+    Skip build steps and run against existing outputs.
+
+.PARAMETER AllowSkip
+    Return success when MXC tests are reported but skipped. Use only for
+    discovery/documentation of a non-MXC host; do not use as merge validation
+    for MXC, system.run, exec approval, Windows node command execution, or
+    gateway setup/connect changes.
+#>
+[CmdletBinding()]
+param(
+    [switch]$NoBuild,
+
+    [switch]$AllowSkip,
+
+    [ValidateSet("Debug", "Release")]
+    [string]$Configuration = "Debug",
+
+    [ValidateSet("win-x64", "win-arm64")]
+    [string]$RuntimeIdentifier,
+
+    [string]$ResultsDirectory
+)
+
+Set-StrictMode -Version Latest
+$ErrorActionPreference = "Stop"
+
+$repoRoot = (Resolve-Path -LiteralPath (Join-Path $PSScriptRoot "..")).Path
+Set-Location $repoRoot
+
+if ([string]::IsNullOrWhiteSpace($RuntimeIdentifier)) {
+    $RuntimeIdentifier = switch ([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture) {
+        ([System.Runtime.InteropServices.Architecture]::Arm64) { "win-arm64"; break }
+        default { "win-x64" }
+    }
+}
+
+if ([string]::IsNullOrWhiteSpace($ResultsDirectory)) {
+    $ResultsDirectory = Join-Path $repoRoot "TestResults\MxcE2E"
+}
+
+New-Item -ItemType Directory -Force -Path $ResultsDirectory | Out-Null
+
+function Invoke-Checked {
+    param(
+        [Parameter(Mandatory = $true)][string]$Name,
+        [Parameter(Mandatory = $true)][scriptblock]$Command
+    )
+
+    Write-Host ""
+    Write-Host "=== $Name ===" -ForegroundColor Cyan
+    & $Command
+    if ($LASTEXITCODE -ne 0) {
+        throw "$Name failed with exit code $LASTEXITCODE."
+    }
+}
+
+function Read-Trx {
+    param([Parameter(Mandatory = $true)][string]$Path)
+
+    if (-not (Test-Path -LiteralPath $Path)) {
+        throw "Expected TRX file was not created: $Path"
+    }
+
+    [xml](Get-Content -LiteralPath $Path -Raw)
+}
+
+function Get-TrxUnitTestResults {
+    param([Parameter(Mandatory = $true)][xml]$Trx)
+
+    @($Trx.SelectNodes("//*[local-name()='UnitTestResult']"))
+}
+
+function Get-TrxResultText {
+    param([Parameter(Mandatory = $true)][System.Xml.XmlElement]$Result)
+
+    $parts = New-Object System.Collections.Generic.List[string]
+    foreach ($node in @($Result.SelectNodes(".//*[local-name()='Message' or local-name()='StdOut' or local-name()='StdErr']"))) {
+        if ($node -and -not [string]::IsNullOrWhiteSpace($node.InnerText)) {
+            $parts.Add($node.InnerText)
+        }
+    }
+
+    [string]::Join("`n", $parts)
+}
+
+function Assert-GatewayMxcProofsPassed {
+    param([Parameter(Mandatory = $true)][xml]$Trx)
+
+    $expectedProofs = @(
+        "RealGateway_SystemRun_ExecutesThroughWindowsNodeMxcSandbox",
+        "RealGateway_SystemRun_BlocksWritesToTrayDataDirectoryInMxcSandbox"
+    )
+    $results = Get-TrxUnitTestResults -Trx $Trx
+    $errors = New-Object System.Collections.Generic.List[string]
+
+    foreach ($proof in $expectedProofs) {
+        $result = @($results | Where-Object { $_.GetAttribute("testName") -like "*$proof*" }) | Select-Object -First 1
+        if ($null -eq $result) {
+            $errors.Add("Gateway MXC proof was not reported in TRX: $proof")
+            continue
+        }
+
+        $outcome = $result.GetAttribute("outcome")
+        if ($outcome -eq "Passed") {
+            Write-Host "Gateway MXC proof passed: $proof" -ForegroundColor Green
+            continue
+        }
+
+        if ($outcome -eq "NotExecuted" -or $outcome -eq "Skipped") {
+            $text = Get-TrxResultText -Result $result
+            $skipMessage = if ([string]::IsNullOrWhiteSpace($text)) { "no skip reason in TRX" } else { $text.Trim() }
+            $message = "Gateway MXC proof skipped: $proof ($skipMessage)"
+            if ($AllowSkip) {
+                Write-Warning $message
+            } else {
+                $errors.Add("$message. Run on an MXC-enabled Windows machine or pass -AllowSkip only when documenting a blocked host.")
+            }
+            continue
+        }
+
+        $errors.Add("Gateway MXC proof '$proof' had unexpected outcome '$outcome'.")
+    }
+
+    if ($errors.Count -gt 0) {
+        throw [string]::Join("`n", $errors)
+    }
+}
+
+function Set-ProcessEnv {
+    param(
+        [Parameter(Mandatory = $true)][string]$Name,
+        [string]$Value
+    )
+
+    [Environment]::SetEnvironmentVariable($Name, $Value, "Process")
+}
+
+$trackedEnvVars = @(
+    "OPENCLAW_REPO_ROOT",
+    "OPENCLAW_RUN_E2E",
+    "OPENCLAW_RUN_MXC_E2E"
+)
+$previousEnv = @{}
+foreach ($name in $trackedEnvVars) {
+    $previousEnv[$name] = [Environment]::GetEnvironmentVariable($name, "Process")
+}
+
+try {
+    Set-ProcessEnv -Name "OPENCLAW_REPO_ROOT" -Value $repoRoot
+    Set-ProcessEnv -Name "OPENCLAW_RUN_E2E" -Value "1"
+    Set-ProcessEnv -Name "OPENCLAW_RUN_MXC_E2E" -Value "1"
+
+    Write-Host "OpenClaw MXC validation"
+    Write-Host "  Repo: $repoRoot"
+    Write-Host "  Configuration: $Configuration"
+    Write-Host "  RuntimeIdentifier: $RuntimeIdentifier"
+    Write-Host "  Results: $ResultsDirectory"
+    if ($AllowSkip) {
+        Write-Warning "-AllowSkip is enabled. This run may document a non-MXC host, but it is not sufficient merge validation for MXC-related work."
+    }
+
+    if (-not $NoBuild) {
+        Invoke-Checked -Name "Build repository" -Command {
+            $powerShellExe = (Get-Process -Id $PID).Path
+            & $powerShellExe -NoProfile -File (Join-Path $repoRoot "build.ps1") -Configuration $Configuration
+        }
+
+        Invoke-Checked -Name "Build tray app for $RuntimeIdentifier" -Command {
+            & dotnet build ".\src\OpenClaw.Tray.WinUI\OpenClaw.Tray.WinUI.csproj" -c $Configuration -r $RuntimeIdentifier
+        }
+
+        Invoke-Checked -Name "Build E2E tests for $RuntimeIdentifier" -Command {
+            & dotnet build ".\tests\OpenClaw.E2ETests\OpenClaw.E2ETests.csproj" -c $Configuration -r $RuntimeIdentifier
+        }
+    }
+
+    $e2eTrx = Join-Path $ResultsDirectory "OpenClaw.E2ETests.Mxc.trx"
+    $e2eConsoleLog = Join-Path $ResultsDirectory "OpenClaw.E2ETests.Mxc.console.log"
+    Invoke-Checked -Name "Run Gateway MXC E2E proofs" -Command {
+        & dotnet test ".\tests\OpenClaw.E2ETests\OpenClaw.E2ETests.csproj" `
+            --no-build `
+            --no-restore `
+            -c $Configuration `
+            -r $RuntimeIdentifier `
+            --verbosity normal `
+            --results-directory $ResultsDirectory `
+            --logger "trx;LogFileName=OpenClaw.E2ETests.Mxc.trx" `
+            --logger "console;verbosity=detailed" `
+            --filter "FullyQualifiedName~OpenClaw.E2ETests.Setup.MxcSetupAndConnectTests" `
+            2>&1 | Tee-Object -FilePath $e2eConsoleLog
+    }
+    Assert-GatewayMxcProofsPassed -Trx (Read-Trx -Path $e2eTrx)
+
+    Write-Host ""
+    Write-Host "MXC validation completed successfully." -ForegroundColor Green
+} finally {
+    foreach ($name in $trackedEnvVars) {
+        [Environment]::SetEnvironmentVariable($name, $previousEnv[$name], "Process")
+    }
+}
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index f46c36dac..e8c8c5792 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GitVersion.MsBuild" Version="6.7.0" PrivateAssets="all" />
+    <PackageReference Include="GitVersion.MsBuild" Version="6.8.1" PrivateAssets="all" />
     <PackageReference Include="VCRuntime.CefSharp.140" Version="1.0.5" PrivateAssets="all" ExcludeAssets="build" />
   </ItemGroup>
 
diff --git a/src/OpenClaw.Chat/ChatModelChoice.cs b/src/OpenClaw.Chat/ChatModelChoice.cs
new file mode 100644
index 000000000..a5a10964b
--- /dev/null
+++ b/src/OpenClaw.Chat/ChatModelChoice.cs
@@ -0,0 +1,243 @@
+namespace OpenClaw.Chat;
+
+using OpenClaw.Shared;
+
+/// <summary>
+/// Provider-rich description of a model exposed by <c>models.list</c>.
+/// </summary>
+/// <param name="Id">Wire model id (e.g. <c>claude-opus-4.8</c>).</param>
+/// <param name="DisplayName">Human-friendly label (falls back to <paramref name="Id"/>).</param>
+/// <param name="Provider">Owning provider (e.g. <c>OpenAI</c>, <c>Anthropic</c>), when known.</param>
+/// <param name="ContextWindow">Context-window size in tokens, when known.</param>
+/// <param name="IsConfigured">True when the provider is configured on the gateway.</param>
+/// <param name="IsAvailable">
+/// True when the model can be selected right now. When false the picker shows it
+/// but does not let the user switch to it.
+/// </param>
+/// <param name="RequiresAuth">
+/// True when the model's provider still needs authentication/credentials before
+/// the model is usable.
+/// </param>
+/// <param name="IsDefault">True when the gateway marks this model as the default.</param>
+public sealed record ChatModelChoice(
+    string Id,
+    string DisplayName,
+    string? Provider = null,
+    int? ContextWindow = null,
+    bool IsConfigured = true,
+    bool IsAvailable = true,
+    bool RequiresAuth = false,
+    bool IsDefault = false)
+{
+    /// <summary>
+    /// Provider-qualified identity used for picker tags and <c>sessions.patch</c>
+    /// model refs. Already-qualified ids are preserved.
+    /// </summary>
+    public string SelectionId => BuildSelectionId(Id, Provider);
+
+    /// <summary>
+    /// True when the user may switch the session to this model. Auth-needed
+    /// models remain selectable (selecting one routes the user toward the
+    /// gateway's provider-auth flow); only explicitly unavailable models are
+    /// blocked.
+    /// </summary>
+    public bool IsSelectable => IsAvailable;
+
+    /// <summary>
+    /// Maps gateway models into ordered, selection-deduplicated picker entries.
+    /// </summary>
+    public static IReadOnlyList<ChatModelChoice> FromModelsList(ModelsListInfo? info)
+    {
+        if (info?.Models is not { Count: > 0 }) return Array.Empty<ChatModelChoice>();
+
+        var seen = new HashSet<string>(StringComparer.Ordinal);
+        var list = new List<ChatModelChoice>(info.Models.Count);
+        foreach (var m in info.Models)
+        {
+            if (m is null || string.IsNullOrEmpty(m.Id)) continue;
+            // Hide explicitly unconfigured models unless the gateway reports an
+            // auth flow for them; auth-needed rows are useful picker actions.
+            if (m.HasConfiguredFlag && !m.IsConfigured && !m.RequiresAuth) continue;
+            var choice = new ChatModelChoice(
+                Id: m.Id,
+                DisplayName: m.DisplayName,
+                Provider: m.Provider,
+                ContextWindow: m.ContextWindow,
+                IsConfigured: m.IsConfigured,
+                IsAvailable: m.IsAvailable,
+                RequiresAuth: m.RequiresAuth,
+                IsDefault: m.IsDefault);
+            if (!seen.Add(choice.SelectionId)) continue;
+            list.Add(choice);
+        }
+        return list;
+    }
+
+    public bool MatchesModel(string? modelId, string? provider = null)
+    {
+        var normalizedModel = NormalizeId(modelId);
+        if (normalizedModel is null) return false;
+
+        if (NormalizeId(provider) is { } normalizedProvider)
+        {
+            var providerQualified = BuildSelectionId(normalizedModel, normalizedProvider);
+            return string.Equals(SelectionId, providerQualified, StringComparison.Ordinal)
+                || (string.Equals(Id, normalizedModel, StringComparison.Ordinal)
+                    && string.Equals(NormalizeId(Provider), normalizedProvider, StringComparison.OrdinalIgnoreCase));
+        }
+
+        return string.Equals(Id, normalizedModel, StringComparison.Ordinal)
+            || string.Equals(SelectionId, normalizedModel, StringComparison.Ordinal);
+    }
+
+    public static string BuildSelectionId(string modelId, string? provider)
+    {
+        var normalizedModel = NormalizeId(modelId) ?? string.Empty;
+        if (normalizedModel.Length == 0) return string.Empty;
+        var normalizedProvider = NormalizeId(provider);
+        if (normalizedProvider is null) return normalizedModel;
+
+        var prefix = normalizedProvider + "/";
+        return normalizedModel.StartsWith(prefix, StringComparison.OrdinalIgnoreCase)
+            ? normalizedModel
+            : $"{normalizedProvider}/{normalizedModel}";
+    }
+
+    public static string? ResolveSelectionId(
+        string? modelId,
+        string? provider,
+        IReadOnlyList<ChatModelChoice> choices)
+    {
+        var normalizedModel = NormalizeId(modelId);
+        if (normalizedModel is null) return null;
+
+        if (NormalizeId(provider) is not null)
+        {
+            var match = choices.FirstOrDefault(c => c.MatchesModel(normalizedModel, provider));
+            if (match is not null) return match.SelectionId;
+
+            var bareRawMatches = choices
+                .Where(c => c.Id == normalizedModel && string.IsNullOrWhiteSpace(c.Provider))
+                .Take(2)
+                .ToArray();
+            if (bareRawMatches.Length == 1) return bareRawMatches[0].SelectionId;
+
+            return BuildSelectionId(normalizedModel, provider);
+        }
+
+        var direct = choices.FirstOrDefault(c => c.SelectionId == normalizedModel);
+        if (direct is not null) return direct.SelectionId;
+
+        var rawMatches = choices.Where(c => c.Id == normalizedModel).Take(2).ToArray();
+        return rawMatches.Length == 1 ? rawMatches[0].SelectionId : normalizedModel;
+    }
+
+    private static string? NormalizeId(string? value)
+    {
+        var trimmed = value?.Trim();
+        return string.IsNullOrEmpty(trimmed) ? null : trimmed;
+    }
+}
+
+/// <summary>
+/// Pure label/formatting helpers for the model picker. Lives in
+/// <c>OpenClaw.Chat</c> (no WinUI dependency) so the display strings can be unit
+/// tested without spinning up the composer.
+/// </summary>
+public static class ChatModelLabels
+{
+    /// <summary>
+    /// True when <paramref name="modelId"/> represents "no explicit model
+    /// override" — i.e. the session is tracking the gateway/agent default.
+    /// This predicate only describes the <em>current</em> state, derived from an
+    /// empty/absent session model. Clearing an override (so a session tracks the
+    /// default again) is performed via the tri-state <c>SessionPatch.Clear</c>
+    /// (explicit JSON null), not by sending an empty model string.
+    /// </summary>
+    public static bool IsTrackingDefault(string? modelId) => string.IsNullOrEmpty(modelId);
+
+    /// <summary>
+    /// Compact token-count label: 272000 → "272K", 1_048_576 → "1M",
+    /// 200000 → "200K". Falls back to the raw number for small values.
+    /// </summary>
+    public static string FormatContextWindow(int contextWindow)
+    {
+        if (contextWindow <= 0) return string.Empty;
+        if (contextWindow >= 1_000_000)
+        {
+            var millions = contextWindow / 1_000_000.0;
+            // Trim a trailing ".0" so 2_000_000 → "2M" not "2.0M".
+            return millions == Math.Floor(millions)
+                ? $"{(int)millions}M"
+                : $"{millions:0.#}M";
+        }
+        if (contextWindow >= 1_000)
+        {
+            var thousands = contextWindow / 1_000.0;
+            return thousands == Math.Floor(thousands)
+                ? $"{(int)thousands}K"
+                : $"{thousands:0.#}K";
+        }
+        return contextWindow.ToString();
+    }
+
+    /// <summary>
+    /// Builds the secondary metadata segment ("OpenAI · 272K") from provider and
+    /// context window, or an empty string when neither is known.
+    /// </summary>
+    public static string BuildMetaSegment(ChatModelChoice choice)
+    {
+        var hasProvider = !string.IsNullOrWhiteSpace(choice.Provider);
+        var ctx = choice.ContextWindow is { } cw ? FormatContextWindow(cw) : string.Empty;
+        var hasCtx = ctx.Length > 0;
+
+        if (hasProvider && hasCtx) return $"{choice.Provider} · {ctx}";
+        if (hasProvider) return choice.Provider!;
+        if (hasCtx) return ctx;
+        return string.Empty;
+    }
+
+    /// <summary>
+    /// Trailing state marker for a model: "default", "auth needed",
+    /// "unavailable", or empty. Unavailable takes precedence over auth-needed,
+    /// which takes precedence over default. Only explicit gateway signals drive
+    /// the markers — a missing <see cref="ChatModelChoice.IsConfigured"/> flag is
+    /// not treated as "auth needed" because the gateway's <c>configured</c> view
+    /// often omits the field entirely.
+    /// </summary>
+    public static string BuildStateMarker(ChatModelChoice choice)
+    {
+        if (!choice.IsAvailable) return "unavailable";
+        if (choice.RequiresAuth) return "auth needed";
+        if (choice.IsDefault) return "default";
+        return string.Empty;
+    }
+
+    /// <summary>
+    /// Full menu/combo label, e.g. "Claude Opus 4.8 · Anthropic · 200K · default".
+    /// State marker is appended last so default/auth-needed/unavailable reads at
+    /// the end of the row.
+    /// </summary>
+    public static string BuildMenuLabel(ChatModelChoice choice)
+    {
+        var label = choice.DisplayName;
+        var meta = BuildMetaSegment(choice);
+        if (meta.Length > 0) label = $"{label} · {meta}";
+        var marker = BuildStateMarker(choice);
+        if (marker.Length > 0) label = $"{label} · {marker}";
+        return label;
+    }
+
+    /// <summary>
+    /// Label for the "clear to gateway default" picker entry. Selecting it clears
+    /// the session's explicit model override (the gateway falls back to its
+    /// agent/default model). When the default model is known its name is
+    /// surfaced, e.g. "Default (Claude Opus 4.8)".
+    /// </summary>
+    public static string BuildDefaultEntryLabel(ChatModelChoice? defaultChoice)
+    {
+        if (defaultChoice is not null && !string.IsNullOrWhiteSpace(defaultChoice.DisplayName))
+            return $"Default ({defaultChoice.DisplayName})";
+        return "Default";
+    }
+}
diff --git a/src/OpenClaw.Chat/ChatModels.cs b/src/OpenClaw.Chat/ChatModels.cs
index 086016635..da526cd1d 100644
--- a/src/OpenClaw.Chat/ChatModels.cs
+++ b/src/OpenClaw.Chat/ChatModels.cs
@@ -45,10 +45,33 @@ public enum ChatTimelineItemKind
 /// </remarks>
 public enum ChatPermissionDecision
 {
-    Pending,
-    Allowed,
-    Denied,
-    Expired
+    Pending = 0,
+    Allowed = 1,
+    Denied = 2,
+    Expired = 3,
+    AllowedAlways = 4
+}
+
+public static class ChatPermissionActionKeys
+{
+    public const string AllowOnce = "allow-once";
+    public const string AllowAlways = "allow-always";
+    public const string Deny = "deny";
+
+    public static readonly string[] ExecApprovalDefaults = [AllowOnce, AllowAlways, Deny];
+
+    public static string[] NormalizeActions(IReadOnlyList<string>? actions)
+    {
+        if (actions is not { Count: > 0 })
+            return ExecApprovalDefaults;
+
+        var normalized = actions
+            .Where(action => !string.IsNullOrWhiteSpace(action))
+            .Distinct(StringComparer.OrdinalIgnoreCase)
+            .ToArray();
+
+        return normalized.Length > 0 ? normalized : ExecApprovalDefaults;
+    }
 }
 
 public enum ChatToolCallStatus
@@ -82,6 +105,7 @@ public record ChatThread
     public string? Compute { get; init; }
     public string? ProfileName { get; init; }
     public string? Model { get; init; }
+    public string? ModelProvider { get; init; }
     public string? ThinkingLevel { get; init; }
     public long InputTokens { get; init; }
     public long OutputTokens { get; init; }
@@ -107,9 +131,10 @@ public record ChatTimelineItem(
     ChatTone? Tone = null,
     string? ToolCallId = null,
     string? PermissionRequestId = null,
-    ChatPermissionDecision PermissionDecision = ChatPermissionDecision.Pending);
+    ChatPermissionDecision PermissionDecision = ChatPermissionDecision.Pending,
+    IReadOnlyList<string>? PermissionActions = null);
 
-public record ChatPermissionRequest(string RequestId, string PermissionKind, string ToolName, string Detail);
+public record ChatPermissionRequest(string RequestId, string PermissionKind, string ToolName, string Detail, IReadOnlyList<string>? Actions = null);
 
 public record ChatTimelineState(
     System.Collections.Immutable.ImmutableList<ChatTimelineItem> Entries,
@@ -131,6 +156,21 @@ public record ChatTimelineState(
         System.Collections.Immutable.ImmutableDictionary<string, string>.Empty);
 }
 
+public enum ChatQueuedMessageSendState
+{
+    Queued,
+    Sending,
+    Failed
+}
+
+public record ChatQueuedMessage(
+    string Id,
+    string Text,
+    DateTimeOffset CreatedAt,
+    string LocalNonce,
+    ChatQueuedMessageSendState SendState = ChatQueuedMessageSendState.Queued,
+    string? ErrorText = null);
+
 public record ChatHistoryPage(ChatEvent[] Events, int NextSince, int PrevBefore, bool HasMore);
 
 public abstract record ChatEvent;
@@ -156,7 +196,7 @@ public record ChatContextChangedEvent(string? Cwd, string? GitBranch) : ChatEven
 public record ChatStatusEvent(string Text, ChatTone Tone) : ChatEvent;
 public record ChatErrorEvent(string Text) : ChatEvent;
 public record ChatRestoredEvent(string Text) : ChatEvent;
-public record ChatPermissionRequestEvent(string RequestId, string PermissionKind, string ToolName, string Detail) : ChatEvent;
+public record ChatPermissionRequestEvent(string RequestId, string PermissionKind, string ToolName, string Detail, IReadOnlyList<string>? Actions = null) : ChatEvent;
 public record ChatModelChangedEvent(string Model) : ChatEvent;
 public record ChatRawEvent(string EventType, string? Text = null) : ChatEvent;
 
@@ -166,7 +206,12 @@ public record ChatDataSnapshot(
     string? DefaultThreadId,
     string? ConnectionStatus,
     string[] AvailableModels,
-    ChatComposeTarget ComposeTarget);
+    ChatComposeTarget ComposeTarget,
+    IReadOnlyList<ChatModelChoice>? ModelChoices = null,
+    IReadOnlyList<OpenClaw.Shared.GatewayCommand>? AvailableCommands = null,
+    bool CommandsSupported = true,
+    IReadOnlyDictionary<string, long>? TimelineGenerations = null,
+    IReadOnlyDictionary<string, IReadOnlyList<ChatQueuedMessage>>? QueuedMessagesByThread = null);
 
 /// <summary>
 /// Describes where the UI may send the next chat message. Distinct from
@@ -229,11 +274,32 @@ public interface IChatDataProvider : IAsyncDisposable
     Task SendMessageAsync(string threadId, string message, CancellationToken cancellationToken = default);
     Task SendMessageAsync(string threadId, string message, CancellationToken cancellationToken, IReadOnlyList<OpenClaw.Shared.ChatAttachment>? attachments) =>
         SendMessageAsync(threadId, message, cancellationToken);
+    Task<bool> CancelQueuedMessageAsync(string threadId, string queuedMessageId, CancellationToken cancellationToken = default) => Task.FromResult(false);
     Task StopResponseAsync(string threadId, CancellationToken cancellationToken = default);
     Task SetThreadSuspendedAsync(string threadId, bool suspended, CancellationToken cancellationToken = default);
     Task DeleteThreadAsync(string threadId, CancellationToken cancellationToken = default);
     Task SetModelAsync(string threadId, string model, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Clears the session's explicit model override so it tracks the gateway's
+    /// agent/default model again. Providers that don't support clearing leave
+    /// the default no-op. Distinct from <see cref="SetModelAsync"/> because the
+    /// gateway models this as an explicit null (tri-state), not an empty string.
+    /// </summary>
+    Task ClearModelAsync(string threadId, CancellationToken cancellationToken = default) => Task.CompletedTask;
     Task SetThinkingLevelAsync(string threadId, string thinkingLevel, CancellationToken cancellationToken = default);
     Task SetPermissionModeAsync(string threadId, bool allowAll, CancellationToken cancellationToken = default);
-    Task RespondToPermissionAsync(string threadId, string requestId, bool allow, CancellationToken cancellationToken = default);
+    Task RespondToPermissionAsync(string threadId, string requestId, string action, CancellationToken cancellationToken = default);
+    Task RespondToPermissionAsync(string threadId, string requestId, bool allow, CancellationToken cancellationToken = default) =>
+        RespondToPermissionAsync(
+            threadId,
+            requestId,
+            allow ? ChatPermissionActionKeys.AllowOnce : ChatPermissionActionKeys.Deny,
+            cancellationToken);
+
+    /// <summary>
+    /// Requests a refresh of the gateway command catalog surfaced via
+    /// <see cref="ChatDataSnapshot.AvailableCommands"/>. Providers that have no
+    /// command catalog (e.g. previews/fakes) may treat this as a no-op.
+    /// </summary>
+    Task EnsureCommandCatalogAsync(CancellationToken cancellationToken = default) => Task.CompletedTask;
 }
diff --git a/src/OpenClaw.Chat/ChatTimelineReducer.cs b/src/OpenClaw.Chat/ChatTimelineReducer.cs
index 4963e73b4..6a83a5b1d 100644
--- a/src/OpenClaw.Chat/ChatTimelineReducer.cs
+++ b/src/OpenClaw.Chat/ChatTimelineReducer.cs
@@ -58,6 +58,12 @@ public static ChatTimelineState AddLocalUser(ChatTimelineState state, string tex
         };
     }
 
+    public static ChatTimelineState BeginLocalUserTurn(ChatTimelineState state)
+    {
+        state = ClearStreamingAtTurnBoundary(state);
+        return state with { TurnActive = true };
+    }
+
     // Hard turn boundary cleanup shared by both user-message entry points
     // (AddLocalUser for typed input, ApplyUserMessage for gateway-injected
     // events). Clears ActiveAssistantId/ActiveReasoningId and demotes any
@@ -174,13 +180,14 @@ static ChatTimelineState ApplyPermissionRequest(ChatTimelineState state, ChatPer
             ToolName: e.ToolName,
             IntentSummary: e.PermissionKind,
             PermissionRequestId: e.RequestId,
-            PermissionDecision: ChatPermissionDecision.Pending);
+            PermissionDecision: ChatPermissionDecision.Pending,
+            PermissionActions: e.Actions);
 
         return state with
         {
             Entries = entries.Add(entry),
             NextId = state.NextId + 1,
-            PendingPermission = new ChatPermissionRequest(e.RequestId, e.PermissionKind, e.ToolName, detail)
+            PendingPermission = new ChatPermissionRequest(e.RequestId, e.PermissionKind, e.ToolName, detail, e.Actions)
         };
     }
 
diff --git a/src/OpenClaw.Cli/Program.cs b/src/OpenClaw.Cli/Program.cs
index 0e2b05987..f9fefdd79 100644
--- a/src/OpenClaw.Cli/Program.cs
+++ b/src/OpenClaw.Cli/Program.cs
@@ -4,10 +4,10 @@
 
 internal sealed class CliOptions
 {
-    public string SettingsPath { get; set; } = Path.Combine(
-        Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
-        "OpenClawTray",
-        "settings.json");
+    public string SettingsPath { get; set; } = "";
+    public bool SettingsPathExplicit { get; set; }
+    public string? Identity { get; set; }
+    public string IdentityDataPath { get; set; } = "";
 
     public string? GatewayUrlOverride { get; set; }
     public string? TokenOverride { get; set; }
@@ -33,6 +33,7 @@ private static async Task<int> Main(string[] args)
         try
         {
             options = ParseArgs(args);
+            ApplyIdentityDefaults(options, Environment.GetEnvironmentVariable);
         }
         catch (Exception ex)
         {
@@ -64,7 +65,11 @@ private static async Task<int> Main(string[] args)
         }
 
         IOpenClawLogger logger = options.Verbose ? new ConsoleLogger() : NullLogger.Instance;
-        using var client = new OpenClawGatewayClient(gatewayUrl, token, logger);
+        using var client = new OpenClawGatewayClient(
+            gatewayUrl,
+            token,
+            logger,
+            identityPath: options.IdentityDataPath);
 
         var lastStatus = ConnectionStatus.Disconnected;
         var connectedTcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
@@ -218,6 +223,10 @@ private static CliOptions ParseArgs(string[] args)
             {
                 case "--settings":
                     options.SettingsPath = RequireValue(args, ref i, arg);
+                    options.SettingsPathExplicit = true;
+                    break;
+                case "--identity":
+                    options.Identity = OpenClawAppIdentity.NormalizeIdentity(RequireValue(args, ref i, arg));
                     break;
                 case "--url":
                     options.GatewayUrlOverride = RequireValue(args, ref i, arg);
@@ -251,6 +260,16 @@ private static CliOptions ParseArgs(string[] args)
         return options;
     }
 
+    private static void ApplyIdentityDefaults(CliOptions options, Func<string, string?> envLookup)
+    {
+        options.Identity = OpenClawAppIdentity.ResolveIdentity(envLookup, options.Identity);
+        options.IdentityDataPath = OpenClawAppIdentity.ResolveRoamingDataDirectory(envLookup, options.Identity);
+        if (!options.SettingsPathExplicit)
+        {
+            options.SettingsPath = OpenClawAppIdentity.ResolveSettingsPath(envLookup, options.Identity);
+        }
+    }
+
     private static string RequireValue(string[] args, ref int index, string name)
     {
         if (index + 1 >= args.Length)
@@ -282,7 +301,8 @@ private static void PrintUsage()
         Console.WriteLine("  dotnet run --project src/OpenClaw.Cli -- [options]");
         Console.WriteLine();
         Console.WriteLine("Options:");
-        Console.WriteLine("  --settings <path>            Settings file (default: %APPDATA%\\OpenClawTray\\settings.json)");
+        Console.WriteLine("  --settings <path>            Settings file (default: selected identity profile)");
+        Console.WriteLine("  --identity <release|dev>     Select tray profile (default: %OPENCLAW_APP_IDENTITY% or release)");
         Console.WriteLine("  --url <ws://...>             Override gateway URL");
         Console.WriteLine("  --token <token>              Override token");
         Console.WriteLine("  --message <text>             Message to send");
diff --git a/src/OpenClaw.Connection/ConnectionDiagnostics.cs b/src/OpenClaw.Connection/ConnectionDiagnostics.cs
index f3ed8fadc..e727e8a16 100644
--- a/src/OpenClaw.Connection/ConnectionDiagnostics.cs
+++ b/src/OpenClaw.Connection/ConnectionDiagnostics.cs
@@ -27,7 +27,11 @@ public ConnectionDiagnostics(int capacity = 500, IClock? clock = null)
 
     public void Record(string category, string message, string? detail = null)
     {
-        var evt = new ConnectionDiagnosticEvent(_clock.UtcNow, category, message, detail);
+        var evt = new ConnectionDiagnosticEvent(
+            _clock.UtcNow,
+            TokenSanitizer.SanitizeLogMessage(category),
+            TokenSanitizer.SanitizeLogMessage(message),
+            detail is null ? null : TokenSanitizer.SanitizeLogMessage(detail));
         lock (_lock)
         {
             _buffer[_head] = evt;
diff --git a/src/OpenClaw.Connection/ConnectionStateMachine.cs b/src/OpenClaw.Connection/ConnectionStateMachine.cs
index 7613e6122..a4b709b70 100644
--- a/src/OpenClaw.Connection/ConnectionStateMachine.cs
+++ b/src/OpenClaw.Connection/ConnectionStateMachine.cs
@@ -123,9 +123,16 @@ public void SetNodeEnabled(bool enabled)
     {
         _nodeEnabled = enabled;
         if (!enabled)
+        {
             _nodeState = RoleConnectionState.Disabled;
+            _nodeError = null;
+            _nodeCredentialSource = null;
+        }
         else if (_nodeState == RoleConnectionState.Disabled)
+        {
             _nodeState = RoleConnectionState.Idle;
+            _nodeError = null;
+        }
         RebuildSnapshot();
     }
 
@@ -199,6 +206,15 @@ internal void SetNodeCredentialSource(string? source)
         RebuildSnapshot();
     }
 
+    internal void BlockNodeStart(string detail)
+    {
+        _nodeEnabled = true;
+        _nodeState = RoleConnectionState.Error;
+        _nodeError = detail;
+        _nodeCredentialSource = null;
+        RebuildSnapshot();
+    }
+
     /// <summary>Update the operator pairing request ID in the snapshot.</summary>
     internal void SetOperatorPairingRequestId(string? requestId)
     {
@@ -304,6 +320,7 @@ private void ApplyTransition(ConnectionTrigger trigger, string? detail)
 
             case ConnectionTrigger.NodePairingRequired:
                 _nodeState = RoleConnectionState.PairingRequired;
+                _nodeError = null;
                 break;
 
             case ConnectionTrigger.NodePaired:
@@ -340,6 +357,7 @@ private void RebuildSnapshot()
             // Clear requestId when no longer in PairingRequired to prevent stale reads
             OperatorPairingRequestId = _operatorState == RoleConnectionState.PairingRequired
                 ? Current.OperatorPairingRequestId : null,
+            NodeConnectionIntended = _nodeEnabled,
             NodeState = _nodeState,
             NodeError = _nodeError,
             NodeCredentialSource = _nodeCredentialSource,
diff --git a/src/OpenClaw.Connection/DeviceIdentityStore.cs b/src/OpenClaw.Connection/DeviceIdentityStore.cs
index 1c491e8bf..9c80e731b 100644
--- a/src/OpenClaw.Connection/DeviceIdentityStore.cs
+++ b/src/OpenClaw.Connection/DeviceIdentityStore.cs
@@ -34,31 +34,14 @@ public void StoreToken(string identityPath, string token, string[]? scopes, stri
     /// Clear stored device tokens from an identity file, keeping the keypair intact.
     /// Strips DeviceToken, DeviceTokenScopes, NodeDeviceToken, and NodeDeviceTokenScopes
     /// from the identity JSON while preserving keys, deviceId, algorithm, etc.
+    /// Writes atomically via temp-file + rename to prevent torn writes from
+    /// silently rotating device identity on crash/power-loss.
     /// </summary>
     public static void ClearStoredTokens(string identityDir, IOpenClawLogger? logger = null)
     {
-        var keyPath = Path.Combine(identityDir, "device-key-ed25519.json");
-        if (!File.Exists(keyPath)) return;
         try
         {
-            var json = File.ReadAllText(keyPath);
-            var doc = System.Text.Json.JsonDocument.Parse(json);
-            var root = doc.RootElement;
-
-            using var ms = new MemoryStream();
-            using var writer = new System.Text.Json.Utf8JsonWriter(ms, new System.Text.Json.JsonWriterOptions { Indented = true });
-            writer.WriteStartObject();
-            foreach (var prop in root.EnumerateObject())
-            {
-                if (prop.Name is "DeviceToken" or "DeviceTokenScopes" or "NodeDeviceToken" or "NodeDeviceTokenScopes")
-                    continue;
-                prop.WriteTo(writer);
-            }
-            writer.WriteEndObject();
-            writer.Flush();
-
-            File.WriteAllBytes(keyPath, ms.ToArray());
-            logger?.Info($"[IdentityStore] Cleared stored device tokens from {identityDir}");
+            DeviceIdentity.TryClearAllDeviceTokens(identityDir, logger);
         }
         catch (Exception ex)
         {
diff --git a/src/OpenClaw.Connection/GatewayClientEndpointResolver.cs b/src/OpenClaw.Connection/GatewayClientEndpointResolver.cs
new file mode 100644
index 000000000..b2239b129
--- /dev/null
+++ b/src/OpenClaw.Connection/GatewayClientEndpointResolver.cs
@@ -0,0 +1,21 @@
+namespace OpenClaw.Connection;
+
+/// <summary>
+/// Resolves the Windows-side WebSocket endpoint for a gateway record.
+/// SSH-backed records must stay on their local forward rather than bypassing the tunnel.
+/// </summary>
+public static class GatewayClientEndpointResolver
+{
+    public static string Resolve(GatewayRecord record)
+    {
+        ArgumentNullException.ThrowIfNull(record);
+
+        if (record.SshTunnel is not { } tunnel)
+            return record.Url;
+
+        if (tunnel.LocalPort is < 1 or > 65535)
+            throw new InvalidOperationException("SSH tunnel local port must be between 1 and 65535.");
+
+        return $"ws://localhost:{tunnel.LocalPort}";
+    }
+}
diff --git a/src/OpenClaw.Connection/GatewayConnectionManager.cs b/src/OpenClaw.Connection/GatewayConnectionManager.cs
index 25d8125a6..98e415d6b 100644
--- a/src/OpenClaw.Connection/GatewayConnectionManager.cs
+++ b/src/OpenClaw.Connection/GatewayConnectionManager.cs
@@ -51,6 +51,17 @@ public sealed class GatewayConnectionManager : IGatewayConnectionManager
     private bool _activeConnectUsedBootstrapToken;
     private bool _postBootstrapOperatorReconnectScheduled;
 
+    private const string MissingNodeCredentialMessage =
+        "No node credential available. Re-pair this PC or add a shared/bootstrap gateway token.";
+    private const string MissingNodeConnectorMessage =
+        "Node mode is enabled, but no node connector is configured.";
+    private const string MissingActiveGatewayForNodeMessage =
+        "Node mode is enabled, but there is no active gateway context for node startup.";
+    private const string MissingGatewayRecordForNodeMessage =
+        "Node mode is enabled, but the active gateway record could not be found.";
+    private const string NodeTunnelStartFailedMessage =
+        "Node mode is enabled, but the SSH tunnel for node startup could not be started.";
+
     public event EventHandler<GatewayConnectionSnapshot>? StateChanged;
     public event EventHandler<ConnectionDiagnosticEvent>? DiagnosticEvent;
     public event EventHandler<OperatorClientChangedEventArgs>? OperatorClientChanged;
@@ -119,7 +130,6 @@ public async Task ConnectAsync(string? gatewayId = null)
     public async Task ConnectNodeOnlyAsync(string? gatewayId = null)
     {
         ThrowIfDisposed();
-        var prevState = _stateMachine.Current.OverallState;
         long? preparedGeneration = null;
 
         await _transitionSemaphore.WaitAsync();
@@ -137,7 +147,7 @@ public async Task ConnectNodeOnlyAsync(string? gatewayId = null)
 
         var startedGeneration = await StartNodeConnectionAsync(preparedGeneration.Value);
         if (startedGeneration.HasValue)
-            EmitStateChanged(prevState);
+            EmitStateChanged();
     }
 
     /// <summary>Core connect logic. Caller must hold <see cref="_transitionSemaphore"/>.</summary>
@@ -202,16 +212,16 @@ private async Task ConnectCoreAsync(string? gatewayId = null)
             _activeGatewayRecordId = record.Id;
             _activeSshTunnel = record.SshTunnel;
             _gatewayNeedsV2Signature = record.IsLocal || record.RequiresV2Signature;
+            SyncNodeIntentFromSettings();
 
             if (credential == null)
             {
                 _logger.Warn("[ConnMgr] No credential available for gateway");
-                var prev = _stateMachine.Current.OverallState;
                 // Must go through Connecting → Error since AuthenticationFailed requires Connecting state
                 _stateMachine.TryTransition(ConnectionTrigger.ConnectRequested);
                 _stateMachine.SetOperatorCredentialSource(null);
                 _stateMachine.TryTransition(ConnectionTrigger.AuthenticationFailed, "No credential available");
-                EmitStateChanged(prev);
+                EmitStateChanged();
                 return;
             }
 
@@ -220,7 +230,7 @@ private async Task ConnectCoreAsync(string? gatewayId = null)
             _stateMachine.TryTransition(ConnectionTrigger.ConnectRequested);
             _stateMachine.SetOperatorCredentialSource(credential.Source);
             _diagnostics.RecordStateChange(prevState, _stateMachine.Current.OverallState);
-            EmitStateChanged(prevState);
+            EmitStateChanged();
 
             // Create client via factory — use a diagnostic-tee logger so client handshake
             // logs appear in the Connection Status window timeline.
@@ -235,9 +245,8 @@ tunnel.SshPort is < 1 or > 65535 ||
                 {
                     _logger.Warn("[ConnMgr] SSH tunnel config is incomplete");
                     _diagnostics.Record("tunnel", "SSH tunnel config is incomplete");
-                    var p = _stateMachine.Current.OverallState;
                     _stateMachine.TryTransition(ConnectionTrigger.AuthenticationFailed, "SSH tunnel config is incomplete");
-                    EmitStateChanged(p);
+                    EmitStateChanged();
                     return;
                 }
                 try
@@ -249,9 +258,8 @@ tunnel.SshPort is < 1 or > 65535 ||
                 {
                     _logger.Error($"[ConnMgr] SSH tunnel start failed: {ex.Message}");
                     _diagnostics.Record("tunnel", "SSH tunnel start failed", ex.Message);
-                    var p = _stateMachine.Current.OverallState;
                     _stateMachine.TryTransition(ConnectionTrigger.WebSocketError, $"SSH tunnel failed: {ex.Message}");
-                    EmitStateChanged(p);
+                    EmitStateChanged();
                     return;
                 }
             }
@@ -356,14 +364,6 @@ tunnel.SshPort is < 1 or > 65535 ||
         if (!Directory.Exists(perGatewayIdentityDir))
             Directory.CreateDirectory(perGatewayIdentityDir);
 
-        var nodeCredential = _credentialResolver.ResolveNode(record, perGatewayIdentityDir);
-        if (nodeCredential == null)
-        {
-            _logger.Warn("[ConnMgr] No node credential available for node-only connect");
-            _diagnostics.Record("node", "No node credential available for node-only connect");
-            return null;
-        }
-
         // Same-gateway node reapproval reconnects keep the operator alive so it can
         // request the post-handshake node.list; all other paths reset lifecycle/tunnel state.
         var preservesOperatorConnection =
@@ -396,15 +396,31 @@ tunnel.SshPort is < 1 or > 65535 ||
             GatewayUrl = record.Url,
             GatewayName = record.FriendlyName
         };
+        _stateMachine.SetNodeEnabled(true);
+        _stateMachine.StartNodeConnecting();
+        _stateMachine.SetNodeCredentialSource(null);
+
+        var nodeCredential = _credentialResolver.ResolveNode(record, perGatewayIdentityDir);
+        if (nodeCredential == null)
+        {
+            _logger.Warn("[ConnMgr] No node credential available for node-only connect");
+            _diagnostics.Record("node", "No node credential available for node-only connect");
+            _stateMachine.BlockNodeStart(MissingNodeCredentialMessage);
+            EmitStateChanged();
+            return null;
+        }
 
         _diagnostics.RecordCredentialResolution(nodeCredential);
         _stateMachine.SetOperatorCredentialSource(operatorCredentialSource);
-        _stateMachine.SetNodeCredentialSource(nodeCredential.Source);
         _diagnostics.Record("node", $"Starting node-only connection to {record.Url}",
             $"Credential source: {nodeCredential.Source}");
 
         if (!preservesOperatorConnection && !await TryStartTunnelForNodeOnlyAsync(record))
+        {
+            _stateMachine.BlockNodeStart(NodeTunnelStartFailedMessage);
+            EmitStateChanged();
             return null;
+        }
 
         return Interlocked.Read(ref _generation) == gen ? gen : null;
     }
@@ -469,9 +485,10 @@ private async Task DisconnectCoreAsync()
 
         var prev = _stateMachine.Current.OverallState;
         await DisposeActiveClientAsync();
+        SyncNodeIntentFromSettings();
         _stateMachine.TryTransition(ConnectionTrigger.DisconnectRequested);
         _diagnostics.RecordStateChange(prev, _stateMachine.Current.OverallState);
-        EmitStateChanged(prev);
+        EmitStateChanged();
     }
 
     public async Task ReconnectAsync()
@@ -518,7 +535,7 @@ public async Task SwitchGatewayAsync(string gatewayId)
         }
     }
 
-    public async Task<SetupCodeResult> ApplySetupCodeAsync(string setupCode)
+    public async Task<SetupCodeResult> ApplySetupCodeAsync(string setupCode, SshTunnelConfig? sshTunnel = null)
     {
         ThrowIfDisposed();
 
@@ -554,6 +571,7 @@ public async Task<SetupCodeResult> ApplySetupCodeAsync(string setupCode)
             Url = gatewayUrl,
             SharedGatewayToken = existing?.SharedGatewayToken, // preserve existing shared token if any
             BootstrapToken = decoded.Token ?? existing?.BootstrapToken,
+            SshTunnel = sshTunnel ?? existing?.SshTunnel,
         };
         _registry.AddOrUpdate(record);
         _registry.SetActive(recordId);
@@ -692,17 +710,17 @@ private async Task<SetupCodeResult> ValidateSharedTokenBeforeReplacementAsync(
 
     private async Task HandleOperatorStatusChangedAsync(ConnectionStatus status, long gen)
     {
-        // Check client's pairing status directly — set synchronously before this handler runs
-        var isPairingPending = _activeLifecycle?.DataClient?.IsPairingRequired == true;
-        if (isPairingPending && status is ConnectionStatus.Disconnected or ConnectionStatus.Error)
-            return;
-
         await _transitionSemaphore.WaitAsync();
         try
         {
             if (Interlocked.Read(ref _generation) != gen) return;
 
-            var prev = _stateMachine.Current.OverallState;
+            // Check client's pairing status while holding the transition lock so
+            // a completed pairing cannot race with a stale disconnect/error event.
+            var isPairingPending = _activeLifecycle?.DataClient?.IsPairingRequired == true;
+            if (isPairingPending && status is ConnectionStatus.Disconnected or ConnectionStatus.Error)
+                return;
+
             switch (status)
             {
                 case ConnectionStatus.Connected:
@@ -724,7 +742,7 @@ private async Task HandleOperatorStatusChangedAsync(ConnectionStatus status, lon
                     _diagnostics.RecordWebSocketEvent("WebSocket connecting");
                     break;
             }
-            EmitStateChanged(prev);
+            EmitStateChanged();
         }
         finally
         {
@@ -742,10 +760,9 @@ private async Task HandleAuthenticationFailedAsync(string message, long gen)
             if (TryScheduleOperatorTokenRecovery(message, gen))
                 return;
 
-            var prev = _stateMachine.Current.OverallState;
             _diagnostics.Record("error", "Authentication failed", message);
             _stateMachine.TryTransition(ConnectionTrigger.AuthenticationFailed, message);
-            EmitStateChanged(prev);
+            EmitStateChanged();
         }
         finally
         {
@@ -784,6 +801,10 @@ private static bool IsOperatorDeviceTokenMismatch(string message) =>
 
     private async Task HandleHandshakeSucceededAsync(long gen)
     {
+        bool shouldStartNodeConnection = false;
+        bool missingGatewayRecordForNode = false;
+        bool missingActiveGatewayForNode = false;
+        bool missingNodeConnector = false;
         await _transitionSemaphore.WaitAsync();
         try
         {
@@ -792,7 +813,7 @@ private async Task HandleHandshakeSucceededAsync(long gen)
             var prev = _stateMachine.Current.OverallState;
             _diagnostics.Record("state", "Handshake succeeded (hello-ok)");
             _stateMachine.TryTransition(ConnectionTrigger.HandshakeSucceeded);
-            _diagnostics.RecordStateChange(prev, _stateMachine.Current.OverallState);
+            var nodeModeIntended = SyncNodeIntentFromSettings();
             if (_operatorTokenRecoveryAttemptedGatewayId == _activeGatewayRecordId)
                 _operatorTokenRecoveryAttemptedGatewayId = null;
 
@@ -802,7 +823,43 @@ private async Task HandleHandshakeSucceededAsync(long gen)
                 _stateMachine.SetOperatorDeviceId(client.OperatorDeviceId);
             }
 
-            EmitStateChanged(prev);
+            missingActiveGatewayForNode =
+                nodeModeIntended &&
+                (_activeGatewayRecordId == null || _activeIdentityPath == null);
+            missingGatewayRecordForNode =
+                nodeModeIntended &&
+                !missingActiveGatewayForNode &&
+                _activeGatewayRecordId != null &&
+                _registry.GetById(_activeGatewayRecordId) == null;
+            shouldStartNodeConnection =
+                !missingActiveGatewayForNode &&
+                !missingGatewayRecordForNode &&
+                ShouldStartNodeConnection();
+            missingNodeConnector = shouldStartNodeConnection && _nodeConnector == null;
+            if (missingActiveGatewayForNode)
+            {
+                _stateMachine.BlockNodeStart(MissingActiveGatewayForNodeMessage);
+            }
+            else if (missingGatewayRecordForNode)
+            {
+                _stateMachine.BlockNodeStart(MissingGatewayRecordForNodeMessage);
+            }
+            else if (missingNodeConnector)
+            {
+                _stateMachine.BlockNodeStart(MissingNodeConnectorMessage);
+            }
+            else if (shouldStartNodeConnection)
+            {
+                _stateMachine.SetNodeEnabled(true);
+                if (_nodeConnector != null)
+                {
+                    _stateMachine.StartNodeConnecting();
+                    _stateMachine.SetNodeCredentialSource(null);
+                }
+            }
+
+            _diagnostics.RecordStateChange(prev, _stateMachine.Current.OverallState);
+            EmitStateChanged();
 
             // Stamp LastConnected so auto-reconnect on next startup can use this gateway.
             // Uses the atomic Update helper to avoid overwriting concurrent registry changes.
@@ -825,10 +882,18 @@ private async Task HandleHandshakeSucceededAsync(long gen)
             _transitionSemaphore.Release();
         }
 
-        // Start node connection outside the semaphore to avoid deadlocks
-        if (_nodeConnector != null && ShouldStartNodeConnection())
+        // Start node connection outside the semaphore to avoid deadlocks.
+        // If Node mode is intended but no connector exists, publish the blocker
+        // through the same manager snapshot instead of leaving node Idle/healthy.
+        if (missingActiveGatewayForNode || missingGatewayRecordForNode || missingNodeConnector)
         {
-            await StartNodeConnectionAsync(gen);
+            return;
+        }
+
+        if (shouldStartNodeConnection)
+        {
+            if (_nodeConnector != null)
+                await StartNodeConnectionAsync(gen);
         }
     }
 
@@ -971,7 +1036,7 @@ private async Task HandlePairingRequiredAsync(string? requestId, long gen)
             // Store requestId in snapshot so setup flows can use it for explicit approval
             _stateMachine.SetOperatorPairingRequestId(requestId);
             _diagnostics.RecordStateChange(prev, _stateMachine.Current.OverallState);
-            EmitStateChanged(prev);
+            EmitStateChanged();
         }
         finally
         {
@@ -1094,6 +1159,18 @@ private bool ShouldStartNodeConnection()
         return _isNodeEnabled?.Invoke() ?? false;
     }
 
+    private bool SyncNodeIntentFromSettings()
+    {
+        var enabled = _isNodeEnabled?.Invoke() ?? false;
+        if (_stateMachine.Current.NodeConnectionIntended != enabled ||
+            (!enabled && _stateMachine.Current.NodeState != RoleConnectionState.Disabled))
+        {
+            _stateMachine.SetNodeEnabled(enabled);
+        }
+
+        return enabled;
+    }
+
     private bool IsCurrentNodeAttempt(long lifecycleGeneration, long nodeGeneration) =>
         !_disposed &&
         Interlocked.Read(ref _generation) == lifecycleGeneration &&
@@ -1103,9 +1180,11 @@ private bool IsCurrentNodeAttempt(long lifecycleGeneration, long nodeGeneration)
         long expectedLifecycleGeneration,
         long? expectedNodeGeneration = null)
     {
-        CancellationTokenSource nodeOperationCts;
-        CancellationToken nodeOperationToken;
-        long nodeGeneration;
+        CancellationTokenSource? nodeOperationCts = null;
+        CancellationToken nodeOperationToken = CancellationToken.None;
+        long nodeGeneration = 0;
+        string? preStartBlocker = null;
+        CancellationToken preStartBlockerToken = CancellationToken.None;
 
         await _nodeStartSemaphore.WaitAsync();
         try
@@ -1131,26 +1210,31 @@ private bool IsCurrentNodeAttempt(long lifecycleGeneration, long nodeGeneration)
                             "Previous node disconnect"))
                     {
                         _diagnostics.Record("node", "Previous node disconnect timed out");
-                        return null;
+                        preStartBlocker = "Previous node disconnect timed out";
+                        preStartBlockerToken = _operationCts?.Token ?? CancellationToken.None;
                     }
                 }
                 catch (Exception ex)
                 {
                     _logger.Error($"[ConnMgr] Previous node disconnect failed: {ex.Message}");
                     _diagnostics.Record("node", "Previous node disconnect failed", ex.Message);
-                    return null;
+                    preStartBlocker = $"Previous node disconnect failed: {ex.Message}";
+                    preStartBlockerToken = _operationCts?.Token ?? CancellationToken.None;
                 }
             }
 
-            lock (_nodeOperationLock)
+            if (preStartBlocker == null)
             {
-                if (!IsExpectedNodeStartCurrent(expectedLifecycleGeneration, expectedNodeGeneration))
-                    return null;
+                lock (_nodeOperationLock)
+                {
+                    if (!IsExpectedNodeStartCurrent(expectedLifecycleGeneration, expectedNodeGeneration))
+                        return null;
 
-                nodeOperationCts = new CancellationTokenSource();
-                nodeOperationToken = nodeOperationCts.Token;
-                nodeGeneration = Interlocked.Increment(ref _nodeConnectionGeneration);
-                _nodeOperationCts = nodeOperationCts;
+                    nodeOperationCts = new CancellationTokenSource();
+                    nodeOperationToken = nodeOperationCts.Token;
+                    nodeGeneration = Interlocked.Increment(ref _nodeConnectionGeneration);
+                    _nodeOperationCts = nodeOperationCts;
+                }
             }
         }
         finally
@@ -1158,9 +1242,19 @@ private bool IsCurrentNodeAttempt(long lifecycleGeneration, long nodeGeneration)
             _nodeStartSemaphore.Release();
         }
 
+        if (preStartBlocker != null)
+        {
+            await BlockNodeStartAsync(
+                preStartBlocker,
+                preStartBlockerToken,
+                expectedLifecycleGeneration,
+                expectedNodeGeneration);
+            return null;
+        }
+
         try
         {
-            return await StartNodeConnectionCoreAsync(nodeGeneration, nodeOperationToken)
+            return await StartNodeConnectionCoreAsync(expectedLifecycleGeneration, nodeGeneration, nodeOperationToken)
                 ? nodeGeneration
                 : null;
         }
@@ -1175,7 +1269,7 @@ private bool IsCurrentNodeAttempt(long lifecycleGeneration, long nodeGeneration)
                 if (ReferenceEquals(_nodeOperationCts, nodeOperationCts))
                     _nodeOperationCts = null;
             }
-            nodeOperationCts.Dispose();
+            nodeOperationCts!.Dispose();
         }
     }
 
@@ -1187,7 +1281,50 @@ private bool IsExpectedNodeStartCurrent(
         (!expectedNodeGeneration.HasValue ||
          Interlocked.Read(ref _nodeConnectionGeneration) == expectedNodeGeneration.Value);
 
+    private async Task BlockNodeStartAsync(
+        string detail,
+        CancellationToken cancellationToken,
+        long? expectedLifecycleGeneration = null,
+        long? expectedNodeGeneration = null)
+    {
+        if (expectedLifecycleGeneration.HasValue &&
+            Interlocked.Read(ref _generation) != expectedLifecycleGeneration.Value)
+        {
+            return;
+        }
+
+        if (expectedNodeGeneration.HasValue &&
+            Interlocked.Read(ref _nodeConnectionGeneration) != expectedNodeGeneration.Value)
+        {
+            return;
+        }
+
+        await _transitionSemaphore.WaitAsync(cancellationToken);
+        try
+        {
+            if (expectedLifecycleGeneration.HasValue &&
+                Interlocked.Read(ref _generation) != expectedLifecycleGeneration.Value)
+            {
+                return;
+            }
+
+            if (expectedNodeGeneration.HasValue &&
+                Interlocked.Read(ref _nodeConnectionGeneration) != expectedNodeGeneration.Value)
+            {
+                return;
+            }
+
+            _stateMachine.BlockNodeStart(detail);
+            EmitStateChanged();
+        }
+        finally
+        {
+            _transitionSemaphore.Release();
+        }
+    }
+
     private async Task<bool> StartNodeConnectionCoreAsync(
+        long expectedLifecycleGeneration,
         long nodeGeneration,
         CancellationToken cancellationToken)
     {
@@ -1197,30 +1334,63 @@ private async Task<bool> StartNodeConnectionCoreAsync(
             return false;
         }
 
-        if (_nodeConnector == null || _activeGatewayRecordId == null || _activeIdentityPath == null) return false;
+        if (_nodeConnector == null)
+        {
+            await BlockNodeStartAsync(MissingNodeConnectorMessage, cancellationToken, expectedLifecycleGeneration, nodeGeneration);
+            return false;
+        }
+
+        if (_activeGatewayRecordId == null || _activeIdentityPath == null)
+        {
+            await BlockNodeStartAsync(MissingActiveGatewayForNodeMessage, cancellationToken, expectedLifecycleGeneration, nodeGeneration);
+            return false;
+        }
 
         var record = _registry.GetById(_activeGatewayRecordId);
         if (record == null)
         {
             _logger.Warn("[ConnMgr] Cannot start node — gateway record not found");
+            await BlockNodeStartAsync(MissingGatewayRecordForNodeMessage, cancellationToken, expectedLifecycleGeneration, nodeGeneration);
             return false;
         }
 
+        // Mark node as enabled in the state machine so UI reflects node state
+        // before credential resolution can fail. Otherwise node mode could look
+        // healthy even though the intended node never started.
+        await _transitionSemaphore.WaitAsync(cancellationToken);
+        try
+        {
+            if (!IsExpectedNodeStartCurrent(expectedLifecycleGeneration, nodeGeneration))
+                return false;
+
+            var before = _stateMachine.Current;
+            _stateMachine.SetNodeEnabled(true);
+            _stateMachine.StartNodeConnecting();
+            _stateMachine.SetNodeCredentialSource(null);
+            if (_stateMachine.Current != before)
+                EmitStateChanged();
+        }
+        finally
+        {
+            _transitionSemaphore.Release();
+        }
+
         // Use root identity path — clients always read/write from root, not per-gateway
         var nodeCredential = _credentialResolver.ResolveNode(record, _activeIdentityPath!);
         if (nodeCredential == null)
         {
             _logger.Warn("[ConnMgr] No node credential available — skipping node connection");
             _diagnostics.Record("node", "No node credential available");
+            await BlockNodeStartAsync(MissingNodeCredentialMessage, cancellationToken, expectedLifecycleGeneration, nodeGeneration);
             return false;
         }
 
-        // Mark node as enabled in the state machine so UI reflects node state
-        // State machine is not thread-safe — acquire semaphore for mutation
         await _transitionSemaphore.WaitAsync(cancellationToken);
         try
         {
-            _stateMachine.SetNodeEnabled(true);
+            if (!IsExpectedNodeStartCurrent(expectedLifecycleGeneration, nodeGeneration))
+                return false;
+
             _stateMachine.SetNodeCredentialSource(nodeCredential.Source);
         }
         finally
@@ -1261,6 +1431,12 @@ await _nodeConnector.ConnectAsync(nodeConnectUrl, nodeCredential, _activeIdentit
 
             _logger.Error($"[ConnMgr] Node connect failed: {ex.Message}");
             _diagnostics.Record("node", "Node connect failed", ex.Message);
+            await BlockNodeStartAsync(
+                $"Node connect failed: {ex.Message}",
+                cancellationToken,
+                expectedLifecycleGeneration,
+                nodeGeneration);
+            return false;
         }
 
         return !cancellationToken.IsCancellationRequested &&
@@ -1296,7 +1472,6 @@ private async Task OnNodeStatusChangedAsync(ConnectionStatus status)
         await _transitionSemaphore.WaitAsync();
         try
         {
-            var prev = _stateMachine.Current.OverallState;
             switch (status)
             {
                 case ConnectionStatus.Connected:
@@ -1335,7 +1510,7 @@ private async Task OnNodeStatusChangedAsync(ConnectionStatus status)
             }
 
             TryClearBootstrapTokenAfterDurablePairing();
-            EmitStateChanged(prev);
+            EmitStateChanged();
         }
         finally
         {
@@ -1370,7 +1545,6 @@ private async Task OnNodePairingStatusChangedAsync(
             if (!IsCurrentNodeAttempt(lifecycleGeneration, nodeGeneration))
                 return;
 
-            var prev = _stateMachine.Current.OverallState;
             switch (e.Status)
             {
                 case PairingStatus.Paired:
@@ -1403,7 +1577,7 @@ private async Task OnNodePairingStatusChangedAsync(
             }
 
             TryClearBootstrapTokenAfterDurablePairing();
-            EmitStateChanged(prev);
+            EmitStateChanged();
         }
         finally
         {
@@ -1685,7 +1859,7 @@ private static string BuildDeviceAutoApprovalFailureDetail(IReadOnlyList<string>
 
     // ─── Helpers ───
 
-    private void EmitStateChanged(OverallConnectionState previousOverall)
+    private void EmitStateChanged()
     {
         var snapshot = _stateMachine.Current;
         // Always fire when any part of the snapshot changed — not just OverallState.
diff --git a/src/OpenClaw.Connection/GatewayConnectionSnapshot.cs b/src/OpenClaw.Connection/GatewayConnectionSnapshot.cs
index 28fd05879..b06cec57d 100644
--- a/src/OpenClaw.Connection/GatewayConnectionSnapshot.cs
+++ b/src/OpenClaw.Connection/GatewayConnectionSnapshot.cs
@@ -22,6 +22,7 @@ public sealed record GatewayConnectionSnapshot
     public string? OperatorPairingRequestId { get; init; }
 
     // ─── Node ───
+    public bool NodeConnectionIntended { get; init; }
     public RoleConnectionState NodeState { get; init; }
     public string? NodeError { get; init; }
     public OpenClaw.Shared.PairingStatus NodePairingStatus { get; init; }
@@ -67,10 +68,26 @@ public static OverallConnectionState DeriveOverall(
         if (op == RoleConnectionState.Connecting)
             return OverallConnectionState.Connecting;
 
+        if (op != RoleConnectionState.Connected && nodeEnabled)
+        {
+            if (node == RoleConnectionState.PairingRequired)
+                return OverallConnectionState.PairingRequired;
+
+            if (node == RoleConnectionState.Connecting)
+                return OverallConnectionState.Connecting;
+
+            if (node == RoleConnectionState.Connected)
+                return OverallConnectionState.Connected;
+
+            if (node is RoleConnectionState.Error or RoleConnectionState.PairingRejected or RoleConnectionState.RateLimited)
+                return OverallConnectionState.Error;
+        }
+
         // From here, operator is Connected.
 
         if (op == RoleConnectionState.Connected && nodeEnabled &&
             (node == RoleConnectionState.Error ||
+             node == RoleConnectionState.Idle ||
              node == RoleConnectionState.PairingRejected ||
              node == RoleConnectionState.RateLimited))
             return OverallConnectionState.Degraded;
diff --git a/src/OpenClaw.Tray.WinUI/Services/GatewayHostAccess.cs b/src/OpenClaw.Connection/GatewayHostAccess.cs
similarity index 93%
rename from src/OpenClaw.Tray.WinUI/Services/GatewayHostAccess.cs
rename to src/OpenClaw.Connection/GatewayHostAccess.cs
index 8967457e7..77e94bd45 100644
--- a/src/OpenClaw.Tray.WinUI/Services/GatewayHostAccess.cs
+++ b/src/OpenClaw.Connection/GatewayHostAccess.cs
@@ -1,9 +1,8 @@
 using System;
-using OpenClaw.Connection;
 
-namespace OpenClawTray.Services;
+namespace OpenClaw.Connection;
 
-internal enum GatewayTerminalTarget
+public enum GatewayTerminalTarget
 {
     None,
     Wsl,
@@ -16,13 +15,13 @@ internal enum GatewayTerminalTarget
 /// without a WinUI runtime. <c>App.xaml.cs</c> wires these up to <c>LocalizationHelper</c>
 /// at startup so the running app sees real localized strings.
 /// </summary>
-internal static class GatewayHostAccessLocalization
+public static class GatewayHostAccessLocalization
 {
     public static Func<string, string> GetString { get; set; } = key => key;
     public static Func<string, object?[], string> Format { get; set; } = (key, _) => key;
 }
 
-internal sealed record GatewayHostAccessPlan(
+public sealed record GatewayHostAccessPlan(
     string? GatewayId,
     GatewayTerminalTarget TerminalTarget,
     string? DistroName,
@@ -53,7 +52,7 @@ public static GatewayHostAccessPlan None(string? gatewayId = null, string? disab
     }
 }
 
-internal static class GatewayHostAccessClassifier
+public static class GatewayHostAccessClassifier
 {
     public static GatewayHostAccessPlan Classify(GatewayRecord? record)
     {
@@ -104,4 +103,4 @@ public static GatewayHostAccessPlan Classify(GatewayRecord? record)
         var trimmed = value?.Trim();
         return string.IsNullOrWhiteSpace(trimmed) ? null : trimmed;
     }
-}
+}
\ No newline at end of file
diff --git a/src/OpenClaw.Tray.WinUI/Services/GatewayTerminalLauncher.cs b/src/OpenClaw.Connection/GatewayTerminalLauncher.cs
similarity index 96%
rename from src/OpenClaw.Tray.WinUI/Services/GatewayTerminalLauncher.cs
rename to src/OpenClaw.Connection/GatewayTerminalLauncher.cs
index 7c6280b40..06f21696b 100644
--- a/src/OpenClaw.Tray.WinUI/Services/GatewayTerminalLauncher.cs
+++ b/src/OpenClaw.Connection/GatewayTerminalLauncher.cs
@@ -2,21 +2,21 @@
 using System.Diagnostics;
 using OpenClaw.Shared;
 
-namespace OpenClawTray.Services;
+namespace OpenClaw.Connection;
 
-internal interface IGatewayTerminalLauncher
+public interface IGatewayTerminalLauncher
 {
     void Open(GatewayHostAccessPlan accessPlan);
 
     void OpenGatewayDoctor(GatewayHostAccessPlan accessPlan);
 }
 
-internal sealed record GatewayTerminalLaunchCommand(
+public sealed record GatewayTerminalLaunchCommand(
     string FileName,
     IReadOnlyList<string> Arguments,
     bool UsesWindowsTerminal);
 
-internal static class GatewayTerminalLaunchCommandBuilder
+public static class GatewayTerminalLaunchCommandBuilder
 {
     public static GatewayTerminalLaunchCommand Build(GatewayHostAccessPlan accessPlan, string? windowsTerminalPath)
     {
@@ -144,7 +144,7 @@ private static string RequireValue(string? value, string message)
     }
 }
 
-internal sealed class GatewayTerminalLauncher(IOpenClawLogger logger) : IGatewayTerminalLauncher
+public sealed class GatewayTerminalLauncher(IOpenClawLogger logger) : IGatewayTerminalLauncher
 {
     public void Open(GatewayHostAccessPlan accessPlan)
     {
diff --git a/src/OpenClaw.Connection/IGatewayConnectionManager.cs b/src/OpenClaw.Connection/IGatewayConnectionManager.cs
index 157c17b02..3bbaaaf5a 100644
--- a/src/OpenClaw.Connection/IGatewayConnectionManager.cs
+++ b/src/OpenClaw.Connection/IGatewayConnectionManager.cs
@@ -46,7 +46,7 @@ public interface IGatewayConnectionManager : IDisposable, IAsyncDisposable
     Task EnsureNodeConnectedAsync(CancellationToken cancellationToken = default);
 
     // ─── Setup ───
-    Task<SetupCodeResult> ApplySetupCodeAsync(string setupCode);
+    Task<SetupCodeResult> ApplySetupCodeAsync(string setupCode, SshTunnelConfig? sshTunnel = null);
     Task<SetupCodeResult> ConnectWithSharedTokenAsync(string gatewayUrl, string token, SshTunnelConfig? sshTunnel = null);
 
     // ─── Operator Client Access ───
diff --git a/src/OpenClaw.Connection/PairingApprovalQueue.cs b/src/OpenClaw.Connection/PairingApprovalQueue.cs
new file mode 100644
index 000000000..6c149d057
--- /dev/null
+++ b/src/OpenClaw.Connection/PairingApprovalQueue.cs
@@ -0,0 +1,241 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using OpenClaw.Shared;
+
+namespace OpenClaw.Connection;
+
+/// <summary>A pairing decision the gateway has now confirmed by removing it from the pending list.</summary>
+public sealed record PairingApprovalResolution(PendingApproval Approval, bool Approved);
+
+/// <summary>The result of reconciling a fresh pair-list snapshot against prior state.</summary>
+public sealed class PairingApprovalDelta
+{
+    /// <summary>Requests that are newly surfaced and prompt-worthy (not previously known, not awaiting resolution).</summary>
+    public IReadOnlyList<PendingApproval> Added { get; init; } = Array.Empty<PendingApproval>();
+
+    /// <summary>Keys (<see cref="PendingApproval.Key"/>) that were present last time but have now left the list.</summary>
+    public IReadOnlyList<string> ResolvedKeys { get; init; } = Array.Empty<string>();
+
+    /// <summary>
+    /// Decisions the local user submitted that the gateway has now confirmed (the request left the
+    /// pending list). These — not the send-ack — are the source of truth for "approved/rejected".
+    /// </summary>
+    public IReadOnlyList<PairingApprovalResolution> ConfirmedDecisions { get; init; } = Array.Empty<PairingApprovalResolution>();
+
+    /// <summary>All currently actionable pending approvals (excludes ones awaiting resolution).</summary>
+    public IReadOnlyList<PendingApproval> Current { get; init; } = Array.Empty<PendingApproval>();
+
+    public bool HasChanges => Added.Count > 0 || ResolvedKeys.Count > 0 || ConfirmedDecisions.Count > 0;
+}
+
+/// <summary>
+/// Pure, UI-agnostic diff engine for inbound pairing approvals. Translates successive
+/// device/node pair-list snapshots (the gateway re-sends the full list on every
+/// <c>*.pair.requested</c>/<c>*.pair.resolved</c> event) into add/resolve deltas the
+/// presentation layer can act on without re-prompting for requests it has already shown
+/// or that are awaiting resolution of a submitted decision.
+///
+/// Responsibilities:
+/// <list type="bullet">
+///   <item>Merge device + node pending lists into a single ordered queue (oldest first). A null
+///         list for a kind means "no update for that kind" (its prior entries are carried forward),
+///         NOT "that kind is now empty" — so a partial snapshot never silently drops or confirms.</item>
+///   <item>Filter out the local node's own pairing request (handled by the auto-approve path)
+///         so the operator is never prompted to approve their own machine. Matches against any of
+///         the node's advertised identifiers (device id and/or gateway node id).</item>
+///   <item>Drop entries with no usable id and legacy fallback-id collisions that cannot be
+///         approved/rejected unambiguously, then de-duplicate by <see cref="PendingApproval.Key"/>.</item>
+///   <item>Treat a submitted approve/reject as <em>optimistic-pending</em> — suppress it from the
+///         actionable set, but only report it <see cref="PairingApprovalDelta.ConfirmedDecisions">
+///         confirmed</see> once the gateway actually drops it from a provided list for that kind. If
+///         the gateway never acts within <see cref="SubmissionResolveTimeoutMs"/>, re-surface the
+///         request so a lost decision is retried rather than hidden forever.</item>
+/// </list>
+/// Not thread-safe; the coordinator marshals all calls onto a single dispatcher thread.
+/// </summary>
+public sealed class PairingApprovalQueue
+{
+    /// <summary>How long a submitted-but-unresolved decision is suppressed before it is re-surfaced.</summary>
+    public const long SubmissionResolveTimeoutMs = 10_000;
+
+    private readonly Dictionary<string, PendingApproval> _current = new(StringComparer.Ordinal);
+    private readonly Dictionary<string, Submission> _submitted = new(StringComparer.Ordinal);
+
+    private readonly record struct Submission(PendingApproval Approval, bool Approved, long SubmittedAtMs);
+
+    /// <summary>Snapshot of currently actionable approvals, oldest first.</summary>
+    public IReadOnlyList<PendingApproval> Current =>
+        _current.Values
+            .Where(a => !_submitted.ContainsKey(a.Key))
+            .OrderBy(a => a.Ts)
+            .ThenBy(a => a.Key, StringComparer.Ordinal)
+            .ToArray();
+
+    /// <summary>True when there are no actionable approvals.</summary>
+    public bool IsEmpty => Current.Count == 0;
+
+    /// <summary>
+    /// Reconcile a fresh snapshot. <paramref name="ownNodeDeviceIds"/>, when provided, filters out the
+    /// local Windows node's own pending node request (matched against any advertised id).
+    /// <paramref name="nowMs"/> is a monotonic timestamp (e.g. <see cref="Environment.TickCount64"/>)
+    /// used to expire stale submissions. A null <paramref name="devices"/> or <paramref name="nodes"/>
+    /// means that kind has no fresh snapshot: its existing entries are carried forward and its
+    /// submissions are neither confirmed nor expired this round.
+    /// </summary>
+    public PairingApprovalDelta Reconcile(
+        DevicePairingListInfo? devices,
+        PairingListInfo? nodes,
+        IReadOnlyCollection<string>? ownNodeDeviceIds = null,
+        long nowMs = 0)
+    {
+        var devicesProvided = devices is not null;
+        var nodesProvided = nodes is not null;
+        bool KindProvided(PairingApprovalKind kind) =>
+            kind == PairingApprovalKind.DevicePair ? devicesProvided : nodesProvided;
+
+        var incoming = BuildIncoming(devices, nodes, ownNodeDeviceIds);
+        var ambiguousFallbackKeys = FindAmbiguousFallbackKeys(incoming);
+        if (ambiguousFallbackKeys.Count > 0)
+            incoming = incoming.Where(a => !ambiguousFallbackKeys.Contains(a.Key)).ToList();
+
+        var incomingByKey = new Dictionary<string, PendingApproval>(StringComparer.Ordinal);
+        foreach (var item in incoming)
+            incomingByKey[item.Key] = item; // last wins on duplicate ids
+
+        // Carry forward prior entries whose kind had NO fresh snapshot — a missing list is "no
+        // update", not "now empty", so we never drop or resolve a kind we didn't actually hear about.
+        foreach (var kv in _current)
+            if (!KindProvided(kv.Value.Kind) && !incomingByKey.ContainsKey(kv.Key))
+                incomingByKey[kv.Key] = kv.Value;
+
+        // If a legacy fallback id becomes ambiguous, cancel any optimistic wait instead of treating
+        // its absence from the actionable queue as a confirmed gateway decision.
+        foreach (var key in _submitted.Keys.Where(ambiguousFallbackKeys.Contains).ToArray())
+            _submitted.Remove(key);
+
+        // Confirmed resolutions: decisions we submitted whose request has now left a PROVIDED list.
+        // This — not the send-ack — is the authoritative "the gateway accepted it" signal.
+        var confirmed = new List<PairingApprovalResolution>();
+        foreach (var sub in _submitted.Values)
+            if (KindProvided(sub.Approval.Kind) && !incomingByKey.ContainsKey(sub.Approval.Key))
+                confirmed.Add(new PairingApprovalResolution(sub.Approval, sub.Approved));
+        foreach (var c in confirmed)
+            _submitted.Remove(c.Approval.Key);
+
+        // Expire submissions the gateway hasn't acted on in time (in a provided list) → drop
+        // suppression so they re-surface (a lost/rejected decision is retried, not hidden forever).
+        var expired = _submitted
+            .Where(kv => KindProvided(kv.Value.Approval.Kind)
+                && incomingByKey.ContainsKey(kv.Key)
+                && nowMs - kv.Value.SubmittedAtMs >= SubmissionResolveTimeoutMs)
+            .Select(kv => kv.Key)
+            .ToArray();
+        foreach (var k in expired)
+            _submitted.Remove(k);
+        var expiredSet = new HashSet<string>(expired, StringComparer.Ordinal);
+
+        // Added: genuinely new requests, plus expired-and-re-surfaced ones. Skip anything still
+        // awaiting resolution.
+        var added = new List<PendingApproval>();
+        var seen = new HashSet<string>(StringComparer.Ordinal);
+        foreach (var item in incoming)
+        {
+            if (_submitted.ContainsKey(item.Key)) continue;                                   // awaiting resolution
+            if (_current.ContainsKey(item.Key) && !expiredSet.Contains(item.Key)) continue;   // already known
+            if (!seen.Add(item.Key)) continue;
+            added.Add(item);
+        }
+
+        var resolvedKeys = _current.Keys
+            .Where(key => !incomingByKey.ContainsKey(key))
+            .ToArray();
+
+        // Swap in the new snapshot (includes carried-forward entries for non-provided kinds).
+        _current.Clear();
+        foreach (var kvp in incomingByKey)
+            _current[kvp.Key] = kvp.Value;
+
+        return new PairingApprovalDelta
+        {
+            Added = added,
+            ResolvedKeys = resolvedKeys,
+            ConfirmedDecisions = confirmed,
+            Current = Current,
+        };
+    }
+
+    /// <summary>
+    /// Record that the local user submitted an approve/reject for a request. The request is suppressed
+    /// from the actionable set (so the UI advances) but remains tracked until the gateway confirms by
+    /// dropping it from the pending list, or until <see cref="SubmissionResolveTimeoutMs"/> elapses.
+    /// </summary>
+    public void MarkSubmitted(PendingApproval approval, bool approved, long nowMs)
+    {
+        if (approval is null || string.IsNullOrEmpty(approval.Key))
+            return;
+        _submitted[approval.Key] = new Submission(approval, approved, nowMs);
+    }
+
+    /// <summary>Look up a currently-actionable approval by its key (excludes ones awaiting resolution).</summary>
+    public PendingApproval? Find(string key) =>
+        !_submitted.ContainsKey(key) && _current.TryGetValue(key, out var value) ? value : null;
+
+    /// <summary>Clears all state (e.g. on disconnect / gateway switch).</summary>
+    public void Reset()
+    {
+        _current.Clear();
+        _submitted.Clear();
+    }
+
+    private static List<PendingApproval> BuildIncoming(
+        DevicePairingListInfo? devices,
+        PairingListInfo? nodes,
+        IReadOnlyCollection<string>? ownNodeDeviceIds)
+    {
+        var list = new List<PendingApproval>();
+
+        if (devices?.Pending is { Count: > 0 })
+        {
+            foreach (var req in devices.Pending)
+            {
+                var approval = PendingApproval.FromDevice(req);
+                if (approval.IsActionable)
+                    list.Add(approval);
+            }
+        }
+
+        if (nodes?.Pending is { Count: > 0 })
+        {
+            foreach (var req in nodes.Pending)
+            {
+                var approval = PendingApproval.FromNode(req);
+                if (!approval.IsActionable) continue;
+                if (IsOwnNode(approval, ownNodeDeviceIds)) continue;
+                list.Add(approval);
+            }
+        }
+
+        return list;
+    }
+
+    private static HashSet<string> FindAmbiguousFallbackKeys(IEnumerable<PendingApproval> incoming)
+    {
+        var ambiguous = incoming
+            .GroupBy(a => a.Key, StringComparer.Ordinal)
+            .Where(g => g.Count() > 1 && g.Any(a => string.IsNullOrEmpty(a.RequestId)))
+            .Select(g => g.Key);
+
+        return new HashSet<string>(ambiguous, StringComparer.Ordinal);
+    }
+
+    private static bool IsOwnNode(PendingApproval approval, IReadOnlyCollection<string>? ownNodeDeviceIds)
+    {
+        if (ownNodeDeviceIds is null || ownNodeDeviceIds.Count == 0) return false;
+        if (string.IsNullOrEmpty(approval.DeviceId)) return false;
+        foreach (var id in ownNodeDeviceIds)
+            if (!string.IsNullOrWhiteSpace(id) && approval.DeviceId.Equals(id, StringComparison.OrdinalIgnoreCase))
+                return true;
+        return false;
+    }
+}
diff --git a/src/OpenClaw.Connection/PairingScopeDescriptions.cs b/src/OpenClaw.Connection/PairingScopeDescriptions.cs
new file mode 100644
index 000000000..8bb68981c
--- /dev/null
+++ b/src/OpenClaw.Connection/PairingScopeDescriptions.cs
@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace OpenClaw.Connection;
+
+/// <summary>
+/// Maps gateway operator scope identifiers to short, human-readable descriptions so a person
+/// approving a pairing request understands what access they are granting — mirroring the
+/// friendly scope list shown by the macOS pairing prompt.
+///
+/// Returns canonical English fallbacks; the presentation layer may override any entry with a
+/// localized resource keyed by scope before falling back to <see cref="Describe"/>.
+/// </summary>
+public static class PairingScopeDescriptions
+{
+    private static readonly IReadOnlyDictionary<string, string> Map =
+        new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+        {
+            ["operator.admin"] = "Admin access",
+            ["operator.read"] = "Read OpenClaw data",
+            ["operator.write"] = "Send messages and make changes",
+            ["operator.approvals"] = "Manage approvals",
+            ["operator.pairing"] = "Pair and repair devices",
+            ["operator.talk.secrets"] = "Use Talk credentials",
+        };
+
+    /// <summary>True when a friendly description exists for the scope; false for unknown scopes.</summary>
+    public static bool IsKnown(string scope) =>
+        !string.IsNullOrWhiteSpace(scope) && Map.ContainsKey(scope.Trim());
+
+    /// <summary>
+    /// Returns a friendly description for a scope, or the raw scope string (trimmed) when unknown
+    /// so the approver still sees exactly what was requested rather than nothing.
+    /// </summary>
+    public static string Describe(string scope)
+    {
+        if (string.IsNullOrWhiteSpace(scope)) return string.Empty;
+        var trimmed = scope.Trim();
+        return Map.TryGetValue(trimmed, out var friendly) ? friendly : trimmed;
+    }
+
+    /// <summary>Describes a set of scopes, dropping blanks and de-duplicating while preserving order.</summary>
+    public static IReadOnlyList<string> DescribeAll(IEnumerable<string>? scopes)
+    {
+        if (scopes == null) return Array.Empty<string>();
+        var seen = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        var result = new List<string>();
+        foreach (var scope in scopes)
+        {
+            if (string.IsNullOrWhiteSpace(scope)) continue;
+            if (!seen.Add(scope.Trim())) continue;
+            result.Add(Describe(scope));
+        }
+        return result;
+    }
+}
diff --git a/src/OpenClaw.Connection/PendingApproval.cs b/src/OpenClaw.Connection/PendingApproval.cs
new file mode 100644
index 000000000..4aa836126
--- /dev/null
+++ b/src/OpenClaw.Connection/PendingApproval.cs
@@ -0,0 +1,97 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using OpenClaw.Shared;
+
+namespace OpenClaw.Connection;
+
+/// <summary>
+/// Unified, UI-agnostic view of a single inbound pairing request that a local operator
+/// (with <c>operator.pairing</c>/<c>operator.admin</c> scope) can approve or reject.
+/// Built from either a <see cref="DevicePairingRequest"/> or a node <see cref="PairingRequest"/>
+/// so the presentation layer can render and act on both kinds uniformly.
+/// </summary>
+public sealed class PendingApproval
+{
+    public PairingApprovalKind Kind { get; init; }
+
+    /// <summary>Gateway request id used to approve/reject. May be empty on legacy gateways.</summary>
+    public string RequestId { get; init; } = "";
+
+    /// <summary>Device id (device requests) or node id (node requests).</summary>
+    public string DeviceId { get; init; } = "";
+
+    public string? DisplayName { get; init; }
+    public string? Platform { get; init; }
+    public string? Role { get; init; }
+
+    /// <summary>Requested operator scopes (device requests only; empty for nodes).</summary>
+    public IReadOnlyList<string> Scopes { get; init; } = Array.Empty<string>();
+
+    public string? RemoteIp { get; init; }
+    public string? Version { get; init; }
+    public bool IsRepair { get; init; }
+    public double Ts { get; init; }
+
+    /// <summary>
+    /// The id passed to the gateway approve/reject RPC. Prefers <see cref="RequestId"/> and
+    /// falls back to <see cref="DeviceId"/> so legacy gateways that omit a request id are still
+    /// actionable (mirrors the per-row fallback already used by the Connection page cards).
+    /// </summary>
+    public string DecisionId => string.IsNullOrEmpty(RequestId) ? DeviceId : RequestId;
+
+    /// <summary>Stable identity for dedup/diffing across list refreshes.</summary>
+    public string Key => $"{Kind}:{DecisionId}";
+
+    /// <summary>True when the request carries no usable id and therefore cannot be acted on.</summary>
+    public bool IsActionable => !string.IsNullOrEmpty(DecisionId);
+
+    public static PendingApproval FromDevice(DevicePairingRequest request)
+    {
+        ArgumentNullException.ThrowIfNull(request);
+        return new PendingApproval
+        {
+            Kind = PairingApprovalKind.DevicePair,
+            RequestId = request.RequestId,
+            DeviceId = request.DeviceId,
+            DisplayName = request.DisplayName,
+            Platform = request.Platform,
+            Role = string.IsNullOrWhiteSpace(request.Role) ? "operator" : request.Role,
+            Scopes = request.Scopes is { Length: > 0 }
+                ? request.Scopes.Where(s => !string.IsNullOrWhiteSpace(s)).ToArray()
+                : Array.Empty<string>(),
+            RemoteIp = NormalizeIp(request.RemoteIp),
+            IsRepair = request.IsRepair,
+            Ts = request.Ts,
+        };
+    }
+
+    public static PendingApproval FromNode(PairingRequest request)
+    {
+        ArgumentNullException.ThrowIfNull(request);
+        return new PendingApproval
+        {
+            Kind = PairingApprovalKind.NodePair,
+            RequestId = request.RequestId,
+            DeviceId = request.NodeId,
+            DisplayName = request.DisplayName,
+            Platform = request.Platform,
+            Role = "node",
+            Scopes = Array.Empty<string>(),
+            RemoteIp = NormalizeIp(request.RemoteIp),
+            Version = request.Version,
+            IsRepair = request.IsRepair,
+            Ts = request.Ts,
+        };
+    }
+
+    /// <summary>Strips the IPv4-mapped IPv6 prefix the gateway sometimes emits (mirrors the Mac client).</summary>
+    private static string? NormalizeIp(string? ip)
+    {
+        if (string.IsNullOrWhiteSpace(ip)) return ip;
+        const string mappedPrefix = "::ffff:";
+        return ip.StartsWith(mappedPrefix, StringComparison.OrdinalIgnoreCase)
+            ? ip[mappedPrefix.Length..]
+            : ip;
+    }
+}
diff --git a/src/OpenClaw.Tray.WinUI/Services/WslCommandRunner.cs b/src/OpenClaw.Connection/WslCommandRunner.cs
similarity index 99%
rename from src/OpenClaw.Tray.WinUI/Services/WslCommandRunner.cs
rename to src/OpenClaw.Connection/WslCommandRunner.cs
index 0bc4ad9ae..8dfd3ef50 100644
--- a/src/OpenClaw.Tray.WinUI/Services/WslCommandRunner.cs
+++ b/src/OpenClaw.Connection/WslCommandRunner.cs
@@ -3,7 +3,7 @@
 using System.Globalization;
 using System.Text;
 
-namespace OpenClawTray.Services;
+namespace OpenClaw.Connection;
 
 public sealed record WslCommandResult(int ExitCode, string StandardOutput, string StandardError)
 {
diff --git a/src/OpenClaw.Tray.WinUI/Services/WslGatewayController.cs b/src/OpenClaw.Connection/WslGatewayController.cs
similarity index 78%
rename from src/OpenClaw.Tray.WinUI/Services/WslGatewayController.cs
rename to src/OpenClaw.Connection/WslGatewayController.cs
index 4db6ec314..b28dd3824 100644
--- a/src/OpenClaw.Tray.WinUI/Services/WslGatewayController.cs
+++ b/src/OpenClaw.Connection/WslGatewayController.cs
@@ -1,7 +1,7 @@
 using System.Collections.ObjectModel;
 using OpenClaw.Shared;
 
-namespace OpenClawTray.Services;
+namespace OpenClaw.Connection;
 
 public enum WslGatewayControlAction
 {
@@ -10,7 +10,7 @@ public enum WslGatewayControlAction
     Restart
 }
 
-internal sealed record WslGatewayControlResult(
+public sealed record WslGatewayControlResult(
     string DistroName,
     WslGatewayControlAction Action,
     int ExitCode,
@@ -29,7 +29,7 @@ public string OutputSummary
     }
 }
 
-internal static class WslGatewayControlCommandBuilder
+public static class WslGatewayControlCommandBuilder
 {
     internal const string OpenClawWslPathPrefix = "export PATH=\"/home/openclaw/.openclaw/bin:/opt/openclaw/bin:/usr/local/bin:$PATH\"";
 
@@ -54,7 +54,7 @@ public static string ToVerb(WslGatewayControlAction action)
     }
 }
 
-internal sealed class WslGatewayController(IWslCommandRunner commandRunner, IOpenClawLogger logger)
+public sealed class WslGatewayController(IWslCommandRunner commandRunner, IOpenClawLogger logger)
 {
     public async Task<WslGatewayControlResult> RunAsync(
         string distroName,
@@ -68,7 +68,14 @@ public async Task<WslGatewayControlResult> RunAsync(
 
         var normalizedDistroName = distroName.Trim();
         var distros = await commandRunner.ListDistrosAsync(cancellationToken).ConfigureAwait(false);
-        if (!distros.Any(distro => string.Equals(distro.Name, normalizedDistroName, StringComparison.OrdinalIgnoreCase)))
+
+        // Only short-circuit as "not registered" when the probe returned a non-empty
+        // enumeration that definitively lacks the distro. An empty list is ambiguous:
+        // `wsl --list` may have failed or timed out (ListDistrosAsync collapses any
+        // failure to an empty list), so fail open and let the actual control command
+        // surface the real error instead of dead-ending recovery with a misleading message.
+        if (distros.Count > 0 &&
+            !distros.Any(distro => string.Equals(distro.Name, normalizedDistroName, StringComparison.OrdinalIgnoreCase)))
         {
             return new WslGatewayControlResult(
                 normalizedDistroName,
diff --git a/src/OpenClaw.SetupEngine.UI/Pages/AdvancedSetupPage.xaml b/src/OpenClaw.SetupEngine.UI/Pages/AdvancedSetupPage.xaml
new file mode 100644
index 000000000..326f11d39
--- /dev/null
+++ b/src/OpenClaw.SetupEngine.UI/Pages/AdvancedSetupPage.xaml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Page
+    x:Class="OpenClaw.SetupEngine.UI.Pages.AdvancedSetupPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    NavigationCacheMode="Disabled">
+
+    <Grid Padding="48,28,48,24" RowDefinitions="Auto,*,Auto">
+
+        <StackPanel Grid.Row="0" Spacing="8" HorizontalAlignment="Center">
+            <Image Source="ms-appx:///OpenClaw.SetupEngine.UI/Assets/Setup/OpenClawMascot.png"
+                   Width="44" Height="44" HorizontalAlignment="Center"
+                   AutomationProperties.AccessibilityView="Raw" />
+            <TextBlock Text="Connect to an existing gateway"
+                       Style="{StaticResource TitleTextBlockStyle}"
+                       TextAlignment="Center" HorizontalAlignment="Center" />
+            <TextBlock TextWrapping="Wrap" TextAlignment="Center" MaxWidth="520"
+                       Style="{StaticResource BodyTextBlockStyle}"
+                       Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                       HorizontalAlignment="Center"
+                       Text="We'll open Companion Settings next — nothing gets installed. Here's what you'll do there:" />
+        </StackPanel>
+
+        <StackPanel Grid.Row="1" Spacing="16" MaxWidth="520" VerticalAlignment="Top"
+                    HorizontalAlignment="Stretch" Margin="0,24,0,0">
+
+            <Grid ColumnDefinitions="Auto,*" ColumnSpacing="16">
+                <FontIcon Grid.Column="0" Glyph="&#xE710;" FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                          FontSize="20" VerticalAlignment="Top" IsTextScaleFactorEnabled="False"
+                          Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}" />
+                <StackPanel Grid.Column="1" Spacing="2">
+                    <TextBlock Text="Add a gateway" Style="{StaticResource BodyStrongTextBlockStyle}" />
+                    <TextBlock TextWrapping="Wrap" Style="{StaticResource CaptionTextBlockStyle}"
+                               Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                               Text="In Connection, choose Add a gateway, then pick how to connect: Setup code or Direct (URL + token)." />
+                </StackPanel>
+            </Grid>
+
+            <Grid ColumnDefinitions="Auto,*" ColumnSpacing="16">
+                <FontIcon Grid.Column="0" Glyph="&#xE774;" FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                          FontSize="20" VerticalAlignment="Top" IsTextScaleFactorEnabled="False"
+                          Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}" />
+                <StackPanel Grid.Column="1" Spacing="2">
+                    <TextBlock Text="Point it at your gateway" Style="{StaticResource BodyStrongTextBlockStyle}" />
+                    <TextBlock TextWrapping="Wrap" Style="{StaticResource CaptionTextBlockStyle}"
+                               Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                               Text="Connect to a gateway running here, on another PC, or remote — for example ws://host.local:18790." />
+                </StackPanel>
+            </Grid>
+
+            <Grid ColumnDefinitions="Auto,*" ColumnSpacing="16">
+                <FontIcon Grid.Column="0" Glyph="&#xE772;" FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                          FontSize="20" VerticalAlignment="Top" IsTextScaleFactorEnabled="False"
+                          Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}" />
+                <StackPanel Grid.Column="1" Spacing="2">
+                    <TextBlock Text="Pair this device" Style="{StaticResource BodyStrongTextBlockStyle}" />
+                    <TextBlock TextWrapping="Wrap" Style="{StaticResource CaptionTextBlockStyle}"
+                               Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                               Text="Paste a setup code from the gateway host, or your shared token, so the gateway trusts this PC." />
+                </StackPanel>
+            </Grid>
+
+            <Grid ColumnDefinitions="Auto,*" ColumnSpacing="16">
+                <FontIcon Grid.Column="0" Glyph="&#xE72E;" FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                          FontSize="20" VerticalAlignment="Top" IsTextScaleFactorEnabled="False"
+                          Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}" />
+                <StackPanel Grid.Column="1" Spacing="2">
+                    <TextBlock Text="Optional: SSH tunnel" Style="{StaticResource BodyStrongTextBlockStyle}" />
+                    <TextBlock TextWrapping="Wrap" Style="{StaticResource CaptionTextBlockStyle}"
+                               Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                               Text="If your gateway isn't directly reachable, any method can tunnel over SSH." />
+                </StackPanel>
+            </Grid>
+
+        </StackPanel>
+
+        <Grid Grid.Row="2" ColumnDefinitions="*,Auto">
+            <StackPanel Grid.ColumnSpan="2" Orientation="Horizontal" Spacing="8"
+                        HorizontalAlignment="Center" VerticalAlignment="Center"
+                        IsTabStop="False" AutomationProperties.Name="Step 2 of 6">
+                <Border Width="8" Height="8" CornerRadius="4" VerticalAlignment="Center" Background="{ThemeResource SetupInactiveDotBrush}" />
+                <Border Width="20" Height="8" CornerRadius="4" VerticalAlignment="Center" Background="{ThemeResource SetupIndicatorAccentBrush}" />
+                <Border Width="8" Height="8" CornerRadius="4" VerticalAlignment="Center" Background="{ThemeResource SetupInactiveDotBrush}" />
+                <Border Width="8" Height="8" CornerRadius="4" VerticalAlignment="Center" Background="{ThemeResource SetupInactiveDotBrush}" />
+                <Border Width="8" Height="8" CornerRadius="4" VerticalAlignment="Center" Background="{ThemeResource SetupInactiveDotBrush}" />
+                <Border Width="8" Height="8" CornerRadius="4" VerticalAlignment="Center" Background="{ThemeResource SetupInactiveDotBrush}" />
+            </StackPanel>
+            <Button x:Name="BackButton" Grid.Column="0" Content="Back"
+                    MinWidth="100" HorizontalAlignment="Left"
+                    Click="Back_Click" />
+            <Button x:Name="OpenConnectionButton" Grid.Column="1" Content="Open Companion Settings"
+                    MinWidth="100" HorizontalAlignment="Right"
+                    Style="{StaticResource AccentButtonStyle}"
+                    Click="OpenConnection_Click" />
+        </Grid>
+    </Grid>
+</Page>
diff --git a/src/OpenClaw.SetupEngine.UI/Pages/AdvancedSetupPage.xaml.cs b/src/OpenClaw.SetupEngine.UI/Pages/AdvancedSetupPage.xaml.cs
new file mode 100644
index 000000000..d170b147a
--- /dev/null
+++ b/src/OpenClaw.SetupEngine.UI/Pages/AdvancedSetupPage.xaml.cs
@@ -0,0 +1,32 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Navigation;
+using OpenClaw.SetupEngine;
+
+namespace OpenClaw.SetupEngine.UI.Pages;
+
+public sealed partial class AdvancedSetupPage : Page
+{
+    private SetupConfig? _config;
+
+    public AdvancedSetupPage()
+    {
+        InitializeComponent();
+    }
+
+    protected override void OnNavigatedTo(NavigationEventArgs e)
+    {
+        _config = e.Parameter as SetupConfig ?? new SetupConfig();
+    }
+
+    private void Back_Click(object sender, RoutedEventArgs e)
+    {
+        SetupWindow.Active?.NavigateToWelcome(back: true);
+    }
+
+    private void OpenConnection_Click(object sender, RoutedEventArgs e)
+    {
+        // Hands off to the companion app's Connection page (and closes setup).
+        SetupWindow.Active?.RequestAdvancedSetup();
+    }
+}
diff --git a/src/OpenClaw.SetupEngine.UI/Pages/CapabilitiesPage.xaml b/src/OpenClaw.SetupEngine.UI/Pages/CapabilitiesPage.xaml
index 806fd3cad..d8d8f6cac 100644
--- a/src/OpenClaw.SetupEngine.UI/Pages/CapabilitiesPage.xaml
+++ b/src/OpenClaw.SetupEngine.UI/Pages/CapabilitiesPage.xaml
@@ -5,46 +5,171 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     NavigationCacheMode="Disabled">
 
-    <Grid RowDefinitions="Auto,*,Auto" Padding="40,28,40,28">
-
-        <!-- Header with lobster icon -->
-        <StackPanel Grid.Row="0" Spacing="6" HorizontalAlignment="Center">
-            <Image Source="ms-appx:///OpenClaw.SetupEngine.UI/Assets/Setup/Lobster.png" Width="64" Height="64"
-                   HorizontalAlignment="Center" Margin="0,0,0,8" />
-            <TextBlock Text="Configure capabilities"
-                       FontSize="24" FontWeight="SemiBold"
-                       HorizontalAlignment="Center" />
-            <TextBlock TextWrapping="Wrap" TextAlignment="Center"
-                       FontSize="13" Opacity="0.6" MaxWidth="440"
-                       Text="Choose which capabilities this node will advertise. You can change these later." />
+    <Grid RowDefinitions="Auto,*,Auto" Padding="48,28,48,24">
+
+        <StackPanel Grid.Row="0" Spacing="8" HorizontalAlignment="Center">
+            <Image Source="ms-appx:///OpenClaw.SetupEngine.UI/Assets/Setup/OpenClawMascot.png"
+                   Width="44" Height="44" HorizontalAlignment="Center"
+                   AutomationProperties.AccessibilityView="Raw" />
+            <TextBlock Text="Set up the WSL gateway"
+                       Style="{StaticResource TitleTextBlockStyle}" HorizontalAlignment="Center" />
         </StackPanel>
 
-        <!-- 2-column capability grid -->
-        <ScrollViewer Grid.Row="1" Margin="0,20,0,0"
-                      VerticalScrollBarVisibility="Auto">
-            <Grid x:Name="CapGrid" ColumnSpacing="16" RowSpacing="4">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-                <!-- Rows added in code-behind -->
-            </Grid>
-        </ScrollViewer>
-
-        <!-- Continue button -->
-        <Button Grid.Row="2" Content="Continue"
-                HorizontalAlignment="Stretch" Margin="0,16,0,0"
-                Height="44" FontSize="15" FontWeight="SemiBold"
-                Click="Continue_Click">
-            <Button.Resources>
-                <SolidColorBrush x:Key="ButtonBackground" Color="#60C8F8" />
-                <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="#52B0DA" />
-                <SolidColorBrush x:Key="ButtonBackgroundPressed" Color="#469BBC" />
-                <SolidColorBrush x:Key="ButtonForeground" Color="Black" />
-                <SolidColorBrush x:Key="ButtonForegroundPointerOver" Color="Black" />
-                <SolidColorBrush x:Key="ButtonForegroundPressed" Color="Black" />
-            </Button.Resources>
-        </Button>
+        <!-- Fixed-width content column keeps transcript rows and the active card aligned across steps. -->
+        <Grid Grid.Row="1" Margin="0,24,0,16" ColumnDefinitions="*,Auto,*">
+            <ScrollViewer x:Name="Scroller" Grid.Column="1" Width="600"
+                          VerticalScrollBarVisibility="Auto">
+                <StackPanel Spacing="12" HorizontalAlignment="Stretch">
+
+                    <StackPanel x:Name="Transcript" Spacing="6" />
+
+                    <Border x:Name="ActiveCard"
+                            CornerRadius="4"
+                            Padding="16"
+                            MinHeight="160"
+                            BorderThickness="1"
+                            BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                            Background="{ThemeResource CardBackgroundFillColorDefaultBrush}">
+                        <StackPanel Spacing="14">
+                            <TextBlock x:Name="StepTitle" Style="{StaticResource BodyStrongTextBlockStyle}" TextWrapping="Wrap" />
+
+                            <StackPanel x:Name="Step1Content" Spacing="8">
+                                <TextBlock TextWrapping="Wrap"
+                                           Style="{StaticResource BodyTextBlockStyle}"
+                                           Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                           Text="OpenClaw runs your agent in a private, self-hosted gateway on this PC. Pick what it's allowed to do — you can change this later in Companion Settings." />
+                                <RadioButtons x:Name="ProfileRadio" SelectionChanged="Profile_Changed" MaxColumns="1">
+                                    <RadioButton AutomationProperties.Name="Read-only">
+                                        <StackPanel Spacing="1">
+                                            <TextBlock Text="Read-only" Style="{StaticResource BodyStrongTextBlockStyle}" />
+                                            <TextBlock Text="See your screen, render on canvas, read device info. No commands."
+                                                       Style="{StaticResource CaptionTextBlockStyle}"
+                                                       Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                                        </StackPanel>
+                                    </RadioButton>
+                                    <RadioButton AutomationProperties.Name="Standard (Recommended)">
+                                        <StackPanel Spacing="1">
+                                            <StackPanel Orientation="Horizontal" Spacing="8">
+                                                <TextBlock Text="Standard" Style="{StaticResource BodyStrongTextBlockStyle}" VerticalAlignment="Center" />
+                                                <Border CornerRadius="4" Padding="7,1" VerticalAlignment="Center"
+                                                        BorderBrush="{ThemeResource AccentTextFillColorPrimaryBrush}" BorderThickness="1">
+                                                    <TextBlock Text="Recommended"
+                                                               Style="{StaticResource CaptionTextBlockStyle}"
+                                                               Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}" />
+                                                </Border>
+                                            </StackPanel>
+                                            <TextBlock Text="Read-only plus run commands, edit files, and use text-to-speech and speech-to-text."
+                                                       Style="{StaticResource CaptionTextBlockStyle}"
+                                                       Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                                        </StackPanel>
+                                    </RadioButton>
+                                    <RadioButton AutomationProperties.Name="Full access">
+                                        <StackPanel Spacing="1">
+                                            <TextBlock Text="Full access" Style="{StaticResource BodyStrongTextBlockStyle}" />
+                                            <TextBlock Text="Everything, plus camera, location, and browser control."
+                                                       Style="{StaticResource CaptionTextBlockStyle}"
+                                                       Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                                        </StackPanel>
+                                    </RadioButton>
+                                </RadioButtons>
+
+                                <Expander x:Name="CapabilityExpander" Margin="0,4,0,0" HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch"
+                                          Background="Transparent" BorderThickness="0"
+                                          Header="Fine-tune individual capabilities (optional)">
+                                    <Grid x:Name="CapGrid" ColumnSpacing="16" RowSpacing="4" Margin="0,4,0,4">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="*" />
+                                            <ColumnDefinition Width="*" />
+                                        </Grid.ColumnDefinitions>
+                                        <!-- Rows added in code-behind -->
+                                    </Grid>
+                                </Expander>
+                                <TextBlock Text="Basic device info and status stay available while Node Mode is on."
+                                           Style="{StaticResource CaptionTextBlockStyle}"
+                                           Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                           TextWrapping="Wrap" />
+                            </StackPanel>
+
+                            <StackPanel x:Name="Step2Content" Spacing="8" Visibility="Collapsed">
+                                <TextBlock TextWrapping="Wrap"
+                                           Style="{StaticResource BodyTextBlockStyle}"
+                                           Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                           Text="Grant the Windows permissions your selected capabilities need — now, or later from Settings. The agent only uses what you allow." />
+                                <StackPanel x:Name="PermRows" Spacing="4" />
+                            </StackPanel>
+
+                            <StackPanel x:Name="Step3Content" Spacing="4" Visibility="Collapsed">
+                                <Border Background="{ThemeResource CardBackgroundFillColorDefaultBrush}" BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}" BorderThickness="1" CornerRadius="4" Padding="14,12">
+                                    <Grid ColumnDefinitions="Auto,*,Auto" ColumnSpacing="14">
+                                        <FontIcon Grid.Column="0" Glyph="&#xE756;" FontSize="18" VerticalAlignment="Center" />
+                                        <StackPanel Grid.Column="1" Spacing="2">
+                                            <TextBlock x:Name="InstallDistroTitleText" Text="Install an isolated Ubuntu 24.04 instance" Style="{StaticResource BodyStrongTextBlockStyle}" />
+                                            <TextBlock x:Name="InstallDistroDetailText" TextWrapping="Wrap" Style="{StaticResource CaptionTextBlockStyle}" Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="WSL distro &quot;OpenClawGateway&quot; in your AppData. Separate from any Ubuntu you already have." />
+                                        </StackPanel>
+                                        <TextBlock Grid.Column="2" Text="~200 MB" Style="{StaticResource CaptionTextBlockStyle}" Foreground="{ThemeResource TextFillColorTertiaryBrush}" FontFamily="Cascadia Mono, Consolas" VerticalAlignment="Center" />
+                                    </Grid>
+                                </Border>
+                                <Border Background="{ThemeResource CardBackgroundFillColorDefaultBrush}" BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}" BorderThickness="1" CornerRadius="4" Padding="14,12">
+                                    <Grid ColumnDefinitions="Auto,*,Auto" ColumnSpacing="14">
+                                        <FontIcon Grid.Column="0" Glyph="&#xE896;" FontSize="18" VerticalAlignment="Center" />
+                                        <StackPanel Grid.Column="1" Spacing="2">
+                                            <TextBlock Text="Download &amp; install the OpenClaw CLI" Style="{StaticResource BodyStrongTextBlockStyle}" />
+                                            <TextBlock x:Name="InstallCliDetailText" TextWrapping="Wrap" Style="{StaticResource CaptionTextBlockStyle}" Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="Fetched over HTTPS; runs as a non-root openclaw user inside the instance." />
+                                        </StackPanel>
+                                        <TextBlock x:Name="InstallCliBadgeText" Grid.Column="2" Text="HTTPS" Style="{StaticResource CaptionTextBlockStyle}" Foreground="{ThemeResource TextFillColorTertiaryBrush}" FontFamily="Cascadia Mono, Consolas" VerticalAlignment="Center" />
+                                    </Grid>
+                                </Border>
+                                <Border Background="{ThemeResource CardBackgroundFillColorDefaultBrush}" BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}" BorderThickness="1" CornerRadius="4" Padding="14,12">
+                                    <Grid ColumnDefinitions="Auto,*,Auto" ColumnSpacing="14">
+                                        <FontIcon Grid.Column="0" Glyph="&#xE968;" FontSize="18" VerticalAlignment="Center" />
+                                        <StackPanel Grid.Column="1" Spacing="2">
+                                            <TextBlock Text="Run a local gateway service" Style="{StaticResource BodyStrongTextBlockStyle}" />
+                                            <TextBlock x:Name="GatewayServiceDetailText" TextWrapping="Wrap" Style="{StaticResource CaptionTextBlockStyle}" Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="Loopback only — not reachable from your network or the internet." />
+                                        </StackPanel>
+                                        <TextBlock x:Name="GatewayEndpointText" Grid.Column="2" Text="127.0.0.1:18789" Style="{StaticResource CaptionTextBlockStyle}" Foreground="{ThemeResource TextFillColorTertiaryBrush}" FontFamily="Cascadia Mono, Consolas" VerticalAlignment="Center" />
+                                    </Grid>
+                                </Border>
+                                <Border Background="{ThemeResource CardBackgroundFillColorDefaultBrush}" BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}" BorderThickness="1" CornerRadius="4" Padding="14,12">
+                                    <Grid ColumnDefinitions="Auto,*,Auto" ColumnSpacing="14">
+                                        <FontIcon Grid.Column="0" Glyph="&#xE7BA;" FontSize="18" VerticalAlignment="Center" IsTextScaleFactorEnabled="False" />
+                                        <StackPanel Grid.Column="1" Spacing="2">
+                                            <TextBlock Text="May ask for admin once" Style="{StaticResource BodyStrongTextBlockStyle}" />
+                                            <TextBlock TextWrapping="Wrap" Style="{StaticResource CaptionTextBlockStyle}" Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="Only if the Windows WSL platform isn't installed yet. One-time per machine." />
+                                        </StackPanel>
+                                        <TextBlock Grid.Column="2" Text="UAC?" Style="{StaticResource CaptionTextBlockStyle}" Foreground="{ThemeResource TextFillColorTertiaryBrush}" FontFamily="Cascadia Mono, Consolas" VerticalAlignment="Center" />
+                                    </Grid>
+                                </Border>
+
+                                <Expander Margin="0,8,0,0" HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch"
+                                          Header="Show the exact commands &amp; files">
+                                    <TextBlock x:Name="ExactCommandsText" FontFamily="Cascadia Mono, Consolas" FontSize="12" TextWrapping="Wrap"
+                                               Foreground="{ThemeResource TextFillColorSecondaryBrush}" Margin="0,4,0,4"
+                                               Text="wsl --install -d Ubuntu-24.04 --name OpenClawGateway --no-launch&#x0a;curl -fsSL --proto '=https' --tlsv1.2 &lt;install-url&gt; | bash&#x0a;openclaw config set gateway.bind loopback · port 18789&#x0a;openclaw gateway install --force   (systemd --user service)&#x0a;writes -&gt; %LOCALAPPDATA%\OpenClawTray\wsl\OpenClawGateway\&#x0a;writes -&gt; %APPDATA%\OpenClawTray\gateways.json + identity" />
+                                </Expander>
+                            </StackPanel>
+                        </StackPanel>
+                    </Border>
+                </StackPanel>
+            </ScrollViewer>
+        </Grid>
 
+        <Grid Grid.Row="2" ColumnDefinitions="*,Auto">
+            <StackPanel Grid.ColumnSpan="2" Orientation="Horizontal" Spacing="8"
+                        HorizontalAlignment="Center" VerticalAlignment="Center"
+                        IsTabStop="False" AutomationProperties.Name="Step 3 of 6">
+                <Border Width="8" Height="8" CornerRadius="4" VerticalAlignment="Center" Background="{ThemeResource SetupInactiveDotBrush}" />
+                <Border Width="8" Height="8" CornerRadius="4" VerticalAlignment="Center" Background="{ThemeResource SetupInactiveDotBrush}" />
+                <Border Width="20" Height="8" CornerRadius="4" VerticalAlignment="Center" Background="{ThemeResource SetupIndicatorAccentBrush}" />
+                <Border Width="8" Height="8" CornerRadius="4" VerticalAlignment="Center" Background="{ThemeResource SetupInactiveDotBrush}" />
+                <Border Width="8" Height="8" CornerRadius="4" VerticalAlignment="Center" Background="{ThemeResource SetupInactiveDotBrush}" />
+                <Border Width="8" Height="8" CornerRadius="4" VerticalAlignment="Center" Background="{ThemeResource SetupInactiveDotBrush}" />
+            </StackPanel>
+            <Button x:Name="BackButton" Grid.Column="0" Content="Back"
+                    MinWidth="100" HorizontalAlignment="Left"
+                    Visibility="Collapsed" Click="Back_Click" />
+            <Button x:Name="PrimaryButton" Grid.Column="1" Content="Next"
+                    MinWidth="100" HorizontalAlignment="Right"
+                    Style="{StaticResource AccentButtonStyle}" Click="Primary_Click" />
+        </Grid>
     </Grid>
 </Page>
diff --git a/src/OpenClaw.SetupEngine.UI/Pages/CapabilitiesPage.xaml.cs b/src/OpenClaw.SetupEngine.UI/Pages/CapabilitiesPage.xaml.cs
index 079ed6efc..8ca682852 100644
--- a/src/OpenClaw.SetupEngine.UI/Pages/CapabilitiesPage.xaml.cs
+++ b/src/OpenClaw.SetupEngine.UI/Pages/CapabilitiesPage.xaml.cs
@@ -1,6 +1,9 @@
+using Microsoft.UI;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Navigation;
+using OpenClaw.Shared;
 using OpenClaw.SetupEngine.UI;
 
 namespace OpenClaw.SetupEngine.UI.Pages;
@@ -9,6 +12,19 @@ public sealed partial class CapabilitiesPage : Page
 {
     private SetupConfig? _config;
     private readonly Dictionary<string, ToggleSwitch> _toggles = new();
+    private readonly Dictionary<string, FrameworkElement> _permRows = new();
+    private readonly Dictionary<string, bool> _permGranted = new();
+    private SetupWindow? _setupWindow;
+    private Task? _permissionsTask;
+    private bool _suppressProfile;
+    private bool _skipPermissions;
+    private bool _treatBundledAllOnAsPlaceholder;
+    private int _step = 1;
+
+    // Capability profiles preset only runtime-gated settings. Device info/status
+    // stays available whenever Node Mode is enabled, so it is disclosed but not selectable.
+    private static readonly string[] ProfileReadOnly = ["Canvas", "Screen"];
+    private static readonly string[] ProfileStandard = ["System", "Canvas", "Screen", "Tts", "Stt"];
 
     // (config property, display name, description, fluent icon glyph)
     private static readonly (string Key, string Name, string Desc, string Glyph)[] Capabilities =
@@ -19,11 +35,19 @@ private static readonly (string Key, string Name, string Desc, string Glyph)[] C
         ("Camera", "Camera", "Webcam photos and video", "\uE722"),
         ("Location", "Location", "Share device location", "\uE81D"),
         ("Browser", "Browser", "Web navigation and automation", "\uE774"),
-        ("Device", "Device", "Volume, brightness, system info", "\uE772"),
         ("Tts", "Text-to-speech", "Speak text aloud", "\uE767"),
         ("Stt", "Speech-to-text", "Transcribe spoken audio", "\uE720"),
     ];
 
+    // Which capability requires which Windows permission (for the inline step-2 rows).
+    private static readonly (string CapKey, string PermId)[] CapPermMap =
+    [
+        ("Camera", "Camera"),
+        ("Stt", "Microphone"),
+        ("Location", "Location"),
+        ("Screen", "Screen"),
+    ];
+
     public CapabilitiesPage()
     {
         InitializeComponent();
@@ -32,15 +56,253 @@ public CapabilitiesPage()
     protected override void OnNavigatedTo(NavigationEventArgs e)
     {
         _config = e.Parameter as SetupConfig ?? new SetupConfig();
+        // The tray always registers device.info/status with Node Mode. Keep the
+        // setup declaration and gateway allowlist aligned with that runtime contract.
+        _config.Capabilities.Device = true;
+        _skipPermissions = _config.SkipPermissions;
+        _treatBundledAllOnAsPlaceholder = _config.UsesBundledDefaultConfig;
         BuildToggles();
+        _suppressProfile = true;
+        var profileIndex = DetectProfileIndex();
+        ProfileRadio.SelectedIndex = profileIndex;
+        UpdateCapabilityProfilePresentation(profileIndex);
+        // BuildToggles() seeded the toggles from the config. The bundled
+        // default-config.json still ships with every capability on as a
+        // placeholder, so default that implicit case to Standard. Explicit
+        // custom configs are preserved even when they do not match a preset.
+        if (_config.UsesBundledDefaultConfig && profileIndex == 1 && !MatchesProfile(ProfileStandard))
+            ApplyProfile(1);
+        _suppressProfile = false;
+        _treatBundledAllOnAsPlaceholder = false;
+        // Only probe OS permissions when the permissions step will actually be shown.
+        if (!_skipPermissions)
+            _permissionsTask = BuildPermissionRows();
+        _setupWindow = SetupWindow.Active;
+        if (_setupWindow is not null)
+            _setupWindow.Activated += SetupWindow_Activated;
+        ApplySetupReviewSummary(_config);
+        GoToStep(1);
+    }
+
+    protected override void OnNavigatedFrom(NavigationEventArgs e)
+    {
+        if (_setupWindow is not null)
+        {
+            _setupWindow.Activated -= SetupWindow_Activated;
+            _setupWindow = null;
+        }
+        base.OnNavigatedFrom(e);
+    }
+
+    private void SetupWindow_Activated(object sender, WindowActivatedEventArgs e)
+    {
+        if (_skipPermissions || e.WindowActivationState == WindowActivationState.Deactivated)
+            return;
+
+        // Settings opens outside the setup window. Refresh when focus returns so the
+        // status rows and completion summary immediately reflect the user's changes.
+        _permissionsTask = RefreshPermissionRowsAsync(_permissionsTask);
+    }
+
+    private async Task RefreshPermissionRowsAsync(Task? previousRefresh)
+    {
+        if (previousRefresh is not null)
+            await previousRefresh;
+        await BuildPermissionRows();
+    }
+
+    // ── Stepped flow (mirrors the gateway onboard transcript) ──
+
+    // The permissions step (internal step 2) is hidden when SetupConfig.SkipPermissions
+    // is set, so the flow is 2 visible steps instead of 3. Internal step ids stay 1/2/3;
+    // navigation routes around step 2 when it is hidden.
+
+    private void GoToStep(int step)
+    {
+        _step = step;
+        Step1Content.Visibility = step == 1 ? Visibility.Visible : Visibility.Collapsed;
+        Step2Content.Visibility = step == 2 ? Visibility.Visible : Visibility.Collapsed;
+        Step3Content.Visibility = step == 3 ? Visibility.Visible : Visibility.Collapsed;
+
+        StepTitle.Text = step switch
+        {
+            1 => "What should your agent be able to do?",
+            2 => "Windows permissions",
+            _ => "What setup will install on this PC",
+        };
+        PrimaryButton.Content = step == 3 ? "Install & set up" : "Next";
+        // Back is always available — from step 1 it returns to the Welcome screen.
+        BackButton.Visibility = Visibility.Visible;
+
+        ScrollActiveIntoView();
+    }
+
+    private void Primary_Click(object sender, RoutedEventArgs e) =>
+        AsyncEventHandlerGuard.Run(
+            PrimaryClickAsync,
+            NullLogger.Instance,
+            nameof(Primary_Click));
+
+    private async Task PrimaryClickAsync()
+    {
+        // The Windows-permission checks run on entry as a background task. They are fast
+        // local reads (registry / device enumeration), but make sure they have finished
+        // before any step that reads their results — step 2's rows and step 3's summary —
+        // so a fast click-through can't render empty rows or an undercounted summary.
+        if (_permissionsTask is { } permissionsTask && !permissionsTask.IsCompletedSuccessfully)
+        {
+            PrimaryButton.IsEnabled = false;
+            try { await permissionsTask; }
+            finally { PrimaryButton.IsEnabled = true; }
+        }
+
+        switch (_step)
+        {
+            case 1:
+                AppendTranscript("What your agent can do", ProfileSummary());
+                GoToStep(_skipPermissions ? 3 : 2);
+                break;
+            case 2:
+                AppendTranscript("Windows permissions", PermissionSummary());
+                GoToStep(3);
+                break;
+            default:
+                WriteCapabilities();
+                SetupWindow.Active?.NavigateToProgress();
+                break;
+        }
+    }
+
+    private void Back_Click(object sender, RoutedEventArgs e)
+    {
+        if (_step <= 1)
+        {
+            // First capability step — step back to the Welcome screen.
+            SetupWindow.Active?.NavigateToWelcome(back: true);
+            return;
+        }
+        if (Transcript.Children.Count > 0)
+            Transcript.Children.RemoveAt(Transcript.Children.Count - 1);
+        // Skip back over the hidden permissions step when permissions are skipped.
+        var previous = _step == 3 && _skipPermissions ? 1 : _step - 1;
+        GoToStep(previous);
+    }
+
+    private void WriteCapabilities()
+    {
+        var config = _config!;
+        var caps = config.Capabilities;
+        foreach (var (key, _, _, _) in Capabilities)
+        {
+            if (_toggles.TryGetValue(key, out var toggle))
+            {
+                var prop = typeof(CapabilitiesConfig).GetProperty(key);
+                prop?.SetValue(caps, toggle.IsOn);
+            }
+        }
+        config.Settings.ApplyCapabilities(caps);
+    }
+
+    private void ApplySetupReviewSummary(SetupConfig config)
+    {
+        var summary = SetupReviewSummaryBuilder.Build(
+            config,
+            SetupWindow.Active?.DataDir,
+            SetupWindow.Active?.LocalDataDir);
+        InstallDistroTitleText.Text = summary.DistroTitle;
+        InstallDistroDetailText.Text = summary.DistroDescription;
+        InstallCliDetailText.Text = summary.InstallerDescription;
+        InstallCliBadgeText.Text = summary.InstallerBadge;
+        GatewayServiceDetailText.Text = summary.GatewayDescription;
+        GatewayEndpointText.Text = summary.GatewayEndpoint;
+        ExactCommandsText.Text = summary.ExactCommands;
+    }
+
+    private string ProfileSummary()
+    {
+        if (MatchesProfile(ProfileReadOnly)) return "Read-only";
+        if (MatchesProfile(ProfileStandard)) return "Standard";
+        if (MatchesProfile(Capabilities.Select(c => c.Key).ToArray())) return "Full access";
+        var n = _toggles.Values.Count(t => t.IsOn);
+        return $"{n} of {Capabilities.Length} capabilities";
+    }
+
+    private string PermissionSummary()
+    {
+        var visible = 1; // Notifications always shown
+        var granted = _permGranted.TryGetValue("Notifications", out var ng) && ng ? 1 : 0;
+        foreach (var (capKey, permId) in CapPermMap)
+        {
+            if (!IsCapOn(capKey))
+                continue;
+            visible++;
+            if (_permGranted.TryGetValue(permId, out var g) && g)
+                granted++;
+        }
+        return granted == visible ? $"All {visible} granted" : $"{granted} of {visible} granted";
+    }
+
+    private void AppendTranscript(string question, string? answer)
+    {
+        var grid = new Grid { Padding = new Thickness(2, 6, 2, 6) };
+        grid.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
+        grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
+
+        var dot = new Border
+        {
+            Width = 22,
+            Height = 22,
+            CornerRadius = new CornerRadius(11),
+            Background = SetupPermissionHelper.Res("SystemFillColorSuccessBrush"),
+            Margin = new Thickness(0, 1, 12, 0),
+            VerticalAlignment = VerticalAlignment.Top,
+            Child = new FontIcon
+            {
+                Glyph = "\uE73E",
+                FontSize = 11,
+                Foreground = new SolidColorBrush(Colors.White),
+            },
+        };
+
+        var stack = new StackPanel { Spacing = 2, VerticalAlignment = VerticalAlignment.Center };
+        stack.Children.Add(new TextBlock
+        {
+            Text = question,
+            FontSize = 14,
+            Foreground = SetupPermissionHelper.Res("TextFillColorSecondaryBrush"),
+            TextWrapping = TextWrapping.Wrap,
+        });
+        if (!string.IsNullOrWhiteSpace(answer))
+        {
+            stack.Children.Add(new TextBlock
+            {
+                Text = answer,
+                FontSize = 13,
+                Foreground = SetupPermissionHelper.Res("TextFillColorPrimaryBrush"),
+                TextWrapping = TextWrapping.Wrap,
+            });
+        }
+
+        Grid.SetColumn(dot, 0);
+        Grid.SetColumn(stack, 1);
+        grid.Children.Add(dot);
+        grid.Children.Add(stack);
+        Transcript.Children.Add(grid);
+    }
+
+    private void ScrollActiveIntoView()
+    {
+        Scroller.UpdateLayout();
+        Scroller.ChangeView(null, Scroller.ScrollableHeight, null);
     }
 
+    // ── Capability toggles ──
+
     private void BuildToggles()
     {
         var caps = _config!.Capabilities;
         var totalRows = (Capabilities.Length + 1) / 2; // ceiling division for 2 columns
 
-        // Add row definitions
         for (int i = 0; i < totalRows; i++)
             CapGrid.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
 
@@ -58,8 +320,8 @@ private void BuildToggles()
                 MinWidth = 0,
             };
             _toggles[key] = toggle;
+            toggle.Toggled += Capability_Toggled;
 
-            // Card-like item: icon + text + toggle
             var item = new Grid
             {
                 ColumnDefinitions =
@@ -100,18 +362,141 @@ private void BuildToggles()
         }
     }
 
-    private void Continue_Click(object sender, RoutedEventArgs e)
+    private void Profile_Changed(object sender, SelectionChangedEventArgs e)
     {
-        var caps = _config!.Capabilities;
-        foreach (var (key, _, _, _) in Capabilities)
+        if (_suppressProfile || _toggles.Count == 0)
+            return;
+
+        _suppressProfile = true;
+        try
+        {
+            ApplyProfile(ProfileRadio.SelectedIndex);
+            UpdateCapabilityProfilePresentation(ProfileRadio.SelectedIndex);
+        }
+        finally
+        {
+            _suppressProfile = false;
+        }
+    }
+
+    private void Capability_Toggled(object sender, RoutedEventArgs e)
+    {
+        UpdatePermissionVisibility();
+        if (_suppressProfile)
+            return;
+
+        var profileIndex = DetectProfileIndex();
+        _suppressProfile = true;
+        try
+        {
+            ProfileRadio.SelectedIndex = profileIndex;
+            UpdateCapabilityProfilePresentation(profileIndex);
+        }
+        finally
+        {
+            _suppressProfile = false;
+        }
+    }
+
+    private void UpdateCapabilityProfilePresentation(int profileIndex)
+    {
+        CapabilityExpander.Header = profileIndex < 0
+            ? "Custom capabilities (review)"
+            : "Fine-tune individual capabilities (optional)";
+        if (profileIndex < 0)
+            CapabilityExpander.IsExpanded = true;
+    }
+
+    // Turns the capability toggles on/off to match a profile index (0=Read-only,
+    // 1=Standard, 2=Full access). Shared by the radio handler and the default-on-entry path.
+    private void ApplyProfile(int index)
+    {
+        var on = index switch
         {
+            0 => ProfileReadOnly,
+            1 => ProfileStandard,
+            _ => Capabilities.Select(c => c.Key).ToArray(), // Full access
+        };
+        var onSet = new HashSet<string>(on);
+        foreach (var (key, _, _, _) in Capabilities)
             if (_toggles.TryGetValue(key, out var toggle))
+                toggle.IsOn = onSet.Contains(key);
+    }
+
+    private int DetectProfileIndex()
+    {
+        if (MatchesProfile(ProfileReadOnly)) return 0;
+        if (MatchesProfile(ProfileStandard)) return 1;
+        if (MatchesProfile(Capabilities.Select(c => c.Key).ToArray()))
+            return _treatBundledAllOnAsPlaceholder ? 1 : 2;
+
+        // An "all capabilities on" bundled config is the shipped placeholder
+        // default, not a deliberate Full-access choice, so new users default to
+        // Standard (recommended). Every other non-preset set is explicit and must
+        // remain visibly custom, including edits made during bundled setup.
+        return -1;
+    }
+
+    private bool MatchesProfile(string[] onKeys)
+    {
+        var onSet = new HashSet<string>(onKeys);
+        foreach (var (key, _, _, _) in Capabilities)
+        {
+            if (!_toggles.TryGetValue(key, out var toggle) || toggle.IsOn != onSet.Contains(key))
+                return false;
+        }
+        return true;
+    }
+
+    // ── Windows permissions (merged inline from the old standalone step) ──
+
+    private async Task BuildPermissionRows()
+    {
+        try
+        {
+            PermRows.Children.Clear();
+            _permRows.Clear();
+            _permGranted.Clear();
+            foreach (var perm in SetupPermissionHelper.All)
             {
-                var prop = typeof(CapabilitiesConfig).GetProperty(key);
-                prop?.SetValue(caps, toggle.IsOn);
+                var (status, granted) = await perm.Check();
+                _permGranted[perm.Id] = granted;
+                var row = SetupPermissionHelper.BuildRow(perm, status, granted);
+                _permRows[perm.Id] = row;
+                PermRows.Children.Add(row);
             }
+            UpdatePermissionVisibility();
         }
+        catch (Exception ex)
+        {
+            PermRows.Children.Clear();
+            _permRows.Clear();
+            _permGranted.Clear();
+            PermRows.Children.Add(new InfoBar
+            {
+                Severity = InfoBarSeverity.Warning,
+                IsOpen = true,
+                IsClosable = false,
+                Title = "Couldn't read Windows permission status",
+                Message = $"You can continue setup. Review permissions later in Settings. Details: {ex.Message}",
+            });
+        }
+    }
 
-        SetupWindow.Active?.NavigateToProgress();
+    private void UpdatePermissionVisibility()
+    {
+        if (_permRows.Count == 0)
+            return;
+        foreach (var (capKey, permId) in CapPermMap)
+            SetPermVisible(permId, IsCapOn(capKey));
+        // Notifications is always visible (app-level, not tied to a capability toggle).
+    }
+
+    private bool IsCapOn(string key) => _toggles.TryGetValue(key, out var t) && t.IsOn;
+
+    private void SetPermVisible(string id, bool visible)
+    {
+        if (_permRows.TryGetValue(id, out var row))
+            row.Visibility = visible ? Visibility.Visible : Visibility.Collapsed;
     }
 }
diff --git a/src/OpenClaw.SetupEngine.UI/Pages/CompletePage.xaml b/src/OpenClaw.SetupEngine.UI/Pages/CompletePage.xaml
index 57ec04df3..1f692405c 100644
--- a/src/OpenClaw.SetupEngine.UI/Pages/CompletePage.xaml
+++ b/src/OpenClaw.SetupEngine.UI/Pages/CompletePage.xaml
@@ -5,93 +5,143 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     NavigationCacheMode="Disabled">
 
-    <Grid RowDefinitions="*,Auto" Padding="56,40,56,32">
+    <Grid RowDefinitions="*,Auto" Padding="48,28,48,24">
 
-        <!-- Main content -->
-        <StackPanel Grid.Row="0" VerticalAlignment="Center" Spacing="12"
-                    HorizontalAlignment="Stretch">
+        <ScrollViewer Grid.Row="0" VerticalScrollBarVisibility="Auto">
+            <StackPanel VerticalAlignment="Center" Spacing="12" HorizontalAlignment="Stretch"
+                        MaxWidth="480" Margin="0,8">
 
-            <!-- Success/failure icon -->
-            <Image x:Name="SuccessIcon" Source="ms-appx:///OpenClaw.SetupEngine.UI/Assets/Setup/PartyPopper.png"
-                   Width="120" Height="120"
-                   HorizontalAlignment="Center" Margin="0,0,0,8" />
-            <Border x:Name="FailureIcon" Width="96" Height="96"
-                    CornerRadius="48" HorizontalAlignment="Center"
-                    Margin="0,0,0,20" Visibility="Collapsed"
-                    Background="#3CFF4444">
-                <TextBlock Text="&#xE783;" FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                           FontSize="42" Foreground="#FF6B6B"
-                           HorizontalAlignment="Center"
-                           VerticalAlignment="Center" />
-            </Border>
+                <Grid x:Name="SuccessIcon" Width="100" Height="100"
+                      HorizontalAlignment="Center" Margin="0,0,0,4">
+                    <Image Source="ms-appx:///OpenClaw.SetupEngine.UI/Assets/Setup/OpenClawMascot.png"
+                           Width="100" Height="100"
+                           AutomationProperties.AccessibilityView="Raw" />
+                    <Border Width="36" Height="36" CornerRadius="18"
+                            HorizontalAlignment="Right" VerticalAlignment="Bottom"
+                            Background="{ThemeResource SystemFillColorSuccessBrush}"
+                            BorderBrush="{ThemeResource SolidBackgroundFillColorBaseBrush}" BorderThickness="3">
+                        <FontIcon Glyph="&#xE73E;" FontSize="16" IsTextScaleFactorEnabled="False"
+                                  Foreground="#FFFFFF"
+                                  HorizontalAlignment="Center" VerticalAlignment="Center"
+                                  AutomationProperties.AccessibilityView="Raw" />
+                    </Border>
+                </Grid>
+                <Grid x:Name="FailureIcon" Width="100" Height="100"
+                      HorizontalAlignment="Center" Margin="0,0,0,16"
+                      Visibility="Collapsed">
+                    <Image Source="ms-appx:///OpenClaw.SetupEngine.UI/Assets/Setup/OpenClawMascot.png"
+                           Width="100" Height="100"
+                           AutomationProperties.AccessibilityView="Raw" />
+                    <Border Width="36" Height="36" CornerRadius="18"
+                            HorizontalAlignment="Right" VerticalAlignment="Bottom"
+                            Background="{ThemeResource SystemFillColorCriticalBrush}"
+                            BorderBrush="{ThemeResource SolidBackgroundFillColorBaseBrush}" BorderThickness="3">
+                        <FontIcon Glyph="&#xEA39;" FontSize="16" IsTextScaleFactorEnabled="False"
+                                 Foreground="#FFFFFF"
+                                 HorizontalAlignment="Center" VerticalAlignment="Center"
+                                 AutomationProperties.AccessibilityView="Raw" />
+                    </Border>
+                </Grid>
 
-            <!-- Title -->
-            <TextBlock x:Name="TitleText" Text="All set!"
-                       FontSize="32" FontWeight="SemiBold"
-                       HorizontalAlignment="Center" />
+                <TextBlock x:Name="TitleText" Text="All set!"
+                           Style="{StaticResource TitleTextBlockStyle}"
+                           HorizontalAlignment="Center" />
 
-            <!-- Subtitle -->
-            <TextBlock x:Name="SubtitleText" Text="OpenClaw is ready to go"
-                       FontSize="14" Opacity="0.6"
-                       HorizontalAlignment="Center" />
+                <TextBlock x:Name="SubtitleText" Text="OpenClaw is ready to go"
+                           Style="{StaticResource BodyTextBlockStyle}"
+                           Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                           HorizontalAlignment="Center" />
 
-            <!-- Error details (hidden on success) -->
-            <Border x:Name="ErrorCard" CornerRadius="8" Padding="16,12,16,12"
-                    Margin="0,16,0,0" Visibility="Collapsed"
-                    Background="#3CFF4444">
-                <StackPanel Spacing="8">
-                    <TextBlock x:Name="ErrorText" TextWrapping="Wrap"
-                               FontSize="13" FontFamily="Cascadia Code,Consolas,monospace"
-                               Foreground="#FF6B6B" />
-                    <HyperlinkButton x:Name="HelpLink"
-                                     Visibility="Collapsed"
-                                     Padding="0"
-                                     FontSize="13" />
-                    <HyperlinkButton x:Name="ViewLogLink" Content="View full log →"
-                                     Click="ViewLog_Click" Padding="0"
-                                     FontSize="13" />
+                <StackPanel x:Name="SummaryPanel" Spacing="8" Visibility="Collapsed">
+                    <Border Background="{ThemeResource CardBackgroundFillColorDefaultBrush}" BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}" BorderThickness="1" CornerRadius="4" Padding="14,12">
+                        <Grid ColumnDefinitions="Auto,*,Auto" ColumnSpacing="14">
+                            <FontIcon Grid.Column="0" Glyph="&#xE756;" FontSize="18" VerticalAlignment="Center" />
+                            <StackPanel Grid.Column="1" Spacing="2">
+                                <TextBlock Text="Local gateway running" Style="{StaticResource BodyStrongTextBlockStyle}" />
+                                <TextBlock x:Name="GatewaySummaryText" Text="OpenClawGateway · 127.0.0.1:18789" Style="{StaticResource CaptionTextBlockStyle}" Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                            </StackPanel>
+                            <FontIcon Grid.Column="2" Glyph="&#xE73E;" FontSize="16" Foreground="{ThemeResource SystemFillColorSuccessBrush}" VerticalAlignment="Center" />
+                        </Grid>
+                    </Border>
+                    <Border Background="{ThemeResource CardBackgroundFillColorDefaultBrush}" BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}" BorderThickness="1" CornerRadius="4" Padding="14,12">
+                        <Grid ColumnDefinitions="Auto,*,Auto" ColumnSpacing="14">
+                            <FontIcon Grid.Column="0" Glyph="&#xE772;" FontSize="18" VerticalAlignment="Center" />
+                            <StackPanel Grid.Column="1" Spacing="2">
+                                <TextBlock Text="Device paired" Style="{StaticResource BodyStrongTextBlockStyle}" />
+                                <TextBlock Text="This PC is connected and ready to use" Style="{StaticResource CaptionTextBlockStyle}" Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                            </StackPanel>
+                            <FontIcon Grid.Column="2" Glyph="&#xE73E;" FontSize="16" Foreground="{ThemeResource SystemFillColorSuccessBrush}" VerticalAlignment="Center" />
+                        </Grid>
+                    </Border>
+                    <Border Background="{ThemeResource CardBackgroundFillColorDefaultBrush}" BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}" BorderThickness="1" CornerRadius="4" Padding="14,12">
+                        <Grid ColumnDefinitions="Auto,*,Auto" ColumnSpacing="14">
+                            <FontIcon Grid.Column="0" Glyph="&#xEA18;" FontSize="18" VerticalAlignment="Center" />
+                            <StackPanel Grid.Column="1" Spacing="2">
+                                <TextBlock Text="Capability profile applied" Style="{StaticResource BodyStrongTextBlockStyle}" />
+                                <TextBlock Text="Editable any time in Companion Settings" Style="{StaticResource CaptionTextBlockStyle}" Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                            </StackPanel>
+                            <FontIcon Grid.Column="2" Glyph="&#xE73E;" FontSize="16" Foreground="{ThemeResource SystemFillColorSuccessBrush}" VerticalAlignment="Center" />
+                        </Grid>
+                    </Border>
                 </StackPanel>
-            </Border>
 
-            <!-- Node Mode Active banner (amber/orange) -->
-            <Border x:Name="NodeModeBanner" CornerRadius="8" Padding="20,16,20,16"
-                    Margin="0,20,0,0">
-                <StackPanel Spacing="6">
-                    <StackPanel Orientation="Horizontal" Spacing="10">
-                        <TextBlock Text="&#xE7BA;" FontFamily="{ThemeResource SymbolThemeFontFamily}" FontSize="16"
-                                   VerticalAlignment="Center" Foreground="#FFC107" />
-                        <TextBlock Text="Node Mode Active" FontSize="15" FontWeight="SemiBold" />
+                <Border x:Name="ErrorCard" CornerRadius="4" Padding="16,12,16,12"
+                        Margin="0,16,0,0" Visibility="Collapsed"
+                        Background="{ThemeResource SystemFillColorCriticalBackgroundBrush}"
+                        BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}" BorderThickness="1">
+                    <StackPanel Spacing="8">
+                        <TextBlock x:Name="ErrorText" TextWrapping="Wrap"
+                                   FontSize="13" FontFamily="Cascadia Code,Consolas,monospace"
+                                   Foreground="{ThemeResource SystemFillColorCriticalBrush}" />
+                        <HyperlinkButton x:Name="HelpLink"
+                                         Visibility="Collapsed"
+                                         Padding="0"
+                                         FontSize="13" />
+                        <HyperlinkButton x:Name="ViewLogLink" Content="View full log →"
+                                         Click="ViewLog_Click" Padding="0"
+                                         FontSize="13" />
                     </StackPanel>
-                    <TextBlock TextWrapping="Wrap" FontSize="13" Opacity="0.85"
-                               Text="This PC will operate as a remote compute node. The gateway can invoke screen capture, camera, and system commands on this machine." />
-                </StackPanel>
-            </Border>
+                </Border>
+
+                <InfoBar x:Name="NodeModeBanner"
+                         IsOpen="True" IsClosable="False" Severity="Informational"
+                         Title="Node mode enabled"
+                         Message="This PC will operate as a remote compute node. The gateway can invoke screen capture, camera, and system commands on this machine." />
 
-            <!-- Launch at startup toggle -->
-            <Grid x:Name="StartupRow" ColumnDefinitions="*,Auto" Margin="0,24,0,0">
-                <TextBlock Text="Launch OpenClaw at startup?" FontSize="14"
-                           VerticalAlignment="Center" Grid.Column="0" />
-                <ToggleSwitch x:Name="StartupToggle" Grid.Column="1"
-                              OnContent="On" OffContent="Off" />
-            </Grid>
+                <Border x:Name="StartupRow"
+                        Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                        BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                        BorderThickness="1" CornerRadius="4" Padding="14,6,8,6">
+                    <Grid ColumnDefinitions="*,Auto">
+                        <TextBlock Grid.Column="0" Text="Launch OpenClaw at startup"
+                                   VerticalAlignment="Center"
+                                   Style="{StaticResource BodyTextBlockStyle}" />
+                        <ToggleSwitch x:Name="StartupToggle" Grid.Column="1"
+                                      OnContent="On" OffContent="Off"
+                                      HorizontalAlignment="Right" VerticalAlignment="Center"
+                                      MinWidth="0" />
+                    </Grid>
+                </Border>
 
-        </StackPanel>
+            </StackPanel>
+        </ScrollViewer>
 
-        <!-- Bottom: Finish button -->
-        <Button Grid.Row="1" x:Name="LaunchButton"
-                Content="Finish"
-                HorizontalAlignment="Stretch"
-                Height="44" FontSize="15" FontWeight="SemiBold"
-                Click="LaunchButton_Click">
-            <Button.Resources>
-                <SolidColorBrush x:Key="ButtonBackground" Color="#60C8F8" />
-                <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="#52B0DA" />
-                <SolidColorBrush x:Key="ButtonBackgroundPressed" Color="#469BBC" />
-                <SolidColorBrush x:Key="ButtonForeground" Color="Black" />
-                <SolidColorBrush x:Key="ButtonForegroundPointerOver" Color="Black" />
-                <SolidColorBrush x:Key="ButtonForegroundPressed" Color="Black" />
-            </Button.Resources>
-        </Button>
+        <Grid Grid.Row="1" ColumnDefinitions="*,Auto" Margin="0,16,0,0">
+            <StackPanel Grid.ColumnSpan="2" Orientation="Horizontal" Spacing="8" HorizontalAlignment="Center" VerticalAlignment="Center"
+                        IsTabStop="False" AutomationProperties.Name="Step 6 of 6">
+                <Border Width="8" Height="8" CornerRadius="4" VerticalAlignment="Center" Background="{ThemeResource SetupInactiveDotBrush}" />
+                <Border Width="8" Height="8" CornerRadius="4" VerticalAlignment="Center" Background="{ThemeResource SetupInactiveDotBrush}" />
+                <Border Width="8" Height="8" CornerRadius="4" VerticalAlignment="Center" Background="{ThemeResource SetupInactiveDotBrush}" />
+                <Border Width="8" Height="8" CornerRadius="4" VerticalAlignment="Center" Background="{ThemeResource SetupInactiveDotBrush}" />
+                <Border Width="8" Height="8" CornerRadius="4" VerticalAlignment="Center" Background="{ThemeResource SetupInactiveDotBrush}" />
+                <Border Width="20" Height="8" CornerRadius="4" VerticalAlignment="Center" Background="{ThemeResource SetupIndicatorAccentBrush}" />
+            </StackPanel>
+            <Button x:Name="LaunchButton" Grid.Column="1"
+                    Content="Finish"
+                    HorizontalAlignment="Right" MinWidth="100"
+                    Style="{StaticResource AccentButtonStyle}"
+                    Click="LaunchButton_Click" />
+        </Grid>
 
     </Grid>
 </Page>
diff --git a/src/OpenClaw.SetupEngine.UI/Pages/CompletePage.xaml.cs b/src/OpenClaw.SetupEngine.UI/Pages/CompletePage.xaml.cs
index fb53c77eb..08690ce14 100644
--- a/src/OpenClaw.SetupEngine.UI/Pages/CompletePage.xaml.cs
+++ b/src/OpenClaw.SetupEngine.UI/Pages/CompletePage.xaml.cs
@@ -17,7 +17,6 @@ public sealed partial class CompletePage : Page
     public CompletePage()
     {
         InitializeComponent();
-        Loaded += OnLoaded;
     }
 
     protected override void OnNavigatedTo(NavigationEventArgs e)
@@ -30,10 +29,14 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
             {
                 SuccessIcon.Visibility = Visibility.Visible;
                 FailureIcon.Visibility = Visibility.Collapsed;
+                StartupToggle.IsOn = args.DefaultAutoStart;
+                StartupRow.Visibility = args.ShowStartupPreference ? Visibility.Visible : Visibility.Collapsed;
+                GatewaySummaryText.Text = (args.ReviewSummary ?? SetupReviewSummaryBuilder.Build(new SetupConfig())).CompletionGatewaySummary;
                 TitleText.Text = "All set!";
                 SubtitleText.Text = "OpenClaw is ready to go";
                 ErrorCard.Visibility = Visibility.Collapsed;
                 HelpLink.Visibility = Visibility.Collapsed;
+                SummaryPanel.Visibility = Visibility.Visible;
             }
             else
             {
@@ -48,6 +51,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
                     : "Follow the steps below to resolve the setup issue and retry.";
                 NodeModeBanner.Visibility = Visibility.Collapsed;
                 StartupRow.Visibility = Visibility.Collapsed;
+                SummaryPanel.Visibility = Visibility.Collapsed;
                 LaunchButton.Content = "Close";
 
                 // Show error card with details and log link
@@ -90,23 +94,11 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
         return Uri.TryCreate(match.Value, UriKind.Absolute, out var uri) ? uri : null;
     }
 
-    private void OnLoaded(object sender, RoutedEventArgs e)
-    {
-        // Style the Node Mode banner with amber/brown background
-        var isDark = ActualTheme == ElementTheme.Dark;
-        NodeModeBanner.Background = new SolidColorBrush(isDark
-            ? Color.FromArgb(255, 0x4A, 0x3D, 0x10) // dark amber
-            : Color.FromArgb(255, 0xF5, 0xE6, 0xB8)); // light amber
-
-        // Default startup toggle to off (user can enable)
-        StartupToggle.IsOn = false;
-    }
-
     private void LaunchButton_Click(object sender, RoutedEventArgs e)
     {
         if (LaunchButton.Content?.ToString() != "Close")
         {
-            var enableAutoStart = StartupToggle.Visibility == Visibility.Visible && StartupToggle.IsOn;
+            var enableAutoStart = StartupRow.Visibility == Visibility.Visible && StartupToggle.IsOn;
             if (SetupWindow.Active?.RequestSetupCompleted(enableAutoStart) == true)
                 return;
         }
diff --git a/src/OpenClaw.SetupEngine.UI/Pages/PermissionsPage.xaml b/src/OpenClaw.SetupEngine.UI/Pages/PermissionsPage.xaml
deleted file mode 100644
index c153f3738..000000000
--- a/src/OpenClaw.SetupEngine.UI/Pages/PermissionsPage.xaml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Page
-    x:Class="OpenClaw.SetupEngine.UI.Pages.PermissionsPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    NavigationCacheMode="Disabled">
-
-    <Grid RowDefinitions="Auto,*,Auto" Padding="48,28,48,28">
-
-        <!-- Header -->
-        <StackPanel Grid.Row="0" Spacing="12" HorizontalAlignment="Center">
-            <TextBlock Text="Grant permissions"
-                       FontSize="28" FontWeight="SemiBold"
-                       HorizontalAlignment="Center" />
-            <TextBlock TextWrapping="Wrap" TextAlignment="Center"
-                       FontSize="14" Opacity="0.7" MaxWidth="480"
-                       HorizontalAlignment="Center"
-                       Text="OpenClaw works best when it can send notifications, access your camera and microphone, capture your screen, and know your location. Grant permissions below." />
-        </StackPanel>
-
-        <!-- Permission rows -->
-        <StackPanel x:Name="PermRows" Grid.Row="1" Spacing="8" Margin="0,24,0,0"
-                    VerticalAlignment="Top" />
-
-        <!-- Bottom: Refresh + Wizard + Next -->
-        <StackPanel Grid.Row="2" Spacing="12">
-            <Button x:Name="RefreshButton" HorizontalAlignment="Right"
-                    Padding="12,8,12,8" Click="Refresh_Click">
-                <StackPanel Orientation="Horizontal" Spacing="8">
-                    <TextBlock Text="&#xE72C;" FontFamily="{ThemeResource SymbolThemeFontFamily}" FontSize="14"
-                               VerticalAlignment="Center" />
-                    <TextBlock Text="Refresh status" FontSize="13" VerticalAlignment="Center" />
-                </StackPanel>
-            </Button>
-
-            <Button Content="Back to gateway wizard"
-                    HorizontalAlignment="Stretch"
-                    Height="40"
-                    Click="BackToWizard_Click" />
-
-            <Button Content="Next"
-                    HorizontalAlignment="Stretch"
-                    Height="44" FontSize="15" FontWeight="SemiBold"
-                    Click="Next_Click">
-                <Button.Resources>
-                    <SolidColorBrush x:Key="ButtonBackground" Color="#60C8F8" />
-                    <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="#52B0DA" />
-                    <SolidColorBrush x:Key="ButtonBackgroundPressed" Color="#469BBC" />
-                    <SolidColorBrush x:Key="ButtonForeground" Color="Black" />
-                    <SolidColorBrush x:Key="ButtonForegroundPointerOver" Color="Black" />
-                    <SolidColorBrush x:Key="ButtonForegroundPressed" Color="Black" />
-                </Button.Resources>
-            </Button>
-        </StackPanel>
-
-    </Grid>
-</Page>
diff --git a/src/OpenClaw.SetupEngine.UI/Pages/PermissionsPage.xaml.cs b/src/OpenClaw.SetupEngine.UI/Pages/PermissionsPage.xaml.cs
deleted file mode 100644
index 2e152a7de..000000000
--- a/src/OpenClaw.SetupEngine.UI/Pages/PermissionsPage.xaml.cs
+++ /dev/null
@@ -1,229 +0,0 @@
-using Microsoft.UI;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using OpenClaw.SetupEngine.UI;
-using Microsoft.Win32;
-using Windows.Devices.Enumeration;
-using Windows.Graphics.Capture;
-using Windows.UI;
-
-namespace OpenClaw.SetupEngine.UI.Pages;
-
-public sealed partial class PermissionsPage : Page
-{
-    private SetupConfig? _config;
-
-    private record PermDef(string Name, string Glyph, string SettingsUri, Func<Task<(string Status, bool Granted)>> Check);
-
-    private static readonly PermDef[] Permissions =
-    [
-        new("Notifications", "\uEA8F", "ms-settings:notifications", CheckNotificationsAsync),
-        new("Camera", "\uE722", "ms-settings:privacy-webcam", CheckCameraAsync),
-        new("Microphone", "\uE720", "ms-settings:privacy-microphone", CheckMicrophoneAsync),
-        new("Location (optional)", "\uE81D", "ms-settings:privacy-location", CheckLocationAsync),
-        new("Screen Capture", "\uE7F4", "", CheckScreenCaptureAsync),
-    ];
-
-    public PermissionsPage()
-    {
-        InitializeComponent();
-    }
-
-    protected override void OnNavigatedTo(NavigationEventArgs e)
-    {
-        _config = e.Parameter as SetupConfig ?? new SetupConfig();
-        _ = RefreshPermissions();
-    }
-
-    private async Task RefreshPermissions()
-    {
-        PermRows.Children.Clear();
-        var isDark = ActualTheme == ElementTheme.Dark;
-        var cardBg = new SolidColorBrush(isDark
-            ? Color.FromArgb(255, 0x2C, 0x2C, 0x2C)
-            : Color.FromArgb(255, 0xF5, 0xF5, 0xF5));
-
-        foreach (var perm in Permissions)
-        {
-            var (status, granted) = await perm.Check();
-            PermRows.Children.Add(BuildRow(perm, status, granted, cardBg, isDark));
-        }
-    }
-
-    private static FrameworkElement BuildRow(PermDef perm, string status, bool granted, Brush cardBg, bool isDark)
-    {
-        var statusColor = granted
-            ? Color.FromArgb(255, 0x2B, 0xC3, 0x6F)  // green
-            : Color.FromArgb(255, 0xF4, 0xA6, 0xB0); // pink
-
-        // Icon badge
-        var iconBadge = new Border
-        {
-            Width = 40, Height = 40,
-            CornerRadius = new CornerRadius(20),
-            Background = isDark
-                ? new SolidColorBrush(Microsoft.UI.Colors.Transparent)
-                : new SolidColorBrush(Color.FromArgb(255, 0x33, 0x33, 0x33)),
-            Child = new TextBlock
-            {
-                Text = perm.Glyph,
-                FontFamily = IconFonts.SymbolThemeFontFamily,
-                FontSize = 20,
-                Foreground = new SolidColorBrush(isDark ? Microsoft.UI.Colors.White : Microsoft.UI.Colors.White),
-                HorizontalAlignment = HorizontalAlignment.Center,
-                VerticalAlignment = VerticalAlignment.Center,
-            },
-            VerticalAlignment = VerticalAlignment.Center,
-            Margin = new Thickness(0, 0, 16, 0),
-        };
-
-        // Title + status
-        var textStack = new StackPanel { Spacing = 2, VerticalAlignment = VerticalAlignment.Center };
-        textStack.Children.Add(new TextBlock { Text = perm.Name, FontSize = 15, FontWeight = Microsoft.UI.Text.FontWeights.SemiBold });
-        textStack.Children.Add(new TextBlock { Text = status, FontSize = 13, Foreground = new SolidColorBrush(statusColor) });
-
-        // Open Settings button (only if URI exists)
-        FrameworkElement actionCol;
-        if (!string.IsNullOrEmpty(perm.SettingsUri))
-        {
-            var btn = new Button
-            {
-                Padding = new Thickness(8, 6, 8, 6),
-                Background = new SolidColorBrush(Microsoft.UI.Colors.Transparent),
-                BorderBrush = new SolidColorBrush(Microsoft.UI.Colors.Transparent),
-            };
-            var btnContent = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 6 };
-            btnContent.Children.Add(new TextBlock
-            {
-                Text = "\uE8A7", FontFamily = IconFonts.SymbolThemeFontFamily,
-                FontSize = 14, VerticalAlignment = VerticalAlignment.Center
-            });
-            btnContent.Children.Add(new TextBlock { Text = "Open Settings", FontSize = 13, VerticalAlignment = VerticalAlignment.Center });
-            btn.Content = btnContent;
-            var uri = perm.SettingsUri;
-            btn.Click += async (_, _) =>
-            {
-                try { await Windows.System.Launcher.LaunchUriAsync(new Uri(uri)); }
-                // slopwatch-ignore: SW003 UI helper action is best-effort and failure should not break the owning UI flow.
-                catch { /* best effort */ }
-            };
-            actionCol = btn;
-        }
-        else
-        {
-            actionCol = new Border { Width = 1 };
-        }
-
-        var grid = new Grid
-        {
-            ColumnDefinitions =
-            {
-                new ColumnDefinition { Width = GridLength.Auto },
-                new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) },
-                new ColumnDefinition { Width = GridLength.Auto },
-            },
-            VerticalAlignment = VerticalAlignment.Center,
-        };
-        Grid.SetColumn(iconBadge, 0);
-        Grid.SetColumn(textStack, 1);
-        Grid.SetColumn(actionCol, 2);
-        grid.Children.Add(iconBadge);
-        grid.Children.Add(textStack);
-        grid.Children.Add(actionCol);
-
-        return new Border
-        {
-            Child = grid,
-            Background = cardBg,
-            CornerRadius = new CornerRadius(8),
-            Padding = new Thickness(20, 18, 20, 18),
-        };
-    }
-
-    private void Refresh_Click(object sender, RoutedEventArgs e) => _ = RefreshPermissions();
-
-    private void BackToWizard_Click(object sender, RoutedEventArgs e)
-        => SetupWindow.Active?.NavigateToWizard();
-
-    private void Next_Click(object sender, RoutedEventArgs e)
-        => SetupWindow.Active?.NavigateToComplete(true, TimeSpan.Zero, null);
-
-    // ── Permission checks (passive, no OS consent dialogs) ──
-
-    private static Task<(string, bool)> CheckNotificationsAsync()
-    {
-        try
-        {
-            using var key = Registry.CurrentUser.OpenSubKey(
-                @"Software\Microsoft\Windows\CurrentVersion\PushNotifications");
-            if (key?.GetValue("ToastEnabled") is int val && val == 0)
-                return Task.FromResult(("Disabled", false));
-            return Task.FromResult(("Enabled", true));
-        }
-        catch
-        {
-            return Task.FromResult(("Unable to check", false));
-        }
-    }
-
-    private static async Task<(string, bool)> CheckCameraAsync()
-    {
-        try
-        {
-            var devices = await DeviceInformation.FindAllAsync(DeviceClass.VideoCapture);
-            if (devices.Count == 0) return ("No camera detected", false);
-            var access = DeviceAccessInformation.CreateFromDeviceClass(DeviceClass.VideoCapture);
-            return access.CurrentStatus == DeviceAccessStatus.Allowed
-                ? ("Allowed", true)
-                : ("Denied — open Settings to allow", false);
-        }
-        catch { return ("Unable to check", false); }
-    }
-
-    private static async Task<(string, bool)> CheckMicrophoneAsync()
-    {
-        try
-        {
-            var devices = await DeviceInformation.FindAllAsync(DeviceClass.AudioCapture);
-            if (devices.Count == 0) return ("No microphone detected", false);
-            var access = DeviceAccessInformation.CreateFromDeviceClass(DeviceClass.AudioCapture);
-            return access.CurrentStatus == DeviceAccessStatus.Allowed
-                ? ("Allowed", true)
-                : ("Denied — open Settings to allow", false);
-        }
-        catch { return ("Unable to check", false); }
-    }
-
-    private static Task<(string, bool)> CheckLocationAsync()
-    {
-        try
-        {
-            using var sysKey = Registry.LocalMachine.OpenSubKey(
-                @"SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\location");
-            if (sysKey?.GetValue("Value") is string sv && sv.Equals("Deny", StringComparison.OrdinalIgnoreCase))
-                return Task.FromResult(("Location services disabled", false));
-
-            using var userKey = Registry.CurrentUser.OpenSubKey(
-                @"SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\location");
-            var uv = userKey?.GetValue("Value") as string;
-            if (uv != null && uv.Equals("Deny", StringComparison.OrdinalIgnoreCase))
-                return Task.FromResult(("Disabled for this user", false));
-
-            return Task.FromResult(("Location services enabled", true));
-        }
-        catch { return Task.FromResult(("Unable to check", false)); }
-    }
-
-    private static Task<(string, bool)> CheckScreenCaptureAsync()
-    {
-        try
-        {
-            return Task.FromResult(GraphicsCaptureSession.IsSupported()
-                ? ("Available — uses picker per capture", true)
-                : ("Not supported on this device", false));
-        }
-        catch { return Task.FromResult(("Unable to check", false)); }
-    }
-}
diff --git a/src/OpenClaw.SetupEngine.UI/Pages/ProgressPage.xaml b/src/OpenClaw.SetupEngine.UI/Pages/ProgressPage.xaml
index cff2dd1fb..2526d26aa 100644
--- a/src/OpenClaw.SetupEngine.UI/Pages/ProgressPage.xaml
+++ b/src/OpenClaw.SetupEngine.UI/Pages/ProgressPage.xaml
@@ -7,62 +7,116 @@
 
     <Grid RowDefinitions="Auto,*,Auto">
 
-        <!-- Header -->
-        <StackPanel Grid.Row="0" Padding="56,24,56,0" Spacing="4">
-            <Image Source="ms-appx:///OpenClaw.SetupEngine.UI/Assets/Setup/Lobster.png" Width="44" Height="44"
-                   HorizontalAlignment="Center" Margin="0,0,0,2" />
-            <TextBlock Text="Setting up locally"
-                       FontSize="26" FontWeight="SemiBold"
+        <StackPanel x:Name="InstallHeader" Grid.Row="0" Padding="48,14,48,0" Spacing="8">
+            <Image Source="ms-appx:///OpenClaw.SetupEngine.UI/Assets/Setup/OpenClawMascot.png" Width="44" Height="44"
+                   HorizontalAlignment="Center" Margin="0,0,0,2"
+                   AutomationProperties.AccessibilityView="Raw" />
+            <TextBlock Text="Setting up WSL gateway"
+                       Style="{StaticResource TitleTextBlockStyle}"
                        HorizontalAlignment="Center" />
             <TextBlock x:Name="SubtitleText"
-                       FontSize="13" Opacity="0.6"
+                       Style="{StaticResource CaptionTextBlockStyle}"
+                       Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                       AutomationProperties.LiveSetting="Polite"
                        HorizontalAlignment="Center" />
         </StackPanel>
 
-        <!-- Step rows -->
-        <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto">
-            <StackPanel x:Name="StepsPanel"
-                        Padding="56,24,56,12" Spacing="18"
-                        VerticalAlignment="Top">
-                <!-- Populated in code-behind -->
+        <ScrollViewer x:Name="InstallContent" Grid.Row="1" VerticalScrollBarVisibility="Auto">
+            <StackPanel Padding="48,12,48,16" Spacing="16" VerticalAlignment="Top">
+
+                <StackPanel x:Name="StepsPanel" Spacing="2" />
+
+                <Expander IsExpanded="False"
+                          HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch"
+                          Header="Live activity">
+                    <Grid RowDefinitions="*,Auto">
+                        <Border Grid.Row="0" CornerRadius="4" MinHeight="160" MaxHeight="200" Padding="12,8"
+                                Background="{ThemeResource SubtleFillColorSecondaryBrush}"
+                                BorderThickness="1" BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}">
+                            <ScrollViewer x:Name="LogScroller"
+                                          VerticalScrollBarVisibility="Auto"
+                                          HorizontalScrollBarVisibility="Auto">
+                                <TextBlock x:Name="LogText"
+                                           FontFamily="Cascadia Mono, Consolas"
+                                           FontSize="12"
+                                           Foreground="{ThemeResource TextFillColorPrimaryBrush}"
+                                           TextWrapping="NoWrap"
+                                           IsTextSelectionEnabled="True" />
+                            </ScrollViewer>
+                        </Border>
+                        <HyperlinkButton x:Name="OpenLogButton" Grid.Row="1"
+                                Content="Open log file" FontSize="12"
+                                HorizontalAlignment="Right" Margin="0,4,0,0"
+                                Click="OpenLog_Click" Padding="6,2" />
+                    </Grid>
+                </Expander>
+
             </StackPanel>
         </ScrollViewer>
 
-        <!-- Log viewer (bottom panel) -->
-        <Grid Grid.Row="2" Padding="24,0,24,16">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-
-            <Border x:Name="LogPanel" Grid.Row="0"
-                    CornerRadius="6" Padding="12,8,12,8"
-                    Height="200" Visibility="Collapsed"
-                    Margin="0,0,0,8">
-                <ScrollViewer x:Name="LogScroller"
-                              VerticalScrollBarVisibility="Auto"
-                              HorizontalScrollBarVisibility="Auto">
-                    <TextBlock x:Name="LogText"
-                               FontFamily="Consolas"
-                               FontSize="11"
-                               TextWrapping="NoWrap"
-                               IsTextSelectionEnabled="True" />
-                </ScrollViewer>
+        <StackPanel x:Name="MilestonePanel" Grid.Row="1" Visibility="Collapsed"
+                    VerticalAlignment="Center" HorizontalAlignment="Center"
+                    Spacing="16" MaxWidth="480" Padding="48,0">
+            <Grid Width="100" Height="100" HorizontalAlignment="Center" Margin="0,0,0,4">
+                <Image Source="ms-appx:///OpenClaw.SetupEngine.UI/Assets/Setup/OpenClawMascot.png"
+                       Width="100" Height="100"
+                       AutomationProperties.AccessibilityView="Raw" />
+                <Border Width="36" Height="36" CornerRadius="18"
+                        HorizontalAlignment="Right" VerticalAlignment="Bottom"
+                        Background="{ThemeResource SystemFillColorSuccessBrush}"
+                        BorderBrush="{ThemeResource SolidBackgroundFillColorBaseBrush}" BorderThickness="3">
+                    <FontIcon Glyph="&#xE73E;" FontSize="16" IsTextScaleFactorEnabled="False"
+                              Foreground="#FFFFFF"
+                              HorizontalAlignment="Center" VerticalAlignment="Center"
+                              AutomationProperties.AccessibilityView="Raw" />
+                </Border>
+            </Grid>
+            <StackPanel Spacing="6">
+                <TextBlock Text="Gateway installed"
+                           Style="{StaticResource TitleTextBlockStyle}"
+                           HorizontalAlignment="Center" TextAlignment="Center"
+                           AutomationProperties.LiveSetting="Assertive" />
+                <TextBlock Text="Your private OpenClaw gateway is up and running on this PC."
+                           Style="{StaticResource BodyTextBlockStyle}"
+                           Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                           HorizontalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" />
+                <TextBlock x:Name="MilestoneStatusText"
+                           Style="{StaticResource CaptionTextBlockStyle}"
+                           Foreground="{ThemeResource SystemFillColorCriticalBrush}"
+                           AutomationProperties.LiveSetting="Assertive"
+                           HorizontalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" />
+            </StackPanel>
+            <Border Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                    BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}" BorderThickness="1"
+                    CornerRadius="4" Padding="16,14" HorizontalAlignment="Stretch">
+                <Grid ColumnDefinitions="Auto,*" ColumnSpacing="14">
+                    <FontIcon Grid.Column="0" Glyph="&#xE72A;" FontSize="18" IsTextScaleFactorEnabled="False"
+                              Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}" VerticalAlignment="Center" />
+                    <StackPanel Grid.Column="1" Spacing="2">
+                        <TextBlock Text="Up next: OpenClaw onboard" Style="{StaticResource BodyStrongTextBlockStyle}" />
+                        <TextBlock Text="A few quick questions — choose your AI provider, model, and key — to connect your agent."
+                                   Style="{StaticResource CaptionTextBlockStyle}"
+                                   Foreground="{ThemeResource TextFillColorSecondaryBrush}" TextWrapping="Wrap" />
+                    </StackPanel>
+                </Grid>
             </Border>
+        </StackPanel>
 
-            <Grid Grid.Row="1" ColumnDefinitions="*,Auto,Auto" ColumnSpacing="8">
-                <Button x:Name="OpenLogButton"
-                        Grid.Column="1"
-                        Content="Open log" FontSize="12"
-                        Visibility="Collapsed"
-                        Click="OpenLog_Click"
-                        Padding="8,4,8,4" />
-                <Button x:Name="LogToggleButton"
-                        Grid.Column="2"
-                        Content="Show logs ▲" FontSize="12"
-                        Click="LogToggle_Click"
-                        Padding="8,4,8,4" />
-            </Grid>
+        <Grid Grid.Row="2" ColumnDefinitions="*,Auto" Margin="0,12,0,16">
+            <StackPanel x:Name="DotsPanel" Grid.ColumnSpan="2" Orientation="Horizontal" Spacing="8"
+                        HorizontalAlignment="Center" VerticalAlignment="Center"
+                        IsTabStop="False" AutomationProperties.Name="Step 4 of 6">
+                <Border Width="8" Height="8" CornerRadius="4" VerticalAlignment="Center" Background="{ThemeResource SetupInactiveDotBrush}" />
+                <Border Width="8" Height="8" CornerRadius="4" VerticalAlignment="Center" Background="{ThemeResource SetupInactiveDotBrush}" />
+                <Border Width="8" Height="8" CornerRadius="4" VerticalAlignment="Center" Background="{ThemeResource SetupInactiveDotBrush}" />
+                <Border Width="20" Height="8" CornerRadius="4" VerticalAlignment="Center" Background="{ThemeResource SetupIndicatorAccentBrush}" />
+                <Border Width="8" Height="8" CornerRadius="4" VerticalAlignment="Center" Background="{ThemeResource SetupInactiveDotBrush}" />
+                <Border Width="8" Height="8" CornerRadius="4" VerticalAlignment="Center" Background="{ThemeResource SetupInactiveDotBrush}" />
+            </StackPanel>
+            <Button x:Name="OnboardButton" Grid.Column="1" Content="Start OpenClaw onboard"
+                    Visibility="Collapsed" MinWidth="100" HorizontalAlignment="Right"
+                    Margin="48,0" Style="{StaticResource AccentButtonStyle}"
+                    Click="Onboard_Click" />
         </Grid>
 
     </Grid>
diff --git a/src/OpenClaw.SetupEngine.UI/Pages/ProgressPage.xaml.cs b/src/OpenClaw.SetupEngine.UI/Pages/ProgressPage.xaml.cs
index ad9a6694c..1b075bc48 100644
--- a/src/OpenClaw.SetupEngine.UI/Pages/ProgressPage.xaml.cs
+++ b/src/OpenClaw.SetupEngine.UI/Pages/ProgressPage.xaml.cs
@@ -1,4 +1,5 @@
 using System.Diagnostics;
+using Microsoft.UI;
 using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
@@ -10,6 +11,12 @@
 
 namespace OpenClaw.SetupEngine.UI.Pages;
 
+internal sealed record ProgressPageArgs(
+    SetupConfig Config,
+    bool ShowMilestoneOnly,
+    string DataDir,
+    string LocalDataDir);
+
 public sealed partial class ProgressPage : Page
 {
     private SetupConfig? _config;
@@ -17,11 +24,14 @@ public sealed partial class ProgressPage : Page
     private SetupLogger? _logger;
     private CancellationTokenSource? _runCts;
     private readonly Dictionary<string, StepRow> _rows = new();
-    private bool _logExpanded;
     private int _logLineCount;
     private bool _pipelineFinished;
+    private string _dataDir = null!;
+    private string _localDataDir = null!;
     private const int MaxLogLines = 200;
 
+    internal bool IsPipelineRunning => _runCts != null && !_pipelineFinished;
+
     // Map pipeline step IDs to display groups (N:1)
     private static readonly (string GroupId, string DisplayName, string[] StepIds)[] StepGroups =
     [
@@ -45,13 +55,57 @@ public ProgressPage()
 
     protected override void OnNavigatedTo(NavigationEventArgs e)
     {
-        _config = e.Parameter as SetupConfig ?? new SetupConfig();
+        var args = e.Parameter as ProgressPageArgs;
+        _config = args?.Config ?? e.Parameter as SetupConfig ?? new SetupConfig();
+        _dataDir = args?.DataDir ?? SetupContext.ResolveDataDir();
+        _localDataDir = args?.LocalDataDir ?? SetupContext.ResolveLocalDataDir();
         SubtitleText.Text = $"Creating {_config.DistroName} WSL instance";
 
         BuildStepRows();
+        if (args?.ShowMilestoneOnly == true)
+        {
+            foreach (var (groupId, _, _) in StepGroups)
+                if (_rows.TryGetValue(groupId, out var row))
+                    row.SetStatus(StepStatus.Done);
+            ShowGatewayInstalledMilestone();
+            return;
+        }
+
+        if (SetupPreview.IsActive)
+        {
+            if (SetupPreview.RequestedPage == "milestone")
+            {
+                foreach (var (groupId, _, _) in StepGroups)
+                    if (_rows.TryGetValue(groupId, out var row))
+                        row.SetStatus(StepStatus.Done);
+                ShowGatewayInstalledMilestone();
+                return;
+            }
+            RenderProgressPreview();
+            return;
+        }
         StartPipeline();
     }
 
+    private void RenderProgressPreview()
+    {
+        SubtitleText.Text = "Creating OpenClawGateway WSL instance — about 4 minutes left";
+        var ids = StepGroups.Select(g => g.GroupId).ToArray();
+        for (int i = 0; i < ids.Length; i++)
+        {
+            var status = i < 3 ? StepStatus.Done : i == 3 ? StepStatus.Running : StepStatus.Idle;
+            if (_rows.TryGetValue(ids[i], out var row))
+                row.SetStatus(status);
+        }
+        LogText.Text =
+            "[12:04:01] [info] Windows 11 26100 · WSL 2 present\n" +
+            "[12:04:03] [info] port 127.0.0.1:18789 available\n" +
+            "[12:04:05] [info] wsl --install -d Ubuntu-24.04 --name OpenClawGateway --no-launch\n" +
+            "[12:04:38] [info] downloading distro … 142/200 MB\n" +
+            "[12:04:38] [changed] created %LOCALAPPDATA%\\OpenClawTray\\wsl\\OpenClawGateway\\\n" +
+            "[12:04:38] [info] next: install CLI via HTTPS, configure loopback gateway\n";
+    }
+
     private void BuildStepRows()
     {
         foreach (var (groupId, displayName, _) in StepGroups)
@@ -75,8 +129,7 @@ private async Task StartPipelineAsync()
             return;
 
         config.LogPath ??= Path.Combine(
-            Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
-            "OpenClawTray", "Logs", "Setup", $"setup-engine-{DateTime.UtcNow:yyyyMMdd-HHmmss}.jsonl");
+            _dataDir, "Logs", "Setup", $"setup-engine-{DateTime.UtcNow:yyyyMMdd-HHmmss}.jsonl");
 
         var sw = Stopwatch.StartNew();
         using var cts = new CancellationTokenSource();
@@ -92,7 +145,14 @@ private async Task StartPipelineAsync()
             var journalPath = Path.ChangeExtension(config.LogPath, ".journal.jsonl");
             using var journal = new TransactionJournal(journalPath);
             var commands = new CommandRunner(_logger);
-            var ctx = new SetupContext(config, _logger, journal, commands, cts.Token);
+            var ctx = new SetupContext(
+                config,
+                _logger,
+                journal,
+                commands,
+                cts.Token,
+                _dataDir,
+                _localDataDir);
 
             var steps = BuildSteps(config);
             _pipeline = new SetupPipeline(steps);
@@ -108,16 +168,16 @@ private async Task StartPipelineAsync()
                 if (!config.SkipWizard)
                 {
                     if (_rows.TryGetValue("finish", out var finishRow))
-                        finishRow.SetStatus(StepStatus.Running);
-                    SubtitleText.Text = "Opening gateway setup...";
-                    await Task.Delay(900);
-                    finishRow?.SetStatus(StepStatus.Done);
-                    SetupWindow.Active?.NavigateToWizard();
+                        finishRow.SetStatus(StepStatus.Done);
+                    // Pause on a "Gateway installed" milestone so the user knowingly steps
+                    // from install (gateway provisioning) into onboarding (the OpenClaw wizard),
+                    // instead of being thrown straight into the questions.
+                    ShowGatewayInstalledMilestone();
                 }
-                else if (config.SkipPermissions)
-                    SetupWindow.Active?.NavigateToComplete(true, sw.Elapsed, config.LogPath);
                 else
-                    SetupWindow.Active?.NavigateToPermissions();
+                    // Permissions are now surfaced inline on the capabilities screen, so
+                    // the standalone permissions step is skipped — go straight to done.
+                    SetupWindow.Active?.NavigateToComplete(true, sw.Elapsed, config.LogPath);
             }
             else
             {
@@ -229,27 +289,34 @@ private void OnLogEmitted(object? sender, LogEntry entry)
         });
     }
 
-    private void LogToggle_Click(object sender, RoutedEventArgs e)
+    private void OpenLog_Click(object sender, RoutedEventArgs e)
     {
-        _logExpanded = !_logExpanded;
-        LogPanel.Visibility = _logExpanded ? Visibility.Visible : Visibility.Collapsed;
-        OpenLogButton.Visibility = _logExpanded ? Visibility.Visible : Visibility.Collapsed;
-        LogToggleButton.Content = _logExpanded ? "Hide logs ▼" : "Show logs ▲";
-
-        var isDark = ActualTheme == ElementTheme.Dark;
-        LogPanel.Background = new SolidColorBrush(isDark
-            ? Color.FromArgb(255, 0x1A, 0x1A, 0x1A)
-            : Color.FromArgb(255, 0xF8, 0xF8, 0xF8));
+        LogFileLauncher.RevealInExplorer(_config?.LogPath);
     }
 
-    private void OpenLog_Click(object sender, RoutedEventArgs e)
+    // Swap the install UI for a "Gateway installed" milestone with an explicit
+    // onboard CTA. The gateway keeps running (WSL keepalive), so the wizard
+    // connects when the user chooses to continue.
+    private void ShowGatewayInstalledMilestone()
     {
-        LogFileLauncher.RevealInExplorer(_config?.LogPath);
+        InstallHeader.Visibility = Visibility.Collapsed;
+        InstallContent.Visibility = Visibility.Collapsed;
+        MilestonePanel.Visibility = Visibility.Visible;
+        OnboardButton.Visibility = Visibility.Visible;
+    }
+
+    private void Onboard_Click(object sender, RoutedEventArgs e)
+    {
+        if (SetupWindow.Active?.TryNavigateToWizard() == true)
+            return;
+
+        MilestoneStatusText.Text = "Another setup task is still active. Wait for it to finish, then start OpenClaw onboard.";
     }
 
     private static List<SetupStep> BuildSteps(SetupConfig config)
         => SetupStepFactory.BuildDefaultSteps()
             .Where(step => step is not RunGatewayWizardStep)
+            .Where(step => config.SkipWizard || step is not WindowsNodeBootstrapContextStep)
             .ToList();
 }
 
@@ -267,36 +334,41 @@ internal sealed class StepRow
     private readonly Border _idleBadge;
     private readonly Border _checkBadge;
     private readonly Border _errorBadge;
+    private readonly Border _rowBorder;
 
     public StepRow(string displayName)
     {
         _label = new TextBlock
         {
             Text = displayName,
-            FontSize = 16,
+            FontSize = 14,
             VerticalAlignment = VerticalAlignment.Center,
         };
 
+        // Bare Windows spinner (no filled disc) — theme-neutral so it reads white
+        // on the dark active row and dark on light, like a standard ProgressRing.
         _spinner = new ProgressRing
         {
-            Width = 28, Height = 28,
-            MinWidth = 28, MinHeight = 28,
+            Width = 20, Height = 20,
+            MinWidth = 20, MinHeight = 20,
             IsActive = false,
             Visibility = Visibility.Collapsed,
         };
+        if (Application.Current.Resources.TryGetValue("TextFillColorPrimaryBrush", out var spinnerFg) && spinnerFg is Brush spinnerBrush)
+            _spinner.Foreground = spinnerBrush;
 
         _idleBadge = CreateEmptyBadge();
 
-        _checkBadge = CreateIconBadge("\uE73E", Color.FromArgb(255, 0x2B, 0xC3, 0x6F), Color.FromArgb(255, 255, 255, 255));
+        _checkBadge = CreateIconBadge("\uE73E", ResolveColor("SystemFillColorSuccess", Color.FromArgb(255, 0x2B, 0xC3, 0x6F)), Colors.White);
         _checkBadge.Visibility = Visibility.Collapsed;
 
-        _errorBadge = CreateIconBadge("\uE711", Color.FromArgb(255, 0xE8, 0x11, 0x23), Color.FromArgb(255, 255, 255, 255));
+        _errorBadge = CreateIconBadge("\uE711", ResolveColor("SystemFillColorCritical", Color.FromArgb(255, 0xE8, 0x11, 0x23)), Colors.White);
         _errorBadge.Visibility = Visibility.Collapsed;
 
         var badgeContainer = new Grid
         {
-            Width = 32,
-            Height = 32,
+            Width = 24,
+            Height = 24,
             HorizontalAlignment = HorizontalAlignment.Center,
             VerticalAlignment = VerticalAlignment.Center,
         };
@@ -314,7 +386,17 @@ public StepRow(string displayName)
         grid.Children.Add(_label);
         grid.Children.Add(badgeContainer);
 
-        Element = grid;
+        _rowBorder = new Border
+        {
+            Child = grid,
+            CornerRadius = new CornerRadius(4),
+            Padding = new Thickness(12, 5, 12, 5),
+            BorderThickness = new Thickness(1),
+            BorderBrush = new SolidColorBrush(Colors.Transparent),
+            Background = new SolidColorBrush(Colors.Transparent),
+        };
+
+        Element = _rowBorder;
     }
 
     public void SetStatus(StepStatus status)
@@ -329,18 +411,31 @@ public void SetStatus(StepStatus status)
         _label.FontWeight = status == StepStatus.Running
             ? Microsoft.UI.Text.FontWeights.SemiBold
             : Microsoft.UI.Text.FontWeights.Normal;
+
+        // Highlight the active step with the setup accent while it is running.
+        if (status == StepStatus.Running
+            && Application.Current.Resources.TryGetValue("SetupIndicatorAccentBrush", out var accent)
+            && accent is SolidColorBrush accentBrush)
+        {
+            var c = accentBrush.Color;
+            _rowBorder.Background = new SolidColorBrush(Color.FromArgb(28, c.R, c.G, c.B));
+            _rowBorder.BorderBrush = new SolidColorBrush(Color.FromArgb(110, c.R, c.G, c.B));
+        }
+        else
+        {
+            _rowBorder.Background = new SolidColorBrush(Colors.Transparent);
+            _rowBorder.BorderBrush = new SolidColorBrush(Colors.Transparent);
+        }
     }
 
     private static Border CreateEmptyBadge()
     {
-        // Use a theme-aware stroke brush so the pending-step ring is visible
-        // in both light and dark mode. The previous hard-coded translucent
-        // white was invisible against light backgrounds.
+        // Use a theme-aware stroke so the pending-step ring stays visible in every theme.
         var border = new Border
         {
-            Width = 22,
-            Height = 22,
-            CornerRadius = new CornerRadius(11),
+            Width = 20,
+            Height = 20,
+            CornerRadius = new CornerRadius(10),
             BorderThickness = new Thickness(1),
         };
 
@@ -361,14 +456,14 @@ private static Border CreateIconBadge(string glyph, Color background, Color fore
     {
         return new Border
         {
-            Width = 22,
-            Height = 22,
-            CornerRadius = new CornerRadius(11),
+            Width = 20,
+            Height = 20,
+            CornerRadius = new CornerRadius(10),
             Background = new SolidColorBrush(background),
             Child = new FontIcon
             {
                 Glyph = glyph,
-                FontSize = 12,
+                FontSize = 11,
                 FontFamily = IconFonts.SymbolThemeFontFamily,
                 Foreground = new SolidColorBrush(foreground),
                 HorizontalAlignment = HorizontalAlignment.Center,
@@ -376,4 +471,8 @@ private static Border CreateIconBadge(string glyph, Color background, Color fore
             }
         };
     }
+
+    // Resolve a native Color theme resource (e.g. SystemFillColorSuccess) with a fallback.
+    private static Color ResolveColor(string key, Color fallback) =>
+        Application.Current.Resources.TryGetValue(key, out var v) && v is Color c ? c : fallback;
 }
diff --git a/src/OpenClaw.SetupEngine.UI/Pages/SecurityNoticePage.xaml b/src/OpenClaw.SetupEngine.UI/Pages/SecurityNoticePage.xaml
new file mode 100644
index 000000000..7d932338d
--- /dev/null
+++ b/src/OpenClaw.SetupEngine.UI/Pages/SecurityNoticePage.xaml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Page
+    x:Class="OpenClaw.SetupEngine.UI.Pages.SecurityNoticePage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    NavigationCacheMode="Disabled">
+
+    <Grid Padding="48,28,48,24" RowDefinitions="Auto,*,Auto">
+
+        <StackPanel Grid.Row="0" HorizontalAlignment="Center" Spacing="12">
+            <Image Source="ms-appx:///OpenClaw.SetupEngine.UI/Assets/Setup/OpenClawMascot.png"
+                   Width="96" Height="96" HorizontalAlignment="Center"
+                   AutomationProperties.AccessibilityView="Raw" />
+            <TextBlock Text="Welcome to OpenClaw"
+                       Style="{StaticResource TitleTextBlockStyle}"
+                       HorizontalAlignment="Center" />
+            <TextBlock TextWrapping="Wrap" TextAlignment="Center" MaxWidth="480"
+                       Style="{StaticResource BodyTextBlockStyle}"
+                       Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                       HorizontalAlignment="Center"
+                       Text="OpenClaw runs your personal AI agent through a private gateway on this PC — reachable from chat apps like WhatsApp or Telegram." />
+        </StackPanel>
+
+        <InfoBar Grid.Row="1" VerticalAlignment="Top" Margin="0,24,0,0" MaxWidth="560"
+                 IsOpen="True" IsClosable="False" Severity="Warning"
+                 Title="Security notice"
+                 Message="The AI agent you connect (for example, Claude) can take powerful actions on this PC — running commands, reading and writing files, and capturing your screen — depending on what you allow.&#x0a;&#x0a;Only set this up on a computer you trust, and only continue if you understand the risks and trust the prompts and integrations you use. You choose exactly what to allow in the next steps." />
+
+        <Grid Grid.Row="2" ColumnDefinitions="*,Auto" Margin="0,12,0,0">
+            <StackPanel Grid.ColumnSpan="2" Orientation="Horizontal" Spacing="8"
+                        HorizontalAlignment="Center" VerticalAlignment="Center"
+                        IsTabStop="False" AutomationProperties.Name="Step 1 of 6">
+                <Border Width="20" Height="8" CornerRadius="4" VerticalAlignment="Center" Background="{ThemeResource SetupIndicatorAccentBrush}" />
+                <Border Width="8" Height="8" CornerRadius="4" VerticalAlignment="Center" Background="{ThemeResource SetupInactiveDotBrush}" />
+                <Border Width="8" Height="8" CornerRadius="4" VerticalAlignment="Center" Background="{ThemeResource SetupInactiveDotBrush}" />
+                <Border Width="8" Height="8" CornerRadius="4" VerticalAlignment="Center" Background="{ThemeResource SetupInactiveDotBrush}" />
+                <Border Width="8" Height="8" CornerRadius="4" VerticalAlignment="Center" Background="{ThemeResource SetupInactiveDotBrush}" />
+                <Border Width="8" Height="8" CornerRadius="4" VerticalAlignment="Center" Background="{ThemeResource SetupInactiveDotBrush}" />
+            </StackPanel>
+            <Button Grid.Column="1" x:Name="ContinueButton" Content="Continue"
+                    MinWidth="100" HorizontalAlignment="Right"
+                    Style="{StaticResource AccentButtonStyle}"
+                    Click="Continue_Click" />
+        </Grid>
+    </Grid>
+</Page>
diff --git a/src/OpenClaw.SetupEngine.UI/Pages/SecurityNoticePage.xaml.cs b/src/OpenClaw.SetupEngine.UI/Pages/SecurityNoticePage.xaml.cs
new file mode 100644
index 000000000..93d06aec1
--- /dev/null
+++ b/src/OpenClaw.SetupEngine.UI/Pages/SecurityNoticePage.xaml.cs
@@ -0,0 +1,26 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Navigation;
+using OpenClaw.SetupEngine;
+
+namespace OpenClaw.SetupEngine.UI.Pages;
+
+public sealed partial class SecurityNoticePage : Page
+{
+    private SetupConfig? _config;
+
+    public SecurityNoticePage()
+    {
+        InitializeComponent();
+    }
+
+    protected override void OnNavigatedTo(NavigationEventArgs e)
+    {
+        _config = e.Parameter as SetupConfig ?? new SetupConfig();
+    }
+
+    private void Continue_Click(object sender, RoutedEventArgs e)
+    {
+        SetupWindow.Active?.NavigateToWelcome();
+    }
+}
diff --git a/src/OpenClaw.SetupEngine.UI/Pages/SetupPermissionHelper.cs b/src/OpenClaw.SetupEngine.UI/Pages/SetupPermissionHelper.cs
new file mode 100644
index 000000000..392944c03
--- /dev/null
+++ b/src/OpenClaw.SetupEngine.UI/Pages/SetupPermissionHelper.cs
@@ -0,0 +1,223 @@
+using Microsoft.UI;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Automation;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.Win32;
+using Windows.Devices.Enumeration;
+using Windows.Graphics.Capture;
+
+namespace OpenClaw.SetupEngine.UI.Pages;
+
+/// <summary>
+/// Shared definition + passive status checks for the Windows OS permissions surfaced
+/// during setup. Used by CapabilitiesPage so each capability shows its matching
+/// Windows permission inline.
+/// All checks are passive — they read current OS state and never trigger a consent dialog.
+/// </summary>
+internal sealed record PermDef(
+    string Id,
+    string Name,
+    string Glyph,
+    string SettingsUri,
+    Func<Task<(string Status, bool Granted)>> Check);
+
+internal static class SetupPermissionHelper
+{
+    public static readonly PermDef Notifications =
+        new("Notifications", "Notifications", "\uEA8F", "ms-settings:notifications", CheckNotificationsAsync);
+    public static readonly PermDef Camera =
+        new("Camera", "Camera", "\uE722", "ms-settings:privacy-webcam", CheckCameraAsync);
+    public static readonly PermDef Microphone =
+        new("Microphone", "Microphone", "\uE720", "ms-settings:privacy-microphone", CheckMicrophoneAsync);
+    public static readonly PermDef Location =
+        new("Location", "Location", "\uE81D", "ms-settings:privacy-location", CheckLocationAsync);
+    public static readonly PermDef ScreenCapture =
+        new("Screen", "Screen capture", "\uE7F4", "", CheckScreenCaptureAsync);
+
+    public static readonly PermDef[] All = [Notifications, Camera, Microphone, Location, ScreenCapture];
+
+    public static Brush Res(string key) =>
+        Application.Current.Resources.TryGetValue(key, out var v) && v is Brush b
+            ? b
+            : new SolidColorBrush(Colors.Gray);
+
+    private static Border Pill(string text, Brush color) => new()
+    {
+        CornerRadius = new CornerRadius(10),
+        Padding = new Thickness(10, 3, 10, 3),
+        BorderBrush = color,
+        BorderThickness = new Thickness(1),
+        VerticalAlignment = VerticalAlignment.Center,
+        Child = new TextBlock { Text = text, FontSize = 12, Foreground = color },
+    };
+
+    public static FrameworkElement BuildRow(PermDef perm, string status, bool granted)
+    {
+        var cardBg = Res("CardBackgroundFillColorDefaultBrush");
+        var cardStroke = Res("CardStrokeColorDefaultBrush");
+        var ok = Res("SystemFillColorSuccessBrush");
+        var iconFg = Res("TextFillColorPrimaryBrush");
+        var subFg = Res("TextFillColorSecondaryBrush");
+
+        var icon = new FontIcon
+        {
+            Glyph = perm.Glyph,
+            FontSize = 20,
+            Foreground = iconFg,
+            VerticalAlignment = VerticalAlignment.Center,
+            Margin = new Thickness(0, 0, 14, 0),
+            IsTextScaleFactorEnabled = false,
+        };
+
+        var textStack = new StackPanel { Spacing = 2, VerticalAlignment = VerticalAlignment.Center };
+        textStack.Children.Add(new TextBlock
+        {
+            Text = perm.Name,
+            Style = (Style)Application.Current.Resources["BodyStrongTextBlockStyle"],
+        });
+        textStack.Children.Add(new TextBlock { Text = status, FontSize = 12, Foreground = subFg });
+
+        FrameworkElement actionCol;
+        if (string.IsNullOrEmpty(perm.SettingsUri))
+        {
+            // No standing OS grant (screen capture) — the user picks what to share each time
+            // via the Windows Graphics Capture picker, so there's nothing to pre-allow here.
+            var pill = Pill(granted ? "Ask every time" : "Unavailable", subFg);
+            if (granted)
+                ToolTipService.SetToolTip(pill,
+                    "Windows has no on/off setting for screen capture. Each time the agent captures your screen, Windows shows a picker so you choose exactly what to share — there's nothing to allow in advance.");
+            actionCol = pill;
+        }
+        else if (granted)
+        {
+            actionCol = Pill("Allowed", ok);
+        }
+        else
+        {
+            var btn = new Button
+            {
+                CornerRadius = new CornerRadius(4),
+                MinWidth = 140,
+                Padding = new Thickness(12, 5, 12, 5),
+                VerticalAlignment = VerticalAlignment.Center,
+                Content = new TextBlock { Text = "Open Settings", FontSize = 12, HorizontalAlignment = HorizontalAlignment.Center },
+            };
+            AutomationProperties.SetName(btn, $"Open {perm.Name} settings");
+            var uri = perm.SettingsUri;
+            // Sync handler (no async-void lambda): launching a settings deep link is
+            // best-effort and fire-and-forget, so we don't await the operation.
+            btn.Click += (_, _) =>
+            {
+                try { _ = Windows.System.Launcher.LaunchUriAsync(new Uri(uri)); }
+                catch { /* best effort */ }
+            };
+            actionCol = btn;
+        }
+
+        var grid = new Grid
+        {
+            ColumnDefinitions =
+            {
+                new ColumnDefinition { Width = GridLength.Auto },
+                new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) },
+                new ColumnDefinition { Width = new GridLength(152) },
+            },
+            VerticalAlignment = VerticalAlignment.Center,
+        };
+        // Right-align the status/action in a fixed-width rail so chips and buttons line up.
+        if (actionCol is FrameworkElement fe)
+            fe.HorizontalAlignment = HorizontalAlignment.Right;
+        Grid.SetColumn(icon, 0);
+        Grid.SetColumn(textStack, 1);
+        Grid.SetColumn(actionCol, 2);
+        grid.Children.Add(icon);
+        grid.Children.Add(textStack);
+        grid.Children.Add(actionCol);
+
+        return new Border
+        {
+            Child = grid,
+            Background = cardBg,
+            BorderBrush = cardStroke,
+            BorderThickness = new Thickness(1),
+            CornerRadius = new CornerRadius(4),
+            Padding = new Thickness(14, 12, 14, 12),
+        };
+    }
+
+    public static Task<(string, bool)> CheckNotificationsAsync()
+    {
+        try
+        {
+            using var key = Registry.CurrentUser.OpenSubKey(
+                @"Software\Microsoft\Windows\CurrentVersion\PushNotifications");
+            if (key?.GetValue("ToastEnabled") is int val && val == 0)
+                return Task.FromResult(("Turn on in Settings to get alerts", false));
+            return Task.FromResult(("Windows notifications are on", true));
+        }
+        catch
+        {
+            return Task.FromResult(("Couldn't check status", false));
+        }
+    }
+
+    public static async Task<(string, bool)> CheckCameraAsync()
+    {
+        try
+        {
+            var devices = await DeviceInformation.FindAllAsync(DeviceClass.VideoCapture);
+            if (devices.Count == 0) return ("No camera detected", false);
+            var access = DeviceAccessInformation.CreateFromDeviceClass(DeviceClass.VideoCapture);
+            return access.CurrentStatus == DeviceAccessStatus.Allowed
+                ? ("Windows camera access is on", true)
+                : ("Turn on in Settings to use the camera", false);
+        }
+        catch { return ("Couldn't check status", false); }
+    }
+
+    public static async Task<(string, bool)> CheckMicrophoneAsync()
+    {
+        try
+        {
+            var devices = await DeviceInformation.FindAllAsync(DeviceClass.AudioCapture);
+            if (devices.Count == 0) return ("No microphone detected", false);
+            var access = DeviceAccessInformation.CreateFromDeviceClass(DeviceClass.AudioCapture);
+            return access.CurrentStatus == DeviceAccessStatus.Allowed
+                ? ("Windows microphone access is on", true)
+                : ("Turn on in Settings to use the microphone", false);
+        }
+        catch { return ("Couldn't check status", false); }
+    }
+
+    public static Task<(string, bool)> CheckLocationAsync()
+    {
+        try
+        {
+            using var sysKey = Registry.LocalMachine.OpenSubKey(
+                @"SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\location");
+            if (sysKey?.GetValue("Value") is string sv && sv.Equals("Deny", StringComparison.OrdinalIgnoreCase))
+                return Task.FromResult(("Turn on in Settings to share location", false));
+
+            using var userKey = Registry.CurrentUser.OpenSubKey(
+                @"SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\location");
+            var uv = userKey?.GetValue("Value") as string;
+            if (uv != null && uv.Equals("Deny", StringComparison.OrdinalIgnoreCase))
+                return Task.FromResult(("Turn on in Settings to share location", false));
+
+            return Task.FromResult(("Windows location is on", true));
+        }
+        catch { return Task.FromResult(("Couldn't check status", false)); }
+    }
+
+    public static Task<(string, bool)> CheckScreenCaptureAsync()
+    {
+        try
+        {
+            return Task.FromResult(GraphicsCaptureSession.IsSupported()
+                ? ("You choose what to share each capture", true)
+                : ("Not supported on this device", false));
+        }
+        catch { return Task.FromResult(("Couldn't check status", false)); }
+    }
+}
diff --git a/src/OpenClaw.SetupEngine.UI/Pages/WelcomePage.xaml b/src/OpenClaw.SetupEngine.UI/Pages/WelcomePage.xaml
index 96110bff9..a9612f634 100644
--- a/src/OpenClaw.SetupEngine.UI/Pages/WelcomePage.xaml
+++ b/src/OpenClaw.SetupEngine.UI/Pages/WelcomePage.xaml
@@ -5,63 +5,106 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     NavigationCacheMode="Disabled">
 
-    <Grid RowDefinitions="Auto,*,Auto" Padding="56,64,56,40">
+    <Grid Padding="48,28,48,24" RowDefinitions="Auto,*,Auto">
 
-        <!-- Top: Logo + Title + Description -->
         <StackPanel Grid.Row="0" HorizontalAlignment="Center" Spacing="12">
-            <Image x:Name="LobsterHero"
-                   Source="ms-appx:///OpenClaw.SetupEngine.UI/Assets/Setup/Lobster.png"
-                   Width="170" Height="170"
-                   HorizontalAlignment="Center" />
-            <TextBlock Text="Get started with OpenClaw"
-                       FontSize="28" FontWeight="SemiBold"
+            <Image x:Name="MascotHero"
+                   Source="ms-appx:///OpenClaw.SetupEngine.UI/Assets/Setup/OpenClawMascot.png"
+                   Width="96" Height="96" HorizontalAlignment="Center"
+                   AutomationProperties.AccessibilityView="Raw" />
+            <TextBlock Text="Set up OpenClaw"
+                       Style="{StaticResource TitleTextBlockStyle}"
                        HorizontalAlignment="Center" />
-            <TextBlock TextWrapping="Wrap" TextAlignment="Center"
-                       FontSize="14" Opacity="0.7" MaxWidth="440"
+            <TextBlock TextWrapping="Wrap" TextAlignment="Center" MaxWidth="460"
+                       Style="{StaticResource BodyTextBlockStyle}"
+                       Foreground="{ThemeResource TextFillColorSecondaryBrush}"
                        HorizontalAlignment="Center"
-                       Text="OpenClaw lets agents run commands, read and write files, and capture screenshots on this PC. Only set it up on a computer you trust." />
+                       Text="OpenClaw runs your agent through a gateway. Choose how to set it up on this PC — you can change this later." />
         </StackPanel>
 
-        <!-- Bottom: Info card + Button + Link (pushed to bottom) -->
-        <StackPanel Grid.Row="2" Spacing="16">
+        <StackPanel Grid.Row="1" VerticalAlignment="Top" Margin="0,24,0,0" Spacing="12"
+                    MaxWidth="560" HorizontalAlignment="Stretch">
 
-            <!-- Info card -->
-            <Border x:Name="InfoCard" CornerRadius="8" Padding="20,18,20,18">
-                <Grid ColumnDefinitions="Auto,*" ColumnSpacing="12">
-                    <Border Width="22" Height="22" CornerRadius="11"
-                            Background="#60C8F8" VerticalAlignment="Top">
-                        <TextBlock Text="i" FontSize="13" FontWeight="SemiBold"
-                                   Foreground="Black"
-                                   HorizontalAlignment="Center" VerticalAlignment="Center" />
+            <Border x:Name="InstallCard"
+                    HorizontalAlignment="Stretch"
+                    Padding="16" CornerRadius="4"
+                    Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                    BorderBrush="{ThemeResource AccentFillColorDefaultBrush}"
+                    BorderThickness="2"
+                    PointerPressed="InstallCard_Pressed"
+                    AutomationProperties.Name="Install a local gateway (WSL), recommended">
+                <Grid ColumnDefinitions="Auto,*" ColumnSpacing="16">
+                    <Border Grid.Column="0" Width="44" Height="44" CornerRadius="6"
+                            Background="{ThemeResource AccentFillColorDefaultBrush}" VerticalAlignment="Top">
+                        <FontIcon Glyph="&#xE756;" FontSize="20" IsTextScaleFactorEnabled="False"
+                                  Foreground="{ThemeResource TextOnAccentFillColorPrimaryBrush}" />
                     </Border>
-                    <TextBlock x:Name="InfoText" Grid.Column="1" TextWrapping="Wrap" FontSize="13"
-                               Opacity="0.85" />
+                    <StackPanel Grid.Column="1" Spacing="3">
+                        <StackPanel Orientation="Horizontal" Spacing="8">
+                            <TextBlock x:Name="InstallTitle"
+                                       Text="Install a local gateway (WSL)"
+                                       Style="{StaticResource BodyStrongTextBlockStyle}"
+                                       VerticalAlignment="Center" />
+                            <Border CornerRadius="4" Padding="7,1" VerticalAlignment="Center"
+                                    BorderBrush="{ThemeResource AccentTextFillColorPrimaryBrush}" BorderThickness="1">
+                                <TextBlock Text="Recommended"
+                                           Style="{StaticResource CaptionTextBlockStyle}"
+                                           Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}" />
+                            </Border>
+                        </StackPanel>
+                        <TextBlock TextWrapping="Wrap"
+                                   Style="{StaticResource CaptionTextBlockStyle}"
+                                   Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                   Text="A private, self-hosted OpenClaw gateway in an isolated Ubuntu WSL instance. We'll show exactly what gets installed before anything runs." />
+                    </StackPanel>
                 </Grid>
             </Border>
 
-            <!-- Start button -->
-            <Button x:Name="StartButton"
-                    Content="Install new WSL Gateway"
+            <Border x:Name="ConnectCard"
                     HorizontalAlignment="Stretch"
-                    Height="44" FontSize="15" FontWeight="SemiBold"
-                    Click="StartButton_Click">
-                <Button.Resources>
-                    <SolidColorBrush x:Key="ButtonBackground" Color="#60C8F8" />
-                    <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="#52B0DA" />
-                    <SolidColorBrush x:Key="ButtonBackgroundPressed" Color="#469BBC" />
-                    <SolidColorBrush x:Key="ButtonForeground" Color="Black" />
-                    <SolidColorBrush x:Key="ButtonForegroundPointerOver" Color="Black" />
-                    <SolidColorBrush x:Key="ButtonForegroundPressed" Color="Black" />
-                </Button.Resources>
-            </Button>
-
-            <!-- Advanced setup link -->
-            <HyperlinkButton Content="Advanced setup"
-                             HorizontalAlignment="Center"
-                             Foreground="#60C8F8" FontSize="14"
-                             Click="AdvancedSetup_Click" />
+                    Padding="16" CornerRadius="4"
+                    Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                    BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                    BorderThickness="1"
+                    PointerPressed="ConnectCard_Pressed"
+                    AutomationProperties.Name="Connect to an existing gateway">
+                <Grid ColumnDefinitions="Auto,*" ColumnSpacing="16">
+                    <Border Grid.Column="0" Width="44" Height="44" CornerRadius="6"
+                            Background="{ThemeResource SubtleFillColorSecondaryBrush}" VerticalAlignment="Top">
+                        <FontIcon Glyph="&#xE71B;" FontSize="20" IsTextScaleFactorEnabled="False"
+                                  Foreground="{ThemeResource TextFillColorPrimaryBrush}" />
+                    </Border>
+                    <StackPanel Grid.Column="1" Spacing="3">
+                        <TextBlock Text="Connect to an existing gateway"
+                                   Style="{StaticResource BodyStrongTextBlockStyle}" />
+                        <TextBlock TextWrapping="Wrap"
+                                   Style="{StaticResource CaptionTextBlockStyle}"
+                                   Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                   Text="Already run an OpenClaw gateway — here, on another machine, or remote? Pair without installing anything." />
+                    </StackPanel>
+                </Grid>
+            </Border>
 
         </StackPanel>
 
+        <Grid Grid.Row="2" ColumnDefinitions="*,Auto" Margin="0,16,0,0">
+            <StackPanel Grid.ColumnSpan="2" Orientation="Horizontal" Spacing="8"
+                        HorizontalAlignment="Center" VerticalAlignment="Center"
+                        IsTabStop="False" AutomationProperties.Name="Step 2 of 6">
+                <Border Width="8" Height="8" CornerRadius="4" VerticalAlignment="Center" Background="{ThemeResource SetupInactiveDotBrush}" />
+                <Border Width="20" Height="8" CornerRadius="4" VerticalAlignment="Center" Background="{ThemeResource SetupIndicatorAccentBrush}" />
+                <Border Width="8" Height="8" CornerRadius="4" VerticalAlignment="Center" Background="{ThemeResource SetupInactiveDotBrush}" />
+                <Border Width="8" Height="8" CornerRadius="4" VerticalAlignment="Center" Background="{ThemeResource SetupInactiveDotBrush}" />
+                <Border Width="8" Height="8" CornerRadius="4" VerticalAlignment="Center" Background="{ThemeResource SetupInactiveDotBrush}" />
+                <Border Width="8" Height="8" CornerRadius="4" VerticalAlignment="Center" Background="{ThemeResource SetupInactiveDotBrush}" />
+            </StackPanel>
+            <Button x:Name="BackButton" Grid.Column="0" Content="Back"
+                    MinWidth="100" HorizontalAlignment="Left"
+                    Click="Back_Click" />
+            <Button x:Name="NextButton" Grid.Column="1" Content="Next"
+                    MinWidth="100" HorizontalAlignment="Right"
+                    Style="{StaticResource AccentButtonStyle}"
+                    Click="Next_Click" />
+        </Grid>
     </Grid>
 </Page>
diff --git a/src/OpenClaw.SetupEngine.UI/Pages/WelcomePage.xaml.cs b/src/OpenClaw.SetupEngine.UI/Pages/WelcomePage.xaml.cs
index 3762b4ead..3e01f07b5 100644
--- a/src/OpenClaw.SetupEngine.UI/Pages/WelcomePage.xaml.cs
+++ b/src/OpenClaw.SetupEngine.UI/Pages/WelcomePage.xaml.cs
@@ -2,24 +2,28 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Hosting;
+using Microsoft.UI.Xaml.Input;
 using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Navigation;
 using OpenClaw.SetupEngine;
 using OpenClaw.SetupEngine.UI;
 using OpenClaw.Shared;
 using System.Numerics;
-using Windows.UI;
 
 namespace OpenClaw.SetupEngine.UI.Pages;
 
 public sealed partial class WelcomePage : Page
 {
+    private const string InstallButtonText = "Install a local gateway (WSL)";
+    private const string CheckingButtonText = "Checking existing setup...";
     private SetupConfig? _config;
+    private bool _installSelected = true; // default selection
 
     public WelcomePage()
     {
         InitializeComponent();
         Loaded += OnLoaded;
+        UpdateCardSelection();
     }
 
     protected override void OnNavigatedTo(NavigationEventArgs e)
@@ -29,23 +33,15 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
 
     private void OnLoaded(object sender, RoutedEventArgs e)
     {
-        var isDark = ActualTheme == ElementTheme.Dark;
-        InfoCard.Background = new SolidColorBrush(isDark
-            ? Color.FromArgb(255, 0x2C, 0x2C, 0x2C)
-            : Color.FromArgb(255, 0xF0, 0xF0, 0xF0));
-
-        InfoText.Text = "This local setup installs a small WSL Linux instance dedicated to OpenClaw. "
-                      + "If you'd rather connect to an existing or remote gateway, choose Advanced setup.";
-
-        StartLobsterBreatheAnimation();
+        StartMascotBreatheAnimation();
     }
 
-    private void StartLobsterBreatheAnimation()
+    private void StartMascotBreatheAnimation()
     {
-        var visual = ElementCompositionPreview.GetElementVisual(LobsterHero);
+        var visual = ElementCompositionPreview.GetElementVisual(MascotHero);
         var compositor = visual.Compositor;
-        var centerX = LobsterHero.ActualWidth > 0 ? LobsterHero.ActualWidth / 2 : LobsterHero.Width / 2;
-        var centerY = LobsterHero.ActualHeight > 0 ? LobsterHero.ActualHeight / 2 : LobsterHero.Height / 2;
+        var centerX = MascotHero.ActualWidth > 0 ? MascotHero.ActualWidth / 2 : MascotHero.Width / 2;
+        var centerY = MascotHero.ActualHeight > 0 ? MascotHero.ActualHeight / 2 : MascotHero.Height / 2;
         visual.CenterPoint = new Vector3((float)centerX, (float)centerY, 0f);
 
         var pulse = compositor.CreateVector3KeyFrameAnimation();
@@ -58,39 +54,95 @@ private void StartLobsterBreatheAnimation()
         visual.StartAnimation("Scale", pulse);
     }
 
-    private void StartButton_Click(object sender, RoutedEventArgs e) =>
-        AsyncEventHandlerGuard.Run(
-            StartButtonClickAsync,
-            NullLogger.Instance,
-            nameof(StartButton_Click));
+    private void InstallCard_Pressed(object sender, PointerRoutedEventArgs e)
+    {
+        _installSelected = true;
+        UpdateCardSelection();
+    }
+
+    private void ConnectCard_Pressed(object sender, PointerRoutedEventArgs e)
+    {
+        _installSelected = false;
+        UpdateCardSelection();
+    }
 
-    private async Task StartButtonClickAsync()
+    private void UpdateCardSelection()
     {
-        var dataDir = Environment.GetEnvironmentVariable("OPENCLAW_TRAY_DATA_DIR")
-            ?? Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "OpenClawTray");
+        InstallCard.BorderBrush = _installSelected
+            ? (Brush)Application.Current.Resources["AccentFillColorDefaultBrush"]
+            : (Brush)Application.Current.Resources["CardStrokeColorDefaultBrush"];
+        InstallCard.BorderThickness = new Thickness(_installSelected ? 2 : 1);
+
+        ConnectCard.BorderBrush = !_installSelected
+            ? (Brush)Application.Current.Resources["AccentFillColorDefaultBrush"]
+            : (Brush)Application.Current.Resources["CardStrokeColorDefaultBrush"];
+        ConnectCard.BorderThickness = new Thickness(!_installSelected ? 2 : 1);
+    }
 
-        var existing = ExistingConfigDetector.Detect(dataDir, _config!.DistroName);
-        var summary = ExistingConfigDetector.BuildReplacementSummary(existing);
+    private void Back_Click(object sender, RoutedEventArgs e)
+    {
+        SetupWindow.Active?.NavigateToSecurityNotice(back: true);
+    }
 
-        var dialog = new ContentDialog
+    private void Next_Click(object sender, RoutedEventArgs e)
+    {
+        if (_installSelected)
         {
-            Title = existing.HasLocalGateway || existing.HasDistro
-                ? "Replace existing WSL gateway?"
-                : "Install a new WSL gateway?",
-            Content = summary,
-            PrimaryButtonText = "Continue",
-            CloseButtonText = "Cancel",
-            DefaultButton = ContentDialogButton.Close,
-            XamlRoot = XamlRoot,
-        };
-
-        var result = await dialog.ShowAsync();
-        if (result == ContentDialogResult.Primary)
-            SetupWindow.Active?.NavigateToCapabilities();
+            AsyncEventHandlerGuard.Run(
+                StartInstallAsync,
+                NullLogger.Instance,
+                nameof(Next_Click));
+        }
+        else
+        {
+            SetupWindow.Active?.NavigateToAdvancedSetup();
+        }
     }
 
-    private void AdvancedSetup_Click(object sender, RoutedEventArgs e)
+    private async Task StartInstallAsync()
     {
-        SetupWindow.Active?.RequestAdvancedSetup();
+        var config = _config ?? throw new InvalidOperationException("Setup configuration has not been loaded.");
+        var setupWindow = SetupWindow.Active;
+        var dataDir = setupWindow?.DataDir ?? SetupContext.ResolveDataDir();
+
+        NextButton.IsEnabled = false;
+        InstallTitle.Text = CheckingButtonText;
+        var navigating = false;
+        try
+        {
+            var existing = await Task.Run(() => ExistingConfigDetector.Detect(dataDir, config.DistroName));
+            var xamlRoot = XamlRoot;
+            if (setupWindow is null or { IsClosed: true } || xamlRoot is null)
+                return;
+
+            var summary = ExistingConfigDetector.BuildReplacementSummary(existing);
+
+            var dialog = new ContentDialog
+            {
+                Title = existing.HasLocalGateway || existing.HasDistro
+                    ? "Replace existing WSL gateway?"
+                    : "Install a new WSL gateway?",
+                Content = summary,
+                PrimaryButtonText = "Continue",
+                CloseButtonText = "Cancel",
+                DefaultButton = ContentDialogButton.Close,
+                XamlRoot = xamlRoot,
+            };
+
+            var result = await dialog.ShowAsync();
+            if (result != ContentDialogResult.Primary)
+                return;
+
+            navigating = true;
+            setupWindow.NavigateToCapabilities();
+        }
+        finally
+        {
+            if (!navigating && setupWindow is { IsClosed: false })
+            {
+                InstallTitle.Text = InstallButtonText;
+                NextButton.IsEnabled = true;
+            }
+        }
     }
 }
diff --git a/src/OpenClaw.SetupEngine.UI/Pages/WizardPage.xaml b/src/OpenClaw.SetupEngine.UI/Pages/WizardPage.xaml
index 1097c29bf..cdc552750 100644
--- a/src/OpenClaw.SetupEngine.UI/Pages/WizardPage.xaml
+++ b/src/OpenClaw.SetupEngine.UI/Pages/WizardPage.xaml
@@ -5,23 +5,35 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     NavigationCacheMode="Disabled">
 
-    <Grid RowDefinitions="Auto,*,Auto" Padding="48,32,48,32">
+    <Grid RowDefinitions="Auto,*,Auto" Padding="48,28,48,24">
         <StackPanel Grid.Row="0" Spacing="6" HorizontalAlignment="Center">
-            <TextBlock Text="🦞" FontSize="42" HorizontalAlignment="Center" />
-            <TextBlock Text="Gateway setup" FontSize="28" FontWeight="SemiBold" HorizontalAlignment="Center" />
-            <TextBlock x:Name="StatusText" Text="Connecting to gateway..." FontSize="13" Opacity="0.65" HorizontalAlignment="Center" />
+            <Image Source="ms-appx:///OpenClaw.SetupEngine.UI/Assets/Setup/OpenClawMascot.png"
+                   Width="44" Height="44" HorizontalAlignment="Center"
+                   AutomationProperties.AccessibilityView="Raw" />
+            <TextBlock Text="OpenClaw onboard"
+                       Style="{StaticResource TitleTextBlockStyle}" HorizontalAlignment="Center" />
+            <TextBlock x:Name="StatusText" Text="Connecting to gateway..."
+                       Style="{StaticResource CaptionTextBlockStyle}"
+                       Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                       HorizontalAlignment="Center" />
         </StackPanel>
 
-        <ScrollViewer Grid.Row="1" Margin="0,28,0,20" VerticalScrollBarVisibility="Auto">
+        <ScrollViewer x:Name="MainScroller" Grid.Row="1" Margin="0,24,0,20" VerticalScrollBarVisibility="Auto">
+            <StackPanel Spacing="12">
+            <StackPanel x:Name="TranscriptPanel" Spacing="6" />
             <Border x:Name="StepCard"
-                    CornerRadius="10"
+                    CornerRadius="8"
                     Padding="24"
                     MinHeight="180"
+                    BorderThickness="1"
+                    BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
                     Background="{ThemeResource CardBackgroundFillColorDefaultBrush}">
                 <StackPanel Spacing="16">
-                    <ProgressRing x:Name="BusyRing" Width="32" Height="32" IsActive="True" HorizontalAlignment="Center" />
-                    <TextBlock x:Name="TitleText" FontSize="22" FontWeight="SemiBold" TextWrapping="Wrap" />
-                    <StackPanel x:Name="MessagePanel" Spacing="8" />
+                    <TextBlock x:Name="TitleText" Style="{StaticResource SubtitleTextBlockStyle}" TextWrapping="Wrap" />
+                    <RichTextBlock x:Name="MessageBlock" Visibility="Collapsed"
+                                   IsTextSelectionEnabled="True" TextWrapping="Wrap"
+                                   FontSize="14" Opacity="0.82" />
+                    <StackPanel x:Name="MessageCodeRows" Spacing="8" />
                     <Border x:Name="ConsoleBanner"
                             Visibility="Collapsed"
                             CornerRadius="6"
@@ -31,59 +43,92 @@
                             BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}">
                         <StackPanel Spacing="6">
                             <TextBlock Text="Live gateway output"
-                                       FontSize="11"
-                                       FontWeight="SemiBold"
-                                       Opacity="0.7"
-                                       CharacterSpacing="60" />
+                                       Style="{StaticResource CaptionTextBlockStyle}"
+                                       Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                            <RichTextBlock x:Name="ConsoleBannerBlock"
+                                           IsTextSelectionEnabled="True" TextWrapping="Wrap"
+                                           FontSize="13" Opacity="0.92"
+                                           FontFamily="Consolas" />
                             <StackPanel x:Name="ConsoleBannerLines" Spacing="6" />
                         </StackPanel>
                     </Border>
-                    <StackPanel x:Name="SelectOptions" Visibility="Collapsed" Spacing="8" />
+                    <ListView x:Name="SelectOptions" Visibility="Collapsed" SelectionMode="Single" />
                     <StackPanel x:Name="MultiOptions" Visibility="Collapsed" Spacing="8" />
                     <TextBox x:Name="TextInput" Visibility="Collapsed" PlaceholderText="Enter value" />
                     <PasswordBox x:Name="SecretInput" Visibility="Collapsed" PlaceholderText="Enter value" />
-                    <TextBlock x:Name="ErrorText" Visibility="Collapsed" Foreground="#FF6B6B" TextWrapping="Wrap" />
+                    <TextBlock x:Name="ErrorText"
+                               Visibility="Collapsed"
+                               Foreground="{ThemeResource SystemFillColorCriticalBrush}"
+                               TextWrapping="Wrap"
+                               IsTextSelectionEnabled="True" />
+                    <StackPanel x:Name="GatewayRecovery"
+                                Visibility="Collapsed"
+                                Orientation="Horizontal"
+                                Spacing="12">
+                        <Button x:Name="OpenGatewayTerminalButton"
+                                Content="Open terminal"
+                                MinWidth="100"
+                                Click="OpenGatewayTerminal_Click" />
+                        <Button x:Name="RestartGatewayButton"
+                                Content="Restart gateway"
+                                MinWidth="100"
+                                Click="RestartGateway_Click" />
+                    </StackPanel>
+                    <ProgressRing x:Name="BusyRing" Width="32" Height="32" IsActive="True" HorizontalAlignment="Center" Foreground="{ThemeResource SetupIndicatorAccentBrush}" />
                 </StackPanel>
             </Border>
+            </StackPanel>
         </ScrollViewer>
 
         <Grid Grid.Row="2" ColumnDefinitions="*,Auto">
-            <StackPanel x:Name="RecoveryActions"
-                        Grid.Column="0"
-                        Orientation="Horizontal"
-                        HorizontalAlignment="Left"
-                        Spacing="12"
-                        Visibility="Collapsed">
-                <Button x:Name="StartOverButton"
-                        Content="Start over"
-                        Height="44"
-                        MinWidth="104"
-                        Click="StartOver_Click" />
-                <Button x:Name="SkipWizardButton"
-                        Content="Skip wizard"
-                        Height="44"
-                        MinWidth="104"
-                        Click="SkipWizard_Click" />
+            <StackPanel Grid.ColumnSpan="2" Orientation="Horizontal" Spacing="8"
+                        HorizontalAlignment="Center" VerticalAlignment="Center"
+                        IsTabStop="False" AutomationProperties.Name="Step 5 of 6">
+                <Border Width="8" Height="8" CornerRadius="4" VerticalAlignment="Center" Background="{ThemeResource SetupInactiveDotBrush}" />
+                <Border Width="8" Height="8" CornerRadius="4" VerticalAlignment="Center" Background="{ThemeResource SetupInactiveDotBrush}" />
+                <Border Width="8" Height="8" CornerRadius="4" VerticalAlignment="Center" Background="{ThemeResource SetupInactiveDotBrush}" />
+                <Border Width="8" Height="8" CornerRadius="4" VerticalAlignment="Center" Background="{ThemeResource SetupInactiveDotBrush}" />
+                <Border Width="20" Height="8" CornerRadius="4" VerticalAlignment="Center" Background="{ThemeResource SetupIndicatorAccentBrush}" />
+                <Border Width="8" Height="8" CornerRadius="4" VerticalAlignment="Center" Background="{ThemeResource SetupInactiveDotBrush}" />
+            </StackPanel>
+            <StackPanel Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Left" Spacing="8">
+                <Button x:Name="WizardBackButton" Content="Back"
+                        MinWidth="100"
+                        Click="WizardBack_Click" />
+                <DropDownButton x:Name="MoreOptionsButton"
+                                Content="More options"
+                                MinWidth="100"
+                                Background="Transparent"
+                                BorderBrush="Transparent"
+                                Visibility="Collapsed"
+                                AutomationProperties.Name="More onboarding options">
+                    <DropDownButton.Flyout>
+                        <MenuFlyout Placement="Top">
+                            <MenuFlyoutItem Text="Restart onboard" Click="StartOver_Click">
+                                <MenuFlyoutItem.Icon>
+                                    <FontIcon Glyph="&#xE72C;" IsTextScaleFactorEnabled="False" />
+                                </MenuFlyoutItem.Icon>
+                            </MenuFlyoutItem>
+                            <MenuFlyoutItem Text="Skip &amp; exit" Click="SkipWizard_Click">
+                                <MenuFlyoutItem.Icon>
+                                    <FontIcon Glyph="&#xE72A;" IsTextScaleFactorEnabled="False" />
+                                </MenuFlyoutItem.Icon>
+                            </MenuFlyoutItem>
+                        </MenuFlyout>
+                    </DropDownButton.Flyout>
+                </DropDownButton>
             </StackPanel>
             <StackPanel Grid.Column="1"
                         Orientation="Horizontal"
                         HorizontalAlignment="Right"
                         Spacing="12">
-                <Button x:Name="SecondaryButton" Content="Skip" Height="44"
-                        MinWidth="96"
+                <Button x:Name="SecondaryButton" Content="Skip"
+                        MinWidth="100"
                         Click="Secondary_Click" IsEnabled="False" />
-                <Button x:Name="PrimaryButton" Content="Continue" Height="44"
-                        MinWidth="120"
-                        Click="Primary_Click" IsEnabled="False">
-                    <Button.Resources>
-                        <SolidColorBrush x:Key="ButtonBackground" Color="#60C8F8" />
-                        <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="#52B0DA" />
-                        <SolidColorBrush x:Key="ButtonBackgroundPressed" Color="#469BBC" />
-                        <SolidColorBrush x:Key="ButtonForeground" Color="Black" />
-                        <SolidColorBrush x:Key="ButtonForegroundPointerOver" Color="Black" />
-                        <SolidColorBrush x:Key="ButtonForegroundPressed" Color="Black" />
-                    </Button.Resources>
-                </Button>
+                <Button x:Name="PrimaryButton" Content="Continue"
+                        MinWidth="100"
+                        Style="{StaticResource AccentButtonStyle}"
+                        Click="Primary_Click" IsEnabled="False" />
             </StackPanel>
         </Grid>
     </Grid>
diff --git a/src/OpenClaw.SetupEngine.UI/Pages/WizardPage.xaml.cs b/src/OpenClaw.SetupEngine.UI/Pages/WizardPage.xaml.cs
index bc2a32a47..faaa16d73 100644
--- a/src/OpenClaw.SetupEngine.UI/Pages/WizardPage.xaml.cs
+++ b/src/OpenClaw.SetupEngine.UI/Pages/WizardPage.xaml.cs
@@ -1,7 +1,8 @@
 using System.Text.Json;
-using System.Text.RegularExpressions;
 using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Automation;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Documents;
 using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Navigation;
 using OpenClaw.Connection;
@@ -15,21 +16,32 @@ public sealed partial class WizardPage : Page
 {
     private const int MaxWizardSteps = 50;
     private const int MaxSameStepVisits = 3;
-    private SetupConfig? _config;
+
+    private SetupConfig _config = new();
     private OpenClawGatewayClient? _client;
     private string _sessionId = "";
     private string _stepId = "";
     private string _stepType = "";
+    private string _currentTitle = "";
+    private string _currentMessage = "";
+    private string _lastProgressStepId = "";
+    private WizardStepCategory _stepCategory = WizardStepCategory.Acknowledge;
     private bool _sensitive;
     private bool _errorState;
+    private bool _finalizationErrorState;
     private int _operationGeneration;
     private int _wizardStepCount;
+    private int _progressPolls;
+    private int _totalProgressPolls;
     private readonly Dictionary<string, int> _stepVisits = new(StringComparer.OrdinalIgnoreCase);
     private readonly List<WizardOptionValue> _options = [];
-    // Tails the WSL gateway log and surfaces openclaw plugin console.log output
-    // (OAuth URLs, install fallback messages, etc) inline on the active step.
-    // wizard.payload frames don't carry this content.
+    private readonly Stack<JsonElement> _stepHistory = new();
+    // "More ▾" overflow toggle lives as a sibling of SelectOptions, so track it to remove between steps.
+    private Button? _moreOptionsButton;
+    // wizard.payload frames do not include plugin console output, so tail the gateway log inline.
     private WizardConsoleTail? _consoleTail;
+    // Captured on connect for "Open terminal" / "Restart gateway" recovery actions.
+    private GatewayHostAccessPlan _hostAccessPlan = GatewayHostAccessPlan.None();
 
     public WizardPage()
     {
@@ -41,20 +53,61 @@ public WizardPage()
     protected override void OnNavigatedTo(NavigationEventArgs e)
     {
         _config = e.Parameter as SetupConfig ?? new SetupConfig();
+        if (SetupPreview.IsActive)
+        {
+            RenderWizardPreview();
+            return;
+        }
         _ = StartWizardAsync();
     }
 
+    private void RenderWizardPreview()
+    {
+        BusyRing.Visibility = Visibility.Collapsed;
+        BusyRing.IsActive = false;
+        ShowRecoveryActions();
+        AppendTranscriptTurn("Welcome — let's connect your agent", null);
+        AppendTranscriptTurn("Choose your AI provider", "Anthropic — Claude");
+        AppendTranscriptTurn("Paste your API key", "••••••");
+
+        if (SetupPreview.RequestedPage == "wizard-error")
+        {
+            TitleText.Text = "OpenClaw onboard hit a problem";
+            ShowError("The gateway restarted before the current wizard step finished. Your setup is still installed; choose Start wizard again, or use More options to restart onboard or skip and exit.");
+            return;
+        }
+
+        StatusText.Text = "A few quick questions to connect your agent";
+        _stepType = "select";
+        _stepId = "model";
+        TitleText.Text = "Default AI model";
+        SelectOptions.Visibility = Visibility.Visible;
+        foreach (var (val, lbl) in new[] { ("opus", "claude-opus-4.8"), ("sonnet", "claude-sonnet-4.6"), ("haiku", "claude-haiku-4.5") })
+        {
+            SelectOptions.Items.Add(new ListViewItem
+            {
+                Content = lbl,
+                Tag = val,
+            });
+        }
+        SelectOptions.SelectedIndex = 0;
+        PrimaryButton.Content = "Continue";
+        PrimaryButton.IsEnabled = true;
+        SecondaryButton.Visibility = Visibility.Collapsed;
+    }
+
     protected override void OnNavigatedFrom(NavigationEventArgs e)
     {
         _ = DisconnectAsync();
     }
 
-    private async Task StartWizardAsync()
+    private async Task StartWizardAsync(bool clearTranscript = true)
     {
         var generation = AdvanceOperationGeneration();
         try
         {
             _errorState = false;
+            _finalizationErrorState = false;
             HideRecoveryActions();
             // Cancel any in-progress server-side wizard session before starting a
             // fresh one, so the gateway doesn't reject wizard.start with "wizard
@@ -63,6 +116,9 @@ private async Task StartWizardAsync()
             ClearConsoleBanner();
             _sessionId = "";
             _wizardStepCount = 0;
+            _progressPolls = 0;
+            _totalProgressPolls = 0;
+            _lastProgressStepId = "";
             _stepVisits.Clear();
             SetBusy("Connecting to gateway...");
             _client = await ConnectClientAsync();
@@ -73,6 +129,8 @@ private async Task StartWizardAsync()
             if (generation != _operationGeneration)
                 return;
 
+            if (clearTranscript)
+                TranscriptPanel.Children.Clear();
             await ApplyPayloadAsync(payload);
         }
         catch (Exception ex)
@@ -86,19 +144,21 @@ private async Task StartWizardAsync()
 
     private async Task<OpenClawGatewayClient> ConnectClientAsync()
     {
-        var config = _config!;
-        var dataDir = Environment.GetEnvironmentVariable("OPENCLAW_TRAY_DATA_DIR")
-            ?? Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "OpenClawTray");
+        var dataDir = SetupWindow.Active?.DataDir ?? SetupContext.ResolveDataDir();
         var registry = new GatewayRegistry(dataDir);
         registry.Load();
         var record = registry.GetActive() ?? throw new InvalidOperationException("No active gateway record found.");
+        _hostAccessPlan = GatewayHostAccessClassifier.Classify(record);
         var identityPath = registry.GetIdentityDirectory(record.Id);
         var token = DeviceIdentity.TryReadStoredDeviceToken(identityPath)
             ?? record.SharedGatewayToken
             ?? record.BootstrapToken
             ?? throw new InvalidOperationException("No gateway credential found.");
 
-        var client = new OpenClawGatewayClient(config.EffectiveGatewayUrl, token, logger: NullLogger.Instance, identityPath: identityPath)
+        // The active record owns the endpoint as well as the credential identity. Resolve
+        // tunnel-backed records to their Windows-side local forward instead of bypassing SSH.
+        var gatewayUrl = GatewayClientEndpointResolver.Resolve(record);
+        var client = new OpenClawGatewayClient(gatewayUrl, token, logger: NullLogger.Instance, identityPath: identityPath)
         {
             UseV2Signature = true
         };
@@ -160,103 +220,188 @@ private void OnWizardClientStatusChanged(object? sender, ConnectionStatus status
 
     private async Task ApplyPayloadAsync(JsonElement payload)
     {
-        if (payload.TryGetProperty("sessionId", out var sid))
-            _sessionId = sid.GetString() ?? _sessionId;
+        var generation = _operationGeneration;
 
-        if (payload.TryGetProperty("done", out var done) && done.ValueKind == JsonValueKind.True)
+        while (true)
         {
-            var error = payload.TryGetProperty("error", out var err) ? err.ToString() : "";
-            if (!string.IsNullOrWhiteSpace(error) && !error.Contains("this.prompt is not a function", StringComparison.OrdinalIgnoreCase))
+            if (payload.TryGetProperty("sessionId", out var sid))
+                _sessionId = sid.GetString() ?? _sessionId;
+
+            if (payload.TryGetProperty("done", out var done) && done.ValueKind == JsonValueKind.True)
             {
-                ShowError(error);
+                var error = payload.TryGetProperty("error", out var err) ? err.ToString() : "";
+                if (!string.IsNullOrWhiteSpace(error) && !error.Contains("this.prompt is not a function", StringComparison.OrdinalIgnoreCase))
+                {
+                    ShowError(error);
+                    return;
+                }
+
+                await DisconnectAsync();
+                if (generation != _operationGeneration || _errorState)
+                    return;
+
+                await CompleteSetupAsync(generation);
                 return;
             }
 
-            await DisconnectAsync();
-            if (_config!.SkipPermissions)
-                SetupWindow.Active?.NavigateToComplete(true, TimeSpan.Zero, _config.LogPath);
-            else
-                SetupWindow.Active?.NavigateToPermissions();
-            return;
-        }
+            if (!payload.TryGetProperty("step", out var step))
+            {
+                ShowError("Gateway wizard returned an invalid response.");
+                return;
+            }
 
-        if (!payload.TryGetProperty("step", out var step))
-        {
-            ShowError("Gateway wizard returned an invalid response.");
-            return;
-        }
+            _stepId = step.TryGetProperty("id", out var id) ? id.ToString() : "";
+            var rawType = step.TryGetProperty("type", out var type) ? type.ToString() : "note";
+            _stepType = string.IsNullOrWhiteSpace(rawType) ? "note" : rawType.Trim().ToLowerInvariant();
+            var stepIndex = payload.TryGetProperty("stepIndex", out var indexProperty) && indexProperty.TryGetInt32(out var index) ? index : 0;
+            _sensitive = step.TryGetProperty("sensitive", out var sensitive) && sensitive.ValueKind == JsonValueKind.True;
+            var title = step.TryGetProperty("title", out var titleProp) ? titleProp.ToString() : "";
+            var message = WizardPayloadHelpers.ExtractStepMessage(step);
+            var initial = step.TryGetProperty("initialValue", out var initialProp) ? initialProp : default;
+            var hasOptions = StepHasOptions(step);
+            _stepCategory = WizardStepClassifier.Categorize(_stepType, hasOptions);
+
+            if (_stepCategory == WizardStepCategory.RequiresAnswer
+                && hasOptions
+                && _stepType is not ("select" or "multiselect" or "text"))
+            {
+                _stepType = "select";
+            }
 
-        _stepId = step.TryGetProperty("id", out var id) ? id.ToString() : "";
-        _stepType = step.TryGetProperty("type", out var type) ? type.ToString() : "note";
-        var stepIndex = payload.TryGetProperty("stepIndex", out var indexProperty) && indexProperty.TryGetInt32(out var index) ? index : 0;
-        _sensitive = step.TryGetProperty("sensitive", out var sensitive) && sensitive.ValueKind == JsonValueKind.True;
-        var title = step.TryGetProperty("title", out var titleProp) ? titleProp.ToString() : "";
-        var message = WizardPayloadHelpers.ExtractStepMessage(step);
-        var initial = step.TryGetProperty("initialValue", out var initialProp) ? initialProp : default;
+            // Keep raw text for auth timeout selection; rendered URL/code rows are not TextBlocks.
+            _currentTitle = title;
+            _currentMessage = message;
 
-        if (string.IsNullOrWhiteSpace(_stepId))
-        {
-            ShowError("Gateway wizard step is missing an id.");
-            return;
-        }
+            if (string.IsNullOrWhiteSpace(_stepId))
+            {
+                ShowError("Gateway wizard step is missing an id.");
+                return;
+            }
 
-        _wizardStepCount++;
-        if (_wizardStepCount > MaxWizardSteps)
-        {
-            ShowError($"Gateway wizard exceeded {MaxWizardSteps} steps.");
-            return;
-        }
+            // Progress carries no answer; poll until the gateway emits the next step.
+            if (_stepCategory == WizardStepCategory.Progress)
+            {
+                if (!string.Equals(_stepId, _lastProgressStepId, StringComparison.Ordinal))
+                {
+                    _lastProgressStepId = _stepId;
+                    _progressPolls = 0;
+                }
 
-        var visitKey = $"{_stepId}:{stepIndex}";
-        _stepVisits.TryGetValue(visitKey, out var visits);
-        _stepVisits[visitKey] = visits + 1;
-        if (_stepVisits[visitKey] > MaxSameStepVisits)
-        {
-            ShowError($"Gateway wizard repeated step '{_stepId}' too many times.");
-            return;
-        }
+                _progressPolls++;
+                _totalProgressPolls++;
+                if (_progressPolls > WizardTimeouts.MaxProgressPollsPerStep)
+                {
+                    ShowError($"Gateway wizard progress step '{_stepId}' did not complete after {WizardTimeouts.MaxProgressPollsPerStep} updates.");
+                    return;
+                }
+                if (_totalProgressPolls > WizardTimeouts.MaxTotalProgressPolls)
+                {
+                    ShowError($"Gateway wizard did not finish after {WizardTimeouts.MaxTotalProgressPolls} progress updates.");
+                    return;
+                }
 
-        ResetInputs();
-        TitleText.Text = string.IsNullOrWhiteSpace(title) ? DisplayTitleFor(_stepType) : title;
-        RenderMessage(message);
-        StepCard.MinHeight = _stepType == "note" && string.IsNullOrWhiteSpace(message) ? 140 : 260;
-        ErrorText.Visibility = Visibility.Collapsed;
-        BusyRing.Visibility = Visibility.Collapsed;
-        BusyRing.IsActive = false;
-        ShowRecoveryActions();
-        StatusText.Text = "Answer the gateway setup question";
-        PrimaryButton.IsEnabled = !WizardSelection.RequiresAnswer(_stepType);
-        SecondaryButton.IsEnabled = true;
-        PrimaryButton.Content = _stepType == "confirm" ? "Yes" : "Continue";
-        SecondaryButton.Content = "No";
-        SecondaryButton.Visibility = _stepType == "confirm" ? Visibility.Visible : Visibility.Collapsed;
-
-        if (!BuildOptions(step, initial))
-            return;
+                RenderProgressStep(title, message);
+                await Task.Delay(WizardTimeouts.ProgressPollDelay);
+                if (generation != _operationGeneration || _errorState || _client == null)
+                    return;
 
-        if (_stepType == "text")
-        {
-            if (_sensitive)
+                payload = await _client.SendWizardRequestAsync(
+                    "wizard.next",
+                    WizardNextPayload.Acknowledge(_sessionId, _stepId),
+                    timeoutMs: WizardTimeouts.ForStep(title, message, _stepId));
+
+                if (generation != _operationGeneration || _errorState || _client == null)
+                    return;
+
+                continue;
+            }
+
+            _wizardStepCount++;
+            if (_wizardStepCount > MaxWizardSteps)
+            {
+                ShowError($"Gateway wizard exceeded {MaxWizardSteps} steps.");
+                return;
+            }
+
+            var visitKey = $"{_stepId}:{stepIndex}";
+            _stepVisits.TryGetValue(visitKey, out var visits);
+            _stepVisits[visitKey] = visits + 1;
+            if (_stepVisits[visitKey] > MaxSameStepVisits)
             {
-                SecretInput.Visibility = Visibility.Visible;
-                SecretInput.Password = initial.ValueKind == JsonValueKind.String ? initial.GetString() ?? "" : "";
+                ShowError($"Gateway wizard repeated step '{_stepId}' too many times.");
+                return;
             }
-            else
+
+            ResetInputs();
+            // Push current payload so Back can re-render this step
+            _stepHistory.Push(payload);
+            TitleText.Text = string.IsNullOrWhiteSpace(title) ? DisplayTitleFor(_stepType) : title;
+            RenderMessage(message);
+            StepCard.MinHeight = _stepType == "note" && string.IsNullOrWhiteSpace(message) ? 140 : 260;
+            ErrorText.Visibility = Visibility.Collapsed;
+            BusyRing.Visibility = Visibility.Collapsed;
+            BusyRing.IsActive = false;
+            ShowRecoveryActions();
+            WizardBackButton.Visibility = Visibility.Visible;
+            StatusText.Text = "A few quick questions to connect your agent";
+            PrimaryButton.IsEnabled = !WizardSelection.RequiresAnswer(_stepType);
+            SecondaryButton.IsEnabled = true;
+            PrimaryButton.Content = _stepType == "confirm" ? "Yes" : "Continue";
+            SecondaryButton.Content = "No";
+            SecondaryButton.Visibility = _stepType == "confirm" ? Visibility.Visible : Visibility.Collapsed;
+
+            if (!BuildOptions(step, initial))
+                return;
+
+            if (_stepType == "text")
             {
-                TextInput.Visibility = Visibility.Visible;
-                TextInput.Text = initial.ValueKind == JsonValueKind.String ? initial.GetString() ?? "" : "";
+                if (_sensitive)
+                {
+                    SecretInput.Visibility = Visibility.Visible;
+                    SecretInput.Password = initial.ValueKind == JsonValueKind.String ? initial.GetString() ?? "" : "";
+                }
+                else
+                {
+                    TextInput.Visibility = Visibility.Visible;
+                    TextInput.Text = initial.ValueKind == JsonValueKind.String ? initial.GetString() ?? "" : "";
+                }
+
+                UpdateContinueState();
             }
 
-            UpdateContinueState();
-        }
+            if (_stepType == "note")
+            {
+                SecondaryButton.IsEnabled = false;
+                SecondaryButton.Visibility = Visibility.Collapsed;
+            }
 
-        if (_stepType == "note")
-        {
-            SecondaryButton.IsEnabled = false;
-            SecondaryButton.Visibility = Visibility.Collapsed;
+            return;
         }
     }
 
+    private static bool StepHasOptions(JsonElement step) =>
+        step.TryGetProperty("options", out var options)
+        && options.ValueKind == JsonValueKind.Array
+        && options.EnumerateArray().Any();
+
+    private void RenderProgressStep(string title, string message)
+    {
+        ResetInputs();
+        TitleText.Text = string.IsNullOrWhiteSpace(title) ? "Working…" : title;
+        RenderMessage(message);
+        StepCard.MinHeight = 200;
+        ErrorText.Visibility = Visibility.Collapsed;
+        BusyRing.Visibility = Visibility.Visible;
+        BusyRing.IsActive = true;
+        StatusText.Text = string.IsNullOrWhiteSpace(message) ? "Working…" : "Setting things up…";
+        PrimaryButton.IsEnabled = false;
+        PrimaryButton.Content = "Continue";
+        SecondaryButton.IsEnabled = false;
+        SecondaryButton.Visibility = Visibility.Collapsed;
+        WizardBackButton.Visibility = Visibility.Collapsed;
+        ShowRecoveryActions();
+    }
+
     private bool BuildOptions(JsonElement step, JsonElement initial)
     {
         if (_stepType is not ("select" or "multiselect"))
@@ -274,27 +419,88 @@ private bool BuildOptions(JsonElement step, JsonElement initial)
         if (_stepType == "select")
         {
             SelectOptions.Visibility = Visibility.Visible;
-            foreach (var option in _options)
+
+            // Reorder: skip options first, then non-more options, filter out "more" and "back" options
+            var skipOptions = _options.Where(IsSkipOption).ToList();
+            var moreOptions = _options.Where(IsMoreOption).ToList();
+            var normalOptions = _options.Where(o => !IsSkipOption(o) && !IsMoreOption(o) && !IsBackOption(o)).ToList();
+
+            var orderedOptions = new List<WizardOptionValue>();
+            orderedOptions.AddRange(skipOptions);
+            orderedOptions.AddRange(normalOptions);
+
+            // Show first batch; if there are many options, show a "More" button to expand
+            const int initialVisibleCount = 6;
+            var hasOverflow = orderedOptions.Count > initialVisibleCount;
+            var hasGatewayMore = moreOptions.Count > 0;
+            var showMoreButton = hasOverflow || hasGatewayMore;
+            var visibleOptions = hasOverflow
+                ? orderedOptions.Take(initialVisibleCount).ToList()
+                : orderedOptions;
+
+            foreach (var option in visibleOptions)
             {
-                SelectOptions.Children.Add(new RadioButton
+                SelectOptions.Items.Add(CreateOptionItem(option));
+            }
+
+            // Add "More ▼" button if there are hidden options OR gateway sent a "more" option
+            if (showMoreButton)
+            {
+                var moreButton = new Button
                 {
-                    Content = BuildOptionContent(option),
-                    Tag = option,
-                    GroupName = $"wizard-step-{_stepId}",
-                    Padding = new Thickness(8, 6, 8, 6),
-                    Margin = new Thickness(0, 0, 0, 2),
-                    HorizontalAlignment = HorizontalAlignment.Stretch,
-                    HorizontalContentAlignment = HorizontalAlignment.Stretch
-                });
+                    Content = "More ▾",
+                    MinWidth = 100,
+                    HorizontalAlignment = HorizontalAlignment.Center,
+                    Background = new Microsoft.UI.Xaml.Media.SolidColorBrush(Microsoft.UI.Colors.Transparent),
+                    BorderBrush = new Microsoft.UI.Xaml.Media.SolidColorBrush(Microsoft.UI.Colors.Transparent),
+                    Margin = new Thickness(0, 4, 0, 0)
+                };
+                var remainingOptions = hasOverflow ? orderedOptions.Skip(initialVisibleCount).ToList() : new List<WizardOptionValue>();
+                var gatewayMoreValue = moreOptions.Count > 0 ? moreOptions[0].Value : null;
+                var capturedSkipOptions = skipOptions;
+                moreButton.Click += (_, _) =>
+                {
+                    // Remove the More button
+                    if (moreButton.Parent is Panel parent)
+                        parent.Children.Remove(moreButton);
+                    if (ReferenceEquals(_moreOptionsButton, moreButton))
+                        _moreOptionsButton = null;
+
+                    if (hasGatewayMore && !string.IsNullOrEmpty(gatewayMoreValue))
+                    {
+                        // Send the "more" option value to gateway to fetch full list, expanding inline
+                        AsyncEventHandlerGuard.Run(
+                            async () => await ExpandMoreOptionsAsync(gatewayMoreValue, capturedSkipOptions),
+                            NullLogger.Instance,
+                            "MoreExpand");
+                    }
+                    else
+                    {
+                        // Just expand remaining local options
+                        foreach (var option in remainingOptions)
+                        {
+                            SelectOptions.Items.Add(CreateOptionItem(option));
+                        }
+                    }
+                };
+                // Insert the button after SelectOptions in the parent StackPanel
+                var parentPanel = SelectOptions.Parent as Panel;
+                if (parentPanel != null)
+                {
+                    var idx = parentPanel.Children.IndexOf(SelectOptions);
+                    parentPanel.Children.Insert(idx + 1, moreButton);
+                    _moreOptionsButton = moreButton;
+                }
             }
 
             var initialValue = WizardAnswerBuilder.ValueKeys(initial).FirstOrDefault();
-            var index = WizardSelection.SelectedIndex(initialValue, _options.Select(o => o.Value).ToArray());
-            if (index >= 0 && index < SelectOptions.Children.Count && SelectOptions.Children[index] is RadioButton radio)
-                radio.IsChecked = true;
+            var index = WizardSelection.SelectedIndex(initialValue, visibleOptions.Select(o => o.Value).ToArray());
+            if (index >= 0 && index < SelectOptions.Items.Count)
+                SelectOptions.SelectedIndex = index;
+            else if (SelectOptions.Items.Count > 0)
+                SelectOptions.SelectedIndex = 0;
 
-            foreach (var optionRadio in SelectOptions.Children.OfType<RadioButton>())
-                optionRadio.Checked += (_, _) => UpdateContinueState();
+            SelectOptions.SelectionChanged += (_, _) => UpdateContinueState();
 
             UpdateContinueState();
         }
@@ -316,6 +522,7 @@ private bool BuildOptions(JsonElement step, JsonElement initial)
                     HorizontalAlignment = HorizontalAlignment.Stretch,
                     HorizontalContentAlignment = HorizontalAlignment.Stretch
                 };
+                AutomationProperties.SetName(checkBox, OptionAccessibleName(option));
                 checkBox.Checked += (_, _) => UpdateContinueState();
                 checkBox.Unchecked += (_, _) => UpdateContinueState();
                 MultiOptions.Children.Add(checkBox);
@@ -327,6 +534,24 @@ private bool BuildOptions(JsonElement step, JsonElement initial)
         return true;
     }
 
+    private static ListViewItem CreateOptionItem(WizardOptionValue option)
+    {
+        var item = new ListViewItem
+        {
+            Content = BuildOptionContent(option),
+            Tag = option,
+            Padding = new Thickness(12, 10, 12, 10),
+            HorizontalContentAlignment = HorizontalAlignment.Stretch
+        };
+        AutomationProperties.SetName(item, OptionAccessibleName(option));
+        return item;
+    }
+
+    private static string OptionAccessibleName(WizardOptionValue option) =>
+        string.IsNullOrWhiteSpace(option.Hint)
+            ? option.Label
+            : $"{option.Label}. {option.Hint}";
+
     private static FrameworkElement BuildOptionContent(WizardOptionValue option)
     {
         var panel = new StackPanel
@@ -358,6 +583,20 @@ private static FrameworkElement BuildOptionContent(WizardOptionValue option)
         return panel;
     }
 
+    private static bool IsSkipOption(WizardOptionValue option) =>
+        string.Equals(option.Value, "__skip__", StringComparison.OrdinalIgnoreCase)
+        || option.Label.Contains("skip", StringComparison.OrdinalIgnoreCase);
+
+    private static bool IsMoreOption(WizardOptionValue option) =>
+        string.Equals(option.Value, "__more__", StringComparison.OrdinalIgnoreCase)
+        || string.Equals(option.Value, "__more", StringComparison.OrdinalIgnoreCase)
+        || (option.Label.Contains("more", StringComparison.OrdinalIgnoreCase)
+            && option.Label.Length < 20);
+
+    private static bool IsBackOption(WizardOptionValue option) =>
+        string.Equals(option.Value, "__back", StringComparison.OrdinalIgnoreCase)
+        || string.Equals(option.Value, "back", StringComparison.OrdinalIgnoreCase);
+
     private static Brush ResourceBrush(string key)
     {
         return Application.Current.Resources.TryGetValue(key, out var brush)
@@ -376,6 +615,14 @@ private async Task PrimaryClickAsync()
     {
         if (_errorState)
         {
+            if (_finalizationErrorState)
+            {
+                _errorState = false;
+                _finalizationErrorState = false;
+                await CompleteSetupAsync(_operationGeneration);
+                return;
+            }
+
             await StartWizardAsync();
             return;
         }
@@ -391,13 +638,102 @@ private void Secondary_Click(object sender, RoutedEventArgs e) =>
 
     private async Task SecondaryClickAsync()
     {
-        if (_errorState)
+        await SendCurrentAnswerAsync(skip: true);
+    }
+
+    private async Task SendOptionValueAsync(string value)
+    {
+        if (_client == null) return;
+
+        var generation = _operationGeneration;
+        try
         {
-            await SkipWizardAsync();
-            return;
+            SetBusy("Loading...");
+            ClearConsoleBanner();
+            var parameters = new { sessionId = _sessionId, answer = new { stepId = _stepId, value } };
+            var payload = await _client.SendWizardRequestAsync("wizard.next", parameters, timeoutMs: TimeoutForCurrentStep());
+            if (generation != _operationGeneration) return;
+            await ApplyPayloadAsync(payload);
+            ScrollActiveIntoView();
+        }
+        catch (Exception ex)
+        {
+            if (generation != _operationGeneration) return;
+            await EnterWizardErrorAsync(ex.Message);
         }
+    }
 
-        await SendCurrentAnswerAsync(skip: true);
+    private async Task ExpandMoreOptionsAsync(string moreValue, List<WizardOptionValue> previousSkipOptions)
+    {
+        if (_client == null) return;
+
+        var generation = _operationGeneration;
+        try
+        {
+            var parameters = new { sessionId = _sessionId, answer = new { stepId = _stepId, value = moreValue } };
+            var payload = await _client.SendWizardRequestAsync("wizard.next", parameters, timeoutMs: TimeoutForCurrentStep());
+            if (generation != _operationGeneration) return;
+
+            // Parse the expanded options from the response
+            if (payload.TryGetProperty("step", out var step))
+            {
+                // Update step ID — the gateway may issue a new one for the expanded view
+                if (step.TryGetProperty("id", out var expandedId))
+                    _stepId = expandedId.ToString();
+
+                var expandedOptions = WizardAnswerBuilder.ReadOptions(step).ToList();
+
+                // Filter out __back and __more from expanded list
+                var filtered = expandedOptions
+                    .Where(o => !IsMoreOption(o) && !IsBackOption(o))
+                    .ToList();
+
+                // Rebuild the ListView: skip options first, then all expanded items
+                SelectOptions.Items.Clear();
+                _options.Clear();
+
+                // Re-inject skip options at top
+                foreach (var skip in previousSkipOptions)
+                {
+                    _options.Add(skip);
+                    SelectOptions.Items.Add(CreateOptionItem(skip));
+                }
+
+                // Add all expanded options
+                foreach (var option in filtered)
+                {
+                    _options.Add(option);
+                    SelectOptions.Items.Add(CreateOptionItem(option));
+                }
+
+                // Select first item by default
+                if (SelectOptions.Items.Count > 0)
+                    SelectOptions.SelectedIndex = 0;
+
+                // Push this expanded payload to step history so Back works
+                _stepHistory.Push(payload);
+            }
+        }
+        catch (Exception ex)
+        {
+            if (generation != _operationGeneration) return;
+            await EnterWizardErrorAsync(ex.Message);
+        }
+    }
+
+    private void WizardBack_Click(object sender, RoutedEventArgs e)
+    {
+        // Pop the current step (that's showing now), then re-render the previous one
+        if (_stepHistory.Count > 1)
+        {
+            _stepHistory.Pop(); // discard current
+            var previousPayload = _stepHistory.Pop(); // will be re-pushed by ApplyPayloadAsync
+            _ = ApplyPayloadAsync(previousPayload);
+        }
+        else
+        {
+            SetupWindow.Active?.NavigateToWelcome(back: true);
+        }
     }
 
     private void StartOver_Click(object sender, RoutedEventArgs e) =>
@@ -409,6 +745,7 @@ private void StartOver_Click(object sender, RoutedEventArgs e) =>
     private async Task StartOverAsync()
     {
         AdvanceOperationGeneration();
+        _stepHistory.Clear();
         HideRecoveryActions();
         SetBusy("Starting over...");
         await CancelCurrentSessionAsync();
@@ -446,6 +783,8 @@ private async Task SendCurrentAnswerAsync(bool skip)
             // render and the user's current click. Once they answer, those messages
             // are "consumed" — wipe so the next step starts with a clean slate.
             ClearConsoleBanner();
+            var answeredQuestion = TitleText.Text;
+            var answeredLabel = CurrentAnswerLabel(skip);
             object parameters;
             if (skip)
             {
@@ -453,6 +792,10 @@ private async Task SendCurrentAnswerAsync(bool skip)
                     ? new { sessionId = _sessionId, answer = new { stepId = _stepId, value = false } }
                     : new { sessionId = _sessionId };
             }
+            else if (_stepCategory == WizardStepCategory.NonInteractive)
+            {
+                parameters = WizardNextPayload.Acknowledge(_sessionId, _stepId);
+            }
             else
             {
                 parameters = new { sessionId = _sessionId, answer = new { stepId = _stepId, value = answerValue } };
@@ -462,7 +805,9 @@ private async Task SendCurrentAnswerAsync(bool skip)
             if (generation != _operationGeneration)
                 return;
 
+            AppendTranscriptTurn(answeredQuestion, answeredLabel);
             await ApplyPayloadAsync(payload);
+            ScrollActiveIntoView();
         }
         catch (Exception ex)
         {
@@ -473,14 +818,113 @@ private async Task SendCurrentAnswerAsync(bool skip)
         }
     }
 
+    private string? CurrentAnswerLabel(bool skip)
+    {
+        if (skip)
+            return _stepType == "confirm" ? "No" : "Skipped";
+
+        return _stepType switch
+        {
+            "confirm" => "Yes",
+            "text" => _sensitive ? "••••••" : (string.IsNullOrEmpty(TextInput.Text) ? null : TextInput.Text),
+            "select" or "multiselect" => LabelForValues(GetSelectedOptionValues()),
+            _ => null,
+        };
+    }
+
+    private string? LabelForValues(string[] values)
+    {
+        if (values.Length == 0)
+            return null;
+        var labels = values.Select(v => _options.FirstOrDefault(o => o.Value == v)?.Label ?? v);
+        return string.Join(", ", labels);
+    }
+
+    // Presentation-only transcript; protocol frames are unchanged.
+    private void AppendTranscriptTurn(string question, string? answer)
+    {
+        if (string.IsNullOrWhiteSpace(question))
+            return;
+
+        var grid = new Grid { Padding = new Thickness(2, 4, 2, 4) };
+        grid.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
+        grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
+
+        var dot = new Border
+        {
+            Width = 18,
+            Height = 18,
+            CornerRadius = new CornerRadius(9),
+            Background = ResourceBrush("SystemFillColorSuccessBrush"),
+            Margin = new Thickness(0, 1, 10, 0),
+            VerticalAlignment = VerticalAlignment.Top,
+            Child = new FontIcon
+            {
+                Glyph = "\uE73E",
+                FontSize = 10,
+                Foreground = new SolidColorBrush(Microsoft.UI.Colors.White),
+                IsTextScaleFactorEnabled = false,
+            },
+        };
+
+        var stack = new StackPanel { Spacing = 1, VerticalAlignment = VerticalAlignment.Center };
+        stack.Children.Add(new TextBlock
+        {
+            Text = question,
+            FontSize = 13,
+            Foreground = ResourceBrush("TextFillColorTertiaryBrush"),
+            TextWrapping = TextWrapping.Wrap,
+        });
+        if (!string.IsNullOrWhiteSpace(answer))
+        {
+            stack.Children.Add(new TextBlock
+            {
+                Text = answer,
+                FontSize = 13,
+                Foreground = ResourceBrush("TextFillColorSecondaryBrush"),
+                TextWrapping = TextWrapping.Wrap,
+            });
+        }
+
+        Grid.SetColumn(dot, 0);
+        Grid.SetColumn(stack, 1);
+        grid.Children.Add(dot);
+        grid.Children.Add(stack);
+        TranscriptPanel.Children.Add(grid);
+    }
+
+    private void ScrollActiveIntoView()
+    {
+        MainScroller.UpdateLayout();
+        // Bring the active step card's TITLE into view (just below the last answered
+        // step) rather than jumping to the very bottom — scrolling to the bottom hid
+        // the step's introduction/question when it had many options (e.g. web search).
+        if (MainScroller.Content is FrameworkElement content)
+        {
+            try
+            {
+                var cardTop = StepCard.TransformToVisual(content)
+                    .TransformPoint(new Windows.Foundation.Point(0, 0)).Y;
+                // Leave a little room above so the most recent answered step stays
+                // visible for continuity, but keep the active title at the top.
+                var target = Math.Max(0, cardTop - 44);
+                MainScroller.ChangeView(null, target, null);
+                return;
+            }
+            catch
+            {
+                // Fall back to the previous behaviour if the transform fails.
+            }
+        }
+        MainScroller.ChangeView(null, MainScroller.ScrollableHeight, null);
+    }
+
     private bool TryBuildAnswerValue(out object value)
     {
         value = _stepType switch
         {
             "confirm" => true,
-            "select" => SelectOptions.Children.OfType<RadioButton>()
-                .FirstOrDefault(r => r.IsChecked == true)
-                ?.Tag is WizardOptionValue option
+            "select" => SelectOptions.SelectedItem is ListViewItem { Tag: WizardOptionValue option }
                     ? option.RawValue
                     : "",
             "multiselect" => MultiOptions.Children.OfType<CheckBox>()
@@ -506,11 +950,9 @@ private string[] GetSelectedOptionValues()
     {
         return _stepType switch
         {
-            "select" => SelectOptions.Children.OfType<RadioButton>()
-                .Where(r => r.IsChecked == true)
-                .Select(r => r.Tag is WizardOptionValue option ? option.Value : "")
-                .Where(v => v.Length > 0)
-                .ToArray(),
+            "select" => SelectOptions.SelectedItem is ListViewItem { Tag: WizardOptionValue selectedOpt }
+                ? [selectedOpt.Value]
+                : [],
             "multiselect" => MultiOptions.Children.OfType<CheckBox>()
                 .Where(c => c.IsChecked == true)
                 .Select(c => c.Tag is WizardOptionValue option ? option.Value : "")
@@ -538,72 +980,102 @@ private void UpdateContinueState()
 
     private int TimeoutForCurrentStep()
     {
-        var text = $"{TitleText.Text} {string.Join(' ', MessagePanel.Children.OfType<TextBlock>().Select(t => t.Text))}";
-        return text.Contains("device", StringComparison.OrdinalIgnoreCase)
-            || text.Contains("authorize", StringComparison.OrdinalIgnoreCase)
-            || text.Contains("login", StringComparison.OrdinalIgnoreCase)
-            || text.Contains("sign in", StringComparison.OrdinalIgnoreCase)
-            || text.Contains("oauth", StringComparison.OrdinalIgnoreCase)
-            ? 300_000
-            : 30_000;
+        IReadOnlyCollection<WizardOptionValue>? selectedOptions = null;
+        if (WizardSelection.RequiresSelection(_stepType))
+        {
+            var selectedValues = GetSelectedOptionValues().ToHashSet(StringComparer.Ordinal);
+            selectedOptions = _options
+                .Where(option => selectedValues.Contains(option.Value))
+                .ToArray();
+        }
+
+        return WizardTimeouts.ForStep(_currentTitle, _currentMessage, _stepId, selectedOptions);
     }
 
     private void ResetInputs()
     {
-        SelectOptions.Children.Clear();
+        if (_moreOptionsButton?.Parent is Panel morePanel)
+            morePanel.Children.Remove(_moreOptionsButton);
+        _moreOptionsButton = null;
+        SelectOptions.Items.Clear();
         SelectOptions.Visibility = Visibility.Collapsed;
         MultiOptions.Children.Clear();
         MultiOptions.Visibility = Visibility.Collapsed;
         TextInput.Visibility = Visibility.Collapsed;
         SecretInput.Visibility = Visibility.Collapsed;
-        MessagePanel.Children.Clear();
+        MessageBlock.Blocks.Clear();
+        MessageBlock.Visibility = Visibility.Collapsed;
+        MessageCodeRows.Children.Clear();
+        HideGatewayRecovery();
     }
 
     private void RenderMessage(string message)
     {
-        MessagePanel.Children.Clear();
+        MessageBlock.Blocks.Clear();
+        MessageCodeRows.Children.Clear();
+        MessageBlock.Visibility = Visibility.Collapsed;
+
         if (string.IsNullOrWhiteSpace(message))
             return;
 
+        var paragraph = new Microsoft.UI.Xaml.Documents.Paragraph();
+        var hasContent = false;
+
         foreach (var line in message.Split('\n'))
-            AppendLineTo(MessagePanel, line, fontSize: 14, opacity: 0.82);
-    }
+        {
+            // Strip leading bullet characters (•, -, *) that look redundant in the UI
+            var trimmed = line.TrimStart();
+            if (trimmed.StartsWith("• ") || trimmed.StartsWith("- ") || trimmed.StartsWith("* "))
+                trimmed = trimmed[2..];
 
-    // Renders a single line into a target panel, decorating URLs as hyperlinks
-    // and "Code: XXX" patterns as monospace rows with a copy button. Shared by
-    // RenderMessage and AppendConsoleLine.
-    private void AppendLineTo(Panel target, string line, double fontSize, double opacity)
-    {
-        var trimmed = line.TrimEnd('\r');
+            var segment = WizardMessageFormatting.ClassifyLine(trimmed);
 
-        var codeMatch = Regex.Match(trimmed, @"^((?:Code|code|user_code|USER_CODE)\s*[:=]\s*)([A-Z0-9]{2,8}(?:-[A-Z0-9]{2,8})+|[A-Z0-9]{4,12})\b");
-        if (codeMatch.Success)
-        {
-            target.Children.Add(BuildCodeRow(codeMatch.Groups[1].Value, codeMatch.Groups[2].Value));
-            return;
-        }
+            if (segment.Kind == WizardLineKind.Code)
+            {
+                // Code rows with copy buttons stay as separate interactive elements
+                MessageCodeRows.Children.Add(BuildCodeRow(segment.Prefix, segment.Highlight));
+                continue;
+            }
 
-        var urlMatch = Regex.Match(trimmed, @"https?://[^\s\)\""]+", RegexOptions.IgnoreCase);
-        if (urlMatch.Success && Uri.TryCreate(urlMatch.Value.TrimEnd('.', ','), UriKind.Absolute, out var uri))
-        {
-            target.Children.Add(BuildLinkLine(trimmed, urlMatch.Value, uri));
-            return;
+            if (hasContent)
+                paragraph.Inlines.Add(new LineBreak());
+
+            if (segment.Kind == WizardLineKind.Url && Uri.TryCreate(segment.Highlight, UriKind.Absolute, out var uri))
+            {
+                var urlIndex = segment.Text.IndexOf(segment.Highlight, StringComparison.Ordinal);
+                var prefix = segment.Text[..urlIndex];
+                if (!string.IsNullOrEmpty(prefix))
+                    paragraph.Inlines.Add(new Run { Text = prefix });
+
+                var link = new Hyperlink { NavigateUri = uri };
+                link.Inlines.Add(new Run { Text = segment.Highlight });
+                paragraph.Inlines.Add(link);
+
+                var suffix = segment.Text[(urlIndex + segment.Highlight.Length)..];
+                if (!string.IsNullOrEmpty(suffix))
+                    paragraph.Inlines.Add(new Run { Text = suffix });
+            }
+            else
+            {
+                paragraph.Inlines.Add(new Run { Text = segment.Text });
+            }
+
+            hasContent = true;
         }
 
-        target.Children.Add(new TextBlock
+        if (hasContent)
         {
-            Text = trimmed,
-            FontSize = fontSize,
-            Opacity = opacity,
-            TextWrapping = TextWrapping.Wrap,
-            IsTextSelectionEnabled = true
-        });
+            MessageBlock.Blocks.Add(paragraph);
+            MessageBlock.Visibility = Visibility.Visible;
+        }
     }
 
     private void StartConsoleTail()
     {
         StopConsoleTail();
-        var tail = new WizardConsoleTail(logger: NullLogger.Instance);
+        var tail = new WizardConsoleTail(
+            logger: NullLogger.Instance,
+            distroNameOverride: _config.DistroName);
         _consoleTail = tail;
         var dispatcher = DispatcherQueue;
         tail.Start(message =>
@@ -639,45 +1111,91 @@ private void AppendConsoleLine(string message)
         if (string.IsNullOrWhiteSpace(message))
             return;
 
+        if (WizardConsoleTail.LooksLikeTerminalQrArt(message))
+        {
+            AppendQrConsoleBlock(message);
+            ConsoleBanner.Visibility = Visibility.Visible;
+            return;
+        }
+
         foreach (var line in message.Split('\n'))
         {
             if (string.IsNullOrWhiteSpace(line))
                 continue;
 
-            AppendLineTo(ConsoleBannerLines, line, fontSize: 13, opacity: 0.92);
+            var para = new Microsoft.UI.Xaml.Documents.Paragraph();
+            para.Inlines.Add(new Run { Text = line });
+            ConsoleBannerBlock.Blocks.Add(para);
         }
 
         ConsoleBanner.Visibility = Visibility.Visible;
     }
 
+    private void AppendQrConsoleBlock(string message)
+    {
+        var text = message.Replace("\r\n", "\n").TrimEnd('\r', '\n');
+        var qrText = new TextBlock
+        {
+            Text = text,
+            FontSize = 9,
+            LineHeight = 9,
+            FontFamily = new FontFamily("Cascadia Mono, Consolas"),
+            Foreground = new SolidColorBrush(Microsoft.UI.Colors.Black),
+            TextWrapping = TextWrapping.NoWrap,
+            IsTextSelectionEnabled = true
+        };
+
+        var qrSurface = new Border
+        {
+            Background = new SolidColorBrush(Microsoft.UI.Colors.White),
+            Padding = new Thickness(12),
+            Child = qrText
+        };
+
+        ConsoleBannerLines.Children.Add(new ScrollViewer
+        {
+            HorizontalScrollBarVisibility = ScrollBarVisibility.Auto,
+            VerticalScrollBarVisibility = ScrollBarVisibility.Disabled,
+            HorizontalScrollMode = ScrollMode.Auto,
+            VerticalScrollMode = ScrollMode.Disabled,
+            Content = qrSurface
+        });
+    }
+
     private void ClearConsoleBanner()
     {
+        ConsoleBannerBlock.Blocks.Clear();
         ConsoleBannerLines.Children.Clear();
         ConsoleBanner.Visibility = Visibility.Collapsed;
     }
 
     private static FrameworkElement BuildLinkLine(string line, string urlText, Uri uri)
     {
-        var panel = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 6 };
-        var prefix = line[..line.IndexOf(urlText, StringComparison.Ordinal)];
+        var textBlock = new TextBlock
+        {
+            FontSize = 14,
+            Opacity = 0.82,
+            TextWrapping = TextWrapping.Wrap,
+            IsTextSelectionEnabled = true
+        };
+
+        var urlIndex = line.IndexOf(urlText, StringComparison.Ordinal);
+        var prefix = line[..urlIndex];
         if (!string.IsNullOrEmpty(prefix))
-            panel.Children.Add(new TextBlock { Text = prefix, FontSize = 14, Opacity = 0.82, VerticalAlignment = VerticalAlignment.Center });
+            textBlock.Inlines.Add(new Run { Text = prefix });
 
-        var button = new HyperlinkButton
+        var link = new Hyperlink
         {
-            Content = urlText,
-            NavigateUri = uri,
-            Padding = new Thickness(0),
-            FontSize = 14,
-            VerticalAlignment = VerticalAlignment.Center
+            NavigateUri = uri
         };
-        panel.Children.Add(button);
+        link.Inlines.Add(new Run { Text = urlText });
+        textBlock.Inlines.Add(link);
 
-        var suffix = line[(line.IndexOf(urlText, StringComparison.Ordinal) + urlText.Length)..];
+        var suffix = line[(urlIndex + urlText.Length)..];
         if (!string.IsNullOrEmpty(suffix))
-            panel.Children.Add(new TextBlock { Text = suffix, FontSize = 14, Opacity = 0.82, VerticalAlignment = VerticalAlignment.Center });
+            textBlock.Inlines.Add(new Run { Text = suffix });
 
-        return panel;
+        return textBlock;
     }
 
     private static FrameworkElement BuildCodeRow(string prefix, string code)
@@ -727,11 +1245,13 @@ private void SetBusy(string status)
         BusyRing.IsActive = true;
         PrimaryButton.IsEnabled = false;
         SecondaryButton.IsEnabled = false;
+        HideGatewayRecovery();
     }
 
     private void ShowError(string message)
     {
         _errorState = true;
+        _finalizationErrorState = false;
         BusyRing.Visibility = Visibility.Collapsed;
         BusyRing.IsActive = false;
         StatusText.Text = "Wizard needs attention";
@@ -739,10 +1259,18 @@ private void ShowError(string message)
         ErrorText.Visibility = Visibility.Visible;
         PrimaryButton.Content = "Start wizard again";
         PrimaryButton.IsEnabled = true;
-        SecondaryButton.Content = "Skip wizard";
-        SecondaryButton.IsEnabled = true;
-        SecondaryButton.Visibility = Visibility.Visible;
-        HideRecoveryActions();
+        SecondaryButton.IsEnabled = false;
+        SecondaryButton.Visibility = Visibility.Collapsed;
+        ShowRecoveryActions();
+        MaybeShowGatewayRecovery();
+    }
+
+    private void ShowFinalizationError(string message)
+    {
+        ShowError(message);
+        _finalizationErrorState = true;
+        StatusText.Text = "Windows integration needs attention";
+        PrimaryButton.Content = "Retry Windows integration";
     }
 
     private async Task EnterWizardErrorAsync(string detail)
@@ -750,24 +1278,150 @@ private async Task EnterWizardErrorAsync(string detail)
         if (_errorState)
             return;
 
+        // Invalidate in-flight wizard.next calls before tearing down the connection.
+        AdvanceOperationGeneration();
         _errorState = true;
-        // Cancel the server-side wizard session before disconnecting so that
-        // subsequent retries (Start wizard again / Skip wizard) don't hit a
-        // "wizard already running" error from a lingering gateway session.
+        // Cancel the server-side wizard session before disconnecting so retries
+        // don't hit a "wizard already running" error from a lingering session.
         await CancelCurrentSessionAsync();
         ShowError(detail);
     }
 
+    // Shows the WSL recovery affordances (open a terminal / restart the gateway)
+    // whenever the wizard surfaces an error AND the active gateway is an
+    // app-managed WSL distro we can control. We deliberately do not parse the
+    // gateway's error text: its wording is outside our control and can change, so
+    // the user reads the (selectable) error message and decides what to run.
+    private void MaybeShowGatewayRecovery()
+    {
+        HideGatewayRecovery();
+
+        if (!_hostAccessPlan.CanControlWslGateway || string.IsNullOrWhiteSpace(_hostAccessPlan.DistroName))
+            return;
+
+        OpenGatewayTerminalButton.IsEnabled = true;
+        RestartGatewayButton.IsEnabled = true;
+        GatewayRecovery.Visibility = Visibility.Visible;
+    }
+
+    private void HideGatewayRecovery()
+    {
+        GatewayRecovery.Visibility = Visibility.Collapsed;
+    }
+
+    private void OpenGatewayTerminal_Click(object sender, RoutedEventArgs e)
+    {
+        if (!_hostAccessPlan.CanOpenTerminal)
+            return;
+
+        try
+        {
+            new GatewayTerminalLauncher(NullLogger.Instance).Open(_hostAccessPlan);
+            StatusText.Text = $"Opened a terminal in {_hostAccessPlan.DistroName}. Install the tool, then choose Restart gateway.";
+        }
+        catch (Exception ex)
+        {
+            ErrorText.Text = $"Couldn't open a terminal: {ex.Message}";
+            ErrorText.Visibility = Visibility.Visible;
+        }
+    }
+
+    private void RestartGateway_Click(object sender, RoutedEventArgs e) =>
+        AsyncEventHandlerGuard.Run(
+            RestartGatewayAsync,
+            NullLogger.Instance,
+            nameof(RestartGateway_Click));
+
+    private async Task RestartGatewayAsync()
+    {
+        var distro = _hostAccessPlan.DistroName;
+        if (!_hostAccessPlan.CanControlWslGateway || string.IsNullOrWhiteSpace(distro))
+            return;
+
+        // Claim this operation and lock the UI synchronously, before the first await,
+        // so a second Restart/Skip/Open-terminal click during the disconnect can't race
+        // us. SetBusy disables the primary/secondary buttons and collapses the recovery
+        // panel (which hosts the Restart/Open-terminal buttons), so they stop hit-testing.
+        var generation = AdvanceOperationGeneration();
+        _errorState = false;
+        ErrorText.Visibility = Visibility.Collapsed;
+        SetBusy($"Restarting {distro}...");
+
+        // Detach the current wizard client first so the restart-induced disconnect
+        // doesn't surface as a spurious "connection lost" error mid-restart.
+        await DisconnectAsync();
+        if (generation != _operationGeneration)
+            return;
+
+        try
+        {
+            // A gateway restart spins up a fresh login shell and restarts the daemon
+            // inside the distro, which can take well over the runner's default 30s
+            // ceiling on a cold distro. Give it a generous timeout so a slow-but-healthy
+            // restart isn't reported as a spurious timeout failure.
+            var runner = new WslExeCommandRunner(NullLogger.Instance, defaultTimeout: TimeSpan.FromMinutes(2));
+            var controller = new WslGatewayController(runner, NullLogger.Instance);
+            var result = await controller.RunAsync(distro, WslGatewayControlAction.Restart);
+            if (generation != _operationGeneration)
+                return;
+
+            if (!result.Success)
+            {
+                var details = string.IsNullOrWhiteSpace(result.OutputSummary)
+                    ? $"wsl.exe exited with code {result.ExitCode}."
+                    : result.OutputSummary;
+                await EnterWizardErrorAsync($"Restarting the gateway failed: {details}");
+                return;
+            }
+
+            // Gateway is back up with the freshly-installed tool on PATH. Stay on
+            // this page and re-enter the gateway config wizard (provider/model
+            // onboarding) — we do NOT return to Welcome or re-install WSL. The
+            // gateway restart wiped its wizard session, so this resumes at the
+            // first config question rather than the exact step that failed.
+            await StartWizardAsync(clearTranscript: false);
+        }
+        catch (Exception ex)
+        {
+            if (generation != _operationGeneration)
+                return;
+
+            await EnterWizardErrorAsync($"Restarting the gateway failed: {ex.Message}");
+        }
+    }
+
     private async Task SkipWizardAsync()
     {
-        AdvanceOperationGeneration();
+        var generation = AdvanceOperationGeneration();
+        _errorState = false;
         HideRecoveryActions();
         SetBusy("Skipping wizard...");
         await CancelCurrentSessionAsync();
-        if (_config!.SkipPermissions)
-            SetupWindow.Active?.NavigateToComplete(true, TimeSpan.Zero, _config.LogPath);
-        else
-            SetupWindow.Active?.NavigateToPermissions();
+        await CompleteSetupAsync(generation);
+    }
+
+    private async Task CompleteSetupAsync(int generation)
+    {
+        if (generation != _operationGeneration || _errorState)
+            return;
+
+        var setupWindow = SetupWindow.Active;
+        if (setupWindow is null or { IsClosed: true })
+            return;
+
+        SetBusy("Finishing Windows integration...");
+        var contextResult = await setupWindow.ApplyWindowsNodeContextAsync();
+        if (generation != _operationGeneration || setupWindow.IsClosed)
+            return;
+
+        if (!contextResult.IsSuccess)
+        {
+            ShowFinalizationError($"OpenClaw onboard finished, but Windows node guidance could not be installed: {contextResult.Message}");
+            return;
+        }
+
+        // Permissions were collected before install, so completion goes straight to summary.
+        setupWindow.NavigateToComplete(true, TimeSpan.Zero, _config!.LogPath);
     }
 
     private async Task CancelCurrentSessionAsync()
@@ -785,19 +1439,14 @@ private async Task CancelCurrentSessionAsync()
 
     private void ShowRecoveryActions()
     {
-        if (_errorState)
-            return;
-
-        RecoveryActions.Visibility = Visibility.Visible;
-        StartOverButton.IsEnabled = true;
-        SkipWizardButton.IsEnabled = true;
+        MoreOptionsButton.Visibility = Visibility.Visible;
+        MoreOptionsButton.IsEnabled = true;
     }
 
     private void HideRecoveryActions()
     {
-        RecoveryActions.Visibility = Visibility.Collapsed;
-        StartOverButton.IsEnabled = false;
-        SkipWizardButton.IsEnabled = false;
+        MoreOptionsButton.Visibility = Visibility.Collapsed;
+        MoreOptionsButton.IsEnabled = false;
     }
 
     private async Task DisconnectAsync()
diff --git a/src/OpenClaw.SetupEngine.UI/SetupPreview.cs b/src/OpenClaw.SetupEngine.UI/SetupPreview.cs
new file mode 100644
index 000000000..bfd4d41d6
--- /dev/null
+++ b/src/OpenClaw.SetupEngine.UI/SetupPreview.cs
@@ -0,0 +1,38 @@
+using System;
+
+namespace OpenClaw.SetupEngine.UI;
+
+/// <summary>
+/// Dev-only preview routing for the setup window. Lets <c>OPENCLAW_SETUP_PREVIEW_PAGE</c>
+/// open a single page directly with sample content (no pipeline, no gateway) for visual
+/// iteration during development.
+///
+/// In <b>Release</b> builds this is fully inert: the environment variable is never read,
+/// so the preview route can never bypass the setup run lock or the real install pipeline
+/// in production. The gating lives here so call sites stay simple and there is exactly one
+/// place that reads the variable.
+/// </summary>
+internal static class SetupPreview
+{
+    private const string EnvVar = "OPENCLAW_SETUP_PREVIEW_PAGE";
+
+    /// <summary>
+    /// The requested preview page (lower-cased, trimmed), or <c>null</c> when preview mode
+    /// is off. Always <c>null</c> in Release builds.
+    /// </summary>
+    public static string? RequestedPage
+    {
+#if DEBUG
+        get
+        {
+            var page = Environment.GetEnvironmentVariable(EnvVar);
+            return string.IsNullOrWhiteSpace(page) ? null : page.Trim().ToLowerInvariant();
+        }
+#else
+        get => null;
+#endif
+    }
+
+    /// <summary>True when a preview page is active. Always <c>false</c> in Release builds.</summary>
+    public static bool IsActive => RequestedPage is not null;
+}
diff --git a/src/OpenClaw.SetupEngine.UI/SetupWindow.xaml b/src/OpenClaw.SetupEngine.UI/SetupWindow.xaml
index 3d9f4b147..9edaf01a6 100644
--- a/src/OpenClaw.SetupEngine.UI/SetupWindow.xaml
+++ b/src/OpenClaw.SetupEngine.UI/SetupWindow.xaml
@@ -14,7 +14,8 @@
         <!-- Title bar drag region with icon + text -->
         <Grid x:Name="TitleBarDrag" Grid.Row="0" Padding="12,0,0,0">
             <StackPanel Orientation="Horizontal" Spacing="10" VerticalAlignment="Center">
-                <Image Source="ms-appx:///OpenClaw.SetupEngine.UI/Assets/Setup/Lobster.png" Width="20" Height="20" />
+                <Image Source="ms-appx:///OpenClaw.SetupEngine.UI/Assets/Setup/OpenClawMascot.png" Width="20" Height="20"
+                       AutomationProperties.AccessibilityView="Raw" />
                 <TextBlock Text="OpenClaw Setup" FontSize="13" Opacity="0.85"
                            VerticalAlignment="Center" />
             </StackPanel>
diff --git a/src/OpenClaw.SetupEngine.UI/SetupWindow.xaml.cs b/src/OpenClaw.SetupEngine.UI/SetupWindow.xaml.cs
index 17872724a..aadb3151c 100644
--- a/src/OpenClaw.SetupEngine.UI/SetupWindow.xaml.cs
+++ b/src/OpenClaw.SetupEngine.UI/SetupWindow.xaml.cs
@@ -3,6 +3,7 @@
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Media.Animation;
 using OpenClaw.SetupEngine.UI.Pages;
 using System.Runtime.InteropServices;
 
@@ -12,22 +13,49 @@ public sealed partial class SetupWindow : Window
 {
     private SetupConfig _config = null!;
     private SetupRunLock? _setupLock;
+    private readonly CancellationTokenSource _lifetimeCts = new();
+    private Task<StepResult>? _contextApplyTask;
     private readonly TaskCompletionSource<bool> _initialContentReady =
         new(TaskCreationOptions.RunContinuationsAsynchronously);
+    private readonly TaskCompletionSource<bool> _cleanupCompleted =
+        new(TaskCreationOptions.RunContinuationsAsynchronously);
     private bool _isClosed;
+    private bool _persistStartupPreferenceOnComplete = true;
+    private bool _showStartupPreferenceOnComplete = true;
+    private readonly string _dataDir;
+    private readonly string _localDataDir;
 
     public static SetupWindow? Active { get; private set; }
 
     public event EventHandler? AdvancedSetupRequested;
     public event EventHandler<SetupCompletedEventArgs>? SetupCompleted;
     public bool IsClosed => _isClosed;
-    public bool CanNavigateToWizard => !_isClosed && _setupLock is not null;
+    public Task CleanupCompleted => _cleanupCompleted.Task;
+    internal string DataDir => _dataDir;
+    internal string LocalDataDir => _localDataDir;
+    public bool CanNavigateToWizard =>
+        !_isClosed &&
+        _setupLock is not null &&
+        RootFrame.Content is not WizardPage;
+    public bool CanNavigateToGatewayInstalledMilestone =>
+        !_isClosed &&
+        _setupLock is not null &&
+        RootFrame.Content is not ProgressPage { IsPipelineRunning: true } &&
+        RootFrame.Content is not WizardPage;
 
     [DllImport("user32.dll")]
     private static extern uint GetDpiForWindow(IntPtr hwnd);
 
-    public SetupWindow(string? configPath = null)
+    public SetupWindow(
+        string? configPath = null,
+        bool startAtGatewayInstalledMilestone = false,
+        string? dataDir = null,
+        string? localDataDir = null,
+        string? distroNameOverride = null,
+        int? gatewayPortOverride = null)
     {
+        _dataDir = dataDir ?? SetupContext.ResolveDataDir();
+        _localDataDir = localDataDir ?? SetupContext.ResolveLocalDataDir();
         InitializeComponent();
         Active = this;
 
@@ -41,12 +69,13 @@ public SetupWindow(string? configPath = null)
         ExtendsContentIntoTitleBar = true;
         SetTitleBar(TitleBarDrag);
 
-        // Mica backdrop
+        // Mica backdrop — the signature Windows 11 material (native).
         SystemBackdrop = new MicaBackdrop();
 
         // Load config: explicit --config arg, or bundled default-config.json (required)
         var args = Environment.GetCommandLineArgs();
-        configPath ??= GetArg(args, "--config");
+        var explicitConfigPath = configPath ?? GetArg(args, "--config");
+        configPath = explicitConfigPath;
         if (configPath == null)
         {
             var defaultPath = Path.Combine(AppContext.BaseDirectory, "default-config.json");
@@ -68,48 +97,188 @@ public SetupWindow(string? configPath = null)
         }
 
         _config = SetupConfig.LoadFromFile(configPath);
+        _config.UsesBundledDefaultConfig = explicitConfigPath == null;
         _config = SetupConfig.FromEnvironment(_config);
+        if (!string.IsNullOrWhiteSpace(distroNameOverride))
+            _config.DistroName = distroNameOverride;
+        if (gatewayPortOverride is > 0 and <= 65535)
+        {
+            _config.GatewayPort = gatewayPortOverride.Value;
+            _config.GatewayUrl = null;
+        }
         GatewayLkgVersion.ApplyToConfig(_config);
         _config.ApplyUiDefaults(rollbackOnFailure: !HasFlag(args, "--no-rollback-on-failure"));
+        if (startAtGatewayInstalledMilestone)
+        {
+            _persistStartupPreferenceOnComplete = false;
+            _showStartupPreferenceOnComplete = false;
+        }
 
-        Closed += (_, _) =>
+        Closed += async (_, _) =>
         {
             _isClosed = true;
             _initialContentReady.TrySetResult(true);
-            _setupLock?.Dispose();
-            _setupLock = null;
-            if (ReferenceEquals(Active, this))
-                Active = null;
+            try
+            {
+                _lifetimeCts.Cancel();
+                if (_contextApplyTask is { } contextApplyTask)
+                    await contextApplyTask;
+            }
+            catch (OperationCanceledException)
+            {
+                // Window teardown owns this cancellation; cleanup still must finish.
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"Setup cleanup failed: {ex}");
+            }
+            finally
+            {
+                _setupLock?.Dispose();
+                _setupLock = null;
+                if (ReferenceEquals(Active, this))
+                    Active = null;
+                _cleanupCompleted.TrySetResult(true);
+            }
         };
 
-        if (!SetupRunLock.TryAcquire(SetupContext.ResolveDataDir(), out _setupLock, out var lockMessage))
+        var previewPage = SetupPreview.RequestedPage;
+        if (previewPage != null)
+        {
+            NavigatePreview(previewPage);
+            return;
+        }
+
+        if (!SetupRunLock.TryAcquire(_dataDir, out _setupLock, out var lockMessage))
         {
-            RootFrame.Navigate(typeof(CompletePage), new CompletePageArgs(false, TimeSpan.Zero, null, lockMessage ?? "Another setup run is active."));
+            NavigateTo(typeof(CompletePage), new CompletePageArgs(false, TimeSpan.Zero, null, lockMessage ?? "Another setup run is active."));
             return;
         }
 
-        RootFrame.Navigate(typeof(WelcomePage), _config);
+        if (startAtGatewayInstalledMilestone)
+            NavigateToGatewayInstalledMilestone();
+        else
+            NavigateTo(typeof(SecurityNoticePage), _config);
+    }
+
+    public void NavigateToSecurityNotice(bool back = false) => NavigateTo(typeof(SecurityNoticePage), _config, back);
+    public void NavigateToWelcome(bool back = false) => NavigateTo(typeof(WelcomePage), _config, back);
+    public void NavigateToAdvancedSetup() => NavigateTo(typeof(AdvancedSetupPage), _config);
+    public void NavigateToCapabilities() => NavigateTo(typeof(CapabilitiesPage), _config);
+    public void NavigateToProgress() => NavigateTo(typeof(ProgressPage), CreateProgressPageArgs(showMilestoneOnly: false));
+    public void NavigateToGatewayInstalledMilestone() =>
+        NavigateTo(typeof(ProgressPage), CreateProgressPageArgs(showMilestoneOnly: true));
+
+    private ProgressPageArgs CreateProgressPageArgs(bool showMilestoneOnly) =>
+        new(_config, showMilestoneOnly, _dataDir, _localDataDir);
+
+    public bool TryNavigateToGatewayInstalledMilestone()
+    {
+        if (!CanNavigateToGatewayInstalledMilestone)
+            return false;
+
+        _persistStartupPreferenceOnComplete = false;
+        _showStartupPreferenceOnComplete = false;
+        NavigateToGatewayInstalledMilestone();
+        return true;
     }
 
-    public void NavigateToCapabilities() => RootFrame.Navigate(typeof(CapabilitiesPage), _config);
-    public void NavigateToProgress() => RootFrame.Navigate(typeof(ProgressPage), _config);
-    public bool TryNavigateToWizard()
+    public bool TryNavigateToWizard(bool back = false)
     {
         if (!CanNavigateToWizard)
             return false;
 
-        RootFrame.Navigate(typeof(WizardPage), _config);
+        NavigateTo(typeof(WizardPage), _config, back);
         return true;
     }
 
-    public void NavigateToWizard()
+    internal async Task<StepResult> ApplyWindowsNodeContextAsync()
+    {
+        if (_contextApplyTask is { } existingTask)
+            return await existingTask;
+
+        _contextApplyTask = ApplyWindowsNodeContextCoreAsync();
+        try
+        {
+            return await _contextApplyTask;
+        }
+        finally
+        {
+            _contextApplyTask = null;
+        }
+    }
+
+    private async Task<StepResult> ApplyWindowsNodeContextCoreAsync()
     {
-        if (!TryNavigateToWizard())
-            throw new InvalidOperationException("Setup window is not ready to navigate to the gateway wizard.");
+        if (!_config.WindowsNodeContext.Enabled)
+            return StepResult.Skip("Windows node context injection disabled");
+
+        var ct = _lifetimeCts.Token;
+        using var logger = new SetupLogger(filePath: null);
+        using var journal = new TransactionJournal(filePath: null, logger);
+        var context = new SetupContext(
+            _config,
+            logger,
+            journal,
+            new CommandRunner(logger),
+            ct,
+            _dataDir,
+            _localDataDir);
+        // This is an idempotent refresh after onboarding, not a transactional
+        // install. A failed refresh must not remove a valid block from an earlier run.
+        var pipeline = new SetupPipeline(
+            [new WindowsNodeBootstrapContextStep()],
+            rollbackOnFailureOverride: false);
+        var result = await pipeline.RunAsync(context);
+        return result.Outcome switch
+        {
+            PipelineOutcome.Success => StepResult.Ok("Windows node context injected"),
+            PipelineOutcome.Cancelled => StepResult.Fail("Windows node context injection was cancelled"),
+            _ => StepResult.Fail(result.Message ?? "Windows node context injection failed")
+        };
     }
-    public void NavigateToPermissions() => RootFrame.Navigate(typeof(PermissionsPage), _config);
+
     public void NavigateToComplete(bool success, TimeSpan elapsed, string? logPath, string? errorMessage = null)
-        => RootFrame.Navigate(typeof(CompletePage), new CompletePageArgs(success, elapsed, logPath, errorMessage));
+        => NavigateTo(
+            typeof(CompletePage),
+            new CompletePageArgs(
+                success,
+                elapsed,
+                logPath,
+                errorMessage,
+                DefaultAutoStart: true,
+                ShowStartupPreference: _showStartupPreferenceOnComplete,
+                ReviewSummary: SetupReviewSummaryBuilder.Build(_config, _dataDir, _localDataDir)));
+
+    // Directional page transition: forward steps slide in from the right, Back from the left.
+    private void NavigateTo(Type page, object? parameter, bool back = false) =>
+        RootFrame.Navigate(page, parameter, new SlideNavigationTransitionInfo
+        {
+            Effect = back ? SlideNavigationTransitionEffect.FromLeft : SlideNavigationTransitionEffect.FromRight,
+        });
+
+    private void NavigatePreview(string page) => RootFrame.Navigate(
+        page switch
+        {
+            "welcome" => typeof(WelcomePage),
+            "advanced" => typeof(AdvancedSetupPage),
+            "capabilities" => typeof(CapabilitiesPage),
+            "progress" => typeof(ProgressPage),
+            "milestone" => typeof(ProgressPage),
+            "wizard" => typeof(WizardPage),
+            "wizard-error" => typeof(WizardPage),
+            "complete" => typeof(CompletePage),
+            "complete-error" => typeof(CompletePage),
+            _ => typeof(SecurityNoticePage),
+        },
+        page switch
+        {
+            "complete" => new CompletePageArgs(true, TimeSpan.FromMinutes(3), null),
+            "complete-error" => new CompletePageArgs(false, TimeSpan.FromMinutes(3), null, "Setup could not finish. Review the details, then retry setup when you are ready."),
+            "progress" => CreateProgressPageArgs(showMilestoneOnly: false),
+            "milestone" => CreateProgressPageArgs(showMilestoneOnly: true),
+            _ => _config,
+        });
 
     public void RequestAdvancedSetup()
     {
@@ -122,6 +291,22 @@ public bool RequestSetupCompleted(bool enableAutoStart)
         if (handler == null)
             return false;
 
+        try
+        {
+            if (_persistStartupPreferenceOnComplete)
+            {
+                _config.Settings.AutoStart = enableAutoStart;
+                TraySettingsConfig.UpdateAutoStartInSettingsFile(
+                    Path.Combine(_dataDir, "settings.json"),
+                    enableAutoStart);
+            }
+        }
+        catch (Exception ex)
+        {
+            NavigateToComplete(false, TimeSpan.Zero, null, $"Setup completed, but saving your startup preference failed: {ex.Message}");
+            return true;
+        }
+
         handler.Invoke(this, new SetupCompletedEventArgs(enableAutoStart));
         return true;
     }
@@ -208,5 +393,12 @@ private static bool HasFlag(string[] args, string name)
         => args.Any(a => a.Equals(name, StringComparison.OrdinalIgnoreCase));
 }
 
-public sealed record CompletePageArgs(bool Success, TimeSpan Elapsed, string? LogPath, string? ErrorMessage = null);
+public sealed record CompletePageArgs(
+    bool Success,
+    TimeSpan Elapsed,
+    string? LogPath,
+    string? ErrorMessage = null,
+    bool DefaultAutoStart = true,
+    bool ShowStartupPreference = true,
+    SetupReviewSummary? ReviewSummary = null);
 public sealed record SetupCompletedEventArgs(bool EnableAutoStart);
diff --git a/src/OpenClaw.SetupEngine.UI/WizardConsoleTail.cs b/src/OpenClaw.SetupEngine.UI/WizardConsoleTail.cs
index 014c224df..ac012a950 100644
--- a/src/OpenClaw.SetupEngine.UI/WizardConsoleTail.cs
+++ b/src/OpenClaw.SetupEngine.UI/WizardConsoleTail.cs
@@ -1,5 +1,7 @@
 using System.Diagnostics;
+using System.Text;
 using System.Text.Json;
+using System.Text.RegularExpressions;
 using OpenClaw.Shared;
 
 namespace OpenClaw.SetupEngine.UI;
@@ -20,6 +22,9 @@ internal sealed class WizardConsoleTail : IDisposable
 {
     private const string DefaultDistroName = "OpenClawGateway";
     private const string LogGlob = "/tmp/openclaw/openclaw-*.log";
+    private static readonly Regex s_ansiEscapeRegex = new(
+        @"\x1B(?:\[[0-?]*[ -/]*[@-~]|\][^\x07]*(?:\x07|\x1B\\)|[PX^_].*?\x1B\\|[@-Z\\-_])",
+        RegexOptions.Compiled | RegexOptions.Singleline);
 
     private readonly string _distroName;
     private readonly IOpenClawLogger _logger;
@@ -51,6 +56,8 @@ public void Start(Action<string> onMessage)
                 FileName = "wsl.exe",
                 RedirectStandardOutput = true,
                 RedirectStandardError = true,
+                StandardOutputEncoding = Encoding.UTF8,
+                StandardErrorEncoding = Encoding.UTF8,
                 UseShellExecute = false,
                 CreateNoWindow = true,
             };
@@ -179,7 +186,7 @@ public void Stop()
             if (!root.TryGetProperty("message", out var message) || message.ValueKind != JsonValueKind.String)
                 return null;
 
-            var text = message.GetString();
+            var text = NormalizeConsoleMessage(message.GetString());
             return string.IsNullOrWhiteSpace(text) ? null : text;
         }
         catch (JsonException)
@@ -187,4 +194,50 @@ public void Stop()
             return null;
         }
     }
+
+    internal static string? NormalizeConsoleMessage(string? text)
+    {
+        if (string.IsNullOrWhiteSpace(text))
+            return null;
+
+        return s_ansiEscapeRegex.Replace(text, "");
+    }
+
+    internal static bool LooksLikeTerminalQrArt(string? text)
+    {
+        if (string.IsNullOrWhiteSpace(text))
+            return false;
+
+        var lines = text
+            .Replace("\r\n", "\n")
+            .Split('\n')
+            .Where(line => !string.IsNullOrWhiteSpace(line))
+            .ToArray();
+        if (lines.Length < 8)
+            return false;
+
+        var qrGlyphCount = 0;
+        var qrLikeLineCount = 0;
+        foreach (var line in lines)
+        {
+            var lineGlyphCount = 0;
+
+            foreach (var ch in line)
+            {
+                if (IsQrBlockGlyph(ch))
+                {
+                    qrGlyphCount++;
+                    lineGlyphCount++;
+                }
+            }
+
+            if (line.Length >= 20 && lineGlyphCount >= 4)
+                qrLikeLineCount++;
+        }
+
+        return qrLikeLineCount >= 8 && qrGlyphCount >= 64;
+    }
+
+    private static bool IsQrBlockGlyph(char ch) =>
+        ch is '█' or '▄' or '▀' or '▌' or '▐';
 }
diff --git a/src/OpenClaw.SetupEngine/CommandRunner.cs b/src/OpenClaw.SetupEngine/CommandRunner.cs
index b4bd4212e..99f8ff027 100644
--- a/src/OpenClaw.SetupEngine/CommandRunner.cs
+++ b/src/OpenClaw.SetupEngine/CommandRunner.cs
@@ -18,13 +18,52 @@ Task<CommandResult> RunAsync(
         string? stdinInput = null,
         CancellationToken ct = default);
 
+    /// <summary>
+    /// Run a command inside a WSL distro.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// By default (<paramref name="inputViaStdin"/> = false) the script is passed
+    /// as argv to <c>wsl.exe -- bash -c &lt;script&gt;</c>. wsl.exe performs shell
+    /// variable expansion on argv before invoking bash, which drops any
+    /// <c>$var</c> or <c>${var}</c> reference that is not defined in the Windows
+    /// process environment. See <c>docs/WSL_EXE_ARGV_PITFALL.md</c> for the full
+    /// writeup.
+    /// </para>
+    /// <para>
+    /// For multi-line scripts that use bash variables, set
+    /// <paramref name="inputViaStdin"/> to <c>true</c>. The script is then piped
+    /// to <c>bash -s</c> via stdin, which wsl.exe does not touch.
+    /// </para>
+    /// </remarks>
+    /// <example>
+    /// <code>
+    /// // Safe: bash variables survive because the script arrives via stdin.
+    /// await runner.RunInWslAsync(distro, """
+    ///     workspace='/home/me/ws'
+    ///     mkdir -p "$workspace"
+    ///     """, TimeSpan.FromSeconds(15), inputViaStdin: true);
+    /// </code>
+    /// </example>
+    /// <param name="distroName">The WSL distribution name passed to <c>wsl.exe -d</c>.</param>
+    /// <param name="command">The bash script or command to run.</param>
+    /// <param name="timeout">The maximum time to wait before killing the process.</param>
+    /// <param name="environment">Optional environment variables to forward into WSL via WSLENV.</param>
+    /// <param name="ct">A cancellation token for aborting the process.</param>
+    /// <param name="user">Optional WSL user passed to <c>wsl.exe -u</c>.</param>
+    /// <param name="inputViaStdin">
+    /// When true, the script is piped to <c>bash -s</c> via stdin instead of
+    /// being passed as argv to <c>bash -c</c>. Use this for any multi-line
+    /// script that uses bash variables or <c>$$</c>.
+    /// </param>
     Task<CommandResult> RunInWslAsync(
         string distroName,
         string command,
         TimeSpan timeout,
         IReadOnlyDictionary<string, string>? environment = null,
         CancellationToken ct = default,
-        string? user = null);
+        string? user = null,
+        bool inputViaStdin = false);
 }
 
 public sealed class CommandRunner : ICommandRunner
@@ -93,17 +132,25 @@ public async Task<CommandResult> RunAsync(
         process.BeginOutputReadLine();
         process.BeginErrorReadLine();
 
-        if (stdinInput != null)
-        {
-            await process.StandardInput.WriteAsync(stdinInput);
-            process.StandardInput.Close();
-        }
-
         using var timeoutCts = CancellationTokenSource.CreateLinkedTokenSource(ct);
         timeoutCts.CancelAfter(timeout);
 
         try
         {
+            if (stdinInput != null)
+            {
+                try
+                {
+                    await process.StandardInput.WriteAsync(stdinInput.AsMemory(), timeoutCts.Token);
+                    await process.StandardInput.FlushAsync(timeoutCts.Token);
+                    process.StandardInput.Close();
+                }
+                catch (IOException) when (process.HasExited)
+                {
+                    // The child exited before consuming all input. Preserve its exit status/output.
+                }
+            }
+
             await process.WaitForExitAsync(timeoutCts.Token);
         }
         catch (OperationCanceledException) when (!ct.IsCancellationRequested)
@@ -139,13 +186,49 @@ public async Task<CommandResult> RunAsync(
     /// <summary>
     /// Run a command inside a WSL distro.
     /// </summary>
+    /// <remarks>
+    /// <para>
+    /// By default (<paramref name="inputViaStdin"/> = false) the script is passed
+    /// as argv to <c>wsl.exe -- bash -c &lt;script&gt;</c>. wsl.exe performs shell
+    /// variable expansion on argv before invoking bash, which drops any
+    /// <c>$var</c> or <c>${var}</c> reference that is not defined in the Windows
+    /// process environment. See <c>docs/WSL_EXE_ARGV_PITFALL.md</c> for the full
+    /// writeup.
+    /// </para>
+    /// <para>
+    /// For multi-line scripts that use bash variables, set
+    /// <paramref name="inputViaStdin"/> to <c>true</c>. The script is then piped
+    /// to <c>bash -s</c> via stdin, which wsl.exe does not touch.
+    /// </para>
+    /// </remarks>
+    /// <example>
+    /// <code>
+    /// // Safe: bash variables survive because the script arrives via stdin.
+    /// await runner.RunInWslAsync(distro, """
+    ///     workspace='/home/me/ws'
+    ///     mkdir -p "$workspace"
+    ///     """, TimeSpan.FromSeconds(15), inputViaStdin: true);
+    /// </code>
+    /// </example>
+    /// <param name="distroName">The WSL distribution name passed to <c>wsl.exe -d</c>.</param>
+    /// <param name="command">The bash script or command to run.</param>
+    /// <param name="timeout">The maximum time to wait before killing the process.</param>
+    /// <param name="environment">Optional environment variables to forward into WSL via WSLENV.</param>
+    /// <param name="ct">A cancellation token for aborting the process.</param>
+    /// <param name="user">Optional WSL user passed to <c>wsl.exe -u</c>.</param>
+    /// <param name="inputViaStdin">
+    /// When true, the script is piped to <c>bash -s</c> via stdin instead of
+    /// being passed as argv to <c>bash -c</c>. Use this for any multi-line
+    /// script that uses bash variables or <c>$$</c>.
+    /// </param>
     public Task<CommandResult> RunInWslAsync(
         string distroName,
         string command,
         TimeSpan timeout,
         IReadOnlyDictionary<string, string>? environment = null,
         CancellationToken ct = default,
-        string? user = null)
+        string? user = null,
+        bool inputViaStdin = false)
     {
         // Strip Windows \r to avoid bash "$'\r': command not found" errors
         command = command.Replace("\r", "");
@@ -158,7 +241,10 @@ public Task<CommandResult> RunInWslAsync(
             args.Add(user);
         }
 
-        args.AddRange(["--", "bash", "-c", command]);
+        if (inputViaStdin)
+            args.AddRange(["--", "bash", "-s"]);
+        else
+            args.AddRange(["--", "bash", "-c", command]);
 
         // Pass WSL environment variables via WSLENV
         Dictionary<string, string>? env = null;
@@ -171,6 +257,9 @@ public Task<CommandResult> RunInWslAsync(
                 : wslEnvKeys;
         }
 
+        if (inputViaStdin)
+            return RunAsync("wsl.exe", args.ToArray(), timeout, env, stdinInput: command, ct: ct);
+
         return RunAsync("wsl.exe", args.ToArray(), timeout, env, ct: ct);
     }
 
diff --git a/src/OpenClaw.SetupEngine/GatewayLkgVersion.cs b/src/OpenClaw.SetupEngine/GatewayLkgVersion.cs
index 1e27b0de7..738a47889 100644
--- a/src/OpenClaw.SetupEngine/GatewayLkgVersion.cs
+++ b/src/OpenClaw.SetupEngine/GatewayLkgVersion.cs
@@ -3,7 +3,7 @@ namespace OpenClaw.SetupEngine;
 public static class GatewayLkgVersion
 {
     public const string DefaultInstallUrl = "https://openclaw.ai/install-cli.sh";
-    public const string LkgVersion = "2026.6.9";
+    public const string LkgVersion = "2026.6.11";
 
     public static string ResolveLkgVersion() => LkgVersion;
 
diff --git a/src/OpenClaw.SetupEngine/OpenClaw.SetupEngine.csproj b/src/OpenClaw.SetupEngine/OpenClaw.SetupEngine.csproj
index 2a54747e9..e9c1adfee 100644
--- a/src/OpenClaw.SetupEngine/OpenClaw.SetupEngine.csproj
+++ b/src/OpenClaw.SetupEngine/OpenClaw.SetupEngine.csproj
@@ -8,6 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <InternalsVisibleTo Include="OpenClaw.SetupEngine.Tests" />
     <ProjectReference Include="..\OpenClaw.Connection\OpenClaw.Connection.csproj" />
     <ProjectReference Include="..\OpenClaw.Shared\OpenClaw.Shared.csproj" />
   </ItemGroup>
diff --git a/src/OpenClaw.SetupEngine/Program.cs b/src/OpenClaw.SetupEngine/Program.cs
index 7b4be7ba1..c3fe59054 100644
--- a/src/OpenClaw.SetupEngine/Program.cs
+++ b/src/OpenClaw.SetupEngine/Program.cs
@@ -1,4 +1,5 @@
 using System.Runtime.Versioning;
+using OpenClaw.Shared;
 
 namespace OpenClaw.SetupEngine;
 
@@ -22,6 +23,12 @@ public static async Task<int> Main(string[] args)
         var confirmDestructive = HasFlag(args, "--confirm-destructive");
         var jsonOutput = GetArg(args, "--json-output");
         var preserveLogs = HasFlag(args, "--preserve-logs");
+        var dataDir = GetArg(args, "--data-dir");
+        var localDataDir = GetArg(args, "--local-data-dir");
+        var distroName = GetArg(args, "--distro-name");
+        var gatewayPortText = GetArg(args, "--gateway-port");
+        var autoStartName = GetArg(args, "--autostart-name") ?? "OpenClawTray";
+        var startupTaskName = GetArg(args, "--startup-task-name") ?? WindowsStartupTaskRegistration.TaskName;
 
         // Load config
         SetupConfig config;
@@ -48,6 +55,18 @@ public static async Task<int> Main(string[] args)
 
         // Apply CLI overrides
         config = SetupConfig.FromEnvironment(config);
+        if (!string.IsNullOrWhiteSpace(distroName))
+            config.DistroName = distroName;
+        if (!string.IsNullOrWhiteSpace(gatewayPortText))
+        {
+            if (!int.TryParse(gatewayPortText, out var gatewayPort) || gatewayPort is <= 0 or > 65535)
+            {
+                Console.Error.WriteLine($"ERROR: Invalid --gateway-port value '{gatewayPortText}'.");
+                return 2;
+            }
+            config.GatewayPort = gatewayPort;
+            config.GatewayUrl = null;
+        }
         GatewayLkgVersion.ApplyToConfig(config);
         if (headless) config.Headless = true;
         if (rollback) config.RollbackOnFailure = true;
@@ -60,8 +79,8 @@ public static async Task<int> Main(string[] args)
         // Default log path if not specified
         var logLabel = uninstall ? "uninstall" : "setup";
         config.LogPath ??= Path.Combine(
-            Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
-            "OpenClawTray", "Logs", "Setup", $"{logLabel}-engine-{DateTime.UtcNow:yyyyMMdd-HHmmss}.jsonl");
+            dataDir ?? SetupContext.ResolveDataDir(),
+            "Logs", "Setup", $"{logLabel}-engine-{DateTime.UtcNow:yyyyMMdd-HHmmss}.jsonl");
 
         Console.WriteLine($"Log file: {config.LogPath}");
         Console.WriteLine($"Distro: {config.DistroName}");
@@ -87,7 +106,7 @@ public static async Task<int> Main(string[] args)
             return 2;
         }
 
-        if (!SetupRunLock.TryAcquire(SetupContext.ResolveDataDir(), out var setupLock, out var lockMessage))
+        if (!SetupRunLock.TryAcquire(dataDir ?? SetupContext.ResolveDataDir(), out var setupLock, out var lockMessage))
         {
             Console.Error.WriteLine($"ERROR: {lockMessage}");
             return 2;
@@ -111,7 +130,14 @@ public static async Task<int> Main(string[] args)
             cts.Cancel();
         };
 
-        var ctx = new SetupContext(config, logger, journal, commands, cts.Token);
+        var ctx = new SetupContext(
+            config,
+            logger,
+            journal,
+            commands,
+            cts.Token,
+            dataDir,
+            localDataDir);
 
         // Build step pipeline
         List<SetupStep> steps;
@@ -121,7 +147,7 @@ public static async Task<int> Main(string[] args)
         }
         else if (wizardOnly)
         {
-            steps = [new RunGatewayWizardStep()];
+            steps = SetupStepFactory.BuildWizardOnlySteps();
         }
         else
         {
@@ -158,7 +184,7 @@ public static async Task<int> Main(string[] args)
                 if (!config.DryRun)
                 {
                     logger.Info("Running tray-artifact cleanup...");
-                    TrayArtifactCleanup.Run(ctx, preserveLogs);
+                    TrayArtifactCleanup.Run(ctx, preserveLogs, autoStartName, startupTaskName);
                 }
             }
         }
diff --git a/src/OpenClaw.SetupEngine/SetupContext.cs b/src/OpenClaw.SetupEngine/SetupContext.cs
index a99f4cacc..1a3589916 100644
--- a/src/OpenClaw.SetupEngine/SetupContext.cs
+++ b/src/OpenClaw.SetupEngine/SetupContext.cs
@@ -24,6 +24,8 @@ public sealed class SetupConfig
     public string? GatewayUrl { get; set; }
     public string? BootstrapToken { get; set; }
     public Dictionary<string, string>? WizardAnswers { get; set; }
+    [JsonIgnore]
+    public bool UsesBundledDefaultConfig { get; set; }
 
     // Nested config sections — everything is configurable
     public WslConfig Wsl { get; set; } = new();
@@ -31,6 +33,7 @@ public sealed class SetupConfig
     public CapabilitiesConfig Capabilities { get; set; } = new();
     public TraySettingsConfig Settings { get; set; } = new();
     public PairingConfig Pairing { get; set; } = new();
+    public WindowsNodeContextConfig WindowsNodeContext { get; set; } = new();
 
     public string EffectiveGatewayUrl => GatewayUrl ?? $"ws://localhost:{GatewayPort}";
 
@@ -143,7 +146,7 @@ public sealed class CapabilitiesConfig
         if (Screen) result.Add(("screen", ["screen.snapshot", "screen.record"]));
         if (Camera) result.Add(("camera", ["camera.list", "camera.snap", "camera.clip"]));
         if (Location) result.Add(("location", ["location.get"]));
-        if (Tts) result.Add(("tts", ["tts.speak"]));
+        if (Tts) result.Add(("tts", ["tts.speak", "tts.status"]));
         if (Stt) result.Add(("stt", ["stt.transcribe", "stt.listen", "stt.status"]));
         if (Device) result.Add(("device", ["device.info", "device.status"]));
         if (Browser) result.Add(("browser", ["browser.proxy"]));
@@ -191,9 +194,7 @@ public void MergeIntoSettingsFile(string settingsPath)
             }
             catch (JsonException ex)
             {
-                var backupPath = settingsPath + $".corrupt-{DateTimeOffset.UtcNow:yyyyMMddHHmmss}.bak";
-                File.Copy(settingsPath, backupPath, overwrite: false);
-                throw new InvalidDataException($"settings.json is corrupt; backed up to {backupPath}", ex);
+                throw BackupCorruptSettingsFile(settingsPath, ex);
             }
         }
 
@@ -201,10 +202,6 @@ public void MergeIntoSettingsFile(string settingsPath)
         {
             ["EnableNodeMode"] = EnableNodeMode,
             ["AutoStart"] = AutoStart,
-        };
-
-        var initialDefaults = new Dictionary<string, object>
-        {
             ["NodeSystemRunEnabled"] = NodeSystemRunEnabled,
             ["NodeCanvasEnabled"] = NodeCanvasEnabled,
             ["NodeScreenEnabled"] = NodeScreenEnabled,
@@ -225,13 +222,62 @@ public void MergeIntoSettingsFile(string settingsPath)
         foreach (var kvp in setupOwnedSettings)
             settings[kvp.Key] = kvp.Value;
 
-        foreach (var kvp in initialDefaults)
-            settings.TryAdd(kvp.Key, kvp.Value);
+        Directory.CreateDirectory(Path.GetDirectoryName(settingsPath)!);
+        var json = JsonSerializer.Serialize(settings, SetupConfig.JsonWriteOptions);
+        AtomicFile.WriteAllText(settingsPath, json);
+    }
+
+    public static void UpdateAutoStartInSettingsFile(string settingsPath, bool autoStart)
+    {
+        Dictionary<string, JsonElement>? existing = null;
+
+        if (File.Exists(settingsPath))
+        {
+            try
+            {
+                var content = File.ReadAllText(settingsPath);
+                existing = JsonSerializer.Deserialize<Dictionary<string, JsonElement>>(content, SetupConfig.JsonOptions);
+            }
+            catch (JsonException ex)
+            {
+                throw BackupCorruptSettingsFile(settingsPath, ex);
+            }
+        }
+
+        var settings = new Dictionary<string, object>();
+        if (existing != null)
+        {
+            foreach (var kvp in existing)
+                settings[kvp.Key] = kvp.Value;
+        }
+
+        settings["AutoStart"] = autoStart;
 
         Directory.CreateDirectory(Path.GetDirectoryName(settingsPath)!);
         var json = JsonSerializer.Serialize(settings, SetupConfig.JsonWriteOptions);
         AtomicFile.WriteAllText(settingsPath, json);
     }
+
+    public void ApplyCapabilities(CapabilitiesConfig capabilities)
+    {
+        // Device info has no independent runtime setting; it is always registered
+        // when node mode is enabled.
+        NodeSystemRunEnabled = capabilities.System;
+        NodeCanvasEnabled = capabilities.Canvas;
+        NodeScreenEnabled = capabilities.Screen;
+        NodeCameraEnabled = capabilities.Camera;
+        NodeLocationEnabled = capabilities.Location;
+        NodeBrowserProxyEnabled = capabilities.Browser;
+        NodeTtsEnabled = capabilities.Tts;
+        NodeSttEnabled = capabilities.Stt;
+    }
+
+    private static InvalidDataException BackupCorruptSettingsFile(string settingsPath, JsonException ex)
+    {
+        var backupPath = settingsPath + $".corrupt-{DateTimeOffset.UtcNow:yyyyMMddHHmmssfffffff}-{Guid.NewGuid():N}.bak";
+        File.Copy(settingsPath, backupPath, overwrite: false);
+        return new InvalidDataException($"settings.json is corrupt; backed up to {backupPath}", ex);
+    }
 }
 
 // ─── Pairing Configuration ───
@@ -243,6 +289,15 @@ public sealed class PairingConfig
     public int TimeoutSeconds { get; set; } = 60;
 }
 
+// ─── Windows Node Context Injection ───
+
+public sealed class WindowsNodeContextConfig
+{
+    public bool Enabled { get; set; } = true;
+    public string? WorkspacePath { get; set; }
+    public int TimeoutSeconds { get; set; } = 180;
+}
+
 // ─── Step Result ───
 
 public enum StepOutcome { Success, Skipped, Failed, FailedTerminal }
@@ -283,7 +338,14 @@ public sealed class SetupContext
     // WSL PATH prefix using configured user
     public string WslPathPrefix => WslConstants.GetPathPrefix(Config.Wsl.User);
 
-    public SetupContext(SetupConfig config, SetupLogger logger, TransactionJournal journal, ICommandRunner commands, CancellationToken ct)
+    public SetupContext(
+        SetupConfig config,
+        SetupLogger logger,
+        TransactionJournal journal,
+        ICommandRunner commands,
+        CancellationToken ct,
+        string? dataDir = null,
+        string? localDataDir = null)
     {
         Config = config;
         Logger = logger;
@@ -291,8 +353,8 @@ public SetupContext(SetupConfig config, SetupLogger logger, TransactionJournal j
         Commands = commands;
         CancellationToken = ct;
 
-        DataDir = ResolveDataDir();
-        LocalDataDir = ResolveLocalDataDir();
+        DataDir = dataDir ?? ResolveDataDir();
+        LocalDataDir = localDataDir ?? ResolveLocalDataDir();
 
         DistroName = config.DistroName;
         GatewayUrl = config.EffectiveGatewayUrl;
diff --git a/src/OpenClaw.SetupEngine/SetupLogger.cs b/src/OpenClaw.SetupEngine/SetupLogger.cs
index a8b36a5dc..397761b2d 100644
--- a/src/OpenClaw.SetupEngine/SetupLogger.cs
+++ b/src/OpenClaw.SetupEngine/SetupLogger.cs
@@ -1,6 +1,9 @@
 using System.Collections.Concurrent;
+using System.Text.Encodings.Web;
 using System.Text.Json;
+using System.Text.Json.Nodes;
 using System.Text.RegularExpressions;
+using OpenClaw.Shared;
 
 namespace OpenClaw.SetupEngine;
 
@@ -84,7 +87,7 @@ private void Write(LogLevel level, string message, object? data = null)
     {
         if (level < _minLevel) return;
 
-        var sanitizedMessage = Sanitize(message);
+        var sanitizedMessage = NormalizeLogString(Sanitize(message));
         var entry = new LogEntry(DateTimeOffset.UtcNow, _runId, level, sanitizedMessage, SanitizeData(data));
         _recentEntries.Enqueue(entry);
         while (_recentEntries.Count > MaxRecentEntries)
@@ -125,6 +128,10 @@ private void Write(LogLevel level, string message, object? data = null)
     internal static string Sanitize(string input)
     {
         if (string.IsNullOrEmpty(input)) return input;
+        input = TokenSanitizer.SanitizeLogMessage(input);
+        if (input == TokenSanitizer.SanitizerTimeoutSentinel)
+            return input;
+
         input = PrivateKeyPattern().Replace(input, "[REDACTED-PRIVATE-KEY]");
         input = BearerPattern().Replace(input, "$1[REDACTED]");
         input = JwtPattern().Replace(input, "[REDACTED-JWT]");
@@ -140,21 +147,65 @@ internal static string Sanitize(string input)
             return null;
 
         if (data is string value)
-            return Sanitize(value);
+            return NormalizeLogString(Sanitize(value));
 
         try
         {
             var json = JsonSerializer.Serialize(data, _jsonOptions);
             var sanitized = Sanitize(json);
-            using var doc = JsonDocument.Parse(sanitized);
-            return doc.RootElement.Clone();
+            var node = JsonNode.Parse(sanitized);
+            return NormalizeJsonNode(node);
         }
         catch (Exception ex) when (ex is JsonException or NotSupportedException or ArgumentException)
         {
-            return Sanitize(data.ToString() ?? string.Empty);
+            return NormalizeLogString(Sanitize(data.ToString() ?? string.Empty));
         }
     }
 
+    private static JsonNode? NormalizeJsonNode(JsonNode? node)
+    {
+        switch (node)
+        {
+            case JsonObject obj:
+                var normalizedObject = new JsonObject();
+                foreach (var property in obj)
+                    normalizedObject[property.Key] = NormalizeJsonNode(property.Value);
+                return normalizedObject;
+
+            case JsonArray array:
+                var normalizedArray = new JsonArray();
+                for (var i = 0; i < array.Count; i++)
+                    normalizedArray.Add(NormalizeJsonNode(array[i]));
+                return normalizedArray;
+
+            case JsonValue value when value.TryGetValue<string>(out var text):
+                var normalized = NormalizeLogString(text);
+                var trimmed = normalized.TrimStart();
+                if (trimmed.StartsWith('{') || trimmed.StartsWith('['))
+                {
+                    try
+                    {
+                        return NormalizeJsonNode(JsonNode.Parse(normalized));
+                    }
+                    catch (JsonException)
+                    {
+                        // Keep malformed JSON-shaped text as a flattened string.
+                    }
+                }
+
+                return JsonValue.Create(normalized);
+
+            default:
+                return node?.DeepClone();
+        }
+    }
+
+    private static string NormalizeLogString(string value) =>
+        value
+            .Replace("\r\n", " ", StringComparison.Ordinal)
+            .Replace('\r', ' ')
+            .Replace('\n', ' ');
+
     private static string Truncate(string input, int max = 4096)
         => input.Length <= max ? input : input[..max] + $"... [truncated {input.Length - max} chars]";
 
@@ -178,7 +229,8 @@ private static string Truncate(string input, int max = 4096)
 
     private static readonly JsonSerializerOptions _jsonOptions = new()
     {
-        DefaultIgnoreCondition = System.Text.Json.Serialization.JsonIgnoreCondition.WhenWritingNull
+        DefaultIgnoreCondition = System.Text.Json.Serialization.JsonIgnoreCondition.WhenWritingNull,
+        Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
     };
 
     public void Dispose() => _writer?.Dispose();
diff --git a/src/OpenClaw.SetupEngine/SetupPipeline.cs b/src/OpenClaw.SetupEngine/SetupPipeline.cs
index 8f2b6feef..92f827592 100644
--- a/src/OpenClaw.SetupEngine/SetupPipeline.cs
+++ b/src/OpenClaw.SetupEngine/SetupPipeline.cs
@@ -38,6 +38,12 @@ public sealed record StepProgressEvent(string StepId, string DisplayName, StepOu
 
 public static class SetupStepFactory
 {
+    public static List<SetupStep> BuildWizardOnlySteps() =>
+    [
+        new RunGatewayWizardStep(),
+        new WindowsNodeBootstrapContextStep(),
+    ];
+
     public static List<SetupStep> BuildDefaultSteps()
     {
         return
@@ -59,6 +65,7 @@ public static List<SetupStep> BuildDefaultSteps()
             new PairNodeStep(),
             new VerifyEndToEndStep(),
             new RunGatewayWizardStep(),
+            new WindowsNodeBootstrapContextStep(),
             new StartKeepaliveStep(),
         ];
     }
@@ -70,12 +77,14 @@ public sealed class SetupPipeline
 {
     private readonly List<SetupStep> _steps;
     private readonly List<SetupStep> _completedSteps = new();
+    private readonly bool? _rollbackOnFailureOverride;
 
     public event EventHandler<StepProgressEvent>? StepProgress;
 
-    public SetupPipeline(IEnumerable<SetupStep> steps)
+    public SetupPipeline(IEnumerable<SetupStep> steps, bool? rollbackOnFailureOverride = null)
     {
         _steps = steps.ToList();
+        _rollbackOnFailureOverride = rollbackOnFailureOverride;
     }
 
     public async Task<PipelineResult> RunAsync(SetupContext ctx)
@@ -168,7 +177,7 @@ public async Task<PipelineResult> RunAsync(SetupContext ctx)
             else
                 ctx.Logger.Warn($"SetupPipeline: Step '{step.Id}' failed: {result.Message}");
 
-            if (ctx.Config.RollbackOnFailure)
+            if (_rollbackOnFailureOverride ?? ctx.Config.RollbackOnFailure)
             {
                 await RollbackFailedStep(step, ctx);
                 await RollbackCompletedSteps(ctx);
diff --git a/src/OpenClaw.SetupEngine/SetupReviewSummary.cs b/src/OpenClaw.SetupEngine/SetupReviewSummary.cs
new file mode 100644
index 000000000..776d7341f
--- /dev/null
+++ b/src/OpenClaw.SetupEngine/SetupReviewSummary.cs
@@ -0,0 +1,65 @@
+namespace OpenClaw.SetupEngine;
+
+public sealed record SetupReviewSummary(
+    string DistroTitle,
+    string DistroDescription,
+    string InstallerDescription,
+    string InstallerBadge,
+    string GatewayDescription,
+    string GatewayEndpoint,
+    string ExactCommands,
+    string CompletionGatewaySummary);
+
+public static class SetupReviewSummaryBuilder
+{
+    public static SetupReviewSummary Build(SetupConfig config, string? dataDir = null, string? localDataDir = null)
+    {
+        var distroName = Display(config.DistroName, "OpenClawGateway");
+        var baseDistro = Display(config.BaseDistro, "Ubuntu-24.04");
+        var gatewayBind = Display(config.Gateway.Bind, "loopback");
+        var gatewayPort = config.GatewayPort;
+        var installPath = Path.Combine(localDataDir ?? SetupContext.ResolveLocalDataDir(), "wsl", distroName);
+        var gatewayDataPath = Path.Combine(dataDir ?? SetupContext.ResolveDataDir(), "gateways.json");
+        var installUrl = config.Gateway.InstallUrl ?? GatewayLkgVersion.DefaultInstallUrl;
+        var installerHost = TryGetHttpsHost(installUrl);
+        var installerDescription = installerHost is null
+            ? "Installer URL is not HTTPS; setup will stop before downloading anything."
+            : $"Fetched over HTTPS from {installerHost}; runs as a non-root {Display(config.Wsl.User, "openclaw")} user inside the instance.";
+        var installerBadge = installerHost is null ? "Invalid URL" : "HTTPS";
+        var isLanBind = gatewayBind.Equals("lan", StringComparison.OrdinalIgnoreCase);
+        var gatewayDescription = isLanBind
+            ? "LAN bind enabled — reachable from this PC and your local network according to Windows firewall/routing."
+            : "Loopback only — not reachable from your network or the internet.";
+        var gatewayEndpoint = isLanBind ? $"LAN:{gatewayPort}" : $"127.0.0.1:{gatewayPort}";
+        var wslCommand = "wsl " + string.Join(' ', WslInstallSupport.BuildDirectInstallArgs(baseDistro, distroName, installPath));
+        var installCommand = string.IsNullOrWhiteSpace(config.Gateway.Version)
+            ? "curl -fsSL --proto '=https' --tlsv1.2 <install-url> | bash"
+            : $"curl -fsSL --proto '=https' --tlsv1.2 <install-url> | bash -s -- --version {config.Gateway.Version.Trim()}";
+
+        return new SetupReviewSummary(
+            DistroTitle: $"Install an isolated {baseDistro} instance",
+            DistroDescription: $"WSL distro \"{distroName}\" at {installPath}. Separate from any Linux distributions you already have.",
+            InstallerDescription: installerDescription,
+            InstallerBadge: installerBadge,
+            GatewayDescription: gatewayDescription,
+            GatewayEndpoint: gatewayEndpoint,
+            ExactCommands: string.Join(
+                Environment.NewLine,
+                wslCommand,
+                installCommand,
+                $"openclaw config set gateway.bind {gatewayBind} · port {gatewayPort}",
+                "openclaw gateway install --force   (systemd --user service)",
+                $"writes -> {installPath}",
+                $"writes -> {gatewayDataPath} + identity"),
+            CompletionGatewaySummary: $"{distroName} · {gatewayEndpoint}");
+    }
+
+    private static string Display(string? value, string fallback)
+        => string.IsNullOrWhiteSpace(value) ? fallback : value.Trim();
+
+    private static string? TryGetHttpsHost(string installUrl)
+        => Uri.TryCreate(installUrl, UriKind.Absolute, out var uri)
+           && uri.Scheme.Equals(Uri.UriSchemeHttps, StringComparison.OrdinalIgnoreCase)
+            ? uri.Host
+            : null;
+}
diff --git a/src/OpenClaw.SetupEngine/SetupSteps.cs b/src/OpenClaw.SetupEngine/SetupSteps.cs
index 84ae1202d..f4675e7ae 100644
--- a/src/OpenClaw.SetupEngine/SetupSteps.cs
+++ b/src/OpenClaw.SetupEngine/SetupSteps.cs
@@ -142,11 +142,15 @@ internal static bool TryGetEnvironmentIssue(string output, Architecture architec
         // virtualization enabled, even though `wsl --version` succeeds.
         if (Contains(text, "WSL2 is not supported with your current machine configuration"))
         {
+            var hardwareVirtualizationGuidance = architecture == Architecture.Arm64
+                ? "On ARM64 devices (including Surface), also make sure hardware virtualization is allowed by firmware or device-management policy; many devices do not expose a firmware toggle. "
+                : "If setup still reports virtualization disabled after enabling the Windows feature, enable VT-x/AMD-V (Intel VT or AMD SVM) in BIOS/UEFI. ";
             message = "WSL2 is not supported with the current machine configuration. "
                 + "Enable the Windows 'Virtual Machine Platform' support by running "
                 + "`wsl --install --no-distribution` from an elevated PowerShell (or enable "
-                + "'Virtual Machine Platform' under 'Turn Windows features on or off'), ensure "
-                + "hardware virtualization is enabled in BIOS/UEFI, reboot, then retry setup.";
+                + "'Virtual Machine Platform' under 'Turn Windows features on or off'). "
+                + hardwareVirtualizationGuidance
+                + "Reboot, then retry setup.";
             return true;
         }
 
@@ -252,10 +256,6 @@ public override async Task<StepResult> ExecuteAsync(SetupContext ctx, Cancellati
             if (Directory.Exists(wslDir))
             {
                 ctx.Logger.Info($"Removing orphaned WSL directory: {wslDir}");
-                // Shut down WSL VM to release VHD locks
-                await ctx.Commands.RunAsync(WslConstants.WslExePath, ["--shutdown"], TimeSpan.FromSeconds(30), ct: ct);
-                await Task.Delay(2000, ct);
-
                 var delete = await DeleteDistroDirectoryWithRetries(ctx, wslDir, ct);
                 if (!delete.IsSuccess)
                     return delete;
@@ -266,16 +266,15 @@ public override async Task<StepResult> ExecuteAsync(SetupContext ctx, Cancellati
 
         ctx.Logger.Decision($"Found existing distro '{distro}'", "terminating and unregistering");
 
-        // Terminate first (stops gateway service), then shut WSL down to release VHD/port locks.
+        // Stop only the app-owned distro. Global WSL shutdown would disrupt unrelated distros.
         await ctx.Commands.RunAsync(WslConstants.WslExePath, ["--terminate", distro], TimeSpan.FromSeconds(30), ct: ct);
-        await ctx.Commands.RunAsync(WslConstants.WslExePath, ["--shutdown"], TimeSpan.FromSeconds(30), ct: ct);
         await Task.Delay(2000, ct); // Let port release
 
         var unregister = await ctx.Commands.RunAsync(WslConstants.WslExePath, ["--unregister", distro], TimeSpan.FromSeconds(60), ct: ct);
         if (unregister.ExitCode != 0)
         {
-            ctx.Logger.Warn($"First unregister attempt failed (exit {unregister.ExitCode}); forcing WSL shutdown and retrying");
-            await ctx.Commands.RunAsync(WslConstants.WslExePath, ["--shutdown"], TimeSpan.FromSeconds(30), ct: ct);
+            ctx.Logger.Warn($"First unregister attempt failed (exit {unregister.ExitCode}); retrying targeted termination");
+            await ctx.Commands.RunAsync(WslConstants.WslExePath, ["--terminate", distro], TimeSpan.FromSeconds(30), ct: ct);
             await Task.Delay(3000, ct);
             unregister = await ctx.Commands.RunAsync(WslConstants.WslExePath, ["--unregister", distro], TimeSpan.FromSeconds(60), ct: ct);
         }
@@ -617,7 +616,7 @@ public override async Task<StepResult> ExecuteAsync(SetupContext ctx, Cancellati
             : [IPAddress.Loopback];
 
         // Poll briefly in case WSL port forwarding proxy hasn't fully released the
-        // port yet (e.g. after wsl --shutdown in a prior cleanup step).
+        // port yet after targeted distro termination in a prior cleanup step.
         await WaitForPortFreeAsync(port, ctx.Config.Gateway.Bind, ctx.Logger, ct, maxWaitSeconds: 10);
 
         foreach (var address in addresses)
@@ -863,10 +862,10 @@ private static async Task<bool> TryUnregisterPartialInstall(SetupContext ctx, st
         if (unregister.ExitCode == 0 || IsMissingDistroResult(unregister))
             return true;
 
-        ctx.Logger.Warn($"Partial install unregister failed (exit {unregister.ExitCode}); forcing WSL shutdown and retrying");
-        var shutdown = await ctx.Commands.RunAsync(WslConstants.WslExePath, ["--shutdown"], TimeSpan.FromSeconds(30), ct: ct);
-        if (shutdown.ExitCode != 0)
-            cleanupErrors.Add($"shutdown exit {shutdown.ExitCode}: {FirstNonEmpty(shutdown.Stderr, shutdown.Stdout)}");
+        ctx.Logger.Warn($"Partial install unregister failed (exit {unregister.ExitCode}); retrying targeted termination");
+        terminate = await ctx.Commands.RunAsync(WslConstants.WslExePath, ["--terminate", distro], TimeSpan.FromSeconds(30), ct: ct);
+        if (terminate.ExitCode != 0 && !IsMissingDistroResult(terminate))
+            cleanupErrors.Add($"retry terminate exit {terminate.ExitCode}: {FirstNonEmpty(terminate.Stderr, terminate.Stdout)}");
 
         unregister = await ctx.Commands.RunAsync(WslConstants.WslExePath, ["--unregister", distro], TimeSpan.FromSeconds(60), ct: ct);
         if (unregister.ExitCode == 0 || IsMissingDistroResult(unregister))
@@ -893,7 +892,6 @@ public override async Task RollbackAsync(SetupContext ctx, CancellationToken ct)
     {
         var distro = ctx.DistroName!;
         await ctx.Commands.RunAsync(WslConstants.WslExePath, ["--terminate", distro], TimeSpan.FromSeconds(30), ct: ct);
-        await ctx.Commands.RunAsync(WslConstants.WslExePath, ["--shutdown"], TimeSpan.FromSeconds(30), ct: ct);
         await Task.Delay(2000, ct); // Let port/VHD locks release
         await ctx.Commands.RunAsync(WslConstants.WslExePath, ["--unregister", distro], TimeSpan.FromSeconds(60), ct: ct);
 
@@ -1024,9 +1022,15 @@ public override async Task<StepResult> ExecuteAsync(SetupContext ctx, Cancellati
         };
 
         // Generate per-directory checks inline (no bash variables).
-        // wsl.exe -- bash -c mangles double-quotes and bash $var references,
-        // so we avoid both: paths have no spaces (safe unquoted) and all
-        // values are C#-interpolated rather than stored in bash variables.
+        // wsl.exe argv variable-expansion pitfall: see docs/WSL_EXE_ARGV_PITFALL.md.
+        // `wsl.exe -- bash -c <script>` performs shell-variable expansion on argv
+        // before bash sees it, so any $var that isn't defined in the Windows env
+        // gets dropped. This step works around the issue by C#-interpolating every
+        // value into the script string (no bash variables) — that pattern is fine
+        // for short scripts with a small fixed value set and no spaces in values.
+        // New multi-line callers should prefer the stdin path:
+        //   ctx.Commands.RunInWslAsync(..., inputViaStdin: true)
+        // which pipes the script via `bash -s` stdin and bypasses the issue entirely.
         var dirChecks = new System.Text.StringBuilder();
         foreach (var d in requiredDirs)
         {
@@ -2494,6 +2498,628 @@ public override Task RollbackAsync(SetupContext ctx, CancellationToken ct)
     }
 }
 
+internal sealed record WindowsNodeContextTarget(string DistroName, string User, string WorkspacePath);
+
+internal sealed class WindowsNodeContextInstallState
+{
+    public List<WindowsNodeContextTarget> Targets { get; set; } = [];
+}
+
+public sealed class WindowsNodeBootstrapContextStep : SetupStep
+{
+    private const string InstallStateFileName = "windows-node-context.json";
+    private WindowsNodeContextTarget? _currentTarget;
+    private bool _currentTargetWasNew;
+    private bool _executeAttempted;
+
+    public override string Id => "windows-node-context";
+    public override string DisplayName => "Inject Windows node context";
+
+    public override bool CanSkip(SetupContext ctx) => !ctx.Config.WindowsNodeContext.Enabled;
+
+    public override async Task<StepResult> ExecuteAsync(SetupContext ctx, CancellationToken ct)
+    {
+        _executeAttempted = true;
+        var distro = ctx.DistroName!;
+        var user = ctx.Config.Wsl.User;
+        var timeout = TimeSpan.FromSeconds(Math.Max(1, ctx.Config.WindowsNodeContext.TimeoutSeconds));
+
+        var home = await ResolveLinuxHomeAsync(ctx, distro, user, ct);
+        if (home is null)
+            return StepResult.Fail("Could not resolve Linux home directory for openclaw user");
+
+        // Resolve before baseline setup and pass the same absolute path to both
+        // setup and injection. The managed gateway starts from this user's home,
+        // so relative configured paths are home-relative rather than caller-cwd-relative.
+        var workspace = await ResolveWorkspacePathAsync(ctx, distro, user, home, ct);
+        if (string.IsNullOrWhiteSpace(workspace))
+            return StepResult.Fail("Could not resolve OpenClaw agent workspace path");
+
+        var workspaceOverride = ctx.Config.WindowsNodeContext.WorkspacePath?.Trim();
+        var runBaselineSetup = !string.IsNullOrWhiteSpace(workspaceOverride);
+        if (!runBaselineSetup)
+        {
+            var defaultWorkspace = await ResolveConfiguredDefaultWorkspacePathAsync(ctx, distro, user, home, ct);
+            if (string.IsNullOrWhiteSpace(defaultWorkspace))
+                return StepResult.Fail("Could not resolve OpenClaw default workspace path");
+
+            runBaselineSetup = string.Equals(
+                workspace.TrimEnd('/'),
+                defaultWorkspace.TrimEnd('/'),
+                StringComparison.Ordinal);
+        }
+
+        // Per-agent workspaces are already initialized by onboarding/agents add.
+        // Running global setup for one would rewrite agents.defaults.workspace.
+        if (runBaselineSetup)
+        {
+            var setupResult = await RunOpenclawSetupAsync(ctx, distro, user, workspace, ct);
+            if (!setupResult.IsSuccess)
+                return setupResult;
+        }
+
+        var target = new WindowsNodeContextTarget(distro, user, workspace);
+        try
+        {
+            _currentTargetWasNew = await RecordAppliedTargetAsync(ctx, target, ct);
+            _currentTarget = target;
+        }
+        catch (Exception ex)
+        {
+            return StepResult.Fail($"Could not persist Windows node context install state: {ex.Message}", ex);
+        }
+
+        var script = BuildApplyScript(workspace);
+        // Uses stdin to bypass wsl.exe argv variable-expansion (see docs/WSL_EXE_ARGV_PITFALL.md).
+        var result = await ctx.Commands.RunInWslAsync(distro, script, timeout, ct: ct, user: user, inputViaStdin: true);
+
+        if (result.ExitCode != 0 || !result.Stdout.Contains("WINDOWS_NODE_CONTEXT_READY", StringComparison.Ordinal))
+        {
+            if (_currentTargetWasNew && result.ExitCode is 2 or 4)
+            {
+                try
+                {
+                    await RemoveRecordedTargetAsync(ctx, target, ct);
+                    _currentTarget = null;
+                    _currentTargetWasNew = false;
+                }
+                catch (Exception ex)
+                {
+                    return StepResult.Fail(
+                        $"Windows node context injection failed and install-state cleanup also failed: {ex.Message}",
+                        ex);
+                }
+            }
+
+            return StepResult.Fail($"Windows node context injection failed (exit {result.ExitCode}): {FirstNonEmpty(result.Stderr, result.Stdout)}");
+        }
+
+        ctx.Logger.Info($"Windows node context injected into workspace: {workspace}");
+        return StepResult.Ok("Windows node context injected");
+    }
+
+    public override async Task RollbackAsync(SetupContext ctx, CancellationToken ct)
+    {
+        var timeout = TimeSpan.FromSeconds(Math.Max(1, ctx.Config.WindowsNodeContext.TimeoutSeconds));
+        var hasInstallState = File.Exists(InstallStatePath(ctx));
+        WindowsNodeContextTarget[] targets;
+        if (_currentTarget is { } current)
+        {
+            targets = [current];
+        }
+        else if (_executeAttempted)
+        {
+            // Failed-step rollback for an attempt that never modified a target.
+            // Do not reinterpret this as a fresh uninstall of earlier installs.
+            return;
+        }
+        else if (hasInstallState)
+        {
+            var state = await ReadInstallStateAsync(ctx, ct);
+            targets = state.Targets.ToArray();
+        }
+        else
+        {
+            var legacyTarget = await ResolveLegacyUninstallTargetAsync(ctx, ct);
+            targets = legacyTarget is null ? [] : [legacyTarget];
+        }
+        if (targets.Length == 0)
+            return;
+
+        var failures = new List<string>();
+        foreach (var target in targets)
+        {
+            // Uses stdin to bypass wsl.exe argv variable-expansion (see docs/WSL_EXE_ARGV_PITFALL.md).
+            var result = await ctx.Commands.RunInWslAsync(
+                target.DistroName,
+                BuildRollbackScript(target.WorkspacePath),
+                timeout,
+                ct: ct,
+                user: target.User,
+                inputViaStdin: true);
+
+            if (result.ExitCode != 0 && !IsMissingDistroResult(result))
+            {
+                failures.Add(
+                    $"{target.DistroName}:{target.WorkspacePath} (exit {result.ExitCode}): " +
+                    FirstNonEmpty(result.Stderr, result.Stdout));
+            }
+        }
+
+        if (failures.Count > 0)
+            throw new InvalidOperationException("Windows node context cleanup failed: " + string.Join("; ", failures));
+
+        if (_currentTarget is { } appliedTarget)
+        {
+            await RemoveRecordedTargetAsync(ctx, appliedTarget, ct);
+        }
+        else
+        {
+            File.Delete(InstallStatePath(ctx));
+        }
+    }
+
+    private static async Task<WindowsNodeContextTarget?> ResolveLegacyUninstallTargetAsync(
+        SetupContext ctx,
+        CancellationToken ct)
+    {
+        var distro = ctx.DistroName;
+        if (string.IsNullOrWhiteSpace(distro))
+            return null;
+
+        var user = ctx.Config.Wsl.User;
+        var (home, result) = await QueryLinuxHomeAsync(ctx, distro, user, ct);
+        if (home is null)
+        {
+            if (IsMissingDistroResult(result))
+                return null;
+            throw new InvalidOperationException(
+                "Could not resolve Linux home directory while cleaning legacy Windows node context: " +
+                FirstNonEmpty(result.Stderr, result.Stdout));
+        }
+
+        var workspace = await ResolveWorkspacePathAsync(ctx, distro, user, home, ct);
+        if (string.IsNullOrWhiteSpace(workspace))
+            throw new InvalidOperationException("Could not resolve workspace while cleaning legacy Windows node context");
+
+        return new WindowsNodeContextTarget(distro, user, workspace);
+    }
+
+    internal static string InstallStatePath(SetupContext ctx) =>
+        Path.Combine(ctx.LocalDataDir, InstallStateFileName);
+
+    internal static async Task<bool> RecordAppliedTargetAsync(
+        SetupContext ctx,
+        WindowsNodeContextTarget target,
+        CancellationToken ct)
+    {
+        var state = await ReadInstallStateAsync(ctx, ct);
+        var exists = state.Targets.Contains(target);
+        if (exists)
+            return false;
+
+        state.Targets.Add(target);
+        var json = JsonSerializer.Serialize(state, SetupConfig.JsonWriteOptions);
+        await AtomicFile.WriteAllTextAsync(InstallStatePath(ctx), json, ct);
+        return true;
+    }
+
+    internal static async Task<WindowsNodeContextInstallState> ReadInstallStateAsync(
+        SetupContext ctx,
+        CancellationToken ct)
+    {
+        var path = InstallStatePath(ctx);
+        if (!File.Exists(path))
+            return new WindowsNodeContextInstallState();
+
+        var json = await File.ReadAllTextAsync(path, ct);
+        var state = JsonSerializer.Deserialize<WindowsNodeContextInstallState>(json, SetupConfig.JsonOptions)
+            ?? throw new InvalidDataException("Windows node context install state is empty");
+        if (state.Targets.Any(target =>
+                string.IsNullOrWhiteSpace(target.DistroName) ||
+                string.IsNullOrWhiteSpace(target.User) ||
+                string.IsNullOrWhiteSpace(target.WorkspacePath) ||
+                !target.WorkspacePath.StartsWith('/')))
+        {
+            throw new InvalidDataException("Windows node context install state contains an invalid target");
+        }
+
+        return state;
+    }
+
+    private static async Task RemoveRecordedTargetAsync(
+        SetupContext ctx,
+        WindowsNodeContextTarget target,
+        CancellationToken ct)
+    {
+        var state = await ReadInstallStateAsync(ctx, ct);
+        state.Targets.RemoveAll(candidate => candidate == target);
+        if (state.Targets.Count == 0)
+        {
+            File.Delete(InstallStatePath(ctx));
+            return;
+        }
+
+        var json = JsonSerializer.Serialize(state, SetupConfig.JsonWriteOptions);
+        await AtomicFile.WriteAllTextAsync(InstallStatePath(ctx), json, ct);
+    }
+
+    internal static bool IsMissingDistroResult(CommandResult result)
+    {
+        if (result.ExitCode == 0)
+            return false;
+
+        var output = FirstNonEmpty(result.Stderr, result.Stdout);
+        return output.Contains("There is no distribution with the supplied name", StringComparison.OrdinalIgnoreCase) ||
+               output.Contains("WSL_E_DISTRO_NOT_FOUND", StringComparison.OrdinalIgnoreCase);
+    }
+
+    internal static async Task<string?> ResolveLinuxHomeAsync(SetupContext ctx, string distro, string user, CancellationToken ct)
+    {
+        var (home, _) = await QueryLinuxHomeAsync(ctx, distro, user, ct);
+        return home;
+    }
+
+    internal static async Task<(string? Home, CommandResult Result)> QueryLinuxHomeAsync(
+        SetupContext ctx,
+        string distro,
+        string user,
+        CancellationToken ct)
+    {
+        var result = await ctx.Commands.RunInWslAsync(
+            distro,
+            "getent passwd \"$(id -un)\" | cut -d: -f6",
+            TimeSpan.FromSeconds(15),
+            ct: ct,
+            user: user);
+
+        if (result.ExitCode != 0)
+            return (null, result);
+
+        var home = result.Stdout
+            .Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries)
+            .Select(line => line.Trim())
+            .FirstOrDefault(line => line.Length > 0 && line.StartsWith('/'));
+
+        return (string.IsNullOrWhiteSpace(home) ? null : home, result);
+    }
+
+    internal static async Task<StepResult> RunOpenclawSetupAsync(SetupContext ctx, string distro, string user, string workspaceAbsolute, CancellationToken ct)
+    {
+        var workspaceArg = ShellEscape(workspaceAbsolute);
+
+        // The pinned 2026.6.11 CLI uses plain `setup` for baseline initialization;
+        // newer/custom CLIs require `--baseline`. Detect the installed contract.
+        var script = $"""
+            set -e
+            {ctx.WslPathPrefix}
+            if openclaw setup --help 2>&1 | grep -q -- '--baseline'; then
+                openclaw setup --baseline --workspace {workspaceArg} >/dev/null
+            else
+                openclaw setup --workspace {workspaceArg} >/dev/null
+            fi
+            """;
+        // Uses stdin to bypass wsl.exe argv variable-expansion (the script's
+        // PATH prefix references $PATH, which would be expanded to the
+        // Windows PATH on the argv path). See docs/WSL_EXE_ARGV_PITFALL.md.
+        var result = await ctx.Commands.RunInWslAsync(
+            distro,
+            script,
+            TimeSpan.FromSeconds(Math.Max(30, ctx.Config.WindowsNodeContext.TimeoutSeconds / 2)),
+            ct: ct,
+            user: user,
+            inputViaStdin: true);
+
+        if (result.ExitCode != 0)
+            return StepResult.Fail($"openclaw setup failed (exit {result.ExitCode}): {FirstNonEmpty(result.Stderr, result.Stdout)}");
+
+        return StepResult.Ok();
+    }
+
+    internal static async Task<string?> ResolveWorkspacePathAsync(SetupContext ctx, string distro, string user, string home, CancellationToken ct)
+    {
+        var workspaceOverride = ctx.Config.WindowsNodeContext.WorkspacePath?.Trim();
+        if (!string.IsNullOrWhiteSpace(workspaceOverride))
+            return ExpandLinuxPath(workspaceOverride, home);
+
+        // `agents list` resolves per-agent overrides and returns the effective
+        // workspace used by the default/main chat agent.
+        var script = $"{ctx.WslPathPrefix}\nopenclaw agents list --json";
+        // Uses stdin to bypass wsl.exe argv variable-expansion (the script's
+        // PATH prefix references $PATH). See docs/WSL_EXE_ARGV_PITFALL.md.
+        var result = await ctx.Commands.RunInWslAsync(
+            distro,
+            script,
+            TimeSpan.FromSeconds(15),
+            ct: ct,
+            user: user,
+            inputViaStdin: true);
+
+        if (result.TimedOut || result.ExitCode != 0)
+            return null;
+
+        var raw = ExtractDefaultAgentWorkspaceFromAgentsOutput(result.Stdout);
+        return string.IsNullOrWhiteSpace(raw) ? null : ExpandLinuxPath(raw, home);
+    }
+
+    internal static async Task<string?> ResolveConfiguredDefaultWorkspacePathAsync(
+        SetupContext ctx,
+        string distro,
+        string user,
+        string home,
+        CancellationToken ct)
+    {
+        var script = $"{ctx.WslPathPrefix}\nopenclaw config get agents.defaults.workspace --json";
+        var result = await ctx.Commands.RunInWslAsync(
+            distro,
+            script,
+            TimeSpan.FromSeconds(15),
+            ct: ct,
+            user: user,
+            inputViaStdin: true);
+
+        if (result.TimedOut)
+            return null;
+
+        var raw = ExtractWorkspaceFromConfigOutput(result.Stdout);
+        if (result.ExitCode != 0)
+        {
+            // Pinned 2026.6.11 reports an absent key with exit 1. Only that
+            // known case may select the default; other read failures must not
+            // be persisted by the subsequent `setup --workspace` call.
+            if (!result.Stderr.Contains(
+                    "Config path not found: agents.defaults.workspace",
+                    StringComparison.Ordinal))
+                return null;
+
+            raw = $"{home.TrimEnd('/')}/.openclaw/workspace";
+        }
+        else if (string.IsNullOrWhiteSpace(raw))
+        {
+            // A present JSON null uses OpenClaw's default. Empty or malformed
+            // successful output is an operational failure, not evidence that
+            // the key is absent.
+            if (!result.Stdout
+                    .Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries)
+                    .Any(line => string.Equals(line.Trim(), "null", StringComparison.Ordinal)))
+                return null;
+
+            raw = $"{home.TrimEnd('/')}/.openclaw/workspace";
+        }
+
+        return ExpandLinuxPath(raw, home);
+    }
+
+    internal static string? ExtractDefaultAgentWorkspaceFromAgentsOutput(string stdout)
+    {
+        if (string.IsNullOrWhiteSpace(stdout))
+            return null;
+
+        var lines = stdout.Split(['\r', '\n'], StringSplitOptions.None);
+        for (var i = 0; i < lines.Length; i++)
+        {
+            var trimmed = lines[i].TrimStart();
+            if (!trimmed.StartsWith('['))
+                continue;
+
+            var candidate = string.Join('\n', lines.Skip(i));
+            var end = candidate.LastIndexOf(']');
+            if (end < 0)
+                continue;
+
+            try
+            {
+                using var document = JsonDocument.Parse(candidate[..(end + 1)]);
+                if (document.RootElement.ValueKind != JsonValueKind.Array)
+                    continue;
+
+                JsonElement? main = null;
+                foreach (var agent in document.RootElement.EnumerateArray())
+                {
+                    if (agent.ValueKind != JsonValueKind.Object)
+                        continue;
+
+                    if (agent.TryGetProperty("isDefault", out var isDefault) &&
+                        isDefault.ValueKind == JsonValueKind.True)
+                    {
+                        main = agent;
+                        break;
+                    }
+
+                    if (main is null &&
+                        agent.TryGetProperty("id", out var id) &&
+                        string.Equals(id.GetString(), "main", StringComparison.OrdinalIgnoreCase))
+                        main = agent;
+                }
+
+                if (main is { } selected &&
+                    selected.TryGetProperty("workspace", out var workspace) &&
+                    workspace.ValueKind == JsonValueKind.String)
+                    return workspace.GetString();
+            }
+            catch (JsonException)
+            {
+                // Keep scanning in case a warning line started with '['.
+            }
+        }
+
+        return null;
+    }
+
+    internal static string? ExtractWorkspaceFromConfigOutput(string stdout)
+    {
+        if (string.IsNullOrWhiteSpace(stdout))
+            return null;
+
+        // openclaw config get --json prints a JSON value; warnings may be on stderr (suppressed)
+        // or as banner lines on stdout. Walk lines from bottom to find a usable value.
+        var lines = stdout
+            .Split(['\r', '\n'], StringSplitOptions.None)
+            .Select(line => line.Trim())
+            .Where(line => line.Length > 0)
+            .ToArray();
+
+        for (var i = lines.Length - 1; i >= 0; i--)
+        {
+            var candidate = lines[i];
+            // Try JSON string parse first
+            if (candidate.StartsWith('"') && candidate.EndsWith('"'))
+            {
+                try
+                {
+                    return System.Text.Json.JsonSerializer.Deserialize<string>(candidate);
+                }
+                catch (System.Text.Json.JsonException)
+                {
+                    continue;
+                }
+            }
+
+            if (candidate == "null")
+                continue;
+
+            // Plain string (non-JSON output)
+            if (candidate.StartsWith('/') || candidate.StartsWith('~'))
+                return candidate;
+        }
+
+        return null;
+    }
+
+    internal static string ExpandLinuxPath(string path, string home)
+    {
+        var trimmed = path.Trim();
+        if (string.IsNullOrWhiteSpace(trimmed) || trimmed == "null" || trimmed == "undefined")
+            return $"{home.TrimEnd('/')}/.openclaw/workspace";
+
+        if (trimmed == "~")
+            return home;
+        if (trimmed.StartsWith("~/", StringComparison.Ordinal))
+            return $"{home.TrimEnd('/')}/{trimmed[2..]}";
+        if (trimmed.StartsWith('/'))
+            return trimmed;
+        return $"{home.TrimEnd('/')}/{trimmed}";
+    }
+
+    internal static string BuildApplyScript(string absoluteWorkspacePath)
+        => $$"""
+            set -e
+            set -o pipefail
+            workspace={{ShellEscape(absoluteWorkspacePath)}}
+            agents="$workspace/AGENTS.md"
+            block_b64={{ShellEscape(ManagedBlockBase64())}}
+            begin_marker={{ShellEscape(WindowsNodeContextSection.BeginMarker)}}
+            end_marker={{ShellEscape(WindowsNodeContextSection.EndMarker)}}
+            if [ -L "$agents" ]; then
+                echo "AGENTS_SYMLINK:$agents" >&2
+                exit 2
+            fi
+            if [ ! -f "$agents" ]; then
+                mkdir -p "$workspace"
+                : > "$agents"
+                echo "WINDOWS_NODE_CONTEXT_BOOTSTRAP_FALLBACK:$agents"
+            fi
+            begin_count=$(awk -v M="$begin_marker" '{ marker_line=$0; sub(/\r$/, "", marker_line); if (marker_line == M) count++ } END { print count + 0 }' "$agents")
+            end_count=$(awk -v M="$end_marker" '{ marker_line=$0; sub(/\r$/, "", marker_line); if (marker_line == M) count++ } END { print count + 0 }' "$agents")
+            if [ "$begin_count" -gt 1 ] || [ "$end_count" -gt 1 ] || [ "$begin_count" != "$end_count" ]; then
+                echo "WINDOWS_NODE_CONTEXT_MARKERS_MALFORMED:$agents" >&2
+                exit 4
+            fi
+            if [ "$begin_count" = 1 ]; then
+                begin_line=$(awk -v M="$begin_marker" '{ marker_line=$0; sub(/\r$/, "", marker_line); if (marker_line == M) { print NR; exit } }' "$agents")
+                end_line=$(awk -v M="$end_marker" '{ marker_line=$0; sub(/\r$/, "", marker_line); if (marker_line == M) { print NR; exit } }' "$agents")
+                if [ "$end_line" -lt "$begin_line" ]; then
+                    echo "WINDOWS_NODE_CONTEXT_MARKERS_MALFORMED:$agents" >&2
+                    exit 4
+                fi
+            fi
+            tmp=$(mktemp "$workspace/.AGENTS.md.openclaw.XXXXXX")
+            trap 'rm -f -- "$tmp"' EXIT
+            awk -v BEGIN_M="$begin_marker" -v END_M="$end_marker" '
+              BEGIN { in_block = 0 }
+              { marker_line = $0; sub(/\r$/, "", marker_line) }
+              marker_line == BEGIN_M { in_block = 1; next }
+              in_block && marker_line == END_M { in_block = 0; next }
+              in_block { next }
+              /^[[:space:]]*$/ { blank = blank $0 ORS; next }
+              { printf "%s%s%s", blank, $0, ORS; blank = "" }
+            ' "$agents" > "$tmp"
+            if [ -s "$tmp" ]; then
+                printf '\n' >> "$tmp"
+            fi
+            printf '%s' "$block_b64" | base64 -d >> "$tmp"
+            printf '\n' >> "$tmp"
+            chmod --reference="$agents" "$tmp"
+            mv -- "$tmp" "$agents"
+            trap - EXIT
+            echo "WINDOWS_NODE_CONTEXT_WORKSPACE:$workspace"
+            echo "WINDOWS_NODE_CONTEXT_READY"
+            """;
+
+    internal static string BuildRollbackScript(string absoluteWorkspacePath)
+        => $$"""
+            set -e
+            set -o pipefail
+            workspace={{ShellEscape(absoluteWorkspacePath)}}
+            agents="$workspace/AGENTS.md"
+            begin_marker={{ShellEscape(WindowsNodeContextSection.BeginMarker)}}
+            end_marker={{ShellEscape(WindowsNodeContextSection.EndMarker)}}
+            if [ ! -e "$agents" ]; then
+                echo "WINDOWS_NODE_CONTEXT_ABSENT"
+                exit 0
+            fi
+            if [ -L "$agents" ]; then
+                echo "AGENTS_SYMLINK_ROLLBACK_SKIPPED:$agents"
+                exit 5
+            fi
+            begin_count=$(awk -v M="$begin_marker" '{ marker_line=$0; sub(/\r$/, "", marker_line); if (marker_line == M) count++ } END { print count + 0 }' "$agents")
+            end_count=$(awk -v M="$end_marker" '{ marker_line=$0; sub(/\r$/, "", marker_line); if (marker_line == M) count++ } END { print count + 0 }' "$agents")
+            if [ "$begin_count" = 0 ] && [ "$end_count" = 0 ]; then
+                echo "WINDOWS_NODE_CONTEXT_REMOVED"
+                exit 0
+            fi
+            if [ "$begin_count" != 1 ] || [ "$end_count" != 1 ]; then
+                echo "WINDOWS_NODE_CONTEXT_MARKERS_MALFORMED:$agents" >&2
+                exit 4
+            fi
+            begin_line=$(awk -v M="$begin_marker" '{ marker_line=$0; sub(/\r$/, "", marker_line); if (marker_line == M) { print NR; exit } }' "$agents")
+            end_line=$(awk -v M="$end_marker" '{ marker_line=$0; sub(/\r$/, "", marker_line); if (marker_line == M) { print NR; exit } }' "$agents")
+            if [ "$end_line" -lt "$begin_line" ]; then
+                echo "WINDOWS_NODE_CONTEXT_MARKERS_MALFORMED:$agents" >&2
+                exit 4
+            fi
+            tmp=$(mktemp "$workspace/.AGENTS.md.openclaw.XXXXXX")
+            trap 'rm -f -- "$tmp"' EXIT
+            awk -v BEGIN_M="$begin_marker" -v END_M="$end_marker" '
+              BEGIN { in_block = 0 }
+              { marker_line = $0; sub(/\r$/, "", marker_line) }
+              marker_line == BEGIN_M { in_block = 1; next }
+              in_block && marker_line == END_M { in_block = 0; next }
+              in_block { next }
+              { print }
+            ' "$agents" > "$tmp"
+            chmod --reference="$agents" "$tmp"
+            mv -- "$tmp" "$agents"
+            trap - EXIT
+            echo "WINDOWS_NODE_CONTEXT_REMOVED"
+            """;
+
+    private static string ManagedBlockBase64()
+        => Convert.ToBase64String(System.Text.Encoding.UTF8.GetBytes(WindowsNodeContextSection.ManagedBlock));
+
+    private static string ShellEscape(string value) => "'" + value.Replace("'", "'\\''") + "'";
+
+    private static string FirstNonEmpty(params string[] values)
+        => values.Select(v => v.Trim()).FirstOrDefault(v => v.Length > 0) ?? "no output";
+
+    private static string? ReadMarkerValue(string output, string marker)
+        => output
+            .Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries)
+            .Select(line => line.Trim())
+            .FirstOrDefault(line => line.StartsWith(marker, StringComparison.Ordinal))
+            ?[marker.Length..];
+}
+
 public sealed class VerifyEndToEndStep : SetupStep
 {
     public override string Id => "verify-e2e";
@@ -2668,9 +3294,10 @@ private static async Task<StepResult> DrainPendingApprovalsAsync(SetupContext ct
         return StepResult.Ok("Pending approvals drained");
     }
 
-    private static void WriteSettingsJson(SetupContext ctx)
+    internal static void WriteSettingsJson(SetupContext ctx)
     {
         var settingsPath = Path.Combine(ctx.DataDir, "settings.json");
+        ctx.Config.Settings.ApplyCapabilities(ctx.Config.Capabilities);
         ctx.Config.Settings.MergeIntoSettingsFile(settingsPath);
         ctx.Logger.Info($"Wrote settings.json: EnableNodeMode={ctx.Config.Settings.EnableNodeMode}");
     }
@@ -2852,7 +3479,7 @@ public override Task<StepResult> ExecuteAsync(SetupContext ctx, CancellationToke
         psi.ArgumentList.Add("sleep");
         psi.ArgumentList.Add("infinity");
 
-        var proc = System.Diagnostics.Process.Start(psi);
+        using var proc = System.Diagnostics.Process.Start(psi);
         if (proc == null)
         {
             ctx.Logger.Warn("Failed to start keepalive process — tray will start its own");
@@ -2980,9 +3607,7 @@ internal static bool IsKeepaliveCommandLine(string? commandLine, string distro)
         if (string.IsNullOrWhiteSpace(commandLine) || string.IsNullOrWhiteSpace(distro))
             return false;
 
-        return commandLine.Contains(distro, StringComparison.OrdinalIgnoreCase)
-            && commandLine.Contains("sleep", StringComparison.OrdinalIgnoreCase)
-            && commandLine.Contains("infinity", StringComparison.OrdinalIgnoreCase);
+        return WslCommandLineMatcher.IsKeepaliveForDistro(commandLine, distro);
     }
 
     private static string? GetProcessCommandLine(int pid, IOpenClawLogger? logger = null)
diff --git a/src/OpenClaw.SetupEngine/SetupWizardRunner.cs b/src/OpenClaw.SetupEngine/SetupWizardRunner.cs
index 2dadbdd3f..39a24719e 100644
--- a/src/OpenClaw.SetupEngine/SetupWizardRunner.cs
+++ b/src/OpenClaw.SetupEngine/SetupWizardRunner.cs
@@ -10,6 +10,10 @@ public sealed class SetupWizardRunner
     private const int MaxWizardSteps = 50;
     private const int MaxSameStepVisits = 3;
     private static readonly Regex s_normalizeKeyRegex = new("[^a-z0-9]+", RegexOptions.Compiled);
+
+    // Progress steps can repeat while background work runs; keep bounded caps
+    // so setup fails with a diagnostic instead of hanging.
+
     private readonly SetupContext _ctx;
 
     public SetupWizardRunner(SetupContext ctx)
@@ -84,7 +88,45 @@ public async Task<StepResult> RunAsync(CancellationToken ct)
 
             var visits = new Dictionary<string, int>(StringComparer.OrdinalIgnoreCase);
             var restartAttempts = 0;
-            for (var i = 0; i < MaxWizardSteps; i++)
+            var progressPolls = 0;
+            var totalProgressPolls = 0;
+            var lastProgressStepId = "";
+            var interactiveSteps = 0;
+
+            // A reconnect restarts the wizard session, so reset replay-scoped
+            // counters before processing the replacement start payload.
+            async Task<JsonElement> SendWizardNextAsync(object parameters, int timeoutMs)
+            {
+                try
+                {
+                    return await client!.SendWizardRequestAsync("wizard.next", parameters, timeoutMs);
+                }
+                catch (Exception ex) when (!ct.IsCancellationRequested && IsRestartLikeWizardDisconnect(ex) && restartAttempts < 2)
+                {
+                    restartAttempts++;
+                    _ctx.Logger.Warn($"Gateway restarted during wizard; reconnecting and replaying answers (attempt {restartAttempts}/2): {ex.Message}");
+
+                    try { await client!.DisconnectAsync(); } catch { }
+                    client!.Dispose();
+
+                    await Task.Delay(TimeSpan.FromSeconds(3), ct);
+                    client = CreateWizardClient(credential, identityPath, wsLogger);
+                    var reconnect = await PairOperatorStep.WaitForConnectionOrPairing(client, _ctx, TimeSpan.FromSeconds(30), ct);
+                    if (reconnect != PairOperatorStep.ConnectionOutcome.Connected)
+                        throw new WizardFatalException($"Gateway wizard reconnect failed after restart: {reconnect}");
+
+                    sessionId = "";
+                    visits.Clear();
+                    discoveredSteps.Clear();
+                    interactiveSteps = 0;
+                    progressPolls = 0;
+                    totalProgressPolls = 0;
+                    lastProgressStepId = "";
+                    return await client.SendWizardRequestAsync("wizard.start", timeoutMs: 30_000);
+                }
+            }
+
+            while (true)
             {
                 ct.ThrowIfCancellationRequested();
 
@@ -123,6 +165,39 @@ public async Task<StepResult> RunAsync(CancellationToken ct)
                 if (string.IsNullOrWhiteSpace(parsed.StepId))
                     return StepResult.Fail("Gateway wizard step is missing an id.");
 
+                var category = WizardStepClassifier.Categorize(parsed.StepType, parsed.Options.Count > 0);
+
+                // Progress carries no answer; poll until the gateway emits the
+                // next interactive step or reaches a bounded failure.
+                if (category == WizardStepCategory.Progress)
+                {
+                    if (!string.Equals(parsed.StepId, lastProgressStepId, StringComparison.Ordinal))
+                    {
+                        lastProgressStepId = parsed.StepId;
+                        progressPolls = 0;
+                    }
+
+                    progressPolls++;
+                    totalProgressPolls++;
+                    if (progressPolls > WizardTimeouts.MaxProgressPollsPerStep)
+                        return StepResult.Fail($"Gateway wizard progress step '{parsed.StepId}' did not complete after {WizardTimeouts.MaxProgressPollsPerStep} polls.");
+                    if (totalProgressPolls > WizardTimeouts.MaxTotalProgressPolls)
+                        return StepResult.Fail($"Gateway wizard did not finish after {WizardTimeouts.MaxTotalProgressPolls} progress updates.");
+
+                    var progressText = $"{parsed.Title} {parsed.Message}".Trim();
+                    _ctx.Logger.Info(string.IsNullOrWhiteSpace(progressText)
+                        ? $"Wizard progress step '{parsed.StepId}' — polling for next step"
+                        : $"Wizard progress: {progressText}");
+
+                    await Task.Delay(WizardTimeouts.ProgressPollDelay, ct);
+                    payload = await SendWizardNextAsync(WizardNextPayload.Acknowledge(sessionId, parsed.StepId), TimeoutFor(parsed));
+                    continue;
+                }
+
+                interactiveSteps++;
+                if (interactiveSteps > MaxWizardSteps)
+                    return StepResult.Fail($"Gateway wizard exceeded {MaxWizardSteps} steps.");
+
                 var visitKey = $"{parsed.StepId}:{parsed.StepIndex}";
                 visits.TryGetValue(visitKey, out var visitCount);
                 visits[visitKey] = visitCount + 1;
@@ -142,9 +217,9 @@ public async Task<StepResult> RunAsync(CancellationToken ct)
 
                 _ctx.Logger.Info(answerResult.HasAnswer
                     ? $"Wizard step '{parsed.StepId}' ({parsed.StepType}, key={StableAnswerKey(parsed.Title, parsed.Message, parsed.StepId)}) answered with {(parsed.Sensitive ? "[sensitive]" : $"'{answerResult.Answer}'")}"
-                    : $"Wizard step '{parsed.StepId}' ({parsed.StepType}) continuing without explicit answer");
+                    : $"Wizard step '{parsed.StepId}' ({parsed.StepType}, {category}) continuing without explicit answer");
 
-                var parameters = answerResult.HasAnswer
+                object parameters = answerResult.HasAnswer
                     ? new
                     {
                         sessionId,
@@ -154,35 +229,10 @@ public async Task<StepResult> RunAsync(CancellationToken ct)
                             value = AnswerValueForWire(parsed, answerResult.Answer)
                         }
                     }
-                    : (object)new { sessionId };
-
-                try
-                {
-                    payload = await client.SendWizardRequestAsync("wizard.next", parameters, timeoutMs: TimeoutFor(parsed));
-                }
-                catch (Exception ex) when (!ct.IsCancellationRequested && IsRestartLikeWizardDisconnect(ex) && restartAttempts < 2)
-                {
-                    restartAttempts++;
-                    _ctx.Logger.Warn($"Gateway restarted during wizard; reconnecting and replaying answers (attempt {restartAttempts}/2): {ex.Message}");
-
-                    // slopwatch-ignore: SW003 Cleanup is best-effort; failure cannot improve caller state and the original outcome is preserved.
-                    try { await client.DisconnectAsync(); } catch { }
-                    client.Dispose();
-
-                    await Task.Delay(TimeSpan.FromSeconds(3), ct);
-                    client = CreateWizardClient(credential, identityPath, wsLogger);
-                    var reconnect = await PairOperatorStep.WaitForConnectionOrPairing(client, _ctx, TimeSpan.FromSeconds(30), ct);
-                    if (reconnect != PairOperatorStep.ConnectionOutcome.Connected)
-                        return StepResult.Fail($"Gateway wizard reconnect failed after restart: {reconnect}");
+                    : WizardNextPayload.Acknowledge(sessionId, parsed.StepId);
 
-                    sessionId = "";
-                    visits.Clear();
-                    discoveredSteps.Clear();
-                    payload = await client.SendWizardRequestAsync("wizard.start", timeoutMs: 30_000);
-                }
+                payload = await SendWizardNextAsync(parameters, TimeoutFor(parsed, answerResult.Answer));
             }
-
-            return StepResult.Fail($"Gateway wizard exceeded {MaxWizardSteps} steps.");
         }
         catch (OperationCanceledException)
         {
@@ -190,6 +240,10 @@ public async Task<StepResult> RunAsync(CancellationToken ct)
                 await TryCancelWizardAsync(client, sessionId);
             throw;
         }
+        catch (WizardFatalException ex)
+        {
+            return StepResult.Fail(ex.Message, ex);
+        }
         catch (Exception ex)
         {
             return StepResult.Fail($"Gateway wizard failed: {ex.Message}", ex);
@@ -225,6 +279,7 @@ private async Task TryCancelWizardAsync(OpenClawGatewayClient client, string ses
             _ctx.Logger.Warn("Cancelling gateway wizard session");
             await client.SendWizardRequestAsync("wizard.cancel", new { sessionId }, timeoutMs: 10_000);
         }
+
         catch (Exception ex)
         {
             _ctx.Logger.Warn($"Failed to cancel gateway wizard session: {ex.Message}");
@@ -291,19 +346,34 @@ private static AnswerResolution ResolveAnswer(WizardPayload step, Dictionary<str
         if (TryGetConfiguredAnswer(step, configuredAnswers, out var configured))
             return ValidateAnswer(step, configured, configuredAnswer: true);
 
-        var inferred = step.StepType switch
+        var category = WizardStepClassifier.Categorize(step.StepType, step.Options.Count > 0);
+        if (WizardStepClassifier.ContinuesWithoutAnswer(category))
         {
-            "note" => "true",
-            "confirm" => InferConfirmAnswer(step),
-            "select" => InferOptionAnswer(step),
-            "multiselect" => InferOptionAnswer(step),
-            "text" => InferTextAnswer(step),
-            _ => !string.IsNullOrWhiteSpace(step.InitialValue) ? step.InitialValue : null
-        };
+            return AnswerResolution.Continue();
+        }
+
+        switch (category)
+        {
+            case WizardStepCategory.Acknowledge:
+                return AnswerResolution.Ok("true");
+
+            case WizardStepCategory.Confirm:
+                return ValidateAnswer(step, InferConfirmAnswer(step), configuredAnswer: false);
+        }
+
+        // Unknown types with options are choice prompts for wire-shaping purposes.
+        var inferred = step.Options.Count > 0 && step.StepType != "text"
+            ? InferOptionAnswer(step)
+            : step.StepType switch
+            {
+                "select" or "multiselect" => InferOptionAnswer(step),
+                "text" => InferTextAnswer(step),
+                _ => !string.IsNullOrWhiteSpace(step.InitialValue) ? step.InitialValue : null
+            };
 
         if (inferred == null)
         {
-            return AnswerResolution.Fail($"Gateway wizard step '{step.StepId}' ({step.StepType}) requires a text answer.");
+            return AnswerResolution.Fail($"Gateway wizard step '{step.StepId}' ({step.StepType}) requires a value that was not provided.");
         }
 
         return ValidateAnswer(step, inferred, configuredAnswer: false);
@@ -337,7 +407,11 @@ private static string InferConfirmAnswer(WizardPayload step)
 
     private static object AnswerValueForWire(WizardPayload step, string answer)
     {
-        return WizardAnswerBuilder.BuildWireValue(step.StepType, answer, step.Options);
+        // Preserve the selected option's raw JSON value for unknown choice-style steps.
+        var effectiveType = step.Options.Count > 0 && step.StepType is not ("select" or "multiselect" or "text")
+            ? "select"
+            : step.StepType;
+        return WizardAnswerBuilder.BuildWireValue(effectiveType, answer, step.Options);
     }
 
     private static string? InferTextAnswer(WizardPayload step)
@@ -404,17 +478,14 @@ private static bool TryGetConfiguredAnswer(WizardPayload step, Dictionary<string
         return false;
     }
 
-    private static int TimeoutFor(WizardPayload step)
-    {
-        var text = $"{step.Title} {step.Message}";
-        return text.Contains("device", StringComparison.OrdinalIgnoreCase)
-            || text.Contains("authorize", StringComparison.OrdinalIgnoreCase)
-            || text.Contains("login", StringComparison.OrdinalIgnoreCase)
-            || text.Contains("sign in", StringComparison.OrdinalIgnoreCase)
-            || text.Contains("oauth", StringComparison.OrdinalIgnoreCase)
-            ? 300_000
-            : 30_000;
-    }
+    private static int TimeoutFor(WizardPayload step, string? answer = null)
+        => WizardTimeouts.ForGatewayStep(
+            step.Title,
+            step.Message,
+            step.StepId,
+            step.StepType,
+            step.Options,
+            answer);
 
     private static bool IsRestartLikeWizardDisconnect(Exception ex)
     {
@@ -434,7 +505,11 @@ private static string AnswerPlaceholderFor(WizardTemplateStep step)
         {
             "select" => step.Options.FirstOrDefault()?.Value ?? "<select one option value>",
             "multiselect" => "<comma-separated option values>",
-            "text" => step.Sensitive ? "<sensitive value>" : "<text value>",
+            "text" => step.Sensitive
+                ? "<sensitive value>"
+                : step.AuthUrls.Count > 0
+                    ? $"<value obtained from: {step.AuthUrls[0]}>"
+                    : "<text value>",
             _ => step.SuggestedAnswer ?? "true"
         };
     }
@@ -461,8 +536,12 @@ private sealed record AnswerResolution(bool Success, bool HasAnswer, string Answ
     {
         public static AnswerResolution Ok(string answer) => new(true, true, answer, null);
         public static AnswerResolution Fail(string error) => new(false, false, "", error);
+
+        public static AnswerResolution Continue() => new(true, false, "", null);
     }
 
+    private sealed class WizardFatalException(string message) : Exception(message);
+
     private sealed record WizardPayload(
         bool IsDone,
         string? SessionId,
@@ -499,7 +578,8 @@ public static WizardPayload Parse(JsonElement payload)
                 if (!payload.TryGetProperty("step", out var step) || step.ValueKind != JsonValueKind.Object)
                     return ErrorPayload("Gateway wizard response is missing a step object.");
 
-                var type = step.TryGetProperty("type", out var typeProperty) ? typeProperty.ToString() : "note";
+                var rawType = step.TryGetProperty("type", out var typeProperty) ? typeProperty.ToString() : "note";
+                var type = string.IsNullOrWhiteSpace(rawType) ? "note" : rawType.Trim().ToLowerInvariant();
                 var title = step.TryGetProperty("title", out var titleProperty) ? titleProperty.ToString() : "";
                 var message = step.TryGetProperty("message", out var messageProperty) ? messageProperty.ToString() : "";
                 var stepId = step.TryGetProperty("id", out var idProperty) ? idProperty.ToString() : "";
@@ -530,7 +610,8 @@ private sealed record WizardTemplateStep(
         string Message,
         bool Sensitive,
         string? SuggestedAnswer,
-        IReadOnlyList<WizardOptionValue> Options)
+        IReadOnlyList<WizardOptionValue> Options,
+        IReadOnlyList<string> AuthUrls)
     {
         public static WizardTemplateStep From(WizardPayload payload)
         {
@@ -549,7 +630,9 @@ public static WizardTemplateStep From(WizardPayload payload)
             if (payload.Sensitive && !string.IsNullOrWhiteSpace(suggested))
                 suggested = "<sensitive value>";
 
-            return new(payload.StepId, payload.StepType, payload.Title, payload.Message, payload.Sensitive, suggested, payload.Options);
+            var authUrls = WizardMessageFormatting.ExtractUrls($"{payload.Title}\n{payload.Message}");
+
+            return new(payload.StepId, payload.StepType, payload.Title, payload.Message, payload.Sensitive, suggested, payload.Options, authUrls);
         }
     }
 }
diff --git a/src/OpenClaw.SetupEngine/TrayArtifactCleanup.cs b/src/OpenClaw.SetupEngine/TrayArtifactCleanup.cs
index 0dbec0ae0..65f625e4b 100644
--- a/src/OpenClaw.SetupEngine/TrayArtifactCleanup.cs
+++ b/src/OpenClaw.SetupEngine/TrayArtifactCleanup.cs
@@ -13,9 +13,13 @@ namespace OpenClaw.SetupEngine;
 public static class TrayArtifactCleanup
 {
     private const string AutoStartKey = @"SOFTWARE\Microsoft\Windows\CurrentVersion\Run";
-    private const string AutoStartValue = "OpenClawTray";
+    private const string DefaultAutoStartValue = "OpenClawTray";
 
-    public static void Run(SetupContext ctx, bool preserveLogs = false)
+    public static void Run(
+        SetupContext ctx,
+        bool preserveLogs = false,
+        string autoStartValue = DefaultAutoStartValue,
+        string startupTaskName = WindowsStartupTaskRegistration.TaskName)
     {
         var logger = ctx.Logger;
         var appDataDir = ctx.DataDir; // %APPDATA%\OpenClawTray
@@ -25,9 +29,9 @@ public static void Run(SetupContext ctx, bool preserveLogs = false)
         try
         {
             using var key = Registry.CurrentUser.OpenSubKey(AutoStartKey, writable: true);
-            if (key?.GetValue(AutoStartValue) != null)
+            if (key?.GetValue(autoStartValue) != null)
             {
-                key.DeleteValue(AutoStartValue);
+                key.DeleteValue(autoStartValue);
                 logger.Info("[Uninstall] Removed autostart registry key");
             }
             else
@@ -40,7 +44,7 @@ public static void Run(SetupContext ctx, bool preserveLogs = false)
             logger.Warn($"[Uninstall] Failed to remove autostart registry key: {ex.Message}");
         }
 
-        if (WindowsStartupTaskRegistration.Unregister())
+        if (WindowsStartupTaskRegistration.Unregister(startupTaskName))
             logger.Info("[Uninstall] Removed autostart scheduled task");
         else
             logger.Info("[Uninstall] Autostart scheduled task already absent or unavailable");
diff --git a/src/OpenClaw.SetupEngine/WindowsNodeContextSection.cs b/src/OpenClaw.SetupEngine/WindowsNodeContextSection.cs
new file mode 100644
index 000000000..7af849a59
--- /dev/null
+++ b/src/OpenClaw.SetupEngine/WindowsNodeContextSection.cs
@@ -0,0 +1,15 @@
+namespace OpenClaw.SetupEngine;
+
+internal static class WindowsNodeContextSection
+{
+    public const string BeginMarker = "<!-- BEGIN OPENCLAW WINDOWS NODE CONTEXT: managed by OpenClaw Windows setup -->";
+    public const string EndMarker = "<!-- END OPENCLAW WINDOWS NODE CONTEXT -->";
+
+    public const string Payload = """
+This WSL gateway may be paired with the OpenClaw Windows tray node. For Windows desktop, Windows files, screenshots, camera, notifications, browser proxy, or Windows commands, use the `nodes` tool (`status` / `describe`) and target the Windows node instead of assuming the WSL shell can do it.
+
+For Windows shell work, use `exec host=node` / `system.run`; normal gateway exec runs in WSL. If Windows node commands fail, ask the user to check the tray Permissions page: Node mode, System run (or the requested capability), and Exec policy. If settings changed or capabilities look stale, ask the user to reconnect/restart the Windows node or gateway.
+""";
+
+    public static string ManagedBlock => $"{BeginMarker}\n{Payload.TrimEnd()}\n{EndMarker}";
+}
diff --git a/src/OpenClaw.SetupEngine/WizardMessageFormatting.cs b/src/OpenClaw.SetupEngine/WizardMessageFormatting.cs
new file mode 100644
index 000000000..0af6215e0
--- /dev/null
+++ b/src/OpenClaw.SetupEngine/WizardMessageFormatting.cs
@@ -0,0 +1,90 @@
+using System.Text.RegularExpressions;
+
+namespace OpenClaw.SetupEngine;
+
+/// <summary>The kind of content a single wizard message line carries.</summary>
+public enum WizardLineKind
+{
+    /// <summary>Plain text.</summary>
+    Text,
+
+    /// <summary>Contains an http(s) URL (e.g. an OAuth/device-authorization link).</summary>
+    Url,
+
+    /// <summary>A "Code: XXXX" style device/pairing code the user must enter elsewhere.</summary>
+    Code,
+}
+
+/// <summary>A classified wizard message line with an optional highlighted URL or code.</summary>
+public sealed record WizardLineSegment(
+    WizardLineKind Kind,
+    string Text,
+    string Prefix,
+    string Highlight,
+    string Suffix);
+
+/// <summary>Detects actionable URLs and manual entry codes in wizard messages.</summary>
+public static class WizardMessageFormatting
+{
+    // "Code: ABCD-EFGH" / "user_code = ABC123" style manual entry codes.
+    private static readonly Regex s_codeRegex = new(
+        @"^((?:Code|code|user_code|USER_CODE|User Code)\s*[:=]\s*)([A-Z0-9]{2,8}(?:-[A-Z0-9]{2,8})+|[A-Z0-9]{4,12})\b",
+        RegexOptions.Compiled);
+
+    private static readonly Regex s_urlRegex = new(
+        @"https?://[^\s\)\""]+",
+        RegexOptions.Compiled | RegexOptions.IgnoreCase);
+
+    /// <summary>Classifies a line as plain text, URL, or device-code text.</summary>
+    public static WizardLineSegment ClassifyLine(string? line)
+    {
+        var trimmed = (line ?? string.Empty).TrimEnd('\r');
+
+        var codeMatch = s_codeRegex.Match(trimmed);
+        if (codeMatch.Success)
+        {
+            return new WizardLineSegment(
+                WizardLineKind.Code,
+                trimmed,
+                Prefix: codeMatch.Groups[1].Value,
+                Highlight: codeMatch.Groups[2].Value,
+                Suffix: string.Empty);
+        }
+
+        var urlMatch = s_urlRegex.Match(trimmed);
+        if (urlMatch.Success)
+        {
+            var url = urlMatch.Value.TrimEnd('.', ',');
+            if (Uri.TryCreate(url, UriKind.Absolute, out _))
+            {
+                var index = trimmed.IndexOf(urlMatch.Value, StringComparison.Ordinal);
+                var prefix = index > 0 ? trimmed[..index] : string.Empty;
+                var suffix = trimmed[(index + urlMatch.Value.Length)..];
+                return new WizardLineSegment(WizardLineKind.Url, trimmed, prefix, url, suffix);
+            }
+        }
+
+        return new WizardLineSegment(WizardLineKind.Text, trimmed, trimmed, string.Empty, string.Empty);
+    }
+
+    /// <summary>Returns all distinct absolute http(s) URLs found in a message.</summary>
+    public static IReadOnlyList<string> ExtractUrls(string? message)
+    {
+        if (string.IsNullOrWhiteSpace(message))
+            return Array.Empty<string>();
+
+        var urls = new List<string>();
+        var seen = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        foreach (Match match in s_urlRegex.Matches(message))
+        {
+            var url = match.Value.TrimEnd('.', ',');
+            if (Uri.TryCreate(url, UriKind.Absolute, out _) && seen.Add(url))
+                urls.Add(url);
+        }
+
+        return urls;
+    }
+
+    /// <summary>True when the message contains at least one actionable auth URL.</summary>
+    public static bool ContainsAuthUrl(string? message) => ExtractUrls(message).Count > 0;
+}
diff --git a/src/OpenClaw.SetupEngine/WizardNextPayload.cs b/src/OpenClaw.SetupEngine/WizardNextPayload.cs
new file mode 100644
index 000000000..a6dd74f32
--- /dev/null
+++ b/src/OpenClaw.SetupEngine/WizardNextPayload.cs
@@ -0,0 +1,11 @@
+namespace OpenClaw.SetupEngine;
+
+public sealed record WizardNextStepAnswer(string stepId);
+
+public sealed record WizardNextStepAcknowledgement(string sessionId, WizardNextStepAnswer answer);
+
+public static class WizardNextPayload
+{
+    public static WizardNextStepAcknowledgement Acknowledge(string sessionId, string stepId) =>
+        new(sessionId, new WizardNextStepAnswer(stepId));
+}
diff --git a/src/OpenClaw.SetupEngine/WizardStepClassifier.cs b/src/OpenClaw.SetupEngine/WizardStepClassifier.cs
new file mode 100644
index 000000000..d1518989f
--- /dev/null
+++ b/src/OpenClaw.SetupEngine/WizardStepClassifier.cs
@@ -0,0 +1,60 @@
+namespace OpenClaw.SetupEngine;
+
+/// <summary>How a gateway wizard step should be handled by the client.</summary>
+public enum WizardStepCategory
+{
+    /// <summary>Needs a concrete value (text) or a selected option (select/multiselect).</summary>
+    RequiresAnswer,
+
+    /// <summary>Yes/No acknowledgement with a safe default (confirm).</summary>
+    Confirm,
+
+    /// <summary>Informational acknowledgement-only step (note).</summary>
+    Acknowledge,
+
+    /// <summary>Non-interactive background/status step.</summary>
+    Progress,
+
+    /// <summary>Unrecognized or client-executed step with no answerable input.</summary>
+    NonInteractive,
+}
+
+/// <summary>Pure classification of gateway wizard step types.</summary>
+public static class WizardStepClassifier
+{
+    /// <summary>Step types that represent non-interactive background progress.</summary>
+    public static readonly IReadOnlySet<string> ProgressTypes =
+        new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "progress", "status", "working" };
+
+    public static bool IsProgress(string? stepType) =>
+        !string.IsNullOrWhiteSpace(stepType) && ProgressTypes.Contains(stepType.Trim());
+
+    /// <summary>Categorizes a step, preserving option-based prompts for unknown types.</summary>
+    public static WizardStepCategory Categorize(string? stepType, bool hasOptions)
+    {
+        var type = (stepType ?? string.Empty).Trim();
+
+        if (IsProgress(type))
+            return WizardStepCategory.Progress;
+
+        switch (type.ToLowerInvariant())
+        {
+            case "text":
+            case "select":
+            case "multiselect":
+                return WizardStepCategory.RequiresAnswer;
+            case "confirm":
+                return WizardStepCategory.Confirm;
+            case "note":
+                return WizardStepCategory.Acknowledge;
+        }
+
+        // Unknown types with options behave like choice prompts; input-less
+        // unknown types are treated as non-interactive protocol steps.
+        return hasOptions ? WizardStepCategory.RequiresAnswer : WizardStepCategory.NonInteractive;
+    }
+
+    /// <summary>True when the step advances without an answer payload.</summary>
+    public static bool ContinuesWithoutAnswer(WizardStepCategory category) =>
+        category is WizardStepCategory.Progress or WizardStepCategory.NonInteractive;
+}
diff --git a/src/OpenClaw.SetupEngine/WizardTimeouts.cs b/src/OpenClaw.SetupEngine/WizardTimeouts.cs
new file mode 100644
index 000000000..727020b78
--- /dev/null
+++ b/src/OpenClaw.SetupEngine/WizardTimeouts.cs
@@ -0,0 +1,105 @@
+namespace OpenClaw.SetupEngine;
+
+/// <summary>Selects the request timeout for a wizard step.</summary>
+public static class WizardTimeouts
+{
+    /// <summary>Default per-step wizard request timeout.</summary>
+    public const int DefaultTimeoutMs = 30_000;
+
+    /// <summary>Extended timeout for steps that wait on auth or external setup work.</summary>
+    public const int SlowStepTimeoutMs = 300_000;
+
+    /// <summary>Polling delay for gateway progress/status wizard steps.</summary>
+    public static readonly TimeSpan ProgressPollDelay = TimeSpan.FromSeconds(1);
+
+    /// <summary>Total progress/status updates before setup fails as stalled.</summary>
+    public const int MaxTotalProgressPolls = 1200;
+
+    /// <summary>Per-step progress/status budget; allow a single long install to consume the total budget.</summary>
+    public const int MaxProgressPollsPerStep = MaxTotalProgressPolls;
+
+    private static readonly string[] s_authHints =
+    {
+        "device", "authorize", "login", "sign in", "oauth",
+        "browser", "authenticate", "verification",
+    };
+
+    private static readonly string[] s_slowSetupHints =
+    {
+        "plugin", "install", "download", "teams",
+    };
+
+    /// <summary>
+    /// Auth and external setup steps get <see cref="SlowStepTimeoutMs"/>; ordinary
+    /// questions get <see cref="DefaultTimeoutMs"/>. Only selected option metadata
+    /// is considered so an unselected slow integration does not extend every choice.
+    /// </summary>
+    public static int ForStep(
+        string? title,
+        string? message,
+        string? stepId = null,
+        IReadOnlyCollection<WizardOptionValue>? selectedOptions = null)
+    {
+        var promptText = JoinText(title, message);
+        if (HasAnyHint(promptText, s_authHints))
+            return SlowStepTimeoutMs;
+
+        // With a choice step, only the submitted option proves which operation
+        // will run. This keeps "skip" and unrelated options on the short path.
+        var slowText = selectedOptions is null
+            ? JoinText(title, message, stepId)
+            : JoinOptionText(selectedOptions);
+        if (HasAnyHint(slowText, s_slowSetupHints))
+            return SlowStepTimeoutMs;
+
+        return DefaultTimeoutMs;
+    }
+
+    internal static int ForGatewayStep(
+        string? title,
+        string? message,
+        string? stepId,
+        string? stepType,
+        IReadOnlyList<WizardOptionValue> options,
+        string? answer = null)
+    {
+        var category = WizardStepClassifier.Categorize(stepType, options.Count > 0);
+        IReadOnlyCollection<WizardOptionValue>? selectedOptions =
+            category == WizardStepCategory.RequiresAnswer && options.Count > 0 ? [] : null;
+
+        if (selectedOptions is not null && !string.IsNullOrWhiteSpace(answer))
+        {
+            if (string.Equals(stepType, "multiselect", StringComparison.OrdinalIgnoreCase)
+                && WizardAnswerBuilder.TryResolveOptions(options, answer, out var multiselectOptions))
+            {
+                selectedOptions = multiselectOptions;
+            }
+            else if (!string.Equals(stepType, "multiselect", StringComparison.OrdinalIgnoreCase)
+                && WizardAnswerBuilder.TryFindOption(options, answer, out var selectedOption))
+            {
+                selectedOptions = [selectedOption];
+            }
+        }
+
+        return ForStep(title, message, stepId, selectedOptions);
+    }
+
+    private static string JoinOptionText(IEnumerable<WizardOptionValue> options)
+    {
+        var parts = new List<string?>();
+        foreach (var option in options)
+        {
+            parts.Add(option.Value);
+            parts.Add(option.Label);
+            parts.Add(option.Hint);
+        }
+
+        return JoinText(parts.ToArray());
+    }
+
+    private static string JoinText(params string?[] parts) =>
+        string.Join(' ', parts.Where(part => !string.IsNullOrWhiteSpace(part)));
+
+    private static bool HasAnyHint(string text, IEnumerable<string> hints) =>
+        hints.Any(hint => text.Contains(hint, StringComparison.OrdinalIgnoreCase));
+}
diff --git a/src/OpenClaw.SetupEngine/default-config.json b/src/OpenClaw.SetupEngine/default-config.json
index b5c38c028..1c375084f 100644
--- a/src/OpenClaw.SetupEngine/default-config.json
+++ b/src/OpenClaw.SetupEngine/default-config.json
@@ -127,5 +127,15 @@
   "Pairing": {
     // Max seconds to wait for pairing handshake
     "TimeoutSeconds": 60
+  },
+
+  // ─── Windows Node Context Injection ───
+  // Inject setup-owned guidance into the final OpenClaw runtime workspace AGENTS.md.
+  "WindowsNodeContext": {
+    "Enabled": true,
+    // Optional WSL workspace path override; null = let the pinned gateway CLI's baseline setup use its configured/default workspace.
+    "WorkspacePath": null,
+    // Seconds allowed for OpenClaw workspace seeding and AGENTS.md context injection.
+    "TimeoutSeconds": 180
   }
 }
diff --git a/src/OpenClaw.SetupPreview/App.xaml b/src/OpenClaw.SetupPreview/App.xaml
deleted file mode 100644
index b9ce62801..000000000
--- a/src/OpenClaw.SetupPreview/App.xaml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Application
-    x:Class="OpenClaw.SetupPreview.App"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:OpenClaw.SetupPreview">
-    <!--
-        Intentionally NO RequestedTheme: defaulting to "Default" makes
-        Application.Current.RequestedTheme reflect the Windows app-mode
-        color setting, which the V2 preview reads when ThemeMode=System.
-    -->
-    <Application.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </Application.Resources>
-</Application>
diff --git a/src/OpenClaw.SetupPreview/App.xaml.cs b/src/OpenClaw.SetupPreview/App.xaml.cs
deleted file mode 100644
index 0ac1398d9..000000000
--- a/src/OpenClaw.SetupPreview/App.xaml.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Microsoft.UI.Xaml;
-
-namespace OpenClaw.SetupPreview;
-
-/// <summary>
-/// Minimal WinUI 3 Application bootstrap for the standalone V2 setup preview.
-/// Constructs the single PreviewWindow and activates it. All capture-mode
-/// behaviour (env-var gated headless rendering + PNG export + exit) lives
-/// inside the window itself so this class stays trivially small.
-/// </summary>
-public partial class App : Application
-{
-    private PreviewWindow? _window;
-
-    public App()
-    {
-        InitializeComponent();
-    }
-
-    protected override void OnLaunched(LaunchActivatedEventArgs args)
-    {
-        _window = new PreviewWindow();
-        _window.Activate();
-    }
-}
diff --git a/src/OpenClaw.SetupPreview/OpenClaw.SetupPreview.csproj b/src/OpenClaw.SetupPreview/OpenClaw.SetupPreview.csproj
deleted file mode 100644
index 702f758fc..000000000
--- a/src/OpenClaw.SetupPreview/OpenClaw.SetupPreview.csproj
+++ /dev/null
@@ -1,58 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>net10.0-windows10.0.22621.0</TargetFramework>
-    <UseWinUI>true</UseWinUI>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <RootNamespace>OpenClaw.SetupPreview</RootNamespace>
-    <AssemblyName>OpenClaw.SetupPreview</AssemblyName>
-    <Platforms>x64;ARM64</Platforms>
-    <RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>
-    <WindowsPackageType>None</WindowsPackageType>
-    <WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
-    <ApplicationManifest>app.manifest</ApplicationManifest>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <!-- We provide our own static Main in Program.cs so we don't need
-         EnableMsixTooling / a Package.appxmanifest. -->
-    <DefineConstants>$(DefineConstants);DISABLE_XAML_GENERATED_MAIN</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(RuntimeIdentifier)' == '' and '$(Platform)' == 'x64'">
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(RuntimeIdentifier)' == '' and '$(Platform)' == 'ARM64'">
-    <RuntimeIdentifier>win-arm64</RuntimeIdentifier>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="$(MicrosoftWindowsAppSDKVersion)" />
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="$(MicrosoftWindowsSdkBuildToolsVersion)" />
-    <PackageReference Include="WinUIEx" Version="2.9.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\OpenClaw.Shared\OpenClaw.Shared.csproj" />
-    <ProjectReference Include="..\OpenClawTray.FunctionalUI\OpenClawTray.FunctionalUI.csproj" />
-  </ItemGroup>
-
-  <!-- Reuse the same Setup assets shipped in the Tray project so the preview
-       and the real onboarding window render from byte-identical PNG files. -->
-  <ItemGroup>
-    <Content Include="..\OpenClaw.Tray.WinUI\Assets\Setup\**\*" Link="Assets\Setup\%(RecursiveDir)%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-
-  <!-- Copy WebView2Loader.dll for the unpackaged exe (mirrors the Tray rule;
-       not strictly needed by the preview today, but keeps parity if any
-       FunctionalUI element later embeds a WebView2). -->
-  <Target Name="CopyWebView2Loader" AfterTargets="Build">
-    <PropertyGroup>
-      <IsArm64Build Condition="'$(Platform)' == 'ARM64' OR '$(RuntimeIdentifier)' == 'win-arm64' OR '$(PROCESSOR_ARCHITECTURE)' == 'ARM64'">true</IsArm64Build>
-      <WebView2LoaderSource Condition="'$(IsArm64Build)' == 'true'">$(OutputPath)runtimes\win-arm64\native\WebView2Loader.dll</WebView2LoaderSource>
-      <WebView2LoaderSource Condition="'$(WebView2LoaderSource)' == ''">$(OutputPath)runtimes\win-x64\native\WebView2Loader.dll</WebView2LoaderSource>
-    </PropertyGroup>
-    <Copy SourceFiles="$(WebView2LoaderSource)" DestinationFolder="$(OutputPath)" SkipUnchangedFiles="true" Condition="Exists('$(WebView2LoaderSource)')" />
-  </Target>
-
-</Project>
diff --git a/src/OpenClaw.SetupPreview/PreviewWindow.cs b/src/OpenClaw.SetupPreview/PreviewWindow.cs
deleted file mode 100644
index a535bf4ce..000000000
--- a/src/OpenClaw.SetupPreview/PreviewWindow.cs
+++ /dev/null
@@ -1,598 +0,0 @@
-using System.Globalization;
-using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.WindowsRuntime;
-using System.Threading.Tasks;
-using Microsoft.UI;
-using Microsoft.UI.Dispatching;
-using Microsoft.UI.Windowing;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Media.Imaging;
-using OpenClawTray.FunctionalUI;
-using OpenClawTray.FunctionalUI.Hosting;
-using OpenClawTray.Onboarding.V2;
-using Windows.Graphics.Imaging;
-using Windows.Storage.Streams;
-using WinUIEx;
-
-namespace OpenClaw.SetupPreview;
-
-/// <summary>
-/// Standalone preview window for the V2 onboarding redesign.
-///
-/// Two modes of operation, selected by env vars:
-///
-///  * Interactive (default): a normal window, intended for live design
-///    iteration. Future work in the fake-services todo wires up the F1
-///    debug overlay (start page, locale, scenarios, replay).
-///
-///  * Headless capture: when OPENCLAW_PREVIEW_CAPTURE=1, the window
-///    appears at the requested size, mounts the V2 tree against the
-///    requested page (OPENCLAW_PREVIEW_PAGE), waits for first composition
-///    plus a quiescent frame, captures the root grid via
-///    RenderTargetBitmap, writes the PNG to OPENCLAW_PREVIEW_CAPTURE_PATH,
-///    and exits with code 0. On failure the exit code is 1 and a JSON
-///    error file is written next to the requested PNG path. This is the
-///    same RenderTargetBitmap mechanism the existing OnboardingWindow uses
-///    for OPENCLAW_VISUAL_TEST=1, factored to fit a one-shot exe.
-///
-/// The window is intentionally fixed-size so that the captured PNG always
-/// has the same pixel dimensions for a given DPI — the visual-diff tool
-/// relies on this stability.
-/// </summary>
-internal sealed class PreviewWindow : WindowEx
-{
-    /// <summary>
-    /// Logical preview window size in DIPs. Picked to closely match the
-    /// designer mocks (which are exported at 2010×2472; aspect 0.813).
-    /// 720 × 885 → aspect 0.813, identical to the design canvas, so the
-    /// rendered PNG can be diffed pixel-for-pixel against the references.
-    /// </summary>
-    private const int PreviewWidthDip = 720;
-    private const int PreviewHeightDip = 885;
-
-    /// <summary>Height in DIPs of the custom XAML title bar (lobster + "OpenClaw Setup").</summary>
-    private const int TitleBarHeight = 40;
-
-    private readonly Grid _rootGrid;
-    private readonly FunctionalHostControl _host;
-    private readonly OnboardingV2State _state;
-    private readonly DispatcherQueue _dispatcherQueue;
-
-    // Capture-mode configuration.
-    private readonly bool _captureMode;
-    private readonly string? _capturePath;
-    private bool _captureCompleted;
-
-    // Theme-aware chrome elements (mutated by ApplyTheme when the user / system theme changes).
-    private Grid? _titleBar;
-    private TextBlock? _titleText;
-
-    // System-theme tracking. Stored as fields (not locals) so the
-    // ColorValuesChanged subscription can be unhooked on window close —
-    // otherwise the COM event holds a strong reference to the lambda
-    // (and via it the window), preventing GC.
-    private Windows.UI.ViewManagement.UISettings? _themeUiSettings;
-    private Windows.Foundation.TypedEventHandler<Windows.UI.ViewManagement.UISettings, object>? _themeColorValuesChangedHandler;
-
-    public PreviewWindow()
-    {
-        _dispatcherQueue = DispatcherQueue.GetForCurrentThread();
-        _state = new OnboardingV2State();
-
-        // Non-functional preview defaults: show the Node-Mode-Active warning
-        // on the All Set page (the design's default state). Env vars below
-        // can override this for capture scenarios that test the no-node variant.
-        _state.NodeModeActive = true;
-
-        ApplyEnvOverrides(_state);
-        _captureMode = Environment.GetEnvironmentVariable("OPENCLAW_PREVIEW_CAPTURE") == "1";
-        _capturePath = Environment.GetEnvironmentVariable("OPENCLAW_PREVIEW_CAPTURE_PATH");
-
-        // In headless capture mode, suppress all V2 entrance/idle animations
-        // so RenderTargetBitmap never snapshots an in-flight transform.
-        OpenClawTray.Onboarding.V2.V2Animations.DisableForCapture = _captureMode;
-
-        Title = "OpenClaw Setup";
-        ExtendsContentIntoTitleBar = true;
-
-        // Use a flat dark background that matches the designer mocks
-        // (#202020) instead of MicaBackdrop. RenderTargetBitmap does not
-        // see Mica composition (it lives below the XAML layer), so the
-        // captures would otherwise show transparent/black behind the UI.
-        // A solid color guarantees byte-identical captures across runs.
-        SystemBackdrop = null;
-
-        this.SetWindowSize(PreviewWidthDip, PreviewHeightDip);
-        this.CenterOnScreen();
-        if (AppWindow.Presenter is OverlappedPresenter presenter)
-        {
-            presenter.IsResizable = false;
-            presenter.IsMaximizable = false;
-        }
-
-        // Force Windows 11 rounded corners on the window. Setting
-        // SystemBackdrop = null above unhooks the default Mica path that
-        // normally rounds the frame, leaving square corners. DWM's
-        // WINDOW_CORNER_PREFERENCE attribute (Windows 11 build 22000+)
-        // restores the rounded look without bringing back the Mica fill.
-        TryApplyRoundedCorners();
-
-        // Make the system min/max/close buttons follow the current theme below;
-        // the actual button colours are applied in ApplyTheme().
-
-        _host = new FunctionalHostControl();
-        _host.Mount(ctx =>
-        {
-            var (s, _) = ctx.UseState(_state);
-            return Factories.Component<OnboardingV2App, OnboardingV2State>(s);
-        });
-
-        _rootGrid = new Grid
-        {
-            Background = V2Theme.WindowBackground(_state.EffectiveTheme)
-        };
-        _rootGrid.RowDefinitions.Add(new RowDefinition { Height = new GridLength(TitleBarHeight) });
-        _rootGrid.RowDefinitions.Add(new RowDefinition { Height = new GridLength(1, GridUnitType.Star) });
-
-        // Custom title bar: small lobster icon + "OpenClaw Setup"
-        // text. Reserve the right-hand inset for the system caption
-        // buttons. AppWindow.TitleBar.RightInset is in physical pixels;
-        // convert to DIPs using XamlRoot.RasterizationScale (set after
-        // the host has loaded). Fall back to a sensible default at 100%
-        // DPI (~138 DIP) until the first SizeChanged.
-        _titleBar = new Grid { Padding = new Thickness(14, 0, 138, 0) };
-        Microsoft.UI.Xaml.Automation.AutomationProperties.SetName(_titleBar, "OpenClaw Setup title bar");
-
-        var titleBar = _titleBar;
-        void UpdateTitleBarPadding()
-        {
-            try
-            {
-                var rightInsetPx = AppWindow?.TitleBar?.RightInset ?? 0;
-                var scale = _host?.XamlRoot?.RasterizationScale ?? 1.0;
-                if (scale <= 0) scale = 1.0;
-                var rightInsetDip = rightInsetPx > 0 ? rightInsetPx / scale : 138;
-                titleBar.Padding = new Thickness(14, 0, rightInsetDip, 0);
-            }
-            // slopwatch-ignore: SW003 Audited non-critical fallback is intentional and the caller preserves safe behavior without this work.
-            catch
-            {
-                // Non-fatal: leave the fallback padding.
-            }
-        }
-        AppWindow.Changed += (_, _) => UpdateTitleBarPadding();
-        var lobster = new Image
-        {
-            Source = new BitmapImage(new Uri("ms-appx:///Assets/Setup/Lobster.png")),
-            Width = 14,
-            Height = 14,
-            VerticalAlignment = VerticalAlignment.Center,
-            Margin = new Thickness(0, 0, 8, 0),
-            Stretch = Stretch.Uniform
-        };
-        Microsoft.UI.Xaml.Automation.AutomationProperties.SetName(lobster, "OpenClaw");
-        _titleText = new TextBlock
-        {
-            Text = Title,
-            FontSize = 12,
-            VerticalAlignment = VerticalAlignment.Center,
-        };
-        Microsoft.UI.Xaml.Automation.AutomationProperties.SetName(_titleText, "OpenClaw Setup");
-        var titleStack = new StackPanel { Orientation = Orientation.Horizontal };
-        titleStack.Children.Add(lobster);
-        titleStack.Children.Add(_titleText);
-        _titleBar.Children.Add(titleStack);
-        Grid.SetRow(_titleBar, 0);
-        _rootGrid.Children.Add(_titleBar);
-        SetTitleBar(_titleBar);
-
-        Grid.SetRow(_host, 1);
-        _rootGrid.Children.Add(_host);
-        Content = _rootGrid;
-
-        _host.Loaded += (_, _) => UpdateTitleBarPadding();
-
-        // Wire theme resolution and re-application. The state's ThemeMode
-        // (System / Light / Dark) is the user's preference; EffectiveTheme
-        // is what the V2 pages actually render against. ApplyResolvedTheme
-        // reads the preference, picks Light or Dark (System => follow the
-        // host Application.RequestedTheme), and pushes the result back
-        // onto the state + the chrome.
-        ApplyResolvedTheme();
-        if (Application.Current is { } app)
-        {
-            // No app-level RequestedTheme change event is reliably surfaced
-            // in unpackaged WinUI 3 apps, but UISettings raises ColorValuesChanged
-            // when Windows app-mode flips. Forward it.
-            //
-            // Both the UISettings instance and the handler delegate are
-            // stored as fields so we can unhook in Closed — without this,
-            // the COM event keeps a strong reference to the lambda (and
-            // via it, this window), preventing GC of the window when it
-            // closes.
-            try
-            {
-                _themeUiSettings = new Windows.UI.ViewManagement.UISettings();
-                _themeColorValuesChangedHandler = (_, _) =>
-                    _dispatcherQueue.TryEnqueue(() => ApplyResolvedTheme());
-                _themeUiSettings.ColorValuesChanged += _themeColorValuesChangedHandler;
-            }
-            // slopwatch-ignore: SW003 Cleanup is best-effort; failure cannot improve caller state and the original outcome is preserved.
-            catch { /* non-fatal */ }
-        }
-
-        Closed += (_, _) =>
-        {
-            if (_themeUiSettings is not null && _themeColorValuesChangedHandler is not null)
-            {
-                try { _themeUiSettings.ColorValuesChanged -= _themeColorValuesChangedHandler; }
-                // slopwatch-ignore: SW003 Optional persisted state fallback is intentional; caller continues with defaults or prior state.
-                catch { /* ignore */ }
-            }
-            _themeColorValuesChangedHandler = null;
-            _themeUiSettings = null;
-        };
-
-        // F2 cycles theme mode (System -> Light -> Dark -> System) for live design feedback.
-        // Only honoured in interactive mode; capture mode never sees keyboard input.
-        if (!_captureMode)
-        {
-            _host.KeyDown += (_, e) =>
-            {
-                if (e.Key == Windows.System.VirtualKey.F2)
-                {
-                    _state.ThemeMode = (V2ThemeMode)(((int)_state.ThemeMode + 1) % 3);
-                    ApplyResolvedTheme();
-                    e.Handled = true;
-                }
-            };
-        }
-
-        if (_captureMode)
-        {
-            _host.Loaded += async (_, _) =>
-            {
-                await CaptureAndExitAsync();
-            };
-        }
-        else
-        {
-            // Interactive preview: drive a fake stage progression so designers
-            // can walk through the LocalSetupProgress checklist without a real
-            // gateway install. Skipped if a frozen / failed stage env override
-            // is set (those are deterministic capture scenarios).
-            var hasFrozen = !string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("OPENCLAW_PREVIEW_PROGRESS_FROZEN_STAGE"));
-            var hasFail = !string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("OPENCLAW_PREVIEW_FAIL_STAGE"));
-            if (!hasFrozen && !hasFail)
-            {
-                _host.Loaded += (_, _) => StartFakeStageProgression();
-            }
-        }
-    }
-
-    /// <summary>
-    /// Resolves <see cref="OnboardingV2State.ThemeMode"/> to a concrete
-    /// <see cref="ElementTheme"/> and pushes it onto state + chrome.
-    /// Called on startup, on F2 cycle, and on Windows app-mode change.
-    /// </summary>
-    private void ApplyResolvedTheme()
-    {
-        var resolved = ResolveEffectiveTheme(_state.ThemeMode);
-        _state.EffectiveTheme = resolved;
-
-        // Window background — V2 pages re-render through StateChanged, but the
-        // root Grid background is owned here so update it directly too.
-        _rootGrid.Background = V2Theme.WindowBackground(resolved);
-
-        // Push the same theme into the visual tree so WinUI's built-in controls
-        // (ToggleSwitch thumb, ProgressRing, focus visuals) pick up matching defaults.
-        _rootGrid.RequestedTheme = resolved;
-
-        if (_titleText is not null)
-        {
-            _titleText.Foreground = V2Theme.TextPrimary(resolved);
-        }
-
-        if (AppWindow?.TitleBar is { } systemTitleBar)
-        {
-            // The system caption buttons (min/max/close) live above our XAML
-            // and need their colours set explicitly. Match the window bg so
-            // they blend into the chrome rather than showing a dark bar above
-            // a light window (or vice versa).
-            var bg = ((SolidColorBrush)V2Theme.WindowBackground(resolved)).Color;
-            var hover = ((SolidColorBrush)V2Theme.CardBackground(resolved)).Color;
-            var pressed = ((SolidColorBrush)V2Theme.CardBackgroundPressed(resolved)).Color;
-            var fg = ((SolidColorBrush)V2Theme.TextPrimary(resolved)).Color;
-            var inactiveFg = ((SolidColorBrush)V2Theme.TextSubtle(resolved)).Color;
-            systemTitleBar.ButtonBackgroundColor = bg;
-            systemTitleBar.ButtonInactiveBackgroundColor = bg;
-            systemTitleBar.ButtonForegroundColor = fg;
-            systemTitleBar.ButtonInactiveForegroundColor = inactiveFg;
-            systemTitleBar.ButtonHoverBackgroundColor = hover;
-            systemTitleBar.ButtonHoverForegroundColor = fg;
-            systemTitleBar.ButtonPressedBackgroundColor = pressed;
-            systemTitleBar.ButtonPressedForegroundColor = fg;
-        }
-    }
-
-    /// <summary>
-    /// Resolves a user theme preference to a concrete <see cref="ElementTheme"/>.
-    /// <see cref="V2ThemeMode.System"/> uses <see cref="V2SystemTheme.IsDark"/>
-    /// (UISettings-based) since <see cref="Application.RequestedTheme"/>
-    /// returns Light on unpackaged WinUI 3 apps regardless of system setting.
-    /// </summary>
-    private static ElementTheme ResolveEffectiveTheme(V2ThemeMode mode) => V2SystemTheme.Resolve(mode);
-
-    /// <summary>
-    /// Apply Windows 11 rounded-corner preference via DWM. No-op (and silent)
-    /// on Windows 10 — the attribute simply isn't recognised.
-    /// </summary>
-    private void TryApplyRoundedCorners()
-    {
-        try
-        {
-            var hwnd = WinRT.Interop.WindowNative.GetWindowHandle(this);
-            int pref = DWMWCP_ROUND;
-            _ = DwmSetWindowAttribute(hwnd, DWMWA_WINDOW_CORNER_PREFERENCE, ref pref, sizeof(int));
-        }
-        // slopwatch-ignore: SW003 UI helper action is best-effort and failure should not break the owning UI flow.
-        catch
-        {
-            // Non-fatal: square corners are an acceptable fallback.
-        }
-    }
-
-    private const int DWMWA_WINDOW_CORNER_PREFERENCE = 33;
-    private const int DWMWCP_ROUND = 2;
-
-    [DllImport("dwmapi.dll", PreserveSig = true)]
-    private static extern int DwmSetWindowAttribute(IntPtr hwnd, int attribute, ref int pvAttribute, int cbAttribute);
-
-    private DispatcherQueueTimer? _fakeStageTimer;
-
-    /// <summary>
-    /// Walk the LocalSetupProgress checklist by promoting one row at a time:
-    /// the current spinner row turns into a checkmark, then the next idle
-    /// row spins. Loops at the end so a designer can keep watching without
-    /// restarting the app. ~900 ms per transition feels close to a real WSL
-    /// install but fast enough for design feedback.
-    /// </summary>
-    private void StartFakeStageProgression()
-    {
-        if (_fakeStageTimer is not null) return;
-
-        // Seed: first stage spinning, the rest idle.
-        var stages = Enum.GetValues<OnboardingV2State.LocalSetupStage>();
-        var seed = new Dictionary<OnboardingV2State.LocalSetupStage, OnboardingV2State.LocalSetupRowState>();
-        for (int i = 0; i < stages.Length; i++)
-        {
-            seed[stages[i]] = i == 0
-                ? OnboardingV2State.LocalSetupRowState.Running
-                : OnboardingV2State.LocalSetupRowState.Idle;
-        }
-        _state.LocalSetupRows = seed;
-
-        _fakeStageTimer = _dispatcherQueue.CreateTimer();
-        _fakeStageTimer.Interval = TimeSpan.FromMilliseconds(900);
-        _fakeStageTimer.IsRepeating = true;
-        _fakeStageTimer.Tick += (_, _) => AdvanceFakeStage();
-        _fakeStageTimer.Start();
-    }
-
-    private void AdvanceFakeStage()
-    {
-        var stages = Enum.GetValues<OnboardingV2State.LocalSetupStage>();
-        var rows = new Dictionary<OnboardingV2State.LocalSetupStage, OnboardingV2State.LocalSetupRowState>(_state.LocalSetupRows);
-
-        // Find the currently-running row (if any) and promote it to Done; then
-        // start the next idle row spinning. If there's no idle row left, loop
-        // by resetting back to "stage 0 spinning, rest idle" after a brief pause.
-        int runningIndex = -1;
-        for (int i = 0; i < stages.Length; i++)
-        {
-            if (rows[stages[i]] == OnboardingV2State.LocalSetupRowState.Running)
-            {
-                runningIndex = i;
-                break;
-            }
-        }
-
-        if (runningIndex == -1)
-        {
-            // Loop back to the start so the demo keeps going.
-            for (int i = 0; i < stages.Length; i++)
-            {
-                rows[stages[i]] = i == 0
-                    ? OnboardingV2State.LocalSetupRowState.Running
-                    : OnboardingV2State.LocalSetupRowState.Idle;
-            }
-            _state.LocalSetupRows = rows;
-            return;
-        }
-
-        rows[stages[runningIndex]] = OnboardingV2State.LocalSetupRowState.Done;
-        var nextIndex = runningIndex + 1;
-        if (nextIndex < stages.Length)
-        {
-            rows[stages[nextIndex]] = OnboardingV2State.LocalSetupRowState.Running;
-        }
-        _state.LocalSetupRows = rows;
-    }
-
-    private static void ApplyEnvOverrides(OnboardingV2State state)
-    {
-        var page = Environment.GetEnvironmentVariable("OPENCLAW_PREVIEW_PAGE");
-        if (!string.IsNullOrWhiteSpace(page) &&
-            Enum.TryParse<V2Route>(page, ignoreCase: true, out var route))
-        {
-            state.CurrentRoute = route;
-        }
-
-        var theme = Environment.GetEnvironmentVariable("OPENCLAW_PREVIEW_THEME");
-        if (!string.IsNullOrWhiteSpace(theme) &&
-            Enum.TryParse<V2ThemeMode>(theme, ignoreCase: true, out var mode))
-        {
-            state.ThemeMode = mode;
-        }
-
-        var nodeMode = Environment.GetEnvironmentVariable("OPENCLAW_PREVIEW_NODE_MODE");
-        if (!string.IsNullOrWhiteSpace(nodeMode))
-        {
-            state.NodeModeActive =
-                nodeMode.Equals("1", StringComparison.OrdinalIgnoreCase) ||
-                nodeMode.Equals("true", StringComparison.OrdinalIgnoreCase);
-        }
-
-        var existingGateway = Environment.GetEnvironmentVariable("OPENCLAW_PREVIEW_EXISTING_GATEWAY_KIND");
-        if (!string.IsNullOrWhiteSpace(existingGateway) &&
-            Enum.TryParse<OnboardingV2State.ExistingGatewayKind>(existingGateway, ignoreCase: true, out var gatewayKind))
-        {
-            state.ExistingGateway = gatewayKind;
-        }
-
-        // OPENCLAW_PREVIEW_PROGRESS_FROZEN_STAGE freezes the LocalSetupProgress
-        // page on a specific stage: every stage strictly before this one is
-        // marked Done, the named stage is Running (spinner), and every stage
-        // strictly after is Idle.
-        //
-        // OPENCLAW_PREVIEW_FAIL_STAGE additionally marks the named stage as
-        // Failed (overrides the Running marking) and populates
-        // LocalSetupErrorMessage so the inline error card renders.
-        var frozen = Environment.GetEnvironmentVariable("OPENCLAW_PREVIEW_PROGRESS_FROZEN_STAGE");
-        var failStage = Environment.GetEnvironmentVariable("OPENCLAW_PREVIEW_FAIL_STAGE");
-
-        if (!string.IsNullOrWhiteSpace(frozen) &&
-            Enum.TryParse<OnboardingV2State.LocalSetupStage>(frozen, ignoreCase: true, out var frozenStage))
-        {
-            var rows = new Dictionary<OnboardingV2State.LocalSetupStage, OnboardingV2State.LocalSetupRowState>();
-            foreach (var stage in Enum.GetValues<OnboardingV2State.LocalSetupStage>())
-            {
-                if (stage < frozenStage)
-                {
-                    rows[stage] = OnboardingV2State.LocalSetupRowState.Done;
-                }
-                else if (stage == frozenStage)
-                {
-                    rows[stage] = OnboardingV2State.LocalSetupRowState.Running;
-                }
-                else
-                {
-                    rows[stage] = OnboardingV2State.LocalSetupRowState.Idle;
-                }
-            }
-            state.LocalSetupRows = rows;
-        }
-
-        if (!string.IsNullOrWhiteSpace(failStage) &&
-            Enum.TryParse<OnboardingV2State.LocalSetupStage>(failStage, ignoreCase: true, out var fStage))
-        {
-            var rows = new Dictionary<OnboardingV2State.LocalSetupStage, OnboardingV2State.LocalSetupRowState>(state.LocalSetupRows);
-            // Mark every stage strictly before the failed one Done (in case
-            // the frozen stage env var was unset or set to the same stage).
-            foreach (var stage in Enum.GetValues<OnboardingV2State.LocalSetupStage>())
-            {
-                if (stage < fStage) rows[stage] = OnboardingV2State.LocalSetupRowState.Done;
-                else if (stage == fStage) rows[stage] = OnboardingV2State.LocalSetupRowState.Failed;
-                else rows[stage] = OnboardingV2State.LocalSetupRowState.Idle;
-            }
-            state.LocalSetupRows = rows;
-            state.LocalSetupErrorMessage =
-                "The OpenClaw gateway service started, but did not report ready status. Follow aka.ms/wsllogs for WSL diagnostic collection instructions.";
-        }
-    }
-
-    private async Task CaptureAndExitAsync()
-    {
-        if (_captureCompleted) return;
-        _captureCompleted = true;
-
-        try
-        {
-            // Two layout passes + a short delay so any first-render UseEffect
-            // mutations have time to land before we snapshot.
-            await Task.Yield();
-            await Task.Delay(250);
-
-            // Clear keyboard focus so the system focus visual (cyan ring)
-            // doesn't leak into deterministic captures. Re-enabling
-            // UseSystemFocusVisuals on V2 buttons (a11y improvement) means
-            // the first focusable in tab order would otherwise carry an
-            // initial focus ring. Park focus on a hidden, zero-size sentinel
-            // and let it settle for one more frame.
-            var sentinel = new ContentControl
-            {
-                IsTabStop = true,
-                Width = 0,
-                Height = 0,
-                Opacity = 0,
-                IsHitTestVisible = false,
-            };
-            _rootGrid.Children.Add(sentinel);
-            sentinel.Focus(FocusState.Programmatic);
-            await Task.Delay(50);
-
-            var rtb = new RenderTargetBitmap();
-            await rtb.RenderAsync(_rootGrid);
-            var pixels = await rtb.GetPixelsAsync();
-            var pixelBytes = pixels.ToArray();
-
-            _rootGrid.Children.Remove(sentinel);
-
-            using var stream = new InMemoryRandomAccessStream();
-            var encoder = await BitmapEncoder.CreateAsync(BitmapEncoder.PngEncoderId, stream);
-            encoder.SetPixelData(
-                BitmapPixelFormat.Bgra8,
-                BitmapAlphaMode.Premultiplied,
-                (uint)rtb.PixelWidth,
-                (uint)rtb.PixelHeight,
-                96, 96,
-                pixelBytes);
-            await encoder.FlushAsync();
-
-            stream.Seek(0);
-            var reader = new DataReader(stream);
-            await reader.LoadAsync((uint)stream.Size);
-            var bytes = new byte[stream.Size];
-            reader.ReadBytes(bytes);
-
-            var path = !string.IsNullOrWhiteSpace(_capturePath)
-                ? _capturePath
-                : Path.Combine(Path.GetTempPath(), "openclaw-preview-capture.png");
-            Directory.CreateDirectory(Path.GetDirectoryName(path)!);
-            await File.WriteAllBytesAsync(path, bytes);
-
-            Console.Out.WriteLine($"[preview] captured {rtb.PixelWidth}x{rtb.PixelHeight} -> {path}");
-            ExitWithCode(0);
-        }
-        catch (Exception ex)
-        {
-            try
-            {
-                var errPath = (_capturePath ?? Path.Combine(Path.GetTempPath(), "openclaw-preview-capture.png")) + ".error.json";
-                Directory.CreateDirectory(Path.GetDirectoryName(errPath)!);
-                var json = $"{{\"error\":{System.Text.Json.JsonSerializer.Serialize(ex.Message)},\"type\":{System.Text.Json.JsonSerializer.Serialize(ex.GetType().FullName ?? "")}}}";
-                File.WriteAllText(errPath, json);
-            }
-            // slopwatch-ignore: SW003 Diagnostic logging fallback is best-effort and logging failure must not cascade.
-            catch { /* best effort */ }
-            Console.Error.WriteLine($"[preview] capture failed: {ex}");
-            ExitWithCode(1);
-        }
-    }
-
-    private void ExitWithCode(int code)
-    {
-        // WinUI doesn't expose a clean Application.Exit(int) — the Win32
-        // ExitProcess avoids racing with the dispatcher loop teardown that
-        // a managed Application.Exit() can leave hanging.
-        // slopwatch-ignore: SW003 Cleanup is best-effort; failure cannot improve caller state and the original outcome is preserved.
-        try { Close(); } catch { /* ignore */ }
-        ExitProcess((uint)code);
-    }
-
-    [DllImport("kernel32.dll", SetLastError = true)]
-    private static extern void ExitProcess(uint uExitCode);
-
-}
diff --git a/src/OpenClaw.SetupPreview/Program.cs b/src/OpenClaw.SetupPreview/Program.cs
deleted file mode 100644
index 29a74a282..000000000
--- a/src/OpenClaw.SetupPreview/Program.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using System.Threading;
-using Microsoft.UI.Dispatching;
-using Microsoft.UI.Xaml;
-
-namespace OpenClaw.SetupPreview;
-
-/// <summary>
-/// Explicit entry point for the unpackaged WinUI 3 preview exe.
-///
-/// Mirrors the pattern auto-generated by EnableMsixTooling=true in MSIX
-/// builds, but without requiring a Package.appxmanifest. Initializes COM
-/// wrappers, installs a DispatcherQueue-backed SynchronizationContext on
-/// the UI thread, then starts the WinUI Application loop with our App.
-/// </summary>
-internal static class Program
-{
-    [STAThread]
-    private static int Main(string[] args)
-    {
-        WinRT.ComWrappersSupport.InitializeComWrappers();
-        Application.Start(p =>
-        {
-            var dispatcher = DispatcherQueue.GetForCurrentThread();
-            var context = new DispatcherQueueSynchronizationContext(dispatcher);
-            SynchronizationContext.SetSynchronizationContext(context);
-            _ = new App();
-        });
-        return 0;
-    }
-}
diff --git a/src/OpenClaw.SetupPreview/Properties/launchSettings.json b/src/OpenClaw.SetupPreview/Properties/launchSettings.json
deleted file mode 100644
index de193eeb0..000000000
--- a/src/OpenClaw.SetupPreview/Properties/launchSettings.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "profiles": {
-    "OpenClaw.SetupPreview": {
-      "commandName": "Project",
-      "nativeDebugging": false
-    },
-    "Capture-Welcome": {
-      "commandName": "Project",
-      "environmentVariables": {
-        "OPENCLAW_PREVIEW_CAPTURE": "1",
-        "OPENCLAW_PREVIEW_PAGE": "Welcome",
-        "OPENCLAW_PREVIEW_CAPTURE_PATH": "$(MSBuildProjectDirectory)\\..\\..\\out\\v2-visual\\welcome\\actual.png"
-      }
-    }
-  }
-}
diff --git a/src/OpenClaw.SetupPreview/app.manifest b/src/OpenClaw.SetupPreview/app.manifest
deleted file mode 100644
index ebb1a314b..000000000
--- a/src/OpenClaw.SetupPreview/app.manifest
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.0.0.0" name="OpenClaw.SetupPreview"/>
-  <application xmlns="urn:schemas-microsoft-com:asm.v3">
-    <windowsSettings>
-      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/pm</dpiAware>
-      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
-    </windowsSettings>
-  </application>
-  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-    <application>
-      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
-    </application>
-  </compatibility>
-</assembly>
diff --git a/src/OpenClaw.Shared/Audio/PiperVoiceManager.cs b/src/OpenClaw.Shared/Audio/PiperVoiceManager.cs
index c24031a6d..d0de04b7c 100644
--- a/src/OpenClaw.Shared/Audio/PiperVoiceManager.cs
+++ b/src/OpenClaw.Shared/Audio/PiperVoiceManager.cs
@@ -27,9 +27,9 @@ namespace OpenClaw.Shared.Audio;
 ///
 /// Each voice is ~50 MB compressed, ~80 MB extracted (with espeak data).
 ///
-/// **TODO (pre-GA):** SHA-256 verification of downloaded tarballs before
-/// extraction (Audio_FollowUps.md §2). The current implementation trusts
-/// HTTPS + the system trust chain only.
+/// **Integrity:** downloaded tarballs are SHA-256-verified against the pinned
+/// hash in <see cref="AvailableVoices"/> before extraction; a mismatch is a
+/// hard failure and the partial file is deleted (see Audio_FollowUps.md §2).
 /// </summary>
 public sealed class PiperVoiceManager
 {
diff --git a/src/OpenClaw.Shared/Capabilities/AppCapability.cs b/src/OpenClaw.Shared/Capabilities/AppCapability.cs
index d135dc474..5faac7ccc 100644
--- a/src/OpenClaw.Shared/Capabilities/AppCapability.cs
+++ b/src/OpenClaw.Shared/Capabilities/AppCapability.cs
@@ -26,6 +26,11 @@ public class AppCapability : NodeCapabilityBase
         "app.menu",
         "app.search",
         "app.dashboard.url",
+        "app.chat.snapshot",
+        "app.chat.send",
+        "app.chat.reset",
+        "app.chat.queue.list",
+        "app.chat.queue.cancel",
     };
 
     public override IReadOnlyList<string> Commands => _commands;
@@ -42,6 +47,11 @@ public class AppCapability : NodeCapabilityBase
     public Func<object?>? MenuHandler;
     public Func<string, object?>? SearchHandler;
     public Func<string?, object?>? DashboardUrlHandler;
+    public Func<string?, Task<object?>>? ChatSnapshotHandler;
+    public Func<string?, string, Task<object?>>? ChatSendHandler;
+    public Func<string?, Task<object?>>? ChatResetHandler;
+    public Func<string?, Task<object?>>? ChatQueueListHandler;
+    public Func<string?, string, Task<object?>>? ChatQueueCancelHandler;
 
     public AppCapability(IOpenClawLogger logger) : base(logger) { }
 
@@ -60,6 +70,11 @@ public override async Task<NodeInvokeResponse> ExecuteAsync(NodeInvokeRequest re
             "app.menu" => HandleMenu(),
             "app.search" => HandleSearch(request),
             "app.dashboard.url" => HandleDashboardUrl(request),
+            "app.chat.snapshot" => await HandleChatSnapshot(request),
+            "app.chat.send" => await HandleChatSend(request),
+            "app.chat.reset" => await HandleChatReset(request),
+            "app.chat.queue.list" => await HandleChatQueueList(request),
+            "app.chat.queue.cancel" => await HandleChatQueueCancel(request),
             _ => Error($"Unknown command: {request.Command}")
         };
     }
@@ -135,7 +150,34 @@ private NodeInvokeResponse HandleSettingsSet(NodeInvokeRequest request)
             return Error("Missing required arg: value");
         if (SettingsSetHandler == null)
             return Error("Settings handler not registered");
-        return Success(SettingsSetHandler(name, value));
+
+        var result = SettingsSetHandler(name, value);
+        if (TryGetErrorPayload(result, out var error))
+            return Error(error);
+
+        return Success(result);
+    }
+
+    private static bool TryGetErrorPayload(object? result, out string error)
+    {
+        error = "";
+        if (result == null)
+            return false;
+
+        var property = result.GetType().GetProperty(
+            "error",
+            System.Reflection.BindingFlags.Instance |
+            System.Reflection.BindingFlags.Public |
+            System.Reflection.BindingFlags.IgnoreCase);
+
+        if (property?.GetValue(result) is not string message ||
+            string.IsNullOrWhiteSpace(message))
+        {
+            return false;
+        }
+
+        error = message;
+        return true;
     }
 
     private NodeInvokeResponse HandleMenu()
@@ -161,4 +203,65 @@ private NodeInvokeResponse HandleDashboardUrl(NodeInvokeRequest request)
             return Error("Dashboard URL handler not registered");
         return Success(DashboardUrlHandler(GetStringArg(request.Args, "path")));
     }
+
+    private async Task<NodeInvokeResponse> HandleChatSnapshot(NodeInvokeRequest request)
+    {
+        if (ChatSnapshotHandler == null)
+            return Error("Chat snapshot handler not registered");
+
+        var result = await ChatSnapshotHandler(GetThreadIdOrSessionKeyArg(request));
+        return Success(result);
+    }
+
+    private async Task<NodeInvokeResponse> HandleChatSend(NodeInvokeRequest request)
+    {
+        if (ChatSendHandler == null)
+            return Error("Chat send handler not registered");
+
+        var message = GetStringArg(request.Args, "message");
+        if (string.IsNullOrWhiteSpace(message))
+            return Error("Missing required arg: message");
+
+        var result = await ChatSendHandler(GetThreadIdOrSessionKeyArg(request), message);
+        return Success(result);
+    }
+
+    private async Task<NodeInvokeResponse> HandleChatReset(NodeInvokeRequest request)
+    {
+        if (ChatResetHandler == null)
+            return Error("Chat reset handler not registered");
+
+        var result = await ChatResetHandler(GetThreadIdOrSessionKeyArg(request));
+        return Success(result);
+    }
+
+    private async Task<NodeInvokeResponse> HandleChatQueueList(NodeInvokeRequest request)
+    {
+        if (ChatQueueListHandler == null)
+            return Error("Chat queue list handler not registered");
+
+        var result = await ChatQueueListHandler(GetThreadIdOrSessionKeyArg(request));
+        return Success(result);
+    }
+
+    private async Task<NodeInvokeResponse> HandleChatQueueCancel(NodeInvokeRequest request)
+    {
+        if (ChatQueueCancelHandler == null)
+            return Error("Chat queue cancel handler not registered");
+
+        var queuedMessageId = GetStringArg(request.Args, "queuedMessageId");
+        if (string.IsNullOrWhiteSpace(queuedMessageId))
+            return Error("Missing required arg: queuedMessageId");
+
+        var threadId = GetThreadIdOrSessionKeyArg(request);
+        if (string.IsNullOrWhiteSpace(threadId))
+            return Error("Missing required arg: threadId");
+
+        var result = await ChatQueueCancelHandler(threadId, queuedMessageId);
+        return Success(result);
+    }
+
+    private string? GetThreadIdOrSessionKeyArg(NodeInvokeRequest request) =>
+        GetStringArg(request.Args, "threadId")
+        ?? GetStringArg(request.Args, "sessionKey");
 }
diff --git a/src/OpenClaw.Shared/Capabilities/CanvasCapability.cs b/src/OpenClaw.Shared/Capabilities/CanvasCapability.cs
index d98cac7fa..38e3cd753 100644
--- a/src/OpenClaw.Shared/Capabilities/CanvasCapability.cs
+++ b/src/OpenClaw.Shared/Capabilities/CanvasCapability.cs
@@ -212,6 +212,10 @@ private async Task<NodeInvokeResponse> HandleNavigateAsync(NodeInvokeRequest req
             // opener is the subscriber's word for how it serviced the request:
             // "canvas" (existing WebView2 frame), "browser" (default browser),
             // or anything else the subscriber wants to surface back to the agent.
+            if (string.Equals(opener, "denied", StringComparison.OrdinalIgnoreCase) ||
+                string.Equals(opener, "unsupported_in_canvas", StringComparison.OrdinalIgnoreCase))
+                return Success(new { navigated = false, opener, url = canonical });
+
             return Success(new { navigated = true, opener, url = canonical });
         }
         catch (Exception ex)
diff --git a/src/OpenClaw.Shared/Capabilities/ScreenCapability.cs b/src/OpenClaw.Shared/Capabilities/ScreenCapability.cs
index b81bf19a4..342029b2f 100644
--- a/src/OpenClaw.Shared/Capabilities/ScreenCapability.cs
+++ b/src/OpenClaw.Shared/Capabilities/ScreenCapability.cs
@@ -46,7 +46,14 @@ public override async Task<NodeInvokeResponse> ExecuteAsync(NodeInvokeRequest re
 
     private async Task<NodeInvokeResponse> HandleCaptureAsync(NodeInvokeRequest request)
     {
-        var format = GetStringArg(request.Args, "format", "png");
+        // The format is interpolated into the data URI, so validate it before
+        // invoking the capture backend.
+        var requestedFormat = GetStringArg(request.Args, "format", "png");
+        if (!TryNormalizeSnapshotFormat(requestedFormat, out var format))
+        {
+            return Error("Unsupported screen snapshot format. Supported formats: png, jpeg.");
+        }
+
         var maxWidth = Clamp(GetIntArg(request.Args, "maxWidth", 1920), MinDimension, MaxScreenWidth);
         var quality = Clamp(GetIntArg(request.Args, "quality", 80), MinQuality, MaxQuality);
         var monitor = GetIntArg(request.Args, "monitor", 0);
@@ -64,17 +71,18 @@ private async Task<NodeInvokeResponse> HandleCaptureAsync(NodeInvokeRequest requ
         {
             var result = await CaptureRequested(new ScreenCaptureArgs
             {
-                Format = format ?? "png",
+                Format = format,
                 MaxWidth = maxWidth,
                 Quality = quality,
                 MonitorIndex = screenIndex,
                 IncludePointer = includePointer
             });
-            
-            var image = $"data:image/{result.Format.ToLowerInvariant()};base64,{result.Base64}";
+
+            // Use the validated format for the MIME type instead of the backend echo.
+            var image = $"data:image/{format};base64,{result.Base64}";
             return Success(new 
             { 
-                format = result.Format,
+                format,
                 width = result.Width,
                 height = result.Height,
                 base64 = result.Base64,
@@ -88,6 +96,30 @@ private async Task<NodeInvokeResponse> HandleCaptureAsync(NodeInvokeRequest requ
         }
     }
 
+    // Keep encoded bytes and advertised MIME type aligned.
+    internal static bool TryNormalizeSnapshotFormat(string? requested, out string normalized)
+    {
+        if (string.IsNullOrWhiteSpace(requested))
+        {
+            normalized = "png";
+            return true;
+        }
+
+        switch (requested.Trim().ToLowerInvariant())
+        {
+            case "png":
+                normalized = "png";
+                return true;
+            case "jpeg":
+            case "jpg":
+                normalized = "jpeg";
+                return true;
+            default:
+                normalized = "png";
+                return false;
+        }
+    }
+
     private async Task<NodeInvokeResponse> HandleRecordAsync(NodeInvokeRequest request)
     {
         var format = GetStringArg(request.Args, "format", "mp4");
@@ -196,4 +228,3 @@ public class ScreenRecordResult
     public int Height { get; set; }
     public bool HasAudio { get; set; }
 }
-
diff --git a/src/OpenClaw.Shared/Capabilities/SystemCapability.cs b/src/OpenClaw.Shared/Capabilities/SystemCapability.cs
index f18061d04..4e7910937 100644
--- a/src/OpenClaw.Shared/Capabilities/SystemCapability.cs
+++ b/src/OpenClaw.Shared/Capabilities/SystemCapability.cs
@@ -275,11 +275,15 @@ private NodeInvokeResponse HandleRunPrepare(NodeInvokeRequest request)
         
         var command = argv[0];
         var rawCommand = GetStringArg(request.Args, "rawCommand");
+        var requestedShell = GetStringArg(request.Args, "shell");
+        var effectiveShell = _commandRunner?.ResolveEffectiveShell(requestedShell)
+            ?? ResolveDefaultEffectiveShell(requestedShell);
         var cwd = GetStringArg(request.Args, "cwd");
         var agentId = GetStringArg(request.Args, "agentId");
-        var sessionKey = GetStringArg(request.Args, "sessionKey");
+        var sessionKey = request.SessionKey ?? GetStringArg(request.Args, "sessionKey");
         
-        Logger.Info($"system.run.prepare: {rawCommand} (cwd={cwd ?? "default"})");
+        Logger.Info(
+            $"system.run.prepare: {rawCommand} (shell={effectiveShell}, requestedShell={requestedShell ?? "auto"}, cwd={cwd ?? "default"})");
         
         return Success(new
         {
@@ -289,11 +293,27 @@ private NodeInvokeResponse HandleRunPrepare(NodeInvokeRequest request)
                 argv,
                 cwd,
                 rawCommand,
+                requestedShell = string.IsNullOrWhiteSpace(requestedShell) ? null : requestedShell.Trim(),
+                effectiveShell,
                 agentId,
                 sessionKey
             }
         });
     }
+
+    private static string ResolveDefaultEffectiveShell(string? requestedShell)
+    {
+        if (string.IsNullOrWhiteSpace(requestedShell))
+            return "powershell";
+
+        return requestedShell.Trim().ToLowerInvariant() switch
+        {
+            "cmd" => "cmd",
+            "pwsh" => "pwsh",
+            "powershell" => "powershell",
+            _ => "powershell",
+        };
+    }
     
     private async Task<NodeInvokeResponse> HandleRunAsync(NodeInvokeRequest request)
     {
@@ -357,6 +377,7 @@ private async Task<NodeInvokeResponse> HandleRunAsync(NodeInvokeRequest request)
         
         var shell = GetStringArg(request.Args, "shell");
         var cwd = GetStringArg(request.Args, "cwd");
+        var sessionKey = request.SessionKey ?? GetStringArg(request.Args, "sessionKey");
         var timeoutMs = GetIntArg(request.Args, "timeoutMs",
             GetIntArg(request.Args, "timeout", DefaultRunTimeoutMs));
         // Clamp caller-supplied timeouts. timeoutMs <= 0 historically meant
@@ -399,50 +420,35 @@ private async Task<NodeInvokeResponse> HandleRunAsync(NodeInvokeRequest request)
         var fullCommand = args != null
             ? FormatExecCommand([command!, ..args])
             : command;
+        var requestedShell = string.IsNullOrWhiteSpace(shell) ? null : shell.Trim();
+        var effectiveShell = _commandRunner.ResolveEffectiveShell(requestedShell);
+        var approvedHostFallbackShell = _commandRunner is IHostFallbackAwareCommandRunner fallbackAwareRunner
+            ? fallbackAwareRunner.ResolveHostFallbackShellForApproval(requestedShell, effectiveShell)
+            : null;
         
-        Logger.Info($"system.run: {fullCommand} (shell={shell ?? "auto"}, timeout={timeoutMs}ms)");
+        Logger.Info($"system.run: {fullCommand} (shell={effectiveShell}, requestedShell={shell ?? "auto"}, timeout={timeoutMs}ms)");
         
         // Check exec approval policy
         if (_approvalPolicy != null)
         {
-            var approval = _approvalPolicy.Evaluate(fullCommand, shell);
-            var approvalCheck = await EnsureApprovedAsync(fullCommand, shell, approval);
-            if (!approvalCheck.Allowed)
-            {
-                Logger.Warn($"system.run DENIED: {fullCommand} ({approval.Reason})");
-                return Error($"Command denied by exec policy: {approval.Reason}");
-            }
-
-            var outerApprovalCoversNestedTargets =
-                approvalCheck.PromptDecisionKind != null ||
-                IsExactAllowRuleForCommand(approval, fullCommand);
+            var approvalError = await EnsureCommandAndNestedTargetsApprovedAsync(
+                fullCommand,
+                effectiveShell,
+                sessionKey,
+                correlationId);
+            if (approvalError != null)
+                return approvalError;
 
-            var parseResult = ExecShellWrapperParser.Expand(fullCommand, shell);
-            if (!string.IsNullOrWhiteSpace(parseResult.Error))
+            if (!string.IsNullOrWhiteSpace(approvedHostFallbackShell)
+                && !string.Equals(approvedHostFallbackShell, effectiveShell, StringComparison.OrdinalIgnoreCase))
             {
-                Logger.Warn($"system.run DENIED: {fullCommand} ({parseResult.Error})");
-                return Error($"Command denied by exec policy: {parseResult.Error}");
-            }
-
-            foreach (var target in parseResult.Targets)
-            {
-                var innerApproval = _approvalPolicy.Evaluate(target.Command, target.Shell);
-                if (outerApprovalCoversNestedTargets && !IsExplicitDeny(innerApproval))
-                {
-                    if (!innerApproval.Allowed)
-                    {
-                        Logger.Info(
-                            $"system.run nested approval covered by approved wrapper: {target.Command} ({innerApproval.Reason})");
-                    }
-                    continue;
-                }
-
-                var innerApprovalCheck = await EnsureApprovedAsync(target.Command, target.Shell, innerApproval);
-                if (!innerApprovalCheck.Allowed)
-                {
-                    Logger.Warn($"system.run DENIED: {target.Command} ({innerApproval.Reason})");
-                    return Error($"Command denied by exec policy: {innerApproval.Reason}");
-                }
+                approvalError = await EnsureCommandAndNestedTargetsApprovedAsync(
+                    fullCommand,
+                    approvedHostFallbackShell,
+                    sessionKey,
+                    correlationId);
+                if (approvalError != null)
+                    return approvalError;
             }
         }
         
@@ -452,10 +458,12 @@ private async Task<NodeInvokeResponse> HandleRunAsync(NodeInvokeRequest request)
             {
                 Command = command,
                 Args = args,
-                Shell = shell,
+                Shell = requestedShell,
                 Cwd = cwd,
                 TimeoutMs = timeoutMs,
-                Env = env
+                Env = env,
+                ApprovedEffectiveShell = effectiveShell,
+                ApprovedHostFallbackShell = approvedHostFallbackShell
             });
             
             return Success(new
@@ -478,6 +486,8 @@ private async Task<ExecApprovalCheckResult> EnsureApprovedAsync(
         string command,
         string? shell,
         ExecApprovalResult approval,
+        string? sessionKey,
+        string correlationId,
         CancellationToken cancellationToken = default)
     {
         if (approval.Allowed)
@@ -494,7 +504,9 @@ private async Task<ExecApprovalCheckResult> EnsureApprovedAsync(
             Command = command,
             Shell = shell,
             MatchedPattern = approval.MatchedPattern,
-            Reason = approval.Reason ?? "Command requires approval"
+            Reason = approval.Reason ?? "Command requires approval",
+            SessionKey = sessionKey,
+            CorrelationId = correlationId
         }, cancellationToken);
 
         if (decision.Kind == ExecApprovalPromptDecisionKind.Deny)
@@ -526,6 +538,63 @@ private async Task<ExecApprovalCheckResult> EnsureApprovedAsync(
         return new ExecApprovalCheckResult(true, decision.Kind);
     }
 
+    private async Task<NodeInvokeResponse?> EnsureCommandAndNestedTargetsApprovedAsync(
+        string fullCommand,
+        string? shell,
+        string? sessionKey,
+        string correlationId)
+    {
+        if (_approvalPolicy == null)
+            return null;
+
+        var approval = _approvalPolicy.Evaluate(fullCommand, shell);
+        var approvalCheck = await EnsureApprovedAsync(fullCommand, shell, approval, sessionKey, correlationId);
+        if (!approvalCheck.Allowed)
+        {
+            Logger.Warn($"system.run DENIED: {fullCommand} ({approval.Reason})");
+            return Error($"Command denied by exec policy: {approval.Reason}");
+        }
+
+        var outerApprovalCoversNestedTargets =
+            approvalCheck.PromptDecisionKind != null ||
+            IsExactAllowRuleForCommand(approval, fullCommand);
+
+        var parseResult = ExecShellWrapperParser.Expand(fullCommand, shell);
+        if (!string.IsNullOrWhiteSpace(parseResult.Error))
+        {
+            Logger.Warn($"system.run DENIED: {fullCommand} ({parseResult.Error})");
+            return Error($"Command denied by exec policy: {parseResult.Error}");
+        }
+
+        foreach (var target in parseResult.Targets)
+        {
+            var innerApproval = _approvalPolicy.Evaluate(target.Command, target.Shell);
+            if (outerApprovalCoversNestedTargets && !IsExplicitDeny(innerApproval))
+            {
+                if (!innerApproval.Allowed)
+                {
+                    Logger.Info(
+                        $"system.run nested approval covered by approved wrapper: {target.Command} ({innerApproval.Reason})");
+                }
+                continue;
+            }
+
+            var innerApprovalCheck = await EnsureApprovedAsync(
+                target.Command,
+                target.Shell,
+                innerApproval,
+                sessionKey,
+                correlationId);
+            if (!innerApprovalCheck.Allowed)
+            {
+                Logger.Warn($"system.run DENIED: {target.Command} ({innerApproval.Reason})");
+                return Error($"Command denied by exec policy: {innerApproval.Reason}");
+            }
+        }
+
+        return null;
+    }
+
     private static bool CanPersistExactAllowRule(string command) =>
         !string.IsNullOrWhiteSpace(command) &&
         command.IndexOfAny(['*', '?']) < 0;
diff --git a/src/OpenClaw.Shared/Capabilities/TtsCapability.cs b/src/OpenClaw.Shared/Capabilities/TtsCapability.cs
index 23878b221..39bb3bfdd 100644
--- a/src/OpenClaw.Shared/Capabilities/TtsCapability.cs
+++ b/src/OpenClaw.Shared/Capabilities/TtsCapability.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -8,6 +9,7 @@ namespace OpenClaw.Shared.Capabilities;
 public sealed class TtsCapability : NodeCapabilityBase
 {
     public const string SpeakCommand = "tts.speak";
+    public const string StatusCommand = "tts.status";
     public const string WindowsProvider = "windows";
     public const string ElevenLabsProvider = "elevenlabs";
     /// <summary>
@@ -17,13 +19,39 @@ public sealed class TtsCapability : NodeCapabilityBase
     public const string PiperProvider = "piper";
     public const int MaxTextLength = 5000;
 
-    private static readonly string[] _commands = [SpeakCommand];
+    // ============================================================
+    // Provider readiness reasons (PII-free; surfaced by tts.status and used
+    // by the fallback resolver below). Kept as string constants rather than
+    // an enum so the wire shape mirrors stt.status's readiness string.
+    // ============================================================
+
+    /// <summary>Provider can serve a speak call right now.</summary>
+    public const string ReadinessReady = "ready";
+    /// <summary>ElevenLabs selected but no API key is configured.</summary>
+    public const string ReadinessNeedsApiKey = "needs-api-key";
+    /// <summary>ElevenLabs selected with a key but no voice id is configured.</summary>
+    public const string ReadinessNeedsVoice = "needs-voice";
+    /// <summary>Piper selected but the chosen voice isn't downloaded yet.</summary>
+    public const string ReadinessVoiceNotDownloaded = "voice-not-downloaded";
+    /// <summary>Provider is unknown or otherwise unusable.</summary>
+    public const string ReadinessUnavailable = "unavailable";
+
+    /// <summary>All known providers, in catalog order (Piper is the default).</summary>
+    public static readonly string[] AllProviders = [PiperProvider, WindowsProvider, ElevenLabsProvider];
+
+    private static readonly string[] _commands = [SpeakCommand, StatusCommand];
 
     public override string Category => "tts";
     public override IReadOnlyList<string> Commands => _commands;
 
     public event Func<TtsSpeakArgs, CancellationToken, Task<TtsSpeakResult>>? SpeakRequested;
 
+    /// <summary>
+    /// Tray-side handler for <see cref="StatusCommand"/>: reports per-provider
+    /// readiness plus the configured/effective provider. Carries no PII.
+    /// </summary>
+    public event Func<CancellationToken, Task<TtsStatusResult>>? StatusRequested;
+
     public TtsCapability(IOpenClawLogger logger) : base(logger)
     {
     }
@@ -39,6 +67,47 @@ public static string ResolveProvider(string? requestedProvider, string? configur
             : provider.Trim().ToLowerInvariant();
     }
 
+    /// <summary>
+    /// Resolve the provider that should actually serve a speak request given
+    /// the set of providers that are currently usable. The requested (then
+    /// configured, then default) provider wins when it is usable. Fallback to
+    /// Windows is limited to configured/default provider degradation; explicit
+    /// provider requests stay strict so callers can rely on provider selection.
+    /// When no provider is usable (should not happen because Windows is always
+    /// available) the preferred provider is returned unchanged so the caller's
+    /// downstream error stays meaningful.
+    /// </summary>
+    /// <param name="requestedProvider">Per-call provider override (may be null).</param>
+    /// <param name="configuredProvider">User's configured default provider.</param>
+    /// <param name="readyProviders">Lower-cased provider ids that can serve a call now.</param>
+    public static TtsProviderResolution ResolveEffectiveProvider(
+        string? requestedProvider,
+        string? configuredProvider,
+        IReadOnlySet<string> readyProviders,
+        bool allowFallback)
+    {
+        ArgumentNullException.ThrowIfNull(readyProviders);
+
+        var preferred = ResolveProvider(requestedProvider, configuredProvider);
+        if (readyProviders.Contains(preferred))
+            return new TtsProviderResolution(preferred, preferred, FellBack: false);
+
+        // Windows is the always-offline safety net for configured/default
+        // provider degradation. Explicit per-call provider requests stay
+        // strict and are not silently rerouted.
+        if (allowFallback
+            && !string.Equals(preferred, WindowsProvider, StringComparison.Ordinal)
+            && readyProviders.Contains(WindowsProvider))
+        {
+            return new TtsProviderResolution(preferred, WindowsProvider, FellBack: true);
+        }
+
+        // Nothing usable — surface the preferred provider so the dispatch
+        // layer's "not configured" error is about the provider the user asked
+        // for, not an arbitrary fallback.
+        return new TtsProviderResolution(preferred, preferred, FellBack: false);
+    }
+
     public override Task<NodeInvokeResponse> ExecuteAsync(NodeInvokeRequest request)
         => ExecuteAsync(request, CancellationToken.None);
 
@@ -46,6 +115,9 @@ public override async Task<NodeInvokeResponse> ExecuteAsync(
         NodeInvokeRequest request,
         CancellationToken cancellationToken)
     {
+        if (string.Equals(request.Command, StatusCommand, StringComparison.Ordinal))
+            return await HandleStatusAsync(cancellationToken).ConfigureAwait(false);
+
         if (!string.Equals(request.Command, SpeakCommand, StringComparison.Ordinal))
             return Error($"Unknown command: {request.Command}");
 
@@ -76,6 +148,8 @@ public override async Task<NodeInvokeResponse> ExecuteAsync(
             {
                 spoken = result.Spoken,
                 provider = result.Provider,
+                requestedProvider = result.RequestedProvider ?? result.Provider,
+                fellBack = result.FellBack,
                 contentType = result.ContentType,
                 durationMs = result.DurationMs
             });
@@ -97,6 +171,36 @@ public override async Task<NodeInvokeResponse> ExecuteAsync(
         }
     }
 
+    private async Task<NodeInvokeResponse> HandleStatusAsync(CancellationToken cancellationToken)
+    {
+        if (StatusRequested == null)
+            return Error("TTS status not available");
+
+        try
+        {
+            var result = await StatusRequested(cancellationToken).ConfigureAwait(false);
+            return Success(new
+            {
+                configuredProvider = result.ConfiguredProvider,
+                effectiveProvider = result.EffectiveProvider,
+                willFallBack = result.WillFallBack,
+                providers = result.Providers.Select(p => new
+                {
+                    provider = p.Provider,
+                    readiness = p.Readiness,
+                    isReady = p.IsReady
+                }).ToArray()
+            });
+        }
+        catch (Exception ex)
+        {
+            // Status must not leak provider internals (voice ids, key
+            // fragments, device names); carry only a fixed message.
+            Logger.Error("TTS status failed", ex);
+            return Error("Status failed");
+        }
+    }
+
     private static string? NormalizeOptional(string? value)
         => string.IsNullOrWhiteSpace(value) ? null : value.Trim();
 }
@@ -114,6 +218,65 @@ public sealed class TtsSpeakResult
 {
     public bool Spoken { get; set; } = true;
     public string Provider { get; set; } = TtsCapability.WindowsProvider;
+
+    /// <summary>
+    /// The provider that was originally requested/configured before any
+    /// fallback. Equals <see cref="Provider"/> when no fallback occurred.
+    /// Null is treated as "same as Provider" by the response surface.
+    /// </summary>
+    public string? RequestedProvider { get; set; }
+
+    /// <summary>
+    /// True when the requested/configured provider was not usable and the
+    /// service fell back to another provider (Windows) to serve the call.
+    /// </summary>
+    public bool FellBack { get; set; }
+
     public string? ContentType { get; set; }
     public int? DurationMs { get; set; }
 }
+
+/// <summary>
+/// Result of <see cref="TtsCapability.ResolveEffectiveProvider"/>: the
+/// provider originally preferred and the one that should actually serve the
+/// call after fallback.
+/// </summary>
+/// <param name="RequestedProvider">The resolved requested/configured provider before fallback.</param>
+/// <param name="EffectiveProvider">The provider that should serve the call.</param>
+/// <param name="FellBack">True when <paramref name="EffectiveProvider"/> differs from <paramref name="RequestedProvider"/> because the latter wasn't usable.</param>
+public readonly record struct TtsProviderResolution(
+    string RequestedProvider,
+    string EffectiveProvider,
+    bool FellBack);
+
+/// <summary>Per-provider readiness snapshot (PII-free) for <c>tts.status</c>.</summary>
+public sealed class TtsProviderStatus
+{
+    public string Provider { get; set; } = "";
+    /// <summary>
+    /// One of <see cref="TtsCapability.ReadinessReady"/>,
+    /// <see cref="TtsCapability.ReadinessNeedsApiKey"/>,
+    /// <see cref="TtsCapability.ReadinessNeedsVoice"/>,
+    /// <see cref="TtsCapability.ReadinessVoiceNotDownloaded"/>, or
+    /// <see cref="TtsCapability.ReadinessUnavailable"/>.
+    /// </summary>
+    public string Readiness { get; set; } = TtsCapability.ReadinessUnavailable;
+    public bool IsReady { get; set; }
+}
+
+/// <summary>
+/// Status surface for TTS, mirroring <c>stt.status</c>. Reports the
+/// configured default provider, the provider that would actually run now
+/// (after fallback), and per-provider readiness. The configured/effective
+/// view reflects the configured defaults only — a specific <c>tts.speak</c>
+/// call that supplies its own voiceId can still avoid a fallback that this
+/// snapshot reports. Carries no PII (no voice ids, no key fragments, no
+/// device names).
+/// </summary>
+public sealed class TtsStatusResult
+{
+    public string ConfiguredProvider { get; set; } = TtsCapability.PiperProvider;
+    public string EffectiveProvider { get; set; } = TtsCapability.PiperProvider;
+    public bool WillFallBack { get; set; }
+    public IReadOnlyList<TtsProviderStatus> Providers { get; set; } = Array.Empty<TtsProviderStatus>();
+}
diff --git a/src/OpenClaw.Shared/CommandCatalogPresentation.cs b/src/OpenClaw.Shared/CommandCatalogPresentation.cs
new file mode 100644
index 000000000..c3bac8ba0
--- /dev/null
+++ b/src/OpenClaw.Shared/CommandCatalogPresentation.cs
@@ -0,0 +1,401 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace OpenClaw.Shared;
+
+// ── Command catalog presentation helpers ──
+//
+// The wire DTOs (GatewayCommand / GatewayCommandArg / CommandCatalog /
+// CommandCatalogQuery) and the gateway request API (ListCommandsAsync) live in
+// GatewayProtocolModels.cs + OpenClawGatewayClient.Protocol.cs. This file adds
+// only UI-facing presentation logic on top of those DTOs:
+//   • display / insertion helpers for a single GatewayCommand
+//   • ranked search + category grouping that the chat command palette needs
+//     (CommandCatalogQuery does boolean filtering only — no ranking or
+//     grouped output).
+// Nothing here duplicates a protocol DTO.
+
+/// <summary>Source/display/insertion presentation helpers for gateway commands.</summary>
+public static class GatewayCommandPresentation
+{
+    /// <summary>
+    /// Best slash/native string to show as the command's primary label. Prefers
+    /// the native name, then the first text alias, then a slash-prefixed name.
+    /// </summary>
+    public static string DisplayName(this GatewayCommand command)
+    {
+        if (command is null) return "";
+        if (!string.IsNullOrWhiteSpace(command.NativeName)) return Normalize(command.NativeName!);
+        var alias = command.TextAliases?.FirstOrDefault(a => !string.IsNullOrWhiteSpace(a));
+        if (!string.IsNullOrWhiteSpace(alias)) return Normalize(alias!);
+        return Normalize(command.Name);
+    }
+
+    /// <summary>Short, capitalized label for the command source ("native"→"Native").</summary>
+    public static string SourceLabel(this GatewayCommand command)
+    {
+        var s = command?.Source;
+        if (string.IsNullOrWhiteSpace(s)) return "";
+        var t = s!.Trim();
+        return char.ToUpperInvariant(t[0]) + (t.Length > 1 ? t[1..] : "");
+    }
+
+    /// <summary>True when the command needs argument input before it can run.</summary>
+    public static bool RequiresArgs(this GatewayCommand command)
+    {
+        if (command is null) return false;
+        return command.AcceptsArgs || (command.Args?.Any(a => a.Required) ?? false);
+    }
+
+    /// <summary>
+    /// Text to insert into the composer when the command is chosen. Commands
+    /// that take arguments get a trailing space so the user can immediately type
+    /// the value (we never inject placeholder text, which would be sent verbatim).
+    /// </summary>
+    public static string BuildInsertionText(this GatewayCommand command)
+    {
+        var token = command.DisplayName();
+        return command.RequiresArgs() ? token + " " : token;
+    }
+
+    /// <summary>Inline argument template (e.g. "&lt;message&gt; [level]"), or "" when none.</summary>
+    public static string ArgTemplate(this GatewayCommand command)
+    {
+        if (command?.Args is null || command.Args.Count == 0) return "";
+        return string.Join(" ", command.Args
+            .Where(a => !string.IsNullOrWhiteSpace(a.Name))
+            .Select(a => a.Required ? $"<{a.Name}>" : $"[{a.Name}]"));
+    }
+
+    /// <summary>Static choice count on the first arg (for the "N options" badge); 0 when dynamic/none.</summary>
+    public static int OptionCount(this GatewayCommand command)
+    {
+        var first = command?.Args?.FirstOrDefault();
+        return first is { IsDynamic: false } ? first.Choices.Count : 0;
+    }
+
+    /// <summary>Static choices on the first declared arg (empty when dynamic or none).</summary>
+    public static IReadOnlyList<GatewayCommandArgChoice> FirstArgChoices(this GatewayCommand command)
+    {
+        var first = command?.Args?.FirstOrDefault();
+        return first is { IsDynamic: false } ? first.Choices : Array.Empty<GatewayCommandArgChoice>();
+    }
+
+    /// <summary>Composer text for a chosen arg value: "/name value".</summary>
+    public static string BuildArgInsertionText(this GatewayCommand command, string value) =>
+        command.DisplayName() + " " + (value ?? "").Trim();
+
+    /// <summary>True when <paramref name="name"/> (slash-stripped) matches this command's name/native/alias.</summary>
+    public static bool MatchesName(this GatewayCommand command, string name)
+    {
+        if (command is null || string.IsNullOrWhiteSpace(name)) return false;
+        var n = name.Trim().TrimStart('/');
+        bool Eq(string? a) => !string.IsNullOrWhiteSpace(a) &&
+            string.Equals(a!.Trim().TrimStart('/'), n, StringComparison.OrdinalIgnoreCase);
+        if (Eq(command.NativeName) || Eq(command.Name)) return true;
+        return command.TextAliases?.Any(Eq) ?? false;
+    }
+
+    private static string Normalize(string value)
+    {
+        var v = (value ?? "").Trim();
+        if (v.Length == 0) return v;
+        // Slash-style commands are the convention; only prefix bare identifiers
+        // (don't double a leading slash, and leave already-prefixed values alone).
+        return v[0] == '/' ? v : "/" + v;
+    }
+}
+
+/// <summary>A named group of commands sharing a category, in display order.</summary>
+public sealed record CommandCategoryGroup(string Category, IReadOnlyList<GatewayCommand> Commands);
+
+/// <summary>
+/// A grouped command palette: the display <see cref="Groups"/>; the same commands
+/// <see cref="Flattened"/> in group/display order (the keyboard-navigation list);
+/// and <see cref="DefaultSelectionIndex"/> — the index in <see cref="Flattened"/>
+/// of the GLOBAL best search match, i.e. the row keyboard selection should default
+/// to so that display grouping never demotes a strong later-bucket match behind a
+/// weak earlier-bucket one for Enter/Tab.
+/// </summary>
+public sealed record GroupedPalette(
+    IReadOnlyList<CommandCategoryGroup> Groups,
+    IReadOnlyList<GatewayCommand> Flattened,
+    int DefaultSelectionIndex);
+
+/// <summary>
+/// Ranked search + category grouping over a set of gateway commands for the chat
+/// command palette. Distinct from <see cref="CommandCatalogQuery"/> (a boolean
+/// filter mirroring the gateway's server-side filtering) — this adds relevance
+/// ranking and grouped output the UI needs. UI-only; lives in OpenClaw.Shared so
+/// it can be unit-tested directly.
+/// </summary>
+public sealed class ChatCommandCatalogView
+{
+    private readonly List<GatewayCommand> _commands;
+
+    public ChatCommandCatalogView(IEnumerable<GatewayCommand>? commands)
+    {
+        _commands = (commands ?? Enumerable.Empty<GatewayCommand>())
+            .Where(c => c is not null)
+            .ToList();
+    }
+
+    public IReadOnlyList<GatewayCommand> Commands => _commands;
+    public int Count => _commands.Count;
+
+    /// <summary>
+    /// Case-insensitive ranked search across display name, native name, text
+    /// aliases, canonical name, description and category. A leading slash in the
+    /// query is ignored so "/cl" and "cl" behave identically. An empty query
+    /// returns the full catalog in display order.
+    /// </summary>
+    public IReadOnlyList<GatewayCommand> Search(string? query)
+    {
+        var q = (query ?? "").Trim();
+        if (q.StartsWith("/", StringComparison.Ordinal)) q = q.TrimStart('/');
+        q = q.Trim();
+
+        if (q.Length == 0)
+            return Ordered(_commands).ToList();
+
+        var scored = new List<(GatewayCommand Cmd, int Score)>();
+        foreach (var cmd in _commands)
+        {
+            var score = ScoreMatch(cmd, q);
+            if (score > 0) scored.Add((cmd, score));
+        }
+
+        return scored
+            .OrderByDescending(t => t.Score)
+            .ThenBy(t => t.Cmd.DisplayName(), StringComparer.OrdinalIgnoreCase)
+            .Select(t => t.Cmd)
+            .ToList();
+    }
+
+    /// <summary>
+    /// Groups commands by their raw category (falling back to source label, then
+    /// "Other"), optionally filtered/ordered. See <see cref="GroupBy"/>.
+    /// </summary>
+    public IReadOnlyList<CommandCategoryGroup> GroupByCategory(
+        string? query = null, IReadOnlyList<string>? categoryOrder = null)
+        => GroupBy(CategoryKey, query, categoryOrder);
+
+    /// <summary>
+    /// Groups commands using a caller-supplied category selector, optionally
+    /// filtered by the same search used in <see cref="Search"/>. Members within a
+    /// group preserve the relevance order produced by <see cref="Search"/>
+    /// (alphabetical when the query is empty), so the top match stays first. When
+    /// <paramref name="categoryOrder"/> is supplied, groups are ordered by that
+    /// sequence first (unlisted categories sort last, alphabetically); otherwise
+    /// groups are ordered alphabetically. The selector lets the palette group by a
+    /// mapped bucket (e.g. Mac's Session/Model/Tools/Agents) rather than the raw
+    /// wire category.
+    /// </summary>
+    public IReadOnlyList<CommandCategoryGroup> GroupBy(
+        Func<GatewayCommand, string> categorySelector,
+        string? query = null,
+        IReadOnlyList<string>? categoryOrder = null)
+    {
+        var matched = Search(query);
+        // GroupBy preserves source (relevance) order within each group; do NOT
+        // re-sort the members — that would demote a strong match below a weaker
+        // one and change the default Enter target.
+        var groups = matched
+            .GroupBy(categorySelector, StringComparer.OrdinalIgnoreCase)
+            .Select(g => new CommandCategoryGroup(g.Key, g.ToList()));
+
+        if (categoryOrder is { Count: > 0 })
+        {
+            int Rank(string category)
+            {
+                for (int i = 0; i < categoryOrder.Count; i++)
+                    if (string.Equals(categoryOrder[i], category, StringComparison.OrdinalIgnoreCase))
+                        return i;
+                return int.MaxValue;
+            }
+
+            return groups
+                .OrderBy(g => Rank(g.Category))
+                .ThenBy(g => g.Category, StringComparer.OrdinalIgnoreCase)
+                .ToList();
+        }
+
+        return groups
+            .OrderBy(g => g.Category, StringComparer.OrdinalIgnoreCase)
+            .ToList();
+    }
+
+    /// <summary>
+    /// Groups commands for the chat command palette (visual grouping) and also
+    /// computes <see cref="GroupedPalette.DefaultSelectionIndex"/> — the index,
+    /// within the flattened group order, of the GLOBAL best <see cref="Search"/>
+    /// match. Display grouping orders by bucket, which can render a strong
+    /// later-bucket match after a weak earlier-bucket one; keyboard selection
+    /// should default to this index (not 0) to preserve the flat-search Enter/Tab
+    /// target.
+    /// </summary>
+    public GroupedPalette GroupForPalette(
+        Func<GatewayCommand, string> categorySelector,
+        string? query = null,
+        IReadOnlyList<string>? categoryOrder = null)
+    {
+        var groups = GroupBy(categorySelector, query, categoryOrder);
+        var flattened = groups.SelectMany(g => g.Commands).ToList();
+        var top = Search(query).FirstOrDefault();
+        var defaultIndex = top is null ? 0 : flattened.IndexOf(top);
+        return new GroupedPalette(groups, flattened, defaultIndex < 0 ? 0 : defaultIndex);
+    }
+
+    private static string CategoryKey(GatewayCommand cmd)
+    {
+        if (!string.IsNullOrWhiteSpace(cmd.Category)) return cmd.Category!.Trim();
+        var src = cmd.SourceLabel();
+        if (!string.IsNullOrWhiteSpace(src)) return src;
+        return "Other";
+    }
+
+    private static IEnumerable<GatewayCommand> Ordered(IEnumerable<GatewayCommand> source) =>
+        source.OrderBy(c => c.DisplayName(), StringComparer.OrdinalIgnoreCase);
+
+    private static int ScoreMatch(GatewayCommand cmd, string q)
+    {
+        int best = 0;
+
+        void Consider(string? token, int exact, int prefix, int contains)
+        {
+            if (string.IsNullOrWhiteSpace(token)) return;
+            var t = token!.TrimStart('/');
+            if (t.Equals(q, StringComparison.OrdinalIgnoreCase)) best = Math.Max(best, exact);
+            else if (t.StartsWith(q, StringComparison.OrdinalIgnoreCase)) best = Math.Max(best, prefix);
+            else if (t.Contains(q, StringComparison.OrdinalIgnoreCase)) best = Math.Max(best, contains);
+        }
+
+        Consider(cmd.DisplayName(), 100, 80, 50);
+        Consider(cmd.NativeName, 100, 80, 50);
+        Consider(cmd.Name, 90, 70, 45);
+        foreach (var alias in cmd.TextAliases ?? Array.Empty<string>())
+            Consider(alias, 90, 70, 45);
+
+        if (best == 0 && !string.IsNullOrWhiteSpace(cmd.Description) &&
+            cmd.Description!.Contains(q, StringComparison.OrdinalIgnoreCase))
+            best = 20;
+
+        if (best == 0 && !string.IsNullOrWhiteSpace(cmd.Category) &&
+            cmd.Category!.Contains(q, StringComparison.OrdinalIgnoreCase))
+            best = 15;
+
+        return best;
+    }
+}
+
+/// <summary>
+/// Mac/web parity for the slash command palette grouping (slash-commands.ts):
+/// maps each command into one of four display buckets — Session, Model, Tools,
+/// Agents — via per-command name overrides first, then a raw-category fallback
+/// (session→Session, options→Model, management→Tools, everything else→Tools).
+/// </summary>
+public static class CommandCategories
+{
+    /// <summary>Bucket display order, mirroring Mac's CATEGORY_ORDER.</summary>
+    public static readonly IReadOnlyList<string> DisplayOrder = new[]
+    {
+        "session", "model", "tools", "agents",
+    };
+
+    private static readonly Dictionary<string, string> Labels = new(StringComparer.OrdinalIgnoreCase)
+    {
+        ["session"] = "Session",
+        ["model"] = "Model",
+        ["tools"] = "Tools",
+        ["agents"] = "Agents",
+    };
+
+    // Per-command bucket overrides keyed by normalized command name. Mirrors
+    // Mac's CATEGORY_OVERRIDES, applied before the raw-category fallback so e.g.
+    // /usage (raw category "options") lands in Tools rather than Model. This is a
+    // deliberate SUPERSET of Mac's map: it additionally pins export/kill/focus/
+    // unfocus, which Mac leaves to its raw-category fallback.
+    private static readonly Dictionary<string, string> BucketOverrides = new(StringComparer.OrdinalIgnoreCase)
+    {
+        ["help"] = "tools",
+        ["commands"] = "tools",
+        ["tools"] = "tools",
+        ["skill"] = "tools",
+        ["status"] = "tools",
+        ["export_session"] = "tools",
+        ["export"] = "tools",
+        ["usage"] = "tools",
+        ["tts"] = "tools",
+        ["agents"] = "agents",
+        ["subagents"] = "agents",
+        ["kill"] = "agents",
+        ["steer"] = "agents",
+        ["redirect"] = "agents",
+        ["session"] = "session",
+        ["stop"] = "session",
+        ["reset"] = "session",
+        ["new"] = "session",
+        ["compact"] = "session",
+        ["focus"] = "session",
+        ["unfocus"] = "session",
+        ["model"] = "model",
+        ["models"] = "model",
+        ["think"] = "model",
+        ["verbose"] = "model",
+        ["fast"] = "model",
+        ["reasoning"] = "model",
+        ["elevated"] = "model",
+        ["queue"] = "model",
+    };
+
+    /// <summary>
+    /// Display bucket (session/model/tools/agents) for a command, mirroring Mac's
+    /// mapCategory: name override first, then raw-category fallback.
+    /// </summary>
+    public static string Bucket(GatewayCommand command)
+    {
+        if (command is null) return "tools";
+        var key = NormalizeKey(command);
+        if (!string.IsNullOrEmpty(key) && BucketOverrides.TryGetValue(key, out var bucket))
+            return bucket;
+
+        return (command.Category?.Trim().ToLowerInvariant()) switch
+        {
+            "session" => "session",
+            "options" => "model",
+            "management" => "tools",
+            _ => "tools",
+        };
+    }
+
+    /// <summary>Friendly heading for a bucket key; Title-cases unknowns.</summary>
+    public static string Label(string? bucket)
+    {
+        if (string.IsNullOrWhiteSpace(bucket)) return "Other";
+        var key = bucket!.Trim();
+        if (Labels.TryGetValue(key, out var label)) return label;
+        return char.ToUpperInvariant(key[0]) + (key.Length > 1 ? key[1..] : "");
+    }
+
+    // Normalizes a command name to an override key the way Mac's normalizeUiKey
+    // does (lowercase, strip a leading slash, ':' '.' '-' → '_'). Mac keys off
+    // command.key; the wire command carries no key here, and the catalog is
+    // requested with text scope, so the text-surface Name is the closest analog —
+    // fall back to the first text alias, then the native name.
+    private static string NormalizeKey(GatewayCommand command)
+    {
+        var raw = !string.IsNullOrWhiteSpace(command.Name)
+            ? command.Name
+            : command.TextAliases?.FirstOrDefault(a => !string.IsNullOrWhiteSpace(a));
+        if (string.IsNullOrWhiteSpace(raw)) raw = command.NativeName;
+        raw = (raw ?? "").Trim();
+        if (raw.Length == 0) return "";
+        if (raw[0] == '/') raw = raw[1..];
+        raw = raw.ToLowerInvariant();
+        var chars = raw.ToCharArray();
+        for (int i = 0; i < chars.Length; i++)
+            if (chars[i] is ':' or '.' or '-') chars[i] = '_';
+        return new string(chars);
+    }
+}
diff --git a/src/OpenClaw.Shared/DeepLinkParser.cs b/src/OpenClaw.Shared/DeepLinkParser.cs
index 4ef68266e..b10a144d8 100644
--- a/src/OpenClaw.Shared/DeepLinkParser.cs
+++ b/src/OpenClaw.Shared/DeepLinkParser.cs
@@ -10,17 +10,20 @@ public record DeepLinkResult(string Path, string Query, Dictionary<string, strin
 /// </summary>
 public static class DeepLinkParser
 {
-    private const string Scheme = "openclaw://";
-
     public static DeepLinkResult? ParseDeepLink(string? uri)
+        => ParseDeepLink(uri, "openclaw");
+
+    public static DeepLinkResult? ParseDeepLink(string? uri, string scheme)
     {
         if (string.IsNullOrWhiteSpace(uri))
             return null;
 
-        if (!uri.StartsWith(Scheme, StringComparison.OrdinalIgnoreCase))
+        ArgumentException.ThrowIfNullOrWhiteSpace(scheme);
+        var prefix = $"{scheme}://";
+        if (!uri.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
             return null;
 
-        var remainder = uri[Scheme.Length..];
+        var remainder = uri[prefix.Length..];
         var queryIndex = remainder.IndexOf('?');
         var query = queryIndex >= 0 ? remainder[(queryIndex + 1)..] : "";
         // Trim trailing slash AFTER splitting off the query so the
diff --git a/src/OpenClaw.Shared/DeviceIdentity.cs b/src/OpenClaw.Shared/DeviceIdentity.cs
index 3d66b4d75..bcb24cd7a 100644
--- a/src/OpenClaw.Shared/DeviceIdentity.cs
+++ b/src/OpenClaw.Shared/DeviceIdentity.cs
@@ -94,6 +94,77 @@ public static bool HasStoredDeviceTokenForRole(string dataPath, string role, IOp
     public static bool TryClearDeviceToken(string dataPath, IOpenClawLogger? logger = null) =>
         TryClearDeviceTokenForRole(dataPath, "operator", logger);
 
+    /// <summary>
+    /// Atomically clears <em>all</em> device-token fields (DeviceToken,
+    /// DeviceTokenScopes, NodeDeviceToken, NodeDeviceTokenScopes) from
+    /// <c>device-key-ed25519.json</c> while preserving the Ed25519 keypair,
+    /// deviceId, algorithm, and all other properties. Uses raw JSON filtering
+    /// so unknown/extra fields are preserved, and writes atomically via
+    /// temp-file + rename.
+    /// </summary>
+    /// <returns>
+    /// <c>true</c> if at least one token field was present and cleared;
+    /// <c>false</c> if the file was absent or already had no tokens.
+    /// </returns>
+    public static bool TryClearAllDeviceTokens(string dataPath, IOpenClawLogger? logger = null)
+    {
+        var keyPath = Path.Combine(dataPath, "device-key-ed25519.json");
+        if (!File.Exists(keyPath))
+            return false;
+
+        try
+        {
+            var json = File.ReadAllText(keyPath);
+            using var doc = JsonDocument.Parse(json);
+            var root = doc.RootElement;
+            if (root.ValueKind != JsonValueKind.Object)
+            {
+                logger?.Warn("Failed to clear all device tokens: device-key-ed25519.json root is not a JSON object.");
+                return false;
+            }
+
+            bool hadTokens = false;
+            using var ms = new MemoryStream();
+            using (var writer = new System.Text.Json.Utf8JsonWriter(ms, new System.Text.Json.JsonWriterOptions { Indented = true }))
+            {
+                writer.WriteStartObject();
+                foreach (var prop in root.EnumerateObject())
+                {
+                    if (prop.Name is "DeviceToken" or "DeviceTokenScopes" or "NodeDeviceToken" or "NodeDeviceTokenScopes")
+                    {
+                        hadTokens = true;
+                        continue;
+                    }
+                    prop.WriteTo(writer);
+                }
+                writer.WriteEndObject();
+            }
+
+            if (!hadTokens)
+                return false;
+
+            var content = System.Text.Encoding.UTF8.GetString(ms.ToArray());
+            AtomicWriteKeyFileRaw(keyPath, content);
+            logger?.Info("All device tokens cleared from device-key-ed25519.json (keypair preserved).");
+            return true;
+        }
+        catch (IOException ex)
+        {
+            logger?.Warn($"Failed to clear all device tokens: {ex.Message}");
+            return false;
+        }
+        catch (UnauthorizedAccessException ex)
+        {
+            logger?.Warn($"Failed to clear all device tokens: {ex.Message}");
+            return false;
+        }
+        catch (JsonException ex)
+        {
+            logger?.Warn($"Failed to clear all device tokens: {ex.Message}");
+            return false;
+        }
+    }
+
     /// <summary>
     /// Sets the role-specific device token field to <c>null</c> in
     /// <c>device-key-ed25519.json</c> without deleting the file. Preserves the
@@ -523,12 +594,22 @@ private void StoreNodeDeviceTokenCore(string token, string[]? scopes)
     private static void AtomicWriteKeyFile(string path, DeviceKeyData data)
     {
         var json = JsonSerializer.Serialize(data, JsonSerializerOptionsCache.WriteIndented);
+        AtomicWriteKeyFileRaw(path, json);
+    }
+
+    /// <summary>
+    /// Atomically writes pre-serialized JSON content to a device-key file path
+    /// using temp-file + rename. Use this when restoring a backup or writing
+    /// content that is already serialized.
+    /// </summary>
+    public static void AtomicWriteKeyFileRaw(string path, string jsonContent)
+    {
         var dir = Path.GetDirectoryName(path);
         var tempDir = string.IsNullOrEmpty(dir) ? Environment.CurrentDirectory : dir;
         var tempPath = Path.Combine(tempDir, $".{Path.GetFileName(path)}.{Guid.NewGuid():N}.tmp");
         try
         {
-            File.WriteAllText(tempPath, json);
+            File.WriteAllText(tempPath, jsonContent);
             McpAuthToken.TryRestrictSensitiveFileAcl(tempPath);
             File.Move(tempPath, path, overwrite: true);
         }
diff --git a/src/OpenClaw.Shared/ExecApprovalPolicy.cs b/src/OpenClaw.Shared/ExecApprovalPolicy.cs
index 644008246..cbcbcf5f0 100644
--- a/src/OpenClaw.Shared/ExecApprovalPolicy.cs
+++ b/src/OpenClaw.Shared/ExecApprovalPolicy.cs
@@ -42,17 +42,28 @@ public enum ExecApprovalAction
 
 /// <summary>
 /// JsonConverter for <see cref="ExecApprovalAction"/> that emits/accepts the canonical
-/// camelCase values ("allow", "deny", "prompt") but also accepts the legacy "ask" alias.
-/// Older builds of the Permissions UI wrote "ask" for the Prompt action; without this
-/// converter, deserialization would throw and the entire policy file (including any
-/// user-authored rules) would be silently replaced with the default policy on load.
+/// camelCase values ("allow", "deny", "prompt") but also accepts legacy values written
+/// by older builds: the "ask" alias and numeric enum values.
 /// </summary>
 internal sealed class ExecApprovalActionConverter : JsonConverter<ExecApprovalAction>
 {
     public override ExecApprovalAction Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
+        if (reader.TokenType == JsonTokenType.Number)
+        {
+            if (!reader.TryGetInt32(out var numericValue))
+                throw new JsonException("Expected integer value for ExecApprovalAction");
+
+            return numericValue switch
+            {
+                (int)ExecApprovalAction.Allow => ExecApprovalAction.Allow,
+                (int)ExecApprovalAction.Deny => ExecApprovalAction.Deny,
+                (int)ExecApprovalAction.Prompt => ExecApprovalAction.Prompt,
+                _ => throw new JsonException($"Unknown ExecApprovalAction numeric value '{numericValue}'")
+            };
+        }
         if (reader.TokenType != JsonTokenType.String)
-            throw new JsonException($"Expected string for ExecApprovalAction, got {reader.TokenType}");
+            throw new JsonException($"Expected string or number for ExecApprovalAction, got {reader.TokenType}");
 
         var value = reader.GetString();
         return value?.ToLowerInvariant() switch
diff --git a/src/OpenClaw.Shared/ExecApprovalPrompt.cs b/src/OpenClaw.Shared/ExecApprovalPrompt.cs
index 622b31443..067312382 100644
--- a/src/OpenClaw.Shared/ExecApprovalPrompt.cs
+++ b/src/OpenClaw.Shared/ExecApprovalPrompt.cs
@@ -17,10 +17,14 @@ public sealed class ExecApprovalPromptRequest
     public string? Shell { get; init; }
     public string? MatchedPattern { get; init; }
     public string Reason { get; init; } = "";
+    public string? SessionKey { get; init; }
+    public string? CorrelationId { get; init; }
 }
 
 public sealed class ExecApprovalPromptDecision
 {
+    public const string TimedOutReason = "Approval prompt timed out";
+
     private ExecApprovalPromptDecision(ExecApprovalPromptDecisionKind kind, string reason)
     {
         Kind = kind;
@@ -33,6 +37,7 @@ private ExecApprovalPromptDecision(ExecApprovalPromptDecisionKind kind, string r
     public static ExecApprovalPromptDecision Deny(string reason = "Denied by user") => new(ExecApprovalPromptDecisionKind.Deny, reason);
     public static ExecApprovalPromptDecision AllowOnce(string reason = "Allowed once by user") => new(ExecApprovalPromptDecisionKind.AllowOnce, reason);
     public static ExecApprovalPromptDecision AlwaysAllow(string reason = "Always allowed by user") => new(ExecApprovalPromptDecisionKind.AlwaysAllow, reason);
+    public static ExecApprovalPromptDecision TimedOut() => Deny(TimedOutReason);
 }
 
 public interface IExecApprovalPromptHandler
@@ -52,6 +57,7 @@ public enum ExecApprovalPromptDecisionSource
     UserAllowOnce,
     UserAlwaysAllow,
     Cancelled,
+    TimedOut,
     Failed,
     /// <summary>
     /// Policy denied the command non-interactively (e.g. default action is
@@ -77,3 +83,13 @@ public ExecApprovalPromptDecidedEventArgs(
     public ExecApprovalPromptDecision Decision { get; }
     public ExecApprovalPromptDecisionSource Source { get; }
 }
+
+public sealed class ExecApprovalPromptRequestedEventArgs : EventArgs
+{
+    public ExecApprovalPromptRequestedEventArgs(ExecApprovalPromptRequest request)
+    {
+        Request = request;
+    }
+
+    public ExecApprovalPromptRequest Request { get; }
+}
diff --git a/src/OpenClaw.Shared/GatewayErrorClassifier.cs b/src/OpenClaw.Shared/GatewayErrorClassifier.cs
new file mode 100644
index 000000000..73eab4137
--- /dev/null
+++ b/src/OpenClaw.Shared/GatewayErrorClassifier.cs
@@ -0,0 +1,134 @@
+using System;
+
+namespace OpenClaw.Shared;
+
+/// <summary>
+/// Actionable classification of a gateway connection error. Lets the UI route a
+/// raw error string to a specific recovery path instead of a generic failure —
+/// distinguishing unauthorized, scope mismatch, token drift, pairing, TLS,
+/// tunnel, and server problems.
+/// </summary>
+public enum GatewayErrorKind
+{
+    /// <summary>No error text, or nothing recognizable.</summary>
+    Unknown,
+
+    /// <summary>Connection refused / unreachable / timed out.</summary>
+    Network,
+
+    /// <summary>Generic unauthorized / invalid-token rejection.</summary>
+    Auth,
+
+    /// <summary>
+    /// The stored device token is no longer recognized by the gateway (rotated,
+    /// revoked, or replaced) — the fix is to re-pair, not to retry.
+    /// </summary>
+    TokenDrift,
+
+    /// <summary>
+    /// Authenticated but missing a required operator/node scope (e.g. cannot
+    /// approve pairing or read config) — the fix is to re-pair for higher scopes.
+    /// </summary>
+    ScopeMismatch,
+
+    /// <summary>Device/node pairing approval is pending on the gateway host.</summary>
+    PairingRequired,
+
+    /// <summary>Pairing was explicitly rejected on the gateway host.</summary>
+    PairingRejected,
+
+    /// <summary>TLS/certificate/cleartext transport problem.</summary>
+    Tls,
+
+    /// <summary>SSH tunnel could not be established or dropped.</summary>
+    Tunnel,
+
+    /// <summary>Gateway returned a 5xx / internal error.</summary>
+    Server,
+
+    /// <summary>Rate limited by the gateway.</summary>
+    RateLimited,
+}
+
+/// <summary>
+/// Pure heuristic classifier for gateway error strings. Order is significant:
+/// the more specific kinds (scope, token drift) are matched before the generic
+/// auth bucket so a "re-pair" path wins over a plain "retry" path.
+/// </summary>
+public static class GatewayErrorClassifier
+{
+    public static GatewayErrorKind Classify(string? error)
+    {
+        if (string.IsNullOrWhiteSpace(error))
+            return GatewayErrorKind.Unknown;
+
+        var e = error.ToLowerInvariant();
+
+        if ((Contains(e, "rate") && Contains(e, "limit")) ||
+            Contains(e, "429") || Contains(e, "too many request"))
+            return GatewayErrorKind.RateLimited;
+
+        // SSH/tunnel first: SSH failures often read "Permission denied
+        // (publickey)" which would otherwise be mistaken for a scope problem.
+        if (Contains(e, "ssh") || Contains(e, "tunnel"))
+            return GatewayErrorKind.Tunnel;
+
+        // Transport security before pairing/auth: e.g. "certificate not
+        // approved by CA" must not be read as a pairing approval.
+        if (Contains(e, "tls") || Contains(e, "ssl") || Contains(e, "certificate") ||
+            Contains(e, "cert ") || Contains(e, "handshake") ||
+            Contains(e, "cleartext") || Contains(e, "insecure"))
+            return GatewayErrorKind.Tls;
+
+        // Scope/permission problems — authenticated but under-privileged.
+        if (Contains(e, "scope") ||
+            Contains(e, "insufficient priv") ||
+            Contains(e, "not permitted") ||
+            Contains(e, "permission denied") ||
+            (Contains(e, "forbidden") && Contains(e, "scope")))
+            return GatewayErrorKind.ScopeMismatch;
+
+        // Token drift — the device token specifically is stale/unknown.
+        if (Contains(e, "re-pair") || Contains(e, "repair token") ||
+            Contains(e, "token rotat") || Contains(e, "token revoked") ||
+            Contains(e, "token mismatch") || Contains(e, "token drift") ||
+            (Contains(e, "device token") &&
+                (Contains(e, "unknown") || Contains(e, "invalid") ||
+                 Contains(e, "expired") || Contains(e, "not recognized") ||
+                 Contains(e, "no longer"))))
+            return GatewayErrorKind.TokenDrift;
+
+        // Pairing lifecycle. Use specific tokens ("pairing"/"approval") so we
+        // don't match "repair" (contains "pair") or "approved by CA".
+        if (Contains(e, "pairing") || Contains(e, "approval"))
+        {
+            if (Contains(e, "reject") || Contains(e, "denied") || Contains(e, "declin"))
+                return GatewayErrorKind.PairingRejected;
+            return GatewayErrorKind.PairingRequired;
+        }
+
+        // Server (5xx) before the broad auth bucket: a transient
+        // "500 internal error: token validation failed" must not route the
+        // user to a re-pair flow.
+        if (Contains(e, "500") || Contains(e, "502") || Contains(e, "503") ||
+            Contains(e, "internal error") || Contains(e, "server error"))
+            return GatewayErrorKind.Server;
+
+        // Generic auth — after the more specific auth-adjacent kinds above.
+        if (Contains(e, "401") || Contains(e, "unauthor") || Contains(e, "forbid") ||
+            Contains(e, "auth") || Contains(e, "token") || Contains(e, "credential"))
+            return GatewayErrorKind.Auth;
+
+        // Network.
+        if (Contains(e, "refused") || Contains(e, "unreachable") ||
+            Contains(e, "timeout") || Contains(e, "timed out") ||
+            Contains(e, "network") || Contains(e, "no route") ||
+            Contains(e, "could not connect") || Contains(e, "connection closed"))
+            return GatewayErrorKind.Network;
+
+        return GatewayErrorKind.Unknown;
+    }
+
+    private static bool Contains(string haystack, string needle) =>
+        haystack.Contains(needle, StringComparison.Ordinal);
+}
diff --git a/src/OpenClaw.Shared/ICommandRunner.cs b/src/OpenClaw.Shared/ICommandRunner.cs
index 1930bb5e7..78cfbfb76 100644
--- a/src/OpenClaw.Shared/ICommandRunner.cs
+++ b/src/OpenClaw.Shared/ICommandRunner.cs
@@ -35,6 +35,20 @@ public class CommandRequest
     
     /// <summary>Additional environment variables</summary>
     public Dictionary<string, string>? Env { get; set; }
+
+    /// <summary>
+    /// Optional effective shell that already passed shell-scoped approval.
+    /// Dynamic runners must execute this shell, or a separately approved host
+    /// fallback shell, so live settings cannot change the approved boundary.
+    /// </summary>
+    public string? ApprovedEffectiveShell { get; set; }
+
+    /// <summary>
+    /// Optional host fallback shell that has already passed shell-scoped approval.
+    /// Sandboxed runners use this only when a compatibility fallback would execute
+    /// a different host shell than the sandbox effective shell.
+    /// </summary>
+    public string? ApprovedHostFallbackShell { get; set; }
 }
 
 /// <summary>
@@ -57,7 +71,39 @@ public interface ICommandRunner
 {
     /// <summary>Human-readable name of this runner (e.g., "local", "docker", "wsl")</summary>
     string Name { get; }
+
+    /// <summary>
+    /// Resolve the shell that will actually execute the request. Approval checks
+    /// must use this value so shell-scoped rules cannot approve one shell while
+    /// the runner executes another.
+    /// </summary>
+    string ResolveEffectiveShell(string? requestedShell)
+    {
+        if (string.IsNullOrWhiteSpace(requestedShell))
+            return "powershell";
+
+        return requestedShell.Trim().ToLowerInvariant() switch
+        {
+            "cmd" => "cmd",
+            "pwsh" => "pwsh",
+            "powershell" => "powershell",
+            _ => "powershell",
+        };
+    }
     
     /// <summary>Execute a command and return the result.</summary>
     Task<CommandResult> RunAsync(CommandRequest request, CancellationToken ct = default);
 }
+
+/// <summary>
+/// Optional contract for runners that may preserve compatibility through an
+/// uncontained host fallback with a shell different from their sandbox shell.
+/// </summary>
+public interface IHostFallbackAwareCommandRunner : ICommandRunner
+{
+    /// <summary>
+    /// Returns the host fallback shell that needs separate approval, or null when
+    /// fallback cannot change the already-approved effective shell.
+    /// </summary>
+    string? ResolveHostFallbackShellForApproval(string? requestedShell, string effectiveShell);
+}
diff --git a/src/OpenClaw.Shared/IOperatorGatewayClient.cs b/src/OpenClaw.Shared/IOperatorGatewayClient.cs
index 48eb84143..fb356c91b 100644
--- a/src/OpenClaw.Shared/IOperatorGatewayClient.cs
+++ b/src/OpenClaw.Shared/IOperatorGatewayClient.cs
@@ -59,6 +59,15 @@ public interface IOperatorGatewayClient
     // ─── Request Methods ───
     Task SendChatMessageAsync(string message, string? sessionKey = null);
     Task<ChatSendResult> SendChatMessageForRunAsync(string message, string? sessionKey = null);
+    /// <summary>
+    /// Fetches the normalized conversation transcript for a session
+    /// (<c>chat.history</c>). Ships with a default so adding it does not
+    /// source-break external implementers (test doubles); the real client
+    /// overrides it. Non-overriding clients fail explicitly instead of looking
+    /// like an empty transcript.
+    /// </summary>
+    Task<ChatHistoryInfo> RequestChatHistoryAsync(string? sessionKey = null, int timeoutMs = 15000)
+        => Task.FromException<ChatHistoryInfo>(new NotSupportedException("chat.history is not supported by this gateway client."));
     Task CheckHealthAsync();
     Task RequestSessionsAsync(string? agentId = null);
     Task RequestUsageAsync();
@@ -73,6 +82,19 @@ public interface IOperatorGatewayClient
     Task RequestCronListAsync();
     Task RequestCronStatusAsync();
     Task<bool> RunCronJobAsync(string jobId, bool force = true);
+    /// <summary>
+    /// Response-aware cron run request. Compatibility fallback for implementers
+    /// that only provide <see cref="RunCronJobAsync"/>; the fallback cannot
+    /// enforce <paramref name="timeoutMs"/> and implementers should not implement
+    /// <see cref="RunCronJobAsync"/> by delegating back to this method.
+    /// </summary>
+    async Task<CronRunRequestResult> RunCronJobDetailedAsync(string jobId, bool force = true, int timeoutMs = 12000)
+    {
+        var accepted = await RunCronJobAsync(jobId, force).ConfigureAwait(false);
+        return accepted
+            ? new CronRunRequestResult(true, true, null)
+            : CronRunRequestResult.NotAccepted(null);
+    }
     Task<bool> RemoveCronJobAsync(string jobId);
     Task<bool> AddCronJobAsync(object jobDefinition);
     Task<bool> UpdateCronJobAsync(string id, object patch);
@@ -142,3 +164,14 @@ Task<SessionCompactionMutationResult> BranchCompactionCheckpointAsync(string key
     Task<SessionCompactionMutationResult> RestoreCompactionCheckpointAsync(string key, string checkpointId, int timeoutMs = 15000)
         => Task.FromResult(new SessionCompactionMutationResult { Key = key, CheckpointId = checkpointId, IsSupported = false });
 }
+
+public sealed record CronRunRequestResult(
+    bool Accepted,
+    bool Enqueued,
+    string? RunId,
+    string? Reason = null,
+    string? Error = null)
+{
+    public static CronRunRequestResult NotAccepted(string? error) =>
+        new(false, false, null, null, error);
+}
diff --git a/src/OpenClaw.Shared/LocalCommandRunner.cs b/src/OpenClaw.Shared/LocalCommandRunner.cs
index 2643deeee..94ea7cf90 100644
--- a/src/OpenClaw.Shared/LocalCommandRunner.cs
+++ b/src/OpenClaw.Shared/LocalCommandRunner.cs
@@ -7,7 +7,7 @@
 namespace OpenClaw.Shared;
 
 /// <summary>
-/// Executes commands locally via Process.Start (pwsh.exe / cmd.exe).
+/// Executes commands locally via Process.Start (pwsh.exe / powershell.exe / cmd.exe).
 /// This is the default runner. Swap with DockerCommandRunner, WslCommandRunner, etc.
 /// </summary>
 public class LocalCommandRunner : ICommandRunner
@@ -22,6 +22,8 @@ public LocalCommandRunner(IOpenClawLogger? logger = null)
     {
         _logger = logger ?? NullLogger.Instance;
     }
+
+    public string ResolveEffectiveShell(string? requestedShell) => ResolveEffectiveShellName(requestedShell);
     
     public async Task<CommandResult> RunAsync(CommandRequest request, CancellationToken ct = default)
     {
@@ -232,9 +234,10 @@ private static void ValidateDirectExecutable(string executable)
                 $"Direct-argv mode cannot guarantee argv fidelity for batch scripts: {executable}", nameof(executable));
     }
 
-    private static (string fileName, string arguments) BuildProcessArgs(CommandRequest request)
+    internal static (string fileName, string arguments) BuildProcessArgs(CommandRequest request, string? pathEnvVar = null)
     {
-        var shell = request.Shell ?? "powershell";
+        var defaultShell = string.IsNullOrWhiteSpace(request.Shell);
+        var shell = ResolveEffectiveShellName(request.Shell, pathEnvVar);
         var command = request.Command;
         var isCmd = shell.Equals("cmd", StringComparison.OrdinalIgnoreCase);
         
@@ -249,8 +252,66 @@ private static (string fileName, string arguments) BuildProcessArgs(CommandReque
         if (isCmd)
             return ("cmd.exe", $"/C {command}");
         if (shell.Equals("pwsh", StringComparison.OrdinalIgnoreCase))
-            return ("pwsh.exe", $"-NoProfile -NonInteractive -Command {command}");
-        return ("powershell.exe", $"-NoProfile -NonInteractive -Command {command}");
+        {
+            var pwshPath = ResolveOnPath("pwsh.exe", pathEnvVar);
+            if (pwshPath is not null || !defaultShell)
+                return (pwshPath ?? "pwsh.exe", $"-NoProfile -NonInteractive -Command {command}");
+        }
+
+        return (ResolveWindowsPowerShellExe(), $"-NoProfile -NonInteractive -Command {command}");
+    }
+
+    internal static string ResolveEffectiveShellName(string? requestedShell)
+        => ResolveEffectiveShellName(requestedShell, pathEnvVar: null);
+
+    private static string ResolveEffectiveShellName(string? requestedShell, string? pathEnvVar)
+    {
+        if (!string.IsNullOrWhiteSpace(requestedShell))
+        {
+            return requestedShell.Trim().ToLowerInvariant() switch
+            {
+                "cmd" => "cmd",
+                "pwsh" => "pwsh",
+                "powershell" => "powershell",
+                _ => "powershell",
+            };
+        }
+
+        return "powershell";
+    }
+
+    private static string? ResolveOnPath(string executableName, string? pathEnvVar = null)
+    {
+        var path = pathEnvVar
+            ?? Environment.GetEnvironmentVariable("PATH")
+            ?? Environment.GetEnvironmentVariable("Path");
+        if (string.IsNullOrWhiteSpace(path))
+            return null;
+
+        foreach (var dir in path.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries))
+        {
+            try
+            {
+                var candidate = Path.Combine(dir, executableName);
+                if (File.Exists(candidate))
+                    return candidate;
+            }
+            catch
+            {
+                // Ignore malformed PATH entries.
+            }
+        }
+
+        return null;
+    }
+
+    private static string ResolveWindowsPowerShellExe()
+    {
+        var systemRoot = Environment.GetEnvironmentVariable("SystemRoot")
+            ?? Environment.GetEnvironmentVariable("windir");
+        return string.IsNullOrWhiteSpace(systemRoot)
+            ? "powershell.exe"
+            : Path.Combine(systemRoot, "System32", "WindowsPowerShell", "v1.0", "powershell.exe");
     }
     
     /// <summary>
diff --git a/src/OpenClaw.Shared/Mcp/McpToolBridge.cs b/src/OpenClaw.Shared/Mcp/McpToolBridge.cs
index a551474b7..525f6db5d 100644
--- a/src/OpenClaw.Shared/Mcp/McpToolBridge.cs
+++ b/src/OpenClaw.Shared/Mcp/McpToolBridge.cs
@@ -247,13 +247,15 @@ private object HandleToolsList()
 
         // tts.*
         ["tts.speak"] =
-            "Speak text aloud on the Windows node. Args: text (string, required), provider ('piper'|'windows'|'elevenlabs', optional — falls back to the configured TtsProvider setting, default 'piper' for fresh installs), voiceId (string, optional — overrides the per-provider configured voice), model (string, optional, ElevenLabs only), interrupt (bool, default false — interrupts any in-progress playback). Returns { spoken, provider, contentType, durationMs }.",
+            "Speak text aloud on the Windows node. Args: text (string, required), provider ('piper'|'windows'|'elevenlabs', optional — omit to use the configured TtsProvider setting, default 'piper' for fresh installs), voiceId (string, optional — overrides the per-provider configured voice), model (string, optional, ElevenLabs only), interrupt (bool, default false — interrupts any in-progress playback). When provider is omitted and the configured provider isn't usable (no ElevenLabs key, Piper voice not downloaded), the node falls back to Windows TTS so playback still happens. Explicit provider requests stay strict and do not silently reroute. Returns { spoken, provider (the provider that actually spoke), requestedProvider, fellBack, contentType, durationMs }.",
+        ["tts.status"] =
+            "Report TTS provider readiness. No args. Returns { configuredProvider, effectiveProvider (the provider that would run now after fallback), willFallBack (bool), providers: [{ provider ('piper'|'windows'|'elevenlabs'), readiness ('ready'|'needs-api-key'|'needs-voice'|'voice-not-downloaded'|'unavailable'), isReady (bool) }] }. Carries no PII (no voice ids, no key fragments, no device names). Requires NodeTtsEnabled.",
 
         // app.*
         ["app.navigate"] =
             "Navigate the companion app to a specific page (e.g., 'home', 'sessions', 'settings'). Args: page (string, required). Returns { navigated, page }.",
         ["app.status"] =
-            "Get current connection status, node state, and gateway info. Returns { connectionStatus, nodeConnected, nodePaired, nodePendingApproval, gatewayVersion, sessionCount, nodeCount }.",
+            "Get current connection status, manager-owned overall/operator/node state, and gateway info. Returns { connectionStatus, overallState, operatorState, nodeState, nodeConnected, nodePaired, nodePendingApproval, nodeError, gatewayVersion, sessionCount, nodeCount }.",
         ["app.sessions"] =
             "List active sessions with optional agent filter. Args: agentId (string, optional). Returns array of { Key, Status, Model, AgeText, tokens }.",
         ["app.agents"] =
@@ -265,13 +267,23 @@ private object HandleToolsList()
         ["app.settings.get"] =
             "Read a local app setting by name. Args: name (string, required). Returns the setting value.",
         ["app.settings.set"] =
-            "Set a local app setting (name and value). Args: name (string, required), value (string, required). Returns { name, value }.",
+            "Set a local app setting (name and value), persist it, and apply the same reconnect/reload behavior as saving settings in the app UI. Args: name (string, required), value (string, required). Returns { name, value }; runtime apply failures surface as tool errors.",
         ["app.menu"] =
-            "Get tray menu state (status, session count, node count). Returns array of menu items.",
+            "Get tray menu state (status including overallState/nodeState/nodeError, session count, node count). Returns array of menu items.",
         ["app.search"] =
             "Search the command palette and return matching commands. Args: query (string, required). Returns array of { Title, Subtitle, Icon }.",
         ["app.dashboard.url"] =
             "Build the same gateway dashboard URL the tray opens. Args: path (string, optional). Returns { url, credentialSource, usesSharedGatewayToken, hasTokenQuery }.",
+        ["app.chat.snapshot"] =
+            "READ-ALL: Return the current native chat snapshot for local automation. Args: threadId/sessionKey (string, optional). Returns connection state, compose target, thread summaries, queued outgoing messages, and recent timeline entries including chat text.",
+        ["app.chat.send"] =
+            "Send a message through the native chat provider. Args: message (string, required), threadId/sessionKey (string, optional; defaults to the current compose/default thread). Returns { sent, threadId, entryCount, turnActive, error? }.",
+        ["app.chat.reset"] =
+            "Reset a chat session through the gateway sessions.reset path. Args: threadId/sessionKey (string, optional; defaults to the current compose/default thread, so no-arg reset clears the active chat). Returns { reset, threadId, error? }.",
+        ["app.chat.queue.list"] =
+            "READ-ALL: List native chat outgoing queue entries. Args: threadId/sessionKey (string, optional; omit to return all queued threads). Returns { defaultThreadId, requestedThreadId, totalCount, selectedThread, threads: [{ threadId, count, messages: [{ id, text, createdAt, sendState, errorText, canCancel }] }] }.",
+        ["app.chat.queue.cancel"] =
+            "Cancel/remove one native chat outgoing queue entry before it is sent. Args: queuedMessageId (string, required), threadId/sessionKey (string, required; use the threadId returned by app.chat.queue.list or app.chat.snapshot). Only Queued/Failed entries can be removed; Sending entries may already have reached the gateway. Returns { canceled, threadId, queuedMessageId, remainingCount, error? }.",
 
         // location.*
         ["location.get"] =
diff --git a/src/OpenClaw.Shared/MenuSizingHelper.cs b/src/OpenClaw.Shared/MenuSizingHelper.cs
index 9eb67a8ec..4e380a95f 100644
--- a/src/OpenClaw.Shared/MenuSizingHelper.cs
+++ b/src/OpenClaw.Shared/MenuSizingHelper.cs
@@ -15,6 +15,14 @@ public static int ConvertPixelsToViewUnits(int pixels, uint dpi)
         return Math.Max(1, (int)Math.Floor(pixels * 96.0 / dpi));
     }
 
+    public static int ConvertViewUnitsToPixels(double viewUnits, uint dpi)
+    {
+        if (!double.IsFinite(viewUnits) || viewUnits <= 0) return 0;
+        if (dpi == 0) dpi = 96;
+
+        return Math.Max(1, (int)Math.Ceiling(viewUnits * dpi / 96.0));
+    }
+
     public static bool HasDpiOrScaleChanged(uint previousDpi, double previousRasterizationScale, uint currentDpi, double currentRasterizationScale)
     {
         previousDpi = NormalizeDpi(previousDpi);
diff --git a/src/OpenClaw.Shared/Models.cs b/src/OpenClaw.Shared/Models.cs
index f918f0ab8..783208799 100644
--- a/src/OpenClaw.Shared/Models.cs
+++ b/src/OpenClaw.Shared/Models.cs
@@ -98,6 +98,7 @@ public class OpenClawNotification
 {
     public string Title { get; set; } = "";
     public string Message { get; set; } = "";
+    public string? FullMessage { get; set; }
     public string Type { get; set; } = "";
     public bool IsChat { get; set; } = false; // True if from chat response
 
@@ -1160,6 +1161,7 @@ public static class CommandCenterCommandGroups
     public static readonly string[] DangerousCommands =
     [
         .. CommonDangerousCommands,
+        "tts.status",
         "stt.transcribe",
         "stt.listen",
         "stt.status"
@@ -1766,6 +1768,12 @@ internal static string FormatLargeNumber(long n)
 /// </summary>
 public class ChatMessageInfo
 {
+    public const string SilentAssistantDirective = "NO_REPLY";
+
+    public static bool IsSilentAssistantDirective(string? role, string? text) =>
+        string.Equals(role, "assistant", StringComparison.OrdinalIgnoreCase) &&
+        string.Equals(text?.Trim(), SilentAssistantDirective, StringComparison.Ordinal);
+
     /// <summary>Session this message belongs to (e.g. "main").</summary>
     public string SessionKey { get; set; } = "";
 
@@ -1990,7 +1998,27 @@ public sealed class ChatSendResult
 {
     public string? RunId { get; init; }
     public string? SessionKey { get; init; }
+    public string? Status { get; init; }
+    public string? Error { get; init; }
     public bool Cached { get; init; }
+
+    public bool IsTerminalFailure => IsFailureStatus(Status) || !string.IsNullOrWhiteSpace(Error);
+
+    public static bool IsFailureStatus(string? status)
+    {
+        if (string.IsNullOrWhiteSpace(status))
+            return false;
+
+        return status.Equals("failed", StringComparison.OrdinalIgnoreCase)
+            || status.Equals("failure", StringComparison.OrdinalIgnoreCase)
+            || status.Equals("error", StringComparison.OrdinalIgnoreCase)
+            || status.Equals("rejected", StringComparison.OrdinalIgnoreCase)
+            || status.Equals("denied", StringComparison.OrdinalIgnoreCase)
+            || status.Equals("aborted", StringComparison.OrdinalIgnoreCase)
+            || status.Equals("timeout", StringComparison.OrdinalIgnoreCase)
+            || status.Equals("cancelled", StringComparison.OrdinalIgnoreCase)
+            || status.Equals("canceled", StringComparison.OrdinalIgnoreCase);
+    }
 }
 
 // ── Node/Device Pairing ──
@@ -2074,9 +2102,28 @@ public class ModelInfo
     public string? Name { get; set; }
     public string? Provider { get; set; }
     public int? ContextWindow { get; set; }
+
+    /// <summary>True when the model's provider is configured on the gateway.</summary>
     public bool IsConfigured { get; set; }
     public bool HasConfiguredFlag { get; set; }
 
+    /// <summary>True when the gateway marks this model as the default choice.</summary>
+    public bool IsDefault { get; set; }
+
+    /// <summary>
+    /// True when the model can be selected/used right now. Defaults to
+    /// <c>true</c> so models lists from gateways that don't report availability
+    /// are treated as usable. The gateway may report <c>available:false</c> or
+    /// <c>unavailable:true</c> to mark a model as not selectable.
+    /// </summary>
+    public bool IsAvailable { get; set; } = true;
+
+    /// <summary>
+    /// True when the model's provider needs authentication/credentials before
+    /// it can be used (e.g. an API key has not been configured yet).
+    /// </summary>
+    public bool RequiresAuth { get; set; }
+
     public string DisplayName => Name ?? Id;
 }
 
diff --git a/src/OpenClaw.Shared/Mxc/DirectAppContainerExecutor.cs b/src/OpenClaw.Shared/Mxc/DirectAppContainerExecutor.cs
index ec46c1316..d92640923 100644
--- a/src/OpenClaw.Shared/Mxc/DirectAppContainerExecutor.cs
+++ b/src/OpenClaw.Shared/Mxc/DirectAppContainerExecutor.cs
@@ -43,12 +43,18 @@ public sealed class DirectAppContainerExecutor : ISandboxExecutor
     /// </summary>
     private const int Base64ConfigCharLimit = 25_000;
 
-    private readonly MxcAvailability _availability;
+    private readonly Func<MxcAvailability> _availabilityProvider;
     private readonly IOpenClawLogger _logger;
 
-    public DirectAppContainerExecutor(MxcAvailability availability, IOpenClawLogger? logger = null)
+    /// <summary>
+    /// Resolves availability lazily via <paramref name="availabilityProvider"/> so the
+    /// executor always sees the current probe verdict. A fixed snapshot would freeze a
+    /// startup probe error for the executor's lifetime even after the host recovers
+    /// (the re-probe would update the caller's gate but not this executor).
+    /// </summary>
+    public DirectAppContainerExecutor(Func<MxcAvailability> availabilityProvider, IOpenClawLogger? logger = null)
     {
-        _availability = availability;
+        _availabilityProvider = availabilityProvider ?? throw new ArgumentNullException(nameof(availabilityProvider));
         _logger = logger ?? NullLogger.Instance;
     }
 
@@ -56,11 +62,15 @@ public async Task<SandboxExecutionResult> ExecuteAsync(
         SandboxExecutionRequest request,
         CancellationToken ct = default)
     {
-        if (!_availability.IsAppContainerAvailable)
+        // Resolve the live availability for THIS invocation so a transient startup
+        // probe error that has since recovered doesn't permanently fail us closed.
+        var availability = _availabilityProvider();
+
+        if (!availability.IsAppContainerAvailable)
             throw new SandboxUnavailableException(
-                _availability.UnsupportedReasons.FirstOrDefault() ?? "AppContainer unavailable");
+                availability.UnsupportedReasons.FirstOrDefault() ?? "AppContainer unavailable");
 
-        if (!_availability.IsWxcExecResolvable || string.IsNullOrEmpty(_availability.WxcExecPath))
+        if (!availability.IsWxcExecResolvable || string.IsNullOrEmpty(availability.WxcExecPath))
             throw new SandboxUnavailableException("wxc-exec.exe not found");
 
         var capBytes = request.MaxOutputBytes is > 0 ? request.MaxOutputBytes.Value : DefaultMaxOutputBytes;
@@ -78,16 +88,16 @@ public async Task<SandboxExecutionResult> ExecuteAsync(
                 : config.Process.Cwd;
 
             WarnIfUnsupportedVolume(config);
-            LogConfig(config, configJson, request);
+            LogConfig(config, configJson, request, availability);
 
             MxcExecutor executor;
             try
             {
-                executor = new MxcExecutor(_availability.WxcExecPath, stdoutCapBytes: capInt, stderrCapBytes: capInt);
+                executor = new MxcExecutor(availability.WxcExecPath, stdoutCapBytes: capInt, stderrCapBytes: capInt);
             }
             catch (FileNotFoundException ex)
             {
-                throw new SandboxUnavailableException($"wxc-exec.exe not found at {_availability.WxcExecPath}", ex);
+                throw new SandboxUnavailableException($"wxc-exec.exe not found at {availability.WxcExecPath}", ex);
             }
 
             // Local timeout + caller cancellation. Mirror the builder's
@@ -180,7 +190,7 @@ private static void TryDeleteDir(string? path)
         catch (Exception ex) { Trace.WriteLine($"DirectAppContainerExecutor.TryDeleteDir '{path}' (best-effort) failed: {ex.Message}"); }
     }
 
-    private void LogConfig(MxcConfig config, string configJson, SandboxExecutionRequest request)
+    private void LogConfig(MxcConfig config, string configJson, SandboxExecutionRequest request, MxcAvailability availability)
     {
         // Default: redacted summary. Field counts only; no paths, no command line,
         // no env values. Useful for verifying Sandbox UI settings round-tripped
@@ -190,21 +200,7 @@ private void LogConfig(MxcConfig config, string configJson, SandboxExecutionRequ
             .OrderBy(k => k, StringComparer.OrdinalIgnoreCase)
             .ToArray() ?? Array.Empty<string>();
 
-        var summary =
-            "[mxc] wxc-exec config (redacted) " +
-            $"wxcExec={_availability.WxcExecPath}; configBytes={Encoding.UTF8.GetByteCount(configJson)}; " +
-            $"containerId={config.ContainerId}; version={config.Version}; " +
-            $"commandLineLength={config.Process.CommandLine?.Length ?? 0}; " +
-            $"cwd={(string.IsNullOrEmpty(config.Process.Cwd) ? "<null>" : "<set>")}; " +
-            $"envKeys=[{string.Join(",", envKeys)}]; " +
-            $"timeoutMs={config.Process.TimeoutMs?.ToString() ?? "<null>"}; " +
-            $"capabilities=[{string.Join(",", config.AppContainer?.Capabilities ?? Array.Empty<string>())}]; " +
-            $"readonlyCount={config.Filesystem?.ReadonlyPaths?.Length ?? 0}; " +
-            $"readwriteCount={config.Filesystem?.ReadwritePaths?.Length ?? 0}; " +
-            $"deniedCount={config.Filesystem?.DeniedPaths?.Length ?? 0}; " +
-            $"network={{defaultPolicy={config.Network?.DefaultPolicy ?? "<null>"},enforcementMode={config.Network?.EnforcementMode ?? "<null>"}}}; " +
-            $"ui={{disable={config.Ui?.Disable},clipboard={config.Ui?.Clipboard ?? "<null>"},injection={config.Ui?.Injection}}}; " +
-            $"maxOutputBytes={request.MaxOutputBytes?.ToString() ?? "<default>"}";
+        var summary = BuildRedactedConfigSummary(availability, config, configJson, request);
         _logger.Debug(summary);
         Trace.WriteLine(summary);
 
@@ -226,6 +222,39 @@ private void LogConfig(MxcConfig config, string configJson, SandboxExecutionRequ
         }
     }
 
+    internal static string BuildRedactedConfigSummary(
+        MxcAvailability availability,
+        MxcConfig config,
+        string configJson,
+        SandboxExecutionRequest request)
+    {
+        // Default diagnostics must not expose host paths. Keep path presence as
+        // a state flag; the opt-in full diagnostics channel owns path-bearing repro data.
+        var wxcExecState = availability.IsWxcExecResolvable && !string.IsNullOrWhiteSpace(availability.WxcExecPath)
+            ? "<set>"
+            : "<missing>";
+        var envKeys = config.Process.Env?
+            .Select(kv => kv.Split('=', 2)[0])
+            .OrderBy(k => k, StringComparer.OrdinalIgnoreCase)
+            .ToArray() ?? Array.Empty<string>();
+
+        return
+            "[mxc] wxc-exec config (redacted) " +
+            $"wxcExec={wxcExecState}; configBytes={Encoding.UTF8.GetByteCount(configJson)}; " +
+            $"containerId={config.ContainerId}; version={config.Version}; " +
+            $"commandLineLength={config.Process.CommandLine?.Length ?? 0}; " +
+            $"cwd={(string.IsNullOrEmpty(config.Process.Cwd) ? "<null>" : "<set>")}; " +
+            $"envKeys=[{string.Join(",", envKeys)}]; " +
+            $"timeoutMs={config.Process.TimeoutMs?.ToString() ?? "<null>"}; " +
+            $"capabilities=[{string.Join(",", config.ProcessContainer?.Capabilities ?? Array.Empty<string>())}]; " +
+            $"readonlyCount={config.Filesystem?.ReadonlyPaths?.Length ?? 0}; " +
+            $"readwriteCount={config.Filesystem?.ReadwritePaths?.Length ?? 0}; " +
+            $"deniedCount={config.Filesystem?.DeniedPaths?.Length ?? 0}; " +
+            $"network={{defaultPolicy={config.Network?.DefaultPolicy ?? "<null>"},enforcementMode={config.Network?.EnforcementMode ?? "<null>"}}}; " +
+            $"ui={{disable={config.Ui?.Disable},clipboard={config.Ui?.Clipboard ?? "<null>"},injection={config.Ui?.Injection}}}; " +
+            $"maxOutputBytes={request.MaxOutputBytes?.ToString() ?? "<default>"}";
+    }
+
     private void WarnIfUnsupportedVolume(MxcConfig config)
     {
         var paths = (config.Filesystem?.ReadonlyPaths ?? Array.Empty<string>())
diff --git a/src/OpenClaw.Shared/Mxc/MxcAvailability.cs b/src/OpenClaw.Shared/Mxc/MxcAvailability.cs
index bffe5a114..cc45468d3 100644
--- a/src/OpenClaw.Shared/Mxc/MxcAvailability.cs
+++ b/src/OpenClaw.Shared/Mxc/MxcAvailability.cs
@@ -1,16 +1,21 @@
-using Microsoft.Win32;
+using System.Diagnostics;
+using System.Text;
+using System.Text.Json;
 
 namespace OpenClaw.Shared.Mxc;
 
 /// <summary>
-/// Per-backend availability probe for MXC. Cached for the process lifetime.
+/// Per-backend availability probe for MXC. <see cref="Probe"/> is intended to be
+/// called once and its result cached by the caller (see NodeService).
 /// </summary>
 /// <remarks>
 /// Backends checked:
 /// <list type="bullet">
-/// <item><see cref="IsAppContainerAvailable"/> — Windows 11 build 26300 with UBR &gt;= 8289, x64 / arm64.</item>
+/// <item><see cref="IsAppContainerAvailable"/> — the native <c>wxc-exec --probe</c>
+///   reports a usable isolation tier on this host. This is the source of truth
+///   for "does this machine support the sandbox".</item>
 /// <item><see cref="IsWxcExecResolvable"/> — wxc-exec.exe found in the shipped tray output layout or via override.</item>
-/// <item><see cref="IsIsolationSessionAvailable"/> — requires AppContainer plus IsolationProxy.exe in System32.</item>
+/// <item><see cref="IsIsolationSessionAvailable"/> — requires a supported host plus IsolationProxy.exe in System32.</item>
 /// </list>
 /// </remarks>
 public sealed class MxcAvailability
@@ -22,26 +27,61 @@ public sealed class MxcAvailability
     /// </summary>
     public const string WxcExecOverrideEnvVar = "OPENCLAW_WXC_EXEC";
 
-    private const int SupportedBuild = 26300;
+    /// <summary>
+    /// Bound on how long we wait for <c>wxc-exec --probe</c> before treating the
+    /// host as unable to run the sandbox.
+    /// </summary>
+    private const int ProbeTimeoutMs = 15_000;
 
-    // TODO: This is all temporary and a moment in time; feature gate this correctly ASAP.
     /// <summary>
-    /// Temporary MXC support table: only build 26300 with UBR 8289+ is enabled.
-    /// All other builds are blocked until validated and the table is updated.
+    /// Minimum time allowed for draining stdout/stderr after the probe process
+    /// exits, so a process that exits right at the deadline doesn't false-timeout
+    /// while its (tiny) output is still being read.
     /// </summary>
-    private const int MinSupportedUbr = 8289;
+    private const int MinReadDrainMs = 2_000;
 
     public bool IsAppContainerAvailable { get; }
     public bool IsIsolationSessionAvailable { get; }
     public bool IsWxcExecResolvable { get; }
     public string? WxcExecPath { get; }
 
+    /// <summary>
+    /// True when the availability verdict came from a <em>probe error</em>
+    /// (timeout, failure to launch <c>wxc-exec</c>, or unparseable output) rather
+    /// than a definitive answer (supported, or the host reporting unsupported).
+    /// Callers should treat an errored verdict as transient — re-probe instead of
+    /// caching it for the process lifetime — so a momentary glitch doesn't pin the
+    /// whole process to uncontained execution.
+    /// </summary>
+    public bool ProbeErrored { get; }
+
+    /// <summary>
+    /// Isolation tier the probe selected for this host (e.g. <c>base-container</c>,
+    /// <c>appcontainer-bfs</c>, <c>appcontainer-dacl</c>), or null when unsupported
+    /// / not probed. Informational; <see cref="IsDegradedContainment"/> is the
+    /// derived signal UX should react to.
+    /// </summary>
+    public string? IsolationTier { get; }
+
+    /// <summary>
+    /// True when the probe indicated the host needs host-DACL augmentation to
+    /// contain (a weaker, last-resort path).
+    /// </summary>
+    public bool NeedsDaclAugmentation { get; }
+
     /// <summary>
     /// Human-readable list of reasons MXC may not be available. Empty when fully supported.
     /// Surface to UX so users know why the sandbox toggle is disabled.
     /// </summary>
     public IReadOnlyList<string> UnsupportedReasons { get; }
 
+    /// <summary>Tiers we consider full-strength containment. Anything else that
+    /// still contains (e.g. <c>appcontainer-dacl</c>, or an unrecognized future
+    /// tier string) is treated as degraded so UX can warn without dropping the
+    /// host all the way to uncontained.</summary>
+    private static readonly HashSet<string> FullStrengthTiers =
+        new(StringComparer.OrdinalIgnoreCase) { "base-container", "appcontainer-bfs" };
+
     /// <summary>True iff at least one MXC backend is supported AND
     /// <c>wxc-exec.exe</c> is resolvable. (Without wxc-exec the executor will refuse
     /// to run, so reporting "available" would lie to the UI.)</summary>
@@ -49,25 +89,55 @@ public sealed class MxcAvailability
         (IsAppContainerAvailable || IsIsolationSessionAvailable)
         && IsWxcExecResolvable;
 
+    /// <summary>
+    /// True when MXC is available but only via a weaker, last-resort isolation tier
+    /// (DACL augmentation, or a tier we don't recognize as full-strength). Still
+    /// contained — surface as a warning, not a block; refusing would drop the host
+    /// to fully uncontained execution, which is strictly worse.
+    /// </summary>
+    public bool IsDegradedContainment =>
+        HasAnyBackend
+        && (NeedsDaclAugmentation
+            || string.IsNullOrEmpty(IsolationTier)
+            || !FullStrengthTiers.Contains(IsolationTier));
+
     public MxcAvailability(
         bool isAppContainerAvailable,
         bool isIsolationSessionAvailable,
         bool isWxcExecResolvable,
         string? wxcExecPath,
-        IReadOnlyList<string> unsupportedReasons)
+        IReadOnlyList<string> unsupportedReasons,
+        bool probeErrored = false,
+        string? isolationTier = null,
+        bool needsDaclAugmentation = false)
     {
         IsAppContainerAvailable = isAppContainerAvailable;
         IsIsolationSessionAvailable = isIsolationSessionAvailable;
         IsWxcExecResolvable = isWxcExecResolvable;
         WxcExecPath = wxcExecPath;
         UnsupportedReasons = unsupportedReasons;
+        ProbeErrored = probeErrored;
+        IsolationTier = isolationTier;
+        NeedsDaclAugmentation = needsDaclAugmentation;
     }
 
     /// <summary>
     /// Probe the running environment. Designed to be called once at app startup
-    /// and the result cached.
+    /// and the result cached. Host support is determined by the native
+    /// <c>wxc-exec --probe</c> command rather than a hardcoded build/UBR table,
+    /// so newer Windows builds light up automatically without a code change.
     /// </summary>
     public static MxcAvailability Probe(IOpenClawLogger? logger = null)
+        => Probe(logger, probeRunner: null);
+
+    /// <summary>
+    /// Test seam for <see cref="Probe(IOpenClawLogger?)"/>. <paramref name="probeRunner"/>
+    /// substitutes the <c>wxc-exec --probe</c> invocation; production passes
+    /// <c>null</c> to spawn the real process.
+    /// </summary>
+    internal static MxcAvailability Probe(
+        IOpenClawLogger? logger,
+        Func<string, WxcProbeInvocation>? probeRunner)
     {
         var log = logger ?? NullLogger.Instance;
         var reasons = new List<string>();
@@ -78,81 +148,270 @@ public static MxcAvailability Probe(IOpenClawLogger? logger = null)
             return new MxcAvailability(false, false, false, null, reasons);
         }
 
-        var (build, ubr) = ReadWindowsBuildAndUbr();
-        var windowsSupportReason = GetWindowsBuildUnsupportedReason(build, ubr);
-        if (windowsSupportReason is not null)
-            reasons.Add(windowsSupportReason);
-
-        var isAppContainerSupported = windowsSupportReason is null;
-
+        // wxc-exec is the source of truth for host support, so resolve it first.
+        // Without the binary we cannot probe and therefore report unavailable.
         var (wxcResolvable, wxcPath) = ResolveWxcExec();
-        if (!wxcResolvable)
+        if (!wxcResolvable || string.IsNullOrEmpty(wxcPath))
+        {
             reasons.Add($"wxc-exec.exe not found. Set {WxcExecOverrideEnvVar} or build the tray app to copy it into the output folder.");
+            return new MxcAvailability(false, false, false, null, reasons);
+        }
+
+        // Ask the native binary whether this host can run the sandbox and at what
+        // isolation tier.
+        WxcProbeInvocation invocation;
+        try
+        {
+            invocation = (probeRunner ?? RunWxcExecProbe)(wxcPath);
+        }
+        catch (Exception ex)
+        {
+            invocation = new WxcProbeInvocation(WxcProbeStatus.LaunchFailed, 0, string.Empty, $"Failed to launch wxc-exec --probe: {ex.Message}");
+        }
+
+        var probe = ParseProbeOutput(invocation.Status, invocation.ExitCode, invocation.StdOut, invocation.StdErr);
+        var isAppContainerSupported = probe.Supported;
+        if (!isAppContainerSupported)
+            reasons.Add(probe.FailureReason ?? "This Windows host does not support the MXC sandbox (wxc-exec --probe reported no usable tier).");
 
         // isolation_session additionally requires Feature_IsoBrokerSessionApis on the OS
         // and IsolationProxy.exe in System32. We currently only check file presence.
         var isolationProxyPath = Path.Combine(
             Environment.GetFolderPath(Environment.SpecialFolder.System),
             "IsolationProxy.exe");
-        var isIsolationSessionSupported = isAppContainerSupported
-            && wxcResolvable
-            && File.Exists(isolationProxyPath);
+        var isIsolationSessionSupported = isAppContainerSupported && File.Exists(isolationProxyPath);
+
+        var probeErrored = probe.Outcome == MxcProbeOutcome.ProbeError;
 
         log.Info(
-            $"[mxc] availability: appcontainer={isAppContainerSupported} " +
+            $"[mxc] availability: supported={isAppContainerSupported} " +
+            $"outcome={probe.Outcome} " +
+            $"tier={probe.Tier ?? "<none>"} needsDaclAugmentation={probe.NeedsDaclAugmentation} " +
             $"isolation_session={isIsolationSessionSupported} " +
-            $"wxc-exec={(wxcResolvable ? wxcPath : "<missing>")} " +
+            $"wxc-exec={wxcPath} " +
+            $"warnings=[{string.Join(", ", probe.Warnings)}] " +
             $"reasons=[{string.Join(", ", reasons)}]");
 
         return new MxcAvailability(
             isAppContainerSupported,
             isIsolationSessionSupported,
-            wxcResolvable,
+            isWxcExecResolvable: true,
             wxcPath,
-            reasons);
+            reasons,
+            probeErrored: probeErrored,
+            isolationTier: probe.Tier,
+            needsDaclAugmentation: probe.NeedsDaclAugmentation);
     }
 
-    internal static string? GetWindowsBuildUnsupportedReason(int build, int ubr)
+    /// <summary>
+    /// Parse the result of a <c>wxc-exec --probe</c> attempt into a support verdict,
+    /// classifying the outcome as <see cref="MxcProbeOutcome.Supported"/>,
+    /// <see cref="MxcProbeOutcome.UnsupportedHost"/> (the binary ran to completion and
+    /// reported no usable tier), or <see cref="MxcProbeOutcome.ProbeError"/> (we could
+    /// not get a verdict: timeout, launch failure, or a completed run with no usable
+    /// output). Probe errors are transient and should be re-probed, not cached.
+    /// Exposed for unit testing.
+    /// </summary>
+    internal static MxcProbeResult ParseProbeOutput(WxcProbeStatus status, int exitCode, string? stdout, string? stderr)
     {
-        if (build != SupportedBuild)
-            return $"Windows build {build} is not MXC supported build {SupportedBuild}.";
+        // We never obtained a verdict — our own infrastructure failure, not a host
+        // decision. Always transient/retryable, regardless of any exit code.
+        if (status != WxcProbeStatus.Completed)
+        {
+            var detail = FirstNonEmpty(stderr, stdout);
+            var what = status == WxcProbeStatus.TimedOut ? "timed out" : "could not be launched";
+            return Error(
+                $"Could not determine MXC sandbox support (wxc-exec --probe {what}{(detail is null ? "" : $": {Summarize(detail)}")}).");
+        }
+
+        // No/garbled output is a binary anomaly, not a clear answer —
+        // treat as a (retryable) probe error rather than silently "unsupported".
+        if (string.IsNullOrWhiteSpace(stdout))
+        {
+            var detail = FirstNonEmpty(stderr);
+            return Error(
+                $"Could not determine MXC sandbox support (wxc-exec --probe {(exitCode == 0 ? "returned no output" : $"exited {exitCode}")}{(detail is null ? "" : $": {Summarize(detail)}")}).");
+        }
+
+        try
+        {
+            using var doc = JsonDocument.Parse(stdout);
+            var root = doc.RootElement;
+            var warnings = ReadWarnings(root);
+
+            if (TryGetString(root, "error") is { } error)
+            {
+                return Unsupported(
+                    $"This Windows host does not support the MXC sandbox (wxc-exec --probe reported: {Summarize(error)}).",
+                    warnings);
+            }
+
+            if (root.TryGetProperty("supported", out var supportedEl)
+                && supportedEl.ValueKind == JsonValueKind.False)
+            {
+                return Unsupported(
+                    "This Windows host does not support the MXC sandbox (wxc-exec --probe reported no usable isolation tier).",
+                    warnings);
+            }
+
+            if (exitCode != 0)
+            {
+                var detail = FirstNonEmpty(stderr, stdout);
+                return Error(
+                    $"Could not determine MXC sandbox support (wxc-exec --probe exited {exitCode}{(detail is null ? "" : $": {Summarize(detail)}")}).");
+            }
+
+            if (root.ValueKind != JsonValueKind.Object
+                || !root.TryGetProperty("tier", out var tierEl)
+                || tierEl.ValueKind != JsonValueKind.String
+                || string.IsNullOrWhiteSpace(tierEl.GetString()))
+            {
+                return Error("Could not determine MXC sandbox support (wxc-exec --probe did not report an isolation tier).");
+            }
+
+            var needsDacl = root.TryGetProperty("needsDaclAugmentation", out var d)
+                && d.ValueKind == JsonValueKind.True;
+
+            return new MxcProbeResult(MxcProbeOutcome.Supported, tierEl.GetString(), needsDacl, warnings, null);
+        }
+        catch (JsonException ex)
+        {
+            var detail = FirstNonEmpty(stderr, stdout);
+            return Error(
+                $"Could not determine MXC sandbox support (wxc-exec --probe {(exitCode == 0 ? "returned unparseable output" : $"exited {exitCode}")}: {Summarize(detail ?? ex.Message)}).");
+        }
+
+        static MxcProbeResult Unsupported(string reason, IReadOnlyList<string>? warnings = null) =>
+            new(MxcProbeOutcome.UnsupportedHost, null, false, warnings ?? Array.Empty<string>(), reason);
+
+        static MxcProbeResult Error(string reason) =>
+            new(MxcProbeOutcome.ProbeError, null, false, Array.Empty<string>(), reason);
+
+        static string? TryGetString(JsonElement root, string propertyName)
+        {
+            if (root.ValueKind != JsonValueKind.Object
+                || !root.TryGetProperty(propertyName, out var property)
+                || property.ValueKind != JsonValueKind.String)
+            {
+                return null;
+            }
+
+            var value = property.GetString();
+            return string.IsNullOrWhiteSpace(value) ? null : value;
+        }
 
-        if (ubr < MinSupportedUbr)
+        static List<string> ReadWarnings(JsonElement root)
         {
-            return
-                $"Windows UBR {ubr} below MXC minimum {MinSupportedUbr} " +
-                $"(for build {SupportedBuild}). " +
-                "Install latest cumulative update.";
+            var warnings = new List<string>();
+            if (root.ValueKind != JsonValueKind.Object
+                || !root.TryGetProperty("warnings", out var w)
+                || w.ValueKind != JsonValueKind.Array)
+            {
+                return warnings;
+            }
+
+            foreach (var item in w.EnumerateArray())
+            {
+                if (item.ValueKind != JsonValueKind.String) continue;
+                var s = item.GetString();
+                if (!string.IsNullOrWhiteSpace(s)) warnings.Add(s);
+            }
+
+            return warnings;
         }
+    }
 
+    private static string? FirstNonEmpty(params string?[] values)
+    {
+        foreach (var v in values)
+            if (!string.IsNullOrWhiteSpace(v)) return v!.Trim();
         return null;
     }
 
-    private static (int build, int ubr) ReadWindowsBuildAndUbr()
+    private static string Summarize(string text)
     {
-        var build = Environment.OSVersion.Version.Build;
-        var ubr = 0;
-        if (!OperatingSystem.IsWindows())
-            return (build, ubr);
+        var collapsed = text.Replace("\r", " ").Replace("\n", " ").Trim();
+        return collapsed.Length <= 200 ? collapsed : collapsed[..200] + "…";
+    }
+
+    /// <summary>
+    /// Spawn <c>wxc-exec --probe</c> and capture its exit code and output.
+    /// Bounded by <see cref="ProbeTimeoutMs"/>; a timeout reports a non-zero exit.
+    /// </summary>
+    private static WxcProbeInvocation RunWxcExecProbe(string wxcExecPath)
+    {
+        using var process = new Process
+        {
+            StartInfo = new ProcessStartInfo
+            {
+                FileName = wxcExecPath,
+                RedirectStandardOutput = true,
+                RedirectStandardError = true,
+                UseShellExecute = false,
+                CreateNoWindow = true,
+                StandardOutputEncoding = Encoding.UTF8,
+                StandardErrorEncoding = Encoding.UTF8,
+            },
+        };
+        process.StartInfo.ArgumentList.Add("--probe");
 
+        process.Start();
+        // Read both pipes async to avoid a full-pipe deadlock.
+        var stdoutTask = process.StandardOutput.ReadToEndAsync();
+        var stderrTask = process.StandardError.ReadToEndAsync();
+
+        var sw = Stopwatch.StartNew();
+        if (!process.WaitForExit(ProbeTimeoutMs))
+            return KillAndTimeout(process, stdoutTask, stderrTask);
+
+        // WaitForExit(int) returns as soon as the immediate child exits, but the
+        // async readers only complete once the WRITE end of each pipe closes. If
+        // wxc-exec spawned a descendant that inherited the redirected handles
+        // (the SDK ships sandbox daemon/guest helpers), the pipes can stay open
+        // after the child exits and an unbounded GetResult() would hang past the
+        // timeout. So bound the drain with whatever time is left in the budget
+        // (with a small floor so a near-deadline exit doesn't false-timeout).
+        var elapsedMs = (int)Math.Min(sw.ElapsedMilliseconds, ProbeTimeoutMs);
+        var drainBudgetMs = Math.Max(ProbeTimeoutMs - elapsedMs, MinReadDrainMs);
         try
         {
-#pragma warning disable CA1416 // OperatingSystem.IsWindows() guard above; analyzer doesn't recognize it through callee.
-            using var key = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows NT\CurrentVersion");
-            var value = key?.GetValue("UBR");
-            if (value is int ubrInt)
-                ubr = ubrInt;
-#pragma warning restore CA1416
+            if (!Task.WhenAll(stdoutTask, stderrTask).Wait(drainBudgetMs))
+                return KillAndTimeout(process, stdoutTask, stderrTask);
         }
-        // slopwatch-ignore: SW003 Audited non-critical fallback is intentional and the caller preserves safe behavior without this work.
-        catch
+        catch (AggregateException)
         {
-            // Best-effort registry read; failure leaves ubr = 0 which fails the gate.
+            // A pipe read faulted (e.g. stream disposed). Treat as no output;
+            // ParseProbeOutput classifies exit 0 with empty stdout as a (retryable)
+            // probe error, and surfaces stderr if the exit code was non-zero.
         }
 
-        return (build, ubr);
+        return new WxcProbeInvocation(
+            WxcProbeStatus.Completed,
+            process.ExitCode,
+            stdoutTask.Status == TaskStatus.RanToCompletion ? stdoutTask.Result : string.Empty,
+            stderrTask.Status == TaskStatus.RanToCompletion ? stderrTask.Result : string.Empty);
     }
 
+    /// <summary>
+    /// Kill the probe process tree and return a timeout invocation. Observes the
+    /// abandoned read tasks so a later fault doesn't surface as an unobserved
+    /// task exception when the process/streams are disposed.
+    /// </summary>
+    private static WxcProbeInvocation KillAndTimeout(Process process, Task stdoutTask, Task stderrTask)
+    {
+        try { process.Kill(entireProcessTree: true); } catch { /* best-effort */ }
+        ObserveQuietly(stdoutTask);
+        ObserveQuietly(stderrTask);
+        return new WxcProbeInvocation(WxcProbeStatus.TimedOut, 0, string.Empty, "wxc-exec --probe timed out.");
+    }
+
+    private static void ObserveQuietly(Task task) =>
+        _ = task.ContinueWith(
+            static t => { _ = t.Exception; },
+            CancellationToken.None,
+            TaskContinuationOptions.OnlyOnFaulted | TaskContinuationOptions.ExecuteSynchronously,
+            TaskScheduler.Default);
+
     private static (bool resolvable, string? path) ResolveWxcExec()
     {
         var overridePath = Environment.GetEnvironmentVariable(WxcExecOverrideEnvVar);
@@ -196,3 +455,52 @@ private static (bool resolvable, string? path) ResolveWxcExec()
         _ => "x64",
     };
 }
+
+/// <summary>Outcome of attempting to run <c>wxc-exec --probe</c> (distinct from the
+/// host verdict it produces). Lets us tell our own infrastructure failures
+/// (timeout / launch failure) apart from a process that actually completed.</summary>
+internal enum WxcProbeStatus
+{
+    /// <summary>The process ran to completion; <c>ExitCode</c> and output are meaningful.</summary>
+    Completed,
+
+    /// <summary>The process did not exit within the timeout and was killed.</summary>
+    TimedOut,
+
+    /// <summary>The process could not be started at all.</summary>
+    LaunchFailed,
+}
+
+/// <summary>Raw result of invoking <c>wxc-exec --probe</c>. <c>ExitCode</c> is only
+/// meaningful when <c>Status</c> is <see cref="WxcProbeStatus.Completed"/>.</summary>
+internal readonly record struct WxcProbeInvocation(WxcProbeStatus Status, int ExitCode, string StdOut, string StdErr);
+
+/// <summary>
+/// Classification of a <c>wxc-exec --probe</c> attempt.
+/// </summary>
+internal enum MxcProbeOutcome
+{
+    /// <summary>The probe ran and reported a usable isolation tier.</summary>
+    Supported,
+
+    /// <summary>The probe ran and definitively reported the host cannot sandbox.</summary>
+    UnsupportedHost,
+
+    /// <summary>
+    /// We could not obtain a verdict (timeout, failure to launch, or exit 0 with
+    /// no usable output). Transient/indeterminate — should be re-probed, not cached.
+    /// </summary>
+    ProbeError,
+}
+
+/// <summary>Parsed host-support verdict derived from <c>wxc-exec --probe</c> output.</summary>
+internal sealed record MxcProbeResult(
+    MxcProbeOutcome Outcome,
+    string? Tier,
+    bool NeedsDaclAugmentation,
+    IReadOnlyList<string> Warnings,
+    string? FailureReason)
+{
+    /// <summary>Convenience: true only for <see cref="MxcProbeOutcome.Supported"/>.</summary>
+    public bool Supported => Outcome == MxcProbeOutcome.Supported;
+}
diff --git a/src/OpenClaw.Shared/Mxc/MxcCommandRunner.cs b/src/OpenClaw.Shared/Mxc/MxcCommandRunner.cs
index 2a71126f8..f481c5342 100644
--- a/src/OpenClaw.Shared/Mxc/MxcCommandRunner.cs
+++ b/src/OpenClaw.Shared/Mxc/MxcCommandRunner.cs
@@ -14,12 +14,14 @@ namespace OpenClaw.Shared.Mxc;
 /// Honors <see cref="SettingsData.SystemRunSandboxEnabled"/>:
 /// <list type="bullet">
 /// <item><c>true</c> (default) — sandbox via MXC when available; fall back uncontained when MXC is unavailable.</item>
+/// <item><c>true</c> with <see cref="SettingsData.SystemRunBlockHostFallbackWhenMxcUnavailable"/> set to <c>true</c> — deny when MXC is unavailable.</item>
 /// <item><c>false</c> — bypass MXC; route through the host runner.</item>
 /// </list>
 /// </remarks>
-public sealed class MxcCommandRunner : ICommandRunner
+public sealed class MxcCommandRunner : IHostFallbackAwareCommandRunner
 {
     public string Name => "mxc";
+    private const string DefaultSandboxShell = "cmd";
 
     private readonly ISandboxExecutor _executor;
     private readonly ICommandRunner _hostFallback;
@@ -47,28 +49,69 @@ public MxcCommandRunner(
         _logger = logger ?? NullLogger.Instance;
     }
 
+    public string ResolveEffectiveShell(string? requestedShell)
+    {
+        var settings = _settingsProvider();
+        if (!settings.SystemRunSandboxEnabled)
+            return _hostFallback.ResolveEffectiveShell(requestedShell);
+
+        if (!_isSandboxAvailable() && !settings.SystemRunBlockHostFallbackWhenMxcUnavailable)
+            return _hostFallback.ResolveEffectiveShell(requestedShell);
+
+        if (!string.IsNullOrWhiteSpace(requestedShell))
+            return ResolveSandboxShell(requestedShell);
+
+        return DefaultSandboxShell;
+    }
+
+    public string? ResolveHostFallbackShellForApproval(string? requestedShell, string effectiveShell)
+    {
+        var settings = _settingsProvider();
+        if (!settings.SystemRunSandboxEnabled || settings.SystemRunBlockHostFallbackWhenMxcUnavailable)
+            return null;
+
+        if (!string.IsNullOrWhiteSpace(requestedShell))
+            return null;
+
+        var hostShell = ResolveHostFallbackShell(requestedShell);
+        return string.Equals(hostShell, effectiveShell, StringComparison.OrdinalIgnoreCase)
+            ? null
+            : hostShell;
+    }
+
     public async Task<CommandResult> RunAsync(CommandRequest request, CancellationToken ct = default)
     {
         var settings = _settingsProvider();
+        var effectiveShell = ResolveEffectiveShell(request.Shell);
+        if (!TryValidateApprovedEffectiveShell(request, effectiveShell, out var approvalDeny))
+            return approvalDeny!;
 
-        // When MXC sandboxing isn't available on this host (e.g. Windows 10,
-        // build != 26300, UBR < 8289, or missing wxc-exec.exe), fall back to the host runner
-        // so the agent can still execute commands instead of being completely
-        // blocked. The Sandbox page is read-only in that state and tells the
-        // user their commands are running uncontained.
-        if (!_isSandboxAvailable())
+        if (!settings.SystemRunSandboxEnabled)
         {
-            _logger.Warn(
-                "[mxc] system.run UNCONTAINED: sandbox unavailable on this host. " +
-                "Commands will run on the host without containment. " +
-                "Update Windows to enable sandboxing.");
-            return await _hostFallback.RunAsync(request, ct);
+            _logger.Info("[mxc] sandbox=disabled; routing system.run through host runner");
+            return await RunHostFallbackAsync(request, effectiveShell, ct);
         }
 
-        if (!settings.SystemRunSandboxEnabled)
+        // Custom env changes the execution boundary. Until MXC can enforce it
+        // in-container, sandbox-enabled requests must not bypass policy through
+        // the MXC-unavailable compatibility fallback.
+        if (request.Env is { Count: > 0 })
+            return DenyCustomEnvUnsupported();
+
+        if (!_isSandboxAvailable())
         {
-            _logger.Info("[mxc] sandbox=disabled; routing system.run through host runner");
-            return await _hostFallback.RunAsync(request, ct);
+            if (settings.SystemRunBlockHostFallbackWhenMxcUnavailable)
+                return DenySandboxUnavailable(
+                    "Sandboxed system.run is enabled, but MXC is unavailable on this host and host fallback is blocked by settings. " +
+                    "Update Windows or repair MXC, or disable strict fallback blocking if uncontained host execution is acceptable.",
+                    "[mxc] system.run denied: sandbox unavailable and host fallback blocked by settings");
+
+            // Compatibility default: keep pre-MXC host execution unless the
+            // operator explicitly opts into strict sandbox-unavailable blocking.
+            _logger.Warn(
+                "[mxc] system.run UNCONTAINED: sandbox unavailable on this host; " +
+                "routing through host runner for compatibility.");
+            return await RunHostFallbackAsync(request, effectiveShell, ct);
         }
 
         // A direct-argv request reaching the sandbox cannot be honored: the sandbox
@@ -92,7 +135,7 @@ public async Task<CommandResult> RunAsync(CommandRequest request, CancellationTo
 
         var settingsDirectoryPath = _settingsDirectoryPathProvider();
         var policy = MxcPolicyBuilder.ForSystemRun(settings, settingsDirectoryPath);
-        var argsJson = SerializeArgs(request);
+        var argsJson = SerializeArgs(request, effectiveShell);
 
         // Compute the effective timeout: take the smaller of the agent-supplied
         // timeout (request.TimeoutMs) and the user's sandbox cap (policy.TimeoutMs).
@@ -112,7 +155,7 @@ public async Task<CommandResult> RunAsync(CommandRequest request, CancellationTo
 
         try
         {
-            LogSandboxRequest(sandboxRequest, request, settings, settingsDirectoryPath, policy);
+            LogSandboxRequest(sandboxRequest, request, effectiveShell, settings, settingsDirectoryPath, policy);
             var sandboxed = await _executor.ExecuteAsync(sandboxRequest, ct);
             LogSandboxResult(sandboxed);
             return new CommandResult
@@ -128,15 +171,23 @@ public async Task<CommandResult> RunAsync(CommandRequest request, CancellationTo
         {
             // Invalidate any cached availability — what we thought was available
             // turned out not to be at runtime. Next command re-probes and the
-            // top-level !_isSandboxAvailable() branch will handle the fallback.
-            // We also fall back to host execution for THIS call instead of
-            // denying it, matching the policy from issue #494.
+            // top-level !_isSandboxAvailable() branch will use the compatibility
+            // fallback until MXC is available again.
             _invalidateAvailability?.Invoke();
 
+            if (settings.SystemRunBlockHostFallbackWhenMxcUnavailable)
+                return DenySandboxUnavailable(
+                    "Sandboxed system.run is enabled, but MXC became unavailable at runtime and host fallback is blocked by settings: " +
+                    $"{ex.Message}. Repair MXC or disable strict fallback blocking if uncontained host execution is acceptable.",
+                    $"[mxc] system.run denied: sandbox became unavailable at runtime and host fallback is blocked by settings: {ex.Message}");
+
             _logger.Warn(
-                $"[mxc] system.run UNCONTAINED (sandbox enabled but unavailable at runtime: {ex.Message}). " +
-                "Falling back to host execution. Update Windows to enable sandboxing.");
-            return await _hostFallback.RunAsync(request, ct);
+                $"[mxc] system.run UNCONTAINED: sandbox became unavailable at runtime ({ex.Message}); " +
+                "routing through host runner for compatibility.");
+            if (!TryResolveApprovedHostFallbackShell(request, effectiveShell, out var hostShell, out var deny))
+                return deny!;
+
+            return await RunHostFallbackAsync(request, hostShell, ct);
         }
         catch (OperationCanceledException)
         {
@@ -144,6 +195,26 @@ public async Task<CommandResult> RunAsync(CommandRequest request, CancellationTo
             // caller sees the cancellation rather than a fake "exited 0" response.
             throw;
         }
+        catch (NotSupportedException ex)
+        {
+            if (IsPowerShellUiUnsupported(ex))
+            {
+                return DenySandboxUnavailable(
+                    "Sandboxed system.run cannot execute PowerShell-family shells with the current MXC UI-deny policy. " +
+                    "Retry with shell='cmd' or explicitly disable sandboxing if uncontained host execution is acceptable.",
+                    $"[mxc] system.run denied: PowerShell-family shell unsupported by MXC UI-deny policy: {ex.Message}");
+            }
+
+            _logger.Warn($"[mxc] system.run denied: unsupported sandbox request: {ex.Message}");
+            return new CommandResult
+            {
+                Stdout = string.Empty,
+                Stderr = ex.Message,
+                ExitCode = -1,
+                TimedOut = false,
+                DurationMs = 0,
+            };
+        }
         catch (Exception ex)
         {
             // Fail closed for ANY other error (bridge crashed, JSON malformed, IO
@@ -164,12 +235,146 @@ public async Task<CommandResult> RunAsync(CommandRequest request, CancellationTo
         }
     }
 
-    private static JsonElement SerializeArgs(CommandRequest request)
+    private CommandResult DenySandboxUnavailable(string stderr, string logMessage)
+    {
+        _logger.Warn(logMessage);
+        return new CommandResult
+        {
+            Stdout = string.Empty,
+            Stderr = stderr,
+            ExitCode = -1,
+            TimedOut = false,
+            DurationMs = 0,
+        };
+    }
+
+    private Task<CommandResult> RunHostFallbackAsync(CommandRequest request, string effectiveShell, CancellationToken ct)
+    {
+        var fallbackRequest = new CommandRequest
+        {
+            Command = request.Command,
+            Args = request.Args,
+            Argv = request.Argv,
+            Shell = effectiveShell,
+            Cwd = request.Cwd,
+            TimeoutMs = request.TimeoutMs,
+            Env = request.Env,
+            ApprovedEffectiveShell = request.ApprovedEffectiveShell,
+            ApprovedHostFallbackShell = request.ApprovedHostFallbackShell,
+        };
+        return _hostFallback.RunAsync(fallbackRequest, ct);
+    }
+
+    private static string ResolveSandboxShell(string requestedShell) =>
+        requestedShell.Trim().ToLowerInvariant() switch
+        {
+            "cmd" => "cmd",
+            "pwsh" => "pwsh",
+            "powershell" => "powershell",
+            _ => "powershell",
+        };
+
+    private string ResolveHostFallbackShell(string? requestedShell) =>
+        _hostFallback.ResolveEffectiveShell(requestedShell);
+
+    private static bool IsPowerShellUiUnsupported(NotSupportedException ex) =>
+        ex.Message.Contains("PowerShell-family shells require UI access", StringComparison.OrdinalIgnoreCase);
+
+    private bool TryValidateApprovedEffectiveShell(
+        CommandRequest request,
+        string effectiveShell,
+        out CommandResult? deny)
+    {
+        deny = null;
+        if (string.IsNullOrWhiteSpace(request.ApprovedEffectiveShell)
+            || string.Equals(request.ApprovedEffectiveShell, effectiveShell, StringComparison.OrdinalIgnoreCase)
+            || string.Equals(request.ApprovedHostFallbackShell, effectiveShell, StringComparison.OrdinalIgnoreCase))
+        {
+            return true;
+        }
+
+        deny = DenyEffectiveShellMismatch(request.ApprovedEffectiveShell!, effectiveShell);
+        return false;
+    }
+
+    private bool TryResolveApprovedHostFallbackShell(
+        CommandRequest request,
+        string effectiveShell,
+        out string hostShell,
+        out CommandResult? deny)
+    {
+        hostShell = ResolveHostFallbackShell(request.Shell);
+        deny = null;
+
+        if (!string.IsNullOrWhiteSpace(request.Shell)
+            || string.Equals(hostShell, effectiveShell, StringComparison.OrdinalIgnoreCase)
+            || string.Equals(request.ApprovedHostFallbackShell, hostShell, StringComparison.OrdinalIgnoreCase))
+        {
+            return true;
+        }
+
+        deny = DenyFallbackShellMismatch(effectiveShell, hostShell);
+        return false;
+    }
+
+    private CommandResult DenyEffectiveShellMismatch(string approvedShell, string effectiveShell)
+    {
+        var message =
+            "Sandboxed system.run could not execute because the effective shell changed " +
+            $"after approval. Approved shell was '{approvedShell}', but execution resolved " +
+            $"'{effectiveShell}'. Retry so the command can be approved for the current shell.";
+        _logger.Warn("[mxc] system.run denied: effective shell changed after approval");
+        return new CommandResult
+        {
+            Stdout = string.Empty,
+            Stderr = message,
+            ExitCode = -1,
+            TimedOut = false,
+            DurationMs = 0,
+        };
+    }
+
+    private CommandResult DenyCustomEnvUnsupported()
+    {
+        const string message =
+            "Sandboxed system.run does not currently support custom environment variables " +
+            "with the Windows MXC 0.7 processcontainer backend. Remove env from the request " +
+            "or explicitly disable sandboxing if uncontained host execution is acceptable.";
+        _logger.Warn("[mxc] system.run denied: custom env is unsupported by MXC processcontainer");
+        return new CommandResult
+        {
+            Stdout = string.Empty,
+            Stderr = message,
+            ExitCode = -1,
+            TimedOut = false,
+            DurationMs = 0,
+        };
+    }
+
+    private CommandResult DenyFallbackShellMismatch(string approvedShell, string hostFallbackShell)
+    {
+        var message =
+            "Sandboxed system.run could not safely fall back to host execution because the " +
+            $"pre-approved shell was '{approvedShell}' but host fallback would execute with " +
+            $"'{hostFallbackShell}' without prior approval. Retry with an explicit shell or after " +
+            "MXC availability has been re-probed.";
+        _logger.Warn("[mxc] system.run denied: host fallback shell would differ from approved shell");
+        return new CommandResult
+        {
+            Stdout = string.Empty,
+            Stderr = message,
+            ExitCode = -1,
+            TimedOut = false,
+            DurationMs = 0,
+        };
+    }
+
+    private static JsonElement SerializeArgs(CommandRequest request, string effectiveShell)
     {
         var payload = new
         {
             command = request.Command,
-            shell = request.Shell ?? "powershell",
+            shell = effectiveShell,
             args = request.Args ?? Array.Empty<string>(),
             cwd = request.Cwd,
             env = request.Env,
@@ -183,23 +388,40 @@ private static JsonElement SerializeArgs(CommandRequest request)
     private void LogSandboxRequest(
         SandboxExecutionRequest sandboxRequest,
         CommandRequest commandRequest,
+        string effectiveShell,
         SettingsData settings,
         string settingsDirectoryPath,
         SandboxPolicy policy)
     {
-        var settingsJson = JsonSerializer.Serialize(ToSandboxSettingsDiagnostic(settings, settingsDirectoryPath), DiagnosticJson);
-        var policyJson = JsonSerializer.Serialize(policy, DiagnosticJson);
+        var envKeys = commandRequest.Env?.Keys
+            .OrderBy(k => k, StringComparer.OrdinalIgnoreCase)
+            .ToArray() ?? Array.Empty<string>();
         var message =
             "[mxc] system.run sandbox request " +
             $"executor={_executor.Name}; contained={_executor.IsContained}; " +
-            $"sandboxSettingsJson={settingsJson}; " +
-            $"shell={commandRequest.Shell ?? "powershell"}; " +
+            $"sandboxSettings={{enabled={settings.SystemRunSandboxEnabled},blockHostFallbackWhenMxcUnavailable={settings.SystemRunBlockHostFallbackWhenMxcUnavailable}," +
+            $"allowOutbound={settings.SystemRunAllowOutbound},clipboard={settings.SandboxClipboard},documents={settings.SandboxDocumentsAccess?.ToString() ?? "<null>"}," +
+            $"downloads={settings.SandboxDownloadsAccess?.ToString() ?? "<null>"},desktop={settings.SandboxDesktopAccess?.ToString() ?? "<null>"}," +
+            $"customFolderCount={settings.SandboxCustomFolders?.Count ?? 0},timeoutMs={settings.SandboxTimeoutMs},maxOutputBytes={settings.SandboxMaxOutputBytes}," +
+            $"settingsDirectoryPath={(string.IsNullOrWhiteSpace(settingsDirectoryPath) ? "<null>" : "<set>")}}}; " +
+            $"shell={effectiveShell}; requestedShell={(string.IsNullOrWhiteSpace(commandRequest.Shell) ? "<auto>" : "<set>")}; " +
             $"commandLength={commandRequest.Command?.Length ?? 0}; " +
             $"cwd={(string.IsNullOrEmpty(commandRequest.Cwd) ? "<null>" : "<set>")}; " +
-            $"envKeys=[{string.Join(",", commandRequest.Env?.Keys.OrderBy(k => k, StringComparer.OrdinalIgnoreCase) ?? Enumerable.Empty<string>())}]; " +
+            $"envKeys=[{string.Join(",", envKeys)}]; " +
             $"timeoutMs={sandboxRequest.TimeoutMs}; maxOutputBytes={sandboxRequest.MaxOutputBytes?.ToString() ?? "<default>"}; " +
-            $"policyJson={policyJson}";
+            $"policy={{readonlyCount={policy.Filesystem?.ReadonlyPaths?.Count ?? 0},readwriteCount={policy.Filesystem?.ReadwritePaths?.Count ?? 0}," +
+            $"deniedCount={policy.Filesystem?.DeniedPaths?.Count ?? 0},networkAllowOutbound={policy.Network?.AllowOutbound},uiAllowWindows={policy.Ui?.AllowWindows}," +
+            $"clipboard={policy.Ui?.Clipboard},timeoutMs={policy.TimeoutMs?.ToString() ?? "<null>"}}}";
         LogMxcDiagnostic(message);
+
+        if (string.Equals(Environment.GetEnvironmentVariable(DirectAppContainerExecutor.LogFullConfigEnvVar), "1", StringComparison.Ordinal))
+        {
+            var settingsJson = JsonSerializer.Serialize(ToSandboxSettingsDiagnostic(settings, settingsDirectoryPath), DiagnosticJson);
+            var policyJson = JsonSerializer.Serialize(policy, DiagnosticJson);
+            LogMxcDiagnostic(
+                "[mxc] system.run sandbox request (full) " +
+                $"sandboxSettingsJson={settingsJson}; policyJson={policyJson}");
+        }
     }
 
     private static object ToSandboxSettingsDiagnostic(SettingsData settings, string settingsDirectoryPath)
@@ -207,6 +429,7 @@ private static object ToSandboxSettingsDiagnostic(SettingsData settings, string
         return new
         {
             systemRunSandboxEnabled = settings.SystemRunSandboxEnabled,
+            systemRunBlockHostFallbackWhenMxcUnavailable = settings.SystemRunBlockHostFallbackWhenMxcUnavailable,
             systemRunAllowOutbound = settings.SystemRunAllowOutbound,
             sandboxClipboard = settings.SandboxClipboard,
             sandboxDocumentsAccess = settings.SandboxDocumentsAccess,
diff --git a/src/OpenClaw.Shared/Mxc/MxcConfig.cs b/src/OpenClaw.Shared/Mxc/MxcConfig.cs
index d7b690de5..081073fc5 100644
--- a/src/OpenClaw.Shared/Mxc/MxcConfig.cs
+++ b/src/OpenClaw.Shared/Mxc/MxcConfig.cs
@@ -10,7 +10,7 @@ namespace OpenClaw.Shared.Mxc;
 public sealed record MxcConfig
 {
     [JsonPropertyName("version")]
-    public string Version { get; init; } = "0.4.0-alpha";
+    public string Version { get; init; } = "0.7.0-alpha";
 
     [JsonPropertyName("containerId")]
     public required string ContainerId { get; init; }
@@ -22,9 +22,9 @@ public sealed record MxcConfig
     [JsonPropertyName("process")]
     public required MxcProcess Process { get; init; }
 
-    [JsonPropertyName("appContainer")]
+    [JsonPropertyName("processContainer")]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public MxcAppContainer? AppContainer { get; init; }
+    public MxcProcessContainer? ProcessContainer { get; init; }
 
     [JsonPropertyName("filesystem")]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
@@ -61,7 +61,7 @@ public sealed record MxcProcess
     public int? TimeoutMs { get; init; }
 }
 
-public sealed record MxcAppContainer
+public sealed record MxcProcessContainer
 {
     [JsonPropertyName("capabilities")]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
diff --git a/src/OpenClaw.Shared/Mxc/MxcConfigBuilder.cs b/src/OpenClaw.Shared/Mxc/MxcConfigBuilder.cs
index bc5f67506..7aa471000 100644
--- a/src/OpenClaw.Shared/Mxc/MxcConfigBuilder.cs
+++ b/src/OpenClaw.Shared/Mxc/MxcConfigBuilder.cs
@@ -1,4 +1,6 @@
 using System.Text;
+using System.Security.AccessControl;
+using System.Security.Principal;
 
 namespace OpenClaw.Shared.Mxc;
 
@@ -11,12 +13,15 @@ namespace OpenClaw.Shared.Mxc;
 /// <list type="bullet">
 /// <item>Translates <see cref="SandboxPolicy"/> (from the Sandbox page) and the
 ///   agent's request into the JSON shape wxc-exec consumes.</item>
-/// <item><see cref="ResolvePathDirsForReadonly"/> — grants every existing
-///   <c>$PATH</c> directory as readonly so command-line tools (git, node,
-///   python, ...) can be read from inside the sandbox. Drive roots skipped.</item>
+/// <item><see cref="ResolvePathDirsForShellPath"/> — reconstructs a bounded
+///   <c>PATH</c> inside the launched shell and grants backend-safe PATH
+///   directories as readonly, so user-level tools can be resolved and executed
+///   without asking MXC's DACL fallback to prepare protected system directories.</item>
 /// <item>Scratch dir injection — adds the per-invocation scratch dir as
-///   readwrite and forces <c>TEMP</c>/<c>TMP</c>/<c>TMPDIR</c> at it so
-///   commands don't write to the user's real <c>%TEMP%</c>.</item>
+///   readwrite and bootstraps <c>TEMP</c>/<c>TMP</c>/<c>TMPDIR</c> inside the
+///   launched shell. Explicit <c>process.env</c> injection is intentionally
+///   disabled for the current Windows MXC 0.7 processcontainer backend because
+///   non-empty env entries fail process creation.</item>
 /// <item>Cwd auto-grant — adds <c>request.Cwd</c> as readonly when not already
 ///   covered by an allow grant. AppContainer does NOT auto-grant cwd, so this
 ///   is required for commands to even start.</item>
@@ -25,10 +30,18 @@ namespace OpenClaw.Shared.Mxc;
 ///   <c>-EncodedCommand</c>).</item>
 /// </list>
 /// Env scrubbing happens upstream in <c>SystemCapability.HandleRunAsync</c>
-/// via <c>ExecEnvSanitizer.Sanitize</c>; this class doesn't scrub env.
+/// via <c>ExecEnvSanitizer.Sanitize</c>; this class rejects explicit env until
+/// the backend accepts it.
 /// </remarks>
 public static class MxcConfigBuilder
 {
+    // MXC processcontainer defaults to cmd because it starts inside the
+    // AppContainer while preserving the default UI-deny boundary. PowerShell
+    // remains available when explicitly requested, but callers must supply a
+    // policy with AllowWindows=true because MXC 0.7 requires UI access for
+    // PowerShell startup.
+    private const string DefaultShell = "cmd";
+
     /// <summary>
     /// Default per-process timeout when the caller doesn't supply one.
     /// </summary>
@@ -39,40 +52,65 @@ public static class MxcConfigBuilder
     /// </summary>
     /// <param name="request">Capability invocation request.</param>
     /// <param name="scratchDir">Per-invocation scratch directory the executor created.</param>
-    /// <param name="containerId">Optional explicit container id (test/diagnostic use). Random GUID when null.</param>
-    /// <param name="pathEnvVar">Optional override for the PATH env-var contents (test use).</param>
     public static MxcConfig Build(
+        SandboxExecutionRequest request,
+        string scratchDir) =>
+        Build(request, scratchDir, MxcConfigBuildContext.Default);
+
+    internal static MxcConfig Build(
         SandboxExecutionRequest request,
         string scratchDir,
-        string? containerId = null,
-        string? pathEnvVar = null)
+        MxcConfigBuildContext context)
     {
         if (request is null) throw new ArgumentNullException(nameof(request));
         if (string.IsNullOrWhiteSpace(scratchDir)) throw new ArgumentException("scratchDir required", nameof(scratchDir));
+        if (context is null) throw new ArgumentNullException(nameof(context));
+        var readonlyGrantIsBackendSafe = context.ReadonlyGrantIsBackendSafe ?? IsBackendSafeReadonlyGrant;
 
         var policy = request.Policy;
         var args = ParseSystemRunArgs(request.Args);
+        var shell = NormalizeSupportedShell(args.Shell);
+        if (IsPowerShellFamilyShell(shell) && policy?.Ui?.AllowWindows != true)
+        {
+            throw new NotSupportedException(
+                "PowerShell-family shells require UI access with the Windows MXC 0.7 processcontainer backend.");
+        }
 
-        // commandLine — shell-quoted.
-        var commandLine = ShellCommandLine.Build(args.Shell, args.Command, args.Argv);
+        if (request.Env is { Count: > 0 })
+        {
+            throw new NotSupportedException(
+                "Explicit environment variables are not supported by the Windows MXC 0.7 processcontainer backend.");
+        }
 
-        // readonly = UI grants + every existing PATH dir (so tools like git,
-        // node, python can be read inside the sandbox). Additional compatibility
-        // paths are added below.
+        // readonly = UI grants. Additional compatibility paths are added below.
+        // PATH itself is bootstrapped inside the shell, and backend-safe PATH
+        // directories are also granted readonly so PATH-resolved user tools can
+        // actually be read/executed from inside AppContainer.
         var roFromPolicy = (policy?.Filesystem?.ReadonlyPaths ?? Array.Empty<string>()).ToList();
-        var pathDirs = ResolvePathDirsForReadonly(pathEnvVar);
+        var pathDirs = ResolvePathDirsForShellPath(context.PathEnvVar);
         foreach (var dir in pathDirs)
+        {
+            if (!readonlyGrantIsBackendSafe(dir)) continue;
             if (!roFromPolicy.Contains(dir, StringComparer.OrdinalIgnoreCase))
                 roFromPolicy.Add(dir);
+        }
+
+        // commandLine — shell-quoted, with PATH/TEMP/TMP/TMPDIR bootstrapped
+        // inside the shell because MXC 0.7 rejects non-empty process.env.
+        var commandLine = ShellCommandLine.Build(shell, args.Command, args.Argv, scratchDir, pathDirs);
+        var allowWindows = policy?.Ui?.AllowWindows == true;
 
         // readwrite = UI grants + scratch dir.
         var rwFromPolicy = (policy?.Filesystem?.ReadwritePaths ?? Array.Empty<string>()).ToList();
         if (!rwFromPolicy.Contains(scratchDir, StringComparer.OrdinalIgnoreCase))
             rwFromPolicy.Add(scratchDir);
-        AddCompatibilityReadonlyPaths(roFromPolicy, roFromPolicy.Concat(rwFromPolicy).ToArray());
 
         // denied list from policy (settings dir, ~/.ssh, browser profiles, ...).
-        var denied = (policy?.Filesystem?.DeniedPaths ?? Array.Empty<string>()).ToList();
+        // Keep the full list for local allow-list filtering, but do not emit
+        // filesystem.deniedPaths to wxc-exec. Windows MXC 0.7 rejects that field;
+        // omitted grants remain denied by default inside the AppContainer.
+        var deniedForFiltering = (policy?.Filesystem?.DeniedPaths ?? Array.Empty<string>()).ToList();
+        string[]? deniedForBackend = null;
 
         // cwd auto-grant — AppContainer does not auto-grant the working
         // directory. Give ungranted cwd read access so shells can start, but
@@ -82,18 +120,18 @@ public static MxcConfig Build(
             && !IsCoveredBy(request.Cwd, roFromPolicy)
             && !IsCoveredBy(request.Cwd, rwFromPolicy))
         {
-            if (!OverlapsAny(request.Cwd, denied))
+            if (!OverlapsAny(request.Cwd, deniedForFiltering))
                 roFromPolicy.Add(request.Cwd);
         }
 
         // Deny wins: strip any allow that overlaps a deny after the merges above.
-        roFromPolicy = FilterOutDenied(roFromPolicy, denied);
-        rwFromPolicy = FilterOutDenied(rwFromPolicy, denied);
+        roFromPolicy = FilterOutDenied(roFromPolicy, deniedForFiltering);
+        rwFromPolicy = FilterOutDenied(rwFromPolicy, deniedForFiltering);
 
-        // env — agent-supplied vars (already scrubbed upstream by
-        // ExecEnvSanitizer in SystemCapability) plus TEMP/TMP/TMPDIR forced
-        // to scratch.
-        var env = BuildEnv(request.Env, scratchDir, pathDirs);
+        // process.env — intentionally empty. MXC 0.7 processcontainer currently
+        // fails process creation when a non-empty process.env array is supplied,
+        // so shell-level bootstrap above carries PATH/scratch temp instead.
+        var env = BuildEnv(request.Env);
 
         // timeout — caller-supplied or default.
         var timeoutMs = request.TimeoutMs > 0 ? request.TimeoutMs : DefaultProcessTimeoutMs;
@@ -111,14 +149,14 @@ public static MxcConfig Build(
 
         var topLevelUi = new MxcUi
         {
-            Disable = true,
+            Disable = !allowWindows,
             Clipboard = MapClipboard(policy?.Ui?.Clipboard ?? ClipboardPolicy.None),
             Injection = false,
         };
 
-        var appContainerUi = new MxcBaseProcessUi
+        var processContainerUi = new MxcBaseProcessUi
         {
-            Isolation = "container",
+            Isolation = allowWindows ? "desktop" : "container",
             DesktopSystemControl = false,
             SystemSettings = "none",
             Ime = false,
@@ -127,9 +165,9 @@ public static MxcConfig Build(
         return new MxcConfig
         {
             Version = MxcPolicyBuilder.SupportedPolicyVersion,
-            ContainerId = containerId ?? Guid.NewGuid().ToString("N"),
+            ContainerId = context.ContainerId ?? Guid.NewGuid().ToString("N"),
             // Top-level "containment" is intentionally omitted; the SDK doesn't
-            // emit it either. Isolation lives in appContainer.ui.isolation.
+            // emit it either. Isolation lives in processContainer.ui.isolation.
             Process = new MxcProcess
             {
                 CommandLine = commandLine,
@@ -137,17 +175,17 @@ public static MxcConfig Build(
                 Env = env,
                 TimeoutMs = timeoutMs,
             },
-            AppContainer = new MxcAppContainer
+            ProcessContainer = new MxcProcessContainer
             {
                 LeastPrivilege = false,
                 Capabilities = capabilities.ToArray(),
-                Ui = appContainerUi,
+                Ui = processContainerUi,
             },
             Filesystem = new MxcFilesystem
             {
                 ReadonlyPaths = roFromPolicy.ToArray(),
                 ReadwritePaths = rwFromPolicy.ToArray(),
-                DeniedPaths = denied.ToArray(),
+                DeniedPaths = deniedForBackend,
                 // SDK output didn't include clearPolicyOnExit even when the
                 // input policy had it set, so we omit it here too.
                 ClearPolicyOnExit = null,
@@ -163,11 +201,11 @@ public static MxcConfig Build(
     }
 
     /// <summary>
-    /// Walk PATH and return each existing directory as a readonly grant
-    /// candidate. Drive roots (e.g. <c>C:\</c>) are skipped so a misconfigured
-    /// PATH entry can't grant the entire system drive.
+    /// Walk PATH and return each existing directory for shell-level PATH
+    /// bootstrap. Drive roots (e.g. <c>C:\</c>) are skipped so a misconfigured
+    /// PATH entry cannot make the payload search an entire drive root.
     /// </summary>
-    public static List<string> ResolvePathDirsForReadonly(string? pathEnvVar = null)
+    public static List<string> ResolvePathDirsForShellPath(string? pathEnvVar = null)
     {
         var path = pathEnvVar ?? Environment.GetEnvironmentVariable("PATH") ?? string.Empty;
         var pathDirs = path
@@ -212,76 +250,117 @@ private static bool IsDriveRoot(string dir)
         }
     }
 
-    private static void AddCompatibilityReadonlyPaths(List<string> readonlyPaths, IEnumerable<string> grantedPaths)
+    private static bool IsBackendSafeReadonlyGrant(string dir)
     {
-        foreach (var path in grantedPaths)
-            AddCompatibilityReadonlyPath(readonlyPaths, path);
-
-        AddCompatibilityReadonlyPath(readonlyPaths, Environment.GetFolderPath(Environment.SpecialFolder.Windows));
-        AddCompatibilityReadonlyPath(readonlyPaths, Environment.GetEnvironmentVariable("SystemDrive") ?? string.Empty);
+        if (IsDriveRoot(dir)) return false;
+        if (IsProtectedSystemPath(dir)) return false;
+        if (!CanMxcDaclFallbackPreparePath(dir)) return false;
+        return true;
     }
 
-    private static void AddCompatibilityReadonlyPath(List<string> readonlyPaths, string path)
+    private static bool CanMxcDaclFallbackPreparePath(string dir)
     {
-        string? root;
-        try { root = Path.GetPathRoot(Path.GetFullPath(path)); }
-        catch { return; }
+        if (!OperatingSystem.IsWindows())
+            return true;
+
+        try
+        {
+            var identity = WindowsIdentity.GetCurrent();
+            var principals = new HashSet<SecurityIdentifier>();
+            if (identity.User is not null)
+                principals.Add(identity.User);
+            if (identity.Groups is not null)
+            {
+                foreach (var group in identity.Groups)
+                {
+                    if (group is SecurityIdentifier sid)
+                        principals.Add(sid);
+                }
+            }
 
-        if (string.IsNullOrWhiteSpace(root))
-            return;
+            if (principals.Count == 0)
+                return false;
 
-        if (!readonlyPaths.Contains(root, StringComparer.OrdinalIgnoreCase))
-            readonlyPaths.Add(root);
+            var rules = new DirectoryInfo(dir)
+                .GetAccessControl(AccessControlSections.Access)
+                .GetAccessRules(includeExplicit: true, includeInherited: true, targetType: typeof(SecurityIdentifier));
+
+            var allowed = false;
+            foreach (FileSystemAccessRule rule in rules)
+            {
+                if (rule.IdentityReference is not SecurityIdentifier sid || !principals.Contains(sid))
+                    continue;
+
+                if ((rule.FileSystemRights & (FileSystemRights.ChangePermissions | FileSystemRights.FullControl)) == 0)
+                    continue;
+
+                if (rule.AccessControlType == AccessControlType.Deny)
+                    return false;
+
+                if (rule.AccessControlType == AccessControlType.Allow)
+                    allowed = true;
+            }
+
+            return allowed;
+        }
+        catch
+        {
+            return false;
+        }
     }
 
-    /// <summary>
-    /// Build the env array (KEY=VALUE strings) the wxc-exec sandbox will inherit.
-    /// </summary>
-    /// <remarks>
-    /// Env from the agent has already been scrubbed upstream in
-    /// <c>SystemCapability.HandleRunAsync</c> via
-    /// <c>ExecEnvSanitizer.Sanitize</c> (which rejects the whole command if
-    /// anything dangerous is present). We pass the surviving entries through
-    /// and force <c>TEMP</c>/<c>TMP</c>/<c>TMPDIR</c> to <paramref name="scratchDir"/>
-    /// so tools inside the sandbox don't write into the user's real <c>%TEMP%</c>.
-    /// </remarks>
-    public static IReadOnlyList<string> BuildEnv(
-        IReadOnlyDictionary<string, string>? requestEnv,
-        string scratchDir,
-        IReadOnlyList<string>? pathDirs = null)
+    private static bool IsProtectedSystemPath(string dir)
     {
-        // Windows env vars are case-insensitive — use OrdinalIgnoreCase so
-        // duplicate-case agent entries don't end up as separate strings.
-        var env = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+        if (!OperatingSystem.IsWindows())
+            return false;
 
-        if (requestEnv is not null)
+        var normalized = NormalizePath(dir);
+        if (string.IsNullOrWhiteSpace(normalized))
+            return false;
+
+        foreach (var root in ProtectedSystemRoots())
         {
-            foreach (var (name, value) in requestEnv)
+            var protectedRoot = NormalizePath(root);
+            if (!string.IsNullOrWhiteSpace(protectedRoot) &&
+                IsSameOrNested(normalized, protectedRoot))
             {
-                if (string.IsNullOrEmpty(name) || value is null) continue;
-                // Reject names with NUL/CR/LF/'=' so an agent can't smuggle
-                // a second KEY=VALUE pair into a single name field.
-                bool malformed = false;
-                foreach (var ch in name)
-                {
-                    if (ch == '=' || ch == '\0' || ch == '\r' || ch == '\n')
-                    {
-                        malformed = true;
-                        break;
-                    }
-                }
-                if (malformed) continue;
-                env[name] = value;
+                return true;
             }
         }
 
-        env["TEMP"] = scratchDir;
-        env["TMP"] = scratchDir;
-        env["TMPDIR"] = scratchDir;
-        if (pathDirs is { Count: > 0 })
-            env["PATH"] = string.Join(Path.PathSeparator, pathDirs);
+        return false;
+    }
+
+    private static IEnumerable<string> ProtectedSystemRoots()
+    {
+        yield return Environment.GetFolderPath(Environment.SpecialFolder.Windows);
+        yield return Environment.GetEnvironmentVariable("SystemRoot") ?? string.Empty;
+        yield return Environment.GetEnvironmentVariable("windir") ?? string.Empty;
+        yield return Environment.GetFolderPath(Environment.SpecialFolder.System);
+        yield return Environment.GetFolderPath(Environment.SpecialFolder.SystemX86);
+        yield return Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles);
+        yield return Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86);
+        yield return Environment.GetFolderPath(Environment.SpecialFolder.CommonProgramFiles);
+        yield return Environment.GetFolderPath(Environment.SpecialFolder.CommonProgramFilesX86);
+    }
+
+    /// <summary>
+    /// Build the explicit process.env array for the wxc-exec sandbox.
+    /// </summary>
+    /// <remarks>
+    /// Current MXC 0.7 Windows processcontainer accepts an empty env array but
+    /// rejects non-empty entries at <c>CreateProcessW</c>. Emit an explicit
+    /// empty array for normal requests so the config does not rely on implicit
+    /// host-environment inheritance semantics. PATH and scratch temp variables
+    /// are set by the shell command line bootstrap instead.
+    /// </remarks>
+    public static IReadOnlyList<string>? BuildEnv(IReadOnlyDictionary<string, string>? requestEnv)
+    {
+        if (requestEnv is null || requestEnv.Count == 0)
+            return Array.Empty<string>();
 
-        return env.Select(kvp => $"{kvp.Key}={kvp.Value}").ToList();
+        throw new NotSupportedException(
+            "Explicit environment variables are not supported by the Windows MXC 0.7 processcontainer backend.");
     }
 
     private static List<string> FilterOutDenied(List<string> allowed, List<string> denied)
@@ -361,12 +440,12 @@ private static string NormalizePath(string path)
     private static SystemRunArgs ParseSystemRunArgs(System.Text.Json.JsonElement args)
     {
         if (args.ValueKind != System.Text.Json.JsonValueKind.Object)
-            return new SystemRunArgs("", "powershell", Array.Empty<string>());
+            return new SystemRunArgs("", DefaultShell, Array.Empty<string>());
 
         string command = args.TryGetProperty("command", out var c) && c.ValueKind == System.Text.Json.JsonValueKind.String
             ? (c.GetString() ?? "") : "";
         string shell = args.TryGetProperty("shell", out var s) && s.ValueKind == System.Text.Json.JsonValueKind.String
-            ? (s.GetString() ?? "powershell") : "powershell";
+            ? (s.GetString() ?? DefaultShell) : DefaultShell;
         string[] argv = Array.Empty<string>();
         if (args.TryGetProperty("args", out var a) && a.ValueKind == System.Text.Json.JsonValueKind.Array)
         {
@@ -378,9 +457,36 @@ private static SystemRunArgs ParseSystemRunArgs(System.Text.Json.JsonElement arg
         return new SystemRunArgs(command, shell, argv);
     }
 
+    private static bool IsPowerShellFamilyShell(string shell)
+    {
+        var normalized = shell.Trim().ToLowerInvariant();
+        return normalized is "powershell" or "pwsh";
+    }
+
+    private static string NormalizeSupportedShell(string shell)
+    {
+        var normalized = string.IsNullOrWhiteSpace(shell)
+            ? DefaultShell
+            : shell.Trim().ToLowerInvariant();
+        return normalized switch
+        {
+            "cmd" or "powershell" or "pwsh" => normalized,
+            _ => throw new NotSupportedException(
+                $"Unsupported shell '{shell}' for the Windows MXC 0.7 processcontainer backend."),
+        };
+    }
+
     private sealed record SystemRunArgs(string Command, string Shell, IReadOnlyList<string> Argv);
 }
 
+internal sealed record MxcConfigBuildContext(
+    string? ContainerId = null,
+    string? PathEnvVar = null,
+    Func<string, bool>? ReadonlyGrantIsBackendSafe = null)
+{
+    public static MxcConfigBuildContext Default { get; } = new();
+}
+
 /// <summary>
 /// Shell command-line construction for the sandboxed payload — wraps the
 /// agent's command in <c>cmd.exe /S /C "..."</c> or
@@ -389,24 +495,82 @@ private sealed record SystemRunArgs(string Command, string Shell, IReadOnlyList<
 /// </summary>
 internal static class ShellCommandLine
 {
-    public static string Build(string shell, string command, IReadOnlyList<string> argv)
+    private const int MaxShellBootstrapPathChars = 4096;
+    private static readonly string[] CmdBootstrapTempEnvNames = ["TEMP", "TMP", "TMPDIR"];
+
+    public static string Build(
+        string shell,
+        string command,
+        IReadOnlyList<string> argv,
+        string scratchDir,
+        IReadOnlyList<string> pathDirs)
     {
-        var normalized = (shell ?? "powershell").Trim().ToLowerInvariant();
+        var normalized = (shell ?? "cmd").Trim().ToLowerInvariant();
+        var bootstrapPathDirs = LimitPathDirsForCommandLine(pathDirs);
         return normalized switch
         {
-            "cmd" => BuildCmd(command, argv),
-            "pwsh" or "powershell" => BuildPowershell(normalized == "pwsh" ? "pwsh.exe" : "powershell.exe", command, argv),
-            _ => BuildPowershell("powershell.exe", command, argv),
+            "cmd" => BuildCmd(command, argv, scratchDir, bootstrapPathDirs),
+            "pwsh" or "powershell" => BuildPowershell(
+                normalized == "pwsh" ? ResolvePwshExe(pathDirs) : ResolveWindowsPowerShellExe(),
+                command,
+                argv,
+                scratchDir,
+                bootstrapPathDirs),
+            _ => throw new NotSupportedException(
+                $"Unsupported shell '{shell}' for the Windows MXC 0.7 processcontainer backend."),
         };
     }
 
-    private static string BuildCmd(string command, IReadOnlyList<string> argv)
+    private static IReadOnlyList<string> LimitPathDirsForCommandLine(IReadOnlyList<string> pathDirs)
+    {
+        if (pathDirs.Count == 0)
+            return Array.Empty<string>();
+
+        var bounded = new List<string>();
+        var currentLength = 0;
+        foreach (var dir in pathDirs)
+        {
+            var additionalLength = dir.Length + (bounded.Count == 0 ? 0 : 1);
+            if (currentLength + additionalLength > MaxShellBootstrapPathChars)
+                break;
+
+            bounded.Add(dir);
+            currentLength += additionalLength;
+        }
+
+        return bounded;
+    }
+
+    private static string BuildCmd(
+        string command,
+        IReadOnlyList<string> argv,
+        string scratchDir,
+        IReadOnlyList<string> pathDirs)
     {
+        ThrowIfCmdContainsLineBreak(command, nameof(command));
+        foreach (var arg in argv)
+            ThrowIfCmdContainsLineBreak(arg, "argv");
+
         // cmd /S /C "<command> [args]" — /S strips outer quotes so cmd treats
-        // everything after /C as the command line verbatim.
-        var sb = new StringBuilder("cmd.exe /S /C \"");
-        sb.Append(command);
-        foreach (var a in argv)
+        // everything after /C as the command line verbatim. If the payload
+        // references env vars we bootstrap in this same /C line, rewrite just
+        // those refs to delayed expansion; otherwise cmd expands %TEMP% before
+        // the preceding set command runs.
+        var rewrittenCommand = RewriteCmdBootstrapEnvRefs(command, pathDirs, out var needsDelayedExpansion);
+        var rewrittenArgv = new List<string>(argv.Count);
+        foreach (var arg in argv)
+        {
+            rewrittenArgv.Add(RewriteCmdBootstrapEnvRefs(arg, pathDirs, out var argNeedsDelayedExpansion));
+            needsDelayedExpansion |= argNeedsDelayedExpansion;
+        }
+
+        var sb = new StringBuilder(QuoteProcessPath(ResolveCmdExe()));
+        if (needsDelayedExpansion)
+            sb.Append(" /V:ON");
+        sb.Append(" /S /C \"");
+        AppendCmdEnvironmentBootstrap(sb, scratchDir, pathDirs);
+        sb.Append(rewrittenCommand);
+        foreach (var a in rewrittenArgv)
         {
             sb.Append(' ');
             sb.Append(QuoteForCmd(a));
@@ -415,11 +579,80 @@ private static string BuildCmd(string command, IReadOnlyList<string> argv)
         return sb.ToString();
     }
 
-    private static string BuildPowershell(string exe, string command, IReadOnlyList<string> argv)
+    private static void ThrowIfCmdContainsLineBreak(string value, string fieldName)
+    {
+        if (value.IndexOfAny(new[] { '\r', '\n' }) >= 0)
+        {
+            throw new NotSupportedException(
+                $"cmd shell {fieldName} values cannot contain CR or LF characters with the Windows MXC 0.7 processcontainer backend.");
+        }
+    }
+
+    private static string RewriteCmdBootstrapEnvRefs(
+        string value,
+        IReadOnlyList<string> pathDirs,
+        out bool rewritten)
+    {
+        rewritten = false;
+        var result = value;
+        foreach (var name in CmdBootstrapTempEnvNames)
+        {
+            result = ReplaceOrdinalIgnoreCase(
+                result,
+                $"%{name}%",
+                $"!{name}!",
+                ref rewritten);
+        }
+
+        if (pathDirs.Count > 0)
+        {
+            result = ReplaceOrdinalIgnoreCase(
+                result,
+                "%PATH%",
+                "!PATH!",
+                ref rewritten);
+        }
+
+        return result;
+    }
+
+    private static string ReplaceOrdinalIgnoreCase(
+        string value,
+        string search,
+        string replacement,
+        ref bool replaced)
+    {
+        var index = value.IndexOf(search, StringComparison.OrdinalIgnoreCase);
+        if (index < 0)
+            return value;
+
+        var sb = new StringBuilder(value.Length);
+        var cursor = 0;
+        while (index >= 0)
+        {
+            sb.Append(value, cursor, index - cursor);
+            sb.Append(replacement);
+            cursor = index + search.Length;
+            index = value.IndexOf(search, cursor, StringComparison.OrdinalIgnoreCase);
+            replaced = true;
+        }
+
+        sb.Append(value, cursor, value.Length - cursor);
+        return sb.ToString();
+    }
+
+    private static string BuildPowershell(
+        string exe,
+        string command,
+        IReadOnlyList<string> argv,
+        string scratchDir,
+        IReadOnlyList<string> pathDirs)
     {
         // -EncodedCommand <UTF-16LE-base64> avoids quoting pitfalls entirely.
         // We concatenate command + argv with spaces and let powershell parse it.
-        var sb = new StringBuilder(command);
+        var sb = new StringBuilder();
+        AppendPowershellEnvironmentBootstrap(sb, scratchDir, pathDirs);
+        sb.Append(command);
         foreach (var a in argv)
         {
             sb.Append(' ');
@@ -427,17 +660,107 @@ private static string BuildPowershell(string exe, string command, IReadOnlyList<
         }
         var script = sb.ToString();
         var encoded = Convert.ToBase64String(Encoding.Unicode.GetBytes(script));
-        return $"{exe} -NoProfile -NonInteractive -EncodedCommand {encoded}";
+        return $"{QuoteProcessPath(exe)} -NoProfile -NonInteractive -EncodedCommand {encoded}";
+    }
+
+    private static void AppendCmdEnvironmentBootstrap(
+        StringBuilder sb,
+        string scratchDir,
+        IReadOnlyList<string> pathDirs)
+    {
+        AppendCmdSet(sb, "TEMP", scratchDir);
+        AppendCmdSet(sb, "TMP", scratchDir);
+        AppendCmdSet(sb, "TMPDIR", scratchDir);
+        if (pathDirs.Count > 0)
+            AppendCmdSet(sb, "PATH", string.Join(Path.PathSeparator, pathDirs));
+    }
+
+    private static void AppendCmdSet(StringBuilder sb, string name, string value)
+    {
+        if (string.IsNullOrEmpty(value)) return;
+        sb.Append("set \"")
+            .Append(name)
+            .Append('=')
+            .Append(value.Replace("\"", ""))
+            .Append("\" && ");
+    }
+
+    private static void AppendPowershellEnvironmentBootstrap(
+        StringBuilder sb,
+        string scratchDir,
+        IReadOnlyList<string> pathDirs)
+    {
+        AppendPowershellSet(sb, "TEMP", scratchDir);
+        AppendPowershellSet(sb, "TMP", scratchDir);
+        AppendPowershellSet(sb, "TMPDIR", scratchDir);
+        if (pathDirs.Count > 0)
+            AppendPowershellSet(sb, "PATH", string.Join(Path.PathSeparator, pathDirs));
+    }
+
+    private static void AppendPowershellSet(StringBuilder sb, string name, string value)
+    {
+        if (string.IsNullOrEmpty(value)) return;
+        sb.Append("$env:")
+            .Append(name)
+            .Append(" = ")
+            .Append(QuoteEnvironmentValueForPowershell(value))
+            .Append("; ");
+    }
+
+    private static string ResolveCmdExe()
+    {
+        var systemRoot = Environment.GetEnvironmentVariable("SystemRoot")
+            ?? Environment.GetEnvironmentVariable("windir");
+        return string.IsNullOrWhiteSpace(systemRoot)
+            ? "cmd.exe"
+            : Path.Combine(systemRoot, "System32", "cmd.exe");
+    }
+
+    private static string ResolveWindowsPowerShellExe()
+    {
+        var systemRoot = Environment.GetEnvironmentVariable("SystemRoot")
+            ?? Environment.GetEnvironmentVariable("windir");
+        return string.IsNullOrWhiteSpace(systemRoot)
+            ? "powershell.exe"
+            : Path.Combine(systemRoot, "System32", "WindowsPowerShell", "v1.0", "powershell.exe");
+    }
+
+    private static string ResolvePwshExe(IReadOnlyList<string> pathDirs)
+    {
+        const string executableName = "pwsh.exe";
+        foreach (var dir in pathDirs)
+        {
+            try
+            {
+                var candidate = Path.Combine(dir, executableName);
+                if (File.Exists(candidate))
+                    return candidate;
+            }
+            catch
+            {
+                // Keep PATH resolution best-effort; launch will fail closed if
+                // pwsh is not resolvable on the host.
+            }
+        }
+
+        return executableName;
+    }
+
+    private static string QuoteProcessPath(string path)
+    {
+        if (path.Length > 0 && path.IndexOfAny(new[] { ' ', '\t', '"' }) < 0)
+            return path;
+
+        return "\"" + path.Replace("\"", "\\\"") + "\"";
     }
 
     private static string QuoteForCmd(string arg)
     {
         // Note: `%VAR%` env-var expansion inside `cmd /S /C "..."` cannot be
         // reliably suppressed via quoting (cmd parses % before applying quote
-        // rules). The cmd shell route is opt-in and runs inside the AppContainer
-        // with a controlled env, so the expansion target is sandbox-side, not
-        // host-side. Callers wanting verbatim arguments should use powershell
-        // (-EncodedCommand) which has no env-expansion ambiguity.
+        // rules). Bootstrap env refs are rewritten before quoting; callers
+        // wanting fully verbatim arguments should use powershell
+        // (-EncodedCommand) which has no cmd env-expansion ambiguity.
         if (arg.Length > 0 && arg.IndexOfAny(new[] { ' ', '\t', '"', '&', '|', '<', '>', '^', '(', ')', '%' }) < 0)
             return arg;
         return "\"" + arg.Replace("\"", "\"\"") + "\"";
@@ -449,4 +772,7 @@ private static string QuoteForPowershell(string arg)
             return arg;
         return "'" + arg.Replace("'", "''") + "'";
     }
+
+    private static string QuoteEnvironmentValueForPowershell(string value) =>
+        "'" + value.Replace("'", "''") + "'";
 }
diff --git a/src/OpenClaw.Shared/Mxc/MxcPolicyBuilder.cs b/src/OpenClaw.Shared/Mxc/MxcPolicyBuilder.cs
index 2a001d1e2..61d260856 100644
--- a/src/OpenClaw.Shared/Mxc/MxcPolicyBuilder.cs
+++ b/src/OpenClaw.Shared/Mxc/MxcPolicyBuilder.cs
@@ -10,26 +10,30 @@ namespace OpenClaw.Shared.Mxc;
 /// Policy decisions:
 /// <list type="bullet">
 /// <item><c>readonlyPaths</c> — populated from user-granted folders (Documents,
-/// Downloads, Desktop, custom). The MXC config builder additionally merges
-/// PATH-specific tool directories so spawned shells can find git/node/python/etc.</item>
+/// Downloads, Desktop, custom). The MXC config builder also grants
+/// backend-safe host PATH directories as readonly so PATH-resolved user tools
+/// can execute inside AppContainer.</item>
 /// <item><c>readwritePaths</c> — user-granted read+write folders. The MXC config
-/// builder adds a per-invocation scratch directory and rewrites TEMP/TMP/TMPDIR
-/// to point at it, so the user's real %TEMP% stays out of reach.</item>
+/// builder adds a per-invocation scratch directory and bootstraps
+/// TEMP/TMP/TMPDIR inside the launched shell so the user's real %TEMP% stays
+/// out of reach.</item>
 /// <item><c>deniedPaths</c> — settings directory (protect MCP token, gateway
 /// credentials, ElevenLabs key), <c>~/.ssh</c>, and the common browser profile
 /// roots (Chrome / Edge / Firefox / Brave). Always blocked regardless of grants.</item>
 /// <item><c>network.allowOutbound</c> — bound by <see cref="SettingsData.SystemRunAllowOutbound"/>.</item>
-/// <item><c>ui</c> — default-deny across the board; shell exec doesn't need windows.</item>
+/// <item><c>ui</c> — default-deny in base policy. PowerShell-family shells
+/// need an explicit <c>allowWindows</c> policy on MXC 0.7 and fail closed under
+/// the default UI-deny policy.</item>
 /// </list>
 /// </remarks>
 public static class MxcPolicyBuilder
 {
     /// <summary>
-    /// Policy schema version. @microsoft/mxc-sdk 0.1.8 accepts 0.4.0-alpha
-    /// through 0.5.0-alpha; keep the documented 0.4.0-alpha schema until we
-    /// intentionally adopt a newer MXC policy contract.
+    /// Policy schema version emitted to <c>wxc-exec</c>. @microsoft/mxc-sdk
+    /// 0.7.0 emits and accepts the 0.7.0-alpha contract used by
+    /// processcontainer/AppContainer execution on Windows build 26100+.
     /// </summary>
-    public const string SupportedPolicyVersion = "0.4.0-alpha";
+    public const string SupportedPolicyVersion = "0.7.0-alpha";
 
     /// <summary>
     /// Build the policy for a system.run invocation given current settings.
@@ -42,31 +46,31 @@ public static class MxcPolicyBuilder
     public static SandboxPolicy ForSystemRun(SettingsData settings, string settingsDirectoryPath)
     {
         var deniedPaths = new List<string>();
-        if (!string.IsNullOrWhiteSpace(settingsDirectoryPath))
-            deniedPaths.Add(settingsDirectoryPath);
+        AddDeniedPath(deniedPaths, settingsDirectoryPath);
 
         var userProfile = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
-        var sshPath = Path.Combine(userProfile, ".ssh");
-        if (!string.IsNullOrWhiteSpace(sshPath))
-            deniedPaths.Add(sshPath);
+        if (!string.IsNullOrWhiteSpace(userProfile))
+            AddDeniedPath(deniedPaths, Path.Combine(userProfile, ".ssh"));
 
         // Always-blocked browser profile roots. Cookies, saved passwords, autofill,
         // and session tokens live here — they must remain unreachable even if the
         // user (or a malicious settings.json) tries to grant a parent folder.
-        // Add these regardless of whether the browser is installed; the AppContainer
-        // policy treats nonexistent denies as a no-op.
+        // Keep these paths in the logical deny list even when they do not
+        // exist yet, so parent-folder grants cannot create sensitive roots. The
+        // config builder filters host-profile roots before backend emission
+        // because MXC 0.7 AppContainer+DACL fails on some nonexistent paths.
         var localAppData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
         var appData = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
         if (!string.IsNullOrWhiteSpace(localAppData))
         {
-            deniedPaths.Add(Path.Combine(localAppData, "Google", "Chrome", "User Data"));
-            deniedPaths.Add(Path.Combine(localAppData, "Microsoft", "Edge", "User Data"));
-            deniedPaths.Add(Path.Combine(localAppData, "BraveSoftware", "Brave-Browser", "User Data"));
+            AddDeniedPath(deniedPaths, Path.Combine(localAppData, "Google", "Chrome", "User Data"));
+            AddDeniedPath(deniedPaths, Path.Combine(localAppData, "Microsoft", "Edge", "User Data"));
+            AddDeniedPath(deniedPaths, Path.Combine(localAppData, "BraveSoftware", "Brave-Browser", "User Data"));
         }
         if (!string.IsNullOrWhiteSpace(appData))
         {
-            deniedPaths.Add(Path.Combine(appData, "Mozilla", "Firefox", "Profiles"));
-            deniedPaths.Add(Path.Combine(appData, "Microsoft", "Windows", "PowerShell", "PSReadLine"));
+            AddDeniedPath(deniedPaths, Path.Combine(appData, "Mozilla", "Firefox", "Profiles"));
+            AddDeniedPath(deniedPaths, Path.Combine(appData, "Microsoft", "Windows", "PowerShell", "PSReadLine"));
         }
 
         var readonlyPaths = new List<string>();
@@ -116,6 +120,12 @@ public static SandboxPolicy ForSystemRun(SettingsData settings, string settingsD
             TimeoutMs: settings.SandboxTimeoutMs > 0 ? settings.SandboxTimeoutMs : null);
     }
 
+    private static void AddDeniedPath(List<string> deniedPaths, string path)
+    {
+        if (!string.IsNullOrWhiteSpace(path))
+            deniedPaths.Add(path);
+    }
+
     /// <summary>
     /// Remove any allow-list entry that overlaps a denied path.
     /// Case-insensitive (NTFS semantics) and tolerant of trailing slashes.
diff --git a/src/OpenClaw.Shared/Mxc/SandboxPolicy.cs b/src/OpenClaw.Shared/Mxc/SandboxPolicy.cs
index c9a25c1e9..0f4c1c353 100644
--- a/src/OpenClaw.Shared/Mxc/SandboxPolicy.cs
+++ b/src/OpenClaw.Shared/Mxc/SandboxPolicy.cs
@@ -41,15 +41,15 @@ public enum ClipboardPolicy
 /// <summary>
 /// When <see cref="SettingsData.SystemRunSandboxEnabled"/> is <c>true</c>, system.run
 /// is contained via MXC AppContainer. When MXC is unavailable on the host, system.run
-/// falls back to the host runner with a warning so older Windows builds are not
-/// completely blocked. When the toggle is <c>false</c>, system.run runs on the host
-/// as before.
+/// uses compatibility host fallback by default and blocks only when
+/// <see cref="SettingsData.SystemRunBlockHostFallbackWhenMxcUnavailable"/> is enabled.
+/// When the toggle is <c>false</c>, system.run runs on the host without attempting MXC.
 /// </summary>
 public enum SandboxMode
 {
-    /// <summary>Use MXC when available; otherwise fall back uncontained with a warning.</summary>
+    /// <summary>Use MXC when available; otherwise use compatibility fallback unless strict blocking is enabled.</summary>
     Enabled,
 
-    /// <summary>Bypass MXC entirely.</summary>
+    /// <summary>Bypass MXC entirely and run on the host.</summary>
     Disabled,
 }
diff --git a/src/OpenClaw.Shared/NodeCapabilities.cs b/src/OpenClaw.Shared/NodeCapabilities.cs
index 1c3feed2a..12358e3cf 100644
--- a/src/OpenClaw.Shared/NodeCapabilities.cs
+++ b/src/OpenClaw.Shared/NodeCapabilities.cs
@@ -24,6 +24,7 @@ public class NodeInvokeRequest
     public string Id { get; set; } = "";
     public string Command { get; set; } = "";
     public JsonElement Args { get; set; }
+    public string? SessionKey { get; set; }
 }
 
 public class NodeInvokeCompletedEventArgs : EventArgs
diff --git a/src/OpenClaw.Shared/OpenClawAppIdentity.cs b/src/OpenClaw.Shared/OpenClawAppIdentity.cs
new file mode 100644
index 000000000..99c7a21b2
--- /dev/null
+++ b/src/OpenClaw.Shared/OpenClawAppIdentity.cs
@@ -0,0 +1,76 @@
+namespace OpenClaw.Shared;
+
+/// <summary>
+/// Shared profile/path rules for standalone tools that need to find the same
+/// release or dev profile used by the tray.
+/// </summary>
+public static class OpenClawAppIdentity
+{
+    public const string ReleaseIdentity = "release";
+    public const string DevIdentity = "dev";
+    public const string IdentityEnvironmentVariable = "OPENCLAW_APP_IDENTITY";
+    public const string DataDirectoryOverrideEnvironmentVariable = "OPENCLAW_TRAY_DATA_DIR";
+    public const string AppDataRootEnvironmentVariable = "OPENCLAW_TRAY_APPDATA_DIR";
+    public const string ReleaseDataDirectoryName = "OpenClawTray";
+    public const string DevDataDirectoryName = "OpenClawTray-Dev";
+
+    public static string NormalizeIdentity(string? identity)
+    {
+        if (string.IsNullOrWhiteSpace(identity))
+            return ReleaseIdentity;
+
+        if (string.Equals(identity, ReleaseIdentity, StringComparison.OrdinalIgnoreCase))
+            return ReleaseIdentity;
+
+        if (string.Equals(identity, DevIdentity, StringComparison.OrdinalIgnoreCase))
+            return DevIdentity;
+
+        throw new ArgumentException(
+            $"App identity must be '{ReleaseIdentity}' or '{DevIdentity}' (got '{identity}').",
+            nameof(identity));
+    }
+
+    public static string ResolveIdentity(Func<string, string?> envLookup, string? explicitIdentity = null)
+    {
+        ArgumentNullException.ThrowIfNull(envLookup);
+
+        return NormalizeIdentity(
+            !string.IsNullOrWhiteSpace(explicitIdentity)
+                ? explicitIdentity
+                : envLookup(IdentityEnvironmentVariable));
+    }
+
+    public static string GetDataDirectoryName(string? identity) =>
+        NormalizeIdentity(identity) == DevIdentity
+            ? DevDataDirectoryName
+            : ReleaseDataDirectoryName;
+
+    public static string ResolveRoamingDataDirectory(
+        Func<string, string?> envLookup,
+        string? explicitIdentity = null)
+    {
+        ArgumentNullException.ThrowIfNull(envLookup);
+
+        var dataDirOverride = envLookup(DataDirectoryOverrideEnvironmentVariable);
+        if (!string.IsNullOrWhiteSpace(dataDirOverride))
+            return dataDirOverride!;
+
+        var root = envLookup(AppDataRootEnvironmentVariable);
+        if (string.IsNullOrWhiteSpace(root))
+            root = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
+
+        return Path.Combine(
+            root!,
+            GetDataDirectoryName(ResolveIdentity(envLookup, explicitIdentity)));
+    }
+
+    public static string ResolveSettingsPath(
+        Func<string, string?> envLookup,
+        string? explicitIdentity = null) =>
+        Path.Combine(ResolveRoamingDataDirectory(envLookup, explicitIdentity), "settings.json");
+
+    public static string ResolveMcpTokenPath(
+        Func<string, string?> envLookup,
+        string? explicitIdentity = null) =>
+        Path.Combine(ResolveRoamingDataDirectory(envLookup, explicitIdentity), "mcp-token.txt");
+}
diff --git a/src/OpenClaw.Shared/OpenClawGatewayClient.Protocol.cs b/src/OpenClaw.Shared/OpenClawGatewayClient.Protocol.cs
index a63b319ee..f30e76d5b 100644
--- a/src/OpenClaw.Shared/OpenClawGatewayClient.Protocol.cs
+++ b/src/OpenClaw.Shared/OpenClawGatewayClient.Protocol.cs
@@ -434,8 +434,7 @@ internal static SessionCompactionCheckpointList ParseCompactionCheckpointList(Js
             {
                 if (item.ValueKind != JsonValueKind.Object) continue;
                 var checkpoint = ParseCompactionCheckpoint(item);
-                if (!string.IsNullOrEmpty(checkpoint.Id))
-                    checkpoints.Add(checkpoint);
+                checkpoints.Add(checkpoint);
             }
         }
 
diff --git a/src/OpenClaw.Shared/OpenClawGatewayClient.cs b/src/OpenClaw.Shared/OpenClawGatewayClient.cs
index fccec44c4..6bd829bb8 100644
--- a/src/OpenClaw.Shared/OpenClawGatewayClient.cs
+++ b/src/OpenClaw.Shared/OpenClawGatewayClient.cs
@@ -100,10 +100,10 @@ public partial class OpenClawGatewayClient : WebSocketClientBase, IOperatorGatew
     private readonly bool _ignoreStoredDeviceToken;
 
     /// <summary>True when the gateway reported "pairing required" for this device.</summary>
-    public bool IsPairingRequired => _pairingRequiredAwaitingApproval;
+    public bool IsPairingRequired => Volatile.Read(ref _pairingRequiredAwaitingApproval);
 
     /// <summary>Safe requestId returned in structured pairing-required details, when present.</summary>
-    public string? PairingRequiredRequestId => _pairingRequiredRequestId;
+    public string? PairingRequiredRequestId => Volatile.Read(ref _pairingRequiredRequestId);
 
     /// <summary>True when the device signature was rejected in all supported modes.</summary>
     public bool IsAuthFailed => _authFailed;
@@ -248,10 +248,8 @@ public OpenClawGatewayClient(string gatewayUrl, string token, IOpenClawLogger? l
         _bootstrapPairAsNode = bootstrapPairAsNode;
         _ignoreStoredDeviceToken = ignoreStoredDeviceToken;
         _currentGatewayUrl = gatewayUrl;
-        var dataPath = identityPath ?? Path.Combine(
-            Environment.GetEnvironmentVariable("OPENCLAW_TRAY_APPDATA_DIR")
-                ?? Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
-            "OpenClawTray");
+        var dataPath = identityPath ?? OpenClawAppIdentity.ResolveRoamingDataDirectory(
+            Environment.GetEnvironmentVariable);
 
         _deviceIdentity = new DeviceIdentity(dataPath, _logger);
         _deviceIdentity.Initialize();
@@ -309,7 +307,12 @@ public async Task SendChatMessageAsync(string message, string? sessionKey = null
         _ = await SendChatMessageForRunAsync(message, sessionKey, sessionId, attachments).ConfigureAwait(false);
     }
 
-    public async Task<ChatSendResult> SendChatMessageForRunAsync(string message, string? sessionKey = null, string? sessionId = null, IReadOnlyList<ChatAttachment>? attachments = null)
+    public async Task<ChatSendResult> SendChatMessageForRunAsync(
+        string message,
+        string? sessionKey = null,
+        string? sessionId = null,
+        IReadOnlyList<ChatAttachment>? attachments = null,
+        string? idempotencyKey = null)
     {
         if (!IsConnected)
             throw new InvalidOperationException("Gateway connection is not open");
@@ -317,9 +320,12 @@ public async Task<ChatSendResult> SendChatMessageForRunAsync(string message, str
         var hasAttachments = attachments is { Count: > 0 };
         if (string.IsNullOrWhiteSpace(message) && !hasAttachments)
             throw new ArgumentException("Message or attachment is required", nameof(message));
+        if (idempotencyKey is not null && string.IsNullOrWhiteSpace(idempotencyKey))
+            throw new ArgumentException("Idempotency key cannot be whitespace", nameof(idempotencyKey));
 
         var effectiveSessionKey = ResolveEffectiveSessionKey(
             sessionKey, Volatile.Read(ref _mainSessionKey), "chat.send");
+        var effectiveIdempotencyKey = idempotencyKey?.Trim() ?? Guid.NewGuid().ToString();
 
         var requestId = Guid.NewGuid().ToString();
         var completion = new TaskCompletionSource<ChatSendResult>(TaskCreationOptions.RunContinuationsAsynchronously);
@@ -336,7 +342,7 @@ public async Task<ChatSendResult> SendChatMessageForRunAsync(string message, str
         {
             ["sessionKey"] = effectiveSessionKey,
             ["message"] = message,
-            ["idempotencyKey"] = Guid.NewGuid().ToString()
+            ["idempotencyKey"] = effectiveIdempotencyKey
         };
 
         if (hasAttachments)
@@ -527,16 +533,7 @@ private static ChatHistoryInfo ParseChatHistory(JsonElement payload, string sess
             else if (m.TryGetProperty("ts", out var tsProp2) && tsProp2.ValueKind == JsonValueKind.Number)
                 ts = tsProp2.GetInt64();
 
-            // __openclaw metadata: unique message ID + sequence number
-            string? openClawId = null;
-            int? openClawSeq = null;
-            if (m.TryGetProperty("__openclaw", out var oc) && oc.ValueKind == JsonValueKind.Object)
-            {
-                if (oc.TryGetProperty("id", out var ocId))
-                    openClawId = ocId.GetString();
-                if (oc.TryGetProperty("seq", out var ocSeq) && ocSeq.ValueKind == JsonValueKind.Number)
-                    openClawSeq = ocSeq.GetInt32();
-            }
+            var (openClawId, openClawSeq) = ExtractOpenClawMetadata(m);
 
             // stopReason on assistant messages (e.g. "stop", "toolUse", possibly "abort")
             string? stopReason = null;
@@ -547,6 +544,7 @@ private static ChatHistoryInfo ParseChatHistory(JsonElement payload, string sess
             string text = ExtractMessageText(m);
             if (string.IsNullOrEmpty(text)) continue;
             if (string.IsNullOrEmpty(role)) continue;
+            if (ChatMessageInfo.IsSilentAssistantDirective(role, text)) continue;
 
             var (inputTokens, outputTokens, responseTokens, contextPercent) = ExtractChatUsage(m);
             list.Add(new ChatMessageInfo
@@ -760,9 +758,70 @@ public async Task RequestCronStatusAsync()
         await SendTrackedRequestAsync("cron.status");
     }
 
-    public Task<bool> RunCronJobAsync(string jobId, bool force = true)
+    public async Task<bool> RunCronJobAsync(string jobId, bool force = true)
+    {
+        var result = await RunCronJobDetailedAsync(jobId, force);
+        return result.Accepted && result.Enqueued;
+    }
+
+    public async Task<CronRunRequestResult> RunCronJobDetailedAsync(string jobId, bool force = true, int timeoutMs = 12000)
+    {
+        if (string.IsNullOrWhiteSpace(jobId))
+            return CronRunRequestResult.NotAccepted("Job id is required.");
+
+        var payloads = new List<object>();
+        if (!force)
+            payloads.Add(new { jobId, mode = "due" });
+        payloads.Add(new { jobId });
+        payloads.Add(new { id = jobId, force });
+
+        string? lastError = null;
+        foreach (var requestPayload in payloads)
+        {
+            try
+            {
+                var payload = await SendWizardRequestAsync("cron.run", requestPayload, timeoutMs);
+                return ParseCronRunRequestResult(payload);
+            }
+            catch (Exception ex)
+            {
+                lastError = ex.Message;
+                if (!IsCronRunPayloadShapeError(ex.Message))
+                    break;
+            }
+        }
+
+        _logger.Warn($"cron.run request failed: {lastError}");
+        return CronRunRequestResult.NotAccepted(lastError);
+    }
+
+    private static bool IsCronRunPayloadShapeError(string? message) =>
+        !string.IsNullOrWhiteSpace(message) &&
+        message.Contains("invalid cron.run params", StringComparison.OrdinalIgnoreCase);
+
+    internal static CronRunRequestResult ParseCronRunRequestResult(JsonElement payload)
     {
-        return TrySendTrackedRequestAsync("cron.run", new { id = jobId, force });
+        var accepted = !payload.TryGetProperty("ok", out var okEl) || okEl.ValueKind != JsonValueKind.False;
+        var hasEnqueued = payload.TryGetProperty("enqueued", out var enqEl);
+        var enqueued = hasEnqueued && enqEl.ValueKind == JsonValueKind.True;
+        var enqueuedFalse = hasEnqueued && enqEl.ValueKind == JsonValueKind.False;
+        var hasRan = payload.TryGetProperty("ran", out var ranEl);
+        var ran = hasRan
+            ? ranEl.ValueKind == JsonValueKind.True
+            : (bool?)null;
+        var runId = payload.TryGetProperty("runId", out var runIdEl) && runIdEl.ValueKind == JsonValueKind.String
+            ? runIdEl.GetString()
+            : null;
+        var reason = payload.TryGetProperty("reason", out var reasonEl) && reasonEl.ValueKind == JsonValueKind.String
+            ? reasonEl.GetString()
+            : null;
+
+        return new CronRunRequestResult(
+            accepted,
+            accepted && !enqueuedFalse && ran != false &&
+            (enqueued || !string.IsNullOrWhiteSpace(runId) || ran == true || (!hasEnqueued && !hasRan)),
+            runId,
+            reason);
     }
 
     public Task<bool> RemoveCronJobAsync(string jobId)
@@ -1544,7 +1603,7 @@ private void ClearPendingRequests()
         // to preserve the chat approval banner on disconnect-mid-flight. The
         // OperationCanceledException thrown here is intentionally a connection
         // lifecycle signal, NOT a benign cancel. RunFireAndForget in the tray
-        // (OpenClawChatRoot) silently swallows OperationCanceledException —
+        // (ChatRoot) silently swallows OperationCanceledException —
         // if a caller forwards the OCE up to RunFireAndForget instead of
         // catching it locally, the banner will be cleared with no UI feedback.
         // Today OpenClawChatDataProvider.RespondToPermissionAsync correctly
@@ -1706,8 +1765,8 @@ private void HandleResponse(JsonElement root)
         if (payload.TryGetProperty("type", out var t) && t.GetString() == "hello-ok")
         {
             _logger.Info($"[HANDSHAKE] Received hello-ok!");
-            _pairingRequiredAwaitingApproval = false;
-            _pairingRequiredRequestId = null;
+            Volatile.Write(ref _pairingRequiredAwaitingApproval, false);
+            Volatile.Write(ref _pairingRequiredRequestId, null);
             _authFailed = false;
             ResetReconnectAttempts();
             _operatorDeviceId = TryGetHandshakeDeviceId(payload);
@@ -1918,6 +1977,8 @@ private static ChatSendResult ParseChatSendResult(JsonElement root)
     {
         string? runId = null;
         string? sessionKey = null;
+        string? status = null;
+        string? error = null;
         var cached = false;
 
         if (root.TryGetProperty("payload", out var payload) && payload.ValueKind == JsonValueKind.Object)
@@ -1926,8 +1987,19 @@ private static ChatSendResult ParseChatSendResult(JsonElement root)
                 runId = runIdProp.GetString();
             if (payload.TryGetProperty("sessionKey", out var sessionKeyProp))
                 sessionKey = sessionKeyProp.GetString();
+            if (payload.TryGetProperty("status", out var statusProp))
+                status = statusProp.GetString();
+            if (payload.TryGetProperty("error", out var payloadErrorProp))
+                error = TryReadJsonValueAsString(payloadErrorProp);
+            else if (payload.TryGetProperty("message", out var payloadMessageProp) && ChatSendResult.IsFailureStatus(status))
+                error = TryReadJsonValueAsString(payloadMessageProp);
         }
 
+        if (root.TryGetProperty("status", out var rootStatusProp))
+            status ??= rootStatusProp.GetString();
+        if (root.TryGetProperty("error", out var rootErrorProp))
+            error ??= TryReadJsonValueAsString(rootErrorProp);
+
         if (root.TryGetProperty("meta", out var meta) &&
             meta.ValueKind == JsonValueKind.Object &&
             meta.TryGetProperty("cached", out var cachedProp) &&
@@ -1940,10 +2012,21 @@ private static ChatSendResult ParseChatSendResult(JsonElement root)
         {
             RunId = runId,
             SessionKey = sessionKey,
+            Status = status,
+            Error = error,
             Cached = cached
         };
     }
 
+    private static string? TryReadJsonValueAsString(JsonElement value) =>
+        value.ValueKind switch
+        {
+            JsonValueKind.String => value.GetString(),
+            JsonValueKind.Number or JsonValueKind.True or JsonValueKind.False => value.ToString(),
+            JsonValueKind.Object when value.TryGetProperty("message", out var message) => TryReadJsonValueAsString(message),
+            _ => null
+        };
+
     private void HandleRequestError(string? method, JsonElement root)
     {
         var message = TryGetErrorMessage(root) ?? "request failed";
@@ -1990,8 +2073,8 @@ private void HandleRequestError(string? method, JsonElement root)
         if (method == "connect" &&
             (pairingDetails.IsPairingRequired || message.Contains("pairing required", StringComparison.OrdinalIgnoreCase)))
         {
-            _pairingRequiredAwaitingApproval = true;
-            _pairingRequiredRequestId = pairingDetails.RequestId;
+            Volatile.Write(ref _pairingRequiredRequestId, pairingDetails.RequestId);
+            Volatile.Write(ref _pairingRequiredAwaitingApproval, true);
             _logger.Warn($"[HANDSHAKE] Pairing required (requestId={pairingDetails.RequestId}). Waiting for approval.");
             PairingRequired?.Invoke(this, pairingDetails.RequestId);
             return;
@@ -2522,6 +2605,7 @@ private void HandleEvent(JsonElement root, int rawMessageLength)
                 }
                 break;
             case "chat":
+            case "session.message":
                 HandleChatEvent(root, rawMessageLength);
                 break;
             case "session":
@@ -2989,6 +3073,12 @@ private void HandleChatEvent(JsonElement root, int rawMessageLength)
         // Try new format: payload.message.role + payload.message.content[].text
         if (payload.TryGetProperty("message", out var message))
         {
+            if (message.ValueKind != JsonValueKind.Object)
+            {
+                _logger.Warn("[GatewayClient] Chat event message payload was not an object; dropping frame.");
+                return;
+            }
+
             var role = message.TryGetProperty("role", out var roleProp) ? roleProp.GetString() ?? "" : "";
             var state = payload.TryGetProperty("state", out var stateProp) ? stateProp.GetString() : null;
             if (tsMs == 0)
@@ -2998,20 +3088,31 @@ private void HandleChatEvent(JsonElement root, int rawMessageLength)
             if (inTok is null && outTok is null && respTok is null && ctxPct is null)
                 (inTok, outTok, respTok, ctxPct) = ExtractChatUsage(message);
 
-            if (message.TryGetProperty("content", out var content) && content.ValueKind == JsonValueKind.Array)
-            {
-                var text = ExtractMessageText(message);
-                if (string.IsNullOrEmpty(text)) return;
-
-                EmitChatMessageReceived(sessionKey, role, text, state, tsMs, inTok, outTok, respTok, ctxPct);
+            var text = ExtractMessageText(message);
+            if (string.IsNullOrEmpty(text)) return;
+            if (ChatMessageInfo.IsSilentAssistantDirective(role, text)) return;
 
-                if (role == "assistant" && string.Equals(state, "final", StringComparison.OrdinalIgnoreCase))
-                {
-                    // HIGH 4: log shape only — content previously
-                    // surfaced in the operator log.
-                    _logger.Info($"Assistant response: role={role} state={state} len={text.Length}");
-                    EmitChatNotification(text, sessionKey);
-                }
+            var (messageOpenClawId, messageOpenClawSeq) = ExtractOpenClawMetadata(message);
+            var (payloadOpenClawId, payloadOpenClawSeq) = ExtractOpenClawMetadata(payload);
+            EmitChatMessageReceived(
+                sessionKey,
+                role,
+                text,
+                state,
+                tsMs,
+                inTok,
+                outTok,
+                respTok,
+                ctxPct,
+                messageOpenClawId ?? payloadOpenClawId,
+                messageOpenClawSeq ?? payloadOpenClawSeq);
+
+            if (role == "assistant" && string.Equals(state, "final", StringComparison.OrdinalIgnoreCase))
+            {
+                // HIGH 4: log shape only — content previously
+                // surfaced in the operator log.
+                _logger.Info($"Assistant response: role={role} state={state} len={text.Length}");
+                EmitChatNotification(text, sessionKey);
             }
         }
         
@@ -3024,7 +3125,21 @@ private void HandleChatEvent(JsonElement root, int rawMessageLength)
 
             if (!string.IsNullOrEmpty(text))
             {
-                EmitChatMessageReceived(sessionKey, role, text, state, tsMs, inTok, outTok, respTok, ctxPct);
+                if (ChatMessageInfo.IsSilentAssistantDirective(role, text)) return;
+
+                var (openClawId, openClawSeq) = ExtractOpenClawMetadata(payload);
+                EmitChatMessageReceived(
+                    sessionKey,
+                    role,
+                    text,
+                    state,
+                    tsMs,
+                    inTok,
+                    outTok,
+                    respTok,
+                    ctxPct,
+                    openClawId,
+                    openClawSeq);
 
                 if (role == "assistant")
                 {
@@ -3086,9 +3201,22 @@ JsonValueKind.Number when v.TryGetInt32(out var i) => i,
         return (input, output, response, ctx);
     }
 
-    private void EmitChatMessageReceived(string sessionKey, string role, string text, string? state, long tsMs,
-        int? inputTokens = null, int? outputTokens = null, int? responseTokens = null, int? contextPct = null)
-    {
+    private void EmitChatMessageReceived(
+        string sessionKey,
+        string role,
+        string text,
+        string? state,
+        long tsMs,
+        int? inputTokens = null,
+        int? outputTokens = null,
+        int? responseTokens = null,
+        int? contextPct = null,
+        string? openClawId = null,
+        int? openClawSeq = null)
+    {
+        if (ChatMessageInfo.IsSilentAssistantDirective(role, text))
+            return;
+
         try
         {
             ChatMessageReceived?.Invoke(this, new ChatMessageInfo
@@ -3101,7 +3229,9 @@ private void EmitChatMessageReceived(string sessionKey, string role, string text
                 InputTokens = inputTokens,
                 OutputTokens = outputTokens,
                 ResponseTokens = responseTokens,
-                ContextPercent = contextPct
+                ContextPercent = contextPct,
+                OpenClawId = openClawId,
+                OpenClawSeq = openClawSeq
             });
         }
         catch (Exception ex)
@@ -3110,6 +3240,26 @@ private void EmitChatMessageReceived(string sessionKey, string role, string text
         }
     }
 
+    private static (string? Id, int? Seq) ExtractOpenClawMetadata(JsonElement node)
+    {
+        if (node.ValueKind != JsonValueKind.Object ||
+            !node.TryGetProperty("__openclaw", out var openClaw) ||
+            openClaw.ValueKind != JsonValueKind.Object)
+        {
+            return (null, null);
+        }
+
+        var id = openClaw.TryGetProperty("id", out var idProp) && idProp.ValueKind == JsonValueKind.String
+            ? idProp.GetString()
+            : null;
+        var seq = openClaw.TryGetProperty("seq", out var seqProp) &&
+                  seqProp.ValueKind == JsonValueKind.Number &&
+                  seqProp.TryGetInt32(out var parsedSeq)
+            ? parsedSeq
+            : (int?)null;
+        return (id, seq);
+    }
+
     private static long ExtractChatTimestampMs(JsonElement node)
     {
         if (node.ValueKind != JsonValueKind.Object)
@@ -3176,6 +3326,7 @@ private void EmitChatNotification(string text, string? sessionKey = null)
         var notification = new OpenClawNotification
         {
             Message = displayText,
+            FullMessage = text,
             IsChat = true,
             SessionKey = sessionKey
         };
@@ -4061,8 +4212,16 @@ private void ParseModelsList(JsonElement payload)
             {
                 foreach (var item in modelsArray.EnumerateArray())
                 {
+                    if (item.ValueKind != JsonValueKind.Object) continue;
+
+                    // Read readiness flags defensively; older gateways may omit
+                    // them, and the UI only uses them for labels/selectability.
                     var hasConfiguredFlag = item.TryGetProperty("configured", out var cfg)
                                             && (cfg.ValueKind == JsonValueKind.True || cfg.ValueKind == JsonValueKind.False);
+                    bool available = true;
+                    if (TryReadBool(item, out var av, "available")) available = av;
+                    else if (TryReadBool(item, out var un, "unavailable")) available = !un;
+
                     var model = new ModelInfo
                     {
                         Id = item.TryGetProperty("id", out var id) ? id.GetString() ?? "" : "",
@@ -4070,7 +4229,10 @@ private void ParseModelsList(JsonElement payload)
                         Provider = item.TryGetProperty("provider", out var prov) ? prov.GetString() : null,
                         ContextWindow = item.TryGetProperty("contextWindow", out var cw) && cw.ValueKind == JsonValueKind.Number ? cw.GetInt32() : null,
                         IsConfigured = hasConfiguredFlag && cfg.ValueKind == JsonValueKind.True,
-                        HasConfiguredFlag = hasConfiguredFlag
+                        HasConfiguredFlag = hasConfiguredFlag,
+                        IsDefault = ReadBool(item, "default", "isDefault"),
+                        IsAvailable = available,
+                        RequiresAuth = ReadBool(item, "requiresAuth", "authRequired", "needsAuth", "authNeeded")
                     };
                     if (!string.IsNullOrEmpty(model.Id))
                         info.Models.Add(model);
@@ -4084,6 +4246,25 @@ private void ParseModelsList(JsonElement payload)
         }
     }
 
+    // Reads the first present boolean property among <paramref name="keys"/>.
+    // Returns false when none are present (or are non-boolean).
+    private static bool ReadBool(JsonElement obj, params string[] keys) =>
+        TryReadBool(obj, out var value, keys) && value;
+
+    private static bool TryReadBool(JsonElement obj, out bool value, params string[] keys)
+    {
+        foreach (var key in keys)
+        {
+            if (obj.TryGetProperty(key, out var prop))
+            {
+                if (prop.ValueKind == JsonValueKind.True) { value = true; return true; }
+                if (prop.ValueKind == JsonValueKind.False) { value = false; return true; }
+            }
+        }
+        value = false;
+        return false;
+    }
+
     private void ParseNodePairList(JsonElement payload)
     {
         try
diff --git a/src/OpenClaw.Shared/RemoteGatewayClassifier.cs b/src/OpenClaw.Shared/RemoteGatewayClassifier.cs
new file mode 100644
index 000000000..7f67c785f
--- /dev/null
+++ b/src/OpenClaw.Shared/RemoteGatewayClassifier.cs
@@ -0,0 +1,130 @@
+using System;
+
+namespace OpenClaw.Shared;
+
+/// <summary>
+/// How the tray reaches a configured gateway. Drives remote-setup guidance and
+/// the cleartext-token warning in Connection settings.
+/// </summary>
+public enum GatewayConnectionTopology
+{
+    /// <summary>URL was empty or could not be parsed.</summary>
+    Unknown,
+
+    /// <summary>localhost / 127.0.0.1 / ::1 — reached directly on this machine.</summary>
+    Local,
+
+    /// <summary>
+    /// A loopback URL that actually fronts a remote gateway through a managed
+    /// SSH tunnel (the WebSocket talks to <c>ws://localhost:&lt;localPort&gt;</c>
+    /// but the bytes are encrypted by SSH end-to-end).
+    /// </summary>
+    SshTunnel,
+
+    /// <summary>Remote host over TLS (<c>wss://</c> or <c>https://</c>).</summary>
+    DirectSecure,
+
+    /// <summary>
+    /// Remote host over cleartext (<c>ws://</c> or <c>http://</c>) — the token
+    /// travels unencrypted across the network.
+    /// </summary>
+    DirectInsecure,
+}
+
+/// <summary>Whether the credential is protected in transit.</summary>
+public enum GatewayTransportSecurity
+{
+    /// <summary>Loopback only — no network exposure.</summary>
+    LocalLoopback,
+
+    /// <summary>Encrypted (TLS) or tunnelled (SSH) — token protected on the wire.</summary>
+    Encrypted,
+
+    /// <summary>Cleartext to a non-local host — token exposed on the wire.</summary>
+    Cleartext,
+}
+
+/// <summary>Immutable classification of a gateway endpoint for setup/repair UX.</summary>
+public sealed record RemoteGatewayProfile(
+    GatewayConnectionTopology Topology,
+    GatewayTransportSecurity Security,
+    string Host,
+    bool IsTls)
+{
+    public bool IsLocal => Topology == GatewayConnectionTopology.Local;
+
+    public bool IsRemote =>
+        Topology is GatewayConnectionTopology.DirectSecure
+                 or GatewayConnectionTopology.DirectInsecure
+                 or GatewayConnectionTopology.SshTunnel;
+
+    /// <summary>
+    /// True when a token would travel in cleartext over a network. The UI should
+    /// steer the user to TLS (<c>wss://</c>), an SSH tunnel, or a trusted proxy
+    /// (e.g. Tailscale) before saving such a gateway.
+    /// </summary>
+    public bool RecommendsTransportHardening =>
+        Security == GatewayTransportSecurity.Cleartext;
+}
+
+/// <summary>
+/// Pure classifier that maps a gateway URL (plus whether a managed SSH tunnel is
+/// configured) to a <see cref="RemoteGatewayProfile"/>. No I/O, no UI types.
+/// </summary>
+public static class RemoteGatewayClassifier
+{
+    public static RemoteGatewayProfile Classify(string? url, bool hasSshTunnel = false)
+    {
+        var trimmed = url?.Trim();
+        if (string.IsNullOrEmpty(trimmed) ||
+            !Uri.TryCreate(trimmed, UriKind.Absolute, out var uri) ||
+            string.IsNullOrEmpty(uri.Host))
+        {
+            // Unparseable input is left to GatewayUrlHelper validation elsewhere;
+            // we surface no transport warning so half-typed URLs don't flicker a
+            // scary banner on every keystroke.
+            return new RemoteGatewayProfile(
+                GatewayConnectionTopology.Unknown,
+                GatewayTransportSecurity.LocalLoopback,
+                Host: string.Empty,
+                IsTls: false);
+        }
+
+        var host = uri.Host;
+        var scheme = uri.Scheme;
+        var isTls = scheme.Equals("wss", StringComparison.OrdinalIgnoreCase) ||
+                    scheme.Equals("https", StringComparison.OrdinalIgnoreCase);
+
+        // A managed SSH tunnel encrypts the hop even though the WebSocket URL is
+        // loopback. Treat it as a remote-but-encrypted endpoint.
+        if (hasSshTunnel)
+        {
+            return new RemoteGatewayProfile(
+                GatewayConnectionTopology.SshTunnel,
+                GatewayTransportSecurity.Encrypted,
+                host,
+                isTls);
+        }
+
+        if (LocalGatewayUrlClassifier.IsLocalGatewayUrl(trimmed))
+        {
+            return new RemoteGatewayProfile(
+                GatewayConnectionTopology.Local,
+                GatewayTransportSecurity.LocalLoopback,
+                host,
+                isTls);
+        }
+
+        return isTls
+            ? new RemoteGatewayProfile(
+                GatewayConnectionTopology.DirectSecure,
+                GatewayTransportSecurity.Encrypted,
+                host,
+                IsTls: true)
+            : new RemoteGatewayProfile(
+                GatewayConnectionTopology.DirectInsecure,
+                GatewayTransportSecurity.Cleartext,
+                host,
+                IsTls: false);
+    }
+}
diff --git a/src/OpenClaw.Shared/Sessions/SessionActionPlanner.cs b/src/OpenClaw.Shared/Sessions/SessionActionPlanner.cs
new file mode 100644
index 000000000..de32659fc
--- /dev/null
+++ b/src/OpenClaw.Shared/Sessions/SessionActionPlanner.cs
@@ -0,0 +1,190 @@
+namespace OpenClaw.Shared.Sessions;
+
+/// <summary>
+/// The set of per-session lifecycle actions the UI can offer: open, reset
+/// (new chat), compact, delete, export, plus compaction-checkpoint
+/// branch/restore.
+/// </summary>
+public enum SessionActionKind
+{
+    OpenChat,
+    Reset,
+    Compact,
+    Delete,
+    Export,
+    Branch,
+    Restore,
+}
+
+/// <summary>
+/// The copy a confirmation dialog should display for a destructive or
+/// context-altering session action.
+/// </summary>
+public sealed record SessionActionPrompt(
+    SessionActionKind Kind,
+    string SessionName,
+    string Title,
+    string Body,
+    string ConfirmLabel,
+    bool IsDestructive);
+
+public enum SessionMainState
+{
+    Main,
+    NotMain,
+    Unknown,
+}
+
+/// <summary>
+/// Pure decision logic for session lifecycle actions, shared by the tray's
+/// session menus (SessionsPage flyout + App tray/toast handlers) so every
+/// entry point applies the same confirmation copy and main-session
+/// protection. Contains no UI or gateway dependencies so it is unit testable.
+/// </summary>
+public static class SessionActionPlanner
+{
+    /// <summary>
+    /// Destructive actions clear or remove conversation state and must always
+    /// be confirmed and styled as dangerous.
+    /// </summary>
+    public static bool IsDestructive(SessionActionKind kind) =>
+        kind is SessionActionKind.Reset
+            or SessionActionKind.Delete
+            or SessionActionKind.Restore;
+
+    /// <summary>
+    /// Actions that prompt before running. Compact is reversible-ish (it
+    /// archives rather than deletes) but still alters the live context, so it
+    /// is confirmed too. Restore rolls the live session back to a checkpoint
+    /// and is therefore confirmed.
+    /// </summary>
+    public static bool RequiresConfirmation(SessionActionKind kind) =>
+        kind is SessionActionKind.Reset
+            or SessionActionKind.Compact
+            or SessionActionKind.Delete
+            or SessionActionKind.Restore;
+
+    /// <summary>
+    /// Returns false when an action must not be offered for the given session.
+    /// The main session is the gateway's primary conversation: it cannot be
+    /// deleted and is not eligible for a destructive checkpoint restore.
+    /// Resetting, compacting, and branching it are allowed.
+    /// </summary>
+    public static bool IsAllowed(SessionActionKind kind, bool isMainSession, out string? blockedReason)
+    {
+        if (isMainSession && kind == SessionActionKind.Delete)
+        {
+            blockedReason = "The main session can't be deleted. Reset it instead to start fresh.";
+            return false;
+        }
+
+        if (isMainSession && kind == SessionActionKind.Restore)
+        {
+            blockedReason = "The main session can't be rolled back to a checkpoint. Branch from it instead.";
+            return false;
+        }
+
+        blockedReason = null;
+        return true;
+    }
+
+    public static bool IsAllowed(SessionActionKind kind, SessionMainState mainState, out string? blockedReason)
+    {
+        if (!IsAllowed(kind, mainState == SessionMainState.Main, out blockedReason))
+            return false;
+
+        if (mainState == SessionMainState.Unknown &&
+            kind is SessionActionKind.Delete or SessionActionKind.Restore)
+        {
+            blockedReason = "Session identity is still loading. Try again after sessions refresh.";
+            return false;
+        }
+
+        return true;
+    }
+
+    public static SessionMainState ResolveMainState(
+        string key,
+        bool? rowIsMain = null,
+        string? mainSessionKey = null,
+        IEnumerable<SessionInfo>? sessions = null)
+    {
+        if (IsMainSessionKeyShape(key)) return SessionMainState.Main;
+        if (rowIsMain == true) return SessionMainState.Main;
+
+        if (string.Equals(mainSessionKey, key, StringComparison.Ordinal)) return SessionMainState.Main;
+        if (!string.IsNullOrWhiteSpace(mainSessionKey)) return SessionMainState.NotMain;
+
+        var session = sessions?.FirstOrDefault(s => string.Equals(s.Key, key, StringComparison.Ordinal));
+        if (session?.IsMain == true) return SessionMainState.Main;
+        if (session is not null || rowIsMain.HasValue) return SessionMainState.NotMain;
+
+        return SessionMainState.Unknown;
+    }
+
+    public static bool IsMainSessionKeyShape(string key)
+    {
+        if (string.Equals(key, "main", StringComparison.Ordinal)) return true;
+        return key.EndsWith(":main", StringComparison.Ordinal) ||
+               key.Contains(":main:main", StringComparison.Ordinal);
+    }
+
+    /// <summary>
+    /// Builds the confirmation copy for an action, or <c>null</c> when the
+    /// action needs no confirmation. The session's friendly name is used when
+    /// available, falling back to the raw key.
+    /// </summary>
+    public static SessionActionPrompt? BuildPrompt(
+        SessionActionKind kind,
+        string sessionKey,
+        string? displayName,
+        bool isMainSession)
+    {
+        if (!RequiresConfirmation(kind))
+            return null;
+
+        var name = Describe(sessionKey, displayName);
+
+        return kind switch
+        {
+            SessionActionKind.Reset => new SessionActionPrompt(
+                kind,
+                name,
+                "Reset session?",
+                $"Start a fresh session for \u201C{name}\u201D? The current conversation context will be cleared.",
+                "Reset",
+                IsDestructive: true),
+
+            SessionActionKind.Compact => new SessionActionPrompt(
+                kind,
+                name,
+                "Compact session log?",
+                $"Keep the most recent messages for \u201C{name}\u201D and archive the rest. " +
+                "This creates a compaction checkpoint; export the transcript first if you need the full history.",
+                "Compact",
+                IsDestructive: false),
+
+            SessionActionKind.Delete => new SessionActionPrompt(
+                kind,
+                name,
+                "Delete session?",
+                $"Delete \u201C{name}\u201D and archive its transcript? It will be removed from the session list.",
+                "Delete",
+                IsDestructive: true),
+
+            SessionActionKind.Restore => new SessionActionPrompt(
+                kind,
+                name,
+                "Restore checkpoint?",
+                $"Roll \u201C{name}\u201D back to this compaction checkpoint? Messages added after the checkpoint will be archived.",
+                "Restore",
+                IsDestructive: true),
+
+            _ => null,
+        };
+    }
+
+    /// <summary>Friendly label for a session, preferring its display name.</summary>
+    public static string Describe(string sessionKey, string? displayName) =>
+        !string.IsNullOrWhiteSpace(displayName) ? displayName! : sessionKey;
+}
diff --git a/src/OpenClaw.Shared/Sessions/SessionCheckpointSelection.cs b/src/OpenClaw.Shared/Sessions/SessionCheckpointSelection.cs
new file mode 100644
index 000000000..60b24c5df
--- /dev/null
+++ b/src/OpenClaw.Shared/Sessions/SessionCheckpointSelection.cs
@@ -0,0 +1,30 @@
+namespace OpenClaw.Shared.Sessions;
+
+/// <summary>
+/// Selection policy for compaction checkpoints. Branching can use a displayed
+/// checkpoint directly, but restore is destructive, so it should only target a
+/// checkpoint when the newest entry is unambiguous.
+/// </summary>
+public static class SessionCheckpointSelection
+{
+    /// <summary>
+    /// Returns the checkpoint that is provably the most recent, or
+    /// <c>null</c> when that can't be established. Restore archives every
+    /// message after the checkpoint, so callers should refuse to restore when
+    /// this returns <c>null</c> rather than guessing.
+    /// </summary>
+    public static SessionCompactionCheckpoint? ResolveUnambiguousLatest(
+        IReadOnlyList<SessionCompactionCheckpoint> checkpoints)
+    {
+        if (checkpoints.Count == 0) return null;
+
+        if (checkpoints.Any(c => c.CreatedAt is null)) return null;
+
+        var ordered = checkpoints.OrderByDescending(c => c.CreatedAt!.Value).ToList();
+        var latest = ordered[0];
+        if (string.IsNullOrEmpty(latest.Id)) return null;
+        if (ordered.Count == 1) return latest;
+
+        return latest.CreatedAt!.Value > ordered[1].CreatedAt!.Value ? latest : null;
+    }
+}
diff --git a/src/OpenClaw.Shared/Sessions/SessionTranscriptFormatter.cs b/src/OpenClaw.Shared/Sessions/SessionTranscriptFormatter.cs
new file mode 100644
index 000000000..b846cea9a
--- /dev/null
+++ b/src/OpenClaw.Shared/Sessions/SessionTranscriptFormatter.cs
@@ -0,0 +1,70 @@
+using System;
+using System.Text;
+
+namespace OpenClaw.Shared.Sessions;
+
+/// <summary>
+/// Renders a <see cref="ChatHistoryInfo"/> transcript to plain text for the
+/// "Export transcript" action, and suggests a filename. Pure and testable.
+/// </summary>
+public static class SessionTranscriptFormatter
+{
+    /// <summary>
+    /// Formats the transcript as a readable plain-text document with a header
+    /// and one block per message (role, local timestamp, text).
+    /// </summary>
+    public static string Format(ChatHistoryInfo history)
+    {
+        if (history is null) throw new ArgumentNullException(nameof(history));
+
+        var nl = Environment.NewLine;
+        var sb = new StringBuilder();
+        sb.Append("OpenClaw session transcript").Append(nl);
+        sb.Append("Session: ").Append(string.IsNullOrWhiteSpace(history.SessionKey) ? "(unknown)" : history.SessionKey).Append(nl);
+        if (!string.IsNullOrWhiteSpace(history.SessionId))
+            sb.Append("Session ID: ").Append(history.SessionId).Append(nl);
+        sb.Append("Exported: ").Append(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")).Append(nl);
+        sb.Append("Messages: ").Append(history.Messages.Count).Append(nl);
+        sb.Append(new string('-', 40)).Append(nl);
+
+        foreach (var m in history.Messages)
+        {
+            var role = string.IsNullOrWhiteSpace(m.Role) ? "?" : m.Role;
+            sb.Append(nl).Append('[').Append(role);
+            if (m.Ts > 0)
+            {
+                var ts = DateTimeOffset.FromUnixTimeMilliseconds(m.Ts).LocalDateTime;
+                sb.Append(" \u00B7 ").Append(ts.ToString("yyyy-MM-dd HH:mm:ss"));
+            }
+            sb.Append(']').Append(nl);
+            sb.Append(m.Text ?? string.Empty).Append(nl);
+        }
+
+        return sb.ToString();
+    }
+
+    /// <summary>
+    /// A filesystem-safe suggested filename for the export, derived from the
+    /// session key and current date.
+    /// </summary>
+    public static string SuggestFileName(string? sessionKey)
+    {
+        var slug = Slugify(sessionKey);
+        return $"openclaw-transcript-{slug}-{DateTime.Now:yyyyMMdd-HHmmss}.txt";
+    }
+
+    private static string Slugify(string? value)
+    {
+        if (string.IsNullOrWhiteSpace(value)) return "session";
+        var sb = new StringBuilder(value!.Length);
+        foreach (var ch in value)
+        {
+            if (char.IsLetterOrDigit(ch)) sb.Append(char.ToLowerInvariant(ch));
+            else if (ch is '-' or '_') sb.Append(ch);
+            else sb.Append('-');
+        }
+        var slug = sb.ToString().Trim('-');
+        if (slug.Length == 0) return "session";
+        return slug.Length > 48 ? slug[..48].Trim('-') : slug;
+    }
+}
diff --git a/src/OpenClaw.Shared/SettingsData.cs b/src/OpenClaw.Shared/SettingsData.cs
index a3374248b..feeb57089 100644
--- a/src/OpenClaw.Shared/SettingsData.cs
+++ b/src/OpenClaw.Shared/SettingsData.cs
@@ -8,6 +8,12 @@ namespace OpenClaw.Shared;
 /// </summary>
 public record class SettingsData
 {
+    /// <summary>
+    /// Version for settings-file migrations that need to distinguish legacy
+    /// serialized defaults from explicit operator choices.
+    /// </summary>
+    public int SettingsSchemaVersion { get; set; } = 1;
+
     public string? GatewayUrl { get; set; }
     public bool UseSshTunnel { get; set; } = false;
     public string? SshTunnelUser { get; set; }
@@ -33,6 +39,12 @@ public record class SettingsData
     public bool NotifyBuild { get; set; } = true;
     public bool NotifyStock { get; set; } = true;
     public bool NotifyInfo { get; set; } = true;
+    /// <summary>
+    /// When true (default), inbound device/node pairing requests are surfaced as a focused
+    /// approval dialog plus an awareness toast. When false they appear only in the Connections
+    /// page "Pending approvals" banner (passive). Auto-approval of the local node is unaffected.
+    /// </summary>
+    public bool ShowPairingApprovalDialog { get; set; } = true;
     public bool EnableNodeMode { get; set; } = false;
     public bool NodeCanvasEnabled { get; set; } = true;
     public bool NodeScreenEnabled { get; set; } = true;
@@ -115,18 +127,36 @@ public record class SettingsData
     /// "User interface" section.
     /// </summary>
     public bool UseLegacyWebChat { get; set; } = false;
+    /// <summary>
+    /// When false, the tray Sessions page hides clean completed sessions
+    /// (currently status <c>done</c> / <c>completed</c>) while keeping failed,
+    /// killed, timeout, and aborted runs visible. Default false reduces
+    /// completed ACP/subagent clutter for upgraded installs.
+    /// </summary>
+    public bool ShowCompletedSessions { get; set; } = false;
+    public string AppTheme { get; set; } = "System";
+    public bool? ShowDiagnostics { get; set; }
     public List<UserNotificationRule>? UserRules { get; set; }
 
     // ── MXC sandbox ─────────────────────────────────────────────────────
     /// <summary>
     /// Master switch for system.run containment. When <c>true</c> (default),
-    /// system.run runs inside an MXC AppContainer; if MXC is unavailable on
-    /// this host the invocation is denied — there is no host fallback. When
-    /// <c>false</c>, system.run runs on the host as it did before MXC support
-    /// was added.
+    /// system.run uses MXC containment when available and uses the compatibility
+    /// host fallback when MXC is unavailable unless strict blocking is enabled. Unsupported
+    /// sandbox request features are rejected while sandboxing remains enabled.
+    /// When <c>false</c>, system.run always runs on the host as it did before
+    /// MXC support was added.
     /// </summary>
     public bool SystemRunSandboxEnabled { get; set; } = true;
 
+    /// <summary>
+    /// When sandboxing is enabled but MXC is unavailable, block system.run
+    /// instead of using the compatibility host fallback. Default <c>false</c>
+    /// preserves the pre-MXC host fallback unless the operator opts into strict
+    /// fail-closed behavior.
+    /// </summary>
+    public bool SystemRunBlockHostFallbackWhenMxcUnavailable { get; set; } = false;
+
     /// <summary>
     /// When sandboxed, allow system.run commands to reach the public internet.
     /// Default false — most shell commands are local-only.
diff --git a/src/OpenClaw.Shared/TokenSanitizer.cs b/src/OpenClaw.Shared/TokenSanitizer.cs
index 9fadb9658..51558aac3 100644
--- a/src/OpenClaw.Shared/TokenSanitizer.cs
+++ b/src/OpenClaw.Shared/TokenSanitizer.cs
@@ -10,7 +10,58 @@ namespace OpenClaw.Shared;
 
 public static class TokenSanitizer
 {
-    private static readonly TimeSpan RegexTimeout = TimeSpan.FromMilliseconds(100);
+    private static readonly TimeSpan RegexTimeout = TimeSpan.FromMilliseconds(500);
+
+    private static readonly string[] SensitiveKeyFragments =
+    [
+        "authorization",
+        "api-key",
+        "apikey",
+        "bearer",
+        "bot-token",
+        "bottoken",
+        "browser-password",
+        "browserpassword",
+        "client-secret",
+        "clientsecret",
+        "cookie",
+        "device-id",
+        "deviceid",
+        "dpapi",
+        "identity",
+        "jwt",
+        "nonce",
+        "node",
+        "nsec",
+        "openclawid",
+        "password",
+        "private-key",
+        "privatekey",
+        "raw-error-response",
+        "raw_error_response",
+        "relay-url",
+        "relayurl",
+        "secret",
+        "session-key",
+        "sessionkey",
+        "setup-code",
+        "setupcode",
+        "signing",
+        "token",
+        "webhook",
+        "x-api-key",
+        "xapikey"
+    ];
+
+    private static readonly string[] SensitiveHeaders =
+    [
+        "authorization",
+        "cookie",
+        "proxy-authorization",
+        "set-cookie",
+        "x-api-key",
+        "x-openclaw-token"
+    ];
 
     private static readonly Regex AuthorizationBearerPattern = new(
         @"(?i)(Authorization\s*:\s*Bearer\s+)([^\s""',;]+)",
@@ -18,7 +69,7 @@ public static class TokenSanitizer
         RegexTimeout);
 
     private static readonly Regex JsonSecretFieldPattern = new(
-        @"""(?<key>[^""]*(?:token|secret|bearer|authorization)[^""]*)""\s*:\s*""(?<value>[^""]+)""",
+        @"""(?<key>[^""]*(?:token|secret|bearer|authorization)[^""]*)""\s*:\s*""(?<value>(?:\\.|[^""\\])*)""",
         RegexOptions.Compiled | RegexOptions.CultureInvariant | RegexOptions.IgnoreCase,
         RegexTimeout);
 
@@ -42,11 +93,26 @@ public static class TokenSanitizer
         RegexOptions.Compiled | RegexOptions.CultureInvariant | RegexOptions.IgnoreCase,
         RegexTimeout);
 
+    private static readonly Regex PathWindowsUserForwardSlashPattern = new(
+        @"\b[A-Za-z]:/{1,4}Users/{1,4}[^/\s]+",
+        RegexOptions.Compiled | RegexOptions.CultureInvariant | RegexOptions.IgnoreCase,
+        RegexTimeout);
+
+    private static readonly Regex PathWslMountedWindowsUserPattern = new(
+        @"/mnt/[a-z]/Users/[^/\s]+",
+        RegexOptions.Compiled | RegexOptions.CultureInvariant | RegexOptions.IgnoreCase,
+        RegexTimeout);
+
     private static readonly Regex PathUnixUserPattern = new(
         @"/Users/[^/\s]+",
         RegexOptions.Compiled | RegexOptions.CultureInvariant,
         RegexTimeout);
 
+    private static readonly Regex PathLinuxHomeUserPattern = new(
+        @"/home/[^/\s]+",
+        RegexOptions.Compiled | RegexOptions.CultureInvariant,
+        RegexTimeout);
+
     // Captures the scheme separately so the replacement can drop any user:pass@ userinfo entirely
     // rather than leaving credentials adjacent to the redacted <host>. The match is greedy through
     // path/query/fragment up to common log delimiters (whitespace, quote, backtick, angle brackets,
@@ -141,14 +207,22 @@ public static string SanitizeLogMessage(string? message)
 
         try
         {
+            sanitized = RedactPrivateKeyBlocks(sanitized);
+            sanitized = RedactSignedHandshakeLines(sanitized);
+            sanitized = RedactDpapiBlobs(sanitized);
+            sanitized = RedactAgentSessionKeys(sanitized);
+            sanitized = RedactSensitiveCommandOptions(sanitized);
+            sanitized = RedactSensitiveKeyValues(sanitized);
+            sanitized = RedactGuidTokens(sanitized);
             sanitized = RedactLocalPaths(sanitized);
             // Reconstruct the URL as scheme://<host>[:port]/<first-segment>[/…] so credential-bearing
             // userinfo, query strings, fragments, and deeper path segments are dropped. Mirrors the
             // UrlLogSanitizer contract used elsewhere for disk-backed log safety.
             sanitized = UrlHostPattern.Replace(sanitized, RedactUrlMatch);
+            sanitized = EmailPattern.Replace(sanitized, "<email>");
+            sanitized = RedactLocalIdentityNames(sanitized);
             sanitized = IpV6Pattern.Replace(sanitized, RedactIfValidIpV6);
             sanitized = IpAddressPattern.Replace(sanitized, "<ip>");
-            sanitized = EmailPattern.Replace(sanitized, "<email>");
             sanitized = UserAtHostPattern.Replace(sanitized, "<user>@<host>");
             sanitized = HostAfterToPattern.Replace(sanitized, "<host>");
             return LeadingHostPattern.Replace(sanitized, "<host>");
@@ -159,6 +233,250 @@ public static string SanitizeLogMessage(string? message)
         }
     }
 
+    private static string RedactPrivateKeyBlocks(string text)
+    {
+        const string beginMarker = "-----BEGIN ";
+        const string endPrefix = "-----END ";
+        const string endSuffix = "-----";
+
+        var builder = new System.Text.StringBuilder(text.Length);
+        var index = 0;
+        while (index < text.Length)
+        {
+            var begin = text.IndexOf(beginMarker, index, StringComparison.OrdinalIgnoreCase);
+            if (begin < 0)
+            {
+                builder.Append(text, index, text.Length - index);
+                break;
+            }
+
+            var beginLineEnd = text.IndexOf(endSuffix, begin + beginMarker.Length, StringComparison.Ordinal);
+            if (beginLineEnd < 0 ||
+                !text.AsSpan(begin, beginLineEnd + endSuffix.Length - begin).Contains("PRIVATE KEY", StringComparison.OrdinalIgnoreCase))
+            {
+                builder.Append(text, index, begin + beginMarker.Length - index);
+                index = begin + beginMarker.Length;
+                continue;
+            }
+
+            var end = text.IndexOf(endPrefix, beginLineEnd + endSuffix.Length, StringComparison.OrdinalIgnoreCase);
+            if (end < 0)
+            {
+                builder.Append(text, index, begin - index);
+                builder.Append("[REDACTED_PRIVATE_KEY]");
+                break;
+            }
+
+            var endLineEnd = text.IndexOf(endSuffix, end + endPrefix.Length, StringComparison.Ordinal);
+            builder.Append(text, index, begin - index);
+            builder.Append("[REDACTED_PRIVATE_KEY]");
+            index = endLineEnd < 0 ? text.Length : endLineEnd + endSuffix.Length;
+        }
+
+        return builder.ToString();
+    }
+
+    private static string RedactSignedHandshakeLines(string text)
+    {
+        const string marker = "signed:";
+        var builder = new System.Text.StringBuilder(text.Length);
+        var index = 0;
+        while (index < text.Length)
+        {
+            var start = text.IndexOf(marker, index, StringComparison.OrdinalIgnoreCase);
+            if (start < 0)
+            {
+                builder.Append(text, index, text.Length - index);
+                break;
+            }
+
+            var lineEnd = FindLineEnd(text, start);
+            builder.Append(text, index, start - index);
+            builder.Append("signed: [REDACTED_HANDSHAKE]");
+            builder.Append(text, lineEnd, FindLineBreakLength(text, lineEnd));
+            index = lineEnd + FindLineBreakLength(text, lineEnd);
+        }
+
+        return builder.ToString();
+    }
+
+    private static string RedactDpapiBlobs(string text) =>
+        RedactPrefixedToken(text, "dpapi:", "dpapi:[REDACTED]");
+
+    private static string RedactAgentSessionKeys(string text) =>
+        RedactPrefixedToken(text, "agent:", "[REDACTED_SESSION_KEY]");
+
+    private static string RedactPrefixedToken(string text, string prefix, string replacement)
+    {
+        var builder = new System.Text.StringBuilder(text.Length);
+        var index = 0;
+        while (index < text.Length)
+        {
+            var start = text.IndexOf(prefix, index, StringComparison.OrdinalIgnoreCase);
+            if (start < 0)
+            {
+                builder.Append(text, index, text.Length - index);
+                break;
+            }
+
+            var end = start + prefix.Length;
+            while (end < text.Length && !IsValueTerminator(text[end]) && !IsQuote(text[end]))
+                end++;
+
+            builder.Append(text, index, start - index);
+            builder.Append(replacement);
+            index = end;
+        }
+
+        return builder.ToString();
+    }
+
+    private static string RedactSensitiveCommandOptions(string text)
+    {
+        var builder = new System.Text.StringBuilder(text.Length);
+        var index = 0;
+        while (index < text.Length)
+        {
+            var optionStart = text.IndexOf("--", index, StringComparison.Ordinal);
+            if (optionStart < 0)
+            {
+                builder.Append(text, index, text.Length - index);
+                break;
+            }
+
+            var optionEnd = optionStart + 2;
+            while (optionEnd < text.Length && IsKeyChar(text[optionEnd]))
+                optionEnd++;
+
+            var optionName = text[(optionStart + 2)..optionEnd];
+            if (!IsSensitiveKey(optionName))
+            {
+                builder.Append(text, index, optionEnd - index);
+                index = optionEnd;
+                continue;
+            }
+
+            var valueStart = optionEnd;
+            while (valueStart < text.Length && char.IsWhiteSpace(text[valueStart]))
+                valueStart++;
+
+            if (valueStart >= text.Length || IsValueTerminator(text[valueStart]))
+            {
+                builder.Append(text, index, valueStart - index);
+                index = valueStart;
+                continue;
+            }
+
+            var (valueContentStart, valueEnd) = FindValueSpan(text, valueStart);
+            if (IsAlreadyRedacted(text, valueContentStart, valueEnd))
+            {
+                builder.Append(text, index, valueEnd - index);
+                index = valueEnd;
+                continue;
+            }
+
+            builder.Append(text, index, valueContentStart - index);
+            builder.Append("[REDACTED]");
+            if (valueEnd < text.Length && IsQuote(text[valueEnd]))
+            {
+                builder.Append(text[valueEnd]);
+                valueEnd++;
+            }
+
+            index = valueEnd;
+        }
+
+        return builder.ToString();
+    }
+
+    private static string RedactSensitiveKeyValues(string text)
+    {
+        var builder = new System.Text.StringBuilder(text.Length);
+        var index = 0;
+        while (index < text.Length)
+        {
+            var delimiter = FindNextKeyValueDelimiter(text, index);
+            if (delimiter < 0)
+            {
+                builder.Append(text, index, text.Length - index);
+                break;
+            }
+
+            var keyStart = FindKeyStart(text, delimiter - 1);
+            var keyToken = text[keyStart..delimiter];
+            var key = NormalizeKey(keyToken);
+            var isSensitiveHeader = IsSensitiveHeader(key);
+            if (!IsSensitiveKey(key) && !isSensitiveHeader)
+            {
+                builder.Append(text, index, delimiter + 1 - index);
+                index = delimiter + 1;
+                continue;
+            }
+
+            var valueStart = delimiter + 1;
+            while (valueStart < text.Length && char.IsWhiteSpace(text[valueStart]))
+                valueStart++;
+
+            if (valueStart >= text.Length)
+            {
+                builder.Append(text, index, valueStart - index);
+                index = valueStart;
+                continue;
+            }
+
+            var (valueContentStart, valueEnd) = isSensitiveHeader
+                ? (valueStart, FindLineEnd(text, valueStart))
+                : FindValueSpan(text, valueStart);
+            if (IsAlreadyRedacted(text, valueContentStart, valueEnd))
+            {
+                builder.Append(text, index, valueEnd - index);
+                index = valueEnd;
+                continue;
+            }
+
+            builder.Append(text, index, valueContentStart - index);
+            var valueIsQuoted = valueStart < text.Length && IsQuote(text[valueStart]);
+            var redactedReplacement = !isSensitiveHeader &&
+                !valueIsQuoted &&
+                text[delimiter] == ':' &&
+                IsQuotedKeyToken(keyToken)
+                    ? "\"[REDACTED]\""
+                    : "[REDACTED]";
+            builder.Append(redactedReplacement);
+            if (valueIsQuoted && valueEnd < text.Length && IsQuote(text[valueEnd]))
+            {
+                builder.Append(text[valueEnd]);
+                valueEnd++;
+            }
+
+            index = valueEnd;
+        }
+
+        return builder.ToString();
+    }
+
+    private static string RedactGuidTokens(string text)
+    {
+        var builder = new System.Text.StringBuilder(text.Length);
+        var index = 0;
+        while (index < text.Length)
+        {
+            if (!IsGuidCandidateStart(text, index) ||
+                index + 36 > text.Length ||
+                !Guid.TryParse(text.AsSpan(index, 36), out _))
+            {
+                builder.Append(text[index]);
+                index++;
+                continue;
+            }
+
+            builder.Append("[REDACTED_ID]");
+            index += 36;
+        }
+
+        return builder.ToString();
+    }
+
     // Validates an IPv6 regex match with System.Net.IPAddress so non-IPv6 substrings
     // that happen to fit the pattern (e.g. [1:2:3:4:5]) are left intact rather than
     // redacted to the misleading <ipv6> marker. Textual zone-ids (fe80::1%eth0) are
@@ -255,9 +573,263 @@ private static string RedactLocalPaths(string message)
         }
 
         redacted = PathWindowsUserPattern.Replace(redacted, "%USERPROFILE%");
-        return PathUnixUserPattern.Replace(redacted, "$HOME");
+        redacted = PathWindowsUserForwardSlashPattern.Replace(redacted, "%USERPROFILE%");
+        redacted = PathWslMountedWindowsUserPattern.Replace(redacted, "%USERPROFILE%");
+        redacted = PathUnixUserPattern.Replace(redacted, "$HOME");
+        return PathLinuxHomeUserPattern.Replace(redacted, "$HOME");
+    }
+
+    private static string RedactLocalIdentityNames(string message)
+    {
+        var redacted = message;
+        redacted = RedactKnownIdentityName(redacted, Environment.UserName, "<user>");
+        redacted = RedactKnownIdentityName(redacted, Environment.MachineName, "<host>");
+        return redacted;
+    }
+
+    private static string RedactKnownIdentityName(string text, string? value, string replacement)
+    {
+        if (string.IsNullOrWhiteSpace(value) || value.Length < 3)
+            return text;
+
+        var normalized = value.Trim();
+        if (normalized.Equals("user", StringComparison.OrdinalIgnoreCase) ||
+            normalized.Equals("admin", StringComparison.OrdinalIgnoreCase) ||
+            normalized.Equals("desktop", StringComparison.OrdinalIgnoreCase) ||
+            normalized.Equals("localhost", StringComparison.OrdinalIgnoreCase))
+        {
+            return text;
+        }
+
+        return Regex.Replace(
+            text,
+            $@"(?<![A-Za-z0-9_-]){Regex.Escape(normalized)}(?![A-Za-z0-9_-])",
+            replacement,
+            RegexOptions.IgnoreCase | RegexOptions.CultureInvariant,
+            RegexTimeout);
+    }
+
+    private static int FindNextKeyValueDelimiter(string text, int start)
+    {
+        for (var i = start; i < text.Length; i++)
+        {
+            if (text[i] is not (':' or '='))
+                continue;
+
+            var keyEnd = i - 1;
+            while (keyEnd >= start && char.IsWhiteSpace(text[keyEnd]))
+                keyEnd--;
+
+            if (keyEnd >= start && IsKeyCharOrQuote(text[keyEnd]))
+                return i;
+        }
+
+        return -1;
+    }
+
+    private static int FindKeyStart(string text, int index)
+    {
+        while (index >= 0 && char.IsWhiteSpace(text[index]))
+            index--;
+
+        while (index >= 0 && IsKeyCharOrQuote(text[index]))
+            index--;
+        return index + 1;
+    }
+
+    private static string NormalizeKey(string key) =>
+        key.Trim().Trim('"', '\'').Replace("_", "-", StringComparison.Ordinal).ToLowerInvariant();
+
+    private static bool IsQuotedKeyToken(string key)
+    {
+        var trimmed = key.Trim();
+        return trimmed.Length >= 2 && IsQuote(trimmed[0]) && IsQuote(trimmed[^1]);
+    }
+
+    public static bool IsSensitiveMetadataKeyName(string? key) =>
+        IsSensitiveKey(key, includeBroadNodeFragment: false);
+
+    private static bool IsSensitiveKey(string? key) =>
+        IsSensitiveKey(key, includeBroadNodeFragment: true);
+
+    private static bool IsSensitiveKey(string? key, bool includeBroadNodeFragment)
+    {
+        if (string.IsNullOrWhiteSpace(key))
+            return false;
+
+        var normalized = NormalizeKey(key);
+        if (normalized == "id" || normalized.EndsWith("-id", StringComparison.Ordinal))
+            return true;
+
+        foreach (var fragment in SensitiveKeyFragments)
+        {
+            if (!includeBroadNodeFragment && fragment == "node")
+                continue;
+
+            if (normalized.Contains(fragment, StringComparison.Ordinal))
+                return true;
+        }
+
+        return false;
+    }
+
+    private static bool IsSensitiveHeader(string key)
+    {
+        var normalized = NormalizeKey(key);
+        foreach (var header in SensitiveHeaders)
+        {
+            if (string.Equals(normalized, header, StringComparison.Ordinal))
+                return true;
+        }
+
+        return false;
+    }
+
+    private static (int ContentStart, int End) FindValueSpan(string text, int valueStart)
+    {
+        if (valueStart >= text.Length)
+            return (valueStart, valueStart);
+
+        if (text.AsSpan(valueStart).StartsWith("[REDACTED", StringComparison.Ordinal))
+        {
+            var markerEnd = text.IndexOf(']', valueStart);
+            if (markerEnd >= 0)
+            {
+                var afterMarker = markerEnd + 1;
+                if (afterMarker >= text.Length || IsValueTerminator(text[afterMarker]) || IsQuote(text[afterMarker]))
+                    return (valueStart, afterMarker);
+
+                var redactedSuffixEnd = afterMarker;
+                while (redactedSuffixEnd < text.Length && !IsValueTerminator(text[redactedSuffixEnd]))
+                    redactedSuffixEnd++;
+                return (valueStart, redactedSuffixEnd);
+            }
+        }
+
+        if (text[valueStart] is '{' or '[')
+            return (valueStart, FindCompoundValueEnd(text, valueStart));
+
+        if (IsQuote(text[valueStart]))
+        {
+            var quote = text[valueStart];
+            var endQuote = valueStart + 1;
+            while (endQuote < text.Length)
+            {
+                if (text[endQuote] == '\\' && endQuote + 1 < text.Length)
+                {
+                    endQuote += 2;
+                    continue;
+                }
+
+                if (text[endQuote] == quote)
+                    break;
+
+                endQuote++;
+            }
+            return (valueStart + 1, endQuote);
+        }
+
+        var end = valueStart;
+        while (end < text.Length && !IsValueTerminator(text[end]))
+            end++;
+        return (valueStart, end);
+    }
+
+    private static int FindCompoundValueEnd(string text, int valueStart)
+    {
+        var opener = text[valueStart];
+        var closer = opener == '{' ? '}' : ']';
+        var depth = 0;
+        var inString = false;
+        var quote = '\0';
+
+        for (var index = valueStart; index < text.Length; index++)
+        {
+            var c = text[index];
+            if (inString)
+            {
+                if (c == '\\' && index + 1 < text.Length)
+                {
+                    index++;
+                    continue;
+                }
+
+                if (c == quote)
+                    inString = false;
+                continue;
+            }
+
+            if (IsQuote(c))
+            {
+                inString = true;
+                quote = c;
+                continue;
+            }
+
+            if (c == opener)
+            {
+                depth++;
+                continue;
+            }
+
+            if (c != closer)
+                continue;
+
+            depth--;
+            if (depth == 0)
+                return index + 1;
+        }
+
+        return FindLineEnd(text, valueStart);
+    }
+
+    private static bool IsAlreadyRedacted(string text, int valueContentStart, int valueEnd)
+    {
+        while (valueContentStart < valueEnd && char.IsWhiteSpace(text[valueContentStart]))
+            valueContentStart++;
+        while (valueEnd > valueContentStart && char.IsWhiteSpace(text[valueEnd - 1]))
+            valueEnd--;
+
+        return valueContentStart < valueEnd &&
+            text.AsSpan(valueContentStart, valueEnd - valueContentStart).StartsWith("[REDACTED", StringComparison.Ordinal) &&
+            text[valueEnd - 1] == ']';
     }
 
+    private static int FindLineEnd(string text, int start)
+    {
+        var index = start;
+        while (index < text.Length && text[index] != '\r' && text[index] != '\n')
+            index++;
+        return index;
+    }
+
+    private static int FindLineBreakLength(string text, int lineEnd)
+    {
+        if (lineEnd >= text.Length)
+            return 0;
+        if (text[lineEnd] == '\r' && lineEnd + 1 < text.Length && text[lineEnd + 1] == '\n')
+            return 2;
+        return 1;
+    }
+
+    private static bool IsGuidCandidateStart(string text, int index) =>
+        (index == 0 || !IsHexOrDash(text[index - 1])) && IsHex(text[index]);
+
+    private static bool IsHexOrDash(char c) => IsHex(c) || c == '-';
+
+    private static bool IsHex(char c) =>
+        c is >= '0' and <= '9' or >= 'a' and <= 'f' or >= 'A' and <= 'F';
+
+    private static bool IsKeyCharOrQuote(char c) => IsKeyChar(c) || IsQuote(c);
+
+    private static bool IsKeyChar(char c) =>
+        char.IsLetterOrDigit(c) || c is '_' or '-' or '.';
+
+    private static bool IsQuote(char c) => c is '"' or '\'';
+
+    private static bool IsValueTerminator(char c) =>
+        char.IsWhiteSpace(c) || c is ',' or ';' or '}' or ']';
+
     private static IEnumerable<(string Folder, string Replacement)> KnownLocalFolders()
     {
         yield return (Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "%USERPROFILE%");
diff --git a/src/OpenClaw.Shared/WindowsNodeClient.cs b/src/OpenClaw.Shared/WindowsNodeClient.cs
index 52859f024..8ca7c8125 100644
--- a/src/OpenClaw.Shared/WindowsNodeClient.cs
+++ b/src/OpenClaw.Shared/WindowsNodeClient.cs
@@ -481,6 +481,8 @@ private async Task HandleNodeInvokeEventAsync(JsonElement root)
                 }
             }
         }
+
+        var sessionKey = ExtractNodeInvokeSessionKey(payload, args);
         
         _logger.Info($"[NODE] Invoking command: {command}");
         
@@ -489,7 +491,8 @@ private async Task HandleNodeInvokeEventAsync(JsonElement root)
         {
             Id = requestId,
             Command = command,
-            Args = args
+            Args = args,
+            SessionKey = sessionKey
         };
         
         // Find capability that can handle this command
@@ -1041,6 +1044,7 @@ private async Task HandleNodeInvokeAsync(JsonElement root, string? requestId)
         var args = paramsEl.TryGetProperty("args", out var argsEl) 
             ? argsEl.Clone() 
             : default;
+        var sessionKey = ExtractNodeInvokeSessionKey(paramsEl, args);
         
         _logger.Info($"Received node.invoke: {command}");
         
@@ -1048,7 +1052,8 @@ private async Task HandleNodeInvokeAsync(JsonElement root, string? requestId)
         {
             Id = requestId,
             Command = command,
-            Args = args
+            Args = args,
+            SessionKey = sessionKey
         };
         
         // Find capability that can handle this command
@@ -1109,6 +1114,28 @@ private async Task HandleNodeInvokeAsync(JsonElement root, string? requestId)
         }, CancellationToken.None);
     }
 
+    private static string? ExtractNodeInvokeSessionKey(JsonElement envelope, JsonElement args)
+    {
+        if (envelope.TryGetProperty("sessionKey", out var envelopeSessionKey) &&
+            envelopeSessionKey.ValueKind == JsonValueKind.String)
+        {
+            var sessionKey = envelopeSessionKey.GetString();
+            if (!string.IsNullOrWhiteSpace(sessionKey))
+                return sessionKey;
+        }
+
+        if (args.ValueKind == JsonValueKind.Object &&
+            args.TryGetProperty("sessionKey", out var argsSessionKey) &&
+            argsSessionKey.ValueKind == JsonValueKind.String)
+        {
+            var sessionKey = argsSessionKey.GetString();
+            if (!string.IsNullOrWhiteSpace(sessionKey))
+                return sessionKey;
+        }
+
+        return null;
+    }
+
     private void RaiseInvokeCompleted(string requestId, string command, bool ok, string? error, TimeSpan duration)
     {
         InvokeCompleted?.Invoke(this, new NodeInvokeCompletedEventArgs
diff --git a/src/OpenClaw.Shared/WindowsStartupTaskRegistration.cs b/src/OpenClaw.Shared/WindowsStartupTaskRegistration.cs
index b36ca72bd..2a24ce843 100644
--- a/src/OpenClaw.Shared/WindowsStartupTaskRegistration.cs
+++ b/src/OpenClaw.Shared/WindowsStartupTaskRegistration.cs
@@ -6,39 +6,46 @@ public static class WindowsStartupTaskRegistration
 {
     public const string TaskName = "OpenClaw Companion";
 
-    public static bool Register(string trayExecutablePath)
+    public static bool Register(string trayExecutablePath, string taskName = TaskName)
     {
         if (string.IsNullOrWhiteSpace(trayExecutablePath) || !File.Exists(trayExecutablePath))
             return false;
 
-        return Run(CreateRegisterProcessStartInfo(trayExecutablePath));
+        return Run(CreateRegisterProcessStartInfo(trayExecutablePath, taskName));
     }
 
-    public static bool Unregister() => Run(CreateUnregisterProcessStartInfo());
+    public static bool Unregister(string taskName = TaskName) => Run(CreateUnregisterProcessStartInfo(taskName));
 
-    public static bool Exists() => Run(CreateQueryProcessStartInfo());
+    public static bool Exists(string taskName = TaskName) => Run(CreateQueryProcessStartInfo(taskName));
 
-    internal static ProcessStartInfo CreateRegisterProcessStartInfo(string trayExecutablePath)
+    internal static ProcessStartInfo CreateRegisterProcessStartInfo(string trayExecutablePath, string taskName = TaskName)
     {
+        ArgumentException.ThrowIfNullOrWhiteSpace(taskName);
         var fullPath = Path.GetFullPath(trayExecutablePath);
         return CreateStartInfo(
             "/Create",
-            "/TN", TaskName,
+            "/TN", taskName,
             "/TR", Quote(fullPath),
             "/SC", "ONLOGON",
             "/F");
     }
 
-    internal static ProcessStartInfo CreateUnregisterProcessStartInfo() =>
-        CreateStartInfo(
+    internal static ProcessStartInfo CreateUnregisterProcessStartInfo(string taskName = TaskName)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(taskName);
+        return CreateStartInfo(
             "/Delete",
-            "/TN", TaskName,
+            "/TN", taskName,
             "/F");
+    }
 
-    internal static ProcessStartInfo CreateQueryProcessStartInfo() =>
-        CreateStartInfo(
+    internal static ProcessStartInfo CreateQueryProcessStartInfo(string taskName = TaskName)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(taskName);
+        return CreateStartInfo(
             "/Query",
-            "/TN", TaskName);
+            "/TN", taskName);
+    }
 
     private static bool Run(ProcessStartInfo startInfo)
     {
diff --git a/src/OpenClaw.Shared/WslCommandLineMatcher.cs b/src/OpenClaw.Shared/WslCommandLineMatcher.cs
new file mode 100644
index 000000000..36a59290d
--- /dev/null
+++ b/src/OpenClaw.Shared/WslCommandLineMatcher.cs
@@ -0,0 +1,32 @@
+using System.Text.RegularExpressions;
+
+namespace OpenClaw.Shared;
+
+/// <summary>Matches the exact WSL distribution argument in app-owned keepalive commands.</summary>
+public static class WslCommandLineMatcher
+{
+    private static readonly Regex DistroArgument = new(
+        """(?:^|\s)(?:-d|--distribution)\s+(?:"(?<quoted>[^"]+)"|(?<bare>[^\s"]+))(?=\s|$)""",
+        RegexOptions.Compiled | RegexOptions.CultureInvariant | RegexOptions.IgnoreCase);
+
+    private static readonly Regex SleepInfinity = new(
+        """(?:^|\s)sleep\s+infinity(?=\s|$)""",
+        RegexOptions.Compiled | RegexOptions.CultureInvariant | RegexOptions.IgnoreCase);
+
+    public static bool IsKeepaliveForDistro(string? commandLine, string? distroName)
+    {
+        if (string.IsNullOrWhiteSpace(commandLine) || string.IsNullOrWhiteSpace(distroName))
+            return false;
+
+        var match = DistroArgument.Match(commandLine);
+        if (!match.Success)
+            return false;
+
+        var actualDistro = match.Groups["quoted"].Success
+            ? match.Groups["quoted"].Value
+            : match.Groups["bare"].Value;
+
+        return string.Equals(actualDistro, distroName, StringComparison.OrdinalIgnoreCase)
+            && SleepInfinity.IsMatch(commandLine);
+    }
+}
diff --git a/src/OpenClaw.Tray.WinUI/A2UI/DataModel/DataModelStore.cs b/src/OpenClaw.Tray.WinUI/A2UI/DataModel/DataModelStore.cs
index 3b091fa2f..d33d69bb7 100644
--- a/src/OpenClaw.Tray.WinUI/A2UI/DataModel/DataModelStore.cs
+++ b/src/OpenClaw.Tray.WinUI/A2UI/DataModel/DataModelStore.cs
@@ -105,6 +105,7 @@ public void ApplyDataModelUpdate(string surfaceId, string? basePath, IReadOnlyLi
             if (entry.Key.Length > MaxKeyLength) continue;
             if (entry.ValueString != null && entry.ValueString.Length > MaxStringValueLength) continue;
             if (!IsWithinDepth(entry.ValueMap, depth: 1, max: MaxValueMapDepth)) continue;
+            if (!IsWithinDepth(entry.ValueArray, depth: 1, max: MaxValueMapDepth)) continue;
 
             try
             {
@@ -130,12 +131,17 @@ public void ApplyDataModelUpdate(string surfaceId, string? basePath, IReadOnlyLi
             new DataModelObservable(model, _dispatcher).NotifyPaths(changed);
     }
 
-    private static bool IsWithinDepth(IReadOnlyList<Protocol.DataModelEntry>? map, int depth, int max)
+    private static bool IsWithinDepth(IReadOnlyList<Protocol.DataModelEntry>? children, int depth, int max)
     {
-        if (map == null) return true;
+        if (children == null) return true;
         if (depth > max) return false;
-        foreach (var e in map)
+        foreach (var e in children)
+        {
+            // Both nested maps and nested arrays add a level — bound either path
+            // so a deeply-nested valueArray can't bypass the valueMap depth cap.
             if (!IsWithinDepth(e.ValueMap, depth + 1, max)) return false;
+            if (!IsWithinDepth(e.ValueArray, depth + 1, max)) return false;
+        }
         return true;
     }
 
@@ -241,14 +247,14 @@ public JsonObject CloneRoot()
                     if (obj[tok] == null)
                     {
                         if (!createMissing) return (null, null, false, -1);
-                        var nextIsIndex = int.TryParse(tokens[i + 1], out _);
+                        var nextIsIndex = TryParseArrayIndex(tokens[i + 1], out _);
                         obj[tok] = nextIsIndex ? new JsonArray() : new JsonObject();
                     }
                     cursor = obj[tok];
                 }
                 else if (cursor is JsonArray arr)
                 {
-                    if (!int.TryParse(tok, out var ai)) return (null, null, false, -1);
+                    if (!TryParseArrayIndex(tok, out var ai)) return (null, null, false, -1);
                     while (createMissing && arr.Count <= ai) arr.Add(null);
                     if (ai < 0 || ai >= arr.Count) return (null, null, false, -1);
                     cursor = arr[ai];
@@ -260,11 +266,28 @@ public JsonObject CloneRoot()
             }
 
             var last = tokens[^1];
-            if (cursor is JsonArray finalArr && int.TryParse(last, out var idx))
+            if (cursor is JsonArray finalArr && TryParseArrayIndex(last, out var idx))
                 return (finalArr, last, true, idx);
             return (cursor, last, false, -1);
         }
 
+        private static bool TryParseArrayIndex(string token, out int index)
+        {
+            index = -1;
+            if (token.Length == 0) return false;
+            if (token.Length > 1 && token[0] == '0') return false;
+
+            foreach (var c in token)
+                if (c < '0' || c > '9')
+                    return false;
+
+            return int.TryParse(
+                token,
+                System.Globalization.NumberStyles.None,
+                System.Globalization.CultureInfo.InvariantCulture,
+                out index);
+        }
+
         private static List<string> SplitPointer(string pointer)
         {
             var p = pointer.StartsWith('/') ? pointer.Substring(1) : pointer;
@@ -356,24 +379,57 @@ internal void NotifyPaths(IEnumerable<string> paths)
             var current = key;
             while (true)
             {
-                List<Action>? subs;
-                lock (_model.Subscribers)
-                {
-                    _model.Subscribers.TryGetValue(current, out subs);
-                    subs = subs == null ? null : new List<Action>(subs);
-                }
-                if (subs != null)
-                {
-                    foreach (var s in subs)
-                        if (fired.Add(s)) Dispatch(s);
-                }
+                DispatchSubscribers(current, fired);
                 if (current == "/" || string.IsNullOrEmpty(current)) break;
                 var slash = current.LastIndexOf('/');
                 current = slash <= 0 ? "/" : current.Substring(0, slash);
             }
+
+            // Replacing a container at /x also changes /x/... descendants. Most
+            // component bindings subscribe to the exact leaf path they read, so
+            // notify those subtree subscribers as well.
+            DispatchDescendantSubscribers(key, fired);
         }
     }
 
+    private void DispatchSubscribers(string key, HashSet<Action> fired)
+    {
+        List<Action>? subs;
+        lock (_model.Subscribers)
+        {
+            _model.Subscribers.TryGetValue(key, out subs);
+            subs = subs == null ? null : new List<Action>(subs);
+        }
+
+        if (subs == null) return;
+
+        foreach (var s in subs)
+            if (fired.Add(s))
+                Dispatch(s);
+    }
+
+    private void DispatchDescendantSubscribers(string key, HashSet<Action> fired)
+    {
+        List<Action> subs = [];
+        var prefix = key == "/" ? "/" : key + "/";
+
+        lock (_model.Subscribers)
+        {
+            foreach (var (subscriberPath, callbacks) in _model.Subscribers)
+            {
+                if (subscriberPath == key)
+                    continue;
+
+                if (key == "/" || subscriberPath.StartsWith(prefix, StringComparison.Ordinal))
+                    subs.AddRange(callbacks);
+            }
+        }
+
+        foreach (var s in subs)
+            if (fired.Add(s))
+                Dispatch(s);
+    }
+
     internal void NotifyAllPaths()
     {
         List<Action> all;
diff --git a/src/OpenClaw.Tray.WinUI/A2UI/Protocol/A2UIProtocol.cs b/src/OpenClaw.Tray.WinUI/A2UI/Protocol/A2UIProtocol.cs
index d4af4d385..f2812ed17 100644
--- a/src/OpenClaw.Tray.WinUI/A2UI/Protocol/A2UIProtocol.cs
+++ b/src/OpenClaw.Tray.WinUI/A2UI/Protocol/A2UIProtocol.cs
@@ -73,9 +73,9 @@ public sealed record A2UIComponentDef
 }
 
 /// <summary>
-/// Single dataModelUpdate.contents entry. Exactly one of Value*/ValueMap is
-/// expected on the wire; we expose them all and let the store apply whichever
-/// is set.
+/// Single dataModelUpdate.contents entry. Exactly one of
+/// Value*/ValueMap/ValueArray is expected on the wire; we expose them all and
+/// let the store apply whichever is set.
 /// </summary>
 public sealed record DataModelEntry
 {
@@ -85,6 +85,12 @@ public sealed record DataModelEntry
     public bool? ValueBoolean { get; init; }
     /// <summary>An adjacency-list map: each item is itself a DataModelEntry.</summary>
     public IReadOnlyList<DataModelEntry>? ValueMap { get; init; }
+    /// <summary>
+    /// An ordered array (v0.8 <c>valueArray</c>): each item is a value-typed
+    /// <see cref="DataModelEntry"/> whose <see cref="Key"/> is ignored. Items
+    /// may themselves be scalars, maps, or nested arrays.
+    /// </summary>
+    public IReadOnlyList<DataModelEntry>? ValueArray { get; init; }
 
     /// <summary>Convert this entry's value to a JsonNode for storage.</summary>
     public JsonNode? ToJsonNode()
@@ -99,6 +105,13 @@ public sealed record DataModelEntry
                 obj[entry.Key] = entry.ToJsonNode();
             return obj;
         }
+        if (ValueArray != null)
+        {
+            var arr = new JsonArray();
+            foreach (var entry in ValueArray)
+                arr.Add(entry.ToJsonNode());
+            return arr;
+        }
         return null;
     }
 }
@@ -350,6 +363,7 @@ private static string Truncate(string s, int max) =>
             ValueNumber = e["valueNumber"] is JsonValue jvn && jvn.TryGetValue<double>(out var n) ? n : null,
             ValueBoolean = e["valueBoolean"] is JsonValue jvb && jvb.TryGetValue<bool>(out var b) ? b : null,
             ValueMap = ParseValueMap(e["valueMap"] as JsonArray),
+            ValueArray = ParseValueArray(e["valueArray"] as JsonArray),
         };
         return entry;
     }
@@ -367,6 +381,61 @@ private static string Truncate(string s, int max) =>
         return list;
     }
 
+    /// <summary>
+    /// Parse a v0.8 <c>valueArray</c>. Each element is a value-typed object
+    /// with no key (e.g. <c>{ "valueString": "admin" }</c>). For robustness we
+    /// also tolerate bare primitives (<c>["a", 1, true]</c>) that an agent may
+    /// emit. A JSON <c>null</c> element is preserved as an explicit null slot so
+    /// array indices stay stable for position-sensitive consumers — matching how
+    /// a value-less wrapped object (<c>{}</c>) round-trips. Elements of an
+    /// unsupported kind are dropped, matching <see cref="ParseValueMap"/>'s
+    /// skip-bad-item tolerance.
+    /// </summary>
+    private static IReadOnlyList<DataModelEntry>? ParseValueArray(JsonArray? arr)
+    {
+        if (arr == null) return null;
+        var list = new List<DataModelEntry>(arr.Count);
+        foreach (var item in arr)
+        {
+            // A JSON null element surfaces as a C# null inside the JsonArray.
+            // Preserve it as a value-less entry (ToJsonNode → null) rather than
+            // dropping it, so [a, null, b] stays length 3.
+            if (item is null) { list.Add(NullArrayElement); continue; }
+            var element = ParseArrayElement(item);
+            if (element != null) list.Add(element);
+        }
+        return list;
+    }
+
+    /// <summary>Shared value-less entry representing a JSON null array slot.</summary>
+    private static readonly DataModelEntry NullArrayElement = new() { Key = string.Empty };
+
+    private static DataModelEntry? ParseArrayElement(JsonNode? item)
+    {
+        if (item is JsonObject e)
+        {
+            return new DataModelEntry
+            {
+                Key = string.Empty,
+                ValueString = OptionalString(e, "valueString"),
+                ValueNumber = e["valueNumber"] is JsonValue jvn && jvn.TryGetValue<double>(out var n) ? n : null,
+                ValueBoolean = e["valueBoolean"] is JsonValue jvb && jvb.TryGetValue<bool>(out var b) ? b : null,
+                ValueMap = ParseValueMap(e["valueMap"] as JsonArray),
+                ValueArray = ParseValueArray(e["valueArray"] as JsonArray),
+            };
+        }
+        // Bare primitive tolerance. Check string first (a JSON number/bool does
+        // not satisfy TryGetValue<string>), then bool (a JSON number does not
+        // satisfy TryGetValue<bool>), then number.
+        if (item is JsonValue v)
+        {
+            if (v.TryGetValue<string>(out var s)) return new DataModelEntry { Key = string.Empty, ValueString = s };
+            if (v.TryGetValue<bool>(out var bl)) return new DataModelEntry { Key = string.Empty, ValueBoolean = bl };
+            if (v.TryGetValue<double>(out var d)) return new DataModelEntry { Key = string.Empty, ValueNumber = d };
+        }
+        return null;
+    }
+
     private static string RequireString(JsonObject o, string key)
     {
         if (o[key] is JsonValue jv && jv.TryGetValue<string>(out var s) && !string.IsNullOrEmpty(s))
diff --git a/src/OpenClaw.Tray.WinUI/A2UI/Rendering/IComponentRenderer.cs b/src/OpenClaw.Tray.WinUI/A2UI/Rendering/IComponentRenderer.cs
index c1369582a..2594e63dd 100644
--- a/src/OpenClaw.Tray.WinUI/A2UI/Rendering/IComponentRenderer.cs
+++ b/src/OpenClaw.Tray.WinUI/A2UI/Rendering/IComponentRenderer.cs
@@ -164,7 +164,12 @@ public void MarkSecretPath(string? path)
     {
         if (SecretPaths == null) return;
         if (string.IsNullOrEmpty(path)) return;
-        SecretPaths.Add(NormalizePath(path));
+        var normalized = NormalizePath(path);
+        SecretPaths.Add(normalized);
+
+        var canonical = SecretRedactor.CanonicalizeLenientArrayIndices(normalized);
+        if (!string.Equals(canonical, normalized, StringComparison.Ordinal))
+            SecretPaths.Add(canonical);
     }
 
     /// <summary>True if <paramref name="path"/> is a secret path (registered or matches denylist).</summary>
@@ -210,7 +215,11 @@ public bool IsSecretPath(string? path)
                 var path = val.Path!;
                 if (!IsAllowedPath(path, allowed)) continue;
                 if (IsSecretPath(path)) continue;
-                result[key] = DataModel.Read(path)?.DeepClone();
+                var clone = DataModel.Read(path)?.DeepClone();
+                var registered = SecretPaths == null
+                    ? System.Collections.Frozen.FrozenSet<string>.Empty
+                    : (IReadOnlySet<string>)SecretPaths;
+                result[key] = SecretRedactor.RedactInPlace(clone, path, registered);
             }
         }
         return result;
diff --git a/src/OpenClaw.Tray.WinUI/A2UI/Rendering/SecretRedactor.cs b/src/OpenClaw.Tray.WinUI/A2UI/Rendering/SecretRedactor.cs
index aafa3aa7d..ee6941068 100644
--- a/src/OpenClaw.Tray.WinUI/A2UI/Rendering/SecretRedactor.cs
+++ b/src/OpenClaw.Tray.WinUI/A2UI/Rendering/SecretRedactor.cs
@@ -50,11 +50,27 @@ public static bool IsSecret(string? path, IReadOnlySet<string> registered)
         if (string.IsNullOrEmpty(path)) return false;
         var normalized = Normalize(path);
         if (registered.Contains(normalized)) return true;
+
+        var canonical = CanonicalizeLenientArrayIndices(normalized);
+        if (!string.Equals(canonical, normalized, StringComparison.Ordinal)
+            && registered.Contains(canonical))
+        {
+            return true;
+        }
+
         // Any ancestor of the path counts: obscuring "/credentials" should hide "/credentials/password" too.
         foreach (var prefix in registered)
         {
-            if (prefix.Length == 0 || prefix == "/") continue;
-            if (normalized.StartsWith(prefix + "/", StringComparison.Ordinal)) return true;
+            var normalizedPrefix = Normalize(prefix);
+            if (normalizedPrefix.Length == 0 || normalizedPrefix == "/") continue;
+            if (IsPathOrDescendant(normalized, normalizedPrefix)) return true;
+
+            var canonicalPrefix = CanonicalizeLenientArrayIndices(normalizedPrefix);
+            if (!string.Equals(canonicalPrefix, normalizedPrefix, StringComparison.Ordinal)
+                && IsPathOrDescendant(normalized, canonicalPrefix))
+            {
+                return true;
+            }
         }
         return MatchesDenylist(normalized);
     }
@@ -66,6 +82,7 @@ public static bool IsSecret(string? path, IReadOnlySet<string> registered)
     public static JsonNode? Redact(JsonNode? root, IReadOnlySet<string> registered)
     {
         if (root == null) return null;
+        if (IsSecret("/", registered)) return JsonValue.Create("[REDACTED]");
         return RedactNode(root.DeepClone(), "/", registered);
     }
 
@@ -76,9 +93,21 @@ public static bool IsSecret(string? path, IReadOnlySet<string> registered)
     public static JsonNode? RedactInPlace(JsonNode? root, IReadOnlySet<string> registered)
     {
         if (root == null) return null;
+        if (IsSecret("/", registered)) return JsonValue.Create("[REDACTED]");
         return RedactNode(root, "/", registered);
     }
 
+    public static JsonNode? RedactInPlace(JsonNode? root, string rootPath, IReadOnlySet<string> registered)
+    {
+        if (root == null) return null;
+
+        var normalizedRootPath = Normalize(rootPath);
+        if (IsSecret(normalizedRootPath, registered))
+            return JsonValue.Create("[REDACTED]");
+
+        return RedactNode(root, normalizedRootPath, registered);
+    }
+
     private static JsonNode? RedactNode(JsonNode? node, string path, IReadOnlySet<string> registered)
     {
         if (node is JsonObject obj)
@@ -107,8 +136,19 @@ public static bool IsSecret(string? path, IReadOnlySet<string> registered)
             {
                 var childPath = path == "/" ? "/" + i : path + "/" + i;
                 var current = arr[i];
-                var replaced = RedactNode(current, childPath, registered);
-                if (!ReferenceEquals(replaced, current)) arr[i] = replaced;
+                // Mirror the object branch: a registered/denylisted element path
+                // (e.g. an obscured TextField bound to "/codes/0") must be
+                // redacted, not just recursed into — a scalar element would
+                // otherwise pass through unchanged and leak via canvas.a2ui.dump.
+                if (IsSecret(childPath, registered))
+                {
+                    arr[i] = JsonValue.Create("[REDACTED]");
+                }
+                else
+                {
+                    var replaced = RedactNode(current, childPath, registered);
+                    if (!ReferenceEquals(replaced, current)) arr[i] = replaced;
+                }
             }
             return arr;
         }
@@ -147,6 +187,41 @@ private static bool MatchesSegment(ReadOnlySpan<char> segment)
     private static string Normalize(string p) =>
         string.IsNullOrEmpty(p) ? "/" : (p[0] == '/' ? p : "/" + p);
 
+    private static bool IsPathOrDescendant(string path, string prefix) =>
+        string.Equals(path, prefix, StringComparison.Ordinal)
+        || path.StartsWith(prefix + "/", StringComparison.Ordinal);
+
+    internal static string CanonicalizeLenientArrayIndices(string path)
+    {
+        var normalized = Normalize(path);
+        if (normalized == "/") return normalized;
+
+        var parts = normalized.Substring(1).Split('/');
+        var changed = false;
+        for (var i = 0; i < parts.Length; i++)
+        {
+            var decoded = parts[i].Replace("~1", "/").Replace("~0", "~");
+            if (!int.TryParse(
+                    decoded,
+                    System.Globalization.NumberStyles.Integer,
+                    System.Globalization.CultureInfo.InvariantCulture,
+                    out var index)
+                || index < 0)
+            {
+                continue;
+            }
+
+            var canonical = index.ToString(System.Globalization.CultureInfo.InvariantCulture);
+            if (string.Equals(decoded, canonical, StringComparison.Ordinal))
+                continue;
+
+            parts[i] = EncodeSegment(canonical);
+            changed = true;
+        }
+
+        return changed ? "/" + string.Join("/", parts) : normalized;
+    }
+
     private static string EncodeSegment(string key) =>
         key.Replace("~", "~0").Replace("/", "~1");
 }
diff --git a/src/OpenClaw.Tray.WinUI/App.CapabilityHandlers.cs b/src/OpenClaw.Tray.WinUI/App.CapabilityHandlers.cs
index 5be9f7436..a675f431b 100644
--- a/src/OpenClaw.Tray.WinUI/App.CapabilityHandlers.cs
+++ b/src/OpenClaw.Tray.WinUI/App.CapabilityHandlers.cs
@@ -1,4 +1,5 @@
 using OpenClaw.Connection;
+using OpenClaw.Chat;
 using OpenClaw.Shared;
 using OpenClaw.Shared.Capabilities;
 using OpenClawTray.Helpers;
@@ -46,17 +47,25 @@ private void WireAppCapabilityHandlers()
             return await tcs.Task;
         };
 
-        app.StatusHandler = () => new
-        {
-            connectionStatus = _appState!.Status.ToString(),
-            nodeConnected = _nodeService?.IsConnected ?? false,
-            nodePaired = _nodeService?.IsPaired ?? false,
-            nodePendingApproval = _nodeService?.IsPendingApproval ?? false,
-            gatewayVersion = _appState!.GatewaySelf?.ServerVersion,
-            sessionCount = _appState!.Sessions?.Length ?? 0,
-            nodeCount = _appState!.Nodes?.Length ?? 0,
-            operatorScopes = _connectionManager?.OperatorClient?.GrantedOperatorScopes.ToArray() ?? Array.Empty<string>(),
-            operatorDeviceId = _connectionManager?.CurrentSnapshot.OperatorDeviceId,
+        app.StatusHandler = () =>
+        {
+            var snapshot = _connectionManager?.CurrentSnapshot;
+            return new
+            {
+                connectionStatus = _appState!.Status.ToString(),
+                overallState = snapshot?.OverallState.ToString(),
+                operatorState = snapshot?.OperatorState.ToString(),
+                nodeState = snapshot?.NodeState.ToString(),
+                nodeConnected = snapshot?.NodeState == RoleConnectionState.Connected,
+                nodePaired = snapshot?.NodePairingStatus == PairingStatus.Paired,
+                nodePendingApproval = snapshot?.NodeState == RoleConnectionState.PairingRequired,
+                nodeError = snapshot?.NodeError,
+                gatewayVersion = _appState!.GatewaySelf?.ServerVersion,
+                sessionCount = _appState!.Sessions?.Length ?? 0,
+                nodeCount = _appState!.Nodes?.Length ?? 0,
+                operatorScopes = _connectionManager?.OperatorClient?.GrantedOperatorScopes.ToArray() ?? Array.Empty<string>(),
+                operatorDeviceId = snapshot?.OperatorDeviceId,
+            };
         };
 
         app.SessionsHandler = async (agentId) =>
@@ -148,6 +157,15 @@ private void WireAppCapabilityHandlers()
                 var converted = Convert.ChangeType(value, prop.PropertyType);
                 prop.SetValue(_settings, converted);
                 _settings.Save();
+                OnSettingsSaved(this, EventArgs.Empty);
+                var runtimeError = McpRuntimeStatePolicy.GetSettingsSetError(
+                    name,
+                    converted,
+                    _nodeService?.IsMcpRunning == true,
+                    _nodeService?.McpStartupError);
+                if (!string.IsNullOrWhiteSpace(runtimeError))
+                    return new { error = runtimeError };
+
                 return new { name, value = prop.GetValue(_settings) };
             }
             catch (Exception ex)
@@ -159,9 +177,17 @@ private void WireAppCapabilityHandlers()
 
         app.MenuHandler = () =>
         {
+            var snapshot = _connectionManager?.CurrentSnapshot;
             var items = new List<object>
             {
-                new { type = "status", status = _appState!.Status.ToString() },
+                new
+                {
+                    type = "status",
+                    status = _appState!.Status.ToString(),
+                    overallState = snapshot?.OverallState.ToString(),
+                    nodeState = snapshot?.NodeState.ToString(),
+                    nodeError = snapshot?.NodeError
+                },
                 new { type = "sessions", count = _appState!.Sessions?.Length ?? 0 },
                 new { type = "nodes", count = _appState!.Nodes?.Length ?? 0 },
             };
@@ -201,6 +227,12 @@ private void WireAppCapabilityHandlers()
             };
         };
 
+        app.ChatSnapshotHandler = BuildChatSnapshotForMcpAsync;
+        app.ChatSendHandler = SendChatMessageForMcpAsync;
+        app.ChatResetHandler = ResetChatSessionForMcpAsync;
+        app.ChatQueueListHandler = ListQueuedChatMessagesForMcpAsync;
+        app.ChatQueueCancelHandler = CancelQueuedChatMessageForMcpAsync;
+
         connection.ApplySetupCodeHandler = async setupCode =>
         {
             if (_connectionManager == null)
@@ -403,6 +435,309 @@ private object BuildPendingApprovalsPayload(
         return payload;
     }
 
+    private async Task<object?> BuildChatSnapshotForMcpAsync(string? threadId)
+    {
+        var provider = _chatCoordinator?.Provider;
+        if (provider == null)
+            return new { error = "Chat provider is not initialized" };
+
+        var snapshot = await provider.LoadAsync();
+        var resolvedThreadId = ResolveChatThreadId(snapshot, threadId);
+        return BuildChatSnapshotPayload(snapshot, resolvedThreadId);
+    }
+
+    private async Task<object?> SendChatMessageForMcpAsync(string? threadId, string message)
+    {
+        var provider = _chatCoordinator?.Provider;
+        if (provider == null)
+            return new { sent = false, error = "Chat provider is not initialized" };
+
+        var snapshot = await provider.LoadAsync();
+        var resolvedThreadId = ResolveChatThreadId(snapshot, threadId);
+        if (string.IsNullOrWhiteSpace(resolvedThreadId))
+            return new { sent = false, error = "Chat compose target is not ready" };
+
+        try
+        {
+            await provider.SendMessageAsync(resolvedThreadId, message);
+        }
+        catch (Exception ex)
+        {
+            Logger.Warn($"App: Chat send for '{resolvedThreadId}' failed: {ex.Message}");
+            return new { sent = false, threadId = resolvedThreadId, error = ex.Message };
+        }
+
+        var updated = await provider.LoadAsync();
+        var timeline = updated.Timelines.TryGetValue(resolvedThreadId, out var tl)
+            ? tl
+            : ChatTimelineState.Initial();
+
+        return new
+        {
+            sent = true,
+            threadId = resolvedThreadId,
+            entryCount = timeline.Entries.Count,
+            turnActive = timeline.TurnActive
+        };
+    }
+
+    private async Task<object?> ResetChatSessionForMcpAsync(string? threadId)
+    {
+        var client = GatewayClient;
+        if (client == null || !client.IsConnectedToGateway)
+            return new { reset = false, error = "Gateway client is not connected" };
+
+        var provider = _chatCoordinator?.Provider;
+        if (provider == null)
+            return new { reset = false, error = "Chat provider is not initialized" };
+
+        var snapshot = await provider.LoadAsync();
+        var resolvedThreadId = ResolveChatThreadId(snapshot, threadId);
+        if (string.IsNullOrWhiteSpace(resolvedThreadId))
+            return new { reset = false, error = "Chat compose target is not ready" };
+
+        var reset = await client.ResetSessionAsync(resolvedThreadId);
+        if (reset)
+            await WaitForAppStateUpdateAsync(nameof(AppState.Sessions), () => client.RequestSessionsAsync());
+
+        return new
+        {
+            reset,
+            threadId = resolvedThreadId,
+            error = reset ? null : "sessions.reset was rejected or unavailable"
+        };
+    }
+
+    private async Task<object?> ListQueuedChatMessagesForMcpAsync(string? threadId)
+    {
+        var provider = _chatCoordinator?.Provider;
+        if (provider == null)
+            return new { error = "Chat provider is not initialized" };
+
+        var snapshot = await provider.LoadAsync();
+        var resolvedThreadId = ResolveChatThreadId(snapshot, threadId);
+        return BuildChatQueuePayload(snapshot, resolvedThreadId, filterToThread: !string.IsNullOrWhiteSpace(threadId));
+    }
+
+    private async Task<object?> CancelQueuedChatMessageForMcpAsync(string? threadId, string queuedMessageId)
+    {
+        var provider = _chatCoordinator?.Provider;
+        if (provider == null)
+            return new { canceled = false, error = "Chat provider is not initialized" };
+
+        var snapshot = await provider.LoadAsync();
+        var resolvedThreadId = ResolveChatThreadId(snapshot, threadId);
+        if (string.IsNullOrWhiteSpace(resolvedThreadId))
+            return new { canceled = false, queuedMessageId, error = "Chat compose target is not ready" };
+
+        if (!TryGetQueuedMessage(snapshot, resolvedThreadId, queuedMessageId, out var queuedMessage))
+        {
+            return new
+            {
+                canceled = false,
+                threadId = resolvedThreadId,
+                queuedMessageId,
+                error = "Queued message was not found"
+            };
+        }
+
+        if (!CanCancelQueuedMessage(queuedMessage))
+        {
+            return new
+            {
+                canceled = false,
+                threadId = resolvedThreadId,
+                queuedMessageId,
+                sendState = queuedMessage.SendState.ToString(),
+                error = "Queued message is already sending and cannot be canceled"
+            };
+        }
+
+        bool canceled;
+        try
+        {
+            canceled = await provider.CancelQueuedMessageAsync(resolvedThreadId, queuedMessageId);
+        }
+        catch (Exception ex)
+        {
+            Logger.Warn($"App: Chat queue cancel for '{resolvedThreadId}' message '{queuedMessageId}' failed: {ex.Message}");
+            return new { canceled = false, threadId = resolvedThreadId, queuedMessageId, error = ex.Message };
+        }
+
+        var updated = await provider.LoadAsync();
+        var stillQueued = TryGetQueuedMessage(updated, resolvedThreadId, queuedMessageId, out var remaining);
+        var remainingCount = GetQueuedMessagesForThread(updated, resolvedThreadId).Length;
+        return new
+        {
+            canceled,
+            threadId = resolvedThreadId,
+            queuedMessageId,
+            remainingCount,
+            error = canceled
+                ? null
+                : stillQueued
+                    ? $"Queued message is still present with state '{remaining!.SendState}'."
+                    : "Queued message was not canceled; it may have started sending before cancellation was processed."
+        };
+    }
+
+    private static string? ResolveChatThreadId(ChatDataSnapshot snapshot, string? requestedThreadId)
+    {
+        if (!string.IsNullOrWhiteSpace(requestedThreadId))
+            return requestedThreadId;
+
+        if (snapshot.ComposeTarget.IsReady && !string.IsNullOrWhiteSpace(snapshot.ComposeTarget.SessionKey))
+            return snapshot.ComposeTarget.SessionKey;
+
+        return snapshot.DefaultThreadId;
+    }
+
+    private static object BuildChatSnapshotPayload(ChatDataSnapshot snapshot, string? resolvedThreadId)
+    {
+        var selectedTimeline = resolvedThreadId is not null
+            && snapshot.Timelines.TryGetValue(resolvedThreadId, out var timeline)
+                ? timeline
+                : null;
+
+        return new
+        {
+            connectionStatus = snapshot.ConnectionStatus,
+            defaultThreadId = snapshot.DefaultThreadId,
+            requestedThreadId = resolvedThreadId,
+            composeTarget = new
+            {
+                sessionKey = snapshot.ComposeTarget.SessionKey,
+                isReady = snapshot.ComposeTarget.IsReady
+            },
+            threads = snapshot.Threads.Select(t => new
+            {
+                t.Id,
+                t.Title,
+                status = t.Status.ToString(),
+                activity = t.Activity.ToString(),
+                t.Model,
+                t.ModelProvider,
+                t.ThinkingLevel,
+                t.InputTokens,
+                t.OutputTokens,
+                t.TotalTokens,
+                t.ContextTokens
+            }).ToArray(),
+            queue = BuildChatQueuePayload(snapshot, resolvedThreadId, filterToThread: false),
+            selectedTimeline = selectedTimeline is null ? null : new
+            {
+                turnActive = selectedTimeline.TurnActive,
+                historyLoaded = selectedTimeline.HistoryLoaded,
+                pendingPermission = selectedTimeline.PendingPermission is null ? null : new
+                {
+                    selectedTimeline.PendingPermission.RequestId,
+                    selectedTimeline.PendingPermission.PermissionKind,
+                    selectedTimeline.PendingPermission.ToolName,
+                    selectedTimeline.PendingPermission.Detail,
+                    selectedTimeline.PendingPermission.Actions
+                },
+                entries = selectedTimeline.Entries
+                    .TakeLast(30)
+                    .Select(e => new
+                    {
+                        e.Id,
+                        kind = e.Kind.ToString(),
+                        e.Text,
+                        e.IsStreaming,
+                        e.ToolName,
+                        toolResult = e.ToolResult?.ToString(),
+                        e.IntentSummary,
+                        e.ToolCallId,
+                        e.PermissionRequestId,
+                        permissionDecision = e.PermissionDecision.ToString()
+                    })
+                    .ToArray()
+            }
+        };
+    }
+
+    private static object BuildChatQueuePayload(
+        ChatDataSnapshot snapshot,
+        string? resolvedThreadId,
+        bool filterToThread)
+    {
+        var queued = snapshot.QueuedMessagesByThread ?? new Dictionary<string, IReadOnlyList<ChatQueuedMessage>>();
+        var threadQueues = filterToThread && !string.IsNullOrWhiteSpace(resolvedThreadId)
+            ? new[]
+            {
+                new KeyValuePair<string, IReadOnlyList<ChatQueuedMessage>>(
+                    resolvedThreadId,
+                    GetQueuedMessagesForThread(snapshot, resolvedThreadId))
+            }
+            : queued
+                .OrderBy(kvp => kvp.Key, StringComparer.Ordinal)
+                .ToArray();
+
+        var selectedMessages = !string.IsNullOrWhiteSpace(resolvedThreadId)
+            ? GetQueuedMessagesForThread(snapshot, resolvedThreadId)
+            : Array.Empty<ChatQueuedMessage>();
+
+        return new
+        {
+            defaultThreadId = snapshot.DefaultThreadId,
+            requestedThreadId = resolvedThreadId,
+            totalCount = threadQueues.Sum(kvp => kvp.Value.Count),
+            selectedThread = string.IsNullOrWhiteSpace(resolvedThreadId)
+                ? null
+                : new
+                {
+                    threadId = resolvedThreadId,
+                    count = selectedMessages.Length,
+                    messages = selectedMessages.Select(ToMcpQueuedMessage).ToArray()
+                },
+            threads = threadQueues.Select(kvp => new
+            {
+                threadId = kvp.Key,
+                count = kvp.Value.Count,
+                messages = kvp.Value.Select(ToMcpQueuedMessage).ToArray()
+            }).ToArray()
+        };
+    }
+
+    private static ChatQueuedMessage[] GetQueuedMessagesForThread(ChatDataSnapshot snapshot, string threadId)
+    {
+        if (snapshot.QueuedMessagesByThread?.TryGetValue(threadId, out var messages) == true)
+            return messages.ToArray();
+        return Array.Empty<ChatQueuedMessage>();
+    }
+
+    private static bool TryGetQueuedMessage(
+        ChatDataSnapshot snapshot,
+        string threadId,
+        string queuedMessageId,
+        out ChatQueuedMessage queuedMessage)
+    {
+        foreach (var message in GetQueuedMessagesForThread(snapshot, threadId))
+        {
+            if (string.Equals(message.Id, queuedMessageId, StringComparison.Ordinal))
+            {
+                queuedMessage = message;
+                return true;
+            }
+        }
+
+        queuedMessage = null!;
+        return false;
+    }
+
+    private static bool CanCancelQueuedMessage(ChatQueuedMessage message) =>
+        message.SendState != ChatQueuedMessageSendState.Sending;
+
+    private static object ToMcpQueuedMessage(ChatQueuedMessage message) => new
+    {
+        id = message.Id,
+        text = message.Text,
+        createdAt = message.CreatedAt,
+        sendState = message.SendState.ToString(),
+        errorText = message.ErrorText,
+        canCancel = CanCancelQueuedMessage(message)
+    };
+
     private async Task WaitForAppStateUpdateAsync(string propertyName, Func<Task> requestAsync)
     {
         if (_appState == null)
diff --git a/src/OpenClaw.Tray.WinUI/App.ToastActivation.cs b/src/OpenClaw.Tray.WinUI/App.ToastActivation.cs
index ffec31ffd..1087b9c58 100644
--- a/src/OpenClaw.Tray.WinUI/App.ToastActivation.cs
+++ b/src/OpenClaw.Tray.WinUI/App.ToastActivation.cs
@@ -36,7 +36,8 @@ private void OnToastActivated(ToastNotificationActivatedEventArgsCompat args)
                     _toastService!.ShowToast(new ToastContentBuilder()
                         .AddText(LocalizationHelper.GetString("Toast_PairingCommandCopied"))
                         .AddText(command));
-                }
+                },
+                ReviewPairing = ShowPairingApprovalDialog,
             }));
     }
 
diff --git a/src/OpenClaw.Tray.WinUI/App.xaml b/src/OpenClaw.Tray.WinUI/App.xaml
index 6a8c281be..b65c584ac 100644
--- a/src/OpenClaw.Tray.WinUI/App.xaml
+++ b/src/OpenClaw.Tray.WinUI/App.xaml
@@ -10,22 +10,30 @@
                 <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
             </ResourceDictionary.MergedDictionaries>
 
-            <!-- Hub NavigationView selection indicator: follow the user's
-                 Windows accent (was hard-coded lobster red #E74C3C). Resolves
-                 against {ThemeResource SystemAccentColor} so the indicator
-                 updates if the user changes their accent. -->
+            <!-- Setup-only indicator brushes. They must live at App scope (not just in
+                 SetupWindow's element resources) because the setup pages resolve them via
+                 {ThemeResource} at page-load, before they attach to the setup window's
+                 resource scope. They alias NATIVE system resources — the active indicator
+                 follows the user's Windows accent, the inactive dot is a native neutral —
+                 so onboarding showcases the user's chosen system colors. -->
+            <ResourceDictionary.ThemeDictionaries>
+                <ResourceDictionary x:Key="Default">
+                    <SolidColorBrush x:Key="SetupIndicatorAccentBrush" Color="{ThemeResource SystemAccentColorLight2}" />
+                    <SolidColorBrush x:Key="SetupInactiveDotBrush" Color="{ThemeResource ControlStrongFillColorDefault}" />
+                </ResourceDictionary>
+                <ResourceDictionary x:Key="Light">
+                    <SolidColorBrush x:Key="SetupIndicatorAccentBrush" Color="{ThemeResource SystemAccentColorDark1}" />
+                    <SolidColorBrush x:Key="SetupInactiveDotBrush" Color="{ThemeResource ControlStrongFillColorDefault}" />
+                </ResourceDictionary>
+                <ResourceDictionary x:Key="HighContrast">
+                    <SolidColorBrush x:Key="SetupIndicatorAccentBrush" Color="{ThemeResource SystemColorHighlightColor}" />
+                    <SolidColorBrush x:Key="SetupInactiveDotBrush" Color="{ThemeResource SystemColorGrayTextColor}" />
+                </ResourceDictionary>
+            </ResourceDictionary.ThemeDictionaries>
+
+            <!-- Hub NavigationView selection indicator follows the user's Windows accent. -->
             <SolidColorBrush x:Key="NavigationViewSelectionIndicatorForeground"
                              Color="{ThemeResource SystemAccentColor}"/>
-
-            <!-- Primary action button: use the WinUI default accent fill
-                 (driven by the user's Windows accent color), not the old
-                 lobster-red brand override. Foreground and CornerRadius keep
-                 the previous app-specific values so layout stays identical. -->
-            <Style x:Key="AccentButtonStyle" TargetType="Button">
-                <Setter Property="Background" Value="{ThemeResource AccentFillColorDefaultBrush}" />
-                <Setter Property="Foreground" Value="{ThemeResource TextOnAccentFillColorPrimaryBrush}" />
-                <Setter Property="CornerRadius" Value="4" />
-            </Style>
         </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/src/OpenClaw.Tray.WinUI/App.xaml.cs b/src/OpenClaw.Tray.WinUI/App.xaml.cs
index 79b7181f5..abbc39cda 100644
--- a/src/OpenClaw.Tray.WinUI/App.xaml.cs
+++ b/src/OpenClaw.Tray.WinUI/App.xaml.cs
@@ -6,6 +6,8 @@
 using Microsoft.UI.Xaml.Controls.Primitives;
 using OpenClaw.Shared;
 using OpenClaw.Shared.Capabilities;
+using OpenClaw.Shared.Sessions;
+using OpenClaw.Shared.Mxc;
 using OpenClawTray.Dialogs;
 using OpenClawTray.Helpers;
 using OpenClawTray.Services;
@@ -22,6 +24,7 @@
 using System.IO.Pipes;
 using System.Linq;
 using System.Runtime.InteropServices;
+using System.Security.Cryptography;
 using System.Text;
 using System.Text.Json;
 using System.Threading;
@@ -42,6 +45,7 @@ public partial class App : Application, OpenClawTray.Services.IAppCommands
     };
 
     private TrayIcon? _trayIcon;
+    private TrayIconCoordinator? _trayIconCoordinator;
     private GatewayConnectionManager? _connectionManager;
     private GatewayRegistry? _gatewayRegistry;
     private OpenClawTray.Chat.OpenClawChatCoordinator? _chatCoordinator;
@@ -56,6 +60,8 @@ public partial class App : Application, OpenClawTray.Services.IAppCommands
     public GatewayRegistry? Registry => _gatewayRegistry;
     public GatewayConnectionManager? ConnectionManager => _connectionManager;
     internal SettingsManager Settings => _settings ?? throw new InvalidOperationException("Settings are not initialized.");
+    internal SettingsManager? SettingsOrNull => _settings;
+    internal string DataDirectoryPath => DataPath;
 
     /// <summary>The active hub window, exposed so pages can obtain an HWND for file pickers.</summary>
     internal Microsoft.UI.Xaml.Window? ActiveHubWindow => _hubWindow;
@@ -63,6 +69,8 @@ public partial class App : Application, OpenClawTray.Services.IAppCommands
     internal VoiceService? VoiceService => _nodeService?.VoiceService ?? _standaloneVoiceService;
     /// <summary>The full device ID of the local node service (if running).</summary>
     internal string? NodeFullDeviceId => _nodeService?.FullDeviceId;
+    /// <summary>Live node service instance used by settings surfaces for MCP status.</summary>
+    internal NodeService? ActiveNodeService => _nodeService;
 
     /// <summary>
     /// Session key that the chat surface should select on its next mount.
@@ -72,6 +80,12 @@ public partial class App : Application, OpenClawTray.Services.IAppCommands
     public string? PendingChatSessionKey { get; set; }
 
     public OpenClawTray.Chat.OpenClawChatDataProvider? ChatProvider => _chatCoordinator?.Provider;
+    private volatile bool _hubNativeChatSurfaceActive;
+    private volatile bool _trayNativeChatSurfaceActive;
+    internal bool IsNativeChatSurfaceActive => _hubNativeChatSurfaceActive || _trayNativeChatSurfaceActive;
+
+    internal void SetHubNativeChatSurfaceActive(bool active) => _hubNativeChatSurfaceActive = active;
+    internal void SetTrayNativeChatSurfaceActive(bool active) => _trayNativeChatSurfaceActive = active;
 
     /// <summary>
     /// Raised after the tray-wide settings have been saved (either via the
@@ -149,16 +163,19 @@ public IntPtr GetHubWindowHandle()
     internal AppState? AppState => _appState;
     private UpdateCoordinator? _updateCoordinator;
     private GatewayService? _gatewayService;
+    private PairingApprovalCoordinator? _pairingApprovalCoordinator;
+    private OpenClawTray.Dialogs.PairingApprovalDialog? _pairingApprovalDialog;
+    private Microsoft.UI.Dispatching.DispatcherQueueTimer? _pairingApprovalPollTimer;
     private CancellationTokenSource? _deepLinkCts;
     private bool _isExiting;
     
     /// <summary>
     /// Cached connection status — sole writer is OnManagerStateChanged.
     /// Reads are safe from any thread; derives from the connection manager's state machine.
-    /// SSH tunnel errors in EnsureSshTunnelConfigured also write this temporarily (Phase 3 moves tunnel to manager).
     /// </summary>
     private WeakReference<ToggleSwitch>? _connectionToggleRef;
     private bool _suspendConnectionToggleEvent;
+    private string? _lastManagerConnectedSideEffectsKey;
 
     // FrozenDictionary for O(1) case-insensitive notification type → setting lookup — no per-call allocation.
     private static readonly System.Collections.Frozen.FrozenDictionary<string, Func<SettingsManager, bool>> s_notifTypeMap =
@@ -184,6 +201,22 @@ public IntPtr GetHubWindowHandle()
     private DiagnosticsClipboardService? _diagnosticsClipboard;
     private ToastService? _toastService;
     private AppNotificationService? _appNotificationService;
+    internal AppNotificationService? AppNotifications => _appNotificationService;
+    private string? _lastConnectionIssueNotificationKey;
+    private readonly Dictionary<string, string> _reportedChannelIssueSignatures = new(StringComparer.OrdinalIgnoreCase);
+    private string? _lastSandboxRiskNotificationKey;
+    private MxcAvailability? _sandboxRiskAvailabilityCache;
+    private bool _sandboxRiskProbeInFlight;
+    private int _sandboxRiskProbeGeneration;
+    private DateTimeOffset _lastSandboxRiskProbeStartedAt;
+
+    private const string ConnectionIssueNotificationId = "connection:issue";
+    private const string ConnectionIssueNotificationDedupeKey = "connection:issue";
+    private const string McpStartupNotificationId = "mcp:startup";
+    private const string McpStartupNotificationDedupeKey = "mcp:startup";
+    private const string SandboxRiskNotificationId = "sandbox:risk";
+    private const string SandboxRiskNotificationDedupeKey = "sandbox:risk";
+    private static readonly TimeSpan SandboxRiskProbeRefreshInterval = TimeSpan.FromMinutes(5);
     
     // Node service (optional, enabled in settings)
     private NodeService? _nodeService;
@@ -199,20 +232,17 @@ public IntPtr GetHubWindowHandle()
     // crash log, exec approvals, and the single-instance mutex name all derive from it.
     private static readonly string? DataDirOverride =
         Environment.GetEnvironmentVariable("OPENCLAW_TRAY_DATA_DIR") is { Length: > 0 } v ? v : null;
-    private static readonly string DataPath = DataDirOverride
-        ?? Path.Combine(
-            Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
-            "OpenClawTray");
+    private static readonly string DataPath = AppIdentity.ResolveLocalDataDirectory();
     private static readonly string DeepLinkPipeName =
         DeepLinkSecurityPolicy.BuildCurrentUserScopedPipeName(DataPath);
-    // Operator/node identity store. In normal installs this is %APPDATA%\OpenClawTray.
+    // Operator/node identity store. Normal installs use the build variant's roaming data folder.
     // Isolated test/dev runs set OPENCLAW_TRAY_DATA_DIR to the direct OpenClaw data
     // folder, and SetupEngine/GatewayRegistry write per-gateway identities there.
     private static readonly string IdentityDataPath = DataDirOverride
         ?? Path.Combine(
             Environment.GetEnvironmentVariable("OPENCLAW_TRAY_APPDATA_DIR")
                 ?? Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
-            "OpenClawTray");
+            AppIdentity.DataDirectoryName);
     private readonly AppCrashLogger _crashLogger = new(Path.Combine(DataPath, "crash.log"));
     private static readonly AppRunMarker s_runMarker = new(Path.Combine(DataPath, "run.marker"));
 
@@ -299,6 +329,13 @@ private void OnUnhandledException(object sender, Microsoft.UI.Xaml.UnhandledExce
         e.Handled = true; // Try to prevent crash
     }
 
+    /// <summary>
+    /// Returns true if <paramref name="arg"/> is a deep link for this build variant.
+    /// Release and dev schemes stay disjoint so one install cannot steal the other's activation.
+    /// </summary>
+    private static bool IsDeepLinkArg(string arg) =>
+        DeepLinkParser.ParseDeepLink(arg, AppIdentity.ProtocolScheme) != null;
+
     private void OnDomainUnhandledException(object sender, System.UnhandledExceptionEventArgs e)
     {
         _crashLogger.Log("DomainUnhandledException", e.ExceptionObject as Exception);
@@ -391,17 +428,17 @@ private async Task OnLaunchedAsync(LaunchActivatedEventArgs args)
         // two test runs against the same data dir would otherwise pick different
         // mutex names — and `Math.Abs(int.MinValue)` overflows. Use a stable
         // SHA-256 prefix instead.
-        // NOTE: The bare "OpenClawTray" mutex name is also referenced by
-        // installer.iss `AppMutex=` for install/uninstall race coordination
-        // (round 2, Scott #5). The suffixed test-isolation variant is
+        // NOTE: The build variant's bare mutex name is also referenced by
+        // installer.iss `AppMutex=` for install/uninstall race coordination.
+        // The suffixed test-isolation variant is
         // intentionally not covered by AppMutex — production installs only
         // ever use the unsuffixed name.
-        var mutexName = "OpenClawTray";
+        var mutexName = AppIdentity.MutexBaseName;
         if (DataDirOverride is not null)
         {
             var hash = System.Security.Cryptography.SHA256.HashData(
                 System.Text.Encoding.UTF8.GetBytes(DataDirOverride));
-            mutexName = $"OpenClawTray-{Convert.ToHexString(hash, 0, 4)}";
+            mutexName = $"{AppIdentity.MutexBaseName}-{Convert.ToHexString(hash, 0, 4)}";
         }
         _mutex = new Mutex(true, mutexName, out bool createdNew);
         var ownsMutex = createdNew;
@@ -423,10 +460,10 @@ private async Task OnLaunchedAsync(LaunchActivatedEventArgs args)
         {
             // Forward deep link args to running instance (command-line or protocol activation)
             var deepLink = protocolUri
-                ?? (_startupArgs.Length > 1 && _startupArgs[1].StartsWith("openclaw://", StringComparison.OrdinalIgnoreCase)
+                ?? (_startupArgs.Length > 1 && IsDeepLinkArg(_startupArgs[1])
                     ? _startupArgs[1] : null)
                 ?? (string.Equals(_postSetupLaunch, "chat", StringComparison.OrdinalIgnoreCase)
-                    ? "openclaw://chat" : null);
+                    ? $"{AppIdentity.ProtocolScheme}://chat" : null);
             if (deepLink != null)
             {
                 SendDeepLinkToRunningInstance(deepLink);
@@ -476,6 +513,29 @@ _dispatcherQueue is null
         _diagnosticsClipboard = new DiagnosticsClipboardService(BuildCommandCenterState);
         _toastService = new ToastService(() => _settings);
         _appNotificationService = new AppNotificationService();
+        PublishSandboxRiskNotificationIfNeeded();
+
+        // Inbound pairing approvals: surface a focused dialog + awareness toast when another
+        // device/node requests pairing (Mac-parity). Getters are lazy so this can be created
+        // before the connection manager / node service exist.
+        _pairingApprovalCoordinator = new PairingApprovalCoordinator(
+            getClient: () => _connectionManager?.OperatorClient,
+            getOwnNodeIds: BuildOwnNodeIds,
+            isPromptEnabled: () => _settings?.ShowPairingApprovalDialog ?? true,
+            logger: new AppLogger());
+        _pairingApprovalCoordinator.ApprovalRequested += OnPairingApprovalRequested;
+        _pairingApprovalCoordinator.DecisionCompleted += OnPairingDecisionCompleted;
+        _gatewayService.PairListsChanged += OnPairListsChanged;
+
+        // Safety-net poll: the gateway broadcasts pair requests with dropIfSlow=true, so a busy
+        // socket can silently drop a "device wants to connect" event and the operator would never
+        // be prompted. A periodic reconcile recovers any missed request. RefreshFromGatewayAsync
+        // no-ops unless connected with approval scope, so this is idle-cheap.
+        _pairingApprovalPollTimer = _dispatcherQueue!.CreateTimer();
+        _pairingApprovalPollTimer.Interval = TimeSpan.FromSeconds(20);
+        _pairingApprovalPollTimer.IsRepeating = true;
+        _pairingApprovalPollTimer.Tick += (_, _) => _ = _pairingApprovalCoordinator?.RefreshFromGatewayAsync();
+        _pairingApprovalPollTimer.Start();
 
         DiagnosticsJsonlService.Write("app.start", new
         {
@@ -483,8 +543,9 @@ _dispatcherQueue is null
             useSshTunnel = _settings.UseSshTunnel
         });
 
-        // Register URI scheme on first run
-        DeepLinkHandler.RegisterUriScheme();
+        // Isolated test instances must not replace the user's installed protocol handler.
+        if (DataDirOverride is null)
+            DeepLinkHandler.RegisterUriScheme();
 
         // Anchor the WinUI runtime so transient windows (UpdateDialog,
         // setup wizard, etc.) don't terminate the process when closed.
@@ -593,7 +654,7 @@ _dispatcherQueue is null
             credentialResolver, clientFactory, _gatewayRegistry, appLogger,
             identityStore: new DeviceIdentityFileStore(appLogger),
             nodeConnector: nodeConnector,
-            isNodeEnabled: ShouldInitializeNodeService,
+            isNodeEnabled: IsGatewayNodeEnabled,
             diagnostics: diagnostics,
             tunnelManager: _sshTunnelService);
         _connectionManager.OperatorClientChanged += OnOperatorClientChanged;
@@ -646,6 +707,7 @@ _dispatcherQueue is null
             !prewarmIsBootstrapToken)
         {
             _chatWindow = new ChatWindow(prewarmUrl, prewarmToken);
+            ApplyThemePreference(_chatWindow);
             // Window is created but hidden — WebView2 initializes in the background
         }
 
@@ -663,7 +725,7 @@ _dispatcherQueue is null
 
         // Process startup deep link (command-line or MSIX protocol activation)
         var startupDeepLink = _pendingProtocolUri
-            ?? (_startupArgs.Length > 1 && _startupArgs[1].StartsWith("openclaw://", StringComparison.OrdinalIgnoreCase)
+            ?? (_startupArgs.Length > 1 && IsDeepLinkArg(_startupArgs[1])
                 ? _startupArgs[1] : null);
         if (!setupShownDuringStartup && startupDeepLink != null)
         {
@@ -671,7 +733,7 @@ _dispatcherQueue is null
         }
         else if (!setupShownDuringStartup && string.Equals(_postSetupLaunch, "chat", StringComparison.OrdinalIgnoreCase))
         {
-            await HandleDeepLinkAsync("openclaw://chat");
+            await HandleDeepLinkAsync($"{AppIdentity.ProtocolScheme}://chat");
         }
 
         Logger.Info("Application started (WinUI 3)");
@@ -683,6 +745,7 @@ private void InitializeKeepAliveWindow()
         // This prevents GC/threading issues when creating windows after idle
         _keepAliveWindow = new Window();
         _keepAliveWindow.Content = new Microsoft.UI.Xaml.Controls.Grid();
+        ApplyThemePreference(_keepAliveWindow);
         _keepAliveWindow.AppWindow.IsShownInSwitchers = false;
         
         // Move off-screen and set minimal size
@@ -699,8 +762,14 @@ private void InitializeTrayIcon()
         
         var iconPath = IconHelper.GetStatusIconPath(ConnectionStatus.Disconnected);
         _trayIcon = new TrayIcon(1, iconPath, BuildTrayTooltip());
+        _trayIconCoordinator = new TrayIconCoordinator(
+            _trayIcon,
+            hasThreadAccess: () => _dispatcherQueue == null || _dispatcherQueue.HasThreadAccess,
+            marshal: OnUiThread,
+            captureSnapshot: CaptureTraySnapshot,
+            isAlive: () => _trayIcon != null);
         _trayIcon.IsVisible = true;
-        ApplyTrayTooltip(BuildTrayTooltip());
+        _trayIconCoordinator.ApplyTrayTooltip(BuildTrayTooltip());
         _trayIcon.Selected += OnTrayIconSelected;
         _trayIcon.ContextMenu += OnTrayContextMenu;
     }
@@ -709,10 +778,28 @@ private void InitializeTrayMenuWindow()
     {
         // Pre-create menu window once - reuse to avoid crash on window creation after idle
         _trayMenuWindow = new TrayMenuWindow();
+        ApplyThemePreference(_trayMenuWindow);
         _trayMenuWindow.MenuItemClicked += OnTrayMenuItemClicked;
         // Don't close - just hide
     }
 
+    internal void ApplyThemePreferenceToOpenWindows()
+    {
+        ApplyThemePreference(_keepAliveWindow);
+        ApplyThemePreference(_hubWindow);
+        ApplyThemePreference(_trayMenuWindow);
+        ApplyThemePreference(_chatWindow);
+        ApplyThemePreference(_connectionStatusWindow);
+    }
+
+    private void ApplyThemePreference(Window? window)
+    {
+        if (_settings is null)
+            return;
+
+        ThemeHelper.ApplyTheme(window, _settings.AppTheme);
+    }
+
     private void OnTrayIconSelected(TrayIcon sender, TrayIconEventArgs e)
     {
         if (_connectionManager?.CurrentSnapshot.OperatorState == RoleConnectionState.Connected)
@@ -747,6 +834,7 @@ internal void ShowChatWindow()
         if (_chatWindow == null)
         {
             _chatWindow = new ChatWindow(url, token);
+            ApplyThemePreference(_chatWindow);
         }
 
         // Bug 2: cached ChatWindow may have been pre-warmed with empty/stale credentials
@@ -757,7 +845,7 @@ internal void ShowChatWindow()
         // Toggle: if visible, hide; if hidden, show near tray
         if (_chatWindow.Visible)
         {
-            _chatWindow.Hide();
+            _chatWindow.HideNearTray();
         }
         else
         {
@@ -929,6 +1017,7 @@ private void OnTrayMenuItemClicked(object? sender, string action)
             case "connection": ShowHub("connection"); break;
             case "permissions": ShowHub("permissions"); break;
             case "dashboard": OpenDashboard(); break;
+            case "diagnostics": ShowHub("debug"); break;
             case "canvas": ShowCanvasWindow(); break;
             case "openchat": ShowHub("chat"); break;
             case "voice": ShowHub("voice"); break; // was: ShowVoiceOverlay()
@@ -1062,30 +1151,57 @@ private async Task ExecuteSessionActionAsync(string action, string sessionKey, s
         {
             if (action is "reset" or "compact" or "delete")
             {
-                var title = action switch
+                var kind = action switch
                 {
-                    "reset" => "Reset session?",
-                    "compact" => "Compact session log?",
-                    "delete" => "Delete session?",
-                    _ => "Confirm session action"
+                    "reset" => SessionActionKind.Reset,
+                    "compact" => SessionActionKind.Compact,
+                    _ => SessionActionKind.Delete,
                 };
-                var body = action switch
+
+                var session = _appState?.Sessions?.FirstOrDefault(s => s.Key == sessionKey);
+                var mainState = SessionActionPlanner.ResolveMainState(
+                    sessionKey,
+                    rowIsMain: session?.IsMain,
+                    mainSessionKey: client.MainSessionKey,
+                    sessions: _appState?.Sessions);
+                var isMain = mainState == SessionMainState.Main;
+                var displayName = session?.DisplayName;
+
+                if (!SessionActionPlanner.IsAllowed(kind, mainState, out var blockedReason))
                 {
-                    "reset" => $"Start a fresh session for '{sessionKey}'?",
-                    "compact" => $"Keep the latest log lines for '{sessionKey}' and archive the rest?",
-                    "delete" => $"Delete '{sessionKey}' and archive its transcript?",
-                    _ => "Continue?"
-                };
-                var button = action switch
+                    _toastService!.ShowToast(new ToastContentBuilder()
+                        .AddText(LocalizationHelper.GetString("Toast_SessionActionFailed"))
+                        .AddText(blockedReason ?? string.Empty));
+                    return;
+                }
+
+                var prompt = SessionActionPlanner.BuildPrompt(kind, sessionKey, displayName, isMain);
+                if (prompt is not null)
                 {
-                    "reset" => "Reset",
-                    "compact" => "Compact",
-                    "delete" => "Delete",
-                    _ => "Continue"
-                };
+                    var localizedPrompt = SessionActionPromptLocalizer.Localize(prompt);
+                    var confirmed = await ConfirmSessionActionAsync(
+                        localizedPrompt.Title,
+                        localizedPrompt.Body,
+                        localizedPrompt.ConfirmLabel);
+                    if (!confirmed) return;
+                }
+            }
 
-                var confirmed = await ConfirmSessionActionAsync(title, body, button);
-                if (!confirmed) return;
+            if (action == "delete")
+            {
+                var session = _appState?.Sessions?.FirstOrDefault(s => s.Key == sessionKey);
+                var mainState = SessionActionPlanner.ResolveMainState(
+                    sessionKey,
+                    rowIsMain: session?.IsMain,
+                    mainSessionKey: client.MainSessionKey,
+                    sessions: _appState?.Sessions);
+                if (!SessionActionPlanner.IsAllowed(SessionActionKind.Delete, mainState, out var blockedReason))
+                {
+                    _toastService!.ShowToast(new ToastContentBuilder()
+                        .AddText(LocalizationHelper.GetString("Toast_SessionActionFailed"))
+                        .AddText(blockedReason ?? string.Empty));
+                    return;
+                }
             }
 
             var sent = action switch
@@ -1138,8 +1254,8 @@ private async Task<bool> ConfirmSessionActionAsync(string title, string body, st
             Title = title,
             Content = body,
             PrimaryButtonText = actionLabel,
-            CloseButtonText = "Cancel",
-            DefaultButton = ContentDialogButton.Close,
+            CloseButtonText = LocalizationHelper.GetString("SessionActionPrompt_CancelLabel"),
+            DefaultButton = ContentDialogButton.None,
             XamlRoot = root.XamlRoot
         };
         var result = await dialog.ShowAsync();
@@ -1151,7 +1267,7 @@ private async Task<bool> ConfirmDeepLinkActionAsync(DeepLinkResult result)
         var root = _keepAliveWindow?.Content as FrameworkElement;
         if (root?.XamlRoot == null)
         {
-            Logger.Warn($"Cannot confirm deep link action without XAML root: {DeepLinkSecurityPolicy.RedactForLog($"openclaw://{result.Path}")}");
+            Logger.Warn($"Cannot confirm deep link action without XAML root: {DeepLinkSecurityPolicy.RedactForLog($"{AppIdentity.ProtocolScheme}://{result.Path}")}");
             return false;
         }
 
@@ -1242,6 +1358,7 @@ private TrayMenuSnapshot CaptureTrayMenuSnapshot()
         return new TrayMenuSnapshot
         {
             CurrentStatus = _appState!.Status,
+            OverallState = _connectionManager?.CurrentSnapshot.OverallState,
             AuthFailureMessage = _appState?.AuthFailureMessage,
             GatewayUrl = _gatewayRegistry?.GetActive()?.Url ?? _settings?.GetEffectiveGatewayUrl(),
             GatewaySelf = _appState?.GatewaySelf,
@@ -1260,6 +1377,9 @@ private TrayMenuSnapshot CaptureTrayMenuSnapshot()
             Settings = _settings,
             SetupMenuLabel = setupMenuLabel,
             ShowSetupMenuEntry = !hasSetupManagedLocalWslGateway,
+            LastUpdated = _appState?.LastCheckTime,
+            IsMcpRunning = _nodeService?.IsMcpRunning == true,
+            McpStartupError = _nodeService?.McpStartupError,
         };
     }
 
@@ -1484,7 +1604,7 @@ record = SyncGatewayBrowserProxyForward(record);
         if (credential == null)
         {
             var nodeCredential = ResolveStartupNodeCredential(record, resolver, identityDir);
-            if (nodeCredential != null && ShouldInitializeNodeService())
+            if (nodeCredential != null && IsGatewayNodeEnabled())
             {
                 Logger.Info(
                     $"Connecting node-only gateway during {context}: {record.Url} ({nodeCredential.Source})");
@@ -1505,6 +1625,8 @@ record = SyncGatewayBrowserProxyForward(record);
         ObserveBackgroundFault(
             _connectionManager.ConnectAsync(record.Id),
             $"[App] Startup gateway connect failed during {context}");
+        if (!IsGatewayNodeEnabled())
+            TryStartLocalMcpOnlyNode();
         return true;
     }
 
@@ -1681,13 +1803,31 @@ private bool TryStartLocalMcpOnlyNode()
         try
         {
             nodeService.StartLocalOnlyAsync().GetAwaiter().GetResult();
+            var notificationPlan = McpRuntimeStatePolicy.PlanStartupNotification(
+                _settings.EnableMcpServer,
+                nodeService.IsMcpRunning,
+                nodeService.McpStartupError);
+            if (notificationPlan.ShouldShow)
+            {
+                Logger.Error($"Failed to start MCP-only node service: {notificationPlan.Message}");
+                ApplyMcpStartupNotificationPlan(notificationPlan);
+                return false;
+            }
+
             WireAppCapabilityHandlers();
+            ApplyMcpStartupNotificationPlan(notificationPlan);
             Logger.Info("Started MCP-only node service without gateway connection");
             return true;
         }
         catch (Exception ex)
         {
             Logger.Error($"Failed to start MCP-only node service: {ex}");
+            nodeService.SetMcpStartupError($"MCP server startup failed: {ex.Message}");
+            ApplyMcpStartupNotificationPlan(
+                McpRuntimeStatePolicy.PlanStartupNotification(
+                    _settings.EnableMcpServer,
+                    nodeService.IsMcpRunning,
+                    nodeService.McpStartupError));
             return false;
         }
     }
@@ -1724,6 +1864,7 @@ private void OnOperatorClientChanged(object? sender, OperatorClientChangedEventA
         else
         {
             _chatCoordinator?.SetOperatorClient(null);
+            _pairingApprovalCoordinator?.Reset();
         }
 
         RaiseChatProviderChanged();
@@ -1741,36 +1882,41 @@ private void RaiseChatProviderChanged()
     /// <summary>
     /// Handles the connection manager's StateChanged event.
     /// Maps the snapshot to the existing tray icon / UI status system.
-    /// Authoritative writer of gateway lifecycle status. Local prerequisite
-    /// failures can still mark the app Error before the manager can connect.
+    /// Authoritative writer of gateway lifecycle status.
     /// </summary>
     private void OnManagerStateChanged(object? sender, GatewayConnectionSnapshot snap)
     {
-        // Map OverallConnectionState to the existing ConnectionStatus enum
-        // for backward compat with tray icon and hub window
-        var mapped = snap.OverallState switch
-        {
-            OverallConnectionState.Idle => ConnectionStatus.Disconnected,
-            OverallConnectionState.Connecting => ConnectionStatus.Connecting,
-            OverallConnectionState.Connected => ConnectionStatus.Connected,
-            OverallConnectionState.Ready => ConnectionStatus.Connected,
-            OverallConnectionState.Degraded => ConnectionStatus.Connected,
-            OverallConnectionState.PairingRequired => ConnectionStatus.Connecting,
-            OverallConnectionState.Error => ConnectionStatus.Error,
-            OverallConnectionState.Disconnecting => ConnectionStatus.Disconnected,
-            _ => ConnectionStatus.Disconnected
-        };
+        var mapped = ConnectionStatusPresenter.ToLegacyStatus(snap);
+        var connectedSideEffectsKey = snap.OperatorState == RoleConnectionState.Connected
+            ? $"{snap.GatewayId ?? snap.GatewayUrl ?? "unknown"}|{snap.OperatorDeviceId ?? "unknown"}"
+            : null;
         OnUiThread(() =>
         {
             if (_appState != null) _appState.Status = mapped;
+            _hubWindow?.UpdateTitleBarStatus(snap, mapped);
             UpdateTrayIcon();
-            SyncConnectionToggle(mapped);
+            SyncConnectionToggle(mapped, snap.OverallState);
+            UpdateConnectionIssueNotification(snap);
             if (mapped is ConnectionStatus.Connected or ConnectionStatus.Disconnected or ConnectionStatus.Error)
             {
                 // Dismiss the tray menu on state change — it will capture fresh data on next open
                 _trayMenuWindow?.HideCascade();
             }
         });
+
+        if (connectedSideEffectsKey != null)
+        {
+            if (!string.Equals(_lastManagerConnectedSideEffectsKey, connectedSideEffectsKey, StringComparison.Ordinal))
+            {
+                _lastManagerConnectedSideEffectsKey = connectedSideEffectsKey;
+                _ = RunHealthCheckAsync();
+                _ = TryConnectLocalNodeServiceAsync();
+            }
+        }
+        else
+        {
+            _lastManagerConnectedSideEffectsKey = null;
+        }
     }
 
     private NodeService? EnsureNodeService(SettingsManager settings)
@@ -1793,8 +1939,10 @@ private void OnManagerStateChanged(object? sender, GatewayConnectionSnapshot sna
                 new AppLogger(),
                 _dispatcherQueue,
                 DataPath,
-                () => _keepAliveWindow?.Content as FrameworkElement,
-                settings,
+                rootProvider: () => _keepAliveWindow?.Content as FrameworkElement,
+                chatProviderProvider: () => _chatCoordinator?.Provider,
+                inlineApprovalAvailable: _ => IsNativeChatSurfaceActive,
+                settings: settings,
                 enableMcpServer: settings.EnableMcpServer,
                 identityDataPath: IdentityDataPath,
                 sharedGatewayTokenResolver: () => _gatewayRegistry?.GetActive()?.SharedGatewayToken,
@@ -1808,6 +1956,7 @@ private void OnManagerStateChanged(object? sender, GatewayConnectionSnapshot sna
             _nodeService.ChannelHealthUpdated += _gatewayService.OnChannelHealthUpdated;
             _nodeService.InvokeCompleted += OnNodeInvokeCompleted;
             _nodeService.GatewaySelfUpdated += _gatewayService.OnGatewaySelfUpdated;
+            _nodeService.LocalExecApprovalRequested += OnLocalExecApprovalRequested;
             _nodeService.LocalExecApprovalDecided += OnLocalExecApprovalDecided;
             return _nodeService;
         }
@@ -1829,236 +1978,10 @@ private bool ShouldInitializeNodeService()
         return _settings?.EnableNodeMode == true || _settings?.EnableMcpServer == true;
     }
 
-    /// <summary>
-    /// Ensures a WSL keepalive process is running for the local gateway distro
-    /// so the WSL2 VM stays up even after the tray exits.
-    /// Best-effort, fire-and-forget.
-    /// </summary>
-    private async Task TryEnsureLocalGatewayKeepAliveAsync()
+    /// <summary>True when this PC should connect as a gateway node.</summary>
+    private bool IsGatewayNodeEnabled()
     {
-        try
-        {
-            if (_settings is null) return;
-
-            var activeRecord = _gatewayRegistry?.GetActive();
-            if (!WslKeepAlivePolicy.ShouldStart(activeRecord, _settings.GetEffectiveGatewayUrl()))
-            {
-                await StopStaleLocalGatewayKeepAliveAsync();
-                return;
-            }
-
-            var distroName = await ResolveLocalGatewayDistroNameAsync(activeRecord);
-            if (string.IsNullOrWhiteSpace(distroName)) return;
-
-            // Verify distro exists before spawning keepalive
-            var runner = new WslExeCommandRunner(new AppLogger(), defaultTimeout: TimeSpan.FromSeconds(4));
-            var distros = await runner.ListDistrosAsync();
-            if (!distros.Any(d => string.Equals(d.Name, distroName, StringComparison.OrdinalIgnoreCase)))
-            {
-                Logger.Warn($"[WslKeepAlive] Distro '{distroName}' not found; skipping keepalive.");
-                return;
-            }
-
-            // Spawn a detached wsl sleep process to keep the VM alive
-            var psi = new System.Diagnostics.ProcessStartInfo
-            {
-                FileName = ResolveWslExePath(),
-                UseShellExecute = false,
-                CreateNoWindow = true,
-            };
-            psi.ArgumentList.Add("-d");
-            psi.ArgumentList.Add(distroName);
-            psi.ArgumentList.Add("--");
-            psi.ArgumentList.Add("sleep");
-            psi.ArgumentList.Add("infinity");
-
-            var proc = System.Diagnostics.Process.Start(psi);
-            if (proc is not null)
-            {
-                Logger.Info($"[WslKeepAlive] Started keepalive for {distroName} (PID {proc.Id}).");
-            }
-        }
-        catch (Exception ex)
-        {
-            Logger.Warn($"[WslKeepAlive] Startup keepalive failed (non-fatal): {ex.Message}");
-        }
-    }
-
-    private async Task StopStaleLocalGatewayKeepAliveAsync()
-    {
-        try
-        {
-            var localDataDir = SetupExistingGatewayClassifier.ResolveLocalDataPath();
-            var markerDir = Path.Combine(localDataDir, "wsl-keepalive");
-            var markerDistroNames = ReadKeepAliveMarkerDistroNames(markerDir);
-            var setupStateDistroName = await ReadSetupStateDistroNameAsync(localDataDir);
-            var records = _gatewayRegistry?.GetAll() ?? [];
-
-            foreach (var distroName in WslKeepAlivePolicy.FindStaleSetupManagedDistroNames(
-                records,
-                markerDistroNames,
-                setupStateDistroName))
-            {
-                StopKeepAliveProcessesForDistro(distroName);
-                DeleteKeepAliveMarker(markerDir, distroName);
-            }
-        }
-        catch (Exception ex)
-        {
-            Logger.Warn($"[WslKeepAlive] Stale keepalive cleanup failed (non-fatal): {ex.Message}");
-        }
-    }
-
-    private static IReadOnlyList<string> ReadKeepAliveMarkerDistroNames(string markerDir)
-    {
-        if (!Directory.Exists(markerDir))
-            return [];
-
-        var distroNames = new List<string>();
-        foreach (var markerPath in Directory.EnumerateFiles(markerDir, "*.json"))
-        {
-            if (WslKeepAlivePolicy.TryGetMarkerDistroName(File.ReadAllText(markerPath), out var distroName))
-                distroNames.Add(distroName);
-        }
-
-        return distroNames;
-    }
-
-    private static async Task<string?> ReadSetupStateDistroNameAsync(string localDataDir)
-    {
-        var stateFile = Path.Combine(localDataDir, "setup-state.json");
-        if (!File.Exists(stateFile))
-            return null;
-
-        var json = await File.ReadAllTextAsync(stateFile);
-        using var doc = System.Text.Json.JsonDocument.Parse(json);
-        return doc.RootElement.TryGetProperty("DistroName", out var distroElement)
-            ? distroElement.GetString()
-            : null;
-    }
-
-    private static void StopKeepAliveProcessesForDistro(string distroName)
-    {
-        var procs = System.Diagnostics.Process.GetProcessesByName("wsl")
-            .Concat(System.Diagnostics.Process.GetProcessesByName("wsl.exe"));
-
-        foreach (var proc in procs)
-        {
-            try
-            {
-                if (WslKeepAlivePolicy.IsKeepaliveCommandLine(GetProcessCommandLine(proc.Id), distroName))
-                {
-                    proc.Kill(entireProcessTree: true);
-                    proc.WaitForExit(5000);
-                    Logger.Info($"[WslKeepAlive] Stopped stale keepalive for {distroName} (PID {proc.Id}).");
-                }
-            }
-            catch (Exception ex)
-            {
-                // Process may have exited while being inspected — common race; log at Debug.
-                Logger.Debug($"[WslKeepAlive] Inspect/stop race for PID {proc.Id}: {ex.GetType().Name}: {ex.Message}");
-            }
-            finally
-            {
-                proc.Dispose();
-            }
-        }
-    }
-
-    private static void DeleteKeepAliveMarker(string markerDir, string distroName)
-    {
-        if (!Directory.Exists(markerDir))
-            return;
-
-        foreach (var markerPath in Directory.EnumerateFiles(markerDir, "*.json"))
-        {
-            try
-            {
-                if (WslKeepAlivePolicy.TryGetMarkerDistroName(File.ReadAllText(markerPath), out var markerDistro)
-                    && string.Equals(markerDistro, distroName, StringComparison.OrdinalIgnoreCase))
-                {
-                    File.Delete(markerPath);
-                    Logger.Info($"[WslKeepAlive] Deleted stale keepalive marker for {distroName}.");
-                }
-            }
-            catch (Exception ex)
-            {
-                // Best-effort cleanup; stale/corrupt markers are not fatal. Log at Debug for diagnostics.
-                Logger.Debug($"[WslKeepAlive] Failed to process marker '{markerPath}': {ex.GetType().Name}: {ex.Message}");
-            }
-        }
-    }
-
-    private static string? GetProcessCommandLine(int pid)
-    {
-        try
-        {
-            var psi = new System.Diagnostics.ProcessStartInfo("powershell.exe",
-                $"-NoProfile -Command \"(Get-CimInstance Win32_Process -Filter 'ProcessId={pid}').CommandLine\"")
-            {
-                RedirectStandardOutput = true,
-                UseShellExecute = false,
-                CreateNoWindow = true
-            };
-            using var p = System.Diagnostics.Process.Start(psi);
-            if (p == null) return null;
-            var output = p.StandardOutput.ReadToEnd();
-            p.WaitForExit(5000);
-            return output.Trim();
-        }
-        catch (Exception ex)
-        {
-            Logger.Debug($"App: GetProcessCommandLine(pid={pid}) failed: {ex.GetType().Name}: {ex.Message}");
-            return null;
-        }
-    }
-
-    private static string ResolveWslExePath()
-    {
-        var windowsDir = Environment.GetFolderPath(Environment.SpecialFolder.Windows);
-        if (string.IsNullOrWhiteSpace(windowsDir))
-            windowsDir = Environment.GetEnvironmentVariable("SystemRoot") ?? @"C:\Windows";
-
-        return Path.Combine(windowsDir, "System32", "wsl.exe");
-    }
-
-    /// <summary>
-    /// Resolves the WSL distro name to keep alive. Prefers the value persisted by
-    /// onboarding in <c>setup-state.json</c> so the keepalive always targets the distro
-    /// the user actually installed. In DEBUG / test builds, an
-    /// <c>OPENCLAW_WSL_DISTRO_NAME</c> environment override is honored to match
-    /// Resolves the local gateway distro name by reading setup-state.json.
-    /// Falls back to "OpenClawGateway" if not found.
-    /// </summary>
-    private async Task<string?> ResolveLocalGatewayDistroNameAsync(GatewayRecord? activeRecord)
-    {
-        string? setupStateDistroName = null;
-        try
-        {
-            var stateFile = Path.Combine(
-                SetupExistingGatewayClassifier.ResolveLocalDataPath(),
-                "setup-state.json");
-
-            if (File.Exists(stateFile))
-            {
-                var json = await File.ReadAllTextAsync(stateFile);
-                using var doc = System.Text.Json.JsonDocument.Parse(json);
-                if (doc.RootElement.TryGetProperty("DistroName", out var dn) &&
-                    dn.GetString() is { Length: > 0 } distroName)
-                {
-                    setupStateDistroName = distroName;
-                }
-            }
-        }
-        catch (Exception ex)
-        {
-            Logger.Warn($"[WslKeepAlive] Failed to read setup-state.json: {ex.Message}");
-        }
-
-        return WslKeepAlivePolicy.ResolveDistroName(
-            activeRecord,
-            setupStateDistroName,
-            Environment.GetEnvironmentVariable("OPENCLAW_WSL_DISTRO_NAME"));
+        return _settings?.EnableNodeMode == true;
     }
 
     // The pre-unification ShouldInitializeNodeService(GatewayRecord, string) overload
@@ -2110,7 +2033,13 @@ private void OnNodeStatusChanged(object? sender, ConnectionStatus status)
     private void OnPairingStatusChanged(object? sender, OpenClaw.Shared.PairingStatusEventArgs args)
     {
         Logger.Info($"Pairing status: {args.Status}");
-        
+
+        // The local node's own device id may have just become known. Re-run the
+        // approval reconcile so the own-node filter drops any self pairing request
+        // rather than prompting the operator to approve their own machine.
+        OnUiThread(() => _pairingApprovalCoordinator?.OnPairListsUpdated(
+            _appState?.DevicePairList, _appState?.NodePairList));
+
         try
         {
             if (args.Status == OpenClaw.Shared.PairingStatus.Pending)
@@ -2126,6 +2055,7 @@ private void OnPairingStatusChanged(object? sender, OpenClaw.Shared.PairingStatu
             else if (args.Status == OpenClaw.Shared.PairingStatus.Paired)
             {
                 RefreshGatewayNodes("node paired");
+                ClearPairingAppNotifications(args.DeviceId);
                 // Bug 3: idempotency guard — only show "Node paired" toast/activity once
                 // per device per session. WS reconnects re-fire Paired; suppress duplicates.
                 var deviceKey = args.DeviceId ?? string.Empty;
@@ -2133,6 +2063,17 @@ private void OnPairingStatusChanged(object? sender, OpenClaw.Shared.PairingStatu
                 {
                     _toastService!.MarkPairedToastShown(deviceKey);
                     AddRecentActivity("Node paired", category: "node", dashboardPath: "nodes", nodeId: args.DeviceId);
+                    AppNotificationPublisher.Show(
+                        _appNotificationService,
+                        LocalizationHelper.GetString("Toast_NodePaired"),
+                        LocalizationHelper.GetString("Toast_NodePairedDetail"),
+                        "node",
+                        "pairing",
+                        AppNotificationSeverity.Success,
+                        "node-paired:" + HashNotificationKey(deviceKey),
+                        "connection",
+                        LocalizationHelper.GetString("AppNotification_ActionOpenConnection"),
+                        id: BuildPairingPairedNotificationId(deviceKey));
                     _toastService!.ShowToast(new ToastContentBuilder()
                         .AddText(LocalizationHelper.GetString("Toast_NodePaired"))
                         .AddText(LocalizationHelper.GetString("Toast_NodePairedDetail")),
@@ -2146,6 +2087,8 @@ private void OnPairingStatusChanged(object? sender, OpenClaw.Shared.PairingStatu
             }
             else if (args.Status == OpenClaw.Shared.PairingStatus.Rejected)
             {
+                _appNotificationService?.Dismiss(BuildPairingPendingNotificationId(args.DeviceId));
+                ShowPairingRejectedAppNotification(args.DeviceId, args.Message);
                 AddRecentActivity("Node pairing rejected", category: "node", dashboardPath: "nodes", nodeId: args.DeviceId, details: args.Message ?? LocalizationHelper.GetString("Toast_PairingRejectedDetail"));
                 _toastService!.ShowToast(new ToastContentBuilder()
                     .AddText(LocalizationHelper.GetString("Toast_PairingRejected"))
@@ -2184,6 +2127,21 @@ private void RefreshGatewayNodes(string reason)
     public static string BuildPairingApprovalCommand(string deviceId) =>
         $"openclaw devices approve {deviceId}";
 
+    private static string BuildPairingPendingNotificationId(string deviceId) =>
+        $"node-pairing-pending:{deviceId.Trim().ToLowerInvariant()}";
+
+    private static string BuildPairingPairedNotificationId(string deviceId) =>
+        $"node-paired:{deviceId.Trim().ToLowerInvariant()}";
+
+    private static string BuildPairingRejectedNotificationId(string deviceId) =>
+        $"node-pairing-rejected:{deviceId.Trim().ToLowerInvariant()}";
+
+    private void ClearPairingAppNotifications(string deviceId)
+    {
+        _appNotificationService?.Dismiss(BuildPairingPendingNotificationId(deviceId));
+        _appNotificationService?.Dismiss(BuildPairingRejectedNotificationId(deviceId));
+    }
+
     private static string DeviceIdForLog(string? deviceId)
     {
         if (string.IsNullOrWhiteSpace(deviceId))
@@ -2202,6 +2160,17 @@ public void ShowPairingPendingNotification(string deviceId, string? approvalComm
         var shortDeviceId = deviceId.Length > 16 ? deviceId[..16] : deviceId;
 
         AddRecentActivity("Node pairing pending", category: "node", dashboardPath: "nodes", nodeId: deviceId);
+        AppNotificationPublisher.Show(
+            _appNotificationService,
+            LocalizationHelper.GetString("Toast_PairingPending"),
+            string.Format(LocalizationHelper.GetString("Toast_PairingPendingDetail"), shortDeviceId),
+            "node",
+            "pairing",
+            AppNotificationSeverity.Warning,
+            $"node-pairing-pending:{deviceId}",
+            "connection",
+            LocalizationHelper.GetString("AppNotification_ActionOpenConnection"),
+            id: BuildPairingPendingNotificationId(deviceId));
         _toastService!.ShowToast(new ToastContentBuilder()
             .AddText(LocalizationHelper.GetString("Toast_PairingPending"))
             .AddText(string.Format(LocalizationHelper.GetString("Toast_PairingPendingDetail"), shortDeviceId))
@@ -2212,7 +2181,201 @@ public void ShowPairingPendingNotification(string deviceId, string? approvalComm
             "node-pairing-pending",
             deviceId);
     }
-    
+
+    private void ShowPairingRejectedAppNotification(string deviceId, string? detail)
+    {
+        AppNotificationPublisher.Show(
+            _appNotificationService,
+            LocalizationHelper.GetString("Toast_PairingRejected"),
+            detail ?? LocalizationHelper.GetString("Toast_PairingRejectedDetail"),
+            "node",
+            "pairing",
+            AppNotificationSeverity.Error,
+            $"node-pairing-rejected:{deviceId}",
+            "connection",
+            LocalizationHelper.GetString("AppNotification_ActionOpenConnection"),
+            id: BuildPairingRejectedNotificationId(deviceId));
+    }
+
+    /// <summary>
+    /// Publishes an immediate connection-error banner using the single
+    /// connection-issue notification identity. Used for transient, page-driven
+    /// failures (e.g. a manual gateway switch that throws) where the snapshot
+    /// may be briefly silent. Because it reuses the connection-issue id/dedupe
+    /// key it occupies the same banner slot — it cannot produce a second bar —
+    /// and the snapshot-driven path will replace or dismiss it on the next tick.
+    /// </summary>
+    internal void ShowTransientConnectionError(string message)
+    {
+        var body = string.IsNullOrWhiteSpace(message)
+            ? LocalizationHelper.GetString("AppNotification_GatewayConnectionFailed_DefaultMessage")
+            : message;
+
+        // Keep the snapshot-driven publisher from immediately re-emitting a
+        // duplicate for the same underlying error.
+        _lastConnectionIssueNotificationKey = $"operator-error:{message}";
+
+        AppNotificationPublisher.Show(
+            _appNotificationService,
+            LocalizationHelper.GetString("AppNotification_GatewayConnectionFailed_Title"),
+            body,
+            "connection",
+            "lifecycle",
+            AppNotificationSeverity.Error,
+            ConnectionIssueNotificationDedupeKey,
+            "connection",
+            LocalizationHelper.GetString("AppNotification_ActionOpenConnection"),
+            id: ConnectionIssueNotificationId);
+    }
+
+    private void UpdateConnectionIssueNotification(GatewayConnectionSnapshot snapshot)
+    {
+        if (!TryBuildConnectionIssueNotification(snapshot, out var title, out var message, out var severity, out var category, out var key))
+        {
+            _lastConnectionIssueNotificationKey = null;
+            _appNotificationService?.Dismiss(ConnectionIssueNotificationId);
+            return;
+        }
+
+        if (string.Equals(_lastConnectionIssueNotificationKey, key, StringComparison.Ordinal))
+            return;
+
+        _lastConnectionIssueNotificationKey = key;
+        AppNotificationPublisher.Show(
+            _appNotificationService,
+            title,
+            message,
+            "connection",
+            category,
+            severity,
+            ConnectionIssueNotificationDedupeKey,
+            "connection",
+            LocalizationHelper.GetString("AppNotification_ActionOpenConnection"),
+            id: ConnectionIssueNotificationId);
+    }
+
+    private void ShowMcpStartupFailureNotification(string message)
+    {
+        AppNotificationPublisher.Show(
+            _appNotificationService,
+            "Local MCP failed",
+            message,
+            "connection",
+            "mcp",
+            AppNotificationSeverity.Error,
+            McpStartupNotificationDedupeKey,
+            "connection",
+            LocalizationHelper.GetString("AppNotification_ActionOpenConnection"),
+            id: McpStartupNotificationId);
+    }
+
+    private void ApplyMcpStartupNotificationPlan(McpStartupNotificationPlan plan)
+    {
+        if (plan.ShouldShow && !string.IsNullOrWhiteSpace(plan.Message))
+        {
+            ShowMcpStartupFailureNotification(plan.Message);
+        }
+        else if (plan.ShouldDismiss)
+        {
+            _appNotificationService?.Dismiss(McpStartupNotificationId);
+        }
+
+        UpdateTrayIcon();
+    }
+
+    private static bool TryBuildConnectionIssueNotification(
+        GatewayConnectionSnapshot snapshot,
+        out string title,
+        out string message,
+        out AppNotificationSeverity severity,
+        out string category,
+        out string key)
+    {
+        title = "";
+        message = "";
+        severity = AppNotificationSeverity.Warning;
+        category = "lifecycle";
+        key = "";
+
+        if (snapshot.OperatorPairingRequired)
+        {
+            title = LocalizationHelper.GetString("AppNotification_GatewayPairingRequired_Title");
+            message = string.IsNullOrWhiteSpace(snapshot.OperatorDeviceId)
+                ? LocalizationHelper.GetString("AppNotification_GatewayPairingRequired_GenericMessage")
+                : LocalizationHelper.Format(
+                    "AppNotification_GatewayPairingRequired_DeviceMessageFormat",
+                    DeviceIdForLog(snapshot.OperatorDeviceId));
+            category = "pairing";
+            key = $"operator-pairing:{snapshot.OperatorDeviceId ?? "unknown"}";
+            return true;
+        }
+
+        if (snapshot.OverallState == OverallConnectionState.PairingRequired &&
+            snapshot.NodeState == RoleConnectionState.PairingRequired)
+        {
+            title = LocalizationHelper.GetString("AppNotification_GatewayPairingRequired_Title");
+            message = "Approve the Windows node pairing request on the gateway host.";
+            category = "pairing";
+            key = $"node-pairing:{snapshot.NodeDeviceId ?? snapshot.NodePairingRequestId ?? "unknown"}";
+            return true;
+        }
+
+        if (TryBuildNodeConnectionIssueNotification(snapshot, out title, out message, out severity, out category, out key))
+            return true;
+
+        if (snapshot.OverallState == OverallConnectionState.Error)
+        {
+            title = LocalizationHelper.GetString("AppNotification_GatewayConnectionFailed_Title");
+            var rawError = snapshot.OperatorError;
+            message = string.IsNullOrWhiteSpace(rawError)
+                ? LocalizationHelper.GetString("AppNotification_GatewayConnectionFailed_DefaultMessage")
+                : rawError;
+            severity = AppNotificationSeverity.Error;
+            key = $"operator-error:{rawError ?? "default"}";
+            return true;
+        }
+
+        return false;
+    }
+
+    private static bool TryBuildNodeConnectionIssueNotification(
+        GatewayConnectionSnapshot snapshot,
+        out string title,
+        out string message,
+        out AppNotificationSeverity severity,
+        out string category,
+        out string key)
+    {
+        title = "";
+        message = "";
+        severity = AppNotificationSeverity.Warning;
+        category = "node";
+        key = "";
+
+        if (snapshot.OperatorState == RoleConnectionState.Error)
+            return false;
+
+        if (snapshot.NodeState == RoleConnectionState.RateLimited)
+        {
+            title = LocalizationHelper.GetString("AppNotification_WindowsNodeRateLimited_Title");
+            message = snapshot.NodeError ?? LocalizationHelper.GetString("AppNotification_WindowsNodeRateLimited_DefaultMessage");
+            key = $"node-rate-limited:{message}";
+            return true;
+        }
+
+        if (snapshot.NodeState is RoleConnectionState.Error or RoleConnectionState.PairingRejected ||
+            !string.IsNullOrWhiteSpace(snapshot.NodeError))
+        {
+            title = LocalizationHelper.GetString("AppNotification_WindowsNodeConnectionFailed_Title");
+            message = snapshot.NodeError ?? LocalizationHelper.GetString("AppNotification_WindowsNodeConnectionFailed_DefaultMessage");
+            severity = AppNotificationSeverity.Error;
+            key = $"node-error:{message}";
+            return true;
+        }
+
+        return false;
+    }
+
     private void OnNodeNotificationRequested(object? sender, OpenClaw.Shared.Capabilities.SystemNotifyArgs args)
     {
         AddRecentActivity(args.Title, category: "node", dashboardPath: "nodes", details: args.Body);
@@ -2220,9 +2383,14 @@ private void OnNodeNotificationRequested(object? sender, OpenClaw.Shared.Capabil
         // Agent requested a notification via node.invoke system.notify
         try
         {
-            _toastService!.ShowToast(new ToastContentBuilder()
-                .AddText(args.Title)
-                .AddText(args.Body));
+            AppNotificationPublisher.Publish(
+                _appNotificationService,
+                _toastService,
+                new AppNotificationPublishRequest(
+                    AppNotificationMapper.FromNodeSystemNotification(args),
+                    new ToastContentBuilder()
+                        .AddText(args.Title)
+                        .AddText(args.Body)));
         }
         catch (Exception ex)
         {
@@ -2230,12 +2398,58 @@ private void OnNodeNotificationRequested(object? sender, OpenClaw.Shared.Capabil
         }
     }
 
-    private void OnNodeToastRequested(object? sender, Microsoft.Toolkit.Uwp.Notifications.ToastContentBuilder builder)
+    private void OnNodeToastRequested(object? sender, NodeToastRequestedEventArgs args)
         => OnUiThread(() =>
-            NonFatalAction.Run(() => _toastService!.ShowToast(builder), msg => Logger.Warn($"Failed to show node toast: {msg}")));
+            NonFatalAction.Run(
+                () => AppNotificationPublisher.Publish(
+                    _appNotificationService,
+                    _toastService,
+                    new AppNotificationPublishRequest(
+                        args.AppNotification,
+                        args.ToastBuilder,
+                        args.ToastTag,
+                        args.ToastDeviceId)),
+                msg => Logger.Warn($"Failed to show node toast: {msg}")));
+
+    private void OnLocalExecApprovalRequested(object? sender, ExecApprovalPromptRequestedEventArgs args)
+    {
+        if (string.IsNullOrWhiteSpace(args.Request.SessionKey))
+            return;
+
+        try
+        {
+            _appNotificationService?.Show(new AppNotification
+            {
+                Id = BuildLocalApprovalPendingNotificationId(args.Request),
+                Title = LocalizationHelper.GetString("AppNotification_ExecApprovalPending_Title"),
+                Message = BuildLocalApprovalPendingNotificationMessage(args.Request),
+                Source = "exec-approval",
+                Category = "node.invoke",
+                Severity = AppNotificationSeverity.Warning,
+                DedupeKey = BuildLocalApprovalPendingDedupeKey(args.Request),
+                ActionLabel = LocalizationHelper.GetString("AppNotification_ExecApprovalPending_OpenChatAction"),
+                ActionRoute = AppNotificationActionRoutes.Chat(args.Request.SessionKey!)
+            });
+        }
+        catch (Exception ex)
+        {
+            Logger.Warn($"Failed to post pending exec-approval app notification: {ex.Message}");
+        }
+    }
 
     private void OnLocalExecApprovalDecided(object? sender, ExecApprovalPromptDecidedEventArgs args)
     {
+        try { _appNotificationService?.Dismiss(BuildLocalApprovalPendingNotificationId(args.Request)); }
+        catch (Exception ex) { Logger.Debug($"Failed to dismiss pending exec-approval notification: {ex.Message}"); }
+
+        if (args.Source is ExecApprovalPromptDecisionSource.UserAllowOnce
+            or ExecApprovalPromptDecisionSource.UserAlwaysAllow)
+        {
+            try { _appNotificationService?.DismissByDedupeKey(BuildLocalDenyDedupeKey(args.Request)); }
+            catch (Exception ex) { Logger.Debug($"Failed to dismiss stale denied exec-approval notification: {ex.Message}"); }
+            return;
+        }
+
         if (args.Source is not (ExecApprovalPromptDecisionSource.UserDeny
             or ExecApprovalPromptDecisionSource.PolicyAutoDeny))
             return;
@@ -2257,6 +2471,77 @@ private void OnLocalExecApprovalDecided(object? sender, ExecApprovalPromptDecide
         }
     }
 
+    private static string BuildLocalApprovalPendingNotificationMessage(ExecApprovalPromptRequest request)
+    {
+        var session = FormatSessionKeyForNotification(request.SessionKey);
+        var command = string.IsNullOrWhiteSpace(request.Command)
+            ? LocalizationHelper.GetString("AppNotification_LocalCommandDenied_UnknownCommandSubject")
+            : CompactNotificationText(request.Command.Trim());
+        return LocalizationHelper.Format(
+            "AppNotification_ExecApprovalPending_MessageFormat",
+            session,
+            command);
+    }
+
+    private static string FormatSessionKeyForNotification(string? sessionKey)
+    {
+        if (string.IsNullOrWhiteSpace(sessionKey))
+            return LocalizationHelper.GetString("AppNotification_ExecApprovalPending_UnknownChatLabel");
+
+        var parts = sessionKey.Split(':', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
+        if (parts.Length >= 3 && string.Equals(parts[0], "agent", StringComparison.OrdinalIgnoreCase))
+        {
+            var agent = FormatSessionSegment(parts[1]);
+            var slot = FormatSessionSegment(parts[2]);
+            var main = LocalizationHelper.GetString("AppNotification_ExecApprovalPending_MainSessionLabel");
+            var isMainAgent = string.Equals(parts[1], "main", StringComparison.OrdinalIgnoreCase);
+            var isMainSlot = string.Equals(parts[2], "main", StringComparison.OrdinalIgnoreCase);
+            var isDefaultSlot = string.Equals(parts[2], "default", StringComparison.OrdinalIgnoreCase);
+
+            if (isMainAgent && isMainSlot)
+                return LocalizationHelper.GetString("AppNotification_ExecApprovalPending_MainChatLabel");
+
+            if (isMainSlot || isDefaultSlot)
+            {
+                return LocalizationHelper.Format(
+                    "AppNotification_ExecApprovalPending_AgentChatLabelFormat",
+                    isMainAgent ? main : agent);
+            }
+
+            return LocalizationHelper.Format(
+                "AppNotification_ExecApprovalPending_AgentSlotLabelFormat",
+                isMainAgent ? main : agent,
+                slot);
+        }
+
+        return CompactNotificationText(sessionKey);
+    }
+
+    private static string FormatSessionSegment(string value)
+    {
+        if (string.IsNullOrWhiteSpace(value))
+            return LocalizationHelper.GetString("AppNotification_ExecApprovalPending_UnknownChatLabel");
+
+        var words = value.Replace('-', ' ').Replace('_', ' ');
+        return CultureInfo.CurrentCulture.TextInfo.ToTitleCase(words.ToLower(CultureInfo.CurrentCulture));
+    }
+
+    private static string BuildLocalApprovalPendingNotificationId(ExecApprovalPromptRequest request) =>
+        "exec-approval-pending-" + HashNotificationKey(BuildLocalApprovalPendingDedupeKey(request));
+
+    private static string BuildLocalApprovalPendingDedupeKey(ExecApprovalPromptRequest request)
+    {
+        return string.Join("|",
+            "exec-approval-pending",
+            request.SessionKey ?? "",
+            request.CorrelationId ?? "",
+            request.Command ?? "",
+            request.Shell ?? "");
+    }
+
+    private static string HashNotificationKey(string value) =>
+        Convert.ToHexString(SHA256.HashData(Encoding.UTF8.GetBytes(value))).ToLowerInvariant();
+
     private static string BuildLocalDenyNotificationMessage(ExecApprovalPromptRequest request)
     {
         var subject = string.IsNullOrWhiteSpace(request.Command)
@@ -2351,25 +2636,10 @@ private void OnGatewayConnectionStatusChanged(object? sender, ConnectionStatus s
             _appState.AuthFailureMessage = null;
         }
 
-        UpdateTrayIcon();
         OnUiThread(() =>
         {
             UpdateStatusDetailWindow();
-            SyncConnectionToggle(status);
-            if (status is ConnectionStatus.Connected or ConnectionStatus.Disconnected or ConnectionStatus.Error)
-            {
-                // Dismiss the tray menu on state change — it will capture fresh data on next open
-                _trayMenuWindow?.HideCascade();
-            }
         });
-
-        if (status == ConnectionStatus.Connected)
-        {
-            _ = RunHealthCheckAsync();
-            // For local gateways, the NodeConnector is suppressed because NodeService
-            // owns the identity. Connect the NodeService directly after operator connects.
-            _ = TryConnectLocalNodeServiceAsync();
-        }
     }
 
     /// <summary>
@@ -2380,7 +2650,7 @@ private void OnGatewayConnectionStatusChanged(object? sender, ConnectionStatus s
     /// </summary>
     private async Task TryConnectLocalNodeServiceAsync()
     {
-        if (_connectionManager == null)
+        if (_connectionManager == null || !IsGatewayNodeEnabled())
             return;
 
         Logger.Info("[App] Auto-connecting local NodeService via EnsureNodeConnectedAsync");
@@ -2398,11 +2668,18 @@ private void OnGatewayAuthenticationFailed(object? sender, string message)
     {
         UpdateTrayIcon();
 
-        // Store auth failure in AppState — HubWindow observes it via PropertyChanged
+        // Store auth failure in AppState — observed for tray tooltip / status.
         if (_appState != null)
         {
             _appState.AuthFailureMessage = message;
         }
+
+        // The user-facing banner is published by the single connection-issue
+        // notification (UpdateConnectionIssueNotification), driven off the
+        // snapshot's Error state + OperatorError (same string surfaced here).
+        // Publishing a second "authentication failed" banner here produced a
+        // duplicate top bar and forced the action button to degrade to
+        // "Show more", so it is intentionally not raised from this handler.
     }
 
     private void OnGatewaySessionCommandCompleted(object? sender, SessionCommandResult result)
@@ -2431,9 +2708,26 @@ private void OnGatewaySessionCommandCompleted(object? sender, SessionCommandResu
                     dashboardPath: !string.IsNullOrWhiteSpace(result.Key) ? $"sessions/{result.Key}" : "sessions",
                     sessionKey: result.Key);
 
-                _toastService!.ShowToast(new ToastContentBuilder()
-                    .AddText(title)
-                    .AddText(message));
+                AppNotification? appNotification = result.Ok
+                    ? null
+                    : new AppNotification
+                    {
+                        Title = title,
+                        Message = message,
+                        Source = "session",
+                        Category = "status",
+                        Severity = AppNotificationSeverity.Error,
+                        DedupeKey = "session-command:" + HashNotificationKey($"{result.Method}|{key}|{message}")
+                    };
+
+                AppNotificationPublisher.Publish(
+                    _appNotificationService,
+                    _toastService,
+                    new AppNotificationPublishRequest(
+                        appNotification,
+                        new ToastContentBuilder()
+                            .AddText(title)
+                            .AddText(message)));
             }
             catch (Exception ex)
             {
@@ -2453,6 +2747,8 @@ private void OnGatewayNotificationReceived(object? sender, OpenClawNotification
         // if the user enabled "Read responses aloud".
         if (notification.IsChat && !string.IsNullOrEmpty(notification.Message))
         {
+            var speechText = ChatNotificationSpeechText.Resolve(notification);
+
             // Suppress TTS/voice overlay when the user has aborted the response.
             if (ChatProvider?.IsResponseSuppressed == true)
                 return;
@@ -2473,7 +2769,7 @@ private void OnGatewayNotificationReceived(object? sender, OpenClawNotification
             // TTS: read response aloud whenever the toggle is on (any chat surface).
             if (_settings?.VoiceTtsEnabled == true)
             {
-                _ = (_chatCoordinator?.SpeakResponseAsync(notification.Message) ?? Task.CompletedTask);
+                _ = (_chatCoordinator?.SpeakResponseAsync(speechText) ?? Task.CompletedTask);
             }
         }
 
@@ -2514,7 +2810,14 @@ private void OnGatewayNotificationReceived(object? sender, OpenClawNotification
                     .AddArgument("sessionKey", notification.SessionKey ?? ""));
             }
 
-            _toastService!.ShowToast(builder);
+            AppNotificationPublisher.Publish(
+                _appNotificationService,
+                _toastService,
+                new AppNotificationPublishRequest(
+                    AppNotificationMapper.FromGatewayNotification(
+                        notification,
+                        LocalizationHelper.GetString("AppNotification_ExecApprovalPending_OpenChatAction")),
+                    builder));
         }
         catch (Exception ex)
         {
@@ -2539,14 +2842,219 @@ private void OnAppStateChanged(object? sender, System.ComponentModel.PropertyCha
             case nameof(AppState.Nodes):
                 UpdateStatusDetailWindow();
                 break;
+            case nameof(AppState.Channels):
+                UpdateChannelIssueNotifications(_appState.Channels);
+                UpdateStatusDetailWindow();
+                break;
             case nameof(AppState.CurrentActivity):
                 UpdateTrayIcon();
                 break;
         }
     }
 
+    private void UpdateChannelIssueNotifications(ChannelHealth[] channels)
+    {
+        var currentIssueNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        foreach (var channel in channels)
+        {
+            if (!TryBuildChannelIssueNotification(channel, out var title, out var message, out var signature))
+                continue;
 
-    private void SyncConnectionToggle(ConnectionStatus status)
+            currentIssueNames.Add(channel.Name);
+            if (_reportedChannelIssueSignatures.TryGetValue(channel.Name, out var existingSignature) &&
+                string.Equals(existingSignature, signature, StringComparison.Ordinal))
+                continue;
+
+            _reportedChannelIssueSignatures[channel.Name] = signature;
+            AppNotificationPublisher.Show(
+                _appNotificationService,
+                title,
+                message,
+                "channels",
+                "status",
+                AppNotificationSeverity.Error,
+                $"channels:{channel.Name}:status-error",
+                "channels",
+                LocalizationHelper.GetString("AppNotification_ActionOpenChannels"),
+                id: BuildChannelIssueNotificationId(channel.Name));
+        }
+
+        foreach (var channelName in _reportedChannelIssueSignatures.Keys.Except(currentIssueNames).ToList())
+        {
+            _reportedChannelIssueSignatures.Remove(channelName);
+            _appNotificationService?.Dismiss(BuildChannelIssueNotificationId(channelName));
+        }
+    }
+
+    private static bool TryBuildChannelIssueNotification(
+        ChannelHealth channel,
+        out string title,
+        out string message,
+        out string signature)
+    {
+        title = "";
+        message = "";
+        signature = "";
+
+        if (string.IsNullOrWhiteSpace(channel.Name))
+            return false;
+
+        var status = channel.Status?.Trim() ?? "";
+        var hasExplicitError = !string.IsNullOrWhiteSpace(channel.Error);
+        var hasErrorStatus = !string.IsNullOrWhiteSpace(status) &&
+            !ChannelHealth.IsHealthyStatus(status) &&
+            !ChannelHealth.IsIntermediateStatus(status) &&
+            !status.Equals("not configured", StringComparison.OrdinalIgnoreCase) &&
+            !status.Equals("unknown", StringComparison.OrdinalIgnoreCase);
+
+        if (!hasExplicitError && !hasErrorStatus)
+            return false;
+
+        var displayName = CultureInfo.CurrentCulture.TextInfo.ToTitleCase(channel.Name);
+        title = LocalizationHelper.Format("AppNotification_ChannelNeedsAttention_TitleFormat", displayName);
+        message = hasExplicitError
+            ? channel.Error!.Trim()
+            : LocalizationHelper.Format("AppNotification_ChannelNeedsAttention_StatusMessageFormat", channel.Name, status);
+        signature = $"{status}|{message}";
+        return true;
+    }
+
+    private static string BuildChannelIssueNotificationId(string channelName) =>
+        $"channel-issue:{channelName.Trim().ToLowerInvariant()}";
+
+    private void PublishSandboxRiskNotificationIfNeeded()
+    {
+        if (_settings is null || _appNotificationService is null)
+            return;
+
+        if (!_settings.SystemRunSandboxEnabled)
+        {
+            _sandboxRiskProbeGeneration++;
+            _sandboxRiskProbeInFlight = false;
+            PublishSandboxRiskNotification(
+                "disabled",
+                LocalizationHelper.GetString("AppNotification_SandboxDisabled_Title"),
+                LocalizationHelper.GetString("AppNotification_SandboxDisabled_Message"));
+            return;
+        }
+
+        if (_sandboxRiskAvailabilityCache is { } cachedAvailability)
+            PublishSandboxRiskNotification(cachedAvailability);
+        else
+            ClearSandboxRiskNotification();
+
+        StartSandboxRiskProbeIfNeeded();
+    }
+
+    private void StartSandboxRiskProbeIfNeeded()
+    {
+        if (_settings is not { SystemRunSandboxEnabled: true })
+            return;
+
+        var now = DateTimeOffset.UtcNow;
+        if (_sandboxRiskProbeInFlight)
+            return;
+
+        if (_sandboxRiskAvailabilityCache is { ProbeErrored: false } &&
+            now - _lastSandboxRiskProbeStartedAt < SandboxRiskProbeRefreshInterval)
+        {
+            return;
+        }
+
+        _sandboxRiskProbeInFlight = true;
+        _lastSandboxRiskProbeStartedAt = now;
+        var generation = ++_sandboxRiskProbeGeneration;
+
+        _ = Task.Run(() => MxcAvailability.Probe(new AppLogger()))
+            .ContinueWith(
+                task => OnUiThread(() => CompleteSandboxRiskProbe(generation, task)),
+                CancellationToken.None,
+                TaskContinuationOptions.None,
+                TaskScheduler.Default);
+    }
+
+    private void CompleteSandboxRiskProbe(int generation, Task<MxcAvailability> task)
+    {
+        if (generation != _sandboxRiskProbeGeneration)
+            return;
+
+        _sandboxRiskProbeInFlight = false;
+
+        MxcAvailability availability;
+        if (task.Status == TaskStatus.RanToCompletion)
+        {
+            availability = task.Result;
+        }
+        else
+        {
+            var message = task.Exception?.GetBaseException().Message ?? LocalizationHelper.GetString("SandboxPage_ProbeErrorReason");
+            Logger.Warn($"Sandbox availability probe failed: {message}");
+            availability = new MxcAvailability(
+                false,
+                false,
+                false,
+                null,
+                new[] { message },
+                probeErrored: true);
+        }
+
+        _sandboxRiskAvailabilityCache = availability;
+        PublishSandboxRiskNotification(availability);
+    }
+
+    private void PublishSandboxRiskNotification(MxcAvailability availability)
+    {
+        if (availability.HasAnyBackend)
+        {
+            ClearSandboxRiskNotification();
+            return;
+        }
+
+        var reasonText = availability.UnsupportedReasons.Count > 0
+            ? string.Join("  ·  ", availability.UnsupportedReasons)
+            : LocalizationHelper.GetString("AppNotification_SandboxUnavailable_DefaultReason");
+        var blockHostFallback = _settings?.SystemRunBlockHostFallbackWhenMxcUnavailable == true;
+        var mode = blockHostFallback ? "blocked" : "host-fallback";
+        var title = blockHostFallback
+            ? LocalizationHelper.GetString("AppNotification_SandboxUnavailableBlocked_Title")
+            : LocalizationHelper.GetString("AppNotification_SandboxUnavailable_Title");
+        var message = blockHostFallback
+            ? LocalizationHelper.Format("AppNotification_SandboxUnavailableBlocked_MessageFormat", reasonText)
+            : LocalizationHelper.Format("AppNotification_SandboxUnavailable_MessageFormat", reasonText);
+
+        PublishSandboxRiskNotification(
+            $"unavailable:{mode}:{reasonText}",
+            title,
+            message);
+    }
+
+    private void PublishSandboxRiskNotification(string riskKey, string title, string message)
+    {
+        if (string.Equals(_lastSandboxRiskNotificationKey, riskKey, StringComparison.Ordinal))
+            return;
+
+        _lastSandboxRiskNotificationKey = riskKey;
+        AppNotificationPublisher.Show(
+            _appNotificationService,
+            title,
+            message,
+            "sandbox",
+            "system.run",
+            AppNotificationSeverity.Warning,
+            SandboxRiskNotificationDedupeKey,
+            "sandbox",
+            LocalizationHelper.GetString("AppNotification_ActionOpenSandbox"),
+            id: SandboxRiskNotificationId);
+    }
+
+    private void ClearSandboxRiskNotification()
+    {
+        _lastSandboxRiskNotificationKey = null;
+        _appNotificationService?.ClearSource("sandbox");
+    }
+
+
+    private void SyncConnectionToggle(ConnectionStatus status, OverallConnectionState? overallState = null)
     {
         if (_connectionToggleRef == null)
             return;
@@ -2560,16 +3068,22 @@ private void SyncConnectionToggle(ConnectionStatus status)
             return;
         }
 
-        var shouldBeOn = status == ConnectionStatus.Connected;
-        var canToggle = status is ConnectionStatus.Connected or ConnectionStatus.Disconnected or ConnectionStatus.Error;
+        var shouldBeOn = ConnectionStatusPresenter.IsLiveOrPending(overallState, status);
+        var canToggle = overallState switch
+        {
+            OverallConnectionState.Connecting or OverallConnectionState.Disconnecting => false,
+            null => status is ConnectionStatus.Connected or ConnectionStatus.Disconnected or ConnectionStatus.Error,
+            _ => true
+        };
+        var statusText = ConnectionStatusPresenter.PlainText(overallState, status);
         _suspendConnectionToggleEvent = true;
         try
         {
             TrayMenuWindow.SetMenuToggleSwitchState(toggle, shouldBeOn, canToggle);
             ToolTipService.SetToolTip(toggle,
-                shouldBeOn ? "Connected - toggle off to disconnect"
+                shouldBeOn ? $"{statusText} - toggle off to disconnect"
                     : status == ConnectionStatus.Connecting ? "Connecting..."
-                    : "Disconnected - toggle on to connect");
+                    : $"{statusText} - toggle on to connect");
         }
         finally
         {
@@ -2667,60 +3181,28 @@ private async Task RunHealthCheckAsync(bool userInitiated = false)
 
     #region Tray Icon
 
-    private void UpdateTrayIcon()
-    {
-        if (_dispatcherQueue != null && !_dispatcherQueue.HasThreadAccess)
-        {
-            _dispatcherQueue.TryEnqueue(UpdateTrayIcon);
-            return;
-        }
-
-        if (_trayIcon == null) return;
-
-        // Tray icon is pinned to the app icon so it visually matches the agent
-        // avatar and chat-window title bar. Status is communicated via the
-        // tooltip text below rather than swapping the icon image.
-        var iconPath = System.IO.Path.Combine(AppContext.BaseDirectory, "Assets", "openclaw.ico");
-        var tooltip = BuildTrayTooltip();
-
-        try
-        {
-            _trayIcon.SetIcon(iconPath);
-            ApplyTrayTooltip(tooltip);
-        }
-        catch (Exception ex)
-        {
-            Logger.Warn($"Failed to update tray icon: {ex.Message}");
-        }
-    }
-
-    private void ApplyTrayTooltip(string tooltip)
-    {
-        if (_trayIcon == null)
-            return;
-
-        if (string.Equals(_trayIcon.Tooltip, tooltip, StringComparison.Ordinal))
-        {
-            _trayIcon.Tooltip = string.Empty;
-        }
-
-        _trayIcon.Tooltip = tooltip;
-    }
+    private void UpdateTrayIcon() => _trayIconCoordinator?.UpdateTrayIcon();
 
     private string BuildTrayTooltip() =>
         new TrayTooltipBuilder(CaptureTraySnapshot()).Build();
 
-    private TrayStateSnapshot CaptureTraySnapshot() => new TrayStateSnapshot
+    private TrayStateSnapshot CaptureTraySnapshot()
     {
-        Status = _appState!.Status,
-        CurrentActivity = _appState!.CurrentActivity,
-        Channels = _appState!.Channels,
-        Nodes = _appState!.Nodes,
-        LocalNodeFallback = _nodeService?.GetLocalNodeInfo(),
-        AuthFailureMessage = _appState!.AuthFailureMessage,
-        LastCheckTime = _appState!.LastCheckTime,
-        Settings = _settings
-    };
+        return new TrayStateSnapshot
+        {
+            Status = _appState!.Status,
+            OverallState = _connectionManager?.CurrentSnapshot.OverallState,
+            CurrentActivity = _appState!.CurrentActivity,
+            Channels = _appState!.Channels,
+            Nodes = _appState!.Nodes,
+            LocalNodeFallback = _nodeService?.GetLocalNodeInfo(),
+            AuthFailureMessage = _appState!.AuthFailureMessage,
+            LastCheckTime = _appState!.LastCheckTime,
+            Settings = _settings,
+            IsMcpRunning = _nodeService?.IsMcpRunning == true,
+            McpStartupError = _nodeService?.McpStartupError
+        };
+    }
 
     #endregion
 
@@ -2731,6 +3213,7 @@ internal void ShowHub(string? navigateTo = null, bool activate = true)
         if (_hubWindow == null || _hubWindow.IsClosed)
         {
             _hubWindow = new HubWindow();
+            ApplyThemePreference(_hubWindow);
             _hubWindow.AppModel = _appState;
             _hubWindow.BindAppNotifications(_appNotificationService!);
             _hubWindow.ApplyNavPaneState(_settings!);
@@ -2835,6 +3318,7 @@ private void OnSettingsSaved(object? sender, EventArgs e)
         _previousSettingsSnapshot = currentSnapshot;
         SyncActiveGatewayBrowserProxyForward();
         Logger.Info($"[SETTINGS] Change impact: {impact}");
+        PublishSandboxRiskNotificationIfNeeded();
 
         switch (impact)
         {
@@ -2882,10 +3366,17 @@ private void OnSettingsSaved(object? sender, EventArgs e)
         {
             var nodeService = EnsureNodeService(_settings);
             nodeService?.SetMcpEnabled(_settings.EnableMcpServer);
+            if (nodeService != null)
+            {
+                ApplyMcpStartupNotificationPlan(
+                    McpRuntimeStatePolicy.PlanStartupNotification(
+                        _settings.EnableMcpServer,
+                        nodeService.IsMcpRunning,
+                        nodeService.McpStartupError));
+            }
             WireAppCapabilityHandlers();
         }
 
-        // Non-connection settings always applied regardless of impact
         if (_settings!.GlobalHotkeyEnabled)
         {
             _globalHotkey ??= new GlobalHotkeyService();
@@ -2904,19 +3395,24 @@ private void OnSettingsSaved(object? sender, EventArgs e)
             AutoStartManager.SetAutoStartAsync(_settings.AutoStart),
             "[App] Failed to apply auto-start setting");
 
-        // Notify ad-hoc listeners (e.g. ChatWindow may be alive but not
-        // owned by the hub) that settings have changed. Marshal onto the
-        // UI thread because IAppCommands.NotifySettingsSaved is a public
-        // entry point that may be invoked from background work; existing
-        // handlers (DebugPage, ChatWindow) update UI directly and would
-        // crash if dispatched from a non-UI thread (Hanselman v2 #7).
+        // Apply UI-only settings and notify ad-hoc listeners. This public
+        // entry point can be invoked from background work, while existing
+        // listeners update UI directly.
+        void ApplyUiSettingsAndNotify()
+        {
+            ApplyThemePreferenceToOpenWindows();
+            if (_hubWindow is { IsClosed: false })
+                _hubWindow.RefreshDiagnosticsNavVisibility();
+            SettingsChanged?.Invoke(this, EventArgs.Empty);
+        }
+
         if (_dispatcherQueue != null && !_dispatcherQueue.HasThreadAccess)
         {
-            _dispatcherQueue.TryEnqueue(() => SettingsChanged?.Invoke(this, EventArgs.Empty));
+            _dispatcherQueue.TryEnqueue(ApplyUiSettingsAndNotify);
         }
         else
         {
-            SettingsChanged?.Invoke(this, EventArgs.Empty);
+            ApplyUiSettingsAndNotify();
         }
     }
 
@@ -2977,9 +3473,114 @@ private void ShowConnectionStatusWindow()
             _connectionManager!.Diagnostics,
             _gatewayRegistry,
             _connectionManager);
+        ApplyThemePreference(_connectionStatusWindow);
         _connectionStatusWindow.Activate();
     }
 
+    // ─── Inbound pairing approvals ───────────────────────────────────────
+
+    /// <summary>Feeds fresh device/node pending pair-lists into the approval coordinator.</summary>
+    private void OnPairListsChanged(object? sender, EventArgs e)
+    {
+        _pairingApprovalCoordinator?.OnPairListsUpdated(_appState?.DevicePairList, _appState?.NodePairList);
+    }
+
+    /// <summary>
+    /// All identifiers the local Windows node may be known by in the gateway's pending node list,
+    /// so the approval coordinator never prompts the operator to approve their own machine. The node
+    /// advertises itself as <c>NodeId ?? FullDeviceId</c>; we offer both so the own-node filter is
+    /// robust to either identifier space.
+    /// </summary>
+    private IReadOnlyCollection<string> BuildOwnNodeIds()
+    {
+        var ids = new List<string>(2);
+        var fullDeviceId = _nodeService?.FullDeviceId;
+        if (!string.IsNullOrWhiteSpace(fullDeviceId)) ids.Add(fullDeviceId);
+        var nodeId = _nodeService?.NodeId;
+        if (!string.IsNullOrWhiteSpace(nodeId) && !ids.Contains(nodeId)) ids.Add(nodeId);
+        return ids;
+    }
+
+    /// <summary>A new inbound pairing request arrived — present the focused dialog and an awareness toast.</summary>
+    private void OnPairingApprovalRequested(object? sender, PendingApproval approval)
+    {
+        OnUiThread(() =>
+        {
+            // Only steal foreground when the dialog isn't already open. On a reconnect burst the
+            // gateway re-pushes every pending request at once; the first opens + foregrounds the
+            // dialog, the rest just enqueue into it without repeated focus-stealing.
+            var alreadyOpen = _pairingApprovalDialog is { IsClosed: false };
+            ShowPairingApprovalDialog(bringToFront: !alreadyOpen);
+
+            var name = string.IsNullOrWhiteSpace(approval.DisplayName)
+                ? approval.DeviceId
+                : approval.DisplayName!;
+            AddRecentActivity(
+                LocalizationHelper.GetString("Toast_PairingRequestTitle"),
+                category: "pairing",
+                dashboardPath: "connection",
+                details: name);
+
+            var bodyKey = approval.Kind == PairingApprovalKind.NodePair
+                ? "Toast_PairingRequestBodyNode"
+                : "Toast_PairingRequestBody";
+            _toastService?.ShowToast(new ToastContentBuilder()
+                .AddText(LocalizationHelper.GetString("Toast_PairingRequestTitle"))
+                .AddText(string.Format(LocalizationHelper.GetString(bodyKey), name))
+                .AddButton(new ToastButton()
+                    .SetContent(LocalizationHelper.GetString("Toast_PairingReview"))
+                    .AddArgument("action", "review_pairing")),
+                "pairing-request",
+                approval.DecisionId);
+        });
+    }
+
+    /// <summary>After a decision is confirmed by the gateway, surface a confirmation toast + activity entry.</summary>
+    private void OnPairingDecisionCompleted(object? sender, PairingDecisionResult result)
+    {
+        if (!result.Success) return; // defensive — the coordinator only raises this for confirmed decisions
+        OnUiThread(() =>
+        {
+            var name = string.IsNullOrWhiteSpace(result.Approval.DisplayName)
+                ? result.Approval.DeviceId
+                : result.Approval.DisplayName!;
+            var titleKey = result.Approved ? "Toast_PairingApprovedTitle" : "Toast_PairingRejectedTitle";
+            var bodyKey = result.Approved ? "Toast_PairingApprovedBody" : "Toast_PairingRejectedBody";
+            AddRecentActivity(
+                LocalizationHelper.GetString(titleKey),
+                category: "pairing",
+                dashboardPath: "connection",
+                details: name);
+            _toastService?.ShowToast(new ToastContentBuilder()
+                .AddText(LocalizationHelper.GetString(titleKey))
+                .AddText(string.Format(LocalizationHelper.GetString(bodyKey), name)),
+                "pairing-decided",
+                result.Approval.DecisionId);
+        });
+    }
+
+    /// <summary>Opens (or re-focuses) the inbound pairing approval dialog when there is something to decide.</summary>
+    private void ShowPairingApprovalDialog() => ShowPairingApprovalDialog(bringToFront: true);
+
+    private void ShowPairingApprovalDialog(bool bringToFront)
+    {
+        if (_pairingApprovalCoordinator == null) return;
+        if (_pairingApprovalCoordinator.Current.Count == 0)
+        {
+            ShowStatusDetail();
+            return;
+        }
+
+        if (_pairingApprovalDialog is { IsClosed: false } existing)
+        {
+            if (bringToFront) existing.ShowForeground();
+            return;
+        }
+
+        _pairingApprovalDialog = new OpenClawTray.Dialogs.PairingApprovalDialog(_pairingApprovalCoordinator);
+        _pairingApprovalDialog.ShowForeground();
+    }
+
     private void RestartSshTunnel()
     {
         if (_settings?.UseSshTunnel != true)
@@ -3051,12 +3652,16 @@ private void UpdateStatusDetailWindow()
     internal GatewayCommandCenterState BuildCommandCenterState() =>
         new CommandCenterStateBuilder(CaptureSnapshot()).Build();
 
+    internal IReadOnlyList<ConnectionDiagnosticEvent> GetConnectionDiagnosticEvents() =>
+        _connectionManager?.Diagnostics.GetRecent(200) ?? [];
+
     private AppStateSnapshot CaptureSnapshot()
     {
         var activeGateway = _gatewayRegistry?.GetActive();
         return new AppStateSnapshot
         {
             Status = _appState!.Status,
+            OverallState = _connectionManager?.CurrentSnapshot.OverallState,
             LastCheckTime = _appState!.LastCheckTime,
             Channels = _appState!.Channels,
             Sessions = _appState!.Sessions,
@@ -3069,6 +3674,8 @@ private AppStateSnapshot CaptureSnapshot()
             LastUpdateInfo = _appState!.UpdateInfo,
             Settings = _settings,
             NodeService = _nodeService,
+            IsMcpRunning = _nodeService?.IsMcpRunning == true,
+            McpStartupError = _nodeService?.McpStartupError,
             NodePairingApprovalKind = _connectionManager?.CurrentSnapshot.NodePairingApprovalKind
                 ?? PairingApprovalKind.Unknown,
             NodePairingRequestId = _connectionManager?.CurrentSnapshot.NodePairingRequestId,
@@ -3099,28 +3706,42 @@ private async Task ShowOnboardingAsync()
         await EnsureSetupWindowAsync();
     }
 
-    private async Task<(SetupWindow? Window, bool CreatedNew)> EnsureSetupWindowAsync()
+    private async Task<(SetupWindow? Window, bool CreatedNew)> EnsureSetupWindowAsync(bool startAtGatewayInstalledMilestone = false)
     {
         if (_settings == null)
             return (null, false);
 
-        if (_setupWindow != null)
+        while (_setupWindow != null)
         {
             var existingSetupWindow = _setupWindow;
             await existingSetupWindow.WaitForInitialContentReadyAsync();
-            if (ReferenceEquals(_setupWindow, existingSetupWindow) && !existingSetupWindow.IsClosed)
-                existingSetupWindow.BringToFrontForSetupLaunch();
-            return (existingSetupWindow, false);
+            if (!existingSetupWindow.IsClosed)
+            {
+                if (ReferenceEquals(_setupWindow, existingSetupWindow))
+                    existingSetupWindow.BringToFrontForSetupLaunch();
+                return (existingSetupWindow, false);
+            }
+
+            await existingSetupWindow.CleanupCompleted;
+            if (ReferenceEquals(_setupWindow, existingSetupWindow))
+                _setupWindow = null;
         }
 
         try
         {
-            var setupWindow = new SetupWindow();
+            var setupWindow = new SetupWindow(
+                startAtGatewayInstalledMilestone: startAtGatewayInstalledMilestone,
+                dataDir: AppIdentity.ResolveRoamingDataDirectory(),
+                localDataDir: AppIdentity.ResolveSetupLocalDataDirectory(),
+                distroNameOverride: AppIdentity.SetupDistroName,
+                gatewayPortOverride: AppIdentity.SetupGatewayPort);
+            setupWindow.Title = AppIdentity.DecorateWindowTitle("OpenClaw Setup");
             _setupWindow = setupWindow;
             setupWindow.AdvancedSetupRequested += OnSetupAdvancedSetupRequested;
             setupWindow.SetupCompleted += OnSetupCompleted;
-            setupWindow.Closed += (_, _) =>
+            setupWindow.Closed += async (_, _) =>
             {
+                await setupWindow.CleanupCompleted;
                 if (ReferenceEquals(_setupWindow, setupWindow))
                     _setupWindow = null;
             };
@@ -3141,27 +3762,20 @@ private async Task ShowOnboardingAsync()
 
     private async Task ShowGatewayWizardAsync()
     {
-        var (setupWindow, createdNew) = await EnsureSetupWindowAsync();
+        var (setupWindow, createdNew) = await EnsureSetupWindowAsync(startAtGatewayInstalledMilestone: true);
         if (setupWindow == null)
             return;
 
-        // Only steer a freshly created setup window to the gateway wizard. An
-        // already-open setup window may be mid-install on ProgressPage, whose
-        // Unloaded handler cancels the running setup pipeline — navigating it
-        // away would abort an in-progress install. In that case leave the
-        // existing window on its current page (already brought to the front).
         if (!createdNew)
         {
-            Logger.Info("Setup window already open; skipping direct gateway wizard navigation to avoid interrupting active setup");
+            if (setupWindow.TryNavigateToGatewayInstalledMilestone())
+                Logger.Info("Setup window already open; switched to direct OpenClaw onboard handoff");
+            else
+                Logger.Info("Setup window already open; leaving current setup page visible to avoid interrupting active setup");
             return;
         }
 
         await setupWindow.WaitForInitialContentReadyAsync();
-        if (ReferenceEquals(_setupWindow, setupWindow) && !setupWindow.IsClosed)
-        {
-            if (!setupWindow.TryNavigateToWizard())
-                Logger.Warn("Setup window is not ready for direct gateway wizard navigation; leaving current setup page visible");
-        }
     }
 
     private void OnSetupAdvancedSetupRequested(object? sender, EventArgs e)
@@ -3322,7 +3936,13 @@ private bool TryResolveChatCredentials(
     private void OpenDashboard(string? path = null)
     {
         if (_settings == null) return;
-        if (!EnsureSshTunnelConfigured()) return;
+        if (!EnsureSshTunnelConfigured())
+        {
+            _toastService?.ShowToast(new ToastContentBuilder()
+                .AddText("SSH tunnel")
+                .AddText(_sshTunnelService?.LastError ?? "Check SSH tunnel settings and logs."));
+            return;
+        }
 
         if (!TryResolveChatCredentials(out var gatewayUrl, out var token, out var credentialSource, out var isBootstrapToken))
         {
@@ -3500,7 +4120,7 @@ private void OnVoiceHotkeyPressed(object? sender, EventArgs e)
 
     private void OnSettingsHotkeyPressed(object? sender, EventArgs e)
     {
-        OnUiThread(() => ShowHub("companion"));
+        OnUiThread(ShowSettings);
     }
 
     #endregion
@@ -3623,7 +4243,7 @@ private void StartDeepLinkServer()
 
     private async Task HandleDeepLinkAsync(string uri)
     {
-        var result = DeepLinkParser.ParseDeepLink(uri);
+        var result = DeepLinkParser.ParseDeepLink(uri, AppIdentity.ProtocolScheme);
         if (result == null)
         {
             Logger.Warn($"Rejected invalid deep link: {DeepLinkSecurityPolicy.RedactForLog(uri)}");
@@ -3724,7 +4344,7 @@ private static void SendDeepLinkToRunningInstance(string uri)
                 return;
             }
 
-            if (DeepLinkParser.ParseDeepLink(uri) == null)
+            if (DeepLinkParser.ParseDeepLink(uri, AppIdentity.ProtocolScheme) == null)
             {
                 Logger.Warn($"Rejected invalid deep link before IPC forwarding: {DeepLinkSecurityPolicy.RedactForLog(uri)}");
                 return;
@@ -3782,6 +4402,14 @@ private async Task ExitApplicationAsync()
             _globalHotkey = null;
         });
 
+        // Stop chat first so provider event handlers cannot drain client-only
+        // queued prompts while the gateway connection is shutting down.
+        SafeShutdownStep("chat coordinator", () =>
+        {
+            _chatCoordinator?.Dispose();
+            _chatCoordinator = null;
+        });
+
         // Dispose runtime services
         var connectionManager = _connectionManager;
         if (connectionManager != null)
@@ -3793,12 +4421,6 @@ await SafeShutdownStepAsync("gateway client", async () =>
             _connectionManager = null;
         }
 
-        SafeShutdownStep("chat coordinator", () =>
-        {
-            _chatCoordinator?.Dispose();
-            _chatCoordinator = null;
-        });
-
         var nodeService = _nodeService;
         if (nodeService != null)
         {
@@ -3825,6 +4447,14 @@ await SafeShutdownStepAsync("standalone voice service", async () =>
             _sshTunnelService = null;
         });
 
+        SafeShutdownStep("pairing approval", () =>
+        {
+            _pairingApprovalPollTimer?.Stop();
+            _pairingApprovalPollTimer = null;
+            _pairingApprovalDialog?.Close();
+            _pairingApprovalDialog = null;
+        });
+
         // Close windows explicitly for deterministic shutdown tracing.
         SafeShutdownStep("chat window", () => { _chatWindow?.ForceClose(); _chatWindow = null; });
         SafeShutdownStep("setup window", () => { _setupWindow?.Close(); _setupWindow = null; });
@@ -3838,6 +4468,7 @@ await SafeShutdownStepAsync("standalone voice service", async () =>
         {
             _trayIcon?.Dispose();
             _trayIcon = null;
+            _trayIconCoordinator = null;
         });
 
         SafeShutdownStep("single-instance mutex", () =>
@@ -3913,7 +4544,6 @@ _settings.SshTunnelRemotePort is < 1 or > 65535 ||
                 _settings.SshTunnelLocalPort is < 1 or > 65535)
             {
                 Logger.Warn("SSH tunnel is enabled but settings are incomplete");
-                _appState!.Status = ConnectionStatus.Error;
                 UpdateTrayIcon();
                 return false;
             }
@@ -3943,7 +4573,6 @@ _settings.SshTunnelRemotePort is < 1 or > 65535 ||
             catch (Exception ex)
             {
                 Logger.Error($"Failed to start SSH tunnel: {ex.Message}");
-                _appState!.Status = ConnectionStatus.Error;
                 UpdateTrayIcon();
                 return false;
             }
diff --git a/src/OpenClaw.Tray.WinUI/AppIdentity.cs b/src/OpenClaw.Tray.WinUI/AppIdentity.cs
new file mode 100644
index 000000000..b698cfa7f
--- /dev/null
+++ b/src/OpenClaw.Tray.WinUI/AppIdentity.cs
@@ -0,0 +1,116 @@
+namespace OpenClawTray;
+
+/// <summary>
+/// Compile-time app identity constants that vary between Dev and Release builds,
+/// enabling side-by-side installation of both variants (similar to WinUI Gallery).
+/// </summary>
+internal static class AppIdentity
+{
+#if DEV_BUILD
+    /// <summary>Human-visible app name shown in tray tooltips, window titles, and notifications.</summary>
+    public const string DisplayName = "OpenClaw Companion (Dev)";
+
+    /// <summary>Short name used in tray tooltip prefix.</summary>
+    public const string TrayName = "OpenClaw Tray (Dev)";
+
+    /// <summary>MSIX package identity name (must differ from release for side-by-side).</summary>
+    public const string PackageIdentityName = "OpenClaw.Companion.Dev";
+
+    /// <summary>Windows Registry auto-start value name (must differ so both can auto-start).</summary>
+    public const string AutoStartRegistryName = "OpenClawTray-Dev";
+
+    /// <summary>Windows scheduled task name (must differ so both can auto-start).</summary>
+    public const string StartupTaskName = "OpenClaw Companion (Dev)";
+
+    /// <summary>Leaf directory for local and roaming app-owned data.</summary>
+    public const string DataDirectoryName = "OpenClawTray-Dev";
+
+    /// <summary>Single-instance mutex base name.</summary>
+    public const string MutexBaseName = "OpenClawTray-Dev";
+
+    /// <summary>Protocol scheme for deep links.</summary>
+    public const string ProtocolScheme = "openclaw-dev";
+
+    /// <summary>App-owned WSL distro used by embedded setup.</summary>
+    public const string SetupDistroName = "OpenClawGateway-Dev";
+
+    /// <summary>Loopback gateway port used by embedded setup.</summary>
+    public const int SetupGatewayPort = 18790;
+
+    /// <summary>Default gateway URL for this app variant.</summary>
+    public const string SetupGatewayUrl = "ws://localhost:18790";
+
+    /// <summary>Whether this is a development build.</summary>
+    public static bool IsDev => true;
+#else
+    /// <summary>Human-visible app name shown in tray tooltips, window titles, and notifications.</summary>
+    public const string DisplayName = "OpenClaw Companion";
+
+    /// <summary>Short name used in tray tooltip prefix.</summary>
+    public const string TrayName = "OpenClaw Tray";
+
+    /// <summary>MSIX package identity name.</summary>
+    public const string PackageIdentityName = "OpenClaw.Companion";
+
+    /// <summary>Windows Registry auto-start value name.</summary>
+    public const string AutoStartRegistryName = "OpenClawTray";
+
+    /// <summary>Windows scheduled task name.</summary>
+    public const string StartupTaskName = "OpenClaw Companion";
+
+    /// <summary>Leaf directory for local and roaming app-owned data.</summary>
+    public const string DataDirectoryName = "OpenClawTray";
+
+    /// <summary>Single-instance mutex base name.</summary>
+    public const string MutexBaseName = "OpenClawTray";
+
+    /// <summary>Protocol scheme for deep links.</summary>
+    public const string ProtocolScheme = "openclaw";
+
+    /// <summary>App-owned WSL distro used by embedded setup.</summary>
+    public const string SetupDistroName = "OpenClawGateway";
+
+    /// <summary>Loopback gateway port used by embedded setup.</summary>
+    public const int SetupGatewayPort = 18789;
+
+    /// <summary>Default gateway URL for this app variant.</summary>
+    public const string SetupGatewayUrl = "ws://localhost:18789";
+
+    /// <summary>Whether this is a development build.</summary>
+    public static bool IsDev => false;
+#endif
+
+    public static string ResolveLocalDataDirectory()
+        => Environment.GetEnvironmentVariable("OPENCLAW_TRAY_DATA_DIR") is { Length: > 0 } overrideDir
+            ? overrideDir
+            : Path.Combine(
+                Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
+                DataDirectoryName);
+
+    /// <summary>
+    /// Resolves setup-owned local state while preserving SetupEngine's dedicated
+    /// local-data override contract.
+    /// </summary>
+    public static string ResolveSetupLocalDataDirectory()
+    {
+        if (Environment.GetEnvironmentVariable("OPENCLAW_TRAY_LOCALAPPDATA_DIR") is { Length: > 0 } localAppDataRoot)
+            return Path.Combine(localAppDataRoot, DataDirectoryName);
+
+        if (Environment.GetEnvironmentVariable("OPENCLAW_TRAY_LOCAL_DATA_DIR") is { Length: > 0 } localDataDir)
+            return localDataDir;
+
+        return Path.Combine(
+            Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
+            DataDirectoryName);
+    }
+
+    public static string ResolveRoamingDataDirectory()
+        => Environment.GetEnvironmentVariable("OPENCLAW_TRAY_DATA_DIR") is { Length: > 0 } overrideDir
+            ? overrideDir
+            : Path.Combine(
+                Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
+                DataDirectoryName);
+
+    public static string DecorateWindowTitle(string title)
+        => IsDev ? $"{title} (Dev)" : title;
+}
diff --git a/src/OpenClaw.Tray.WinUI/AppLogger.cs b/src/OpenClaw.Tray.WinUI/AppLogger.cs
index c8006a385..a8cb154bd 100644
--- a/src/OpenClaw.Tray.WinUI/AppLogger.cs
+++ b/src/OpenClaw.Tray.WinUI/AppLogger.cs
@@ -9,6 +9,6 @@ internal sealed class AppLogger : IOpenClawLogger
     public void Debug(string message) => Logger.Debug(message);
     public void Warn(string message) => Logger.Warn(message);
     public void Error(string message, Exception? ex = null) =>
-        Logger.Error(ex != null ? $"{message}: {ex.Message}" : message);
+        Logger.Error(ex != null ? $"{message}: {ex}" : message);
     public void Trace(string message) => Logger.Trace(message);
 }
diff --git a/src/OpenClaw.Tray.WinUI/Assets/LockScreenLogo.png b/src/OpenClaw.Tray.WinUI/Assets/LockScreenLogo.png
index 07bfcfabf..38bfc9ef6 100644
Binary files a/src/OpenClaw.Tray.WinUI/Assets/LockScreenLogo.png and b/src/OpenClaw.Tray.WinUI/Assets/LockScreenLogo.png differ
diff --git a/src/OpenClaw.Tray.WinUI/Assets/Setup/Lobster.png b/src/OpenClaw.Tray.WinUI/Assets/Setup/Lobster.png
deleted file mode 100644
index 2b9a2dafb..000000000
Binary files a/src/OpenClaw.Tray.WinUI/Assets/Setup/Lobster.png and /dev/null differ
diff --git a/src/OpenClaw.Tray.WinUI/Assets/Setup/OpenClawMascot.png b/src/OpenClaw.Tray.WinUI/Assets/Setup/OpenClawMascot.png
new file mode 100644
index 000000000..0baa169f0
Binary files /dev/null and b/src/OpenClaw.Tray.WinUI/Assets/Setup/OpenClawMascot.png differ
diff --git a/src/OpenClaw.Tray.WinUI/Assets/SplashScreen.png b/src/OpenClaw.Tray.WinUI/Assets/SplashScreen.png
index 0737627d2..e15d1e532 100644
Binary files a/src/OpenClaw.Tray.WinUI/Assets/SplashScreen.png and b/src/OpenClaw.Tray.WinUI/Assets/SplashScreen.png differ
diff --git a/src/OpenClaw.Tray.WinUI/Assets/Square150x150Logo.png b/src/OpenClaw.Tray.WinUI/Assets/Square150x150Logo.png
index a2e043217..2b00b9ebe 100644
Binary files a/src/OpenClaw.Tray.WinUI/Assets/Square150x150Logo.png and b/src/OpenClaw.Tray.WinUI/Assets/Square150x150Logo.png differ
diff --git a/src/OpenClaw.Tray.WinUI/Assets/Square44x44Logo.png b/src/OpenClaw.Tray.WinUI/Assets/Square44x44Logo.png
index e467c2dbc..96e1518e9 100644
Binary files a/src/OpenClaw.Tray.WinUI/Assets/Square44x44Logo.png and b/src/OpenClaw.Tray.WinUI/Assets/Square44x44Logo.png differ
diff --git a/src/OpenClaw.Tray.WinUI/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/src/OpenClaw.Tray.WinUI/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
index 07bfcfabf..fe849f7af 100644
Binary files a/src/OpenClaw.Tray.WinUI/Assets/Square44x44Logo.targetsize-24_altform-unplated.png and b/src/OpenClaw.Tray.WinUI/Assets/Square44x44Logo.targetsize-24_altform-unplated.png differ
diff --git a/src/OpenClaw.Tray.WinUI/Assets/Square44x44Logo.targetsize-256_altform-unplated.png b/src/OpenClaw.Tray.WinUI/Assets/Square44x44Logo.targetsize-256_altform-unplated.png
index 319469b78..caac31759 100644
Binary files a/src/OpenClaw.Tray.WinUI/Assets/Square44x44Logo.targetsize-256_altform-unplated.png and b/src/OpenClaw.Tray.WinUI/Assets/Square44x44Logo.targetsize-256_altform-unplated.png differ
diff --git a/src/OpenClaw.Tray.WinUI/Assets/Square44x44Logo.targetsize-32_altform-unplated.png b/src/OpenClaw.Tray.WinUI/Assets/Square44x44Logo.targetsize-32_altform-unplated.png
index f0e4ae8a1..e112742b9 100644
Binary files a/src/OpenClaw.Tray.WinUI/Assets/Square44x44Logo.targetsize-32_altform-unplated.png and b/src/OpenClaw.Tray.WinUI/Assets/Square44x44Logo.targetsize-32_altform-unplated.png differ
diff --git a/src/OpenClaw.Tray.WinUI/Assets/Square44x44Logo.targetsize-48_altform-unplated.png b/src/OpenClaw.Tray.WinUI/Assets/Square44x44Logo.targetsize-48_altform-unplated.png
index c492bc25d..c0155168b 100644
Binary files a/src/OpenClaw.Tray.WinUI/Assets/Square44x44Logo.targetsize-48_altform-unplated.png and b/src/OpenClaw.Tray.WinUI/Assets/Square44x44Logo.targetsize-48_altform-unplated.png differ
diff --git a/src/OpenClaw.Tray.WinUI/Assets/StoreLogo.png b/src/OpenClaw.Tray.WinUI/Assets/StoreLogo.png
index 13556a3b8..d8400bef0 100644
Binary files a/src/OpenClaw.Tray.WinUI/Assets/StoreLogo.png and b/src/OpenClaw.Tray.WinUI/Assets/StoreLogo.png differ
diff --git a/src/OpenClaw.Tray.WinUI/Assets/Wide310x150Logo.png b/src/OpenClaw.Tray.WinUI/Assets/Wide310x150Logo.png
index 0217ab425..92d81377f 100644
Binary files a/src/OpenClaw.Tray.WinUI/Assets/Wide310x150Logo.png and b/src/OpenClaw.Tray.WinUI/Assets/Wide310x150Logo.png differ
diff --git a/src/OpenClaw.Tray.WinUI/Assets/openclaw.ico b/src/OpenClaw.Tray.WinUI/Assets/openclaw.ico
index 30dc915b2..19f51459c 100644
Binary files a/src/OpenClaw.Tray.WinUI/Assets/openclaw.ico and b/src/OpenClaw.Tray.WinUI/Assets/openclaw.ico differ
diff --git a/src/OpenClaw.Tray.WinUI/Chat/ChatComposer.cs b/src/OpenClaw.Tray.WinUI/Chat/ChatComposer.cs
new file mode 100644
index 000000000..a9e080ea4
--- /dev/null
+++ b/src/OpenClaw.Tray.WinUI/Chat/ChatComposer.cs
@@ -0,0 +1,2013 @@
+using OpenClaw.Chat;
+using OpenClaw.Shared;
+using OpenClawTray.Helpers;
+using Microsoft.UI;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Media;
+using OpenClawTray.FunctionalUI;
+using OpenClawTray.FunctionalUI.Core;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Threading.Tasks;
+using Windows.UI;
+using static OpenClawTray.FunctionalUI.Factories;
+using static OpenClawTray.FunctionalUI.Core.Theme;
+
+namespace OpenClawTray.Chat;
+
+/// <summary>
+/// Three-row composer surface that mirrors Kenny Hong's <c>ChatShell</c> XAML
+/// design (kenehong/native-chat-v2):
+///
+/// <list type="number">
+///   <item><description>Row 1 — three compact <see cref="Microsoft.UI.Xaml.Controls.ComboBox"/>es:
+///     <c>Channel</c> (agent identity), <c>Model</c>, and <c>Reasoning</c> mode.</description></item>
+///   <item><description>Row 2 — multi-line message <see cref="Microsoft.UI.Xaml.Controls.TextBox"/>
+///     with <c>Message Assistant (Enter to send)</c> placeholder.</description></item>
+///   <item><description>Row 3 — four right-aligned action buttons (transparent attach / mic / more,
+///     plus a filled accent <c>Send</c> button).</description></item>
+/// </list>
+///
+/// Replaces the original <c>InputBar</c> + <c>StatusBar</c> pair from the
+/// previous native chat prototype so our chat surface no longer carries two
+/// separate footer rows. The status, working indicator, and permission
+/// banner that <c>InputBar</c> used to render are preserved here above the
+/// composer.
+/// </summary>
+public record ChannelGroup(string AgentLabel, (string Id, string Title)[] Sessions);
+
+public record ChatComposerProps(
+    string ConnectionState,
+    bool TurnActive,
+    string ChannelLabel,
+    string? ChannelId,
+    ChannelGroup[] AvailableChannels,
+    string[] AvailableModels,
+    string? CurrentModel,
+    string? CurrentModelProvider,
+    string? CurrentThinkingLevel,
+    bool MessageOptionsDisabled,
+    Action<string, IReadOnlyList<ChatAttachment>> OnSend,
+    Action OnStop,
+    Action<string> OnChannelChanged,
+    Action<string> OnModelChanged,
+    Action<string> OnThinkingLevelChanged,
+    Action<bool> OnPermissionsChanged,
+    Func<CancellationToken, Action?, Task<string?>>? OnVoiceRequest = null,
+    Action? OnAttachClick = null,
+    IReadOnlyList<ChatAttachment>? PendingAttachments = null,
+    IReadOnlyList<ChatQueuedMessage>? QueuedMessages = null,
+    Action<string>? OnQueuedMessageCancel = null,
+    Action<ChatAttachment>? OnAttachmentRemoved = null,
+    bool IsSpeakerMuted = false,
+    Action? OnSpeakerToggle = null,
+    Action? OnSettingsClick = null,
+    string? VoiceTranscript = null,
+    float VoiceAudioLevel = 0f,
+    Action<Action>? RegisterVoiceStarter = null,
+    Action<ChatAttachment>? OnAttachmentPasted = null,
+    bool ShowToolCalls = true,
+    Action<bool>? OnShowToolCallsChanged = null,
+    bool IsCompact = false,
+    IReadOnlyList<ChatModelChoice>? ModelChoices = null,
+    Action? OnModelCleared = null,
+    IReadOnlyList<GatewayCommand>? AvailableCommands = null,
+    bool CommandsSupported = true,
+    Action? OnCommandsRequested = null,
+    double? AvailableHeight = null);
+
+public sealed class ChatComposer : Component<ChatComposerProps>
+{
+    private const double CompactQueuedMessagesMaxHeight = 144;
+    private const double ExpandedQueuedMessagesFallbackMaxHeight = 220;
+    private const double ExpandedQueuedMessagesMinHeight = 144;
+    private const double ExpandedQueuedMessagesMaxHeight = 280;
+    private const double ExpandedQueuedMessagesHeightRatio = 0.28;
+
+    // Distinct reference-equality sentinel used as the ComboBoxItem.Tag for the
+    // "Default" (clear model override) row, so it can never collide with a real
+    // model id string. Selecting it routes to OnModelCleared (tri-state clear)
+    // rather than OnModelChanged.
+    private static readonly object ClearModelTag = new();
+
+    // Thinking levels matching the gateway's sessions.patch thinkingLevel values.
+    // "medium" is the default when the session has no explicit thinkingLevel set.
+    private static readonly string[] ThinkingLevelIds    = { "off", "minimal", "low", "medium", "high" };
+    private static readonly string[] ThinkingLevelLabels = { "off", "minimal", "low", "medium (default)", "high" };
+
+    public override Element Render()
+    {
+        // UseRef for input text — avoids full-tree re-render on every keypress.
+        // A separate hasTextState tracks the empty↔non-empty transition so the
+        // send button accent styling updates correctly (at most 2 re-renders
+        // per compose cycle instead of one per keypress).
+        var inputRef = UseRef("");
+        var hasTextState = UseState(false, threadSafe: true);
+        // Slash-command menu state. Active when the composer holds a "/token"
+        // (a leading slash with no whitespace yet); Query is the text after the
+        // slash; Index is the highlighted row. ArgsMode flips the same popup into
+        // the argument-choice picker after a command with fixed choices is chosen
+        // (mirrors Mac's slashMenuMode "command" | "args"). Drives the inline
+        // command menu that mirrors the gateway/web "type / to open" UX.
+        var slashMenuState = UseState<(bool Active, string Query, int Index, bool ArgsMode)>((false, "", 0, false), threadSafe: true);
+
+        var composerCornerRadius = new CornerRadius(8);
+        const double composerIconSize = 16;
+        const double sendButtonSize = 40;
+
+        // Version bump triggers a re-render on send so the cleared ref value
+        // is pushed to the TextBox control.
+        var sendVersion = UseState(0, threadSafe: true);
+
+        // Track whether the mic is actively recording for visual indicator.
+        var isRecording = UseState(false, threadSafe: true);
+        var voiceCtsRef = UseRef<CancellationTokenSource?>(null);
+        // When true, a stop (not cancel) was requested — keep the transcript.
+        var voiceStoppedRef = UseRef(false);
+        // TextBox reference for focusing after recording completes
+        var textBoxRef = UseRef<TextBox?>(null);
+        // Slash-menu popup overlay (floats above the composer; does not push the
+        // input controls). Created once on first render, driven each render.
+        var slashPopupRef = UseRef<Microsoft.UI.Xaml.Controls.Primitives.Popup?>(null);
+        // Tear the popup down when the composer unmounts so it isn't left rooted
+        // to the XamlRoot (which would keep its row-button closures alive).
+        UseEffect((Func<Action>)(() => () =>
+        {
+            var p = slashPopupRef.Current;
+            if (p is not null)
+            {
+                p.IsOpen = false;
+                p.Child = null;
+                p.PlacementTarget = null;
+                slashPopupRef.Current = null;
+            }
+        }));
+        // One-time hook flag for the TextBox Paste event so we don't re-attach
+        // the handler on every re-render (Set() runs each render).
+        var pasteHookedRef = UseRef(false);
+        // Cache BitmapImages built for current attachments so we rebuild them
+        // only when an attachment is added or removed (not on every render).
+        var attachmentImagesRef = UseRef<Dictionary<ChatAttachment, Microsoft.UI.Xaml.Media.Imaging.BitmapImage?>>(new());
+        var pendingAttachments = Props.PendingAttachments ?? Array.Empty<ChatAttachment>();
+        var queuedMessages = Props.QueuedMessages ?? Array.Empty<ChatQueuedMessage>();
+        var imageCache = attachmentImagesRef.Current;
+        foreach (var cachedAttachment in imageCache.Keys.ToArray())
+        {
+            if (!pendingAttachments.Contains(cachedAttachment))
+                imageCache.Remove(cachedAttachment);
+        }
+
+        // Extracted voice-start action so it can be triggered programmatically (e.g. hotkey)
+        Action startVoiceRecording = () =>
+        {
+            if (Props.OnVoiceRequest is null || isRecording.Value) return;
+            var cts = new CancellationTokenSource();
+            voiceCtsRef.Current = cts;
+            voiceStoppedRef.Current = false;
+            // Don't set isRecording yet — the request may show a dialog
+            // (e.g. STT model not installed) and return null immediately.
+            _ = Task.Run(async () =>
+            {
+                try
+                {
+                    var text = await Props.OnVoiceRequest(cts.Token, () => isRecording.Set(true));
+                    // Keep transcript if we got text (either natural completion
+                    // or user pressed stop). Discard only on explicit cancel.
+                    if (!string.IsNullOrEmpty(text)
+                        && (voiceStoppedRef.Current || !cts.IsCancellationRequested))
+                    {
+                        // Append to existing text (supports multiple recording passes)
+                        var existing = inputRef.Current?.TrimEnd();
+                        inputRef.Current = string.IsNullOrEmpty(existing)
+                            ? text
+                            : existing + " " + text;
+                        hasTextState.Set(true);
+                        sendVersion.Set(sendVersion.Value + 1);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    // Voice recording cancelled mid-transcription or pipeline
+                    // unavailable. The UI already reflects the cancel; surface
+                    // the cause at Debug for diagnostics.
+                    OpenClawTray.Services.Logger.Debug($"ChatComposer: voice transcription failed/cancelled: {ex.Message}");
+                }
+                finally
+                {
+                    voiceCtsRef.Current = null;
+                    voiceStoppedRef.Current = false;
+                    cts.Dispose();
+                    isRecording.Set(false);
+                    // Move focus to the textbox so Enter sends the transcribed text
+                    var tb = textBoxRef.Current;
+                    if (tb != null)
+                    {
+                        tb.DispatcherQueue?.TryEnqueue(() =>
+                        {
+                            tb.Focus(FocusState.Programmatic);
+                            // Place cursor at end of transcribed text
+                            tb.SelectionStart = tb.Text?.Length ?? 0;
+                            tb.SelectionLength = 0;
+                        });
+                    }
+                }
+            });
+        };
+
+        // Register the voice starter so external callers (e.g. hotkey) can trigger recording
+        Props.RegisterVoiceStarter?.Invoke(startVoiceRecording);
+
+        var sendAction = () =>
+        {
+            var msg = inputRef.Current?.Trim();
+            if (string.IsNullOrEmpty(msg) && pendingAttachments.Count == 0) return;
+            Props.OnSend(msg ?? "", pendingAttachments.ToArray());
+            inputRef.Current = "";
+            hasTextState.Set(false);
+            // Clear any open slash menu so it doesn't re-open over the now-empty
+            // composer (programmatic text reset doesn't fire TextChanged).
+            slashMenuState.Set((false, "", 0, false));
+            sendVersion.Set(sendVersion.Value + 1);
+        };
+        var sendActionRef = UseRef<Action>(sendAction);
+        sendActionRef.Current = sendAction;
+        var isConnected = Props.ConnectionState == "connected";
+        var messageOptionControlsEnabled = !Props.MessageOptionsDisabled;
+        var placeholder = Props.ConnectionState switch
+        {
+            "connected" => LocalizationHelper.GetString("Chat_Composer_Placeholder_Connected"),
+            "connecting" => LocalizationHelper.GetString("Chat_Composer_Placeholder_Connecting"),
+            "incompatible-gateway" => LocalizationHelper.GetString("Chat_Composer_Placeholder_IncompatibleGateway"),
+            _ => LocalizationHelper.GetString("Chat_Composer_Placeholder_NotConnected")
+        };
+
+        // ── Row 1: three compact dropdowns ─────────────────────────────
+        // Build grouped session ComboBox directly (bypassing the FunctionalUI
+        // ComboBox helper which only supports flat string[] items).
+        var groups = Props.AvailableChannels;
+        var channelCombo = Border()
+            .Set(border =>
+            {
+                var cb = new ComboBox
+                {
+                    MinWidth = 0,
+                    Width = double.NaN,
+                    Height = 28,
+                    FontSize = 11,
+                    Padding = new Thickness(8, 0, 4, 0),
+                    CornerRadius = composerCornerRadius,
+                    HorizontalAlignment = HorizontalAlignment.Stretch,
+                    VerticalAlignment = VerticalAlignment.Center,
+                };
+                Microsoft.UI.Xaml.Automation.AutomationProperties.SetName(
+                    cb,
+                    LocalizationHelper.GetString("Chat_Composer_Accessibility_Session"));
+
+                ComboBoxItem? selectedItem = null;
+                foreach (var group in groups)
+                {
+                    if (groups.Length > 1)
+                    {
+                        cb.Items.Add(new ComboBoxItem
+                        {
+                            Content = group.AgentLabel,
+                            IsEnabled = false,
+                            FontWeight = Microsoft.UI.Text.FontWeights.SemiBold,
+                            FontSize = 10,
+                            Padding = new Thickness(4, 2, 4, 2),
+                            IsHitTestVisible = false,
+                        });
+                    }
+                    foreach (var session in group.Sessions)
+                    {
+                        var item = new ComboBoxItem
+                        {
+                            Content = session.Title,
+                            Tag = session.Id,
+                            Padding = groups.Length > 1
+                                ? new Thickness(16, 4, 4, 4)
+                                : new Thickness(8, 4, 4, 4),
+                        };
+                        cb.Items.Add(item);
+                        if (session.Id == (Props.ChannelId ?? ""))
+                            selectedItem = item;
+                    }
+                }
+
+                if (selectedItem != null)
+                    cb.SelectedItem = selectedItem;
+
+                var onChanged = Props.OnChannelChanged;
+                cb.SelectionChanged += (_, _) =>
+                {
+                    if (cb.SelectedItem is ComboBoxItem { Tag: string id })
+                        onChanged(id);
+                };
+
+                border.Child = cb;
+            });
+
+        // ── Model picker (provider-rich) ─────────────────────────────────
+        IReadOnlyList<ChatModelChoice> modelChoices = Props.ModelChoices is { Count: > 0 } mc
+            ? mc
+            : (Props.AvailableModels is { Length: > 0 } am
+                ? am.Select(id => new ChatModelChoice(id, id)).ToList()
+                : Array.Empty<ChatModelChoice>());
+
+        var currentModelId = Props.CurrentModel;
+        var currentSelectionId = ChatModelChoice.ResolveSelectionId(currentModelId, Props.CurrentModelProvider, modelChoices);
+        var trackingDefault = ChatModelLabels.IsTrackingDefault(currentModelId);
+        ChatModelChoice? currentChoice = null;
+        ChatModelChoice? defaultChoice = null;
+        foreach (var c in modelChoices)
+        {
+            if (defaultChoice is null && c.IsDefault) defaultChoice = c;
+            if (currentChoice is null && !trackingDefault
+                && string.Equals(c.SelectionId, currentSelectionId, StringComparison.Ordinal))
+                currentChoice = c;
+        }
+
+        // Keep stale/custom current models visible even if models.list omits them.
+        var effectiveChoices = modelChoices;
+        if (!trackingDefault && currentChoice is null && !string.IsNullOrWhiteSpace(currentModelId))
+        {
+            var synthetic = new ChatModelChoice(currentModelId!, currentModelId!, Provider: Props.CurrentModelProvider);
+            currentChoice = synthetic;
+            var augmented = new List<ChatModelChoice>(modelChoices.Count + 1);
+            augmented.AddRange(modelChoices);
+            augmented.Add(synthetic);
+            effectiveChoices = augmented;
+            currentSelectionId = synthetic.SelectionId;
+        }
+
+        var modelEntries = new List<(string Label, object Tag, bool Selectable, bool IsCurrent)>();
+        if (effectiveChoices.Count > 0)
+            modelEntries.Add((ChatModelLabels.BuildDefaultEntryLabel(defaultChoice), ClearModelTag, true, trackingDefault));
+        foreach (var c in effectiveChoices)
+        {
+            var isCur = !trackingDefault && string.Equals(c.SelectionId, currentSelectionId, StringComparison.Ordinal);
+            modelEntries.Add((ChatModelLabels.BuildMenuLabel(c), c.SelectionId, c.IsSelectable, isCur));
+        }
+        if (modelEntries.Count == 0)
+        {
+            modelEntries.Add((Props.CurrentModel ?? "model", Props.CurrentModel ?? "", false, true));
+        }
+
+        var modelSelectedIndex = modelEntries.FindIndex(e => e.IsCurrent);
+
+        // Build directly so unavailable rows can be displayed but not selected.
+        var modelCombo = Border()
+            .Set(border =>
+            {
+                var cb = new ComboBox
+                {
+                    MinWidth = 0,
+                    Width = double.NaN,
+                    Height = 28,
+                    FontSize = 11,
+                    Padding = new Thickness(8, 0, 4, 0),
+                    CornerRadius = composerCornerRadius,
+                    HorizontalAlignment = HorizontalAlignment.Stretch,
+                    VerticalAlignment = VerticalAlignment.Center,
+                    IsEnabled = messageOptionControlsEnabled,
+                };
+                Microsoft.UI.Xaml.Automation.AutomationProperties.SetName(
+                    cb,
+                    LocalizationHelper.GetString("Chat_Composer_Accessibility_Model"));
+
+                ComboBoxItem? selectedItem = null;
+                for (int i = 0; i < modelEntries.Count; i++)
+                {
+                    var entry = modelEntries[i];
+                    var item = new ComboBoxItem
+                    {
+                        Content = entry.Label,
+                        Tag = entry.Tag,
+                        IsEnabled = entry.Selectable,
+                        Padding = new Thickness(8, 4, 4, 4),
+                    };
+                    cb.Items.Add(item);
+                    if (i == modelSelectedIndex) selectedItem = item;
+                }
+
+                if (selectedItem != null)
+                    cb.SelectedItem = selectedItem;
+
+                var onModelChanged = Props.OnModelChanged;
+                var onModelCleared = Props.OnModelCleared;
+                cb.SelectionChanged += (_, _) =>
+                {
+                    if (cb.SelectedItem is not ComboBoxItem { IsEnabled: true } sel) return;
+                    if (ReferenceEquals(sel.Tag, ClearModelTag))
+                        onModelCleared?.Invoke();
+                    else if (sel.Tag is string id && !string.IsNullOrEmpty(id))
+                        onModelChanged(id);
+                };
+
+                border.Child = cb;
+            })
+            .VAlign(VerticalAlignment.Center);
+
+        var thinkingLevel = Props.CurrentThinkingLevel ?? "medium";
+        var thinkingIndex = Array.IndexOf(ThinkingLevelIds, thinkingLevel);
+        if (thinkingIndex < 0) thinkingIndex = 3; // default to "medium (default)"
+
+        var reasoningCombo = ComboBox(ThinkingLevelLabels, thinkingIndex, idx =>
+        {
+            if (idx >= 0 && idx < ThinkingLevelIds.Length)
+                Props.OnThinkingLevelChanged(ThinkingLevelIds[idx]);
+        })
+            .Set(cb =>
+            {
+                Microsoft.UI.Xaml.Automation.AutomationProperties.SetName(
+                    cb,
+                    LocalizationHelper.GetString("Chat_Composer_Accessibility_Reasoning"));
+                cb.MinWidth = 0;
+                cb.Width = double.NaN;
+                cb.Height = 28;
+                cb.FontSize = 11;
+                cb.Padding = new Thickness(8, 0, 4, 0);
+                cb.CornerRadius = composerCornerRadius;
+                cb.HorizontalAlignment = HorizontalAlignment.Stretch;
+                cb.IsEnabled = messageOptionControlsEnabled;
+            }).VAlign(VerticalAlignment.Center);
+
+        Element dropdownsRow = Grid([GridSize.Star(1.2), GridSize.Star(), GridSize.Star(0.62)], [GridSize.Auto],
+            channelCombo.Margin(0, 0, 6, 0).HAlign(HorizontalAlignment.Stretch).Grid(row: 0, column: 0),
+            modelCombo.Margin(0, 0, 6, 0).HAlign(HorizontalAlignment.Stretch).Grid(row: 0, column: 1),
+            reasoningCombo.HAlign(HorizontalAlignment.Stretch).Grid(row: 0, column: 2)
+        ).HAlign(HorizontalAlignment.Stretch);
+
+        // ── Row 2: multi-line composer textbox ─────────────────────────
+        var recording = isRecording.Value;
+        var recTranscript = recording ? Props.VoiceTranscript : null;
+
+        // When recording, show the streaming transcript in the textbox.
+        // The user can still type to edit after recording stops.
+        var displayText = recording && !string.IsNullOrEmpty(recTranscript)
+            ? recTranscript
+            : inputRef.Current;
+
+        // ── Slash command menu (type "/" to discover gateway commands inline) ──
+        // The composer text box doubles as the menu's search field: when the
+        // input is a bare "/token" the menu opens and filters as the user types,
+        // matching the gateway/web Control UI's primary command surface.
+        var slash = slashMenuState.Value;
+        // The menu only engages on a connected gateway that actually advertises a
+        // command catalog. Gating on CommandsSupported here keeps the whole
+        // feature inert on gateways without commands.list: the popup stays hidden
+        // AND the slash key-handling branches below are skipped, so "/foo" behaves
+        // as ordinary text (Tab/Esc/Enter all keep their normal meaning).
+        var slashActive = isConnected && slash.Active && !recording && Props.CommandsSupported;
+
+        // Lazily fetch the catalog when the menu opens without one. Keyed via
+        // UseEffect on the (open + missing-catalog) transition so the request
+        // fires once on that edge — not as a render side effect, and not on every
+        // keystroke while loading. If a fetch fails and the catalog stays null the
+        // deps don't change, so it won't retry until the menu is reopened.
+        // EnsureCommandCatalogAsync is itself cached + in-flight guarded.
+        var needsCatalog = slashActive && Props.AvailableCommands is null;
+        UseEffect(() =>
+        {
+            if (needsCatalog) Props.OnCommandsRequested?.Invoke();
+        }, needsCatalog);
+
+        IReadOnlyList<GatewayCommand> slashResults = Array.Empty<GatewayCommand>();
+        IReadOnlyList<CommandCategoryGroup> slashGroups = Array.Empty<CommandCategoryGroup>();
+        // Index (within the flattened group order) of the GLOBAL best search match
+        // — the default keyboard selection, so display grouping never demotes a
+        // strong later-bucket match behind a weak earlier-bucket one for Enter/Tab.
+        var slashDefaultIndex = 0;
+        if (slashActive && !slash.ArgsMode && Props.AvailableCommands is { } slashCmds)
+        {
+            // Category-grouped palette (Mac/web parity): commands render under
+            // their Mac display bucket (Session, Model, Tools, Agents). Within a
+            // bucket the relevance order from Search is preserved; Flattened drives
+            // keyboard navigation, and DefaultSelectionIndex pins the global top
+            // match as the default Enter/Tab target.
+            var palette = new ChatCommandCatalogView(slashCmds)
+                .GroupForPalette(CommandCategories.Bucket, slash.Query, CommandCategories.DisplayOrder);
+            slashGroups = palette.Groups;
+            slashResults = palette.Flattened;
+            slashDefaultIndex = palette.DefaultSelectionIndex;
+        }
+
+        // Args-mode: the command (parsed from the composer text) plus its static
+        // choices filtered by what the user has typed after "/name ".
+        GatewayCommand? slashArgCmd = null;
+        IReadOnlyList<GatewayCommandArgChoice> slashArgResults = Array.Empty<GatewayCommandArgChoice>();
+        if (slashActive && slash.ArgsMode && Props.CommandsSupported && Props.AvailableCommands is { } argCmds)
+        {
+            var (argName, _, _) = SplitSlashArgText(displayText);
+            slashArgCmd = argCmds.FirstOrDefault(c => c.MatchesName(argName));
+            if (slashArgCmd is not null)
+                slashArgResults = slashArgCmd.FirstArgChoices()
+                    .Where(ch => ChoiceMatches(ch, slash.Query))
+                    .Take(SlashMenuMaxItems)
+                    .ToList();
+        }
+
+        var inArgsMode = slash.ArgsMode && slashArgCmd is not null && slashArgResults.Count > 0;
+        var slashSelectableCount = inArgsMode ? slashArgResults.Count : slashResults.Count;
+        // slash.Index < 0 means "not navigated yet": default to the global best
+        // command match (slashDefaultIndex) in command mode, or the first arg
+        // choice in args mode. Up/Down then make it a concrete index.
+        var slashDefault = inArgsMode ? 0 : slashDefaultIndex;
+        var slashIndex = slashSelectableCount == 0
+            ? 0
+            : Math.Clamp(slash.Index < 0 ? slashDefault : slash.Index, 0, slashSelectableCount - 1);
+
+        // Pushes a new composer value into the textbox and restores the caret to
+        // the end (shared by command insertion and arg-choice insertion).
+        Action<string> commitSlashText = insert =>
+        {
+            inputRef.Current = insert;
+            hasTextState.Set(!string.IsNullOrWhiteSpace(insert));
+            sendVersion.Set(sendVersion.Value + 1);
+            var tbox = textBoxRef.Current;
+            tbox?.DispatcherQueue?.TryEnqueue(() =>
+            {
+                tbox.Focus(FocusState.Programmatic);
+                var c = tbox.Text?.Length ?? 0;
+                tbox.SelectionStart = c;
+                tbox.SelectionLength = 0;
+            });
+        };
+
+        // Inserts the chosen command, replacing the "/token" the user was typing.
+        // When the command has fixed argument choices, the popup transitions into
+        // the arg-choice picker (Mac parity) instead of dismissing; otherwise the
+        // command text is inserted (with a trailing space when it takes args).
+        Action<GatewayCommand> insertSlashCommand = cmd =>
+        {
+            if (cmd.FirstArgChoices().Count > 0)
+            {
+                commitSlashText(cmd.DisplayName() + " ");
+                slashMenuState.Set((true, "", 0, true));
+                return;
+            }
+            commitSlashText(cmd.BuildInsertionText());
+            slashMenuState.Set((false, "", 0, false));
+        };
+
+        // Picks a static argument choice, filling "/name value" and closing.
+        Action<GatewayCommand, GatewayCommandArgChoice> insertSlashArg = (cmd, choice) =>
+        {
+            commitSlashText(cmd.BuildArgInsertionText(choice.Value));
+            slashMenuState.Set((false, "", 0, false));
+        };
+
+        var textbox = TextField(displayText, v =>
+            {
+                inputRef.Current = v;
+                hasTextState.Set(!string.IsNullOrWhiteSpace(v));
+                var (active, query, argsMode) = ComputeSlashState(v, Props.AvailableCommands);
+                var cur = slashMenuState.Value;
+                if (active != cur.Active || query != cur.Query || argsMode != cur.ArgsMode)
+                    // -1 = "not navigated": selection resolves to the global best
+                    // match (see slashIndex) until the user presses Up/Down.
+                    slashMenuState.Set((active, query, -1, argsMode));
+            })
+            .Set(tb =>
+            {
+                textBoxRef.Current = tb;
+                Microsoft.UI.Xaml.Automation.AutomationProperties.SetAutomationId(
+                    tb,
+                    "ChatComposerInput");
+                tb.PlaceholderText = recording
+                    ? LocalizationHelper.GetString("Chat_Voice_ListeningPrompt")
+                    : placeholder;
+                // Keep AcceptsReturn=false: this lets us intercept *every*
+                // Enter key in OnKeyDown reliably. When the user holds Shift,
+                // we manually insert a newline at the caret below. This avoids
+                // the routed-event ordering problem where the TextBox's class
+                // handler can swallow Enter before our handler runs.
+                tb.AcceptsReturn = false;
+                tb.TextWrapping = TextWrapping.Wrap;
+                tb.MinHeight = 56;
+                tb.MaxHeight = 200;
+                tb.IsEnabled = isConnected;
+                // Strip the TextBox's own chrome — the wrapper Border below
+                // (composerInput) provides the unified border + corner radius
+                // so the optional attachment preview visually sits inside the
+                // same input "card" as the typed text.
+                tb.BorderThickness = new Thickness(0);
+                tb.BorderBrush = new SolidColorBrush(Colors.Transparent);
+                tb.Background = new SolidColorBrush(Colors.Transparent);
+                tb.CornerRadius = new CornerRadius(0);
+                // The TextBox template draws an additional "focus underline"
+                // using TextControlBorderThemeThicknessFocused (default 0,0,0,2)
+                // and a static top/side line via TextControlBorderThemeThickness
+                // even when our BorderThickness=0 (template binds its inner
+                // BorderElement to those theme thicknesses directly). Zero them
+                // out plus force every TextControl BorderBrush variant to
+                // transparent so the wrapper Border (composerInput) is the
+                // only chrome visible.
+                tb.Resources["TextControlBorderThemeThickness"] = new Thickness(0);
+                tb.Resources["TextControlBorderThemeThicknessFocused"] = new Thickness(0);
+                tb.Resources["TextControlBackground"] = new SolidColorBrush(Colors.Transparent);
+                tb.Resources["TextControlBackgroundFocused"] = new SolidColorBrush(Colors.Transparent);
+                tb.Resources["TextControlBackgroundPointerOver"] = new SolidColorBrush(Colors.Transparent);
+                tb.Resources["TextControlBorderBrush"] = new SolidColorBrush(Colors.Transparent);
+                tb.Resources["TextControlBorderBrushFocused"] = new SolidColorBrush(Colors.Transparent);
+                tb.Resources["TextControlBorderBrushPointerOver"] = new SolidColorBrush(Colors.Transparent);
+
+                if (!pasteHookedRef.Current)
+                {
+                    pasteHookedRef.Current = true;
+                    tb.Paste += async (s, e) =>
+                    {
+                        try
+                        {
+                            var att = await TryReadImageFromClipboardAsync();
+                            if (att is not null)
+                            {
+                                e.Handled = true;
+                                Props.OnAttachmentPasted?.Invoke(att);
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            // If anything goes wrong reading the clipboard,
+                            // fall through to the default text paste behavior.
+                            OpenClawTray.Services.Logger.Debug($"ChatComposer: clipboard image paste failed, falling back to text: {ex.Message}");
+                        }
+                    };
+                }
+            })
+            .OnKeyDown((sender, e) =>
+            {
+                var key = e.Key;
+
+                // While the slash menu is open with results, the arrow keys
+                // navigate it and Enter/Tab autocompletes — instead of moving
+                // the caret or sending the message. Works for both the command
+                // list and the argument-choice picker (slashSelectableCount and
+                // the Enter/Tab branch dispatch on the active mode).
+                if (slashActive && slashSelectableCount > 0)
+                {
+                    if (key == global::Windows.System.VirtualKey.Down)
+                    {
+                        e.Handled = true;
+                        slashMenuState.Set((slash.Active, slash.Query, Math.Min(slashIndex + 1, slashSelectableCount - 1), slash.ArgsMode));
+                        return;
+                    }
+                    if (key == global::Windows.System.VirtualKey.Up)
+                    {
+                        e.Handled = true;
+                        slashMenuState.Set((slash.Active, slash.Query, Math.Max(slashIndex - 1, 0), slash.ArgsMode));
+                        return;
+                    }
+                    if (key == global::Windows.System.VirtualKey.Enter
+                        || key == global::Windows.System.VirtualKey.Tab)
+                    {
+                        e.Handled = true;
+                        if (inArgsMode)
+                            insertSlashArg(slashArgCmd!, slashArgResults[slashIndex]);
+                        else
+                            insertSlashCommand(slashResults[slashIndex]);
+                        return;
+                    }
+                    if (key == global::Windows.System.VirtualKey.Escape)
+                    {
+                        e.Handled = true;
+                        slashMenuState.Set((false, "", 0, false));
+                        return;
+                    }
+                }
+                else if (slashActive && Props.AvailableCommands is null)
+                {
+                    // The loading popup is visible but nothing is selectable yet.
+                    // No-match input hides the popup, so it must fall through as
+                    // ordinary composer text instead of trapping Tab/Escape/arrows.
+                    if (key == global::Windows.System.VirtualKey.Escape
+                        || key == global::Windows.System.VirtualKey.Tab)
+                    {
+                        // Dismiss (Tab must not silently move focus while the popup
+                        // overlays the composer).
+                        e.Handled = true;
+                        slashMenuState.Set((false, "", 0, false));
+                        return;
+                    }
+                    if (key == global::Windows.System.VirtualKey.Up
+                        || key == global::Windows.System.VirtualKey.Down)
+                    {
+                        // Nothing to move through — swallow so the caret doesn't jump.
+                        e.Handled = true;
+                        return;
+                    }
+                    if (key == global::Windows.System.VirtualKey.Enter)
+                    {
+                        // We don't yet know whether "/token" is a real command, so
+                        // don't let Enter send it as raw text and race the fetch.
+                        e.Handled = true;
+                        return;
+                    }
+                }
+
+                if (key == global::Windows.System.VirtualKey.Enter)
+                {
+                    var shift = Microsoft.UI.Input.InputKeyboardSource
+                        .GetKeyStateForCurrentThread(global::Windows.System.VirtualKey.Shift);
+                    var shiftDown = shift.HasFlag(global::Windows.UI.Core.CoreVirtualKeyStates.Down);
+                    e.Handled = true;
+                    if (shiftDown && sender is TextBox tb)
+                    {
+                        // Insert a newline at the caret position. AcceptsReturn
+                        // is false, so we do this manually instead of letting
+                        // the TextBox handle it (which would race with the
+                        // routed-event order and could either fail to insert
+                        // or also trigger send).
+                        var pos = tb.SelectionStart;
+                        var len = tb.SelectionLength;
+                        var text = tb.Text ?? string.Empty;
+                        var safePos = Math.Min(Math.Max(pos, 0), text.Length);
+                        var safeEnd = Math.Min(safePos + Math.Max(len, 0), text.Length);
+                        tb.Text = text.Substring(0, safePos) + "\n" + text.Substring(safeEnd);
+                        tb.SelectionStart = safePos + 1;
+                        tb.SelectionLength = 0;
+                        inputRef.Current = tb.Text;
+                        hasTextState.Set(!string.IsNullOrWhiteSpace(tb.Text));
+                    }
+                    else
+                    {
+                        sendActionRef.Current();
+                    }
+                }
+            });
+
+        // ── Row 3: action icons (right-aligned) ────────────────────────
+
+        // ── Attachment preview (rendered INSIDE the composer input card) ──
+        // For images, a real thumbnail is shown so the user can confirm what
+        // they pasted/picked. For other files a compact icon+name chip is
+        // shown. The preview sits inside the same Border as the textbox so it
+        // visually reads as part of the chat input.
+        Element attachmentPreview = Empty();
+        if (pendingAttachments.Count > 0)
+        {
+            Element BuildRemoveButton(ChatAttachment attachment, bool floating = false) => Button(
+                    TextBlock("\uE711") // Cancel glyph
+                        .Set(t =>
+                        {
+                            t.FontFamily = FluentIconCatalog.SymbolThemeFontFamily;
+                            t.FontSize = 10;
+                            if (floating)
+                            {
+                                t.HorizontalAlignment = HorizontalAlignment.Center;
+                                t.VerticalAlignment = VerticalAlignment.Center;
+                            }
+                        }),
+                    () => Props.OnAttachmentRemoved?.Invoke(attachment))
+                .Set(b =>
+                {
+                    if (floating)
+                    {
+                        b.Width = 22;
+                        b.Height = 22;
+                        b.Padding = new Thickness(0);
+                        b.CornerRadius = new CornerRadius(11);
+                        b.BorderThickness = new Thickness(1);
+                    }
+                    else
+                    {
+                        b.Padding = new Thickness(4, 2, 4, 2);
+                        b.CornerRadius = new CornerRadius(4);
+                    }
+                    b.MinWidth = 0; b.MinHeight = 0;
+                })
+                .Resources(r =>
+                {
+                    if (floating)
+                    {
+                        r.Set("ButtonBackground", Ref("SolidBackgroundFillColorBaseBrush"));
+                        r.Set("ButtonBackgroundPointerOver", Ref("SolidBackgroundFillColorTertiaryBrush"));
+                        r.Set("ButtonBackgroundPressed", Ref("SolidBackgroundFillColorQuarternaryBrush"));
+                        r.Set("ButtonForeground", Ref("TextFillColorPrimaryBrush"));
+                        r.Set("ButtonForegroundPointerOver", Ref("TextFillColorPrimaryBrush"));
+                        r.Set("ButtonForegroundPressed", Ref("TextFillColorPrimaryBrush"));
+                        r.Set("ButtonBorderBrush", Ref("CardStrokeColorDefaultBrush"));
+                        r.Set("ButtonBorderBrushPointerOver", Ref("CardStrokeColorDefaultBrush"));
+                        r.Set("ButtonBorderBrushPressed", Ref("CardStrokeColorDefaultBrush"));
+                    }
+                    else
+                    {
+                        r.Set("ButtonBackground", new SolidColorBrush(Colors.Transparent));
+                        r.Set("ButtonBackgroundPointerOver", Ref("SubtleFillColorSecondaryBrush"));
+                        r.Set("ButtonBackgroundPressed", Ref("SubtleFillColorTertiaryBrush"));
+                        r.Set("ButtonBorderBrush", new SolidColorBrush(Colors.Transparent));
+                        r.Set("ButtonBorderBrushPointerOver", new SolidColorBrush(Colors.Transparent));
+                        r.Set("ButtonBorderBrushPressed", new SolidColorBrush(Colors.Transparent));
+                    }
+
+                })
+                .AutomationName("Remove attachment");
+
+            Element BuildAttachmentPreview(ChatAttachment att)
+            {
+                var isImage = att.Type == "image";
+
+            if (isImage)
+            {
+                // Build (and cache) a BitmapImage from the base64 content.
+                // Rebuild only when the attachment instance changes; base64
+                // decode + stream copy is non-trivial work to repeat per
+                // keystroke re-render.
+                if (!imageCache.TryGetValue(att, out var bmp))
+                {
+                    bmp = TryCreateBitmapFromBase64(att.Content);
+                    imageCache[att] = bmp;
+                }
+
+                Element thumb;
+                if (bmp is not null)
+                {
+                    // Fit the thumbnail inside a 160×96 box while preserving
+                    // aspect ratio (downscale only, never upscale tiny pastes).
+                    const double maxW = 160;
+                    const double maxH = 96;
+                    var pw = bmp.PixelWidth > 0 ? bmp.PixelWidth : (int)maxW;
+                    var ph = bmp.PixelHeight > 0 ? bmp.PixelHeight : (int)maxH;
+                    var scale = Math.Min(Math.Min(maxW / pw, maxH / ph), 1.0);
+                    var thumbW = pw * scale;
+                    var thumbH = ph * scale;
+
+                    thumb = Border(Empty())
+                        .CornerRadius(4)
+                        .Set(b =>
+                        {
+                            b.Width = thumbW;
+                            b.Height = thumbH;
+                            b.Background = new Microsoft.UI.Xaml.Media.ImageBrush
+                            {
+                                ImageSource = bmp,
+                                Stretch = Stretch.UniformToFill,
+                            };
+                            b.BorderThickness = new Thickness(1);
+                            b.BorderBrush = (Brush)Microsoft.UI.Xaml.Application.Current.Resources["CardStrokeColorDefaultBrush"];
+                        });
+                }
+                else
+                {
+                    thumb = TextBlock("\uEB9F")
+                        .Set(t =>
+                        {
+                            t.FontFamily = FluentIconCatalog.SymbolThemeFontFamily;
+                            t.FontSize = 16;
+                            t.VerticalAlignment = VerticalAlignment.Center;
+                        });
+                }
+
+                // Circular close button that floats in the top-right corner
+                // of the thumbnail. Distinct from the chip's flat removeBtn
+                // because we need an opaque background (so the × is readable
+                // over any image) and a contrast-friendly hover.
+                var floatingRemove = BuildRemoveButton(att, floating: true)
+                    .HAlign(HorizontalAlignment.Right)
+                    .VAlign(VerticalAlignment.Top)
+                    .Margin(0, -8, -8, 0);
+
+                // Stack the close button on top of the thumbnail in the same
+                // Grid cell. Auto sizing means the chip is exactly as wide as
+                // the thumbnail.
+                var thumbWithClose = Grid(
+                    [GridSize.Auto], [GridSize.Auto],
+                    thumb.Grid(row: 0, column: 0),
+                    floatingRemove.Grid(row: 0, column: 0)
+                ).HAlign(HorizontalAlignment.Left);
+
+                return Border(thumbWithClose)
+                    .Padding(8, 12, 8, 4);
+            }
+            else
+            {
+                return Border(
+                    Grid([GridSize.Auto, GridSize.Star(), GridSize.Auto], [GridSize.Auto],
+                        TextBlock("\uE8A5") // Page glyph
+                            .Set(t =>
+                            {
+                                t.FontFamily = FluentIconCatalog.SymbolThemeFontFamily;
+                                t.FontSize = 12;
+                                t.VerticalAlignment = VerticalAlignment.Center;
+                            })
+                            .Grid(row: 0, column: 0),
+                        TextBlock($"{att.FileName}  ({att.FormatSize()})")
+                            .Set(t =>
+                            {
+                                t.FontSize = 12;
+                                t.TextTrimming = TextTrimming.CharacterEllipsis;
+                                t.VerticalAlignment = VerticalAlignment.Center;
+                                t.Margin = new Thickness(6, 0, 0, 0);
+                            })
+                            .Grid(row: 0, column: 1),
+                        BuildRemoveButton(att).Grid(row: 0, column: 2)
+                    )
+                ).Padding(4, 4, 4, 0);
+            }
+            }
+
+            attachmentPreview = VStack(6, pendingAttachments.Select(BuildAttachmentPreview).ToArray());
+        }
+
+        // Composer "card" — wraps the attachment preview (if any) and the
+        // textbox in a single bordered container so the preview reads as
+        // content inside the chat input rather than a separate row.
+        Element RenderQueuedMessages()
+        {
+            if (queuedMessages.Count == 0)
+                return Empty();
+
+            var cardBg = (Brush)Microsoft.UI.Xaml.Application.Current.Resources["CardBackgroundFillColorDefaultBrush"];
+            var cardBorder = (Brush)Microsoft.UI.Xaml.Application.Current.Resources["ControlStrokeColorDefaultBrush"];
+            var labelFg = (Brush)Microsoft.UI.Xaml.Application.Current.Resources["TextFillColorSecondaryBrush"];
+            var textFg = (Brush)Microsoft.UI.Xaml.Application.Current.Resources["TextFillColorPrimaryBrush"];
+            var failureFg = (Brush)Microsoft.UI.Xaml.Application.Current.Resources["SystemFillColorCriticalBrush"];
+            var queuedCountText = string.Format(
+                CultureInfo.CurrentCulture,
+                LocalizationHelper.GetString("Chat_Composer_QueuedCountFormat"),
+                queuedMessages.Count);
+            Element RenderQueueCancelButton(ChatQueuedMessage message, int index)
+            {
+                if (message.SendState == ChatQueuedMessageSendState.Sending || Props.OnQueuedMessageCancel is null)
+                    return Empty();
+
+                var failed = message.SendState == ChatQueuedMessageSendState.Failed;
+                var cancelTooltip = LocalizationHelper.GetString(failed
+                    ? "Chat_Composer_QueuedMessageRemoveFailed"
+                    : "Chat_Composer_QueuedMessageCancel");
+                var buttonName = string.Format(
+                    CultureInfo.CurrentCulture,
+                    LocalizationHelper.GetString(failed
+                        ? "Chat_Composer_QueuedMessageRemoveFailedAutomationFormat"
+                        : "Chat_Composer_QueuedMessageCancelAutomationFormat"),
+                    index + 1,
+                    FormatQueuedMessageAutomationSnippet(message.Text));
+                return Button(
+                        TextBlock("\uE711")
+                            .Set(t =>
+                            {
+                                t.FontFamily = FluentIconCatalog.SymbolThemeFontFamily;
+                                t.FontSize = 11;
+                                t.HorizontalAlignment = HorizontalAlignment.Center;
+                                t.VerticalAlignment = VerticalAlignment.Center;
+                            }),
+                        () => Props.OnQueuedMessageCancel?.Invoke(message.Id))
+                    .Set(b =>
+                    {
+                        b.Width = 28;
+                        b.Height = 28;
+                        b.MinWidth = 0;
+                        b.MinHeight = 0;
+                        b.Padding = new Thickness(0);
+                        b.CornerRadius = new CornerRadius(4);
+                        Microsoft.UI.Xaml.Automation.AutomationProperties.SetAutomationId(
+                            b,
+                            $"{(failed ? "ChatQueuedMessageRemoveFailed" : "ChatQueuedMessageCancel")}_{message.Id}");
+                    })
+                    .Resources(r =>
+                    {
+                        r.Set("ButtonBackground", new SolidColorBrush(Colors.Transparent));
+                        r.Set("ButtonBackgroundPointerOver", Ref("SubtleFillColorSecondaryBrush"));
+                        r.Set("ButtonBackgroundPressed", Ref("SubtleFillColorTertiaryBrush"));
+                        r.Set("ButtonBorderBrush", new SolidColorBrush(Colors.Transparent));
+                        r.Set("ButtonBorderBrushPointerOver", new SolidColorBrush(Colors.Transparent));
+                        r.Set("ButtonBorderBrushPressed", new SolidColorBrush(Colors.Transparent));
+                    })
+                    .AutomationName(buttonName)
+                    .SetToolTip(cancelTooltip);
+            }
+
+            Element RenderQueuedCard(ChatQueuedMessage message, int index)
+            {
+                var failed = message.SendState == ChatQueuedMessageSendState.Failed;
+                var automationName = string.Format(
+                    CultureInfo.CurrentCulture,
+                    LocalizationHelper.GetString(failed
+                        ? "Chat_Composer_QueuedMessageFailedAutomationFormat"
+                        : "Chat_Composer_QueuedMessageAutomationFormat"),
+                    message.Text);
+
+                Element stateLabel = Empty();
+                Element details = Empty();
+                if (failed)
+                {
+                    stateLabel = TextBlock(LocalizationHelper.GetString("Chat_Composer_QueuedMessageFailed"))
+                        .Set(t =>
+                            {
+                                t.FontSize = 12;
+                                t.FontWeight = Microsoft.UI.Text.FontWeights.SemiBold;
+                                t.Foreground = failureFg;
+                            });
+
+                    if (!string.IsNullOrWhiteSpace(message.ErrorText))
+                    {
+                        details = TextBlock(message.ErrorText!)
+                            .Set(t =>
+                            {
+                                t.TextWrapping = TextWrapping.Wrap;
+                                t.FontSize = 12;
+                                t.Foreground = failureFg;
+                            });
+                    }
+                }
+
+                var messageBody = VStack(6,
+                    stateLabel,
+                    TextBlock(message.Text)
+                        .Set(t =>
+                        {
+                            t.TextWrapping = TextWrapping.Wrap;
+                            t.IsTextSelectionEnabled = true;
+                            t.Foreground = textFg;
+                        }),
+                    details
+                );
+
+                return Border(
+                    Grid([GridSize.Star(), GridSize.Auto], [GridSize.Auto],
+                        messageBody.Grid(row: 0, column: 0),
+                        RenderQueueCancelButton(message, index)
+                            .Grid(row: 0, column: 1)
+                            .VAlign(VerticalAlignment.Top)
+                    )
+                )
+                .Background(cardBg)
+                .CornerRadius(8)
+                .Padding(10, 8, 10, 8)
+                .HAlign(HorizontalAlignment.Stretch)
+                .AutomationName(automationName)
+                .WithKey($"composer-queued:{Props.ChannelId ?? "none"}:{message.Id}")
+                .Set(b =>
+                {
+                    b.BorderBrush = cardBorder;
+                    b.BorderThickness = new Thickness(1);
+                });
+            }
+
+            var queuedList = ScrollView(VStack(8, queuedMessages.Select(RenderQueuedCard).ToArray()))
+                .Set(sv =>
+                {
+                    sv.MaxHeight = ComputeQueuedMessagesMaxHeight(Props.IsCompact, Props.AvailableHeight);
+                    sv.VerticalScrollBarVisibility = ScrollBarVisibility.Auto;
+                    sv.HorizontalScrollBarVisibility = ScrollBarVisibility.Disabled;
+                    sv.HorizontalScrollMode = ScrollMode.Disabled;
+                    sv.HorizontalContentAlignment = HorizontalAlignment.Stretch;
+                });
+
+            return Border(
+                    VStack(8,
+                        TextBlock(queuedCountText)
+                            .Set(t =>
+                            {
+                                t.FontSize = 13;
+                                t.FontWeight = Microsoft.UI.Text.FontWeights.SemiBold;
+                                t.Foreground = labelFg;
+                            }),
+                        queuedList
+                    )
+                )
+                .Padding(0, 0, 0, 0)
+                .AutomationName(queuedCountText)
+                .LiveRegion(Microsoft.UI.Xaml.Automation.Peers.AutomationLiveSetting.Polite)
+                .WithKey($"composer-queued-section:{Props.ChannelId ?? "none"}");
+        }
+
+        var queuedPanel = RenderQueuedMessages();
+
+        var composerInput = Border(
+            VStack(0, attachmentPreview, textbox)
+        ).Set(b =>
+        {
+            b.Background = (Brush)Microsoft.UI.Xaml.Application.Current.Resources["TextControlBackground"];
+            if (recording)
+            {
+                b.BorderBrush = (Brush)Microsoft.UI.Xaml.Application.Current.Resources["AccentFillColorDefaultBrush"];
+                b.BorderThickness = new Thickness(2);
+            }
+            else
+            {
+                b.BorderBrush = (Brush)Microsoft.UI.Xaml.Application.Current.Resources["TextControlBorderBrush"];
+                b.BorderThickness = new Thickness(1);
+            }
+            b.CornerRadius = composerCornerRadius;
+        });
+
+        // ── Voice recording indicator: compact pill with dot, label, and mini waveform ──
+        // Only shown while actively recording (isRecording state).
+        // Uses a unique Key so FunctionalUI doesn't reuse the same Border and leave
+        // stale styling when switching between pill and empty placeholder.
+        Element voiceIndicator;
+        if (recording)
+        {
+            var audioLevel = Props.VoiceAudioLevel;
+            var accentBrush = (Brush)Microsoft.UI.Xaml.Application.Current.Resources["AccentFillColorDefaultBrush"];
+
+            // Red recording dot
+            var recDot = Border(Empty())
+                .Set(b =>
+                {
+                    b.Width = 6;
+                    b.Height = 6;
+                    b.CornerRadius = new CornerRadius(3);
+                    b.Background = new SolidColorBrush(Microsoft.UI.Colors.Red);
+                    b.Opacity = 0.5 + Math.Min(audioLevel, 1f) * 0.5;
+                    b.VerticalAlignment = VerticalAlignment.Center;
+                });
+
+            // "Recording" label
+            var recLabel = TextBlock("Recording")
+                .Set(t =>
+                {
+                    t.FontSize = 11;
+                    t.Foreground = accentBrush;
+                    t.VerticalAlignment = VerticalAlignment.Center;
+                });
+
+            // Mini waveform bars (16 bars for a fuller waveform)
+            var miniBarCount = 16;
+            var miniBarElements = new Element[miniBarCount];
+            for (int bi = 0; bi < miniBarCount; bi++)
+            {
+                var barPhase = (bi % 3 == 0) ? 0.7 : (bi % 3 == 1) ? 1.0 : 0.5;
+                var barHeight = 2.0 + Math.Min(audioLevel * barPhase, 1.0) * 8.0;
+                miniBarElements[bi] = Border(Empty())
+                    .Set(b =>
+                    {
+                        b.Width = 2;
+                        b.Height = barHeight;
+                        b.CornerRadius = new CornerRadius(1);
+                        b.Background = accentBrush;
+                        b.Opacity = 0.5 + Math.Min(audioLevel, 1f) * 0.5;
+                        b.VerticalAlignment = VerticalAlignment.Center;
+                    });
+            }
+            var miniWave = (FlexRow(miniBarElements) with { ColumnGap = 1.5 })
+                .VAlign(VerticalAlignment.Center);
+
+            // Pill container with accent tint background and border
+            voiceIndicator = Border(
+                (FlexRow(recDot, recLabel, miniWave) with { ColumnGap = 8 })
+                    .VAlign(VerticalAlignment.Center)
+            ).Set(b =>
+            {
+                b.Padding = new Thickness(10, 5, 12, 5);
+                b.CornerRadius = new CornerRadius(14);
+                b.Background = accentBrush;
+                b.Opacity = 1.0;
+                // Use a low-opacity accent background
+                if (accentBrush is SolidColorBrush scb)
+                {
+                    b.Background = new SolidColorBrush(scb.Color) { Opacity = 0.1 };
+                    b.BorderBrush = new SolidColorBrush(scb.Color) { Opacity = 0.3 };
+                }
+                b.BorderThickness = new Thickness(1);
+            }).Margin(4, 0, 4, 0)
+              .HAlign(HorizontalAlignment.Left);
+            voiceIndicator.Key = "voice-pill";
+        }
+        else
+        {
+            voiceIndicator = Border(Empty()).Set(b =>
+            {
+                b.Padding = new Thickness(0);
+                b.Margin = new Thickness(0);
+                b.Height = 0;
+                b.Opacity = 0;
+            });
+            voiceIndicator.Key = "voice-pill-hidden";
+        }
+
+        Element IconButton(string glyph, string tip, Action onClick, Brush? foreground = null)
+            => Button(
+                TextBlock(glyph)
+                    .Set(t =>
+                    {
+                        t.FontFamily = FluentIconCatalog.SymbolThemeFontFamily;
+                        t.FontSize = composerIconSize;
+                        // Always set foreground explicitly so element diffing resets it.
+                        t.Foreground = foreground
+                            ?? (Brush)Microsoft.UI.Xaml.Application.Current.Resources["TextFillColorPrimaryBrush"];
+                    }),
+                onClick)
+            .Set(b =>
+            {
+                b.Padding = new Thickness(8, 4, 8, 4);
+                b.MinWidth = 32; b.MinHeight = 28;
+                b.CornerRadius = composerCornerRadius;
+            })
+            .Resources(r => r
+                .Set("ButtonBackground", new SolidColorBrush(Colors.Transparent))
+                .Set("ButtonBackgroundPointerOver", Ref("SubtleFillColorSecondaryBrush"))
+                .Set("ButtonBackgroundPressed", Ref("SubtleFillColorTertiaryBrush"))
+                .Set("ButtonBorderBrush", new SolidColorBrush(Colors.Transparent))
+                .Set("ButtonBorderBrushPointerOver", new SolidColorBrush(Colors.Transparent))
+                .Set("ButtonBorderBrushPressed", new SolidColorBrush(Colors.Transparent)))
+            .AutomationName(tip)
+            .SetToolTip(tip);
+
+        var attachBtn = IconButton("\uE723", LocalizationHelper.GetString("Chat_Composer_Tooltip_Attach"), () =>
+        {
+            Props.OnAttachClick?.Invoke();
+        });
+
+        // Voice recording: three-button model
+        // - Not recording: mic button starts recording
+        // - Recording: mic button becomes stop (■, keeps transcript),
+        //   plus a cancel (✕) button that discards
+        Element voiceBtn = Empty();
+        Element voiceCancelBtn = Empty();
+        if (isRecording.Value)
+        {
+            // Stop button — ends recording and keeps the transcript
+            voiceBtn = IconButton("\uE15B", "Stop recording", () =>
+            {
+                voiceStoppedRef.Current = true;
+                voiceCtsRef.Current?.Cancel();
+            }, foreground: new SolidColorBrush(Microsoft.UI.Colors.Red));
+
+            // Cancel button — discards recording entirely
+            voiceCancelBtn = IconButton("\uE711", "Cancel recording", () =>
+            {
+                voiceStoppedRef.Current = false;
+                voiceCtsRef.Current?.Cancel();
+            });
+        }
+        else
+        {
+            voiceBtn = IconButton(
+                "\uE720",
+                LocalizationHelper.GetString("Chat_Composer_Tooltip_Voice"),
+                startVoiceRecording);
+        }
+        var speakerBtn = Props.OnSpeakerToggle is not null
+            ? IconButton(
+                Props.IsSpeakerMuted ? "\uE74F" : "\uE767",  // SpeakerMute : Speaker
+                Props.IsSpeakerMuted ? "Unmute" : "Mute",
+                () => Props.OnSpeakerToggle())
+            : Empty();
+        // Toggle tool-call visibility. Same wrench icon in both states;
+        // reduced opacity when tool calls are hidden to indicate "off"
+        // without looking disabled. Tooltip clarifies the action.
+        var showTools = Props.ShowToolCalls;
+        var toolToggleBtn = IconButton(
+            "\uE90F",  // Wrench
+            showTools ? "Hide tool calls & usage" : "Show tool calls & usage",
+            () => Props.OnShowToolCallsChanged?.Invoke(!Props.ShowToolCalls))
+            .Set(b => b.Opacity = showTools ? 1.0 : 0.55);
+
+        // ── Slash command menu (gateway commands.list discovery) ──
+        // Hosted in a floating Popup above the composer so the input controls
+        // never move; it overlays content like standard command menus. The
+        // textbox stays focused (light-dismiss off) so typing keeps filtering
+        // and ↑/↓/Enter/Tab/Esc drive the menu.
+        FrameworkElement? slashPopupContent = null;
+        var slashMenuVisible = false;
+        if (slashActive)
+        {
+            // slashActive already implies a connected, command-supporting gateway.
+            if (Props.AvailableCommands is null)
+            {
+                slashPopupContent = BuildSlashHintPopup("Loading commands…");
+                slashMenuVisible = true;
+            }
+            else if (slash.ArgsMode)
+            {
+                // Arg-choice picker for the selected command (Mac parity). When
+                // nothing matches, ComputeSlashState has already cleared Active,
+                // so we only reach here with results to show.
+                if (inArgsMode)
+                {
+                    slashPopupContent = BuildSlashArgPopup(slashArgCmd!, slashArgResults, slashIndex, choice => insertSlashArg(slashArgCmd!, choice));
+                    slashMenuVisible = true;
+                }
+            }
+            else if (slashResults.Count == 0)
+            {
+                // No command matches the typed text — hide the palette entirely
+                // (no "no matches" hint) so the composer reads as normal.
+                slashMenuVisible = false;
+            }
+            else
+            {
+                slashPopupContent = BuildSlashPopup(slashGroups, slashIndex, slash.Query, insertSlashCommand);
+                slashMenuVisible = true;
+            }
+        }
+
+        // Send button — always present so the user can queue follow-up messages
+        // even while the assistant is responding.
+        var sendBrush = (Brush)Microsoft.UI.Xaml.Application.Current.Resources["AccentFillColorDefaultBrush"];
+        const string sendGlyph = "\uE724";
+        const string stopGlyph = "\uE71A";
+
+        var hasText = hasTextState.Value || pendingAttachments.Count > 0;
+        var sendTooltip = LocalizationHelper.GetString("Chat_Composer_Tooltip_Send");
+        var glyphBrush = hasText
+            ? (Brush)new SolidColorBrush(Colors.White)
+            : (Brush)Microsoft.UI.Xaml.Application.Current.Resources["TextFillColorSecondaryBrush"];
+        var actionBtn = Button(
+            TextBlock(sendGlyph)
+                .Set(t =>
+                {
+                    t.FontFamily = FluentIconCatalog.SymbolThemeFontFamily;
+                    t.FontSize = composerIconSize;
+                })
+                .Foreground(glyphBrush),
+            sendAction
+        ).Set(b =>
+        {
+            b.Padding = new Thickness(10, 4, 10, 4);
+            b.MinWidth = sendButtonSize + 4; b.MinHeight = sendButtonSize - 4;
+            b.CornerRadius = composerCornerRadius;
+            b.IsEnabled = isConnected;
+            b.Background = hasText ? sendBrush : new SolidColorBrush(Colors.Transparent);
+        })
+        .Resources(r =>
+        {
+            if (hasText)
+            {
+                r.Set("ButtonBackgroundPointerOver", Ref("AccentFillColorSecondaryBrush"));
+                r.Set("ButtonBackgroundPressed",    Ref("AccentFillColorTertiaryBrush"));
+                r.Set("ButtonBorderBrush",            new SolidColorBrush(Colors.Transparent));
+                r.Set("ButtonBorderBrushPointerOver", new SolidColorBrush(Colors.Transparent));
+                r.Set("ButtonBorderBrushPressed",     new SolidColorBrush(Colors.Transparent));
+            }
+            else
+            {
+                r.Set("ButtonBackground",             new SolidColorBrush(Colors.Transparent));
+                r.Set("ButtonBackgroundPointerOver",  Ref("SubtleFillColorSecondaryBrush"));
+                r.Set("ButtonBackgroundPressed",      Ref("SubtleFillColorTertiaryBrush"));
+                r.Set("ButtonBorderBrush",            new SolidColorBrush(Colors.Transparent));
+                r.Set("ButtonBorderBrushPointerOver", new SolidColorBrush(Colors.Transparent));
+                r.Set("ButtonBorderBrushPressed",     new SolidColorBrush(Colors.Transparent));
+            }
+        })
+        .AutomationName(sendTooltip)
+        .SetToolTip(sendTooltip);
+
+        // Stop button — shown inline NEXT TO the send button (to its right)
+        // when the assistant is responding, matching the gateway web UI pattern.
+        Element stopBtn = Empty();
+        if (Props.TurnActive)
+        {
+            var stopTooltip = LocalizationHelper.GetString("Chat_Composer_Tooltip_Stop");
+            stopBtn = Button(
+                TextBlock(stopGlyph)
+                    .Set(t =>
+                    {
+                        t.FontFamily = FluentIconCatalog.SymbolThemeFontFamily;
+                        t.FontSize = composerIconSize;
+                    })
+                    .Foreground(new SolidColorBrush(Colors.White)),
+                Props.OnStop
+            ).Set(b =>
+            {
+                b.Padding = new Thickness(10, 4, 10, 4);
+                b.MinWidth = sendButtonSize + 4; b.MinHeight = sendButtonSize - 4;
+                b.CornerRadius = composerCornerRadius;
+                b.Background = (Brush)Microsoft.UI.Xaml.Application.Current.Resources["SystemFillColorCriticalBrush"];
+            })
+            .Resources(r =>
+            {
+                r.Set("ButtonBackgroundPointerOver", Ref("SystemFillColorCriticalBrush"));
+                r.Set("ButtonBackgroundPressed", Ref("SystemFillColorCriticalBrush"));
+                r.Set("ButtonBorderBrush", new SolidColorBrush(Colors.Transparent));
+                r.Set("ButtonBorderBrushPointerOver", new SolidColorBrush(Colors.Transparent));
+                r.Set("ButtonBorderBrushPressed", new SolidColorBrush(Colors.Transparent));
+            })
+            .AutomationName(stopTooltip)
+            .SetToolTip(stopTooltip);
+        }
+
+        Element workingBanner = Empty();
+
+        // Permission/exec-approval banner used to live here, pinned above
+        // the composer. It now renders inline in the timeline as a
+        // ChatTimelineItemKind.PermissionRequest entry so the conversation
+        // history records every approval (and its decided/expired badge)
+        // in chronological order. See ChatTimeline.RenderPermissionEntry.
+
+        var bottomToolbar = Grid([GridSize.Star(), GridSize.Auto], [GridSize.Auto],
+            dropdownsRow
+                .Margin(0, 0, 12, 0)
+                .HAlign(HorizontalAlignment.Stretch)
+                .Grid(row: 0, column: 0),
+            (FlexRow(attachBtn, voiceCancelBtn, voiceBtn, speakerBtn, toolToggleBtn, actionBtn, stopBtn)
+                with { ColumnGap = 4 })
+            .HAlign(HorizontalAlignment.Right)
+            .Grid(row: 0, column: 1)
+        );
+
+        // ── Optional working banner above the composer ──
+        Element workingBanner2 = workingBanner;
+
+        var composerCore = VStack(8, queuedPanel, composerInput, voiceIndicator, bottomToolbar.Margin(0, -8, 0, -4));
+
+        // Drive the floating slash-menu popup after the tree builds so it anchors
+        // above the (already mounted) textbox without shifting any controls.
+        var tbForPopup = textBoxRef.Current;
+        tbForPopup?.DispatcherQueue?.TryEnqueue(() =>
+            DriveSlashPopup(slashPopupRef, tbForPopup, slashPopupContent, slashMenuVisible));
+
+        return VStack(0,
+            workingBanner2,
+            Border(composerCore).Padding(16, 12, 16, 12)
+             .Set(b =>
+             {
+                 // Top divider only — mirrors Kenny's ChatShell ComposerBorder.
+                 b.BorderThickness = new Thickness(0, 1, 0, 0);
+                 b.BorderBrush = (Brush)Microsoft.UI.Xaml.Application.Current.Resources["SurfaceStrokeColorDefaultBrush"];
+             })
+        );
+    }
+
+    private static double ComputeQueuedMessagesMaxHeight(bool isCompact, double? availableHeight)
+    {
+        if (isCompact)
+            return CompactQueuedMessagesMaxHeight;
+
+        if (availableHeight is not { } height || double.IsNaN(height) || double.IsInfinity(height) || height <= 0)
+            return ExpandedQueuedMessagesFallbackMaxHeight;
+
+        return Math.Clamp(
+            Math.Round(height * ExpandedQueuedMessagesHeightRatio),
+            ExpandedQueuedMessagesMinHeight,
+            ExpandedQueuedMessagesMaxHeight);
+    }
+
+    private static string FormatQueuedMessageAutomationSnippet(string text)
+    {
+        var normalized = string.Join(" ", text.Split((char[]?)null, StringSplitOptions.RemoveEmptyEntries));
+        const int maxLength = 80;
+        return normalized.Length <= maxLength
+            ? normalized
+            : normalized[..maxLength] + "…";
+    }
+
+    private const int SlashMenuMaxItems = 8;
+
+    /// <summary>
+    /// Decides whether the composer text should open the inline slash menu and
+    /// in which mode. Command mode: a single leading "/token" with no whitespace.
+    /// Args mode: "/name &lt;filter&gt;" where <paramref name="commands"/> contains a
+    /// command named <c>name</c> that declares static argument choices and at
+    /// least one choice matches the filter (mirrors Mac's slash-commands.ts).
+    /// </summary>
+    private static (bool Active, string Query, bool ArgsMode) ComputeSlashState(
+        string? text, IReadOnlyList<GatewayCommand>? commands)
+    {
+        var t = text ?? string.Empty;
+        if (t.Length == 0 || t[0] != '/')
+            return (false, string.Empty, false);
+
+        var (name, rest, hasSpace) = SplitSlashArgText(t);
+        if (!hasSpace)
+            return (true, t.Substring(1), false); // command mode: still typing the name
+
+        // The arg-choice picker filters on a single token. Once the user types
+        // whitespace within that token (e.g. completed "/model gpt-5 " and kept
+        // typing), they've moved past the picker — fall back to plain text so the
+        // menu doesn't keep trapping Enter/Tab on a value they've finished.
+        if (rest.Any(char.IsWhiteSpace))
+            return (false, string.Empty, false);
+
+        var cmd = commands?.FirstOrDefault(c => c.MatchesName(name));
+        if (cmd is not null)
+        {
+            var choices = cmd.FirstArgChoices();
+            if (choices.Count > 0 && choices.Any(ch => ChoiceMatches(ch, rest)))
+                return (true, rest, true);
+        }
+        return (false, string.Empty, false);
+    }
+
+    /// <summary>Splits "/name rest" into ("name", "rest", hasSpace). Without a space, remainder is "".</summary>
+    private static (string Name, string Remainder, bool HasSpace) SplitSlashArgText(string? text)
+    {
+        var t = text ?? string.Empty;
+        if (t.Length == 0 || t[0] != '/') return (string.Empty, string.Empty, false);
+        for (int i = 1; i < t.Length; i++)
+        {
+            if (char.IsWhiteSpace(t[i]))
+                return (t.Substring(1, i - 1), t.Substring(i + 1), true);
+        }
+        return (t.Substring(1), string.Empty, false);
+    }
+
+    /// <summary>Prefix match of a choice (value or label) against the typed filter, case-insensitive.</summary>
+    private static bool ChoiceMatches(GatewayCommandArgChoice choice, string? filter)
+    {
+        var f = (filter ?? string.Empty).Trim();
+        if (f.Length == 0) return true;
+        return (choice.Value?.StartsWith(f, StringComparison.OrdinalIgnoreCase) ?? false)
+            || (choice.Label?.StartsWith(f, StringComparison.OrdinalIgnoreCase) ?? false);
+    }
+
+    // ── Native slash-menu popup builders ──
+    // The menu is hosted in a WinUI Popup (overlay) so it floats above the
+    // composer without shifting controls. Content is built as native controls
+    // (not FunctionalUI elements) because it lives outside the functional tree.
+
+    private static double SlashPopupWidth(double anchorWidth) =>
+        Math.Max(280, anchorWidth);
+
+    private static Border BuildSlashHintPopup(string text)
+    {
+        var label = new TextBlock
+        {
+            Text = text,
+            FontSize = 12,
+            Foreground = (Brush)Microsoft.UI.Xaml.Application.Current.Resources["TextFillColorSecondaryBrush"],
+            Margin = new Thickness(8, 6, 8, 6),
+        };
+        return SlashShell(label);
+    }
+
+    private static Border BuildSlashPopup(
+        IReadOnlyList<CommandCategoryGroup> groups, int selectedIndex, string query, Action<GatewayCommand> onPick)
+    {
+        var primary = (Brush)Microsoft.UI.Xaml.Application.Current.Resources["TextFillColorPrimaryBrush"];
+        var secondary = (Brush)Microsoft.UI.Xaml.Application.Current.Resources["TextFillColorSecondaryBrush"];
+        var selectedBg = (Brush)Microsoft.UI.Xaml.Application.Current.Resources["SubtleFillColorSecondaryBrush"];
+        var headerBrush = (Brush)Microsoft.UI.Xaml.Application.Current.Resources["TextFillColorTertiaryBrush"];
+
+        var list = new StackPanel { Orientation = Orientation.Vertical };
+        // Each group leads with a non-interactive category subheading; command
+        // rows follow. A single running index across all groups keeps the
+        // rendered rows aligned with the flattened keyboard-navigation list.
+        var idx = 0;
+        foreach (var group in groups)
+        {
+            list.Children.Add(SlashCategoryHeader(CommandCategories.Label(group.Category), headerBrush));
+            foreach (var cmd in group.Commands)
+            {
+                list.Children.Add(SlashRow(cmd, idx == selectedIndex, query, primary, secondary, selectedBg, onPick));
+                idx++;
+            }
+        }
+        var scroll = new ScrollViewer
+        {
+            VerticalScrollBarVisibility = Microsoft.UI.Xaml.Controls.ScrollBarVisibility.Auto,
+            HorizontalScrollBarVisibility = Microsoft.UI.Xaml.Controls.ScrollBarVisibility.Disabled,
+            MaxHeight = 280,
+            Content = list,
+        };
+        return SlashShell(scroll);
+    }
+
+    /// <summary>
+    /// Non-interactive category subheading for the slash palette: uppercase and
+    /// letter-spaced like Mac's .slash-menu-group__label, rendered in a muted
+    /// tone (Mac tints its label with the accent color; we keep it subdued to
+    /// match the reference design).
+    /// </summary>
+    private static TextBlock SlashCategoryHeader(string text, Brush foreground) => new()
+    {
+        Text = (text ?? "").ToUpperInvariant(),
+        FontSize = 11,
+        FontWeight = Microsoft.UI.Text.FontWeights.Bold,
+        CharacterSpacing = 60,   // ~0.06em (units are 1/1000 em)
+        Foreground = foreground,
+        Margin = new Thickness(8, 8, 8, 2),
+    };
+
+    private static Border BuildSlashArgPopup(
+        GatewayCommand cmd, IReadOnlyList<GatewayCommandArgChoice> choices,
+        int selectedIndex, Action<GatewayCommandArgChoice> onPick)
+    {
+        var primary = (Brush)Microsoft.UI.Xaml.Application.Current.Resources["TextFillColorPrimaryBrush"];
+        var secondary = (Brush)Microsoft.UI.Xaml.Application.Current.Resources["TextFillColorSecondaryBrush"];
+        var selectedBg = (Brush)Microsoft.UI.Xaml.Application.Current.Resources["SubtleFillColorSecondaryBrush"];
+
+        var list = new StackPanel { Orientation = Orientation.Vertical };
+        // Header echoes the chosen command + its argument description so the user
+        // keeps context while choosing a value. Falls back to the command's own
+        // description, then just the command name.
+        var argDesc = cmd.Args?.FirstOrDefault()?.Description;
+        var headerText = !string.IsNullOrWhiteSpace(argDesc)
+            ? $"{cmd.DisplayName()}  {argDesc}"
+            : !string.IsNullOrWhiteSpace(cmd.Description)
+                ? $"{cmd.DisplayName()}  {cmd.Description}"
+                : cmd.DisplayName();
+        list.Children.Add(new TextBlock
+        {
+            Text = headerText,
+            FontSize = 11,
+            FontWeight = Microsoft.UI.Text.FontWeights.SemiBold,
+            Foreground = (Brush)Microsoft.UI.Xaml.Application.Current.Resources["TextFillColorTertiaryBrush"],
+            TextTrimming = TextTrimming.CharacterEllipsis,
+            MaxLines = 1,
+            Margin = new Thickness(8, 6, 8, 2),
+        });
+        for (int i = 0; i < choices.Count; i++)
+            list.Children.Add(SlashArgRow(cmd, choices[i], i == selectedIndex, primary, secondary, selectedBg, onPick));
+
+        var scroll = new ScrollViewer
+        {
+            VerticalScrollBarVisibility = Microsoft.UI.Xaml.Controls.ScrollBarVisibility.Auto,
+            HorizontalScrollBarVisibility = Microsoft.UI.Xaml.Controls.ScrollBarVisibility.Disabled,
+            MaxHeight = 280,
+            Content = list,
+        };
+        return SlashShell(scroll);
+    }
+
+    private static Button SlashArgRow(
+        GatewayCommand cmd, GatewayCommandArgChoice choice, bool selected,
+        Brush primary, Brush secondary, Brush selectedBg, Action<GatewayCommandArgChoice> onPick)
+    {
+        var label = string.IsNullOrWhiteSpace(choice.Label) ? choice.Value : choice.Label;
+        var row = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 8 };
+        row.Children.Add(new TextBlock
+        {
+            Text = label,
+            FontSize = 13,
+            FontWeight = Microsoft.UI.Text.FontWeights.SemiBold,
+            Foreground = primary,
+            VerticalAlignment = VerticalAlignment.Center,
+        });
+        row.Children.Add(new TextBlock
+        {
+            Text = $"{cmd.DisplayName()} {choice.Value}",
+            FontSize = 12,
+            Foreground = secondary,
+            VerticalAlignment = VerticalAlignment.Center,
+            TextTrimming = TextTrimming.CharacterEllipsis,
+            MaxLines = 1,
+        });
+
+        var btn = new Button
+        {
+            Content = row,
+            Padding = new Thickness(8, 7, 8, 7),
+            HorizontalAlignment = HorizontalAlignment.Stretch,
+            HorizontalContentAlignment = HorizontalAlignment.Left,
+            CornerRadius = new CornerRadius(6),
+            Background = selected ? selectedBg : new SolidColorBrush(Colors.Transparent),
+            BorderThickness = new Thickness(0),
+        };
+        btn.Click += (_, _) => onPick(choice);
+        return btn;
+    }
+
+    private static Border SlashShell(UIElement child)
+    {
+        // Floating, opaque, elevated container for the slash menu. Uses the same
+        // 8px corner radius + default surface stroke as the composer card, with a
+        // soft shadow so the menu reads as a distinct layer over the chat content.
+        var res = Microsoft.UI.Xaml.Application.Current.Resources;
+
+        // Match the composer input's background, but OPAQUE. TextControlBackground
+        // is a semi-transparent overlay (fine over the solid composer card, but it
+        // would show chat content through this floating popup), so composite it
+        // over the base surface into a solid color.
+        Brush background;
+        if (res["TextControlBackground"] as SolidColorBrush is { } overlay
+            && res["SolidBackgroundFillColorBaseBrush"] as SolidColorBrush is { } baseBrush)
+        {
+            var a = overlay.Color.A / 255.0;
+            byte Mix(byte b, byte o) => (byte)Math.Round(b * (1 - a) + o * a);
+            var o = overlay.Color;
+            var b = baseBrush.Color;
+            background = new SolidColorBrush(
+                global::Windows.UI.Color.FromArgb(255, Mix(b.R, o.R), Mix(b.G, o.G), Mix(b.B, o.B)));
+        }
+        else
+        {
+            background = (Brush)res["SolidBackgroundFillColorBaseBrush"];
+        }
+
+        var shell = new Border
+        {
+            Background = background,
+            BorderBrush = (Brush)res["SurfaceStrokeColorDefaultBrush"],
+            BorderThickness = new Thickness(1),
+            CornerRadius = new CornerRadius(8),
+            Padding = new Thickness(4),
+            Child = child,
+        };
+        shell.Translation = new System.Numerics.Vector3(0, 0, 32);
+        shell.Shadow = new Microsoft.UI.Xaml.Media.ThemeShadow();
+        return shell;
+    }
+
+    // Highlights every case-insensitive occurrence of the typed query inside a
+    // row TextBlock (command name / description) with a soft accent tint, so it's
+    // clear what the filter matched. Uses TextHighlighter (rectangular) because it
+    // is the only WinUI text-highlight that doesn't disturb the line layout —
+    // inline rounded "chip" elements (InlineUIContainer) render as superscript and
+    // break the baseline. No-op when the query is empty or shorter than the text.
+    private static void ApplyQueryHighlight(TextBlock tb, string? query)
+    {
+        tb.TextHighlighters.Clear();
+        var text = tb.Text ?? "";
+        var q = (query ?? "").Trim().TrimStart('/').Trim();
+        if (q.Length == 0 || text.Length < q.Length) return;
+
+        var accent = Microsoft.UI.Xaml.Application.Current.Resources["AccentFillColorDefaultBrush"] as SolidColorBrush
+            ?? new SolidColorBrush(Microsoft.UI.Colors.SteelBlue);
+        // IMPORTANT: TextHighlighter ignores SolidColorBrush.Opacity (unlike a
+        // normal element background), so the alpha must be baked into the Color
+        // itself — otherwise it renders the full, vivid accent. ~12% alpha gives
+        // the same soft, muted blue-grey the old padded chip had.
+        var ac = accent.Color;
+        var tint = global::Windows.UI.Color.FromArgb(31, ac.R, ac.G, ac.B);
+        var highlighter = new Microsoft.UI.Xaml.Documents.TextHighlighter
+        {
+            Background = new SolidColorBrush(tint),
+            // Make the matched text pop over the tint (white in dark theme, near-
+            // black in light) — theme-aware via the primary text brush.
+            Foreground = (Brush)Microsoft.UI.Xaml.Application.Current.Resources["TextFillColorPrimaryBrush"],
+        };
+
+        var i = 0;
+        while (i <= text.Length - q.Length)
+        {
+            var found = text.IndexOf(q, i, StringComparison.OrdinalIgnoreCase);
+            if (found < 0) break;
+            highlighter.Ranges.Add(new Microsoft.UI.Xaml.Documents.TextRange { StartIndex = found, Length = q.Length });
+            i = found + q.Length;
+        }
+
+        if (highlighter.Ranges.Count > 0) tb.TextHighlighters.Add(highlighter);
+    }
+
+    private static Button SlashRow(
+        GatewayCommand cmd, bool selected, string query, Brush primary, Brush secondary, Brush selectedBg, Action<GatewayCommand> onPick)
+    {
+        // Row layout mirrors Mac's .slash-menu-item: icon · /name · [args] on the
+        // left; description + "N options" badge pushed to the right edge (the
+        // description column is star-sized and right-aligned). Args use the mono
+        // font; the name keeps the default font (bold) for readability.
+        var mono = new Microsoft.UI.Xaml.Media.FontFamily("Consolas");
+
+        var grid = new Microsoft.UI.Xaml.Controls.Grid { ColumnSpacing = 8, VerticalAlignment = VerticalAlignment.Center };
+        grid.ColumnDefinitions.Add(new Microsoft.UI.Xaml.Controls.ColumnDefinition { Width = Microsoft.UI.Xaml.GridLength.Auto }); // icon
+        grid.ColumnDefinitions.Add(new Microsoft.UI.Xaml.Controls.ColumnDefinition { Width = Microsoft.UI.Xaml.GridLength.Auto }); // name
+        grid.ColumnDefinitions.Add(new Microsoft.UI.Xaml.Controls.ColumnDefinition { Width = Microsoft.UI.Xaml.GridLength.Auto }); // args
+        grid.ColumnDefinitions.Add(new Microsoft.UI.Xaml.Controls.ColumnDefinition { Width = new Microsoft.UI.Xaml.GridLength(1, Microsoft.UI.Xaml.GridUnitType.Star) }); // desc
+        grid.ColumnDefinitions.Add(new Microsoft.UI.Xaml.Controls.ColumnDefinition { Width = Microsoft.UI.Xaml.GridLength.Auto }); // badge
+
+        var icon = new FontIcon
+        {
+            FontFamily = (Microsoft.UI.Xaml.Media.FontFamily)Microsoft.UI.Xaml.Application.Current.Resources["SymbolThemeFontFamily"],
+            Glyph = SlashGlyph(cmd),
+            FontSize = 14,
+            Foreground = secondary,
+            VerticalAlignment = VerticalAlignment.Center,
+        };
+        Microsoft.UI.Xaml.Controls.Grid.SetColumn(icon, 0);
+        grid.Children.Add(icon);
+
+        var name = new TextBlock
+        {
+            Text = cmd.DisplayName(),
+            FontSize = 13,
+            FontWeight = Microsoft.UI.Text.FontWeights.SemiBold,
+            Foreground = primary,
+            VerticalAlignment = VerticalAlignment.Center,
+        };
+        Microsoft.UI.Xaml.Controls.Grid.SetColumn(name, 1);
+        grid.Children.Add(name);
+        ApplyQueryHighlight(name, query);
+
+        var args = cmd.ArgTemplate();
+        if (!string.IsNullOrWhiteSpace(args))
+        {
+            var argBlock = new TextBlock
+            {
+                Text = args,
+                FontSize = 12,
+                FontFamily = mono,
+                Foreground = secondary,
+                Opacity = 0.75,
+                VerticalAlignment = VerticalAlignment.Center,
+            };
+            Microsoft.UI.Xaml.Controls.Grid.SetColumn(argBlock, 2);
+            grid.Children.Add(argBlock);
+        }
+
+        if (!string.IsNullOrWhiteSpace(cmd.Description))
+        {
+            var desc = new TextBlock
+            {
+                Text = cmd.Description!,
+                FontSize = 12,
+                Foreground = secondary,
+                VerticalAlignment = VerticalAlignment.Center,
+                HorizontalAlignment = HorizontalAlignment.Right,
+                TextAlignment = Microsoft.UI.Xaml.TextAlignment.Right,
+                TextTrimming = TextTrimming.CharacterEllipsis,
+                MaxLines = 1,
+            };
+            Microsoft.UI.Xaml.Controls.Grid.SetColumn(desc, 3);
+            grid.Children.Add(desc);
+            ApplyQueryHighlight(desc, query);
+        }
+
+        var opts = cmd.OptionCount();
+        if (opts > 0)
+        {
+            var badge = SlashBadge($"{opts} options");
+            Microsoft.UI.Xaml.Controls.Grid.SetColumn(badge, 4);
+            grid.Children.Add(badge);
+        }
+
+        var btn = new Button
+        {
+            Content = grid,
+            Padding = new Thickness(8, 7, 8, 7),
+            HorizontalAlignment = HorizontalAlignment.Stretch,
+            // Stretch the content so the star-sized description column fills the
+            // row and its right-alignment actually pushes desc/badge to the edge.
+            HorizontalContentAlignment = HorizontalAlignment.Stretch,
+            CornerRadius = new CornerRadius(6),
+            Background = selected ? selectedBg : new SolidColorBrush(Colors.Transparent),
+            BorderThickness = new Thickness(0),
+        };
+        btn.Click += (_, _) => onPick(cmd);
+        // Auto-scroll: when this is the keyboard-selected row, bring it into view
+        // once it mounts so arrow navigation past the visible fold follows the
+        // selection (the popup content is rebuilt each render, so Loaded fires per
+        // navigation step). No animation to keep keypress scrolling snappy.
+        if (selected)
+        {
+            btn.Loaded += (_, _) =>
+                btn.StartBringIntoView(new Microsoft.UI.Xaml.BringIntoViewOptions { AnimationDesired = false });
+        }
+        return btn;
+    }
+
+    // Mirrors Mac's COMMAND_ICON_OVERRIDES (slash-commands.ts): icon keyed by
+    // normalized command name, defaulting to the command-prompt glyph. Lucide
+    // names are mapped to their nearest Segoe Fluent equivalents.
+    private static string SlashGlyph(GatewayCommand cmd)
+    {
+        var name = (cmd.NativeName ?? cmd.DisplayName()).Trim().TrimStart('/').ToLowerInvariant();
+        name = name.Replace(':', '_').Replace('.', '_').Replace('-', '_');
+        return name switch
+        {
+            "help" or "commands" => "\uE82D",        // book
+            "status" or "usage" => "\uE9D9",          // bar chart
+            "export" or "export_session" => "\uE896", // download
+            "skill" or "fast" => "\uE945",            // lightning (zap)
+            "model" or "models" or "think" => "\uE713", // model/options (brain→settings)
+            "new" => "\uE710",                         // plus
+            "reset" or "redirect" => "\uE72C",         // refresh
+            "compact" => "\uE9F3",                     // loader
+            "stop" => "\uE71A",                        // stop
+            "clear" => "\uE74D",                       // trash
+            "agents" => "\uE7F4",                      // monitor
+            "subagents" => "\uE8B7",                   // folder
+            "steer" => "\uE724",                       // send
+            "tts" => "\uE767",                         // volume
+            _ => "\uE756",                              // command prompt (terminal default)
+        };
+    }
+
+    // Accent-tinted pill mirroring Mac's .slash-menu-badge (accent text on a
+    // ~14% accent fill).
+    private static Border SlashBadge(string text)
+    {
+        var accent = Microsoft.UI.Xaml.Application.Current.Resources["AccentFillColorDefaultBrush"] as SolidColorBrush
+            ?? new SolidColorBrush(Microsoft.UI.Colors.SteelBlue);
+        return new Border
+        {
+            Padding = new Thickness(6, 1, 6, 1),
+            CornerRadius = new CornerRadius(4),
+            Background = new SolidColorBrush(accent.Color) { Opacity = 0.14 },
+            VerticalAlignment = VerticalAlignment.Center,
+            Child = new TextBlock
+            {
+                Text = text,
+                FontSize = 10,
+                FontWeight = Microsoft.UI.Text.FontWeights.SemiBold,
+                Foreground = accent,
+            },
+        };
+    }
+
+    /// <summary>
+    /// Creates (once) and drives the floating slash-menu Popup so it overlays
+    /// just above the composer without affecting layout. Closed by clearing the
+    /// content or when the trigger is no longer active.
+    /// </summary>
+    private static void DriveSlashPopup(
+        Ref<Microsoft.UI.Xaml.Controls.Primitives.Popup?> popupRef,
+        TextBox anchor,
+        FrameworkElement? content,
+        bool visible)
+    {
+        var popup = popupRef.Current;
+        if (popup is null)
+        {
+            popup = new Microsoft.UI.Xaml.Controls.Primitives.Popup
+            {
+                IsLightDismissEnabled = false,
+                ShouldConstrainToRootBounds = true,
+            };
+            popupRef.Current = popup;
+        }
+
+        if (!visible || content is null || anchor.XamlRoot is null)
+        {
+            popup.IsOpen = false;
+            popup.Child = null;
+            popup.PlacementTarget = null;
+            return;
+        }
+
+        var width = SlashPopupWidth(anchor.ActualWidth > 0 ? anchor.ActualWidth : 360);
+        if (content is FrameworkElement fe) fe.Width = width;
+
+        popup.XamlRoot = anchor.XamlRoot;
+        popup.PlacementTarget = anchor;
+        popup.DesiredPlacement = Microsoft.UI.Xaml.Controls.Primitives.PopupPlacementMode.Top;
+        popup.Child = content;
+        popup.IsOpen = true;
+    }
+
+    /// <summary>
+    /// Synchronously builds a <see cref="Microsoft.UI.Xaml.Media.Imaging.BitmapImage"/>
+    /// from a base64-encoded image payload (PNG/JPEG/etc.). Returns
+    /// <c>null</c> if the base64 string can't be decoded or the bitmap can't
+    /// be initialized — callers should fall back to a glyph in that case.
+    /// </summary>
+    private static Microsoft.UI.Xaml.Media.Imaging.BitmapImage? TryCreateBitmapFromBase64(string base64)
+    {
+        try
+        {
+            var bytes = Convert.FromBase64String(base64);
+            var stream = new global::Windows.Storage.Streams.InMemoryRandomAccessStream();
+            using (var writer = new global::Windows.Storage.Streams.DataWriter(stream))
+            {
+                writer.WriteBytes(bytes);
+                writer.StoreAsync().AsTask().GetAwaiter().GetResult();
+                writer.DetachStream();
+            }
+            stream.Seek(0);
+            var bmp = new Microsoft.UI.Xaml.Media.Imaging.BitmapImage();
+            bmp.SetSource(stream);
+            return bmp;
+        }
+        catch
+        {
+            return null;
+        }
+    }
+
+    /// <summary>
+    /// If the clipboard contains a bitmap, reads it, re-encodes as PNG, and
+    /// returns a <see cref="ChatAttachment"/>. Returns <c>null</c> if no
+    /// bitmap is present or the bitmap exceeds <see cref="ChatAttachment.MaxSizeBytes"/>.
+    /// </summary>
+    private static async Task<ChatAttachment?> TryReadImageFromClipboardAsync()
+    {
+        var content = global::Windows.ApplicationModel.DataTransfer.Clipboard.GetContent();
+        if (content is null) return null;
+        if (!content.Contains(global::Windows.ApplicationModel.DataTransfer.StandardDataFormats.Bitmap))
+            return null;
+
+        var streamRef = await content.GetBitmapAsync();
+        using var inStream = await streamRef.OpenReadAsync();
+
+        // Decode then re-encode as PNG so the gateway always receives a
+        // self-describing image (clipboard bitmaps on Windows are often raw
+        // CF_DIB and lack a recognizable container).
+        var decoder = await global::Windows.Graphics.Imaging.BitmapDecoder.CreateAsync(inStream);
+        var softwareBitmap = await decoder.GetSoftwareBitmapAsync();
+
+        var outStream = new global::Windows.Storage.Streams.InMemoryRandomAccessStream();
+        var encoder = await global::Windows.Graphics.Imaging.BitmapEncoder.CreateAsync(
+            global::Windows.Graphics.Imaging.BitmapEncoder.PngEncoderId, outStream);
+        encoder.SetSoftwareBitmap(softwareBitmap);
+        await encoder.FlushAsync();
+
+        var size = (long)outStream.Size;
+        if (size > ChatAttachment.MaxSizeBytes)
+            return null;
+
+        outStream.Seek(0);
+        var buffer = new byte[size];
+        using (var reader = new global::Windows.Storage.Streams.DataReader(outStream.GetInputStreamAt(0)))
+        {
+            await reader.LoadAsync((uint)size);
+            reader.ReadBytes(buffer);
+        }
+
+        // Use a timestamp filename — clipboard bitmaps have no original name.
+        var fileName = $"pasted-image-{DateTime.Now:yyyyMMdd-HHmmss}.png";
+        return new ChatAttachment
+        {
+            Type = "image",
+            MimeType = "image/png",
+            FileName = fileName,
+            Content = Convert.ToBase64String(buffer),
+            SizeBytes = size
+        };
+    }
+}
diff --git a/src/OpenClaw.Tray.WinUI/Chat/ChatEntryMetadata.cs b/src/OpenClaw.Tray.WinUI/Chat/ChatEntryMetadata.cs
index bcd4e76ad..16e9b8f59 100644
--- a/src/OpenClaw.Tray.WinUI/Chat/ChatEntryMetadata.cs
+++ b/src/OpenClaw.Tray.WinUI/Chat/ChatEntryMetadata.cs
@@ -44,6 +44,22 @@ namespace OpenClawTray.Chat;
 /// Raw token contribution reported for this assistant response before it was
 /// converted into the displayed cumulative session snapshot.
 /// </param>
+/// <param name="GatewayMessageId">
+/// Gateway-assigned stable message id from <c>__openclaw.id</c>, when known.
+/// Used to reconcile live entries with later <c>chat.history</c> rows.
+/// </param>
+/// <param name="OpenClawSeq">
+/// Monotonic per-session sequence from <c>__openclaw.seq</c>, when known.
+/// Prefer this over timestamps for transcript ordering and dedupe.
+/// </param>
+/// <param name="IsLocalQueuedSend">
+/// True for a locally queued user prompt promoted into the transcript before
+/// gateway history has provided its stable id/sequence.
+/// </param>
+/// <param name="LocalQueuedMessageId">
+/// Stable client-side id for a local send. Used to attach a later gateway
+/// identity to the exact optimistic transcript row without text matching.
+/// </param>
 public sealed record ChatEntryMetadata(
     DateTimeOffset? Timestamp,
     string? Model,
@@ -52,4 +68,8 @@ public sealed record ChatEntryMetadata(
     int? ResponseTokens = null,
     int? ContextPercent = null,
     long? ContextTokens = null,
-    int? UsageContributionTokens = null);
+    int? UsageContributionTokens = null,
+    string? GatewayMessageId = null,
+    int? OpenClawSeq = null,
+    bool IsLocalQueuedSend = false,
+    string? LocalQueuedMessageId = null);
diff --git a/src/OpenClaw.Tray.WinUI/Chat/ChatMarkdownSanitizer.cs b/src/OpenClaw.Tray.WinUI/Chat/ChatMarkdownSanitizer.cs
index a33bdb1f4..f5c1715f6 100644
--- a/src/OpenClaw.Tray.WinUI/Chat/ChatMarkdownSanitizer.cs
+++ b/src/OpenClaw.Tray.WinUI/Chat/ChatMarkdownSanitizer.cs
@@ -36,7 +36,7 @@ internal static class ChatMarkdownSanitizer
     /// <summary>
     /// Flatten a parsed Markdown link's display text + destination URI
     /// into a single inert plain-text string. Used by the
-    /// <c>OpenClawChatTimeline</c> rendering path so
+    /// <c>ChatTimeline</c> rendering path so
     /// that links the parser DOES emit (bare URLs, autolinks
     /// <c>&lt;https://…&gt;</c>) collapse to non-clickable text instead
     /// of <see cref="System.Windows.Documents.Hyperlink"/>-style runs.
diff --git a/src/OpenClaw.Tray.WinUI/Chat/OpenClawChatRoot.cs b/src/OpenClaw.Tray.WinUI/Chat/ChatRoot.cs
similarity index 87%
rename from src/OpenClaw.Tray.WinUI/Chat/OpenClawChatRoot.cs
rename to src/OpenClaw.Tray.WinUI/Chat/ChatRoot.cs
index 69776f58a..27c6565ec 100644
--- a/src/OpenClaw.Tray.WinUI/Chat/OpenClawChatRoot.cs
+++ b/src/OpenClaw.Tray.WinUI/Chat/ChatRoot.cs
@@ -22,7 +22,7 @@ namespace OpenClawTray.Chat;
 /// session navigation (via the existing NavigationView/SessionsPage) so
 /// no Sidebar is rendered here.
 /// </summary>
-public sealed class OpenClawChatRoot : Component
+public sealed class ChatRoot : Component
 {
     private static bool s_showToolCalls = true;
     private static int s_toolCallsCollapseVersion;
@@ -38,7 +38,7 @@ public sealed class OpenClawChatRoot : Component
     private readonly Action<bool>? _onSpeakerMuteChanged;
     private readonly bool _initialMuted;
     private readonly bool _isCompact;
-    private Action<ChatAttachment>? _onFileAttached;
+    private Action<IReadOnlyList<ChatAttachment>>? _onFilesAttached;
     private Action<string?>? _setVoiceTranscript;
     private Action<float>? _setVoiceAudioLevel;
     private Action? _scrollToBottomToken;
@@ -56,12 +56,12 @@ public sealed class OpenClawChatRoot : Component
 
     /// <summary>
     /// Callback invoked by the host window/page after a file is selected.
-    /// Sets the pending attachment and triggers a re-render.
+    /// Appends pending attachments and triggers a re-render.
     /// </summary>
-    public Action<ChatAttachment>? OnFileAttached
+    public Action<IReadOnlyList<ChatAttachment>>? OnFilesAttached
     {
-        get => _onFileAttached;
-        set => _onFileAttached = value;
+        get => _onFilesAttached;
+        set => _onFilesAttached = value;
     }
 
     /// <summary>
@@ -83,7 +83,7 @@ public Action<float>? SetVoiceAudioLevel
         set => _setVoiceAudioLevel = value;
     }
 
-    public OpenClawChatRoot(
+    public ChatRoot(
         IChatDataProvider provider,
         string? initialThreadId = null,
         Func<string, Task>? onReadAloud = null,
@@ -109,22 +109,37 @@ public OpenClawChatRoot(
 
     public override Element Render()
     {
-        var pendingAttachment = UseState<ChatAttachment?>(null, threadSafe: true);
+        var pendingAttachments = UseState<IReadOnlyList<ChatAttachment>>(Array.Empty<ChatAttachment>(), threadSafe: true);
+        var pendingAttachmentsRef = UseRef<IReadOnlyList<ChatAttachment>>(pendingAttachments.Value);
+        pendingAttachmentsRef.Current = pendingAttachments.Value;
         var speakerMuted = UseState(_initialMuted, threadSafe: true);
         var voiceTranscript = UseState<string?>(null, threadSafe: true);
         var voiceAudioLevel = UseState(0f, threadSafe: true);
         var scrollToBottomToken = UseState(0, threadSafe: true);
         var showToolCalls = UseState(s_showToolCalls, threadSafe: true);
         var toolCallsCollapseVersion = UseState(s_toolCallsCollapseVersion, threadSafe: true);
+        var chatSurfaceHeight = UseState<double?>(null, threadSafe: true);
         // Guards a duplicate suggestion-button click before the snapshot
         // reflects the optimistic local user entry (which then ordinarily
         // hides the zero-state buttons via the isEmptyConversation check).
         // Cleared automatically when the next snapshot arrives.
         var firstSendInFlight = UseState(false, threadSafe: true);
 
-        // Wire the OnFileAttached callback so the host window/page can set the
-        // pending attachment after the file picker completes.
-        _onFileAttached = att => pendingAttachment.Set(att);
+        void SetPendingAttachments(IReadOnlyList<ChatAttachment> attachments)
+        {
+            pendingAttachmentsRef.Current = attachments;
+            pendingAttachments.Set(attachments);
+        }
+
+        // Wire the attachment callback so the host window/page can append
+        // pending attachments after the file picker completes.
+        _onFilesAttached = attachments =>
+        {
+            if (attachments.Count == 0)
+                return;
+
+            SetPendingAttachments(pendingAttachmentsRef.Current.Concat(attachments).ToArray());
+        };
         _setVoiceTranscript = voiceTranscript.Set;
         _setVoiceAudioLevel = voiceAudioLevel.Set;
         _scrollToBottomToken = () => scrollToBottomToken.Set(scrollToBottomToken.Value + 1);
@@ -246,6 +261,7 @@ Element BuildLoadingElement()
                 Id = composeKey,
                 Title = lastState?.ThreadTitle ?? "OpenClaw Windows Tray",
                 Model = lastState?.Model,
+                ModelProvider = lastState?.ModelProvider,
                 Status = ChatThreadStatus.Running,
                 Activity = ChatActivity.Idle,
             };
@@ -271,6 +287,22 @@ Element BuildLoadingElement()
         var timeline = effectiveThread is not null && snapshot.Timelines.TryGetValue(effectiveThread.Id, out var tl)
             ? tl
             : ChatTimelineState.Initial();
+        var timelineGeneration = 0L;
+        if (effectiveThread is not null
+            && snapshot.TimelineGenerations is { } generations
+            && generations.TryGetValue(effectiveThread.Id, out var generation))
+        {
+            timelineGeneration = generation;
+        }
+        var queuedMessages = Array.Empty<ChatQueuedMessage>();
+        if (effectiveThread is not null
+            && snapshot.QueuedMessagesByThread is { } queuedByThread
+            && queuedByThread.TryGetValue(effectiveThread.Id, out var queuedForThread))
+        {
+            queuedMessages = queuedForThread.ToArray();
+        }
+        var hasPendingQueuedSend = queuedMessages.Any(message =>
+            message.SendState is ChatQueuedMessageSendState.Queued or ChatQueuedMessageSendState.Sending);
 
         var entries = (IReadOnlyList<ChatTimelineItem>)timeline.Entries;
         var connectedRaw = snapshot.ConnectionStatus;
@@ -452,18 +484,19 @@ Element BuildLoadingElement()
                     if (effectiveThread is { } t)
                     {
                         firstSendInFlight.Set(true);
-                        OnSend(t.Id, suggestion, null);
+                        OnSend(t.Id, suggestion, Array.Empty<ChatAttachment>());
                     }
                 }, suggestionsDisabled: firstSendInFlight.Value);
         }
         else
         {
-            body = Component<OpenClawChatTimeline, OpenClawChatTimelineProps>(new(
+            body = Component<ChatTimeline, ChatTimelineProps>(new(
                 SessionId: effectiveThread.Id,
                 Entries: entries,
                 HasMoreHistory: false,
                 OnLoadMoreHistory: null,
                 EntryMetadata: entryMeta,
+                TimelineGeneration: timelineGeneration,
                 UserSenderLabel: "OpenClaw Windows Tray",
                 AssistantSenderLabel: assistantSenderLabel,
                 DefaultModel: effectiveThread.Model,
@@ -476,7 +509,7 @@ Element BuildLoadingElement()
                     : null,
                 OnStopSpeaking: _onStopSpeaking,
                 ScrollToBottomToken: scrollToBottomToken.Value,
-                OnPermissionResponse: (rid, allow) => OnPermission(effectiveThread.Id!, rid, allow)));
+                OnPermissionResponse: (rid, action) => OnPermission(effectiveThread.Id!, rid, action)));
         }
 
         // Session list for the composer dropdown — grouped by agent, keyed by
@@ -526,7 +559,7 @@ Element BuildLoadingElement()
         }
 
         Element composer = effectiveThread is { } composerThread
-            ? Component<OpenClawComposer, OpenClawComposerProps>(new(
+            ? Component<ChatComposer, ChatComposerProps>(new(
                 ConnectionState: connState,
                 TurnActive: turnActiveOverride,
                 ChannelLabel: composerThread.Title ?? "OpenClaw Windows Tray",
@@ -534,11 +567,14 @@ Element BuildLoadingElement()
                 AvailableChannels: channelGroups,
                 AvailableModels: snapshot.AvailableModels,
                 CurrentModel: composerThread.Model,
+                CurrentModelProvider: composerThread.ModelProvider,
                 CurrentThinkingLevel: composerThread.ThinkingLevel,
-                OnSend: (msg, att) =>
+                MessageOptionsDisabled: turnActiveOverride || hasPendingQueuedSend,
+                ModelChoices: snapshot.ModelChoices,
+                OnSend: (msg, attachments) =>
                 {
-                    pendingAttachment.Set(null);
-                    OnSend(composerThread.Id!, msg, att);
+                    SetPendingAttachments(Array.Empty<ChatAttachment>());
+                    OnSend(composerThread.Id!, msg, attachments);
                 },
                 OnStop: () => OnStop(composerThread.Id!),
                 OnChannelChanged: id =>
@@ -546,13 +582,16 @@ Element BuildLoadingElement()
                     selectedIdState.Set(id);
                     selectedIdRef.Current = id;
                 },
-                OnModelChanged: model => RunFireAndForget(ct => _provider.SetModelAsync(composerThread.Id!, model, ct)),
+                OnModelChanged: model => ObserveFireAndForget(_provider.SetModelAsync(composerThread.Id!, model)),
+                OnModelCleared: () => ObserveFireAndForget(_provider.ClearModelAsync(composerThread.Id!)),
                 OnThinkingLevelChanged: level => RunFireAndForget(ct => _provider.SetThinkingLevelAsync(composerThread.Id!, level, ct)),
                 OnPermissionsChanged: allowAll => RunFireAndForget(ct => _provider.SetPermissionModeAsync(composerThread.Id!, allowAll, ct)),
                 OnVoiceRequest: _onVoiceRequest,
                 OnAttachClick: _onAttachClick,
-                PendingAttachment: pendingAttachment.Value,
-                OnAttachmentRemoved: () => pendingAttachment.Set(null),
+                PendingAttachments: pendingAttachments.Value,
+                QueuedMessages: queuedMessages,
+                OnQueuedMessageCancel: queuedMessageId => RunFireAndForget(ct => _provider.CancelQueuedMessageAsync(composerThread.Id!, queuedMessageId, ct)),
+                OnAttachmentRemoved: attachment => SetPendingAttachments(RemoveAttachment(pendingAttachmentsRef.Current, attachment)),
                 IsSpeakerMuted: speakerMuted.Value,
                 OnSpeakerToggle: () =>
                 {
@@ -564,7 +603,7 @@ Element BuildLoadingElement()
                 VoiceTranscript: voiceTranscript.Value,
                 VoiceAudioLevel: voiceAudioLevel.Value,
                 RegisterVoiceStarter: starter => TriggerVoiceRecording = starter,
-                OnAttachmentPasted: att => pendingAttachment.Set(att),
+                OnAttachmentPasted: att => SetPendingAttachments(pendingAttachmentsRef.Current.Concat(new[] { att }).ToArray()),
                 ShowToolCalls: showToolCalls.Value,
                 OnShowToolCallsChanged: visible =>
                 {
@@ -573,17 +612,33 @@ Element BuildLoadingElement()
                     s_showToolCalls = visible;
                     ToolCallsVisibilityChanged?.Invoke(null, EventArgs.Empty);
                 },
-                IsCompact: _isCompact))
+                IsCompact: _isCompact,
+                AvailableCommands: snapshot.AvailableCommands,
+                CommandsSupported: snapshot.CommandsSupported,
+                OnCommandsRequested: () => RunFireAndForget(ct => _provider.EnsureCommandCatalogAsync(ct)),
+                AvailableHeight: chatSurfaceHeight.Value))
             : (bodyIsSkeleton ? RenderSkeletonComposer() : Empty());
 
         var divider = Empty();
         // Composer absorbs the old StatusBar.
+        void SetChatSurfaceHeight(double height)
+        {
+            if (double.IsNaN(height) || double.IsInfinity(height) || height <= 0)
+                return;
+
+            chatSurfaceHeight.Set(Math.Round(height));
+        }
+
         return Grid([GridSize.Star()], [GridSize.Auto, GridSize.Auto, GridSize.Star(), GridSize.Auto],
             header.Grid(row: 0, column: 0),
             divider.Grid(row: 1, column: 0),
             body.Grid(row: 2, column: 0),
             composer.Grid(row: 3, column: 0)
-        );
+        ).OnMount(root =>
+        {
+            SetChatSurfaceHeight(root.ActualHeight);
+            root.SizeChanged += (_, e) => SetChatSurfaceHeight(e.NewSize.Height);
+        });
     }
 
     // Cheap allocation-free probe for "does any group contain a session with
@@ -837,26 +892,43 @@ private static Element PlaceholderEmptyThreadState(string connectionState)
         );
     }
 
-    private void OnSend(string threadId, string message, ChatAttachment? attachment)
+    private void OnSend(string threadId, string message, IReadOnlyList<ChatAttachment> attachments)
     {
         _scrollToBottomToken?.Invoke();
-        IReadOnlyList<ChatAttachment>? attachments = attachment is not null
-            ? new[] { attachment }
-            : null;
-        if (attachments is not null)
-            RunFireAndForget(ct => _provider.SendMessageAsync(threadId, message, ct, attachments));
+        if (attachments.Count > 0)
+            RunFireAndForget(ct => _provider.SendMessageAsync(threadId, message, ct, attachments.ToArray()));
         else
             RunFireAndForget(ct => _provider.SendMessageAsync(threadId, message, ct));
     }
 
+    private static IReadOnlyList<ChatAttachment> RemoveAttachment(
+        IReadOnlyList<ChatAttachment> attachments,
+        ChatAttachment attachment)
+    {
+        var next = new List<ChatAttachment>(attachments.Count);
+        var removed = false;
+        foreach (var current in attachments)
+        {
+            if (!removed && ReferenceEquals(current, attachment))
+            {
+                removed = true;
+                continue;
+            }
+
+            next.Add(current);
+        }
+
+        return removed ? next.ToArray() : attachments;
+    }
+
     private void OnStop(string threadId)
     {
         RunFireAndForget(ct => _provider.StopResponseAsync(threadId, ct));
     }
 
-    private void OnPermission(string threadId, string requestId, bool allow)
+    private void OnPermission(string threadId, string requestId, string action)
     {
-        RunFireAndForget(ct => _provider.RespondToPermissionAsync(threadId, requestId, allow, ct));
+        RunFireAndForget(ct => _provider.RespondToPermissionAsync(threadId, requestId, action, ct));
     }
 
     private static void RunFireAndForget(Func<CancellationToken, Task> op)
@@ -870,6 +942,19 @@ private static void RunFireAndForget(Func<CancellationToken, Task> op)
         });
     }
 
+    private static void ObserveFireAndForget(Task task)
+    {
+        _ = ObserveAsync(task);
+
+        static async Task ObserveAsync(Task task)
+        {
+            try { await task; }
+            // slopwatch-ignore: SW003 Shutdown cancellation or disposal is expected and the caller already preserves the safe state.
+            catch (OperationCanceledException) { /* expected */ }
+            catch (Exception ex) { System.Diagnostics.Trace.WriteLine($"[chat] op failed: {ex}"); }
+        }
+    }
+
     private static async Task LoadAsync(
         IChatDataProvider provider,
         Action<ChatDataSnapshot?> setSnapshot,
diff --git a/src/OpenClaw.Tray.WinUI/Chat/ChatTimeline.Helpers.cs b/src/OpenClaw.Tray.WinUI/Chat/ChatTimeline.Helpers.cs
new file mode 100644
index 000000000..c3d0c886c
--- /dev/null
+++ b/src/OpenClaw.Tray.WinUI/Chat/ChatTimeline.Helpers.cs
@@ -0,0 +1,281 @@
+using Microsoft.UI;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Documents;
+using Microsoft.UI.Xaml.Media;
+using OpenClaw.Chat;
+using OpenClawTray.FunctionalUI;
+using OpenClawTray.FunctionalUI.Core;
+using Windows.UI;
+using static OpenClawTray.FunctionalUI.Factories;
+
+namespace OpenClawTray.Chat;
+
+public partial class ChatTimeline
+{
+    // SECURITY (chat-rubber-duck HIGH 1 / MEDIUM 3): chat-bubble Markdown is
+    // rendered as sanitized inert text that:
+    //   1. Renders images as inert ``[Image: <alt>]`` text (no Uri fetch) —
+    //      blocks SSRF / tracking-pixel beacons triggered by a compromised
+    //      gateway, malicious tool output, or a prompt-injected model.
+    //   2. Pre-strips inline link / image / ref-def syntax via
+    //      <see cref="ChatMarkdownSanitizer.Sanitize(string?)"/> so explicit
+    //      ``[text](url)`` syntax never reaches the parser.
+    //   3. Renders raw HTML blocks as selectable plain text.
+    //      Net effect: no click-to-navigate hyperlink or network-fetching
+    //      image can be manufactured by untrusted Markdown inside a chat bubble.
+    private static Element SafeMarkdownText(string? text)
+    {
+        if (!Markdown.ChatMarkdownRenderer.ContainsBlockMarkdown(text))
+        {
+            return TextBlock(string.Empty)
+                .Set(t =>
+                {
+                    t.TextWrapping = TextWrapping.Wrap;
+                    t.IsTextSelectionEnabled = true;
+                    ApplySafeMarkdownInlines(t, text);
+                });
+        }
+
+        return Markdown.ChatMarkdownRenderer.Render(text)
+               ?? TextBlock(text ?? string.Empty)
+                    .Set(t => { t.TextWrapping = TextWrapping.Wrap; t.IsTextSelectionEnabled = true; });
+    }
+
+    private static readonly System.Runtime.CompilerServices.ConditionalWeakTable<TextBlock, string>
+        s_plainCache = new();
+
+    private const string MonoFontFamilySource = "Cascadia Code, Cascadia Mono, Consolas";
+    private static readonly System.Runtime.CompilerServices.ConditionalWeakTable<
+        Microsoft.UI.Dispatching.DispatcherQueue, FontFamily> s_monoFontByDispatcher = new();
+    private const string ChatTextFontFamilySource = "Segoe UI Variable Text, Segoe UI";
+    private static readonly System.Runtime.CompilerServices.ConditionalWeakTable<
+        Microsoft.UI.Dispatching.DispatcherQueue, FontFamily> s_chatTextFontByDispatcher = new();
+
+    private static FontFamily s_monoFontFamily
+    {
+        get
+        {
+            var dispatcher = Microsoft.UI.Dispatching.DispatcherQueue.GetForCurrentThread();
+            if (dispatcher is null)
+                return new FontFamily(MonoFontFamilySource);
+
+            if (!s_monoFontByDispatcher.TryGetValue(dispatcher, out var family))
+            {
+                family = new FontFamily(MonoFontFamilySource);
+                s_monoFontByDispatcher.Add(dispatcher, family);
+            }
+
+            return family;
+        }
+    }
+
+    private static FontFamily s_chatTextFontFamily
+    {
+        get
+        {
+            var dispatcher = Microsoft.UI.Dispatching.DispatcherQueue.GetForCurrentThread();
+            if (dispatcher is null)
+                return new FontFamily(ChatTextFontFamilySource);
+
+            if (!s_chatTextFontByDispatcher.TryGetValue(dispatcher, out var family))
+            {
+                family = new FontFamily(ChatTextFontFamilySource);
+                s_chatTextFontByDispatcher.Add(dispatcher, family);
+            }
+
+            return family;
+        }
+    }
+
+    private static readonly System.Runtime.CompilerServices.ConditionalWeakTable<
+        Microsoft.UI.Dispatching.DispatcherQueue, SolidColorBrush> s_accentDarkByDispatcher = new();
+    private static readonly System.Runtime.CompilerServices.ConditionalWeakTable<
+        Microsoft.UI.Dispatching.DispatcherQueue, SolidColorBrush> s_hcHighlightByDispatcher = new();
+    private static readonly System.Runtime.CompilerServices.ConditionalWeakTable<
+        Microsoft.UI.Dispatching.DispatcherQueue,
+        global::Windows.UI.ViewManagement.AccessibilitySettings> s_a11yByDispatcher = new();
+
+    private static bool TryDetectHighContrast()
+    {
+        var dispatcher = Microsoft.UI.Dispatching.DispatcherQueue.GetForCurrentThread();
+        if (dispatcher is null)
+        {
+            try { return new global::Windows.UI.ViewManagement.AccessibilitySettings().HighContrast; }
+            catch { return false; }
+        }
+
+        if (!s_a11yByDispatcher.TryGetValue(dispatcher, out var settings))
+        {
+            try
+            {
+                settings = new global::Windows.UI.ViewManagement.AccessibilitySettings();
+                s_a11yByDispatcher.Add(dispatcher, settings);
+            }
+            catch { return false; }
+        }
+
+        try { return settings.HighContrast; }
+        catch
+        {
+            s_a11yByDispatcher.Remove(dispatcher);
+            return false;
+        }
+    }
+
+    private static SolidColorBrush GetUserBubbleSelectionBrush(bool isHighContrast)
+    {
+        var dispatcher = Microsoft.UI.Dispatching.DispatcherQueue.GetForCurrentThread();
+        var table = isHighContrast ? s_hcHighlightByDispatcher : s_accentDarkByDispatcher;
+        var color = isHighContrast
+            ? TryGetThemeColor("SystemColorHighlightColor", Colors.Blue)
+            : TryGetThemeColor("SystemAccentColorDark2", Colors.DarkBlue);
+
+        if (dispatcher is null)
+            return new SolidColorBrush(color);
+
+        if (!table.TryGetValue(dispatcher, out var brush))
+        {
+            brush = new SolidColorBrush(color);
+            table.Add(dispatcher, brush);
+        }
+        else if (brush.Color != color)
+        {
+            brush.Color = color;
+        }
+
+        return brush;
+    }
+
+    private static Color TryGetThemeColor(string key, Color fallback)
+    {
+        try
+        {
+            var app = Application.Current;
+            if (app is null) return fallback;
+            if (app.Resources.TryGetValue(key, out var v))
+            {
+                if (v is Color c) return c;
+                if (v is SolidColorBrush brush) return brush.Color;
+            }
+        }
+        catch (Exception ex) { OpenClawTray.Services.Logger.Debug($"ChatTimeline: resource brush lookup failed (unpackaged/test host?): {ex.Message}"); }
+
+        return fallback;
+    }
+
+    private static void ApplyPlainSelectableInlines(TextBlock textBlock, string? text)
+    {
+        var normalized = text ?? string.Empty;
+        if (textBlock.Inlines.Count > 0
+            && s_plainCache.TryGetValue(textBlock, out var cached)
+            && cached == normalized)
+            return;
+
+        s_plainCache.AddOrUpdate(textBlock, normalized);
+        textBlock.Inlines.Clear();
+        if (normalized.Length > 0)
+            textBlock.Inlines.Add(new Run { Text = normalized });
+    }
+
+    private static readonly System.Runtime.CompilerServices.ConditionalWeakTable<TextBlock, string>
+        s_markdownCache = new();
+
+    private static void ApplySafeMarkdownInlines(TextBlock textBlock, string? text)
+    {
+        if (textBlock.Inlines.Count > 0
+            && s_markdownCache.TryGetValue(textBlock, out var cached)
+            && cached == text)
+            return;
+
+        s_markdownCache.AddOrUpdate(textBlock, text ?? "");
+        textBlock.Inlines.Clear();
+
+        foreach (var segment in ChatMarkdownSanitizer.SanitizeAndSplitStrongEmphasis(text))
+        {
+            if (segment.Text.Length == 0)
+                continue;
+
+            if (segment.IsStrong)
+            {
+                var bold = new Bold();
+                bold.Inlines.Add(new Run { Text = segment.Text });
+                textBlock.Inlines.Add(bold);
+            }
+            else
+            {
+                textBlock.Inlines.Add(new Run { Text = segment.Text });
+            }
+        }
+    }
+
+    static string FormatToolLabel(ChatTimelineItem e)
+    {
+        var text = e.Text ?? "";
+        return e.ToolName switch
+        {
+            "bash" or "powershell" => $"$ {text}",
+            "read" or "view" => text,
+            "edit" or "create" => text,
+            "grep" => $"🔍 {text}",
+            "glob" => $"📂 {text}",
+            "web_fetch" => $"🌐 {text}",
+            "web_search" => $"🔎 {text}",
+            "task" => text,
+            "report_intent" => text,
+            _ => text == e.ToolName || string.IsNullOrEmpty(text) ? e.ToolName ?? "tool" : $"{e.ToolName}: {text}"
+        };
+    }
+
+    static string CapitalizeFirst(string? s)
+    {
+        if (string.IsNullOrEmpty(s)) return string.Empty;
+        return char.ToUpperInvariant(s[0]) + (s.Length > 1 ? s[1..] : string.Empty);
+    }
+
+    static string TryFormatJsonForDisplay(string text)
+    {
+        if (string.IsNullOrWhiteSpace(text)) return text;
+        var trimmed = text.TrimStart();
+        if (trimmed.Length == 0) return text;
+        var first = trimmed[0];
+        if (first != '{' && first != '[') return text;
+        try
+        {
+            using var doc = System.Text.Json.JsonDocument.Parse(trimmed);
+            return System.Text.Json.JsonSerializer.Serialize(doc.RootElement,
+                new System.Text.Json.JsonSerializerOptions { WriteIndented = true });
+        }
+        catch
+        {
+            return text;
+        }
+    }
+
+    private static readonly System.Runtime.CompilerServices.ConditionalWeakTable<byte[], Microsoft.UI.Xaml.Media.Imaging.BitmapImage> _bitmapCache = new();
+
+    static Microsoft.UI.Xaml.Media.Imaging.BitmapImage? TryDecodeBitmap(byte[] bytes)
+    {
+        if (_bitmapCache.TryGetValue(bytes, out var existing))
+            return existing;
+        try
+        {
+            var stream = new global::Windows.Storage.Streams.InMemoryRandomAccessStream();
+            using (var writer = new global::Windows.Storage.Streams.DataWriter(stream))
+            {
+                writer.WriteBytes(bytes);
+                writer.StoreAsync().AsTask().GetAwaiter().GetResult();
+                writer.DetachStream();
+            }
+            stream.Seek(0);
+            var bmp = new Microsoft.UI.Xaml.Media.Imaging.BitmapImage();
+            bmp.SetSource(stream);
+            _bitmapCache.Add(bytes, bmp);
+            return bmp;
+        }
+        catch
+        {
+            return null;
+        }
+    }
+}
diff --git a/src/OpenClaw.Tray.WinUI/Chat/OpenClawChatTimeline.cs b/src/OpenClaw.Tray.WinUI/Chat/ChatTimeline.cs
similarity index 77%
rename from src/OpenClaw.Tray.WinUI/Chat/OpenClawChatTimeline.cs
rename to src/OpenClaw.Tray.WinUI/Chat/ChatTimeline.cs
index 36eae8248..af524e30e 100644
--- a/src/OpenClaw.Tray.WinUI/Chat/OpenClawChatTimeline.cs
+++ b/src/OpenClaw.Tray.WinUI/Chat/ChatTimeline.cs
@@ -10,6 +10,7 @@
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Documents;
 using Microsoft.UI.Xaml.Media;
+using OpenClawTray.Chat.Controls;
 using OpenClawTray.FunctionalUI;
 using OpenClawTray.FunctionalUI.Core;
 using Windows.UI;
@@ -22,7 +23,7 @@ namespace OpenClawTray.Chat;
 /// Extension of <see cref="ChatTimelineProps"/> with OpenClaw-specific
 /// per-entry metadata (<see cref="ChatEntryMetadata"/>) and sender/model
 /// labels used in the per-message footer rendering. Created by
-/// <c>OpenClawChatRoot</c>.
+/// <c>ChatRoot</c>.
 /// </summary>
 /// <param name="EntryMetadata">
 /// Optional per-entry metadata snapshot keyed by <c>ChatTimelineItem.Id</c>.
@@ -38,12 +39,13 @@ namespace OpenClawTray.Chat;
 /// </param>
 /// <param name="ShowToolCalls">When true, renders tool-call progress and usage footer summaries.</param>
 /// <param name="ToolCallsCollapseVersion">Bumps when expanded tool details should be reset.</param>
-public record OpenClawChatTimelineProps(
+public record ChatTimelineProps(
     string? SessionId,
     IReadOnlyList<ChatTimelineItem> Entries,
     bool HasMoreHistory,
     Action? OnLoadMoreHistory,
     IReadOnlyDictionary<string, ChatEntryMetadata>? EntryMetadata = null,
+    long TimelineGeneration = 0,
     string UserSenderLabel = "OpenClaw Windows Tray",
     string AssistantSenderLabel = "Field",
     string? DefaultModel = null,
@@ -54,7 +56,7 @@ public record OpenClawChatTimelineProps(
     Func<string, Task>? OnReadAloud = null,
     Action? OnStopSpeaking = null,
     int ScrollToBottomToken = 0,
-    Action<string, bool>? OnPermissionResponse = null);
+    Action<string, string>? OnPermissionResponse = null);
 
 /// <summary>
 /// OpenClaw-skinned variant of <see cref="ChatTimeline"/> from the vendored
@@ -71,366 +73,8 @@ public record OpenClawChatTimelineProps(
 ///   <item>Reasoning / status entries: muted styling as in upstream.</item>
 /// </list>
 /// </summary>
-public class OpenClawChatTimeline : Component<OpenClawChatTimelineProps>
+public partial class ChatTimeline : Component<ChatTimelineProps>
 {
-    const double FollowThreshold = 60;
-
-    /// <summary>
-    /// Static scroll-offset store shared across all timeline instances so that
-    /// scroll position survives page navigation (which recreates the page and
-    /// component instances). Bounded to avoid unbounded memory growth.
-    /// </summary>
-    private static readonly Dictionary<string, double> s_sessionOffsets = new();
-    private const int MaxSessionOffsets = 50;
-
-    // SECURITY (chat-rubber-duck HIGH 1 / MEDIUM 3): chat-bubble Markdown is
-    // rendered as sanitized inert text that:
-    //   1. Renders images as inert ``[Image: <alt>]`` text (no Uri fetch) —
-    //      blocks SSRF / tracking-pixel beacons triggered by a compromised
-    //      gateway, malicious tool output, or a prompt-injected model.
-    //   2. Pre-strips inline link / image / ref-def syntax via
-    //      <see cref="ChatMarkdownSanitizer.Sanitize(string?)"/> so explicit
-    //      ``[text](url)`` syntax never reaches the parser.
-    //   3. Renders raw HTML blocks as selectable plain text.
-    //      Net effect: no click-to-navigate hyperlink or network-fetching
-    //      image can be manufactured by untrusted Markdown inside a chat bubble.
-    private static Element SafeMarkdownText(string? text)
-    {
-        // Fast path: bubbles with no block-level markdown (the common case)
-        // keep the lightweight inline sanitizer to avoid the parser cost.
-        if (!Markdown.ChatMarkdownRenderer.ContainsBlockMarkdown(text))
-        {
-            return TextBlock(string.Empty)
-                .Set(t =>
-                {
-                    t.TextWrapping = TextWrapping.Wrap;
-                    t.IsTextSelectionEnabled = true;
-                    ApplySafeMarkdownInlines(t, text);
-                });
-        }
-        return Markdown.ChatMarkdownRenderer.Render(text)
-               ?? TextBlock(text ?? string.Empty)
-                    .Set(t => { t.TextWrapping = TextWrapping.Wrap; t.IsTextSelectionEnabled = true; });
-    }
-
-    // Cache plain (non-markdown) text per TextBlock so we can reuse the
-    // assistant-bubble's Inlines-based render path for user prompts without
-    // re-clearing/rebuilding the run on every re-render. Going through
-    // Inlines (instead of the TextBlock.Text property) avoids a WinUI quirk
-    // where setting Text on a selection-enabled TextBlock during a parent
-    // re-render that fires immediately after the user finishes selecting can
-    // leave the glyph layer visually empty until the next focus change.
-    private static readonly System.Runtime.CompilerServices.ConditionalWeakTable<TextBlock, string>
-        s_plainCache = new();
-
-    // FontFamily instances are immutable, but `new FontFamily(...)` per
-    // render allocates a fresh CLR object whose reference does not equal
-    // the previous one. Reassigning a referentially-different FontFamily
-    // to a TextBlock invalidates its inline runs even when the source
-    // string is identical, which (in the tool-output panel) makes
-    // multi-line wrapped text vanish during a pointer-exit re-render.
-    // Caching sidesteps both the GC pressure and the invalidation.
-    //
-    // FontFamily is a DependencyObject with thread affinity, so a single
-    // process-wide singleton would crash with RPC_E_WRONG_THREAD if a
-    // second window on a different dispatcher ever tried to read it.
-    // Keying by DispatcherQueue mirrors the brush cache above: one
-    // shared instance per window, collected with its dispatcher.
-    // Off-dispatcher callers (tests, design-time) get a one-shot
-    // uncached instance — correct, just not reused.
-    private const string MonoFontFamilySource = "Cascadia Code, Cascadia Mono, Consolas";
-    private static readonly System.Runtime.CompilerServices.ConditionalWeakTable<
-        Microsoft.UI.Dispatching.DispatcherQueue, FontFamily> s_monoFontByDispatcher = new();
-    private static FontFamily s_monoFontFamily
-    {
-        get
-        {
-            var dispatcher = Microsoft.UI.Dispatching.DispatcherQueue.GetForCurrentThread();
-            if (dispatcher is null)
-            {
-                return new FontFamily(MonoFontFamilySource);
-            }
-            if (!s_monoFontByDispatcher.TryGetValue(dispatcher, out var family))
-            {
-                family = new FontFamily(MonoFontFamilySource);
-                s_monoFontByDispatcher.Add(dispatcher, family);
-            }
-            return family;
-        }
-    }
-
-    // Per-DispatcherQueue selection-highlight brushes for the user
-    // bubble. The bubble background is the user's chosen system accent
-    // (which may be red, green, purple, …), so a hardcoded color would
-    // clash whenever the accent is non-blue. SystemAccentColorDark2 is
-    // the OS-defined "darker shade of the current accent" — guaranteed
-    // darker than the bubble's AccentFillColorDefault background and
-    // high-contrast against the bubble's white foreground for every
-    // accent. In High Contrast the bubble switches to
-    // SystemColorHighlight (often near-black), so we fall back to the
-    // OS-guaranteed SystemColorHighlightColor for the band there.
-    //
-    // SolidColorBrush is a DependencyObject with thread affinity, so a
-    // single static instance would crash with RPC_E_WRONG_THREAD if a
-    // second window on a different dispatcher ever tried to use it.
-    // Keying by DispatcherQueue keeps one shared brush per window while
-    // still avoiding per-render allocation. ConditionalWeakTable lets a
-    // closing window's brush be collected with its dispatcher. The
-    // brush's Color is mutated in place when the source color changes
-    // (e.g. user switches their accent in Windows Settings) so
-    // already-rendered TextBlocks update atomically.
-    private static readonly System.Runtime.CompilerServices.ConditionalWeakTable<
-        Microsoft.UI.Dispatching.DispatcherQueue, SolidColorBrush> s_accentDarkByDispatcher = new();
-    private static readonly System.Runtime.CompilerServices.ConditionalWeakTable<
-        Microsoft.UI.Dispatching.DispatcherQueue, SolidColorBrush> s_hcHighlightByDispatcher = new();
-    // AccessibilitySettings is a WinRT object with DispatcherQueue
-    // affinity: an instance created on one dispatcher cannot reliably
-    // be read from another. We deliberately avoid Lazy<>: Lazy
-    // permanently caches the factory's result, so a single failed
-    // construction would cache null forever and silently disable the
-    // High Contrast code path. Per-dispatcher cache keyed by
-    // ConditionalWeakTable lets each window have its own instance,
-    // collected when its dispatcher dies. On any thrown exception we
-    // drop the cached instance so the next render retries from scratch.
-    private static readonly System.Runtime.CompilerServices.ConditionalWeakTable<
-        Microsoft.UI.Dispatching.DispatcherQueue,
-        global::Windows.UI.ViewManagement.AccessibilitySettings> s_a11yByDispatcher = new();
-
-    private static bool TryDetectHighContrast()
-    {
-        var dispatcher = Microsoft.UI.Dispatching.DispatcherQueue.GetForCurrentThread();
-        if (dispatcher is null)
-        {
-            // Off-thread caller (tests, design-time). One-shot, no caching.
-            try { return new global::Windows.UI.ViewManagement.AccessibilitySettings().HighContrast; }
-            catch { return false; }
-        }
-        if (!s_a11yByDispatcher.TryGetValue(dispatcher, out var settings))
-        {
-            try
-            {
-                settings = new global::Windows.UI.ViewManagement.AccessibilitySettings();
-                s_a11yByDispatcher.Add(dispatcher, settings);
-            }
-            catch { return false; }
-        }
-        try { return settings.HighContrast; }
-        catch
-        {
-            // Drop the cached instance so the next call retries.
-            s_a11yByDispatcher.Remove(dispatcher);
-            return false;
-        }
-    }
-
-    private static SolidColorBrush GetUserBubbleSelectionBrush(bool isHighContrast)
-    {
-        var dispatcher = Microsoft.UI.Dispatching.DispatcherQueue.GetForCurrentThread();
-        var table = isHighContrast ? s_hcHighlightByDispatcher : s_accentDarkByDispatcher;
-        var color = isHighContrast
-            ? TryGetThemeColor("SystemColorHighlightColor", Microsoft.UI.Colors.Blue)
-            : TryGetThemeColor("SystemAccentColorDark2", Microsoft.UI.Colors.DarkBlue);
-
-        // No dispatcher means we're being called off-thread (e.g.
-        // from a unit test). Allocate a one-shot brush — it can't be
-        // safely cached without a dispatcher to key it on.
-        if (dispatcher is null)
-            return new SolidColorBrush(color);
-
-        if (!table.TryGetValue(dispatcher, out var brush))
-        {
-            brush = new SolidColorBrush(color);
-            table.Add(dispatcher, brush);
-        }
-        else if (brush.Color != color)
-        {
-            // Mutate in place rather than reallocating: TextBlocks
-            // rendered earlier hold a reference to this brush, so
-            // updating .Color updates them atomically without waiting
-            // for the next render pass.
-            brush.Color = color;
-        }
-        return brush;
-    }
-
-    private static Color TryGetThemeColor(string key, Color fallback)
-    {
-        try
-        {
-            var app = Application.Current;
-            if (app is null) return fallback;
-            if (app.Resources.TryGetValue(key, out var v))
-            {
-                // Theme dictionaries usually store Color, but a custom
-                // theme override can supply a SolidColorBrush under the
-                // same key. Accept either rather than silently falling
-                // back to DarkBlue / Blue when the resource is present
-                // but wrapped in a brush.
-                if (v is Color c) return c;
-                if (v is SolidColorBrush brush) return brush.Color;
-            }
-        }
-        catch (Exception ex) { OpenClawTray.Services.Logger.Debug($"ChatTimeline: resource brush lookup failed (unpackaged/test host?): {ex.Message}"); }
-        return fallback;
-    }
-
-    private static void ApplyPlainSelectableInlines(TextBlock textBlock, string? text)
-    {
-        var normalized = text ?? string.Empty;
-        // ConfigureTextBlock may set Text="" and clear Inlines before this
-        // setter runs again, so only skip when the cached run is still present.
-        if (textBlock.Inlines.Count > 0
-            && s_plainCache.TryGetValue(textBlock, out var cached)
-            && cached == normalized)
-            return;
-        s_plainCache.AddOrUpdate(textBlock, normalized);
-        textBlock.Inlines.Clear();
-        if (normalized.Length > 0)
-            textBlock.Inlines.Add(new Run { Text = normalized });
-    }
-
-    // Cache parsed markdown text per TextBlock to avoid re-clearing and
-    // rebuilding Inlines on every re-render when message content is stable.
-    private static readonly System.Runtime.CompilerServices.ConditionalWeakTable<TextBlock, string>
-        s_markdownCache = new();
-
-    private static void ApplySafeMarkdownInlines(TextBlock textBlock, string? text)
-    {
-        // Skip re-parsing only when text is unchanged AND inlines are still
-        // present. ConfigureTextBlock sets control.Text="" which clears
-        // Inlines, so we must re-apply even if the source text matches.
-        if (textBlock.Inlines.Count > 0
-            && s_markdownCache.TryGetValue(textBlock, out var cached)
-            && cached == text)
-            return;
-        s_markdownCache.AddOrUpdate(textBlock, text ?? "");
-
-        textBlock.Inlines.Clear();
-
-        foreach (var segment in ChatMarkdownSanitizer.SanitizeAndSplitStrongEmphasis(text))
-        {
-            if (segment.Text.Length == 0)
-                continue;
-
-            if (segment.IsStrong)
-            {
-                var bold = new Bold();
-                bold.Inlines.Add(new Run { Text = segment.Text });
-                textBlock.Inlines.Add(bold);
-            }
-            else
-            {
-                textBlock.Inlines.Add(new Run { Text = segment.Text });
-            }
-        }
-    }
-
-    static string FormatToolLabel(ChatTimelineItem e)    {
-        var text = e.Text ?? "";
-        return e.ToolName switch
-        {
-            "bash" or "powershell" => $"$ {text}",
-            "read" or "view" => text,
-            "edit" or "create" => text,
-            "grep" => $"🔍 {text}",
-            "glob" => $"📂 {text}",
-            "web_fetch" => $"🌐 {text}",
-            "web_search" => $"🔎 {text}",
-            "task" => text,
-            "report_intent" => text,
-            _ => text == e.ToolName || string.IsNullOrEmpty(text) ? e.ToolName ?? "tool" : $"{e.ToolName}: {text}"
-        };
-    }
-
-    /// <summary>
-    /// Title-case a single token: <c>"exec"</c> → <c>"Exec"</c>. Used by the
-    /// tool-chip inner header to mirror the web's <c>Exec</c>/<c>Process</c>
-    /// styling. Returns the empty string for null/empty input.
-    /// </summary>
-    static string CapitalizeFirst(string? s)
-    {
-        if (string.IsNullOrEmpty(s)) return string.Empty;
-        return char.ToUpperInvariant(s[0]) + (s.Length > 1 ? s[1..] : string.Empty);
-    }
-
-    /// <summary>
-    /// If <paramref name="text"/> looks like a JSON object/array, pretty-print
-    /// it with 2-space indentation. Otherwise return the string verbatim.
-    /// Used so tool chips render gateway action blobs (<c>{"action":"poll"…}</c>)
-    /// the same way the web does, without affecting plain shell output.
-    /// </summary>
-    static string TryFormatJsonForDisplay(string text)
-    {
-        if (string.IsNullOrWhiteSpace(text)) return text;
-        var trimmed = text.TrimStart();
-        if (trimmed.Length == 0) return text;
-        var first = trimmed[0];
-        if (first != '{' && first != '[') return text;
-        try
-        {
-            using var doc = System.Text.Json.JsonDocument.Parse(trimmed);
-            return System.Text.Json.JsonSerializer.Serialize(doc.RootElement,
-                new System.Text.Json.JsonSerializerOptions { WriteIndented = true });
-        }
-        catch
-        {
-            return text;
-        }
-    }
-
-    static bool ContainsEntryId(IReadOnlyList<ChatTimelineItem> entries, string id)
-    {
-        for (var i = 0; i < entries.Count; i++)
-        {
-            if (entries[i].Id == id)
-                return true;
-        }
-
-        return false;
-    }
-
-    static double ClampOffset(double offset, double max) =>
-        Math.Max(0, Math.Min(offset, max));
-
-    /// <summary>
-    /// Process-wide cache so we decode each cached image only once. Keyed by
-    /// byte-array reference so cache invalidates automatically when bytes
-    /// are replaced. BitmapImage instances are UI-thread-affine but read
-    /// access from other threads through ImageBrush is safe.
-    /// </summary>
-    private static readonly System.Runtime.CompilerServices.ConditionalWeakTable<byte[], Microsoft.UI.Xaml.Media.Imaging.BitmapImage> _bitmapCache = new();
-
-    /// <summary>
-    /// Decodes <paramref name="bytes"/> into a <see cref="Microsoft.UI.Xaml.Media.Imaging.BitmapImage"/>,
-    /// caching the result so repeated renders of the same image don't re-run
-    /// the decoder. Returns <c>null</c> on any decode failure (renderer will
-    /// fall back to a filename chip).
-    /// </summary>
-    static Microsoft.UI.Xaml.Media.Imaging.BitmapImage? TryDecodeBitmap(byte[] bytes)
-    {
-        if (_bitmapCache.TryGetValue(bytes, out var existing))
-            return existing;
-        try
-        {
-            var stream = new global::Windows.Storage.Streams.InMemoryRandomAccessStream();
-            using (var writer = new global::Windows.Storage.Streams.DataWriter(stream))
-            {
-                writer.WriteBytes(bytes);
-                writer.StoreAsync().AsTask().GetAwaiter().GetResult();
-                writer.DetachStream();
-            }
-            stream.Seek(0);
-            var bmp = new Microsoft.UI.Xaml.Media.Imaging.BitmapImage();
-            bmp.SetSource(stream);
-            _bitmapCache.Add(bytes, bmp);
-            return bmp;
-        }
-        catch
-        {
-            return null;
-        }
-    }
-
     public override Element Render()
     {
         var bubbleRadius     = new CornerRadius(16);
@@ -443,25 +87,6 @@ public override Element Render()
         const bool showAssistAvatar = true;
         const bool showTimestamps = true;
 
-        var scrollViewRef = UseRef<Microsoft.UI.Xaml.Controls.ScrollViewer?>(null);
-        var isFollowingRef = UseRef(true);
-        var contentRef = UseRef<Microsoft.UI.Xaml.Controls.StackPanel?>(null);
-        var prevEntryCountRef = UseRef(0);
-        var prevSessionIdRef = UseRef<string?>(null);
-        var prevFirstEntryIdRef = UseRef<string?>(null);
-        var prevLastEntryIdRef = UseRef<string?>(null);
-        var lastVerticalOffsetRef = UseRef(0.0);
-        var lastScrollableHeightRef = UseRef(0.0);
-        var suppressAutoFollowRef = UseRef(false);
-        var sessionOffsetsRef = UseRef<Dictionary<string, double>>(new());
-        var prevScrollToBottomTokenRef = UseRef(0);
-        var hasMoreHistoryRef = UseRef(Props.HasMoreHistory);
-        var loadMoreHistoryRef = UseRef<Action?>(Props.OnLoadMoreHistory);
-        var loadMoreRequestedForCountRef = UseRef(-1);
-        // Pending offset to restore after layout completes (SizeChanged).
-        // Set during initialLoad when ScrollableHeight is still 0.
-        var pendingRestoreOffsetRef = UseRef<double?>(null);
-
         // Per-entry expand state for tool chips. Tokens are
         // "{entryId}:call" and "{entryId}:out" so call and output
         // toggle independently. HashSet so the empty default is "all
@@ -480,16 +105,15 @@ public override Element Render()
                 expandedToolChips.Set(new HashSet<string>());
         }
 
-        // When showToolCalls changes, pre-clear the native StackPanel so the
-        // reconciler (SyncChildren) only does inserts into an empty panel
-        // instead of expensive per-element RemoveAt calls that cascade
-        // Unloaded events through deep visual subtrees.
+        // Keep the last showToolCalls value so collapsing the tool-call surface
+        // can reset row-local expanded state without forcing a full timeline
+        // StackPanel clear. Row realization now belongs to VirtualizedChatView.
         var prevShowToolCallsRef = UseRef(showToolCalls);
         if (prevShowToolCallsRef.Current != showToolCalls)
         {
             prevShowToolCallsRef.Current = showToolCalls;
-            contentRef.Current?.Children.Clear();
         }
+        var (suppressAutoFollowToken, suppressAutoFollowUpdate) = UseReducer<int>(0, threadSafe: true);
 
         // Hover state — set of entry ids currently under the pointer. Used to
         // reveal the trash / speak action icons beside user / assistant
@@ -561,88 +185,15 @@ void Clear() => ackUpdate(prev =>
             else dq.TryEnqueue(Clear);
         }
 
-        hasMoreHistoryRef.Current = Props.HasMoreHistory;
-        loadMoreHistoryRef.Current = Props.OnLoadMoreHistory;
-
         var entryCount = Props.Entries.Count;
         var firstEntryId = entryCount > 0 ? Props.Entries[0].Id : null;
         var lastEntryId = entryCount > 0 ? Props.Entries[entryCount - 1].Id : null;
-        var previousSessionId = prevSessionIdRef.Current;
-        var previousEntryCount = prevEntryCountRef.Current;
-        var previousFirstEntryId = prevFirstEntryIdRef.Current;
-        var previousLastEntryId = prevLastEntryIdRef.Current;
-        var sessionChanged = Props.SessionId != previousSessionId;
-        var isFirstMount = sessionChanged && previousSessionId is null;
-        var initialLoad = isFirstMount
-            ? entryCount > 0
-            : (!sessionChanged && previousEntryCount == 0 && entryCount > 0);
-        var prependedHistory = !sessionChanged
-            && previousEntryCount > 0
-            && entryCount > previousEntryCount
-            && previousFirstEntryId is not null
-            && firstEntryId != previousFirstEntryId
-            && lastEntryId == previousLastEntryId
-            && ContainsEntryId(Props.Entries, previousFirstEntryId);
-        var appendedEntries = !sessionChanged
-            && entryCount > previousEntryCount
-            && !prependedHistory;
-
-        void StoreSessionOffset(string? sessionId, double offset)
-        {
-            if (sessionId is { Length: > 0 })
-            {
-                sessionOffsetsRef.Current[sessionId] = offset;
-                s_sessionOffsets[sessionId] = offset;
-                // Evict oldest entries when cache exceeds bound
-                if (s_sessionOffsets.Count > MaxSessionOffsets)
-                {
-                    var first = s_sessionOffsets.Keys.First();
-                    s_sessionOffsets.Remove(first);
-                }
-            }
-        }
-
-        void UpdateScrollMetrics(Microsoft.UI.Xaml.Controls.ScrollViewer sv)
-        {
-            if (sv.ViewportHeight <= 0) return;
-
-            lastVerticalOffsetRef.Current = sv.VerticalOffset;
-            lastScrollableHeightRef.Current = sv.ScrollableHeight;
-            isFollowingRef.Current = sv.ScrollableHeight - sv.VerticalOffset <= FollowThreshold;
-            StoreSessionOffset(prevSessionIdRef.Current, sv.VerticalOffset);
-        }
-
-        void QueueScrollToBottom(Microsoft.UI.Xaml.Controls.ScrollViewer sv, string? sessionId, bool disableAnimation)
-        {
-            isFollowingRef.Current = true;
-            sv.DispatcherQueue.TryEnqueue(() =>
-            {
-                var bottom = sv.ScrollableHeight;
-                sv.ChangeView(null, bottom, null, disableAnimation);
-                lastVerticalOffsetRef.Current = bottom;
-                lastScrollableHeightRef.Current = sv.ScrollableHeight;
-                isFollowingRef.Current = true;
-                StoreSessionOffset(sessionId, bottom);
-            });
-        }
-
-        void QueuePreservePrependOffset(Microsoft.UI.Xaml.Controls.ScrollViewer sv, string? sessionId, double oldOffset, double oldScrollableHeight)
-        {
-            suppressAutoFollowRef.Current = true;
-            sv.DispatcherQueue.TryEnqueue(() =>
-            {
-                var delta = sv.ScrollableHeight - oldScrollableHeight;
-                var target = ClampOffset(oldOffset + delta, sv.ScrollableHeight);
-                sv.ChangeView(null, target, null, disableAnimation: true);
-                lastVerticalOffsetRef.Current = target;
-                lastScrollableHeightRef.Current = sv.ScrollableHeight;
-                isFollowingRef.Current = sv.ScrollableHeight - target <= FollowThreshold;
-                StoreSessionOffset(sessionId, target);
-                sv.DispatcherQueue.TryEnqueue(() => suppressAutoFollowRef.Current = false);
-            });
-        }
+        string SyntheticRowKey(string id, ChatTimelineItemKind kind) =>
+            $"{Props.TimelineGeneration}:{kind}:{id}";
+        string RowKey(ChatTimelineItem entry) => SyntheticRowKey(entry.Id, entry.Kind);
 
-        // Load more button — outside the repeated items
+        // Load more button — rendered as the first virtualized row so it scrolls
+        // with history rather than living outside the timeline viewport.
         var loadMoreButton = Props.HasMoreHistory
             ? Button(LocalizationHelper.GetString("Chat_Timeline_LoadEarlier"), () => Props.OnLoadMoreHistory?.Invoke())
                 .HAlign(HorizontalAlignment.Center)
@@ -1117,6 +668,14 @@ Element RenderUserEntry(ChatTimelineItem entry, bool startsBurst, bool endsBurst
                             t.FontSize = 14;
                             t.Foreground = userBubbleFg;
                             t.IsTextSelectionEnabled = true;
+                            t.FontFamily = s_chatTextFontFamily;
+                            t.TextTrimming = TextTrimming.None;
+                            t.MaxLines = 0;
+                            t.LineHeight = 0;
+                            t.CharacterSpacing = 0;
+                            t.Width = double.NaN;
+                            t.MinWidth = 0;
+                            t.MaxWidth = double.PositiveInfinity;
                             // The default SelectionHighlightColor is the
                             // system accent — which equals the user bubble's
                             // background — so the highlight band is invisible
@@ -1574,7 +1133,7 @@ Element PhantomChevron() => Caption("▸")
                 {
                     var next = new HashSet<string>(expandedToolChips.Value);
                     if (!next.Add(token)) next.Remove(token);
-                    suppressAutoFollowRef.Current = true;
+                    suppressAutoFollowUpdate(v => v + 1);
                     expandedToolChips.Set(next);
                 };
 
@@ -1796,7 +1355,7 @@ Element AnchorLeft(Element card) => Grid(
                     // Suppress auto-follow so the scroll position stays put
                     // while the card unfurls — the SizeChanged handler would
                     // otherwise chase the new bottom.
-                    suppressAutoFollowRef.Current = true;
+                    suppressAutoFollowUpdate(v => v + 1);
                     expandedToolChips.Set(next);
                 };
 
@@ -1906,7 +1465,36 @@ Element RenderPermissionEntry(ChatTimelineItem entry)
             if (entry.PermissionDecision == ChatPermissionDecision.Pending)
             {
                 var allowLabel = LocalizationHelper.GetString("Chat_Permission_Allow");
+                var allowAlwaysLabel = LocalizationHelper.GetString("Chat_Permission_AllowAlways");
                 var denyLabel = LocalizationHelper.GetString("Chat_Permission_Deny");
+                var actions = new List<Element>();
+                foreach (var action in ChatPermissionActionKeys.NormalizeActions(entry.PermissionActions))
+                {
+                    var isDeny = string.Equals(action, ChatPermissionActionKeys.Deny, StringComparison.OrdinalIgnoreCase);
+                    var label = action switch
+                    {
+                        ChatPermissionActionKeys.AllowAlways => allowAlwaysLabel,
+                        ChatPermissionActionKeys.Deny => denyLabel,
+                        _ => allowLabel,
+                    };
+
+                    var button = Button(label, () => onResponse?.Invoke(requestId, action))
+                        .Set(b =>
+                        {
+                            b.CornerRadius = new CornerRadius(4);
+                            b.Padding = new Thickness(14, 6, 14, 6);
+                            b.MinWidth = 0; b.MinHeight = 0;
+                            b.IsEnabled = onResponse is not null && !string.IsNullOrEmpty(requestId);
+                            Microsoft.UI.Xaml.Automation.AutomationProperties.SetName(b, $"{label}{automationSuffix}");
+                            if (!isDeny)
+                            {
+                                try { b.Style = (Microsoft.UI.Xaml.Style)Microsoft.UI.Xaml.Application.Current.Resources["AccentButtonStyle"]; }
+                                catch (Exception ex) { OpenClawTray.Services.Logger.Debug($"ChatTimeline: accent button style lookup failed: {ex.Message}"); }
+                            }
+                        });
+                    actions.Add(button);
+                }
+
                 body = VStack(8,
                     TextBlock($"⚠ {kind}")
                         .Set(t => { t.FontWeight = Microsoft.UI.Text.FontWeights.SemiBold; t.TextWrapping = TextWrapping.Wrap; }),
@@ -1931,32 +1519,7 @@ Element RenderPermissionEntry(ChatTimelineItem entry)
                      }),
                     TextBlock(LocalizationHelper.GetString("Chat_Permission_Caption"))
                         .Set(t => { t.TextWrapping = TextWrapping.Wrap; t.FontSize = 11; t.Opacity = 0.7; }),
-                    HStack(8,
-                        Button(allowLabel,
-                            () => onResponse?.Invoke(requestId, true))
-                            .Set(b =>
-                            {
-                                b.CornerRadius = new CornerRadius(4);
-                                b.Padding = new Thickness(14, 6, 14, 6);
-                                b.MinWidth = 0; b.MinHeight = 0;
-                                b.IsEnabled = onResponse is not null && !string.IsNullOrEmpty(requestId);
-                                // Include the operation kind in the screen-reader name so
-                                // users hear "Allow shell.exec" instead of bare "Allow".
-                                Microsoft.UI.Xaml.Automation.AutomationProperties.SetName(b, $"{allowLabel}{automationSuffix}");
-                                try { b.Style = (Microsoft.UI.Xaml.Style)Microsoft.UI.Xaml.Application.Current.Resources["AccentButtonStyle"]; }
-                                catch (Exception ex) { OpenClawTray.Services.Logger.Debug($"ChatTimeline: accent button style lookup failed: {ex.Message}"); }
-                            }),
-                        Button(denyLabel,
-                            () => onResponse?.Invoke(requestId, false))
-                            .Set(b =>
-                            {
-                                b.CornerRadius = new CornerRadius(4);
-                                b.Padding = new Thickness(14, 6, 14, 6);
-                                b.MinWidth = 0; b.MinHeight = 0;
-                                b.IsEnabled = onResponse is not null && !string.IsNullOrEmpty(requestId);
-                                Microsoft.UI.Xaml.Automation.AutomationProperties.SetName(b, $"{denyLabel}{automationSuffix}");
-                            })
-                    ).HAlign(HorizontalAlignment.Right)
+                    HStack(8, actions.ToArray()).HAlign(HorizontalAlignment.Right)
                 );
             }
             else
@@ -1966,9 +1529,10 @@ Element RenderPermissionEntry(ChatTimelineItem entry)
                 // was approved/denied without expanding anything.
                 var (glyph, labelKey) = entry.PermissionDecision switch
                 {
-                    ChatPermissionDecision.Allowed => ("✓", "Chat_Permission_DecisionAllowed"),
-                    ChatPermissionDecision.Denied  => ("✕", "Chat_Permission_DecisionDenied"),
-                    _                              => ("⌛", "Chat_Permission_DecisionExpired"),
+                    ChatPermissionDecision.Allowed       => ("✓", "Chat_Permission_DecisionAllowed"),
+                    ChatPermissionDecision.AllowedAlways => ("✓", "Chat_Permission_DecisionAlwaysAllowed"),
+                    ChatPermissionDecision.Denied        => ("✕", "Chat_Permission_DecisionDenied"),
+                    _                                    => ("⌛", "Chat_Permission_DecisionExpired"),
                 };
                 var label = LocalizationHelper.GetString(labelKey);
                 // Surrogate-safe truncation: if char 119 is a high surrogate,
@@ -2268,19 +1832,19 @@ bool BurstIsNestable(System.Collections.Generic.List<ChatTimelineItem> b)
             {
                 if (!showToolCalls)
                 {
-                    renderedEntries[k] = Empty().WithKey(entry.Id);
+                    renderedEntries[k] = Empty().WithKey(RowKey(entry));
                     continue;
                 }
                 if (!startsBurst)
                 {
-                    renderedEntries[k] = Empty().WithKey(entry.Id);
+                    renderedEntries[k] = Empty().WithKey(RowKey(entry));
                     continue;
                 }
                 if (nestedConsumed.Contains(k))
                 {
                     // The assistant bubble above already rendered this burst
                     // inline as a child element — emit nothing here.
-                    renderedEntries[k] = Empty().WithKey(entry.Id);
+                    renderedEntries[k] = Empty().WithKey(RowKey(entry));
                     continue;
                 }
                 var burst = new System.Collections.Generic.List<ChatTimelineItem> { entry };
@@ -2290,7 +1854,7 @@ bool BurstIsNestable(System.Collections.Generic.List<ChatTimelineItem> b)
                     burst.Add(Props.Entries[orderedIdx[kj]]);
                     kj++;
                 }
-                renderedEntries[k] = RenderToolBurst(burst, showAvatar, currentBubbleSlot).WithKey(entry.Id);
+                renderedEntries[k] = RenderToolBurst(burst, showAvatar, currentBubbleSlot).WithKey(RowKey(entry));
                 continue;
             }
 
@@ -2326,11 +1890,11 @@ bool BurstIsNestable(System.Collections.Generic.List<ChatTimelineItem> b)
                     }
                 }
 
-                renderedEntries[k] = RenderAssistantEntry(entry, startsBurst, endsBurst, showAvatar, currentBubbleSlot, nestedTool).WithKey(entry.Id);
+                renderedEntries[k] = RenderAssistantEntry(entry, startsBurst, endsBurst, showAvatar, currentBubbleSlot, nestedTool).WithKey(RowKey(entry));
                 continue;
             }
 
-            renderedEntries[k] = RenderEntry(entry, startsBurst, endsBurst, showAvatar).WithKey(entry.Id);
+            renderedEntries[k] = RenderEntry(entry, startsBurst, endsBurst, showAvatar).WithKey(RowKey(entry));
         }
 
         var thinkingNestedConsumed = new System.Collections.Generic.HashSet<int>();
@@ -2397,6 +1961,7 @@ bool BurstIsNestable(System.Collections.Generic.List<ChatTimelineItem> b)
                 nestedTool: thinkingNestedTool,
                 suppressFooter: true,
                 forceVisible: true)
+                .WithKey(SyntheticRowKey("__thinking__", ChatTimelineItemKind.Assistant))
                 .LiveRegion(Microsoft.UI.Xaml.Automation.Peers.AutomationLiveSetting.Polite);
         }
 
@@ -2436,132 +2001,21 @@ bool BurstIsNestable(System.Collections.Generic.List<ChatTimelineItem> b)
             timelineRows = renderedEntries;
         }
 
+        var timelineView = BuildVirtualizedTimelineView(
+            Props,
+            timelineRows,
+            loadMoreButton,
+            entryCount,
+            firstEntryId,
+            lastEntryId,
+            suppressAutoFollowToken);
+
         return Grid([GridSize.Star()], [GridSize.Star()],
             // Page background matches dash-light --bg so bubbles stand out.
             Border(
-                ScrollView(
-                    Grid([GridSize.Star()], [GridSize.Auto, GridSize.Auto, GridSize.Auto, GridSize.Auto],
-                        loadMoreButton.Grid(row: 0, column: 0),
-                        Border(Empty()).Height(20).Grid(row: 1, column: 0),
-                        VStack(2, timelineRows).Set(sp =>
-                        {
-                            if (contentRef.Current != sp)
-                            {
-                                contentRef.Current = (Microsoft.UI.Xaml.Controls.StackPanel)sp;
-                                sp.SizeChanged += (_, _) =>
-                                {
-                                    if (scrollViewRef.Current is not { } sv) return;
-
-                                    // Pending scroll restoration from initialLoad — apply
-                                    // once the layout is ready (ScrollableHeight > 0).
-                                    if (pendingRestoreOffsetRef.Current is { } pendingOffset && sv.ScrollableHeight > 0)
-                                    {
-                                        pendingRestoreOffsetRef.Current = null;
-                                        var target = ClampOffset(pendingOffset, sv.ScrollableHeight);
-                                        isFollowingRef.Current = sv.ScrollableHeight - target <= FollowThreshold;
-                                        sv.ChangeView(null, target, null, disableAnimation: true);
-                                        lastVerticalOffsetRef.Current = target;
-                                        lastScrollableHeightRef.Current = sv.ScrollableHeight;
-                                        suppressAutoFollowRef.Current = false;
-                                        return;
-                                    }
-
-                                    if (!suppressAutoFollowRef.Current && isFollowingRef.Current)
-                                    {
-                                        QueueScrollToBottom(sv, prevSessionIdRef.Current, disableAnimation: true);
-                                    }
-                                    else if (suppressAutoFollowRef.Current)
-                                    {
-                                        // Reset after one suppressed layout pass (e.g. tool expand/collapse).
-                                        suppressAutoFollowRef.Current = false;
-                                    }
-                                };
-                            }
-                        }).Grid(row: 2, column: 0),
-                        Border(Empty()).Height(24).Grid(row: 3, column: 0)
-                    )
-                ).Set(sv =>
-            {
-                sv.HorizontalScrollBarVisibility = Microsoft.UI.Xaml.Controls.ScrollBarVisibility.Disabled;
-                sv.HorizontalScrollMode = Microsoft.UI.Xaml.Controls.ScrollMode.Disabled;
-                sv.HorizontalContentAlignment = HorizontalAlignment.Stretch;
-                if (scrollViewRef.Current != sv)
-                {
-                    scrollViewRef.Current = sv;
-                    sv.ViewChanged += (_, _) =>
-                    {
-                        UpdateScrollMetrics(sv);
-
-                        if (sv.ScrollableHeight > 0
-                            && sv.VerticalOffset <= FollowThreshold
-                            && hasMoreHistoryRef.Current
-                            && loadMoreRequestedForCountRef.Current != prevEntryCountRef.Current)
-                        {
-                            loadMoreRequestedForCountRef.Current = prevEntryCountRef.Current;
-                            loadMoreHistoryRef.Current?.Invoke();
-                        }
-                    };
-                }
-
-                if (entryCount != previousEntryCount)
-                    loadMoreRequestedForCountRef.Current = -1;
-
-                if (sessionChanged && !isFirstMount)
-                {
-                    StoreSessionOffset(previousSessionId, lastVerticalOffsetRef.Current);
-
-                    if (entryCount > 0)
-                    {
-                        // Always scroll to bottom when switching sessions
-                        QueueScrollToBottom(sv, Props.SessionId, disableAnimation: true);
-                    }
-                }
-                else if (prependedHistory)
-                {
-                    QueuePreservePrependOffset(sv, Props.SessionId, lastVerticalOffsetRef.Current, lastScrollableHeightRef.Current);
-                }
-                else if (initialLoad)
-                {
-                    // Check instance-level ref first, then static store (survives page recreation)
-                    double? savedOffset = null;
-                    if (Props.SessionId is not null)
-                    {
-                        if (sessionOffsetsRef.Current.TryGetValue(Props.SessionId, out var refOffset))
-                            savedOffset = refOffset;
-                        else if (s_sessionOffsets.TryGetValue(Props.SessionId, out var staticOffset))
-                            savedOffset = staticOffset;
-                    }
-
-                    if (savedOffset is not null)
-                    {
-                        // Defer the scroll restoration: the ScrollViewer hasn't
-                        // laid out yet (ScrollableHeight=0) so we can't scroll
-                        // now. Store the target and let SizeChanged apply it
-                        // once the layout is ready.
-                        pendingRestoreOffsetRef.Current = savedOffset.Value;
-                        suppressAutoFollowRef.Current = true;
-                        isFollowingRef.Current = false;
-                    }
-                    else
-                        QueueScrollToBottom(sv, Props.SessionId, disableAnimation: true);
-                }
-                else if (appendedEntries && isFollowingRef.Current)
-                {
-                    QueueScrollToBottom(sv, Props.SessionId, disableAnimation: false);
-                }
-
-                // External scroll-to-bottom request (e.g. user sent a message)
-                if (Props.ScrollToBottomToken != prevScrollToBottomTokenRef.Current)
-                {
-                    prevScrollToBottomTokenRef.Current = Props.ScrollToBottomToken;
-                    QueueScrollToBottom(sv, Props.SessionId, disableAnimation: false);
-                }
-
-                prevSessionIdRef.Current = Props.SessionId;
-                prevFirstEntryIdRef.Current = firstEntryId;
-                prevLastEntryIdRef.Current = lastEntryId;
-                prevEntryCountRef.Current = entryCount;
-            })
+                Native(
+                    () => new VirtualizedChatView(),
+                    (VirtualizedChatView element) => element.Update(timelineView))
             ).Background(chatPageBg).Grid(row: 0, column: 0)
         );
     }
diff --git a/src/OpenClaw.Tray.WinUI/Chat/ChatTimelineRows.cs b/src/OpenClaw.Tray.WinUI/Chat/ChatTimelineRows.cs
new file mode 100644
index 000000000..3a70fe322
--- /dev/null
+++ b/src/OpenClaw.Tray.WinUI/Chat/ChatTimelineRows.cs
@@ -0,0 +1,88 @@
+using OpenClawTray.FunctionalUI.Core;
+using OpenClawTray.FunctionalUI;
+using static OpenClawTray.FunctionalUI.Factories;
+
+namespace OpenClawTray.Chat;
+
+/// <summary>
+/// Keyed, renderer-agnostic row descriptor consumed by the virtualized chat host.
+/// The row keeps identity separate from the bubble/tool/permission UI that renders it.
+/// </summary>
+public sealed record ChatTimelineRow(string Key, Func<Element> Render);
+
+/// <summary>
+/// Snapshot passed from <see cref="ChatTimeline"/> into the native
+/// virtualized host. It contains the rendered row descriptors plus the scroll
+/// anchors needed to preserve existing chat timeline behavior.
+/// </summary>
+public sealed record ChatTimelineView(
+    IReadOnlyList<ChatTimelineRow> Rows,
+    string? SessionId,
+    int EntryCount,
+    string? FirstEntryId,
+    string? LastEntryId,
+    Func<string, bool> ContainsEntryId,
+    bool HasMoreHistory,
+    Action? OnLoadMoreHistory,
+    int ScrollToBottomToken,
+    int SuppressAutoFollowToken)
+{
+    public static ChatTimelineView Empty { get; } = new(
+        Array.Empty<ChatTimelineRow>(),
+        null,
+        0,
+        null,
+        null,
+        static _ => false,
+        false,
+        null,
+        0,
+        0);
+}
+
+public partial class ChatTimeline
+{
+    private static ChatTimelineView BuildVirtualizedTimelineView(
+        ChatTimelineProps props,
+        IReadOnlyList<Element> timelineRows,
+        Element loadMoreButton,
+        int entryCount,
+        string? firstEntryId,
+        string? lastEntryId,
+        int suppressAutoFollowToken)
+    {
+        var virtualizedRows = new List<ChatTimelineRow>(timelineRows.Count + 3);
+        if (props.HasMoreHistory)
+        {
+            var loadMoreRow = loadMoreButton;
+            virtualizedRows.Add(new ChatTimelineRow(
+                "chrome:load-more",
+                () => loadMoreRow));
+        }
+
+        virtualizedRows.Add(new ChatTimelineRow(
+            "chrome:top-spacer",
+            () => Border(Empty()).Height(20)));
+
+        for (var rowIndex = 0; rowIndex < timelineRows.Count; rowIndex++)
+        {
+            var rowElement = timelineRows[rowIndex];
+            var rowKey = string.IsNullOrEmpty(rowElement.Key)
+                ? $"row:index:{rowIndex}"
+                : $"row:{rowElement.Key}";
+            virtualizedRows.Add(new ChatTimelineRow(rowKey, () => rowElement));
+        }
+
+        return new ChatTimelineView(
+            virtualizedRows,
+            props.SessionId,
+            entryCount,
+            firstEntryId,
+            lastEntryId,
+            id => props.Entries.Any(e => string.Equals(e.Id, id, StringComparison.Ordinal)),
+            props.HasMoreHistory,
+            props.OnLoadMoreHistory,
+            props.ScrollToBottomToken,
+            suppressAutoFollowToken);
+    }
+}
diff --git a/src/OpenClaw.Tray.WinUI/Chat/Controls/StableRowCollection.cs b/src/OpenClaw.Tray.WinUI/Chat/Controls/StableRowCollection.cs
new file mode 100644
index 000000000..c259efefd
--- /dev/null
+++ b/src/OpenClaw.Tray.WinUI/Chat/Controls/StableRowCollection.cs
@@ -0,0 +1,63 @@
+using System.Collections.ObjectModel;
+
+namespace OpenClawTray.Chat.Controls;
+
+internal static class StableRowCollection
+{
+    public static void Sync<T>(
+        ObservableCollection<T> current,
+        IReadOnlyList<T> desired,
+        Func<T, string> keySelector,
+        HashSet<string>? scratchKeys = null)
+    {
+        ArgumentNullException.ThrowIfNull(current);
+        ArgumentNullException.ThrowIfNull(desired);
+        ArgumentNullException.ThrowIfNull(keySelector);
+
+        var desiredKeys = scratchKeys ?? new HashSet<string>(StringComparer.Ordinal);
+        desiredKeys.Clear();
+        foreach (var item in desired)
+            desiredKeys.Add(keySelector(item));
+
+        for (var index = current.Count - 1; index >= 0; index--)
+        {
+            if (!desiredKeys.Contains(keySelector(current[index])))
+                current.RemoveAt(index);
+        }
+
+        for (var desiredIndex = 0; desiredIndex < desired.Count; desiredIndex++)
+        {
+            var desiredItem = desired[desiredIndex];
+            var desiredKey = keySelector(desiredItem);
+            if (desiredIndex < current.Count &&
+                string.Equals(keySelector(current[desiredIndex]), desiredKey, StringComparison.Ordinal))
+            {
+                continue;
+            }
+
+            var existingIndex = IndexOfKey(current, desiredKey, desiredIndex + 1, keySelector);
+            if (existingIndex >= 0)
+                current.Move(existingIndex, desiredIndex);
+            else
+                current.Insert(desiredIndex, desiredItem);
+        }
+
+        if (scratchKeys is null)
+            desiredKeys.Clear();
+    }
+
+    private static int IndexOfKey<T>(
+        ObservableCollection<T> current,
+        string key,
+        int startIndex,
+        Func<T, string> keySelector)
+    {
+        for (var index = Math.Max(0, startIndex); index < current.Count; index++)
+        {
+            if (string.Equals(keySelector(current[index]), key, StringComparison.Ordinal))
+                return index;
+        }
+
+        return -1;
+    }
+}
diff --git a/src/OpenClaw.Tray.WinUI/Chat/Controls/VirtualizedChatView.cs b/src/OpenClaw.Tray.WinUI/Chat/Controls/VirtualizedChatView.cs
new file mode 100644
index 000000000..339f5ccbd
--- /dev/null
+++ b/src/OpenClaw.Tray.WinUI/Chat/Controls/VirtualizedChatView.cs
@@ -0,0 +1,679 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Automation;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media;
+using OpenClawTray.FunctionalUI.Hosting;
+using OpenClawTray.Helpers;
+using System.Collections.ObjectModel;
+
+namespace OpenClawTray.Chat.Controls;
+
+/// <summary>
+/// Native WinUI timeline host for OpenClaw chat rows. It owns realization,
+/// follow-scroll, load-earlier, per-session offset restore, and the floating
+/// scroll-to-latest affordance while row UI remains supplied by FunctionalUI.
+/// </summary>
+public sealed class VirtualizedChatView : ContentControl, IDisposable
+{
+    private const double FollowThreshold = 60;
+    private const int MaxSessionOffsets = 50;
+    private const int RequiredStableRestorePasses = 2;
+    private static readonly Dictionary<string, double> s_sessionOffsets = new(StringComparer.Ordinal);
+    private static readonly object s_sessionOffsetsLock = new();
+
+    private readonly ScrollViewer _scrollViewer;
+    private readonly ItemsRepeater _itemsRepeater;
+    private readonly Button _scrollToLatestButton;
+    private readonly ChatRowElementFactory _rowFactory;
+    private readonly ObservableCollection<ChatTimelineRow> _rows = new();
+    private readonly HashSet<string> _rowKeyScratch = new(StringComparer.Ordinal);
+
+    private ChatTimelineView _view = ChatTimelineView.Empty;
+    private string? _previousSessionId;
+    private int _previousEntryCount;
+    private string? _previousFirstEntryId;
+    private string? _previousLastEntryId;
+    private double _lastVerticalOffset;
+    private double _lastScrollableHeight;
+    private bool _isFollowing = true;
+    private bool _suppressAutoFollow;
+    private double? _pendingRestoreOffset;
+    private double? _lastRestoreScrollableHeight;
+    private int _stableRestorePasses;
+    private string? _pendingPrependSessionId;
+    private double? _pendingPrependOldOffset;
+    private double? _pendingPrependOldScrollableHeight;
+    private double? _lastPrependScrollableHeight;
+    private int _stablePrependPasses;
+    private int _previousScrollToBottomToken;
+    private int _previousSuppressAutoFollowToken;
+    private int _loadMoreRequestedForCount = -1;
+    private ScrollToEndState _scrollToEndState;
+    private bool _scrollToEndPending;
+    private string? _scrollToEndSessionId;
+    private bool _scrollToEndDisableAnimation;
+    private bool _disposed;
+
+    private enum ScrollToEndState
+    {
+        Idle,
+        Queued,
+        BringingIntoView,
+    }
+
+    public VirtualizedChatView()
+    {
+        HorizontalAlignment = HorizontalAlignment.Stretch;
+        VerticalAlignment = VerticalAlignment.Stretch;
+        HorizontalContentAlignment = HorizontalAlignment.Stretch;
+        VerticalContentAlignment = VerticalAlignment.Stretch;
+
+        _rowFactory = new ChatRowElementFactory();
+        _itemsRepeater = new ItemsRepeater
+        {
+            HorizontalAlignment = HorizontalAlignment.Stretch,
+            Layout = new StackLayout
+            {
+                Orientation = Orientation.Vertical,
+                Spacing = 2,
+            },
+            ItemsSource = _rows,
+            ItemTemplate = _rowFactory,
+        };
+        _itemsRepeater.SizeChanged += OnContentSizeChanged;
+
+        _scrollViewer = new ScrollViewer
+        {
+            Content = _itemsRepeater,
+            HorizontalAlignment = HorizontalAlignment.Stretch,
+            VerticalAlignment = VerticalAlignment.Stretch,
+            HorizontalScrollBarVisibility = ScrollBarVisibility.Disabled,
+            HorizontalScrollMode = ScrollMode.Disabled,
+            VerticalScrollBarVisibility = ScrollBarVisibility.Auto,
+            VerticalScrollMode = ScrollMode.Enabled,
+            Background = new SolidColorBrush(Microsoft.UI.Colors.Transparent),
+        };
+        _scrollViewer.ViewChanged += OnViewChanged;
+        _scrollViewer.SizeChanged += OnContentSizeChanged;
+
+        _scrollToLatestButton = new Button
+        {
+            Width = 40,
+            Height = 40,
+            MinWidth = 0,
+            MinHeight = 0,
+            Padding = new Thickness(0),
+            CornerRadius = new CornerRadius(20),
+            HorizontalAlignment = HorizontalAlignment.Center,
+            VerticalAlignment = VerticalAlignment.Bottom,
+            Margin = new Thickness(0, 0, 0, 12),
+            Visibility = Visibility.Collapsed,
+            Content = new FontIcon
+            {
+                Glyph = "\uE70D",
+                FontSize = 16,
+                FontFamily = FluentIconCatalog.SymbolThemeFontFamily,
+            },
+        };
+        AutomationProperties.SetName(
+            _scrollToLatestButton,
+            LocalizationHelper.GetString("Chat_Timeline_ScrollToLatest"));
+        _scrollToLatestButton.Click += (_, _) => ScrollToEnd();
+
+        var root = new Grid();
+        root.Children.Add(_scrollViewer);
+        root.Children.Add(_scrollToLatestButton);
+        Content = root;
+    }
+
+    public void Update(ChatTimelineView view)
+    {
+        ArgumentNullException.ThrowIfNull(view);
+
+        var previousSessionId = _previousSessionId;
+        var previousEntryCount = _previousEntryCount;
+        var previousFirstEntryId = _previousFirstEntryId;
+        var previousLastEntryId = _previousLastEntryId;
+        var sessionChanged = !string.Equals(view.SessionId, previousSessionId, StringComparison.Ordinal);
+        var isFirstMount = sessionChanged && previousSessionId is null;
+        var initialLoad = isFirstMount
+            ? view.EntryCount > 0
+            : (!sessionChanged && previousEntryCount == 0 && view.EntryCount > 0);
+        var prependedHistory = !sessionChanged
+            && previousEntryCount > 0
+            && view.EntryCount > previousEntryCount
+            && previousFirstEntryId is not null
+            && !string.Equals(view.FirstEntryId, previousFirstEntryId, StringComparison.Ordinal)
+            && string.Equals(view.LastEntryId, previousLastEntryId, StringComparison.Ordinal)
+            && view.ContainsEntryId(previousFirstEntryId);
+        var appendedEntries = !sessionChanged
+            && view.EntryCount > previousEntryCount
+            && !prependedHistory;
+
+        _view = view;
+        _rowFactory.Update(view.Rows);
+        SyncRows(view.Rows);
+
+        if (view.EntryCount != previousEntryCount)
+            _loadMoreRequestedForCount = -1;
+
+        if (sessionChanged && !isFirstMount)
+        {
+            StoreCurrentOffsetForSession(previousSessionId);
+            if (view.EntryCount > 0)
+                QueueScrollToBottom(view.SessionId, disableAnimation: true);
+        }
+        else if (prependedHistory)
+        {
+            QueuePreservePrependOffset(view.SessionId, _lastVerticalOffset, _lastScrollableHeight);
+        }
+        else if (initialLoad)
+        {
+            var savedOffset = TryGetSessionOffset(view.SessionId);
+            if (savedOffset is not null)
+            {
+                _pendingRestoreOffset = savedOffset.Value;
+                _lastRestoreScrollableHeight = null;
+                _stableRestorePasses = 0;
+                _suppressAutoFollow = true;
+                _isFollowing = false;
+                ApplyPendingRestoreIfReady();
+            }
+            else
+            {
+                QueueScrollToBottom(view.SessionId, disableAnimation: true);
+            }
+        }
+        else if (appendedEntries && _isFollowing)
+        {
+            QueueScrollToBottom(view.SessionId, disableAnimation: false);
+        }
+
+        if (view.ScrollToBottomToken != _previousScrollToBottomToken)
+        {
+            _previousScrollToBottomToken = view.ScrollToBottomToken;
+            QueueScrollToBottom(view.SessionId, disableAnimation: false);
+        }
+
+        if (view.SuppressAutoFollowToken != _previousSuppressAutoFollowToken)
+        {
+            _previousSuppressAutoFollowToken = view.SuppressAutoFollowToken;
+            _suppressAutoFollow = true;
+        }
+
+        _previousSessionId = view.SessionId;
+        _previousFirstEntryId = view.FirstEntryId;
+        _previousLastEntryId = view.LastEntryId;
+        _previousEntryCount = view.EntryCount;
+    }
+
+    public void ScrollToEnd()
+    {
+        _pendingRestoreOffset = null;
+        ClearPendingPrependCorrection();
+        ResetScrollToEndState();
+        _suppressAutoFollow = false;
+        ClearSessionOffset(_view.SessionId);
+        QueueScrollToBottom(_view.SessionId, disableAnimation: false);
+    }
+
+    private void SyncRows(IReadOnlyList<ChatTimelineRow> desiredRows)
+    {
+        StableRowCollection.Sync(_rows, desiredRows, row => row.Key, _rowKeyScratch);
+    }
+
+    public void Dispose()
+    {
+        if (_disposed)
+            return;
+
+        _disposed = true;
+        _scrollViewer.ViewChanged -= OnViewChanged;
+        _scrollViewer.SizeChanged -= OnContentSizeChanged;
+        _itemsRepeater.SizeChanged -= OnContentSizeChanged;
+        _itemsRepeater.ItemsSource = null;
+        _itemsRepeater.ItemTemplate = null;
+        _rowFactory.Dispose();
+        Content = null;
+    }
+
+    private void OnContentSizeChanged(object sender, SizeChangedEventArgs e)
+    {
+        if (ApplyPendingRestoreIfReady())
+            return;
+
+        if (ApplyPendingPrependCorrectionIfReady())
+            return;
+
+        if (!_suppressAutoFollow && _isFollowing && _scrollToEndState == ScrollToEndState.Idle)
+        {
+            QueueScrollToBottom(_view.SessionId, disableAnimation: true);
+        }
+        else if (_suppressAutoFollow)
+        {
+            _suppressAutoFollow = false;
+        }
+    }
+
+    private void OnViewChanged(object? sender, ScrollViewerViewChangedEventArgs e)
+    {
+        var verticalOffset = _scrollViewer.VerticalOffset;
+
+        if (!e.IsIntermediate && _scrollToEndState == ScrollToEndState.BringingIntoView)
+        {
+            CompleteScrollToEnd();
+        }
+
+        var movedUp = verticalOffset < _lastVerticalOffset - 0.5;
+
+        if (e.IsIntermediate && _scrollToEndState != ScrollToEndState.BringingIntoView)
+        {
+            CancelPendingCorrectionsForManualScroll();
+            ResetScrollToEndState();
+            _isFollowing = false;
+            _scrollToLatestButton.Visibility = Visibility.Visible;
+        }
+        else if (_scrollToEndState == ScrollToEndState.Idle && IsAtBottom)
+        {
+            _isFollowing = true;
+            _scrollToLatestButton.Visibility = Visibility.Collapsed;
+        }
+        else if (_scrollToEndState == ScrollToEndState.Idle && (movedUp || !_isFollowing))
+        {
+            _isFollowing = false;
+            _scrollToLatestButton.Visibility = Visibility.Visible;
+        }
+
+        _lastVerticalOffset = verticalOffset;
+        _lastScrollableHeight = _scrollViewer.ScrollableHeight;
+        StoreCurrentOffsetForSession(_view.SessionId);
+
+        if (_scrollViewer.ScrollableHeight > 0
+            && _scrollViewer.VerticalOffset <= FollowThreshold
+            && (movedUp || _scrollViewer.VerticalOffset <= 1)
+            && _scrollToEndState == ScrollToEndState.Idle
+            && _view.HasMoreHistory
+            && _loadMoreRequestedForCount != _view.EntryCount)
+        {
+            _loadMoreRequestedForCount = _view.EntryCount;
+            _view.OnLoadMoreHistory?.Invoke();
+        }
+    }
+
+    private bool IsAtBottom =>
+        _scrollViewer.ScrollableHeight - _scrollViewer.VerticalOffset <= FollowThreshold;
+
+    private bool ApplyPendingRestoreIfReady()
+    {
+        if (_pendingRestoreOffset is not { } pendingOffset || _scrollViewer.ScrollableHeight <= 0)
+            return false;
+
+        var scrollableHeight = _scrollViewer.ScrollableHeight;
+        var target = ClampOffset(pendingOffset, scrollableHeight);
+        _isFollowing = scrollableHeight - target <= FollowThreshold;
+        _scrollToLatestButton.Visibility = _isFollowing ? Visibility.Collapsed : Visibility.Visible;
+        _scrollViewer.ChangeView(null, target, null, disableAnimation: true);
+        _lastVerticalOffset = target;
+        _lastScrollableHeight = scrollableHeight;
+
+        if (_lastRestoreScrollableHeight is { } previousHeight &&
+            Math.Abs(previousHeight - scrollableHeight) < 0.5)
+        {
+            _stableRestorePasses++;
+        }
+        else
+        {
+            _stableRestorePasses = 0;
+            _lastRestoreScrollableHeight = scrollableHeight;
+        }
+
+        if (_stableRestorePasses >= RequiredStableRestorePasses)
+        {
+            _pendingRestoreOffset = null;
+            _lastRestoreScrollableHeight = null;
+            _stableRestorePasses = 0;
+            _suppressAutoFollow = false;
+        }
+
+        return true;
+    }
+
+    private void QueueScrollToBottom(string? sessionId, bool disableAnimation)
+    {
+        _pendingRestoreOffset = null;
+        ClearPendingPrependCorrection();
+        _isFollowing = true;
+        _scrollToLatestButton.Visibility = Visibility.Collapsed;
+        if (_scrollToEndState != ScrollToEndState.Idle)
+        {
+            _scrollToEndPending = true;
+            _scrollToEndSessionId = sessionId;
+            _scrollToEndDisableAnimation = true;
+            QueueStuckBringIntoViewFallback();
+            return;
+        }
+
+        _scrollToEndPending = false;
+        _scrollToEndSessionId = sessionId;
+        _scrollToEndDisableAnimation = disableAnimation;
+        _scrollToEndState = ScrollToEndState.Queued;
+        EnqueueOnView(StartScrollToEndIfFollowing);
+    }
+
+    private void StartScrollToEndIfFollowing()
+    {
+        if (_scrollToEndState != ScrollToEndState.Queued)
+            return;
+
+        _scrollToEndState = ScrollToEndState.Idle;
+        if (!_isFollowing || _rows.Count == 0)
+        {
+            _scrollToEndPending = false;
+            return;
+        }
+
+        var latest = _itemsRepeater.GetOrCreateElement(_rows.Count - 1);
+        _scrollToEndState = ScrollToEndState.BringingIntoView;
+        latest.StartBringIntoView(new BringIntoViewOptions
+        {
+            AnimationDesired = !_scrollToEndDisableAnimation,
+            VerticalAlignmentRatio = 1.0,
+        });
+        QueueBringIntoViewCompletionFallback();
+    }
+
+    private void CompleteScrollToEnd()
+    {
+        if (_scrollToEndState != ScrollToEndState.BringingIntoView)
+            return;
+
+        _scrollToEndState = ScrollToEndState.Idle;
+        var bottom = _scrollViewer.ScrollableHeight;
+        _scrollViewer.ChangeView(null, bottom, null, _scrollToEndDisableAnimation);
+        _lastVerticalOffset = bottom;
+        _lastScrollableHeight = _scrollViewer.ScrollableHeight;
+        _isFollowing = true;
+        ClearSessionOffset(_scrollToEndSessionId);
+
+        if (_scrollToEndPending)
+        {
+            _scrollToEndPending = false;
+            QueueScrollToBottom(_scrollToEndSessionId, disableAnimation: true);
+        }
+    }
+
+    private void QueueStuckBringIntoViewFallback()
+    {
+        QueueBringIntoViewCompletionFallback();
+    }
+
+    private void QueueBringIntoViewCompletionFallback()
+    {
+        EnqueueOnView(() =>
+        {
+            if (_scrollToEndState == ScrollToEndState.BringingIntoView)
+                EnqueueOnView(CompleteScrollToEnd);
+        });
+    }
+
+    private void ResetScrollToEndState()
+    {
+        _scrollToEndPending = false;
+        _scrollToEndState = ScrollToEndState.Idle;
+    }
+
+    private void QueuePreservePrependOffset(string? sessionId, double oldOffset, double oldScrollableHeight)
+    {
+        _pendingPrependSessionId = sessionId;
+        _pendingPrependOldOffset = oldOffset;
+        _pendingPrependOldScrollableHeight = oldScrollableHeight;
+        _lastPrependScrollableHeight = null;
+        _stablePrependPasses = 0;
+        _suppressAutoFollow = true;
+        EnqueueOnView(() => { _ = ApplyPendingPrependCorrectionIfReady(); });
+    }
+
+    private bool ApplyPendingPrependCorrectionIfReady()
+    {
+        if (_pendingPrependOldOffset is not { } oldOffset ||
+            _pendingPrependOldScrollableHeight is not { } oldScrollableHeight ||
+            _scrollViewer.ScrollableHeight <= 0)
+        {
+            return false;
+        }
+
+        var scrollableHeight = _scrollViewer.ScrollableHeight;
+        var delta = scrollableHeight - oldScrollableHeight;
+        var target = ClampOffset(oldOffset + delta, scrollableHeight);
+        _scrollViewer.ChangeView(null, target, null, disableAnimation: true);
+        _lastVerticalOffset = target;
+        _lastScrollableHeight = scrollableHeight;
+        _isFollowing = scrollableHeight - target <= FollowThreshold;
+        _scrollToLatestButton.Visibility = _isFollowing ? Visibility.Collapsed : Visibility.Visible;
+        if (_isFollowing)
+            ClearSessionOffset(_pendingPrependSessionId);
+        else
+            StoreSessionOffset(_pendingPrependSessionId, target);
+
+        if (_lastPrependScrollableHeight is { } previousHeight &&
+            Math.Abs(previousHeight - scrollableHeight) < 0.5)
+        {
+            _stablePrependPasses++;
+        }
+        else
+        {
+            _stablePrependPasses = 0;
+            _lastPrependScrollableHeight = scrollableHeight;
+        }
+
+        if (_stablePrependPasses >= RequiredStableRestorePasses)
+        {
+            ClearPendingPrependCorrection();
+            _suppressAutoFollow = false;
+        }
+
+        return true;
+    }
+
+    private void ClearPendingPrependCorrection()
+    {
+        _pendingPrependSessionId = null;
+        _pendingPrependOldOffset = null;
+        _pendingPrependOldScrollableHeight = null;
+        _lastPrependScrollableHeight = null;
+        _stablePrependPasses = 0;
+    }
+
+    private void EnqueueOnView(Action action)
+    {
+        if (_disposed)
+            return;
+
+        var dispatcher = _scrollViewer.DispatcherQueue ?? DispatcherQueue;
+        if (dispatcher is null)
+        {
+            action();
+            return;
+        }
+
+        dispatcher.TryEnqueue(() =>
+        {
+            if (!_disposed)
+                action();
+        });
+    }
+
+    private void CancelPendingCorrectionsForManualScroll()
+    {
+        _pendingRestoreOffset = null;
+        _lastRestoreScrollableHeight = null;
+        _stableRestorePasses = 0;
+        ClearPendingPrependCorrection();
+        _suppressAutoFollow = false;
+    }
+
+    private static double ClampOffset(double offset, double max) =>
+        Math.Max(0, Math.Min(offset, max));
+
+    private static double? TryGetSessionOffset(string? sessionId)
+    {
+        if (sessionId is not { Length: > 0 })
+            return null;
+
+        lock (s_sessionOffsetsLock)
+        {
+            return s_sessionOffsets.TryGetValue(sessionId, out var offset) ? offset : null;
+        }
+    }
+
+    private static void StoreSessionOffset(string? sessionId, double offset)
+    {
+        if (sessionId is not { Length: > 0 })
+            return;
+
+        lock (s_sessionOffsetsLock)
+        {
+            s_sessionOffsets[sessionId] = offset;
+            if (s_sessionOffsets.Count <= MaxSessionOffsets)
+                return;
+
+            var first = s_sessionOffsets.Keys.First();
+            s_sessionOffsets.Remove(first);
+        }
+    }
+
+    private void StoreCurrentOffsetForSession(string? sessionId)
+    {
+        if (sessionId is not { Length: > 0 })
+            return;
+
+        if (_isFollowing || IsAtBottom)
+        {
+            ClearSessionOffset(sessionId);
+            return;
+        }
+
+        StoreSessionOffset(sessionId, _lastVerticalOffset);
+    }
+
+    private static void ClearSessionOffset(string? sessionId)
+    {
+        if (sessionId is not { Length: > 0 })
+            return;
+
+        lock (s_sessionOffsetsLock)
+        {
+            s_sessionOffsets.Remove(sessionId);
+        }
+    }
+
+    private sealed class ChatRowElementFactory : IElementFactory, IDisposable
+    {
+        private readonly Dictionary<string, ChatTimelineRow> _rows = new(StringComparer.Ordinal);
+        private readonly Dictionary<string, FunctionalHostControl> _hosts = new(StringComparer.Ordinal);
+        private readonly HashSet<string> _realizedKeys = new(StringComparer.Ordinal);
+
+        public void Update(IReadOnlyList<ChatTimelineRow> rows)
+        {
+            _rows.Clear();
+            foreach (var row in rows)
+                _rows[row.Key] = row;
+
+            RefreshRealizedRows();
+        }
+
+        private void RefreshRealizedRows()
+        {
+            foreach (var key in _realizedKeys.ToArray())
+            {
+                if (_rows.TryGetValue(key, out var row) && _hosts.TryGetValue(key, out var host))
+                {
+                    Mount(host, row, renderImmediately: false);
+                }
+                else
+                {
+                    _realizedKeys.Remove(key);
+                }
+            }
+        }
+
+        public UIElement GetElement(ElementFactoryGetArgs args)
+        {
+            if (args.Data is not ChatTimelineRow row)
+                return new ContentPresenter();
+
+            if (_rows.TryGetValue(row.Key, out var latestRow))
+                row = latestRow;
+
+            if (!_hosts.TryGetValue(row.Key, out var host))
+            {
+                host = new FunctionalHostControl
+                {
+                    SuppressAutoDispose = true,
+                    HorizontalAlignment = HorizontalAlignment.Stretch,
+                    VerticalAlignment = VerticalAlignment.Stretch,
+                    HorizontalContentAlignment = HorizontalAlignment.Stretch,
+                    VerticalContentAlignment = VerticalAlignment.Stretch,
+                    Background = new SolidColorBrush(Microsoft.UI.Colors.Transparent),
+                };
+                _hosts[row.Key] = host;
+            }
+            else if (host.Parent is not null)
+            {
+                DetachFromParent(host);
+            }
+
+            Mount(host, row, renderImmediately: true);
+            _realizedKeys.Add(row.Key);
+            return host;
+        }
+
+        public void RecycleElement(ElementFactoryRecycleArgs args)
+        {
+            if (args.Element is not FunctionalHostControl host)
+                return;
+
+            var key = _hosts.FirstOrDefault(kvp => ReferenceEquals(kvp.Value, host)).Key;
+            if (key is null)
+                return;
+
+            _realizedKeys.Remove(key);
+            host.Dispose();
+            _hosts.Remove(key);
+        }
+
+        public void Dispose()
+        {
+            foreach (var host in _hosts.Values)
+                host.Dispose();
+
+            _hosts.Clear();
+            _rows.Clear();
+            _realizedKeys.Clear();
+        }
+
+        private static void Mount(FunctionalHostControl host, ChatTimelineRow row, bool renderImmediately)
+        {
+            host.Mount(_ => row.Render(), preserveRootContext: true, renderImmediately: renderImmediately);
+        }
+
+        private static void DetachFromParent(FunctionalHostControl host)
+        {
+            switch (host.Parent)
+            {
+                case Panel panel:
+                    panel.Children.Remove(host);
+                    break;
+                case Border border when ReferenceEquals(border.Child, host):
+                    border.Child = null;
+                    break;
+                case ScrollViewer scrollViewer when ReferenceEquals(scrollViewer.Content, host):
+                    scrollViewer.Content = null;
+                    break;
+                case ContentControl contentControl when ReferenceEquals(contentControl.Content, host):
+                    contentControl.Content = null;
+                    break;
+            }
+        }
+    }
+}
diff --git a/src/OpenClaw.Tray.WinUI/Chat/FunctionalChatHostExtensions.cs b/src/OpenClaw.Tray.WinUI/Chat/FunctionalChatHostExtensions.cs
index 85cc8e014..b027581c1 100644
--- a/src/OpenClaw.Tray.WinUI/Chat/FunctionalChatHostExtensions.cs
+++ b/src/OpenClaw.Tray.WinUI/Chat/FunctionalChatHostExtensions.cs
@@ -5,12 +5,13 @@
 using Microsoft.UI.Xaml.Controls;
 using OpenClawTray.FunctionalUI.Hosting;
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace OpenClawTray.Chat;
 
 /// <summary>
-/// Helper for hosting the <see cref="OpenClawChatRoot"/> FunctionalUI tree
+/// Helper for hosting the <see cref="ChatRoot"/> FunctionalUI tree
 /// inside an existing XAML window/page. The FunctionalUI host renders
 /// into a target <see cref="Border"/>
 /// rather than replacing <see cref="Window.Content"/>, so the surrounding
@@ -39,7 +40,7 @@ public static Action<Action> AsPost(this DispatcherQueue dispatcher) =>
         };
 
     /// <summary>
-    /// Mount <see cref="OpenClawChatRoot"/> into <paramref name="target"/>.
+    /// Mount <see cref="ChatRoot"/> into <paramref name="target"/>.
     /// Returns a <see cref="MountedFunctionalChat"/> that releases the FunctionalUI host
     /// when the page/window unloads and exposes the chat root for file attachment.
     /// </summary>
@@ -62,7 +63,7 @@ public static MountedFunctionalChat MountFunctionalChat(
         ArgumentNullException.ThrowIfNull(target);
         ArgumentNullException.ThrowIfNull(provider);
 
-        var root = new OpenClawChatRoot(provider, initialThreadId, onReadAloud, onStopSpeaking, onVoiceRequest, onAttachClick, onSettingsClick, onSpeakerMuteChanged, initialMuted, isCompact);
+        var root = new ChatRoot(provider, initialThreadId, onReadAloud, onStopSpeaking, onVoiceRequest, onAttachClick, onSettingsClick, onSpeakerMuteChanged, initialMuted, isCompact);
         var host = new FunctionalHostControl();
         host.SuppressAutoDispose = suppressAutoDispose;
         host.Mount(root);
@@ -76,12 +77,15 @@ public static MountedFunctionalChat MountFunctionalChat(
 /// Exposes the <see cref="ChatRoot"/> so the host window/page can push file
 /// attachments into the composer.
 /// </summary>
-public sealed class MountedFunctionalChat(Border target, FunctionalHostControl host, OpenClawChatRoot root) : IDisposable
+public sealed class MountedFunctionalChat(Border target, FunctionalHostControl host, ChatRoot root) : IDisposable
 {
-    public OpenClawChatRoot ChatRoot => root;
+    public ChatRoot ChatRoot => root;
 
     /// <summary>Push a picked file into the composer as a pending attachment.</summary>
-    public void AttachFile(ChatAttachment attachment) => root.OnFileAttached?.Invoke(attachment);
+    public void AttachFile(ChatAttachment attachment) => AttachFiles(new[] { attachment });
+
+    /// <summary>Push picked files into the composer as pending attachments.</summary>
+    public void AttachFiles(IReadOnlyList<ChatAttachment> attachments) => root.OnFilesAttached?.Invoke(attachments);
 
     /// <summary>Push streaming voice transcript text into the composer.</summary>
     public void SetVoiceTranscript(string? text) => root.SetVoiceTranscript?.Invoke(text);
diff --git a/src/OpenClaw.Tray.WinUI/Chat/IChatGatewayBridge.cs b/src/OpenClaw.Tray.WinUI/Chat/IChatGatewayBridge.cs
index 3c5aaa240..1a2b29348 100644
--- a/src/OpenClaw.Tray.WinUI/Chat/IChatGatewayBridge.cs
+++ b/src/OpenClaw.Tray.WinUI/Chat/IChatGatewayBridge.cs
@@ -35,8 +35,27 @@ public interface IChatGatewayBridge : IDisposable
     void StartProactiveBootstrap();
 
     Task SendChatMessageAsync(string message, string? sessionKey, string? sessionId, IReadOnlyList<ChatAttachment>? attachments = null);
-    Task<ChatSendResult> SendChatMessageForRunAsync(string message, string? sessionKey, string? sessionId, IReadOnlyList<ChatAttachment>? attachments = null);
+    Task<ChatSendResult> SendChatMessageForRunAsync(
+        string message,
+        string? sessionKey,
+        string? sessionId,
+        IReadOnlyList<ChatAttachment>? attachments = null,
+        string? idempotencyKey = null);
+    /// <summary>
+    /// Fetches the gateway command catalog (<c>commands.list</c>) via the typed
+    /// protocol API. Returns a <see cref="CommandCatalog"/> whose
+    /// <see cref="CommandCatalog.IsSupported"/> is <c>false</c> when the gateway
+    /// does not implement the method. Request/response — no event subscription.
+    /// </summary>
+    Task<CommandCatalog> ListCommandsAsync(CommandCatalogQuery? query = null);
     Task PatchSessionModelAsync(string sessionKey, string model);
+    /// <summary>
+    /// Clears the session's model override (tri-state <c>sessions.patch</c> with
+    /// an explicit JSON null), reverting the session to the gateway/agent
+    /// default. Distinct from <see cref="PatchSessionModelAsync"/>, which sets a
+    /// concrete model.
+    /// </summary>
+    Task ClearSessionModelAsync(string sessionKey);
     Task PatchSessionThinkingLevelAsync(string sessionKey, string thinkingLevel);
     Task<ChatHistoryInfo> RequestChatHistoryAsync(string? sessionKey);
     Task SendChatAbortAsync(string runId, string? sessionKey = null);
@@ -156,14 +175,25 @@ public void StartProactiveBootstrap()
     public Task SendChatMessageAsync(string message, string? sessionKey, string? sessionId, IReadOnlyList<ChatAttachment>? attachments = null) =>
         _client.SendChatMessageAsync(message, sessionKey, sessionId, attachments);
 
-    public Task<ChatSendResult> SendChatMessageForRunAsync(string message, string? sessionKey, string? sessionId, IReadOnlyList<ChatAttachment>? attachments = null) =>
-        _client.SendChatMessageForRunAsync(message, sessionKey, sessionId, attachments);
+    public Task<ChatSendResult> SendChatMessageForRunAsync(
+        string message,
+        string? sessionKey,
+        string? sessionId,
+        IReadOnlyList<ChatAttachment>? attachments = null,
+        string? idempotencyKey = null) =>
+        _client.SendChatMessageForRunAsync(message, sessionKey, sessionId, attachments, idempotencyKey);
 
     public Task PatchSessionModelAsync(string sessionKey, string model) =>
-        _client.PatchSessionAsync(sessionKey, model: model);
+        _client.PatchSessionAsync(sessionKey, new SessionPatch { Model = model });
+
+    public Task ClearSessionModelAsync(string sessionKey) =>
+        _client.PatchSessionAsync(sessionKey, new SessionPatch { Model = SessionPatch.Clear });
 
     public Task PatchSessionThinkingLevelAsync(string sessionKey, string thinkingLevel) =>
-        _client.PatchSessionAsync(sessionKey, thinkingLevel: thinkingLevel);
+        _client.PatchSessionAsync(sessionKey, new SessionPatch { ThinkingLevel = thinkingLevel });
+
+    public Task<CommandCatalog> ListCommandsAsync(CommandCatalogQuery? query = null) =>
+        _client.ListCommandsAsync(query);
 
     public Task<ChatHistoryInfo> RequestChatHistoryAsync(string? sessionKey) =>
         _client.RequestChatHistoryAsync(sessionKey);
diff --git a/src/OpenClaw.Tray.WinUI/Chat/OpenClawChatCoordinator.cs b/src/OpenClaw.Tray.WinUI/Chat/OpenClawChatCoordinator.cs
index f388d7257..54a075db7 100644
--- a/src/OpenClaw.Tray.WinUI/Chat/OpenClawChatCoordinator.cs
+++ b/src/OpenClaw.Tray.WinUI/Chat/OpenClawChatCoordinator.cs
@@ -138,7 +138,9 @@ private async Task SpeakConfiguredTextAsync(string text, bool muteVoiceCapture,
             var speakArgs = new TtsSpeakArgs
             {
                 Text = speakText,
-                Provider = _settings.TtsProvider ?? TtsCapability.PiperProvider,
+                // Leave provider unset so TextToSpeechService treats this as
+                // configured/default playback and can fall back when needed.
+                Provider = null,
                 Interrupt = true
             };
 
diff --git a/src/OpenClaw.Tray.WinUI/Chat/OpenClawChatDataProvider.cs b/src/OpenClaw.Tray.WinUI/Chat/OpenClawChatDataProvider.cs
index ffc0502a9..f323959ab 100644
--- a/src/OpenClaw.Tray.WinUI/Chat/OpenClawChatDataProvider.cs
+++ b/src/OpenClaw.Tray.WinUI/Chat/OpenClawChatDataProvider.cs
@@ -1,7 +1,9 @@
 using System.Buffers;
 using System.Collections.Concurrent;
+using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Text.Encodings.Web;
 using System.Text.Json;
 using OpenClaw.Chat;
 using OpenClaw.Shared;
@@ -22,6 +24,13 @@ internal static class LocalizationHelper
     public static string GetString(string resourceKey) => resourceKey switch
     {
         "Chat_TruncationMarkerFormat" => " … [{0} bytes truncated]",
+        "Chat_Permission_Allow" => "Allow once",
+        "Chat_Permission_AllowAlways" => "Always allow",
+        "Chat_Permission_Deny" => "Deny once",
+        "Chat_Permission_CommandApprovalTitle" => "Command approval requested",
+        "Chat_Permission_ResultSubmittedFormat" => "Approval {0} submitted for {1}.",
+        "Chat_Error_SendReturnedStatusFormat" => "Gateway returned send status '{0}'.",
+        "Chat_Error_SendFailedFormat" => "Send failed: {0}",
         _ => resourceKey
     };
 }
@@ -62,6 +71,12 @@ internal static class LocalizationHelper
 public sealed class OpenClawChatDataProvider : IChatDataProvider
 {
     private const long ResetTimestampToleranceMs = 1000;
+    private static readonly JsonSerializerOptions CacheJsonOptions = new()
+    {
+        WriteIndented = true,
+        Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
+    };
+
     /// <summary>
     /// Process-wide cache mapping an attachment's filename to its raw image
     /// bytes. Populated by <see cref="SendMessageAsync"/> for image
@@ -81,8 +96,11 @@ public sealed class OpenClawChatDataProvider : IChatDataProvider
     private readonly string _attachmentMetaCacheFilePath;
     private System.Threading.Timer? _toolMetaSaveTimer; // debounce cache writes
     private long _toolMetaSaveVersion;
+    private bool _toolMetaCacheDirty;
     private readonly Dictionary<string, ChatTimelineState> _timelines = new();
+    private readonly Dictionary<string, LocalInlineApproval> _localInlineApprovals = new(StringComparer.Ordinal);
     private readonly Dictionary<string, string> _activeRunIds = new();   // sessionKey → runId
+    private readonly Dictionary<string, long> _activeRunStartSequences = new(); // sessionKey → lifecycle.start sequence
     private readonly Dictionary<string, int> _pendingAbortCounts = new(); // threads → count of pending aborts waiting for lifecycle.start
     private readonly HashSet<string> _abortedRunIds = new();             // runIds whose events should be suppressed
     private readonly HashSet<string> _abortedThreads = new();            // threads with active abort — suppress chat messages (no runId on those)
@@ -95,10 +113,12 @@ public sealed class OpenClawChatDataProvider : IChatDataProvider
     private readonly Dictionary<string, string> _sessionIds = new();      // sessionKey → immutable sessionId
     private readonly HashSet<string> _historyLoaded = new();              // sessionKey
     private readonly HashSet<string> _historyInFlight = new();            // sessionKey
+    private readonly Dictionary<string, Task> _pendingModelPatches = new(); // sessionKey -> in-flight model set/clear
     private readonly Dictionary<string, long> _resetVersions = new(); // sessionKey -> reset generation
     private readonly Dictionary<string, long> _resetCutoffUtcMs = new(); // sessionKey -> local reset time
     private readonly HashSet<string> _resetAwaitingUserMessage = new(); // threads reset and waiting for first post-reset turn
     private readonly Dictionary<string, HashSet<string>> _resetIgnoredRunIds = new(); // sessionKey -> pre-reset run IDs to drop
+    private readonly Dictionary<string, Dictionary<string, Queue<DateTimeOffset>>> _resetSubmittedLocalEchoTexts = new(); // sessionKey -> pre-reset local user echoes that reached the gateway
     private readonly Dictionary<string, HashSet<string>> _resetAcceptedRunIds = new(); // sessionKey -> post-reset run IDs allowed to open the gate
     private readonly Dictionary<string, long> _resetLocalSendWithoutRunVersions = new(); // sessionKey -> reset generation for no-runId sends
     private readonly Dictionary<string, long> _resetLocalSendWithoutRunStartSequences = new(); // sessionKey -> lifecycle sequence at local send start
@@ -106,6 +126,7 @@ public sealed class OpenClawChatDataProvider : IChatDataProvider
     private readonly Dictionary<string, List<PendingResetLifecycleStart>> _resetPendingLifecycleStarts = new(); // sessionKey -> lifecycle.start seen before proof
     private readonly HashSet<string> _resetRemoteBackfillInFlight = new(); // threads proving a timestamp-less remote user frame via history
     private long _resetLifecycleStartSequence;
+    private long _lifecycleStartSequence;
     private readonly HashSet<string> _resetRemoteUserSeen = new(); // threads with a fresh remote post-reset user frame
     private readonly Dictionary<string, string> _resetClearedSessionIds = new(); // sessionKey -> sessionId cleared by reset
     // Per-session cache of tool metadata from live SSE events.
@@ -116,6 +137,13 @@ public sealed class OpenClawChatDataProvider : IChatDataProvider
     // Track recently-sent local user message texts so we can suppress
     // SSE echoes while still displaying messages from other clients.
     private readonly Dictionary<string, Queue<LocalSentText>> _localSentTexts = new();
+    private readonly Dictionary<string, List<ChatQueuedMessage>> _queuedMessages = new();
+    private readonly Dictionary<string, List<QueuedSendRequest>> _queuedSendRequests = new();
+    private readonly Dictionary<string, Dictionary<string, string>> _queuedMessageIdsByRunId = new();
+    private readonly Dictionary<string, List<string>> _terminalRunIdsByThread = new();
+    private readonly HashSet<string> _queuedDrainScheduledThreads = new(StringComparer.Ordinal);
+    private readonly HashSet<string> _assistantFallbackPromotedThreads = new(StringComparer.Ordinal);
+    private long _queuedMessageSequence;
     private int _keylessEventDiagnosticRaised;
     // Threads where we locally initiated the current turn (via SendMessageAsync).
     // When lifecycle.start arrives for a thread NOT in this set, we know a remote
@@ -124,8 +152,39 @@ public sealed class OpenClawChatDataProvider : IChatDataProvider
     // Per-thread retry count for LoadHistoryAsync to prevent unbounded retry loops.
     private readonly Dictionary<string, int> _historyRetryCount = new();
     private const int MaxHistoryRetries = 3;
+    private const int MaxDeferredAdmissionRetries = 8;
     private static readonly TimeSpan LocalEchoSuppressionWindow = TimeSpan.FromSeconds(30);
-    private readonly record struct LocalSentText(string Text, DateTimeOffset SentAt);
+    private static readonly TimeSpan DeferredQueueDrainDelay = TimeSpan.FromMilliseconds(100);
+    private static readonly TimeSpan MaxDeferredAdmissionRetryDelay = TimeSpan.FromSeconds(1);
+    private readonly record struct LocalSentText(string Text, DateTimeOffset SentAt, string QueuedMessageId);
+    private sealed record QueuedSendRequest(
+        string Id,
+        string SendRunId,
+        string ThreadId,
+        string Text,
+        string DisplayText,
+        string LocalNonce,
+        IReadOnlyList<ChatAttachment>? Attachments,
+        int DeferredAdmissionRetryCount = 0,
+        DateTimeOffset? DeferredAdmissionRetryAfter = null);
+    private sealed record QueuedSendDispatch(
+        QueuedSendRequest Request,
+        string? SessionId,
+        long ResetVersion,
+        long StartedLifecycleSequence,
+        long StartedRunStartSequence,
+        bool StartedDirectly);
+    private enum AssistantQueueFrameDisposition
+    {
+        Render,
+        Drop,
+    }
+    private sealed record LocalInlineApproval(
+        string ThreadId,
+        string RequestId,
+        string Detail,
+        TaskCompletionSource<ExecApprovalPromptDecision> Response);
+    private static readonly TimeSpan LocalInlineApprovalTimeout = TimeSpan.FromSeconds(30);
     // Per-thread, per-entry metadata: timestamp + model snapshot at the
     // moment the entry was created. Built up as events are applied so the
     // timeline renderer can show a "<sender> · <local time> · <model>" footer
@@ -142,6 +201,18 @@ public sealed class OpenClawChatDataProvider : IChatDataProvider
     // false on disconnect alongside `_status`.
     private bool _sessionsListReceived;
     private string[] _availableModels = Array.Empty<string>();
+    private IReadOnlyList<ChatModelChoice> _modelChoices = Array.Empty<ChatModelChoice>();
+    // Gateway command catalog (commands.list), fetched on demand via the typed
+    // protocol API. Null until the first fetch completes so the UI can
+    // distinguish "still loading" from "loaded but empty". When the gateway
+    // reports the method unsupported the catalog carries IsSupported=false.
+    private CommandCatalog? _commandCatalog;
+    // Guards against overlapping in-flight commands.list fetches.
+    private bool _commandsFetchInFlight;
+    // Bumped on every transition out of Connected so a commands.list fetch that
+    // was already in flight at disconnect time is discarded on completion rather
+    // than resurrecting a catalog for a stale connection.
+    private int _commandsEpoch;
     private ConnectionStatus _status;
     private bool _disposed;
 
@@ -191,11 +262,17 @@ internal OpenClawChatDataProvider(
         // that completed before the provider was constructed will have its
         // models.list snapshot cached on the bridge).
         if (bridge.GetCurrentModelsList() is { } seedModels)
-            _availableModels = ExtractModelNames(seedModels);
+        {
+            _modelChoices = ChatModelChoice.FromModelsList(seedModels);
+            _availableModels = ModelIdsFromChoices(_modelChoices);
+        }
         // Fall back to last-known models so the composer shows a real model
         // name while reconnecting instead of the generic "model" placeholder.
         else if (_lastChatState?.AvailableModels is { Length: > 0 } cached)
+        {
             _availableModels = cached;
+            _modelChoices = ChoicesFromIds(cached);
+        }
 
         _bridge.StatusChanged += OnStatusChanged;
         _bridge.SessionsUpdated += OnSessionsUpdated;
@@ -224,6 +301,7 @@ public Task<ChatDataSnapshot> LoadAsync(CancellationToken cancellationToken = de
         {
             _sessions = sessions;
             EnsureTimelinesForSessionsLocked();
+            RememberLastSessionStateLocked();
             return Task.FromResult(BuildSnapshotLocked());
         }
     }
@@ -273,73 +351,232 @@ public async Task SendMessageAsync(string threadId, string message, Cancellation
                 : $"{safeUserText}\n{chips}";
         }
 
-        // 1. Optimistically add the user message + flag turn active.
+        // 1. Render immediately when this thread is idle. Follow-up messages
+        // enter the visible queue and stay client-only until the turn ends.
         ChatDataSnapshot snapshot;
-        string? sessionId;
-        long sendResetVersion;
-        long sendStartedLifecycleSequence;
+        string messageId;
+        QueuedSendDispatch? dispatch;
         lock (_gate)
         {
-            sendResetVersion = GetResetVersionLocked(threadId);
-            sendStartedLifecycleSequence = _resetLifecycleStartSequence;
-            var current = GetOrCreateTimelineLocked(threadId);
-            var beforeNextId = current.NextId;
-            _timelines[threadId] = ChatTimelineReducer.AddLocalUser(current, displayText, nonce);
-            _sessionIds.TryGetValue(threadId, out sessionId);
-
-            // Track this text so we can suppress the SSE echo.
-            if (!_localSentTexts.TryGetValue(threadId, out var q))
-            {
-                q = new Queue<LocalSentText>();
-                _localSentTexts[threadId] = q;
-            }
-            q.Enqueue(new LocalSentText(trimmed, DateTimeOffset.UtcNow));
-            // Cap at 20 to avoid unbounded growth.
-            while (q.Count > 20) q.Dequeue();
+            ObjectDisposedException.ThrowIf(_disposed, this);
+            messageId = $"q{++_queuedMessageSequence}";
+            if (CanClearAssistantFallbackPromotionLocked(threadId))
+                _assistantFallbackPromotedThreads.Remove(threadId);
 
             // Clear abort suppression — the user is starting a new interaction.
             // Also clear pending abort counts: if the user sends a new message,
             // any queued aborts from before should not fire against the new turn.
             _abortedThreads.Remove(threadId);
             _pendingAbortCounts.Remove(threadId);
-            _locallyInitiatedThreads.Add(threadId);
 
-            // Capture metadata for the just-added user entry.
-            var meta = BuildLiveMetaLocked(threadId);
-            var threadMeta = GetOrCreateThreadMetaLocked(threadId);
-            threadMeta[$"e{beforeNextId}"] = meta;
+            var request = new QueuedSendRequest(
+                messageId,
+                Guid.NewGuid().ToString(),
+                threadId,
+                trimmed,
+                displayText,
+                nonce,
+                attachments?.ToArray());
+
+            if (CanSendDirectlyLocked(threadId))
+            {
+                dispatch = StartDirectSendLocked(request);
+            }
+            else
+            {
+                AddQueuedMessageLocked(threadId, new ChatQueuedMessage(
+                    messageId,
+                    displayText,
+                    DateTimeOffset.UtcNow,
+                    nonce));
+                AddQueuedSendRequestLocked(request);
+                dispatch = TryStartNextQueuedSendLocked(threadId, requireConnected: false, out _);
+            }
 
             snapshot = BuildSnapshotLocked();
         }
         Publish(snapshot);
 
-        // 2. Send to gateway.
+        if (dispatch is not null)
+            await DispatchQueuedSendAsync(dispatch, rethrow: true, cancellationToken);
+    }
+
+    public Task<bool> CancelQueuedMessageAsync(string threadId, string queuedMessageId, CancellationToken cancellationToken = default)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        if (string.IsNullOrEmpty(threadId))
+            throw new ArgumentException("Thread id is required.", nameof(threadId));
+        if (string.IsNullOrEmpty(queuedMessageId))
+            throw new ArgumentException("Queued message id is required.", nameof(queuedMessageId));
+
+        ChatDataSnapshot? snapshot = null;
+        var canceled = false;
+        lock (_gate)
+        {
+            ObjectDisposedException.ThrowIf(_disposed, this);
+            canceled = CancelQueuedMessageLocked(threadId, queuedMessageId);
+            if (canceled)
+                snapshot = BuildSnapshotLocked();
+        }
+
+        if (snapshot is not null)
+            Publish(snapshot);
+
+        return Task.FromResult(canceled);
+    }
+
+    private async Task DispatchQueuedSendAsync(
+        QueuedSendDispatch dispatch,
+        bool rethrow,
+        CancellationToken cancellationToken = default)
+    {
+        var request = dispatch.Request;
+        var threadId = request.ThreadId;
+        var hasAttachments = request.Attachments is { Count: > 0 };
+
         try
         {
-            var sendResult = await _bridge.SendChatMessageForRunAsync(trimmed, threadId, sessionId, attachments);
+            await AwaitPendingModelPatchAsync(threadId, cancellationToken);
+            lock (_gate)
+            {
+                if (_disposed)
+                    return;
+                if (GetResetVersionLocked(threadId) == dispatch.ResetVersion)
+                    TrackQueuedMessageRunLocked(threadId, request.SendRunId, request.Id);
+            }
+            var sendResult = await _bridge.SendChatMessageForRunAsync(
+                request.Text,
+                threadId,
+                dispatch.SessionId,
+                request.Attachments,
+                idempotencyKey: request.SendRunId);
+            if (sendResult.IsTerminalFailure)
+            {
+                var failure = !string.IsNullOrWhiteSpace(sendResult.Error)
+                    ? sendResult.Error!
+                    : string.Format(
+                        CultureInfo.CurrentCulture,
+                        LocalizationHelper.GetString("Chat_Error_SendReturnedStatusFormat"),
+                        sendResult.Status);
+                throw new InvalidOperationException(failure);
+            }
+
             bool sendStillCurrent;
+            string? staleRunIdToAbort = null;
+            ChatDataSnapshot? acceptedSnapshot = null;
+            ChatDataSnapshot? requeuedSnapshot = null;
+            var retryDeferredSend = false;
+            var deferredRetryDelay = DeferredQueueDrainDelay;
+            var acceptedRunId = string.IsNullOrWhiteSpace(sendResult.RunId)
+                ? null
+                : sendResult.RunId!;
             lock (_gate)
             {
-                sendStillCurrent = GetResetVersionLocked(threadId) == sendResetVersion;
+                sendStillCurrent = GetResetVersionLocked(threadId) == dispatch.ResetVersion;
                 if (!sendStillCurrent)
                 {
-                    if (!string.IsNullOrEmpty(sendResult.RunId))
-                        AddResetIgnoredRunIdLocked(threadId, sendResult.RunId!);
+                    staleRunIdToAbort = acceptedRunId ?? request.SendRunId;
+                    AddResetIgnoredRunIdLocked(threadId, staleRunIdToAbort);
+                }
+                else if (IsDeferredAdmissionStatus(sendResult.Status))
+                {
+                    var runAlreadyStarted = !string.IsNullOrEmpty(acceptedRunId)
+                        && _activeRunIds.TryGetValue(threadId, out var activeRunId)
+                        && _activeRunStartSequences.TryGetValue(threadId, out var activeStartSequence)
+                        && string.Equals(activeRunId, acceptedRunId, StringComparison.Ordinal)
+                        && activeStartSequence > dispatch.StartedRunStartSequence;
+                    if (runAlreadyStarted)
+                    {
+                        TrackQueuedMessageRunLocked(threadId, acceptedRunId!, request.Id);
+                        AddResetAcceptedRunIdLocked(threadId, acceptedRunId!);
+                        if (PromoteQueuedMessageLocked(threadId, request.Id))
+                        {
+                            acceptedSnapshot = BuildSnapshotLocked();
+                        }
+                        else
+                        {
+                            RemoveQueuedRunMappingByMessageIdLocked(threadId, request.Id);
+                        }
+                    }
+                    else if (RequeueDeferredAdmissionLocked(threadId, request.Id, out deferredRetryDelay))
+                    {
+                        if (!string.IsNullOrEmpty(acceptedRunId))
+                        {
+                            TrackQueuedMessageRunLocked(threadId, acceptedRunId, request.Id);
+                            AddResetAcceptedRunIdLocked(threadId, acceptedRunId);
+                        }
+                        requeuedSnapshot = BuildSnapshotLocked();
+                        retryDeferredSend = true;
+                    }
+                    else if (dispatch.StartedDirectly)
+                    {
+                        throw new InvalidOperationException(
+                            $"Gateway returned chat.send status {sendResult.Status} before admitting the direct send.");
+                    }
                 }
-                else if (!string.IsNullOrEmpty(sendResult.RunId))
+                else if (!string.IsNullOrEmpty(acceptedRunId))
                 {
-                    AddResetAcceptedRunIdLocked(threadId, sendResult.RunId!);
+                    TrackQueuedMessageRunLocked(threadId, acceptedRunId, request.Id);
+                    AddResetAcceptedRunIdLocked(threadId, acceptedRunId);
+                    var runAlreadyStarted = _activeRunIds.TryGetValue(threadId, out var activeRunId)
+                        && _activeRunStartSequences.TryGetValue(threadId, out var activeStartSequence)
+                        && string.Equals(activeRunId, acceptedRunId, StringComparison.Ordinal)
+                        && activeStartSequence > dispatch.StartedRunStartSequence;
+                    if (PromoteQueuedMessageLocked(threadId, request.Id))
+                    {
+                        acceptedSnapshot = BuildSnapshotLocked();
+                    }
+                    else if (runAlreadyStarted)
+                    {
+                        RemoveQueuedRunMappingByMessageIdLocked(threadId, request.Id);
+                    }
                 }
                 else if (_resetAwaitingUserMessage.Contains(threadId))
                 {
-                    _resetLocalSendWithoutRunVersions[threadId] = sendResetVersion;
-                    _resetLocalSendWithoutRunStartSequences[threadId] = sendStartedLifecycleSequence;
+                    RemoveQueuedRunMappingByRunIdLocked(threadId, request.SendRunId);
+                    _resetLocalSendWithoutRunVersions[threadId] = dispatch.ResetVersion;
+                    _resetLocalSendWithoutRunStartSequences[threadId] = dispatch.StartedLifecycleSequence;
                     TryOpenResetGateFromPendingLifecycleLocked(threadId, acceptedRunId: null);
+                    if (PromoteQueuedMessageLocked(threadId, request.Id))
+                    {
+                        acceptedSnapshot = BuildSnapshotLocked();
+                    }
+                }
+                else if (PromoteQueuedMessageLocked(threadId, request.Id))
+                {
+                    RemoveQueuedRunMappingByRunIdLocked(threadId, request.SendRunId);
+                    acceptedSnapshot = BuildSnapshotLocked();
+                }
+            }
+
+            if (acceptedSnapshot is not null)
+            {
+                Publish(acceptedSnapshot);
+            }
+            if (requeuedSnapshot is not null)
+            {
+                Publish(requeuedSnapshot);
+            }
+            if (retryDeferredSend)
+            {
+                ScheduleQueuedSendDrain(threadId, deferredRetryDelay);
+            }
+
+            if (staleRunIdToAbort is not null)
+            {
+                try
+                {
+                    Logger.Info($"[Reset] Aborting late pre-reset send runId='{staleRunIdToAbort}' threadId='{threadId}'");
+                    await _bridge.SendChatAbortAsync(staleRunIdToAbort, threadId);
+                }
+                catch (Exception abortEx)
+                {
+                    Logger.Warn($"[Reset] Failed to abort late pre-reset send runId='{staleRunIdToAbort}': {abortEx.Message}");
                 }
             }
 
             if (hasAttachments && sendStillCurrent)
-                CacheAttachmentMeta(sessionId, threadId, trimmed, attachments!, DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(), sendResetVersion);
+                CacheAttachmentMeta(dispatch.SessionId, threadId, request.Text, request.Attachments!, DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(), dispatch.ResetVersion);
         }
         catch (Exception ex)
         {
@@ -347,14 +584,21 @@ public async Task SendMessageAsync(string threadId, string message, Cancellation
             ChatDataSnapshot? failureSnapshot = null;
             lock (_gate)
             {
-                sendStillCurrent = GetResetVersionLocked(threadId) == sendResetVersion;
+                sendStillCurrent = GetResetVersionLocked(threadId) == dispatch.ResetVersion;
                 if (sendStillCurrent)
                 {
-                    RemovePendingLocalEchoLocked(threadId, trimmed);
-                    _locallyInitiatedThreads.Remove(threadId);
+                    RemovePendingLocalEchoLocked(threadId, request.Id);
+                    MarkQueuedMessageFailedLocked(threadId, request.Id, ex.Message);
+                    RemoveQueuedSendRequestLocked(threadId, request.Id);
+                    RemoveQueuedRunMappingByMessageIdLocked(threadId, request.Id);
+                    if (!HasSendingQueuedMessagesLocked(threadId))
+                        _locallyInitiatedThreads.Remove(threadId);
                     failureSnapshot = ApplyEventLocked(
                         threadId,
-                        TruncateChatEvent(new ChatErrorEvent($"Send failed: {ex.Message}")),
+                        TruncateChatEvent(new ChatErrorEvent(string.Format(
+                            CultureInfo.CurrentCulture,
+                            LocalizationHelper.GetString("Chat_Error_SendFailedFormat"),
+                            ex.Message))),
                         meta: null);
                     failureSnapshot = ApplyEventLocked(threadId, new ChatTurnEndEvent(), meta: null);
                 }
@@ -363,12 +607,15 @@ public async Task SendMessageAsync(string threadId, string message, Cancellation
             if (!sendStillCurrent)
                 return;
 
-            // Surface as an error in the timeline + notification — keeps the
-            // user message visible so they can edit/retry.
+            Logger.Warn($"[Queue] chat.send failed threadId='{threadId}' queuedMessageId='{request.Id}' sendRunId='{request.SendRunId}': {ex.Message}");
+            // Surface as an error in the timeline + notification, while the
+            // failed queue card keeps the attempted text visible for retry/edit.
             Publish(failureSnapshot!);
             RaiseNotification(new ChatProviderNotification(
                 ChatProviderNotificationKind.Error, threadId, LocalizationHelper.GetString("Chat_Notification_SendFailed"), ex.Message));
-            throw;
+            TryDispatchNextQueuedSend(threadId);
+            if (rethrow)
+                throw;
         }
     }
 
@@ -412,10 +659,15 @@ public async Task StopResponseAsync(string threadId, CancellationToken cancellat
                 {
                     _abortedThreads.Remove(threadId);
                     _abortedRunIds.Remove(runId);
+                    _activeRunIds.Remove(threadId);
+                    _activeRunStartSequences.Remove(threadId);
+                    if (!HasSendingQueuedMessagesLocked(threadId))
+                        _locallyInitiatedThreads.Remove(threadId);
                 }
                 Logger.Warn($"[ABORT] chat.abort failed, cleared suppression: {ex.Message}");
                 RaiseNotification(new ChatProviderNotification(
                     ChatProviderNotificationKind.Error, threadId, LocalizationHelper.GetString("Chat_Notification_AbortFailed"), ex.Message));
+                ApplyEventAndPublish(threadId, new ChatTurnEndEvent());
                 return;
             }
         }
@@ -435,6 +687,18 @@ public async Task StopResponseAsync(string threadId, CancellationToken cancellat
             ApplyEventAndPublish(threadId, new ChatStatusEvent("Aborted", ChatTone.Warning));
         }
 
+        lock (_gate)
+        {
+            if (!string.IsNullOrEmpty(runId))
+            {
+                _activeRunIds.Remove(threadId);
+                _activeRunStartSequences.Remove(threadId);
+            }
+            _abortedThreads.Remove(threadId);
+            if (!HasSendingQueuedMessagesLocked(threadId))
+                _locallyInitiatedThreads.Remove(threadId);
+        }
+
         // Always clear local "turn active" state — the gateway will emit a
         // lifecycle.end if the abort succeeds, but we want the UI to reflect
         // the user's intent immediately.
@@ -483,15 +747,14 @@ public async Task LoadHistoryAsync(string threadId, bool force = false, Cancella
                 var prior = GetOrCreateTimelineLocked(threadId);
                 var rebuilt = ChatTimelineState.Initial() with { HistoryLoaded = true };
 
-                // Sort by timestamp ascending as a safety net — the gateway is
-                // expected to return chronological order, but don't trust it.
-                // Stable secondary sort preserves the original index for ties.
-                var ordered = history.Messages
-                    .Select((m, i) => (m, i))
-                    .OrderBy(t => t.m.Ts)
-                    .ThenBy(t => t.i)
-                    .Select(t => t.m)
+                // Prefer the gateway's per-session sequence over timestamps.
+                // Spam/queue bursts can produce persisted rows whose timestamps
+                // don't reflect the actual processing order; __openclaw.seq is
+                // the stable transcript order when present.
+                var orderedItems = history.Messages
+                    .Select((m, i) => (Message: m, Index: i))
                     .ToList();
+                var ordered = OrderHistoryMessages(orderedItems);
 
                 // Build per-entry metadata in lockstep with the reducer.
                 var rebuiltMeta = new Dictionary<string, ChatEntryMetadata>();
@@ -539,7 +802,9 @@ ChatTimelineState ApplyAndCaptureMeta(ChatTimelineState s, ChatEvent e, ChatEntr
                         msg.InputTokens,
                         msg.OutputTokens,
                         msg.ResponseTokens,
-                        msg.ContextPercent);
+                        msg.ContextPercent,
+                        GatewayMessageId: msg.OpenClawId,
+                        OpenClawSeq: msg.OpenClawSeq);
 
                     // Cap per-message text up front so heuristics, logging,
                     // and the reducer all see the same bounded value
@@ -616,6 +881,12 @@ ChatTimelineState ApplyAndCaptureMeta(ChatTimelineState s, ChatEvent e, ChatEntr
                             break;
 
                         case "assistant":
+                            if (ChatMessageInfo.IsSilentAssistantDirective(roleLower, text))
+                            {
+                                Logger.Debug("[ChatHistory]   → routed: SILENT assistant directive");
+                                break;
+                            }
+
                             // If this assistant response was aborted, show a placeholder
                             // instead of the actual (partial) content.
                             if (shouldMarkAborted)
@@ -745,13 +1016,20 @@ ChatTimelineState ApplyAndCaptureMeta(ChatTimelineState s, ChatEvent e, ChatEntr
                         : new Dictionary<string, ChatEntryMetadata>();
 
                     static string ContentKey(ChatTimelineItemKind kind, string text) => $"{kind}|{text}";
+                    static string SequenceKey(ChatTimelineItemKind kind, int sequence) => $"{kind}|{sequence}";
 
                     // (kind|text) → list of unix-second timestamps for rebuilt
                     // entries that have a real timestamp. Only these can match.
                     var rebuiltContentTimestamps = new Dictionary<string, List<long>>(StringComparer.Ordinal);
+                    var rebuiltMessageIds = new HashSet<string>(StringComparer.Ordinal);
+                    var rebuiltSequenceCounts = new Dictionary<string, int>(StringComparer.Ordinal);
                     foreach (var entry in rebuilt.Entries)
                     {
                         rebuiltMeta.TryGetValue(entry.Id, out var em);
+                        if (!string.IsNullOrEmpty(em?.GatewayMessageId))
+                            rebuiltMessageIds.Add(em.GatewayMessageId);
+                        if (em?.OpenClawSeq is { } seq)
+                            IncrementCount(rebuiltSequenceCounts, SequenceKey(entry.Kind, seq));
                         if (em?.Timestamp is { } rts && rts != default)
                         {
                             var key = ContentKey(entry.Kind, entry.Text);
@@ -780,6 +1058,21 @@ ChatTimelineState ApplyAndCaptureMeta(ChatTimelineState s, ChatEvent e, ChatEntr
                     {
                         priorMeta.TryGetValue(entry.Id, out var em);
                         var priorTs = em?.Timestamp;
+                        if (!string.IsNullOrEmpty(em?.GatewayMessageId) &&
+                            rebuiltMessageIds.Contains(em.GatewayMessageId))
+                        {
+                            ConsumeAnyTimestamp(rebuiltContentTimestamps, ContentKey(entry.Kind, entry.Text));
+                            skippedDup++;
+                            continue;
+                        }
+
+                        if (em?.OpenClawSeq is { } seq &&
+                            TryConsumeCount(rebuiltSequenceCounts, SequenceKey(entry.Kind, seq)))
+                        {
+                            ConsumeAnyTimestamp(rebuiltContentTimestamps, ContentKey(entry.Kind, entry.Text));
+                            skippedDup++;
+                            continue;
+                        }
 
                         // Rule 2: content+timestamp dedup only when BOTH sides
                         // have valid timestamps within 2 seconds. Otherwise
@@ -790,10 +1083,12 @@ ChatTimelineState ApplyAndCaptureMeta(ChatTimelineState s, ChatEvent e, ChatEntr
                         {
                             var priorSec = pts.ToUnixTimeSeconds();
                             var matched = false;
-                            foreach (var rebSec in rebuiltTimes)
+                            for (var rebIndex = 0; rebIndex < rebuiltTimes.Count; rebIndex++)
                             {
+                                var rebSec = rebuiltTimes[rebIndex];
                                 if (Math.Abs(rebSec - priorSec) <= 2)
                                 {
+                                    rebuiltTimes.RemoveAt(rebIndex);
                                     matched = true;
                                     break;
                                 }
@@ -830,6 +1125,10 @@ ChatTimelineState ApplyAndCaptureMeta(ChatTimelineState s, ChatEvent e, ChatEntr
                                 rebuiltContentTimestamps[key] = list = new List<long>();
                             list.Add(addTs.ToUnixTimeSeconds());
                         }
+                        if (!string.IsNullOrEmpty(em?.GatewayMessageId))
+                            rebuiltMessageIds.Add(em.GatewayMessageId);
+                        if (em?.OpenClawSeq is { } addSeq)
+                            IncrementCount(rebuiltSequenceCounts, SequenceKey(entryToAdd.Kind, addSeq));
                         if (em is not null && !rebuiltMeta.ContainsKey(entryToAdd.Id))
                             rebuiltMeta[entryToAdd.Id] = em;
                     }
@@ -901,7 +1200,81 @@ public Task DeleteThreadAsync(string threadId, CancellationToken cancellationTok
     public async Task SetModelAsync(string threadId, string model, CancellationToken cancellationToken = default)
     {
         cancellationToken.ThrowIfCancellationRequested();
-        await _bridge.PatchSessionModelAsync(threadId, model);
+        // The gateway's sessions.patch schema treats `model` as a non-empty
+        // string; a blank value here is a no-op rather than a clear. Use
+        // ClearModelAsync to revert a session to the gateway default.
+        if (string.IsNullOrWhiteSpace(model)) return;
+        await TrackModelPatchAsync(threadId, () => _bridge.PatchSessionModelAsync(threadId, model));
+    }
+
+    public async Task ClearModelAsync(string threadId, CancellationToken cancellationToken = default)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        // Tri-state clear: removes the session's model override (explicit null)
+        // so it tracks the gateway/agent default again.
+        await TrackModelPatchAsync(threadId, () => _bridge.ClearSessionModelAsync(threadId));
+    }
+
+    private async Task TrackModelPatchAsync(string threadId, Func<Task> patchOperation)
+    {
+        var startSignal = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        Task? previous;
+        Task pending;
+        lock (_gate)
+        {
+            _pendingModelPatches.TryGetValue(threadId, out previous);
+            pending = RunModelPatchAsync(previous, patchOperation, startSignal.Task);
+            _pendingModelPatches[threadId] = pending;
+        }
+
+        startSignal.SetResult();
+        try
+        {
+            await pending;
+        }
+        finally
+        {
+            lock (_gate)
+            {
+                if (_pendingModelPatches.TryGetValue(threadId, out var current)
+                    && ReferenceEquals(current, pending))
+                    _pendingModelPatches.Remove(threadId);
+            }
+        }
+    }
+
+    private static async Task RunModelPatchAsync(Task? previous, Func<Task> patchOperation, Task startSignal)
+    {
+        await startSignal;
+        if (previous is not null)
+        {
+            try { await previous; }
+            catch (Exception ex)
+            {
+                Logger.Debug($"ChatDataProvider: continuing model patch after previous patch failed: {ex.Message}");
+            }
+        }
+
+        await patchOperation();
+    }
+
+    private async Task AwaitPendingModelPatchAsync(string threadId, CancellationToken cancellationToken)
+    {
+        Task? pending;
+        lock (_gate)
+        {
+            _pendingModelPatches.TryGetValue(threadId, out pending);
+        }
+
+        if (pending is not null)
+        {
+            try { await pending.WaitAsync(cancellationToken); }
+            catch (OperationCanceledException) { throw; }
+            catch (Exception ex)
+            {
+                Logger.Debug($"ChatDataProvider: continuing send after model patch failed: {ex.Message}");
+            }
+        }
     }
 
     public async Task SetThinkingLevelAsync(string threadId, string thinkingLevel, CancellationToken cancellationToken = default)
@@ -910,18 +1283,130 @@ public async Task SetThinkingLevelAsync(string threadId, string thinkingLevel, C
         await _bridge.PatchSessionThinkingLevelAsync(threadId, thinkingLevel);
     }
 
+    public async Task EnsureCommandCatalogAsync(CancellationToken cancellationToken = default)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+
+        int epoch;
+        lock (_gate)
+        {
+            // Only fetch while connected — the command catalog is a property of
+            // the live gateway connection. A not-connected caller would just
+            // land in the catch below.
+            if (_status != ConnectionStatus.Connected)
+                return;
+            // Already loaded (or a fetch is running) → reuse the cached catalog
+            // rather than hammering commands.list every time the palette opens.
+            // A reconnect clears _commandCatalog (see OnStatusChanged), so a
+            // fresh fetch happens after reconnect.
+            if (_commandsFetchInFlight || _commandCatalog is not null)
+                return;
+            _commandsFetchInFlight = true;
+            // Capture the connection epoch BEFORE the await. If a disconnect (or
+            // reconnect) happens while ListCommandsAsync is in flight,
+            // OnStatusChanged bumps the epoch; the late result is then discarded
+            // rather than resurrecting a stale catalog for the new connection.
+            epoch = _commandsEpoch;
+        }
+
+        CommandCatalog catalog;
+        try
+        {
+            // Chat composer slash completion can only insert text-invokable
+            // commands. Request the protocol's text scope so native-only
+            // commands never surface in the composer catalog.
+            catalog = await _bridge.ListCommandsAsync(new CommandCatalogQuery { Scope = "text" }).ConfigureAwait(false)
+                      ?? new CommandCatalog { IsSupported = true };
+        }
+        catch (Exception ex)
+        {
+            Logger.Warn($"[ChatProvider] EnsureCommandCatalogAsync failed: {ex.Message}");
+            var shouldPublishFallback = false;
+            lock (_gate)
+            {
+                // Only publish a fallback if no status change superseded this
+                // fetch. A failure must still move the UI out of its "loading"
+                // state; otherwise slash-leading text would keep trapping Enter
+                // until reconnect. Treat the catalog as temporarily unavailable
+                // for this connection and let reconnect clear/refetch it.
+                if (epoch == _commandsEpoch && _status == ConnectionStatus.Connected)
+                {
+                    _commandsFetchInFlight = false;
+                    _commandCatalog = new CommandCatalog { IsSupported = false };
+                    shouldPublishFallback = true;
+                }
+            }
+            if (shouldPublishFallback)
+                PublishCommandCatalogIfFresh(epoch);
+            return;
+        }
+
+        lock (_gate)
+        {
+            // Drop the result if the connection changed during the await.
+            if (epoch != _commandsEpoch || _status != ConnectionStatus.Connected)
+                return;
+            _commandsFetchInFlight = false;
+            _commandCatalog = catalog;
+        }
+        Logger.Info($"[ChatProvider] commands.list: supported={catalog.IsSupported} count={catalog.Commands.Count}");
+        // Re-validate freshness at UI-thread delivery time rather than
+        // publishing a snapshot captured under the lock above. This closes the
+        // window where a disconnect occurring between snapshot build and
+        // Publish could let a stale "connected + commands" snapshot arrive after
+        // the disconnect snapshot.
+        PublishCommandCatalogIfFresh(epoch);
+    }
+
+    /// <summary>
+    /// Publishes a freshly-built snapshot on the UI thread, but only if the
+    /// connection <paramref name="epoch"/> captured for this commands.list fetch
+    /// is still current when delivery runs. If a disconnect/reconnect superseded
+    /// the fetch in the meantime, the stale publish is dropped (the status
+    /// handler's own publish carries the authoritative state).
+    /// </summary>
+    private void PublishCommandCatalogIfFresh(int epoch)
+    {
+        void Deliver()
+        {
+            ChatDataSnapshot snapshot;
+            lock (_gate)
+            {
+                if (epoch != _commandsEpoch) return;
+                snapshot = BuildSnapshotLocked();
+            }
+            Changed?.Invoke(this, new ChatDataChangedEventArgs(snapshot));
+        }
+
+        if (_post is null)
+            Deliver();
+        else
+            _post(Deliver);
+    }
+
     public Task SetPermissionModeAsync(string threadId, bool allowAll, CancellationToken cancellationToken = default)
     {
         cancellationToken.ThrowIfCancellationRequested();
         return Task.CompletedTask;
     }
 
-    public async Task RespondToPermissionAsync(string threadId, string requestId, bool allow, CancellationToken cancellationToken = default)
+    public Task RespondToPermissionAsync(string threadId, string requestId, bool allow, CancellationToken cancellationToken = default) =>
+        RespondToPermissionAsync(
+            threadId,
+            requestId,
+            allow ? ChatPermissionActionKeys.AllowOnce : ChatPermissionActionKeys.Deny,
+            cancellationToken);
+
+    public async Task RespondToPermissionAsync(string threadId, string requestId, string action, CancellationToken cancellationToken = default)
     {
         cancellationToken.ThrowIfCancellationRequested();
         if (string.IsNullOrEmpty(threadId) || string.IsNullOrEmpty(requestId))
             return;
 
+        var decision = NormalizeApprovalAction(action);
+        if (TryResolveLocalInlineApproval(threadId, requestId, decision))
+            return;
+
         // Use the operator-approvals gateway RPC (``exec.approval.resolve``)
         // rather than the ``/approve <id> <decision>`` chat slash command.
         //
@@ -931,8 +1416,6 @@ public async Task RespondToPermissionAsync(string threadId, string requestId, bo
         // sits in the input queue until the run times out, by which point the
         // approval has already expired and the approve/deny is a no-op. The
         // RPC bypasses the chat queue and resolves the approval immediately.
-        var decision = allow ? "allow-once" : "deny";
-
         Logger.Info($"[Approval] user response requestId={requestId} decision={decision} thread='{threadId}'");
 
         try
@@ -950,59 +1433,234 @@ public async Task RespondToPermissionAsync(string threadId, string requestId, bo
         }
 
         ClearPendingPermissionAndPublish(threadId, expectedRequestId: requestId,
-            decision: allow ? ChatPermissionDecision.Allowed : ChatPermissionDecision.Denied);
+            decision: ChatDecisionForApprovalAction(decision));
     }
 
-    // expectedRequestId: when non-null, the clear is a no-op unless the
-    // currently-pending banner's RequestId matches. This protects against
-    // the responder-race where a fresh approval arrives between the
-    // user's tap and the post-send clear.
-    //
-    // decision: terminal state to stamp on the matching inline timeline
-    // entry. The user's local Allow/Deny click passes Allowed/Denied so
-    // the bubble collapses to the correct badge immediately. The
-    // backstop path triggered by the gateway echo passes Expired, which
-    // only takes effect if the user hasn't already decided locally
-    // (ResolvePermission protects already-decided entries).
-    private void ClearPendingPermissionAndPublish(string threadId, string? expectedRequestId = null,
-        ChatPermissionDecision decision = ChatPermissionDecision.Expired)
+    internal async Task<ExecApprovalPromptDecision?> RequestLocalExecApprovalAsync(
+        ExecApprovalPromptRequest request,
+        CancellationToken cancellationToken = default,
+        TimeSpan? approvalTimeout = null)
     {
+        cancellationToken.ThrowIfCancellationRequested();
+        if (string.IsNullOrWhiteSpace(request.SessionKey) || _disposed)
+            return null;
+
+        var threadId = request.SessionKey!;
+        var requestId = !string.IsNullOrWhiteSpace(request.CorrelationId)
+            ? $"local-{request.CorrelationId}"
+            : $"local-{Guid.NewGuid():N}";
+        var response = new TaskCompletionSource<ExecApprovalPromptDecision>(TaskCreationOptions.RunContinuationsAsynchronously);
+        var detail = request.Command ?? string.Empty;
+        var inline = new LocalInlineApproval(threadId, requestId, detail, response);
+
         ChatDataSnapshot snapshot;
         lock (_gate)
         {
-            var current = GetOrCreateTimelineLocked(threadId);
-            if (current.PendingPermission is null)
-            {
-                Logger.Info($"[Approval] clear requested but no PendingPermission for thread='{threadId}'");
-                return;
-            }
-            if (expectedRequestId is not null
-                && !string.Equals(current.PendingPermission.RequestId, expectedRequestId, System.StringComparison.Ordinal))
+            if (_disposed)
+                return null;
+
+            _localInlineApprovals[requestId] = inline;
+            var meta = BuildLiveMetaLocked(threadId);
+            snapshot = ApplyEventLocked(
+                threadId,
+                new ChatPermissionRequestEvent(
+                    requestId,
+                    LocalizationHelper.GetString("Chat_Permission_CommandApprovalTitle"),
+                    request.Shell ?? "exec",
+                    detail,
+                    ChatPermissionActionKeys.ExecApprovalDefaults),
+                meta);
+        }
+        Publish(snapshot);
+
+        using var registration = cancellationToken.Register(() =>
+            TryResolveLocalInlineApproval(threadId, requestId, ChatPermissionActionKeys.Deny));
+
+        _ = ExpireLocalInlineApprovalAfterDelayAsync(threadId, requestId, approvalTimeout ?? LocalInlineApprovalTimeout);
+
+        return await response.Task.ConfigureAwait(false);
+    }
+
+    private async Task ExpireLocalInlineApprovalAfterDelayAsync(string threadId, string requestId, TimeSpan delay)
+    {
+        try
+        {
+            await Task.Delay(delay).ConfigureAwait(false);
+            TryExpireLocalInlineApproval(threadId, requestId);
+        }
+        catch (Exception ex)
+        {
+            Logger.Debug($"[Approval] inline approval timeout task failed: {ex.Message}");
+        }
+    }
+
+    private bool TryExpireLocalInlineApproval(string threadId, string requestId)
+    {
+        LocalInlineApproval inline;
+        ChatDataSnapshot snapshot;
+        lock (_gate)
+        {
+            if (!_localInlineApprovals.TryGetValue(requestId, out var found) ||
+                !string.Equals(found.ThreadId, threadId, StringComparison.Ordinal))
             {
-                Logger.Info($"[Approval] clear skipped — pending is '{current.PendingPermission.RequestId}', expected '{expectedRequestId}' (newer approval superseded)");
-                return;
+                return false;
             }
-            Logger.Info($"[Approval] clearing PendingPermission requestId='{current.PendingPermission.RequestId}' on thread='{threadId}' decision={decision}");
-            _timelines[threadId] = ChatTimelineReducer.ResolvePermission(current, current.PendingPermission.RequestId, decision);
+
+            inline = found;
+            _localInlineApprovals.Remove(requestId);
+            var current = GetOrCreateTimelineLocked(threadId);
+            _timelines[threadId] = ChatTimelineReducer.ResolvePermission(
+                current,
+                requestId,
+                ChatPermissionDecision.Expired);
             snapshot = BuildSnapshotLocked();
         }
+
         Publish(snapshot);
+        inline.Response.TrySetResult(ExecApprovalPromptDecision.TimedOut());
+        return true;
     }
 
-    public ValueTask DisposeAsync()
+    private bool TryResolveLocalInlineApproval(string threadId, string requestId, string decision)
     {
-        if (_disposed) return ValueTask.CompletedTask;
-        _disposed = true;
-        System.Threading.Timer? timerToDispose;
-        System.Threading.Timer? chatStateTimerToDispose;
+        LocalInlineApproval inline;
+        ChatDataSnapshot snapshot;
         lock (_gate)
         {
-            timerToDispose = _toolMetaSaveTimer;
+            if (!_localInlineApprovals.TryGetValue(requestId, out var found) ||
+                !string.Equals(found.ThreadId, threadId, StringComparison.Ordinal))
+            {
+                return false;
+            }
+
+            inline = found;
+            _localInlineApprovals.Remove(requestId);
+            var current = GetOrCreateTimelineLocked(threadId);
+            _timelines[threadId] = ChatTimelineReducer.ResolvePermission(
+                current,
+                requestId,
+                ChatDecisionForApprovalAction(decision));
+            var meta = BuildLiveMetaLocked(threadId);
+            snapshot = ApplyEventLocked(
+                threadId,
+                new ChatStatusEvent(FormatApprovalResult(decision, inline.Detail, requestId), ApprovalToneForDecision(decision)),
+                meta);
+        }
+
+        Publish(snapshot);
+        inline.Response.TrySetResult(DecisionForApprovalAction(decision));
+        return true;
+    }
+
+    private static ExecApprovalPromptDecision DecisionForApprovalAction(string decision) =>
+        string.Equals(decision, ChatPermissionActionKeys.AllowAlways, StringComparison.OrdinalIgnoreCase)
+            ? ExecApprovalPromptDecision.AlwaysAllow()
+            : string.Equals(decision, ChatPermissionActionKeys.AllowOnce, StringComparison.OrdinalIgnoreCase)
+                ? ExecApprovalPromptDecision.AllowOnce()
+                : ExecApprovalPromptDecision.Deny();
+
+    private static string FormatApprovalResult(string decision, string detail, string requestId)
+        => string.Format(
+            System.Globalization.CultureInfo.CurrentCulture,
+            LocalizationHelper.GetString("Chat_Permission_ResultSubmittedFormat"),
+            LabelForApprovalAction(decision),
+            string.IsNullOrWhiteSpace(detail) ? requestId : detail);
+
+    private static string LabelForApprovalAction(string decision)
+    {
+        if (string.Equals(decision, ChatPermissionActionKeys.AllowAlways, StringComparison.OrdinalIgnoreCase))
+            return LocalizationHelper.GetString("Chat_Permission_AllowAlways");
+        if (string.Equals(decision, ChatPermissionActionKeys.AllowOnce, StringComparison.OrdinalIgnoreCase))
+            return LocalizationHelper.GetString("Chat_Permission_Allow");
+        return LocalizationHelper.GetString("Chat_Permission_Deny");
+    }
+
+    private static ChatTone ApprovalToneForDecision(string decision)
+        => string.Equals(decision, ChatPermissionActionKeys.Deny, StringComparison.OrdinalIgnoreCase)
+            ? ChatTone.Warning
+            : ChatTone.Success;
+
+    private string NormalizeApprovalAction(string? action)
+    {
+        if (string.Equals(action, ChatPermissionActionKeys.AllowAlways, StringComparison.OrdinalIgnoreCase))
+            return ChatPermissionActionKeys.AllowAlways;
+        if (string.Equals(action, ChatPermissionActionKeys.AllowOnce, StringComparison.OrdinalIgnoreCase))
+            return ChatPermissionActionKeys.AllowOnce;
+        if (!string.Equals(action, ChatPermissionActionKeys.Deny, StringComparison.OrdinalIgnoreCase))
+            Logger.Warn($"[Approval] unknown action '{action ?? "<null>"}'; defaulting to deny");
+        return ChatPermissionActionKeys.Deny;
+    }
+
+    private static ChatPermissionDecision ChatDecisionForApprovalAction(string action)
+        => string.Equals(action, ChatPermissionActionKeys.AllowAlways, StringComparison.OrdinalIgnoreCase)
+            ? ChatPermissionDecision.AllowedAlways
+            : string.Equals(action, ChatPermissionActionKeys.Deny, StringComparison.OrdinalIgnoreCase)
+                ? ChatPermissionDecision.Denied
+                : ChatPermissionDecision.Allowed;
+
+    // expectedRequestId: when non-null, the clear is a no-op unless the
+    // currently-pending banner's RequestId matches. This protects against
+    // the responder-race where a fresh approval arrives between the
+    // user's tap and the post-send clear.
+    //
+    // decision: terminal state to stamp on the matching inline timeline
+    // entry. The user's local Allow/Deny click passes Allowed/Denied so
+    // the bubble collapses to the correct badge immediately. The
+    // backstop path triggered by the gateway echo passes Expired, which
+    // only takes effect if the user hasn't already decided locally
+    // (ResolvePermission protects already-decided entries).
+    private void ClearPendingPermissionAndPublish(string threadId, string? expectedRequestId = null,
+        ChatPermissionDecision decision = ChatPermissionDecision.Expired)
+    {
+        ChatDataSnapshot snapshot;
+        lock (_gate)
+        {
+            var current = GetOrCreateTimelineLocked(threadId);
+            if (current.PendingPermission is null)
+            {
+                Logger.Info($"[Approval] clear requested but no PendingPermission for thread='{threadId}'");
+                return;
+            }
+            if (expectedRequestId is not null
+                && !string.Equals(current.PendingPermission.RequestId, expectedRequestId, System.StringComparison.Ordinal))
+            {
+                Logger.Info($"[Approval] clear skipped — pending is '{current.PendingPermission.RequestId}', expected '{expectedRequestId}' (newer approval superseded)");
+                return;
+            }
+            Logger.Info($"[Approval] clearing PendingPermission requestId='{current.PendingPermission.RequestId}' on thread='{threadId}' decision={decision}");
+            _timelines[threadId] = ChatTimelineReducer.ResolvePermission(current, current.PendingPermission.RequestId, decision);
+            snapshot = BuildSnapshotLocked();
+        }
+        Publish(snapshot);
+    }
+
+    public ValueTask DisposeAsync()
+    {
+        if (_disposed) return ValueTask.CompletedTask;
+        _disposed = true;
+        System.Threading.Timer? timerToDispose;
+        System.Threading.Timer? chatStateTimerToDispose;
+        List<LocalInlineApproval> pendingLocalApprovals;
+        lock (_gate)
+        {
+            timerToDispose = _toolMetaSaveTimer;
             _toolMetaSaveTimer = null;
             _toolMetaSaveVersion++;
             chatStateTimerToDispose = _lastChatStateSaveTimer;
             _lastChatStateSaveTimer = null;
-        }
+            pendingLocalApprovals = _localInlineApprovals.Values.ToList();
+            _localInlineApprovals.Clear();
+            _queuedMessages.Clear();
+            _queuedSendRequests.Clear();
+            _queuedDrainScheduledThreads.Clear();
+            _queuedMessageIdsByRunId.Clear();
+            _terminalRunIdsByThread.Clear();
+            _localSentTexts.Clear();
+            _locallyInitiatedThreads.Clear();
+            _resetSubmittedLocalEchoTexts.Clear();
+        }
+        foreach (var approval in pendingLocalApprovals)
+            approval.Response.TrySetResult(ExecApprovalPromptDecision.Deny());
         timerToDispose?.Dispose();
         chatStateTimerToDispose?.Dispose();
         SaveToolMetaCache();
@@ -1057,6 +1715,18 @@ private void OnStatusChanged(object? sender, ConnectionStatus status)
             if (status != ConnectionStatus.Connected)
                 _sessionsListReceived = false;
 
+            // Drop the cached command catalog whenever we leave Connected so a
+            // reconnect re-fetches commands.list (the catalog can change across
+            // gateways / agent reconfigurations). Bumping the epoch invalidates
+            // any commands.list fetch still in flight so its late result is
+            // discarded instead of resurrecting a stale catalog.
+            if (status != ConnectionStatus.Connected)
+            {
+                _commandsEpoch++;
+                _commandCatalog = null;
+                _commandsFetchInFlight = false;
+            }
+
             // Reset the approval-dedupe LRU on every transition out of
             // Connected. IDs from a prior session must not block a fresh
             // approval with a colliding slug from the next connection.
@@ -1082,6 +1752,15 @@ private void OnStatusChanged(object? sender, ConnectionStatus status)
                 _historyInFlight.Clear();
                 _locallyInitiatedThreads.Clear();
                 _localSentTexts.Clear();
+                _queuedMessages.Clear();
+                _queuedSendRequests.Clear();
+                _queuedDrainScheduledThreads.Clear();
+                _assistantFallbackPromotedThreads.Clear();
+                _queuedMessageIdsByRunId.Clear();
+                _terminalRunIdsByThread.Clear();
+                _resetSubmittedLocalEchoTexts.Clear();
+                _activeRunIds.Clear();
+                _activeRunStartSequences.Clear();
                 _historyRetryCount.Clear();
                 // Reset keyless-event diagnostic so a fresh reconnect to a
                 // still-broken gateway surfaces the notification again.
@@ -1100,6 +1779,11 @@ private void OnStatusChanged(object? sender, ConnectionStatus status)
                     if (tl.TurnActive) list.Add(key);
                 }
                 threadsToInterrupt = list.ToArray();
+                foreach (var threadId in threadsToInterrupt)
+                {
+                    _activeRunIds.Remove(threadId);
+                    _activeRunStartSequences.Remove(threadId);
+                }
             }
             else
             {
@@ -1131,6 +1815,7 @@ private void OnSessionsUpdated(object? sender, SessionInfo[] sessions)
     {
         ChatDataSnapshot snapshot;
         string[] newThreadsToLoad;
+        string[] queuedThreadsToDrain;
         lock (_gate)
         {
             var previousUsage = _sessions
@@ -1140,6 +1825,7 @@ private void OnSessionsUpdated(object? sender, SessionInfo[] sessions)
             SeedSessionIdsFromSessionsLocked(_sessions);
             _sessionsListReceived = true;
             EnsureTimelinesForSessionsLocked();
+            RememberLastSessionStateLocked();
             foreach (var s in _sessions)
             {
                 if (string.IsNullOrEmpty(s.Key)) continue;
@@ -1165,10 +1851,12 @@ private void OnSessionsUpdated(object? sender, SessionInfo[] sessions)
                         toLoad.Add(key);
                 }
                 newThreadsToLoad = toLoad.Count > 0 ? toLoad.ToArray() : Array.Empty<string>();
+                queuedThreadsToDrain = _queuedMessages.Keys.ToArray();
             }
             else
             {
                 newThreadsToLoad = Array.Empty<string>();
+                queuedThreadsToDrain = Array.Empty<string>();
             }
         }
         Publish(snapshot);
@@ -1177,6 +1865,10 @@ private void OnSessionsUpdated(object? sender, SessionInfo[] sessions)
         {
             _ = LoadHistoryAsync(threadId, force: false);
         }
+        foreach (var threadId in queuedThreadsToDrain)
+        {
+            TryDispatchNextQueuedSend(threadId);
+        }
     }
 
     private void OnSessionCommandCompleted(object? sender, SessionCommandResult result)
@@ -1198,6 +1890,32 @@ private void OnSessionCommandCompleted(object? sender, SessionCommandResult resu
 
         Publish(snapshot);
         PersistClearedResetState(persistence);
+        AbortSubmittedRunsAfterReset(result.Key, persistence.SubmittedRunIds);
+    }
+
+    private void AbortSubmittedRunsAfterReset(string threadId, IReadOnlyList<string> runIds)
+    {
+        if (runIds.Count == 0)
+            return;
+
+        _ = Task.Run(async () =>
+        {
+            foreach (var runId in runIds)
+            {
+                if (string.IsNullOrWhiteSpace(runId))
+                    continue;
+
+                try
+                {
+                    Logger.Info($"[Reset] Sending chat.abort for pre-reset submitted runId='{runId}' threadId='{threadId}'");
+                    await _bridge.SendChatAbortAsync(runId, threadId).ConfigureAwait(false);
+                }
+                catch (Exception ex)
+                {
+                    Logger.Warn($"[Reset] chat.abort failed for pre-reset runId='{runId}' threadId='{threadId}': {ex.Message}");
+                }
+            }
+        });
     }
 
     private void OnModelsListUpdated(object? sender, ModelsListInfo info)
@@ -1205,30 +1923,44 @@ private void OnModelsListUpdated(object? sender, ModelsListInfo info)
         ChatDataSnapshot snapshot;
         lock (_gate)
         {
-            _availableModels = ExtractModelNames(info);
+            _modelChoices = ChatModelChoice.FromModelsList(info);
+            _availableModels = ModelIdsFromChoices(_modelChoices);
             snapshot = BuildSnapshotLocked();
         }
         Logger.Info($"[ChatBridge] OnModelsListUpdated: count={_availableModels.Length}");
         Publish(snapshot);
     }
 
-    private static string[] ExtractModelNames(ModelsListInfo info)
+    // Wire ids (e.g. "claude-opus-4.5") in gateway order, used by the composer
+    // to match against SessionInfo.Model. Kept as a parallel string[] for
+    // back-compat with callers/persistence that only need the id list.
+    private static string[] ModelIdsFromChoices(IReadOnlyList<ChatModelChoice> choices)
+    {
+        if (choices.Count == 0) return Array.Empty<string>();
+        var seen = new HashSet<string>(StringComparer.Ordinal);
+        var ids = new List<string>(choices.Count);
+        foreach (var choice in choices)
+        {
+            if (seen.Add(choice.Id))
+                ids.Add(choice.Id);
+        }
+        return ids.ToArray();
+    }
+
+    // Rehydrate minimal choices from a cached id list (reconnect / pre-connect
+    // path) when richer gateway metadata isn't available yet.
+    private static IReadOnlyList<ChatModelChoice> ChoicesFromIds(string[] ids)
     {
-        if (info?.Models is null || info.Models.Count == 0) return Array.Empty<string>();
-        // Use model Id (wire format, e.g. "claude-opus-4.5") so the composer
-        // can match against SessionInfo.Model (which is also the wire Id).
-        // The ComboBox will show Ids directly; a future pass could introduce
-        // a separate display-name array if prettier labels are desired.
+        if (ids.Length == 0) return Array.Empty<ChatModelChoice>();
         var seen = new HashSet<string>(StringComparer.Ordinal);
-        var list = new List<string>(info.Models.Count);
-        foreach (var m in info.Models)
+        var list = new List<ChatModelChoice>(ids.Length);
+        foreach (var id in ids)
         {
-            if (m.HasConfiguredFlag && !m.IsConfigured) continue;
-            var id = m.Id;
             if (string.IsNullOrEmpty(id)) continue;
-            if (seen.Add(id)) list.Add(id);
+            if (!seen.Add(id)) continue;
+            list.Add(new ChatModelChoice(id, id));
         }
-        return list.ToArray();
+        return list;
     }
 
     private void OnChatMessageReceived(object? sender, ChatMessageInfo message)
@@ -1269,6 +2001,9 @@ private void OnChatMessageReceived(object? sender, ChatMessageInfo message)
         var role = message.Role ?? "";
         var roleLower = role.ToLowerInvariant();
         var rawText = message.Text ?? string.Empty;
+        ChatDataSnapshot? resetLocalEchoSnapshot = null;
+        var dropAfterReset = false;
+        var requestRemoteBackfillAfterReset = false;
         lock (_gate)
         {
             if (ShouldDropChatMessageAfterResetLocked(
@@ -1279,34 +2014,49 @@ private void OnChatMessageReceived(object? sender, ChatMessageInfo message)
                 out var consumeEchoText,
                 out var requestRemoteBackfill))
             {
+                dropAfterReset = true;
+                requestRemoteBackfillAfterReset = requestRemoteBackfill;
                 if (consumeEchoText is not null &&
                     _localSentTexts.TryGetValue(msgThreadId, out var resetEchoQueue) &&
-                    resetEchoQueue.Count > 0)
+                    resetEchoQueue.Count > 0 &&
+                    TryConsumeLocalEchoLocked(msgThreadId, resetEchoQueue, consumeEchoText, out var queuedMessageId))
                 {
-                    TryConsumeLocalEchoLocked(msgThreadId, resetEchoQueue, consumeEchoText);
+                    var confirmedMeta = BuildLiveMetaLocked(
+                        msgThreadId,
+                        message.Ts,
+                        message.OpenClawId,
+                        message.OpenClawSeq);
+                    if (ReconcileQueuedMessageEchoLocked(msgThreadId, queuedMessageId, confirmedMeta))
+                        resetLocalEchoSnapshot = BuildSnapshotLocked();
                 }
-
-                if (requestRemoteBackfill)
-                    _ = FetchRemoteUserMessageAsync(msgThreadId, openResetGateOnSuccess: true);
-
-                Logger.Debug($"[Reset] Dropping stale chat message after reset for threadId='{msgThreadId}' role='{roleLower}'");
-                return;
             }
-
-            if (_abortedThreads.Contains(msgThreadId))
+            else if (_abortedThreads.Contains(msgThreadId))
             {
                 Logger.Debug($"[ABORT] Suppressed ChatMessage for threadId='{msgThreadId}' (role={message.Role})");
                 return;
             }
         }
+        if (dropAfterReset)
+        {
+            if (resetLocalEchoSnapshot is not null)
+            {
+                Publish(resetLocalEchoSnapshot);
+            }
+            if (requestRemoteBackfillAfterReset)
+                _ = FetchRemoteUserMessageAsync(msgThreadId, openResetGateOnSuccess: true);
+
+            Logger.Debug($"[Reset] Dropping stale chat message after reset for threadId='{msgThreadId}' role='{roleLower}'");
+            return;
+        }
 
         // User messages from the SSE stream. System control notes are rendered
-        // as dim status entries. Normal user messages: suppress echoes of
-        // locally-sent messages (already displayed), show messages from other
-        // clients (e.g. gateway web UI) so the conversation is coherent.
+        // as dim status entries. Normal user messages: promote echoes of
+        // locally-sent queued messages into the transcript, show messages from
+        // other clients (e.g. gateway web UI) so the conversation is coherent.
         if (roleLower == "user")
         {
             // Approval slash-commands ("/approve <slug> allow-once",
+            // "/approve <slug> allow-always",
             // "/deny <slug>") are transport, not user prose. If WE sent
             // it (matched + consumed from _localSentTexts) suppress the
             // echo entirely — RespondToPermissionAsync already cleared
@@ -1321,9 +2071,10 @@ private void OnChatMessageReceived(object? sender, ChatMessageInfo message)
                 lock (_gate)
                 {
                     if (_localSentTexts.TryGetValue(msgThreadId, out var sq) && sq.Count > 0
-                        && TryConsumeLocalEchoLocked(msgThreadId, sq, slashEcho))
+                        && TryConsumeLocalEchoLocked(msgThreadId, sq, slashEcho, out var slashEntryId))
                     {
                         weSentIt = true;
+                        RemoveQueuedMessageLocked(msgThreadId, slashEntryId);
                     }
                 }
                 if (weSentIt)
@@ -1355,23 +2106,55 @@ private void OnChatMessageReceived(object? sender, ChatMessageInfo message)
             // Check if this is an echo of a locally-sent message.
             var echoText = (message.Text ?? "").Trim();
             bool isLocalEcho = false;
+            ChatDataSnapshot? echoSnapshot = null;
             lock (_gate)
             {
                 if (_localSentTexts.TryGetValue(msgThreadId, out var q) && q.Count > 0
-                    && TryConsumeLocalEchoLocked(msgThreadId, q, echoText))
+                    && TryConsumeLocalEchoLocked(msgThreadId, q, echoText, out var echoEntryId))
                 {
                     isLocalEcho = true;
+                    var confirmedMeta = BuildLiveMetaLocked(
+                        msgThreadId,
+                        message.Ts,
+                        message.OpenClawId,
+                        message.OpenClawSeq);
+                    if (ReconcileQueuedMessageEchoLocked(msgThreadId, echoEntryId, confirmedMeta))
+                        echoSnapshot = BuildSnapshotLocked();
+                }
+            }
+            if (isLocalEcho)
+            {
+                if (echoSnapshot is not null)
+                {
+                    Publish(echoSnapshot);
                 }
+                return;
             }
-            if (isLocalEcho) return;
 
             // Not a local echo — show it as a user message from another client.
             if (!string.IsNullOrEmpty(message.Text))
             {
+                var userText = TruncateForChatEntry(EscapeUntrustedAttachmentMarkerLines(message.Text));
                 ChatEntryMetadata? userMeta;
-                lock (_gate) { userMeta = BuildLiveMetaLocked(msgThreadId, message.Ts); }
+                ChatDataSnapshot? reconciledLocalQueuedSnapshot = null;
+                lock (_gate)
+                {
+                    userMeta = BuildLiveMetaLocked(
+                        msgThreadId,
+                        message.Ts,
+                        message.OpenClawId,
+                        message.OpenClawSeq);
+                    if (TryReconcileExistingLocalQueuedUserEchoLocked(msgThreadId, userText, userMeta))
+                        reconciledLocalQueuedSnapshot = BuildSnapshotLocked();
+                }
+                if (reconciledLocalQueuedSnapshot is not null)
+                {
+                    Publish(reconciledLocalQueuedSnapshot);
+                    return;
+                }
+
                 ApplyEventAndPublish(msgThreadId,
-                    new ChatUserMessageEvent(TruncateForChatEntry(EscapeUntrustedAttachmentMarkerLines(message.Text))),
+                    new ChatUserMessageEvent(userText),
                     userMeta);
             }
             return;
@@ -1385,7 +2168,14 @@ private void OnChatMessageReceived(object? sender, ChatMessageInfo message)
             if (string.IsNullOrEmpty(message.Text)) return;
             var trThread = message.SessionKey;
             ChatEntryMetadata? trMeta;
-            lock (_gate) { trMeta = BuildLiveMetaLocked(trThread, message.Ts); }
+            lock (_gate)
+            {
+                trMeta = BuildLiveMetaLocked(
+                    trThread,
+                    message.Ts,
+                    message.OpenClawId,
+                    message.OpenClawSeq);
+            }
             var capped = TruncateForChatEntry(message.Text);
             var kind = ClassifyFlattenedToolOutput(capped);
             var label = ExtractFlattenedToolSummary(capped);
@@ -1396,17 +2186,39 @@ private void OnChatMessageReceived(object? sender, ChatMessageInfo message)
 
         if (roleLower != "assistant")
             return;
+        if (ChatMessageInfo.IsSilentAssistantDirective(roleLower, message.Text))
+            return;
         if (string.IsNullOrEmpty(message.Text))
             return;
 
         var threadId = message.SessionKey;
-        ChatEntryMetadata? meta;
         var cappedAssistantText = RepairContentBlockSeams(TruncateForChatEntry(message.Text));
+        AssistantQueueFrameDisposition assistantDisposition;
+        lock (_gate)
+        {
+            assistantDisposition = ClassifyAssistantQueueFrameLocked(
+                threadId,
+                cappedAssistantText,
+                message.OpenClawId,
+                message.OpenClawSeq);
+        }
+        if (assistantDisposition != AssistantQueueFrameDisposition.Render)
+        {
+            Logger.Debug($"[Queue] Dropping retransmitted assistant frame around queued user boundary threadId='{threadId}'");
+            return;
+        }
+
+        PromoteOldestQueuedMessageBeforeAssistantIfNeeded(threadId);
+        ChatEntryMetadata? meta;
         var hasUsage = message.InputTokens is not null || message.OutputTokens is not null
             || message.ResponseTokens is not null || message.ContextPercent is not null;
         lock (_gate)
         {
-            meta = BuildLiveMetaLocked(threadId, message.Ts);
+            meta = BuildLiveMetaLocked(
+                threadId,
+                message.Ts,
+                message.OpenClawId,
+                message.OpenClawSeq);
             // If the gateway included a usage block on this chat event,
             // attach it so the assistant footer pills (↑/↓/R/ctx%) can
             // render. Mostly arrives on state="final" frames.
@@ -1453,10 +2265,23 @@ private void OnChatMessageReceived(object? sender, ChatMessageInfo message)
 
         if (message.IsFinal)
         {
+            lock (_gate)
+            {
+                if (_activeRunIds.Remove(threadId, out var completedRunId))
+                {
+                    RememberTerminalRunIdLocked(threadId, completedRunId);
+                    _abortedRunIds.Remove(completedRunId);
+                }
+                _activeRunStartSequences.Remove(threadId);
+                _abortedThreads.Remove(threadId);
+                if (!HasSendingQueuedMessagesLocked(threadId))
+                    _locallyInitiatedThreads.Remove(threadId);
+            }
             SnapshotLatestAssistantUsage(threadId);
             ApplyEventAndPublish(threadId, new ChatTurnEndEvent());
             RaiseNotification(new ChatProviderNotification(
                 ChatProviderNotificationKind.TurnComplete, threadId, LocalizationHelper.GetString("Chat_Notification_AssistantReplied")));
+            ScheduleQueuedSendDrain(threadId);
         }
     }
 
@@ -1495,18 +2320,35 @@ private void OnAgentEventReceived(object? sender, AgentEventInfo evt)
             return;
         }
         var threadId = evt.SessionKey;
+        var isTerminalRunEvent = IsTerminalRunEvent(evt);
 
+        var reloadHistoryAfterResetDrop = false;
+        var shouldProcessEvent = false;
         lock (_gate)
         {
-            if (ShouldDropAgentEventAfterResetLocked(evt, threadId))
+            if (ShouldDropAgentEventAfterResetLocked(evt, threadId, out reloadHistoryAfterResetDrop))
             {
                 Logger.Debug($"[Reset] Dropping stale agent event after reset for threadId='{threadId}' stream='{evt.Stream}' runId='{evt.RunId}'");
-                return;
             }
+            else if (ShouldDropTerminalAgentEventLocked(evt, threadId))
+            {
+                Logger.Debug($"[Queue] Dropping stale terminal agent event for threadId='{threadId}' stream='{evt.Stream}' runId='{evt.RunId}'");
+            }
+            else
+            {
+                shouldProcessEvent = true;
+            }
+        }
+        if (!shouldProcessEvent)
+        {
+            if (reloadHistoryAfterResetDrop)
+                _ = LoadHistoryAsync(threadId, force: true);
+            return;
         }
 
         // Always update run tracking first (state maintenance must not be skipped).
         UpdateActiveRunId(evt, threadId);
+        ClearQueuedMessageOnLocalTurnStart(evt, threadId);
 
         // Fire deferred chat.abort and persist if pending aborts were queued.
         var deferredRunId = _deferredAbortRunId;
@@ -1535,12 +2377,19 @@ private void OnAgentEventReceived(object? sender, AgentEventInfo evt)
 
         // Suppress rendering for aborted runs/threads (but lifecycle events
         // already ran above for state cleanup).
+        var suppressRendering = false;
         lock (_gate)
         {
             if (!string.IsNullOrEmpty(evt.RunId) && _abortedRunIds.Contains(evt.RunId))
-                return;
-            if (_abortedThreads.Contains(threadId))
-                return;
+                suppressRendering = true;
+            else if (_abortedThreads.Contains(threadId))
+                suppressRendering = true;
+        }
+        if (suppressRendering)
+        {
+            if (isTerminalRunEvent)
+                ScheduleQueuedSendDrain(threadId);
+            return;
         }
 
         ChatEvent? mapped = MapAgentEvent(evt);
@@ -1578,6 +2427,9 @@ private void OnAgentEventReceived(object? sender, AgentEventInfo evt)
                     var evtSlug = evt.Data.TryGetProperty("approvalSlug", out var s) && s.ValueKind == System.Text.Json.JsonValueKind.String
                         ? (s.GetString() ?? "")
                         : "";
+                    var evtDecision = evt.Data.TryGetProperty("decision", out var d) && d.ValueKind == System.Text.Json.JsonValueKind.String
+                        ? (d.GetString() ?? "")
+                        : "";
 
                     string? pendingId;
                     lock (_gate)
@@ -1597,11 +2449,10 @@ private void OnAgentEventReceived(object? sender, AgentEventInfo evt)
                         // RPC response on the same WebSocket — if Expired wins
                         // here, ResolvePermission's no-overwrite guard then
                         // blocks the user's Allow/Denied stamp from landing.
-                        // Phase already passed IsTerminalApprovalPhase; map
-                        // resolved → Allowed, denied → Denied, and treat the
-                        // remaining non-decided terminal phases (aborted,
-                        // canceled, expired, timeout, error) as Expired.
-                        var resolvedDecision = MapTerminalPhaseToDecision(phase);
+                        // Phase already passed IsTerminalApprovalPhase; use
+                        // the exact decision when present so allow-always is
+                        // preserved, then fall back to phase mapping.
+                        var resolvedDecision = MapTerminalPhaseToDecision(phase, evtDecision);
                         ClearPendingPermissionAndPublish(threadId, expectedRequestId: pendingId, decision: resolvedDecision);
                     }
                     else
@@ -1613,6 +2464,8 @@ private void OnAgentEventReceived(object? sender, AgentEventInfo evt)
                     }
                 }
             }
+            if (isTerminalRunEvent)
+                ScheduleQueuedSendDrain(threadId);
             return;
         }
 
@@ -1629,6 +2482,8 @@ private void OnAgentEventReceived(object? sender, AgentEventInfo evt)
         lock (_gate) { meta = BuildLiveMetaLocked(threadId, tsMs); }
 
         ApplyEventAndPublish(threadId, mapped, meta);
+        if (isTerminalRunEvent)
+            ScheduleQueuedSendDrain(threadId);
     }
 
     private void RaiseKeylessEventDiagnosticOnce()
@@ -1677,6 +2532,7 @@ private void UpdateActiveRunId(AgentEventInfo evt, string threadId)
                 if (phase == "start" && !string.IsNullOrEmpty(evt.RunId))
                 {
                     _activeRunIds[threadId] = evt.RunId;
+                    _activeRunStartSequences[threadId] = ++_lifecycleStartSequence;
 
                     // Detect remote turn: if the turn was NOT locally initiated,
                     // a remote client (e.g. gateway web UI) sent the message.
@@ -1704,12 +2560,19 @@ private void UpdateActiveRunId(AgentEventInfo evt, string threadId)
                     if (!string.IsNullOrEmpty(evt.RunId))
                         _abortedRunIds.Remove(evt.RunId);
                     _activeRunIds.Remove(threadId);
+                    _activeRunStartSequences.Remove(threadId);
 
                     // Clear thread-level abort suppression on terminal lifecycle events.
                     // The turn is over — any remaining abort suppression is no longer needed.
                     _abortedThreads.Remove(threadId);
-                    // Clear locally-initiated flag — this turn is done.
-                    _locallyInitiatedThreads.Remove(threadId);
+                    // Clear locally-initiated flag only when no locally queued
+                    // follow-up prompts remain for this thread. Multiple rapid
+                    // sends can queue runs behind the current one; treating the
+                    // next lifecycle.start as remote would orphan those queued
+                    // cards and let assistant fallback promote the wrong item.
+                    RemoveQueuedRunMappingByRunIdLocked(threadId, evt.RunId);
+                    if (!HasPendingQueuedMessagesLocked(threadId))
+                        _locallyInitiatedThreads.Remove(threadId);
 
                     // Edge case: if we have pending aborts but never saw lifecycle.start
                     // (gateway responded so fast start+end were batched), fire the
@@ -1729,61 +2592,749 @@ private void UpdateActiveRunId(AgentEventInfo evt, string threadId)
                  evt.Data.ValueKind == System.Text.Json.JsonValueKind.Object &&
                  evt.Data.TryGetProperty("state", out var stateProp))
         {
-            var state = stateProp.GetString()?.ToLowerInvariant();
-            lock (_gate)
-            {
-                if ((state == "done" || state == "error") && !string.IsNullOrEmpty(evt.RunId))
-                {
-                    _abortedRunIds.Remove(evt.RunId);
-                    _activeRunIds.Remove(threadId);
-                }
-            }
+            var state = stateProp.GetString()?.ToLowerInvariant();
+            lock (_gate)
+            {
+                if ((state == "done" || state == "error") && !string.IsNullOrEmpty(evt.RunId))
+                {
+                    _abortedRunIds.Remove(evt.RunId);
+                    _activeRunIds.Remove(threadId);
+                    _activeRunStartSequences.Remove(threadId);
+                    RemoveQueuedRunMappingByRunIdLocked(threadId, evt.RunId);
+                }
+            }
+        }
+    }
+
+    private bool ShouldDropTerminalAgentEventLocked(AgentEventInfo evt, string threadId)
+    {
+        if (!TryGetTerminalAgentRunId(evt, out var runId) || string.IsNullOrWhiteSpace(runId))
+            return false;
+
+        if (_terminalRunIdsByThread.TryGetValue(threadId, out var terminalRunIds) &&
+            terminalRunIds.Contains(runId, StringComparer.Ordinal))
+        {
+            return true;
+        }
+
+        if (_activeRunIds.TryGetValue(threadId, out var activeRunId) &&
+            !string.Equals(activeRunId, runId, StringComparison.Ordinal))
+        {
+            return true;
+        }
+
+        if (!_activeRunIds.ContainsKey(threadId) &&
+            _queuedMessageIdsByRunId.TryGetValue(threadId, out var queuedRunIds) &&
+            queuedRunIds.Count > 0 &&
+            !queuedRunIds.ContainsKey(runId) &&
+            _timelines.TryGetValue(threadId, out var timeline) &&
+            timeline.TurnActive)
+        {
+            return true;
+        }
+
+        RememberTerminalRunIdLocked(threadId, runId);
+        return false;
+    }
+
+    private void RememberTerminalRunIdLocked(string threadId, string runId)
+    {
+        if (!_terminalRunIdsByThread.TryGetValue(threadId, out var terminalRunIds))
+        {
+            terminalRunIds = new List<string>();
+            _terminalRunIdsByThread[threadId] = terminalRunIds;
+        }
+
+        terminalRunIds.RemoveAll(existing => string.Equals(existing, runId, StringComparison.Ordinal));
+        terminalRunIds.Add(runId);
+        if (terminalRunIds.Count > 64)
+            terminalRunIds.RemoveRange(0, terminalRunIds.Count - 64);
+    }
+
+    private static bool TryGetTerminalAgentRunId(AgentEventInfo evt, out string runId)
+    {
+        runId = evt.RunId ?? string.Empty;
+        if (evt.Data.ValueKind != System.Text.Json.JsonValueKind.Object)
+            return false;
+
+        if (string.Equals(evt.Stream, "lifecycle", StringComparison.OrdinalIgnoreCase) &&
+            evt.Data.TryGetProperty("phase", out var phaseProp))
+        {
+            var phase = phaseProp.GetString();
+            return string.Equals(phase, "end", StringComparison.OrdinalIgnoreCase) ||
+                   string.Equals(phase, "error", StringComparison.OrdinalIgnoreCase);
+        }
+
+        if (string.Equals(evt.Stream, "job", StringComparison.OrdinalIgnoreCase) &&
+            evt.Data.TryGetProperty("state", out var stateProp))
+        {
+            var state = stateProp.GetString();
+            return string.Equals(state, "done", StringComparison.OrdinalIgnoreCase) ||
+                   string.Equals(state, "error", StringComparison.OrdinalIgnoreCase);
+        }
+
+        return false;
+    }
+
+    private bool TryConsumeLocalEchoLocked(string threadId, Queue<LocalSentText> queue, string text, out string queuedMessageId)
+    {
+        queuedMessageId = string.Empty;
+        var now = DateTimeOffset.UtcNow;
+        while (queue.Count > 0 && now - queue.Peek().SentAt > LocalEchoSuppressionWindow)
+            queue.Dequeue();
+
+        if (queue.Count == 0)
+        {
+            _localSentTexts.Remove(threadId);
+            return false;
+        }
+
+        var matched = false;
+        string matchedMessageId = string.Empty;
+        var pendingEchoes = queue.ToArray();
+        queue.Clear();
+        foreach (var pending in pendingEchoes)
+        {
+            if (matched || !string.Equals(pending.Text, text, StringComparison.Ordinal))
+                continue;
+
+            queuedMessageId = pending.QueuedMessageId;
+            matchedMessageId = pending.QueuedMessageId;
+            matched = true;
+        }
+
+        var kept = new Queue<LocalSentText>(pendingEchoes.Length);
+        if (!matched)
+        {
+            foreach (var pending in pendingEchoes)
+                kept.Enqueue(pending);
+            StoreLocalEchoQueueLocked(threadId, kept);
+            return false;
+        }
+
+        foreach (var pending in pendingEchoes)
+        {
+            if (string.Equals(pending.QueuedMessageId, matchedMessageId, StringComparison.Ordinal))
+                continue;
+
+            kept.Enqueue(pending);
+        }
+
+        StoreLocalEchoQueueLocked(threadId, kept);
+        return true;
+    }
+
+    private void StoreLocalEchoQueueLocked(string threadId, Queue<LocalSentText> queue)
+    {
+        if (queue.Count == 0)
+            _localSentTexts.Remove(threadId);
+        else
+            _localSentTexts[threadId] = queue;
+    }
+
+    private bool TryReconcileExistingLocalQueuedUserEchoLocked(
+        string threadId,
+        string text,
+        ChatEntryMetadata confirmedMeta)
+    {
+        if (!HasGatewayIdentity(confirmedMeta))
+            return false;
+        if (!_entryMeta.TryGetValue(threadId, out var threadMeta) ||
+            !_timelines.TryGetValue(threadId, out var timeline))
+            return false;
+
+        foreach (var entry in timeline.Entries)
+        {
+            if (entry.Kind != ChatTimelineItemKind.User)
+                continue;
+            if (!string.Equals(entry.Text, text, StringComparison.Ordinal))
+                continue;
+            if (!threadMeta.TryGetValue(entry.Id, out var existing) || !existing.IsLocalQueuedSend)
+                continue;
+            if (HasGatewayIdentity(existing))
+                continue;
+            if (!IsFreshLocalQueuedPromotion(existing, confirmedMeta))
+                continue;
+
+            threadMeta[entry.Id] = confirmedMeta with
+            {
+                IsLocalQueuedSend = false,
+                LocalQueuedMessageId = existing.LocalQueuedMessageId,
+            };
+            return true;
+        }
+
+        return false;
+    }
+
+    private static bool HasGatewayIdentity(ChatEntryMetadata meta)
+        => !string.IsNullOrEmpty(meta.GatewayMessageId) || meta.OpenClawSeq is not null;
+
+    private static bool IsFreshLocalQueuedPromotion(ChatEntryMetadata existing, ChatEntryMetadata confirmed)
+    {
+        if (existing.Timestamp is not { } existingTimestamp)
+            return false;
+        if (confirmed.Timestamp is { } confirmedTimestamp)
+            return (confirmedTimestamp - existingTimestamp).Duration() <= LocalEchoSuppressionWindow;
+
+        return DateTimeOffset.Now - existingTimestamp <= LocalEchoSuppressionWindow;
+    }
+
+    private void AddQueuedMessageLocked(string threadId, ChatQueuedMessage message)
+    {
+        if (!_queuedMessages.TryGetValue(threadId, out var list))
+        {
+            list = new List<ChatQueuedMessage>();
+            _queuedMessages[threadId] = list;
+        }
+
+        list.RemoveAll(existing => existing.Id == message.Id);
+        list.Add(message);
+    }
+
+    private void AddQueuedSendRequestLocked(QueuedSendRequest request)
+    {
+        if (!_queuedSendRequests.TryGetValue(request.ThreadId, out var list))
+        {
+            list = new List<QueuedSendRequest>();
+            _queuedSendRequests[request.ThreadId] = list;
+        }
+
+        list.RemoveAll(existing => existing.Id == request.Id);
+        list.Add(request);
+    }
+
+    private void RemoveQueuedSendRequestLocked(string threadId, string messageId)
+    {
+        if (!_queuedSendRequests.TryGetValue(threadId, out var list))
+            return;
+
+        list.RemoveAll(request => request.Id == messageId);
+        if (list.Count == 0)
+            _queuedSendRequests.Remove(threadId);
+    }
+
+    private QueuedSendRequest? FindQueuedSendRequestLocked(string threadId, string messageId)
+    {
+        if (!_queuedSendRequests.TryGetValue(threadId, out var list))
+            return null;
+
+        return list.FirstOrDefault(request => string.Equals(request.Id, messageId, StringComparison.Ordinal));
+    }
+
+    private bool CanSendDirectlyLocked(string threadId)
+    {
+        if (_activeRunIds.ContainsKey(threadId))
+            return false;
+        if (_timelines.TryGetValue(threadId, out var timeline) && timeline.TurnActive)
+            return false;
+        return !HasPendingQueuedMessagesLocked(threadId);
+    }
+
+    private bool CanClearAssistantFallbackPromotionLocked(string threadId)
+    {
+        if (HasSendingQueuedMessagesLocked(threadId))
+            return false;
+        if (_activeRunIds.ContainsKey(threadId))
+            return false;
+        return !_timelines.TryGetValue(threadId, out var timeline) || !timeline.TurnActive;
+    }
+
+    private QueuedSendDispatch StartDirectSendLocked(QueuedSendRequest request)
+    {
+        var threadId = request.ThreadId;
+        var resetVersion = GetResetVersionLocked(threadId);
+        var startedLifecycleSequence = _resetLifecycleStartSequence;
+        var startedRunStartSequence = _lifecycleStartSequence;
+        var current = GetOrCreateTimelineLocked(threadId);
+        var entryId = $"e{current.NextId}";
+        _timelines[threadId] = ChatTimelineReducer.AddLocalUser(current, request.DisplayText, request.LocalNonce);
+        GetOrCreateThreadMetaLocked(threadId)[entryId] = BuildLiveMetaLocked(
+            threadId,
+            isLocalQueuedSend: true,
+            localQueuedMessageId: request.Id);
+        _sessionIds.TryGetValue(threadId, out var sessionId);
+
+        EnqueueLocalEchoLocked(threadId, request.Text, request.Id);
+        _locallyInitiatedThreads.Add(threadId);
+        _assistantFallbackPromotedThreads.Add(threadId);
+        return new QueuedSendDispatch(
+            request,
+            sessionId,
+            resetVersion,
+            startedLifecycleSequence,
+            startedRunStartSequence,
+            StartedDirectly: true);
+    }
+
+    private QueuedSendDispatch? TryStartNextQueuedSendLocked(
+        string threadId,
+        bool requireConnected,
+        out TimeSpan? delayedRetry)
+    {
+        delayedRetry = null;
+        if (requireConnected && _status != ConnectionStatus.Connected)
+            return null;
+        if (_activeRunIds.ContainsKey(threadId))
+            return null;
+        if (_timelines.TryGetValue(threadId, out var timeline) && timeline.TurnActive)
+            return null;
+        if (!_queuedMessages.TryGetValue(threadId, out var queuedMessages))
+            return null;
+
+        for (var i = 0; i < queuedMessages.Count; i++)
+        {
+            if (queuedMessages[i].SendState != ChatQueuedMessageSendState.Queued)
+                continue;
+
+            var request = FindQueuedSendRequestLocked(threadId, queuedMessages[i].Id);
+            if (request is null)
+                continue;
+
+            var now = DateTimeOffset.UtcNow;
+            if (request.DeferredAdmissionRetryAfter is { } retryAfter)
+            {
+                if (retryAfter > now)
+                {
+                    delayedRetry = retryAfter - now;
+                    return null;
+                }
+
+                request = request with { DeferredAdmissionRetryAfter = null };
+                AddQueuedSendRequestLocked(request);
+            }
+
+            // Each dispatched prompt gets one opportunity for assistant-frame
+            // fallback promotion before its lifecycle/user echo arrives.
+            _assistantFallbackPromotedThreads.Remove(threadId);
+            queuedMessages[i] = queuedMessages[i] with { SendState = ChatQueuedMessageSendState.Sending, ErrorText = null };
+            var resetVersion = GetResetVersionLocked(threadId);
+            var startedLifecycleSequence = _resetLifecycleStartSequence;
+            var startedRunStartSequence = _lifecycleStartSequence;
+            _timelines[threadId] = ChatTimelineReducer.BeginLocalUserTurn(GetOrCreateTimelineLocked(threadId));
+            _sessionIds.TryGetValue(threadId, out var sessionId);
+
+            EnqueueLocalEchoLocked(threadId, request.Text, request.Id);
+            _locallyInitiatedThreads.Add(threadId);
+            return new QueuedSendDispatch(
+                request,
+                sessionId,
+                resetVersion,
+                startedLifecycleSequence,
+                startedRunStartSequence,
+                StartedDirectly: false);
+        }
+
+        return null;
+    }
+
+    private void EnqueueLocalEchoLocked(string threadId, string text, string messageId)
+    {
+        RemovePendingLocalEchoLocked(threadId, messageId);
+        if (!_localSentTexts.TryGetValue(threadId, out var localEchoQueue))
+        {
+            localEchoQueue = new Queue<LocalSentText>();
+            _localSentTexts[threadId] = localEchoQueue;
+        }
+
+        localEchoQueue.Enqueue(new LocalSentText(text, DateTimeOffset.UtcNow, messageId));
+        while (localEchoQueue.Count > 20)
+            localEchoQueue.Dequeue();
+    }
+
+    private void TryDispatchNextQueuedSend(string threadId)
+    {
+        ChatDataSnapshot? snapshot = null;
+        QueuedSendDispatch? dispatch;
+        TimeSpan? delayedRetry;
+        lock (_gate)
+        {
+            if (_disposed)
+                return;
+            dispatch = TryStartNextQueuedSendLocked(threadId, requireConnected: true, out delayedRetry);
+            if (dispatch is not null)
+                snapshot = BuildSnapshotLocked();
+        }
+
+        if (snapshot is not null)
+            Publish(snapshot);
+        if (dispatch is not null)
+            _ = DispatchQueuedSendAsync(dispatch, rethrow: false);
+        else if (delayedRetry is { } delay)
+            ScheduleQueuedSendDrain(threadId, delay);
+    }
+
+    private void ScheduleQueuedSendDrain(string threadId)
+        => ScheduleQueuedSendDrain(threadId, DeferredQueueDrainDelay);
+
+    private void ScheduleQueuedSendDrain(string threadId, TimeSpan delay)
+    {
+        lock (_gate)
+        {
+            if (_disposed || !_queuedMessages.ContainsKey(threadId))
+                return;
+            if (!_queuedDrainScheduledThreads.Add(threadId))
+                return;
+        }
+
+        _ = Task.Run(async () =>
+        {
+            try
+            {
+                await Task.Delay(delay).ConfigureAwait(false);
+            }
+            finally
+            {
+                lock (_gate)
+                {
+                    _queuedDrainScheduledThreads.Remove(threadId);
+                }
+            }
+
+            try
+            {
+                TryDispatchNextQueuedSend(threadId);
+            }
+            catch (Exception ex)
+            {
+                Logger.Warn($"[Queue] Scheduled queued send drain failed for threadId='{threadId}': {ex.Message}");
+            }
+        });
+    }
+
+    private static bool IsDeferredAdmissionStatus(string? status) =>
+        string.Equals(status, "in_flight", StringComparison.OrdinalIgnoreCase);
+
+    private static TimeSpan DeferredAdmissionRetryDelay(int retryCount)
+    {
+        var exponent = Math.Min(Math.Max(retryCount - 1, 0), 5);
+        var delayMs = DeferredQueueDrainDelay.TotalMilliseconds * (1 << exponent);
+        return TimeSpan.FromMilliseconds(Math.Min(delayMs, MaxDeferredAdmissionRetryDelay.TotalMilliseconds));
+    }
+
+    private void TrackQueuedMessageRunLocked(string threadId, string runId, string messageId)
+    {
+        if (!_queuedMessageIdsByRunId.TryGetValue(threadId, out var byRunId))
+        {
+            byRunId = new Dictionary<string, string>(StringComparer.Ordinal);
+            _queuedMessageIdsByRunId[threadId] = byRunId;
+        }
+
+        byRunId[runId] = messageId;
+    }
+
+    private bool RemoveQueuedMessageLocked(string threadId, string messageId)
+    {
+        if (!_queuedMessages.TryGetValue(threadId, out var list))
+            return false;
+
+        var removed = list.RemoveAll(message => message.Id == messageId) > 0;
+        if (removed)
+        {
+            RemoveQueuedRunMappingByMessageIdLocked(threadId, messageId);
+            RemoveQueuedSendRequestLocked(threadId, messageId);
+        }
+        if (list.Count == 0)
+        {
+            _queuedMessages.Remove(threadId);
+            ClearQueuedDrainScheduleLocked(threadId);
+            ClearLocallyInitiatedIfIdleLocked(threadId);
+        }
+        return removed;
+    }
+
+    private bool CancelQueuedMessageLocked(string threadId, string messageId)
+    {
+        if (!_queuedMessages.TryGetValue(threadId, out var list))
+            return false;
+
+        var index = list.FindIndex(message => string.Equals(message.Id, messageId, StringComparison.Ordinal));
+        if (index < 0)
+            return false;
+
+        if (list[index].SendState == ChatQueuedMessageSendState.Sending)
+            return false;
+
+        list.RemoveAt(index);
+        RemovePendingLocalEchoLocked(threadId, messageId);
+        RemoveQueuedRunMappingByMessageIdLocked(threadId, messageId);
+        RemoveQueuedSendRequestLocked(threadId, messageId);
+        if (list.Count == 0)
+        {
+            _queuedMessages.Remove(threadId);
+            ClearQueuedDrainScheduleLocked(threadId);
+            ClearLocallyInitiatedIfIdleLocked(threadId);
+        }
+        return true;
+    }
+
+    private void ClearQueuedDrainScheduleLocked(string threadId)
+        => _queuedDrainScheduledThreads.Remove(threadId);
+
+    private bool PromoteQueuedMessageLocked(
+        string threadId,
+        string messageId,
+        ChatEntryMetadata? confirmedMeta = null)
+    {
+        if (!_queuedMessages.TryGetValue(threadId, out var list))
+            return false;
+
+        var index = list.FindIndex(message => message.Id == messageId);
+        if (index < 0)
+            return false;
+
+        var queued = list[index];
+        var current = GetOrCreateTimelineLocked(threadId);
+        var entryId = $"e{current.NextId}";
+        _timelines[threadId] = ChatTimelineReducer.AddLocalUser(current, queued.Text, queued.LocalNonce);
+
+        var hasGatewayIdentity = confirmedMeta is not null && HasGatewayIdentity(confirmedMeta);
+        var meta = hasGatewayIdentity
+            ? confirmedMeta! with { IsLocalQueuedSend = false, LocalQueuedMessageId = messageId }
+            : BuildLiveMetaLocked(
+                threadId,
+                isLocalQueuedSend: true,
+                localQueuedMessageId: messageId);
+        var threadMeta = GetOrCreateThreadMetaLocked(threadId);
+        threadMeta[entryId] = meta;
+
+        list.RemoveAt(index);
+        _assistantFallbackPromotedThreads.Add(threadId);
+        RemoveQueuedSendRequestLocked(threadId, messageId);
+        if (list.Count == 0)
+        {
+            _queuedMessages.Remove(threadId);
+            ClearQueuedDrainScheduleLocked(threadId);
+        }
+        return true;
+    }
+
+    private void ClearLocallyInitiatedIfIdleLocked(string threadId)
+    {
+        if (_activeRunIds.ContainsKey(threadId))
+            return;
+        if (_timelines.TryGetValue(threadId, out var timeline) && timeline.TurnActive)
+            return;
+        if (HasPendingQueuedMessagesLocked(threadId))
+            return;
+
+        _locallyInitiatedThreads.Remove(threadId);
+    }
+
+    private bool ReconcileQueuedMessageEchoLocked(
+        string threadId,
+        string messageId,
+        ChatEntryMetadata confirmedMeta)
+    {
+        if (PromoteQueuedMessageLocked(threadId, messageId, confirmedMeta))
+            return true;
+        if (!HasGatewayIdentity(confirmedMeta) ||
+            !_entryMeta.TryGetValue(threadId, out var threadMeta))
+        {
+            return false;
+        }
+
+        string? matchedEntryId = null;
+        foreach (var (entryId, existing) in threadMeta)
+        {
+            if (!string.Equals(existing.LocalQueuedMessageId, messageId, StringComparison.Ordinal))
+                continue;
+            matchedEntryId = entryId;
+            break;
+        }
+
+        if (matchedEntryId is null)
+            return false;
+
+        threadMeta[matchedEntryId] = confirmedMeta with
+        {
+            IsLocalQueuedSend = false,
+            LocalQueuedMessageId = messageId,
+        };
+        return true;
+    }
+
+    private void RemoveQueuedRunMappingByMessageIdLocked(string threadId, string messageId)
+    {
+        if (!_queuedMessageIdsByRunId.TryGetValue(threadId, out var byRunId))
+            return;
+
+        foreach (var runId in byRunId.Where(kvp => kvp.Value == messageId).Select(kvp => kvp.Key).ToArray())
+            byRunId.Remove(runId);
+
+        if (byRunId.Count == 0)
+            _queuedMessageIdsByRunId.Remove(threadId);
+    }
+
+    private void RemoveQueuedRunMappingByRunIdLocked(string threadId, string runId)
+    {
+        if (!_queuedMessageIdsByRunId.TryGetValue(threadId, out var byRunId))
+            return;
+
+        if (byRunId.TryGetValue(runId, out var messageId))
+        {
+            foreach (var aliasRunId in byRunId.Where(kvp => kvp.Value == messageId).Select(kvp => kvp.Key).ToArray())
+                byRunId.Remove(aliasRunId);
+        }
+        else
+        {
+            byRunId.Remove(runId);
+        }
+
+        if (byRunId.Count == 0)
+            _queuedMessageIdsByRunId.Remove(threadId);
+    }
+
+    private void MarkQueuedMessageFailedLocked(string threadId, string messageId, string error)
+    {
+        if (!_queuedMessages.TryGetValue(threadId, out var list))
+            return;
+
+        for (var i = 0; i < list.Count; i++)
+        {
+            if (list[i].Id == messageId)
+            {
+                list[i] = list[i] with
+                {
+                    SendState = ChatQueuedMessageSendState.Failed,
+                    ErrorText = error
+                };
+                return;
+            }
+        }
+    }
+
+    private bool RequeueDeferredAdmissionLocked(string threadId, string messageId, out TimeSpan retryDelay)
+    {
+        retryDelay = DeferredQueueDrainDelay;
+        var hasActiveRun = _activeRunIds.ContainsKey(threadId);
+        if (!_queuedMessages.TryGetValue(threadId, out var list))
+            return false;
+
+        for (var i = 0; i < list.Count; i++)
+        {
+            if (list[i].Id != messageId ||
+                list[i].SendState != ChatQueuedMessageSendState.Sending)
+            {
+                continue;
+            }
+
+            var retryCount = IncrementDeferredAdmissionRetryCountLocked(threadId, messageId);
+            if (retryCount > MaxDeferredAdmissionRetries)
+            {
+                throw new InvalidOperationException(
+                    $"Gateway kept chat.send status in_flight after {MaxDeferredAdmissionRetries} retries.");
+            }
+
+            list[i] = list[i] with
+            {
+                SendState = ChatQueuedMessageSendState.Queued,
+                ErrorText = null
+            };
+            retryDelay = DeferredAdmissionRetryDelay(retryCount);
+            SetDeferredAdmissionRetryAfterLocked(threadId, messageId, DateTimeOffset.UtcNow + retryDelay);
+            _assistantFallbackPromotedThreads.Remove(threadId);
+            if (!hasActiveRun)
+            {
+                _timelines[threadId] = ChatTimelineReducer.Apply(
+                    GetOrCreateTimelineLocked(threadId),
+                    new ChatTurnEndEvent());
+            }
+            return true;
+        }
+
+        return false;
+    }
+
+    private void SetDeferredAdmissionRetryAfterLocked(string threadId, string messageId, DateTimeOffset retryAfter)
+    {
+        if (!_queuedSendRequests.TryGetValue(threadId, out var requests))
+            return;
+
+        for (var i = 0; i < requests.Count; i++)
+        {
+            if (!string.Equals(requests[i].Id, messageId, StringComparison.Ordinal))
+                continue;
+
+            requests[i] = requests[i] with { DeferredAdmissionRetryAfter = retryAfter };
+            return;
+        }
+    }
+
+    private int IncrementDeferredAdmissionRetryCountLocked(string threadId, string messageId)
+    {
+        if (!_queuedSendRequests.TryGetValue(threadId, out var requests))
+            return MaxDeferredAdmissionRetries + 1;
+
+        for (var i = 0; i < requests.Count; i++)
+        {
+            if (!string.Equals(requests[i].Id, messageId, StringComparison.Ordinal))
+                continue;
+
+            var retryCount = requests[i].DeferredAdmissionRetryCount + 1;
+            requests[i] = requests[i] with { DeferredAdmissionRetryCount = retryCount };
+            return retryCount;
         }
+
+        return MaxDeferredAdmissionRetries + 1;
     }
 
-    private bool TryConsumeLocalEchoLocked(string threadId, Queue<LocalSentText> queue, string text)
+    private void ClearQueuedMessageOnLocalTurnStart(AgentEventInfo evt, string threadId)
     {
-        var now = DateTimeOffset.UtcNow;
-        while (queue.Count > 0 && now - queue.Peek().SentAt > LocalEchoSuppressionWindow)
-            queue.Dequeue();
+        if (!IsLifecycleStart(evt))
+            return;
 
-        if (queue.Count == 0)
+        ChatDataSnapshot? snapshot = null;
+        lock (_gate)
         {
-            _localSentTexts.Remove(threadId);
-            return false;
+            if (TryPromoteQueuedMessageOnLocalTurnStartLocked(evt, threadId))
+                snapshot = BuildSnapshotLocked();
+        }
+
+        if (snapshot is not null)
+        {
+            Publish(snapshot);
         }
+    }
 
-        if (!string.Equals(queue.Peek().Text, text, StringComparison.Ordinal))
+    private bool TryPromoteQueuedMessageOnLocalTurnStartLocked(AgentEventInfo evt, string threadId)
+    {
+        if (!_locallyInitiatedThreads.Contains(threadId))
             return false;
 
-        queue.Dequeue();
-        if (queue.Count == 0)
-            _localSentTexts.Remove(threadId);
-        return true;
+        var runId = evt.RunId;
+        if (!string.IsNullOrEmpty(runId) &&
+            _queuedMessageIdsByRunId.TryGetValue(threadId, out var byRunId) &&
+            byRunId.TryGetValue(runId, out var queuedMessageId))
+        {
+            return PromoteQueuedMessageLocked(threadId, queuedMessageId);
+        }
+
+        if (string.IsNullOrEmpty(runId) &&
+            TryGetSingleSendingQueuedMessageLocked(threadId, out var queued))
+        {
+            return PromoteQueuedMessageLocked(threadId, queued.Id);
+        }
+
+        return false;
     }
 
-    private void RemovePendingLocalEchoLocked(string threadId, string text)
+    private void RemovePendingLocalEchoLocked(string threadId, string messageId)
     {
         if (!_localSentTexts.TryGetValue(threadId, out var queue))
             return;
 
         var kept = new Queue<LocalSentText>(queue.Count);
-        var removed = false;
         while (queue.Count > 0)
         {
             var pending = queue.Dequeue();
-            if (!removed && string.Equals(pending.Text, text, StringComparison.Ordinal))
-            {
-                removed = true;
+            if (string.Equals(pending.QueuedMessageId, messageId, StringComparison.Ordinal))
                 continue;
-            }
+
             kept.Enqueue(pending);
         }
 
-        if (kept.Count == 0)
-            _localSentTexts.Remove(threadId);
-        else
-            _localSentTexts[threadId] = kept;
+        StoreLocalEchoQueueLocked(threadId, kept);
     }
 
     /// <summary>
@@ -1853,7 +3404,11 @@ private async Task FetchRemoteUserMessageAsync(string threadId, bool openResetGa
                     TryOpenResetGateFromPendingLifecycleLocked(threadId, acceptedRunId: null);
                 }
 
-                var meta = BuildLiveMetaLocked(threadId, lastUser.Ts);
+                var meta = BuildLiveMetaLocked(
+                    threadId,
+                    lastUser.Ts,
+                    lastUser.OpenClawId,
+                    lastUser.OpenClawSeq);
                 snapshotToPublish = ApplyEventLocked(
                     threadId,
                     new ChatUserMessageEvent(TruncateForChatEntry(lastUser.Text)),
@@ -1936,10 +3491,16 @@ private static bool IsTerminalApprovalPhase(string phase)
     // Allowed. ``denied`` maps to Denied. Every other terminal phase (aborted,
     // canceled/cancelled, expired, timeout, error) collapses to Expired — the
     // "decided elsewhere or never decided" badge.
-    private static ChatPermissionDecision MapTerminalPhaseToDecision(string phase)
+    private static ChatPermissionDecision MapTerminalPhaseToDecision(string phase, string? decision = null)
     {
         if (string.Equals(phase, "resolved", System.StringComparison.OrdinalIgnoreCase))
+        {
+            if (string.Equals(decision, ChatPermissionActionKeys.AllowAlways, System.StringComparison.OrdinalIgnoreCase))
+                return ChatPermissionDecision.AllowedAlways;
+            if (string.Equals(decision, ChatPermissionActionKeys.Deny, System.StringComparison.OrdinalIgnoreCase))
+                return ChatPermissionDecision.Denied;
             return ChatPermissionDecision.Allowed;
+        }
         if (string.Equals(phase, "denied", System.StringComparison.OrdinalIgnoreCase))
             return ChatPermissionDecision.Denied;
         return ChatPermissionDecision.Expired;
@@ -2158,7 +3719,7 @@ static string SafeStr(System.Text.Json.JsonElement obj, string name)
             detail = string.IsNullOrEmpty(detail) ? message : message + "\n\n" + detail;
 
         Logger.Info($"[Approval] emitting ChatPermissionRequestEvent requestId={requestId} kind='{permissionKind}' tool='{toolName}' detail.len={detail.Length}");
-        return new ChatPermissionRequestEvent(requestId, permissionKind, toolName, detail);
+        return new ChatPermissionRequestEvent(requestId, permissionKind, toolName, detail, ChatPermissionActionKeys.ExecApprovalDefaults);
     }
 
     private static ChatEvent? MapAssistantEvent(AgentEventInfo evt)
@@ -2569,7 +4130,8 @@ internal static string TruncateForChatEntry(string? text)
     /// </remarks>
     /// <summary>
     /// True when text is one of the approval slash-commands we send on the
-    /// user's behalf (<c>/approve &lt;slug&gt; allow-once</c> or
+    /// user's behalf (<c>/approve &lt;slug&gt; allow-once</c>,
+    /// <c>/approve &lt;slug&gt; allow-always</c>, or
     /// <c>/deny &lt;slug&gt;</c>). Matches the exact dashboard grammar
     /// — not just the prefix — so legitimate user prose like
     /// "/approve the design changes" still renders as a normal bubble.
@@ -2588,7 +4150,7 @@ internal static bool LooksLikeApprovalSlashCommand(string text)
     }
 
     private static readonly System.Text.RegularExpressions.Regex s_approvalSlashCommandRegex =
-        new(@"^/(?:approve\s+[A-Za-z0-9_-]{4,64}(?:\s+allow-once)?|deny\s+[A-Za-z0-9_-]{4,64})\s*$",
+        new(@"^/(?:approve\s+[A-Za-z0-9_-]{4,64}(?:\s+(?:allow-once|allow-always))?|deny\s+[A-Za-z0-9_-]{4,64})\s*$",
             System.Text.RegularExpressions.RegexOptions.Compiled);
 
     internal static bool LooksLikeSystemControlNote(string text)
@@ -3074,7 +4636,8 @@ private Dictionary<string, ChatEntryMetadata> GetOrCreateThreadMetaLocked(string
     private readonly record struct ResetClearPersistence(
         bool SaveAbortedIds,
         bool SaveToolMeta,
-        bool SaveAttachmentMeta);
+        bool SaveAttachmentMeta,
+        string[] SubmittedRunIds);
 
     private long GetResetVersionLocked(string threadId) =>
         _resetVersions.TryGetValue(threadId, out var version) ? version : 0;
@@ -3103,10 +4666,24 @@ private ResetClearPersistence ClearThreadHistoryAfterResetLocked(string threadId
         saveAttachmentMeta = _attachmentMetaCache.Remove(threadId) || saveAttachmentMeta;
 
         if (saveToolMeta)
+        {
+            _toolMetaCacheDirty = true;
             _toolMetaSaveVersion++;
+        }
 
+        var submittedRunIds = new HashSet<string>(StringComparer.Ordinal);
         if (_activeRunIds.TryGetValue(threadId, out var activeRunId) && !string.IsNullOrEmpty(activeRunId))
-            AddResetIgnoredRunIdLocked(threadId, activeRunId);
+            submittedRunIds.Add(activeRunId);
+        if (_queuedMessageIdsByRunId.TryGetValue(threadId, out var queuedRunIds))
+        {
+            foreach (var queuedRunId in queuedRunIds.Keys)
+                submittedRunIds.Add(queuedRunId);
+        }
+        if (_localSentTexts.TryGetValue(threadId, out var localEchoes))
+        {
+            foreach (var localEcho in localEchoes)
+                AddResetSubmittedLocalEchoTextLocked(threadId, localEcho.Text, localEcho.SentAt);
+        }
 
         _resetVersions[threadId] = GetResetVersionLocked(threadId) + 1;
         _resetCutoffUtcMs[threadId] = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
@@ -3117,10 +4694,17 @@ private ResetClearPersistence ClearThreadHistoryAfterResetLocked(string threadId
         _historyLoaded.Add(threadId);
         _historyRetryCount.Remove(threadId);
         _activeRunIds.Remove(threadId);
+        _activeRunStartSequences.Remove(threadId);
         _pendingAbortCounts.Remove(threadId);
         _abortedThreads.Remove(threadId);
         _locallyInitiatedThreads.Remove(threadId);
         _localSentTexts.Remove(threadId);
+        _queuedMessages.Remove(threadId);
+        _queuedSendRequests.Remove(threadId);
+        ClearQueuedDrainScheduleLocked(threadId);
+        _queuedMessageIdsByRunId.Remove(threadId);
+        _terminalRunIdsByThread.Remove(threadId);
+        _assistantFallbackPromotedThreads.Remove(threadId);
         _resetAcceptedRunIds.Remove(threadId);
         _resetLocalSendWithoutRunVersions.Remove(threadId);
         _resetLocalSendWithoutRunStartSequences.Remove(threadId);
@@ -3128,8 +4712,10 @@ private ResetClearPersistence ClearThreadHistoryAfterResetLocked(string threadId
         _resetPendingLifecycleStarts.Remove(threadId);
         _resetRemoteBackfillInFlight.Remove(threadId);
         _resetRemoteUserSeen.Remove(threadId);
+        foreach (var submittedRunId in submittedRunIds)
+            AddResetIgnoredRunIdLocked(threadId, submittedRunId);
 
-        return new ResetClearPersistence(saveAbortedIds, saveToolMeta, saveAttachmentMeta);
+        return new ResetClearPersistence(saveAbortedIds, saveToolMeta, saveAttachmentMeta, submittedRunIds.ToArray());
     }
 
     private void PersistClearedResetState(ResetClearPersistence persistence)
@@ -3152,6 +4738,72 @@ private void AddResetIgnoredRunIdLocked(string threadId, string runId)
         set.Add(runId);
     }
 
+    private void AddResetSubmittedLocalEchoTextLocked(string threadId, string text, DateTimeOffset sentAt)
+    {
+        if (string.IsNullOrWhiteSpace(text))
+            return;
+
+        if (!_resetSubmittedLocalEchoTexts.TryGetValue(threadId, out var texts))
+        {
+            texts = new Dictionary<string, Queue<DateTimeOffset>>(StringComparer.Ordinal);
+            _resetSubmittedLocalEchoTexts[threadId] = texts;
+        }
+
+        var normalized = text.Trim();
+        if (!texts.TryGetValue(normalized, out var timestamps))
+        {
+            timestamps = new Queue<DateTimeOffset>();
+            texts[normalized] = timestamps;
+        }
+        timestamps.Enqueue(sentAt);
+    }
+
+    private bool TryConsumeResetSubmittedLocalEchoTextLocked(string threadId, string text)
+    {
+        if (string.IsNullOrWhiteSpace(text) ||
+            !_resetSubmittedLocalEchoTexts.TryGetValue(threadId, out var texts))
+        {
+            return false;
+        }
+
+        var normalized = text.Trim();
+        if (!texts.TryGetValue(normalized, out var timestamps))
+            return false;
+
+        var now = DateTimeOffset.UtcNow;
+        while (timestamps.Count > 0 && now - timestamps.Peek() > LocalEchoSuppressionWindow)
+            timestamps.Dequeue();
+
+        if (timestamps.Count == 0)
+        {
+            texts.Remove(normalized);
+            if (texts.Count == 0)
+                _resetSubmittedLocalEchoTexts.Remove(threadId);
+            return false;
+        }
+
+        timestamps.Dequeue();
+        if (timestamps.Count == 0)
+            texts.Remove(normalized);
+
+        if (texts.Count == 0)
+            _resetSubmittedLocalEchoTexts.Remove(threadId);
+        return true;
+    }
+
+    private bool HasPendingLocalEchoTextLocked(string threadId, string text)
+    {
+        if (string.IsNullOrWhiteSpace(text) ||
+            !_localSentTexts.TryGetValue(threadId, out var queue) ||
+            queue.Count == 0)
+        {
+            return false;
+        }
+
+        var normalized = text.Trim();
+        return queue.Any(pending => string.Equals(pending.Text, normalized, StringComparison.Ordinal));
+    }
+
     private void AddResetAcceptedRunIdLocked(string threadId, string runId)
     {
         if (!_resetAwaitingUserMessage.Contains(threadId))
@@ -3178,20 +4830,29 @@ private bool ShouldDropChatMessageAfterResetLocked(
     {
         consumeEchoText = null;
         requestRemoteBackfill = false;
+        var isNormalUserText = roleLower == "user" &&
+            !LooksLikeApprovalSlashCommand(rawText) &&
+            !LooksLikeSystemControlNote(rawText);
+
+        if (isNormalUserText &&
+            !HasPendingLocalEchoTextLocked(threadId, rawText) &&
+            TryConsumeResetSubmittedLocalEchoTextLocked(threadId, rawText))
+        {
+            return true;
+        }
+
         if (!_resetAwaitingUserMessage.Contains(threadId))
         {
             return IsPreResetTimestampLocked(threadId, tsMs, GetResetCutoffUtcMsLocked(threadId));
         }
 
-        var isFreshUser = roleLower == "user" &&
-            !LooksLikeApprovalSlashCommand(rawText) &&
-            !LooksLikeSystemControlNote(rawText) &&
+        var isFreshUser = isNormalUserText &&
             !IsPreResetTimestampLocked(threadId, tsMs, GetResetCutoffUtcMsLocked(threadId));
 
         if (isFreshUser &&
             _localSentTexts.TryGetValue(threadId, out var echoQueue) &&
             echoQueue.Count > 0 &&
-            string.Equals(echoQueue.Peek().Text, rawText.Trim(), StringComparison.Ordinal))
+            echoQueue.Any(pending => string.Equals(pending.Text, rawText.Trim(), StringComparison.Ordinal)))
         {
             consumeEchoText = rawText.Trim();
             _resetLocalEchoSequences[threadId] = _resetLifecycleStartSequence;
@@ -3212,9 +4873,210 @@ private bool ShouldDropChatMessageAfterResetLocked(
         return true;
     }
 
-    private bool ShouldDropAgentEventAfterResetLocked(AgentEventInfo evt, string threadId)
+    private void PromoteOldestQueuedMessageBeforeAssistantIfNeeded(string threadId)
+    {
+        ChatDataSnapshot? snapshot = null;
+        lock (_gate)
+        {
+            // This fallback covers the degenerate case where an assistant frame
+            // arrives before any user echo or lifecycle.start/run mapping. When
+            // a run is active, lifecycle/ACK correlation owns the handoff; when
+            // multiple queued prompts exist, positional assistant fallback is
+            // ambiguous and can create false user boundaries that duplicate the
+            // assistant bubble.
+            if (_locallyInitiatedThreads.Contains(threadId)
+                && TryGetSingleSendingQueuedMessageLocked(threadId, out var queued)
+                && !_activeRunIds.ContainsKey(threadId)
+                && !_assistantFallbackPromotedThreads.Contains(threadId)
+                && PromoteQueuedMessageLocked(threadId, queued.Id))
+            {
+                snapshot = BuildSnapshotLocked();
+            }
+        }
+
+        if (snapshot is not null)
+            Publish(snapshot);
+    }
+
+    private AssistantQueueFrameDisposition ClassifyAssistantQueueFrameLocked(
+        string threadId,
+        string assistantText,
+        string? gatewayMessageId,
+        int? openClawSeq)
+    {
+        if ((!string.IsNullOrEmpty(gatewayMessageId) || openClawSeq is not null) &&
+            IsIdentifiedCompletedAssistantDuplicateLocked(
+                threadId,
+                assistantText,
+                gatewayMessageId,
+                openClawSeq))
+        {
+            return AssistantQueueFrameDisposition.Drop;
+        }
+
+        if (string.IsNullOrEmpty(gatewayMessageId) &&
+            openClawSeq is null &&
+            IsIdentitylessAssistantRetransmitAcrossLocalUserBoundaryLocked(threadId, assistantText))
+        {
+            return AssistantQueueFrameDisposition.Drop;
+        }
+
+        if (!_locallyInitiatedThreads.Contains(threadId) ||
+            !TryGetSingleSendingQueuedMessageLocked(threadId, out _) ||
+            _activeRunIds.ContainsKey(threadId) ||
+            _assistantFallbackPromotedThreads.Contains(threadId) ||
+            !_timelines.TryGetValue(threadId, out var timeline))
+        {
+            return AssistantQueueFrameDisposition.Render;
+        }
+
+        for (var i = timeline.Entries.Count - 1; i >= 0; i--)
+        {
+            var entry = timeline.Entries[i];
+            if (entry.Kind != ChatTimelineItemKind.Assistant)
+                continue;
+            if (entry.IsStreaming || !string.Equals(entry.Text, assistantText, StringComparison.Ordinal))
+                return AssistantQueueFrameDisposition.Render;
+            if (string.IsNullOrEmpty(gatewayMessageId) && openClawSeq is null)
+                // In this queue-boundary window, an identity-less same-text frame cannot be tied
+                // to the queued prompt; replaying it can attach stale output to the next prompt.
+                return AssistantQueueFrameDisposition.Drop;
+            if (!_entryMeta.TryGetValue(threadId, out var threadMeta) ||
+                !threadMeta.TryGetValue(entry.Id, out var existing))
+            {
+                return AssistantQueueFrameDisposition.Render;
+            }
+
+            var sameGatewayIdentity =
+                (!string.IsNullOrEmpty(gatewayMessageId) &&
+                 string.Equals(existing.GatewayMessageId, gatewayMessageId, StringComparison.Ordinal)) ||
+                (openClawSeq is not null && existing.OpenClawSeq == openClawSeq);
+            return sameGatewayIdentity
+                ? AssistantQueueFrameDisposition.Drop
+                : AssistantQueueFrameDisposition.Render;
+        }
+
+        return AssistantQueueFrameDisposition.Render;
+    }
+
+    private bool IsIdentitylessAssistantRetransmitAcrossLocalUserBoundaryLocked(string threadId, string assistantText)
+    {
+        if (!_locallyInitiatedThreads.Contains(threadId) ||
+            _activeRunIds.ContainsKey(threadId) ||
+            !_timelines.TryGetValue(threadId, out var timeline) ||
+            !_entryMeta.TryGetValue(threadId, out var threadMeta))
+        {
+            return false;
+        }
+
+        var sawLatestLocalUserBoundary = false;
+        for (var i = timeline.Entries.Count - 1; i >= 0; i--)
+        {
+            var entry = timeline.Entries[i];
+            if (!sawLatestLocalUserBoundary)
+            {
+                if (entry.Kind == ChatTimelineItemKind.Assistant)
+                    return false;
+                if (entry.Kind == ChatTimelineItemKind.User &&
+                    threadMeta.TryGetValue(entry.Id, out var meta) &&
+                    meta.IsLocalQueuedSend)
+                {
+                    sawLatestLocalUserBoundary = true;
+                }
+                continue;
+            }
+
+            if (entry.Kind == ChatTimelineItemKind.Assistant)
+                return !entry.IsStreaming && string.Equals(entry.Text, assistantText, StringComparison.Ordinal);
+            if (entry.Kind == ChatTimelineItemKind.User)
+                return false;
+        }
+
+        return false;
+    }
+
+    private bool IsIdentifiedCompletedAssistantDuplicateLocked(
+        string threadId,
+        string assistantText,
+        string? gatewayMessageId,
+        int? openClawSeq)
+    {
+        if (!_timelines.TryGetValue(threadId, out var timeline) ||
+            !_entryMeta.TryGetValue(threadId, out var threadMeta))
+        {
+            return false;
+        }
+
+        for (var i = timeline.Entries.Count - 1; i >= 0; i--)
+        {
+            var entry = timeline.Entries[i];
+            if (entry.Kind != ChatTimelineItemKind.Assistant ||
+                entry.IsStreaming ||
+                !threadMeta.TryGetValue(entry.Id, out var existing))
+            {
+                continue;
+            }
+
+            var bothHaveGatewayIds =
+                !string.IsNullOrEmpty(gatewayMessageId) &&
+                !string.IsNullOrEmpty(existing.GatewayMessageId);
+            if (bothHaveGatewayIds &&
+                string.Equals(existing.GatewayMessageId, gatewayMessageId, StringComparison.Ordinal))
+            {
+                return true;
+            }
+            if (!bothHaveGatewayIds &&
+                openClawSeq is not null &&
+                existing.OpenClawSeq == openClawSeq &&
+                string.Equals(entry.Text, assistantText, StringComparison.Ordinal))
+            {
+                if (!string.IsNullOrEmpty(gatewayMessageId) &&
+                    string.IsNullOrEmpty(existing.GatewayMessageId))
+                {
+                    threadMeta[entry.Id] = existing with { GatewayMessageId = gatewayMessageId };
+                }
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private bool HasSendingQueuedMessagesLocked(string threadId)
+        => _queuedMessages.TryGetValue(threadId, out var queued) &&
+           queued.Any(message => message.SendState == ChatQueuedMessageSendState.Sending);
+
+    private bool HasPendingQueuedMessagesLocked(string threadId)
+        => _queuedMessages.TryGetValue(threadId, out var queued) &&
+           queued.Any(message => message.SendState is ChatQueuedMessageSendState.Queued or ChatQueuedMessageSendState.Sending);
+
+    private bool TryGetSingleSendingQueuedMessageLocked(string threadId, out ChatQueuedMessage message)
+    {
+        message = default!;
+        if (!_queuedMessages.TryGetValue(threadId, out var queued))
+            return false;
+
+        ChatQueuedMessage? found = null;
+        foreach (var candidate in queued)
+        {
+            if (candidate.SendState != ChatQueuedMessageSendState.Sending)
+                continue;
+            if (found is not null)
+                return false;
+            found = candidate;
+        }
+
+        if (found is null)
+            return false;
+
+        message = found;
+        return true;
+    }
+
+    private bool ShouldDropAgentEventAfterResetLocked(AgentEventInfo evt, string threadId, out bool reloadHistoryAfterDrop)
     {
-        if (IsResetIgnoredRunLocked(threadId, evt.RunId, evt))
+        reloadHistoryAfterDrop = false;
+        if (IsResetIgnoredRunLocked(threadId, evt.RunId, evt, out reloadHistoryAfterDrop))
             return true;
 
         var eventTsMs = evt.Ts > 0 ? (long)evt.Ts : 0L;
@@ -3403,6 +5265,7 @@ private void OpenResetGateForLifecycleStartLocked(string threadId, AgentEventInf
         if (!string.IsNullOrEmpty(evt.RunId))
         {
             _activeRunIds[threadId] = evt.RunId;
+            _activeRunStartSequences[threadId] = ++_lifecycleStartSequence;
             if (_resetAcceptedRunIds.TryGetValue(threadId, out var acceptedRunIds))
             {
                 acceptedRunIds.Remove(evt.RunId);
@@ -3412,8 +5275,9 @@ private void OpenResetGateForLifecycleStartLocked(string threadId, AgentEventInf
         }
     }
 
-    private bool IsResetIgnoredRunLocked(string threadId, string? runId, AgentEventInfo evt)
+    private bool IsResetIgnoredRunLocked(string threadId, string? runId, AgentEventInfo evt, out bool reloadHistoryAfterDrop)
     {
+        reloadHistoryAfterDrop = false;
         if (string.IsNullOrEmpty(runId) ||
             !_resetIgnoredRunIds.TryGetValue(threadId, out var runIds) ||
             !runIds.Contains(runId))
@@ -3425,7 +5289,11 @@ private bool IsResetIgnoredRunLocked(string threadId, string? runId, AgentEventI
         {
             runIds.Remove(runId);
             if (runIds.Count == 0)
+            {
                 _resetIgnoredRunIds.Remove(threadId);
+                _resetSubmittedLocalEchoTexts.Remove(threadId);
+            }
+            reloadHistoryAfterDrop = true;
         }
 
         return true;
@@ -3577,13 +5445,79 @@ private string ResolveTimelineKeyForSessionLocked(SessionInfo session)
     private static int? ToIntIfPositive(long value)
         => value > 0 && value <= int.MaxValue ? (int)value : null;
 
-    private ChatEntryMetadata BuildLiveMetaLocked(string threadId, long? tsMs = null)
+    private ChatEntryMetadata BuildLiveMetaLocked(
+        string threadId,
+        long? tsMs = null,
+        string? gatewayMessageId = null,
+        int? openClawSeq = null,
+        bool isLocalQueuedSend = false,
+        string? localQueuedMessageId = null)
     {
         var ts = tsMs is { } v && v > 0
             ? DateTimeOffset.FromUnixTimeMilliseconds(v).ToLocalTime()
             : (DateTimeOffset?)DateTimeOffset.Now;
         var session = Array.Find(_sessions, s => s.Key == threadId);
-        return new ChatEntryMetadata(ts, session?.Model);
+        return new ChatEntryMetadata(
+            ts,
+            session?.Model,
+            GatewayMessageId: gatewayMessageId,
+            OpenClawSeq: openClawSeq,
+            IsLocalQueuedSend: isLocalQueuedSend,
+            LocalQueuedMessageId: localQueuedMessageId);
+    }
+
+    private static List<ChatMessageInfo> OrderHistoryMessages(List<(ChatMessageInfo Message, int Index)> messages)
+    {
+        if (messages.Count == 0)
+            return new List<ChatMessageInfo>();
+
+        var sequencedCount = messages.Count(item => item.Message.OpenClawSeq is not null);
+        if (sequencedCount == messages.Count)
+        {
+            return messages
+                .OrderBy(item => item.Message.OpenClawSeq)
+                .ThenBy(item => item.Index)
+                .Select(item => item.Message)
+                .ToList();
+        }
+
+        if (sequencedCount == 0)
+        {
+            return messages
+                .OrderBy(item => item.Message.Ts)
+                .ThenBy(item => item.Index)
+                .Select(item => item.Message)
+                .ToList();
+        }
+
+        // Mixed old/new rows are already in gateway transcript order. Sorting
+        // timestamped-but-unsequenced rows against sequenced rows can drag a
+        // later queued burst (e.g. "t") ahead of the actual transcript start.
+        return messages
+            .OrderBy(item => item.Index)
+            .Select(item => item.Message)
+            .ToList();
+    }
+
+    private static void IncrementCount(Dictionary<string, int> counts, string key)
+        => counts[key] = counts.TryGetValue(key, out var count) ? count + 1 : 1;
+
+    private static bool TryConsumeCount(Dictionary<string, int> counts, string key)
+    {
+        if (!counts.TryGetValue(key, out var count) || count <= 0)
+            return false;
+
+        if (count == 1)
+            counts.Remove(key);
+        else
+            counts[key] = count - 1;
+        return true;
+    }
+
+    private static void ConsumeAnyTimestamp(Dictionary<string, List<long>> timestamps, string key)
+    {
+        if (timestamps.TryGetValue(key, out var values) && values.Count > 0)
+            values.RemoveAt(0);
     }
 
     private void SeedSessionIdsFromSessionsLocked(IEnumerable<SessionInfo> sessions)
@@ -3652,9 +5586,9 @@ private ChatDataSnapshot BuildSnapshotLocked()
             && _sessionsListReceived;
 
         // If the compose target hasn't materialized as a real session yet but
-        // already has an optimistic timeline (because the user sent a message
+        // already has local pending chat state (because the user sent a message
         // before the gateway echoed back sessions.list), surface a synthetic
-        // thread record so the UI can render the optimistic bubble without
+        // thread record so the UI can render the queued card/transcript without
         // falling back into the "no thread selected" zero state. The synthetic
         // thread's Id is the canonical compose key, so when SessionsUpdated
         // eventually arrives with the same key it replaces the synthetic in
@@ -3662,7 +5596,9 @@ private ChatDataSnapshot BuildSnapshotLocked()
         if (composeReady
             && composeKey is { } ck
             && _timelines.TryGetValue(ck, out var pendingTl)
-            && pendingTl.Entries.Count > 0
+            && (pendingTl.Entries.Count > 0
+                || pendingTl.TurnActive
+                || (_queuedMessages.TryGetValue(ck, out var pendingQueue) && pendingQueue.Count > 0))
             && !_sessions.Any(s => string.Equals(s.Key, ck, StringComparison.Ordinal)))
         {
             threadList.Add(new ChatThread
@@ -3670,15 +5606,36 @@ private ChatDataSnapshot BuildSnapshotLocked()
                 Id = ck,
                 Title = _lastChatState?.ThreadTitle ?? "OpenClaw Windows Tray",
                 Model = _lastChatState?.Model,
+                ModelProvider = _lastChatState?.ModelProvider,
                 Status = ChatThreadStatus.Running,
                 Activity = ChatActivity.Idle,
             });
         }
 
+        foreach (var approval in _localInlineApprovals.Values)
+        {
+            if (threadList.Any(s => string.Equals(s.Id, approval.ThreadId, StringComparison.Ordinal)))
+                continue;
+
+            threadList.Add(new ChatThread
+            {
+                Id = approval.ThreadId,
+                Title = _lastChatState?.ThreadTitle ?? "OpenClaw Windows Tray",
+                Status = ChatThreadStatus.Running,
+                Activity = ChatActivity.AwaitingPermission,
+                Model = _lastChatState?.Model,
+                ModelProvider = _lastChatState?.ModelProvider,
+            });
+        }
+
         var threads = threadList.ToArray();
 
         // Snapshot a defensive copy of the timeline dict.
         var timelinesCopy = new Dictionary<string, ChatTimelineState>(_timelines);
+        var timelineGenerationsCopy = new Dictionary<string, long>(_resetVersions);
+        var queuedMessagesCopy = _queuedMessages.ToDictionary(
+            kvp => kvp.Key,
+            kvp => (IReadOnlyList<ChatQueuedMessage>)kvp.Value.ToArray());
 
         var defaultThreadId = ResolveDefaultThreadIdLocked();
 
@@ -3708,7 +5665,15 @@ private ChatDataSnapshot BuildSnapshotLocked()
             DefaultThreadId: defaultThreadId,
             ConnectionStatus: connectionLabel,
             AvailableModels: _availableModels,
-            ComposeTarget: composeTarget);
+            ComposeTarget: composeTarget,
+            ModelChoices: _modelChoices,
+            // Null until the first commands.list fetch completes so the UI can
+            // distinguish "loading" from "loaded but empty". IsSupported=false
+            // surfaces the unsupported state.
+            AvailableCommands: _commandCatalog?.Commands,
+            CommandsSupported: _commandCatalog?.IsSupported ?? true,
+            TimelineGenerations: timelineGenerationsCopy,
+            QueuedMessagesByThread: queuedMessagesCopy);
     }
 
     private string? ResolveDefaultThreadIdLocked()
@@ -3732,6 +5697,23 @@ private ChatDataSnapshot BuildSnapshotLocked()
         return null;
     }
 
+    private void RememberLastSessionStateLocked()
+    {
+        if (_sessions.Length == 0) return;
+        var session = _sessions.FirstOrDefault(s => s.IsMain && !string.IsNullOrEmpty(s.Key))
+            ?? _sessions.FirstOrDefault(s => !string.IsNullOrEmpty(s.Key));
+        if (session is null) return;
+
+        _lastChatState = new LastChatState
+        {
+            DefaultThreadId = session.Key,
+            ThreadTitle = BuildSessionTitle(session),
+            Model = session.Model,
+            ModelProvider = session.Provider,
+            AvailableModels = _availableModels,
+        };
+    }
+
     private static ChatThread ToThread(SessionInfo s)
     {
         var title = BuildSessionTitle(s);
@@ -3744,6 +5726,7 @@ private static ChatThread ToThread(SessionInfo s)
             Activity = string.IsNullOrEmpty(s.CurrentActivity) ? ChatActivity.Idle : ChatActivity.Working,
             Workspace = s.Channel,
             Model = s.Model,
+            ModelProvider = s.Provider,
             ThinkingLevel = s.ThinkingLevel,
             InputTokens = s.InputTokens,
             OutputTokens = s.OutputTokens,
@@ -3825,8 +5808,7 @@ private void Publish(ChatDataSnapshot snapshot)
     // the UI can show them while reconnecting instead of generic placeholders.
 
     private static readonly string LastChatStateFilePath = Path.Combine(
-        Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
-        "OpenClawTray", "last-chat-state.json");
+        AppIdentity.ResolveLocalDataDirectory(), "last-chat-state.json");
 
     private System.Threading.Timer? _lastChatStateSaveTimer;
 
@@ -3835,6 +5817,7 @@ internal sealed class LastChatState
         public string? DefaultThreadId { get; set; }
         public string? ThreadTitle { get; set; }
         public string? Model { get; set; }
+        public string? ModelProvider { get; set; }
         public string[]? AvailableModels { get; set; }
     }
 
@@ -3864,12 +5847,14 @@ private void DebounceSaveLastChatState(ChatDataSnapshot snapshot)
             : snapshot.Threads.Length > 0 ? snapshot.Threads[0] : null;
 
         if (defaultThread is null && snapshot.AvailableModels.Length == 0) return;
+        var previous = _lastChatState;
 
         var state = new LastChatState
         {
-            DefaultThreadId = snapshot.DefaultThreadId,
-            ThreadTitle = defaultThread?.Title,
-            Model = defaultThread?.Model,
+            DefaultThreadId = snapshot.DefaultThreadId ?? previous?.DefaultThreadId,
+            ThreadTitle = defaultThread?.Title ?? previous?.ThreadTitle,
+            Model = defaultThread?.Model ?? previous?.Model,
+            ModelProvider = defaultThread?.ModelProvider ?? previous?.ModelProvider,
             AvailableModels = snapshot.AvailableModels,
         };
 
@@ -3909,8 +5894,7 @@ private void RaiseNotification(ChatProviderNotification notification)
     // ── Abort persistence ──────────────────────────────────────────────
 
     private static readonly string AbortedIdsFilePath = Path.Combine(
-        Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
-        "OpenClawTray", "aborted-messages.json");
+        AppIdentity.ResolveLocalDataDirectory(), "aborted-messages.json");
 
     private static Dictionary<string, HashSet<string>> LoadAbortedIds()
     {
@@ -3983,12 +5967,7 @@ private static string DefaultToolMetaCacheFilePath
     {
         get
         {
-            var root = Environment.GetEnvironmentVariable("OPENCLAW_TRAY_DATA_DIR") is { Length: > 0 } overrideDir
-                ? overrideDir
-                : Path.Combine(
-                    Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
-                    "OpenClawTray");
-            return Path.Combine(root, "tool-metadata.json");
+            return Path.Combine(AppIdentity.ResolveLocalDataDirectory(), "tool-metadata.json");
         }
     }
 
@@ -4019,6 +5998,14 @@ private static Dictionary<string, List<CachedToolMeta>> LoadToolMetaCache(string
                 return new();
             var json = File.ReadAllText(cacheFilePath);
             var dict = System.Text.Json.JsonSerializer.Deserialize<Dictionary<string, List<CachedToolMeta>>>(json);
+            if (dict is not null)
+            {
+                foreach (var entry in dict.Values.SelectMany(entries => entries))
+                {
+                    entry.ToolName = NormalizeCachedDisplayText(entry.ToolName);
+                    entry.Label = NormalizeCachedDisplayText(entry.Label);
+                }
+            }
             return dict ?? new();
         }
         catch (Exception ex)
@@ -4036,6 +6023,15 @@ private static Dictionary<string, List<CachedAttachmentMeta>> LoadAttachmentMeta
                 return new();
             var json = File.ReadAllText(cacheFilePath);
             var dict = System.Text.Json.JsonSerializer.Deserialize<Dictionary<string, List<CachedAttachmentMeta>>>(json);
+            if (dict is not null)
+            {
+                foreach (var entry in dict.Values.SelectMany(entries => entries))
+                {
+                    entry.Text = NormalizeCachedDisplayText(entry.Text);
+                    foreach (var attachment in entry.Attachments)
+                        attachment.FileName = NormalizeCachedDisplayText(attachment.FileName);
+                }
+            }
             return dict ?? new();
         }
         catch (Exception ex)
@@ -4057,10 +6053,10 @@ private void SaveAttachmentMetaCache()
                     kv => kv.Value.Select(e => new CachedAttachmentMeta
                     {
                         Ts = e.Ts,
-                        Text = e.Text,
+                        Text = NormalizeCachedDisplayText(e.Text),
                         Attachments = e.Attachments.Select(a => new CachedAttachmentItem
                         {
-                            FileName = a.FileName,
+                            FileName = NormalizeCachedDisplayText(a.FileName),
                             IsImage = a.IsImage
                         }).ToList()
                     }).ToList(),
@@ -4077,8 +6073,7 @@ private void SaveAttachmentMetaCache()
                 foreach (var k in toRemove) snapshot.Remove(k);
             }
 
-            var json = System.Text.Json.JsonSerializer.Serialize(snapshot,
-                new System.Text.Json.JsonSerializerOptions { WriteIndented = true });
+            var json = System.Text.Json.JsonSerializer.Serialize(snapshot, CacheJsonOptions);
 
             lock (_attachmentMetaSaveGate)
             {
@@ -4126,7 +6121,7 @@ private void CacheAttachmentMeta(
             .Where(a => !string.IsNullOrWhiteSpace(a.FileName))
             .Select(a => new CachedAttachmentItem
             {
-                FileName = a.FileName,
+                FileName = NormalizeCachedDisplayText(a.FileName),
                 IsImage = string.Equals(a.Type, "image", StringComparison.OrdinalIgnoreCase)
             })
             .ToList();
@@ -4154,7 +6149,7 @@ private void CacheAttachmentMeta(
             list.Add(new CachedAttachmentMeta
             {
                 Ts = tsMs,
-                Text = TruncateForChatEntry(EscapeUntrustedAttachmentMarkerLines(text)),
+                Text = NormalizeCachedDisplayText(TruncateForChatEntry(EscapeUntrustedAttachmentMarkerLines(text))),
                 Attachments = items
             });
 
@@ -4187,10 +6182,10 @@ private static List<CachedAttachmentMeta> CloneAttachmentMeta(List<CachedAttachm
         entries.Select(e => new CachedAttachmentMeta
         {
             Ts = e.Ts,
-            Text = e.Text,
+            Text = NormalizeCachedDisplayText(e.Text),
             Attachments = e.Attachments.Select(a => new CachedAttachmentItem
             {
-                FileName = a.FileName,
+                FileName = NormalizeCachedDisplayText(a.FileName),
                 IsImage = a.IsImage
             }).ToList()
         }).ToList();
@@ -4286,14 +6281,16 @@ private void SaveToolMetaCache(long? expectedVersion = null)
             {
                 if (expectedVersion is long version && (version != _toolMetaSaveVersion || _disposed))
                     return;
+                if (!_toolMetaCacheDirty)
+                    return;
 
                 snapshot = _toolMetaCache.ToDictionary(
                     kv => kv.Key,
                     kv => kv.Value.Select(e => new CachedToolMeta
                     {
                         Ts = e.Ts,
-                        ToolName = e.ToolName,
-                        Label = e.Label
+                        ToolName = NormalizeCachedDisplayText(e.ToolName),
+                        Label = NormalizeCachedDisplayText(e.Label)
                     }).ToList(),
                     StringComparer.Ordinal);
             }
@@ -4309,8 +6306,7 @@ private void SaveToolMetaCache(long? expectedVersion = null)
                 foreach (var k in toRemove) snapshot.Remove(k);
             }
 
-            var json = System.Text.Json.JsonSerializer.Serialize(snapshot,
-                new System.Text.Json.JsonSerializerOptions { WriteIndented = true });
+            var json = System.Text.Json.JsonSerializer.Serialize(snapshot, CacheJsonOptions);
 
             lock (_toolMetaSaveGate)
             {
@@ -4332,6 +6328,7 @@ private void SaveToolMetaCache(long? expectedVersion = null)
                 {
                     File.WriteAllText(tempPath, json);
                     File.Move(tempPath, _toolMetaCacheFilePath, overwrite: true);
+                    MarkToolMetaCacheSaved(expectedVersion);
                 }
                 finally
                 {
@@ -4378,7 +6375,12 @@ internal void CacheToolMeta(string threadId, long tsMs, string toolName, string
             if (list.Count > 0 && list[^1].Ts == tsMs && list[^1].ToolName == toolName)
                 return;
 
-            list.Add(new CachedToolMeta { Ts = tsMs, ToolName = toolName, Label = label });
+            list.Add(new CachedToolMeta
+            {
+                Ts = tsMs,
+                ToolName = NormalizeCachedDisplayText(toolName),
+                Label = NormalizeCachedDisplayText(label)
+            });
 
             // Cap per-session entries
             if (list.Count > MaxToolEntriesPerSession)
@@ -4386,6 +6388,7 @@ internal void CacheToolMeta(string threadId, long tsMs, string toolName, string
 
             // Debounce save — reset the timer on each cache addition so we only
             // write once after 500ms of quiescence, avoiding concurrent file writes.
+            _toolMetaCacheDirty = true;
             saveVersion = ++_toolMetaSaveVersion;
             timerToDispose = _toolMetaSaveTimer;
             _toolMetaSaveTimer = new System.Threading.Timer(_ => SaveToolMetaCache(saveVersion), null, 500, Timeout.Infinite);
@@ -4441,7 +6444,30 @@ internal void CacheToolMeta(string threadId, long tsMs, string toolName, string
         if (historyTsMs > 0 && candidate.Ts > 0 && candidate.Ts > historyTsMs + 300_000)
             return null; // cached entry is >5 min after this history entry — not a match
 
-        return cache.Dequeue();
+        var match = cache.Dequeue();
+        match.ToolName = NormalizeCachedDisplayText(match.ToolName);
+        match.Label = NormalizeCachedDisplayText(match.Label);
+        return match;
+    }
+
+    private static string NormalizeCachedDisplayText(string? value)
+    {
+        if (string.IsNullOrEmpty(value))
+            return string.Empty;
+
+        return value
+            .Replace("\r\n", " ", StringComparison.Ordinal)
+            .Replace('\r', ' ')
+            .Replace('\n', ' ');
+    }
+
+    private void MarkToolMetaCacheSaved(long? savedVersion)
+    {
+        lock (_gate)
+        {
+            if (savedVersion is null || savedVersion == _toolMetaSaveVersion)
+                _toolMetaCacheDirty = false;
+        }
     }
 
     /// <summary>
diff --git a/src/OpenClaw.Tray.WinUI/Chat/OpenClawComposer.cs b/src/OpenClaw.Tray.WinUI/Chat/OpenClawComposer.cs
deleted file mode 100644
index 53b26b681..000000000
--- a/src/OpenClaw.Tray.WinUI/Chat/OpenClawComposer.cs
+++ /dev/null
@@ -1,958 +0,0 @@
-using OpenClaw.Chat;
-using OpenClaw.Shared;
-using OpenClawTray.Helpers;
-using Microsoft.UI;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Media;
-using OpenClawTray.FunctionalUI;
-using OpenClawTray.FunctionalUI.Core;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using Windows.UI;
-using static OpenClawTray.FunctionalUI.Factories;
-using static OpenClawTray.FunctionalUI.Core.Theme;
-
-namespace OpenClawTray.Chat;
-
-/// <summary>
-/// Three-row composer surface that mirrors Kenny Hong's <c>ChatShell</c> XAML
-/// design (kenehong/native-chat-v2):
-///
-/// <list type="number">
-///   <item><description>Row 1 — three compact <see cref="Microsoft.UI.Xaml.Controls.ComboBox"/>es:
-///     <c>Channel</c> (agent identity), <c>Model</c>, and <c>Reasoning</c> mode.</description></item>
-///   <item><description>Row 2 — multi-line message <see cref="Microsoft.UI.Xaml.Controls.TextBox"/>
-///     with <c>Message Assistant (Enter to send)</c> placeholder.</description></item>
-///   <item><description>Row 3 — four right-aligned action buttons (transparent attach / mic / more,
-///     plus a filled accent <c>Send</c> button).</description></item>
-/// </list>
-///
-/// Replaces the original <c>InputBar</c> + <c>StatusBar</c> pair from the
-/// previous native chat prototype so our chat surface no longer carries two
-/// separate footer rows. The status, working indicator, and permission
-/// banner that <c>InputBar</c> used to render are preserved here above the
-/// composer.
-/// </summary>
-public record ChannelGroup(string AgentLabel, (string Id, string Title)[] Sessions);
-
-public record OpenClawComposerProps(
-    string ConnectionState,
-    bool TurnActive,
-    string ChannelLabel,
-    string? ChannelId,
-    ChannelGroup[] AvailableChannels,
-    string[] AvailableModels,
-    string? CurrentModel,
-    string? CurrentThinkingLevel,
-    Action<string, ChatAttachment?> OnSend,
-    Action OnStop,
-    Action<string> OnChannelChanged,
-    Action<string> OnModelChanged,
-    Action<string> OnThinkingLevelChanged,
-    Action<bool> OnPermissionsChanged,
-    Func<CancellationToken, Action?, Task<string?>>? OnVoiceRequest = null,
-    Action? OnAttachClick = null,
-    ChatAttachment? PendingAttachment = null,
-    Action? OnAttachmentRemoved = null,
-    bool IsSpeakerMuted = false,
-    Action? OnSpeakerToggle = null,
-    Action? OnSettingsClick = null,
-    string? VoiceTranscript = null,
-    float VoiceAudioLevel = 0f,
-    Action<Action>? RegisterVoiceStarter = null,
-    Action<ChatAttachment>? OnAttachmentPasted = null,
-    bool ShowToolCalls = true,
-    Action<bool>? OnShowToolCallsChanged = null,
-    bool IsCompact = false);
-
-public sealed class OpenClawComposer : Component<OpenClawComposerProps>
-{
-    // Thinking levels matching the gateway's sessions.patch thinkingLevel values.
-    // "medium" is the default when the session has no explicit thinkingLevel set.
-    private static readonly string[] ThinkingLevelIds    = { "off", "minimal", "low", "medium", "high" };
-    private static readonly string[] ThinkingLevelLabels = { "off", "minimal", "low", "medium (default)", "high" };
-
-    public override Element Render()
-    {
-        // UseRef for input text — avoids full-tree re-render on every keypress.
-        // A separate hasTextState tracks the empty↔non-empty transition so the
-        // send button accent styling updates correctly (at most 2 re-renders
-        // per compose cycle instead of one per keypress).
-        var inputRef = UseRef("");
-        var hasTextState = UseState(false, threadSafe: true);
-
-        var composerCornerRadius = new CornerRadius(8);
-        const double composerIconSize = 16;
-        const double sendButtonSize = 40;
-
-        // Version bump triggers a re-render on send so the cleared ref value
-        // is pushed to the TextBox control.
-        var sendVersion = UseState(0, threadSafe: true);
-
-        // Track whether the mic is actively recording for visual indicator.
-        var isRecording = UseState(false, threadSafe: true);
-        var voiceCtsRef = UseRef<CancellationTokenSource?>(null);
-        // When true, a stop (not cancel) was requested — keep the transcript.
-        var voiceStoppedRef = UseRef(false);
-        // TextBox reference for focusing after recording completes
-        var textBoxRef = UseRef<TextBox?>(null);
-        // One-time hook flag for the TextBox Paste event so we don't re-attach
-        // the handler on every re-render (Set() runs each render).
-        var pasteHookedRef = UseRef(false);
-        // Cache the BitmapImage built for the current attachment so we rebuild
-        // it only when the attachment instance changes (not on every render).
-        var attachmentImageRef = UseRef<(ChatAttachment? Att, Microsoft.UI.Xaml.Media.Imaging.BitmapImage? Bmp)>((null, null));
-
-        // Extracted voice-start action so it can be triggered programmatically (e.g. hotkey)
-        Action startVoiceRecording = () =>
-        {
-            if (Props.OnVoiceRequest is null || isRecording.Value) return;
-            var cts = new CancellationTokenSource();
-            voiceCtsRef.Current = cts;
-            voiceStoppedRef.Current = false;
-            // Don't set isRecording yet — the request may show a dialog
-            // (e.g. STT model not installed) and return null immediately.
-            _ = Task.Run(async () =>
-            {
-                try
-                {
-                    var text = await Props.OnVoiceRequest(cts.Token, () => isRecording.Set(true));
-                    // Keep transcript if we got text (either natural completion
-                    // or user pressed stop). Discard only on explicit cancel.
-                    if (!string.IsNullOrEmpty(text)
-                        && (voiceStoppedRef.Current || !cts.IsCancellationRequested))
-                    {
-                        // Append to existing text (supports multiple recording passes)
-                        var existing = inputRef.Current?.TrimEnd();
-                        inputRef.Current = string.IsNullOrEmpty(existing)
-                            ? text
-                            : existing + " " + text;
-                        hasTextState.Set(true);
-                        sendVersion.Set(sendVersion.Value + 1);
-                    }
-                }
-                catch (Exception ex)
-                {
-                    // Voice recording cancelled mid-transcription or pipeline
-                    // unavailable. The UI already reflects the cancel; surface
-                    // the cause at Debug for diagnostics.
-                    OpenClawTray.Services.Logger.Debug($"OpenClawComposer: voice transcription failed/cancelled: {ex.Message}");
-                }
-                finally
-                {
-                    voiceCtsRef.Current = null;
-                    voiceStoppedRef.Current = false;
-                    cts.Dispose();
-                    isRecording.Set(false);
-                    // Move focus to the textbox so Enter sends the transcribed text
-                    var tb = textBoxRef.Current;
-                    if (tb != null)
-                    {
-                        tb.DispatcherQueue?.TryEnqueue(() =>
-                        {
-                            tb.Focus(FocusState.Programmatic);
-                            // Place cursor at end of transcribed text
-                            tb.SelectionStart = tb.Text?.Length ?? 0;
-                            tb.SelectionLength = 0;
-                        });
-                    }
-                }
-            });
-        };
-
-        // Register the voice starter so external callers (e.g. hotkey) can trigger recording
-        Props.RegisterVoiceStarter?.Invoke(startVoiceRecording);
-
-        var sendAction = () =>
-        {
-            var msg = inputRef.Current?.Trim();
-            var attachment = Props.PendingAttachment;
-            if (string.IsNullOrEmpty(msg) && attachment is null) return;
-            Props.OnSend(msg ?? "", attachment);
-            inputRef.Current = "";
-            hasTextState.Set(false);
-            sendVersion.Set(sendVersion.Value + 1);
-        };
-        var sendActionRef = UseRef<Action>(sendAction);
-        sendActionRef.Current = sendAction;
-
-        var isConnected = Props.ConnectionState == "connected";
-        var placeholder = Props.ConnectionState switch
-        {
-            "connected" => LocalizationHelper.GetString("Chat_Composer_Placeholder_Connected"),
-            "connecting" => LocalizationHelper.GetString("Chat_Composer_Placeholder_Connecting"),
-            "incompatible-gateway" => LocalizationHelper.GetString("Chat_Composer_Placeholder_IncompatibleGateway"),
-            _ => LocalizationHelper.GetString("Chat_Composer_Placeholder_NotConnected")
-        };
-
-        // ── Row 1: three compact dropdowns ─────────────────────────────
-        // Build grouped session ComboBox directly (bypassing the FunctionalUI
-        // ComboBox helper which only supports flat string[] items).
-        var groups = Props.AvailableChannels;
-        var channelCombo = Border()
-            .Set(border =>
-            {
-                var cb = new ComboBox
-                {
-                    MinWidth = 0,
-                    Width = double.NaN,
-                    Height = 28,
-                    FontSize = 11,
-                    Padding = new Thickness(8, 0, 4, 0),
-                    CornerRadius = composerCornerRadius,
-                    HorizontalAlignment = HorizontalAlignment.Stretch,
-                    VerticalAlignment = VerticalAlignment.Center,
-                };
-
-                ComboBoxItem? selectedItem = null;
-                foreach (var group in groups)
-                {
-                    if (groups.Length > 1)
-                    {
-                        cb.Items.Add(new ComboBoxItem
-                        {
-                            Content = group.AgentLabel,
-                            IsEnabled = false,
-                            FontWeight = Microsoft.UI.Text.FontWeights.SemiBold,
-                            FontSize = 10,
-                            Padding = new Thickness(4, 2, 4, 2),
-                            IsHitTestVisible = false,
-                        });
-                    }
-                    foreach (var session in group.Sessions)
-                    {
-                        var item = new ComboBoxItem
-                        {
-                            Content = session.Title,
-                            Tag = session.Id,
-                            Padding = groups.Length > 1
-                                ? new Thickness(16, 4, 4, 4)
-                                : new Thickness(8, 4, 4, 4),
-                        };
-                        cb.Items.Add(item);
-                        if (session.Id == (Props.ChannelId ?? ""))
-                            selectedItem = item;
-                    }
-                }
-
-                if (selectedItem != null)
-                    cb.SelectedItem = selectedItem;
-
-                var onChanged = Props.OnChannelChanged;
-                cb.SelectionChanged += (_, _) =>
-                {
-                    if (cb.SelectedItem is ComboBoxItem { Tag: string id })
-                        onChanged(id);
-                };
-
-                border.Child = cb;
-            });
-
-        var models = Props.AvailableModels;
-        var modelIndex = models is { Length: > 0 } && Props.CurrentModel is { } cur
-            ? Array.IndexOf(models, cur) : -1;
-        if (modelIndex < 0 && models is { Length: > 0 }) modelIndex = 0;
-        var modelDisplay = models is { Length: > 0 } ? models : new[] { Props.CurrentModel ?? "model" };
-
-        var modelCombo = ComboBox(modelDisplay, Math.Max(modelIndex, 0), idx =>
-        {
-            if (models is { Length: > 0 } && idx >= 0 && idx < models.Length)
-                Props.OnModelChanged(models[idx]);
-        }).Set(cb =>
-        {
-            cb.MinWidth = 0;
-            cb.Width = double.NaN;
-            cb.Height = 28;
-            cb.FontSize = 11;
-            cb.Padding = new Thickness(8, 0, 4, 0);
-            cb.CornerRadius = composerCornerRadius;
-            cb.HorizontalAlignment = HorizontalAlignment.Stretch;
-        }).VAlign(VerticalAlignment.Center);
-
-        var thinkingLevel = Props.CurrentThinkingLevel ?? "medium";
-        var thinkingIndex = Array.IndexOf(ThinkingLevelIds, thinkingLevel);
-        if (thinkingIndex < 0) thinkingIndex = 3; // default to "medium (default)"
-
-        var reasoningCombo = ComboBox(ThinkingLevelLabels, thinkingIndex, idx =>
-        {
-            if (idx >= 0 && idx < ThinkingLevelIds.Length)
-                Props.OnThinkingLevelChanged(ThinkingLevelIds[idx]);
-        })
-            .Set(cb =>
-            {
-                cb.MinWidth = 0;
-                cb.Width = double.NaN;
-                cb.Height = 28;
-                cb.FontSize = 11;
-                cb.Padding = new Thickness(8, 0, 4, 0);
-                cb.CornerRadius = composerCornerRadius;
-                cb.HorizontalAlignment = HorizontalAlignment.Stretch;
-            }).VAlign(VerticalAlignment.Center);
-
-        Element dropdownsRow = Grid([GridSize.Star(1.2), GridSize.Star(), GridSize.Star(0.62)], [GridSize.Auto],
-            channelCombo.Margin(0, 0, 6, 0).HAlign(HorizontalAlignment.Stretch).Grid(row: 0, column: 0),
-            modelCombo.Margin(0, 0, 6, 0).HAlign(HorizontalAlignment.Stretch).Grid(row: 0, column: 1),
-            reasoningCombo.HAlign(HorizontalAlignment.Stretch).Grid(row: 0, column: 2)
-        ).HAlign(HorizontalAlignment.Stretch);
-
-        // ── Row 2: multi-line composer textbox ─────────────────────────
-        var recording = isRecording.Value;
-        var recTranscript = recording ? Props.VoiceTranscript : null;
-
-        // When recording, show the streaming transcript in the textbox.
-        // The user can still type to edit after recording stops.
-        var displayText = recording && !string.IsNullOrEmpty(recTranscript)
-            ? recTranscript
-            : inputRef.Current;
-
-        var textbox = TextField(displayText, v =>
-            {
-                inputRef.Current = v;
-                hasTextState.Set(!string.IsNullOrWhiteSpace(v));
-            })
-            .Set(tb =>
-            {
-                textBoxRef.Current = tb;
-                tb.PlaceholderText = recording
-                    ? LocalizationHelper.GetString("Chat_Voice_ListeningPrompt")
-                    : placeholder;
-                // Keep AcceptsReturn=false: this lets us intercept *every*
-                // Enter key in OnKeyDown reliably. When the user holds Shift,
-                // we manually insert a newline at the caret below. This avoids
-                // the routed-event ordering problem where the TextBox's class
-                // handler can swallow Enter before our handler runs.
-                tb.AcceptsReturn = false;
-                tb.TextWrapping = TextWrapping.Wrap;
-                tb.MinHeight = 56;
-                tb.MaxHeight = 200;
-                tb.IsEnabled = isConnected;
-                // Strip the TextBox's own chrome — the wrapper Border below
-                // (composerInput) provides the unified border + corner radius
-                // so the optional attachment preview visually sits inside the
-                // same input "card" as the typed text.
-                tb.BorderThickness = new Thickness(0);
-                tb.BorderBrush = new SolidColorBrush(Colors.Transparent);
-                tb.Background = new SolidColorBrush(Colors.Transparent);
-                tb.CornerRadius = new CornerRadius(0);
-                // The TextBox template draws an additional "focus underline"
-                // using TextControlBorderThemeThicknessFocused (default 0,0,0,2)
-                // and a static top/side line via TextControlBorderThemeThickness
-                // even when our BorderThickness=0 (template binds its inner
-                // BorderElement to those theme thicknesses directly). Zero them
-                // out plus force every TextControl BorderBrush variant to
-                // transparent so the wrapper Border (composerInput) is the
-                // only chrome visible.
-                tb.Resources["TextControlBorderThemeThickness"] = new Thickness(0);
-                tb.Resources["TextControlBorderThemeThicknessFocused"] = new Thickness(0);
-                tb.Resources["TextControlBackground"] = new SolidColorBrush(Colors.Transparent);
-                tb.Resources["TextControlBackgroundFocused"] = new SolidColorBrush(Colors.Transparent);
-                tb.Resources["TextControlBackgroundPointerOver"] = new SolidColorBrush(Colors.Transparent);
-                tb.Resources["TextControlBorderBrush"] = new SolidColorBrush(Colors.Transparent);
-                tb.Resources["TextControlBorderBrushFocused"] = new SolidColorBrush(Colors.Transparent);
-                tb.Resources["TextControlBorderBrushPointerOver"] = new SolidColorBrush(Colors.Transparent);
-
-                if (!pasteHookedRef.Current)
-                {
-                    pasteHookedRef.Current = true;
-                    tb.Paste += async (s, e) =>
-                    {
-                        try
-                        {
-                            var att = await TryReadImageFromClipboardAsync();
-                            if (att is not null)
-                            {
-                                e.Handled = true;
-                                Props.OnAttachmentPasted?.Invoke(att);
-                            }
-                        }
-                        catch (Exception ex)
-                        {
-                            // If anything goes wrong reading the clipboard,
-                            // fall through to the default text paste behavior.
-                            OpenClawTray.Services.Logger.Debug($"OpenClawComposer: clipboard image paste failed, falling back to text: {ex.Message}");
-                        }
-                    };
-                }
-            })
-            .OnKeyDown((sender, e) =>
-            {
-                if (e.Key == global::Windows.System.VirtualKey.Enter)
-                {
-                    var shift = Microsoft.UI.Input.InputKeyboardSource
-                        .GetKeyStateForCurrentThread(global::Windows.System.VirtualKey.Shift);
-                    var shiftDown = shift.HasFlag(global::Windows.UI.Core.CoreVirtualKeyStates.Down);
-                    e.Handled = true;
-                    if (shiftDown && sender is TextBox tb)
-                    {
-                        // Insert a newline at the caret position. AcceptsReturn
-                        // is false, so we do this manually instead of letting
-                        // the TextBox handle it (which would race with the
-                        // routed-event order and could either fail to insert
-                        // or also trigger send).
-                        var pos = tb.SelectionStart;
-                        var len = tb.SelectionLength;
-                        var text = tb.Text ?? string.Empty;
-                        var safePos = Math.Min(Math.Max(pos, 0), text.Length);
-                        var safeEnd = Math.Min(safePos + Math.Max(len, 0), text.Length);
-                        tb.Text = text.Substring(0, safePos) + "\n" + text.Substring(safeEnd);
-                        tb.SelectionStart = safePos + 1;
-                        tb.SelectionLength = 0;
-                        inputRef.Current = tb.Text;
-                        hasTextState.Set(!string.IsNullOrWhiteSpace(tb.Text));
-                    }
-                    else
-                    {
-                        sendActionRef.Current();
-                    }
-                }
-            });
-
-        // ── Row 3: action icons (right-aligned) ────────────────────────
-
-        // ── Attachment preview (rendered INSIDE the composer input card) ──
-        // For images, a real thumbnail is shown so the user can confirm what
-        // they pasted/picked. For other files a compact icon+name chip is
-        // shown. The preview sits inside the same Border as the textbox so it
-        // visually reads as part of the chat input.
-        Element attachmentPreview = Empty();
-        if (Props.PendingAttachment is { } att)
-        {
-            var isImage = att.Type == "image";
-
-            Element removeBtn = Button(
-                    TextBlock("\uE711") // Cancel glyph
-                        .Set(t =>
-                        {
-                            t.FontFamily = FluentIconCatalog.SymbolThemeFontFamily;
-                            t.FontSize = 10;
-                        }),
-                    () => Props.OnAttachmentRemoved?.Invoke())
-                .Set(b =>
-                {
-                    b.Padding = new Thickness(4, 2, 4, 2);
-                    b.MinWidth = 0; b.MinHeight = 0;
-                    b.CornerRadius = new CornerRadius(4);
-                })
-                .Resources(r => r
-                    .Set("ButtonBackground", new SolidColorBrush(Colors.Transparent))
-                    .Set("ButtonBackgroundPointerOver", Ref("SubtleFillColorSecondaryBrush"))
-                    .Set("ButtonBackgroundPressed", Ref("SubtleFillColorTertiaryBrush"))
-                    .Set("ButtonBorderBrush", new SolidColorBrush(Colors.Transparent))
-                    .Set("ButtonBorderBrushPointerOver", new SolidColorBrush(Colors.Transparent))
-                    .Set("ButtonBorderBrushPressed", new SolidColorBrush(Colors.Transparent)))
-                .AutomationName("Remove attachment");
-
-            if (isImage)
-            {
-                // Build (and cache) a BitmapImage from the base64 content.
-                // Rebuild only when the attachment instance changes — base64
-                // decode + stream copy is non-trivial work to repeat per
-                // keystroke re-render.
-                var cached = attachmentImageRef.Current;
-                Microsoft.UI.Xaml.Media.Imaging.BitmapImage? bmp = cached.Bmp;
-                if (!ReferenceEquals(cached.Att, att) || bmp is null)
-                {
-                    bmp = TryCreateBitmapFromBase64(att.Content);
-                    attachmentImageRef.Current = (att, bmp);
-                }
-
-                Element thumb;
-                if (bmp is not null)
-                {
-                    // Fit the thumbnail inside a 160×96 box while preserving
-                    // aspect ratio (downscale only, never upscale tiny pastes).
-                    const double maxW = 160;
-                    const double maxH = 96;
-                    var pw = bmp.PixelWidth > 0 ? bmp.PixelWidth : (int)maxW;
-                    var ph = bmp.PixelHeight > 0 ? bmp.PixelHeight : (int)maxH;
-                    var scale = Math.Min(Math.Min(maxW / pw, maxH / ph), 1.0);
-                    var thumbW = pw * scale;
-                    var thumbH = ph * scale;
-
-                    thumb = Border(Empty())
-                        .CornerRadius(4)
-                        .Set(b =>
-                        {
-                            b.Width = thumbW;
-                            b.Height = thumbH;
-                            b.Background = new Microsoft.UI.Xaml.Media.ImageBrush
-                            {
-                                ImageSource = bmp,
-                                Stretch = Stretch.UniformToFill,
-                            };
-                            b.BorderThickness = new Thickness(1);
-                            b.BorderBrush = (Brush)Microsoft.UI.Xaml.Application.Current.Resources["CardStrokeColorDefaultBrush"];
-                        });
-                }
-                else
-                {
-                    thumb = TextBlock("\uEB9F")
-                        .Set(t =>
-                        {
-                            t.FontFamily = FluentIconCatalog.SymbolThemeFontFamily;
-                            t.FontSize = 16;
-                            t.VerticalAlignment = VerticalAlignment.Center;
-                        });
-                }
-
-                // Circular close button that floats in the top-right corner
-                // of the thumbnail. Distinct from the chip's flat removeBtn
-                // because we need an opaque background (so the × is readable
-                // over any image) and a contrast-friendly hover.
-                var floatingRemove = Button(
-                        TextBlock("\uE711")
-                            .Set(t =>
-                            {
-                                t.FontFamily = FluentIconCatalog.SymbolThemeFontFamily;
-                                t.FontSize = 10;
-                                t.HorizontalAlignment = HorizontalAlignment.Center;
-                                t.VerticalAlignment = VerticalAlignment.Center;
-                            }),
-                        () => Props.OnAttachmentRemoved?.Invoke())
-                    .Set(b =>
-                    {
-                        b.Width = 22;
-                        b.Height = 22;
-                        b.MinWidth = 0; b.MinHeight = 0;
-                        b.Padding = new Thickness(0);
-                        b.CornerRadius = new CornerRadius(11);
-                        b.BorderThickness = new Thickness(1);
-                    })
-                    .Resources(r => r
-                        .Set("ButtonBackground", Ref("SolidBackgroundFillColorBaseBrush"))
-                        .Set("ButtonBackgroundPointerOver", Ref("SolidBackgroundFillColorTertiaryBrush"))
-                        .Set("ButtonBackgroundPressed", Ref("SolidBackgroundFillColorQuarternaryBrush"))
-                        .Set("ButtonForeground", Ref("TextFillColorPrimaryBrush"))
-                        .Set("ButtonForegroundPointerOver", Ref("TextFillColorPrimaryBrush"))
-                        .Set("ButtonForegroundPressed", Ref("TextFillColorPrimaryBrush"))
-                        .Set("ButtonBorderBrush", Ref("CardStrokeColorDefaultBrush"))
-                        .Set("ButtonBorderBrushPointerOver", Ref("CardStrokeColorDefaultBrush"))
-                        .Set("ButtonBorderBrushPressed", Ref("CardStrokeColorDefaultBrush")))
-                    .AutomationName("Remove attachment")
-                    .HAlign(HorizontalAlignment.Right)
-                    .VAlign(VerticalAlignment.Top)
-                    .Margin(0, -8, -8, 0);
-
-                // Stack the close button on top of the thumbnail in the same
-                // Grid cell. Auto sizing means the chip is exactly as wide as
-                // the thumbnail.
-                var thumbWithClose = Grid(
-                    [GridSize.Auto], [GridSize.Auto],
-                    thumb.Grid(row: 0, column: 0),
-                    floatingRemove.Grid(row: 0, column: 0)
-                ).HAlign(HorizontalAlignment.Left);
-
-                attachmentPreview = Border(thumbWithClose)
-                    .Padding(8, 12, 8, 4);
-            }
-            else
-            {
-                attachmentPreview = Border(
-                    Grid([GridSize.Auto, GridSize.Star(), GridSize.Auto], [GridSize.Auto],
-                        TextBlock("\uE8A5") // Page glyph
-                            .Set(t =>
-                            {
-                                t.FontFamily = FluentIconCatalog.SymbolThemeFontFamily;
-                                t.FontSize = 12;
-                                t.VerticalAlignment = VerticalAlignment.Center;
-                            })
-                            .Grid(row: 0, column: 0),
-                        TextBlock($"{att.FileName}  ({att.FormatSize()})")
-                            .Set(t =>
-                            {
-                                t.FontSize = 12;
-                                t.TextTrimming = TextTrimming.CharacterEllipsis;
-                                t.VerticalAlignment = VerticalAlignment.Center;
-                                t.Margin = new Thickness(6, 0, 0, 0);
-                            })
-                            .Grid(row: 0, column: 1),
-                        removeBtn.Grid(row: 0, column: 2)
-                    )
-                ).Padding(4, 4, 4, 0);
-            }
-        }
-
-        // Composer "card" — wraps the attachment preview (if any) and the
-        // textbox in a single bordered container so the preview reads as
-        // content inside the chat input rather than a separate row.
-        var composerInput = Border(
-            VStack(0, attachmentPreview, textbox)
-        ).Set(b =>
-        {
-            b.Background = (Brush)Microsoft.UI.Xaml.Application.Current.Resources["TextControlBackground"];
-            if (recording)
-            {
-                b.BorderBrush = (Brush)Microsoft.UI.Xaml.Application.Current.Resources["AccentFillColorDefaultBrush"];
-                b.BorderThickness = new Thickness(2);
-            }
-            else
-            {
-                b.BorderBrush = (Brush)Microsoft.UI.Xaml.Application.Current.Resources["TextControlBorderBrush"];
-                b.BorderThickness = new Thickness(1);
-            }
-            b.CornerRadius = composerCornerRadius;
-        });
-
-        // ── Voice recording indicator: compact pill with dot, label, and mini waveform ──
-        // Only shown while actively recording (isRecording state).
-        // Uses a unique Key so FunctionalUI doesn't reuse the same Border and leave
-        // stale styling when switching between pill and empty placeholder.
-        Element voiceIndicator;
-        if (recording)
-        {
-            var audioLevel = Props.VoiceAudioLevel;
-            var accentBrush = (Brush)Microsoft.UI.Xaml.Application.Current.Resources["AccentFillColorDefaultBrush"];
-
-            // Red recording dot
-            var recDot = Border(Empty())
-                .Set(b =>
-                {
-                    b.Width = 6;
-                    b.Height = 6;
-                    b.CornerRadius = new CornerRadius(3);
-                    b.Background = new SolidColorBrush(Microsoft.UI.Colors.Red);
-                    b.Opacity = 0.5 + Math.Min(audioLevel, 1f) * 0.5;
-                    b.VerticalAlignment = VerticalAlignment.Center;
-                });
-
-            // "Recording" label
-            var recLabel = TextBlock("Recording")
-                .Set(t =>
-                {
-                    t.FontSize = 11;
-                    t.Foreground = accentBrush;
-                    t.VerticalAlignment = VerticalAlignment.Center;
-                });
-
-            // Mini waveform bars (16 bars for a fuller waveform)
-            var miniBarCount = 16;
-            var miniBarElements = new Element[miniBarCount];
-            for (int bi = 0; bi < miniBarCount; bi++)
-            {
-                var barPhase = (bi % 3 == 0) ? 0.7 : (bi % 3 == 1) ? 1.0 : 0.5;
-                var barHeight = 2.0 + Math.Min(audioLevel * barPhase, 1.0) * 8.0;
-                miniBarElements[bi] = Border(Empty())
-                    .Set(b =>
-                    {
-                        b.Width = 2;
-                        b.Height = barHeight;
-                        b.CornerRadius = new CornerRadius(1);
-                        b.Background = accentBrush;
-                        b.Opacity = 0.5 + Math.Min(audioLevel, 1f) * 0.5;
-                        b.VerticalAlignment = VerticalAlignment.Center;
-                    });
-            }
-            var miniWave = (FlexRow(miniBarElements) with { ColumnGap = 1.5 })
-                .VAlign(VerticalAlignment.Center);
-
-            // Pill container with accent tint background and border
-            voiceIndicator = Border(
-                (FlexRow(recDot, recLabel, miniWave) with { ColumnGap = 8 })
-                    .VAlign(VerticalAlignment.Center)
-            ).Set(b =>
-            {
-                b.Padding = new Thickness(10, 5, 12, 5);
-                b.CornerRadius = new CornerRadius(14);
-                b.Background = accentBrush;
-                b.Opacity = 1.0;
-                // Use a low-opacity accent background
-                if (accentBrush is SolidColorBrush scb)
-                {
-                    b.Background = new SolidColorBrush(scb.Color) { Opacity = 0.1 };
-                    b.BorderBrush = new SolidColorBrush(scb.Color) { Opacity = 0.3 };
-                }
-                b.BorderThickness = new Thickness(1);
-            }).Margin(4, 0, 4, 0)
-              .HAlign(HorizontalAlignment.Left);
-            voiceIndicator.Key = "voice-pill";
-        }
-        else
-        {
-            voiceIndicator = Border(Empty()).Set(b =>
-            {
-                b.Padding = new Thickness(0);
-                b.Margin = new Thickness(0);
-                b.Height = 0;
-                b.Opacity = 0;
-            });
-            voiceIndicator.Key = "voice-pill-hidden";
-        }
-
-        Element IconButton(string glyph, string tip, Action onClick, Brush? foreground = null)
-            => Button(
-                TextBlock(glyph)
-                    .Set(t =>
-                    {
-                        t.FontFamily = FluentIconCatalog.SymbolThemeFontFamily;
-                        t.FontSize = composerIconSize;
-                        // Always set foreground explicitly so element diffing resets it.
-                        t.Foreground = foreground
-                            ?? (Brush)Microsoft.UI.Xaml.Application.Current.Resources["TextFillColorPrimaryBrush"];
-                    }),
-                onClick)
-            .Set(b =>
-            {
-                b.Padding = new Thickness(8, 4, 8, 4);
-                b.MinWidth = 32; b.MinHeight = 28;
-                b.CornerRadius = composerCornerRadius;
-            })
-            .Resources(r => r
-                .Set("ButtonBackground", new SolidColorBrush(Colors.Transparent))
-                .Set("ButtonBackgroundPointerOver", Ref("SubtleFillColorSecondaryBrush"))
-                .Set("ButtonBackgroundPressed", Ref("SubtleFillColorTertiaryBrush"))
-                .Set("ButtonBorderBrush", new SolidColorBrush(Colors.Transparent))
-                .Set("ButtonBorderBrushPointerOver", new SolidColorBrush(Colors.Transparent))
-                .Set("ButtonBorderBrushPressed", new SolidColorBrush(Colors.Transparent)))
-            .AutomationName(tip)
-            .SetToolTip(tip);
-
-        var attachBtn = IconButton("\uE723", LocalizationHelper.GetString("Chat_Composer_Tooltip_Attach"), () =>
-        {
-            Props.OnAttachClick?.Invoke();
-        });
-
-        // Voice recording: three-button model
-        // - Not recording: mic button starts recording
-        // - Recording: mic button becomes stop (■, keeps transcript),
-        //   plus a cancel (✕) button that discards
-        Element voiceBtn = Empty();
-        Element voiceCancelBtn = Empty();
-        if (isRecording.Value)
-        {
-            // Stop button — ends recording and keeps the transcript
-            voiceBtn = IconButton("\uE15B", "Stop recording", () =>
-            {
-                voiceStoppedRef.Current = true;
-                voiceCtsRef.Current?.Cancel();
-            }, foreground: new SolidColorBrush(Microsoft.UI.Colors.Red));
-
-            // Cancel button — discards recording entirely
-            voiceCancelBtn = IconButton("\uE711", "Cancel recording", () =>
-            {
-                voiceStoppedRef.Current = false;
-                voiceCtsRef.Current?.Cancel();
-            });
-        }
-        else
-        {
-            voiceBtn = IconButton(
-                "\uE720",
-                LocalizationHelper.GetString("Chat_Composer_Tooltip_Voice"),
-                startVoiceRecording);
-        }
-        var speakerBtn = Props.OnSpeakerToggle is not null
-            ? IconButton(
-                Props.IsSpeakerMuted ? "\uE74F" : "\uE767",  // SpeakerMute : Speaker
-                Props.IsSpeakerMuted ? "Unmute" : "Mute",
-                () => Props.OnSpeakerToggle())
-            : Empty();
-        // Toggle tool-call visibility. Same wrench icon in both states;
-        // reduced opacity when tool calls are hidden to indicate "off"
-        // without looking disabled. Tooltip clarifies the action.
-        var showTools = Props.ShowToolCalls;
-        var toolToggleBtn = IconButton(
-            "\uE90F",  // Wrench
-            showTools ? "Hide tool calls & usage" : "Show tool calls & usage",
-            () => Props.OnShowToolCallsChanged?.Invoke(!Props.ShowToolCalls))
-            .Set(b => b.Opacity = showTools ? 1.0 : 0.55);
-
-        // Send button — always present so the user can queue follow-up messages
-        // even while the assistant is responding.
-        var sendBrush = (Brush)Microsoft.UI.Xaml.Application.Current.Resources["AccentFillColorDefaultBrush"];
-        const string sendGlyph = "\uE724";
-        const string stopGlyph = "\uE71A";
-
-        var hasText = hasTextState.Value || Props.PendingAttachment is not null;
-        var sendTooltip = LocalizationHelper.GetString("Chat_Composer_Tooltip_Send");
-        var glyphBrush = hasText
-            ? (Brush)new SolidColorBrush(Colors.White)
-            : (Brush)Microsoft.UI.Xaml.Application.Current.Resources["TextFillColorSecondaryBrush"];
-        var actionBtn = Button(
-            TextBlock(sendGlyph)
-                .Set(t =>
-                {
-                    t.FontFamily = FluentIconCatalog.SymbolThemeFontFamily;
-                    t.FontSize = composerIconSize;
-                })
-                .Foreground(glyphBrush),
-            sendAction
-        ).Set(b =>
-        {
-            b.Padding = new Thickness(10, 4, 10, 4);
-            b.MinWidth = sendButtonSize + 4; b.MinHeight = sendButtonSize - 4;
-            b.CornerRadius = composerCornerRadius;
-            b.IsEnabled = isConnected;
-            b.Background = hasText ? sendBrush : new SolidColorBrush(Colors.Transparent);
-        })
-        .Resources(r =>
-        {
-            if (hasText)
-            {
-                r.Set("ButtonBackgroundPointerOver", Ref("AccentFillColorSecondaryBrush"));
-                r.Set("ButtonBackgroundPressed",    Ref("AccentFillColorTertiaryBrush"));
-                r.Set("ButtonBorderBrush",            new SolidColorBrush(Colors.Transparent));
-                r.Set("ButtonBorderBrushPointerOver", new SolidColorBrush(Colors.Transparent));
-                r.Set("ButtonBorderBrushPressed",     new SolidColorBrush(Colors.Transparent));
-            }
-            else
-            {
-                r.Set("ButtonBackground",             new SolidColorBrush(Colors.Transparent));
-                r.Set("ButtonBackgroundPointerOver",  Ref("SubtleFillColorSecondaryBrush"));
-                r.Set("ButtonBackgroundPressed",      Ref("SubtleFillColorTertiaryBrush"));
-                r.Set("ButtonBorderBrush",            new SolidColorBrush(Colors.Transparent));
-                r.Set("ButtonBorderBrushPointerOver", new SolidColorBrush(Colors.Transparent));
-                r.Set("ButtonBorderBrushPressed",     new SolidColorBrush(Colors.Transparent));
-            }
-        })
-        .AutomationName(sendTooltip)
-        .SetToolTip(sendTooltip);
-
-        // Stop button — shown inline NEXT TO the send button (to its right)
-        // when the assistant is responding, matching the gateway web UI pattern.
-        Element stopBtn = Empty();
-        if (Props.TurnActive)
-        {
-            var stopTooltip = LocalizationHelper.GetString("Chat_Composer_Tooltip_Stop");
-            stopBtn = Button(
-                TextBlock(stopGlyph)
-                    .Set(t =>
-                    {
-                        t.FontFamily = FluentIconCatalog.SymbolThemeFontFamily;
-                        t.FontSize = composerIconSize;
-                    })
-                    .Foreground(new SolidColorBrush(Colors.White)),
-                Props.OnStop
-            ).Set(b =>
-            {
-                b.Padding = new Thickness(10, 4, 10, 4);
-                b.MinWidth = sendButtonSize + 4; b.MinHeight = sendButtonSize - 4;
-                b.CornerRadius = composerCornerRadius;
-                b.Background = (Brush)Microsoft.UI.Xaml.Application.Current.Resources["SystemFillColorCriticalBrush"];
-            })
-            .Resources(r =>
-            {
-                r.Set("ButtonBackgroundPointerOver", Ref("SystemFillColorCriticalBrush"));
-                r.Set("ButtonBackgroundPressed", Ref("SystemFillColorCriticalBrush"));
-                r.Set("ButtonBorderBrush", new SolidColorBrush(Colors.Transparent));
-                r.Set("ButtonBorderBrushPointerOver", new SolidColorBrush(Colors.Transparent));
-                r.Set("ButtonBorderBrushPressed", new SolidColorBrush(Colors.Transparent));
-            })
-            .AutomationName(stopTooltip)
-            .SetToolTip(stopTooltip);
-        }
-
-        Element workingBanner = Empty();
-
-        // Permission/exec-approval banner used to live here, pinned above
-        // the composer. It now renders inline in the timeline as a
-        // ChatTimelineItemKind.PermissionRequest entry so the conversation
-        // history records every approval (and its decided/expired badge)
-        // in chronological order. See OpenClawChatTimeline.RenderPermissionEntry.
-
-        var actionsRow = Grid([GridSize.Star(), GridSize.Auto], [GridSize.Auto],
-            Empty().Grid(row: 0, column: 0),
-            (FlexRow(attachBtn, voiceCancelBtn, voiceBtn, speakerBtn, toolToggleBtn, actionBtn, stopBtn)
-                with { ColumnGap = 4 })
-            .HAlign(HorizontalAlignment.Right)
-            .Grid(row: 0, column: 1)
-        );
-
-        // ── Optional working banner above the composer ──
-        Element workingBanner2 = workingBanner;
-
-        return VStack(0,
-            workingBanner2,
-            Border(
-                VStack(8, dropdownsRow, composerInput, voiceIndicator, actionsRow.Margin(0, -8, 0, -4))
-            ).Padding(16, 12, 16, 12)
-             .Set(b =>
-             {
-                 // Top divider only — mirrors Kenny's ChatShell ComposerBorder.
-                 b.BorderThickness = new Thickness(0, 1, 0, 0);
-                 b.BorderBrush = (Brush)Microsoft.UI.Xaml.Application.Current.Resources["SurfaceStrokeColorDefaultBrush"];
-             })
-        );
-    }
-
-    /// <summary>
-    /// Synchronously builds a <see cref="Microsoft.UI.Xaml.Media.Imaging.BitmapImage"/>
-    /// from a base64-encoded image payload (PNG/JPEG/etc.). Returns
-    /// <c>null</c> if the base64 string can't be decoded or the bitmap can't
-    /// be initialized — callers should fall back to a glyph in that case.
-    /// </summary>
-    private static Microsoft.UI.Xaml.Media.Imaging.BitmapImage? TryCreateBitmapFromBase64(string base64)
-    {
-        try
-        {
-            var bytes = Convert.FromBase64String(base64);
-            var stream = new global::Windows.Storage.Streams.InMemoryRandomAccessStream();
-            using (var writer = new global::Windows.Storage.Streams.DataWriter(stream))
-            {
-                writer.WriteBytes(bytes);
-                writer.StoreAsync().AsTask().GetAwaiter().GetResult();
-                writer.DetachStream();
-            }
-            stream.Seek(0);
-            var bmp = new Microsoft.UI.Xaml.Media.Imaging.BitmapImage();
-            bmp.SetSource(stream);
-            return bmp;
-        }
-        catch
-        {
-            return null;
-        }
-    }
-
-    /// <summary>
-    /// If the clipboard contains a bitmap, reads it, re-encodes as PNG, and
-    /// returns a <see cref="ChatAttachment"/>. Returns <c>null</c> if no
-    /// bitmap is present or the bitmap exceeds <see cref="ChatAttachment.MaxSizeBytes"/>.
-    /// </summary>
-    private static async Task<ChatAttachment?> TryReadImageFromClipboardAsync()
-    {
-        var content = global::Windows.ApplicationModel.DataTransfer.Clipboard.GetContent();
-        if (content is null) return null;
-        if (!content.Contains(global::Windows.ApplicationModel.DataTransfer.StandardDataFormats.Bitmap))
-            return null;
-
-        var streamRef = await content.GetBitmapAsync();
-        using var inStream = await streamRef.OpenReadAsync();
-
-        // Decode then re-encode as PNG so the gateway always receives a
-        // self-describing image (clipboard bitmaps on Windows are often raw
-        // CF_DIB and lack a recognizable container).
-        var decoder = await global::Windows.Graphics.Imaging.BitmapDecoder.CreateAsync(inStream);
-        var softwareBitmap = await decoder.GetSoftwareBitmapAsync();
-
-        var outStream = new global::Windows.Storage.Streams.InMemoryRandomAccessStream();
-        var encoder = await global::Windows.Graphics.Imaging.BitmapEncoder.CreateAsync(
-            global::Windows.Graphics.Imaging.BitmapEncoder.PngEncoderId, outStream);
-        encoder.SetSoftwareBitmap(softwareBitmap);
-        await encoder.FlushAsync();
-
-        var size = (long)outStream.Size;
-        if (size > ChatAttachment.MaxSizeBytes)
-            return null;
-
-        outStream.Seek(0);
-        var buffer = new byte[size];
-        using (var reader = new global::Windows.Storage.Streams.DataReader(outStream.GetInputStreamAt(0)))
-        {
-            await reader.LoadAsync((uint)size);
-            reader.ReadBytes(buffer);
-        }
-
-        // Use a timestamp filename — clipboard bitmaps have no original name.
-        var fileName = $"pasted-image-{DateTime.Now:yyyyMMdd-HHmmss}.png";
-        return new ChatAttachment
-        {
-            Type = "image",
-            MimeType = "image/png",
-            FileName = fileName,
-            Content = Convert.ToBase64String(buffer),
-            SizeBytes = size
-        };
-    }
-}
diff --git a/src/OpenClaw.Tray.WinUI/CliUninstallHandler.cs b/src/OpenClaw.Tray.WinUI/CliUninstallHandler.cs
index def75d44e..7de2af536 100644
--- a/src/OpenClaw.Tray.WinUI/CliUninstallHandler.cs
+++ b/src/OpenClaw.Tray.WinUI/CliUninstallHandler.cs
@@ -1,4 +1,5 @@
 using System.Runtime.InteropServices;
+using System.Globalization;
 
 namespace OpenClawTray;
 
@@ -40,6 +41,14 @@ public static async Task RunAsync(string[] args)
 
         // Build CLI arguments for SetupEngine
         var setupArgs = new List<string> { "--headless", "--uninstall" };
+        setupArgs.AddRange([
+            "--data-dir", AppIdentity.ResolveRoamingDataDirectory(),
+            "--local-data-dir", AppIdentity.ResolveSetupLocalDataDirectory(),
+            "--distro-name", AppIdentity.SetupDistroName,
+            "--gateway-port", AppIdentity.SetupGatewayPort.ToString(CultureInfo.InvariantCulture),
+            "--autostart-name", AppIdentity.AutoStartRegistryName,
+            "--startup-task-name", AppIdentity.StartupTaskName,
+        ]);
         if (confirmDestructive) setupArgs.Add("--confirm-destructive");
         if (dryRun) setupArgs.Add("--dry-run");
         if (jsonOutputPath != null)
diff --git a/src/OpenClaw.Tray.WinUI/Controls/BrandMark.xaml b/src/OpenClaw.Tray.WinUI/Controls/BrandMark.xaml
new file mode 100644
index 000000000..bb7b07b10
--- /dev/null
+++ b/src/OpenClaw.Tray.WinUI/Controls/BrandMark.xaml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<UserControl
+    x:Class="OpenClawTray.Controls.BrandMark"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    AutomationProperties.AccessibilityView="Raw"
+    IsHitTestVisible="False"
+    IsTabStop="False">
+
+    <Image x:Name="MarkImage"
+           Stretch="Uniform"
+           AutomationProperties.AccessibilityView="Raw"/>
+</UserControl>
diff --git a/src/OpenClaw.Tray.WinUI/Controls/BrandMark.xaml.cs b/src/OpenClaw.Tray.WinUI/Controls/BrandMark.xaml.cs
new file mode 100644
index 000000000..dc8d2b2a9
--- /dev/null
+++ b/src/OpenClaw.Tray.WinUI/Controls/BrandMark.xaml.cs
@@ -0,0 +1,47 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using OpenClawTray.Helpers;
+
+namespace OpenClawTray.Controls;
+
+public sealed partial class BrandMark : UserControl
+{
+    private const double DefaultMarkSize = 20d;
+
+    public static readonly DependencyProperty MarkSizeProperty =
+        DependencyProperty.Register(
+            nameof(MarkSize),
+            typeof(double),
+            typeof(BrandMark),
+            new PropertyMetadata(DefaultMarkSize, OnMarkSizeChanged));
+
+    public BrandMark()
+    {
+        InitializeComponent();
+        MarkImage.Source = BrandAssets.CreateRedBotMarkSource();
+        ApplySize(MarkSize);
+    }
+
+    public double MarkSize
+    {
+        get => (double)GetValue(MarkSizeProperty);
+        set => SetValue(MarkSizeProperty, value);
+    }
+
+    private static void OnMarkSizeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is BrandMark mark && e.NewValue is double size)
+            mark.ApplySize(size);
+    }
+
+    private void ApplySize(double size)
+    {
+        if (!double.IsFinite(size) || size < 0)
+            size = DefaultMarkSize;
+
+        Width = size;
+        Height = size;
+        MarkImage.Width = size;
+        MarkImage.Height = size;
+    }
+}
diff --git a/src/OpenClaw.Tray.WinUI/Dialogs/PairingApprovalDialog.cs b/src/OpenClaw.Tray.WinUI/Dialogs/PairingApprovalDialog.cs
new file mode 100644
index 000000000..a864a1d2b
--- /dev/null
+++ b/src/OpenClaw.Tray.WinUI/Dialogs/PairingApprovalDialog.cs
@@ -0,0 +1,466 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media;
+using OpenClaw.Connection;
+using OpenClaw.Shared;
+using OpenClawTray.Controls;
+using OpenClawTray.Helpers;
+using OpenClawTray.Services;
+using System;
+using System.Runtime.InteropServices;
+using WinUIEx;
+
+namespace OpenClawTray.Dialogs;
+
+/// <summary>
+/// Focused approval surface for inbound pairing requests (devices / nodes asking to join the
+/// gateway). Presents one request at a time with full identity + the operator scopes being
+/// granted, mirroring the macOS pairing prompt. Acts on the live <see cref="PairingApprovalCoordinator"/>
+/// and advances through the queue as decisions are made or requests are resolved elsewhere.
+///
+/// Security posture: Approve is never the default-focused button and stays disabled for a short
+/// delay after a request appears so the dialog cannot be "click-through" approved by a stray
+/// keypress/click. Reject and "Decide later" are always available.
+/// </summary>
+public sealed class PairingApprovalDialog : WindowEx
+{
+    [DllImport("user32.dll")]
+    private static extern bool SetForegroundWindow(IntPtr hWnd);
+
+    [DllImport("user32.dll")]
+    private static extern bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int X, int Y, int cx, int cy, uint uFlags);
+
+    private static readonly IntPtr HWND_TOPMOST = new(-1);
+    private static readonly IntPtr HWND_NOTOPMOST = new(-2);
+    private const uint SWP_NOMOVE = 0x0002;
+    private const uint SWP_NOSIZE = 0x0001;
+
+    private static readonly TimeSpan ApproveArmDelay = TimeSpan.FromMilliseconds(1500);
+
+    private readonly PairingApprovalCoordinator _coordinator;
+    private readonly StackPanel _bodyPanel;
+    private readonly TextBlock _headingText;
+    private readonly TextBlock _queueChip;
+    private readonly Button _approveButton;
+    private readonly Button _rejectButton;
+    private readonly Button _laterButton;
+
+    private DispatcherTimer? _armTimer;
+    private string? _currentKey;
+    private bool _busy;
+
+    public bool IsClosed { get; private set; }
+
+    public PairingApprovalDialog(PairingApprovalCoordinator coordinator)
+    {
+        _coordinator = coordinator ?? throw new ArgumentNullException(nameof(coordinator));
+
+        Title = LocalizationHelper.GetString("PairingApproval_WindowTitle");
+        this.SetWindowSize(460, 460);
+        this.CenterOnScreen();
+        this.SetIcon("Assets\\openclaw.ico");
+        SystemBackdrop = new MicaBackdrop();
+        ExtendsContentIntoTitleBar = true;
+
+        // ── Custom title bar ──
+        var titleBar = new Grid { Height = 48, Padding = new Thickness(16, 0, 140, 0) };
+        titleBar.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
+        titleBar.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
+        var titleIcon = new BrandMark { MarkSize = 16, VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(0, 0, 8, 0) };
+        Grid.SetColumn(titleIcon, 0);
+        titleBar.Children.Add(titleIcon);
+        var titleText = new TextBlock
+        {
+            Text = LocalizationHelper.GetString("PairingApproval_WindowTitle"),
+            FontSize = 13,
+            VerticalAlignment = VerticalAlignment.Center,
+            Style = (Style)Application.Current.Resources["CaptionTextBlockStyle"],
+        };
+        Grid.SetColumn(titleText, 1);
+        titleBar.Children.Add(titleText);
+        SetTitleBar(titleBar);
+
+        // ── Layout: [title][header][scrollable body][buttons] ──
+        var outerGrid = new Grid();
+        outerGrid.RowDefinitions.Add(new RowDefinition { Height = new GridLength(48) });
+        outerGrid.RowDefinitions.Add(new RowDefinition { Height = new GridLength(1, GridUnitType.Star) });
+        Grid.SetRow(titleBar, 0);
+        outerGrid.Children.Add(titleBar);
+
+        var root = new Grid { Padding = new Thickness(28, 8, 28, 24), RowSpacing = 14 };
+        root.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto }); // header
+        root.RowDefinitions.Add(new RowDefinition { Height = new GridLength(1, GridUnitType.Star) }); // body
+        root.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto }); // buttons
+
+        // Header: shield glyph + heading + queue chip
+        var header = new Grid { ColumnSpacing = 12 };
+        header.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
+        header.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
+        header.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
+
+        var shield = new FontIcon
+        {
+            Glyph = "\uE72E", // shield
+            FontSize = 28,
+            Foreground = ResolveBrush("SystemFillColorCautionBrush"),
+            VerticalAlignment = VerticalAlignment.Center,
+        };
+        Grid.SetColumn(shield, 0);
+        header.Children.Add(shield);
+
+        _headingText = new TextBlock
+        {
+            Style = (Style)Application.Current.Resources["SubtitleTextBlockStyle"],
+            VerticalAlignment = VerticalAlignment.Center,
+            TextWrapping = TextWrapping.Wrap,
+        };
+        Grid.SetColumn(_headingText, 1);
+        header.Children.Add(_headingText);
+
+        _queueChip = new TextBlock
+        {
+            Style = (Style)Application.Current.Resources["CaptionTextBlockStyle"],
+            Foreground = ResolveBrush("TextFillColorSecondaryBrush"),
+            VerticalAlignment = VerticalAlignment.Center,
+            Visibility = Visibility.Collapsed,
+        };
+        Grid.SetColumn(_queueChip, 2);
+        header.Children.Add(_queueChip);
+
+        Grid.SetRow(header, 0);
+        root.Children.Add(header);
+
+        // Body (scrollable detail card)
+        _bodyPanel = new StackPanel { Spacing = 12 };
+        var scroll = new ScrollViewer
+        {
+            Content = _bodyPanel,
+            VerticalScrollBarVisibility = ScrollBarVisibility.Auto,
+            HorizontalScrollBarVisibility = ScrollBarVisibility.Disabled,
+        };
+        Grid.SetRow(scroll, 1);
+        root.Children.Add(scroll);
+
+        // Buttons: [Reject] [Decide later] ............ [Approve]
+        var buttonGrid = new Grid { ColumnSpacing = 8 };
+        buttonGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
+        buttonGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
+        buttonGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
+        buttonGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
+
+        _rejectButton = new Button { Content = BuildButtonContent("\uE711", "SystemFillColorCriticalBrush", LocalizationHelper.GetString("PairingApproval_Reject")) };
+        Microsoft.UI.Xaml.Automation.AutomationProperties.SetAutomationId(_rejectButton, "PairingRejectAction");
+        _rejectButton.Click += async (_, _) => await DecideAsync(approve: false);
+        Grid.SetColumn(_rejectButton, 0);
+        buttonGrid.Children.Add(_rejectButton);
+
+        _laterButton = new Button { Content = LocalizationHelper.GetString("PairingApproval_Later") };
+        Microsoft.UI.Xaml.Automation.AutomationProperties.SetAutomationId(_laterButton, "PairingLaterAction");
+        _laterButton.Click += (_, _) => Close(); // dismiss without deciding; request stays pending
+        Grid.SetColumn(_laterButton, 1);
+        buttonGrid.Children.Add(_laterButton);
+
+        _approveButton = new Button
+        {
+            Content = BuildButtonContent("\uE73E", null, LocalizationHelper.GetString("PairingApproval_Approve")),
+            Style = (Style)Application.Current.Resources["AccentButtonStyle"],
+        };
+        Microsoft.UI.Xaml.Automation.AutomationProperties.SetAutomationId(_approveButton, "PairingApproveAction");
+        _approveButton.Click += async (_, _) => await DecideAsync(approve: true);
+        Grid.SetColumn(_approveButton, 3);
+        buttonGrid.Children.Add(_approveButton);
+
+        Grid.SetRow(buttonGrid, 2);
+        root.Children.Add(buttonGrid);
+
+        Grid.SetRow(root, 1);
+        outerGrid.Children.Add(root);
+        Content = outerGrid;
+
+        _coordinator.ApprovalsChanged += OnApprovalsChanged;
+        Closed += OnWindowClosed;
+
+        Render();
+    }
+
+    /// <summary>Activates the dialog and forces it to the foreground (it may open from a background event).</summary>
+    public void ShowForeground()
+    {
+        Activate();
+        try
+        {
+            var hwnd = WinRT.Interop.WindowNative.GetWindowHandle(this);
+            if (hwnd != IntPtr.Zero)
+            {
+                SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
+                SetWindowPos(hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
+                SetForegroundWindow(hwnd);
+            }
+        }
+        catch { /* best-effort */ }
+    }
+
+    private void OnApprovalsChanged(object? sender, EventArgs e)
+    {
+        if (IsClosed) return;
+        if (DispatcherQueue.HasThreadAccess) Render();
+        else DispatcherQueue.TryEnqueue(Render);
+    }
+
+    private void Render()
+    {
+        if (IsClosed) return;
+
+        var current = _coordinator.Current;
+        if (current.Count == 0)
+        {
+            // Nothing left to decide — close.
+            Close();
+            return;
+        }
+
+        var approval = current[0];
+        var keyChanged = !string.Equals(_currentKey, approval.Key, StringComparison.Ordinal);
+
+        // The queue chip always reflects the latest count, even when the
+        // front-of-queue request is unchanged.
+        if (current.Count > 1)
+        {
+            _queueChip.Text = string.Format(LocalizationHelper.GetString("PairingApproval_MoreWaiting"), current.Count - 1);
+            _queueChip.Visibility = Visibility.Visible;
+        }
+        else
+        {
+            _queueChip.Visibility = Visibility.Collapsed;
+        }
+
+        // If the request at the front of the queue hasn't changed (an unrelated
+        // list refresh arrived), do NOT rebuild the card, reset the in-flight
+        // decision guard, or re-arm the approve delay — that would let a second
+        // click through while a decision is still in flight for this same request.
+        if (!keyChanged)
+            return;
+
+        _currentKey = approval.Key;
+        _headingText.Text = LocalizationHelper.GetString(
+            approval.Kind == PairingApprovalKind.NodePair ? "PairingApproval_NodeHeading" : "PairingApproval_DeviceHeading");
+
+        // Kind-aware approve label ("Approve device" / "Approve node") to reinforce intent.
+        _approveButton.Content = BuildButtonContent(
+            "\uE73E",
+            null,
+            LocalizationHelper.GetString(approval.Kind == PairingApprovalKind.NodePair
+                ? "PairingApproval_ApproveNode"
+                : "PairingApproval_ApproveDevice"));
+
+        _bodyPanel.Children.Clear();
+        _bodyPanel.Children.Add(BuildDetailCard(approval));
+
+        // Fresh request — reset interaction state and re-arm the approve guard.
+        _busy = false;
+        _rejectButton.IsEnabled = true;
+        _laterButton.IsEnabled = true;
+        ArmApproveGuard();
+    }
+
+    private Border BuildDetailCard(PendingApproval approval)
+    {
+        var card = new Border
+        {
+            Background = ResolveBrush("CardBackgroundFillColorDefaultBrush"),
+            BorderBrush = ResolveBrush("CardStrokeColorDefaultBrush"),
+            BorderThickness = new Thickness(1),
+            CornerRadius = new CornerRadius(8),
+            Padding = new Thickness(16),
+        };
+        var stack = new StackPanel { Spacing = 10 };
+
+        var name = string.IsNullOrWhiteSpace(approval.DisplayName)
+            ? (string.IsNullOrEmpty(approval.DeviceId)
+                ? LocalizationHelper.GetString("PairingApproval_UnknownDevice")
+                : approval.DeviceId)
+            : approval.DisplayName!;
+
+        stack.Children.Add(new TextBlock
+        {
+            Text = name,
+            Style = (Style)Application.Current.Resources["BodyStrongTextBlockStyle"],
+            TextWrapping = TextWrapping.Wrap,
+        });
+
+        var detailParts = new System.Collections.Generic.List<string>
+        {
+            string.IsNullOrWhiteSpace(approval.Platform)
+                ? LocalizationHelper.GetString("PairingApproval_UnknownPlatform")
+                : approval.Platform!,
+        };
+        if (!string.IsNullOrWhiteSpace(approval.Role)) detailParts.Add(approval.Role!);
+        if (!string.IsNullOrWhiteSpace(approval.Version)) detailParts.Add($"v{approval.Version}");
+        stack.Children.Add(new TextBlock
+        {
+            Text = string.Join("  ·  ", detailParts),
+            Style = (Style)Application.Current.Resources["CaptionTextBlockStyle"],
+            Foreground = ResolveBrush("TextFillColorSecondaryBrush"),
+            TextWrapping = TextWrapping.Wrap,
+        });
+
+        // Friendly scope list (device requests only).
+        if (approval.Scopes.Count > 0)
+        {
+            stack.Children.Add(new TextBlock
+            {
+                Text = LocalizationHelper.GetString("PairingApproval_AccessRequested"),
+                Style = (Style)Application.Current.Resources["CaptionTextBlockStyle"],
+                Foreground = ResolveBrush("TextFillColorSecondaryBrush"),
+                Margin = new Thickness(0, 4, 0, 0),
+            });
+            foreach (var label in PairingScopeDescriptions.DescribeAll(approval.Scopes))
+            {
+                var row = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 8 };
+                row.Children.Add(new FontIcon
+                {
+                    Glyph = "\uE73E",
+                    FontSize = 12,
+                    Foreground = ResolveBrush("TextFillColorSecondaryBrush"),
+                    VerticalAlignment = VerticalAlignment.Center,
+                });
+                row.Children.Add(new TextBlock { Text = label, TextWrapping = TextWrapping.Wrap, VerticalAlignment = VerticalAlignment.Center });
+                stack.Children.Add(row);
+            }
+        }
+
+        // Repair badge.
+        if (approval.IsRepair)
+        {
+            stack.Children.Add(new TextBlock
+            {
+                Text = LocalizationHelper.GetString("PairingApproval_RepairBadge"),
+                Style = (Style)Application.Current.Resources["CaptionTextBlockStyle"],
+                Foreground = ResolveBrush("SystemFillColorCautionBrush"),
+                TextWrapping = TextWrapping.Wrap,
+                Margin = new Thickness(0, 4, 0, 0),
+            });
+        }
+
+        // Footer: truncated id · ip (monospace, tertiary).
+        var footerParts = new System.Collections.Generic.List<string>();
+        if (!string.IsNullOrEmpty(approval.DeviceId))
+            footerParts.Add($"ID {TruncateId(approval.DeviceId)}");
+        if (!string.IsNullOrWhiteSpace(approval.RemoteIp))
+            footerParts.Add($"IP {approval.RemoteIp}");
+        if (footerParts.Count > 0)
+        {
+            stack.Children.Add(new TextBlock
+            {
+                Text = string.Join("  ·  ", footerParts),
+                Style = (Style)Application.Current.Resources["CaptionTextBlockStyle"],
+                Foreground = ResolveBrush("TextFillColorTertiaryBrush"),
+                FontFamily = new FontFamily("Consolas"),
+                TextWrapping = TextWrapping.Wrap,
+                Margin = new Thickness(0, 6, 0, 0),
+            });
+        }
+
+        // Reassurance line.
+        stack.Children.Add(new TextBlock
+        {
+            Text = LocalizationHelper.GetString("PairingApproval_Subtitle"),
+            Style = (Style)Application.Current.Resources["CaptionTextBlockStyle"],
+            Foreground = ResolveBrush("TextFillColorSecondaryBrush"),
+            TextWrapping = TextWrapping.Wrap,
+            Margin = new Thickness(0, 8, 0, 0),
+        });
+
+        card.Child = stack;
+        return card;
+    }
+
+    private void ArmApproveGuard()
+    {
+        _armTimer?.Stop();
+        _approveButton.IsEnabled = false;
+        ToolTipService.SetToolTip(_approveButton, LocalizationHelper.GetString("PairingApproval_ApproveHint"));
+        _armTimer = new DispatcherTimer { Interval = ApproveArmDelay };
+        _armTimer.Tick += (_, _) =>
+        {
+            _armTimer?.Stop();
+            if (!_busy)
+            {
+                _approveButton.IsEnabled = true;
+                ToolTipService.SetToolTip(_approveButton, null);
+            }
+        };
+        _armTimer.Start();
+    }
+
+    private async System.Threading.Tasks.Task DecideAsync(bool approve)
+    {
+        if (_busy || _currentKey == null) return;
+        var decisionKey = _currentKey;
+        _busy = true;
+        _approveButton.IsEnabled = false;
+        _rejectButton.IsEnabled = false;
+        _laterButton.IsEnabled = false;
+
+        bool ok;
+        try
+        {
+            // Success drives a coordinator ApprovalsChanged -> Render() which advances or closes.
+            ok = approve
+                ? await _coordinator.ApproveAsync(decisionKey)
+                : await _coordinator.RejectAsync(decisionKey);
+        }
+        catch
+        {
+            ok = false;
+        }
+
+        // The window may have closed (disconnect -> Reset -> Close) or the queue may have advanced
+        // to a different request while the RPC was in flight. Only touch UI if we're still on a live
+        // window showing the same request — otherwise this stale continuation must not mutate state.
+        if (IsClosed || !string.Equals(_currentKey, decisionKey, StringComparison.Ordinal))
+            return;
+
+        if (!ok)
+        {
+            // Re-enable the secondary actions and RE-ARM the approve guard (don't force-enable
+            // Approve — that would defeat the anti-clickthrough delay on the retry).
+            _busy = false;
+            _rejectButton.IsEnabled = true;
+            _laterButton.IsEnabled = true;
+            ArmApproveGuard();
+        }
+        // On success, leave buttons disabled; the pending ApprovalsChanged -> Render() will advance
+        // to the next request (re-enabling) or close the dialog.
+    }
+
+    private void OnWindowClosed(object sender, WindowEventArgs args)
+    {
+        IsClosed = true;
+        _armTimer?.Stop();
+        _coordinator.ApprovalsChanged -= OnApprovalsChanged;
+        Closed -= OnWindowClosed;
+    }
+
+    private static StackPanel BuildButtonContent(string glyph, string? glyphBrushKey, string label)
+    {
+        var stack = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 6, VerticalAlignment = VerticalAlignment.Center };
+        var icon = new FontIcon { Glyph = glyph, FontSize = 14, VerticalAlignment = VerticalAlignment.Center };
+        if (glyphBrushKey != null)
+            icon.Foreground = ResolveBrush(glyphBrushKey);
+        stack.Children.Add(icon);
+        stack.Children.Add(new TextBlock { Text = label, VerticalAlignment = VerticalAlignment.Center });
+        return stack;
+    }
+
+    private static string TruncateId(string id)
+    {
+        if (string.IsNullOrEmpty(id) || id.Length <= 20) return id;
+        return $"{id[..8]}…{id[^7..]}";
+    }
+
+    private static Brush ResolveBrush(string themeKey) =>
+        Application.Current.Resources.TryGetValue(themeKey, out var value) && value is Brush brush
+            ? brush
+            : new SolidColorBrush(Microsoft.UI.Colors.Transparent);
+}
diff --git a/src/OpenClaw.Tray.WinUI/Dialogs/RecordingConsentDialog.cs b/src/OpenClaw.Tray.WinUI/Dialogs/RecordingConsentDialog.cs
index db2bdc7e2..28f80d9b5 100644
--- a/src/OpenClaw.Tray.WinUI/Dialogs/RecordingConsentDialog.cs
+++ b/src/OpenClaw.Tray.WinUI/Dialogs/RecordingConsentDialog.cs
@@ -2,6 +2,7 @@
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media;
 using OpenClaw.Shared.Capabilities;
+using OpenClawTray.Controls;
 using OpenClawTray.Helpers;
 using OpenClawTray.Services;
 using System;
@@ -55,10 +56,9 @@ public RecordingConsentDialog(RecordingType type)
         titleBar.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
         titleBar.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
 
-        var titleIcon = new TextBlock
+        var titleIcon = new BrandMark
         {
-            Text = "🦞",
-            FontSize = 16,
+            MarkSize = 16,
             VerticalAlignment = VerticalAlignment.Center,
             Margin = new Thickness(0, 0, 8, 0)
         };
diff --git a/src/OpenClaw.Tray.WinUI/Dialogs/WelcomeDialog.cs b/src/OpenClaw.Tray.WinUI/Dialogs/WelcomeDialog.cs
index 2449ec862..0744e8321 100644
--- a/src/OpenClaw.Tray.WinUI/Dialogs/WelcomeDialog.cs
+++ b/src/OpenClaw.Tray.WinUI/Dialogs/WelcomeDialog.cs
@@ -1,6 +1,7 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media;
+using OpenClawTray.Controls;
 using OpenClawTray.Helpers;
 using OpenClawTray.Services;
 using System;
@@ -38,17 +39,16 @@ public WelcomeDialog()
         root.RowDefinitions.Add(new RowDefinition { Height = new GridLength(1, GridUnitType.Star) });
         root.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
 
-        // Lobster header
+        // OpenClaw header
         var headerPanel = new StackPanel
         {
             Orientation = Orientation.Horizontal,
             Spacing = 12,
             HorizontalAlignment = HorizontalAlignment.Center
         };
-        headerPanel.Children.Add(new TextBlock
+        headerPanel.Children.Add(new BrandMark
         {
-            Text = "🦞",
-            FontSize = 48
+            MarkSize = 48
         });
         headerPanel.Children.Add(new TextBlock
         {
@@ -130,10 +130,9 @@ public WelcomeDialog()
         outerGrid.RowDefinitions.Add(new RowDefinition { Height = new GridLength(1, GridUnitType.Star) });
 
         var titleBar = new Grid { Padding = new Thickness(16, 0, 140, 0) };
-        var titleIcon = new TextBlock
+        var titleIcon = new BrandMark
         {
-            Text = "🦞",
-            FontSize = 20,
+            MarkSize = 20,
             VerticalAlignment = VerticalAlignment.Center,
             Margin = new Thickness(0, 0, 10, 0)
         };
diff --git a/src/OpenClaw.Tray.WinUI/Helpers/BrandAssets.cs b/src/OpenClaw.Tray.WinUI/Helpers/BrandAssets.cs
new file mode 100644
index 000000000..bb4e7b10c
--- /dev/null
+++ b/src/OpenClaw.Tray.WinUI/Helpers/BrandAssets.cs
@@ -0,0 +1,10 @@
+using Microsoft.UI.Xaml.Media.Imaging;
+
+namespace OpenClawTray.Helpers;
+
+public static class BrandAssets
+{
+    public const string RedBotMarkUri = "ms-appx:///Assets/Square44x44Logo.targetsize-256_altform-unplated.png";
+
+    public static BitmapImage CreateRedBotMarkSource() => new(new Uri(RedBotMarkUri));
+}
diff --git a/src/OpenClaw.Tray.WinUI/Helpers/CanvasGatewayUrlRewriter.cs b/src/OpenClaw.Tray.WinUI/Helpers/CanvasGatewayUrlRewriter.cs
new file mode 100644
index 000000000..db6a8d280
--- /dev/null
+++ b/src/OpenClaw.Tray.WinUI/Helpers/CanvasGatewayUrlRewriter.cs
@@ -0,0 +1,43 @@
+using OpenClaw.Shared;
+
+namespace OpenClawTray.Helpers;
+
+internal static class CanvasGatewayUrlRewriter
+{
+    public static string? ToHttpOrigin(string? gatewayUrl)
+    {
+        if (string.IsNullOrWhiteSpace(gatewayUrl))
+            return null;
+
+        var uri = new Uri(GatewayUrlHelper.NormalizeForWebSocket(gatewayUrl));
+        var httpScheme = uri.Scheme == "wss" ? "https" : "http";
+        return $"{httpScheme}://{uri.Host}:{uri.Port}";
+    }
+
+    public static string Rewrite(string url, string? effectiveGatewayOrigin, string? configuredGatewayOrigin)
+    {
+        if (string.IsNullOrEmpty(effectiveGatewayOrigin))
+            return url;
+
+        if (url.StartsWith("/", StringComparison.Ordinal))
+            return effectiveGatewayOrigin + url;
+
+        var uri = new Uri(url);
+        var urlOrigin = $"{uri.Scheme}://{uri.Host}:{uri.Port}";
+
+        if (IsGatewayOrigin(urlOrigin, effectiveGatewayOrigin, configuredGatewayOrigin) &&
+            !urlOrigin.Equals(effectiveGatewayOrigin, StringComparison.OrdinalIgnoreCase))
+        {
+            return effectiveGatewayOrigin + uri.PathAndQuery;
+        }
+
+        return url;
+    }
+
+    private static bool IsGatewayOrigin(string urlOrigin, string effectiveGatewayOrigin, string? configuredGatewayOrigin)
+    {
+        return urlOrigin.Equals(effectiveGatewayOrigin, StringComparison.OrdinalIgnoreCase) ||
+               (!string.IsNullOrEmpty(configuredGatewayOrigin) &&
+                urlOrigin.Equals(configuredGatewayOrigin, StringComparison.OrdinalIgnoreCase));
+    }
+}
diff --git a/src/OpenClaw.Tray.WinUI/Helpers/CommandCenterTextHelper.cs b/src/OpenClaw.Tray.WinUI/Helpers/CommandCenterTextHelper.cs
index 3bcb2fc8a..a26645c35 100644
--- a/src/OpenClaw.Tray.WinUI/Helpers/CommandCenterTextHelper.cs
+++ b/src/OpenClaw.Tray.WinUI/Helpers/CommandCenterTextHelper.cs
@@ -12,9 +12,6 @@ namespace OpenClawTray.Helpers;
 
 internal static class CommandCenterTextHelper
 {
-    private const int RecentTrayLogTailLines = 120;
-    private const int RecentTrayLogMaxChars = 24_000;
-
     // Pre-compiled patterns used in RedactSupportPath / RedactSupportValue.
     // Compiled once at startup; reused on every diagnostic / support-text build.
     private static readonly Regex PathWindowsUserPattern = new(
@@ -27,40 +24,6 @@ internal static class CommandCenterTextHelper
         RegexOptions.Compiled,
         TimeSpan.FromMilliseconds(100));
 
-    private static readonly Regex ValueUrlHostPattern = new(
-        @"\b(?<scheme>[a-z][a-z0-9+.-]*)://(?:[^@\s/]+@)?(?<host>\[[^\]\s]+\]|[^:/\s]+)",
-        RegexOptions.IgnoreCase | RegexOptions.Compiled,
-        TimeSpan.FromMilliseconds(100));
-
-    private static readonly Regex ValueIpPattern = new(
-        @"\b(?:\d{1,3}\.){3}\d{1,3}\b",
-        RegexOptions.Compiled,
-        TimeSpan.FromMilliseconds(100));
-
-    // IPv6 regex is shared with TokenSanitizer to keep log sanitization and support-context
-    // redaction in lock-step. See TokenSanitizer.IpV6Pattern for the alternative-by-alternative
-    // breakdown and the rationale for the trailing negative lookahead.
-
-    private static readonly Regex ValueEmailPattern = new(
-        @"\b[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,}\b",
-        RegexOptions.IgnoreCase | RegexOptions.Compiled,
-        TimeSpan.FromMilliseconds(100));
-
-    private static readonly Regex ValueUserAtHostPattern = new(
-        @"\b(?<user>[A-Za-z0-9._-]+)@(?<host>[A-Za-z0-9._-]+)(?=[:\s]|$)",
-        RegexOptions.Compiled,
-        TimeSpan.FromMilliseconds(100));
-
-    private static readonly Regex ValueHostAfterToPattern = new(
-        @"(?<=\bto\s)[A-Za-z0-9._-]+(?=:\d{1,5}\b)",
-        RegexOptions.IgnoreCase | RegexOptions.Compiled,
-        TimeSpan.FromMilliseconds(100));
-
-    private static readonly Regex ValueLeadingHostPattern = new(
-        @"^\s*[A-Za-z0-9._-]+(?=:\d{1,5}\b)",
-        RegexOptions.Compiled,
-        TimeSpan.FromMilliseconds(100));
-
     internal static string BuildSupportContext(GatewayCommandCenterState state)
     {
         var builder = new StringBuilder();
@@ -128,7 +91,6 @@ internal static string BuildDebugBundle(GatewayCommandCenterState state)
         AppendSection(builder, "Channel Summary", BuildChannelSummaryText(state.Channels));
         AppendSection(builder, "Activity Summary", BuildActivitySummary(state.RecentActivity));
         AppendSection(builder, "Extensibility Summary", BuildExtensibilitySummary(state.Channels));
-        AppendSection(builder, "Recent Tray Log", BuildRecentTrayLogTail(Logger.LogFilePath));
         return builder.ToString();
     }
 
@@ -357,61 +319,6 @@ private static void AppendSection(StringBuilder builder, string title, string co
         builder.AppendLine();
     }
 
-    private static string BuildRecentTrayLogTail(string? logPath)
-    {
-        if (string.IsNullOrWhiteSpace(logPath))
-            return "Tray log path is not configured.";
-
-        if (!File.Exists(logPath))
-            return $"Tray log does not exist: {RedactSupportPath(logPath)}";
-
-        var lines = new Queue<string>(RecentTrayLogTailLines);
-        try
-        {
-            using var stream = new FileStream(logPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite | FileShare.Delete);
-            using var reader = new StreamReader(stream);
-            while (reader.ReadLine() is { } line)
-            {
-                lines.Enqueue(RedactSupportLogLine(line));
-                while (lines.Count > RecentTrayLogTailLines)
-                    lines.Dequeue();
-            }
-        }
-        catch (IOException ex)
-        {
-            return $"Unable to read tray log '{RedactSupportPath(logPath)}': {RedactSupportLogLine(ex.Message)}";
-        }
-        catch (UnauthorizedAccessException ex)
-        {
-            return $"Unable to read tray log '{RedactSupportPath(logPath)}': {RedactSupportLogLine(ex.Message)}";
-        }
-
-        if (lines.Count == 0)
-            return $"Tray log is empty: {RedactSupportPath(logPath)}";
-
-        var builder = new StringBuilder();
-        builder.AppendLine($"Source: {RedactSupportPath(logPath)}");
-        builder.AppendLine($"Showing the last {lines.Count} lines. Sensitive values are redacted before writing and again before bundling.");
-        foreach (var line in lines)
-        {
-            if (builder.Length >= RecentTrayLogMaxChars)
-            {
-                builder.AppendLine("... truncated ...");
-                break;
-            }
-
-            builder.AppendLine(line);
-        }
-
-        return builder.ToString();
-    }
-
-    // SanitizeLogMessage already performs the same folder + Windows/Unix user-path redactions
-    // that an earlier version of this helper duplicated here. Delegating avoids redundant
-    // allocations on every diagnostic-bundle line.
-    private static string RedactSupportLogLine(string line)
-        => TokenSanitizer.SanitizeLogMessage(line);
-
     private static string BuildBrowserProxySshForwardHint(int browserProxyPort, TunnelCommandCenterInfo? tunnel)
     {
         if (browserProxyPort is < 1 or > 65535)
@@ -495,31 +402,7 @@ private static string RedactSupportValue(string? value)
         if (string.IsNullOrWhiteSpace(value))
             return "unknown";
 
-        try
-        {
-            var redacted = ValueUrlHostPattern.Replace(
-                value,
-                match => $"{match.Groups["scheme"].Value}://<host>");
-
-            redacted = TokenSanitizer.IpV6Pattern.Replace(redacted, TokenSanitizer.RedactIfValidIpV6);
-
-            redacted = ValueIpPattern.Replace(redacted, "<ip>");
-
-            redacted = ValueEmailPattern.Replace(redacted, "<email>");
-
-            redacted = ValueUserAtHostPattern.Replace(redacted, "<user>@<host>");
-
-            redacted = ValueHostAfterToPattern.Replace(redacted, "<host>");
-
-            redacted = ValueLeadingHostPattern.Replace(redacted, "<host>");
-
-            return redacted;
-        }
-        catch (RegexMatchTimeoutException)
-        {
-            // Fail-closed: see TokenSanitizer.SanitizerTimeoutSentinel.
-            return TokenSanitizer.SanitizerTimeoutSentinel;
-        }
+        return TokenSanitizer.SanitizeLogMessage(value);
     }
 
     private static string BuildChannelDetail(ChannelCommandCenterInfo channel)
diff --git a/src/OpenClaw.Tray.WinUI/Helpers/DiagnosticsGate.cs b/src/OpenClaw.Tray.WinUI/Helpers/DiagnosticsGate.cs
new file mode 100644
index 000000000..5d50696a7
--- /dev/null
+++ b/src/OpenClaw.Tray.WinUI/Helpers/DiagnosticsGate.cs
@@ -0,0 +1,28 @@
+#if OPENCLAW_TRAY_TESTS
+namespace OpenClawTray.Helpers;
+
+internal static class DiagnosticsGate
+{
+    public static bool BuildDefault => true;
+    public static bool IsVisible => BuildDefault;
+}
+#else
+using Microsoft.UI.Xaml;
+
+namespace OpenClawTray.Helpers;
+
+/// <summary>
+/// Gates the Diagnostics page. Diagnostics remain visible by default for
+/// compatibility with existing installs; users can explicitly hide or show them
+/// via Settings (SettingsManager.ShowDiagnosticsOverride).
+/// </summary>
+internal static class DiagnosticsGate
+{
+    public static bool BuildDefault =>
+        true;
+
+    /// <summary>Effective visibility: user override if set, else the build default.</summary>
+    public static bool IsVisible =>
+        (Application.Current as OpenClawTray.App)?.SettingsOrNull?.ShowDiagnosticsEffective ?? BuildDefault;
+}
+#endif
diff --git a/src/OpenClaw.Tray.WinUI/Helpers/FluentIconCatalog.cs b/src/OpenClaw.Tray.WinUI/Helpers/FluentIconCatalog.cs
index 7bf2f04a8..117a5ea05 100644
--- a/src/OpenClaw.Tray.WinUI/Helpers/FluentIconCatalog.cs
+++ b/src/OpenClaw.Tray.WinUI/Helpers/FluentIconCatalog.cs
@@ -49,6 +49,7 @@ public static class FluentIconCatalog
     public const string Settings = "\uE713";       // Settings
     public const string Setup = "\uE825";          // Bank — Reconfigure / Setup wizard launcher
     public const string About = "\uE946";          // Info
+    public const string Notifications = "\uE7E7";   // Ringer — title-bar notifications bell
     public const string Exit = "\uE711";           // Cancel (X) — used for "Close" menu item
     public const string Add = "\uE710";            // Add — "+ Add gateway" header button
     public const string Back = "\uE72B";           // Back — leading chevron on Back hyperlink
@@ -72,9 +73,6 @@ public static class FluentIconCatalog
     public const string ChevronR = "\uE76C";       // ChevronRight
     public const string Check = "\uE73E";          // CheckMark
 
-    // ── Brand placeholder (lobster emoji currently retained) ───────
-    public const string Brand = "🦞";
-
     // ── Diagnostics page glyphs ────────────────────────────────────
     // Added 2026-05 for the Diagnostics surface
     // (src/OpenClaw.Tray.WinUI/Pages/DebugPage.xaml). Keep these here
diff --git a/src/OpenClaw.Tray.WinUI/Helpers/GatewayChatHelper.cs b/src/OpenClaw.Tray.WinUI/Helpers/GatewayChatHelper.cs
index ce91eb3ab..35a60e657 100644
--- a/src/OpenClaw.Tray.WinUI/Helpers/GatewayChatHelper.cs
+++ b/src/OpenClaw.Tray.WinUI/Helpers/GatewayChatHelper.cs
@@ -7,14 +7,13 @@ namespace OpenClawTray.Helpers;
 /// Helper for WebView2-hosted gateway chat. Used today only by the
 /// Onboarding flow's WebView2 overlay (the Hub Chat tab and tray
 /// ChatWindow popup were migrated to native FunctionalUI controls — see
-/// <c>OpenClawTray.Chat.OpenClawChatRoot</c> + <c>OpenClawChatDataProvider</c>).
+/// <c>OpenClawTray.Chat.ChatRoot</c> + <c>OpenClawChatDataProvider</c>).
 /// Retire this helper when the onboarding chat surface is migrated too.
 /// </summary>
 public static class GatewayChatHelper
 {
     private static readonly string s_userDataFolder = Path.Combine(
-        Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
-        "OpenClawTray", "WebView2");
+        AppIdentity.ResolveLocalDataDirectory(), "WebView2");
 
     /// <summary>
     /// Build the HTTP(S) chat URL from a WebSocket gateway URL.
diff --git a/src/OpenClaw.Tray.WinUI/Helpers/IconHelper.cs b/src/OpenClaw.Tray.WinUI/Helpers/IconHelper.cs
index d2181cd06..feba9b734 100644
--- a/src/OpenClaw.Tray.WinUI/Helpers/IconHelper.cs
+++ b/src/OpenClaw.Tray.WinUI/Helpers/IconHelper.cs
@@ -8,7 +8,7 @@ namespace OpenClawTray.Helpers;
 
 /// <summary>
 /// Provides icon resources for the tray application.
-/// Creates dynamic status icons with lobster pixel art.
+/// Creates fallback dynamic status icons when packaged assets are unavailable.
 /// </summary>
 public static class IconHelper
 {
@@ -65,7 +65,7 @@ public static Icon GetAppIcon()
         }
         else
         {
-            _appIcon = CreateLobsterIcon(Color.FromArgb(255, 99, 71)); // Lobster red
+            _appIcon = CreateFallbackStatusIcon(Color.FromArgb(255, 99, 71));
         }
 
         return _appIcon;
@@ -90,17 +90,16 @@ private static Icon GetOrCreateIcon(ref Icon? cached, ConnectionStatus status)
                 ConnectionStatus.Error => Color.FromArgb(244, 67, 54),       // Red
                 _ => Color.FromArgb(158, 158, 158)                           // Gray
             };
-            cached = CreateLobsterIcon(color);
+            cached = CreateFallbackStatusIcon(color);
         }
 
         return cached;
     }
 
     /// <summary>
-    /// Creates a simple colored lobster icon programmatically.
-    /// Uses pixel art style matching the original WinForms version.
+    /// Creates a simple colored fallback status icon.
     /// </summary>
-    public static Icon CreateLobsterIcon(Color color)
+    public static Icon CreateFallbackStatusIcon(Color color)
     {
         const int size = 16;
         using var bitmap = new Bitmap(size, size);
@@ -108,13 +107,11 @@ public static Icon CreateLobsterIcon(Color color)
         
         g.Clear(Color.Transparent);
 
-        // Simple lobster silhouette (pixel art style)
         using var brush = new SolidBrush(color);
         
         // Body
         g.FillRectangle(brush, 6, 6, 4, 6);
         
-        // Claws
         g.FillRectangle(brush, 3, 4, 2, 2);
         g.FillRectangle(brush, 11, 4, 2, 2);
         g.FillRectangle(brush, 4, 6, 2, 2);
diff --git a/src/OpenClaw.Tray.WinUI/Helpers/LocalizationHelper.cs b/src/OpenClaw.Tray.WinUI/Helpers/LocalizationHelper.cs
index 189b40ca3..53bf2887d 100644
--- a/src/OpenClaw.Tray.WinUI/Helpers/LocalizationHelper.cs
+++ b/src/OpenClaw.Tray.WinUI/Helpers/LocalizationHelper.cs
@@ -41,28 +41,73 @@ private static ResourceContext GetContext()
 
     public static string GetString(string resourceKey)
     {
-        try
+        var found = TryGetValueAsString(resourceKey, out var value, out var lookupFailure);
+        if (found && !string.IsNullOrEmpty(value))
         {
-            var candidate = Manager.MainResourceMap.GetValue($"Resources/{resourceKey}", GetContext());
-            var value = candidate?.ValueAsString;
-            return string.IsNullOrEmpty(value) ? resourceKey : value;
+            return value;
         }
-        catch (Exception ex)
+
+        if (TryGetXamlPropertyResourcePath(resourceKey, out var propertyResourcePath))
         {
-            var logKey = $"{_languageOverride ?? "<default>"}:{resourceKey}:{ex.GetType().FullName}";
+            var propertyFound = TryGetValueAsString(propertyResourcePath, out value, out var propertyLookupFailure);
+            if (propertyFound && !string.IsNullOrEmpty(value))
+            {
+                return value;
+            }
+
+            if (!found)
+            {
+                lookupFailure ??= propertyLookupFailure;
+            }
+        }
+
+        if (lookupFailure is not null)
+        {
+            var logKey = $"{_languageOverride ?? "<default>"}:{resourceKey}:{lookupFailure.GetType().FullName}";
             if (s_loggedLookupFailures.ContainsKey(logKey))
                 return resourceKey;
 
             if (s_loggedLookupFailures.Count < MaxLoggedLookupFailures && s_loggedLookupFailures.TryAdd(logKey, 0))
             {
-                Logger.Warn($"LocalizationHelper: Resource lookup failed for '{resourceKey}' (language='{_languageOverride ?? "<default>"}'): {ex.Message}");
+                Logger.Warn($"LocalizationHelper: Resource lookup failed for '{resourceKey}' (language='{_languageOverride ?? "<default>"}'): {lookupFailure.Message}");
             }
             else if (System.Threading.Interlocked.Exchange(ref s_lookupFailureLimitLogged, 1) == 0)
             {
                 Logger.Warn("LocalizationHelper: Resource lookup failure log limit reached; suppressing additional unique resource lookup failures");
             }
-            return resourceKey;
         }
+
+        return resourceKey;
+    }
+
+    private static bool TryGetValueAsString(string resourceKey, out string? value, out Exception? lookupFailure)
+    {
+        try
+        {
+            var candidate = Manager.MainResourceMap.GetValue($"Resources/{resourceKey}", GetContext());
+            value = candidate?.ValueAsString;
+            lookupFailure = null;
+            return true;
+        }
+        catch (Exception ex)
+        {
+            value = null;
+            lookupFailure = ex;
+            return false;
+        }
+    }
+
+    private static bool TryGetXamlPropertyResourcePath(string resourceKey, out string resourcePath)
+    {
+        var propertySeparator = resourceKey.LastIndexOf('.');
+        if (propertySeparator > 0 && propertySeparator < resourceKey.Length - 1)
+        {
+            resourcePath = $"{resourceKey[..propertySeparator]}/{resourceKey[(propertySeparator + 1)..]}";
+            return true;
+        }
+
+        resourcePath = string.Empty;
+        return false;
     }
 
     /// <summary>
diff --git a/src/OpenClaw.Tray.WinUI/Helpers/SessionActionPromptLocalizer.cs b/src/OpenClaw.Tray.WinUI/Helpers/SessionActionPromptLocalizer.cs
new file mode 100644
index 000000000..def45d21b
--- /dev/null
+++ b/src/OpenClaw.Tray.WinUI/Helpers/SessionActionPromptLocalizer.cs
@@ -0,0 +1,28 @@
+using OpenClaw.Shared.Sessions;
+
+namespace OpenClawTray.Helpers;
+
+internal static class SessionActionPromptLocalizer
+{
+    public static SessionActionPrompt Localize(SessionActionPrompt prompt)
+    {
+        var prefix = prompt.Kind switch
+        {
+            SessionActionKind.Reset => "SessionActionPrompt_Reset",
+            SessionActionKind.Compact => "SessionActionPrompt_Compact",
+            SessionActionKind.Delete => "SessionActionPrompt_Delete",
+            SessionActionKind.Restore => "SessionActionPrompt_Restore",
+            _ => null,
+        };
+
+        if (prefix is null)
+            return prompt;
+
+        return prompt with
+        {
+            Title = LocalizationHelper.GetString($"{prefix}_Title"),
+            Body = LocalizationHelper.Format($"{prefix}_BodyFormat", prompt.SessionName),
+            ConfirmLabel = LocalizationHelper.GetString($"{prefix}_ConfirmLabel"),
+        };
+    }
+}
diff --git a/src/OpenClaw.Tray.WinUI/Helpers/ThemeHelper.cs b/src/OpenClaw.Tray.WinUI/Helpers/ThemeHelper.cs
index c773de391..b5165e078 100644
--- a/src/OpenClaw.Tray.WinUI/Helpers/ThemeHelper.cs
+++ b/src/OpenClaw.Tray.WinUI/Helpers/ThemeHelper.cs
@@ -30,12 +30,25 @@ public static ElementTheme GetCurrentTheme()
         return IsDarkMode() ? ElementTheme.Dark : ElementTheme.Light;
     }
 
+    public static ElementTheme GetRequestedTheme(string? preference) =>
+        SettingsManager.NormalizeAppTheme(preference) switch
+        {
+            SettingsManager.AppThemeLight => ElementTheme.Light,
+            SettingsManager.AppThemeDark => ElementTheme.Dark,
+            _ => ElementTheme.Default
+        };
+
+    public static void ApplyTheme(Window? window, string? preference)
+    {
+        if (window?.Content is FrameworkElement rootElement)
+            rootElement.RequestedTheme = GetRequestedTheme(preference);
+    }
+
     public static Color GetAccentColor()
     {
-        // Returns the user's Windows accent color (previously hard-coded to
-        // lobster red). Reads HKCU\Software\Microsoft\Windows\DWM\AccentColor
-        // which is stored as ABGR DWORD, falls back to the WinUI default
-        // blue if the registry key is missing.
+        // Returns the user's Windows accent color. Reads
+        // HKCU\Software\Microsoft\Windows\DWM\AccentColor, which is stored as
+        // ABGR DWORD, and falls back to the WinUI default blue if missing.
         try
         {
             using var key = Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\DWM");
diff --git a/src/OpenClaw.Tray.WinUI/Helpers/Win32FilePickerHelper.cs b/src/OpenClaw.Tray.WinUI/Helpers/Win32FilePickerHelper.cs
index 58b6744d4..aea78d24e 100644
--- a/src/OpenClaw.Tray.WinUI/Helpers/Win32FilePickerHelper.cs
+++ b/src/OpenClaw.Tray.WinUI/Helpers/Win32FilePickerHelper.cs
@@ -1,39 +1,142 @@
 using System;
+using System.Collections.Generic;
 using System.Runtime.InteropServices;
+using System.Runtime.Versioning;
 using System.Threading;
 using System.Threading.Tasks;
 
 namespace OpenClawTray.Helpers;
 
 /// <summary>
-/// Opens the native Win32 IFileOpenDialog on a dedicated STA thread.
-/// UWP FileOpenPicker throws COMException in unpackaged / self-hosted WinUI 3 apps,
-/// so we use the COM dialog directly. IFileOpenDialog is an STA COM object and must
+/// Opens native Win32 file dialogs on a dedicated STA thread.
+/// UWP FileOpenPicker/FileSavePicker are unreliable in unpackaged / self-hosted WinUI 3 apps,
+/// so we use the COM dialogs directly. These STA COM objects must
 /// run on an STA thread — using a dedicated STA thread avoids hangs/failures from
 /// shell extensions when called from MTA thread-pool threads.
 /// </summary>
+[SupportedOSPlatform("windows")]
 internal static class Win32FilePickerHelper
 {
     /// <summary>
     /// Shows an "Open" dialog owned by <paramref name="ownerHwnd"/>.
     /// Returns the selected file path, or <c>null</c> if cancelled.
     /// </summary>
-    public static Task<string?> PickSingleFileAsync(IntPtr ownerHwnd, string title = "Open")
+    public static async Task<string?> PickSingleFileAsync(IntPtr ownerHwnd, string title = "Open")
     {
-        var tcs = new TaskCompletionSource<string?>();
+        var paths = await PickFilesAsync(ownerHwnd, title, allowMultiple: false);
+        return paths.Count > 0 ? paths[0] : null;
+    }
+
+    /// <summary>
+    /// Shows an "Open" dialog owned by <paramref name="ownerHwnd"/>.
+    /// Returns all selected file paths, or an empty list if cancelled.
+    /// </summary>
+    public static Task<IReadOnlyList<string>> PickMultipleFilesAsync(IntPtr ownerHwnd, string title = "Open")
+        => PickFilesAsync(ownerHwnd, title, allowMultiple: true);
+
+    private static Task<IReadOnlyList<string>> PickFilesAsync(IntPtr ownerHwnd, string title, bool allowMultiple)
+    {
+        var tcs = new TaskCompletionSource<IReadOnlyList<string>>(TaskCreationOptions.RunContinuationsAsynchronously);
         var staThread = new Thread(() =>
         {
             try
             {
                 var dialog = (IFileOpenDialog)new FileOpenDialogClass();
-                dialog.SetOptions(FOS.FOS_FORCEFILESYSTEM | FOS.FOS_FILEMUSTEXIST);
+                var options = FOS.FOS_FORCEFILESYSTEM | FOS.FOS_FILEMUSTEXIST;
+                if (allowMultiple)
+                    options |= FOS.FOS_ALLOWMULTISELECT;
+                dialog.SetOptions(options);
+                dialog.SetTitle(title);
+                var hr = dialog.Show(ownerHwnd);
+                if (hr < 0)
+                {
+                    tcs.SetResult(Array.Empty<string>()); // cancelled or error
+                    return;
+                }
+
+                if (allowMultiple)
+                {
+                    dialog.GetResults(out var items);
+                    if (items is null)
+                    {
+                        dialog.GetResult(out var fallbackItem);
+                        if (fallbackItem is null)
+                        {
+                            tcs.SetResult(Array.Empty<string>());
+                            return;
+                        }
+
+                        fallbackItem.GetDisplayName(SIGDN.SIGDN_FILESYSPATH, out var fallbackFilePath);
+                        tcs.SetResult(new[] { fallbackFilePath });
+                        return;
+                    }
+
+                    items.GetCount(out var count);
+                    var paths = new List<string>((int)count);
+                    for (uint i = 0; i < count; i++)
+                    {
+                        items.GetItemAt(i, out var multiItem);
+                        if (multiItem is null)
+                            continue;
+
+                        multiItem.GetDisplayName(SIGDN.SIGDN_FILESYSPATH, out var multiFilePath);
+                        paths.Add(multiFilePath);
+                    }
+                    tcs.SetResult(paths);
+                    return;
+                }
+
+                dialog.GetResult(out var singleItem);
+                singleItem.GetDisplayName(SIGDN.SIGDN_FILESYSPATH, out var singleFilePath);
+                tcs.SetResult(new[] { singleFilePath });
+            }
+            catch (Exception ex)
+            {
+                tcs.SetException(ex);
+            }
+        });
+        staThread.SetApartmentState(ApartmentState.STA);
+        staThread.IsBackground = true;
+        staThread.Start();
+        return tcs.Task;
+    }
+
+    /// <summary>
+    /// Shows a "Save as" dialog owned by <paramref name="ownerHwnd"/>.
+    /// Returns the selected file path, or <c>null</c> if cancelled.
+    /// </summary>
+    public static Task<string?> PickSaveFileAsync(
+        IntPtr ownerHwnd,
+        string title = "Save as",
+        string suggestedFileName = "",
+        string defaultExtension = "txt")
+    {
+        var tcs = new TaskCompletionSource<string?>();
+        var staThread = new Thread(() =>
+        {
+            IntPtr filterSpecPtr = IntPtr.Zero;
+            try
+            {
+                var dialog = (IFileSaveDialog)new FileSaveDialogClass();
+                dialog.SetOptions(FOS.FOS_FORCEFILESYSTEM | FOS.FOS_PATHMUSTEXIST | FOS.FOS_OVERWRITEPROMPT);
                 dialog.SetTitle(title);
+                dialog.SetDefaultExtension(defaultExtension);
+                if (!string.IsNullOrWhiteSpace(suggestedFileName))
+                    dialog.SetFileName(suggestedFileName);
+
+                var filterSpec = new COMDLG_FILTERSPEC("Text file (*.txt)", "*.txt");
+                filterSpecPtr = Marshal.AllocCoTaskMem(Marshal.SizeOf<COMDLG_FILTERSPEC>());
+                Marshal.StructureToPtr(filterSpec, filterSpecPtr, fDeleteOld: false);
+                dialog.SetFileTypes(1, filterSpecPtr);
+                dialog.SetFileTypeIndex(1);
+
                 var hr = dialog.Show(ownerHwnd);
                 if (hr < 0)
                 {
                     tcs.SetResult(null); // cancelled or error
                     return;
                 }
+
                 dialog.GetResult(out var item);
                 item.GetDisplayName(SIGDN.SIGDN_FILESYSPATH, out var filePath);
                 tcs.SetResult(filePath);
@@ -42,6 +145,14 @@ internal static class Win32FilePickerHelper
             {
                 tcs.SetException(ex);
             }
+            finally
+            {
+                if (filterSpecPtr != IntPtr.Zero)
+                {
+                    Marshal.DestroyStructure<COMDLG_FILTERSPEC>(filterSpecPtr);
+                    Marshal.FreeCoTaskMem(filterSpecPtr);
+                }
+            }
         });
         staThread.SetApartmentState(ApartmentState.STA);
         staThread.IsBackground = true;
@@ -54,6 +165,9 @@ internal static class Win32FilePickerHelper
     [ComImport, Guid("DC1C5A9C-E88A-4DDE-A5A1-60F82A20AEF7")]
     private class FileOpenDialogClass { }
 
+    [ComImport, Guid("C0B4E2F3-BA21-4773-8DBA-335EC946EB8B")]
+    private class FileSaveDialogClass { }
+
     [ComImport, Guid("42f85136-db7e-439c-85f1-e4075d135fc8")]
     [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
     private interface IFileOpenDialog
@@ -82,10 +196,73 @@ private interface IFileOpenDialog
         void SetClientGuid(ref Guid guid);
         void ClearClientData();
         void SetFilter(IntPtr pFilter);
-        void GetResults(out IntPtr ppenum);
+        void GetResults(out IShellItemArray ppenum);
         void GetSelectedItems(out IntPtr ppsai);
     }
 
+    [ComImport, Guid("84bccd23-5fde-4cdb-aea4-af64b83d78ab")]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    private interface IFileSaveDialog
+    {
+        [PreserveSig] int Show(IntPtr parent);
+        void SetFileTypes(uint cFileTypes, IntPtr rgFilterSpec);
+        void SetFileTypeIndex(uint iFileType);
+        void GetFileTypeIndex(out uint piFileType);
+        void Advise(IntPtr pfde, out uint pdwCookie);
+        void Unadvise(uint dwCookie);
+        void SetOptions(FOS fos);
+        void GetOptions(out FOS pfos);
+        void SetDefaultFolder(IShellItem psi);
+        void SetFolder(IShellItem psi);
+        void GetFolder(out IShellItem ppsi);
+        void GetCurrentSelection(out IShellItem ppsi);
+        void SetFileName([MarshalAs(UnmanagedType.LPWStr)] string pszName);
+        void GetFileName([MarshalAs(UnmanagedType.LPWStr)] out string pszName);
+        void SetTitle([MarshalAs(UnmanagedType.LPWStr)] string pszTitle);
+        void SetOkButtonLabel([MarshalAs(UnmanagedType.LPWStr)] string pszText);
+        void SetFileNameLabel([MarshalAs(UnmanagedType.LPWStr)] string pszLabel);
+        void GetResult(out IShellItem ppsi);
+        void AddPlace(IShellItem psi, int fdap);
+        void SetDefaultExtension([MarshalAs(UnmanagedType.LPWStr)] string pszDefaultExtension);
+        void Close(int hr);
+        void SetClientGuid(ref Guid guid);
+        void ClearClientData();
+        void SetFilter(IntPtr pFilter);
+        void SetSaveAsItem(IShellItem psi);
+        void SetProperties(IntPtr pStore);
+        void SetCollectedProperties(IntPtr pList, bool fAppendDefault);
+        void GetProperties(out IntPtr ppStore);
+        void ApplyProperties(IShellItem psi, IntPtr pStore, IntPtr hwnd, IntPtr pSink);
+    }
+
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+    private readonly struct COMDLG_FILTERSPEC
+    {
+        [MarshalAs(UnmanagedType.LPWStr)]
+        public readonly string pszName;
+        [MarshalAs(UnmanagedType.LPWStr)]
+        public readonly string pszSpec;
+
+        public COMDLG_FILTERSPEC(string name, string spec)
+        {
+            pszName = name;
+            pszSpec = spec;
+        }
+    }
+
+    [ComImport, Guid("B63EA76D-1F85-456F-A19C-48159EFA858B")]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    private interface IShellItemArray
+    {
+        void BindToHandler(IntPtr pbc, ref Guid bhid, ref Guid riid, out IntPtr ppvOut);
+        void GetPropertyStore(int flags, ref Guid riid, out IntPtr ppv);
+        void GetPropertyDescriptionList(IntPtr keyType, ref Guid riid, out IntPtr ppv);
+        void GetAttributes(int attribFlags, uint sfgaoMask, out uint psfgaoAttribs);
+        void GetCount(out uint pdwNumItems);
+        void GetItemAt(uint dwIndex, out IShellItem ppsi);
+        void EnumItems(out IntPtr ppenumShellItems);
+    }
+
     [ComImport, Guid("43826D1E-E718-42EE-BC55-A1E261C37BFE")]
     [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
     private interface IShellItem
@@ -101,7 +278,10 @@ private interface IShellItem
     private enum FOS : uint
     {
         FOS_FORCEFILESYSTEM = 0x40,
+        FOS_ALLOWMULTISELECT = 0x200,
         FOS_FILEMUSTEXIST = 0x1000,
+        FOS_PATHMUSTEXIST = 0x800,
+        FOS_OVERWRITEPROMPT = 0x2,
     }
 
     private enum SIGDN : uint
diff --git a/src/OpenClaw.Tray.WinUI/Helpers/WrapPanel.cs b/src/OpenClaw.Tray.WinUI/Helpers/WrapPanel.cs
new file mode 100644
index 000000000..0d97b5aa3
--- /dev/null
+++ b/src/OpenClaw.Tray.WinUI/Helpers/WrapPanel.cs
@@ -0,0 +1,74 @@
+using System;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Windows.Foundation;
+
+namespace OpenClawTray.Helpers;
+
+/// <summary>
+/// Minimal left-to-right wrapping panel for compact chip rows.
+/// </summary>
+public sealed class WrapPanel : Panel
+{
+    public double HorizontalSpacing { get; set; }
+
+    public double VerticalSpacing { get; set; }
+
+    protected override Size MeasureOverride(Size availableSize)
+    {
+        var available = double.IsInfinity(availableSize.Width)
+            ? double.PositiveInfinity
+            : availableSize.Width;
+
+        double lineWidth = 0, lineHeight = 0, totalHeight = 0, maxWidth = 0;
+
+        foreach (var child in Children)
+        {
+            child.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+            var size = child.DesiredSize;
+
+            if (lineWidth > 0 && lineWidth + HorizontalSpacing + size.Width > available)
+            {
+                totalHeight += lineHeight + VerticalSpacing;
+                maxWidth = Math.Max(maxWidth, lineWidth);
+                lineWidth = size.Width;
+                lineHeight = size.Height;
+            }
+            else
+            {
+                lineWidth += (lineWidth > 0 ? HorizontalSpacing : 0) + size.Width;
+                lineHeight = Math.Max(lineHeight, size.Height);
+            }
+        }
+
+        totalHeight += lineHeight;
+        maxWidth = Math.Max(maxWidth, lineWidth);
+
+        return new Size(
+            double.IsInfinity(available) ? maxWidth : Math.Min(maxWidth, available),
+            totalHeight);
+    }
+
+    protected override Size ArrangeOverride(Size finalSize)
+    {
+        double x = 0, y = 0, lineHeight = 0;
+
+        foreach (var child in Children)
+        {
+            var size = child.DesiredSize;
+
+            if (x > 0 && x + size.Width > finalSize.Width)
+            {
+                x = 0;
+                y += lineHeight + VerticalSpacing;
+                lineHeight = 0;
+            }
+
+            child.Arrange(new Rect(x, y, size.Width, size.Height));
+            x += size.Width + HorizontalSpacing;
+            lineHeight = Math.Max(lineHeight, size.Height);
+        }
+
+        return finalSize;
+    }
+}
diff --git a/src/OpenClaw.Tray.WinUI/OpenClaw.Tray.WinUI.csproj b/src/OpenClaw.Tray.WinUI/OpenClaw.Tray.WinUI.csproj
index a064df3ab..7db7389ac 100644
--- a/src/OpenClaw.Tray.WinUI/OpenClaw.Tray.WinUI.csproj
+++ b/src/OpenClaw.Tray.WinUI/OpenClaw.Tray.WinUI.csproj
@@ -14,6 +14,16 @@
     <RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>
   </PropertyGroup>
 
+  <!-- Dev build identity: allows side-by-side installation with Release.
+       Set DevBuild=true explicitly; release identity remains the default for every configuration. -->
+  <PropertyGroup Condition="'$(DevBuild)' == 'true'">
+    <DefineConstants>$(DefineConstants);DEV_BUILD</DefineConstants>
+    <AppIdentityMarker>dev</AppIdentityMarker>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(DevBuild)' != 'true'">
+    <AppIdentityMarker>release</AppIdentityMarker>
+  </PropertyGroup>
+
   <!-- Map $(Platform) to $(RuntimeIdentifier) so self-contained WinUI F5/debug produces a launchable EXE. -->
   <PropertyGroup Condition="'$(RuntimeIdentifier)' == '' and '$(Platform)' == 'x64'">
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
@@ -37,9 +47,8 @@
     <GenerateAppxPackageOnBuild>true</GenerateAppxPackageOnBuild>
     <AppxBundle>Never</AppxBundle>
     <UapAppxPackageBuildMode>SideloadOnly</UapAppxPackageBuildMode>
-    <!-- MSIX package version (Identity/Version in Package.appxmanifest) is auto-synced from
-         $(Version) by the SyncAppxManifestVersion target below; this is the only place the
-         Version is written. -->
+    <!-- MSIX package version is generated from $(Version) into the obj/ manifest by
+         PrepareOpenClawAppxManifest below; this is the only place the package version is sourced. -->
   </PropertyGroup>
 
   <ItemGroup>
@@ -89,104 +98,134 @@
     <MxcArch Condition="'$(MxcArch)' == '' And '$(PlatformTarget)' == 'ARM64'">arm64</MxcArch>
     <MxcArch Condition="'$(MxcArch)' == '' And '$(RuntimeIdentifier)' == ''">x64</MxcArch>
     <MxcSdkBinDir>$(OpenClawRepoRoot)node_modules\@microsoft\mxc-sdk\bin\$(MxcArch)\</MxcSdkBinDir>
+    <MxcSdkExpectedVersion>0.7.0</MxcSdkExpectedVersion>
+    <MxcSdkPackageJson>$(OpenClawRepoRoot)node_modules\@microsoft\mxc-sdk\package.json</MxcSdkPackageJson>
+    <MxcSdkRestoreStamp>$(OpenClawRepoRoot)node_modules\.openclaw-mxc-sdk-$(MxcSdkExpectedVersion).stamp</MxcSdkRestoreStamp>
   </PropertyGroup>
 
-  <!--
-    Single source of truth for the app version is GitVersion/tag history (see docs/VERSIONING.md).
-    Package.appxmanifest carries a sentinel Version="0.0.0.0" in source; the real version is patched
-    in only when actually packaging MSIX (WindowsPackageType=MSIX), so unpackaged dev builds leave
-    the file untouched and git stays clean. CI's manifest patch step (.github/workflows/ci.yml)
-    only writes Identity/Name and DisplayName; Version is written by this target from the
-    GitVersion-derived $(Version).
-
-    Uses a regex string-replace (not XmlPoke) to preserve the manifest's hand-formatted layout.
-    The MSIX Identity/Version must be a 4-part version (X.Y.Z.W) with no pre-release suffix;
-    $(Version) may be 2-, 3- or 4-part and may include a -alpha/+meta suffix from GitVersion.
-  -->
-  <UsingTask TaskName="SyncAppxManifestVersion" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
+  <!-- Generate the versioned/channel-specific manifest under obj/. Never rewrite the
+       tracked source manifest: a dev package build followed by a release build must not
+       inherit the dev identity, and parallel builds must not race on one source file. -->
+  <UsingTask TaskName="GenerateOpenClawAppxManifest" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
     <ParameterGroup>
-      <ManifestPath ParameterType="System.String" Required="true" />
+      <SourceManifestPath ParameterType="System.String" Required="true" />
+      <OutputManifestPath ParameterType="System.String" Required="true" />
       <FourPartVersion ParameterType="System.String" Required="true" />
+      <DevBuild ParameterType="System.String" />
+      <IdentityName ParameterType="System.String" Required="true" />
+      <DisplayName ParameterType="System.String" Required="true" />
+      <ProtocolName ParameterType="System.String" Required="true" />
     </ParameterGroup>
     <Task>
       <Code Type="Fragment" Language="cs">
         <![CDATA[
-        // Validate the version is a proper 4-part numeric (X.Y.Z.W) before touching the manifest.
         if (!System.Text.RegularExpressions.Regex.IsMatch(FourPartVersion, @"^\d+\.\d+\.\d+\.\d+$")) {
-            Log.LogError("SyncAppxManifestVersion: '" + FourPartVersion + "' is not a valid 4-part numeric MSIX version.");
+            Log.LogError("GenerateOpenClawAppxManifest: '" + FourPartVersion + "' is not a valid four-part MSIX version.");
             return false;
         }
 
-        var text = System.IO.File.ReadAllText(ManifestPath);
-        // Tolerate attribute-order, whitespace around '=', single or double quotes, and case
-        // variations on the Version attribute name. Capture the opening and closing quote
-        // characters so we re-emit them unchanged.
-        var regex = new System.Text.RegularExpressions.Regex(
+        var text = System.IO.File.ReadAllText(SourceManifestPath);
+        var versionRegex = new System.Text.RegularExpressions.Regex(
             "(<Identity\\b[^>]*?\\bVersion\\s*=\\s*[\"'])[^\"']+([\"'])",
             System.Text.RegularExpressions.RegexOptions.IgnoreCase);
-        if (!regex.IsMatch(text)) {
-            Log.LogError("SyncAppxManifestVersion: could not find Identity/@Version in " + ManifestPath);
+        if (!versionRegex.IsMatch(text)) {
+            Log.LogError("GenerateOpenClawAppxManifest: Identity/@Version missing from " + SourceManifestPath);
             return false;
         }
-        var updated = regex.Replace(text, "${1}" + FourPartVersion + "$2", 1);
-        if (updated == text) {
-            return true;
-        }
+        text = versionRegex.Replace(text, "${1}" + FourPartVersion + "$2", 1);
 
-        // Clear any read-only attribute (some non-Git SCMs mark files read-only) so the
-        // write doesn't fail with an opaque UnauthorizedAccessException.
-        try {
-            var attrs = System.IO.File.GetAttributes(ManifestPath);
-            if ((attrs & System.IO.FileAttributes.ReadOnly) != 0) {
-                System.IO.File.SetAttributes(ManifestPath, attrs & ~System.IO.FileAttributes.ReadOnly);
+        if (System.String.Equals(DevBuild, "true", System.StringComparison.OrdinalIgnoreCase)) {
+            var nameRegex = new System.Text.RegularExpressions.Regex(
+            "(<Identity\\b[^>]*?\\bName\\s*=\\s*[\"'])[^\"']+([\"'])",
+            System.Text.RegularExpressions.RegexOptions.IgnoreCase);
+            if (!nameRegex.IsMatch(text)) {
+                Log.LogError("GenerateOpenClawAppxManifest: Identity/@Name missing from " + SourceManifestPath);
+                return false;
             }
-        } catch (System.Exception ex) {
-            Log.LogWarning("SyncAppxManifestVersion: could not clear read-only on " + ManifestPath + ": " + ex.Message);
-        }
+            text = nameRegex.Replace(text, "${1}" + IdentityName + "$2", 1);
+
+            var propsDisplayRegex = new System.Text.RegularExpressions.Regex(
+            "(<Properties>[\\s\\S]*?<DisplayName>)[^<]+(</DisplayName>)",
+            System.Text.RegularExpressions.RegexOptions.IgnoreCase);
+            if (!propsDisplayRegex.IsMatch(text)) {
+                Log.LogError("GenerateOpenClawAppxManifest: Properties/DisplayName missing from " + SourceManifestPath);
+                return false;
+            }
+            text = propsDisplayRegex.Replace(text, "${1}" + DisplayName + "$2", 1);
+
+            var visualRegex = new System.Text.RegularExpressions.Regex(
+            "(<uap:VisualElements\\b[\\s\\S]*?\\bDisplayName\\s*=\\s*[\"'])[^\"']+([\"'])",
+            System.Text.RegularExpressions.RegexOptions.IgnoreCase);
+            if (!visualRegex.IsMatch(text)) {
+                Log.LogError("GenerateOpenClawAppxManifest: VisualElements/@DisplayName missing from " + SourceManifestPath);
+                return false;
+            }
+            text = visualRegex.Replace(text, "${1}" + DisplayName + "$2", 1);
 
-        // Atomic write: stage to a sibling temp file then replace, so parallel readers never
-        // see a truncated manifest. File.Replace is atomic on NTFS. The finally block makes
-        // sure the temp file never lingers (it isn't in .gitignore and would otherwise show
-        // up in `git status` if Replace throws something other than FileNotFoundException).
-        var tempPath = ManifestPath + ".sync-tmp";
-        System.IO.File.WriteAllText(tempPath, updated);
-        try {
-            try {
-                System.IO.File.Replace(tempPath, ManifestPath, destinationBackupFileName: null);
-            } catch (System.IO.FileNotFoundException) {
-                // Replace requires destination to exist; if a concurrent build deleted it, fall
-                // back to a plain move (no 3-arg overload on .NET Framework, which is what the
-                // inline task compiler targets).
-                System.IO.File.Move(tempPath, ManifestPath);
+            var protocolRegex = new System.Text.RegularExpressions.Regex(
+            "(<uap:Protocol\\b[^>]*?\\bName\\s*=\\s*[\"'])[^\"']+([\"'])",
+            System.Text.RegularExpressions.RegexOptions.IgnoreCase);
+            if (!protocolRegex.IsMatch(text)) {
+                Log.LogError("GenerateOpenClawAppxManifest: Protocol/@Name missing from " + SourceManifestPath);
+                return false;
             }
-        } finally {
-            try {
-                if (System.IO.File.Exists(tempPath)) {
-                    System.IO.File.Delete(tempPath);
-                }
-            } catch { /* best-effort cleanup */ }
+            text = protocolRegex.Replace(text, "${1}" + ProtocolName + "$2", 1);
         }
-        Log.LogMessage(MessageImportance.High, "Synced Package.appxmanifest Identity/@Version to " + FourPartVersion);
+
+        System.IO.Directory.CreateDirectory(System.IO.Path.GetDirectoryName(OutputManifestPath));
+        System.IO.File.WriteAllText(OutputManifestPath, text);
+        Log.LogMessage(MessageImportance.High,
+            "Generated " + OutputManifestPath + " (Version=" + FourPartVersion + ", DevBuild=" + DevBuild + ")");
         ]]>
       </Code>
     </Task>
   </UsingTask>
 
-  <Target Name="SyncAppxManifestVersionTarget" BeforeTargets="BeforeBuild;_GenerateCurrentProjectAppxManifest" Condition="'$(WindowsPackageType)' == 'MSIX'">
-    <!-- Fail loudly if MSIX packaging was requested but no version was supplied; without
-         this, the target would silently skip and the sentinel 0.0.0.0 in the source manifest
-         would ship in the MSIX package. -->
-    <Error Text="MSIX packaging requested (WindowsPackageType=MSIX) but Version is empty. Ensure GitVersion can read this repository's tag history or pass /p:Version=X.Y[.Z]." Condition="'$(Version)' == ''" />
+  <Target Name="PrepareOpenClawAppxManifest"
+          BeforeTargets="_ValidatePresenceOfAppxManifestItems;_CalculateInputsForGenerateCurrentProjectAppxManifest"
+          Condition="'$(WindowsPackageType)' == 'MSIX'">
+    <Error Text="MSIX packaging requested but Version is empty. Pass /p:Version=X.Y[.Z]." Condition="'$(Version)' == ''" />
     <PropertyGroup>
-      <_AppxManifestPath>$(MSBuildThisFileDirectory)Package.appxmanifest</_AppxManifestPath>
       <_StrippedVersion>$([System.Text.RegularExpressions.Regex]::Replace('$(Version)', '[-+].*$', ''))</_StrippedVersion>
       <_VersionDotCount>$([System.Text.RegularExpressions.Regex]::Matches('$(_StrippedVersion)', '\.').Count)</_VersionDotCount>
       <_AppxManifestVersion Condition="'$(_VersionDotCount)' == '3'">$(_StrippedVersion)</_AppxManifestVersion>
       <_AppxManifestVersion Condition="'$(_VersionDotCount)' == '2'">$(_StrippedVersion).0</_AppxManifestVersion>
       <_AppxManifestVersion Condition="'$(_VersionDotCount)' == '1'">$(_StrippedVersion).0.0</_AppxManifestVersion>
+      <_GeneratedAppxManifestPath>$(IntermediateOutputPath)openclaw.Package.appxmanifest</_GeneratedAppxManifestPath>
     </PropertyGroup>
-    <Error Text="Cannot derive 4-part MSIX version from &lt;Version&gt;$(Version)&lt;/Version&gt;. Use the form X.Y or X.Y.Z (optionally with -prerelease or +meta suffix)." Condition="'$(_AppxManifestVersion)' == ''" />
-    <SyncAppxManifestVersion ManifestPath="$(_AppxManifestPath)" FourPartVersion="$(_AppxManifestVersion)" />
+    <Error Text="Cannot derive four-part MSIX version from $(Version). Use X.Y or X.Y.Z with an optional suffix." Condition="'$(_AppxManifestVersion)' == ''" />
+    <GenerateOpenClawAppxManifest
+      SourceManifestPath="$(MSBuildThisFileDirectory)Package.appxmanifest"
+      OutputManifestPath="$(_GeneratedAppxManifestPath)"
+      FourPartVersion="$(_AppxManifestVersion)"
+      DevBuild="$(DevBuild)"
+      IdentityName="OpenClaw.Companion.Dev"
+      DisplayName="OpenClaw Companion (Dev)"
+      ProtocolName="openclaw-dev" />
+    <ItemGroup>
+      <AppxManifest Remove="@(AppxManifest)" />
+      <AppxManifest Include="$(_GeneratedAppxManifestPath)">
+        <SubType>Designer</SubType>
+      </AppxManifest>
+      <FileWrites Include="$(_GeneratedAppxManifestPath)" />
+    </ItemGroup>
+  </Target>
+
+  <!-- Local installer tooling validates this marker before wrapping a published payload. -->
+  <Target Name="WritePublishedAppIdentityMarker" AfterTargets="Publish">
+    <WriteLinesToFile
+      File="$(PublishDir)app-identity.txt"
+      Lines="$(AppIdentityMarker)"
+      Overwrite="true"
+      Encoding="UTF-8" />
+  </Target>
+
+  <Target Name="WriteBuildAppIdentityMarker" AfterTargets="Build">
+    <WriteLinesToFile
+      File="$(TargetDir)app-identity.txt"
+      Lines="$(AppIdentityMarker)"
+      Overwrite="true"
+      Encoding="UTF-8" />
   </Target>
 
   <!-- Fail fast on RIDs we have no wxc-exec binary for, so x86/non-Windows
@@ -196,9 +235,22 @@
     <Error Text="Unsupported RuntimeIdentifier '$(RuntimeIdentifier)' for MXC sandbox. Only win-x64 and win-arm64 are supported. Override -p:MxcArch=x64 or -p:MxcArch=arm64 if you know what you are doing." />
   </Target>
 
-  <Target Name="RestoreMxcNodeBridge" BeforeTargets="Build;Publish;CopyWxcExecToOutput;CopyWxcExecToPublish" Condition="'$(SkipMxcNodeBridgeRestore)' != 'true' And Exists('$(OpenClawRepoRoot)package-lock.json') And !Exists('$(OpenClawRepoRoot)node_modules\@microsoft\mxc-sdk\package.json')">
+  <Target Name="RestoreMxcNodeBridge"
+          BeforeTargets="Build;Publish;CopyWxcExecToOutput;CopyWxcExecToPublish"
+          Condition="'$(SkipMxcNodeBridgeRestore)' != 'true' And Exists('$(OpenClawRepoRoot)package-lock.json')"
+          Inputs="$(OpenClawRepoRoot)package-lock.json"
+          Outputs="$(MxcSdkRestoreStamp)">
     <Message Importance="high" Text="Restoring @microsoft/mxc-sdk to extract wxc-exec.exe ($(MxcArch))" />
     <Exec Command="npm ci --no-audit --no-fund" WorkingDirectory="$(OpenClawRepoRoot)" />
+    <Touch Files="$(MxcSdkRestoreStamp)" AlwaysCreate="true" />
+  </Target>
+
+  <Target Name="ValidateMxcSdkVersion"
+          BeforeTargets="CopyWxcExecToOutput;CopyWxcExecToPublish"
+          DependsOnTargets="RestoreMxcNodeBridge"
+          Condition="'$(SkipMxcNodeBridgeRestore)' != 'true' And Exists('$(OpenClawRepoRoot)package-lock.json')">
+    <Error Condition="!Exists('$(MxcSdkPackageJson)')" Text="@microsoft/mxc-sdk package.json missing at $(MxcSdkPackageJson). Run `npm ci` at $(OpenClawRepoRoot)." />
+    <Error Condition="Exists('$(MxcSdkPackageJson)') And !$([System.IO.File]::ReadAllText('$(MxcSdkPackageJson)').Contains('&quot;version&quot;: &quot;$(MxcSdkExpectedVersion)&quot;'))" Text="@microsoft/mxc-sdk version mismatch. Expected $(MxcSdkExpectedVersion) in $(MxcSdkPackageJson). Run `npm ci` at $(OpenClawRepoRoot)." />
   </Target>
 
   <!-- Copy ONLY wxc-exec.exe (and any sibling DLLs) for the active arch into
diff --git a/src/OpenClaw.Tray.WinUI/Pages/AboutPage.xaml b/src/OpenClaw.Tray.WinUI/Pages/AboutPage.xaml
deleted file mode 100644
index 58ac065d6..000000000
--- a/src/OpenClaw.Tray.WinUI/Pages/AboutPage.xaml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Page
-    x:Class="OpenClawTray.Pages.AboutPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-    <ScrollViewer VerticalScrollBarVisibility="Auto">
-    <Grid HorizontalAlignment="Stretch">
-        <StackPanel Padding="24" Spacing="16" HorizontalAlignment="Stretch" MaxWidth="900">
-
-            <TextBlock x:Uid="AboutPage_TextBlock_10" Text="About" Style="{StaticResource TitleTextBlockStyle}"/>
-
-            <!-- App Info Card -->
-            <Border Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-                    BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-                    BorderThickness="1" CornerRadius="8" Padding="16">
-                <StackPanel Orientation="Horizontal" Spacing="16">
-                    <TextBlock Text="🦞" FontSize="48" VerticalAlignment="Center"/>
-                    <StackPanel Spacing="4" VerticalAlignment="Center">
-                        <TextBlock x:Uid="AboutPage_TextBlock_19" Text="OpenClaw Hub" Style="{StaticResource SubtitleTextBlockStyle}"/>
-                        <TextBlock x:Name="VersionText"
-                                   Style="{StaticResource CaptionTextBlockStyle}"
-                                   Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
-                        <TextBlock x:Uid="AboutPage_TextBlock_23" x:Name="RuntimeStackText"
-                                   Text=".NET / WinUI / Windows App SDK"
-                                   Style="{StaticResource CaptionTextBlockStyle}"
-                                   Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
-                    </StackPanel>
-                </StackPanel>
-            </Border>
-
-            <!-- Gateway Info Card -->
-            <Border Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-                    BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-                    BorderThickness="1" CornerRadius="8" Padding="16">
-                <StackPanel Spacing="8">
-                    <TextBlock x:Uid="AboutPage_TextBlock_35" Text="Gateway Info" Style="{StaticResource BodyStrongTextBlockStyle}"/>
-                    <Grid ColumnSpacing="12" RowSpacing="4">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition Width="*"/>
-                        </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto"/>
-                            <RowDefinition Height="Auto"/>
-                            <RowDefinition Height="Auto"/>
-                            <RowDefinition Height="Auto"/>
-                        </Grid.RowDefinitions>
-
-                        <TextBlock x:Uid="AboutPage_TextBlock_48" Grid.Row="0" Grid.Column="0" Text="Version:"
-                                   Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
-                        <TextBlock x:Name="GatewayVersionText" Grid.Row="0" Grid.Column="1" Text="—"/>
-
-                        <TextBlock x:Uid="AboutPage_TextBlock_52" Grid.Row="1" Grid.Column="0" Text="Protocol:"
-                                   Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
-                        <TextBlock x:Name="GatewayProtocolText" Grid.Row="1" Grid.Column="1" Text="—"/>
-
-                        <TextBlock x:Uid="AboutPage_TextBlock_56" Grid.Row="2" Grid.Column="0" Text="Auth mode:"
-                                   Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
-                        <TextBlock x:Name="GatewayAuthText" Grid.Row="2" Grid.Column="1" Text="—"/>
-
-                        <TextBlock x:Uid="AboutPage_TextBlock_60" Grid.Row="3" Grid.Column="0" Text="Uptime:"
-                                   Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
-                        <TextBlock x:Name="GatewayUptimeText" Grid.Row="3" Grid.Column="1" Text="—"/>
-                    </Grid>
-                </StackPanel>
-            </Border>
-
-            <!-- Debug Section -->
-            <Border Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-                    BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-                    BorderThickness="1" CornerRadius="8" Padding="16">
-                <StackPanel Spacing="12">
-                    <TextBlock x:Uid="AboutPage_TextBlock_72" Text="Debug" Style="{StaticResource BodyStrongTextBlockStyle}"/>
-                    <StackPanel Orientation="Horizontal" Spacing="8">
-                        <Button x:Uid="OpenLogButton" x:Name="OpenLogButton" Content="Open Log File"
-                                Click="OnOpenLogClick"/>
-                        <Button x:Uid="OpenConfigButton" x:Name="OpenConfigButton" Content="Open Config Folder"
-                                Click="OnOpenConfigClick"/>
-                        <Button x:Uid="CopySupportButton" x:Name="CopySupportButton" Content="Copy Support Context"
-                                Click="OnCopySupportClick"/>
-                        <Button x:Uid="CheckUpdatesButton" x:Name="CheckUpdatesButton" Content="Check for Updates"
-                                Click="OnCheckUpdatesClick"/>
-                    </StackPanel>
-                    <HyperlinkButton x:Uid="AboutPage_MoreDiagnosticsLink"
-                                     Content="More diagnostics →"
-                                     Click="OnMoreDiagnosticsClick"
-                                     Padding="0,4,0,0"/>
-                </StackPanel>
-            </Border>
-
-            <!-- Links Section -->
-            <Border Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-                    BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-                    BorderThickness="1" CornerRadius="8" Padding="16">
-                <StackPanel Spacing="8">
-                    <TextBlock x:Uid="AboutPage_TextBlock_91" Text="Links" Style="{StaticResource BodyStrongTextBlockStyle}"/>
-                    <HyperlinkButton x:Uid="AboutPage_HyperlinkButton_92" Content="Documentation → docs.openclaw.ai/platforms/windows"
-                                     Click="OnDocumentationClick"/>
-                    <HyperlinkButton x:Uid="AboutPage_HyperlinkButton_94" Content="GitHub → github.com/openclaw/openclaw-windows-node"
-                                     Click="OnGitHubClick"/>
-                    <HyperlinkButton x:Uid="AboutPage_HyperlinkButton_96" Content="Dashboard → openclaw://dashboard"
-                                     Click="OnDashboardClick"/>
-                </StackPanel>
-            </Border>
-
-        </StackPanel>
-    </Grid>
-    </ScrollViewer>
-</Page>
diff --git a/src/OpenClaw.Tray.WinUI/Pages/AboutPage.xaml.cs b/src/OpenClaw.Tray.WinUI/Pages/AboutPage.xaml.cs
deleted file mode 100644
index 93643f4ec..000000000
--- a/src/OpenClaw.Tray.WinUI/Pages/AboutPage.xaml.cs
+++ /dev/null
@@ -1,333 +0,0 @@
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using OpenClaw.Shared;
-using OpenClawTray.Helpers;
-using OpenClawTray.Services;
-using System;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.IO;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Text.Json;
-using System.Threading.Tasks;
-
-namespace OpenClawTray.Pages;
-
-public sealed partial class AboutPage : Page
-{
-    private const string DocumentationUrl = "https://docs.openclaw.ai/platforms/windows";
-    private const string GitHubUrl = "https://github.com/openclaw/openclaw-windows-node";
-
-    private static App CurrentApp => (App)Microsoft.UI.Xaml.Application.Current!;
-    private readonly DispatcherTimer _uptimeRefreshTimer = new() { Interval = TimeSpan.FromSeconds(1) };
-    private AppState? _appState;
-    private long? _sampledGatewayUptimeMs;
-    private DateTime _sampledGatewayUptimeUtc;
-
-    public AboutPage()
-    {
-        InitializeComponent();
-        VersionText.Text = AppVersionInfo.DisplayVersion;
-        RuntimeStackText.Text = BuildRuntimeStackDisplayText();
-        _uptimeRefreshTimer.Tick += OnUptimeRefreshTimerTick;
-        Loaded += OnLoaded;
-        Unloaded += OnUnloaded;
-    }
-
-    private void OnLoaded(object sender, RoutedEventArgs e)
-    {
-        TryLoadGatewayInfo();
-    }
-
-    private void OnUnloaded(object sender, RoutedEventArgs e)
-    {
-        _uptimeRefreshTimer.Stop();
-        if (_appState != null)
-        {
-            _appState.PropertyChanged -= OnAppStateChanged;
-            _appState = null;
-        }
-    }
-
-    public void Initialize()
-    {
-        var appState = CurrentApp.AppState!;
-        if (!ReferenceEquals(_appState, appState))
-        {
-            if (_appState != null) _appState.PropertyChanged -= OnAppStateChanged;
-            _appState = appState;
-            _appState.PropertyChanged += OnAppStateChanged;
-        }
-
-        TryLoadGatewayInfo();
-    }
-
-    private void OnAppStateChanged(object? sender, PropertyChangedEventArgs e)
-    {
-        switch (e.PropertyName)
-        {
-            case nameof(AppState.Status):
-            case nameof(AppState.GatewaySelf):
-                RefreshGatewayInfo();
-                break;
-        }
-    }
-
-    public void RefreshGatewayInfo() => TryLoadGatewayInfo();
-
-    private void TryLoadGatewayInfo()
-    {
-        var self = CurrentApp.AppState?.GatewaySelf;
-        if (CurrentApp.AppState?.Status == OpenClaw.Shared.ConnectionStatus.Connected && self != null)
-        {
-            GatewayVersionText.Text = self.VersionText;
-            GatewayProtocolText.Text = self.Protocol.HasValue ? $"v{self.Protocol}" : "unknown";
-            GatewayAuthText.Text = string.IsNullOrWhiteSpace(self.AuthMode) ? "unknown" : self.AuthMode;
-            CaptureGatewayUptimeSample(self);
-            RefreshGatewayUptimeText();
-        }
-        else
-        {
-            _sampledGatewayUptimeMs = null;
-            _uptimeRefreshTimer.Stop();
-            GatewayVersionText.Text = "—";
-            GatewayProtocolText.Text = "—";
-            GatewayAuthText.Text = "—";
-            GatewayUptimeText.Text = "—";
-        }
-    }
-
-    private void OnOpenLogClick(object sender, RoutedEventArgs e)
-    {
-        OpenShellTarget(Logger.LogFilePath, "log file");
-    }
-
-    private void OnOpenConfigClick(object sender, RoutedEventArgs e)
-    {
-        try
-        {
-            System.IO.Directory.CreateDirectory(SettingsManager.SettingsDirectoryPath);
-            OpenShellTarget(SettingsManager.SettingsDirectoryPath, "config folder");
-        }
-        catch (Exception ex) when (ex is System.IO.IOException or UnauthorizedAccessException or InvalidOperationException or Win32Exception)
-        {
-            Logger.Warn($"Failed to open config folder: {ex.Message}");
-        }
-    }
-
-    private void OnCopySupportClick(object sender, RoutedEventArgs e) =>
-        AsyncEventHandlerGuard.Run(
-            OnCopySupportClickAsync,
-            new OpenClawTray.AppLogger(),
-            nameof(OnCopySupportClick));
-
-    private async Task OnCopySupportClickAsync()
-    {
-        // Unified with the richer CommandCenterTextHelper.BuildSupportContext
-        // that the Diagnostics page uses, sourced from App's authoritative
-        // CommandCenterState builder. Falls back to a minimal local
-        // string only when the state isn't available yet (cold start).
-        string context;
-        var state = CurrentApp.BuildCommandCenterState();
-        if (state != null)
-        {
-            context = OpenClawTray.Helpers.CommandCenterTextHelper.BuildSupportContext(state);
-        }
-        else
-        {
-            context = $"OpenClaw Hub {AppVersionInfo.DisplayVersion}\n"
-                + $"OS: {Environment.OSVersion}\n"
-                + $"Runtime: {System.Runtime.InteropServices.RuntimeInformation.FrameworkDescription}\n"
-                + $"Connection: {CurrentApp.AppState?.Status}\n"
-                + $"Gateway: {CurrentApp.Settings?.GetEffectiveGatewayUrl() ?? "n/a"}\n";
-        }
-
-        ClipboardHelper.CopyText(context);
-        await Task.CompletedTask;
-    }
-
-    private void OnCheckUpdatesClick(object sender, RoutedEventArgs e)
-    {
-        ((IAppCommands)CurrentApp).CheckForUpdates();
-    }
-
-    private void OnMoreDiagnosticsClick(object sender, RoutedEventArgs e)
-    {
-        ((IAppCommands)CurrentApp).Navigate("debug");
-    }
-
-    private void OnDocumentationClick(object sender, RoutedEventArgs e)
-    {
-        OpenShellTarget(DocumentationUrl, "documentation");
-    }
-
-    private void OnGitHubClick(object sender, RoutedEventArgs e)
-    {
-        OpenShellTarget(GitHubUrl, "GitHub");
-    }
-
-    private static void OpenShellTarget(string target, string label)
-    {
-        if (string.IsNullOrWhiteSpace(target))
-        {
-            Logger.Warn($"Failed to open {label}: target is empty");
-            return;
-        }
-
-        try
-        {
-            Process.Start(new ProcessStartInfo(target) { UseShellExecute = true });
-        }
-        catch (Exception ex) when (ex is Win32Exception or InvalidOperationException or UnauthorizedAccessException or ArgumentException or NotSupportedException)
-        {
-            Logger.Warn($"Failed to open {label}: {ex.Message}");
-        }
-    }
-
-    private static string BuildRuntimeStackDisplayText()
-    {
-        var dotNet = RuntimeInformation.FrameworkDescription;
-        var winUi = ResolveWinUiDisplayName();
-        var windowsAppSdk = ResolveWindowsAppSdkDisplayName();
-
-        return $"{dotNet} / {winUi} / {windowsAppSdk}";
-    }
-
-    private static string ResolveWinUiDisplayName()
-    {
-        var version = typeof(Microsoft.UI.Xaml.Application).Assembly.GetName().Version;
-        return version is { Major: > 0 }
-            ? $"WinUI {version.Major}"
-            : "WinUI";
-    }
-
-    private static string ResolveWindowsAppSdkDisplayName()
-    {
-        if (TryResolveWindowsAppSdkPackageVersionFromDeps() is { Length: > 0 } packageVersion)
-        {
-            return $"Windows App SDK {packageVersion}";
-        }
-
-        return ResolveWindowsAppSdkDisplayNameFromFileVersion();
-    }
-
-    private static string ResolveWindowsAppSdkDisplayNameFromFileVersion()
-    {
-        var xamlNativePath = Path.Combine(AppContext.BaseDirectory, "Microsoft.ui.xaml.dll");
-        if (File.Exists(xamlNativePath))
-        {
-            try
-            {
-                var productVersion = FileVersionInfo.GetVersionInfo(xamlNativePath).ProductVersion;
-                if (!string.IsNullOrWhiteSpace(productVersion))
-                {
-                    return $"Windows App SDK {StripBuildMetadata(productVersion)}";
-                }
-            }
-            catch (Exception ex) when (ex is IOException or UnauthorizedAccessException or ArgumentException)
-            {
-                Logger.Warn($"Failed to read Windows App SDK version from {xamlNativePath}: {ex.Message}");
-            }
-        }
-
-        return "Windows App SDK";
-    }
-
-    private static string? TryResolveWindowsAppSdkPackageVersionFromDeps()
-    {
-        var assemblyName = Assembly.GetEntryAssembly()?.GetName().Name;
-        if (string.IsNullOrWhiteSpace(assemblyName))
-            return null;
-
-        var depsPath = Path.Combine(AppContext.BaseDirectory, $"{assemblyName}.deps.json");
-        if (!File.Exists(depsPath))
-            return null;
-
-        try
-        {
-            using var stream = File.OpenRead(depsPath);
-            using var document = JsonDocument.Parse(stream);
-            if (!document.RootElement.TryGetProperty("libraries", out var libraries) ||
-                libraries.ValueKind != JsonValueKind.Object)
-            {
-                return null;
-            }
-
-            foreach (var library in libraries.EnumerateObject())
-            {
-                const string packagePrefix = "Microsoft.WindowsAppSDK/";
-                if (library.Name.StartsWith(packagePrefix, StringComparison.OrdinalIgnoreCase))
-                {
-                    return StripBuildMetadata(library.Name[packagePrefix.Length..]);
-                }
-            }
-        }
-        catch (Exception ex) when (ex is IOException or UnauthorizedAccessException or JsonException or ArgumentException)
-        {
-            Logger.Warn($"Failed to read Windows App SDK package version from {depsPath}: {ex.Message}");
-        }
-
-        return null;
-    }
-
-    private static string StripBuildMetadata(string version)
-    {
-        var plus = version.IndexOf('+', StringComparison.Ordinal);
-        return plus >= 0 ? version[..plus] : version;
-    }
-
-    private void CaptureGatewayUptimeSample(GatewaySelfInfo self)
-    {
-        if (!self.UptimeMs.HasValue)
-        {
-            _sampledGatewayUptimeMs = null;
-            _uptimeRefreshTimer.Stop();
-            return;
-        }
-
-        if (_sampledGatewayUptimeMs != self.UptimeMs.Value)
-        {
-            _sampledGatewayUptimeMs = self.UptimeMs.Value;
-            _sampledGatewayUptimeUtc = DateTime.UtcNow;
-        }
-
-        if (!_uptimeRefreshTimer.IsEnabled)
-            _uptimeRefreshTimer.Start();
-    }
-
-    private void OnUptimeRefreshTimerTick(object? sender, object e)
-    {
-        RefreshGatewayUptimeText();
-    }
-
-    private void RefreshGatewayUptimeText()
-    {
-        if (CurrentApp.AppState?.Status != OpenClaw.Shared.ConnectionStatus.Connected ||
-            !_sampledGatewayUptimeMs.HasValue)
-        {
-            _uptimeRefreshTimer.Stop();
-            GatewayUptimeText.Text = "—";
-            return;
-        }
-
-        var elapsedMs = Math.Max(0, (DateTime.UtcNow - _sampledGatewayUptimeUtc).TotalMilliseconds);
-        GatewayUptimeText.Text = FormatDuration(TimeSpan.FromMilliseconds(_sampledGatewayUptimeMs.Value + elapsedMs));
-    }
-
-    private static string FormatDuration(TimeSpan duration)
-    {
-        if (duration.TotalDays >= 1)
-            return $"{(int)duration.TotalDays}d {duration.Hours}h";
-        if (duration.TotalHours >= 1)
-            return $"{(int)duration.TotalHours}h {duration.Minutes}m";
-        if (duration.TotalMinutes >= 1)
-            return $"{(int)duration.TotalMinutes}m {duration.Seconds}s";
-        return $"{Math.Max(0, (int)duration.TotalSeconds)}s";
-    }
-
-    private void OnDashboardClick(object sender, RoutedEventArgs e)
-    {
-        ((IAppCommands)CurrentApp).OpenDashboard(null);
-    }
-}
diff --git a/src/OpenClaw.Tray.WinUI/Pages/AgentEventsPage.xaml b/src/OpenClaw.Tray.WinUI/Pages/AgentEventsPage.xaml
index c5e82ef28..594fb8211 100644
--- a/src/OpenClaw.Tray.WinUI/Pages/AgentEventsPage.xaml
+++ b/src/OpenClaw.Tray.WinUI/Pages/AgentEventsPage.xaml
@@ -3,6 +3,7 @@
     x:Class="OpenClawTray.Pages.AgentEventsPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:OpenClawTray.Controls"
     xmlns:helpers="using:OpenClawTray.Helpers">
 
     <Grid Padding="24,16,24,16" MaxWidth="900" HorizontalAlignment="Stretch">
@@ -16,7 +17,9 @@
 
         <StackPanel Grid.Row="0" Spacing="4" Margin="0,0,0,12">
             <StackPanel Orientation="Horizontal" Spacing="8">
-                <TextBlock x:Uid="AgentEventsPage_TextBlock_18" Text="Event Stream" Style="{StaticResource TitleTextBlockStyle}"/>
+                <TextBlock x:Uid="AgentEventsPage_TextBlock_18" Text="Event Stream"
+                           AutomationProperties.AutomationId="AgentEventsPageMarker"
+                           Style="{StaticResource TitleTextBlockStyle}"/>
                 <Border x:Name="LiveBadge" CornerRadius="4" Padding="6,2,8,3" VerticalAlignment="Center"
                         Background="#20FF4444">
                     <StackPanel Orientation="Horizontal" Spacing="4">
@@ -48,11 +51,12 @@
                       SelectionChanged="OnAgentFilterComboChanged">
                 <ComboBoxItem x:Uid="AgentEventsPage_ComboBoxItem_26" Content="All Agents" Tag="" IsSelected="True"/>
             </ComboBox>
-            <Button x:Name="ClearButton" Grid.Column="2" Click="OnClear">
+            <Button x:Name="ClearButton" Grid.Column="2" Click="OnClear"
+                    AutomationProperties.LabeledBy="{Binding ElementName=ClearButtonLabel}">
                 <StackPanel Orientation="Horizontal" Spacing="8">
                     <FontIcon Glyph="{x:Bind helpers:FluentIconCatalog.Clear, Mode=OneTime}"
                               FontSize="14" IsTextScaleFactorEnabled="False"/>
-                    <TextBlock x:Uid="AgentEventsPage_ClearButton" Text="Clear"/>
+                    <TextBlock x:Uid="AgentEventsPage_ClearButton" x:Name="ClearButtonLabel" Text="Clear"/>
                 </StackPanel>
             </Button>
         </Grid>
@@ -137,7 +141,7 @@
         <!-- Empty state -->
         <StackPanel x:Name="EmptyState" Grid.Row="3"
                     VerticalAlignment="Center" HorizontalAlignment="Center" Spacing="8">
-            <TextBlock Text="🤖" FontSize="48" HorizontalAlignment="Center"/>
+            <controls:BrandMark MarkSize="48" HorizontalAlignment="Center"/>
             <TextBlock x:Uid="AgentEventsPage_TextBlock_96" Text="No events in this session"
                        Style="{StaticResource SubtitleTextBlockStyle}"
                        HorizontalAlignment="Center"/>
diff --git a/src/OpenClaw.Tray.WinUI/Pages/BindingsPage.xaml b/src/OpenClaw.Tray.WinUI/Pages/BindingsPage.xaml
index 641f91e8f..296e58129 100644
--- a/src/OpenClaw.Tray.WinUI/Pages/BindingsPage.xaml
+++ b/src/OpenClaw.Tray.WinUI/Pages/BindingsPage.xaml
@@ -15,6 +15,7 @@
                 </Grid.ColumnDefinitions>
                 <StackPanel Spacing="2">
                     <TextBlock x:Uid="BindingsPage_TextBlock_16" Text="Bindings"
+                               AutomationProperties.AutomationId="BindingsPageMarker"
                                Style="{StaticResource TitleTextBlockStyle}"/>
                     <TextBlock x:Uid="BindingsPage_TextBlock_17" Text="Message routing rules"
                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
diff --git a/src/OpenClaw.Tray.WinUI/Pages/ChannelsPage.xaml b/src/OpenClaw.Tray.WinUI/Pages/ChannelsPage.xaml
index a1a4faa09..de66075a5 100644
--- a/src/OpenClaw.Tray.WinUI/Pages/ChannelsPage.xaml
+++ b/src/OpenClaw.Tray.WinUI/Pages/ChannelsPage.xaml
@@ -37,6 +37,7 @@
                     </Grid.ColumnDefinitions>
                     <StackPanel Spacing="4">
                         <TextBlock x:Uid="ChannelsPage_Title" Text="Channels"
+                                   AutomationProperties.AutomationId="ChannelsPageMarker"
                                    Style="{StaticResource TitleTextBlockStyle}"/>
                         <TextBlock x:Name="MetaText"
                                    Style="{StaticResource CaptionTextBlockStyle}"
diff --git a/src/OpenClaw.Tray.WinUI/Pages/ChatPage.xaml.cs b/src/OpenClaw.Tray.WinUI/Pages/ChatPage.xaml.cs
index 15a04fba9..e0e3db9c6 100644
--- a/src/OpenClaw.Tray.WinUI/Pages/ChatPage.xaml.cs
+++ b/src/OpenClaw.Tray.WinUI/Pages/ChatPage.xaml.cs
@@ -10,6 +10,7 @@
 using OpenClawTray.Windows;
 using OpenClaw.Connection;
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Net.Http;
@@ -26,10 +27,12 @@ public sealed partial class ChatPage : Page
     private HubWindow? _hub;
     private MountedFunctionalChat? _functionalHost;
     private IChatDataProvider? _mountedProvider;
+    private IChatDataProvider? _accessibilityTestProvider;
     private string? _mountedThreadId;
     private string? _chatUrl;
     private bool _webViewInitialized;
     private bool _webViewMode;
+    private bool _pageActive;
     private bool _navigationStarted;
     private CancellationTokenSource? _navigationCts;
     private global::Windows.Foundation.TypedEventHandler<CoreWebView2, CoreWebView2NavigationCompletedEventArgs>? _navCompletedHandler;
@@ -51,6 +54,9 @@ public ChatPage()
 
     private void OnUnloaded(object sender, RoutedEventArgs e)
     {
+        _pageActive = false;
+        UpdateNativeChatSurfaceActive();
+
         // Don't tear down the native chat host — preserve it across page
         // navigations so that scroll position, selected session, and loaded
         // history survive. ShowFunctionalSurface's _mountedProvider check
@@ -111,6 +117,7 @@ private void RetryTriggerVoice(int retries, int delayMs)
 
     public void Initialize()
     {
+        _pageActive = true;
         _hub = CurrentApp.ActiveHubWindow as HubWindow;
 
         // Compute a "open in browser" URL once so the toolbar button works
@@ -165,6 +172,17 @@ private void OnAppChatProviderChanged(object? sender, EventArgs e)
         _ = dispatcher.TryEnqueue(ApplyChatSurface);
     }
 
+    internal void SelectSession(string sessionKey)
+    {
+        if (string.IsNullOrWhiteSpace(sessionKey))
+            return;
+
+        if (_hub is not null)
+            _hub.PendingChatSessionKey = sessionKey;
+        CurrentApp.PendingChatSessionKey = sessionKey;
+        ApplyChatSurface();
+    }
+
     private void ApplyChatSurface()
     {
         if (CurrentApp.Settings is null) return;
@@ -213,7 +231,7 @@ private void ShowFunctionalSurface()
         DevToolsButton.Visibility = Visibility.Collapsed;
 
         var app = App.Current as App;
-        var provider = app?.ChatProvider;
+        var provider = ResolveChatProvider(app);
         Func<string, Task>? readAloud = app is null ? null : app.SpeakChatTextAsync;
 
         // Consume a pending session-key hand-off from SessionsPage or a
@@ -237,6 +255,7 @@ private void ShowFunctionalSurface()
         {
             PlaceholderPanel.Visibility = Visibility.Collapsed;
             ChatHost.Visibility = Visibility.Visible;
+            UpdateNativeChatSurfaceActive();
             // Check for pending auto-start voice even when already mounted
             if (_hub?.PendingAutoStartVoice == true)
             {
@@ -258,6 +277,7 @@ private void ShowFunctionalSurface()
 
             PlaceholderPanel.Visibility = Visibility.Visible;
             ChatHost.Visibility = Visibility.Collapsed;
+            UpdateNativeChatSurfaceActive();
             return;
         }
 
@@ -277,6 +297,7 @@ private void ShowFunctionalSurface()
             suppressAutoDispose: true);
         _mountedProvider = provider;
         _mountedThreadId = threadIdToMount;
+        UpdateNativeChatSurfaceActive();
 
         // If the V hotkey (or another caller) requested auto-start voice,
         // trigger it after the UI thread processes the mount (composer needs
@@ -291,6 +312,116 @@ private void ShowFunctionalSurface()
         }
     }
 
+    private IChatDataProvider? ResolveChatProvider(App? app)
+    {
+        if (app?.ChatProvider is { } liveProvider)
+            return liveProvider;
+
+        // The accessibility suite launches an isolated app process without a
+        // gateway. Mount a deterministic provider only under its explicit
+        // test flag so Axe scans the real FunctionalUI timeline and composer,
+        // not merely the disconnected page shell.
+        if (Environment.GetEnvironmentVariable("OPENCLAW_ACCESSIBILITY_TEST_CHAT") == "1"
+            && Environment.GetEnvironmentVariable("OPENCLAW_TRAY_DATA_DIR") is { Length: > 0 })
+        {
+            return _accessibilityTestProvider ??= new AccessibilityChatDataProvider();
+        }
+
+        return null;
+    }
+
+    private sealed class AccessibilityChatDataProvider : IChatDataProvider
+    {
+        private const string ThreadId = "accessibility-main";
+        private static readonly ChatDataSnapshot Snapshot = CreateSnapshot();
+
+        public string DisplayName => "Accessibility test chat";
+
+        public event EventHandler<ChatDataChangedEventArgs>? Changed
+        {
+            add { }
+            remove { }
+        }
+
+        public event EventHandler<ChatProviderNotificationEventArgs>? NotificationRequested
+        {
+            add { }
+            remove { }
+        }
+
+        public Task<ChatDataSnapshot> LoadAsync(CancellationToken cancellationToken = default)
+            => Task.FromResult(Snapshot);
+
+        public Task SendMessageAsync(
+            string threadId,
+            string message,
+            CancellationToken cancellationToken = default)
+            => Task.CompletedTask;
+
+        public Task StopResponseAsync(string threadId, CancellationToken cancellationToken = default)
+            => Task.CompletedTask;
+
+        public Task SetThreadSuspendedAsync(string threadId, bool suspended, CancellationToken cancellationToken = default)
+            => Task.CompletedTask;
+
+        public Task DeleteThreadAsync(string threadId, CancellationToken cancellationToken = default)
+            => Task.CompletedTask;
+
+        public Task SetModelAsync(string threadId, string model, CancellationToken cancellationToken = default)
+            => Task.CompletedTask;
+
+        public Task SetThinkingLevelAsync(string threadId, string thinkingLevel, CancellationToken cancellationToken = default)
+            => Task.CompletedTask;
+
+        public Task SetPermissionModeAsync(string threadId, bool allowAll, CancellationToken cancellationToken = default)
+            => Task.CompletedTask;
+
+        public Task RespondToPermissionAsync(
+            string threadId,
+            string requestId,
+            string action,
+            CancellationToken cancellationToken = default)
+            => Task.CompletedTask;
+
+        public ValueTask DisposeAsync() => ValueTask.CompletedTask;
+
+        private static ChatDataSnapshot CreateSnapshot()
+        {
+            var timeline = ChatTimelineState.Initial() with
+            {
+                Entries = ChatTimelineState.Initial().Entries
+                    .Add(new ChatTimelineItem(
+                        "accessibility-user",
+                        ChatTimelineItemKind.User,
+                        "Verify the native chat surface."))
+                    .Add(new ChatTimelineItem(
+                        "accessibility-assistant",
+                        ChatTimelineItemKind.Assistant,
+                        "The timeline and composer are ready.")),
+                NextId = 3,
+                HistoryLoaded = true,
+            };
+
+            return new ChatDataSnapshot(
+                [new ChatThread
+                {
+                    Id = ThreadId,
+                    Title = "Accessibility session",
+                    Status = ChatThreadStatus.Running,
+                    Activity = ChatActivity.Idle,
+                    Model = "test-model",
+                }],
+                new Dictionary<string, ChatTimelineState>
+                {
+                    [ThreadId] = timeline,
+                },
+                ThreadId,
+                "Connected (accessibility test)",
+                ["test-model"],
+                new ChatComposeTarget(ThreadId, IsReady: true));
+        }
+    }
+
     private void ShowWebViewSurface(bool forceNavigate = false)
     {
         // Consume pending session key for WebView mode.
@@ -312,6 +443,7 @@ private void ShowWebViewSurface(bool forceNavigate = false)
         DisposeFunctionalHost();
 
         ChatHost.Visibility = Visibility.Collapsed;
+        UpdateNativeChatSurfaceActive();
         PlaceholderPanel.Visibility = Visibility.Collapsed;
         ToolbarBorder.Visibility = Visibility.Visible;
         HomeButton.Visibility = Visibility.Visible;
@@ -391,10 +523,17 @@ private void DisposeFunctionalHost()
         _functionalHost = null;
         _mountedProvider = null;
         _mountedThreadId = null;
+        UpdateNativeChatSurfaceActive();
         try { host?.Dispose(); }
         catch (Exception ex) { Logger.Debug($"ChatPage: functional host dispose tear-down race: {ex.Message}"); }
     }
 
+    private void UpdateNativeChatSurfaceActive()
+    {
+        if (App.Current is App app)
+            app.SetHubNativeChatSurfaceActive(_pageActive && !_webViewMode && _functionalHost is not null);
+    }
+
     private async Task InitializeWebViewAsync(SettingsManager settings)
     {
         try
@@ -816,17 +955,21 @@ private async Task PickAndAttachFileAsync()
             }
 
             var hwnd = WinRT.Interop.WindowNative.GetWindowHandle((Window)_hub!);
-            var path = await Win32FilePickerHelper.PickSingleFileAsync(hwnd, LocalizationHelper.GetString("ChatPage_AttachFile"));
+            var paths = await Win32FilePickerHelper.PickMultipleFilesAsync(hwnd, LocalizationHelper.GetString("ChatPage_AttachFile"));
 
-            if (path is null)
+            if (paths.Count == 0)
             {
                 Logger.Info("[ChatPage] File picker cancelled by user");
                 return;
             }
 
-            Logger.Info($"[ChatPage] File selected: {path}");
-            var attachment = await ChatAttachment.FromFileAsync(path);
-            _functionalHost?.AttachFile(attachment);
+            var attachments = new List<ChatAttachment>(paths.Count);
+            foreach (var path in paths)
+            {
+                Logger.Info($"[ChatPage] File selected: {path}");
+                attachments.Add(await ChatAttachment.FromFileAsync(path));
+            }
+            _functionalHost?.AttachFiles(attachments);
         }
         catch (InvalidOperationException ex)
         {
diff --git a/src/OpenClaw.Tray.WinUI/Pages/ConfigPage.xaml b/src/OpenClaw.Tray.WinUI/Pages/ConfigPage.xaml
index 05821d92e..341b8abc3 100644
--- a/src/OpenClaw.Tray.WinUI/Pages/ConfigPage.xaml
+++ b/src/OpenClaw.Tray.WinUI/Pages/ConfigPage.xaml
@@ -27,6 +27,7 @@
                 </Grid.ColumnDefinitions>
                 <StackPanel Grid.Column="0" Spacing="4">
                     <TextBlock x:Uid="ConfigPage_TextBlock_17" Text="Config"
+                               AutomationProperties.AutomationId="ConfigPageMarker"
                                Style="{StaticResource TitleTextBlockStyle}"/>
                     <TextBlock x:Uid="ConfigSubtitle" x:Name="ConfigSubtitle"
                                Text="Edit gateway configuration (openclaw.json) with a schema-guided form."
@@ -40,10 +41,11 @@
                 </StackPanel>
                 <Button Grid.Column="1"
                         x:Name="RefreshButton" Click="OnRefresh"
+                        AutomationProperties.LabeledBy="{Binding ElementName=RefreshButtonLabel}"
                         VerticalAlignment="Center">
                     <StackPanel Orientation="Horizontal" Spacing="6">
                         <FontIcon Glyph="&#xE72C;" FontSize="14"/>
-                        <TextBlock x:Uid="ConfigPage_TextBlock_21" Text="Refresh"/>
+                        <TextBlock x:Uid="ConfigPage_TextBlock_21" x:Name="RefreshButtonLabel" Text="Refresh"/>
                     </StackPanel>
                 </Button>
             </Grid>
@@ -226,8 +228,11 @@
 
                     <toolkit:GridSplitter Grid.Column="3"
                                           x:Name="JsonPreviewSplitter"
+                                          x:Uid="JsonPreviewSplitter"
                                           ResizeDirection="Columns"
                                           ResizeBehavior="PreviousAndNext"
+                                          AutomationProperties.Name="Resize JSON preview"
+                                          AutomationProperties.LocalizedControlType="splitter"
                                           HorizontalAlignment="Stretch"
                                           VerticalAlignment="Stretch"
                                           Background="{ThemeResource CardStrokeColorDefaultBrush}"/>
diff --git a/src/OpenClaw.Tray.WinUI/Pages/ConfigPage.xaml.cs b/src/OpenClaw.Tray.WinUI/Pages/ConfigPage.xaml.cs
index e27782fd7..0a6f4234d 100644
--- a/src/OpenClaw.Tray.WinUI/Pages/ConfigPage.xaml.cs
+++ b/src/OpenClaw.Tray.WinUI/Pages/ConfigPage.xaml.cs
@@ -28,6 +28,8 @@ public sealed partial class ConfigPage : Page
     private const double JsonPreviewMinWidth = 340;
 
     private static App CurrentApp => (App)Microsoft.UI.Xaml.Application.Current!;
+    private static string L(string key) => LocalizationHelper.GetString(key);
+    private static string Lf(string key, params object?[] args) => LocalizationHelper.Format(key, args);
     private AppState? _appState;
     private JsonElement? _lastConfig;
     private JsonElement? _lastSchema;
@@ -148,7 +150,7 @@ public void UpdateConfig(JsonElement config)
 
                 if (configSnapshot.TryGetProperty("path", out var pathEl) &&
                     pathEl.ValueKind == JsonValueKind.String)
-                    ConfigSubtitle.Text = $"Editing {pathEl.GetString()} via schema-guided form.";
+                    ConfigSubtitle.Text = Lf("ConfigPage_EditingPathFormat", pathEl.GetString());
 
                 _loading = false;
                 SetInfoBarOpen(ConnectionInfoBar, CurrentApp.GatewayClient == null);
@@ -161,7 +163,9 @@ public void UpdateConfig(JsonElement config)
             catch (Exception ex)
             {
                 Logger.Error($"[ConfigPage] Failed to render config: {ex}");
-                ShowConfigRenderError("Config unavailable", "The gateway config could not be rendered. Refresh and try again.");
+                ShowConfigRenderError(
+                    L("ConfigPage_RenderConfigUnavailableTitle"),
+                    L("ConfigPage_RenderConfigUnavailableMessage"));
             }
         });
     }
@@ -192,7 +196,9 @@ public void UpdateConfigSchema(JsonElement schema)
             catch (Exception ex)
             {
                 Logger.Error($"[ConfigPage] Failed to render config schema: {ex}");
-                ShowConfigRenderError("Schema unavailable", "The gateway schema could not be rendered. Raw JSON remains available as a read-only preview.");
+                ShowConfigRenderError(
+                    L("ConfigPage_RenderSchemaUnavailableTitle"),
+                    L("ConfigPage_RenderSchemaUnavailableMessage"));
             }
         });
     }
@@ -214,7 +220,10 @@ private void OnAppStateChanged(object? sender, PropertyChangedEventArgs e)
                 var configPermissionState = GetConfigPermissionState();
                 if (configPermissionState == ConfigPermissionState.Disconnected && _refreshConfigAfterReconnect)
                 {
-                    ShowStatus("Gateway restarting", "Saving changes. The gateway is restarting and will reconnect automatically.", InfoBarSeverity.Informational);
+                    ShowStatus(
+                        L("ConfigPage_StatusGatewayRestartingTitle"),
+                        L("ConfigPage_StatusGatewayRestartingMessage"),
+                        InfoBarSeverity.Informational);
                     ShowReconnectDialog(LocalizationHelper.GetString("ConfigPage_ReconnectDialogWaiting"));
                 }
                 else if (_refreshConfigAfterReconnect &&
@@ -480,14 +489,20 @@ private async Task OnSaveAsync()
 
         if (_pendingChanges.Count == 0)
         {
-            ShowStatus("No changes", "There is nothing to save.", InfoBarSeverity.Informational);
+            ShowStatus(
+                L("ConfigPage_StatusNoChangesTitle"),
+                L("ConfigPage_StatusNoChangesMessage"),
+                InfoBarSeverity.Informational);
             return;
         }
 
         if (_validationErrors.Count > 0)
         {
             var first = _validationErrors.First();
-            ShowStatus("Fix validation errors", $"{first.Key}: {first.Value}", InfoBarSeverity.Error);
+            ShowStatus(
+                L("ConfigPage_StatusFixValidationErrorsTitle"),
+                Lf("ConfigPage_StatusValidationErrorMessageFormat", first.Key, first.Value),
+                InfoBarSeverity.Error);
             UpdateMetaAndButtons();
             return;
         }
@@ -495,14 +510,20 @@ private async Task OnSaveAsync()
         var client = CurrentApp.GatewayClient;
         if (client == null)
         {
-            ShowStatus("Not connected", "Connect to a gateway before saving config.", InfoBarSeverity.Error);
+            ShowStatus(
+                L("ConfigPage_StatusNotConnectedTitle"),
+                L("ConfigPage_StatusNotConnectedMessage"),
+                InfoBarSeverity.Error);
             UpdateMetaAndButtons();
             return;
         }
 
         if (!OperatorScopeHelper.CanWriteConfig(client.GrantedOperatorScopes))
         {
-            ShowStatus("Config is read-only", "This operator token does not have operator.write permission, so config changes cannot be saved.", InfoBarSeverity.Warning);
+            ShowStatus(
+                L("ConfigPage_ConfigIsReadOnly"),
+                L("ConfigPage_StatusReadOnlyMessage"),
+                InfoBarSeverity.Warning);
             UpdatePermissionBanner();
             UpdateMetaAndButtons();
             return;
@@ -511,14 +532,20 @@ private async Task OnSaveAsync()
         var saveBase = _editSnapshot.HasRoot ? _editSnapshot : _serverSnapshot;
         if (!saveBase.HasRoot)
         {
-            ShowStatus("Config not loaded", "Refresh the gateway config before saving.", InfoBarSeverity.Error);
+            ShowStatus(
+                L("ConfigPage_StatusConfigNotLoadedTitle"),
+                L("ConfigPage_StatusConfigNotLoadedMessage"),
+                InfoBarSeverity.Error);
             UpdateMetaAndButtons();
             return;
         }
 
         _saving = true;
         UpdateMetaAndButtons();
-        ShowStatus("Saving config…", $"Writing {_pendingChanges.Count} change(s) to the gateway.", InfoBarSeverity.Informational);
+        ShowStatus(
+            L("ConfigPage_StatusSavingConfigTitle"),
+            Lf("ConfigPage_StatusSavingConfigMessageFormat", _pendingChanges.Count),
+            InfoBarSeverity.Informational);
 
         try
         {
@@ -531,15 +558,17 @@ private async Task OnSaveAsync()
                     _editSnapshot = ConfigEditorSnapshot.Empty;
                     _ = client.RequestConfigAsync();
                     ShowStatus(
-                        "Gateway config changed elsewhere",
-                        $"Your edits are preserved. The latest config is being refreshed; review the form and try Save again. Details: {result.Error ?? "stale config hash"}",
+                        L("ConfigPage_StatusStaleConfigTitle"),
+                        Lf(
+                            "ConfigPage_StatusStaleConfigMessageFormat",
+                            result.Error ?? L("ConfigPage_StatusStaleConfigDefaultDetail")),
                         InfoBarSeverity.Warning);
                 }
                 else
                 {
                     ShowStatus(
-                        "Save failed",
-                        result.Error ?? "The gateway rejected the config update. Your changes are preserved.",
+                        L("ConfigPage_StatusSaveFailedTitle"),
+                        result.Error ?? L("ConfigPage_StatusSaveRejectedMessage"),
                         InfoBarSeverity.Error);
                 }
                 return;
@@ -551,7 +580,10 @@ private async Task OnSaveAsync()
             _refreshConfigAfterReconnect = true;
             _refreshConfigWhenGatewayAvailable = true;
             ShowReconnectDialog(LocalizationHelper.GetString("ConfigPage_ReconnectDialogAccepted"));
-            ShowStatus("Gateway restarting", "Saving changes. The gateway is restarting and will reconnect automatically.", InfoBarSeverity.Informational);
+            ShowStatus(
+                L("ConfigPage_StatusGatewayRestartingTitle"),
+                L("ConfigPage_StatusGatewayRestartingMessage"),
+                InfoBarSeverity.Informational);
             _reconnectCompletionTimer.Stop();
             _reconnectCompletionTimer.Start();
             _reconnectTimeoutTimer.Stop();
@@ -559,7 +591,10 @@ private async Task OnSaveAsync()
         }
         catch (Exception ex)
         {
-            ShowStatus("Save failed", $"{ex.Message} Your changes are preserved.", InfoBarSeverity.Error);
+            ShowStatus(
+                L("ConfigPage_StatusSaveFailedTitle"),
+                Lf("ConfigPage_StatusSaveExceptionMessageFormat", ex.Message),
+                InfoBarSeverity.Error);
         }
         finally
         {
@@ -590,7 +625,7 @@ private void RefreshFromGateway()
         if (permissionState == ConfigPermissionState.Checking)
         {
             _loading = false;
-            SaveStatus.Text = "Checking config permissions…";
+            SaveStatus.Text = L("ConfigPage_SaveStatusCheckingConfigPermissions");
             UpdatePermissionBanner();
             UpdateMetaAndButtons();
             return;
@@ -606,7 +641,7 @@ private void RefreshFromGateway()
 
         _loading = true;
         LoadingState.Visibility = Visibility.Visible;
-        SaveStatus.Text = "Refreshing…";
+        SaveStatus.Text = L("ConfigPage_SaveStatusRefreshing");
         UpdatePermissionBanner();
         _ = CurrentApp.GatewayClient.RequestConfigSchemaAsync();
         _ = CurrentApp.GatewayClient.RequestConfigAsync();
@@ -630,7 +665,10 @@ private void OnDiscardChanges(object sender, RoutedEventArgs e)
         _pendingChanges.Clear();
         _validationErrors.Clear();
         _editSnapshot = ConfigEditorSnapshot.Empty;
-        ShowStatus("Changes discarded", "The form is back to the last config loaded from the gateway.", InfoBarSeverity.Informational);
+        ShowStatus(
+            L("ConfigPage_StatusChangesDiscardedTitle"),
+            L("ConfigPage_StatusChangesDiscardedMessage"),
+            InfoBarSeverity.Informational);
         RenderTree();
         RestoreSelectedDetail();
         UpdateSelectedJsonPreviewForCurrentSelection();
@@ -641,8 +679,11 @@ private void OnResetSection(object sender, RoutedEventArgs e)
     {
         RemoveSectionEntries(_selectedPath, _pendingChanges);
         RemoveSectionEntries(_selectedPath, _validationErrors);
-        var sectionLabel = string.IsNullOrEmpty(_selectedPath) ? "Full config" : _selectedPath;
-        ShowStatus("Section reset", $"{sectionLabel} is back to the last loaded gateway value.", InfoBarSeverity.Informational);
+        var sectionLabel = string.IsNullOrEmpty(_selectedPath) ? L("ConfigPage_FullConfig") : _selectedPath;
+        ShowStatus(
+            L("ConfigPage_StatusSectionResetTitle"),
+            Lf("ConfigPage_StatusSectionResetMessageFormat", sectionLabel),
+            InfoBarSeverity.Informational);
         RenderTree();
         RestoreSelectedDetail();
         UpdateSelectedJsonPreviewForCurrentSelection();
@@ -664,7 +705,10 @@ private void OnCopySelectedJson(object sender, RoutedEventArgs e)
         var package = new global::Windows.ApplicationModel.DataTransfer.DataPackage();
         package.SetText(_selectedJsonCopyText);
         global::Windows.ApplicationModel.DataTransfer.Clipboard.SetContent(package);
-        ShowStatus("Copied JSON diff", "The selected section diff was copied to the clipboard.", InfoBarSeverity.Success);
+        ShowStatus(
+            L("ConfigPage_StatusCopiedJsonDiffTitle"),
+            L("ConfigPage_StatusCopiedJsonDiffMessage"),
+            InfoBarSeverity.Success);
     }
 
     private void OnToggleJsonPreview(object sender, RoutedEventArgs e)
@@ -841,9 +885,10 @@ private void UpdateMetaAndButtons()
         var canWriteConfig = permissionState == ConfigPermissionState.ReadWrite;
         var editingLocked = IsConfigEditingLocked(permissionState);
         ConfigMetaText.Text = dirtyCount == 0
-            ? "No unsaved changes."
-            : $"{dirtyCount} unsaved change{(dirtyCount == 1 ? "" : "s")}" +
-              (invalidCount > 0 ? $" · {invalidCount} validation issue{(invalidCount == 1 ? "" : "s")}" : "");
+            ? L("ConfigPage_MetaNoUnsavedChanges")
+            : invalidCount > 0
+                ? Lf("ConfigPage_MetaUnsavedChangesWithValidationFormat", dirtyCount, invalidCount)
+                : Lf("ConfigPage_MetaUnsavedChangesFormat", dirtyCount);
 
         SaveStatus.Text = BuildSaveStatusText(permissionState, dirtyCount, invalidCount);
         SaveStatusIcon.Glyph = BuildSaveStatusGlyph(permissionState, dirtyCount, invalidCount);
@@ -872,20 +917,22 @@ private void SetDetailEditingEnabled(bool isEnabled)
     private string BuildSaveStatusText(ConfigPermissionState permissionState, int dirtyCount, int invalidCount)
     {
         if (_saving)
-            return "Saving…";
+            return L("ConfigPage_SaveStatusSaving");
         if (permissionState == ConfigPermissionState.Disconnected)
-            return _refreshConfigAfterReconnect ? "Gateway restarting…" : "Connect to a gateway to edit";
+            return _refreshConfigAfterReconnect
+                ? L("ConfigPage_SaveStatusGatewayRestarting")
+                : L("ConfigPage_SaveStatusConnectToGateway");
         if (permissionState == ConfigPermissionState.Checking)
-            return "Checking permissions…";
+            return L("ConfigPage_SaveStatusCheckingPermissions");
         if (permissionState == ConfigPermissionState.NoRead)
-            return "Config unavailable: missing operator.read";
+            return L("ConfigPage_SaveStatusMissingRead");
         if (permissionState == ConfigPermissionState.ReadOnly && dirtyCount > 0)
-            return "Read-only: missing operator.write";
+            return L("ConfigPage_SaveStatusReadOnlyMissingWrite");
         if (invalidCount > 0)
-            return "Fix validation errors before saving";
+            return L("ConfigPage_SaveStatusFixValidationBeforeSaving");
         if (dirtyCount > 0)
-            return "Unsaved changes";
-        return "No unsaved changes";
+            return L("ConfigPage_SaveStatusUnsavedChanges");
+        return L("ConfigPage_SaveStatusNoUnsavedChanges");
     }
 
     private string BuildSaveStatusGlyph(ConfigPermissionState permissionState, int dirtyCount, int invalidCount)
@@ -911,10 +958,10 @@ private void CompleteGatewayReconnect(bool refreshLatestConfig)
         _reconnectTimeoutTimer.Stop();
         DismissReconnectDialog();
         ShowStatus(
-            "Gateway reconnected",
+            L("ConfigPage_StatusGatewayReconnectedTitle"),
             refreshLatestConfig
-                ? "Configuration saved and the gateway connection is back. Refreshing the latest config."
-                : "Configuration saved and the latest gateway config is loaded.",
+                ? L("ConfigPage_StatusGatewayReconnectedRefreshingMessage")
+                : L("ConfigPage_StatusGatewayReconnectedLoadedMessage"),
             InfoBarSeverity.Success);
 
         if (refreshLatestConfig)
@@ -944,8 +991,8 @@ private void HandleReconnectTimeout()
         _reconnectCompletionTimer.Stop();
         DismissReconnectDialog();
         ShowStatus(
-            "Gateway still reconnecting",
-            "The config save was accepted, but the gateway has not reconnected yet. You can keep this page open or use Connection to check status.",
+            L("ConfigPage_StatusGatewayStillReconnectingTitle"),
+            L("ConfigPage_StatusGatewayStillReconnectingMessage"),
             InfoBarSeverity.Warning);
         UpdateMetaAndButtons();
     }
@@ -1055,18 +1102,18 @@ private static string BuildAccessSummaryText(ConfigPermissionState permissionSta
     {
         var access = permissionState switch
         {
-            ConfigPermissionState.Disconnected => "Disconnected",
-            ConfigPermissionState.Checking => "Checking access",
-            ConfigPermissionState.NoRead => "No config read access",
-            ConfigPermissionState.ReadOnly => "Read-only access",
-            ConfigPermissionState.ReadWrite => "Read/write access",
-            _ => "Unknown access"
+            ConfigPermissionState.Disconnected => L("ConfigPage_AccessDisconnected"),
+            ConfigPermissionState.Checking => L("ConfigPage_AccessChecking"),
+            ConfigPermissionState.NoRead => L("ConfigPage_AccessNoRead"),
+            ConfigPermissionState.ReadOnly => L("ConfigPage_AccessReadOnly"),
+            ConfigPermissionState.ReadWrite => L("ConfigPage_AccessReadWrite"),
+            _ => L("ConfigPage_AccessUnknown")
         };
-        var changes = $"{dirtyCount} change{(dirtyCount == 1 ? "" : "s")}";
+        var changes = Lf("ConfigPage_AccessChangesFormat", dirtyCount);
         var validation = invalidCount == 0
-            ? "Local validation clean"
-            : $"{invalidCount} validation issue{(invalidCount == 1 ? "" : "s")}";
-        return $"{access} · {changes} · {validation}";
+            ? L("ConfigPage_AccessValidationClean")
+            : Lf("ConfigPage_AccessValidationIssuesFormat", invalidCount);
+        return Lf("ConfigPage_AccessSummaryFormat", access, changes, validation);
     }
 
     private void ShowConfigRenderError(string title, string message)
@@ -1135,20 +1182,20 @@ private void UpdatePermissionBanner()
         {
             case ConfigPermissionState.Checking:
                 PermissionInfoBar.Title = LocalizationHelper.GetString("ConfigPage_CheckingConfigPermissions");
-                PermissionInfoBar.Message = "Waiting for the gateway to report this operator's permissions.";
+                PermissionInfoBar.Message = L("ConfigPage_CheckingConfigPermissionsMessage");
                 PermissionInfoBar.Severity = InfoBarSeverity.Informational;
                 SetInfoBarOpen(PermissionInfoBar, true);
                 break;
             case ConfigPermissionState.NoRead:
                 ClearConfigViewForNoRead();
                 PermissionInfoBar.Title = LocalizationHelper.GetString("ConfigPage_ConfigUnavailable");
-                PermissionInfoBar.Message = "This operator token lacks operator.read permission, so the gateway config cannot be loaded here.";
+                PermissionInfoBar.Message = L("ConfigPage_ConfigUnavailableMessage");
                 PermissionInfoBar.Severity = InfoBarSeverity.Error;
                 SetInfoBarOpen(PermissionInfoBar, true);
                 break;
             case ConfigPermissionState.ReadOnly:
                 PermissionInfoBar.Title = LocalizationHelper.GetString("ConfigPage_ConfigIsReadOnly");
-                PermissionInfoBar.Message = "This operator token can read config but lacks operator.write permission. You can inspect and validate drafts, but Save is disabled.";
+                PermissionInfoBar.Message = L("ConfigPage_ConfigIsReadOnlyMessage");
                 PermissionInfoBar.Severity = InfoBarSeverity.Warning;
                 SetInfoBarOpen(PermissionInfoBar, true);
                 break;
diff --git a/src/OpenClaw.Tray.WinUI/Pages/ConnectionPage.xaml b/src/OpenClaw.Tray.WinUI/Pages/ConnectionPage.xaml
index 8e37bc8d3..4a57d598b 100644
--- a/src/OpenClaw.Tray.WinUI/Pages/ConnectionPage.xaml
+++ b/src/OpenClaw.Tray.WinUI/Pages/ConnectionPage.xaml
@@ -59,12 +59,6 @@
                  PINNED MODIFIERS — render across every mode
                  ═════════════════════════════════════════════════════════ -->
 
-            <!-- Auth error (legacy, kept) -->
-            <InfoBar x:Name="AuthErrorBar"
-                     x:Uid="AuthErrorBar"
-                     Title="Connection Error"
-                     Severity="Error" IsOpen="False" IsClosable="True"/>
-
             <!-- Pending approvals (others waiting on the user's decision) -->
             <Border x:Name="PendingApprovalsBanner"
                     Visibility="Collapsed"
@@ -139,6 +133,7 @@
                         <!-- Headline + sub + glance chips -->
                         <StackPanel Grid.Column="1" VerticalAlignment="Center" Spacing="2">
                             <TextBlock x:Uid="ConnectionPage_NotConnected" x:Name="StripHeadline" Text="Not connected"
+                                       AutomationProperties.AutomationId="ConnectionPageMarker"
                                        Style="{StaticResource SubtitleTextBlockStyle}"
                                        AutomationProperties.HeadingLevel="Level1"
                                        AutomationProperties.LiveSetting="Polite"
@@ -416,30 +411,52 @@
                                       Glyph="{x:Bind helpers:FluentIconCatalog.StatusOk, Mode=OneTime}"
                                       FontSize="14"
                                       Foreground="{ThemeResource SystemFillColorNeutralBrush}"
-                                      VerticalAlignment="Center" HorizontalAlignment="Center"
+                                      VerticalAlignment="Top" HorizontalAlignment="Center"
+                                      Margin="0,2,0,0"
                                       AutomationProperties.AccessibilityView="Raw"/>
-                            <StackPanel Grid.Column="1" VerticalAlignment="Center" Spacing="2">
+                            <StackPanel Grid.Column="1" Spacing="2">
                                 <TextBlock x:Uid="ConnectionPage_NodeModeDisabled" x:Name="NodeStatusText"
                                            Text="Node mode disabled"
                                            Style="{StaticResource BodyTextBlockStyle}"/>
-                                <!-- Canonical capability list per design naming.md:
-                                     "Providing N capabilities: browser, camera, …"
-                                     Replaces the prior chip strip. -->
+                                <!-- MCP-only reachability line. Active node uses pills below. -->
                                 <TextBlock x:Name="NodeCapabilityText"
                                            Style="{StaticResource CaptionTextBlockStyle}"
                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
                                            TextWrapping="Wrap"
                                            Visibility="Collapsed"/>
-                                <TextBlock x:Name="NodeCommandText"
-                                           Style="{StaticResource CaptionTextBlockStyle}"
-                                           Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                           TextWrapping="Wrap"
-                                           Visibility="Collapsed"/>
-                                <TextBlock x:Name="NodePermissionText"
-                                           Style="{StaticResource CaptionTextBlockStyle}"
-                                           Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                           TextWrapping="Wrap"
-                                           Visibility="Collapsed"/>
+                                <Border x:Name="NodeCapabilityPillsHost"
+                                        Margin="0,2,0,0"
+                                        Visibility="Collapsed"/>
+                                <Expander x:Name="NodeTechnicalDetailsExpander"
+                                          Margin="0,6,0,0"
+                                          HorizontalAlignment="Stretch"
+                                          HorizontalContentAlignment="Stretch"
+                                          IsExpanded="False"
+                                          Visibility="Collapsed">
+                                    <Expander.Header>
+                                        <TextBlock x:Uid="ConnectionPage_NodeTechnicalDetails" Text="Show technical details"
+                                                   Style="{StaticResource CaptionTextBlockStyle}"
+                                                   Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                   VerticalAlignment="Center"/>
+                                    </Expander.Header>
+                                    <StackPanel Spacing="6" Padding="0,4,0,0">
+                                        <TextBlock x:Name="NodeTechCapabilityText"
+                                                   Style="{StaticResource CaptionTextBlockStyle}"
+                                                   Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                   IsTextSelectionEnabled="True"
+                                                   TextWrapping="Wrap"/>
+                                        <TextBlock x:Name="NodeTechCommandText"
+                                                   Style="{StaticResource CaptionTextBlockStyle}"
+                                                   Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                   IsTextSelectionEnabled="True"
+                                                   TextWrapping="Wrap"/>
+                                        <TextBlock x:Name="NodeTechPermissionText"
+                                                   Style="{StaticResource CaptionTextBlockStyle}"
+                                                   Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                   IsTextSelectionEnabled="True"
+                                                   TextWrapping="Wrap"/>
+                                    </StackPanel>
+                                </Expander>
                                 <StackPanel x:Name="NodePendingDeclarationsPanel"
                                             Spacing="2"
                                             Visibility="Collapsed">
@@ -525,15 +542,6 @@
                                 Margin="0,4,0,0"
                                 AutomationProperties.AutomationId="NodeReconnect"/>
 
-                        <!-- Capability chips removed in favor of NodeCapabilityText
-                             above. Element kept for back-compat with code-behind
-                             that may still reference it (currently inert). -->
-                        <ItemsRepeater x:Name="NodeCapabilityChipsHost" Visibility="Collapsed">
-                            <ItemsRepeater.Layout>
-                                <StackLayout Orientation="Horizontal" Spacing="6"/>
-                            </ItemsRepeater.Layout>
-                        </ItemsRepeater>
-
                         <!-- Deep link to per-capability config -->
                         <StackPanel x:Name="NodeDeepLinks" Orientation="Horizontal" Spacing="12">
                             <HyperlinkButton x:Uid="ConnectionPage_ManagePermissions" x:Name="NodePermissionsLink"
@@ -602,6 +610,11 @@
                                             Click="OnApplyRepairCode"
                                             AutomationProperties.AutomationId="RecoveryApplyRepair"/>
                                 </Grid>
+                                <TextBlock x:Name="RecoveryRepairResultText"
+                                           Visibility="Collapsed"
+                                           Style="{StaticResource CaptionTextBlockStyle}"
+                                           TextWrapping="Wrap"
+                                           AutomationProperties.AutomationId="RecoveryRepairResult"/>
                             </StackPanel>
                         </Border>
 
@@ -946,12 +959,83 @@
                                  Header="Shared token"
                                  PlaceholderText="Paste shared gateway token"
                                  AutomationProperties.AutomationId="AddDirectToken"/>
+                        <TextBlock x:Uid="ConnectionPage_TokenOrPasswordHint" x:Name="DirectAuthHintText"
+                                   Text="Paste a shared gateway token, or leave it blank to pair with a setup code."
+                                   Style="{StaticResource CaptionTextBlockStyle}"
+                                   Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                   TextWrapping="Wrap"/>
                         <TextBox x:Uid="ConnectionPage_NameOptional" x:Name="DirectNameBox"
                                  Header="Name (optional)"
                                  PlaceholderText="My gateway"
                                  AutomationProperties.AutomationId="AddDirectName"/>
                     </StackPanel>
 
+                    <!-- Remote gateway setup help — a lightweight info link that
+                         opens a TeachingTip. Deliberately NOT an Expander so it
+                         reads as guidance and is visually distinct from the
+                         functional "Use SSH tunnel" input section below. -->
+                    <HyperlinkButton x:Name="AddRemoteHelpLink"
+                                     Padding="0" FontSize="13"
+                                     Click="OnRemoteHelpClick"
+                                     AutomationProperties.AutomationId="AddRemoteHelpLink">
+                        <StackPanel Orientation="Horizontal" Spacing="6">
+                            <FontIcon Glyph="{x:Bind helpers:FluentIconCatalog.About, Mode=OneTime}"
+                                      FontSize="14" VerticalAlignment="Center"
+                                      AutomationProperties.AccessibilityView="Raw"/>
+                            <TextBlock x:Uid="ConnectionPage_RemoteSetupHelpLink"
+                                       Text="How do I connect to a remote gateway?"
+                                       VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </HyperlinkButton>
+
+                    <TeachingTip x:Name="AddRemoteHelpTip"
+                                 Target="{x:Bind AddRemoteHelpLink}"
+                                 x:Uid="ConnectionPage_RemoteSetupHelpTip"
+                                 Title="Connecting to a remote gateway"
+                                 PreferredPlacement="Bottom"
+                                 IsLightDismissEnabled="True">
+                        <TeachingTip.Content>
+                            <StackPanel Spacing="12" Margin="0,8,0,0">
+                                <StackPanel Spacing="2">
+                                    <TextBlock x:Uid="ConnectionPage_RemoteSetupHelpDirectTitle"
+                                               Text="Direct (TLS)" FontWeight="SemiBold"/>
+                                    <TextBlock x:Uid="ConnectionPage_RemoteSetupHelpDirect"
+                                               Text="Connect to wss:// or https:// when the gateway has a trusted certificate. Your token is encrypted in transit after certificate validation."
+                                               Style="{StaticResource CaptionTextBlockStyle}"
+                                               Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                               TextWrapping="Wrap"/>
+                                </StackPanel>
+                                <StackPanel Spacing="2">
+                                    <TextBlock x:Uid="ConnectionPage_RemoteSetupHelpTunnelTitle"
+                                               Text="SSH tunnel" FontWeight="SemiBold"/>
+                                    <TextBlock x:Uid="ConnectionPage_RemoteSetupHelpTunnel"
+                                               Text="When the gateway only listens on localhost, expand &quot;Use SSH tunnel&quot; below. The tray forwards a local port over SSH so traffic stays encrypted."
+                                               Style="{StaticResource CaptionTextBlockStyle}"
+                                               Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                               TextWrapping="Wrap"/>
+                                </StackPanel>
+                                <StackPanel Spacing="2">
+                                    <TextBlock x:Uid="ConnectionPage_RemoteSetupHelpProxyTitle"
+                                               Text="Trusted proxy / Tailscale" FontWeight="SemiBold"/>
+                                    <TextBlock x:Uid="ConnectionPage_RemoteSetupHelpProxy"
+                                               Text="If a Tailscale or reverse proxy already encrypts the path, a plain ws:// URL over that private network is fine."
+                                               Style="{StaticResource CaptionTextBlockStyle}"
+                                               Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                               TextWrapping="Wrap"/>
+                                </StackPanel>
+                                <StackPanel Spacing="2">
+                                    <TextBlock x:Uid="ConnectionPage_RemoteSetupHelpAuthTitle"
+                                               Text="Auth" FontWeight="SemiBold"/>
+                                    <TextBlock x:Uid="ConnectionPage_RemoteSetupHelpAuth"
+                                               Text="Paste a shared token, or leave it blank and pair with a setup code. Re-pairing also upgrades this device's scopes."
+                                               Style="{StaticResource CaptionTextBlockStyle}"
+                                               Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                               TextWrapping="Wrap"/>
+                                </StackPanel>
+                            </StackPanel>
+                        </TeachingTip.Content>
+                    </TeachingTip>
+
                     <!-- Setup code pane -->
                     <StackPanel x:Name="AddSetupCodePane" Spacing="8" Visibility="Collapsed">
                         <TextBlock x:Uid="ConnectionPage_PasteASetupCode" Text="Paste a setup code from the gateway's QR or `openclaw qr` output."
@@ -1013,10 +1097,20 @@
                                    Visibility="Collapsed"/>
                     </StackPanel>
 
+                    <!-- Transport-security advice — populated in code-behind
+                         from RemoteGatewayClassifier for the active method's
+                         URL (Direct field or decoded setup code). -->
+                    <InfoBar x:Name="AddSecurityAdviceBar"
+                             IsOpen="False" IsClosable="False"
+                             Severity="Informational"
+                             AutomationProperties.AutomationId="AddSecurityAdvice"/>
+
                     <!-- Per-gateway SSH tunnel — saved with the gateway record -->
                     <Expander x:Name="AddSshExpander"
                               HorizontalAlignment="Stretch"
                               HorizontalContentAlignment="Stretch"
+                              Expanding="OnAddSshExpanding"
+                              Collapsed="OnAddSshCollapsed"
                               IsExpanded="False">
                         <Expander.Header>
                             <TextBlock x:Uid="ConnectionPage_UseSSHTunnelOptional" Text="Use SSH tunnel (optional)"
@@ -1032,10 +1126,12 @@
                                 <TextBox x:Uid="ConnectionPage_SSHUser" Grid.Column="0"
                                          x:Name="AddSshUserBox"
                                          Header="SSH user"
+                                         TextChanged="OnAddSshFieldChanged"
                                          PlaceholderText="user"/>
                                 <TextBox x:Uid="ConnectionPage_SSHHost" Grid.Column="1"
                                          x:Name="AddSshHostBox"
                                          Header="SSH host"
+                                         TextChanged="OnAddSshFieldChanged"
                                          PlaceholderText="machine-name"/>
                             </Grid>
                             <Grid ColumnSpacing="8">
diff --git a/src/OpenClaw.Tray.WinUI/Pages/ConnectionPage.xaml.cs b/src/OpenClaw.Tray.WinUI/Pages/ConnectionPage.xaml.cs
index 651e2ed3a..132e2ae9a 100644
--- a/src/OpenClaw.Tray.WinUI/Pages/ConnectionPage.xaml.cs
+++ b/src/OpenClaw.Tray.WinUI/Pages/ConnectionPage.xaml.cs
@@ -1,5 +1,8 @@
 using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Automation;
+using Microsoft.UI.Xaml.Automation.Peers;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Documents;
 using Microsoft.UI.Xaml.Media;
 using OpenClaw.Connection;
 using OpenClaw.Shared;
@@ -35,6 +38,7 @@ public sealed partial class ConnectionPage : Page
     private IGatewayConnectionManager? _connectionManager;
     private GatewayRegistry? _gatewayRegistry;
     private GatewayDiscoveryService? _discoveryService;
+    private global::Windows.UI.ViewManagement.AccessibilitySettings? _accessibilitySettings;
     private IGatewayTerminalLauncher? _terminalLauncher;
     private WslGatewayController? _wslGatewayController;
 
@@ -48,13 +52,16 @@ public sealed partial class ConnectionPage : Page
     private bool _gatewayHostActionInProgress;
     private CancellationTokenSource? _gatewayHostActionCts;
     private string? _gatewayHostStatusGatewayId;
-
     // Tracks which gateway record the Add Gateway form is currently editing
     // (set by OnSavedRowEdit / OnEditTunnelSettings; null = creating a brand
     // new record). Used by DoDirectConnectFromAddFormAsync so a URL change
     // updates the original record instead of orphaning it as a duplicate.
     private string? _editingGatewayId;
 
+    // Last gateway URL decoded from a pasted setup code, used to drive the
+    // transport-security advice for the Setup-code method. Null when no valid
+    // code is decoded.
+    private string? _lastDecodedSetupUrl;
     // ─── Reconnect-mask state ───
     // Toggling Node mode forces the connection manager to tear down the
     // WS and rebuild it (so the gateway sees the role change). That brief
@@ -76,14 +83,11 @@ public sealed partial class ConnectionPage : Page
     private bool _maskHasObservedTransient;
 
     // ─── Fingerprint caches ───
-    // ItemsSource swaps re-template every item even when the content is
-    // identical, which causes a visible flash on every snapshot tick.
-    // We stash a string fingerprint of the inputs and skip the swap when
-    // the rendered output would be identical. Keeps the page calm during
-    // the rapid-fire snapshot transitions a Node-mode toggle produces.
+    // Rebuilding rows/chips on every snapshot tick causes visible churn.
+    // Fingerprints let us update only when the rendered inputs change.
     private string? _savedGatewaysFingerprint;
     private string? _glanceChipsFingerprint;
-    private string? _capabilityChipsFingerprint;
+    private string? _capabilityPillsFingerprint;
 
     public ConnectionPage()
     {
@@ -122,6 +126,8 @@ public void Initialize()
         if (_gatewayRegistry != null)
             _gatewayRegistry.Changed += OnRegistryChanged;
 
+        ActualThemeChanged += OnPageActualThemeChanged;
+        TrySubscribeAccessibilitySettings();
         Unloaded += OnPageUnloaded;
 
         // Initialize Node mode toggle from settings (suppressed event)
@@ -165,6 +171,12 @@ private void OnPageUnloaded(object sender, RoutedEventArgs e)
             _connectionManager.StateChanged -= OnManagerStateChanged;
         if (_gatewayRegistry != null)
             _gatewayRegistry.Changed -= OnRegistryChanged;
+        ActualThemeChanged -= OnPageActualThemeChanged;
+        if (_accessibilitySettings != null)
+        {
+            _accessibilitySettings.HighContrastChanged -= OnHighContrastChanged;
+            _accessibilitySettings = null;
+        }
         _discoveryService?.Dispose();
         _discoveryService = null;
         if (_reconnectMaskTimer != null)
@@ -183,6 +195,38 @@ private void OnPageUnloaded(object sender, RoutedEventArgs e)
         if (_appState != null) _appState.PropertyChanged -= OnAppStateChanged;
     }
 
+    private void OnPageActualThemeChanged(FrameworkElement sender, object args)
+    {
+        RefreshAfterThemeVisualChange();
+    }
+
+    private void OnHighContrastChanged(
+        global::Windows.UI.ViewManagement.AccessibilitySettings sender,
+        object args)
+    {
+        DispatcherQueue?.TryEnqueue(RefreshAfterThemeVisualChange);
+    }
+
+    private void RefreshAfterThemeVisualChange()
+    {
+        _capabilityPillsFingerprint = null;
+        RefreshFromSnapshot(_lastSnapshot);
+    }
+
+    private void TrySubscribeAccessibilitySettings()
+    {
+        try
+        {
+            _accessibilitySettings = new global::Windows.UI.ViewManagement.AccessibilitySettings();
+            _accessibilitySettings.HighContrastChanged += OnHighContrastChanged;
+        }
+        catch (Exception ex)
+        {
+            Services.Logger.Warn($"[ConnectionPage] Could not subscribe to High Contrast changes: {ex.Message}");
+            _accessibilitySettings = null;
+        }
+    }
+
     private void OnManagerStateChanged(object? sender, GatewayConnectionSnapshot snapshot)
     {
         DispatcherQueue?.TryEnqueue(() =>
@@ -295,18 +339,6 @@ private void RefreshFromSnapshot(GatewayConnectionSnapshot snapshot)
         // background highlight reflects the live snapshot. Cheap — list is
         // typically < 10 entries and only re-runs on real state transitions.
         LoadSavedGateways();
-
-        // Bridge auth error (lives outside the plan as a transient modifier)
-        var authError = CurrentApp.AppState?.AuthFailureMessage;
-        if (!string.IsNullOrEmpty(authError))
-        {
-            AuthErrorBar.Message = GetAuthErrorGuidance(authError!);
-            AuthErrorBar.IsOpen = true;
-        }
-        else
-        {
-            AuthErrorBar.IsOpen = false;
-        }
     }
 
     private void ApplyPlan(ConnectionPagePlan plan)
@@ -317,10 +349,9 @@ private void ApplyPlan(ConnectionPagePlan plan)
         bool isRecovery = plan.Mode == ConnectionPageMode.Recovery;
         bool isAdding   = plan.Mode == ConnectionPageMode.AddGateway;
 
-        // Operator + Node cards only when we actually have an active operator
-        // connection AND we're not in a focused sub-view (Welcome / Recovery /
-        // AddGateway). Recovery's help block carries the action; the role
-        // cards would just compete with it.
+        // Operator + Node cards are normally tied to an active operator session.
+        // Local MCP-only mode has no operator session, but still needs the Node
+        // card so users can see that MCP is serving local tools.
         bool hasOperatorSession = _lastSnapshot.OverallState is
             OverallConnectionState.Connected
             or OverallConnectionState.Ready
@@ -328,9 +359,12 @@ or OverallConnectionState.Degraded
             or OverallConnectionState.Connecting
             or OverallConnectionState.PairingRequired
             or OverallConnectionState.Disconnecting;
-        bool showRoles = hasOperatorSession && !isWelcome && !isAdding && !isRecovery;
+        var hasStandaloneNodeCard = plan.NodeCard != NodeCardState.Hidden && !hasOperatorSession;
+        bool showRoles = (hasOperatorSession || hasStandaloneNodeCard) && !isAdding && !isRecovery;
         CockpitPanel.Visibility = showRoles ? Visibility.Visible : Visibility.Collapsed;
-        OperatorSection.Visibility = showRoles ? Visibility.Visible : Visibility.Collapsed;
+        OperatorSection.Visibility = showRoles && plan.OperatorCard != OperatorCardState.Hidden
+            ? Visibility.Visible
+            : Visibility.Collapsed;
 
         // Bottom section: exactly one of these is visible
         //   • SavedGatewaysCard  — Cockpit / Recovery (always present when registry has items)
@@ -810,6 +844,14 @@ or NodeCardState.OnNodeRateLimited
                 Helpers.FluentIconCatalog.StatusOk,
                 "SystemFillColorSuccessBrush",
                 capCount == 1 ? LocalizationHelper.GetString("ConnectionPage_NodeActiveOneCapability") : string.Format(LocalizationHelper.GetString("ConnectionPage_NodeActiveCapabilities"), capCount)),
+            NodeCardState.OnNodeConnecting => (
+                Helpers.FluentIconCatalog.Sync,
+                "SystemFillColorCautionBrush",
+                LocalizationHelper.GetString("ConnectionPage_NodeStarting")),
+            NodeCardState.OffMcpOnly => (
+                Helpers.FluentIconCatalog.Terminal,
+                "SystemFillColorAttentionBrush",
+                LocalizationHelper.GetString("ConnectionPage_NodeMcpOnly")),
             NodeCardState.OnPermissionsIncomplete => (
                 Helpers.FluentIconCatalog.StatusWarn,
                 "SystemFillColorCautionBrush",
@@ -854,47 +896,107 @@ or NodeCardState.OnNodeRateLimited
             ? ResolveBrush("SystemFillColorCriticalBrush")
             : ResolveBrush("TextFillColorPrimaryBrush");
 
-        // The gateway's node-list contract owns this boundary. Pending
-        // declarations are visible for approval context but never counted or
-        // labeled as approved/effective.
-        bool showSurfaces = settings != null && plan.NodeCard != NodeCardState.Off
-                                             && plan.NodeCard != NodeCardState.Hidden;
-        NodeCapabilityText.Visibility = showSurfaces ? Visibility.Visible : Visibility.Collapsed;
-        NodeCommandText.Visibility = showSurfaces ? Visibility.Visible : Visibility.Collapsed;
-        NodePermissionText.Visibility = showSurfaces ? Visibility.Visible : Visibility.Collapsed;
-        if (showSurfaces)
-        {
-            NodeCapabilityText.Text = BuildNodeSurfaceListString(
-                "ConnectionPage_NodeEffectiveCapabilities",
-                plan.NodeEffectiveCapabilities);
-            NodeCommandText.Text = BuildNodeSurfaceListString(
-                "ConnectionPage_NodeEffectiveCommands",
-                plan.NodeEffectiveCommands);
-            NodePermissionText.Text = BuildNodePermissionListString(
-                "ConnectionPage_NodeEffectivePermissions",
-                plan.NodeEffectivePermissions);
-        }
-
-        var showPendingDeclarations = showSurfaces &&
-            (plan.NodeApprovalState is GatewayNodeApprovalState.PendingApproval or
-                GatewayNodeApprovalState.PendingReapproval ||
-             plan.NodePendingDeclaredCapabilities.Count > 0 ||
-             plan.NodePendingDeclaredCommands.Count > 0 ||
-             plan.NodePendingDeclaredPermissions.Count > 0);
-        NodePendingDeclarationsPanel.Visibility = showPendingDeclarations
-            ? Visibility.Visible
-            : Visibility.Collapsed;
-        if (showPendingDeclarations)
+        if (plan.NodeCard == NodeCardState.OffMcpOnly)
+        {
+            NodeCapabilityText.Visibility = Visibility.Visible;
+            NodeCapabilityText.Text = LocalizationHelper.Format(
+                "ConnectionPage_NodeMcpOnlyReachable", NodeService.McpServerUrl);
+            NodeCapabilityPillsHost.Visibility = Visibility.Collapsed;
+            NodeTechnicalDetailsExpander.Visibility = Visibility.Collapsed;
+            NodePendingDeclarationsPanel.Visibility = Visibility.Collapsed;
+
+            var mcpError = CurrentApp.ActiveNodeService?.McpStartupError;
+            if (!string.IsNullOrEmpty(mcpError))
+            {
+                NodeStatusIcon.Glyph = Helpers.FluentIconCatalog.StatusErr;
+                NodeStatusIcon.Foreground = ResolveBrush("SystemFillColorCriticalBrush");
+                NodeStatusText.Text = LocalizationHelper.GetString("ConnectionPage_NodeMcpError");
+                NodeStatusText.Foreground = ResolveBrush("SystemFillColorCriticalBrush");
+                NodeCapabilityText.Visibility = Visibility.Collapsed;
+                NodeBodyText.Text = mcpError;
+                NodeBodyText.Foreground = ResolveBrush("SystemFillColorCriticalBrush");
+                NodeBodyText.Visibility = Visibility.Visible;
+            }
+        }
+        else
         {
-            NodePendingCapabilityText.Text = BuildNodeSurfaceListString(
-                "ConnectionPage_NodePendingDeclaredCapabilities",
-                plan.NodePendingDeclaredCapabilities);
-            NodePendingCommandText.Text = BuildNodeSurfaceListString(
-                "ConnectionPage_NodePendingDeclaredCommands",
-                plan.NodePendingDeclaredCommands);
-            NodePendingPermissionText.Text = BuildNodePermissionListString(
-                "ConnectionPage_NodePendingDeclaredPermissions",
-                plan.NodePendingDeclaredPermissions);
+            // Pending declarations are visible for approval context but never
+            // counted as the active node contract.
+            bool showSurfaces = settings != null && plan.NodeCard != NodeCardState.Off
+                                                 && plan.NodeCard != NodeCardState.Hidden
+                                                 && plan.NodeCard != NodeCardState.OnNodeConnecting;
+
+            NodeCapabilityText.Visibility = Visibility.Collapsed;
+
+            if (showSurfaces && settings is not null)
+            {
+                var pillFp = BuildCapabilityPillFingerprint(
+                    plan.NodeCard,
+                    plan.NodeEffectiveCapabilities,
+                    plan.NodePendingDeclaredCapabilities,
+                    settings);
+                if (_capabilityPillsFingerprint != pillFp)
+                {
+                    _capabilityPillsFingerprint = pillFp;
+                    NodeCapabilityPillsHost.Child = BuildCapabilityPills(
+                        plan.NodeEffectiveCapabilities,
+                        plan.NodePendingDeclaredCapabilities,
+                        settings);
+                }
+
+                NodeCapabilityPillsHost.Visibility =
+                    NodeCapabilityPillsHost.Child is WrapPanel { Children.Count: > 0 }
+                        ? Visibility.Visible
+                        : Visibility.Collapsed;
+            }
+            else
+            {
+                NodeCapabilityPillsHost.Visibility = Visibility.Collapsed;
+                _capabilityPillsFingerprint = null;
+            }
+
+            bool hasTechnicalSurfaces = plan.NodeEffectiveCapabilities.Count > 0
+                                     || plan.NodeEffectiveCommands.Count > 0
+                                     || plan.NodeEffectivePermissions.Count > 0;
+            NodeTechnicalDetailsExpander.Visibility =
+                showSurfaces && hasTechnicalSurfaces ? Visibility.Visible : Visibility.Collapsed;
+            if (NodeTechnicalDetailsExpander.Visibility == Visibility.Collapsed)
+                NodeTechnicalDetailsExpander.IsExpanded = false;
+
+            if (showSurfaces)
+            {
+                SetSurfaceInlines(NodeTechCapabilityText,
+                    "ConnectionPage_NodeEffectiveCapabilities",
+                    FormatSurfaceList(plan.NodeEffectiveCapabilities));
+                SetSurfaceInlines(NodeTechCommandText,
+                    "ConnectionPage_NodeEffectiveCommands",
+                    FormatSurfaceList(plan.NodeEffectiveCommands));
+                SetSurfaceInlines(NodeTechPermissionText,
+                    "ConnectionPage_NodeEffectivePermissions",
+                    FormatPermissionList(plan.NodeEffectivePermissions));
+            }
+
+            var showPendingDeclarations = showSurfaces &&
+                (plan.NodeApprovalState is GatewayNodeApprovalState.PendingApproval or
+                    GatewayNodeApprovalState.PendingReapproval ||
+                 plan.NodePendingDeclaredCapabilities.Count > 0 ||
+                 plan.NodePendingDeclaredCommands.Count > 0 ||
+                 plan.NodePendingDeclaredPermissions.Count > 0);
+            NodePendingDeclarationsPanel.Visibility = showPendingDeclarations
+                ? Visibility.Visible
+                : Visibility.Collapsed;
+            if (showPendingDeclarations)
+            {
+                NodePendingCapabilityText.Text = BuildNodeSurfaceListString(
+                    "ConnectionPage_NodePendingDeclaredCapabilities",
+                    plan.NodePendingDeclaredCapabilities);
+                NodePendingCommandText.Text = BuildNodeSurfaceListString(
+                    "ConnectionPage_NodePendingDeclaredCommands",
+                    plan.NodePendingDeclaredCommands);
+                NodePendingPermissionText.Text = BuildNodePermissionListString(
+                    "ConnectionPage_NodePendingDeclaredPermissions",
+                    plan.NodePendingDeclaredPermissions);
+            }
         }
 
         // Sync toggle from current settings (suppress event)
@@ -952,22 +1054,6 @@ plan.NodeCard is NodeCardState.OnNodeApprovalRequired or
             NodeReconnectButton.Visibility = Visibility.Collapsed;
         }
 
-        // Capability chips — skip the rebuild if the rendered output would
-        // be identical. Fingerprint includes the full capability list from
-        // the gateway (same source as tray/instances) so new capabilities
-        // trigger a rebuild automatically.
-        var capNames = string.Join(
-            ",",
-            plan.NodeEffectiveCapabilities.OrderBy(c => c, StringComparer.OrdinalIgnoreCase));
-        var capFp = $"{plan.NodeCard}|{capNames}";
-        if (_capabilityChipsFingerprint != capFp)
-        {
-            _capabilityChipsFingerprint = capFp;
-            NodeCapabilityChipsHost.ItemsSource = BuildCapabilityChips(
-                plan.NodeEffectiveCapabilities,
-                plan.NodeCard);
-        }
-
         // Permissions link is always visible (entry point even when sharing is off);
         // Voice and Skills deep links were removed from the simplified node card.
     }
@@ -978,6 +1064,7 @@ private void ApplyRecoveryBody(ConnectionPagePlan plan)
         RecoveryTunnelBlock.Visibility = Visibility.Collapsed;
         RecoveryAuthPasteBlock.Visibility = Visibility.Collapsed;
         RecoveryApproveCmdBlock.Visibility = Visibility.Collapsed;
+        RecoveryRepairResultText.Visibility = Visibility.Collapsed;
 
         RecoveryHelpHeaderText.Text = plan.Recovery switch
         {
@@ -985,6 +1072,10 @@ private void ApplyRecoveryBody(ConnectionPagePlan plan)
             RecoveryCategory.Pairing => LocalizationHelper.GetString("ConnectionPage_RecoveryHeaderPairing"),
             RecoveryCategory.Tunnel => LocalizationHelper.GetString("ConnectionPage_RecoveryHeaderTunnel"),
             RecoveryCategory.Server => LocalizationHelper.GetString("ConnectionPage_RecoveryHeaderServer"),
+            RecoveryCategory.TokenDrift => LocalizationHelper.GetString("ConnectionPage_RecoveryHeaderTokenDrift"),
+            RecoveryCategory.Scope => LocalizationHelper.GetString("ConnectionPage_RecoveryHeaderScope"),
+            RecoveryCategory.Tls => LocalizationHelper.GetString("ConnectionPage_RecoveryHeaderTls"),
+            RecoveryCategory.RateLimited => LocalizationHelper.GetString("ConnectionPage_RecoveryHeaderRateLimited"),
             _ => LocalizationHelper.GetString("ConnectionPage_RecoveryHeaderServer"),
         };
 
@@ -1011,6 +1102,26 @@ private void ApplyRecoveryBody(ConnectionPagePlan plan)
                 LocalizationHelper.GetString("ConnectionPage_RecoveryServerBullet2"),
                 LocalizationHelper.GetString("ConnectionPage_RecoveryServerBullet3"),
             },
+            RecoveryCategory.TokenDrift => new[]
+            {
+                LocalizationHelper.GetString("ConnectionPage_RecoveryTokenDriftBullet1"),
+                LocalizationHelper.GetString("ConnectionPage_RecoveryTokenDriftBullet2"),
+            },
+            RecoveryCategory.Scope => new[]
+            {
+                LocalizationHelper.GetString("ConnectionPage_RecoveryScopeBullet1"),
+                LocalizationHelper.GetString("ConnectionPage_RecoveryScopeBullet2"),
+            },
+            RecoveryCategory.Tls => new[]
+            {
+                LocalizationHelper.GetString("ConnectionPage_RecoveryTlsBullet1"),
+                LocalizationHelper.GetString("ConnectionPage_RecoveryTlsBullet2"),
+            },
+            RecoveryCategory.RateLimited => new[]
+            {
+                LocalizationHelper.GetString("ConnectionPage_RecoveryRateLimitedBullet1"),
+                LocalizationHelper.GetString("ConnectionPage_RecoveryRateLimitedBullet2"),
+            },
             _ => new[]
             {
                 LocalizationHelper.GetString("ConnectionPage_RecoveryDefaultBullet1"),
@@ -1028,7 +1139,11 @@ private void ApplyRecoveryBody(ConnectionPagePlan plan)
             RecoveryTunnelBlock.Visibility = Visibility.Visible;
             RecoveryTunnelDetailText.Text = plan.RecoveryDetail ?? LocalizationHelper.GetString("ConnectionPage_SshTunnelIsDownText");
         }
-        if (plan.Recovery == RecoveryCategory.Auth)
+        // Auth, token drift, and scope problems are all repaired by pasting a
+        // fresh setup code (re-pair), which also upgrades scopes on the gateway.
+        if (plan.Recovery is RecoveryCategory.Auth
+                          or RecoveryCategory.TokenDrift
+                          or RecoveryCategory.Scope)
         {
             RecoveryAuthPasteBlock.Visibility = Visibility.Visible;
         }
@@ -1065,77 +1180,197 @@ private static Border BuildBulletRow(string text)
         return new Border { Child = grid };
     }
 
-    private List<Border> BuildCapabilityChips(IReadOnlyList<string>? capabilities, NodeCardState state)
+    private enum CapabilityPillState { Active, Pending, Off }
+
+    private WrapPanel BuildCapabilityPills(
+        IReadOnlyList<string> effective,
+        IReadOnlyList<string> pendingDeclared,
+        SettingsManager settings)
     {
-        var chips = new List<Border>();
-        if (capabilities == null || capabilities.Count == 0) return chips;
-        if (state == NodeCardState.Off || state == NodeCardState.Hidden) return chips;
+        var panel = new WrapPanel { HorizontalSpacing = 6, VerticalSpacing = 6 };
+        var effectiveSet = new HashSet<string>(
+            effective.Where(c => !string.IsNullOrWhiteSpace(c)),
+            StringComparer.OrdinalIgnoreCase);
+        var pendingSet = new HashSet<string>(
+            pendingDeclared.Where(c => !string.IsNullOrWhiteSpace(c)),
+            StringComparer.OrdinalIgnoreCase);
+        var isHighContrast = IsHighContrastEnabled();
 
-        void Add(string label, bool enabled, bool warn = false, bool error = false)
+        var canonical = new (string Name, string LabelKey, string Glyph, bool Enabled)[]
         {
-            string bgKey;
-            string fgKey;
-            string glyph;
-            if (error)
-            {
-                bgKey = "SystemFillColorCriticalBackgroundBrush";
-                fgKey = "SystemFillColorCriticalBrush";
-                glyph = Helpers.FluentIconCatalog.StatusErr;
-            }
-            else if (warn)
-            {
-                bgKey = "SystemFillColorCautionBackgroundBrush";
-                fgKey = "SystemFillColorCautionBrush";
-                glyph = Helpers.FluentIconCatalog.StatusWarn;
-            }
-            else if (enabled)
-            {
-                bgKey = "SystemFillColorSuccessBackgroundBrush";
-                fgKey = "SystemFillColorSuccessBrush";
-                glyph = Helpers.FluentIconCatalog.StatusOk;
-            }
-            else
-            {
-                bgKey = "SubtleFillColorSecondaryBrush";
-                fgKey = "TextFillColorSecondaryBrush";
-                glyph = Helpers.FluentIconCatalog.CapabilityOff;
-            }
+            ("browser",  "PermissionsPage_Cap_Browser_Label",  FluentIconCatalog.Browser,  settings.NodeBrowserProxyEnabled),
+            ("camera",   "PermissionsPage_Cap_Camera_Label",   FluentIconCatalog.Camera,   settings.NodeCameraEnabled),
+            ("canvas",   "PermissionsPage_Cap_Canvas_Label",   FluentIconCatalog.Canvas,   settings.NodeCanvasEnabled),
+            ("screen",   "PermissionsPage_Cap_Screen_Label",   FluentIconCatalog.Screen,   settings.NodeScreenEnabled),
+            ("location", "PermissionsPage_Cap_Location_Label", FluentIconCatalog.Location, settings.NodeLocationEnabled),
+            ("tts",      "PermissionsPage_Cap_Tts_Label",      FluentIconCatalog.Voice,    settings.NodeTtsEnabled),
+            ("stt",      "PermissionsPage_Cap_Stt_Label",      FluentIconCatalog.Speech,   settings.NodeSttEnabled),
+        };
 
-            var stack = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 4 };
-            stack.Children.Add(new FontIcon
+        var shown = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        foreach (var (name, labelKey, glyph, enabled) in canonical)
+        {
+            var state = effectiveSet.Contains(name)
+                ? CapabilityPillState.Active
+                : (pendingSet.Contains(name) || enabled)
+                    ? CapabilityPillState.Pending
+                    : CapabilityPillState.Off;
+            panel.Children.Add(MakeCapabilityPill(LocalizationHelper.GetString(labelKey), glyph, state, isHighContrast));
+            shown.Add(name);
+        }
+
+        var extras = effective.Select(c => (Name: c, State: CapabilityPillState.Active))
+            .Concat(pendingDeclared.Select(c => (Name: c, State: CapabilityPillState.Pending)))
+            .Where(x => !string.IsNullOrWhiteSpace(x.Name) && !shown.Contains(x.Name));
+        foreach (var (name, state) in extras)
+        {
+            if (!shown.Add(name)) continue;
+            var (label, glyph) = name.Trim().ToLowerInvariant() switch
             {
-                Glyph = glyph,
-                FontSize = 11,
-                Foreground = ResolveBrush(fgKey),
-                VerticalAlignment = VerticalAlignment.Center,
-            });
-            stack.Children.Add(new TextBlock
+                "device" => (LocalizationHelper.GetString("ConnectionPage_NodeCap_Device"), FluentIconCatalog.Devices),
+                "system" => (LocalizationHelper.GetString("ConnectionPage_NodeCap_System"), FluentIconCatalog.System),
+                _ => (HumanizeNodeToken(name), FluentIconCatalog.System),
+            };
+            panel.Children.Add(MakeCapabilityPill(label, glyph, state, isHighContrast));
+        }
+
+        return panel;
+    }
+
+    private const double CapabilityPillFillOpacity = 0.14;
+
+    private Border MakeCapabilityPill(string label, string glyph, CapabilityPillState state, bool isHighContrast)
+    {
+        var (fillBrush, iconBrush, textBrush, stateKey, stateGlyph) = state switch
+        {
+            CapabilityPillState.Active => (
+                TintBrush(
+                    "SystemFillColorSuccessBrush",
+                    "SystemFillColorSuccessBackgroundBrush",
+                    CapabilityPillFillOpacity,
+                    isHighContrast),
+                ResolveBrush("SystemFillColorSuccessBrush"),
+                ResolveBrush("SystemFillColorSuccessBrush"),
+                "ConnectionPage_NodePillState_Active",
+                null),
+            CapabilityPillState.Pending => (
+                TintBrush(
+                    "SystemFillColorCautionBrush",
+                    "SystemFillColorCautionBackgroundBrush",
+                    CapabilityPillFillOpacity,
+                    isHighContrast),
+                ResolveBrush("SystemFillColorCautionBrush"),
+                ResolveBrush("SystemFillColorCautionBrush"),
+                "ConnectionPage_NodePillState_Pending",
+                FluentIconCatalog.StatusWarn),
+            _ => (
+                ResolveBrush("SubtleFillColorTertiaryBrush"),
+                ResolveBrush("TextFillColorTertiaryBrush"),
+                ResolveBrush("TextFillColorSecondaryBrush"),
+                "ConnectionPage_NodePillState_Off",
+                null),
+        };
+
+        var content = new StackPanel
+        {
+            Orientation = Orientation.Horizontal,
+            Spacing = 5,
+            VerticalAlignment = VerticalAlignment.Center,
+        };
+        var capabilityIcon = new FontIcon
+        {
+            Glyph = glyph,
+            FontSize = 12,
+            Foreground = iconBrush,
+            VerticalAlignment = VerticalAlignment.Center,
+            IsTextScaleFactorEnabled = false,
+        };
+        AutomationProperties.SetAccessibilityView(capabilityIcon, AccessibilityView.Raw);
+        content.Children.Add(capabilityIcon);
+
+        var stateText = LocalizationHelper.GetString(stateKey);
+        var labelText = new TextBlock
+        {
+            Text = label,
+            FontSize = 12,
+            Foreground = textBrush,
+            VerticalAlignment = VerticalAlignment.Center,
+        };
+        AutomationProperties.SetName(labelText, $"{label} — {stateText}");
+        content.Children.Add(labelText);
+
+        if (stateGlyph != null)
+        {
+            var stateIcon = new FontIcon
             {
-                Text = label,
-                FontSize = 11,
-                Foreground = ResolveBrush(fgKey),
+                Glyph = stateGlyph,
+                FontSize = 10,
+                Foreground = textBrush,
                 VerticalAlignment = VerticalAlignment.Center,
-            });
-            chips.Add(new Border
-            {
-                CornerRadius = new CornerRadius(4),
-                Padding = new Thickness(6, 2, 6, 2),
-                Background = ResolveBrush(bgKey),
-                Child = stack,
-            });
+                IsTextScaleFactorEnabled = false,
+            };
+            AutomationProperties.SetAccessibilityView(stateIcon, AccessibilityView.Raw);
+            content.Children.Add(stateIcon);
         }
 
-        // Render a chip for each capability reported by the gateway —
-        // same source as tray menu and instances page.
-        foreach (var cap in capabilities)
+        var pill = new Border
         {
-            if (string.IsNullOrEmpty(cap)) continue;
-            // Capitalize first letter for display (e.g. "browser" → "Browser")
-            var label = char.ToUpperInvariant(cap[0]) + cap[1..];
-            Add(label, enabled: true);
+            CornerRadius = new CornerRadius(12),
+            Padding = new Thickness(8, 3, 11, 3),
+            Background = fillBrush,
+            Child = content,
+        };
+        ToolTipService.SetToolTip(pill, stateText);
+        return pill;
+    }
+
+    private Brush TintBrush(string colorKey, string highContrastBrushKey, double opacity, bool isHighContrast)
+    {
+        if (isHighContrast)
+            return ResolveBrush(highContrastBrushKey);
+
+        var color = ResolveBrush(colorKey) is SolidColorBrush scb
+            ? scb.Color
+            : ((SolidColorBrush)ResolveBrush("TextFillColorPrimaryBrush")).Color;
+        return new SolidColorBrush(color) { Opacity = opacity };
+    }
+
+    private bool IsHighContrastEnabled()
+    {
+        if (_accessibilitySettings is null)
+            return false;
+
+        try { return _accessibilitySettings.HighContrast; }
+        catch (Exception ex)
+        {
+            Services.Logger.Warn($"[ConnectionPage] Could not read High Contrast state: {ex.Message}");
+            return false;
         }
+    }
 
-        return chips;
+    private static string BuildCapabilityPillFingerprint(
+        NodeCardState state,
+        IReadOnlyList<string> effective,
+        IReadOnlyList<string> pendingDeclared,
+        SettingsManager settings)
+    {
+        var eff = string.Join(
+            ",",
+            effective.Where(c => !string.IsNullOrWhiteSpace(c))
+                     .OrderBy(c => c, StringComparer.OrdinalIgnoreCase));
+        var pend = string.Join(
+            ",",
+            pendingDeclared.Where(c => !string.IsNullOrWhiteSpace(c))
+                           .OrderBy(c => c, StringComparer.OrdinalIgnoreCase));
+        var toggles = string.Concat(
+            settings.NodeBrowserProxyEnabled ? '1' : '0',
+            settings.NodeCameraEnabled ? '1' : '0',
+            settings.NodeCanvasEnabled ? '1' : '0',
+            settings.NodeScreenEnabled ? '1' : '0',
+            settings.NodeLocationEnabled ? '1' : '0',
+            settings.NodeTtsEnabled ? '1' : '0',
+            settings.NodeSttEnabled ? '1' : '0');
+        return $"{state}|{eff}|{pend}|{toggles}";
     }
 
     /// <summary>
@@ -1145,26 +1380,44 @@ void Add(string label, bool enabled, bool warn = false, bool error = false)
     private static string BuildNodeSurfaceListString(
         string resourceKey,
         IReadOnlyList<string> values)
-    {
-        var display = values.Count == 0
+        => LocalizationHelper.Format(resourceKey, FormatSurfaceList(values));
+
+    private static string FormatSurfaceList(IReadOnlyList<string> values)
+        => values.Count == 0
             ? LocalizationHelper.GetString("ConnectionPage_NodeSurfaceNone")
             : string.Join(", ", values);
-        return LocalizationHelper.Format(resourceKey, display);
-    }
 
     private static string BuildNodePermissionListString(
         string resourceKey,
         IReadOnlyDictionary<string, bool> permissions)
-    {
-        var display = permissions.Count == 0
+        => LocalizationHelper.Format(resourceKey, FormatPermissionList(permissions));
+
+    private static string FormatPermissionList(IReadOnlyDictionary<string, bool> permissions)
+        => permissions.Count == 0
             ? LocalizationHelper.GetString("ConnectionPage_NodeSurfaceNone")
             : string.Join(", ", permissions
                 .OrderBy(permission => permission.Key, StringComparer.OrdinalIgnoreCase)
                 .Select(permission =>
                     $"{permission.Key}={permission.Value.ToString().ToLowerInvariant()}"));
-        return LocalizationHelper.Format(resourceKey, display);
+
+    private static void SetSurfaceInlines(TextBlock target, string resourceKey, string value)
+    {
+        var format = LocalizationHelper.GetString(resourceKey);
+        var idx = format.IndexOf("{0}", StringComparison.Ordinal);
+        var label = idx >= 0 ? format[..idx] : format;
+        var suffix = idx >= 0 ? format[(idx + 3)..] : string.Empty;
+
+        target.Inlines.Clear();
+        target.Inlines.Add(new Run { Text = label, FontWeight = Microsoft.UI.Text.FontWeights.SemiBold });
+        target.Inlines.Add(new Run { Text = value + suffix });
     }
 
+    private static string HumanizeNodeToken(string token)
+    {
+        var spaced = token.Trim().Replace('.', ' ').Replace('_', ' ');
+        if (spaced.Length == 0) return spaced;
+        return char.ToUpperInvariant(spaced[0]) + spaced[1..];
+    }
 
     private Brush ResolveBrush(string themeKey)
     {
@@ -1486,6 +1739,8 @@ private Border BuildSavedGatewayRowControl(SavedGatewayRow row)
             VerticalAlignment = VerticalAlignment.Center,
             Tag = row.Id,
         };
+        Microsoft.UI.Xaml.Automation.AutomationProperties.SetName(overflowBtn,
+            string.Format(LocalizationHelper.GetString("ConnectionPage_GatewayOptionsA11y"), row.DisplayName));
         overflowBtn.Content = new FontIcon
         {
             Glyph = Helpers.FluentIconCatalog.MoreOverflow,
@@ -1536,6 +1791,7 @@ private Border BuildSavedGatewayRowControl(SavedGatewayRow row)
         grid.Children.Add(overflowBtn);
 
         card.Child = grid;
+        Microsoft.UI.Xaml.Automation.AutomationProperties.SetName(card, row.DisplayName);
         return card;
     }
 
@@ -1571,6 +1827,7 @@ private void OnEnterAddGateway(object sender, RoutedEventArgs e)
     {
         _editingGatewayId = null;
         _userIntent = UserIntent.AddingGateway;
+        ClearAddGatewaySshFields();
         // Direct is default — make sure the selector is on Direct.
         // Pre-fill the most common local gateway URL.
         DirectUrlBox.Text = "ws://127.0.0.1:18789";
@@ -1586,6 +1843,7 @@ private void OnEnterAddGatewayDirect(object sender, RoutedEventArgs e)
     {
         _editingGatewayId = null;
         _userIntent = UserIntent.AddingGateway;
+        ClearAddGatewaySshFields();
         ShowAddPane("direct");
         AddDirectItem.IsSelected = true;
         RefreshFromSnapshot(_lastSnapshot);
@@ -1595,6 +1853,7 @@ private void OnEnterAddGatewaySetupCode(object sender, RoutedEventArgs e)
     {
         _editingGatewayId = null;
         _userIntent = UserIntent.AddingGateway;
+        ClearAddGatewaySshFields();
         ShowAddPane("setup");
         AddSetupCodeItem.IsSelected = true;
         RefreshFromSnapshot(_lastSnapshot);
@@ -1615,6 +1874,7 @@ private void OnAddBack(object sender, RoutedEventArgs e)
         AddResultText.Text = "";
         AddSetupCodeBox.Text = "";
         AddSetupCodePreviewPanel.Visibility = Visibility.Collapsed;
+        ClearAddGatewaySshFields();
         AddScanStatusText.Text = LocalizationHelper.GetString("ConnectionPage_PressScan");
         AddScanProgressBar.Visibility = Visibility.Collapsed;
         AddScanResultsPanel.Children.Clear();
@@ -1641,6 +1901,111 @@ private void ShowAddPane(string tag)
         bool isFormMethod = (tag == "direct") || (tag == "setup");
         AddSshExpander.Visibility = isFormMethod ? Visibility.Visible : Visibility.Collapsed;
         AddSaveButton.Visibility = isFormMethod ? Visibility.Visible : Visibility.Collapsed;
+        AddRemoteHelpLink.Visibility = isFormMethod ? Visibility.Visible : Visibility.Collapsed;
+        if (!isFormMethod)
+            AddRemoteHelpTip.IsOpen = false;
+
+        UpdateRemoteSetupAdvice();
+    }
+
+    private void ClearAddGatewaySshFields()
+    {
+        AddSshExpander.IsExpanded = false;
+        AddSshUserBox.Text = "";
+        AddSshHostBox.Text = "";
+        AddSshServerPortBox.Text = "";
+        AddSshRemotePortBox.Text = "";
+        AddSshLocalPortBox.Text = "";
+    }
+
+    private void OnRemoteHelpClick(object sender, RoutedEventArgs e)
+    {
+        AddRemoteHelpTip.IsOpen = !AddRemoteHelpTip.IsOpen;
+    }
+
+    // ─── Remote setup transport-security advisory ─────────────────────
+    // Offline (no network) classification driven by RemoteGatewayClassifier.
+    // Steers users to TLS / SSH tunnel / trusted proxy before they save a
+    // gateway that would send the token in cleartext over the network.
+
+    private void OnAddSshExpanding(Expander sender, ExpanderExpandingEventArgs args) =>
+        UpdateRemoteSetupAdvice(sshExpandedOverride: true);
+
+    private void OnAddSshCollapsed(Expander sender, ExpanderCollapsedEventArgs args) =>
+        UpdateRemoteSetupAdvice(sshExpandedOverride: false);
+
+    private void OnAddSshFieldChanged(object sender, TextChangedEventArgs e) =>
+        UpdateRemoteSetupAdvice();
+
+    private void UpdateRemoteSetupAdvice(bool? sshExpandedOverride = null)
+    {
+        if (AddSecurityAdviceBar == null) return;
+
+        // The advice applies to the two form methods (Direct + Setup code).
+        // Pick the URL from whichever is active: the typed Direct URL, or the
+        // URL decoded from a pasted setup code.
+        string? url;
+        var tag = ActiveAddPaneTag();
+        if (tag == "direct")
+            url = DirectUrlBox.Text?.Trim();
+        else if (tag == "setup")
+            url = _lastDecodedSetupUrl;
+        else
+        {
+            AddSecurityAdviceBar.IsOpen = false;
+            return;
+        }
+
+        // The Expander.Expanding/Collapsed events fire before IsExpanded flips,
+        // so callers pass the post-transition state to avoid a one-frame flash
+        // of the cleartext warning.
+        bool sshExpanded = sshExpandedOverride ?? AddSshExpander.IsExpanded;
+        bool hasSshTunnel = sshExpanded
+                         && !string.IsNullOrWhiteSpace(AddSshUserBox.Text)
+                         && !string.IsNullOrWhiteSpace(AddSshHostBox.Text);
+
+        var profile = RemoteGatewayClassifier.Classify(url, hasSshTunnel);
+
+        InfoBarSeverity severity;
+        string title;
+        string message;
+        bool open = true;
+
+        switch (profile.Topology)
+        {
+            case GatewayConnectionTopology.DirectInsecure:
+                severity = InfoBarSeverity.Warning;
+                title = LocalizationHelper.GetString("ConnectionPage_AdviceCleartextTitle");
+                message = LocalizationHelper.GetString("ConnectionPage_AdviceCleartextMessage");
+                break;
+            case GatewayConnectionTopology.DirectSecure:
+                severity = InfoBarSeverity.Success;
+                title = LocalizationHelper.GetString("ConnectionPage_AdviceSecureTitle");
+                message = LocalizationHelper.GetString("ConnectionPage_AdviceSecureMessage");
+                break;
+            case GatewayConnectionTopology.SshTunnel:
+                severity = InfoBarSeverity.Success;
+                title = LocalizationHelper.GetString("ConnectionPage_AdviceTunnelTitle");
+                message = LocalizationHelper.GetString("ConnectionPage_AdviceTunnelMessage");
+                break;
+            default:
+                // Local or unparseable — no transport warning needed.
+                AddSecurityAdviceBar.IsOpen = false;
+                return;
+        }
+
+        // InfoBar does not reliably repaint its severity icon/accent when
+        // Severity changes while IsOpen stays true. When the severity actually
+        // changes (e.g. cleartext ws:// → TLS wss://), force a close before
+        // re-applying so the bar re-renders cleanly. Guard on change so we
+        // don't flicker on every keystroke within the same severity.
+        if (AddSecurityAdviceBar.IsOpen && AddSecurityAdviceBar.Severity != severity)
+            AddSecurityAdviceBar.IsOpen = false;
+
+        AddSecurityAdviceBar.Severity = severity;
+        AddSecurityAdviceBar.Title = title;
+        AddSecurityAdviceBar.Message = message;
+        AddSecurityAdviceBar.IsOpen = open;
     }
 
     private string ActiveAddPaneTag()
@@ -1822,10 +2187,23 @@ private void ShowGatewayHostFailure(string title, string message, bool preferInl
             return;
         }
 
-        AuthErrorBar.Title = title;
-        AuthErrorBar.Message = message;
-        AuthErrorBar.Severity = InfoBarSeverity.Error;
-        AuthErrorBar.IsOpen = true;
+        // No inline WSL-controls surface is available here (e.g. launching a
+        // terminal for a non-active saved gateway, where that card isn't shown).
+        // The in-page Connection Error bar was removed, so surface the failure as
+        // a transient top-bar notification rather than dropping it silently. This
+        // is a one-off action failure, not the persistent connection-issue banner,
+        // so it carries no "Open Connection" action.
+        AppNotificationPublisher.Show(
+            CurrentApp.AppNotifications,
+            title,
+            message,
+            "connection",
+            "gateway-host",
+            AppNotificationSeverity.Error,
+            $"gateway-host-action:{title}",
+            actionRoute: string.Empty,
+            actionLabel: string.Empty,
+            id: $"gateway-host-action:{title}");
     }
 
     private static string UppercaseFirst(string value)
@@ -1949,16 +2327,24 @@ private async Task OnApplyRepairCodeAsync()
     {
         var code = RecoveryRepairCodeBox.Text?.Trim();
         if (string.IsNullOrEmpty(code) || _connectionManager == null) return;
+        void ShowResult(string text, bool error)
+        {
+            RecoveryRepairResultText.Text = text;
+            RecoveryRepairResultText.Foreground = (Brush)Application.Current.Resources[
+                error ? "SystemFillColorCriticalBrush" : "SystemFillColorSuccessBrush"];
+            RecoveryRepairResultText.Visibility = Visibility.Visible;
+        }
         try
         {
             var result = await _connectionManager.ApplySetupCodeAsync(code);
-            AddResultText.Text = result.Outcome == SetupCodeOutcome.Success
-                ? LocalizationHelper.GetString("ConnectionPage_RepairedReconnecting")
-                : $"✗ {result.ErrorMessage ?? LocalizationHelper.GetString("ConnectionPage_CouldNotApplyCode")}";
+            if (result.Outcome == SetupCodeOutcome.Success)
+                ShowResult(LocalizationHelper.GetString("ConnectionPage_RepairedReconnecting"), error: false);
+            else
+                ShowResult($"✗ {result.ErrorMessage ?? LocalizationHelper.GetString("ConnectionPage_CouldNotApplyCode")}", error: true);
         }
         catch (Exception ex)
         {
-            AddResultText.Text = $"✗ {ex.Message}";
+            ShowResult($"✗ {ex.Message}", error: true);
         }
     }
 
@@ -1990,18 +2376,16 @@ private async Task OnConnectSavedGatewayAsync(object sender)
         catch (Exception ex)
         {
             // Strip status will read the snapshot's terminal state next tick;
-            // surface the immediate error in the auth-error bar so the user
-            // gets feedback even if the snapshot is briefly silent.
+            // surface the immediate error in the single top connection banner so
+            // the user gets feedback (and an "Open Connection" action) even if
+            // the snapshot is briefly silent.
             try
             {
-                AuthErrorBar.Title = LocalizationHelper.GetString("ConnectionPage_ConnectFailed");
-                AuthErrorBar.Message = ex.Message;
-                AuthErrorBar.Severity = Microsoft.UI.Xaml.Controls.InfoBarSeverity.Error;
-                AuthErrorBar.IsOpen = true;
+                CurrentApp.ShowTransientConnectionError(ex.Message);
             }
             catch (Exception uiEx)
             {
-                Logger.Warn($"ConnectionPage: Failed to surface connect failure in auth error bar: {uiEx.Message}");
+                Logger.Warn($"ConnectionPage: Failed to surface connect failure in connection banner: {uiEx.Message}");
             }
         }
         finally
@@ -2107,6 +2491,7 @@ private void OnDirectInputChanged(object sender, RoutedEventArgs e)
         var url = DirectUrlBox.Text?.Trim();
         ScheduleConnectivityTest(url);
         AutoFillTokenForUrl(url);
+        UpdateRemoteSetupAdvice();
     }
 
     private void OnDirectUrlLostFocus(object sender, RoutedEventArgs e)
@@ -2115,6 +2500,7 @@ private void OnDirectUrlLostFocus(object sender, RoutedEventArgs e)
         ScheduleConnectivityTest(url);
         // On focus-out, overwrite token even if already populated (user finished editing URL).
         AutoFillTokenForUrl(url, force: true);
+        UpdateRemoteSetupAdvice();
     }
 
     private void AutoFillTokenForUrl(string? url, bool force = false)
@@ -2263,43 +2649,12 @@ private async Task DoDirectConnectFromAddFormAsync()
 
         url = GatewayUrlHelper.NormalizeForWebSocket(url);
 
-        // SSH tunnel — read from the Add form (per-gateway) if the expander is open
-        SshTunnelConfig? sshConfig = null;
-        bool useSsh = AddSshExpander.IsExpanded
-                   && !string.IsNullOrWhiteSpace(AddSshUserBox.Text)
-                   && !string.IsNullOrWhiteSpace(AddSshHostBox.Text);
-        if (useSsh)
+        if (!TryBuildAddSshTunnelConfig(out var sshConfig, out var sshError))
         {
-            var sshUser = AddSshUserBox.Text.Trim();
-            var sshHost = AddSshHostBox.Text.Trim();
-            var sshPortText = string.IsNullOrWhiteSpace(AddSshServerPortBox.Text) ? "22" : AddSshServerPortBox.Text;
-            if (!int.TryParse(sshPortText, out var sshPort) || sshPort is < 1 or > 65535)
-            {
-                AddResultText.Text = LocalizationHelper.GetString("ConnectionPage_SshServerPortInvalid");
-                return;
-            }
-            if (!int.TryParse(AddSshRemotePortBox.Text, out var remotePort) || remotePort is < 1 or > 65535)
-            {
-                AddResultText.Text = LocalizationHelper.GetString("ConnectionPage_SshRemotePortInvalid");
-                return;
-            }
-            if (!int.TryParse(AddSshLocalPortBox.Text, out var localPort) || localPort is < 1 or > 65535)
-            {
-                AddResultText.Text = LocalizationHelper.GetString("ConnectionPage_SshLocalPortInvalid");
-                return;
-            }
-            var includeBrowserProxyForward = BrowserProxySshTunnelForwardPolicy.ShouldInclude(
-                CurrentApp.Settings.NodeBrowserProxyEnabled,
-                remotePort,
-                localPort);
-            sshConfig = new SshTunnelConfig(
-                sshUser,
-                sshHost,
-                remotePort,
-                localPort,
-                IncludeBrowserProxyForward: includeBrowserProxyForward,
-                SshPort: sshPort);
+            AddResultText.Text = sshError;
+            return;
         }
+        bool useSsh = sshConfig != null;
 
         AddSaveButton.IsEnabled = false;
         AddResultText.Text = LocalizationHelper.GetString("ConnectionPage_Connecting");
@@ -2490,6 +2845,51 @@ or OverallConnectionState.Degraded ||
         snapshot.OperatorState is RoleConnectionState.PairingRequired
             or RoleConnectionState.Error;
 
+    private bool TryBuildAddSshTunnelConfig(out SshTunnelConfig? sshConfig, out string? error)
+    {
+        sshConfig = null;
+        error = null;
+
+        if (!AddSshExpander.IsExpanded ||
+            string.IsNullOrWhiteSpace(AddSshUserBox.Text) ||
+            string.IsNullOrWhiteSpace(AddSshHostBox.Text))
+        {
+            return true;
+        }
+
+        var sshUser = AddSshUserBox.Text.Trim();
+        var sshHost = AddSshHostBox.Text.Trim();
+        var sshPortText = string.IsNullOrWhiteSpace(AddSshServerPortBox.Text) ? "22" : AddSshServerPortBox.Text;
+        if (!int.TryParse(sshPortText, out var sshPort) || sshPort is < 1 or > 65535)
+        {
+            error = LocalizationHelper.GetString("ConnectionPage_SshServerPortInvalid");
+            return false;
+        }
+        if (!int.TryParse(AddSshRemotePortBox.Text, out var remotePort) || remotePort is < 1 or > 65535)
+        {
+            error = LocalizationHelper.GetString("ConnectionPage_SshRemotePortInvalid");
+            return false;
+        }
+        if (!int.TryParse(AddSshLocalPortBox.Text, out var localPort) || localPort is < 1 or > 65535)
+        {
+            error = LocalizationHelper.GetString("ConnectionPage_SshLocalPortInvalid");
+            return false;
+        }
+
+        var includeBrowserProxyForward = BrowserProxySshTunnelForwardPolicy.ShouldInclude(
+            CurrentApp.Settings.NodeBrowserProxyEnabled,
+            remotePort,
+            localPort);
+        sshConfig = new SshTunnelConfig(
+            sshUser,
+            sshHost,
+            remotePort,
+            localPort,
+            IncludeBrowserProxyForward: includeBrowserProxyForward,
+            SshPort: sshPort);
+        return true;
+    }
+
     private static GatewayConnectionSnapshot EnsureDirectConnectSucceeded(GatewayConnectionSnapshot snapshot)
     {
         if (snapshot.OperatorState == RoleConnectionState.Error)
@@ -2546,7 +2946,7 @@ private void RollbackDirectConnect(
                     fileUnchanged = true;
                 }
                 if (fileUnchanged)
-                    File.WriteAllText(identityKeyPath, identityBackup);
+                    DeviceIdentity.AtomicWriteKeyFileRaw(identityKeyPath, identityBackup);
                 // else: another writer touched the file; preserve it.
             }
             catch (Exception ex)
@@ -2576,6 +2976,11 @@ private async Task DoApplySetupCodeFromAddFormAsync()
             AddResultText.Text = LocalizationHelper.GetString("ConnectionPage_PleaseEnterSetupCode");
             return;
         }
+        if (!TryBuildAddSshTunnelConfig(out var sshConfig, out var sshError))
+        {
+            AddResultText.Text = sshError;
+            return;
+        }
 
         AddSaveButton.IsEnabled = false;
         AddResultText.Text = LocalizationHelper.GetString("ConnectionPage_Applying");
@@ -2583,7 +2988,7 @@ private async Task DoApplySetupCodeFromAddFormAsync()
         {
             if (_connectionManager != null)
             {
-                var result = await _connectionManager.ApplySetupCodeAsync(code);
+                var result = await _connectionManager.ApplySetupCodeAsync(code, sshConfig);
                 AddResultText.Text = result.Outcome switch
                 {
                     SetupCodeOutcome.Success => $"✓ {string.Format(LocalizationHelper.GetString("ConnectionPage_AppliedGateway"), SanitizeUrl(result.GatewayUrl ?? ""))}",
@@ -2634,6 +3039,8 @@ private void OnSetupCodeTextChanged(object sender, TextChangedEventArgs? e)
         if (string.IsNullOrEmpty(code) || code.Length < 10)
         {
             AddSetupCodePreviewPanel.Visibility = Visibility.Collapsed;
+            _lastDecodedSetupUrl = null;
+            UpdateRemoteSetupAdvice();
             return;
         }
         var decoded = SetupCodeDecoder.Decode(code);
@@ -2648,10 +3055,15 @@ private void OnSetupCodeTextChanged(object sender, TextChangedEventArgs? e)
             // Auto-test connectivity with the decoded URL
             if (!string.IsNullOrEmpty(decoded.Url))
                 ScheduleConnectivityTest(decoded.Url);
+            // Warn if the decoded URL would send the bootstrap token in cleartext.
+            _lastDecodedSetupUrl = decoded.Url;
+            UpdateRemoteSetupAdvice();
         }
         else
         {
             AddSetupCodePreviewPanel.Visibility = Visibility.Collapsed;
+            _lastDecodedSetupUrl = null;
+            UpdateRemoteSetupAdvice();
         }
     }
 
@@ -2928,6 +3340,8 @@ private void OnAppStateChanged(object? sender, PropertyChangedEventArgs e)
                 case nameof(AppState.Channels):
                 case nameof(AppState.UsageCost):
                 case nameof(AppState.Sessions):
+                    OnGlanceDataChanged();
+                    break;
                 case nameof(AppState.GatewaySelf):
                     OnGlanceDataChanged();
                     break;
@@ -3325,21 +3739,6 @@ await RunPairingDecisionAsync(approveBtn, rejectBtn, isApprove: false, async cli
         return card;
     }
 
-    // ─── Auth error guidance (preserved) ─────────────────────────────
-
-    private static string GetAuthErrorGuidance(string error)
-    {
-        if (error.Contains("token", StringComparison.OrdinalIgnoreCase))
-            return string.Format(LocalizationHelper.GetString("ConnectionPage_AuthGuidanceToken"), error);
-        if (error.Contains("pairing", StringComparison.OrdinalIgnoreCase))
-            return string.Format(LocalizationHelper.GetString("ConnectionPage_AuthGuidancePairing"), error);
-        if (error.Contains("password", StringComparison.OrdinalIgnoreCase))
-            return string.Format(LocalizationHelper.GetString("ConnectionPage_AuthGuidancePassword"), error);
-        if (error.Contains("signature", StringComparison.OrdinalIgnoreCase))
-            return string.Format(LocalizationHelper.GetString("ConnectionPage_AuthGuidanceSignature"), error);
-        return string.Format(LocalizationHelper.GetString("ConnectionPage_AuthGuidanceDefault"), error);
-    }
-
     private static string SanitizeUrl(string url)
     {
         try
diff --git a/src/OpenClaw.Tray.WinUI/Pages/ConnectionPagePlan.cs b/src/OpenClaw.Tray.WinUI/Pages/ConnectionPagePlan.cs
index c40725d4c..905a77537 100644
--- a/src/OpenClaw.Tray.WinUI/Pages/ConnectionPagePlan.cs
+++ b/src/OpenClaw.Tray.WinUI/Pages/ConnectionPagePlan.cs
@@ -86,7 +86,11 @@ internal enum NodeCardState
 {
     Hidden,
     Off,
+    /// <summary>Gateway node is off, local MCP server is enabled.</summary>
+    OffMcpOnly,
     OnHealthy,
+    /// <summary>Node role is connecting / starting up (not yet ready).</summary>
+    OnNodeConnecting,
     OnPermissionsIncomplete,
     OnNodeApprovalRequired,
     OnNodeReapprovalRequired,
@@ -105,6 +109,14 @@ internal enum RecoveryCategory
     Network,
     Server,
     Tunnel,
+    /// <summary>Authenticated but missing a required scope — re-pair for higher scopes.</summary>
+    Scope,
+    /// <summary>Stored device token rotated/revoked — re-pair to repair.</summary>
+    TokenDrift,
+    /// <summary>TLS/cleartext transport problem — switch to wss:// or a tunnel.</summary>
+    Tls,
+    /// <summary>Gateway is temporarily rate-limiting this client.</summary>
+    RateLimited,
 }
 
 /// <summary>
@@ -212,7 +224,7 @@ private static ConnectionPagePlan BuildDerived(
         // ─── Derived layout ───
         return snap.OverallState switch
         {
-            OverallConnectionState.Idle => BuildIdle(savedGatewayCount, activeRecord),
+            OverallConnectionState.Idle => BuildIdle(savedGatewayCount, activeRecord, settings),
 
             OverallConnectionState.Connecting => BuildCockpitConnecting(snap, activeRecord, displayName),
 
@@ -241,7 +253,7 @@ private static ConnectionPagePlan BuildDerived(
                 ActiveGatewayHasSshTunnel = activeRecord?.SshTunnel != null,
             },
 
-            _ => BuildIdle(savedGatewayCount, activeRecord),
+            _ => BuildIdle(savedGatewayCount, activeRecord, settings),
         };
     }
 
@@ -249,8 +261,12 @@ private static ConnectionPagePlan BuildDerived(
     // Mode builders
     // ───────────────────────────────────────────────────────────────────
 
-    private static ConnectionPagePlan BuildIdle(int savedCount, GatewayRecord? activeRecord)
+    private static ConnectionPagePlan BuildIdle(
+        int savedCount,
+        GatewayRecord? activeRecord,
+        SettingsManager? settings)
     {
+        var idleNodeCard = BuildIdleNodeCardState(settings);
         if (savedCount == 0)
         {
             return new ConnectionPagePlan
@@ -260,11 +276,12 @@ private static ConnectionPagePlan BuildIdle(int savedCount, GatewayRecord? activ
                 StripAccent = ConnectionAccent.Neutral,
                 StripHeadline = "No gateway yet",
                 StripSub = "Add a gateway to get started.",
+                NodeCard = idleNodeCard,
             };
         }
 
         // Saved gateways exist but none active — drop straight into Cockpit
-        // (Operator/Node panels hide themselves because OperatorCardState=Hidden).
+        // (role panels hide themselves unless local MCP-only status is visible).
         return new ConnectionPagePlan
         {
             Mode = ConnectionPageMode.Cockpit,
@@ -272,6 +289,7 @@ private static ConnectionPagePlan BuildIdle(int savedCount, GatewayRecord? activ
             StripAccent = ConnectionAccent.Neutral,
             StripHeadline = "Not connected",
             StripSub = "Pick a gateway below, or add a new one.",
+            NodeCard = idleNodeCard,
             RelevantGatewayId = activeRecord?.Id,
         };
     }
@@ -341,6 +359,7 @@ private static ConnectionPagePlan BuildCockpitDegraded(
                 RoleConnectionState.PairingRejected => "Node pairing was rejected.",
                 RoleConnectionState.RateLimited => "Node is rate-limited by the gateway.",
                 RoleConnectionState.Error => "Node reported an error.",
+                RoleConnectionState.Idle when snap.NodeConnectionIntended => "Node mode is enabled, but the node has not connected.",
                 _ => "Connection is impaired.",
             };
 
@@ -449,6 +468,85 @@ private static ConnectionPagePlan BuildRecoveryFromError(
                 RelevantGatewayId = rec?.Id,
             },
 
+            // Stored device token rotated/revoked — the fix is to re-pair, not
+            // retry. Same paste-setup-code affordance as Auth, clearer copy.
+            RecoveryCategory.TokenDrift => new ConnectionPagePlan
+            {
+                Mode = ConnectionPageMode.Recovery,
+                Recovery = RecoveryCategory.TokenDrift,
+                StripGlyph = OpenClawTray.Helpers.FluentIconCatalog.StatusErr,
+                StripAccent = ConnectionAccent.Critical,
+                StripHeadline = "Device needs re-pairing",
+                StripSub = string.IsNullOrEmpty(err)
+                    ? $"The saved device token for {name} is no longer trusted by the gateway."
+                    : err,
+                StripPrimaryLabel = null,
+                StripPrimaryAction = ConnectionPrimaryAction.None,
+                ActiveGatewayDisplayName = name,
+                ActiveGatewayDetailLine = url,
+                ActiveGatewayHasSshTunnel = rec?.SshTunnel != null,
+                RelevantGatewayId = rec?.Id,
+            },
+
+            // Authenticated but under-privileged — re-pair to request the scopes
+            // this device needs (e.g. operator.admin / operator.pairing).
+            RecoveryCategory.Scope => new ConnectionPagePlan
+            {
+                Mode = ConnectionPageMode.Recovery,
+                Recovery = RecoveryCategory.Scope,
+                StripGlyph = OpenClawTray.Helpers.FluentIconCatalog.Lock,
+                StripAccent = ConnectionAccent.Critical,
+                StripHeadline = "Not enough access",
+                StripSub = string.IsNullOrEmpty(err)
+                    ? $"This device is connected but lacks the scopes it needs on {name}."
+                    : err,
+                StripPrimaryLabel = null,
+                StripPrimaryAction = ConnectionPrimaryAction.None,
+                ActiveGatewayDisplayName = name,
+                ActiveGatewayDetailLine = url,
+                ActiveGatewayHasSshTunnel = rec?.SshTunnel != null,
+                RelevantGatewayId = rec?.Id,
+            },
+
+            // TLS/cleartext transport problem — steer toward wss:// or a tunnel.
+            RecoveryCategory.Tls => new ConnectionPagePlan
+            {
+                Mode = ConnectionPageMode.Recovery,
+                Recovery = RecoveryCategory.Tls,
+                StripGlyph = OpenClawTray.Helpers.FluentIconCatalog.StatusErr,
+                StripAccent = ConnectionAccent.Critical,
+                StripHeadline = "Secure connection failed",
+                StripSub = string.IsNullOrEmpty(err)
+                    ? "The gateway's transport could not be secured."
+                    : err,
+                StripPrimaryLabel = "Retry",
+                StripPrimaryAction = ConnectionPrimaryAction.Retry,
+                RecoveryDetail = err,
+                ActiveGatewayDisplayName = name,
+                ActiveGatewayDetailLine = url,
+                ActiveGatewayHasSshTunnel = rec?.SshTunnel != null,
+                RelevantGatewayId = rec?.Id,
+            },
+
+            RecoveryCategory.RateLimited => new ConnectionPagePlan
+            {
+                Mode = ConnectionPageMode.Recovery,
+                Recovery = RecoveryCategory.RateLimited,
+                StripGlyph = OpenClawTray.Helpers.FluentIconCatalog.StatusWarn,
+                StripAccent = ConnectionAccent.Caution,
+                StripHeadline = "Too many failed attempts",
+                StripSub = string.IsNullOrEmpty(err)
+                    ? "The gateway is temporarily limiting connection attempts from this client."
+                    : err,
+                StripPrimaryLabel = null,
+                StripPrimaryAction = ConnectionPrimaryAction.None,
+                RecoveryDetail = err,
+                ActiveGatewayDisplayName = name,
+                ActiveGatewayDetailLine = url,
+                ActiveGatewayHasSshTunnel = rec?.SshTunnel != null,
+                RelevantGatewayId = rec?.Id,
+            },
+
             RecoveryCategory.Tunnel => new ConnectionPagePlan
             {
                 Mode = ConnectionPageMode.Recovery,
@@ -530,7 +628,8 @@ GatewayNodeApprovalState.PendingApproval or
         var nodeCardAllowsTrustOverride = plan.NodeCard is
             NodeCardState.OnHealthy or
             NodeCardState.OnPermissionsIncomplete or
-            NodeCardState.OnNodePairingRequired ||
+            NodeCardState.OnNodePairingRequired or
+            NodeCardState.OnNodeConnecting ||
             nodeConnectingAllowsTrustOverride;
         // Authoritative node-list trust can override any non-device-pair card.
         // Snapshot fallback is narrower: Unknown stays on discovery-only pairing UI.
@@ -598,23 +697,35 @@ NodeCardState.OnPermissionsIncomplete or
     private static NodeCardState BuildNodeCardState(GatewayConnectionSnapshot snap, SettingsManager? settings)
     {
         if (settings == null) return NodeCardState.Hidden;
-        if (!settings.EnableNodeMode) return NodeCardState.Off;
 
-        // Operator must be connected for the node card to be meaningful.
+        if (!settings.EnableNodeMode)
+            return settings.EnableMcpServer ? NodeCardState.OffMcpOnly : NodeCardState.Off;
+
         if (snap.OperatorState != RoleConnectionState.Connected)
             return NodeCardState.Off;
 
         return snap.NodeState switch
         {
+            RoleConnectionState.Connecting => NodeCardState.OnNodeConnecting,
             RoleConnectionState.PairingRequired => NodeCardState.OnNodePairingRequired,
             RoleConnectionState.PairingRejected => NodeCardState.OnNodeRejected,
             RoleConnectionState.RateLimited => NodeCardState.OnNodeRateLimited,
             RoleConnectionState.Error => NodeCardState.OnNodeError,
+            RoleConnectionState.Idle when snap.NodeConnectionIntended => NodeCardState.OnNodeError,
             _ when CountEnabledCapabilities(settings) == 0 => NodeCardState.OnPermissionsIncomplete,
             _ => NodeCardState.OnHealthy,
         };
     }
 
+    private static NodeCardState BuildIdleNodeCardState(SettingsManager? settings)
+    {
+        if (settings == null) return NodeCardState.Hidden;
+
+        return !settings.EnableNodeMode && settings.EnableMcpServer
+            ? NodeCardState.OffMcpOnly
+            : NodeCardState.Hidden;
+    }
+
     private static string? BuildNodeApproveCommand(GatewayConnectionSnapshot snap)
     {
         if (snap.NodeState != RoleConnectionState.PairingRequired) return null;
@@ -708,20 +819,24 @@ private static int CountEnabledCapabilities(SettingsManager s)
 
     private static RecoveryCategory ClassifyError(string err)
     {
-        if (string.IsNullOrEmpty(err)) return RecoveryCategory.Network;
-        var e = err.ToLowerInvariant();
-
-        if (e.Contains("auth") || e.Contains("token") || e.Contains("unauthor") || e.Contains("forbid"))
-            return RecoveryCategory.Auth;
-
-        if (e.Contains("ssh") || e.Contains("tunnel"))
-            return RecoveryCategory.Tunnel;
-
-        if (e.Contains("500") || e.Contains("502") || e.Contains("503") ||
-            e.Contains("internal") || e.Contains("server"))
-            return RecoveryCategory.Server;
-
-        return RecoveryCategory.Network;
+        // Delegate the heuristic matching to the pure, unit-tested Shared
+        // classifier so the same kinds drive both setup and recovery copy.
+        return OpenClaw.Shared.GatewayErrorClassifier.Classify(err) switch
+        {
+            OpenClaw.Shared.GatewayErrorKind.ScopeMismatch => RecoveryCategory.Scope,
+            OpenClaw.Shared.GatewayErrorKind.TokenDrift => RecoveryCategory.TokenDrift,
+            OpenClaw.Shared.GatewayErrorKind.Auth => RecoveryCategory.Auth,
+            OpenClaw.Shared.GatewayErrorKind.Tls => RecoveryCategory.Tls,
+            OpenClaw.Shared.GatewayErrorKind.Tunnel => RecoveryCategory.Tunnel,
+            OpenClaw.Shared.GatewayErrorKind.Server => RecoveryCategory.Server,
+            OpenClaw.Shared.GatewayErrorKind.RateLimited => RecoveryCategory.RateLimited,
+            OpenClaw.Shared.GatewayErrorKind.PairingRejected => RecoveryCategory.Auth,
+            // PairingRequired is normally driven by snapshot state, not the
+            // error string; if it surfaces here, the Auth re-pair path is the
+            // closest actionable fit. Network / Unknown → Network.
+            OpenClaw.Shared.GatewayErrorKind.PairingRequired => RecoveryCategory.Auth,
+            _ => RecoveryCategory.Network,
+        };
     }
 
     private static string FormatUptime(long uptimeMs)
diff --git a/src/OpenClaw.Tray.WinUI/Pages/CronPage.xaml b/src/OpenClaw.Tray.WinUI/Pages/CronPage.xaml
index dbb453608..4adf38242 100644
--- a/src/OpenClaw.Tray.WinUI/Pages/CronPage.xaml
+++ b/src/OpenClaw.Tray.WinUI/Pages/CronPage.xaml
@@ -26,7 +26,9 @@
                      <ColumnDefinition Width="Auto"/>
                      <ColumnDefinition Width="Auto"/>
                  </Grid.ColumnDefinitions>
-                 <TextBlock x:Uid="CronPage_CronJobs" Text="Cron Jobs" Style="{StaticResource TitleTextBlockStyle}" Grid.Column="0" VerticalAlignment="Center"/>
+                 <TextBlock x:Uid="CronPage_CronJobs" Text="Cron Jobs"
+                            AutomationProperties.AutomationId="CronPageMarker"
+                            Style="{StaticResource TitleTextBlockStyle}" Grid.Column="0" VerticalAlignment="Center"/>
                  <TextBlock x:Name="JobCountText" Text="(0)" VerticalAlignment="Center" Grid.Column="1" Margin="8,0,0,0"
                             Style="{StaticResource CaptionTextBlockStyle}"
                             Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
diff --git a/src/OpenClaw.Tray.WinUI/Pages/CronPage.xaml.cs b/src/OpenClaw.Tray.WinUI/Pages/CronPage.xaml.cs
index ee0d41929..8b198e39c 100644
--- a/src/OpenClaw.Tray.WinUI/Pages/CronPage.xaml.cs
+++ b/src/OpenClaw.Tray.WinUI/Pages/CronPage.xaml.cs
@@ -3,14 +3,17 @@
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media;
 using OpenClaw.Shared;
+using OpenClawTray.Chat;
+using OpenClawTray.Chat.Markdown;
+using OpenClawTray.FunctionalUI.Hosting;
 using OpenClawTray.Helpers;
 using OpenClawTray.Services;
+using OpenClawTray.Windows;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 using System.Text.Json;
-using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Windows.UI;
 
@@ -26,6 +29,9 @@ public sealed partial class CronPage : Page
     private HashSet<string> _runningJobIds = new(); // jobs currently being triggered
     private HashSet<string> _removedJobIds = new(); // jobs user explicitly removed (suppress auto-delete notification)
     private HashSet<string> _expandedJobIds = new(); // persisted expanded state
+    private readonly Dictionary<string, CancellationTokenSource> _runRefreshCts = new();
+    private readonly HashSet<string> _expandedRunFullResponseIds = new(); // persisted run response expansion state
+    private string? _lastHistoryRenderSignature = null;
     private CancellationTokenSource? _infoDismissCts = null; // auto-dismiss timer for InfoBar
     private readonly AsyncListLoadingState _cronLoading = new();
 
@@ -35,6 +41,7 @@ public CronPage()
         Unloaded += (_, _) =>
         {
             if (_appState != null) _appState.PropertyChanged -= OnAppStateChanged;
+            CancelAllRunRefreshLoops();
         };
     }
 
@@ -127,23 +134,37 @@ private void OnRunNowClick(object sender, RoutedEventArgs e)
         if (!_cronLoading.CanEdit) return;
         if (CurrentApp.GatewayClient == null) { ShowDisconnected(); return; }
         var vm = _jobs.Find(j => j.Id == jobId);
-        if (vm != null && !vm.IsEnabled) return;
+        if (_runningJobIds.Contains(jobId)) return;
         _runningJobIds.Add(jobId);
-        btn!.Content = LocalizationHelper.GetString("CronPage_Running");
-        btn.IsEnabled = false;
+        RefreshJobActionButtons(jobId);
 
-        CurrentApp.GatewayClient.RunCronJobAsync(jobId).ContinueWith(t =>
+        CurrentApp.GatewayClient.RunCronJobDetailedAsync(jobId).ContinueWith(t =>
         {
-            if (t.IsFaulted || (t.IsCompletedSuccessfully && !t.Result))
+            DispatcherQueue?.TryEnqueue(() =>
             {
-                // Request failed — clear running state immediately
-                DispatcherQueue?.TryEnqueue(() =>
+                var client = CurrentApp.GatewayClient;
+                var result = t.IsCompletedSuccessfully ? t.Result : null;
+                if (t.IsFaulted || result?.Enqueued != true)
                 {
-                    _runningJobIds.Remove(jobId);
-                    var client = CurrentApp.GatewayClient;
+                    var detail = t.IsFaulted
+                        ? t.Exception?.GetBaseException().Message ?? LocalizationHelper.GetString("AppNotification_CronRunFailed_DefaultDetail")
+                        : result?.Reason ?? result?.Error ?? LocalizationHelper.GetString("AppNotification_CronRunRejectedDetail");
+                    ClearRunningJob(jobId);
+                    ShowRunNotStartedNotification(vm?.Name ?? jobId, detail);
+                    ShowCronAppNotification(
+                        LocalizationHelper.GetString("AppNotification_CronRunFailed_Title"),
+                        LocalizationHelper.Format("AppNotification_CronRunFailed_MessageFormat", vm?.Name ?? jobId, detail),
+                        AppNotificationSeverity.Error,
+                        $"cron:{jobId}:run-failed");
                     if (client != null) _ = client.RequestCronListAsync();
-                });
-            }
+                    return;
+                }
+
+                if (client != null)
+                {
+                    StartRunRefreshLoop(jobId);
+                }
+            });
         });
 
         // Safety timeout: clear running state after 90s if gateway never reports completion
@@ -154,19 +175,100 @@ private void OnRunNowClick(object sender, RoutedEventArgs e)
             {
                 DispatcherQueue?.TryEnqueue(() =>
                 {
-                    _runningJobIds.Remove(jobId);
+                    ClearRunningJob(jobId);
                     var client = CurrentApp.GatewayClient;
-                    if (client != null) _ = client.RequestCronListAsync();
+                    if (client != null)
+                    {
+                        _ = client.RequestCronListAsync();
+                        if (_historyJobId == jobId)
+                            _ = client.RequestCronRunsAsync(jobId, limit: 20, offset: 0);
+                    }
                 });
             }
         });
     }
 
+    private void StartRunRefreshLoop(string jobId)
+    {
+        CancelRunRefreshLoop(jobId);
+        var cts = new CancellationTokenSource();
+        _runRefreshCts[jobId] = cts;
+        var token = cts.Token;
+
+        _ = Task.Run(async () =>
+        {
+            try
+            {
+                for (var attempt = 0; attempt < 30; attempt++)
+                {
+                    await Task.Delay(TimeSpan.FromSeconds(3), token);
+                    DispatcherQueue?.TryEnqueue(() =>
+                    {
+                        if (token.IsCancellationRequested)
+                            return;
+                        if (!_runningJobIds.Contains(jobId))
+                        {
+                            CancelRunRefreshLoop(jobId);
+                            return;
+                        }
+
+                        var client = CurrentApp.GatewayClient;
+                        if (client == null) return;
+
+                        _ = client.RequestCronRunsAsync(jobId, limit: 20, offset: 0);
+                    });
+                }
+            }
+            catch (TaskCanceledException)
+            {
+                // Expected when the run completes, times out, or the page unloads.
+            }
+            finally
+            {
+                var dispatcher = DispatcherQueue;
+                if (dispatcher != null)
+                {
+                    dispatcher.TryEnqueue(() =>
+                    {
+                        if (_runRefreshCts.TryGetValue(jobId, out var current) && ReferenceEquals(current, cts))
+                            _runRefreshCts.Remove(jobId);
+                        cts.Dispose();
+                    });
+                }
+                else
+                {
+                    cts.Dispose();
+                }
+            }
+        });
+    }
+
+    private void ClearRunningJob(string jobId)
+    {
+        _runningJobIds.Remove(jobId);
+        CancelRunRefreshLoop(jobId);
+        RefreshJobActionButtons(jobId);
+    }
+
+    private void CancelRunRefreshLoop(string jobId)
+    {
+        if (_runRefreshCts.Remove(jobId, out var cts))
+            cts.Cancel();
+    }
+
+    private void CancelAllRunRefreshLoops()
+    {
+        foreach (var cts in _runRefreshCts.Values)
+            cts.Cancel();
+        _runRefreshCts.Clear();
+    }
+
     private void OnRemoveClick(object sender, RoutedEventArgs e)
     {
         var jobId = (sender as Button)?.Tag as string;
         if (string.IsNullOrEmpty(jobId)) return;
         if (!_cronLoading.CanEdit) return;
+        if (_runningJobIds.Contains(jobId)) return;
         if (CurrentApp.GatewayClient == null) { ShowDisconnected(); return; }
         _removedJobIds.Add(jobId);
         // Gateway client's HandleKnownResponse refreshes the list automatically on cron.remove
@@ -183,6 +285,7 @@ private void OnEnabledToggleChanged(object sender, RoutedEventArgs e)
 
         var vm = _jobs.Find(j => j.Id == jobId);
         if (vm == null) return;
+        if (_runningJobIds.Contains(jobId)) return;
         if (ts.IsOn == vm.IsEnabled) return; // no-op (e.g., programmatic init)
         _ = CurrentApp.GatewayClient.UpdateCronJobAsync(jobId, new { enabled = ts.IsOn });
     }
@@ -209,7 +312,7 @@ private void OnEditJobClick(object sender, RoutedEventArgs e)
         if (!_cronLoading.CanEdit) return;
         if (CurrentApp.GatewayClient == null) { ShowDisconnected(); return; }
         var vm = _jobs.Find(j => j.Id == jobId);
-        if (vm == null || !vm.IsEnabled) return;
+        if (vm == null || _runningJobIds.Contains(jobId)) return;
 
         _editingJobId = jobId;
         FormTitle.Text = LocalizationHelper.GetString("CronPage_EditJob");
@@ -519,6 +622,7 @@ private void ShowJobCompletedNotification(string jobName)
 
         JobCompletedInfoBar.Title = LocalizationHelper.GetString("CronPage_JobCompleted");
         JobCompletedInfoBar.Message = LocalizationHelper.Format("CronPage_JobCompletedRanSuccessfully", jobName);
+        JobCompletedInfoBar.Severity = InfoBarSeverity.Success;
         JobCompletedInfoBar.IsOpen = true;
         DispatcherQueue?.TryEnqueue(async () =>
         {
@@ -527,6 +631,44 @@ private void ShowJobCompletedNotification(string jobName)
         });
     }
 
+    private void ShowRunNotStartedNotification(string jobName, string? reason)
+    {
+        _infoDismissCts?.Cancel();
+        _infoDismissCts?.Dispose();
+        _infoDismissCts = new CancellationTokenSource();
+        var cts = _infoDismissCts;
+
+        JobCompletedInfoBar.Title = LocalizationHelper.GetString("CronPage_RunNotStarted");
+        JobCompletedInfoBar.Message = string.IsNullOrWhiteSpace(reason)
+            ? LocalizationHelper.Format("CronPage_RunNotStartedGeneric", jobName)
+            : LocalizationHelper.Format("CronPage_RunNotStartedWithReason", jobName, reason);
+        JobCompletedInfoBar.Severity = InfoBarSeverity.Warning;
+        JobCompletedInfoBar.IsOpen = true;
+        DispatcherQueue?.TryEnqueue(async () =>
+        {
+            try { await Task.Delay(10000, cts.Token); } catch (TaskCanceledException) { return; }
+            JobCompletedInfoBar.IsOpen = false;
+        });
+    }
+
+    private static void ShowCronAppNotification(
+        string title,
+        string message,
+        AppNotificationSeverity severity,
+        string dedupeKey)
+    {
+        AppNotificationPublisher.Show(
+            CurrentApp.AppNotifications,
+            title,
+            message,
+            "cron",
+            "jobs",
+            severity,
+            dedupeKey,
+            "cron",
+            LocalizationHelper.GetString("AppNotification_ActionOpenCron"));
+    }
+
     private static string? GetSelectedTag(ComboBox combo)
     {
         return (combo.SelectedItem as ComboBoxItem)?.Tag as string;
@@ -773,19 +915,31 @@ private void ParseCronList(JsonElement payload)
 
         DispatcherQueue?.TryEnqueue(() =>
         {
-            // Clear running state for jobs whose lastRunAtMs changed or runningAtMs is 0
+            var oldJobs = _jobs;
+            var hadRunningJobs = _runningJobIds.Count > 0;
+            var newIds = new HashSet<string>(jobs.Select(j => j.Id));
+            foreach (var runningJobId in _runningJobIds.ToArray())
+            {
+                if (!newIds.Contains(runningJobId))
+                    ClearRunningJob(runningJobId);
+            }
+
+            // Clear optimistic running state only after the gateway reports a completed run.
             foreach (var vm in jobs)
             {
                 if (_runningJobIds.Contains(vm.Id))
                 {
-                    var oldVm = _jobs.Find(j => j.Id == vm.Id);
-                    if (vm.RunningAtMs == 0 || oldVm == null || vm.LastRunAtMs != oldVm.LastRunAtMs)
-                        _runningJobIds.Remove(vm.Id);
+                    var oldVm = oldJobs.Find(j => j.Id == vm.Id);
+                    if (oldVm != null && vm.LastRunAtMs > 0 && vm.LastRunAtMs != oldVm.LastRunAtMs)
+                    {
+                        ClearRunningJob(vm.Id);
+                        if (_historyJobId == vm.Id && CurrentApp.GatewayClient != null)
+                            _ = CurrentApp.GatewayClient.RequestCronRunsAsync(vm.Id, limit: 20, offset: 0);
+                    }
                 }
             }
 
             // Detect one-shot jobs that disappeared (ran and deleted themselves)
-            var newIds = new HashSet<string>(jobs.Select(j => j.Id));
             foreach (var oldVm in _jobs)
             {
                 if (!newIds.Contains(oldVm.Id) && oldVm.DeleteAfterRun && !_removedJobIds.Contains(oldVm.Id))
@@ -796,6 +950,14 @@ private void ParseCronList(JsonElement payload)
                     _removedJobIds.Remove(oldVm.Id);
             }
 
+            var oldIds = new HashSet<string>(oldJobs.Select(j => j.Id));
+            var sameJobSet = oldIds.SetEquals(newIds);
+            var shouldPreserveVisualTreeForRunningRefresh =
+                hadRunningJobs &&
+                _runningJobIds.Count > 0 &&
+                sameJobSet &&
+                _editingJobId == null;
+
             _jobs = jobs;
             _cronLoading.Complete(jobs.Count);
 
@@ -809,8 +971,20 @@ private void ParseCronList(JsonElement payload)
             if (jobs.Count > 0)
             {
                 // Don't rebuild cards if we're currently editing inline (would lose the form)
-                if (_editingJobId == null)
-                    RebuildJobCards();
+                if (_editingJobId == null && !shouldPreserveVisualTreeForRunningRefresh)
+                {
+                    RebuildJobCards(preserveHistory: _historyJobId != null);
+                    if (_historyJobId != null && CurrentApp.GatewayClient != null)
+                    {
+                        ShowHistoryLoading(_historyJobId);
+                        _ = CurrentApp.GatewayClient.RequestCronRunsAsync(_historyJobId, limit: 20, offset: 0);
+                    }
+                }
+                else if (shouldPreserveVisualTreeForRunningRefresh)
+                {
+                    foreach (var runningJobId in _runningJobIds)
+                        RefreshJobActionButtons(runningJobId);
+                }
             }
             else
             {
@@ -846,7 +1020,7 @@ private void ParseCronStatus(JsonElement payload)
                 ? (Brush)Application.Current.Resources["SystemFillColorSuccessBrush"]
                 : (Brush)Application.Current.Resources["SystemFillColorNeutralBrush"];
             StorePathText.Text = storePath;
-            NextWakeText.Text = $"· Next wake: {nextWake}";
+            NextWakeText.Text = LocalizationHelper.Format("CronPage_NextWakeFormat", nextWake);
         });
     }
 
@@ -1010,7 +1184,7 @@ private void OnCardTapped(object sender, Microsoft.UI.Xaml.Input.TappedRoutedEve
             var parent = fe;
             while (parent != null)
             {
-                if (parent is Button) return;
+                if (parent is Button or ToggleSwitch or Expander) return;
                 parent = Microsoft.UI.Xaml.Media.VisualTreeHelper.GetParent(parent) as FrameworkElement;
             }
         }
@@ -1105,9 +1279,24 @@ private void RestoreFormFromInline()
 
     // --- Card building ---
 
-    private void RebuildJobCards()
+    private void RebuildJobCards(bool preserveHistory = false)
     {
-        _historyJobId = null; // history panel is destroyed on rebuild
+        var historyToRestore = preserveHistory ? _historyJobId : null;
+        if (historyToRestore != null)
+        {
+            var historyVm = _jobs.Find(j => j.Id == historyToRestore);
+            if (historyVm != null)
+            {
+                historyVm.IsExpanded = true;
+                _expandedJobIds.Add(historyToRestore);
+            }
+            else
+            {
+                historyToRestore = null;
+            }
+        }
+
+        _historyJobId = historyToRestore;
         JobsListPanel.Children.Clear();
         foreach (var vm in _jobs)
             JobsListPanel.Children.Add(BuildJobCard(vm));
@@ -1123,8 +1312,7 @@ private Border BuildJobCard(CronJobViewModel vm)
             CornerRadius = new CornerRadius(6),
             Background = (Brush)Application.Current.Resources["CardBackgroundFillColorDefaultBrush"],
             BorderBrush = (Brush)Application.Current.Resources["CardStrokeColorDefaultBrush"],
-            BorderThickness = new Thickness(1),
-            Opacity = vm.CardOpacity
+            BorderThickness = new Thickness(1)
         };
 
         var grid = new Grid();
@@ -1169,19 +1357,25 @@ private Border BuildJobCard(CronJobViewModel vm)
             headerGrid.Children.Add(resultBadge);
         }
 
-        // Show "Running" badge when job is in-progress
-        if (_runningJobIds.Contains(vm.Id))
+        var runningBadge = new Border
         {
-            var runningBadge = new Border
+            Tag = $"running_{vm.Id}",
+            Visibility = _runningJobIds.Contains(vm.Id) ? Visibility.Visible : Visibility.Collapsed,
+            CornerRadius = new CornerRadius(4),
+            Padding = new Thickness(6, 2, 6, 2),
+            Margin = new Thickness(4, 0, 0, 0),
+            VerticalAlignment = VerticalAlignment.Center,
+            Background = (Brush)Application.Current.Resources["SubtleFillColorSecondaryBrush"],
+            Child = new TextBlock
             {
-                CornerRadius = new CornerRadius(4), Padding = new Thickness(6, 2, 6, 2), Margin = new Thickness(4, 0, 0, 0),
-                VerticalAlignment = VerticalAlignment.Center,
-                Background = (Brush)Application.Current.Resources["SubtleFillColorSecondaryBrush"]
-            };
-            runningBadge.Child = new TextBlock { Text = "Running", FontSize = 10, FontWeight = Microsoft.UI.Text.FontWeights.SemiBold, Foreground = (Brush)Application.Current.Resources["SystemFillColorAttentionBrush"] };
-            Grid.SetColumn(runningBadge, 3);
-            headerGrid.Children.Add(runningBadge);
-        }
+                Text = LocalizationHelper.GetString("CronPage_RunningBadge"),
+                FontSize = 10,
+                FontWeight = Microsoft.UI.Text.FontWeights.SemiBold,
+                Foreground = (Brush)Application.Current.Resources["SystemFillColorAttentionBrush"]
+            }
+        };
+        Grid.SetColumn(runningBadge, 3);
+        headerGrid.Children.Add(runningBadge);
 
         // Inline enabled/disabled toggle (right-aligned, before chevron).
         // Stop tapped from bubbling so the card doesn't toggle expand state.
@@ -1194,9 +1388,11 @@ private Border BuildJobCard(CronJobViewModel vm)
             MinWidth = 0,
             VerticalAlignment = VerticalAlignment.Center,
             Margin = new Thickness(8, 0, 8, 0),
-            IsEnabled = _cronLoading.CanEdit
+            IsEnabled = _cronLoading.CanEdit && !vm.IsCompletedOneShot && !_runningJobIds.Contains(vm.Id)
         };
-        ToolTipService.SetToolTip(enabledToggle, vm.IsEnabled ? "Disable job" : "Enable job");
+        ToolTipService.SetToolTip(enabledToggle, vm.IsCompletedOneShot
+            ? LocalizationHelper.GetString("CronPage_CompletedOneTimeJobTooltip")
+            : vm.IsEnabled ? LocalizationHelper.GetString("CronPage_DisableJobTooltip") : LocalizationHelper.GetString("CronPage_EnableJobTooltip"));
         enabledToggle.Toggled += OnEnabledToggleChanged;
         enabledToggle.Tapped += (s, ev) => { ev.Handled = true; };
         Grid.SetColumn(enabledToggle, 5);
@@ -1267,30 +1463,32 @@ private StackPanel BuildDetailPanel(CronJobViewModel vm)
 
         // Action buttons
         var buttonsPanel = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 4 };
-        var jobDisabled = !vm.IsEnabled;
+        var isRunning = _runningJobIds.Contains(vm.Id);
+        var canRunOrEditJob = _cronLoading.CanEdit && !isRunning;
 
         // "Run Now" button — show running state if job is in the running set
-        var runNowBtn = MakeActionButton("\uE768", "Run Now", vm.Id, OnRunNowClick);
-        if (_runningJobIds.Contains(vm.Id))
+        var runNowBtn = MakeActionButton("\uE768", LocalizationHelper.GetString("CronPage_RunNow"), vm.Id, OnRunNowClick, "RunNow");
+        if (isRunning)
         {
-            runNowBtn.Content = "Running...";
+            runNowBtn.Content = LocalizationHelper.GetString("CronPage_Running");
             runNowBtn.IsEnabled = false;
         }
-        else if (jobDisabled)
+        else if (!canRunOrEditJob)
         {
-            runNowBtn.Opacity = 0.4;
+            runNowBtn.IsEnabled = false;
         }
         buttonsPanel.Children.Add(runNowBtn);
 
-        var editBtn = MakeActionButton("\uE70F", "Edit", vm.Id, OnEditJobClick);
-        if (jobDisabled) editBtn.Opacity = 0.4;
+        var editBtn = MakeActionButton("\uE70F", LocalizationHelper.GetString("CronPage_EditAction"), vm.Id, OnEditJobClick, "Edit");
+        editBtn.IsEnabled = canRunOrEditJob;
         buttonsPanel.Children.Add(editBtn);
 
-        var histBtn = MakeActionButton("\uE81C", "History", vm.Id, OnHistoryClick);
-        if (jobDisabled) histBtn.Opacity = 0.4;
+        var histBtn = MakeActionButton("\uE81C", LocalizationHelper.GetString("CronPage_HistoryAction"), vm.Id, OnHistoryClick, "History");
+        histBtn.IsEnabled = _cronLoading.CanEdit && vm.HasRunHistory;
         buttonsPanel.Children.Add(histBtn);
 
-        var removeBtn = MakeActionButton("\uE711", "Remove", vm.Id, OnRemoveClick);
+        var removeBtn = MakeActionButton("\uE711", LocalizationHelper.GetString("CronPage_RemoveAction"), vm.Id, OnRemoveClick, "Remove");
+        removeBtn.IsEnabled = _cronLoading.CanEdit && !isRunning;
         buttonsPanel.Children.Add(removeBtn);
 
         panel.Children.Add(buttonsPanel);
@@ -1326,17 +1524,176 @@ private static Border MakeChip(string text)
         return chip;
     }
 
-    private Button MakeActionButton(string glyph, string text, string jobId, RoutedEventHandler handler)
+    private Button MakeActionButton(string glyph, string text, string jobId, RoutedEventHandler handler, string actionName)
+    {
+        var btn = new Button
+        {
+            Name = actionName,
+            Tag = jobId,
+            FontSize = 12,
+            Padding = new Thickness(8, 4, 8, 4),
+            IsEnabled = _cronLoading.CanEdit
+        };
+        btn.Content = MakeActionButtonContent(glyph, text);
+        btn.Click += handler;
+        return btn;
+    }
+
+    private static StackPanel MakeActionButtonContent(string glyph, string text)
     {
-        var btn = new Button { Tag = jobId, FontSize = 12, Padding = new Thickness(8, 4, 8, 4), IsEnabled = _cronLoading.CanEdit };
         var sp = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 4 };
         sp.Children.Add(new FontIcon { Glyph = glyph, FontSize = 12 });
         sp.Children.Add(new TextBlock { Text = text });
+        return sp;
+    }
+
+    private void RefreshJobActionButtons(string jobId)
+    {
+        var vm = _jobs.Find(j => j.Id == jobId);
+        var isRunning = _runningJobIds.Contains(jobId);
+
+        foreach (var button in FindVisualChildren<Button>(JobsListPanel))
+        {
+            if (button.Tag as string != jobId)
+                continue;
+
+            switch (button.Name)
+            {
+                case "RunNow":
+                    button.Content = isRunning
+                        ? LocalizationHelper.GetString("CronPage_Running")
+                        : MakeActionButtonContent("\uE768", LocalizationHelper.GetString("CronPage_RunNow"));
+                    button.IsEnabled = _cronLoading.CanEdit && !isRunning;
+                    break;
+                case "Edit":
+                    button.IsEnabled = _cronLoading.CanEdit && !isRunning;
+                    break;
+                case "History":
+                    button.IsEnabled = _cronLoading.CanEdit && vm?.HasRunHistory == true;
+                    break;
+                case "Remove":
+                    button.IsEnabled = _cronLoading.CanEdit && !isRunning;
+                    break;
+            }
+        }
+
+        foreach (var toggle in FindVisualChildren<ToggleSwitch>(JobsListPanel))
+        {
+            if (toggle.Tag as string == jobId)
+                toggle.IsEnabled = _cronLoading.CanEdit && vm?.IsCompletedOneShot != true && !isRunning;
+        }
+
+        foreach (var badge in FindVisualChildren<Border>(JobsListPanel))
+        {
+            if (badge.Tag as string == $"running_{jobId}")
+                badge.Visibility = isRunning ? Visibility.Visible : Visibility.Collapsed;
+        }
+    }
+
+    private static IEnumerable<T> FindVisualChildren<T>(DependencyObject parent) where T : DependencyObject
+    {
+        var count = Microsoft.UI.Xaml.Media.VisualTreeHelper.GetChildrenCount(parent);
+        for (var i = 0; i < count; i++)
+        {
+            var child = Microsoft.UI.Xaml.Media.VisualTreeHelper.GetChild(parent, i);
+            if (child is T typed)
+                yield return typed;
+
+            foreach (var descendant in FindVisualChildren<T>(child))
+                yield return descendant;
+        }
+    }
+
+    private UIElement BuildFullResponseExpander(string runEntryKey, string fullText, bool isError)
+    {
+        var expander = new Expander
+        {
+            HorizontalAlignment = HorizontalAlignment.Stretch,
+            HorizontalContentAlignment = HorizontalAlignment.Stretch,
+            Margin = new Thickness(0, 6, 0, 0),
+            IsExpanded = _expandedRunFullResponseIds.Contains(runEntryKey),
+            Header = new TextBlock
+            {
+                Text = LocalizationHelper.GetString("CronPage_FullResponse"),
+                FontSize = 11,
+                FontWeight = Microsoft.UI.Text.FontWeights.SemiBold,
+                Foreground = (Brush)Application.Current.Resources["TextFillColorSecondaryBrush"]
+            }
+        };
+        expander.Expanding += (_, _) => _expandedRunFullResponseIds.Add(runEntryKey);
+        expander.Collapsed += (_, _) => _expandedRunFullResponseIds.Remove(runEntryKey);
+
+        UIElement content;
+
+        if (isError)
+        {
+            content = new TextBlock
+            {
+                Text = fullText,
+                FontFamily = new FontFamily("Consolas"),
+                FontSize = 11,
+                TextWrapping = TextWrapping.Wrap,
+                IsTextSelectionEnabled = true,
+                Foreground = new SolidColorBrush(Color.FromArgb(255, 224, 85, 69))
+            };
+        }
+        else
+        {
+            var markdown = ChatMarkdownSanitizer.Sanitize(fullText);
+            var host = new FunctionalHostControl
+            {
+                HorizontalAlignment = HorizontalAlignment.Stretch,
+                Background = new SolidColorBrush(Colors.Transparent)
+            };
+            host.Mount(_ => ChatMarkdownRenderer.Render(markdown)
+                ?? OpenClawTray.FunctionalUI.Factories.TextBlock(markdown));
+            content = host;
+        }
+
+        expander.Content = new Border
+        {
+            Padding = new Thickness(10, 8, 10, 10),
+            Margin = new Thickness(0, 4, 0, 0),
+            CornerRadius = new CornerRadius(6),
+            Background = (Brush)Application.Current.Resources["CardBackgroundFillColorSecondaryBrush"],
+            BorderBrush = (Brush)Application.Current.Resources["CardStrokeColorDefaultBrush"],
+            BorderThickness = new Thickness(1),
+            Child = content
+        };
+
+        return expander;
+    }
+
+    private static Button MakeRunChatButton(string sessionKey)
+    {
+        var btn = new Button
+        {
+            Tag = sessionKey,
+            FontSize = 11,
+            Padding = new Thickness(8, 3, 8, 3),
+            Margin = new Thickness(0, 4, 0, 0),
+            HorizontalAlignment = HorizontalAlignment.Left
+        };
+        var sp = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 4 };
+        sp.Children.Add(new FontIcon { Glyph = "\uE8F2", FontSize = 11 });
+        sp.Children.Add(new TextBlock { Text = LocalizationHelper.GetString("CronPage_OpenChat") });
         btn.Content = sp;
-        btn.Click += handler;
+        btn.Click += OnOpenRunChatClick;
         return btn;
     }
 
+    private static void OnOpenRunChatClick(object sender, RoutedEventArgs e)
+    {
+        if (sender is not Button { Tag: string sessionKey } || string.IsNullOrWhiteSpace(sessionKey))
+            return;
+
+        CurrentApp.PendingChatSessionKey = sessionKey;
+        if (CurrentApp.ActiveHubWindow is HubWindow hub)
+            hub.PendingChatSessionKey = sessionKey;
+
+        ((IAppCommands)CurrentApp).Navigate("chat");
+    }
+
     // --- Run History ---
 
     private void OnHistoryClick(object sender, RoutedEventArgs e)
@@ -1346,7 +1703,7 @@ private void OnHistoryClick(object sender, RoutedEventArgs e)
         if (!_cronLoading.CanEdit) return;
         if (CurrentApp.GatewayClient == null) { ShowDisconnected(); return; }
         var vm = _jobs.Find(j => j.Id == jobId);
-        if (vm != null && !vm.IsEnabled) return;
+        if (vm != null && !vm.HasRunHistory) return;
         if (_historyJobId == jobId)
         {
             HideHistoryPanel(jobId);
@@ -1360,28 +1717,33 @@ private void OnHistoryClick(object sender, RoutedEventArgs e)
 
         _historyJobId = jobId;
 
-        // Show loading state
-        var histPanel = FindHistoryPanel(jobId);
-        if (histPanel != null)
-        {
-            histPanel.Children.Clear();
-            histPanel.Children.Add(new TextBlock
-            {
-                Text = "Loading run history...",
-                FontSize = 12,
-                Foreground = (Brush)Application.Current.Resources["TextFillColorSecondaryBrush"]
-            });
-            histPanel.Visibility = Visibility.Visible;
-        }
+        ShowHistoryLoading(jobId);
 
         _ = CurrentApp.GatewayClient.RequestCronRunsAsync(jobId, limit: 20, offset: 0);
     }
 
+    private void ShowHistoryLoading(string jobId)
+    {
+        var histPanel = FindHistoryPanel(jobId);
+        if (histPanel == null) return;
+
+        _lastHistoryRenderSignature = null;
+        histPanel.Children.Clear();
+        histPanel.Children.Add(new TextBlock
+        {
+            Text = LocalizationHelper.GetString("CronPage_LoadingRunHistory"),
+            FontSize = 12,
+            Foreground = (Brush)Application.Current.Resources["TextFillColorSecondaryBrush"]
+        });
+        histPanel.Visibility = Visibility.Visible;
+    }
+
     private void HideHistoryPanel(string jobId)
     {
         var panel = FindHistoryPanel(jobId);
         if (panel != null)
         {
+            _lastHistoryRenderSignature = null;
             panel.Children.Clear();
             panel.Visibility = Visibility.Collapsed;
         }
@@ -1416,17 +1778,23 @@ private void HideHistoryPanel(string jobId)
     public void UpdateCronRuns(JsonElement data)
     {
         // data is the full response: { entries: [...], total, offset, limit, hasMore, ... }
-        if (_historyJobId == null) return;
+        if (data.TryGetProperty("entries", out var completionEntries) &&
+            completionEntries.ValueKind == JsonValueKind.Array)
+        {
+            DetectCompletedRunsFromHistory(completionEntries);
+        }
 
-        var histPanel = FindHistoryPanel(_historyJobId);
-        if (histPanel == null) return;
-        histPanel.Children.Clear();
+        if (_historyJobId == null) return;
 
         if (!data.TryGetProperty("entries", out var entries) || entries.ValueKind != JsonValueKind.Array)
         {
-            histPanel.Children.Add(new TextBlock
+            var emptyHistoryPanel = FindHistoryPanel(_historyJobId);
+            if (emptyHistoryPanel == null) return;
+            _lastHistoryRenderSignature = null;
+            emptyHistoryPanel.Children.Clear();
+            emptyHistoryPanel.Children.Add(new TextBlock
             {
-                Text = "No run history available.",
+                Text = LocalizationHelper.GetString("CronPage_NoRunHistoryAvailable"),
                 FontSize = 12,
                 Foreground = (Brush)Application.Current.Resources["TextFillColorSecondaryBrush"]
             });
@@ -1434,6 +1802,16 @@ public void UpdateCronRuns(JsonElement data)
         }
 
         var total = data.TryGetProperty("total", out var totalEl) && totalEl.ValueKind == JsonValueKind.Number ? totalEl.GetInt32() : 0;
+        var hasMore = data.TryGetProperty("hasMore", out var hmEl) && hmEl.ValueKind == JsonValueKind.True;
+        var signature = BuildHistoryRenderSignature(entries, total, hasMore);
+        if (_runningJobIds.Count > 0 && string.Equals(_lastHistoryRenderSignature, signature, StringComparison.Ordinal))
+            return;
+
+        _lastHistoryRenderSignature = signature;
+        var histPanel = FindHistoryPanel(_historyJobId);
+        if (histPanel == null) return;
+        histPanel.Children.Clear();
+
         var entryCount = 0;
 
         // Header
@@ -1443,7 +1821,7 @@ public void UpdateCronRuns(JsonElement data)
 
         var headerText = new TextBlock
         {
-            Text = "Run History",
+            Text = LocalizationHelper.GetString("CronPage_RunHistory"),
             FontSize = 12,
             FontWeight = Microsoft.UI.Text.FontWeights.SemiBold,
             Foreground = (Brush)Application.Current.Resources["TextFillColorSecondaryBrush"]
@@ -1467,16 +1845,17 @@ public void UpdateCronRuns(JsonElement data)
         }
 
         // Update header with count
-        headerText.Text = total > 0 ? $"Run History — showing {entryCount} of {total}" : $"Run History — {entryCount} runs";
+        headerText.Text = total > 0
+            ? LocalizationHelper.Format("CronPage_RunHistoryShowing", entryCount, total)
+            : LocalizationHelper.Format("CronPage_RunHistoryCount", entryCount);
 
         // "Load more" if there are more
-        var hasMore = data.TryGetProperty("hasMore", out var hmEl) && hmEl.ValueKind == JsonValueKind.True;
         if (hasMore)
         {
             var nextOffset = data.TryGetProperty("nextOffset", out var noEl) && noEl.ValueKind == JsonValueKind.Number ? noEl.GetInt32() : entryCount;
             var loadMoreBtn = new Button
             {
-                Content = $"Load older runs ({total - entryCount - (nextOffset - entryCount)} more)...",
+                Content = LocalizationHelper.Format("CronPage_LoadOlderRuns", total - entryCount - (nextOffset - entryCount)),
                 HorizontalAlignment = HorizontalAlignment.Stretch,
                 Margin = new Thickness(0, 6, 0, 0),
                 Padding = new Thickness(0, 6, 0, 6),
@@ -1487,9 +1866,9 @@ public void UpdateCronRuns(JsonElement data)
             // Simple "load more" content
             var remaining = total - nextOffset;
             if (remaining > 0)
-                loadMoreBtn.Content = $"Load older runs ({remaining} more)...";
+                loadMoreBtn.Content = LocalizationHelper.Format("CronPage_LoadOlderRuns", remaining);
             else
-                loadMoreBtn.Content = "Load more runs...";
+                loadMoreBtn.Content = LocalizationHelper.GetString("CronPage_LoadMoreRuns");
 
             loadMoreBtn.Click += (s, args) =>
             {
@@ -1497,7 +1876,7 @@ public void UpdateCronRuns(JsonElement data)
                 if (!string.IsNullOrEmpty(jid) && CurrentApp.GatewayClient != null)
                 {
                     loadMoreBtn.IsEnabled = false;
-                    loadMoreBtn.Content = "Loading...";
+                    loadMoreBtn.Content = LocalizationHelper.GetString("CronPage_Loading");
                     // For simplicity, reload with higher limit
                     _ = CurrentApp.GatewayClient.RequestCronRunsAsync(jid, limit: nextOffset + 20, offset: 0);
                 }
@@ -1508,31 +1887,73 @@ public void UpdateCronRuns(JsonElement data)
         histPanel.Visibility = Visibility.Visible;
     }
 
-    // Redact tokens, secrets, and file paths from text before UI display
-    private static readonly Regex AbsolutePathPattern = new(
-        @"(?:[A-Za-z]:\\(?:Users|home|usr|var|tmp)\\[^\s""']+)|(?:/(?:home|Users|usr|var|tmp)/[^\s""']+)",
-        RegexOptions.Compiled);
+    private static string BuildHistoryRenderSignature(JsonElement entries, int total, bool hasMore)
+    {
+        var parts = new List<string> { total.ToString(), hasMore ? "more" : "done" };
+        foreach (var entry in entries.EnumerateArray())
+        {
+            if (entry.ValueKind != JsonValueKind.Object)
+                continue;
+
+            parts.Add(GetRunEntryKey(entry));
+            if (entry.TryGetProperty("summary", out var summaryEl) && summaryEl.ValueKind == JsonValueKind.String)
+                parts.Add((summaryEl.GetString()?.Length ?? 0).ToString());
+            if (entry.TryGetProperty("status", out var statusEl) && statusEl.ValueKind == JsonValueKind.String)
+                parts.Add(statusEl.GetString() ?? "");
+        }
+        return string.Join("|", parts);
+    }
 
-    private static string SanitizeForDisplay(string text)
+    private void DetectCompletedRunsFromHistory(JsonElement entries)
     {
-        if (string.IsNullOrEmpty(text)) return text;
-        var sanitized = TokenSanitizer.Sanitize(text);
-        sanitized = AbsolutePathPattern.Replace(sanitized, m =>
+        var completedJobIds = new HashSet<string>();
+        foreach (var entry in entries.EnumerateArray())
         {
-            var sep = m.Value.Contains('\\') ? '\\' : '/';
-            var lastSep = m.Value.LastIndexOf(sep);
-            return lastSep >= 0 ? "…" + sep + m.Value[(lastSep + 1)..] : m.Value;
-        });
-        return sanitized;
+            if (entry.ValueKind != JsonValueKind.Object)
+                continue;
+
+            if (!entry.TryGetProperty("jobId", out var jobIdEl) || jobIdEl.ValueKind != JsonValueKind.String)
+                continue;
+
+            var jobId = jobIdEl.GetString();
+            if (string.IsNullOrWhiteSpace(jobId) || !_runningJobIds.Contains(jobId))
+                continue;
+
+            var oldVm = _jobs.Find(j => j.Id == jobId);
+            if (oldVm == null)
+                continue;
+
+            var runAtMs = entry.TryGetProperty("runAtMs", out var runAtEl) && runAtEl.ValueKind == JsonValueKind.Number
+                ? runAtEl.GetInt64()
+                : (entry.TryGetProperty("ts", out var tsEl) && tsEl.ValueKind == JsonValueKind.Number ? tsEl.GetInt64() : 0);
+            if (runAtMs > oldVm.LastRunAtMs)
+                completedJobIds.Add(jobId);
+        }
+
+        if (completedJobIds.Count == 0)
+            return;
+
+        foreach (var jobId in completedJobIds)
+        {
+            ClearRunningJob(jobId);
+        }
+
+        var client = CurrentApp.GatewayClient;
+        if (client != null)
+        {
+            _ = client.RequestCronListAsync();
+            _ = client.RequestCronStatusAsync();
+        }
     }
 
     private Border BuildRunEntry(JsonElement entry)
     {
+        var runEntryKey = GetRunEntryKey(entry);
         var status = entry.TryGetProperty("status", out var sEl) ? sEl.GetString() ?? "" : "";
         var durationMs = entry.TryGetProperty("durationMs", out var dEl) && dEl.ValueKind == JsonValueKind.Number ? dEl.GetInt64() : 0;
-        var summary = SanitizeForDisplay(entry.TryGetProperty("summary", out var sumEl) ? sumEl.GetString() ?? "" : "");
-        var error = SanitizeForDisplay(entry.TryGetProperty("error", out var errEl) ? errEl.GetString() ?? "" : "");
         var model = entry.TryGetProperty("model", out var modEl) ? modEl.GetString() ?? "" : "";
+        var provider = entry.TryGetProperty("provider", out var providerEl) ? providerEl.GetString() ?? "" : "";
+        var sessionKey = entry.TryGetProperty("sessionKey", out var sessionEl) ? sessionEl.GetString() ?? "" : "";
         var tsMs = entry.TryGetProperty("runAtMs", out var tsEl) && tsEl.ValueKind == JsonValueKind.Number
             ? tsEl.GetInt64()
             : (entry.TryGetProperty("ts", out var ts2El) && ts2El.ValueKind == JsonValueKind.Number ? ts2El.GetInt64() : 0);
@@ -1549,6 +1970,7 @@ private Border BuildRunEntry(JsonElement entry)
 
         // Colors
         bool isError = status == "error" || status == "failed";
+        var text = CronRunHistoryDisplay.ExtractText(entry, isError);
         var statusBg = isError
             ? new SolidColorBrush(Color.FromArgb(40, 224, 85, 69))
             : new SolidColorBrush(Color.FromArgb(40, 76, 175, 80));
@@ -1582,10 +2004,12 @@ private Border BuildRunEntry(JsonElement entry)
 
         // Summary/error + metadata
         var contentPanel = new StackPanel { Margin = new Thickness(4, 0, 8, 0) };
-        var displayText = isError && !string.IsNullOrEmpty(error) ? error : summary;
+        var displayText = text.PreviewText;
         if (!string.IsNullOrEmpty(displayText))
         {
-            var truncated = displayText.Length > 120 ? displayText[..120] + "…" : displayText;
+            var truncated = displayText.Length > CronRunHistoryDisplay.PreviewMaxChars
+                ? displayText[..CronRunHistoryDisplay.PreviewMaxChars] + "…"
+                : displayText;
             contentPanel.Children.Add(new TextBlock
             {
                 Text = truncated,
@@ -1601,6 +2025,7 @@ private Border BuildRunEntry(JsonElement entry)
         // Meta line: model · tokens · delivery
         var metaParts = new List<string>();
         if (!string.IsNullOrEmpty(model)) metaParts.Add(model);
+        if (!string.IsNullOrEmpty(provider)) metaParts.Add(provider);
         if (totalTokens > 0) metaParts.Add($"{totalTokens:N0} tokens");
         if (delivered) metaParts.Add("delivered");
         else if (!string.IsNullOrEmpty(deliveryStatus)) metaParts.Add(deliveryStatus);
@@ -1615,6 +2040,10 @@ private Border BuildRunEntry(JsonElement entry)
                 Foreground = (Brush)Application.Current.Resources["TextFillColorTertiaryBrush"]
             });
         }
+        if (text.HasExpandableFullText)
+            contentPanel.Children.Add(BuildFullResponseExpander(runEntryKey, text.FullText!, isError));
+        if (!string.IsNullOrWhiteSpace(sessionKey))
+            contentPanel.Children.Add(MakeRunChatButton(sessionKey));
         Grid.SetColumn(contentPanel, 1);
         grid.Children.Add(contentPanel);
 
@@ -1660,6 +2089,24 @@ private Border BuildRunEntry(JsonElement entry)
         return row;
     }
 
+    private static string GetRunEntryKey(JsonElement entry)
+    {
+        var runId = entry.TryGetProperty("runId", out var runIdEl) && runIdEl.ValueKind == JsonValueKind.String
+            ? runIdEl.GetString()
+            : null;
+        if (!string.IsNullOrWhiteSpace(runId))
+            return runId!;
+
+        var jobId = entry.TryGetProperty("jobId", out var jobIdEl) && jobIdEl.ValueKind == JsonValueKind.String
+            ? jobIdEl.GetString()
+            : "";
+        var runAtMs = entry.TryGetProperty("runAtMs", out var runAtEl) && runAtEl.ValueKind == JsonValueKind.Number
+            ? runAtEl.GetInt64()
+            : (entry.TryGetProperty("ts", out var tsEl) && tsEl.ValueKind == JsonValueKind.Number ? tsEl.GetInt64() : 0);
+
+        return $"{jobId}:{runAtMs}";
+    }
+
     private static T? FindChild<T>(DependencyObject parent) where T : DependencyObject
     {
         int count = Microsoft.UI.Xaml.Media.VisualTreeHelper.GetChildrenCount(parent);
@@ -1718,7 +2165,11 @@ private class CronJobViewModel
         public string Schedule { get; set; } = "";
         public bool IsEnabled { get; set; } = true;
         public bool IsExpanded { get; set; } = false;
-        public double CardOpacity => IsEnabled ? 1.0 : 0.5;
+        public bool IsCompletedOneShot =>
+            string.Equals(ScheduleKind, "at", StringComparison.OrdinalIgnoreCase) &&
+            LastRunAtMs > 0 &&
+            NextRunAtMs <= 0;
+        public bool HasRunHistory => LastRunAtMs > 0;
         public string LastRunTime { get; set; } = "—";
         public string LastResult { get; set; } = "";
         public SolidColorBrush ResultBadgeForeground { get; set; } = new(Colors.White);
diff --git a/src/OpenClaw.Tray.WinUI/Pages/DebugPage.xaml b/src/OpenClaw.Tray.WinUI/Pages/DebugPage.xaml
index e1e0be199..713d0e629 100644
--- a/src/OpenClaw.Tray.WinUI/Pages/DebugPage.xaml
+++ b/src/OpenClaw.Tray.WinUI/Pages/DebugPage.xaml
@@ -53,6 +53,7 @@
                     <!-- Title block (in-stack, same column as cards). -->
                     <TextBlock x:Uid="DiagnosticsPage_Title"
                                Text="Diagnostics"
+                               AutomationProperties.AutomationId="DebugPageMarker"
                                Style="{StaticResource TitleTextBlockStyle}"
                                Margin="0,0,0,2"/>
                     <TextBlock x:Uid="DiagnosticsPage_Subtitle"
@@ -157,8 +158,8 @@
                                 </toolkit:SettingsCard.ActionIcon>
                             </toolkit:SettingsCard>
                             <toolkit:SettingsCard x:Uid="DiagnosticsPage_Card_CopyDebugBundle"
-                                                  Header="Copy full debug bundle"
-                                                  Description="Everything the preview dialog produces, no preview."
+                                                  Header="Copy summary debug bundle"
+                                                  Description="Generated summaries only; excludes log tails. Use Create diagnostics bundle to review logs before sharing."
                                                   IsClickEnabled="True"
                                                   Click="OnCopyDebugBundle">
                                 <toolkit:SettingsCard.ActionIcon>
@@ -329,22 +330,6 @@
                         </toolkit:SettingsExpander.Items>
                     </toolkit:SettingsExpander>
 
-                    <!-- Reconfigure… — canonical action verb per naming.md
-                         (action that walks the user back through the
-                         onboarding wizard). Always followed by `…` because
-                         it opens a wizard. -->
-                    <toolkit:SettingsCard x:Uid="DiagnosticsPage_Card_Reconfigure"
-                                          Header="Reconfigure…"
-                                          Description="Reopens the OpenClaw onboarding wizard. You will be asked to confirm.">
-                        <toolkit:SettingsCard.HeaderIcon>
-                            <FontIcon Glyph="{x:Bind helpers:FluentIconCatalog.Reset, Mode=OneTime}"
-                                      FontFamily="{ThemeResource SymbolThemeFontFamily}"/>
-                        </toolkit:SettingsCard.HeaderIcon>
-                        <Button x:Uid="DiagnosticsPage_ReconfigureButton"
-                                Content="Reconfigure…"
-                                Click="OnRelaunchOnboarding"/>
-                    </toolkit:SettingsCard>
-
                 </StackPanel>
                 </Grid>
             </ScrollViewer>
diff --git a/src/OpenClaw.Tray.WinUI/Pages/DebugPage.xaml.cs b/src/OpenClaw.Tray.WinUI/Pages/DebugPage.xaml.cs
index 409615f40..4cfc87e10 100644
--- a/src/OpenClaw.Tray.WinUI/Pages/DebugPage.xaml.cs
+++ b/src/OpenClaw.Tray.WinUI/Pages/DebugPage.xaml.cs
@@ -49,8 +49,7 @@ public sealed partial class DebugPage : Page
     private IGatewayTerminalLauncher TerminalLauncher =>
         _terminalLauncher ??= new GatewayTerminalLauncher(new OpenClawTray.AppLogger());
 
-    private static readonly string LocalAppData = Path.Combine(
-        Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "OpenClawTray");
+    private static readonly string LocalAppData = AppIdentity.ResolveLocalDataDirectory();
     private static readonly string LogPath = Path.Combine(LocalAppData, "openclaw-tray.log");
     private static readonly string DeviceKeyPath = Path.Combine(LocalAppData, "device-key-ed25519.json");
 
@@ -85,6 +84,7 @@ private enum DetailMode { None, Log }
     // Plain-text mirror of log rows for the Copy toolbar action.
     // Capped to MaxLogRows in O(1) via Queue.
     private readonly Queue<string> _detailPlainLines = new();
+    private bool _bundlePreviewOpen;
 
     public DebugPage()
     {
@@ -155,7 +155,9 @@ protected override void OnNavigatedFrom(NavigationEventArgs e)
     private void UpdateStatusInfoBar()
     {
         var gatewayUrl = CurrentApp.Settings?.GetEffectiveGatewayUrl();
-        var gatewayDisplay = string.IsNullOrWhiteSpace(gatewayUrl) ? "no gateway configured" : gatewayUrl;
+        var gatewayDisplay = string.IsNullOrWhiteSpace(gatewayUrl)
+            ? LocalizationHelper.GetString("DebugPage_NoGatewayConfigured")
+            : gatewayUrl;
         var status = _appState?.Status ?? ConnectionStatus.Disconnected;
 
         switch (status)
@@ -163,27 +165,27 @@ private void UpdateStatusInfoBar()
             case ConnectionStatus.Connected:
                 StatusInfoBar.Severity = InfoBarSeverity.Success;
                 StatusInfoBar.Title = LocalizationHelper.GetConnectionStatusText(status);
-                StatusInfoBar.Message = $"OpenClaw is connected to {gatewayDisplay}.";
+                StatusInfoBar.Message = LocalizationHelper.Format("DebugPage_StatusConnectedFormat", gatewayDisplay);
                 break;
             case ConnectionStatus.Connecting:
                 StatusInfoBar.Severity = InfoBarSeverity.Informational;
                 StatusInfoBar.Title = LocalizationHelper.GetConnectionStatusText(status);
-                StatusInfoBar.Message = $"Connecting to {gatewayDisplay}…";
+                StatusInfoBar.Message = LocalizationHelper.Format("DebugPage_StatusConnectingFormat", gatewayDisplay);
                 break;
             case ConnectionStatus.Disconnected:
                 StatusInfoBar.Severity = InfoBarSeverity.Warning;
                 StatusInfoBar.Title = LocalizationHelper.GetConnectionStatusText(status);
-                StatusInfoBar.Message = $"Not connected. Gateway: {gatewayDisplay}.";
+                StatusInfoBar.Message = LocalizationHelper.Format("DebugPage_StatusDisconnectedFormat", gatewayDisplay);
                 break;
             case ConnectionStatus.Error:
                 StatusInfoBar.Severity = InfoBarSeverity.Error;
                 StatusInfoBar.Title = LocalizationHelper.GetConnectionStatusText(status);
-                StatusInfoBar.Message = $"Last gateway: {gatewayDisplay}. See the event timeline.";
+                StatusInfoBar.Message = LocalizationHelper.Format("DebugPage_StatusErrorFormat", gatewayDisplay);
                 break;
             default:
                 StatusInfoBar.Severity = InfoBarSeverity.Informational;
                 StatusInfoBar.Title = LocalizationHelper.GetConnectionStatusText(status);
-                StatusInfoBar.Message = $"Gateway: {gatewayDisplay}.";
+                StatusInfoBar.Message = LocalizationHelper.Format("DebugPage_StatusGatewayFormat", gatewayDisplay);
                 break;
         }
     }
@@ -248,8 +250,8 @@ private void EnterDetailView(DetailMode mode)
 
         if (mode == DetailMode.Log)
         {
-            DetailTitle.Text = "Recent log";
-            DetailCaption.Text = $"Last 200 lines of {LogPath}. Severity is parsed from [info]/[warn]/[error] tags.";
+            DetailTitle.Text = LocalizationHelper.GetString("DebugPage_RecentLogTitle");
+            DetailCaption.Text = LocalizationHelper.Format("DebugPage_RecentLogCaptionFormat", LogPath);
             DetailOpenFileButton.Visibility = Visibility.Visible;
             DetailRefreshButton.Visibility = Visibility.Visible;
             _ = LoadLogFileAsync(_detailGeneration);
@@ -284,7 +286,7 @@ private void OnDetailRefresh(object sender, RoutedEventArgs e)
 
     private void OnDetailCopy(object sender, RoutedEventArgs e)
     {
-        ClipboardHelper.CopyText(string.Concat(_detailPlainLines));
+        ClipboardHelper.CopyText(DiagnosticsExportSanitizer.SanitizeTextBlock(string.Concat(_detailPlainLines)));
     }
 
     private void OnDetailOpenFile(object sender, RoutedEventArgs e)
@@ -336,17 +338,9 @@ private async Task LoadLogFileAsync(int generation)
         string[] lines;
         try
         {
-            // Hanselman v1 review findings #2 and #4:
-            //   #2 — Logger holds the log open with FileAccess.Write +
-            //        FileShare.Read (Logger.cs:109). Default File.ReadLines
-            //        opens with FileShare.Read which excludes Write — so
-            //        every read attempt failed with IOException as long
-            //        as Logger was active (essentially always). The
-            //        explicit FileShare.ReadWrite below is required for
-            //        concurrent read while Logger holds the writer.
-            //   #4 — Read tail on a background thread so a 5 MB log
-            //        rotation does not stall the UI.
-            lines = await Task.Run(() => ReadLogTail(LogPath, 200));
+            lines = await Task.Run(() => DiagnosticsLogTailReader.ReadSanitizedTail(
+                LogPath,
+                new DiagnosticsTailOptions(MaxLines: 200, MaxLineChars: 8_000, MaxSectionChars: 128_000, MaxReadBytes: 512_000)).ToArray());
         }
         catch (Exception ex)
         {
@@ -373,23 +367,6 @@ private async Task LoadLogFileAsync(int generation)
         ScrollDetailToEnd();
     }
 
-    private static string[] ReadLogTail(string path, int tailCount)
-    {
-        // FileShare.ReadWrite lets us coexist with the Logger writer.
-        // Rolling Queue<string> keeps memory at O(tailCount) instead of
-        // O(file size).
-        using var fs = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
-        using var sr = new StreamReader(fs);
-        var queue = new Queue<string>(tailCount);
-        string? line;
-        while ((line = sr.ReadLine()) != null)
-        {
-            if (queue.Count == tailCount) queue.Dequeue();
-            queue.Enqueue(line);
-        }
-        return queue.ToArray();
-    }
-
     private static Paragraph CreateLogParagraph(string line)
     {
         var para = new Paragraph { Margin = new Thickness(0, 0, 0, 1) };
@@ -454,14 +431,31 @@ private void ScrollDetailToEnd()
 
     private void OnCreateDiagnosticsBundle(object sender, RoutedEventArgs e) =>
         AsyncEventHandlerGuard.Run(
-            () => ShowBundlePreviewAsync(
-                title: "Diagnostics bundle",
-                buildText: CommandCenterTextHelper.BuildDebugBundle,
-                suggestedFileName: $"openclaw-diagnostics-{DateTime.Now:yyyyMMdd-HHmmss}.txt",
-                headerCaption: "This is the complete bundle that would be copied or saved."),
+            ShowDiagnosticsBundlePreviewAsync,
             new OpenClawTray.AppLogger(),
             nameof(OnCreateDiagnosticsBundle));
 
+    private async Task ShowDiagnosticsBundlePreviewAsync()
+    {
+        if (_bundlePreviewOpen)
+            return;
+
+        _bundlePreviewOpen = true;
+        try
+        {
+            var connectionEvents = CurrentApp.GetConnectionDiagnosticEvents().ToArray();
+            await ShowBundlePreviewAsync(
+                title: "Diagnostics bundle",
+                buildText: state => DiagnosticsBundleBuilder.BuildCached(state, connectionEvents),
+                suggestedFileName: $"openclaw-diagnostics-{DateTime.Now:yyyyMMdd-HHmmss}.txt",
+                headerCaption: "This is the complete sanitized bundle that would be copied or saved. Review before sharing.");
+        }
+        finally
+        {
+            _bundlePreviewOpen = false;
+        }
+    }
+
     private async Task ShowBundlePreviewAsync(
         string title,
         Func<GatewayCommandCenterState, string> buildText,
@@ -472,23 +466,42 @@ private async Task ShowBundlePreviewAsync(
         var state = CurrentApp.BuildCommandCenterState();
         if (state == null) return;
 
-        string text;
-        try
-        {
-            text = buildText(state) ?? string.Empty;
-        }
-        catch (Exception ex)
+        var buildTask = Task.Run(() =>
         {
-            text = $"Failed to build diagnostics bundle: {ex.Message}";
-        }
+            try
+            {
+                return buildText(state) ?? string.Empty;
+            }
+            catch (Exception ex)
+            {
+                Logger.Error($"Diagnostics bundle build failed: {ex}");
+                return $"Failed to build diagnostics bundle: {ex.Message}";
+            }
+        });
 
         var dialog = new DiagnosticsBundleDialog { XamlRoot = XamlRoot, Title = title };
         // Just-in-time HWND resolution so a Hub-window close that happens
         // between dialog open and Save click can't land a stale handle in
         // the file picker (Hanselman v2 #4).
-        dialog.Configure(text, headerCaption, suggestedFileName,
+        dialog.Configure("Preparing diagnostics bundle…", headerCaption, suggestedFileName,
             hwndProvider: () => CurrentApp.GetHubWindowHandle());
-        await dialog.ShowAsync();
+        dialog.SetBundleText("Preparing diagnostics bundle…", isReady: false);
+        var updateTask = UpdateBundleDialogWhenReadyAsync(dialog, buildTask);
+        await Task.Yield();
+        try
+        {
+            await dialog.ShowAsync();
+        }
+        finally
+        {
+            await updateTask;
+        }
+    }
+
+    private async Task UpdateBundleDialogWhenReadyAsync(DiagnosticsBundleDialog dialog, Task<string> buildTask)
+    {
+        var text = await buildTask;
+        dialog.SetBundleText(text, isReady: true);
     }
 
     private void OnOpenDiagnosticsFolder(object sender, RoutedEventArgs e)
@@ -509,7 +522,9 @@ private void OnCopySupportContext(object sender, RoutedEventArgs e)
         => CopyDiagnosticText("Support context", CommandCenterTextHelper.BuildSupportContext);
 
     private void OnCopyDebugBundle(object sender, RoutedEventArgs e)
-        => CopyDiagnosticText("Debug bundle", CommandCenterTextHelper.BuildDebugBundle);
+        => CopyDiagnosticText(
+            "Summary debug bundle",
+            CommandCenterTextHelper.BuildDebugBundle);
 
     private void OnCopyBrowserSetup(object sender, RoutedEventArgs e)
         => CopyDiagnosticText("Browser setup guidance", CommandCenterTextHelper.BuildBrowserSetupGuidance);
@@ -526,7 +541,7 @@ private void CopyDiagnosticText(string label, Func<GatewayCommandCenterState, st
         if (state == null) return;
         try
         {
-            ClipboardHelper.CopyText(build(state) ?? string.Empty);
+            ClipboardHelper.CopyText(DiagnosticsExportSanitizer.SanitizeTextBlock(build(state) ?? string.Empty));
             ShowCopyFeedback(label);
         }
         catch (Exception ex)
@@ -552,7 +567,7 @@ private void CopyDiagnosticText(string label, Func<GatewayCommandCenterState, st
 
     private void ShowCopyFeedback(string label)
     {
-        CopyFeedbackInfoBar.Message = $"{label} copied to clipboard.";
+        CopyFeedbackInfoBar.Message = LocalizationHelper.Format("DebugPage_CopyFeedbackFormat", label);
         CopyFeedbackInfoBar.IsOpen = true;
 
         if (_copyFeedbackTimer == null)
@@ -699,29 +714,4 @@ private void OnTrayChatOverrideChanged(object sender, SelectionChangedEventArgs
         DebugChatSurfaceOverrides.TrayChat = ParseOverride(TrayChatOverrideCombo);
     }
 
-    private void OnRelaunchOnboarding(object sender, RoutedEventArgs e) =>
-        AsyncEventHandlerGuard.Run(
-            OnRelaunchOnboardingAsync,
-            new OpenClawTray.AppLogger(),
-            nameof(OnRelaunchOnboarding));
-
-    private async Task OnRelaunchOnboardingAsync()
-    {
-        if (XamlRoot == null) return;
-
-        var confirm = new ContentDialog
-        {
-            XamlRoot = XamlRoot,
-            Title = "Relaunch first-run setup?",
-            Content = "This will reopen the OpenClaw onboarding wizard. The current view will close.",
-            PrimaryButtonText = "Relaunch",
-            CloseButtonText = "Cancel",
-            DefaultButton = ContentDialogButton.Close
-        };
-        var result = await confirm.ShowAsync();
-        if (result == ContentDialogResult.Primary)
-        {
-            ((IAppCommands)CurrentApp).ShowOnboarding();
-        }
-    }
 }
diff --git a/src/OpenClaw.Tray.WinUI/Pages/ExecPolicyRuleList.cs b/src/OpenClaw.Tray.WinUI/Pages/ExecPolicyRuleList.cs
new file mode 100644
index 000000000..a914cb067
--- /dev/null
+++ b/src/OpenClaw.Tray.WinUI/Pages/ExecPolicyRuleList.cs
@@ -0,0 +1,97 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+
+namespace OpenClawTray.Pages;
+
+internal sealed class ExecPolicyRule
+{
+    public string Pattern { get; set; } = "";
+    public string Action { get; set; } = "deny";
+    public int Index { get; set; }
+    public string[]? Shells { get; set; }
+    public string? Description { get; set; }
+    public bool Enabled { get; set; } = true;
+}
+
+internal static class ExecPolicyRuleList
+{
+    public static string NormalizeAction(string? action)
+    {
+        if (string.Equals(action, "allow", StringComparison.OrdinalIgnoreCase))
+            return "allow";
+        if (string.Equals(action, "prompt", StringComparison.OrdinalIgnoreCase) ||
+            string.Equals(action, "ask", StringComparison.OrdinalIgnoreCase))
+            return "prompt";
+        return "deny";
+    }
+
+    public static string NormalizeAction(JsonElement action)
+    {
+        if (action.ValueKind == JsonValueKind.String)
+            return NormalizeAction(action.GetString());
+
+        if (action.ValueKind == JsonValueKind.Number && action.TryGetInt32(out var numeric))
+        {
+            return numeric switch
+            {
+                0 => "allow",
+                1 => "deny",
+                2 => "prompt",
+                _ => "deny"
+            };
+        }
+
+        return "deny";
+    }
+
+    public static string? TryGetActionCaseInsensitive(JsonElement element, params string[] names)
+    {
+        foreach (var name in names)
+        {
+            if (element.TryGetProperty(name, out var prop))
+                return NormalizeAction(prop);
+        }
+
+        return null;
+    }
+
+    public static bool? PersistedEnabled(bool enabled) => enabled ? null : false;
+
+    public static void UpsertByPattern(IList<ExecPolicyRule> rules, string pattern, string action)
+    {
+        ArgumentNullException.ThrowIfNull(rules);
+
+        var normalizedPattern = pattern.Trim();
+        if (normalizedPattern.Length == 0)
+            return;
+
+        var firstMatch = -1;
+        for (var i = 0; i < rules.Count; i++)
+        {
+            if (PatternEquals(rules[i].Pattern, normalizedPattern))
+            {
+                firstMatch = i;
+                break;
+            }
+        }
+
+        if (firstMatch < 0)
+        {
+            rules.Add(new ExecPolicyRule { Pattern = normalizedPattern, Action = action });
+            return;
+        }
+
+        rules[firstMatch].Pattern = normalizedPattern;
+        rules[firstMatch].Action = action;
+
+        for (var i = rules.Count - 1; i > firstMatch; i--)
+        {
+            if (PatternEquals(rules[i].Pattern, normalizedPattern))
+                rules.RemoveAt(i);
+        }
+    }
+
+    private static bool PatternEquals(string currentPattern, string newPattern) =>
+        string.Equals(currentPattern.Trim(), newPattern.Trim(), StringComparison.OrdinalIgnoreCase);
+}
diff --git a/src/OpenClaw.Tray.WinUI/Pages/InstancesPage.xaml b/src/OpenClaw.Tray.WinUI/Pages/InstancesPage.xaml
index 943f272bf..51dc3a04d 100644
--- a/src/OpenClaw.Tray.WinUI/Pages/InstancesPage.xaml
+++ b/src/OpenClaw.Tray.WinUI/Pages/InstancesPage.xaml
@@ -14,6 +14,7 @@
                 <StackPanel Grid.Column="0" Spacing="4">
                     <TextBlock x:Uid="InstancesPage_Title"
                                Text="Instances"
+                               AutomationProperties.AutomationId="InstancesPageMarker"
                                Style="{StaticResource TitleTextBlockStyle}"/>
                     <TextBlock x:Uid="InstancesPage_Subtitle"
                                Text="Latest presence beacons from OpenClaw nodes."
@@ -24,6 +25,7 @@
                 <Button x:Name="RefreshButton"
                         Grid.Column="1"
                         Click="OnRefreshClicked"
+                        AutomationProperties.LabeledBy="{Binding ElementName=RefreshButtonLabel}"
                         VerticalAlignment="Top">
                     <StackPanel Orientation="Horizontal" Spacing="6">
                         <Grid Width="14" Height="14">
@@ -36,7 +38,7 @@
                                           Height="14"
                                           Visibility="Collapsed"/>
                         </Grid>
-                        <TextBlock x:Uid="InstancesPage_RefreshLabel" Text="Refresh"/>
+                        <TextBlock x:Uid="InstancesPage_RefreshLabel" x:Name="RefreshButtonLabel" Text="Refresh"/>
                     </StackPanel>
                 </Button>
             </Grid>
diff --git a/src/OpenClaw.Tray.WinUI/Pages/NotificationsPage.xaml b/src/OpenClaw.Tray.WinUI/Pages/NotificationsPage.xaml
index 9277deb47..7798db4ce 100644
--- a/src/OpenClaw.Tray.WinUI/Pages/NotificationsPage.xaml
+++ b/src/OpenClaw.Tray.WinUI/Pages/NotificationsPage.xaml
@@ -19,6 +19,7 @@
                 <StackPanel Spacing="2">
                     <TextBlock x:Uid="NotificationsPage_Title"
                                Text="Notifications"
+                               AutomationProperties.AutomationId="NotificationsPageMarker"
                                Style="{StaticResource TitleTextBlockStyle}"/>
                     <TextBlock x:Uid="NotificationsPage_Subtitle"
                                Text="Review and clear active OpenClaw notifications."
@@ -80,18 +81,22 @@
                                                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
                                     </StackPanel>
 
-                                    <Button Grid.Column="2"
-                                            Tag="{Binding Id}"
-                                            AutomationProperties.Name="{Binding DismissAutomationName}"
-                                            Padding="8"
-                                            MinWidth="32"
-                                            MinHeight="32"
-                                            VerticalAlignment="Top"
-                                            Click="OnDismissNotificationClick">
-                                        <FontIcon Glyph="&#xE711;"
-                                                  FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                                  FontSize="12"/>
-                                    </Button>
+                                    <StackPanel Grid.Column="2" Orientation="Horizontal" Spacing="8" VerticalAlignment="Top">
+                                        <Button Content="{Binding ActionLabel}"
+                                                Tag="{Binding}"
+                                                Visibility="{Binding ActionVisibility}"
+                                                Click="OnNotificationActionClick"/>
+                                        <Button Tag="{Binding Id}"
+                                                AutomationProperties.Name="{Binding DismissAutomationName}"
+                                                Padding="8"
+                                                MinWidth="32"
+                                                MinHeight="32"
+                                                Click="OnDismissNotificationClick">
+                                            <FontIcon Glyph="&#xE711;"
+                                                      FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                                      FontSize="12"/>
+                                        </Button>
+                                    </StackPanel>
                                 </Grid>
                             </Border>
                         </DataTemplate>
diff --git a/src/OpenClaw.Tray.WinUI/Pages/NotificationsPage.xaml.cs b/src/OpenClaw.Tray.WinUI/Pages/NotificationsPage.xaml.cs
index 91efaeb73..8e752df7b 100644
--- a/src/OpenClaw.Tray.WinUI/Pages/NotificationsPage.xaml.cs
+++ b/src/OpenClaw.Tray.WinUI/Pages/NotificationsPage.xaml.cs
@@ -1,16 +1,14 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using OpenClawTray.Helpers;
 using OpenClawTray.Services;
-using System;
+using OpenClawTray.ViewModels;
 using System.Collections.ObjectModel;
-using System.Globalization;
-using System.Linq;
 
 namespace OpenClawTray.Pages;
 
 public sealed partial class NotificationsPage : Page
 {
+    private static App CurrentApp => (App)Application.Current!;
     private readonly ObservableCollection<NotificationItemViewModel> _notificationItems = new();
     private AppNotificationService? _notificationService;
 
@@ -76,55 +74,25 @@ private void OnDismissNotificationClick(object sender, RoutedEventArgs e)
         _notificationService?.Dismiss(notificationId);
     }
 
-    private sealed record NotificationItemViewModel(
-        string Id,
-        string SeverityGlyph,
-        string Title,
-        string Message,
-        string Metadata,
-        string OccurrenceText,
-        Visibility OccurrenceVisibility,
-        string DismissAutomationName)
+    private void OnNotificationActionClick(object sender, RoutedEventArgs e)
     {
-        public static NotificationItemViewModel From(AppNotification notification)
-        {
-            var metadata = new[]
-                {
-                    LocalizeMetadataValue(notification.Source),
-                    LocalizeMetadataValue(notification.Category),
-                    notification.CreatedAt.ToLocalTime().ToString("g", CultureInfo.CurrentCulture)
-                }
-                .Where(value => !string.IsNullOrWhiteSpace(value));
-
-            var occurrenceText = LocalizationHelper.Format(
-                "AppNotification_RepeatedBadgeFormat",
-                notification.OccurrenceCount);
-
-            return new(
-                notification.Id,
-                ToSeverityGlyph(notification.Severity),
-                notification.Title,
-                notification.Message,
-                string.Join(" - ", metadata),
-                occurrenceText,
-                notification.OccurrenceCount > 1 ? Visibility.Visible : Visibility.Collapsed,
-                LocalizationHelper.Format("NotificationsPage_DismissAutomationNameFormat", notification.Title));
-        }
+        if (sender is not FrameworkElement { Tag: NotificationItemViewModel item })
+            return;
 
-        private static string ToSeverityGlyph(AppNotificationSeverity severity) => severity switch
-        {
-            AppNotificationSeverity.Success => "\uE930",
-            AppNotificationSeverity.Warning => "\uE7BA",
-            AppNotificationSeverity.Error => "\uE783",
-            _ => "\uE946"
-        };
+        if (string.IsNullOrWhiteSpace(item.ActionRoute))
+            return;
 
-        private static string? LocalizeMetadataValue(string? value) => value switch
+        if (AppNotificationActionRoutes.TryGetChatSessionKey(item.ActionRoute, out var sessionKey))
         {
-            null or "" => null,
-            "exec-approval" => LocalizationHelper.GetString("NotificationsPage_MetadataSourceExecApproval"),
-            "node.invoke" => LocalizationHelper.GetString("NotificationsPage_MetadataCategoryNodeInvoke"),
-            _ => value
-        };
+            CurrentApp.PendingChatSessionKey = sessionKey;
+            if (CurrentApp.ActiveHubWindow is OpenClawTray.Windows.HubWindow hub)
+                hub.PendingChatSessionKey = sessionKey;
+            ((IAppCommands)CurrentApp).Navigate("chat");
+            _notificationService?.Dismiss(item.Id);
+            return;
+        }
+
+        ((IAppCommands)CurrentApp).Navigate(item.ActionRoute);
+        _notificationService?.Dismiss(item.Id);
     }
 }
diff --git a/src/OpenClaw.Tray.WinUI/Pages/PermissionsPage.xaml b/src/OpenClaw.Tray.WinUI/Pages/PermissionsPage.xaml
index a5a0fd67e..9b343775c 100644
--- a/src/OpenClaw.Tray.WinUI/Pages/PermissionsPage.xaml
+++ b/src/OpenClaw.Tray.WinUI/Pages/PermissionsPage.xaml
@@ -12,6 +12,7 @@
 
             <!-- ───────── Page header ───────── -->
             <TextBlock x:Uid="PermissionsPage_Permissions" Text="Permissions"
+                       AutomationProperties.AutomationId="PermissionsPageMarker"
                        Style="{StaticResource TitleTextBlockStyle}"
                        Margin="0,0,0,2"/>
             <StackPanel Orientation="Horizontal" Spacing="8" Margin="0,0,0,2">
@@ -175,7 +176,7 @@
                             <TextBlock x:Uid="PermissionsPage_McpHeader" Text="Local MCP Server"
                                        Style="{StaticResource BodyStrongTextBlockStyle}"/>
                             <TextBlock x:Uid="PermissionsPage_McpDescription"
-                                       Text="Expose capabilities over HTTP for CLI tools and local integrations."
+                                       Text="Serves capabilities to local MCP clients (CLI tools, integrations) on this PC over HTTP."
                                        Style="{StaticResource CaptionTextBlockStyle}"
                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
                                        TextWrapping="Wrap"/>
@@ -283,7 +284,7 @@
 
                     <!-- Empty state — visible when there are no rules -->
                     <TextBlock x:Uid="PermissionsPage_NoRulesYetAdd" x:Name="RulesEmptyState"
-                               Text="No rules yet. Add a pattern below to allow or deny specific commands."
+                              Text="No rules yet. Add a pattern below to deny, allow, or ask for specific commands."
                                Style="{StaticResource CaptionTextBlockStyle}"
                                Foreground="{ThemeResource TextFillColorTertiaryBrush}"
                                HorizontalAlignment="Center"
@@ -328,6 +329,8 @@
                                             Click="OnRemoveRule" Tag="{Binding Index}"
                                             Background="Transparent" BorderThickness="0"
                                             Padding="6" MinWidth="0"
+                                            AutomationProperties.Name="{Binding RemoveRuleAutomationName}"
+                                            AutomationProperties.AutomationId="{Binding RemoveRuleAutomationId}"
                                             ToolTipService.ToolTip="Remove rule">
                                         <FontIcon Glyph="&#xE74D;" FontSize="14"
                                                   Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
@@ -349,9 +352,11 @@
                         <TextBox Grid.Column="0" x:Uid="NewRulePattern" x:Name="NewRulePattern"
                                  PlaceholderText="Command pattern (e.g. echo *)"
                                  FontFamily="Consolas"/>
-                        <ComboBox Grid.Column="1" x:Name="NewRuleAction" MinWidth="100" SelectedIndex="0">
-                            <ComboBoxItem x:Uid="PermissionsPage_ComboBoxItem_54" Content="allow" Tag="allow"/>
-                            <ComboBoxItem x:Uid="PermissionsPage_ComboBoxItem_55" Content="deny" Tag="deny"/>
+                        <ComboBox Grid.Column="1" x:Uid="PermissionsPage_NewRuleAction" x:Name="NewRuleAction"
+                                  MinWidth="100" SelectedIndex="0">
+                           <ComboBoxItem x:Uid="PermissionsPage_ComboBoxItem_54" Content="Deny" Tag="deny"/>
+                           <ComboBoxItem x:Uid="PermissionsPage_ComboBoxItem_55" Content="Allow" Tag="allow"/>
+                           <ComboBoxItem x:Uid="PermissionsPage_ComboBoxItem_56" Content="Ask" Tag="prompt"/>
                         </ComboBox>
                         <Button Grid.Column="2" x:Uid="PermissionsPage_Button_57" Content="Add" Click="OnAddRule"/>
                     </Grid>
diff --git a/src/OpenClaw.Tray.WinUI/Pages/PermissionsPage.xaml.cs b/src/OpenClaw.Tray.WinUI/Pages/PermissionsPage.xaml.cs
index b3129f51a..7f9f02741 100644
--- a/src/OpenClaw.Tray.WinUI/Pages/PermissionsPage.xaml.cs
+++ b/src/OpenClaw.Tray.WinUI/Pages/PermissionsPage.xaml.cs
@@ -1,6 +1,7 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media;
+using OpenClaw.Connection;
 using OpenClaw.Shared;
 using OpenClaw.Shared.Capabilities;
 using OpenClawTray.Helpers;
@@ -12,6 +13,7 @@
 using System.IO;
 using System.Linq;
 using System.Text.Json;
+using System.Text.Json.Serialization;
 using System.Threading;
 
 namespace OpenClawTray.Pages;
@@ -23,6 +25,7 @@ public sealed partial class PermissionsPage : Page
     private bool _suppressTtsProviderChange;
     private readonly List<ToggleSwitch> _featureToggles = new();
     private List<ExecPolicyRule> _policyRules = new();
+    private const int BrowserProxyToggleIndex = 1;
 
     // Sentinel rendered into the API key PasswordBox so the user can see
     // that a key is already saved without us ever surfacing the plaintext.
@@ -55,12 +58,29 @@ private void OnLoaded(object sender, RoutedEventArgs e)
     {
         if (CurrentApp.Settings != null)
             CurrentApp.Settings.Saved += OnSettingsSaved;
+
+        var mgr = CurrentApp.ConnectionManager;
+        if (mgr != null)
+            mgr.StateChanged += OnConnectionStateChanged;
     }
 
     private void OnUnloaded(object sender, RoutedEventArgs e)
     {
         if (CurrentApp.Settings != null)
             CurrentApp.Settings.Saved -= OnSettingsSaved;
+
+        var mgr = CurrentApp.ConnectionManager;
+        if (mgr != null)
+            mgr.StateChanged -= OnConnectionStateChanged;
+    }
+
+    private void OnConnectionStateChanged(object? sender, GatewayConnectionSnapshot snapshot)
+    {
+        DispatcherQueue?.TryEnqueue(() =>
+        {
+            if (!IsLoaded) return;
+            UpdateNodeStatus();
+        });
     }
 
     private bool _suppressNodeModeToggle;
@@ -118,18 +138,18 @@ private void ReloadFeatureToggleStates()
         }
     }
 
-    /// <summary>
-    /// Disables and dims the sub-toggles when Node Mode is off so users see they have
-    /// no effect until Node Mode is back on. ItemsRepeater isn't a Control (no IsEnabled),
-    /// so we apply per-toggle plus an Opacity on the repeater.
-    /// </summary>
+    /// <summary>Enables capability toggles whenever either node transport can serve them.</summary>
     private void ApplyFeaturesEnabledState()
     {
-        var nodeEnabled = CurrentApp.Settings?.EnableNodeMode ?? false;
-        CapabilityRepeater.Opacity = nodeEnabled ? 1.0 : 0.4;
-        foreach (var toggle in _featureToggles)
-            toggle.IsEnabled = nodeEnabled;
-        FeaturesSectionDescription.Text = LocalizationHelper.GetString(nodeEnabled
+        var s = CurrentApp.Settings;
+        var canServe = (s?.EnableNodeMode ?? false) || (s?.EnableMcpServer ?? false);
+        CapabilityRepeater.Opacity = canServe ? 1.0 : 0.4;
+        for (int i = 0; i < _featureToggles.Count; i++)
+        {
+            var isBrowserProxyToggle = i == BrowserProxyToggleIndex;
+            _featureToggles[i].IsEnabled = canServe && (!isBrowserProxyToggle || s?.EnableNodeMode == true);
+        }
+        FeaturesSectionDescription.Text = LocalizationHelper.GetString(canServe
             ? "PermissionsPage_FeaturesDescription_Enabled"
             : "PermissionsPage_FeaturesDescription_Disabled");
     }
@@ -471,16 +491,52 @@ private void OnTtsElevenLabsCommitted(object sender, RoutedEventArgs e)
 
     private void UpdateNodeStatus()
     {
-        var nodeEnabled = CurrentApp.Settings?.EnableNodeMode ?? false;
-        var isConnected = (CurrentApp.AppState?.Status ?? ConnectionStatus.Disconnected) == ConnectionStatus.Connected;
+        var settings = CurrentApp.Settings;
+        var nodeEnabled = settings?.EnableNodeMode ?? false;
+        var mcpEnabled = settings?.EnableMcpServer ?? false;
 
         if (!nodeEnabled)
         {
-            NodeStatusDot.Fill = new SolidColorBrush(Microsoft.UI.Colors.Gray);
-            NodeStatusText.Text = LocalizationHelper.GetString("PermissionsPage_NodeStatus_Disabled");
-            NodeDetailsText.Text = LocalizationHelper.GetString("PermissionsPage_NodeStatus_DisabledDetails");
+            if (mcpEnabled && settings != null)
+            {
+                var mcpError = CurrentApp.ActiveNodeService?.McpStartupError;
+                if (!string.IsNullOrEmpty(mcpError))
+                {
+                    NodeStatusDot.Fill = new SolidColorBrush(Microsoft.UI.Colors.OrangeRed);
+                    NodeStatusText.Text = LocalizationHelper.GetString("PermissionsPage_NodeStatus_McpError");
+                    NodeDetailsText.Text = mcpError;
+                }
+                else
+                {
+                    NodeStatusDot.Fill = new SolidColorBrush(Microsoft.UI.Colors.DodgerBlue);
+                    NodeStatusText.Text = LocalizationHelper.GetString("PermissionsPage_NodeStatus_McpOnly");
+                    NodeDetailsText.Text = LocalizationHelper.Format(
+                        "PermissionsPage_NodeStatus_McpOnlyDetailsFormat",
+                        NodeCapabilityGating.CountMcpServedCapabilities(settings),
+                        NodeService.McpServerUrl);
+                }
+            }
+            else
+            {
+                NodeStatusDot.Fill = new SolidColorBrush(Microsoft.UI.Colors.Gray);
+                NodeStatusText.Text = LocalizationHelper.GetString("PermissionsPage_NodeStatus_Disabled");
+                NodeDetailsText.Text = LocalizationHelper.GetString("PermissionsPage_NodeStatus_DisabledDetails");
+            }
+            return;
         }
-        else if (isConnected)
+
+        var snap = CurrentApp.ConnectionManager?.CurrentSnapshot;
+        var nodeState = snap?.NodeState ?? RoleConnectionState.Idle;
+        var operatorConnected = snap?.OperatorState == RoleConnectionState.Connected;
+        var mcpStartupError = CurrentApp.ActiveNodeService?.McpStartupError;
+
+        if (mcpEnabled && !string.IsNullOrEmpty(mcpStartupError))
+        {
+            NodeStatusDot.Fill = new SolidColorBrush(Microsoft.UI.Colors.OrangeRed);
+            NodeStatusText.Text = LocalizationHelper.GetString("PermissionsPage_NodeStatus_McpError");
+            NodeDetailsText.Text = mcpStartupError;
+        }
+        else if (nodeState == RoleConnectionState.Connected && operatorConnected)
         {
             NodeStatusDot.Fill = new SolidColorBrush(Microsoft.UI.Colors.LimeGreen);
             NodeStatusText.Text = LocalizationHelper.GetString("PermissionsPage_NodeStatus_Active");
@@ -495,11 +551,22 @@ private void UpdateNodeStatus()
                     caps.Count, string.Join(", ", caps))
                 : LocalizationHelper.GetString("PermissionsPage_NodeStatus_NoCapabilities");
         }
+        else if (nodeState == RoleConnectionState.Connecting)
+        {
+            NodeStatusDot.Fill = new SolidColorBrush(Microsoft.UI.Colors.Goldenrod);
+            NodeStatusText.Text = LocalizationHelper.GetString("PermissionsPage_NodeStatus_Starting");
+            NodeDetailsText.Text = LocalizationHelper.GetString("PermissionsPage_NodeStatus_NotConnectedDetails");
+        }
         else
         {
             NodeStatusDot.Fill = new SolidColorBrush(Microsoft.UI.Colors.Orange);
             NodeStatusText.Text = LocalizationHelper.GetString("PermissionsPage_NodeStatus_NotConnected");
-            NodeDetailsText.Text = LocalizationHelper.GetString("PermissionsPage_NodeStatus_NotConnectedDetails");
+            NodeDetailsText.Text = mcpEnabled && settings != null && string.IsNullOrEmpty(mcpStartupError)
+                ? LocalizationHelper.Format(
+                    "PermissionsPage_NodeStatus_McpOnlyDetailsFormat",
+                    NodeCapabilityGating.CountMcpServedCapabilities(settings),
+                    NodeService.McpServerUrl)
+                : LocalizationHelper.GetString("PermissionsPage_NodeStatus_NotConnectedDetails");
         }
     }
 
@@ -518,6 +585,14 @@ private void UpdateMcpStatus()
 
         if (settings.EnableMcpServer)
         {
+            var mcpError = CurrentApp.ActiveNodeService?.McpStartupError;
+            if (!string.IsNullOrEmpty(mcpError))
+            {
+                McpStatusText.Text =
+                    $"{LocalizationHelper.GetString("PermissionsPage_NodeStatus_McpError")}: {mcpError}";
+                return;
+            }
+
             var tokenPath = NodeService.McpTokenPath;
             var tokenExists = File.Exists(tokenPath);
             McpStatusText.Text = LocalizationHelper.GetString(tokenExists
@@ -534,6 +609,8 @@ private void OnMcpToggled(object sender, RoutedEventArgs e)
         CurrentApp.Settings.Save();
         ((IAppCommands)CurrentApp).NotifySettingsSaved();
         UpdateMcpStatus();
+        UpdateNodeStatus();
+        ApplyFeaturesEnabledState();
     }
 
     private void OnCopyMcpToken(object sender, RoutedEventArgs e)
@@ -572,9 +649,7 @@ private void LoadExecPolicy()
         _loadingExecPolicy = true;
         try
         {
-            var policyPath = Path.Combine(
-                Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
-                "OpenClawTray", "exec-policy.json");
+            var policyPath = ExecPolicyPath;
 
             if (File.Exists(policyPath))
             {
@@ -584,12 +659,7 @@ private void LoadExecPolicy()
 
                 if (root.TryGetProperty("defaultAction", out var da))
                 {
-                    var action = da.GetString() ?? "deny";
-                    // Migrate legacy "ask" tag (pre-fix files) to the canonical "prompt"
-                    // value used by ExecApprovalAction.Prompt. Without this, files written
-                    // by older builds fail to deserialize and silently reset to Deny.
-                    if (string.Equals(action, "ask", StringComparison.OrdinalIgnoreCase))
-                        action = "prompt";
+                    var action = NormalizeExecPolicyAction(da);
                     for (int i = 0; i < DefaultActionCombo.Items.Count; i++)
                     {
                         if (DefaultActionCombo.Items[i] is ComboBoxItem item && item.Tag?.ToString() == action)
@@ -608,7 +678,10 @@ private void LoadExecPolicy()
                             // Accept either case — earlier saves wrote "Pattern" capitalized
                             // due to an anonymous-type property name leak.
                             Pattern = TryGetStringCaseInsensitive(rule, "pattern", "Pattern") ?? "",
-                            Action = TryGetStringCaseInsensitive(rule, "action", "Action") ?? "deny",
+                            Action = ExecPolicyRuleList.TryGetActionCaseInsensitive(rule, "action", "Action") ?? "deny",
+                            Shells = TryGetStringArrayCaseInsensitive(rule, "shells", "Shells"),
+                            Description = TryGetStringCaseInsensitive(rule, "description", "Description"),
+                            Enabled = TryGetBoolCaseInsensitive(rule, "enabled", "Enabled") ?? true,
                             Index = idx++
                         });
                     }
@@ -631,13 +704,18 @@ private void RefreshPolicyRulesList()
         for (int i = 0; i < _policyRules.Count; i++) _policyRules[i].Index = i;
         var allowBrush = (Microsoft.UI.Xaml.Media.Brush)Application.Current.Resources["SystemFillColorSuccessBrush"];
         var denyBrush = (Microsoft.UI.Xaml.Media.Brush)Application.Current.Resources["SystemFillColorCriticalBrush"];
+        var askBrush = (Microsoft.UI.Xaml.Media.Brush)Application.Current.Resources["SystemFillColorCautionBrush"];
         PolicyRulesList.ItemsSource = null;
         PolicyRulesList.ItemsSource = _policyRules.Select(r => new
         {
             r.Pattern,
-            r.Action,
+            Action = DisplayExecPolicyAction(r.Action),
             r.Index,
-            ActionBrush = r.Action == "allow" ? allowBrush : denyBrush
+            RemoveRuleAutomationName = $"Remove rule {r.Pattern}",
+            RemoveRuleAutomationId = $"RemoveExecPolicyRuleButton_{r.Index}",
+            ActionBrush = r.Action == "allow"
+                ? allowBrush
+                : r.Action == "prompt" ? askBrush : denyBrush
         }).ToList();
 
         // Header badge + empty state
@@ -658,8 +736,8 @@ private void OnAddRule(object sender, RoutedEventArgs e)
         if (string.IsNullOrEmpty(pattern)) return;
         // Read .Tag (invariant identifier) instead of .Content so future localization
         // of the allow/deny strings can't break the JSON contract on disk.
-        var action = (NewRuleAction.SelectedItem as ComboBoxItem)?.Tag?.ToString() ?? "deny";
-        _policyRules.Add(new ExecPolicyRule { Pattern = pattern, Action = action });
+        var action = NormalizeExecPolicyAction((NewRuleAction.SelectedItem as ComboBoxItem)?.Tag?.ToString());
+        ExecPolicyRuleList.UpsertByPattern(_policyRules, pattern, action);
         NewRulePattern.Text = "";
         RefreshPolicyRulesList();
         SaveExecPolicyToDisk();
@@ -683,24 +761,34 @@ private void OnDefaultActionChanged(object sender, SelectionChangedEventArgs e)
 
     private bool _loadingExecPolicy;
     private Microsoft.UI.Dispatching.DispatcherQueueTimer? _execSavedHintTimer;
+    private static string ExecPolicyPath => Path.Combine(CurrentApp.DataDirectoryPath, "exec-policy.json");
 
-    private void SaveExecPolicyToDisk()
+    private void SaveExecPolicyToDisk(bool showSavedHint = true)
     {
         string? tmpPath = null;
         try
         {
-            var policyPath = Path.Combine(
-                Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
-                "OpenClawTray", "exec-policy.json");
+            var policyPath = ExecPolicyPath;
 
-            var defaultAction = (DefaultActionCombo.SelectedItem as ComboBoxItem)?.Tag?.ToString() ?? "deny";
+            var defaultAction = NormalizeExecPolicyAction((DefaultActionCombo.SelectedItem as ComboBoxItem)?.Tag?.ToString());
             var policy = new
             {
                 defaultAction,
-                rules = _policyRules.Select(r => new { pattern = r.Pattern, action = r.Action }).ToArray()
+                rules = _policyRules.Select(r => new
+                {
+                    pattern = r.Pattern,
+                    action = r.Action,
+                    shells = r.Shells,
+                    description = r.Description,
+                    enabled = ExecPolicyRuleList.PersistedEnabled(r.Enabled)
+                }).ToArray()
             };
 
-            var json = JsonSerializer.Serialize(policy, new JsonSerializerOptions { WriteIndented = true });
+            var json = JsonSerializer.Serialize(policy, new JsonSerializerOptions
+            {
+                WriteIndented = true,
+                DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
+            });
             Directory.CreateDirectory(Path.GetDirectoryName(policyPath)!);
 
             // Atomic write: serialize to a sibling .tmp first, then replace.
@@ -712,6 +800,9 @@ private void SaveExecPolicyToDisk()
             MoveFileWithRetry(tmpPath, policyPath);
             tmpPath = null;
 
+            if (!showSavedHint)
+                return;
+
             // Brief inline "Saved" pill in the rules-card header. Reuses a single
             // DispatcherQueueTimer instance so rapid saves don't orphan timers.
             ExecPolicySavedHint.Visibility = Visibility.Visible;
@@ -774,6 +865,48 @@ private static void TryDeleteTempFile(string? path)
         return null;
     }
 
+    internal static string NormalizeExecPolicyAction(string? action) =>
+        ExecPolicyRuleList.NormalizeAction(action);
+
+    private static string NormalizeExecPolicyAction(JsonElement action) =>
+        ExecPolicyRuleList.NormalizeAction(action);
+
+    private static string[]? TryGetStringArrayCaseInsensitive(JsonElement element, params string[] names)
+    {
+        foreach (var name in names)
+        {
+            if (!element.TryGetProperty(name, out var prop) || prop.ValueKind != JsonValueKind.Array)
+                continue;
+
+            var values = new List<string>();
+            foreach (var item in prop.EnumerateArray())
+            {
+                if (item.ValueKind == JsonValueKind.String)
+                    values.Add(item.GetString() ?? "");
+            }
+
+            return values.ToArray();
+        }
+
+        return null;
+    }
+
+    private static bool? TryGetBoolCaseInsensitive(JsonElement element, params string[] names)
+    {
+        foreach (var name in names)
+        {
+            if (!element.TryGetProperty(name, out var prop))
+                continue;
+            if (prop.ValueKind == JsonValueKind.True) return true;
+            if (prop.ValueKind == JsonValueKind.False) return false;
+        }
+
+        return null;
+    }
+
+    private static string DisplayExecPolicyAction(string action) =>
+        string.Equals(action, "prompt", StringComparison.OrdinalIgnoreCase) ? "ask" : action;
+
     // ── Node Allowlist ───────────────────────────────────────────────
 
     private void LoadAllowlist(JsonElement? config)
@@ -854,10 +987,4 @@ private void OnOpenPrivacySettings(object sender, RoutedEventArgs e)
 
     // ── Types ────────────────────────────────────────────────────────
 
-    private class ExecPolicyRule
-    {
-        public string Pattern { get; set; } = "";
-        public string Action { get; set; } = "deny";
-        public int Index { get; set; }
-    }
 }
diff --git a/src/OpenClaw.Tray.WinUI/Pages/SandboxPage.xaml b/src/OpenClaw.Tray.WinUI/Pages/SandboxPage.xaml
index 7a5fc4e3a..b6a4f0a58 100644
--- a/src/OpenClaw.Tray.WinUI/Pages/SandboxPage.xaml
+++ b/src/OpenClaw.Tray.WinUI/Pages/SandboxPage.xaml
@@ -27,6 +27,7 @@
                 <StackPanel Grid.Column="1" Spacing="2" VerticalAlignment="Center">
                     <TextBlock x:Uid="SandboxPage_NodeSandboxIsOn" x:Name="SandboxStatusTitle"
                                Text="Node sandbox is on"
+                               AutomationProperties.AutomationId="SandboxPageMarker"
                                Style="{StaticResource TitleTextBlockStyle}"
                                TextWrapping="Wrap" />
                     <TextBlock x:Uid="SandboxPage_ProgramsTheAgentRuns" x:Name="SandboxStatusSubtext"
@@ -54,7 +55,9 @@
                  scope-clarity InfoBar and the separate "How sandboxing works"
                  ContentDialog — the architectural breakdown of which execution
                  paths are contained vs not is inline, on-demand. -->
-            <Expander HorizontalAlignment="Stretch"
+            <Expander x:Name="ScopeExpander"
+                      AutomationProperties.LabeledBy="{Binding ElementName=ScopeExpanderLabel}"
+                      HorizontalAlignment="Stretch"
                       HorizontalContentAlignment="Stretch"
                       IsExpanded="False">
                 <Expander.Header>
@@ -68,7 +71,7 @@
                                   Glyph="&#xE946;"
                                   VerticalAlignment="Center" />
                         <StackPanel Grid.Column="1" Spacing="2" VerticalAlignment="Center">
-                            <TextBlock x:Uid="SandboxPage_WhatGetsContained" Text="What gets contained"
+                            <TextBlock x:Uid="SandboxPage_WhatGetsContained" x:Name="ScopeExpanderLabel" Text="What gets contained"
                                        Style="{StaticResource BodyStrongTextBlockStyle}" />
                             <TextBlock x:Uid="SandboxPage_SeeWhichCommandsThis" Text="See which commands this page covers — and which need different controls."
                                        Style="{StaticResource CaptionTextBlockStyle}"
@@ -125,7 +128,8 @@
                     <StackPanel Spacing="8" Margin="0,4,0,12">
                         <TextBlock x:Name="UnavailableActionMessage" TextWrapping="Wrap" />
                         <StackPanel Orientation="Horizontal" Spacing="8">
-                            <Button x:Name="UnavailablePrimaryButton" Click="OnUnavailableActionClick" Style="{ThemeResource AccentButtonStyle}" />
+                            <Button x:Uid="SandboxPage_UnavailablePrimaryButton" x:Name="UnavailablePrimaryButton"
+                                    Click="OnUnavailableActionClick" Style="{ThemeResource AccentButtonStyle}" />
                             <HyperlinkButton x:Uid="SandboxPage_LearnMoreAboutMXC" Content="Learn more about MXC sandboxing"
                                              NavigateUri="https://github.com/microsoft/mxc" />
                         </StackPanel>
@@ -154,7 +158,7 @@
                             <ColumnDefinition Width="*" />
                         </Grid.ColumnDefinitions>
 
-                        <Button x:Name="PresetLockedButton"
+                        <Button x:Uid="SandboxPage_PresetLockedButton" x:Name="PresetLockedButton"
                                 Grid.Column="0"
                                 HorizontalAlignment="Stretch"
                                 HorizontalContentAlignment="Stretch"
@@ -175,7 +179,7 @@
                             </StackPanel>
                         </Button>
 
-                        <Button x:Name="PresetBalancedButton"
+                        <Button x:Uid="SandboxPage_PresetBalancedButton" x:Name="PresetBalancedButton"
                                 Grid.Column="1"
                                 HorizontalAlignment="Stretch"
                                 HorizontalContentAlignment="Stretch"
@@ -196,7 +200,7 @@
                             </StackPanel>
                         </Button>
 
-                        <Button x:Name="PresetPermissiveButton"
+                        <Button x:Uid="SandboxPage_PresetPermissiveButton" x:Name="PresetPermissiveButton"
                                 Grid.Column="2"
                                 HorizontalAlignment="Stretch"
                                 HorizontalContentAlignment="Stretch"
@@ -253,7 +257,7 @@
                             </Grid.RowDefinitions>
 
                             <TextBlock x:Uid="SandboxPage_Documents" Grid.Row="0" Grid.Column="0" Text="Documents" VerticalAlignment="Center"/>
-                            <ComboBox x:Name="DocsAccessCombo" Grid.Row="0" Grid.Column="1"
+                            <ComboBox x:Uid="SandboxPage_DocsAccessCombo" x:Name="DocsAccessCombo" Grid.Row="0" Grid.Column="1"
                                       HorizontalAlignment="Stretch"
                                       SelectionChanged="OnDocsAccessChanged">
                                 <ComboBoxItem x:Uid="SandboxPage_Blocked" Content="Blocked" Tag="None" />
@@ -262,7 +266,7 @@
                             </ComboBox>
 
                             <TextBlock x:Uid="SandboxPage_Downloads" Grid.Row="1" Grid.Column="0" Text="Downloads" VerticalAlignment="Center"/>
-                            <ComboBox x:Name="DownloadsAccessCombo" Grid.Row="1" Grid.Column="1"
+                            <ComboBox x:Uid="SandboxPage_DownloadsAccessCombo" x:Name="DownloadsAccessCombo" Grid.Row="1" Grid.Column="1"
                                       HorizontalAlignment="Stretch"
                                       SelectionChanged="OnDownloadsAccessChanged">
                                 <ComboBoxItem x:Uid="SandboxPage_Blocked2" Content="Blocked" Tag="None" />
@@ -271,7 +275,7 @@
                             </ComboBox>
 
                             <TextBlock x:Uid="SandboxPage_Desktop" Grid.Row="2" Grid.Column="0" Text="Desktop" VerticalAlignment="Center"/>
-                            <ComboBox x:Name="DesktopAccessCombo" Grid.Row="2" Grid.Column="1"
+                            <ComboBox x:Uid="SandboxPage_DesktopAccessCombo" x:Name="DesktopAccessCombo" Grid.Row="2" Grid.Column="1"
                                       HorizontalAlignment="Stretch"
                                       SelectionChanged="OnDesktopAccessChanged">
                                 <ComboBoxItem x:Uid="SandboxPage_Blocked3" Content="Blocked" Tag="None" />
diff --git a/src/OpenClaw.Tray.WinUI/Pages/SandboxPage.xaml.cs b/src/OpenClaw.Tray.WinUI/Pages/SandboxPage.xaml.cs
index 1da740b89..f1de9a532 100644
--- a/src/OpenClaw.Tray.WinUI/Pages/SandboxPage.xaml.cs
+++ b/src/OpenClaw.Tray.WinUI/Pages/SandboxPage.xaml.cs
@@ -1,6 +1,7 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using OpenClaw.Shared;
+using OpenClawTray.Helpers;
 using OpenClawTray.Services;
 using System;
 using System.Collections.ObjectModel;
@@ -13,20 +14,62 @@ namespace OpenClawTray.Pages;
 public sealed partial class SandboxPage : Page
 {
     private static App CurrentApp => (App)Microsoft.UI.Xaml.Application.Current!;
+    private static string L(string key) => LocalizationHelper.GetString(key);
+    private static string Lf(string key, params object?[] args) => LocalizationHelper.Format(key, args);
     private bool _suppress;
     private bool _dialogOpen;
-    private OpenClaw.Shared.Mxc.MxcAvailability? _cachedAvailability;
 
     public ObservableCollection<CustomFolderRow> CustomFolders { get; } = new();
 
     /// <summary>
-    /// Cached MxcAvailability for the lifetime of this page instance. Probe() does
-    /// registry reads and filesystem walks; we don't need to repeat that work on every
-    /// toggle/preset change. The result is stable as long as the OS doesn't change
-    /// under us, which is fine for a settings page.
+    /// Cached MxcAvailability for the lifetime of this page instance, or null until
+    /// the first background probe completes. Probe() spawns <c>wxc-exec --probe</c>
+    /// (up to ~15s on a misbehaving host) plus filesystem walks, so we never run it
+    /// on the UI thread; <see cref="RefreshAvailabilityAsync"/> populates this
+    /// off-thread and re-renders. Availability-driven UI treats null as "checking".
+    /// </summary>
+    private OpenClaw.Shared.Mxc.MxcAvailability? _cachedAvailability;
+    private bool _availabilityProbeInFlight;
+
+    /// <summary>
+    /// Probe MXC availability off the UI thread (once), cache it, then refresh the
+    /// availability-driven UI. No-op once a definitive result is cached or while a
+    /// probe is already running.
     /// </summary>
-    private OpenClaw.Shared.Mxc.MxcAvailability GetAvailability()
-        => _cachedAvailability ??= OpenClaw.Shared.Mxc.MxcAvailability.Probe();
+    private async System.Threading.Tasks.Task RefreshAvailabilityAsync()
+    {
+        // Re-probe when we have no result yet, or the last one was a transient
+        // probe error. A definitive verdict (supported / host-unsupported) is kept
+        // for the page-instance lifetime.
+        if (_cachedAvailability is { ProbeErrored: false }) return;
+        if (_availabilityProbeInFlight) return;
+
+        _availabilityProbeInFlight = true;
+        try
+        {
+            _cachedAvailability = await System.Threading.Tasks.Task.Run(
+                static () => OpenClaw.Shared.Mxc.MxcAvailability.Probe());
+        }
+        catch (Exception)
+        {
+            // Probe() is designed not to throw, but never leave the page stuck in
+            // "Checking…": synthesize an errored result so the UI shows Retry.
+            _cachedAvailability = new OpenClaw.Shared.Mxc.MxcAvailability(
+                false, false, false, null,
+                new[] { L("SandboxPage_ProbeErrorReason") }, probeErrored: true);
+        }
+        finally
+        {
+            _availabilityProbeInFlight = false;
+
+            // await resumed us on the UI thread (DispatcherQueue sync context), so it
+            // is safe to touch controls here. Always re-render — on both the happy
+            // path and the failure path — so the page never stays in "Checking…".
+            NormalizeSandboxToggleForAvailability();
+            UpdateSandboxStatusCard();
+            UpdateControlsEnabledState();
+        }
+    }
 
     // ── Quick-preset definitions ─────────────────────────────────────
     //
@@ -90,6 +133,15 @@ public void Initialize()
         LoadState();
         ProbeStatus();
         UpdateControlsEnabledState();
+
+        // Kick off the (potentially slow) MXC probe off the UI thread. The page
+        // renders a neutral "checking" state until it completes, then re-renders
+        // with the real availability — so the settings UI never blocks on
+        // wxc-exec --probe.
+        AsyncEventHandlerGuard.Run(
+            RefreshAvailabilityAsync,
+            new OpenClawTray.AppLogger(),
+            nameof(RefreshAvailabilityAsync));
     }
 
     // ── Load + probe ─────────────────────────────────────────────────
@@ -133,6 +185,7 @@ private void LoadState()
             _suppress = false;
         }
 
+        NormalizeSandboxToggleForAvailability();
         UpdatePresetHighlight();
         UpdateSandboxStatusCard();
         UpdateControlsEnabledState();
@@ -140,28 +193,50 @@ private void LoadState()
 
     /// <summary>
     /// Drives the page header (icon + title + subtext + toggle visibility) based on
-    /// MXC availability AND the current sandbox toggle state. Three visual states:
-    ///   1. Available + ON   → 🛡 "Sandbox is on" + toggle visible
-    ///   2. Available + OFF  → ⚠ "Sandbox is off — high risk" + toggle visible
-    ///   3. Unavailable      → ⚠ "Sandbox unavailable — commands run uncontained" + toggle hidden
-    /// When MXC is unavailable the toggle is hidden and MxcCommandRunner falls
-    /// back to host execution with a warning so older Windows builds are not
-    /// completely blocked.
+    /// MXC availability AND the current sandbox toggle state. Definitively
+    /// unavailable MXC is normalized to OFF so the UI never claims Node Sandbox is
+    /// on when containment cannot run. Transient probe errors can still render the
+    /// enabled/strict-blocking state until retry resolves the probe.
     /// </summary>
     private void UpdateSandboxStatusCard()
     {
-        var availability = GetAvailability();
+        var availability = _cachedAvailability;
         var enabled = SandboxEnabledToggle.IsOn;
-        var available = availability.HasAnyBackend;
+        var blockHostFallback = CurrentApp.Settings?.SystemRunBlockHostFallbackWhenMxcUnavailable ?? false;
 
-        UpdateUnavailableActionBar(availability);
+        UpdateUnavailableActionBar(availability, enabled);
 
+        if (availability is null)
+        {
+            // Probe still running on the background thread — neutral interim state.
+            SandboxStatusIcon.Text = "⏳";
+            SandboxStatusTitle.Text = "Checking sandbox availability…";
+            SandboxStatusSubtext.Text = "Verifying that this PC can contain commands the agent runs.";
+            SandboxEnabledToggle.Visibility = Visibility.Collapsed;
+            return;
+        }
+
+        var available = availability.HasAnyBackend;
         if (!available)
         {
             SandboxStatusIcon.Text = "⚠";
-            SandboxStatusTitle.Text = "Node Sandbox unavailable — commands run uncontained";
-            SandboxStatusSubtext.Text = "Containment isn't available on this PC, so commands run without sandbox protection.";
-            SandboxEnabledToggle.Visibility = Visibility.Collapsed;
+            SandboxEnabledToggle.Visibility = Visibility.Visible;
+
+            if (enabled && blockHostFallback)
+            {
+                SandboxStatusTitle.Text = L("SandboxPage_StatusUnavailableBlockedTitle");
+                SandboxStatusSubtext.Text = L("SandboxPage_StatusUnavailableBlockedSubtext");
+            }
+            else if (enabled)
+            {
+                SandboxStatusTitle.Text = L("SandboxPage_StatusUnavailableTitle");
+                SandboxStatusSubtext.Text = L("SandboxPage_StatusUnavailableSubtext");
+            }
+            else
+            {
+                SandboxStatusTitle.Text = L("SandboxPage_StatusUnavailableOffTitle");
+                SandboxStatusSubtext.Text = L("SandboxPage_StatusUnavailableOffSubtext");
+            }
             return;
         }
 
@@ -170,27 +245,42 @@ private void UpdateSandboxStatusCard()
         if (enabled)
         {
             SandboxStatusIcon.Text = "🛡";
-            SandboxStatusTitle.Text = "Node Sandbox is on";
-            SandboxStatusSubtext.Text = "Programs the agent runs on this PC are contained.";
+            if (availability.IsDegradedContainment)
+            {
+                // Contained, but only via a weaker, last-resort isolation tier
+                // (e.g. DACL augmentation). Surface as a caution rather than a block.
+                SandboxStatusTitle.Text = "Node Sandbox is on — limited containment";
+                SandboxStatusSubtext.Text =
+                    "Programs the agent runs are contained, but this PC only supports a fallback isolation tier" +
+                    $"{(string.IsNullOrEmpty(availability.IsolationTier) ? "" : $" ({availability.IsolationTier})")}. " +
+                    "Containment is weaker than on a fully supported build; install the latest Windows updates to strengthen it.";
+            }
+            else
+            {
+                SandboxStatusTitle.Text = L("SandboxPage_StatusOnTitle");
+                SandboxStatusSubtext.Text = L("SandboxPage_StatusOnSubtext");
+            }
         }
         else
         {
             SandboxStatusIcon.Text = "⚠";
-            SandboxStatusTitle.Text = "Node Sandbox is off — high risk";
-            SandboxStatusSubtext.Text = "Programs the agent runs on this PC are not contained.";
+            SandboxStatusTitle.Text = L("SandboxPage_StatusOffTitle");
+            SandboxStatusSubtext.Text = L("SandboxPage_StatusOffSubtext");
         }
     }
 
     /// <summary>
     /// Shows or hides the prominent "Sandbox unavailable" InfoBar based on availability,
     /// and categorizes the failure mode so we can suggest a relevant action:
-    ///   - Windows build/UBR too old → "Open Windows Update"
+    ///   - probe errored (transient) → "Retry"
+    ///   - host doesn't support sandboxing → "Open Windows Update"
     ///   - wxc-exec.exe missing → "Show install instructions"
     ///   - Anything else → no primary action, just the learn-more hyperlink
     /// </summary>
-    private void UpdateUnavailableActionBar(OpenClaw.Shared.Mxc.MxcAvailability availability)
+    private void UpdateUnavailableActionBar(OpenClaw.Shared.Mxc.MxcAvailability? availability, bool sandboxEnabled)
     {
-        if (availability.HasAnyBackend)
+        // Null = still probing; hide the bar until we have a verdict.
+        if (availability is null || availability.HasAnyBackend)
         {
             UnavailableActionBar.IsOpen = false;
             return;
@@ -199,45 +289,91 @@ private void UpdateUnavailableActionBar(OpenClaw.Shared.Mxc.MxcAvailability avai
         var reasons = availability.UnsupportedReasons;
         var reasonText = reasons.Count > 0
             ? string.Join("  ·  ", reasons)
-            : "MXC sandboxing primitives are not available on this machine.";
+            : L("SandboxPage_UnavailableDefaultReason");
+
+        // A transient probe error (timeout / couldn't launch / garbled output) is NOT
+        // the same as the host being unsupported — don't push the user at Windows
+        // Update. Offer a retry; the next probe may succeed.
+        var isProbeError = availability.ProbeErrored;
 
-        var isWindowsIssue = reasons.Any(r =>
-            r.Contains("Windows build", StringComparison.OrdinalIgnoreCase) ||
-            r.Contains("Windows UBR", StringComparison.OrdinalIgnoreCase));
+        // wxc-exec is present and the probe gave a definitive negative → the Windows
+        // host itself doesn't support the sandbox (vs. a missing binary).
+        var isWindowsIssue = !isProbeError
+            && availability.IsWxcExecResolvable
+            && !availability.IsAppContainerAvailable;
 
         var isSetupIssue = !availability.IsWxcExecResolvable;
+        var blockHostFallback = sandboxEnabled
+            && (CurrentApp.Settings?.SystemRunBlockHostFallbackWhenMxcUnavailable ?? false);
+        var unavailableBehavior = L(blockHostFallback
+            ? "SandboxPage_UnavailableBehaviorBlocked"
+            : "SandboxPage_UnavailableBehaviorHostFallback");
 
-        if (isWindowsIssue)
+        if (isProbeError)
         {
-            UnavailableActionBar.Title = "Your Windows version doesn't support sandboxing yet";
-            UnavailableActionMessage.Text =
-                $"{reasonText}\n\nCommands run uncontained on this machine — sandboxing requires a recent Windows build with the AppContainer primitives shipped. " +
-                "Install the latest Windows updates (or join the Windows Insider Program for the newest builds) to enable containment.";
-            UnavailablePrimaryButton.Content = "Open Windows Update";
+            UnavailableActionBar.Title = L("SandboxPage_ProbeErrorTitle");
+            UnavailableActionMessage.Text = Lf("SandboxPage_ProbeErrorMessageFormat", reasonText, unavailableBehavior);
+            UnavailablePrimaryButton.Content = L("SandboxPage_Retry");
+            UnavailablePrimaryButton.Tag = "retry";
+            UnavailablePrimaryButton.Visibility = Visibility.Visible;
+        }
+        else if (isWindowsIssue)
+        {
+            UnavailableActionBar.Title = L("SandboxPage_WindowsUnsupportedTitle");
+            UnavailableActionMessage.Text = Lf("SandboxPage_WindowsUnsupportedMessageFormat", reasonText, unavailableBehavior);
+            UnavailablePrimaryButton.Content = L("SandboxPage_OpenWindowsUpdate");
             UnavailablePrimaryButton.Tag = "windowsupdate";
             UnavailablePrimaryButton.Visibility = Visibility.Visible;
         }
         else if (isSetupIssue)
         {
-            UnavailableActionBar.Title = "Sandboxing components are missing";
-            UnavailableActionMessage.Text =
-                $"{reasonText}\n\nThe wxc-exec binary couldn't be located, so commands run uncontained. " +
-                "If this is a developer build, build the tray app so wxc-exec.exe is copied into the output folder. " +
-                "Otherwise reinstall the companion app to restore sandboxing.";
-            UnavailablePrimaryButton.Content = "Show install instructions";
+            UnavailableActionBar.Title = L("SandboxPage_ComponentsMissingTitle");
+            UnavailableActionMessage.Text = Lf("SandboxPage_ComponentsMissingMessageFormat", reasonText, unavailableBehavior);
+            UnavailablePrimaryButton.Content = L("SandboxPage_ShowInstallInstructions");
             UnavailablePrimaryButton.Tag = "install";
             UnavailablePrimaryButton.Visibility = Visibility.Visible;
         }
         else
         {
-            UnavailableActionBar.Title = "Sandbox unavailable — commands run uncontained";
-            UnavailableActionMessage.Text = reasonText;
+            UnavailableActionBar.Title = blockHostFallback
+                ? L("SandboxPage_UnavailableBlockedTitle")
+                : L("SandboxPage_UnavailableTitle");
+            UnavailableActionMessage.Text = $"{reasonText}\n\n{unavailableBehavior}";
             UnavailablePrimaryButton.Visibility = Visibility.Collapsed;
         }
 
         UnavailableActionBar.IsOpen = true;
     }
 
+    private bool IsSandboxDefinitivelyUnavailable()
+    {
+        return _cachedAvailability is { HasAnyBackend: false, ProbeErrored: false };
+    }
+
+    private bool NormalizeSandboxToggleForAvailability()
+    {
+        if (!IsSandboxDefinitivelyUnavailable())
+            return false;
+        if (CurrentApp.Settings is not { } settings || !settings.SystemRunSandboxEnabled)
+            return false;
+        if (settings.SystemRunBlockHostFallbackWhenMxcUnavailable)
+            return false;
+
+        _suppress = true;
+        try
+        {
+            settings.SystemRunSandboxEnabled = false;
+            SandboxEnabledToggle.IsOn = false;
+        }
+        finally
+        {
+            _suppress = false;
+        }
+
+        Save();
+        return true;
+    }
+
     private void OnUnavailableActionClick(object sender, RoutedEventArgs e) =>
         AsyncEventHandlerGuard.Run(
             () => OnUnavailableActionClickAsync(sender),
@@ -248,6 +384,17 @@ private async Task OnUnavailableActionClickAsync(object sender)
     {
         if (sender is not Button btn) return;
         var tag = btn.Tag as string;
+
+        // Transient probe error → clear the cached verdict and re-probe off-thread.
+        if (tag == "retry")
+        {
+            _cachedAvailability = null;
+            UpdateSandboxStatusCard();
+            UpdateControlsEnabledState();
+            await RefreshAvailabilityAsync();
+            return;
+        }
+
         try
         {
             var uri = tag switch
@@ -274,8 +421,9 @@ private async Task OnUnavailableActionClickAsync(object sender)
     /// </summary>
     private void UpdateControlsEnabledState()
     {
-        var availability = GetAvailability();
-        var available = availability.HasAnyBackend;
+        // Null availability = still probing; treat as not-yet-active so the
+        // controls stay dimmed until the background probe resolves.
+        var available = _cachedAvailability?.HasAnyBackend ?? false;
         var sandboxOn = SandboxEnabledToggle.IsOn;
         var active = available && sandboxOn;
 
@@ -456,6 +604,7 @@ private void Save()
     {
         if (_suppress) return;
         CurrentApp.Settings?.Save();
+        ((IAppCommands)CurrentApp).NotifySettingsSaved();
         UpdatePresetHighlight();
     }
 
@@ -481,6 +630,15 @@ private async Task OnSandboxEnabledToggledAsync()
         var newValue = SandboxEnabledToggle.IsOn;
         var oldValue = s.SystemRunSandboxEnabled;
 
+        if (newValue
+            && !oldValue
+            && IsSandboxDefinitivelyUnavailable()
+            && !s.SystemRunBlockHostFallbackWhenMxcUnavailable)
+        {
+            await RejectSandboxEnableWhenUnavailableAsync();
+            return;
+        }
+
         // Confirm before turning sandbox OFF — this is the high-risk transition.
         if (!newValue && oldValue)
         {
@@ -537,6 +695,48 @@ private async Task OnSandboxEnabledToggledAsync()
         Save();
     }
 
+    private async Task RejectSandboxEnableWhenUnavailableAsync()
+    {
+        _suppress = true;
+        try { SandboxEnabledToggle.IsOn = false; }
+        finally { _suppress = false; }
+
+        UpdateSandboxStatusCard();
+        UpdateControlsEnabledState();
+
+        if (_dialogOpen)
+            return;
+
+        var reasonText = _cachedAvailability?.UnsupportedReasons.Count > 0
+            ? string.Join("\n", _cachedAvailability.UnsupportedReasons)
+            : L("SandboxPage_UnavailableDefaultReason");
+        var dialog = new ContentDialog
+        {
+            Title = "Node Sandbox unavailable",
+            Content =
+                "Node Sandbox can't be turned on because this PC does not currently have a usable MXC backend.\n\n" +
+                $"{reasonText}\n\n" +
+                "Agent-started commands will keep using the host execution path until MXC is available.",
+            CloseButtonText = "OK",
+            DefaultButton = ContentDialogButton.Close,
+            XamlRoot = this.XamlRoot,
+        };
+
+        _dialogOpen = true;
+        try
+        {
+            await dialog.ShowAsync();
+        }
+        catch (System.Runtime.InteropServices.COMException)
+        {
+            // Another dialog is already open. The toggle has already been restored.
+        }
+        finally
+        {
+            _dialogOpen = false;
+        }
+    }
+
     private void OnNetInternetToggled(object sender, RoutedEventArgs e)
     {
         if (_suppress) return;
diff --git a/src/OpenClaw.Tray.WinUI/Pages/SessionsPage.xaml b/src/OpenClaw.Tray.WinUI/Pages/SessionsPage.xaml
index 628e317c8..c59b955bd 100644
--- a/src/OpenClaw.Tray.WinUI/Pages/SessionsPage.xaml
+++ b/src/OpenClaw.Tray.WinUI/Pages/SessionsPage.xaml
@@ -12,6 +12,7 @@
 
             <TextBlock x:Uid="SessionsPage_Sessions"
                            Text="Sessions"
+                           AutomationProperties.AutomationId="SessionsPageMarker"
                            Style="{StaticResource TitleTextBlockStyle}"
                            Margin="0,0,0,2"/>
                 <TextBlock x:Uid="SessionsPage_Subtitle" Text="Conversations this gateway is currently handling, grouped by channel."
@@ -23,6 +24,7 @@
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"/>
                         <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="Auto"/>
                     </Grid.ColumnDefinitions>
 
                     <SelectorBar x:Name="ChannelSelector" Grid.Column="0"
@@ -31,7 +33,14 @@
                         <SelectorBarItem x:Uid="SessionsPage_All" x:Name="AllTab" Text="All" IsSelected="True"/>
                     </SelectorBar>
 
-                    <Button x:Name="RefreshButton" Grid.Column="1"
+                    <ToggleSwitch x:Uid="SessionsPage_ShowCompleted" x:Name="ShowCompletedToggle" Grid.Column="1"
+                                  Header="Show completed"
+                                  MinWidth="0"
+                                  OnContent="" OffContent=""
+                                  Toggled="OnShowCompletedToggled"
+                                  AutomationProperties.AutomationId="SessionsPageShowCompleted"/>
+
+                    <Button x:Name="RefreshButton" Grid.Column="2"
                             Click="OnRefresh"
                             ToolTipService.ToolTip="Refresh sessions"
                             AutomationProperties.Name="Refresh sessions">
@@ -203,11 +212,34 @@
                                                                           IsTextScaleFactorEnabled="False"/>
                                                             </MenuFlyoutItem.Icon>
                                                         </MenuFlyoutItem>
+                                                        <MenuFlyoutItem x:Uid="SessionsPage_Checkpoints"
+                                                                        Text="Checkpoints"
+                                                                        Tag="{Binding Key}"
+                                                                        Click="OnShowCheckpoints"
+                                                                        ToolTipService.ToolTip="View, branch or restore compaction checkpoints">
+                                                            <MenuFlyoutItem.Icon>
+                                                                <FontIcon Glyph="&#xE81C;"
+                                                                          FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                                                          IsTextScaleFactorEnabled="False"/>
+                                                            </MenuFlyoutItem.Icon>
+                                                        </MenuFlyoutItem>
+                                                        <MenuFlyoutItem x:Uid="SessionsPage_ExportTranscript"
+                                                                        Text="Export transcript"
+                                                                        Tag="{Binding Key}"
+                                                                        Click="OnExportSession"
+                                                                        ToolTipService.ToolTip="Save the conversation transcript to a text file">
+                                                            <MenuFlyoutItem.Icon>
+                                                                <FontIcon Glyph="&#xEDE1;"
+                                                                          FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                                                          IsTextScaleFactorEnabled="False"/>
+                                                            </MenuFlyoutItem.Icon>
+                                                        </MenuFlyoutItem>
                                                         <MenuFlyoutSeparator/>
                                                         <MenuFlyoutItem x:Uid="SessionsPage_Delete"
                                                                         Text="Delete"
                                                                         Tag="{Binding Key}"
                                                                         Click="OnDeleteSession"
+                                                                        IsEnabled="{Binding CanDelete}"
                                                                         Foreground="{ThemeResource SystemFillColorCriticalBrush}">
                                                             <MenuFlyoutItem.Icon>
                                                                 <FontIcon Glyph="&#xE74D;"
diff --git a/src/OpenClaw.Tray.WinUI/Pages/SessionsPage.xaml.cs b/src/OpenClaw.Tray.WinUI/Pages/SessionsPage.xaml.cs
index a52299be0..8177d91bc 100644
--- a/src/OpenClaw.Tray.WinUI/Pages/SessionsPage.xaml.cs
+++ b/src/OpenClaw.Tray.WinUI/Pages/SessionsPage.xaml.cs
@@ -3,6 +3,7 @@
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media;
 using OpenClaw.Shared;
+using OpenClaw.Shared.Sessions;
 using OpenClawTray.Helpers;
 using OpenClawTray.Services;
 using OpenClawTray.Windows;
@@ -10,6 +11,8 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
+using Windows.Storage;
+using Windows.Storage.Pickers;
 
 namespace OpenClawTray.Pages;
 
@@ -21,14 +24,24 @@ public sealed partial class SessionsPage : Page
     private string _activeChannel = "all";
     private Microsoft.UI.Dispatching.DispatcherQueueTimer? _refreshTimer;
     private readonly AsyncListLoadingState _sessionLoading = new();
+    private IOperatorGatewayClient? _subscribedClient;
+    private bool _unloaded;
+    private bool _syncingShowCompletedToggle;
 
     public SessionsPage()
     {
         InitializeComponent();
+        Loaded += (_, _) => _unloaded = false;
         Unloaded += (_, _) =>
         {
+            _unloaded = true;
             _refreshTimer?.Stop(); _refreshTimer = null;
             if (_appState != null) _appState.PropertyChanged -= OnAppStateChanged;
+            if (_subscribedClient != null)
+            {
+                _subscribedClient.SessionCommandCompleted -= OnSessionCommandCompleted;
+                _subscribedClient = null;
+            }
         };
     }
 
@@ -38,8 +51,21 @@ public void Initialize()
         if (_appState != null) _appState.PropertyChanged -= OnAppStateChanged;
         _appState = CurrentApp.AppState!;
         _appState.PropertyChanged += OnAppStateChanged;
+        SyncShowCompletedToggle();
 
         var client = CurrentApp.GatewayClient;
+
+        // Rebind when the client instance changes so a cached page never holds
+        // a stale command-result subscription.
+        if (_subscribedClient != client)
+        {
+            if (_subscribedClient != null)
+                _subscribedClient.SessionCommandCompleted -= OnSessionCommandCompleted;
+            _subscribedClient = client;
+            if (_subscribedClient != null)
+                _subscribedClient.SessionCommandCompleted += OnSessionCommandCompleted;
+        }
+
         if (client == null)
         {
             _sessionLoading.Fail();
@@ -95,21 +121,31 @@ private void RebuildChannelTabs()
     {
         if (_allSessions == null) return;
 
-        var channels = _allSessions
+        var requestedChannel = _activeChannel;
+        var visibleSessions = SessionVisibilityFilter.VisibleSessions(_allSessions, ShowCompletedSessions);
+        var channels = visibleSessions
             .Where(s => !string.IsNullOrWhiteSpace(s.Channel))
             .Select(s => s.Channel!)
             .Distinct(StringComparer.OrdinalIgnoreCase)
             .OrderBy(c => c)
             .ToList();
+        var activeChannel = SessionVisibilityFilter.ResolveActiveChannel(requestedChannel, channels);
 
         // Keep "All" tab, clear dynamic tabs
         while (ChannelSelector.Items.Count > 1)
             ChannelSelector.Items.RemoveAt(ChannelSelector.Items.Count - 1);
 
+        SelectorBarItem selectedItem = AllTab;
         foreach (var ch in channels)
         {
-            ChannelSelector.Items.Add(new SelectorBarItem { Text = ch });
+            var item = new SelectorBarItem { Text = ch };
+            ChannelSelector.Items.Add(item);
+            if (string.Equals(ch, activeChannel, StringComparison.OrdinalIgnoreCase))
+                selectedItem = item;
         }
+
+        _activeChannel = activeChannel;
+        selectedItem.IsSelected = true;
     }
 
     private void ApplyFilter()
@@ -126,6 +162,7 @@ private void ApplyFilter()
         }
 
         IEnumerable<SessionInfo> filtered = _allSessions ?? Array.Empty<SessionInfo>();
+        filtered = SessionVisibilityFilter.VisibleSessions(filtered, ShowCompletedSessions);
 
         if (_activeChannel != "all")
         {
@@ -156,6 +193,35 @@ private void ApplyFilter()
         ChannelSelector.IsEnabled = _sessionLoading.HasLoaded && _sessionLoading.CanEdit;
     }
 
+    private bool ShowCompletedSessions => CurrentApp.Settings?.ShowCompletedSessions ?? false;
+
+    private void SyncShowCompletedToggle()
+    {
+        _syncingShowCompletedToggle = true;
+        try
+        {
+            ShowCompletedToggle.IsOn = ShowCompletedSessions;
+        }
+        finally
+        {
+            _syncingShowCompletedToggle = false;
+        }
+    }
+
+    private void OnShowCompletedToggled(object sender, RoutedEventArgs e)
+    {
+        if (_syncingShowCompletedToggle)
+            return;
+
+        if (CurrentApp.Settings is { } settings)
+        {
+            settings.ShowCompletedSessions = ShowCompletedToggle.IsOn;
+            settings.Save();
+        }
+        RebuildChannelTabs();
+        ApplyFilter();
+    }
+
     private void OnAppStateChanged(object? sender, PropertyChangedEventArgs e)
     {
         switch (e.PropertyName)
@@ -183,6 +249,13 @@ private SessionViewModel ToViewModel(SessionInfo s)
         if (s.ContextTokens > 0 && s.TotalTokens > 0)
             contextPercent = Math.Min(100.0, (double)s.TotalTokens / s.ContextTokens * 100.0);
 
+        var mainState = SessionActionPlanner.ResolveMainState(
+            s.Key,
+            rowIsMain: s.IsMain,
+            mainSessionKey: CurrentApp.GatewayClient?.MainSessionKey,
+            sessions: _appState?.Sessions);
+        var isMain = mainState == SessionMainState.Main;
+
         return new SessionViewModel
         {
             Key = s.Key,
@@ -195,6 +268,8 @@ private SessionViewModel ToViewModel(SessionInfo s)
             ContextPercent = contextPercent,
             HasTokenData = hasTokens || contextPercent > 0,
             CanEdit = _sessionLoading.CanEdit,
+            IsMain = isMain,
+            CanDelete = _sessionLoading.CanEdit && SessionActionPlanner.IsAllowed(SessionActionKind.Delete, mainState, out _),
         };
     }
 
@@ -271,49 +346,478 @@ private void ChannelSelector_SelectionChanged(SelectorBar sender, SelectorBarSel
         return null;
     }
 
+    private static SessionViewModel? ResolveSessionVm(object sender)
+    {
+        if (sender is FrameworkElement fe)
+        {
+            if (fe.DataContext is SessionViewModel vm && !string.IsNullOrEmpty(vm.Key))
+                return vm;
+            if (fe is MenuFlyoutItem mfi && mfi.Parent is MenuFlyout mf
+                && mf.Target is FrameworkElement target
+                && target.DataContext is SessionViewModel targetVm
+                && !string.IsNullOrEmpty(targetVm.Key))
+                return targetVm;
+        }
+        return null;
+    }
+
     private void OnResetSession(object sender, RoutedEventArgs e) =>
         AsyncEventHandlerGuard.Run(
-            () => OnResetSessionAsync(sender),
+            () => RunSessionActionAsync(sender, SessionActionKind.Reset),
             new OpenClawTray.AppLogger(),
             nameof(OnResetSession));
 
-    private async Task OnResetSessionAsync(object sender)
+    private void OnDeleteSession(object sender, RoutedEventArgs e) =>
+        AsyncEventHandlerGuard.Run(
+            () => RunSessionActionAsync(sender, SessionActionKind.Delete),
+            new OpenClawTray.AppLogger(),
+            nameof(OnDeleteSession));
+
+    private void OnCompactSession(object sender, RoutedEventArgs e) =>
+        AsyncEventHandlerGuard.Run(
+            () => RunSessionActionAsync(sender, SessionActionKind.Compact),
+            new OpenClawTray.AppLogger(),
+            nameof(OnCompactSession));
+
+    private async Task RunSessionActionAsync(object sender, SessionActionKind kind)
     {
-        if (ResolveSessionKey(sender) is not string key) return;
+        var vm = ResolveSessionVm(sender);
+        var key = vm?.Key ?? ResolveSessionKey(sender);
+        if (string.IsNullOrEmpty(key)) return;
+
         var client = CurrentApp.GatewayClient;
         if (client == null) { ShowDisconnected(); return; }
-        try { await client.ResetSessionAsync(key); }
-        catch (Exception ex) { ShowActionFailure("Reset failed", ex); }
+
+        var isMainState = ResolveMainState(key, vm);
+        var isMain = isMainState == SessionMainState.Main;
+        var displayName = vm?.DisplayName;
+
+        if (!SessionActionPlanner.IsAllowed(kind, isMainState, out var blockedReason))
+        {
+            ShowActionInfo("Action unavailable", blockedReason ?? "This action isn't available.", InfoBarSeverity.Informational);
+            return;
+        }
+
+        var prompt = SessionActionPlanner.BuildPrompt(kind, key, displayName, isMain);
+        if (prompt is not null && !await ConfirmAsync(prompt))
+            return;
+
+        try
+        {
+            if (kind == SessionActionKind.Delete)
+            {
+                var latestState = ResolveMainState(key, vm);
+                if (!SessionActionPlanner.IsAllowed(kind, latestState, out blockedReason))
+                {
+                    ShowActionInfo("Action unavailable", blockedReason ?? "Delete isn't available for this session.", InfoBarSeverity.Informational);
+                    return;
+                }
+            }
+
+            var sent = kind switch
+            {
+                SessionActionKind.Reset => await client.ResetSessionAsync(key),
+                SessionActionKind.Compact => await client.CompactSessionAsync(key),
+                SessionActionKind.Delete => await client.DeleteSessionAsync(key),
+                _ => true,
+            };
+            if (!sent)
+                ShowActionInfo($"{kind} failed", "The gateway didn't accept the request. Try again.", InfoBarSeverity.Error);
+        }
+        catch (Exception ex)
+        {
+            ShowActionFailure($"{kind} failed", ex);
+        }
     }
 
-    private void OnDeleteSession(object sender, RoutedEventArgs e) =>
+    private SessionMainState ResolveMainState(string key, SessionViewModel? vm)
+        => SessionActionPlanner.ResolveMainState(
+            key,
+            rowIsMain: vm?.IsMain,
+            mainSessionKey: CurrentApp.GatewayClient?.MainSessionKey,
+            sessions: _appState?.Sessions);
+
+    private void OnExportSession(object sender, RoutedEventArgs e) =>
         AsyncEventHandlerGuard.Run(
-            () => OnDeleteSessionAsync(sender),
+            () => OnExportSessionAsync(sender),
             new OpenClawTray.AppLogger(),
-            nameof(OnDeleteSession));
+            nameof(OnExportSession));
 
-    private async Task OnDeleteSessionAsync(object sender)
+    private async Task OnExportSessionAsync(object sender)
     {
-        if (ResolveSessionKey(sender) is not string key) return;
+        var vm = ResolveSessionVm(sender);
+        var key = vm?.Key ?? ResolveSessionKey(sender);
+        if (string.IsNullOrEmpty(key)) return;
+
         var client = CurrentApp.GatewayClient;
         if (client == null) { ShowDisconnected(); return; }
-        try { await client.DeleteSessionAsync(key); }
-        catch (Exception ex) { ShowActionFailure("Delete failed", ex); }
+
+        var hwnd = ResolveHostHwnd();
+        if (hwnd == IntPtr.Zero)
+        {
+            ShowActionInfo("Export unavailable", "Open the app window before exporting a transcript.", InfoBarSeverity.Informational);
+            return;
+        }
+
+        ChatHistoryInfo history;
+        try
+        {
+            history = await client.RequestChatHistoryAsync(key);
+        }
+        catch (NotSupportedException)
+        {
+            ShowActionInfo("Not supported", "This gateway doesn't support exporting a transcript. Update the gateway to use this.", InfoBarSeverity.Informational);
+            return;
+        }
+        catch (InvalidOperationException ex) when (ex.Message.Contains("unknown method", StringComparison.OrdinalIgnoreCase))
+        {
+            ShowActionInfo("Not supported", "This gateway doesn't support exporting a transcript. Update the gateway to use this.", InfoBarSeverity.Informational);
+            return;
+        }
+        catch (Exception ex)
+        {
+            ShowActionFailure("Export failed", ex);
+            return;
+        }
+
+        if (history.Messages.Count == 0)
+        {
+            ShowActionInfo("Nothing to export", "This session has no transcript yet.", InfoBarSeverity.Informational);
+            return;
+        }
+
+        try
+        {
+            var picker = new FileSavePicker
+            {
+                SuggestedStartLocation = PickerLocationId.Desktop,
+                SuggestedFileName = System.IO.Path.GetFileNameWithoutExtension(
+                    SessionTranscriptFormatter.SuggestFileName(key)),
+            };
+            picker.FileTypeChoices.Add("Text file", new List<string> { ".txt" });
+            WinRT.Interop.InitializeWithWindow.Initialize(picker, hwnd);
+
+            var file = await picker.PickSaveFileAsync();
+            if (file == null) return; // user cancelled
+
+            await FileIO.WriteTextAsync(file, SessionTranscriptFormatter.Format(history));
+            ShowActionInfo("Transcript exported", $"Saved {history.Messages.Count} messages to {file.Name}.", InfoBarSeverity.Success);
+        }
+        catch (Exception ex)
+        {
+            ShowActionFailure("Export failed", ex);
+        }
     }
 
-    private void OnCompactSession(object sender, RoutedEventArgs e) =>
+    private void OnShowCheckpoints(object sender, RoutedEventArgs e) =>
         AsyncEventHandlerGuard.Run(
-            () => OnCompactSessionAsync(sender),
+            () => OnShowCheckpointsAsync(sender),
             new OpenClawTray.AppLogger(),
-            nameof(OnCompactSession));
+            nameof(OnShowCheckpoints));
 
-    private async Task OnCompactSessionAsync(object sender)
+    private async Task OnShowCheckpointsAsync(object sender)
     {
-        if (ResolveSessionKey(sender) is not string key) return;
+        var vm = ResolveSessionVm(sender);
+        var key = vm?.Key ?? ResolveSessionKey(sender);
+        if (string.IsNullOrEmpty(key)) return;
+        if (XamlRoot == null) return;
+
         var client = CurrentApp.GatewayClient;
         if (client == null) { ShowDisconnected(); return; }
-        try { await client.CompactSessionAsync(key); }
-        catch (Exception ex) { ShowActionFailure("Compact failed", ex); }
+
+        var name = SessionActionPlanner.Describe(key, vm?.DisplayName);
+        var isMainState = ResolveMainState(key, vm);
+        var isMain = isMainState == SessionMainState.Main;
+
+        SessionCompactionCheckpointList list;
+        try
+        {
+            list = await client.ListCompactionCheckpointsAsync(key);
+        }
+        catch (Exception ex)
+        {
+            ShowActionFailure("Couldn't load checkpoints", ex);
+            return;
+        }
+
+        if (!list.IsSupported)
+        {
+            ShowActionInfo("Not supported", "This gateway doesn't support session compaction checkpoints. Update the gateway to use this.", InfoBarSeverity.Informational);
+            return;
+        }
+
+        if (_unloaded || XamlRoot == null)
+            return;
+
+        var checkpoints = list.Checkpoints
+            .OrderByDescending(c => c.CreatedAt ?? DateTime.MinValue)
+            .ToList();
+
+        var branchTarget = checkpoints.FirstOrDefault(c => !string.IsNullOrWhiteSpace(c.Id));
+        var restoreTarget = SessionCheckpointSelection.ResolveUnambiguousLatest(checkpoints);
+        var canRestore = restoreTarget is not null
+            && SessionActionPlanner.IsAllowed(SessionActionKind.Restore, isMainState, out _);
+        var actionHint = BuildCheckpointActionHint(checkpoints.Count, branchTarget, restoreTarget, canRestore, isMainState);
+
+        var body = new StackPanel { Spacing = 12 };
+
+        if (checkpoints.Count == 0)
+        {
+            body.Children.Add(new TextBlock
+            {
+                Text = "No compaction checkpoints yet. Compacting this session creates one you can branch from or restore to.",
+                TextWrapping = TextWrapping.Wrap,
+            });
+        }
+        else
+        {
+            body.Children.Add(new TextBlock
+            {
+                Text = $"{checkpoints.Count} checkpoint{(checkpoints.Count == 1 ? "" : "s")} \u00B7 newest first",
+                Style = (Style)Application.Current.Resources["CaptionTextBlockStyle"],
+            });
+
+            var listPanel = new StackPanel { Spacing = 4 };
+            foreach (var cp in checkpoints)
+            {
+                listPanel.Children.Add(new TextBlock
+                {
+                    Text = "\u2022 " + DescribeCheckpoint(cp),
+                    TextWrapping = TextWrapping.Wrap,
+                });
+            }
+            body.Children.Add(listPanel);
+
+            body.Children.Add(new TextBlock
+            {
+                Text = actionHint,
+                Style = (Style)Application.Current.Resources["CaptionTextBlockStyle"],
+                Foreground = (Brush)Application.Current.Resources["TextFillColorSecondaryBrush"],
+                TextWrapping = TextWrapping.Wrap,
+            });
+        }
+
+        var dialog = new ContentDialog
+        {
+            Title = $"Checkpoints \u2014 {name}",
+            Content = body,
+            PrimaryButtonText = branchTarget is not null
+                ? (restoreTarget is not null ? "Branch from latest" : "Branch from latest targetable")
+                : "",
+            SecondaryButtonText = canRestore ? "Restore latest" : "",
+            CloseButtonText = "Close",
+            DefaultButton = ContentDialogButton.Close,
+            XamlRoot = XamlRoot,
+        };
+
+        var result = await dialog.ShowAsync();
+        if (result == ContentDialogResult.Primary && branchTarget is not null)
+            await BranchCheckpointAsync(key, branchTarget.Id);
+        else if (result == ContentDialogResult.Secondary && restoreTarget is not null)
+            await RestoreCheckpointAsync(key, name, isMain, restoreTarget.Id);
+    }
+
+    private static string DescribeCheckpoint(SessionCompactionCheckpoint cp)
+    {
+        var parts = new List<string>(3);
+        if (cp.CreatedAt is { } ts) parts.Add(ts.ToLocalTime().ToString("g"));
+        if (!string.IsNullOrWhiteSpace(cp.Reason)) parts.Add(cp.Reason!);
+        if (cp.TokensBefore is { } tb && cp.TokensAfter is { } ta) parts.Add($"{tb:n0}\u2192{ta:n0} tokens");
+
+        var head = parts.Count > 0
+            ? string.Join(" \u00B7 ", parts)
+            : (string.IsNullOrEmpty(cp.Id) ? "checkpoint" : cp.Id);
+
+        if (!string.IsNullOrWhiteSpace(cp.Summary))
+            head += $" \u2014 {cp.Summary}";
+        return head;
+    }
+
+    private static string BuildCheckpointActionHint(
+        int checkpointCount,
+        SessionCompactionCheckpoint? branchTarget,
+        SessionCompactionCheckpoint? restoreTarget,
+        bool canRestore,
+        SessionMainState mainState)
+    {
+        if (checkpointCount <= 0)
+            return "";
+
+        if (canRestore)
+        {
+            return "Actions apply to the most recent checkpoint (top of the list). " +
+                   "Branch starts a new session from it; Restore rolls this session back to it.";
+        }
+
+        var reason = mainState == SessionMainState.Main
+            ? "Restore is unavailable for the main session."
+            : restoreTarget is null
+                ? "Restore is unavailable because the latest checkpoint can't be determined safely."
+                : "Restore is unavailable for this session.";
+
+        var branchText = branchTarget is null
+            ? "Branch is unavailable because no checkpoint has a checkpoint id."
+            : "Branch starts a new session from the latest targetable checkpoint.";
+        return branchText + " " + reason;
+    }
+
+    private async Task BranchCheckpointAsync(string key, string checkpointId)
+    {
+        if (string.IsNullOrWhiteSpace(checkpointId))
+        {
+            ShowActionInfo("Action unavailable", "This checkpoint can't be branched because it has no checkpoint id.", InfoBarSeverity.Informational);
+            return;
+        }
+
+        var client = CurrentApp.GatewayClient;
+        if (client == null) { ShowDisconnected(); return; }
+
+        SessionCompactionMutationResult result;
+        try
+        {
+            result = await client.BranchCompactionCheckpointAsync(key, checkpointId);
+        }
+        catch (Exception ex)
+        {
+            ShowActionFailure("Branch failed", ex);
+            return;
+        }
+
+        if (!result.IsSupported)
+            ShowActionInfo("Not supported", "This gateway doesn't support branching from a checkpoint. Update the gateway to use this.", InfoBarSeverity.Informational);
+        else if (result.Ok)
+        {
+            ShowActionInfo("Branched", result.ResultSessionKey is { Length: > 0 } nk ? $"Created session {nk}." : "Created a new session from the checkpoint.", InfoBarSeverity.Success);
+            _ = client.RequestSessionsAsync();
+        }
+        else
+            ShowActionInfo("Branch failed", result.Error ?? "Could not branch from the checkpoint.", InfoBarSeverity.Error);
+    }
+
+    private async Task RestoreCheckpointAsync(string key, string name, bool isMain, string checkpointId)
+    {
+        var mainState = ResolveMainState(key, null);
+        if (isMain && mainState == SessionMainState.NotMain)
+            mainState = SessionMainState.Main;
+
+        if (!SessionActionPlanner.IsAllowed(SessionActionKind.Restore, mainState, out var blockedReason))
+        {
+            ShowActionInfo("Action unavailable", blockedReason ?? "Restore isn't available for this session.", InfoBarSeverity.Informational);
+            return;
+        }
+
+        var prompt = SessionActionPlanner.BuildPrompt(SessionActionKind.Restore, key, name, mainState == SessionMainState.Main);
+        if (prompt is not null && !await ConfirmAsync(prompt))
+            return;
+
+        var client = CurrentApp.GatewayClient;
+        if (client == null) { ShowDisconnected(); return; }
+
+        mainState = ResolveMainState(key, null);
+        if (isMain && mainState == SessionMainState.NotMain)
+            mainState = SessionMainState.Main;
+        if (!SessionActionPlanner.IsAllowed(SessionActionKind.Restore, mainState, out blockedReason))
+        {
+            ShowActionInfo("Action unavailable", blockedReason ?? "Restore isn't available for this session.", InfoBarSeverity.Informational);
+            return;
+        }
+
+        // Re-check before restore so a concurrent compaction cannot make the
+        // confirmed "latest" checkpoint stale.
+        try
+        {
+            var fresh = await client.ListCompactionCheckpointsAsync(key);
+            if (!fresh.IsSupported)
+            {
+                ShowActionInfo("Not supported", "This gateway doesn't support restoring a checkpoint. Update the gateway to use this.", InfoBarSeverity.Informational);
+                return;
+            }
+
+            var freshLatest = SessionCheckpointSelection.ResolveUnambiguousLatest(fresh.Checkpoints);
+            if (freshLatest is null || !string.Equals(freshLatest.Id, checkpointId, StringComparison.Ordinal))
+            {
+                ShowActionInfo("Checkpoints changed", "The latest checkpoint changed since you opened this. Reopen Checkpoints and try again.", InfoBarSeverity.Warning);
+                return;
+            }
+        }
+        catch (Exception ex)
+        {
+            ShowActionFailure("Restore failed", ex);
+            return;
+        }
+
+        SessionCompactionMutationResult result;
+        try
+        {
+            result = await client.RestoreCompactionCheckpointAsync(key, checkpointId);
+        }
+        catch (Exception ex)
+        {
+            ShowActionFailure("Restore failed", ex);
+            return;
+        }
+
+        if (!result.IsSupported)
+            ShowActionInfo("Not supported", "This gateway doesn't support restoring a checkpoint. Update the gateway to use this.", InfoBarSeverity.Informational);
+        else if (result.Ok)
+        {
+            ShowActionInfo("Restored", "Rolled the session back to the checkpoint.", InfoBarSeverity.Success);
+            _ = client.RequestSessionsAsync();
+        }
+        else
+            ShowActionInfo("Restore failed", result.Error ?? "Could not restore the checkpoint.", InfoBarSeverity.Error);
+    }
+
+    private async Task<bool> ConfirmAsync(SessionActionPrompt prompt)
+    {
+        if (XamlRoot == null) return false;
+        var localizedPrompt = SessionActionPromptLocalizer.Localize(prompt);
+        var dialog = new ContentDialog
+        {
+            Title = localizedPrompt.Title,
+            Content = localizedPrompt.Body,
+            PrimaryButtonText = localizedPrompt.ConfirmLabel,
+            CloseButtonText = LocalizationHelper.GetString("SessionActionPrompt_CancelLabel"),
+            DefaultButton = ContentDialogButton.None,
+            XamlRoot = XamlRoot,
+        };
+        if (localizedPrompt.IsDestructive)
+            dialog.PrimaryButtonStyle = (Style)Application.Current.Resources["AccentButtonStyle"];
+        return await dialog.ShowAsync() == ContentDialogResult.Primary;
+    }
+
+    private IntPtr ResolveHostHwnd()
+    {
+        var window = CurrentApp.ActiveHubWindow;
+        if (window == null) return IntPtr.Zero;
+        try { return WinRT.Interop.WindowNative.GetWindowHandle(window); }
+        catch { return IntPtr.Zero; }
+    }
+
+    private void OnSessionCommandCompleted(object? sender, SessionCommandResult result)
+    {
+        DispatcherQueue.TryEnqueue(() =>
+        {
+            if (_unloaded) return;
+
+            if (string.Equals(result.Method, "sessions.compact", StringComparison.Ordinal) && result.Ok)
+            {
+                if (result.Compacted == true)
+                {
+                    var kept = result.Kept.HasValue ? $" Kept {result.Kept.Value} lines." : "";
+                    ShowActionInfo("Checkpoint created", $"Compacted {result.Key ?? "session"}.{kept} View it from the session's Checkpoints menu.", InfoBarSeverity.Success);
+                }
+                else if (result.Compacted == false)
+                {
+                    ShowActionInfo("Nothing to compact", $"{result.Key ?? "Session"} was already compact; no checkpoint was created.", InfoBarSeverity.Informational);
+                }
+                else
+                {
+                    ShowActionInfo("Session compacted", $"Compacted {result.Key ?? "session"}. Refresh Checkpoints to see any new entries.", InfoBarSeverity.Success);
+                }
+            }
+            ApplyFilter();
+        });
     }
 
     private void OnRefresh(object sender, RoutedEventArgs e)
@@ -367,6 +871,14 @@ private void ShowActionFailure(string title, Exception ex)
         ConnectionInfoBar.Severity = InfoBarSeverity.Error;
         ConnectionInfoBar.IsOpen = true;
     }
+
+    private void ShowActionInfo(string title, string message, InfoBarSeverity severity)
+    {
+        ConnectionInfoBar.Title = title;
+        ConnectionInfoBar.Message = message;
+        ConnectionInfoBar.Severity = severity;
+        ConnectionInfoBar.IsOpen = true;
+    }
 }
 
 public class SessionViewModel
@@ -381,5 +893,7 @@ public class SessionViewModel
     public double ContextPercent { get; set; }
     public bool HasTokenData { get; set; }
     public bool CanEdit { get; set; } = true;
+    public bool IsMain { get; set; }
+    public bool CanDelete { get; set; } = true;
     public Visibility TokenRowVisibility => HasTokenData ? Visibility.Visible : Visibility.Collapsed;
 }
diff --git a/src/OpenClaw.Tray.WinUI/Pages/SettingsPage.xaml b/src/OpenClaw.Tray.WinUI/Pages/SettingsPage.xaml
index adb3aca7a..8e717b8b0 100644
--- a/src/OpenClaw.Tray.WinUI/Pages/SettingsPage.xaml
+++ b/src/OpenClaw.Tray.WinUI/Pages/SettingsPage.xaml
@@ -2,7 +2,9 @@
 <Page
     x:Class="OpenClawTray.Pages.SettingsPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:toolkit="using:CommunityToolkit.WinUI.Controls"
+    xmlns:helpers="using:OpenClawTray.Helpers">
 
     <Page.Resources>
         <Thickness x:Key="SettingsRowPadding">16,14,16,14</Thickness>
@@ -25,6 +27,7 @@
 
                 <!-- Page header -->
                 <TextBlock x:Uid="SettingsPage_Settings" Text="Settings"
+                           AutomationProperties.AutomationId="SettingsPageMarker"
                            Style="{StaticResource TitleTextBlockStyle}"
                            Margin="0,0,0,8"/>
 
@@ -54,6 +57,32 @@
                     </Grid>
                 </Border>
 
+                <Border Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                        BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                        BorderThickness="1" CornerRadius="8" Padding="{StaticResource SettingsRowPadding}">
+                    <Grid ColumnSpacing="16">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
+                        <StackPanel Grid.Column="0" VerticalAlignment="Center" Spacing="2">
+                            <TextBlock x:Uid="SettingsRow_AppTheme_Header" Text="App theme" Style="{StaticResource BodyTextBlockStyle}"/>
+                            <TextBlock x:Uid="SettingsRow_AppTheme_Description"
+                                       Text="Choose light, dark, or use your Windows setting."
+                                       Style="{StaticResource CaptionTextBlockStyle}"
+                                       Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                       TextWrapping="Wrap"/>
+                        </StackPanel>
+                        <ComboBox Grid.Column="1" x:Name="AppThemeComboBox" MinWidth="160"
+                                  AutomationProperties.AutomationId="SettingsPageAppTheme"
+                                  AutomationProperties.Name="App theme">
+                            <ComboBoxItem x:Uid="SettingsPage_AppTheme_System" Content="System" Tag="System"/>
+                            <ComboBoxItem x:Uid="SettingsPage_AppTheme_Light" Content="Light" Tag="Light"/>
+                            <ComboBoxItem x:Uid="SettingsPage_AppTheme_Dark" Content="Dark" Tag="Dark"/>
+                        </ComboBox>
+                    </Grid>
+                </Border>
+
                 <Border Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
                         BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
                         BorderThickness="1" CornerRadius="8" Padding="{StaticResource SettingsRowPadding}">
@@ -140,7 +169,8 @@
                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
                                        TextWrapping="Wrap"/>
                         </StackPanel>
-                        <ComboBox Grid.Column="1" x:Name="NotificationSoundComboBox" MinWidth="140"
+                        <ComboBox Grid.Column="1" x:Uid="SettingsPage_NotificationSoundComboBox"
+                                  x:Name="NotificationSoundComboBox" MinWidth="140"
                                   AutomationProperties.AutomationId="SettingsPageSound">
                             <ComboBoxItem x:Uid="SettingsPage_ComboBoxItem_48" Content="Default" Tag="Default"/>
                             <ComboBoxItem x:Uid="SettingsPage_ComboBoxItem_49" Content="None" Tag="None"/>
@@ -270,8 +300,8 @@
                            <TextBlock x:Uid="SettingsPage_LocalGatewaySetup_Header"
                                       Text="Set up or reconfigure Local Gateway"
                                       Style="{StaticResource BodyTextBlockStyle}"/>
-                           <TextBlock x:Uid="SettingsPage_LocalGatewaySetup_Description"
-                                      Text="Launches setup to install an app-owned OpenClawGateway WSL distro or re-run provider and model setup for an existing one. Existing local gateways are only replaced after confirmation."
+                           <TextBlock x:Uid="SettingsPage_LocalGatewaySetup_Description" x:Name="LocalGatewaySetupDescriptionText"
+                                      Text="Launches setup to install an app-owned WSL distro or re-run provider and model setup for an existing one. Existing local gateways are only replaced after confirmation."
                                       Style="{StaticResource CaptionTextBlockStyle}"
                                       Foreground="{ThemeResource TextFillColorSecondaryBrush}"
                                       TextWrapping="Wrap"/>
@@ -330,7 +360,7 @@
                                  Message="Removing OpenClaw from Windows Settings &#x2192; Apps will NOT clean up the Local Gateway (WSL distro, disk image). Use Remove Local Gateway below FIRST, then uninstall OpenClaw."/>
 
                         <TextBlock x:Uid="SettingsPage_RemovesTheWSLDistro" x:Name="GatewayBodyText"
-                                   Text="Removes the WSL distro (OpenClawGateway), its disk image, autostart entry, and clears gateway credentials. Your MCP token is preserved. Onboarding will reset."
+                                   Text="Removes the app-owned WSL distro, its disk image, autostart entry, and clears gateway credentials. Your MCP token is preserved. Onboarding will reset."
                                    Style="{StaticResource BodyTextBlockStyle}"
                                    TextWrapping="Wrap"/>
 
@@ -346,6 +376,257 @@
                     </StackPanel>
                 </Border>
 
+                <!-- ═════════ Developer ═════════ -->
+                <TextBlock x:Uid="SettingsPage_Developer" Text="Developer" Style="{StaticResource BodyStrongTextBlockStyle}"
+                           Margin="{StaticResource SectionHeaderMargin}"/>
+
+                <Border Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                        BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                        BorderThickness="1" CornerRadius="8" Padding="{StaticResource SettingsRowPadding}">
+                    <Grid ColumnSpacing="14">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
+                        <StackPanel Grid.Column="0" VerticalAlignment="Center" Spacing="2">
+                            <TextBlock x:Uid="SettingsRow_ShowDiagnostics_Header"
+                                       Text="Enable Diagnostics"
+                                       Style="{StaticResource BodyTextBlockStyle}"/>
+                            <TextBlock x:Uid="SettingsRow_ShowDiagnostics_Description"
+                                       Text="Developer and troubleshooting tools. On by default for local builds."
+                                       Style="{StaticResource CaptionTextBlockStyle}"
+                                       Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                       TextWrapping="Wrap"/>
+                        </StackPanel>
+                        <ToggleSwitch Grid.Column="1"
+                                      x:Name="ShowDiagnosticsToggle"
+                                      MinWidth="0"
+                                      OnContent=""
+                                      OffContent=""
+                                      AutomationProperties.AutomationId="SettingsPageShowDiagnostics"
+                                      AutomationProperties.Name="Enable Diagnostics"/>
+                    </Grid>
+                </Border>
+
+                <!-- ═════════ About ═════════ -->
+                <TextBlock x:Uid="SettingsPage_About" Text="About" Style="{StaticResource BodyStrongTextBlockStyle}"
+                           Margin="{StaticResource SectionHeaderMargin}"/>
+
+                <toolkit:SettingsExpander x:Uid="SettingsPage_AppInfoExpander"
+                                          Header="App info"
+                                          IsExpanded="True">
+                    <toolkit:SettingsExpander.HeaderIcon>
+                        <FontIcon Glyph="{x:Bind helpers:FluentIconCatalog.About, Mode=OneTime}"
+                                  FontFamily="{ThemeResource SymbolThemeFontFamily}"/>
+                    </toolkit:SettingsExpander.HeaderIcon>
+                    <toolkit:SettingsExpander.Content>
+                        <Button x:Uid="SettingsPage_AppInfoCheckUpdates"
+                                Content="Check for updates"
+                                Click="OnCheckUpdates"
+                                AutomationProperties.AutomationId="SettingsPageCheckUpdates"/>
+                    </toolkit:SettingsExpander.Content>
+                    <toolkit:SettingsExpander.ItemsHeader>
+                        <StackPanel Padding="16" Spacing="12">
+                            <Grid ColumnSpacing="24" RowSpacing="6">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="180"/>
+                                    <ColumnDefinition Width="*"/>
+                                </Grid.ColumnDefinitions>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto"/>
+                                    <RowDefinition Height="Auto"/>
+                                    <RowDefinition Height="Auto"/>
+                                    <RowDefinition Height="Auto"/>
+                                    <RowDefinition Height="Auto"/>
+                                    <RowDefinition Height="Auto"/>
+                                    <RowDefinition Height="Auto"/>
+                                    <RowDefinition Height="Auto"/>
+                                </Grid.RowDefinitions>
+
+                                <TextBlock x:Uid="SettingsPage_AppInfoLabel_AppName"
+                                           Grid.Row="0" Grid.Column="0"
+                                           Text="App name"
+                                           Style="{StaticResource CaptionTextBlockStyle}"
+                                           Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
+                                <TextBlock Grid.Row="0" Grid.Column="1"
+                                           Text="OpenClaw Windows Companion"
+                                           Style="{StaticResource BodyTextBlockStyle}"
+                                           IsTextSelectionEnabled="True"/>
+
+                                <TextBlock x:Uid="SettingsPage_AppInfoLabel_Version"
+                                           Grid.Row="1" Grid.Column="0"
+                                           Text="Version"
+                                           Style="{StaticResource CaptionTextBlockStyle}"
+                                           Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
+                                <TextBlock x:Name="AppInfoVersionText"
+                                           Grid.Row="1" Grid.Column="1"
+                                           Style="{StaticResource BodyTextBlockStyle}"
+                                           IsTextSelectionEnabled="True"/>
+
+                                <TextBlock x:Uid="SettingsPage_AppInfoLabel_BuildDate"
+                                           x:Name="AppInfoBuildLabel"
+                                           Grid.Row="2" Grid.Column="0"
+                                           Text="Build date"
+                                           Style="{StaticResource CaptionTextBlockStyle}"
+                                           Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
+                                <TextBlock x:Name="AppInfoBuildText"
+                                           Grid.Row="2" Grid.Column="1"
+                                           Style="{StaticResource BodyTextBlockStyle}"
+                                           IsTextSelectionEnabled="True"/>
+
+                                <TextBlock x:Uid="SettingsPage_AppInfoLabel_Runtime"
+                                           Grid.Row="3" Grid.Column="0"
+                                           Text="Runtime"
+                                           Style="{StaticResource CaptionTextBlockStyle}"
+                                           Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
+                                <TextBlock x:Name="AppInfoRuntimeText"
+                                           Grid.Row="3" Grid.Column="1"
+                                           Style="{StaticResource BodyTextBlockStyle}"
+                                           IsTextSelectionEnabled="True"
+                                           TextWrapping="Wrap"/>
+
+                                <TextBlock x:Uid="SettingsPage_AppInfoLabel_Architecture"
+                                           Grid.Row="4" Grid.Column="0"
+                                           Text="Architecture"
+                                           Style="{StaticResource CaptionTextBlockStyle}"
+                                           Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
+                                <TextBlock x:Name="AppInfoArchText"
+                                           Grid.Row="4" Grid.Column="1"
+                                           Style="{StaticResource BodyTextBlockStyle}"
+                                           IsTextSelectionEnabled="True"/>
+
+                                <TextBlock x:Uid="SettingsPage_AppInfoLabel_Windows"
+                                           Grid.Row="5" Grid.Column="0"
+                                           Text="Windows"
+                                           Style="{StaticResource CaptionTextBlockStyle}"
+                                           Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
+                                <TextBlock x:Name="AppInfoWindowsText"
+                                           Grid.Row="5" Grid.Column="1"
+                                           Style="{StaticResource BodyTextBlockStyle}"
+                                           IsTextSelectionEnabled="True"/>
+
+                                <TextBlock x:Uid="SettingsPage_AppInfoLabel_UpdateChannel"
+                                           Grid.Row="6" Grid.Column="0"
+                                           Text="Update channel"
+                                           Style="{StaticResource CaptionTextBlockStyle}"
+                                           Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
+                                <TextBlock x:Name="AppInfoChannelText"
+                                           Grid.Row="6" Grid.Column="1"
+                                           Style="{StaticResource BodyTextBlockStyle}"
+                                           IsTextSelectionEnabled="True"/>
+
+                                <TextBlock x:Uid="SettingsPage_AppInfoLabel_InstallType"
+                                           Grid.Row="7" Grid.Column="0"
+                                           Text="Install type"
+                                           Style="{StaticResource CaptionTextBlockStyle}"
+                                           Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
+                                <TextBlock x:Name="AppInfoInstallText"
+                                           Grid.Row="7" Grid.Column="1"
+                                           Style="{StaticResource BodyTextBlockStyle}"
+                                           IsTextSelectionEnabled="True"/>
+                            </Grid>
+
+                            <Grid ColumnSpacing="24">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="180"/>
+                                    <ColumnDefinition Width="*"/>
+                                </Grid.ColumnDefinitions>
+                                <TextBlock x:Uid="SettingsPage_AppInfoRelatedLinks"
+                                           Grid.Column="0"
+                                           Text="Related links"
+                                           Style="{StaticResource CaptionTextBlockStyle}"
+                                           Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                           VerticalAlignment="Center"/>
+                                <StackPanel Grid.Column="1" Orientation="Horizontal" Spacing="8">
+                                    <HyperlinkButton x:Uid="SettingsPage_AppInfoDocumentation"
+                                                     Content="Documentation"
+                                                     Padding="0"
+                                                     Click="OnDocumentationLink"/>
+                                    <HyperlinkButton x:Uid="SettingsPage_AppInfoGitHub"
+                                                     Content="GitHub"
+                                                     Padding="0"
+                                                     Click="OnGitHubLink"/>
+                                    <HyperlinkButton x:Uid="SettingsPage_AppInfoDashboard"
+                                                     Content="Dashboard"
+                                                     Padding="0"
+                                                     Click="OnDashboardLink"/>
+                                </StackPanel>
+                            </Grid>
+                        </StackPanel>
+                    </toolkit:SettingsExpander.ItemsHeader>
+                </toolkit:SettingsExpander>
+
+                <toolkit:SettingsExpander x:Uid="SettingsPage_GatewayInfoExpander"
+                                          Header="Gateway info"
+                                          IsExpanded="False">
+                    <toolkit:SettingsExpander.HeaderIcon>
+                        <FontIcon Glyph="{x:Bind helpers:FluentIconCatalog.ServerEnvironment, Mode=OneTime}"
+                                  FontFamily="{ThemeResource SymbolThemeFontFamily}"/>
+                    </toolkit:SettingsExpander.HeaderIcon>
+                    <toolkit:SettingsExpander.ItemsHeader>
+                        <Grid Padding="16" ColumnSpacing="24" RowSpacing="6">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="180"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto"/>
+                            </Grid.RowDefinitions>
+
+                            <TextBlock x:Uid="SettingsPage_GatewayInfoLabel_Version"
+                                       Grid.Row="0" Grid.Column="0"
+                                       Text="Version"
+                                       Style="{StaticResource CaptionTextBlockStyle}"
+                                       Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
+                            <TextBlock x:Name="GatewayVersionText"
+                                       Grid.Row="0" Grid.Column="1"
+                                       Text="—"
+                                       Style="{StaticResource BodyTextBlockStyle}"
+                                       IsTextSelectionEnabled="True"
+                                       TextWrapping="Wrap"/>
+
+                            <TextBlock x:Uid="SettingsPage_GatewayInfoLabel_Protocol"
+                                       Grid.Row="1" Grid.Column="0"
+                                       Text="Protocol"
+                                       Style="{StaticResource CaptionTextBlockStyle}"
+                                       Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
+                            <TextBlock x:Name="GatewayProtocolText"
+                                       Grid.Row="1" Grid.Column="1"
+                                       Text="—"
+                                       Style="{StaticResource BodyTextBlockStyle}"
+                                       IsTextSelectionEnabled="True"
+                                       TextWrapping="Wrap"/>
+
+                            <TextBlock x:Uid="SettingsPage_GatewayInfoLabel_AuthMode"
+                                       Grid.Row="2" Grid.Column="0"
+                                       Text="Auth mode"
+                                       Style="{StaticResource CaptionTextBlockStyle}"
+                                       Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
+                            <TextBlock x:Name="GatewayAuthText"
+                                       Grid.Row="2" Grid.Column="1"
+                                       Text="—"
+                                       Style="{StaticResource BodyTextBlockStyle}"
+                                       IsTextSelectionEnabled="True"
+                                       TextWrapping="Wrap"/>
+
+                            <TextBlock x:Uid="SettingsPage_GatewayInfoLabel_Uptime"
+                                       Grid.Row="3" Grid.Column="0"
+                                       Text="Uptime"
+                                       Style="{StaticResource CaptionTextBlockStyle}"
+                                       Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
+                            <TextBlock x:Name="GatewayUptimeText"
+                                       Grid.Row="3" Grid.Column="1"
+                                       Text="—"
+                                       Style="{StaticResource BodyTextBlockStyle}"
+                                       IsTextSelectionEnabled="True"
+                                       TextWrapping="Wrap"/>
+                        </Grid>
+                    </toolkit:SettingsExpander.ItemsHeader>
+                </toolkit:SettingsExpander>
+
             </StackPanel>
             </Grid>
         </ScrollViewer>
diff --git a/src/OpenClaw.Tray.WinUI/Pages/SettingsPage.xaml.cs b/src/OpenClaw.Tray.WinUI/Pages/SettingsPage.xaml.cs
index 540a9a739..1b92e7b1d 100644
--- a/src/OpenClaw.Tray.WinUI/Pages/SettingsPage.xaml.cs
+++ b/src/OpenClaw.Tray.WinUI/Pages/SettingsPage.xaml.cs
@@ -1,12 +1,18 @@
 using Microsoft.Toolkit.Uwp.Notifications;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using OpenClaw.Connection;
 using OpenClaw.Shared;
 using OpenClawTray.Helpers;
 using OpenClawTray.Services;
 using System;
+using System.ComponentModel;
 using System.Diagnostics;
+using System.Globalization;
 using System.IO;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -21,22 +27,36 @@ public sealed partial class SettingsPage : Page
     private bool _localGatewayInstalled;
     private bool _uninstallInitiatedThisSession;
     private CancellationTokenSource? _uninstallCts;
+    private AppState? _appState;
+    private readonly DispatcherTimer _gatewayUptimeRefreshTimer = new() { Interval = TimeSpan.FromSeconds(1) };
+    private long? _sampledGatewayUptimeMs;
+    private DateTime _sampledGatewayUptimeUtc;
+
+    private const string DocumentationUrl = "https://docs.openclaw.ai/platforms/windows";
+    private const string GitHubUrl = "https://github.com/openclaw/openclaw-windows-node";
 
     private enum UninstallUiState { Idle, InProgress, Success, Failure }
 
-    private const string GatewayIdleBodyText =
-        "Removes the WSL distro (OpenClawGateway), its disk image, autostart entry, and clears gateway credentials. Your MCP token is preserved. Onboarding will reset.";
+    private static string GatewayIdleBodyText =>
+        $"Removes the WSL distro ({AppIdentity.SetupDistroName}), its disk image, autostart entry, and clears gateway credentials. Your MCP token is preserved. Onboarding will reset.";
 
 
     public SettingsPage()
     {
         InitializeComponent();
+        LocalGatewaySetupDescriptionText.Text =
+            $"Launches setup to install the app-owned {AppIdentity.SetupDistroName} WSL distro or re-run provider and model setup for an existing one. Existing local gateways are only replaced after confirmation.";
+        GatewayBodyText.Text = GatewayIdleBodyText;
+        _gatewayUptimeRefreshTimer.Tick += OnGatewayUptimeRefreshTimerTick;
         Loaded += OnLoaded;
         Unloaded += OnUnloaded;
     }
 
     public void Initialize()
     {
+        PopulateAppInfo();
+        InitializeGatewayInfo();
+
         var settings = CurrentApp.Settings;
         if (!_initialized && settings != null)
         {
@@ -65,6 +85,10 @@ private void OnUnloaded(object sender, RoutedEventArgs e)
     {
         if (CurrentApp.Settings != null)
             CurrentApp.Settings.Saved -= OnExternalSettingsChanged;
+        if (_appState != null)
+            _appState.PropertyChanged -= OnAppStateChanged;
+        _appState = null;
+        _gatewayUptimeRefreshTimer.Stop();
     }
 
     // ── Auto-save wiring ──
@@ -80,6 +104,12 @@ private void WireAutoSaveHandlers()
             if (NotificationSoundComboBox.SelectedItem is ComboBoxItem item)
                 Persist(s => s.NotificationSound = item.Tag?.ToString() ?? "Default");
         };
+        AppThemeComboBox.SelectionChanged += (_, _) =>
+        {
+            if (AppThemeComboBox.SelectedItem is ComboBoxItem item)
+                Persist(s => s.AppTheme = item.Tag?.ToString() ?? SettingsManager.AppThemeSystem);
+        };
+        ShowDiagnosticsToggle.Toggled += (_, _) => Persist(s => s.ShowDiagnosticsOverride = ShowDiagnosticsToggle.IsOn);
 
         WireCheckBox(NotifyHealthCb, v => CurrentApp.Settings!.NotifyHealth = v);
         WireCheckBox(NotifyUrgentCb, v => CurrentApp.Settings!.NotifyUrgent = v);
@@ -180,17 +210,9 @@ private void LoadSettings(SettingsManager settings)
         UseLegacyWebChatToggle.IsOn = settings.UseLegacyWebChat;
         NotificationsToggle.IsOn = settings.ShowNotifications;
 
-        for (int i = 0; i < NotificationSoundComboBox.Items.Count; i++)
-        {
-            if (NotificationSoundComboBox.Items[i] is ComboBoxItem item &&
-                item.Tag?.ToString() == settings.NotificationSound)
-            {
-                NotificationSoundComboBox.SelectedIndex = i;
-                break;
-            }
-        }
-        if (NotificationSoundComboBox.SelectedIndex < 0)
-            NotificationSoundComboBox.SelectedIndex = 0;
+        SelectComboBoxItemByTag(NotificationSoundComboBox, settings.NotificationSound);
+        SelectComboBoxItemByTag(AppThemeComboBox, settings.AppTheme);
+        ShowDiagnosticsToggle.IsOn = settings.ShowDiagnosticsEffective;
 
         NotifyHealthCb.IsChecked = settings.NotifyHealth;
         NotifyUrgentCb.IsChecked = settings.NotifyUrgent;
@@ -206,6 +228,137 @@ private void LoadSettings(SettingsManager settings)
         LoadGatewaySection(settings);
     }
 
+    private void PopulateAppInfo()
+    {
+        AppInfoVersionText.Text = AppVersionInfo.DisplayVersion;
+        AppInfoRuntimeText.Text = BuildRuntimeStackDisplayText();
+        AppInfoArchText.Text = RuntimeInformation.ProcessArchitecture.ToString();
+        AppInfoWindowsText.Text = Environment.OSVersion.Version.ToString();
+        AppInfoInstallText.Text = PackageHelper.IsPackaged ? "Packaged (MSIX)" : "Unpackaged (developer)";
+        AppInfoChannelText.Text = ResolveUpdateChannelDisplayText();
+
+        var buildDate = TryResolveBuildDateDisplayText();
+        if (string.IsNullOrWhiteSpace(buildDate))
+        {
+            AppInfoBuildLabel.Visibility = Visibility.Collapsed;
+            AppInfoBuildText.Visibility = Visibility.Collapsed;
+            AppInfoBuildText.Text = string.Empty;
+        }
+        else
+        {
+            AppInfoBuildLabel.Visibility = Visibility.Visible;
+            AppInfoBuildText.Visibility = Visibility.Visible;
+            AppInfoBuildText.Text = buildDate;
+        }
+    }
+
+    private void InitializeGatewayInfo()
+    {
+        var appState = CurrentApp.AppState;
+        if (!ReferenceEquals(_appState, appState))
+        {
+            if (_appState != null)
+                _appState.PropertyChanged -= OnAppStateChanged;
+            _appState = appState;
+            if (_appState != null)
+                _appState.PropertyChanged += OnAppStateChanged;
+        }
+
+        RefreshGatewayInfo();
+    }
+
+    private void OnAppStateChanged(object? sender, PropertyChangedEventArgs e)
+    {
+        if (e.PropertyName is nameof(AppState.Status) or nameof(AppState.GatewaySelf))
+            RefreshGatewayInfo();
+    }
+
+    private void RefreshGatewayInfo()
+    {
+        var self = CurrentApp.AppState?.GatewaySelf;
+        if (CurrentApp.AppState?.Status == ConnectionStatus.Connected && self != null)
+        {
+            GatewayVersionText.Text = self.VersionText;
+            GatewayProtocolText.Text = self.Protocol.HasValue ? $"v{self.Protocol}" : "unknown";
+            GatewayAuthText.Text = string.IsNullOrWhiteSpace(self.AuthMode) ? "unknown" : self.AuthMode;
+            CaptureGatewayUptimeSample(self);
+            RefreshGatewayUptimeText();
+        }
+        else
+        {
+            _sampledGatewayUptimeMs = null;
+            _gatewayUptimeRefreshTimer.Stop();
+            GatewayVersionText.Text = "—";
+            GatewayProtocolText.Text = "—";
+            GatewayAuthText.Text = "—";
+            GatewayUptimeText.Text = "—";
+        }
+    }
+
+    private void CaptureGatewayUptimeSample(GatewaySelfInfo self)
+    {
+        if (!self.UptimeMs.HasValue)
+        {
+            _sampledGatewayUptimeMs = null;
+            _gatewayUptimeRefreshTimer.Stop();
+            return;
+        }
+
+        if (_sampledGatewayUptimeMs != self.UptimeMs.Value)
+        {
+            _sampledGatewayUptimeMs = self.UptimeMs.Value;
+            _sampledGatewayUptimeUtc = DateTime.UtcNow;
+        }
+
+        if (!_gatewayUptimeRefreshTimer.IsEnabled)
+            _gatewayUptimeRefreshTimer.Start();
+    }
+
+    private void OnGatewayUptimeRefreshTimerTick(object? sender, object e)
+    {
+        RefreshGatewayUptimeText();
+    }
+
+    private void RefreshGatewayUptimeText()
+    {
+        if (CurrentApp.AppState?.Status != ConnectionStatus.Connected ||
+            !_sampledGatewayUptimeMs.HasValue)
+        {
+            _gatewayUptimeRefreshTimer.Stop();
+            GatewayUptimeText.Text = "—";
+            return;
+        }
+
+        var elapsedMs = Math.Max(0, (DateTime.UtcNow - _sampledGatewayUptimeUtc).TotalMilliseconds);
+        GatewayUptimeText.Text = FormatDuration(TimeSpan.FromMilliseconds(_sampledGatewayUptimeMs.Value + elapsedMs));
+    }
+
+    private static string FormatDuration(TimeSpan duration)
+    {
+        if (duration.TotalDays >= 1)
+            return $"{(int)duration.TotalDays}d {duration.Hours}h";
+        if (duration.TotalHours >= 1)
+            return $"{(int)duration.TotalHours}h {duration.Minutes}m";
+        if (duration.TotalMinutes >= 1)
+            return $"{(int)duration.TotalMinutes}m {duration.Seconds}s";
+        return $"{Math.Max(0, (int)duration.TotalSeconds)}s";
+    }
+
+    private static void SelectComboBoxItemByTag(ComboBox comboBox, string? tag)
+    {
+        for (int i = 0; i < comboBox.Items.Count; i++)
+        {
+            if (comboBox.Items[i] is ComboBoxItem item &&
+                string.Equals(item.Tag?.ToString(), tag, StringComparison.OrdinalIgnoreCase))
+            {
+                comboBox.SelectedIndex = i;
+                return;
+            }
+        }
+
+        comboBox.SelectedIndex = 0;
+    }
+
     private void LoadGatewaySection(SettingsManager settings)
     {
         var setupStatePath = Path.Combine(SetupExistingGatewayClassifier.ResolveLocalDataPath(), "setup-state.json");
@@ -260,6 +413,159 @@ private void OnTestNotification(object sender, RoutedEventArgs e)
         }
     }
 
+    private void OnCheckUpdates(object sender, RoutedEventArgs e)
+    {
+        ((IAppCommands)CurrentApp).CheckForUpdates();
+    }
+
+    private void OnDocumentationLink(object sender, RoutedEventArgs e)
+    {
+        OpenShellTarget(DocumentationUrl, "documentation");
+    }
+
+    private void OnGitHubLink(object sender, RoutedEventArgs e)
+    {
+        OpenShellTarget(GitHubUrl, "GitHub");
+    }
+
+    private void OnDashboardLink(object sender, RoutedEventArgs e)
+    {
+        ((IAppCommands)CurrentApp).OpenDashboard(null);
+    }
+
+    private static void OpenShellTarget(string target, string label)
+    {
+        if (string.IsNullOrWhiteSpace(target))
+        {
+            Logger.Warn($"Failed to open {label}: target is empty");
+            return;
+        }
+
+        try
+        {
+            Process.Start(new ProcessStartInfo(target) { UseShellExecute = true });
+        }
+        catch (Exception ex) when (ex is Win32Exception or InvalidOperationException or UnauthorizedAccessException or ArgumentException or NotSupportedException)
+        {
+            Logger.Warn($"Failed to open {label}: {ex.Message}");
+        }
+    }
+
+    private static string BuildRuntimeStackDisplayText()
+    {
+        var dotNet = RuntimeInformation.FrameworkDescription;
+        var winUi = ResolveWinUiDisplayName();
+        var windowsAppSdk = ResolveWindowsAppSdkDisplayName();
+
+        return $"{dotNet} / {winUi} / {windowsAppSdk}";
+    }
+
+    private static string ResolveUpdateChannelDisplayText()
+    {
+        var channel = Environment.GetEnvironmentVariable("OPENCLAW_UPDATE_CHANNEL");
+        return string.IsNullOrWhiteSpace(channel) ? "stable" : channel.Trim();
+    }
+
+    private static string? TryResolveBuildDateDisplayText()
+    {
+        try
+        {
+            var location = Assembly.GetEntryAssembly()?.Location;
+            if (string.IsNullOrWhiteSpace(location) || !File.Exists(location))
+                return null;
+
+            return File.GetLastWriteTime(location).ToString("MMM d, yyyy", CultureInfo.CurrentCulture);
+        }
+        catch (Exception ex) when (ex is ArgumentException or IOException or UnauthorizedAccessException or NotSupportedException)
+        {
+            Logger.Debug($"SettingsPage: Failed to resolve app build date: {ex.Message}");
+            return null;
+        }
+    }
+
+    private static string ResolveWinUiDisplayName()
+    {
+        var version = typeof(Microsoft.UI.Xaml.Application).Assembly.GetName().Version;
+        return version is { Major: > 0 }
+            ? $"WinUI {version.Major}"
+            : "WinUI";
+    }
+
+    private static string ResolveWindowsAppSdkDisplayName()
+    {
+        if (TryResolveWindowsAppSdkPackageVersionFromDeps() is { Length: > 0 } packageVersion)
+        {
+            return $"Windows App SDK {packageVersion}";
+        }
+
+        return ResolveWindowsAppSdkDisplayNameFromFileVersion();
+    }
+
+    private static string ResolveWindowsAppSdkDisplayNameFromFileVersion()
+    {
+        var xamlNativePath = Path.Combine(AppContext.BaseDirectory, "Microsoft.ui.xaml.dll");
+        if (File.Exists(xamlNativePath))
+        {
+            try
+            {
+                var productVersion = FileVersionInfo.GetVersionInfo(xamlNativePath).ProductVersion;
+                if (!string.IsNullOrWhiteSpace(productVersion))
+                {
+                    return $"Windows App SDK {StripBuildMetadata(productVersion)}";
+                }
+            }
+            catch (Exception ex) when (ex is IOException or UnauthorizedAccessException or ArgumentException)
+            {
+                Logger.Warn($"Failed to read Windows App SDK version from {xamlNativePath}: {ex.Message}");
+            }
+        }
+
+        return "Windows App SDK";
+    }
+
+    private static string? TryResolveWindowsAppSdkPackageVersionFromDeps()
+    {
+        var assemblyName = Assembly.GetEntryAssembly()?.GetName().Name;
+        if (string.IsNullOrWhiteSpace(assemblyName))
+            return null;
+
+        var depsPath = Path.Combine(AppContext.BaseDirectory, $"{assemblyName}.deps.json");
+        if (!File.Exists(depsPath))
+            return null;
+
+        try
+        {
+            using var stream = File.OpenRead(depsPath);
+            using var document = JsonDocument.Parse(stream);
+            if (!document.RootElement.TryGetProperty("libraries", out var libraries) ||
+                libraries.ValueKind != JsonValueKind.Object)
+            {
+                return null;
+            }
+
+            foreach (var library in libraries.EnumerateObject())
+            {
+                const string packagePrefix = "Microsoft.WindowsAppSDK/";
+                if (library.Name.StartsWith(packagePrefix, StringComparison.OrdinalIgnoreCase))
+                {
+                    return StripBuildMetadata(library.Name[packagePrefix.Length..]);
+                }
+            }
+        }
+        catch (Exception ex) when (ex is IOException or UnauthorizedAccessException or JsonException or ArgumentException)
+        {
+            Logger.Warn($"Failed to read Windows App SDK package version from {depsPath}: {ex.Message}");
+        }
+
+        return null;
+    }
+
+    private static string StripBuildMetadata(string version)
+    {
+        var plus = version.IndexOf('+', StringComparison.Ordinal);
+        return plus >= 0 ? version[..plus] : version;
+    }
+
     private void OnRemoveGateway(object sender, RoutedEventArgs e) =>
         AsyncEventHandlerGuard.Run(
             OnRemoveGatewayAsync,
@@ -276,7 +582,7 @@ private async Task OnRemoveGatewayAsync()
         });
         dialogContent.Children.Add(new TextBlock
         {
-            Text = "• WSL distro: OpenClawGateway (and its disk image)\n" +
+            Text = $"• WSL distro: {AppIdentity.SetupDistroName} (and its disk image)\n" +
                    "• Autostart registry entry\n" +
                    "• Gateway credentials (token and bootstrap token cleared)\n" +
                    "• Setup state (onboarding will reset)",
@@ -346,15 +652,15 @@ private async Task OnRemoveGatewayAsync()
                 OpenClawOnboardCard.Visibility = Visibility.Collapsed;
                 ApplyUninstallUiState(UninstallUiState.Success);
                 UninstallResultBar.Severity = InfoBarSeverity.Success;
-                UninstallResultBar.Title = "Local gateway removed";
-                UninstallResultBar.Message = "Setup is reset; you can re-run setup from the tray menu.";
+                UninstallResultBar.Title = LocalizationHelper.GetString("SettingsPage_LocalGatewayRemovedTitle");
+                UninstallResultBar.Message = LocalizationHelper.GetString("SettingsPage_LocalGatewayRemovedMessage");
                 UninstallResultBar.ActionButton = null;
                 UninstallResultBar.IsOpen = true;
             }
             else
             {
                 ApplyUninstallUiState(UninstallUiState.Failure);
-                var errorMsg = "Removal completed with errors. Check logs for details.";
+                var errorMsg = LocalizationHelper.GetString("SettingsPage_LocalGatewayRemovalErrorsMessage");
                 if (File.Exists(jsonOutput))
                 {
                     try
@@ -393,8 +699,8 @@ private async Task OnRemoveGatewayAsync()
 
             ApplyUninstallUiState(UninstallUiState.Failure);
             UninstallResultBar.Severity = InfoBarSeverity.Warning;
-            UninstallResultBar.Title = "Removal cancelled";
-            UninstallResultBar.Message = "Gateway may be in a partially-removed state. Review logs or retry.";
+            UninstallResultBar.Title = LocalizationHelper.GetString("SettingsPage_LocalGatewayRemovalCancelledTitle");
+            UninstallResultBar.Message = LocalizationHelper.GetString("SettingsPage_LocalGatewayRemovalCancelledMessage");
             UninstallResultBar.ActionButton = null;
             UninstallResultBar.IsOpen = true;
         }
@@ -431,11 +737,9 @@ private async Task OnRemoveGatewayAsync()
 
     private void ShowUninstallError(string message)
     {
-        var logsPath = Path.Combine(
-            Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
-            "OpenClawTray", "Logs");
+        var logsPath = Path.Combine(AppIdentity.ResolveLocalDataDirectory(), "Logs");
 
-        var viewLogsButton = new Button { Content = "View Logs" };
+        var viewLogsButton = new Button { Content = LocalizationHelper.GetString("SettingsPage_ViewLogs") };
         viewLogsButton.Click += (_, _) =>
         {
             try { System.Diagnostics.Process.Start("explorer.exe", logsPath); }
@@ -443,7 +747,7 @@ private void ShowUninstallError(string message)
         };
 
         UninstallResultBar.Severity = InfoBarSeverity.Error;
-        UninstallResultBar.Title = "Removal failed";
+        UninstallResultBar.Title = LocalizationHelper.GetString("SettingsPage_LocalGatewayRemovalFailedTitle");
         UninstallResultBar.Message = message;
         UninstallResultBar.ActionButton = viewLogsButton;
         UninstallResultBar.IsOpen = true;
@@ -455,7 +759,7 @@ private void ApplyUninstallUiState(UninstallUiState state)
         {
             case UninstallUiState.Idle:
             case UninstallUiState.Failure:
-                RemoveGatewayButton.Content = "Remove Local Gateway";
+                RemoveGatewayButton.Content = LocalizationHelper.GetString("SettingsPage_RemoveLocalGatewayButton");
                 RemoveGatewayButton.IsEnabled = true;
                 RemoveGatewayButton.Visibility = Visibility.Visible;
                 GatewayBodyText.Text = GatewayIdleBodyText;
@@ -473,13 +777,13 @@ private void ApplyUninstallUiState(UninstallUiState state)
                 });
                 sp.Children.Add(new TextBlock
                 {
-                    Text = "Removing distro\u2026",
+                    Text = LocalizationHelper.GetString("SettingsPage_RemovingDistro"),
                     VerticalAlignment = VerticalAlignment.Center
                 });
                 RemoveGatewayButton.Content = sp;
                 RemoveGatewayButton.IsEnabled = false;
                 RemoveGatewayButton.Visibility = Visibility.Visible;
-                GatewayBodyText.Text = "Removing the local gateway. This may take 10\u201330 seconds\u2026";
+                GatewayBodyText.Text = LocalizationHelper.GetString("SettingsPage_RemovingLocalGatewayMessage");
                 break;
             }
 
diff --git a/src/OpenClaw.Tray.WinUI/Pages/SkillsPage.xaml b/src/OpenClaw.Tray.WinUI/Pages/SkillsPage.xaml
index 73d52387f..3844e704b 100644
--- a/src/OpenClaw.Tray.WinUI/Pages/SkillsPage.xaml
+++ b/src/OpenClaw.Tray.WinUI/Pages/SkillsPage.xaml
@@ -11,7 +11,9 @@
 
                 <!-- Header -->
                 <StackPanel Orientation="Horizontal" Spacing="8" Margin="0,0,0,4">
-                    <TextBlock x:Uid="SkillsPage_Skills" Text="🧩 Skills" Style="{StaticResource TitleTextBlockStyle}"/>
+                    <TextBlock x:Uid="SkillsPage_Skills" Text="🧩 Skills"
+                               AutomationProperties.AutomationId="SkillsPageMarker"
+                               Style="{StaticResource TitleTextBlockStyle}"/>
                     <TextBlock x:Name="CountText" Text="" VerticalAlignment="Center"
                                Style="{StaticResource CaptionTextBlockStyle}"
                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
diff --git a/src/OpenClaw.Tray.WinUI/Pages/UsagePage.xaml b/src/OpenClaw.Tray.WinUI/Pages/UsagePage.xaml
index e7b0a3f2b..16fa531de 100644
--- a/src/OpenClaw.Tray.WinUI/Pages/UsagePage.xaml
+++ b/src/OpenClaw.Tray.WinUI/Pages/UsagePage.xaml
@@ -8,7 +8,9 @@
     <Grid HorizontalAlignment="Stretch">
         <StackPanel Padding="24" Spacing="16" HorizontalAlignment="Stretch" MaxWidth="900">
 
-            <TextBlock x:Uid="UsagePage_TextBlock_10" Text="Usage &amp; Cost" Style="{StaticResource TitleTextBlockStyle}"/>
+            <TextBlock x:Uid="UsagePage_TextBlock_10" Text="Usage &amp; Cost"
+                       AutomationProperties.AutomationId="UsagePageMarker"
+                       Style="{StaticResource TitleTextBlockStyle}"/>
 
             <InfoBar x:Uid="UsagePage_GatewayDisconnected" x:Name="ConnectionInfoBar"
                      IsOpen="False" IsClosable="False" Severity="Warning"
diff --git a/src/OpenClaw.Tray.WinUI/Pages/VoiceSettingsPage.xaml b/src/OpenClaw.Tray.WinUI/Pages/VoiceSettingsPage.xaml
index e98a7f05c..703933336 100644
--- a/src/OpenClaw.Tray.WinUI/Pages/VoiceSettingsPage.xaml
+++ b/src/OpenClaw.Tray.WinUI/Pages/VoiceSettingsPage.xaml
@@ -9,13 +9,86 @@
     <Grid HorizontalAlignment="Stretch">
         <StackPanel Padding="24" Spacing="8" HorizontalAlignment="Stretch" MaxWidth="900">
 
-            <TextBlock x:Uid="VoiceSettingsPage_PageTitle" x:Name="PageTitleText" Text="Voice &amp; Audio" Style="{StaticResource TitleTextBlockStyle}"/>
+            <TextBlock x:Uid="VoiceSettingsPage_PageTitle" x:Name="PageTitleText" Text="Voice &amp; Audio"
+                       AutomationProperties.AutomationId="VoiceSettingsPageMarker"
+                       Style="{StaticResource TitleTextBlockStyle}"/>
             <TextBlock x:Uid="VoiceSettingsPage_PageDescription" x:Name="PageDescriptionText"
                        Text="Configure speech-to-text and voice interaction settings. All speech processing runs locally on your device."
                        Style="{StaticResource CaptionTextBlockStyle}"
                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
                        TextWrapping="Wrap" Margin="0,0,0,8"/>
 
+            <!-- Assistant loop -->
+            <Border Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                    BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                    BorderThickness="1" CornerRadius="8" Padding="16">
+                <StackPanel Spacing="12">
+                    <Grid ColumnSpacing="12">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
+                        <StackPanel Spacing="4">
+                            <TextBlock x:Uid="VoiceSettingsPage_AssistantHeader" Text="Assistant" Style="{StaticResource BodyStrongTextBlockStyle}"/>
+                            <TextBlock x:Uid="VoiceSettingsPage_AssistantDescription"
+                                      Text="Always-listening assistant service and latest conversation turns."
+                                      Style="{StaticResource CaptionTextBlockStyle}"
+                                      Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                      TextWrapping="Wrap"/>
+                        </StackPanel>
+                        <StackPanel Grid.Column="1" Orientation="Horizontal" Spacing="8" VerticalAlignment="Top">
+                            <Button x:Uid="VoiceSettingsPage_AssistantRefreshButton"
+                                    x:Name="AssistantRefreshButton" Click="OnAssistantRefreshClick" Padding="10,8"
+                                    ToolTipService.ToolTip="Refresh assistant status">
+                                <FontIcon Glyph="&#xE72C;" FontSize="14"/>
+                            </Button>
+                            <Button x:Uid="VoiceSettingsPage_AssistantStartButton" x:Name="AssistantStartButton"
+                                    Click="OnAssistantStartClick" Style="{StaticResource AccentButtonStyle}">
+                                <StackPanel Orientation="Horizontal" Spacing="6">
+                                    <FontIcon Glyph="&#xE768;" FontSize="14"/>
+                                    <TextBlock x:Uid="VoiceSettingsPage_AssistantStartButtonText" Text="Start"/>
+                                </StackPanel>
+                            </Button>
+                            <Button x:Uid="VoiceSettingsPage_AssistantStopButton" x:Name="AssistantStopButton"
+                                    Click="OnAssistantStopClick">
+                                <StackPanel Orientation="Horizontal" Spacing="6">
+                                    <FontIcon Glyph="&#xE71A;" FontSize="14"/>
+                                    <TextBlock x:Uid="VoiceSettingsPage_AssistantStopButtonText" Text="Stop"/>
+                                </StackPanel>
+                            </Button>
+                        </StackPanel>
+                    </Grid>
+
+                    <Border Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}"
+                            CornerRadius="8" Padding="12">
+                        <Grid RowSpacing="4">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto"/>
+                            </Grid.RowDefinitions>
+                            <TextBlock x:Uid="VoiceSettingsPage_AssistantStatusChecking"
+                                       x:Name="AssistantStatusText"
+                                       Text="Checking assistant status..."
+                                       Style="{StaticResource BodyStrongTextBlockStyle}"/>
+                            <TextBlock x:Name="AssistantDetailText" Grid.Row="1"
+                                       Style="{StaticResource CaptionTextBlockStyle}"
+                                       Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                       TextWrapping="Wrap"/>
+                            <TextBlock x:Name="AssistantLastRefreshText" Grid.Row="2"
+                                       Style="{StaticResource CaptionTextBlockStyle}"
+                                       Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                       TextWrapping="Wrap"/>
+                        </Grid>
+                    </Border>
+
+                    <StackPanel Spacing="8">
+                        <TextBlock x:Uid="VoiceSettingsPage_AssistantRecentTurnsHeader" Text="Recent turns" Style="{StaticResource BodyStrongTextBlockStyle}"/>
+                        <StackPanel x:Name="AssistantTurnsPanel" Spacing="8"/>
+                    </StackPanel>
+                </StackPanel>
+            </Border>
+
             <!-- Enable STT -->
             <Border Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
                     BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
@@ -53,6 +126,7 @@
 
                     <StackPanel Orientation="Horizontal" Spacing="12">
                         <Button x:Name="DownloadButton" Click="OnDownloadClick"
+                                AutomationProperties.LabeledBy="{Binding ElementName=DownloadButtonText}"
                                 Style="{StaticResource AccentButtonStyle}">
                             <StackPanel Orientation="Horizontal" Spacing="6">
                                 <FontIcon Glyph="&#xE896;" FontSize="14"/>
@@ -68,6 +142,7 @@
                                  Minimum="0" Maximum="100"/>
 
                     <Button x:Name="TestVoiceButton" Click="OnTestVoiceClick"
+                            AutomationProperties.LabeledBy="{Binding ElementName=TestVoiceButtonText}"
                             Visibility="Collapsed">
                         <StackPanel Orientation="Horizontal" Spacing="6">
                             <FontIcon x:Name="TestVoiceBtnIcon" Glyph="&#xE720;" FontSize="14"/>
@@ -100,6 +175,7 @@
                             <!-- Centered buttons -->
                             <StackPanel Orientation="Horizontal" Spacing="8" HorizontalAlignment="Center">
                                 <Button x:Name="InlineTestStartBtn" Click="OnInlineTestStartClick"
+                                        AutomationProperties.LabeledBy="{Binding ElementName=InlineTestBtnLabel}"
                                         Style="{StaticResource AccentButtonStyle}" Padding="12,8">
                                     <StackPanel Orientation="Horizontal" Spacing="6">
                                         <FontIcon x:Name="InlineTestBtnIcon" Glyph="&#xE720;" FontSize="14"/>
@@ -122,7 +198,7 @@
                     BorderThickness="1" CornerRadius="8" Padding="16">
                 <StackPanel Spacing="8">
                     <TextBlock x:Uid="VoiceSettingsPage_LanguageHeader" x:Name="LanguageHeaderText" Text="Language" Style="{StaticResource BodyStrongTextBlockStyle}"/>
-                    <ComboBox x:Name="LanguageCombo"
+                    <ComboBox x:Uid="VoiceSettingsPage_LanguageCombo" x:Name="LanguageCombo"
                               SelectionChanged="OnLanguageChanged" Width="200">
                         <ComboBoxItem x:Uid="VoiceSettingsPage_LangAuto" Content="Auto-detect" Tag="auto"/>
                         <ComboBoxItem x:Uid="VoiceSettingsPage_LangEn"   Content="English"     Tag="en"/>
@@ -182,6 +258,7 @@
                                   SelectionChanged="OnPiperVoiceChanged" Width="400"/>
                         <StackPanel Orientation="Horizontal" Spacing="8">
                             <Button x:Name="PiperDownloadButton" Click="OnPiperDownloadClick"
+                                    AutomationProperties.LabeledBy="{Binding ElementName=PiperDownloadButtonText}"
                                     Width="180" MinHeight="32">
                                 <StackPanel Orientation="Horizontal" Spacing="6">
                                     <FontIcon x:Name="PiperDownloadIcon" Glyph="&#xE896;" FontSize="14"/>
@@ -191,6 +268,7 @@
                             <Button x:Uid="VoiceSettingsPage_PiperDeleteButton" x:Name="PiperDeleteButton" Click="OnPiperDeleteClick"
                                     Content="Delete" Width="80" Visibility="Collapsed"/>
                             <Button x:Name="PiperPreviewButton" Click="OnPiperPreviewClick"
+                                    AutomationProperties.LabeledBy="{Binding ElementName=PiperPreviewLabel}"
                                     Width="100" Visibility="Collapsed">
                                 <StackPanel Orientation="Horizontal" Spacing="6">
                                     <FontIcon x:Name="PiperPreviewIcon" Glyph="&#xE768;" FontSize="14"/>
@@ -214,6 +292,7 @@
                         <ComboBox x:Uid="VoiceSettingsPage_WindowsVoiceCombo" x:Name="WindowsVoiceCombo" Header="Voice"
                                   SelectionChanged="OnWindowsVoiceChanged" Width="300"/>
                         <Button x:Name="PreviewVoiceButton" Click="OnPreviewVoiceClick"
+                                AutomationProperties.LabeledBy="{Binding ElementName=PreviewVoiceLabel}"
                                 Width="140">
                             <StackPanel Orientation="Horizontal" Spacing="6">
                                 <FontIcon x:Name="PreviewVoiceIcon" Glyph="&#xE768;" FontSize="14"/>
diff --git a/src/OpenClaw.Tray.WinUI/Pages/VoiceSettingsPage.xaml.cs b/src/OpenClaw.Tray.WinUI/Pages/VoiceSettingsPage.xaml.cs
index 307c144ef..9fe417b13 100644
--- a/src/OpenClaw.Tray.WinUI/Pages/VoiceSettingsPage.xaml.cs
+++ b/src/OpenClaw.Tray.WinUI/Pages/VoiceSettingsPage.xaml.cs
@@ -17,6 +17,9 @@ public sealed partial class VoiceSettingsPage : Page
 {
     private static App CurrentApp => (App)Microsoft.UI.Xaml.Application.Current!;
     private VoiceService? _voiceService;
+    private AssistantBridgeService? _assistantBridgeService;
+    private CancellationTokenSource? _assistantRequestCts;
+    private int _assistantOperationVersion;
     private bool _suppressEvents = true; // suppress until Initialize/LoadSettings runs
     // Per-asset CTS so a Piper download doesn't cancel an in-flight Whisper
     // download (and vice versa). Each download type owns its own token.
@@ -34,9 +37,12 @@ public VoiceSettingsPage()
         {
             UpdateModelStatus();
             UpdatePiperVoiceState();
+            _ = RefreshAssistantAsync();
         };
         Unloaded += async (_, _) =>
         {
+            CancelAssistantRequest();
+
             if (App.Current is App app)
                 app.SpeakerMuteChanged -= OnAppSpeakerMuteChanged;
 
@@ -52,6 +58,7 @@ public VoiceSettingsPage()
     public void Initialize(VoiceService? voiceService)
     {
         _voiceService = voiceService;
+        _assistantBridgeService ??= new AssistantBridgeService(new AppLogger());
         if (App.Current is App app)
         {
             app.SpeakerMuteChanged -= OnAppSpeakerMuteChanged;
@@ -64,6 +71,248 @@ public void Initialize(VoiceService? voiceService)
         PiperPreviewLabel.Text = L("VoiceSettingsPage_PiperPreviewButtonContent");
         PreviewVoiceLabel.Text = L("VoiceSettingsPage_PreviewVoiceButtonContent");
         LoadSettings();
+        _ = RefreshAssistantAsync();
+    }
+
+    private void OnAssistantRefreshClick(object sender, RoutedEventArgs e) =>
+        AsyncEventHandlerGuard.Run(
+            RefreshAssistantAsync,
+            new OpenClawTray.AppLogger(),
+            nameof(OnAssistantRefreshClick));
+
+    private void OnAssistantStartClick(object sender, RoutedEventArgs e) =>
+        AsyncEventHandlerGuard.Run(
+            OnAssistantStartClickAsync,
+            new OpenClawTray.AppLogger(),
+            nameof(OnAssistantStartClick));
+
+    private async Task OnAssistantStartClickAsync()
+    {
+        var bridge = EnsureAssistantBridge();
+        var busyVersion = BeginAssistantOperation();
+        AssistantStatusText.Text = L("VoiceSettingsPage_AssistantStarting");
+        AssistantDetailText.Text = L("VoiceSettingsPage_AssistantStartingDetail");
+        try
+        {
+            var result = await bridge.StartListenServiceAsync(NewAssistantRequestToken());
+            if (!result.Success)
+            {
+                AssistantStatusText.Text = L("VoiceSettingsPage_AssistantStartFailed");
+                AssistantDetailText.Text = result.ErrorMessage;
+                return;
+            }
+
+            await RefreshAssistantAsync();
+        }
+        catch (OperationCanceledException)
+        {
+        }
+        finally
+        {
+            EndAssistantOperation(busyVersion);
+        }
+    }
+
+    private void OnAssistantStopClick(object sender, RoutedEventArgs e) =>
+        AsyncEventHandlerGuard.Run(
+            OnAssistantStopClickAsync,
+            new OpenClawTray.AppLogger(),
+            nameof(OnAssistantStopClick));
+
+    private async Task OnAssistantStopClickAsync()
+    {
+        var bridge = EnsureAssistantBridge();
+        var busyVersion = BeginAssistantOperation();
+        AssistantStatusText.Text = L("VoiceSettingsPage_AssistantStopping");
+        AssistantDetailText.Text = "";
+        try
+        {
+            var result = await bridge.StopListenServiceAsync(NewAssistantRequestToken());
+            if (!result.Success)
+            {
+                AssistantStatusText.Text = L("VoiceSettingsPage_AssistantStopFailed");
+                AssistantDetailText.Text = result.ErrorMessage;
+                return;
+            }
+
+            await RefreshAssistantAsync();
+        }
+        catch (OperationCanceledException)
+        {
+        }
+        finally
+        {
+            EndAssistantOperation(busyVersion);
+        }
+    }
+
+    private async Task RefreshAssistantAsync()
+    {
+        var bridge = EnsureAssistantBridge();
+        var busyVersion = BeginAssistantOperation();
+        try
+        {
+            var snapshot = await bridge.GetStatusAsync(NewAssistantRequestToken());
+            RenderAssistantSnapshot(snapshot);
+        }
+        catch (OperationCanceledException)
+        {
+        }
+        finally
+        {
+            EndAssistantOperation(busyVersion);
+        }
+    }
+
+    private AssistantBridgeService EnsureAssistantBridge() =>
+        _assistantBridgeService ??= new AssistantBridgeService(new AppLogger());
+
+    private CancellationToken NewAssistantRequestToken()
+    {
+        CancelAssistantRequest();
+        _assistantRequestCts = new CancellationTokenSource();
+        return _assistantRequestCts.Token;
+    }
+
+    private void CancelAssistantRequest()
+    {
+        try { _assistantRequestCts?.Cancel(); }
+        catch (Exception ex) { Logger.Debug($"VoiceSettingsPage: assistant request cancel failed: {ex.Message}"); }
+        _assistantRequestCts?.Dispose();
+        _assistantRequestCts = null;
+    }
+
+    private void SetAssistantBusy(bool busy)
+    {
+        AssistantRefreshButton.IsEnabled = !busy;
+        AssistantStartButton.IsEnabled = !busy;
+        AssistantStopButton.IsEnabled = !busy;
+    }
+
+    private int BeginAssistantOperation()
+    {
+        var version = Interlocked.Increment(ref _assistantOperationVersion);
+        SetAssistantBusy(true);
+        return version;
+    }
+
+    private void EndAssistantOperation(int version)
+    {
+        if (Volatile.Read(ref _assistantOperationVersion) == version)
+            SetAssistantBusy(false);
+    }
+
+    private void RenderAssistantSnapshot(AssistantBridgeSnapshot snapshot)
+    {
+        if (!snapshot.IsAvailable)
+        {
+            AssistantStatusText.Text = L("VoiceSettingsPage_AssistantBridgeUnavailable");
+            AssistantDetailText.Text = snapshot.ErrorMessage;
+            AssistantLastRefreshText.Text = "";
+            AssistantTurnsPanel.Children.Clear();
+            AssistantTurnsPanel.Children.Add(new TextBlock
+            {
+                Text = L("VoiceSettingsPage_AssistantNoTurnsLoaded"),
+                Style = (Style)Application.Current.Resources["CaptionTextBlockStyle"],
+                Foreground = (Brush)Application.Current.Resources["TextFillColorSecondaryBrush"],
+                TextWrapping = TextWrapping.Wrap
+            });
+            return;
+        }
+
+        var listen = snapshot.ListenService;
+        var unknown = L("VoiceSettingsPage_AssistantUnknown");
+        var status = string.IsNullOrWhiteSpace(listen.Status) ? unknown : listen.Status;
+        AssistantStatusText.Text = listen.IsRunning
+            ? Lf("VoiceSettingsPage_AssistantListeningFormat", listen.Pid?.ToString(CultureInfo.CurrentCulture) ?? unknown)
+            : listen.IsStopped
+                ? L("VoiceSettingsPage_AssistantStopped")
+                : Lf("VoiceSettingsPage_AssistantStatusFormat", status);
+
+        var details = new[]
+        {
+            string.IsNullOrWhiteSpace(listen.Transcriber) ? "" : Lf("VoiceSettingsPage_AssistantTranscriberFormat", listen.Transcriber),
+            string.IsNullOrWhiteSpace(snapshot.PreferredInputDevice) ? "" : Lf("VoiceSettingsPage_AssistantMicFormat", snapshot.PreferredInputDevice),
+            string.IsNullOrWhiteSpace(snapshot.PreferredOutputDevice) ? "" : Lf("VoiceSettingsPage_AssistantSpeakerFormat", snapshot.PreferredOutputDevice),
+            Lf("VoiceSettingsPage_AssistantCloudRoutingFormat", listen.AllowCloud ? L("VoiceSettingsPage_AssistantOn") : L("VoiceSettingsPage_AssistantOff")),
+            Lf("VoiceSettingsPage_AssistantSpeechOutputFormat", listen.SpeakAloud ? L("VoiceSettingsPage_AssistantOn") : L("VoiceSettingsPage_AssistantOff"))
+        }.Where(s => !string.IsNullOrWhiteSpace(s));
+        AssistantDetailText.Text = string.Join(" | ", details);
+        AssistantLastRefreshText.Text = string.IsNullOrWhiteSpace(snapshot.GeneratedAt)
+            ? ""
+            : Lf("VoiceSettingsPage_AssistantLastBridgeUpdateFormat", snapshot.GeneratedAt);
+
+        AssistantTurnsPanel.Children.Clear();
+        if (snapshot.RecentTurns.Count == 0)
+        {
+            AssistantTurnsPanel.Children.Add(new TextBlock
+            {
+                Text = L("VoiceSettingsPage_AssistantNoConversationTurns"),
+                Style = (Style)Application.Current.Resources["CaptionTextBlockStyle"],
+                Foreground = (Brush)Application.Current.Resources["TextFillColorSecondaryBrush"],
+                TextWrapping = TextWrapping.Wrap
+            });
+            return;
+        }
+
+        foreach (var turn in snapshot.RecentTurns.Take(5))
+            AssistantTurnsPanel.Children.Add(CreateAssistantTurnView(turn));
+    }
+
+    private static Border CreateAssistantTurnView(AssistantTurnSnapshot turn)
+    {
+        var panel = new StackPanel { Spacing = 6 };
+        var source = string.IsNullOrWhiteSpace(turn.Source) ? L("VoiceSettingsPage_AssistantSourceDefault") : turn.Source;
+        var stage = string.IsNullOrWhiteSpace(turn.Stage) ? L("VoiceSettingsPage_AssistantUnknown") : turn.Stage;
+        var model = string.IsNullOrWhiteSpace(turn.Provider)
+            ? turn.ModelProfile
+            : $"{turn.Provider} {turn.ModelProfile}".Trim();
+        var metadata = turn.TotalMs is int ms
+            ? Lf("VoiceSettingsPage_AssistantTurnMetadataWithLatencyFormat", source, stage, ms.ToString(CultureInfo.CurrentCulture))
+            : Lf("VoiceSettingsPage_AssistantTurnMetadataFormat", source, stage);
+        panel.Children.Add(new TextBlock
+        {
+            Text = metadata,
+            Style = (Style)Application.Current.Resources["CaptionTextBlockStyle"],
+            Foreground = (Brush)Application.Current.Resources["TextFillColorSecondaryBrush"],
+            TextWrapping = TextWrapping.Wrap
+        });
+        panel.Children.Add(new TextBlock
+        {
+            Text = Lf("VoiceSettingsPage_AssistantUserTurnFormat", TrimForDisplay(turn.InputText)),
+            TextWrapping = TextWrapping.Wrap
+        });
+        panel.Children.Add(new TextBlock
+        {
+            Text = Lf("VoiceSettingsPage_AssistantResponseTurnFormat", TrimForDisplay(turn.ResponseText)),
+            TextWrapping = TextWrapping.Wrap
+        });
+        if (!string.IsNullOrWhiteSpace(model))
+        {
+            panel.Children.Add(new TextBlock
+            {
+                Text = model,
+                Style = (Style)Application.Current.Resources["CaptionTextBlockStyle"],
+                Foreground = (Brush)Application.Current.Resources["TextFillColorSecondaryBrush"],
+                TextWrapping = TextWrapping.Wrap
+            });
+        }
+
+        return new Border
+        {
+            Child = panel,
+            Background = (Brush)Application.Current.Resources["CardBackgroundFillColorSecondaryBrush"],
+            CornerRadius = new CornerRadius(8),
+            Padding = new Thickness(12)
+        };
+    }
+
+    private static string TrimForDisplay(string value)
+    {
+        if (string.IsNullOrWhiteSpace(value))
+            return L("VoiceSettingsPage_AssistantEmptyValue");
+        value = value.Trim();
+        return value.Length <= 220 ? value : value[..217] + "...";
     }
 
     private void OnAppSpeakerMuteChanged(bool muted)
diff --git a/src/OpenClaw.Tray.WinUI/Pages/WorkspaceFilesModel.cs b/src/OpenClaw.Tray.WinUI/Pages/WorkspaceFilesModel.cs
new file mode 100644
index 000000000..43a2f2a3f
--- /dev/null
+++ b/src/OpenClaw.Tray.WinUI/Pages/WorkspaceFilesModel.cs
@@ -0,0 +1,372 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json;
+using OpenClaw.Shared;
+
+namespace OpenClawTray.Pages;
+
+/// <summary>
+/// Pure projection layer for the Workspace page's session file rail. Adapts the
+/// typed gateway protocol DTOs (<see cref="SessionFileList"/> /
+/// <see cref="SessionFileContent"/> from <c>sessions.files.list/get</c>) into
+/// view rows and owns the search/sort/format logic so the code-behind stays a
+/// thin view.
+///
+/// This layer <i>consumes</i> the protocol DTOs — it does not re-parse wire JSON
+/// or redefine the protocol contract (that lives in
+/// <c>OpenClaw.Shared.GatewayProtocolModels</c> /
+/// <c>OpenClawGatewayClient.Protocol</c>).
+/// </summary>
+internal static class WorkspaceFilesModel
+{
+    /// <summary>One row in the workspace file rail.</summary>
+    internal sealed record WorkspaceFileEntry
+    {
+        /// <summary>Display name (leaf name, never a path).</summary>
+        public required string Name { get; init; }
+
+        /// <summary>
+        /// Normalized workspace-relative path used for grouping/search/display.
+        /// </summary>
+        public required string RelativePath { get; init; }
+
+        /// <summary>
+        /// The original path string from the gateway DTO — used verbatim when
+        /// requesting content via <c>sessions.files.get</c> so normalization
+        /// never diverges from what the gateway expects.
+        /// </summary>
+        public required string RequestPath { get; init; }
+
+        /// <summary>Size in bytes; <c>null</c> when unknown.</summary>
+        public long? Size { get; init; }
+
+        /// <summary>False when the file is tracked but missing on disk.</summary>
+        public bool Exists { get; init; } = true;
+
+        /// <summary>True for browser/directory entries (not openable as text).</summary>
+        public bool IsDirectory { get; init; }
+
+        /// <summary>True when this row came from transcript/session relevance.</summary>
+        public bool IsSessionFile { get; init; }
+
+        /// <summary>True when selecting this file may call <c>sessions.files.get</c>.</summary>
+        public bool CanPreview { get; init; }
+
+        /// <summary>The agent wrote/modified this file during the session.</summary>
+        public bool Touched { get; init; }
+
+        /// <summary>The agent read this file during the session.</summary>
+        public bool Read { get; init; }
+
+        /// <summary>Last-modified time (UTC) when the gateway reports it.</summary>
+        public DateTimeOffset? ModifiedUtc { get; init; }
+    }
+
+    /// <summary>View state derived from a <see cref="SessionFileList"/>.</summary>
+    internal sealed record WorkspaceListState
+    {
+        /// <summary>Absolute workspace root, or empty when not reported.</summary>
+        public string WorkspacePath { get; init; } = string.Empty;
+
+        /// <summary>
+        /// False when the connected gateway does not implement the method
+        /// (older gateway). Mirrors <see cref="SessionFileList.IsSupported"/>.
+        /// </summary>
+        public bool Supported { get; init; } = true;
+
+        public IReadOnlyList<WorkspaceFileEntry> Entries { get; init; } =
+            Array.Empty<WorkspaceFileEntry>();
+
+        public string BrowserPath { get; init; } = string.Empty;
+
+        public string? BrowserParentPath { get; init; }
+
+        public string BrowserSearch { get; init; } = string.Empty;
+
+        public bool BrowserTruncated { get; init; }
+    }
+
+    /// <summary>
+    /// Project a typed <see cref="SessionFileList"/> into sorted view rows.
+    /// Merges the transcript-referenced <see cref="SessionFileList.Files"/> with
+    /// any optional <see cref="SessionFileList.Browser"/> entries (deduped by
+    /// path, preferring the richer file entry).
+    /// </summary>
+    public static WorkspaceListState FromSessionFileList(SessionFileList list)
+    {
+        if (list == null) return new WorkspaceListState();
+
+        if (!list.IsSupported)
+            return new WorkspaceListState { Supported = false, WorkspacePath = list.Root ?? string.Empty };
+
+        // Identity is case-sensitive: a gateway-backed workspace can contain
+        // distinct paths that differ only by case.
+        var byPath = new Dictionary<string, WorkspaceFileEntry>(StringComparer.Ordinal);
+        var order = new List<string>();
+
+        void Add(WorkspaceFileEntry entry)
+        {
+            if (!byPath.ContainsKey(entry.RelativePath))
+                order.Add(entry.RelativePath);
+            byPath[entry.RelativePath] = entry;
+        }
+
+        foreach (var f in list.Files ?? Array.Empty<SessionFileEntry>())
+        {
+            if (MapFileEntry(f) is { } entry) Add(entry);
+        }
+
+        // Browser entries (present only when a path/search was requested) fill in
+        // directory rows and any files not already referenced by the transcript.
+        foreach (var b in list.Browser?.Entries ?? Array.Empty<SessionFileBrowserEntry>())
+        {
+            if (MapBrowserEntry(b) is not { } entry) continue;
+            if (byPath.ContainsKey(entry.RelativePath)) continue; // file entry wins
+            Add(entry);
+        }
+
+        var entries = Sort(order.Select(p => byPath[p]).ToList());
+        var browser = list.Browser;
+
+        return new WorkspaceListState
+        {
+            WorkspacePath = list.Root ?? string.Empty,
+            Supported = true,
+            Entries = entries,
+            BrowserPath = NormalizeBrowserPath(browser?.Path),
+            BrowserParentPath = browser?.ParentPath is { Length: > 0 } parent
+                ? NormalizeBrowserPath(parent)
+                : browser?.ParentPath,
+            BrowserSearch = browser?.Search ?? string.Empty,
+            BrowserTruncated = browser?.Truncated ?? false,
+        };
+    }
+
+    /// <summary>
+    /// Project the legacy <c>agents.files.list</c> payload used by older
+    /// gateways. It does not support path browsing or session relevance badges,
+    /// but the rows remain previewable through <c>agents.files.get</c>.
+    /// </summary>
+    public static WorkspaceListState FromLegacyAgentFilesList(JsonElement payload)
+    {
+        var entries = new List<WorkspaceFileEntry>();
+        if (payload.ValueKind != JsonValueKind.Object)
+            return new WorkspaceListState();
+
+        if (payload.TryGetProperty("files", out var filesEl) &&
+            filesEl.ValueKind == JsonValueKind.Array)
+        {
+            foreach (var fileEl in filesEl.EnumerateArray())
+            {
+                if (MapLegacyFileEntry(fileEl) is { } entry)
+                    entries.Add(entry);
+            }
+        }
+
+        return new WorkspaceListState
+        {
+            WorkspacePath = GetString(payload, "workspace") ?? GetString(payload, "root") ?? string.Empty,
+            Supported = true,
+            Entries = Sort(entries),
+        };
+    }
+
+    private static WorkspaceFileEntry? MapFileEntry(SessionFileEntry f)
+    {
+        var requestPath = !string.IsNullOrEmpty(f.Path) ? f.Path : f.Name;
+        if (string.IsNullOrEmpty(requestPath)) return null;
+
+        var relative = NormalizePath(requestPath);
+        var name = !string.IsNullOrEmpty(f.Name) ? f.Name : LeafName(relative);
+        if (string.IsNullOrEmpty(name)) return null;
+
+        return new WorkspaceFileEntry
+        {
+            Name = name,
+            RelativePath = relative,
+            RequestPath = requestPath,
+            Size = f.Size is >= 0 ? f.Size : null,
+            Exists = !f.Missing,
+            IsDirectory = false,
+            IsSessionFile = true,
+            CanPreview = true,
+            Touched = string.Equals(f.Kind, "modified", StringComparison.OrdinalIgnoreCase),
+            Read = string.Equals(f.Kind, "read", StringComparison.OrdinalIgnoreCase),
+            ModifiedUtc = ToUtc(f.UpdatedAt),
+        };
+    }
+
+    private static WorkspaceFileEntry? MapBrowserEntry(SessionFileBrowserEntry b)
+    {
+        var requestPath = !string.IsNullOrEmpty(b.Path) ? b.Path : b.Name;
+        if (string.IsNullOrEmpty(requestPath)) return null;
+
+        var relative = NormalizePath(requestPath);
+        var name = !string.IsNullOrEmpty(b.Name) ? b.Name : LeafName(relative);
+        if (string.IsNullOrEmpty(name)) return null;
+
+        // SessionKind reflects relevance: "modified" / "read" / "mixed".
+        // Compare case-insensitively for consistency with MapFileEntry.
+        bool touched = string.Equals(b.SessionKind, "modified", StringComparison.OrdinalIgnoreCase)
+                       || string.Equals(b.SessionKind, "mixed", StringComparison.OrdinalIgnoreCase);
+        bool read = string.Equals(b.SessionKind, "read", StringComparison.OrdinalIgnoreCase);
+        bool isDirectory = b.IsDirectory;
+        bool isSessionFile = touched || read;
+
+        return new WorkspaceFileEntry
+        {
+            Name = name,
+            RelativePath = relative,
+            RequestPath = requestPath,
+            Size = b.Size is >= 0 ? b.Size : null,
+            Exists = true,
+            IsDirectory = isDirectory,
+            IsSessionFile = isSessionFile,
+            CanPreview = !isDirectory && isSessionFile,
+            Touched = touched,
+            Read = read,
+            ModifiedUtc = ToUtc(b.UpdatedAt),
+        };
+    }
+
+    private static WorkspaceFileEntry? MapLegacyFileEntry(JsonElement item)
+    {
+        if (item.ValueKind != JsonValueKind.Object) return null;
+
+        var requestPath = GetString(item, "path") ?? GetString(item, "name");
+        if (string.IsNullOrEmpty(requestPath)) return null;
+
+        var relative = NormalizePath(requestPath);
+        var name = GetString(item, "name") ?? LeafName(relative);
+        if (string.IsNullOrEmpty(name)) return null;
+
+        return new WorkspaceFileEntry
+        {
+            Name = name,
+            RelativePath = relative,
+            RequestPath = requestPath,
+            Size = GetLong(item, "size"),
+            Exists = GetBool(item, "exists") ?? !GetBool(item, "missing").GetValueOrDefault(),
+            IsDirectory = false,
+            IsSessionFile = true,
+            CanPreview = true,
+            ModifiedUtc = ToUtc(GetDateTime(item, "updatedAt") ?? GetDateTime(item, "modifiedAt")),
+        };
+    }
+
+    /// <summary>
+    /// Filter entries by a free-text query matched (case-insensitive) against
+    /// the leaf name and the relative path. Whitespace-only queries return the
+    /// full list unchanged. Ordering is stable (input order preserved).
+    /// </summary>
+    public static IReadOnlyList<WorkspaceFileEntry> Filter(
+        IReadOnlyList<WorkspaceFileEntry> entries, string? query)
+    {
+        if (entries.Count == 0)
+            return entries;
+
+        var trimmed = query?.Trim();
+        if (string.IsNullOrEmpty(trimmed))
+            return entries;
+
+        return entries
+            .Where(e =>
+                e.Name.Contains(trimmed, StringComparison.OrdinalIgnoreCase) ||
+                e.RelativePath.Contains(trimmed, StringComparison.OrdinalIgnoreCase))
+            .ToList();
+    }
+
+    /// <summary>
+    /// Default rail ordering: directories first, then files the agent edited,
+    /// then files it only read, then the rest; alphabetical by relative path
+    /// within each tier. Deterministic so the UI does not jitter between
+    /// refreshes.
+    /// </summary>
+    public static IReadOnlyList<WorkspaceFileEntry> Sort(
+        IReadOnlyList<WorkspaceFileEntry> entries)
+    {
+        return entries
+            .OrderBy(Rank)
+            .ThenBy(e => e.RelativePath, StringComparer.OrdinalIgnoreCase)
+            .ToList();
+
+        static int Rank(WorkspaceFileEntry e) =>
+            e.IsDirectory ? 0 : e.Touched ? 1 : e.Read ? 2 : 3;
+    }
+
+    /// <summary>Human-readable byte size (B / KB / MB).</summary>
+    public static string FormatSize(long? bytes)
+    {
+        if (bytes is not { } b || b < 0) return string.Empty;
+        if (b < 1024) return $"{b} B";
+        if (b < 1024 * 1024) return $"{b / 1024.0:F1} KB";
+        return $"{b / (1024.0 * 1024.0):F1} MB";
+    }
+
+    /// <summary>
+    /// The parent folder portion of a relative path, or empty when the file
+    /// sits at the workspace root. Used to render a subtle path caption.
+    /// </summary>
+    public static string DirectoryOf(string relativePath)
+    {
+        if (string.IsNullOrEmpty(relativePath)) return string.Empty;
+        var idx = relativePath.LastIndexOf('/');
+        return idx <= 0 ? string.Empty : relativePath[..idx];
+    }
+
+    public static string NormalizeBrowserPath(string? path) =>
+        string.IsNullOrWhiteSpace(path) ? string.Empty : NormalizePath(path.Trim()).TrimEnd('/');
+
+    private static string LeafName(string? path)
+    {
+        if (string.IsNullOrEmpty(path)) return string.Empty;
+        var normalized = path.Replace('\\', '/').TrimEnd('/');
+        var idx = normalized.LastIndexOf('/');
+        return idx < 0 ? normalized : normalized[(idx + 1)..];
+    }
+
+    private static string NormalizePath(string path) =>
+        path.Replace('\\', '/').TrimStart('/');
+
+    private static DateTimeOffset? ToUtc(DateTime? value)
+    {
+        if (value is not { } dt) return null;
+        return dt.Kind == DateTimeKind.Unspecified
+            ? new DateTimeOffset(DateTime.SpecifyKind(dt, DateTimeKind.Utc))
+            : new DateTimeOffset(dt.ToUniversalTime());
+    }
+
+    private static string? GetString(JsonElement item, string name)
+    {
+        return item.TryGetProperty(name, out var value) && value.ValueKind == JsonValueKind.String
+            ? value.GetString()
+            : null;
+    }
+
+    private static bool? GetBool(JsonElement item, string name)
+    {
+        return item.TryGetProperty(name, out var value) && value.ValueKind is JsonValueKind.True or JsonValueKind.False
+            ? value.GetBoolean()
+            : null;
+    }
+
+    private static long? GetLong(JsonElement item, string name)
+    {
+        return item.TryGetProperty(name, out var value) &&
+               value.ValueKind == JsonValueKind.Number &&
+               value.TryGetInt64(out var result) &&
+               result >= 0
+            ? result
+            : null;
+    }
+
+    private static DateTime? GetDateTime(JsonElement item, string name)
+    {
+        return item.TryGetProperty(name, out var value) &&
+               value.ValueKind == JsonValueKind.String &&
+               DateTime.TryParse(value.GetString(), null, System.Globalization.DateTimeStyles.RoundtripKind, out var result)
+            ? result
+            : null;
+    }
+}
diff --git a/src/OpenClaw.Tray.WinUI/Pages/WorkspacePage.xaml b/src/OpenClaw.Tray.WinUI/Pages/WorkspacePage.xaml
index c3085dcc1..95e7f6b55 100644
--- a/src/OpenClaw.Tray.WinUI/Pages/WorkspacePage.xaml
+++ b/src/OpenClaw.Tray.WinUI/Pages/WorkspacePage.xaml
@@ -81,15 +81,17 @@
                 </Grid.ColumnDefinitions>
                 <TextBlock x:Uid="WorkspacePage_TextBlock_22" Grid.Column="0"
                            Text="Workspace"
+                           AutomationProperties.AutomationId="WorkspacePageMarker"
                            Style="{StaticResource TitleTextBlockStyle}"
                            VerticalAlignment="Center"/>
                 <Button x:Name="RefreshButton" Grid.Column="1" Click="RefreshButton_Click"
+                        AutomationProperties.LabeledBy="{Binding ElementName=RefreshButtonLabel}"
                         VerticalAlignment="Center">
                     <StackPanel Orientation="Horizontal" Spacing="8">
                         <FontIcon Glyph="{x:Bind helpers:FluentIconCatalog.Refresh, Mode=OneTime}"
                                   FontSize="16"
                                   IsTextScaleFactorEnabled="False"/>
-                        <TextBlock x:Uid="WorkspacePage_TextBlock_34" Text="Refresh"/>
+                        <TextBlock x:Uid="WorkspacePage_TextBlock_34" x:Name="RefreshButtonLabel" Text="Refresh"/>
                     </StackPanel>
                 </Button>
             </Grid>
@@ -113,7 +115,15 @@
                 <InfoBar x:Uid="FallbackInfoBar" x:Name="FallbackInfoBar"
                          IsOpen="False" IsClosable="False"
                          Severity="Informational"
-                         Title="Workspace files"/>
+                         Title="Workspace files">
+                    <InfoBar.ActionButton>
+                        <HyperlinkButton x:Name="RepairLink"
+                                         x:Uid="WorkspacePage_OpenConnectionSettings"
+                                         Content="Open Connection settings"
+                                         Visibility="Collapsed"
+                                         Click="RepairLink_Click"/>
+                    </InfoBar.ActionButton>
+                </InfoBar>
             </StackPanel>
 
             <Border x:Name="BodyGrid" Grid.Row="3" Visibility="Collapsed"
@@ -134,10 +144,16 @@
                     </Grid.RowDefinitions>
 
                     <Border Grid.Row="0" Grid.Column="0" Padding="16,12,16,12">
-                        <TextBlock x:Uid="WorkspacePage_FilesHeader"
-                                   Text="Files"
-                                   Style="{StaticResource BodyStrongTextBlockStyle}"
-                                   VerticalAlignment="Center"/>
+                        <StackPanel Orientation="Horizontal" Spacing="8" VerticalAlignment="Center">
+                            <TextBlock x:Uid="WorkspacePage_FilesHeader"
+                                       Text="Files"
+                                       Style="{StaticResource BodyStrongTextBlockStyle}"
+                                       VerticalAlignment="Center"/>
+                            <TextBlock x:Name="FileCountText"
+                                       Style="{StaticResource CaptionTextBlockStyle}"
+                                       Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                       VerticalAlignment="Center"/>
+                        </StackPanel>
                     </Border>
 
                     <Grid Grid.Row="0" Grid.Column="2" Padding="16,8,12,8">
@@ -145,12 +161,20 @@
                             <ColumnDefinition Width="*"/>
                             <ColumnDefinition Width="Auto"/>
                         </Grid.ColumnDefinitions>
-                        <TextBlock x:Name="SelectedFileText" Grid.Column="0"
-                                   Style="{StaticResource BodyStrongTextBlockStyle}"
-                                   VerticalAlignment="Center"
-                                   TextWrapping="NoWrap"
-                                   TextTrimming="CharacterEllipsis"/>
+                        <StackPanel Grid.Column="0" VerticalAlignment="Center" Spacing="4">
+                            <TextBlock x:Name="SelectedFileText"
+                                       Style="{StaticResource BodyStrongTextBlockStyle}"
+                                       TextWrapping="NoWrap"
+                                       TextTrimming="CharacterEllipsis"/>
+                            <TextBlock x:Name="SelectedFileMeta"
+                                       Style="{StaticResource CaptionTextBlockStyle}"
+                                       Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                       TextWrapping="NoWrap"
+                                       TextTrimming="CharacterEllipsis"
+                                       Visibility="Collapsed"/>
+                        </StackPanel>
                         <controls:SelectorBar x:Name="ViewModeSelector" Grid.Column="1"
+                                              VerticalAlignment="Center"
                                               Visibility="Collapsed"
                                               SelectionChanged="ViewModeSelector_SelectionChanged">
                             <controls:SelectorBarItem x:Uid="WorkspacePage_ViewMode_Rendered"
@@ -168,20 +192,69 @@
                     <Border Grid.Row="2" Grid.Column="1"
                             Background="{ThemeResource CardStrokeColorDefaultBrush}"/>
 
-                    <ListView x:Name="FileList" Grid.Row="2" Grid.Column="0"
-                              SelectionMode="Single"
-                              SelectionChanged="FileList_SelectionChanged"
-                              ShowsScrollingPlaceholders="False"
-                              Padding="4,4,4,8">
-                        <ListView.ItemContainerStyle>
-                            <Style TargetType="ListViewItem">
-                                <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
-                                <Setter Property="Padding" Value="12,8"/>
-                                <Setter Property="Margin" Value="0"/>
-                                <Setter Property="CornerRadius" Value="4"/>
-                            </Style>
-                        </ListView.ItemContainerStyle>
-                    </ListView>
+                    <Grid Grid.Row="2" Grid.Column="0">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="*"/>
+                        </Grid.RowDefinitions>
+                        <Grid Grid.Row="0" Margin="8,8,8,0" ColumnSpacing="8">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <Button x:Name="ParentFolderButton"
+                                    x:Uid="WorkspacePage_ParentFolderButton"
+                                    Content="Up"
+                                    MinWidth="48"
+                                    Padding="8,4"
+                                    Click="ParentFolderButton_Click"/>
+                            <TextBlock x:Name="CurrentFolderText" Grid.Column="1"
+                                       Style="{StaticResource CaptionTextBlockStyle}"
+                                       Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                       VerticalAlignment="Center"
+                                       TextWrapping="NoWrap"
+                                       TextTrimming="CharacterEllipsis"/>
+                        </Grid>
+                        <AutoSuggestBox x:Name="SearchBox"
+                                        x:Uid="WorkspacePage_SearchBox"
+                                        Grid.Row="1"
+                                        Margin="8,4,8,4"
+                                        QueryIcon="Find"
+                                        PlaceholderText="Search files"
+                                        TextChanged="SearchBox_TextChanged"/>
+                        <TextBlock x:Name="BrowserNoticeText" Grid.Row="2"
+                                   Style="{StaticResource CaptionTextBlockStyle}"
+                                   Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                   TextWrapping="Wrap"
+                                   Margin="12,0,12,4"
+                                   Visibility="Collapsed"/>
+                        <ListView x:Name="FileList" Grid.Row="3"
+                                  SelectionMode="Single"
+                                  SelectionChanged="FileList_SelectionChanged"
+                                  ShowsScrollingPlaceholders="False"
+                                  Padding="4,0,4,8">
+                            <ListView.ItemContainerStyle>
+                                <Style TargetType="ListViewItem">
+                                    <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+                                    <Setter Property="Padding" Value="12,8"/>
+                                    <Setter Property="Margin" Value="0"/>
+                                    <Setter Property="CornerRadius" Value="4"/>
+                                </Style>
+                            </ListView.ItemContainerStyle>
+                        </ListView>
+                        <TextBlock x:Name="NoResultsText" Grid.Row="3"
+                                   x:Uid="WorkspacePage_NoSearchResults"
+                                   Text="No files match your search."
+                                   Style="{StaticResource CaptionTextBlockStyle}"
+                                   Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                   TextWrapping="Wrap"
+                                   HorizontalAlignment="Center"
+                                   VerticalAlignment="Center"
+                                   Margin="16"
+                                   Visibility="Collapsed"/>
+                    </Grid>
 
                     <ScrollViewer Grid.Row="2" Grid.Column="2"
                                   VerticalScrollBarVisibility="Auto"
diff --git a/src/OpenClaw.Tray.WinUI/Pages/WorkspacePage.xaml.cs b/src/OpenClaw.Tray.WinUI/Pages/WorkspacePage.xaml.cs
index a6246b09d..874d713f8 100644
--- a/src/OpenClaw.Tray.WinUI/Pages/WorkspacePage.xaml.cs
+++ b/src/OpenClaw.Tray.WinUI/Pages/WorkspacePage.xaml.cs
@@ -1,4 +1,5 @@
 using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Automation;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Documents;
 using Microsoft.UI.Xaml.Media;
@@ -8,8 +9,11 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Linq;
 using System.Text;
 using System.Text.Json;
+using System.Threading.Tasks;
+using Windows.ApplicationModel.DataTransfer;
 
 namespace OpenClawTray.Pages;
 
@@ -18,14 +22,35 @@ public sealed partial class WorkspacePage : Page
     private static App CurrentApp => (App)Microsoft.UI.Xaml.Application.Current!;
     private AppState? _appState;
 
-    // file name (case-insensitive) → its list item
-    private readonly Dictionary<string, ListViewItem> _fileItems = new(StringComparer.OrdinalIgnoreCase);
+    // All entries from the latest list result, in display (sorted) order.
+    private readonly List<WorkspaceFilesModel.WorkspaceFileEntry> _allEntries = new();
 
-    // file name → raw text content (null = missing on disk, absent = not loaded yet)
-    private readonly Dictionary<string, string?> _fileContent = new(StringComparer.OrdinalIgnoreCase);
+    // relativePath → entry, for selection lookup. Case-sensitive: workspace
+    // paths may differ only by case.
+    private readonly Dictionary<string, WorkspaceFilesModel.WorkspaceFileEntry> _entriesByPath =
+        new(StringComparer.Ordinal);
 
+    private enum FileBodyKind { Loaded, Missing }
+
+    // relativePath → resolved body. Only stable outcomes are cached (loaded
+    // content or confirmed-missing); transient/unavailable errors are NOT cached
+    // so re-selecting the file retries the fetch.
+    private readonly Dictionary<string, (FileBodyKind Kind, string? Content)> _fileContent =
+        new(StringComparer.Ordinal);
+
+    private readonly DispatcherTimer _searchDebounceTimer = new() { Interval = TimeSpan.FromMilliseconds(250) };
+
+    private string _browserPath = string.Empty;
+    private string? _browserParentPath;
+    private string _searchQuery = string.Empty;
+    private bool _suppressSearchTextChanged;
+    private bool _usingLegacyAgentFilesFallback;
     private bool _renderMarkdown = true;
 
+    // Monotonic token guarding against out-of-order async results: a list/file
+    // load applies only when its token still matches the latest request.
+    private int _loadToken;
+
     /// <summary>Set by HubWindow before <see cref="Initialize"/> to specify the active agent scope.</summary>
     public string AgentId { get; set; } = "main";
     public string CurrentAgentId => AgentId;
@@ -35,7 +60,14 @@ public WorkspacePage()
         InitializeComponent();
         Unloaded += (_, _) =>
         {
+            _searchDebounceTimer.Stop();
             if (_appState != null) _appState.PropertyChanged -= OnAppStateChanged;
+            _appState = null;
+        };
+        _searchDebounceTimer.Tick += (_, _) =>
+        {
+            _searchDebounceTimer.Stop();
+            _ = LoadAsync();
         };
     }
 
@@ -51,181 +83,632 @@ private void OnPageSizeChanged(object sender, SizeChangedEventArgs e)
 
     public void Initialize()
     {
-        _appState = CurrentApp.AppState!;
-        _appState.PropertyChanged += OnAppStateChanged;
+        if (_appState != null) _appState.PropertyChanged -= OnAppStateChanged;
+        _appState = CurrentApp.AppState;
+        if (_appState != null) _appState.PropertyChanged += OnAppStateChanged;
+        _ = LoadAsync();
+    }
+
+    /// <summary>
+    /// Resolve the gateway session key for the current agent. The typed
+    /// <c>sessions.files.*</c> API is keyed by session key (e.g.
+    /// <c>agent:main:main</c>), so map the agent to its canonical main session,
+    /// preferring the handshake-resolved key for the default agent. The
+    /// <c>agent:&lt;id&gt;:main</c> fallback assumes a simple slug agent id.
+    /// </summary>
+    private string? ResolveSessionKey()
+    {
+        var client = CurrentApp.GatewayClient;
+        if (client == null) return null;
 
-        if (_appState.TryGetCachedAgentFilesList(AgentId, out var cachedData))
+        var agentId = string.IsNullOrWhiteSpace(AgentId) ? "main" : AgentId.Trim();
+        if (string.Equals(agentId, "main", StringComparison.OrdinalIgnoreCase) &&
+            !string.IsNullOrWhiteSpace(client.MainSessionKey))
         {
-            UpdateAgentFilesList(cachedData);
-            return;
+            return client.MainSessionKey;
         }
+        return $"agent:{agentId}:main";
+    }
+
+    private async Task LoadAsync()
+    {
+        // Invalidate any in-flight list/file loads up front — before the
+        // connected/key early-returns — so a stale result can never render
+        // after a newer (even failed) load.
+        var token = ++_loadToken;
+        _usingLegacyAgentFilesFallback = false;
 
-        var hasMatchingCache = _appState?.AgentFilesList.HasValue == true &&
-            string.Equals(_appState?.AgentFilesListAgentId, AgentId, StringComparison.OrdinalIgnoreCase);
+        var client = CurrentApp.GatewayClient;
         var status = CurrentApp.AppState?.Status ?? ConnectionStatus.Disconnected;
-        if (CurrentApp.GatewayClient != null && status == ConnectionStatus.Connected && !hasMatchingCache)
+        if (client == null || status != ConnectionStatus.Connected)
+        {
+            ShowDisconnected();
+            return;
+        }
+
+        var key = ResolveSessionKey();
+        if (string.IsNullOrWhiteSpace(key))
+        {
+            ShowDisconnected();
+            return;
+        }
+
+        BeginLoading();
+
+        SessionFileList result;
+        try
+        {
+            var search = string.IsNullOrWhiteSpace(_searchQuery) ? null : _searchQuery.Trim();
+            var path = search is null ? _browserPath : string.Empty;
+            result = await client.ListSessionFilesAsync(key, path, search);
+        }
+        catch (Exception ex)
+        {
+            if (token != _loadToken) return;
+            Services.Logger.Warn($"[WorkspacePage] sessions.files.list failed: {ex.Message}");
+            EndLoading();
+            if (CurrentApp.AppState?.Status == ConnectionStatus.Connected)
+                ShowLoadError();
+            else
+                ShowDisconnected();
+            return;
+        }
+
+        if (token != _loadToken) return; // a newer load superseded this one
+        if (!result.IsSupported)
+        {
+            await StartLegacyAgentFilesFallbackAsync(token);
+            return;
+        }
+
+        EndLoading();
+        ApplyListResult(result);
+    }
+
+    private async Task StartLegacyAgentFilesFallbackAsync(int token)
+    {
+        if (token != _loadToken) return;
+        _usingLegacyAgentFilesFallback = true;
+
+        var appState = _appState ?? CurrentApp.AppState;
+        if (appState != null && appState.TryGetCachedAgentFilesList(AgentId, out var cachedData))
+        {
+            EndLoading();
+            ApplyLegacyAgentFilesList(cachedData);
+            return;
+        }
+
+        var client = CurrentApp.GatewayClient;
+        if (client == null)
         {
-            FallbackInfoBar.IsOpen = false;
-            LoadingRing.IsActive = true;
-            LoadingPanel.Visibility = Visibility.Visible;
-            ClearFiles();
-            _ = CurrentApp.GatewayClient.RequestAgentFilesListAsync(AgentId);
+            ShowDisconnected();
+            return;
         }
-        else if (hasMatchingCache)
+
+        try
         {
-            UpdateAgentFilesList(_appState!.AgentFilesList!.Value);
+            await client.RequestAgentFilesListAsync(AgentId);
         }
-        else if (CurrentApp.GatewayClient == null || status != ConnectionStatus.Connected)
+        catch (Exception ex)
         {
-            FallbackInfoBar.IsOpen = true;
-            FallbackInfoBar.Message = LocalizationHelper.GetString("WorkspacePage_DisconnectedMessage");
+            if (token != _loadToken) return;
+            Services.Logger.Warn($"[WorkspacePage] agents.files.list fallback failed: {ex.Message}");
+            ShowUnsupported();
         }
     }
 
     private void OnAppStateChanged(object? sender, PropertyChangedEventArgs e)
     {
+        if (!_usingLegacyAgentFilesFallback || _appState == null) return;
+
         switch (e.PropertyName)
         {
             case nameof(AppState.AgentFilesList):
-                if (_appState!.AgentFilesList.HasValue) UpdateAgentFilesList(_appState.AgentFilesList.Value);
+                if (_appState.AgentFilesList.HasValue &&
+                    (string.IsNullOrEmpty(_appState.AgentFilesListAgentId) ||
+                     string.Equals(_appState.AgentFilesListAgentId, AgentId, StringComparison.OrdinalIgnoreCase)))
+                {
+                    EndLoading();
+                    ApplyLegacyAgentFilesList(_appState.AgentFilesList.Value);
+                }
                 break;
             case nameof(AppState.AgentFileContent):
-                if (_appState!.AgentFileContent.HasValue) UpdateAgentFileContent(_appState.AgentFileContent.Value);
+                if (_appState.AgentFileContent.HasValue)
+                    ApplyLegacyAgentFileContent(_appState.AgentFileContent.Value);
                 break;
         }
     }
 
-    public void UpdateAgentFilesList(JsonElement data)
+    private void ApplyListResult(SessionFileList result)
     {
-        LoadingRing.IsActive = false;
-        LoadingPanel.Visibility = Visibility.Collapsed;
         ClearFiles();
 
-        if (data.TryGetProperty("workspace", out var workspaceEl))
+        var state = WorkspaceFilesModel.FromSessionFileList(result);
+        WorkspacePathText.Text = state.WorkspacePath;
+        _browserPath = state.BrowserPath;
+        _browserParentPath = state.BrowserParentPath;
+        UpdateBrowserChrome(state);
+
+        if (!state.Supported)
         {
-            var workspace = workspaceEl.GetString();
-            if (!string.IsNullOrEmpty(workspace))
-                WorkspacePathText.Text = workspace;
+            ShowUnsupported();
+            return;
         }
 
-        if (data.TryGetProperty("files", out var filesEl) && filesEl.ValueKind == JsonValueKind.Array)
+        foreach (var entry in state.Entries)
         {
-            foreach (var fileEl in filesEl.EnumerateArray())
-            {
-                var name = fileEl.TryGetProperty("name", out var nameEl) ? nameEl.GetString() ?? "" : "";
-                long size = fileEl.TryGetProperty("size", out var sizeEl) && sizeEl.ValueKind == JsonValueKind.Number ? sizeEl.GetInt64() : 0;
-                bool exists = !fileEl.TryGetProperty("exists", out var existsEl) || existsEl.ValueKind != JsonValueKind.False;
+            _allEntries.Add(entry);
+            _entriesByPath[entry.RelativePath] = entry;
+        }
 
-                if (!string.IsNullOrEmpty(name) && exists)
-                    AddFileItem(name, size);
-            }
+        if (_allEntries.Count == 0 && string.IsNullOrWhiteSpace(_searchQuery) && string.IsNullOrEmpty(_browserPath))
+        {
+            ShowNoFiles();
+            return;
         }
 
-        if (_fileItems.Count == 0)
+        HideFallback();
+        BodyGrid.Visibility = Visibility.Visible;
+        ApplyFilter();
+    }
+
+    private void ApplyLegacyAgentFilesList(JsonElement payload)
+    {
+        ClearFiles();
+
+        var state = WorkspaceFilesModel.FromLegacyAgentFilesList(payload);
+        WorkspacePathText.Text = state.WorkspacePath;
+        _browserPath = state.BrowserPath;
+        _browserParentPath = state.BrowserParentPath;
+        UpdateBrowserChrome(state);
+
+        foreach (var entry in state.Entries)
         {
-            FallbackInfoBar.IsOpen = true;
-            FallbackInfoBar.Message = LocalizationHelper.GetString("WorkspacePage_NoFilesMessage");
-            BodyGrid.Visibility = Visibility.Collapsed;
+            _allEntries.Add(entry);
+            _entriesByPath[entry.RelativePath] = entry;
         }
-        else
+
+        if (_allEntries.Count == 0)
         {
-            BodyGrid.Visibility = Visibility.Visible;
-            FileList.SelectedIndex = 0;
-            RequestSelectedFileIfNeeded();
+            ShowNoFiles();
+            return;
         }
+
+        HideFallback();
+        BodyGrid.Visibility = Visibility.Visible;
+        ApplyFilter();
     }
 
-    public void UpdateAgentFileContent(JsonElement data)
+    private void BeginLoading()
     {
-        if (!data.TryGetProperty("file", out var fileEl)) return;
+        HideFallback();
+        LoadingRing.IsActive = true;
+        LoadingPanel.Visibility = Visibility.Visible;
+        ClearFiles();
+        BrowserNoticeText.Visibility = Visibility.Collapsed;
+    }
+
+    private void EndLoading()
+    {
+        LoadingRing.IsActive = false;
+        LoadingPanel.Visibility = Visibility.Collapsed;
+    }
+
+    private void ApplyFilter()
+    {
+        var filtered = WorkspaceFilesModel.Filter(_allEntries, _searchQuery);
 
-        var name = fileEl.TryGetProperty("name", out var nameEl) ? nameEl.GetString() ?? "" : "";
-        var content = fileEl.TryGetProperty("content", out var contentEl) ? contentEl.GetString() ?? "" : "";
-        bool missing = fileEl.TryGetProperty("missing", out var missingEl) && missingEl.ValueKind == JsonValueKind.True;
+        FileList.SelectionChanged -= FileList_SelectionChanged;
+        FileList.Items.Clear();
+        foreach (var entry in filtered)
+            FileList.Items.Add(BuildFileRow(entry));
+        FileList.SelectionChanged += FileList_SelectionChanged;
 
-        if (string.IsNullOrEmpty(name) || !_fileItems.ContainsKey(name)) return;
+        FileCountText.Text = _allEntries.Count > 0
+            ? filtered.Count == _allEntries.Count ? $"({_allEntries.Count})" : $"({filtered.Count} of {_allEntries.Count})"
+            : string.Empty;
 
-        _fileContent[name] = missing ? null : content;
+        bool hasResults = filtered.Count > 0;
+        bool searching = !string.IsNullOrWhiteSpace(_searchQuery);
+        NoResultsText.Text = LocalizationHelper.GetString(searching
+            ? "WorkspacePage_NoSearchResults.Text"
+            : "WorkspacePage_NoFolderResults");
+        NoResultsText.Visibility = !hasResults ? Visibility.Visible : Visibility.Collapsed;
 
-        if (FileList.SelectedItem is ListViewItem selected &&
-            selected.Tag is string selectedName &&
-            string.Equals(selectedName, name, StringComparison.OrdinalIgnoreCase))
+        if (hasResults)
         {
-            RenderSelectedFile();
+            SelectInitialRow(filtered);
+        }
+        else
+        {
+            FileBodyPresenter.Content = null;
+            SelectedFileText.Text = string.Empty;
+            SelectedFileMeta.Visibility = Visibility.Collapsed;
+            ViewModeSelector.Visibility = Visibility.Collapsed;
+        }
+    }
+
+    private void SearchBox_TextChanged(AutoSuggestBox sender, AutoSuggestBoxTextChangedEventArgs args)
+    {
+        if (args.Reason != AutoSuggestionBoxTextChangeReason.UserInput &&
+            args.Reason != AutoSuggestionBoxTextChangeReason.ProgrammaticChange)
+        {
+            return;
         }
+        if (_suppressSearchTextChanged) return;
+        _searchQuery = sender.Text ?? string.Empty;
+        _searchDebounceTimer.Stop();
+        _searchDebounceTimer.Start();
     }
 
-    private void AddFileItem(string fileName, long size)
+    private void SelectInitialRow(IReadOnlyList<WorkspaceFilesModel.WorkspaceFileEntry> filtered)
     {
-        var stack = new StackPanel { Spacing = 2 };
+        int index = -1;
+        for (int i = 0; i < filtered.Count; i++)
+        {
+            if (filtered[i].CanPreview || !filtered[i].Exists)
+            {
+                index = i;
+                break;
+            }
+        }
+
+        if (index < 0)
+        {
+            FileList.SelectedIndex = -1;
+            SelectedFileText.Text = string.Empty;
+            SelectedFileMeta.Visibility = Visibility.Collapsed;
+            ViewModeSelector.Visibility = Visibility.Collapsed;
+            FileBodyPresenter.Content = null;
+            return;
+        }
+
+        FileList.SelectedIndex = index;
+    }
+
+    private ListViewItem BuildFileRow(WorkspaceFilesModel.WorkspaceFileEntry entry)
+    {
+        var row = new Grid { ColumnSpacing = 8 };
+        row.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
+        row.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
+        row.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
+
+        var glyph = new FontIcon
+        {
+            Glyph = entry.IsDirectory ? FluentIconCatalog.Folder : FluentIconCatalog.Document,
+            FontSize = 16,
+            VerticalAlignment = VerticalAlignment.Top,
+            Margin = new Thickness(0, 2, 0, 0),
+            IsTextScaleFactorEnabled = false,
+            Foreground = (Brush)Application.Current.Resources["TextFillColorSecondaryBrush"],
+        };
+        Grid.SetColumn(glyph, 0);
+        row.Children.Add(glyph);
+
+        var stack = new StackPanel { Spacing = 4 };
+        Grid.SetColumn(stack, 1);
+
         stack.Children.Add(new TextBlock
         {
-            Text = fileName,
+            Text = entry.Name,
             TextTrimming = TextTrimming.CharacterEllipsis,
-            TextWrapping = TextWrapping.NoWrap
+            TextWrapping = TextWrapping.NoWrap,
         });
-        if (size > 0)
+
+        var meta = BuildRowMeta(entry);
+        if (!string.IsNullOrEmpty(meta))
         {
             stack.Children.Add(new TextBlock
             {
-                Text = FormatSize(size),
+                Text = meta,
                 Style = (Style)Application.Current.Resources["CaptionTextBlockStyle"],
-                Foreground = (Brush)Application.Current.Resources["TextFillColorSecondaryBrush"]
+                Foreground = (Brush)Application.Current.Resources["TextFillColorSecondaryBrush"],
+                TextTrimming = TextTrimming.CharacterEllipsis,
+                TextWrapping = TextWrapping.NoWrap,
             });
         }
 
-        var item = new ListViewItem { Content = stack, Tag = fileName };
-        _fileItems[fileName] = item;
-        FileList.Items.Add(item);
+        row.Children.Add(stack);
+
+        var badges = BuildBadges(entry);
+        if (badges != null)
+        {
+            Grid.SetColumn(badges, 2);
+            row.Children.Add(badges);
+        }
+
+        var item = new ListViewItem { Content = row, Tag = entry.RelativePath };
+        AutomationProperties.SetName(item, BuildAutomationName(entry));
+        item.ContextFlyout = BuildRowContextFlyout(entry);
+        return item;
+    }
+
+    private MenuFlyout BuildRowContextFlyout(WorkspaceFilesModel.WorkspaceFileEntry entry)
+    {
+        var copyLabel = LocalizationHelper.GetString("WorkspacePage_CopyPath");
+        var copy = new MenuFlyoutItem
+        {
+            Text = copyLabel,
+            Tag = entry.RequestPath,
+            Icon = new FontIcon
+            {
+                Glyph = FluentIconCatalog.Copy,
+                FontSize = 16,
+                IsTextScaleFactorEnabled = false,
+            },
+        };
+        copy.Click += CopyPathButton_Click;
+
+        var menu = new MenuFlyout();
+        menu.Items.Add(copy);
+        return menu;
+    }
+
+    private static string BuildAutomationName(WorkspaceFilesModel.WorkspaceFileEntry entry)
+    {
+        var role = LocalizationHelper.GetString(entry.IsDirectory
+            ? "WorkspacePage_FileType_Folder"
+            : "WorkspacePage_FileType_File");
+        var parts = new List<string> { role, entry.Name };
+        var meta = BuildRowMeta(entry);
+        if (!string.IsNullOrEmpty(meta)) parts.Add(meta);
+        if (!entry.Exists) parts.Add(LocalizationHelper.GetString("WorkspacePage_Badge_Missing"));
+        if (entry.Touched) parts.Add(LocalizationHelper.GetString("WorkspacePage_Badge_Edited"));
+        else if (entry.Read) parts.Add(LocalizationHelper.GetString("WorkspacePage_Badge_Read"));
+        return string.Join(", ", parts);
+    }
+
+    // Second-line caption: parent folder · size. Modified time, when present,
+    // is shown in the detail header rather than crowding every row.
+    private static string BuildRowMeta(WorkspaceFilesModel.WorkspaceFileEntry entry)
+    {
+        var parts = new List<string>(2);
+        var dir = WorkspaceFilesModel.DirectoryOf(entry.RelativePath);
+        if (!string.IsNullOrEmpty(dir)) parts.Add(dir);
+        var size = WorkspaceFilesModel.FormatSize(entry.Size);
+        if (!string.IsNullOrEmpty(size)) parts.Add(size);
+        return string.Join(" · ", parts);
+    }
+
+    private StackPanel? BuildBadges(WorkspaceFilesModel.WorkspaceFileEntry entry)
+    {
+        var badges = new StackPanel
+        {
+            Orientation = Orientation.Horizontal,
+            Spacing = 4,
+            HorizontalAlignment = HorizontalAlignment.Right,
+            VerticalAlignment = VerticalAlignment.Top,
+        };
+
+        if (!entry.Exists)
+            badges.Children.Add(BuildBadge("WorkspacePage_Badge_Missing", "SystemFillColorCautionBrush"));
+        if (entry.Touched)
+            badges.Children.Add(BuildBadge("WorkspacePage_Badge_Edited", "AccentTextFillColorPrimaryBrush"));
+        else if (entry.Read)
+            badges.Children.Add(BuildBadge("WorkspacePage_Badge_Read", "TextFillColorSecondaryBrush"));
+
+        return badges.Children.Count > 0 ? badges : null;
+    }
+
+    private static Border BuildBadge(string resKey, string foregroundBrushKey)
+    {
+        return new Border
+        {
+            Background = (Brush)Application.Current.Resources["ControlFillColorSecondaryBrush"],
+            CornerRadius = new CornerRadius(4),
+            Padding = new Thickness(8, 0, 8, 0),
+            Child = new TextBlock
+            {
+                Text = LocalizationHelper.GetString(resKey),
+                Style = (Style)Application.Current.Resources["CaptionTextBlockStyle"],
+                Foreground = (Brush)Application.Current.Resources[foregroundBrushKey],
+            },
+        };
     }
 
     private void ClearFiles()
     {
+        FileList.SelectionChanged -= FileList_SelectionChanged;
         FileList.Items.Clear();
-        _fileItems.Clear();
+        FileList.SelectionChanged += FileList_SelectionChanged;
+        _allEntries.Clear();
+        _entriesByPath.Clear();
         _fileContent.Clear();
         FileBodyPresenter.Content = null;
         SelectedFileText.Text = string.Empty;
+        SelectedFileMeta.Visibility = Visibility.Collapsed;
+        FileCountText.Text = string.Empty;
+        NoResultsText.Visibility = Visibility.Collapsed;
         BodyGrid.Visibility = Visibility.Collapsed;
         ViewModeSelector.Visibility = Visibility.Collapsed;
     }
 
+    private string? SelectedRelativePath() =>
+        FileList.SelectedItem is ListViewItem { Tag: string path } ? path : null;
+
     private void FileList_SelectionChanged(object sender, SelectionChangedEventArgs e)
     {
-        if (FileList.SelectedItem is not ListViewItem selected ||
-            selected.Tag is not string fileName)
+        if (SelectedRelativePath() is not string relativePath ||
+            !_entriesByPath.TryGetValue(relativePath, out var entry))
+        {
+            return;
+        }
+
+        SelectedFileText.Text = entry.Name;
+        UpdateDetailMeta(entry);
+
+        if (entry.IsDirectory)
+        {
+            ViewModeSelector.Visibility = Visibility.Collapsed;
+            BrowseToPath(entry.RequestPath);
+            return;
+        }
+
+        ViewModeSelector.Visibility = IsMarkdown(entry.Name) ? Visibility.Visible : Visibility.Collapsed;
+
+        if (!entry.CanPreview)
         {
+            ViewModeSelector.Visibility = Visibility.Collapsed;
+            FileBodyPresenter.Content = BuildNoteBody(
+                LocalizationHelper.GetString("WorkspacePage_BrowserOnlyFileNote"));
             return;
         }
 
-        bool isMarkdown = IsMarkdown(fileName);
-        ViewModeSelector.Visibility = isMarkdown ? Visibility.Visible : Visibility.Collapsed;
-        SelectedFileText.Text = fileName;
+        // Files the list already reported as missing on disk never need a fetch.
+        if (!entry.Exists)
+        {
+            _fileContent[relativePath] = (FileBodyKind.Missing, null);
+            RenderSelectedFile();
+            return;
+        }
 
-        if (_fileContent.ContainsKey(fileName))
+        if (_fileContent.ContainsKey(relativePath))
         {
             RenderSelectedFile();
         }
         else
         {
             ShowLoadingBody();
-            if (CurrentApp.GatewayClient != null)
-                _ = CurrentApp.GatewayClient.RequestAgentFileGetAsync(AgentId, fileName);
+            _ = LoadFileAsync(entry);
+        }
+    }
+
+    private async Task LoadFileAsync(WorkspaceFilesModel.WorkspaceFileEntry entry)
+    {
+        var client = CurrentApp.GatewayClient;
+        var key = ResolveSessionKey();
+        if (client == null || string.IsNullOrWhiteSpace(key))
+        {
+            ShowFileUnavailable(entry.RelativePath);
+            return;
+        }
+
+        var token = _loadToken;
+        try
+        {
+            // Use the gateway's original path string, not the normalized display
+            // path, so the request matches exactly what the gateway indexed.
+            var result = await client.GetSessionFileAsync(key, entry.RequestPath);
+            if (token != _loadToken) return; // list reloaded underneath us
+
+            if (!result.IsSupported)
+            {
+                await StartLegacyAgentFileGetFallbackAsync(entry, token);
+                return;
+            }
+
+            if (result.Missing)
+                SetFileBody(entry.RelativePath, FileBodyKind.Missing, null);
+            else if (result.Content is null)
+                ShowFileUnavailable(entry.RelativePath);
+            else
+                SetFileBody(entry.RelativePath, FileBodyKind.Loaded, result.Content);
+        }
+        catch (Exception ex)
+        {
+            if (token != _loadToken) return;
+            // The gateway returns an error for missing / too-large files. Show it
+            // inline without caching so the user can retry by reselecting.
+            Services.Logger.Warn($"[WorkspacePage] sessions.files.get failed for '{entry.RequestPath}': {ex.Message}");
+            ShowFileUnavailable(entry.RelativePath);
+        }
+    }
+
+    private async Task StartLegacyAgentFileGetFallbackAsync(
+        WorkspaceFilesModel.WorkspaceFileEntry entry,
+        int token)
+    {
+        var client = CurrentApp.GatewayClient;
+        if (client == null)
+        {
+            ShowFileUnavailable(entry.RelativePath);
+            return;
+        }
+
+        _usingLegacyAgentFilesFallback = true;
+        try
+        {
+            await client.RequestAgentFileGetAsync(AgentId, entry.RequestPath);
+        }
+        catch (Exception ex)
+        {
+            if (token != _loadToken) return;
+            Services.Logger.Warn($"[WorkspacePage] agents.files.get fallback failed for '{entry.RequestPath}': {ex.Message}");
+            ShowFileUnavailable(entry.RelativePath);
         }
     }
 
-    private void RequestSelectedFileIfNeeded()
+    private void ApplyLegacyAgentFileContent(JsonElement payload)
     {
-        if (FileList.SelectedItem is not ListViewItem selected ||
-            selected.Tag is not string fileName ||
-            _fileContent.ContainsKey(fileName))
+        if (payload.ValueKind != JsonValueKind.Object ||
+            !payload.TryGetProperty("file", out var fileEl) ||
+            fileEl.ValueKind != JsonValueKind.Object)
+        {
+            return;
+        }
+
+        var name = GetString(fileEl, "path") ?? GetString(fileEl, "name");
+        if (string.IsNullOrEmpty(name)) return;
+
+        var entry = _entriesByPath.Values.FirstOrDefault(e =>
+            string.Equals(e.RequestPath, name, StringComparison.OrdinalIgnoreCase) ||
+            string.Equals(e.RelativePath, name, StringComparison.OrdinalIgnoreCase) ||
+            string.Equals(e.Name, name, StringComparison.OrdinalIgnoreCase));
+        if (entry == null) return;
+
+        bool missing = GetBool(fileEl, "missing") ?? false;
+        if (missing)
         {
+            SetFileBody(entry.RelativePath, FileBodyKind.Missing, null);
             return;
         }
 
-        ShowLoadingBody();
-        if (CurrentApp.GatewayClient != null)
-            _ = CurrentApp.GatewayClient.RequestAgentFileGetAsync(AgentId, fileName);
+        var content = GetString(fileEl, "content");
+        if (content is null)
+            ShowFileUnavailable(entry.RelativePath);
+        else
+            SetFileBody(entry.RelativePath, FileBodyKind.Loaded, content);
+    }
+
+    // Cache a stable body outcome (loaded content or confirmed-missing) and
+    // render it if the file is still selected.
+    private void SetFileBody(string relativePath, FileBodyKind kind, string? content)
+    {
+        _fileContent[relativePath] = (kind, content);
+        if (string.Equals(SelectedRelativePath(), relativePath, StringComparison.Ordinal))
+            RenderSelectedFile();
+    }
+
+    // Transient/unavailable error: shown inline but NOT cached, so re-selecting
+    // the file retries the fetch instead of permanently reading as "missing".
+    private void ShowFileUnavailable(string relativePath)
+    {
+        if (string.Equals(SelectedRelativePath(), relativePath, StringComparison.Ordinal))
+        {
+            FileBodyPresenter.Content = BuildNoteBody(
+                LocalizationHelper.GetString("WorkspacePage_FileUnavailable"));
+        }
+    }
+
+    private void UpdateDetailMeta(WorkspaceFilesModel.WorkspaceFileEntry entry)
+    {
+        var parts = new List<string>(3);
+        var size = WorkspaceFilesModel.FormatSize(entry.Size);
+        if (!string.IsNullOrEmpty(size)) parts.Add(size);
+        if (entry.ModifiedUtc is { } modified)
+            parts.Add(modified.ToLocalTime().ToString("g"));
+        if (!entry.Exists)
+            parts.Add(LocalizationHelper.GetString("WorkspacePage_Badge_Missing"));
+
+        if (parts.Count > 0)
+        {
+            SelectedFileMeta.Text = string.Join(" · ", parts);
+            SelectedFileMeta.Visibility = Visibility.Visible;
+        }
+        else
+        {
+            SelectedFileMeta.Visibility = Visibility.Collapsed;
+        }
     }
 
     private void ViewModeSelector_SelectionChanged(SelectorBar sender, SelectorBarSelectionChangedEventArgs args)
@@ -252,39 +735,42 @@ private void ShowLoadingBody()
         FileBodyPresenter.Content = loading;
     }
 
+    private static TextBlock BuildNoteBody(string text) => new()
+    {
+        Text = text,
+        Style = (Style)Application.Current.Resources["BodyTextBlockStyle"],
+        Foreground = (Brush)Application.Current.Resources["TextFillColorSecondaryBrush"]
+    };
+
     private void RenderSelectedFile()
     {
-        if (FileList.SelectedItem is not ListViewItem selected ||
-            selected.Tag is not string fileName)
+        if (SelectedRelativePath() is not string relativePath)
         {
             FileBodyPresenter.Content = null;
             return;
         }
 
-        if (!_fileContent.TryGetValue(fileName, out var content))
+        if (!_fileContent.TryGetValue(relativePath, out var body))
         {
             ShowLoadingBody();
             return;
         }
 
-        if (content == null)
+        if (body.Kind == FileBodyKind.Missing || body.Content == null)
         {
-            FileBodyPresenter.Content = new TextBlock
-            {
-                Text = LocalizationHelper.GetString("WorkspacePage_MissingFile"),
-                Style = (Style)Application.Current.Resources["BodyTextBlockStyle"],
-                Foreground = (Brush)Application.Current.Resources["TextFillColorSecondaryBrush"]
-            };
+            FileBodyPresenter.Content = BuildNoteBody(
+                LocalizationHelper.GetString("WorkspacePage_MissingFile"));
             return;
         }
 
-        if (IsMarkdown(fileName) && _renderMarkdown)
+        var name = _entriesByPath.TryGetValue(relativePath, out var entry) ? entry.Name : relativePath;
+        if (IsMarkdown(name) && _renderMarkdown)
         {
-            FileBodyPresenter.Content = BuildMarkdownView(content);
+            FileBodyPresenter.Content = BuildMarkdownView(body.Content);
         }
         else
         {
-            FileBodyPresenter.Content = BuildRawView(content);
+            FileBodyPresenter.Content = BuildRawView(body.Content);
         }
     }
 
@@ -550,20 +1036,136 @@ private static string StripLinks(string text)
 
     private void RefreshButton_Click(object sender, RoutedEventArgs e)
     {
-        if (CurrentApp.GatewayClient != null)
+        _ = LoadAsync();
+    }
+
+    private void ParentFolderButton_Click(object sender, RoutedEventArgs e)
+    {
+        if (_browserParentPath is not null)
+            BrowseToPath(_browserParentPath);
+    }
+
+    private void CopyPathButton_Click(object sender, RoutedEventArgs e)
+    {
+        if (sender is not FrameworkElement { Tag: string path } || string.IsNullOrWhiteSpace(path))
+            return;
+
+        try
+        {
+            var data = new DataPackage();
+            data.SetText(path);
+            Clipboard.SetContent(data);
+        }
+        catch (Exception ex)
+        {
+            Services.Logger.Warn($"[WorkspacePage] Clipboard copy failed: {ex.Message}");
+            BrowserNoticeText.Text = LocalizationHelper.GetString("WorkspacePage_CopyPathFailed");
+            BrowserNoticeText.Visibility = Visibility.Visible;
+        }
+    }
+
+    private void BrowseToPath(string? path)
+    {
+        _browserPath = WorkspaceFilesModel.NormalizeBrowserPath(path);
+        _suppressSearchTextChanged = true;
+        try
+        {
+            SearchBox.Text = string.Empty;
+            _searchQuery = string.Empty;
+        }
+        finally
         {
-            LoadingRing.IsActive = true;
-            LoadingPanel.Visibility = Visibility.Visible;
-            FallbackInfoBar.IsOpen = false;
-            ClearFiles();
-            _ = CurrentApp.GatewayClient.RequestAgentFilesListAsync(AgentId);
+            _suppressSearchTextChanged = false;
         }
+        _ = LoadAsync();
+    }
+
+    private void UpdateBrowserChrome(WorkspaceFilesModel.WorkspaceListState state)
+    {
+        bool searching = !string.IsNullOrWhiteSpace(state.BrowserSearch);
+        ParentFolderButton.IsEnabled = !searching && state.BrowserParentPath is not null;
+        CurrentFolderText.Text = searching
+            ? LocalizationHelper.Format("WorkspacePage_SearchResultsPath", state.BrowserSearch.Trim())
+            : string.IsNullOrEmpty(state.BrowserPath)
+                ? LocalizationHelper.GetString("WorkspacePage_RootFolder")
+                : state.BrowserPath;
+
+        if (state.BrowserTruncated)
+        {
+            BrowserNoticeText.Text = LocalizationHelper.GetString("WorkspacePage_BrowserTruncated");
+            BrowserNoticeText.Visibility = Visibility.Visible;
+        }
+        else
+        {
+            BrowserNoticeText.Visibility = Visibility.Collapsed;
+        }
+    }
+
+    private void RepairLink_Click(object sender, RoutedEventArgs e)
+        => ((IAppCommands)CurrentApp).Navigate("connection");
+
+    private void HideFallback()
+    {
+        FallbackInfoBar.IsOpen = false;
+        RepairLink.Visibility = Visibility.Collapsed;
+    }
+
+    private void ShowLoadError()
+    {
+        EndLoading();
+        ClearFiles();
+        FallbackInfoBar.Severity = InfoBarSeverity.Warning;
+        FallbackInfoBar.Message = LocalizationHelper.GetString("WorkspacePage_LoadErrorMessage");
+        RepairLink.Visibility = Visibility.Collapsed;
+        FallbackInfoBar.IsOpen = true;
+    }
+
+    // Gateway unreachable: offer a one-tap route to Connection settings so the
+    // user can repair pairing instead of hitting a silent dead end.
+    private void ShowDisconnected()
+    {
+        EndLoading();
+        ClearFiles();
+        WorkspacePathText.Text = string.Empty;
+        FallbackInfoBar.Severity = InfoBarSeverity.Warning;
+        FallbackInfoBar.Message = LocalizationHelper.GetString("WorkspacePage_DisconnectedMessage");
+        RepairLink.Visibility = Visibility.Visible;
+        FallbackInfoBar.IsOpen = true;
+    }
+
+    // Connected gateway that doesn't implement sessions.files.list (older
+    // gateway) or errored serving it. Same repair affordance, distinct copy so
+    // the user knows it's a capability gap.
+    private void ShowUnsupported()
+    {
+        EndLoading();
+        FallbackInfoBar.Severity = InfoBarSeverity.Warning;
+        FallbackInfoBar.Message = LocalizationHelper.GetString("WorkspacePage_UnsupportedMessage");
+        RepairLink.Visibility = Visibility.Visible;
+        FallbackInfoBar.IsOpen = true;
+        BodyGrid.Visibility = Visibility.Collapsed;
+    }
+
+    private void ShowNoFiles()
+    {
+        FallbackInfoBar.Severity = InfoBarSeverity.Informational;
+        FallbackInfoBar.Message = LocalizationHelper.GetString("WorkspacePage_NoFilesMessage");
+        RepairLink.Visibility = Visibility.Collapsed;
+        FallbackInfoBar.IsOpen = true;
+        BodyGrid.Visibility = Visibility.Collapsed;
+    }
+
+    private static string? GetString(JsonElement item, string name)
+    {
+        return item.TryGetProperty(name, out var value) && value.ValueKind == JsonValueKind.String
+            ? value.GetString()
+            : null;
     }
 
-    private static string FormatSize(long bytes)
+    private static bool? GetBool(JsonElement item, string name)
     {
-        if (bytes < 1024) return $"{bytes} B";
-        if (bytes < 1024 * 1024) return $"{bytes / 1024.0:F1} KB";
-        return $"{bytes / (1024.0 * 1024.0):F1} MB";
+        return item.TryGetProperty(name, out var value) && value.ValueKind is JsonValueKind.True or JsonValueKind.False
+            ? value.GetBoolean()
+            : null;
     }
 }
diff --git a/src/OpenClaw.Tray.WinUI/Services/AppNotificationMapper.cs b/src/OpenClaw.Tray.WinUI/Services/AppNotificationMapper.cs
new file mode 100644
index 000000000..602c95a83
--- /dev/null
+++ b/src/OpenClaw.Tray.WinUI/Services/AppNotificationMapper.cs
@@ -0,0 +1,116 @@
+using OpenClaw.Shared;
+using OpenClaw.Shared.Capabilities;
+using System;
+using System.Security.Cryptography;
+using System.Text;
+
+namespace OpenClawTray.Services;
+
+internal static class AppNotificationMapper
+{
+    public static AppNotification FromGatewayNotification(OpenClawNotification notification, string? chatActionLabel = null)
+    {
+        ArgumentNullException.ThrowIfNull(notification);
+
+        var title = NormalizeTitle(notification.Title);
+        var message = NormalizeMessage(notification.Message, title);
+        var category = NormalizeCategory(notification.Type);
+        var hasChatAction = notification.IsChat && !string.IsNullOrWhiteSpace(chatActionLabel);
+
+        return new AppNotification
+        {
+            Title = title,
+            Message = message,
+            Source = "gateway",
+            Category = category,
+            Severity = SeverityFromGatewayType(category),
+            DedupeKey = BuildDedupeKey(
+                "gateway",
+                notification.Type,
+                notification.Title,
+                notification.Message,
+                notification.SessionKey),
+            ActionLabel = hasChatAction ? chatActionLabel : null,
+            ActionRoute = hasChatAction ? GetChatActionRoute(notification.SessionKey) : null
+        };
+    }
+
+    public static AppNotification FromNodeSystemNotification(SystemNotifyArgs args)
+    {
+        ArgumentNullException.ThrowIfNull(args);
+
+        var title = NormalizeTitle(args.Title);
+        var message = NormalizeMessage(args.Body, title);
+
+        return new AppNotification
+        {
+            Title = title,
+            Message = message,
+            Source = "node",
+            Category = "system.notify",
+            Severity = SeverityFromText(title, message),
+            DedupeKey = BuildDedupeKey("node-system-notify", args.Title, args.Body)
+        };
+    }
+
+    public static AppNotification FromNodeActivity(
+        string title,
+        string message,
+        string category,
+        AppNotificationSeverity severity,
+        string dedupeKey)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(category);
+        ArgumentException.ThrowIfNullOrWhiteSpace(dedupeKey);
+
+        var normalizedTitle = NormalizeTitle(title);
+        return new AppNotification
+        {
+            Title = normalizedTitle,
+            Message = NormalizeMessage(message, normalizedTitle),
+            Source = "node",
+            Category = category.Trim(),
+            Severity = severity,
+            DedupeKey = dedupeKey.Trim()
+        };
+    }
+
+    private static AppNotificationSeverity SeverityFromGatewayType(string? type) => type?.Trim().ToLowerInvariant() switch
+    {
+        "error" => AppNotificationSeverity.Error,
+        "urgent" or "health" => AppNotificationSeverity.Warning,
+        _ => AppNotificationSeverity.Informational
+    };
+
+    private static AppNotificationSeverity SeverityFromText(string title, string message)
+    {
+        var text = string.Concat(title, " ", message);
+        return text.Contains("error", StringComparison.OrdinalIgnoreCase) ||
+            text.Contains("failed", StringComparison.OrdinalIgnoreCase) ||
+            text.Contains("blocked", StringComparison.OrdinalIgnoreCase) ||
+            text.Contains("denied", StringComparison.OrdinalIgnoreCase)
+                ? AppNotificationSeverity.Error
+                : AppNotificationSeverity.Informational;
+    }
+
+    private static string NormalizeTitle(string? title) =>
+        string.IsNullOrWhiteSpace(title) ? "OpenClaw" : title.Trim();
+
+    private static string NormalizeMessage(string? message, string title) =>
+        string.IsNullOrWhiteSpace(message) ? title : message.Trim();
+
+    private static string NormalizeCategory(string? category) =>
+        string.IsNullOrWhiteSpace(category) ? "info" : category.Trim();
+
+    private static string GetChatActionRoute(string? sessionKey) =>
+        string.IsNullOrWhiteSpace(sessionKey)
+            ? "chat"
+            : AppNotificationActionRoutes.Chat(sessionKey);
+
+    private static string BuildDedupeKey(string scope, params string?[] parts)
+    {
+        var raw = string.Join("\u001f", parts.Select(part => part?.Trim() ?? string.Empty));
+        var hash = Convert.ToHexString(SHA256.HashData(Encoding.UTF8.GetBytes(raw))).ToLowerInvariant();
+        return $"{scope}:{hash}";
+    }
+}
diff --git a/src/OpenClaw.Tray.WinUI/Services/AppNotificationPublisher.cs b/src/OpenClaw.Tray.WinUI/Services/AppNotificationPublisher.cs
new file mode 100644
index 000000000..13ba66d09
--- /dev/null
+++ b/src/OpenClaw.Tray.WinUI/Services/AppNotificationPublisher.cs
@@ -0,0 +1,104 @@
+using Microsoft.Toolkit.Uwp.Notifications;
+using System;
+using System.Collections.Generic;
+using System.Runtime.ExceptionServices;
+
+namespace OpenClawTray.Services;
+
+internal sealed record AppNotificationPublishRequest(
+    AppNotification? AppNotification = null,
+    ToastContentBuilder? ToastBuilder = null,
+    string? ToastTag = null,
+    string? ToastDeviceId = null);
+
+internal interface IToastNotificationPublisher
+{
+    void ShowToast(ToastContentBuilder builder, string? toastTag = null, string? deviceId = null);
+}
+
+internal static class AppNotificationPublisher
+{
+    public static void Publish(
+        AppNotificationService? appNotificationService,
+        IToastNotificationPublisher? toastService,
+        AppNotificationPublishRequest request)
+    {
+        Action<ToastContentBuilder, string?, string?>? showToast = toastService is null
+            ? null
+            : (builder, tag, deviceId) => toastService.ShowToast(builder, tag, deviceId);
+        Publish(appNotificationService, showToast, request);
+    }
+
+    internal static void Publish(
+        AppNotificationService? appNotificationService,
+        Action<ToastContentBuilder, string?, string?>? showToast,
+        AppNotificationPublishRequest request)
+    {
+        ArgumentNullException.ThrowIfNull(request);
+        if (request.AppNotification is null && request.ToastBuilder is null)
+            throw new ArgumentException("Publish request must include an app notification, a toast builder, or both.", nameof(request));
+
+        List<Exception>? failures = null;
+
+        if (request.ToastBuilder is not null && showToast is not null)
+        {
+            try
+            {
+                showToast(request.ToastBuilder, request.ToastTag, request.ToastDeviceId);
+            }
+            catch (Exception ex)
+            {
+                (failures ??= new()).Add(ex);
+            }
+        }
+
+        if (request.AppNotification is not null && appNotificationService is not null)
+        {
+            try
+            {
+                appNotificationService.Show(request.AppNotification);
+            }
+            catch (Exception ex)
+            {
+                (failures ??= new()).Add(ex);
+            }
+        }
+
+        if (failures is null)
+            return;
+
+        if (failures.Count == 1)
+            ExceptionDispatchInfo.Capture(failures[0]).Throw();
+
+        throw new AggregateException(failures);
+    }
+
+    public static void Show(
+        AppNotificationService? service,
+        string title,
+        string message,
+        string source,
+        string category,
+        AppNotificationSeverity severity,
+        string dedupeKey,
+        string actionRoute,
+        string actionLabel,
+        string? id = null)
+    {
+        if (service is null)
+            return;
+
+        service.Show(new AppNotification
+        {
+            Id = id ?? "",
+            Title = title,
+            Message = message,
+            Source = source,
+            Category = category,
+            Severity = severity,
+            DedupeKey = dedupeKey,
+            ActionRoute = actionRoute,
+            ActionLabel = actionLabel
+        });
+    }
+}
diff --git a/src/OpenClaw.Tray.WinUI/Services/AppNotificationService.cs b/src/OpenClaw.Tray.WinUI/Services/AppNotificationService.cs
index f399e098f..04ef57a63 100644
--- a/src/OpenClaw.Tray.WinUI/Services/AppNotificationService.cs
+++ b/src/OpenClaw.Tray.WinUI/Services/AppNotificationService.cs
@@ -43,24 +43,75 @@ public sealed record AppNotificationSnapshot(
     public bool HasMultipleActiveNotifications => ActiveNotifications.Count > 1;
 }
 
+internal static class AppNotificationActionRoutes
+{
+    private const string ChatPrefix = "chat:";
+
+    public static string Chat(string sessionKey) =>
+        ChatPrefix + Uri.EscapeDataString(sessionKey);
+
+    public static bool TryGetChatSessionKey(string? route, out string? sessionKey)
+    {
+        sessionKey = null;
+        if (string.IsNullOrWhiteSpace(route) ||
+            !route.StartsWith(ChatPrefix, StringComparison.OrdinalIgnoreCase))
+        {
+            return false;
+        }
+
+        var encoded = route[ChatPrefix.Length..];
+        if (string.IsNullOrWhiteSpace(encoded))
+            return false;
+
+        sessionKey = Uri.UnescapeDataString(encoded);
+        return !string.IsNullOrWhiteSpace(sessionKey);
+    }
+}
+
 internal sealed class AppNotificationBannerState
 {
+    private const string ConnectionSource = "connection";
     private readonly HashSet<string> _hiddenNotificationIds = new(StringComparer.Ordinal);
 
     public AppNotification? SelectVisibleNotification(AppNotificationSnapshot snapshot, bool revealHiddenIfNeeded = false)
     {
         PruneRemovedNotifications(snapshot);
-        var visible = snapshot.ActiveNotifications.FirstOrDefault(notification =>
-            !_hiddenNotificationIds.Contains(notification.Id));
+
+        var visibleCandidates = snapshot.ActiveNotifications
+            .Where(notification => !_hiddenNotificationIds.Contains(notification.Id))
+            .ToList();
+
+        // Connection issues are the most actionable banner (they route the user
+        // to the Connection page), so surface them ahead of any earlier,
+        // unrelated notification that happens to be current. Without this, a
+        // connection failure arriving while another notification is showing
+        // would be queued behind it and the user couldn't reach Connection.
+        // Among connection-source notifications, prefer one that actually has an
+        // action: an action-less connection notification (e.g. a transient
+        // gateway-host failure) must not mask a real connection error and
+        // degrade the banner to "Show more".
+        var visible = visibleCandidates.FirstOrDefault(IsActionableConnectionPriority)
+            ?? visibleCandidates.FirstOrDefault(IsConnectionPriority)
+            ?? visibleCandidates.FirstOrDefault();
         if (visible is not null || !revealHiddenIfNeeded)
             return visible;
 
-        var fallback = snapshot.ActiveNotifications.FirstOrDefault();
+        var fallback = snapshot.ActiveNotifications.FirstOrDefault(IsActionableConnectionPriority)
+            ?? snapshot.ActiveNotifications.FirstOrDefault(IsConnectionPriority)
+            ?? snapshot.ActiveNotifications.FirstOrDefault();
         if (fallback is not null)
             _hiddenNotificationIds.Remove(fallback.Id);
         return fallback;
     }
 
+    private static bool IsConnectionPriority(AppNotification notification) =>
+        string.Equals(notification.Source, ConnectionSource, StringComparison.OrdinalIgnoreCase);
+
+    private static bool IsActionableConnectionPriority(AppNotification notification) =>
+        IsConnectionPriority(notification)
+        && !string.IsNullOrWhiteSpace(notification.ActionLabel)
+        && !string.IsNullOrWhiteSpace(notification.ActionRoute);
+
     public void HideActiveNotifications(AppNotificationSnapshot snapshot)
     {
         PruneRemovedNotifications(snapshot);
@@ -84,6 +135,7 @@ public sealed class AppNotificationChangedEventArgs(AppNotificationSnapshot snap
 
 internal sealed class AppNotificationService
 {
+    private const int MaxActiveNotifications = 100;
     private readonly object _gate = new();
     private readonly List<AppNotification> _queue = new();
     private AppNotification? _current;
@@ -119,6 +171,7 @@ public void Show(AppNotification notification)
             else
             {
                 _queue.Add(normalized);
+                PruneQueueLocked();
                 snapshot = CreateSnapshotLocked();
             }
         }
@@ -169,6 +222,37 @@ public void Dismiss(string notificationId)
             RaiseChanged(snapshot);
     }
 
+    public void DismissByDedupeKey(string dedupeKey)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(dedupeKey);
+
+        AppNotificationSnapshot snapshot;
+        var changed = false;
+        lock (_gate)
+        {
+            if (_current is not null &&
+                string.Equals(_current.DedupeKey, dedupeKey, StringComparison.OrdinalIgnoreCase))
+            {
+                _current = _queue.Count > 0 ? DequeueLocked() : null;
+                changed = true;
+            }
+
+            for (var i = _queue.Count - 1; i >= 0; i--)
+            {
+                if (!string.Equals(_queue[i].DedupeKey, dedupeKey, StringComparison.OrdinalIgnoreCase))
+                    continue;
+
+                _queue.RemoveAt(i);
+                changed = true;
+            }
+
+            snapshot = CreateSnapshotLocked();
+        }
+
+        if (changed)
+            RaiseChanged(snapshot);
+    }
+
     public void ClearAll()
     {
         AppNotificationSnapshot snapshot;
@@ -296,6 +380,13 @@ private AppNotification DequeueLocked()
         return next;
     }
 
+    private void PruneQueueLocked()
+    {
+        var maxQueued = _current is null ? MaxActiveNotifications : MaxActiveNotifications - 1;
+        while (_queue.Count > maxQueued)
+            _queue.RemoveAt(0);
+    }
+
     private AppNotificationSnapshot CreateSnapshotLocked()
     {
         var queued = _queue.ToList();
diff --git a/src/OpenClaw.Tray.WinUI/Services/AppStateSnapshot.cs b/src/OpenClaw.Tray.WinUI/Services/AppStateSnapshot.cs
index 979a2b1a9..58c9efec5 100644
--- a/src/OpenClaw.Tray.WinUI/Services/AppStateSnapshot.cs
+++ b/src/OpenClaw.Tray.WinUI/Services/AppStateSnapshot.cs
@@ -9,6 +9,7 @@ namespace OpenClawTray.Services;
 internal sealed record AppStateSnapshot
 {
     public ConnectionStatus Status              { get; init; }
+    public OverallConnectionState? OverallState { get; init; }
     public DateTime LastCheckTime               { get; init; }
     public ChannelHealth[] Channels             { get; init; } = [];
     public SessionInfo[] Sessions               { get; init; } = [];
@@ -21,6 +22,8 @@ internal sealed record AppStateSnapshot
     public UpdateCommandCenterInfo LastUpdateInfo { get; init; } = new();
     public SettingsManager? Settings            { get; init; }
     public NodeService? NodeService             { get; init; }
+    public bool IsMcpRunning                    { get; init; }
+    public string? McpStartupError              { get; init; }
     public PairingApprovalKind NodePairingApprovalKind { get; init; }
     public string? NodePairingRequestId         { get; init; }
     public SshTunnelSnapshot? SshTunnelSnapshot   { get; init; }
diff --git a/src/OpenClaw.Tray.WinUI/Services/AssistantBridgeService.cs b/src/OpenClaw.Tray.WinUI/Services/AssistantBridgeService.cs
new file mode 100644
index 000000000..3f6572a1f
--- /dev/null
+++ b/src/OpenClaw.Tray.WinUI/Services/AssistantBridgeService.cs
@@ -0,0 +1,449 @@
+using OpenClaw.Shared;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.IO;
+using System.Text;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace OpenClawTray.Services;
+
+internal sealed class AssistantBridgeService
+{
+    private static readonly TimeSpan DefaultTimeout = TimeSpan.FromSeconds(20);
+    private readonly IOpenClawLogger _logger;
+    private readonly string _userId;
+    private readonly OpenClawCliLauncher? _launcher;
+    private readonly TimeSpan _timeout;
+
+    public AssistantBridgeService(IOpenClawLogger logger, string userId = "owner")
+        : this(logger, userId, ResolveOpenClawCli)
+    {
+    }
+
+    internal AssistantBridgeService(
+        IOpenClawLogger logger,
+        string userId,
+        Func<OpenClawCliLauncher?> launcherResolver,
+        TimeSpan? commandTimeout = null)
+    {
+        _logger = logger;
+        _userId = string.IsNullOrWhiteSpace(userId) ? "owner" : userId;
+        _launcher = launcherResolver();
+        _timeout = commandTimeout ?? DefaultTimeout;
+
+        var overrideRoot = Environment.GetEnvironmentVariable("OPENCLAW_BACKEND_ROOT");
+        if (!string.IsNullOrWhiteSpace(overrideRoot))
+        {
+            if (TryNormalizeBackendRoot(overrideRoot, out var normalizedOverrideRoot))
+            {
+                if (_launcher != null &&
+                    string.Equals(_launcher.WorkingDirectory, normalizedOverrideRoot, StringComparison.OrdinalIgnoreCase))
+                {
+                    _logger.Info($"Assistant bridge using OPENCLAW_BACKEND_ROOT launcher at '{_launcher.WorkingDirectory}'.");
+                }
+            }
+            else
+            {
+                _logger.Warn("Assistant bridge ignored OPENCLAW_BACKEND_ROOT because it is not a fully qualified local checkout under a trusted parent.");
+            }
+        }
+    }
+
+    public async Task<AssistantBridgeSnapshot> GetStatusAsync(CancellationToken cancellationToken = default)
+    {
+        var result = await RunOpenClawAsync(["dashboard", "bridge", "status", "--user", _userId, "--json"], cancellationToken);
+        if (!result.Success)
+            return AssistantBridgeSnapshot.Unavailable(result.ErrorMessage);
+
+        try
+        {
+            return ParseStatus(result.Stdout);
+        }
+        catch (JsonException ex)
+        {
+            _logger.Warn($"Assistant bridge status JSON could not be parsed: {ex.Message}");
+            return AssistantBridgeSnapshot.Unavailable("OpenClaw returned status JSON the Companion could not read.");
+        }
+    }
+
+    public Task<AssistantCommandResult> StartListenServiceAsync(CancellationToken cancellationToken = default) =>
+        RunCommandAsync(
+            ["assistant", "listen-service", "start", "--user", _userId, "--store-turn", "--json"],
+            cancellationToken);
+
+    public Task<AssistantCommandResult> StopListenServiceAsync(CancellationToken cancellationToken = default) =>
+        RunCommandAsync(
+            ["assistant", "listen-service", "stop", "--user", _userId, "--json"],
+            cancellationToken);
+
+    private async Task<AssistantCommandResult> RunCommandAsync(IReadOnlyList<string> args, CancellationToken cancellationToken)
+    {
+        var result = await RunOpenClawAsync(args, cancellationToken);
+        return new AssistantCommandResult(result.Success, result.ErrorMessage);
+    }
+
+    private async Task<AssistantProcessResult> RunOpenClawAsync(
+        IReadOnlyList<string> args,
+        CancellationToken cancellationToken)
+    {
+        var launcher = _launcher;
+        if (launcher == null)
+            return AssistantProcessResult.Failed(BuildBackendNotFoundMessage());
+
+        var psi = new ProcessStartInfo
+        {
+            FileName = launcher.ExecutablePath,
+            WorkingDirectory = launcher.WorkingDirectory,
+            RedirectStandardOutput = true,
+            RedirectStandardError = true,
+            UseShellExecute = false,
+            CreateNoWindow = true,
+            StandardOutputEncoding = Encoding.UTF8,
+            StandardErrorEncoding = Encoding.UTF8
+        };
+
+        foreach (var arg in launcher.PrefixArgs)
+            psi.ArgumentList.Add(arg);
+        foreach (var arg in args)
+            psi.ArgumentList.Add(arg);
+
+        try
+        {
+            using var process = new Process { StartInfo = psi };
+            if (!process.Start())
+                return AssistantProcessResult.Failed("Could not start the OpenClaw backend command.");
+
+            using var timeoutCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
+            timeoutCts.CancelAfter(_timeout);
+
+            var stdoutTask = process.StandardOutput.ReadToEndAsync(timeoutCts.Token);
+            var stderrTask = process.StandardError.ReadToEndAsync(timeoutCts.Token);
+            var timedOut = false;
+            try
+            {
+                await process.WaitForExitAsync(timeoutCts.Token).ConfigureAwait(false);
+            }
+            catch (OperationCanceledException) when (!cancellationToken.IsCancellationRequested)
+            {
+                timedOut = true;
+                TryKillProcessTree(process);
+            }
+            catch (OperationCanceledException)
+            {
+                TryKillProcessTree(process);
+                throw;
+            }
+
+            var stdout = await ReadProcessStreamAsync(stdoutTask).ConfigureAwait(false);
+            var stderr = await ReadProcessStreamAsync(stderrTask).ConfigureAwait(false);
+            if (timedOut)
+                return AssistantProcessResult.Failed("OpenClaw backend command timed out.");
+
+            if (process.ExitCode != 0)
+            {
+                var detail = string.IsNullOrWhiteSpace(stderr) ? "OpenClaw backend command failed." : stderr.Trim();
+                return AssistantProcessResult.Failed(detail);
+            }
+
+            return new AssistantProcessResult(true, stdout, "");
+        }
+        catch (OperationCanceledException)
+        {
+            throw;
+        }
+        catch (Exception ex)
+        {
+            _logger.Warn($"Assistant bridge command failed to start: {ex.Message}");
+            return AssistantProcessResult.Failed("OpenClaw backend command could not be started.");
+        }
+    }
+
+    private static async Task<string> ReadProcessStreamAsync(Task<string> streamTask)
+    {
+        try
+        {
+            return await streamTask.ConfigureAwait(false);
+        }
+        catch (OperationCanceledException)
+        {
+            return "";
+        }
+        catch (IOException)
+        {
+            return "";
+        }
+        catch (ObjectDisposedException)
+        {
+            return "";
+        }
+    }
+
+    private static void TryKillProcessTree(Process process)
+    {
+        try
+        {
+            process.Kill(entireProcessTree: true);
+        }
+        catch (InvalidOperationException)
+        {
+        }
+        catch (Win32Exception)
+        {
+        }
+        catch (NotSupportedException)
+        {
+        }
+    }
+
+    internal static AssistantBridgeSnapshot ParseStatus(string json)
+    {
+        using var doc = JsonDocument.Parse(json);
+        var root = doc.RootElement;
+        var generatedAt = ReadString(root, "generated_at");
+        var assistant = ReadObject(root, "assistant");
+        var voice = ReadObject(root, "voice");
+
+        var listen = AssistantListenServiceSnapshot.Empty;
+        if (assistant.HasValue && assistant.Value.TryGetProperty("listen_service", out var listenElement))
+        {
+            listen = new AssistantListenServiceSnapshot(
+                ReadString(listenElement, "status"),
+                ReadBool(listenElement, "configured"),
+                ReadNullableInt(listenElement, "pid"),
+                ReadBool(listenElement, "stop_requested"),
+                ReadBool(listenElement, "allow_cloud"),
+                ReadBool(listenElement, "speak_aloud"),
+                ReadString(listenElement, "transcriber"),
+                ReadString(listenElement, "input_mode"),
+                ReadString(listenElement, "log_file"));
+        }
+
+        var turns = new List<AssistantTurnSnapshot>();
+        if (assistant.HasValue && assistant.Value.TryGetProperty("recent_turns", out var recentTurns) &&
+            recentTurns.ValueKind == JsonValueKind.Array)
+        {
+            foreach (var turn in recentTurns.EnumerateArray())
+            {
+                turns.Add(new AssistantTurnSnapshot(
+                    ReadString(turn, "created_at"),
+                    ReadString(turn, "source"),
+                    ReadString(turn, "input_text"),
+                    ReadString(turn, "display_response_text"),
+                    ReadString(turn, "provider"),
+                    ReadString(turn, "model_profile"),
+                    ReadString(turn, "stage"),
+                    ReadNullableInt(turn, "total_ms")));
+            }
+        }
+
+        return new AssistantBridgeSnapshot(
+            true,
+            "",
+            generatedAt,
+            ReadString(root, "user_id"),
+            ReadString(voice, "preferred_input_device"),
+            ReadString(voice, "preferred_output_device"),
+            listen,
+            turns);
+    }
+
+    internal static OpenClawCliLauncher? ResolveOpenClawCli()
+    {
+        foreach (var root in CandidateBackendRoots())
+        {
+            if (!TryNormalizeBackendRoot(root, out var normalizedRoot))
+                continue;
+
+            var openclawExe = Path.Combine(normalizedRoot, ".venv", "Scripts", "openclaw.exe");
+            if (File.Exists(openclawExe))
+                return new OpenClawCliLauncher(openclawExe, normalizedRoot, []);
+
+            var pythonExe = Path.Combine(normalizedRoot, ".venv", "Scripts", "python.exe");
+            if (File.Exists(pythonExe))
+                return new OpenClawCliLauncher(pythonExe, normalizedRoot, ["-m", "openclaw.cli"]);
+        }
+
+        return null;
+    }
+
+    internal static string BuildBackendNotFoundMessage()
+    {
+        var searchedRoots = CandidateBackendRoots()
+            .Select(root => TryNormalizeBackendRoot(root, out var normalizedRoot) ? normalizedRoot : root)
+            .Where(root => !string.IsNullOrWhiteSpace(root))
+            .Distinct(StringComparer.OrdinalIgnoreCase);
+
+        return "OpenClaw backend checkout was not found. Set OPENCLAW_BACKEND_ROOT to a fully qualified local checkout under D:\\Projects, %USERPROFILE%\\Projects, or %USERPROFILE%\\source\\repos. Searched: " +
+            string.Join("; ", searchedRoots) +
+            ".";
+    }
+
+    internal static IReadOnlyList<string> CandidateBackendRoots()
+    {
+        var candidates = new List<string>();
+        var overrideRoot = Environment.GetEnvironmentVariable("OPENCLAW_BACKEND_ROOT");
+        if (!string.IsNullOrWhiteSpace(overrideRoot))
+            candidates.Add(overrideRoot);
+
+        candidates.Add(@"D:\Projects\OpenClaw");
+        candidates.Add(Path.Combine(
+            Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
+            "Projects",
+            "OpenClaw"));
+        candidates.Add(Path.Combine(
+            Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
+            "source",
+            "repos",
+            "OpenClaw"));
+
+        return candidates;
+    }
+
+    internal static bool TryNormalizeBackendRoot(string root, out string normalizedRoot)
+    {
+        normalizedRoot = "";
+        if (string.IsNullOrWhiteSpace(root))
+            return false;
+
+        var expandedRoot = Environment.ExpandEnvironmentVariables(root.Trim());
+        if (string.IsNullOrWhiteSpace(expandedRoot) || !Path.IsPathFullyQualified(expandedRoot))
+            return false;
+
+        try
+        {
+            normalizedRoot = Path.GetFullPath(expandedRoot);
+        }
+        catch (ArgumentException)
+        {
+            return false;
+        }
+        catch (NotSupportedException)
+        {
+            return false;
+        }
+        catch (PathTooLongException)
+        {
+            return false;
+        }
+
+        if (normalizedRoot.StartsWith(@"\\", StringComparison.Ordinal))
+            return false;
+
+        var candidateRoot = normalizedRoot;
+        return TrustedBackendParentRoots()
+            .Any(parent => IsSameOrUnderPath(candidateRoot, parent));
+    }
+
+    private static IEnumerable<string> TrustedBackendParentRoots()
+    {
+        yield return @"D:\Projects";
+
+        var userProfile = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
+        if (string.IsNullOrWhiteSpace(userProfile))
+            yield break;
+
+        yield return Path.Combine(userProfile, "Projects");
+        yield return Path.Combine(userProfile, "source", "repos");
+    }
+
+    private static bool IsSameOrUnderPath(string path, string parent)
+    {
+        var normalizedParent = Path.GetFullPath(parent)
+            .TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
+        var normalizedPath = path.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
+
+        return string.Equals(normalizedPath, normalizedParent, StringComparison.OrdinalIgnoreCase) ||
+            normalizedPath.StartsWith(normalizedParent + Path.DirectorySeparatorChar, StringComparison.OrdinalIgnoreCase);
+    }
+
+    private static JsonElement? ReadObject(JsonElement? parent, string name)
+    {
+        if (parent is not { } element || element.ValueKind != JsonValueKind.Object)
+            return null;
+        return element.TryGetProperty(name, out var value) && value.ValueKind == JsonValueKind.Object
+            ? value
+            : null;
+    }
+
+    private static string ReadString(JsonElement? parent, string name)
+    {
+        if (parent is not { } element || element.ValueKind != JsonValueKind.Object)
+            return "";
+        return element.TryGetProperty(name, out var value) && value.ValueKind == JsonValueKind.String
+            ? value.GetString() ?? ""
+            : "";
+    }
+
+    private static bool ReadBool(JsonElement parent, string name) =>
+        parent.TryGetProperty(name, out var value) && value.ValueKind == JsonValueKind.True;
+
+    private static int? ReadNullableInt(JsonElement parent, string name)
+    {
+        if (!parent.TryGetProperty(name, out var value))
+            return null;
+        return value.ValueKind == JsonValueKind.Number && value.TryGetInt32(out var parsed)
+            ? parsed
+            : null;
+    }
+
+    private sealed record AssistantProcessResult(bool Success, string Stdout, string ErrorMessage)
+    {
+        public static AssistantProcessResult Failed(string errorMessage) => new(false, "", errorMessage);
+    }
+}
+
+internal sealed record OpenClawCliLauncher(
+    string ExecutablePath,
+    string WorkingDirectory,
+    IReadOnlyList<string> PrefixArgs);
+
+internal sealed record AssistantCommandResult(bool Success, string ErrorMessage);
+
+internal sealed record AssistantBridgeSnapshot(
+    bool IsAvailable,
+    string ErrorMessage,
+    string GeneratedAt,
+    string UserId,
+    string PreferredInputDevice,
+    string PreferredOutputDevice,
+    AssistantListenServiceSnapshot ListenService,
+    IReadOnlyList<AssistantTurnSnapshot> RecentTurns)
+{
+    public static AssistantBridgeSnapshot Unavailable(string errorMessage) =>
+        new(false, errorMessage, "", "", "", "", AssistantListenServiceSnapshot.Empty, []);
+}
+
+internal sealed record AssistantListenServiceSnapshot(
+    string Status,
+    bool Configured,
+    int? Pid,
+    bool StopRequested,
+    bool AllowCloud,
+    bool SpeakAloud,
+    string Transcriber,
+    string InputMode,
+    string LogFile)
+{
+    public static AssistantListenServiceSnapshot Empty { get; } =
+        new("", false, null, false, false, false, "", "", "");
+
+    public bool IsRunning => string.Equals(Status, "running", StringComparison.OrdinalIgnoreCase);
+
+    public bool IsStopped =>
+        string.Equals(Status, "stopped", StringComparison.OrdinalIgnoreCase) ||
+        (StopRequested && string.Equals(Status, "stop-requested", StringComparison.OrdinalIgnoreCase));
+}
+
+internal sealed record AssistantTurnSnapshot(
+    string CreatedAt,
+    string Source,
+    string InputText,
+    string ResponseText,
+    string Provider,
+    string ModelProfile,
+    string Stage,
+    int? TotalMs);
diff --git a/src/OpenClaw.Tray.WinUI/Services/AutoStartManager.cs b/src/OpenClaw.Tray.WinUI/Services/AutoStartManager.cs
index 3cdae99a6..867b32b2c 100644
--- a/src/OpenClaw.Tray.WinUI/Services/AutoStartManager.cs
+++ b/src/OpenClaw.Tray.WinUI/Services/AutoStartManager.cs
@@ -11,7 +11,7 @@ namespace OpenClawTray.Services;
 public static class AutoStartManager
 {
     private const string RegistryKey = @"SOFTWARE\Microsoft\Windows\CurrentVersion\Run";
-    private const string AppName = "OpenClawTray";
+    private static readonly string AppName = AppIdentity.AutoStartRegistryName;
 
     public static bool IsAutoStartEnabled()
     {
@@ -25,7 +25,7 @@ public static bool IsAutoStartEnabled()
         {
         }
 
-        return WindowsStartupTaskRegistration.Exists();
+        return WindowsStartupTaskRegistration.Exists(AppIdentity.StartupTaskName);
     }
 
     public static void SetAutoStart(bool enable)
@@ -35,7 +35,7 @@ public static void SetAutoStart(bool enable)
             if (enable)
             {
                 var exePath = Environment.ProcessPath ?? System.Reflection.Assembly.GetExecutingAssembly().Location;
-                if (WindowsStartupTaskRegistration.Register(exePath))
+                if (WindowsStartupTaskRegistration.Register(exePath, AppIdentity.StartupTaskName))
                 {
                     DeleteRunKey();
                     Logger.Info("Auto-start enabled via scheduled task");
@@ -55,7 +55,7 @@ public static void SetAutoStart(bool enable)
             else
             {
                 DeleteRunKey();
-                WindowsStartupTaskRegistration.Unregister();
+                WindowsStartupTaskRegistration.Unregister(AppIdentity.StartupTaskName);
                 Logger.Info("Auto-start disabled");
             }
         }
diff --git a/src/OpenClaw.Tray.WinUI/Services/ChatNotificationSpeechText.cs b/src/OpenClaw.Tray.WinUI/Services/ChatNotificationSpeechText.cs
new file mode 100644
index 000000000..09a646141
--- /dev/null
+++ b/src/OpenClaw.Tray.WinUI/Services/ChatNotificationSpeechText.cs
@@ -0,0 +1,14 @@
+using OpenClaw.Shared;
+
+namespace OpenClawTray.Services;
+
+internal static class ChatNotificationSpeechText
+{
+    public static string Resolve(OpenClawNotification notification)
+    {
+        ArgumentNullException.ThrowIfNull(notification);
+        return string.IsNullOrEmpty(notification.FullMessage)
+            ? notification.Message
+            : notification.FullMessage;
+    }
+}
diff --git a/src/OpenClaw.Tray.WinUI/Services/CommandCenterStateBuilder.cs b/src/OpenClaw.Tray.WinUI/Services/CommandCenterStateBuilder.cs
index 47ceb495e..4ad1aeedd 100644
--- a/src/OpenClaw.Tray.WinUI/Services/CommandCenterStateBuilder.cs
+++ b/src/OpenClaw.Tray.WinUI/Services/CommandCenterStateBuilder.cs
@@ -81,6 +81,34 @@ node.ApprovalState is GatewayNodeApprovalState.PendingApproval or
             });
         }
 
+        var overallState = _snapshot.OverallState;
+        var mcpStartupError = _snapshot.McpStartupError;
+
+        if (_snapshot.Settings?.EnableMcpServer == true &&
+            !string.IsNullOrWhiteSpace(mcpStartupError))
+        {
+            warnings.Insert(0, new GatewayDiagnosticWarning
+            {
+                Severity = GatewayDiagnosticSeverity.Critical,
+                Category = "mcp",
+                Title = "Local MCP failed",
+                Detail = mcpStartupError
+            });
+        }
+
+        if (_snapshot.Settings?.EnableMcpServer == true &&
+            (_snapshot.Settings?.EnableNodeMode ?? false) == false &&
+            _snapshot.IsMcpRunning)
+        {
+            warnings.Add(new GatewayDiagnosticWarning
+            {
+                Severity = GatewayDiagnosticSeverity.Info,
+                Category = "mcp",
+                Title = "Local MCP only",
+                Detail = "Local MCP tools are listening on this PC without a gateway node connection."
+            });
+        }
+
         if (shouldShowPendingLocalNodeApproval &&
             _snapshot.NodeService?.IsPendingApproval == true &&
             !string.IsNullOrWhiteSpace(_snapshot.NodeService.FullDeviceId))
@@ -103,7 +131,27 @@ node.ApprovalState is GatewayNodeApprovalState.PendingApproval or
             });
         }
 
-        if (_snapshot.Status == ConnectionStatus.Error)
+        if (overallState == OpenClaw.Connection.OverallConnectionState.Degraded)
+        {
+            warnings.Insert(0, new GatewayDiagnosticWarning
+            {
+                Severity = GatewayDiagnosticSeverity.Warning,
+                Category = "gateway",
+                Title = "Connection degraded",
+                Detail = "The operator connection is available, but one required role is blocked."
+            });
+        }
+        else if (overallState == OpenClaw.Connection.OverallConnectionState.PairingRequired)
+        {
+            warnings.Insert(0, new GatewayDiagnosticWarning
+            {
+                Severity = GatewayDiagnosticSeverity.Warning,
+                Category = "pairing",
+                Title = "Pairing required",
+                Detail = "Approve the pending operator or node pairing request to finish connecting."
+            });
+        }
+        else if (_snapshot.Status == ConnectionStatus.Error)
         {
             warnings.Insert(0, new GatewayDiagnosticWarning
             {
diff --git a/src/OpenClaw.Tray.WinUI/Services/ConnectionStatusPresenter.cs b/src/OpenClaw.Tray.WinUI/Services/ConnectionStatusPresenter.cs
new file mode 100644
index 000000000..bd4da850d
--- /dev/null
+++ b/src/OpenClaw.Tray.WinUI/Services/ConnectionStatusPresenter.cs
@@ -0,0 +1,126 @@
+using OpenClaw.Connection;
+using OpenClaw.Shared;
+
+namespace OpenClawTray.Services;
+
+internal enum ConnectionStatusAccent
+{
+    Neutral,
+    Success,
+    Caution,
+    Critical,
+}
+
+internal static class ConnectionStatusPresenter
+{
+    public static ConnectionStatus ToLegacyStatus(OverallConnectionState overall) => overall switch
+    {
+        OverallConnectionState.Connected or OverallConnectionState.Ready or OverallConnectionState.Degraded => ConnectionStatus.Connected,
+        OverallConnectionState.Connecting => ConnectionStatus.Connecting,
+        OverallConnectionState.Idle or OverallConnectionState.Disconnecting => ConnectionStatus.Disconnected,
+        OverallConnectionState.PairingRequired or
+        OverallConnectionState.Error => ConnectionStatus.Error,
+        _ => ConnectionStatus.Disconnected,
+    };
+
+    public static ConnectionStatus ToLegacyStatus(GatewayConnectionSnapshot snapshot)
+    {
+        if (snapshot.OperatorState == RoleConnectionState.Connected)
+            return ConnectionStatus.Connected;
+
+        return ToLegacyStatus(snapshot.OverallState);
+    }
+
+    public static bool IsHealthy(OverallConnectionState? overall, ConnectionStatus fallback) =>
+        overall is OverallConnectionState.Connected or OverallConnectionState.Ready ||
+        (overall is null && fallback == ConnectionStatus.Connected);
+
+    public static bool IsLiveOrPending(OverallConnectionState? overall, ConnectionStatus fallback) =>
+        overall is OverallConnectionState.Connected
+            or OverallConnectionState.Ready
+            or OverallConnectionState.Degraded
+            or OverallConnectionState.PairingRequired
+            or OverallConnectionState.Connecting ||
+        (overall is null && fallback is ConnectionStatus.Connected or ConnectionStatus.Connecting);
+
+    public static bool IsOperatorChannelLive(GatewayConnectionSnapshot snapshot) =>
+        snapshot.OperatorState == RoleConnectionState.Connected;
+
+    public static string PlainText(OverallConnectionState? overall, ConnectionStatus fallback) => overall switch
+    {
+        OverallConnectionState.Connected or OverallConnectionState.Ready => "Connected",
+        OverallConnectionState.Connecting => "Connecting",
+        OverallConnectionState.Degraded => "Degraded",
+        OverallConnectionState.PairingRequired => "Pairing required",
+        OverallConnectionState.Error => "Connection error",
+        OverallConnectionState.Disconnecting => "Disconnecting",
+        OverallConnectionState.Idle => "Disconnected",
+        _ => fallback switch
+        {
+            ConnectionStatus.Connected => "Connected",
+            ConnectionStatus.Connecting => "Connecting",
+            ConnectionStatus.Error => "Connection error",
+            _ => "Disconnected",
+        },
+    };
+
+    public static (string LabelKey, ConnectionStatusAccent Accent) Pill(OverallConnectionState overall) => overall switch
+    {
+        OverallConnectionState.Connected or OverallConnectionState.Ready =>
+            ("StatusDisplay_Connected", ConnectionStatusAccent.Success),
+        OverallConnectionState.Connecting =>
+            ("StatusDisplay_Connecting", ConnectionStatusAccent.Caution),
+        OverallConnectionState.Degraded =>
+            ("HubWindow_Pill_Degraded", ConnectionStatusAccent.Caution),
+        OverallConnectionState.PairingRequired =>
+            ("HubWindow_Pill_PairingRequired", ConnectionStatusAccent.Caution),
+        OverallConnectionState.Error =>
+            ("StatusDisplay_Error", ConnectionStatusAccent.Critical),
+        _ => ("StatusDisplay_Disconnected", ConnectionStatusAccent.Neutral),
+    };
+
+    public static ConnectionStatusAccent RoleAccent(RoleConnectionState state) => state switch
+    {
+        RoleConnectionState.Connected => ConnectionStatusAccent.Success,
+        RoleConnectionState.Connecting => ConnectionStatusAccent.Caution,
+        RoleConnectionState.PairingRequired => ConnectionStatusAccent.Caution,
+        RoleConnectionState.Error or
+        RoleConnectionState.PairingRejected or
+        RoleConnectionState.RateLimited => ConnectionStatusAccent.Critical,
+        _ => ConnectionStatusAccent.Neutral,
+    };
+
+    public static string RoleStateLabelKey(RoleConnectionState state) => state switch
+    {
+        RoleConnectionState.Connected => "StatusDisplay_Connected",
+        RoleConnectionState.Connecting => "StatusDisplay_Connecting",
+        RoleConnectionState.PairingRequired => "HubWindow_Role_PairingRequired",
+        RoleConnectionState.PairingRejected => "HubWindow_Role_PairingRejected",
+        RoleConnectionState.RateLimited => "HubWindow_Role_RateLimited",
+        RoleConnectionState.Error => "StatusDisplay_Error",
+        RoleConnectionState.Disabled => "HubWindow_Role_Disabled",
+        _ => "HubWindow_Role_Off",
+    };
+
+    public static (string LabelKey, ConnectionStatusAccent Accent) NodeRow(
+        GatewayConnectionSnapshot snapshot, bool nodeModeEnabled, int enabledCapabilityCount)
+    {
+        if (!nodeModeEnabled || snapshot.OperatorState != RoleConnectionState.Connected)
+            return ("HubWindow_Role_Disabled", ConnectionStatusAccent.Neutral);
+
+        return snapshot.NodeState switch
+        {
+            RoleConnectionState.PairingRequired => (RoleStateLabelKey(snapshot.NodeState), ConnectionStatusAccent.Caution),
+            RoleConnectionState.PairingRejected or
+            RoleConnectionState.RateLimited or
+            RoleConnectionState.Error => (RoleStateLabelKey(snapshot.NodeState), ConnectionStatusAccent.Critical),
+            _ when enabledCapabilityCount == 0 => ("HubWindow_Role_PermissionsIncomplete", ConnectionStatusAccent.Caution),
+            _ => (RoleStateLabelKey(snapshot.NodeState), RoleAccent(snapshot.NodeState)),
+        };
+    }
+
+    public static bool NodeNeedsApproval(GatewayConnectionSnapshot snapshot, bool nodeModeEnabled) =>
+        nodeModeEnabled
+        && snapshot.OperatorState == RoleConnectionState.Connected
+        && snapshot.NodeState == RoleConnectionState.PairingRequired;
+}
diff --git a/src/OpenClaw.Tray.WinUI/Services/CronRunHistoryDisplay.cs b/src/OpenClaw.Tray.WinUI/Services/CronRunHistoryDisplay.cs
new file mode 100644
index 000000000..bbe7dc923
--- /dev/null
+++ b/src/OpenClaw.Tray.WinUI/Services/CronRunHistoryDisplay.cs
@@ -0,0 +1,343 @@
+using OpenClaw.Shared;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.Json;
+using System.Text.RegularExpressions;
+
+namespace OpenClawTray.Services;
+
+internal readonly record struct CronRunDisplayText(string PreviewText, string? FullText)
+{
+    public bool HasExpandableFullText =>
+        !string.IsNullOrWhiteSpace(FullText) &&
+        (FullText!.Length > CronRunHistoryDisplay.PreviewMaxChars ||
+         FullText.Contains('\n') ||
+         FullText.Contains('\r') ||
+         !string.Equals(PreviewText, FullText, StringComparison.Ordinal));
+}
+
+internal static class CronRunHistoryDisplay
+{
+    public const int PreviewMaxChars = 120;
+
+    private static readonly string[] FullResponseKeys =
+    [
+        "fullResponse",
+        "full_response",
+        "assistantResponse",
+        "assistant_response",
+        "response",
+        "answer",
+        "output",
+        "result",
+        "content",
+        "text"
+    ];
+
+    private static readonly string[] TranscriptKeys =
+    [
+        "transcript",
+        "transcriptJsonl",
+        "transcript_jsonl",
+        "events",
+        "messages"
+    ];
+
+    private static readonly string[] TextKeys = ["text", "content", "message"];
+
+    private static readonly Regex AbsolutePathPattern = new(
+        @"(?:[A-Za-z]:\\(?:Users|home|usr|var|tmp)\\[^\s""']+)|(?:/(?:home|Users|usr|var|tmp)/[^\s""']+)",
+        RegexOptions.Compiled);
+
+    public static CronRunDisplayText ExtractText(JsonElement entry, bool isError)
+    {
+        var summary = SanitizeForDisplay(GetStringProperty(entry, "summary")) ?? string.Empty;
+        var error = SanitizeForDisplay(GetStringProperty(entry, "error")) ?? string.Empty;
+        var preview = isError && !string.IsNullOrWhiteSpace(error) ? error : summary;
+
+        var fullText = isError && !string.IsNullOrWhiteSpace(error)
+            ? error
+            : FindFullResponseText(entry) ?? FindTranscriptResponseText(entry) ?? summary;
+        fullText = SanitizeForDisplay(fullText);
+
+        if (string.IsNullOrWhiteSpace(preview) && !string.IsNullOrWhiteSpace(fullText))
+            preview = fullText!;
+
+        return new CronRunDisplayText(preview, string.IsNullOrWhiteSpace(fullText) ? null : fullText);
+    }
+
+    public static string? SanitizeForDisplay(string? text)
+    {
+        if (string.IsNullOrEmpty(text)) return text;
+        var sanitized = TokenSanitizer.Sanitize(text);
+        sanitized = AbsolutePathPattern.Replace(sanitized, m =>
+        {
+            var sep = m.Value.Contains('\\') ? '\\' : '/';
+            var lastSep = m.Value.LastIndexOf(sep);
+            return lastSep >= 0 ? "…" + sep + m.Value[(lastSep + 1)..] : m.Value;
+        });
+        return sanitized;
+    }
+
+    private static string? FindFullResponseText(JsonElement entry)
+    {
+        var direct = FindStringByKeys(entry, FullResponseKeys);
+        if (!string.IsNullOrWhiteSpace(direct))
+            return NormalizePotentialTranscript(direct);
+
+        if (entry.TryGetProperty("result", out var result) && result.ValueKind == JsonValueKind.Object)
+        {
+            var nested = FindStringByKeys(result, FullResponseKeys);
+            if (!string.IsNullOrWhiteSpace(nested))
+                return NormalizePotentialTranscript(nested);
+        }
+
+        if (entry.TryGetProperty("response", out var response) && response.ValueKind == JsonValueKind.Object)
+        {
+            var nested = FindStringByKeys(response, FullResponseKeys);
+            if (!string.IsNullOrWhiteSpace(nested))
+                return NormalizePotentialTranscript(nested);
+        }
+
+        return null;
+    }
+
+    private static string? FindTranscriptResponseText(JsonElement entry)
+    {
+        foreach (var key in TranscriptKeys)
+        {
+            if (!entry.TryGetProperty(key, out var value))
+                continue;
+
+            var extracted = value.ValueKind == JsonValueKind.String
+                ? TryExtractAssistantTextFromTranscript(value.GetString())
+                : TryExtractAssistantTextFromTranscript(value);
+            if (!string.IsNullOrWhiteSpace(extracted))
+                return extracted;
+        }
+
+        return null;
+    }
+
+    private static string? NormalizePotentialTranscript(string? text)
+    {
+        if (string.IsNullOrWhiteSpace(text)) return text;
+        return TryExtractAssistantTextFromTranscript(text) ?? text;
+    }
+
+    private static string? TryExtractAssistantTextFromTranscript(string? transcript)
+    {
+        if (string.IsNullOrWhiteSpace(transcript)) return null;
+        var trimmed = transcript.Trim();
+
+        if (trimmed.StartsWith('{') || trimmed.StartsWith('['))
+        {
+            try
+            {
+                using var doc = JsonDocument.Parse(trimmed);
+                var extracted = TryExtractAssistantTextFromTranscript(doc.RootElement);
+                if (!string.IsNullOrWhiteSpace(extracted))
+                    return extracted;
+            }
+            catch (JsonException)
+            {
+                // Not a single JSON document; fall through to JSONL parsing.
+            }
+        }
+
+        if (!trimmed.Contains('\n')) return null;
+
+        var finalCandidates = new List<string>();
+        var deltas = new StringBuilder();
+        foreach (var line in trimmed.Split('\n'))
+        {
+            var lineTrimmed = line.Trim();
+            if (lineTrimmed.Length == 0 || lineTrimmed[0] != '{') continue;
+
+            try
+            {
+                using var doc = JsonDocument.Parse(lineTrimmed);
+                CollectAssistantText(doc.RootElement, finalCandidates, deltas);
+            }
+            catch (JsonException)
+            {
+                // Ignore non-JSONL lines in mixed diagnostic transcripts.
+            }
+        }
+
+        return BuildAssistantText(finalCandidates, deltas);
+    }
+
+    private static string? TryExtractAssistantTextFromTranscript(JsonElement transcript)
+    {
+        var finalCandidates = new List<string>();
+        var deltas = new StringBuilder();
+        CollectAssistantText(transcript, finalCandidates, deltas);
+        return BuildAssistantText(finalCandidates, deltas);
+    }
+
+    private static string? BuildAssistantText(List<string> finalCandidates, StringBuilder deltas)
+    {
+        if (finalCandidates.Count > 0)
+        {
+            var candidates = finalCandidates
+                .Select(c => c.Trim())
+                .Where(c => c.Length > 0)
+                .ToArray();
+            var retained = new List<string>();
+
+            for (var i = 0; i < candidates.Length; i++)
+            {
+                var candidate = candidates[i];
+                var appearsInLaterCandidate = candidates
+                    .Skip(i + 1)
+                    .Any(later => later.Contains(candidate, StringComparison.Ordinal));
+                if (!appearsInLaterCandidate && !retained.Contains(candidate, StringComparer.Ordinal))
+                    retained.Add(candidate);
+            }
+
+            if (retained.Count > 0)
+                return string.Join("\n\n", retained);
+        }
+
+        return deltas.Length > 0 ? deltas.ToString().Trim() : null;
+    }
+
+    private static void CollectAssistantText(
+        JsonElement element,
+        List<string> finalCandidates,
+        StringBuilder deltas)
+    {
+        switch (element.ValueKind)
+        {
+            case JsonValueKind.Array:
+                foreach (var item in element.EnumerateArray())
+                    CollectAssistantText(item, finalCandidates, deltas);
+                return;
+            case JsonValueKind.Object:
+                break;
+            default:
+                return;
+        }
+
+        var stream = GetStringProperty(element, "stream");
+        var role = GetStringProperty(element, "role");
+        var type = GetStringProperty(element, "type");
+        var kind = GetStringProperty(element, "kind");
+        var assistantLike =
+            string.Equals(stream, "assistant", StringComparison.OrdinalIgnoreCase) ||
+            string.Equals(role, "assistant", StringComparison.OrdinalIgnoreCase) ||
+            string.Equals(kind, "assistant", StringComparison.OrdinalIgnoreCase) ||
+            (type?.Contains("assistant", StringComparison.OrdinalIgnoreCase) == true);
+
+        if (assistantLike)
+        {
+            AddAssistantTextFromObject(element, finalCandidates, deltas);
+            if (element.TryGetProperty("data", out var data) && data.ValueKind == JsonValueKind.Object)
+                AddAssistantTextFromObject(data, finalCandidates, deltas);
+        }
+
+        foreach (var key in new[] { "data", "event", "payload", "record" })
+        {
+            if (element.TryGetProperty(key, out var nested) && nested.ValueKind == JsonValueKind.Object)
+                CollectAssistantText(nested, finalCandidates, deltas);
+        }
+
+        foreach (var key in new[] { "events", "messages", "entries", "items" })
+        {
+            if (element.TryGetProperty(key, out var nested) && nested.ValueKind == JsonValueKind.Array)
+                CollectAssistantText(nested, finalCandidates, deltas);
+        }
+
+        if (element.TryGetProperty("message", out var message) && message.ValueKind == JsonValueKind.Object)
+            CollectAssistantText(message, finalCandidates, deltas);
+    }
+
+    private static void AddAssistantTextFromObject(
+        JsonElement obj,
+        List<string> finalCandidates,
+        StringBuilder deltas)
+    {
+        if (obj.TryGetProperty("delta", out var delta) && delta.ValueKind == JsonValueKind.String)
+        {
+            var deltaText = delta.GetString();
+            if (!string.IsNullOrEmpty(deltaText))
+                deltas.Append(deltaText);
+        }
+
+        foreach (var key in TextKeys)
+        {
+            if (!obj.TryGetProperty(key, out var value))
+                continue;
+
+            if (value.ValueKind == JsonValueKind.String)
+            {
+                var text = value.GetString();
+                if (!string.IsNullOrWhiteSpace(text))
+                    finalCandidates.Add(text);
+            }
+            else if (value.ValueKind == JsonValueKind.Array)
+            {
+                ExtractTextContentArray(value, finalCandidates);
+            }
+        }
+    }
+
+    private static void ExtractTextContentArray(JsonElement array, List<string> finalCandidates)
+    {
+        var parts = new List<string>();
+        foreach (var item in array.EnumerateArray())
+        {
+            if (item.ValueKind == JsonValueKind.String)
+            {
+                var value = item.GetString();
+                if (!string.IsNullOrEmpty(value)) parts.Add(value);
+                continue;
+            }
+
+            if (item.ValueKind == JsonValueKind.Object)
+            {
+                var text = GetStringProperty(item, "text");
+                if (!string.IsNullOrEmpty(text))
+                    parts.Add(text);
+            }
+        }
+
+        if (parts.Count > 0)
+            finalCandidates.Add(string.Concat(parts));
+    }
+
+    private static string? FindStringByKeys(JsonElement element, IReadOnlyList<string> keys)
+    {
+        foreach (var key in keys)
+        {
+            if (!element.TryGetProperty(key, out var value))
+                continue;
+
+            if (value.ValueKind == JsonValueKind.String)
+            {
+                var text = value.GetString();
+                if (!string.IsNullOrWhiteSpace(text))
+                    return text;
+            }
+
+            if (value.ValueKind == JsonValueKind.Object)
+            {
+                var nested = FindStringByKeys(value, TextKeys);
+                if (!string.IsNullOrWhiteSpace(nested))
+                    return nested;
+            }
+        }
+
+        return null;
+    }
+
+    private static string? GetStringProperty(JsonElement element, string key) =>
+        element.ValueKind == JsonValueKind.Object &&
+        element.TryGetProperty(key, out var value) &&
+        value.ValueKind == JsonValueKind.String
+            ? value.GetString()
+            : null;
+}
diff --git a/src/OpenClaw.Tray.WinUI/Services/DeepLinkHandler.cs b/src/OpenClaw.Tray.WinUI/Services/DeepLinkHandler.cs
index 3eb3529f1..bce608ef7 100644
--- a/src/OpenClaw.Tray.WinUI/Services/DeepLinkHandler.cs
+++ b/src/OpenClaw.Tray.WinUI/Services/DeepLinkHandler.cs
@@ -6,13 +6,10 @@
 namespace OpenClawTray.Services;
 
 /// <summary>
-/// Handles openclaw:// deep link URI scheme registration and processing.
+/// Handles this build variant's deep link URI scheme registration and processing.
 /// </summary>
 public static class DeepLinkHandler
 {
-    private const string UriScheme = "openclaw";
-    private const string UriSchemeKey = @"SOFTWARE\Classes\openclaw";
-
     [SupportedOSPlatform("windows")]
     public static void RegisterUriScheme()
     {
@@ -27,7 +24,8 @@ public static void RegisterUriScheme()
         {
             var exePath = Environment.ProcessPath ?? System.Reflection.Assembly.GetExecutingAssembly().Location;
 
-            using var key = Registry.CurrentUser.CreateSubKey(UriSchemeKey);
+            var uriSchemeKey = $@"SOFTWARE\Classes\{AppIdentity.ProtocolScheme}";
+            using var key = Registry.CurrentUser.CreateSubKey(uriSchemeKey);
             key?.SetValue("", "URL:OpenClaw Protocol");
             key?.SetValue("URL Protocol", "");
 
@@ -37,7 +35,7 @@ public static void RegisterUriScheme()
             using var commandKey = key?.CreateSubKey(@"shell\open\command");
             commandKey?.SetValue("", $"\"{exePath}\" \"%1\"");
 
-            Logger.Info("URI scheme registered: openclaw://");
+            Logger.Info($"URI scheme registered: {AppIdentity.ProtocolScheme}://");
         }
         catch (Exception ex)
         {
@@ -53,7 +51,7 @@ public static void RegisterUriScheme()
 
     public static void Handle(string uri, DeepLinkActions actions)
     {
-        var result = OpenClaw.Shared.DeepLinkParser.ParseDeepLink(uri);
+        var result = OpenClaw.Shared.DeepLinkParser.ParseDeepLink(uri, AppIdentity.ProtocolScheme);
         if (result == null)
             return;
 
diff --git a/src/OpenClaw.Tray.WinUI/Services/DeepLinkSecurityPolicy.cs b/src/OpenClaw.Tray.WinUI/Services/DeepLinkSecurityPolicy.cs
index 1592f251a..3ff19986a 100644
--- a/src/OpenClaw.Tray.WinUI/Services/DeepLinkSecurityPolicy.cs
+++ b/src/OpenClaw.Tray.WinUI/Services/DeepLinkSecurityPolicy.cs
@@ -62,14 +62,14 @@ public static string RedactForLog(string? uri)
         if (string.IsNullOrWhiteSpace(uri))
             return "<empty-deep-link>";
 
-        var result = DeepLinkParser.ParseDeepLink(uri);
+        var result = DeepLinkParser.ParseDeepLink(uri, AppIdentity.ProtocolScheme);
         if (result == null)
             return "<invalid-deep-link>";
 
         var redactedPath = RedactPathForLog(result.Path);
         return string.IsNullOrEmpty(result.Query)
-            ? $"openclaw://{redactedPath}"
-            : $"openclaw://{redactedPath}?<redacted>";
+            ? $"{AppIdentity.ProtocolScheme}://{redactedPath}"
+            : $"{AppIdentity.ProtocolScheme}://{redactedPath}?<redacted>";
     }
 
     internal static string GetActionDisplayName(DeepLinkResult result)
diff --git a/src/OpenClaw.Tray.WinUI/Services/DiagnosticsBundleBuilder.cs b/src/OpenClaw.Tray.WinUI/Services/DiagnosticsBundleBuilder.cs
new file mode 100644
index 000000000..ff53be9da
--- /dev/null
+++ b/src/OpenClaw.Tray.WinUI/Services/DiagnosticsBundleBuilder.cs
@@ -0,0 +1,241 @@
+using OpenClaw.Connection;
+using OpenClaw.Shared;
+using OpenClawTray.Helpers;
+using System.Text;
+
+namespace OpenClawTray.Services;
+
+internal sealed record DiagnosticsBundlePaths(
+    string? TrayLogPath,
+    string? TrayLogArchivePath,
+    string? DiagnosticsJsonlPath,
+    string? CrashLogPath,
+    string? SetupLogDirectory)
+{
+    public static DiagnosticsBundlePaths Default()
+    {
+        var trayLog = Logger.LogFilePath;
+        var logDirectory = Path.GetDirectoryName(trayLog);
+        var diagnosticsJsonl = DiagnosticsJsonlService.FilePath ??
+            Path.Combine(logDirectory ?? "", "Logs", "diagnostics.jsonl");
+        return new DiagnosticsBundlePaths(
+            TrayLogPath: trayLog,
+            TrayLogArchivePath: string.IsNullOrWhiteSpace(logDirectory)
+                ? null
+                : Path.Combine(logDirectory, "openclaw-tray.log.old"),
+            DiagnosticsJsonlPath: diagnosticsJsonl,
+            CrashLogPath: string.IsNullOrWhiteSpace(logDirectory)
+                ? null
+                : Path.Combine(logDirectory, "crash.log"),
+            SetupLogDirectory: Path.Combine(SettingsManager.SettingsDirectoryPath, "Logs", "Setup"));
+    }
+}
+
+internal static class DiagnosticsBundleBuilder
+{
+    private const int MaxSetupLogFiles = 4;
+    private const int MaxTotalBundleChars = 1_000_000;
+    private static readonly DiagnosticsTailOptions StandardTail = new(MaxLines: 200, MaxLineChars: 8_000, MaxSectionChars: 256_000, MaxReadBytes: 512_000);
+    private static readonly DiagnosticsTailOptions ShortTail = new(MaxLines: 120, MaxLineChars: 8_000, MaxSectionChars: 128_000, MaxReadBytes: 256_000);
+    private static readonly DiagnosticsTailOptions JsonlTail = StandardTail with { LineKind = DiagnosticsExportLineKind.Jsonl };
+    private static readonly DiagnosticsTailOptions ShortJsonlTail = ShortTail with { LineKind = DiagnosticsExportLineKind.Jsonl };
+
+    public static string BuildCached(
+        GatewayCommandCenterState state,
+        IReadOnlyList<ConnectionDiagnosticEvent>? connectionEvents = null,
+        DiagnosticsBundlePaths? paths = null,
+        DateTimeOffset? now = null)
+    {
+        ArgumentNullException.ThrowIfNull(state);
+        return Build(state, connectionEvents, paths);
+    }
+
+    public static string Build(
+        GatewayCommandCenterState state,
+        IReadOnlyList<ConnectionDiagnosticEvent>? connectionEvents = null,
+        DiagnosticsBundlePaths? paths = null)
+    {
+        ArgumentNullException.ThrowIfNull(state);
+        paths ??= DiagnosticsBundlePaths.Default();
+
+        var builder = new StringBuilder();
+        builder.AppendLine("OpenClaw Windows Tray Diagnostics Bundle");
+        builder.AppendLine($"Generated: {DateTimeOffset.Now:O}");
+        builder.AppendLine();
+        builder.AppendLine("## Manifest");
+        builder.AppendLine("Included:");
+        builder.AppendLine("- Generated support/debug summaries");
+        builder.AppendLine("- Connection event timeline");
+        builder.AppendLine("- Tray log tail");
+        builder.AppendLine("- Structured diagnostics JSONL tail");
+        builder.AppendLine("- Crash log tail");
+        builder.AppendLine("- Latest setup log tails");
+        builder.AppendLine();
+        builder.AppendLine("Privacy boundary:");
+        builder.AppendLine("- Export is read-only: source logs are tail-read and are never rewritten by preview/copy/save.");
+        builder.AppendLine("- Log tails are bounded first, then sanitized into this bundle as a defense-in-depth export boundary.");
+        builder.AppendLine("- Tokens, bootstrap/shared credentials, bearer headers, API keys, passwords, setup codes, DPAPI blobs, private keys, URLs, emails, IPs, and user paths are redacted before emission.");
+        builder.AppendLine("- Raw settings.json, gateways.json, mcp-token.txt, device-key-ed25519.json, screenshots, recordings, chat payloads, camera data, and microphone data are not included.");
+        builder.AppendLine("- Files, lines, bytes per line, bytes per section, and total bundle size are capped and marked inline when truncated.");
+        builder.AppendLine();
+        builder.AppendLine("Sources:");
+        AppendSource(builder, "Tray log", paths.TrayLogPath);
+        AppendSource(builder, "Tray log archive", paths.TrayLogArchivePath);
+        AppendSource(builder, "Diagnostics JSONL", paths.DiagnosticsJsonlPath);
+        AppendSource(builder, "Crash log", paths.CrashLogPath);
+        AppendSource(builder, "Setup logs", paths.SetupLogDirectory);
+        builder.AppendLine();
+
+        AppendSanitizedSection(builder, "Generated Debug Summary", CommandCenterTextHelper.BuildDebugBundle(state));
+        AppendPreSanitizedSection(builder, "Connection Event Timeline", BuildConnectionTimeline(connectionEvents));
+        builder.Append(DiagnosticsLogTailReader.BuildSection("Tray Log Tail", paths.TrayLogPath, StandardTail));
+        builder.Append(DiagnosticsLogTailReader.BuildSection("Tray Log Archive Tail", paths.TrayLogArchivePath, ShortTail));
+        builder.Append(DiagnosticsLogTailReader.BuildSection("Structured Diagnostics JSONL Tail", paths.DiagnosticsJsonlPath, JsonlTail));
+        builder.Append(DiagnosticsLogTailReader.BuildSection("Crash Log Tail", paths.CrashLogPath, ShortTail));
+        AppendLatestSetupLogs(builder, paths.SetupLogDirectory);
+
+        return TruncateBundle(builder.ToString());
+    }
+
+    private static void AppendSource(StringBuilder builder, string label, string? path)
+    {
+        builder.Append("- ");
+        builder.Append(label);
+        builder.Append(": ");
+        builder.AppendLine(string.IsNullOrWhiteSpace(path)
+            ? "not configured"
+            : FormatPath(path));
+    }
+
+    private static void AppendSanitizedSection(StringBuilder builder, string title, string content)
+    {
+        builder.AppendLine($"## {title}");
+        builder.AppendLine(DiagnosticsExportSanitizer.SanitizeTextBlock(content).TrimEnd());
+        builder.AppendLine();
+    }
+
+    private static void AppendPreSanitizedSection(StringBuilder builder, string title, string content)
+    {
+        builder.AppendLine($"## {title}");
+        builder.AppendLine(content.TrimEnd());
+        builder.AppendLine();
+    }
+
+    private static string BuildConnectionTimeline(IReadOnlyList<ConnectionDiagnosticEvent>? events)
+    {
+        if (events is not { Count: > 0 })
+            return "No connection diagnostic events recorded.";
+
+        var builder = new StringBuilder();
+        foreach (var evt in events.TakeLast(200))
+        {
+            builder.Append(evt.Timestamp.ToUniversalTime().ToString("O"));
+            builder.Append(" [");
+            builder.Append(DiagnosticsExportSanitizer.SanitizeTextBlock(evt.Category));
+            builder.Append("] ");
+            builder.Append(DiagnosticsExportSanitizer.SanitizeTextBlock(evt.Message));
+            if (!string.IsNullOrWhiteSpace(evt.Detail))
+            {
+                builder.Append(" — ");
+                builder.Append(DiagnosticsExportSanitizer.SanitizeTextBlock(evt.Detail));
+            }
+            builder.AppendLine();
+        }
+        return builder.ToString();
+    }
+
+    private static void AppendLatestSetupLogs(StringBuilder builder, string? setupLogDirectory)
+    {
+        builder.AppendLine("## Latest Setup Log Tails");
+        builder.AppendLine($"Source: {FormatPath(setupLogDirectory)}");
+
+        if (string.IsNullOrWhiteSpace(setupLogDirectory) || !Directory.Exists(setupLogDirectory))
+        {
+            builder.AppendLine("Status: not found");
+            builder.AppendLine();
+            return;
+        }
+
+        IReadOnlyList<FileInfo> latestLogs;
+        try
+        {
+            latestLogs = EnumerateLatestSetupLogFiles(setupLogDirectory, MaxSetupLogFiles + 1);
+        }
+        catch (Exception ex) when (IsSetupLogEnumerationException(ex))
+        {
+            Logger.Warn($"Diagnostics bundle setup log enumeration failed: {ex.Message}");
+            builder.AppendLine($"Status: setup logs unavailable ({ex.GetType().Name})");
+            builder.AppendLine();
+            return;
+        }
+
+        if (latestLogs.Count == 0)
+        {
+            builder.AppendLine("Status: no setup logs found");
+            builder.AppendLine();
+            return;
+        }
+
+        builder.AppendLine();
+        foreach (var file in latestLogs.Take(MaxSetupLogFiles))
+        {
+            builder.Append(DiagnosticsLogTailReader.BuildSection(
+                $"Setup Log Tail: {file.Name}",
+                file.FullName,
+                ShortJsonlTail));
+        }
+        if (latestLogs.Count > MaxSetupLogFiles)
+            builder.AppendLine($"[truncated setup logs at {MaxSetupLogFiles} files]");
+    }
+
+    private static string FormatPath(string? path) =>
+        string.IsNullOrWhiteSpace(path)
+            ? "not configured"
+            : FormatSourcePath(path);
+
+    private static string FormatSourcePath(string path)
+    {
+        var fileName = Path.GetFileName(path);
+        return string.IsNullOrWhiteSpace(fileName) ? "configured" : fileName;
+    }
+
+    internal static void ClearBundleCacheForTest()
+    {
+        // Preserved for existing tests; bundle generation is intentionally uncached.
+    }
+
+    private static IReadOnlyList<FileInfo> EnumerateLatestSetupLogFiles(string setupLogDirectory, int maxFiles) =>
+        Directory.EnumerateFiles(setupLogDirectory, "*.jsonl", SearchOption.TopDirectoryOnly)
+            .Select(path => new FileInfo(path))
+            .OrderByDescending(file => file.LastWriteTimeUtc)
+            .Take(maxFiles)
+            .ToList();
+
+    private static IEnumerable<string> EnumerateLatestSetupLogPaths(string setupLogDirectory)
+    {
+        IReadOnlyList<FileInfo> latestLogs;
+        try
+        {
+            latestLogs = EnumerateLatestSetupLogFiles(setupLogDirectory, MaxSetupLogFiles);
+        }
+        catch (Exception ex) when (IsSetupLogEnumerationException(ex))
+        {
+            Logger.Warn($"Diagnostics bundle setup log cache signature failed: {ex.Message}");
+            yield break;
+        }
+
+        foreach (var file in latestLogs)
+            yield return file.FullName;
+    }
+
+    private static bool IsSetupLogEnumerationException(Exception ex) =>
+        ex is IOException or UnauthorizedAccessException or NotSupportedException or PathTooLongException;
+
+    private static string TruncateBundle(string text)
+    {
+        if (text.Length <= MaxTotalBundleChars)
+            return text;
+
+        return text[..MaxTotalBundleChars] + Environment.NewLine + $"[truncated bundle at {MaxTotalBundleChars} chars]";
+    }
+}
diff --git a/src/OpenClaw.Tray.WinUI/Services/DiagnosticsClipboardService.cs b/src/OpenClaw.Tray.WinUI/Services/DiagnosticsClipboardService.cs
index 29b657091..f9329ac33 100644
--- a/src/OpenClaw.Tray.WinUI/Services/DiagnosticsClipboardService.cs
+++ b/src/OpenClaw.Tray.WinUI/Services/DiagnosticsClipboardService.cs
@@ -12,7 +12,8 @@ internal sealed class DiagnosticsClipboardService
 {
     private readonly Func<GatewayCommandCenterState> _captureState;
 
-    public DiagnosticsClipboardService(Func<GatewayCommandCenterState> captureState)
+    public DiagnosticsClipboardService(
+        Func<GatewayCommandCenterState> captureState)
     {
         _captureState = captureState;
     }
@@ -21,7 +22,7 @@ public void CopyDiagnostic(string label, Func<GatewayCommandCenterState, string>
     {
         try
         {
-            App.CopyTextToClipboard(format(_captureState()));
+            App.CopyTextToClipboard(DiagnosticsExportSanitizer.SanitizeTextBlock(format(_captureState())));
             Logger.Info($"Copied {label} from deep link");
         }
         catch (Exception ex)
@@ -34,7 +35,7 @@ public void CopySupportContext() =>
         CopyDiagnostic("support context", CommandCenterTextHelper.BuildSupportContext);
 
     public void CopyDebugBundle() =>
-        CopyDiagnostic("debug bundle", CommandCenterTextHelper.BuildDebugBundle);
+        CopyDiagnostic("summary debug bundle", CommandCenterTextHelper.BuildDebugBundle);
 
     public void CopyBrowserSetupGuidance() =>
         CopyDiagnostic("browser setup guidance", CommandCenterTextHelper.BuildBrowserSetupGuidance);
diff --git a/src/OpenClaw.Tray.WinUI/Services/DiagnosticsExportSanitizer.cs b/src/OpenClaw.Tray.WinUI/Services/DiagnosticsExportSanitizer.cs
new file mode 100644
index 000000000..2a6750f92
--- /dev/null
+++ b/src/OpenClaw.Tray.WinUI/Services/DiagnosticsExportSanitizer.cs
@@ -0,0 +1,151 @@
+using OpenClaw.Shared;
+using System.Text.Encodings.Web;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+
+namespace OpenClawTray.Services;
+
+internal enum DiagnosticsExportLineKind
+{
+    Text,
+    Jsonl
+}
+
+internal static class DiagnosticsExportSanitizer
+{
+    internal const string UnsafeTextLineSentinel = "[REDACTED_UNSAFE_LOG_LINE]";
+    internal const string UnsafeJsonlLineSentinel = """{"event":"redacted_unsafe_log_line"}""";
+
+    private static readonly JsonSerializerOptions ReadableJsonOptions = new()
+    {
+        Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
+    };
+
+    public static string SanitizeTextBlock(string? text, DiagnosticsExportLineKind kind = DiagnosticsExportLineKind.Text)
+    {
+        if (string.IsNullOrEmpty(text))
+            return string.Empty;
+
+        var normalized = kind == DiagnosticsExportLineKind.Jsonl
+            ? NormalizeLegacyJsonlText(text)
+            : text;
+        var sanitized = TokenSanitizer.SanitizeLogMessage(normalized);
+        return sanitized == TokenSanitizer.SanitizerTimeoutSentinel
+            ? kind == DiagnosticsExportLineKind.Jsonl ? UnsafeJsonlLineSentinel : UnsafeTextLineSentinel
+            : sanitized;
+    }
+
+    public static string SanitizeLine(string? line, DiagnosticsExportLineKind kind = DiagnosticsExportLineKind.Text)
+    {
+        if (line is null)
+            return string.Empty;
+
+        var sanitized = SanitizeTextBlock(line, kind);
+        if (kind != DiagnosticsExportLineKind.Jsonl)
+            return sanitized;
+
+        return IsValidJsonLine(sanitized) ? sanitized : UnsafeJsonlLineSentinel;
+    }
+
+    internal static string SanitizeLineForTest(string? line, DiagnosticsExportLineKind kind = DiagnosticsExportLineKind.Text) =>
+        SanitizeLine(line, kind);
+
+    private static string NormalizeLegacyJsonlText(string text)
+    {
+        var lines = text
+            .Replace("\r\n", "\n", StringComparison.Ordinal)
+            .Replace('\r', '\n')
+            .Split('\n');
+
+        for (var i = 0; i < lines.Length; i++)
+            lines[i] = NormalizeLegacyJsonLine(lines[i]);
+
+        return string.Join('\n', lines);
+    }
+
+    private static string NormalizeLegacyJsonLine(string line)
+    {
+        if (!NeedsLegacyJsonNormalization(line))
+            return line;
+
+        try
+        {
+            var node = JsonNode.Parse(line);
+            var normalized = NormalizeJsonNode(node);
+            return normalized?.ToJsonString(ReadableJsonOptions) ?? line;
+        }
+        catch (JsonException)
+        {
+            return line;
+        }
+    }
+
+    private static bool NeedsLegacyJsonNormalization(string text) =>
+        text.Contains("\\u0022", StringComparison.OrdinalIgnoreCase) ||
+        text.Contains("\\u002B", StringComparison.OrdinalIgnoreCase) ||
+        text.Contains("\\u003C", StringComparison.OrdinalIgnoreCase) ||
+        text.Contains("\\u003E", StringComparison.OrdinalIgnoreCase) ||
+        text.Contains("\\u0026", StringComparison.OrdinalIgnoreCase) ||
+        text.Contains("\\u0060", StringComparison.OrdinalIgnoreCase) ||
+        text.Contains("\\r\\n", StringComparison.Ordinal);
+
+    private static JsonNode? NormalizeJsonNode(JsonNode? node)
+    {
+        switch (node)
+        {
+            case JsonObject obj:
+                var normalizedObject = new JsonObject();
+                foreach (var property in obj)
+                    normalizedObject[property.Key] = NormalizeJsonNode(property.Value);
+                return normalizedObject;
+
+            case JsonArray array:
+                var normalizedArray = new JsonArray();
+                foreach (var item in array)
+                    normalizedArray.Add(NormalizeJsonNode(item));
+                return normalizedArray;
+
+            case JsonValue value when value.TryGetValue<string>(out var text):
+                var normalized = NormalizeLogString(text);
+                var trimmed = normalized.TrimStart();
+                if (trimmed.StartsWith('{') || trimmed.StartsWith('['))
+                {
+                    try
+                    {
+                        return NormalizeJsonNode(JsonNode.Parse(normalized));
+                    }
+                    catch (JsonException)
+                    {
+                        // Keep malformed JSON-shaped text as flattened text.
+                    }
+                }
+
+                return JsonValue.Create(normalized);
+
+            default:
+                return node?.DeepClone();
+        }
+    }
+
+    private static string NormalizeLogString(string value) =>
+        value
+            .Replace("\r\n", " ", StringComparison.Ordinal)
+            .Replace('\r', ' ')
+            .Replace('\n', ' ');
+
+    private static bool IsValidJsonLine(string line)
+    {
+        if (string.IsNullOrWhiteSpace(line))
+            return true;
+
+        try
+        {
+            using var _ = JsonDocument.Parse(line);
+            return true;
+        }
+        catch (JsonException)
+        {
+            return false;
+        }
+    }
+}
diff --git a/src/OpenClaw.Tray.WinUI/Services/DiagnosticsJsonlService.cs b/src/OpenClaw.Tray.WinUI/Services/DiagnosticsJsonlService.cs
index 5f5ba049a..300fc22f4 100644
--- a/src/OpenClaw.Tray.WinUI/Services/DiagnosticsJsonlService.cs
+++ b/src/OpenClaw.Tray.WinUI/Services/DiagnosticsJsonlService.cs
@@ -1,6 +1,8 @@
 using System;
 using System.IO;
+using System.Text.Encodings.Web;
 using System.Text.Json;
+using System.Text.Json.Nodes;
 using System.Threading.Channels;
 using System.Threading.Tasks;
 using OpenClaw.Shared;
@@ -23,6 +25,10 @@ public static class DiagnosticsJsonlService
     private static Channel<string>? s_channel;
     private static Task? s_writerTask;
     private static readonly object s_initLock = new();
+    private static readonly JsonSerializerOptions JsonOptions = new()
+    {
+        Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
+    };
 
     public static string? FilePath => s_filePath;
 
@@ -66,14 +72,7 @@ public static void Write(string eventName, object metadata)
 
         try
         {
-            var record = new
-            {
-                ts = DateTimeOffset.Now,
-                @event = eventName,
-                metadata
-            };
-            var line = TokenSanitizer.SanitizeLogMessage(JsonSerializer.Serialize(record));
-            channel.Writer.TryWrite(line);
+            channel.Writer.TryWrite(FormatRecordLine(eventName, metadata));
         }
         catch (NotSupportedException ex)
         {
@@ -83,6 +82,120 @@ public static void Write(string eventName, object metadata)
         }
     }
 
+    private static object? SanitizeMetadata(object? metadata)
+    {
+        if (metadata is null)
+            return null;
+
+        if (metadata is string text)
+            return TokenSanitizer.SanitizeLogMessage(text);
+
+        var node = JsonSerializer.SerializeToNode(metadata, JsonOptions);
+        return SanitizeJsonNode(node);
+    }
+
+    private static string FormatRecordLine(string eventName, object metadata)
+    {
+        var record = new
+        {
+            ts = DateTimeOffset.Now,
+            @event = TokenSanitizer.SanitizeLogMessage(eventName),
+            metadata = SanitizeMetadata(metadata)
+        };
+        return JsonSerializer.Serialize(record, JsonOptions);
+    }
+
+    private static JsonNode? SanitizeJsonNode(JsonNode? node)
+    {
+        switch (node)
+        {
+            case null:
+                return null;
+            case JsonObject obj:
+                var sanitizedObject = new JsonObject();
+                foreach (var property in obj)
+                {
+                    var propertyName = property.Key;
+                    var sanitizedPropertyName = MakeUniquePropertyName(
+                        sanitizedObject,
+                        SanitizeJsonPropertyName(propertyName));
+                    sanitizedObject[sanitizedPropertyName] = IsSensitiveMetadataKey(propertyName)
+                        ? JsonValue.Create("[REDACTED]")
+                        : SanitizeJsonNode(property.Value);
+                }
+                return sanitizedObject;
+            case JsonArray array:
+                var sanitizedArray = new JsonArray();
+                foreach (var item in array)
+                    sanitizedArray.Add(SanitizeJsonNode(item));
+                return sanitizedArray;
+            case JsonValue value when value.TryGetValue<string>(out var text):
+                return SanitizeStringValue(text);
+            default:
+                return node.DeepClone();
+        }
+    }
+
+    private static JsonNode? SanitizeStringValue(string text)
+    {
+        var trimmed = text.TrimStart();
+        if ((trimmed.StartsWith('{') || trimmed.StartsWith('[')) &&
+            TryParseJsonString(text, out var parsed))
+        {
+            return SanitizeJsonNode(parsed);
+        }
+
+        return JsonValue.Create(NormalizeSingleLine(TokenSanitizer.SanitizeLogMessage(text)));
+    }
+
+    private static bool TryParseJsonString(string text, out JsonNode? node)
+    {
+        try
+        {
+            node = JsonNode.Parse(text);
+            return node is not null;
+        }
+        catch (JsonException)
+        {
+            node = null;
+            return false;
+        }
+    }
+
+    private static string NormalizeSingleLine(string text) =>
+        text.Replace("\r\n", " ", StringComparison.Ordinal)
+            .Replace('\r', ' ')
+            .Replace('\n', ' ');
+
+    private static bool IsSensitiveMetadataKey(string key) =>
+        TokenSanitizer.IsSensitiveMetadataKeyName(key);
+
+    private static string SanitizeJsonPropertyName(string propertyName)
+    {
+        var sanitized = NormalizeSingleLine(TokenSanitizer.SanitizeLogMessage(propertyName));
+        return string.IsNullOrWhiteSpace(sanitized) ? "[redacted-key]" : sanitized;
+    }
+
+    private static string MakeUniquePropertyName(JsonObject obj, string propertyName)
+    {
+        if (!obj.ContainsKey(propertyName))
+            return propertyName;
+
+        var index = 2;
+        string candidate;
+        do
+        {
+            candidate = $"{propertyName}#{index++}";
+        } while (obj.ContainsKey(candidate));
+
+        return candidate;
+    }
+
+#if OPENCLAW_TRAY_TESTS
+    internal static object? SanitizeMetadataForTest(object? metadata) => SanitizeMetadata(metadata);
+    internal static string FormatRecordLineForTest(string eventName, object metadata) => FormatRecordLine(eventName, metadata);
+#endif
+
     private static async Task WriterLoopAsync()
     {
         var channel = s_channel;
diff --git a/src/OpenClaw.Tray.WinUI/Services/DiagnosticsLogTailReader.cs b/src/OpenClaw.Tray.WinUI/Services/DiagnosticsLogTailReader.cs
new file mode 100644
index 000000000..ddcdf0315
--- /dev/null
+++ b/src/OpenClaw.Tray.WinUI/Services/DiagnosticsLogTailReader.cs
@@ -0,0 +1,153 @@
+using System.Text;
+
+namespace OpenClawTray.Services;
+
+internal sealed record DiagnosticsTailOptions(
+    int MaxLines = 200,
+    int MaxLineChars = 8_000,
+    int MaxSectionChars = 256_000,
+    int MaxReadBytes = 512_000,
+    DiagnosticsExportLineKind LineKind = DiagnosticsExportLineKind.Text,
+    int SanitizationContextLines = 20);
+
+internal static class DiagnosticsLogTailReader
+{
+    public static string BuildSection(string title, string? path, DiagnosticsTailOptions? options = null)
+    {
+        options ??= new DiagnosticsTailOptions();
+        var builder = new StringBuilder();
+        builder.AppendLine($"## {title}");
+        builder.AppendLine($"Source: {FormatPath(path)}");
+
+        if (string.IsNullOrWhiteSpace(path) || !File.Exists(path))
+        {
+            builder.AppendLine("Status: not found");
+            builder.AppendLine();
+            return builder.ToString();
+        }
+
+        try
+        {
+            var lines = ReadSanitizedTail(path, options);
+            builder.AppendLine($"Lines: last {lines.Count} of up to {options.MaxLines}");
+            builder.AppendLine("Sanitization: applied during export; source log was not modified.");
+            builder.AppendLine();
+
+            var writtenChars = 0;
+            foreach (var rawLine in lines)
+            {
+                var line = TruncateLine(rawLine, options.MaxLineChars);
+                if (writtenChars + line.Length > options.MaxSectionChars)
+                {
+                    builder.AppendLine($"[truncated section at {options.MaxSectionChars} chars]");
+                    break;
+                }
+
+                builder.AppendLine(line);
+                writtenChars += line.Length + Environment.NewLine.Length;
+            }
+        }
+        catch (Exception ex) when (ex is IOException or UnauthorizedAccessException or NotSupportedException)
+        {
+            builder.AppendLine($"Status: failed to read ({ex.GetType().Name})");
+        }
+
+        builder.AppendLine();
+        return builder.ToString();
+    }
+
+    public static IReadOnlyList<string> ReadTail(string path, int maxLines)
+        => ReadTail(path, maxLines, maxReadBytes: 512_000);
+
+    public static IReadOnlyList<string> ReadTail(string path, int maxLines, int maxReadBytes)
+    {
+        if (maxLines <= 0)
+            return [];
+
+        using var stream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite | FileShare.Delete);
+        if (stream.Length == 0)
+            return [];
+
+        const int ChunkSize = 8192;
+        var chunks = new Stack<byte[]>();
+        var buffer = new byte[ChunkSize];
+        var position = stream.Length;
+        var newlineCount = 0;
+        var bytesCollected = 0;
+        maxReadBytes = Math.Max(1, maxReadBytes);
+
+        while (position > 0 && newlineCount <= maxLines && bytesCollected < maxReadBytes)
+        {
+            var bytesToRead = (int)Math.Min(Math.Min(buffer.Length, position), maxReadBytes - bytesCollected);
+            position -= bytesToRead;
+            stream.Seek(position, SeekOrigin.Begin);
+            stream.ReadExactly(buffer.AsSpan(0, bytesToRead));
+            bytesCollected += bytesToRead;
+
+            var chunk = buffer.AsSpan(0, bytesToRead).ToArray();
+            chunks.Push(chunk);
+
+            for (var i = bytesToRead - 1; i >= 0; i--)
+            {
+                if (buffer[i] == (byte)'\n')
+                    newlineCount++;
+            }
+        }
+
+        using var tailBytes = new MemoryStream();
+        foreach (var chunk in chunks)
+            tailBytes.Write(chunk);
+
+        var text = Encoding.UTF8.GetString(tailBytes.ToArray())
+            .Replace("\r\n", "\n", StringComparison.Ordinal)
+            .Replace('\r', '\n');
+        var lines = text.Split('\n').ToList();
+        if (lines.Count > 0 && lines[^1].Length == 0)
+            lines.RemoveAt(lines.Count - 1);
+        return lines.TakeLast(maxLines).ToArray();
+    }
+
+    public static IReadOnlyList<string> ReadSanitizedTail(string path, DiagnosticsTailOptions options)
+    {
+        var contextLineCount = Math.Max(0, options.SanitizationContextLines);
+        var lines = ReadTail(path, options.MaxLines + contextLineCount, options.MaxReadBytes);
+        return SanitizeTailLines(lines, options.LineKind)
+            .TakeLast(options.MaxLines)
+            .ToArray();
+    }
+
+    private static IReadOnlyList<string> SanitizeTailLines(IReadOnlyList<string> lines, DiagnosticsExportLineKind kind)
+    {
+        if (lines.Count == 0)
+            return [];
+
+        var sanitized = DiagnosticsExportSanitizer.SanitizeTextBlock(string.Join('\n', lines), kind)
+            .Replace("\r\n", "\n", StringComparison.Ordinal)
+            .Replace('\r', '\n')
+            .Split('\n');
+
+        for (var i = 0; i < sanitized.Length; i++)
+            sanitized[i] = DiagnosticsExportSanitizer.SanitizeLine(sanitized[i], kind);
+
+        return sanitized;
+    }
+
+    private static string FormatPath(string? path) =>
+        string.IsNullOrWhiteSpace(path)
+            ? "not configured"
+            : FormatSourcePath(path);
+
+    private static string TruncateLine(string line, int maxChars)
+    {
+        if (maxChars <= 0 || line.Length <= maxChars)
+            return line;
+
+        return line[..maxChars] + $"... [truncated {line.Length - maxChars} chars]";
+    }
+
+    private static string FormatSourcePath(string path)
+    {
+        var fileName = Path.GetFileName(path);
+        return string.IsNullOrWhiteSpace(fileName) ? "configured" : fileName;
+    }
+}
diff --git a/src/OpenClaw.Tray.WinUI/Services/ExecApprovalPromptService.cs b/src/OpenClaw.Tray.WinUI/Services/ExecApprovalPromptService.cs
index 9a80df223..b37936609 100644
--- a/src/OpenClaw.Tray.WinUI/Services/ExecApprovalPromptService.cs
+++ b/src/OpenClaw.Tray.WinUI/Services/ExecApprovalPromptService.cs
@@ -6,19 +6,26 @@
 using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
+using OpenClawTray.Chat;
 
 namespace OpenClawTray.Services;
 
 public sealed class ExecApprovalPromptService : IExecApprovalPromptHandler
 {
     private readonly IOpenClawLogger _logger;
+    private readonly Func<OpenClawChatDataProvider?>? _chatProviderProvider;
+    private readonly Func<string, bool>? _inlineApprovalAvailable;
 
     public ExecApprovalPromptService(
         DispatcherQueue dispatcherQueue,
         Func<FrameworkElement?> rootProvider,
-        IOpenClawLogger logger)
+        IOpenClawLogger logger,
+        Func<OpenClawChatDataProvider?>? chatProviderProvider = null,
+        Func<string, bool>? inlineApprovalAvailable = null)
     {
         _logger = logger;
+        _chatProviderProvider = chatProviderProvider;
+        _inlineApprovalAvailable = inlineApprovalAvailable;
     }
 
     /// <summary>
@@ -31,26 +38,64 @@ public ExecApprovalPromptService(
     /// resolved as Deny.
     /// </summary>
     public event EventHandler<ExecApprovalPromptDecidedEventArgs>? Decided;
+    public event EventHandler<ExecApprovalPromptRequestedEventArgs>? InlineApprovalRequested;
 
-    public Task<ExecApprovalPromptDecision> RequestAsync(
+    public async Task<ExecApprovalPromptDecision> RequestAsync(
         ExecApprovalPromptRequest request,
         CancellationToken cancellationToken = default)
     {
-        var tcs = new TaskCompletionSource<ExecApprovalPromptDecision>(TaskCreationOptions.RunContinuationsAsynchronously);
         if (cancellationToken.IsCancellationRequested)
         {
             var cancelled = ExecApprovalPromptDecision.Deny("Approval prompt was cancelled");
             RaiseDecided(request, cancelled, ExecApprovalPromptDecisionSource.Cancelled);
-            return Task.FromResult(cancelled);
+            return cancelled;
+        }
+
+        var hasSessionKey = !string.IsNullOrWhiteSpace(request.SessionKey);
+        var chatProvider = _chatProviderProvider?.Invoke();
+        if (hasSessionKey
+            && (_inlineApprovalAvailable?.Invoke(request.SessionKey!) ?? false)
+            && chatProvider is { } provider)
+        {
+            try
+            {
+                var inlineTask = provider.RequestLocalExecApprovalAsync(request, cancellationToken);
+                if (!inlineTask.IsCompleted)
+                    RaiseInlineApprovalRequested(request);
+
+                var inlineDecision = await inlineTask.ConfigureAwait(false);
+                if (inlineDecision is not null)
+                {
+                    _logger.Info($"[ExecApproval] Inline prompt decision: {inlineDecision.Kind}");
+                    RaiseDecided(request, inlineDecision, MapDecisionToSource(inlineDecision));
+                    return inlineDecision;
+                }
+            }
+            catch (OperationCanceledException) when (cancellationToken.IsCancellationRequested)
+            {
+                var cancelled = ExecApprovalPromptDecision.Deny("Approval prompt was cancelled");
+                RaiseDecided(request, cancelled, ExecApprovalPromptDecisionSource.Cancelled);
+                return cancelled;
+            }
+            catch (Exception ex)
+            {
+                _logger.Warn($"[ExecApproval] Inline prompt failed: {ex.Message}; falling back to native prompt");
+            }
+        }
+        else if (hasSessionKey && chatProvider is not null)
+        {
+            _logger.Info("[ExecApproval] Native prompt selected because no native chat surface is active");
         }
 
+        var tcs = new TaskCompletionSource<ExecApprovalPromptDecision>(TaskCreationOptions.RunContinuationsAsynchronously);
+
         var thread = new Thread(() =>
         {
             try
             {
                 var decision = ShowNativePrompt(request);
                 _logger.Info($"[ExecApproval] Prompt decision: {decision.Kind}");
-                RaiseDecided(request, decision, MapKindToUserSource(decision.Kind));
+                RaiseDecided(request, decision, MapDecisionToSource(decision));
                 tcs.TrySetResult(decision);
             }
             catch (Exception ex)
@@ -68,7 +113,27 @@ public Task<ExecApprovalPromptDecision> RequestAsync(
         thread.SetApartmentState(ApartmentState.STA);
         thread.Start();
 
-        return tcs.Task;
+        return await tcs.Task.ConfigureAwait(false);
+    }
+
+    private void RaiseInlineApprovalRequested(ExecApprovalPromptRequest request)
+    {
+        try
+        {
+            InlineApprovalRequested?.Invoke(this, new ExecApprovalPromptRequestedEventArgs(request));
+        }
+        catch (Exception ex)
+        {
+            _logger.Warn($"[ExecApproval] InlineApprovalRequested subscriber threw: {ex.Message}");
+        }
+    }
+
+    private static ExecApprovalPromptDecisionSource MapDecisionToSource(ExecApprovalPromptDecision decision)
+    {
+        if (string.Equals(decision.Reason, ExecApprovalPromptDecision.TimedOutReason, StringComparison.Ordinal))
+            return ExecApprovalPromptDecisionSource.TimedOut;
+
+        return MapKindToUserSource(decision.Kind);
     }
 
     private static ExecApprovalPromptDecisionSource MapKindToUserSource(ExecApprovalPromptDecisionKind kind) => kind switch
diff --git a/src/OpenClaw.Tray.WinUI/Services/GatewayService.cs b/src/OpenClaw.Tray.WinUI/Services/GatewayService.cs
index e9d6af0e4..05da04255 100644
--- a/src/OpenClaw.Tray.WinUI/Services/GatewayService.cs
+++ b/src/OpenClaw.Tray.WinUI/Services/GatewayService.cs
@@ -23,6 +23,8 @@ internal sealed class GatewayService
     public event EventHandler<string>? AuthenticationFailed;
     public event EventHandler<SessionCommandResult>? SessionCommandCompleted;
     public event EventHandler<OpenClawNotification>? NotificationReceived;
+    /// <summary>Raised (on the UI thread) whenever the node or device pending pair-list changes.</summary>
+    public event EventHandler? PairListsChanged;
 
     // Throttle / dedup state (moved from App)
     private DateTime _lastPreviewRequestUtc = DateTime.MinValue;
@@ -190,6 +192,10 @@ private void OnConnectionStatusChanged(object? sender, ConnectionStatus status)
             if (status == ConnectionStatus.Disconnected || status == ConnectionStatus.Error)
             {
                 _state.ClearCachedData();
+                // Pair lists were just cleared — notify the approval coordinator so it
+                // reconciles to empty (resolving any open approvals / closing the dialog)
+                // instead of leaving stale state until the operator client is swapped out.
+                PairListsChanged?.Invoke(this, EventArgs.Empty);
             }
 
             ConnectionStatusChanged?.Invoke(this, status);
@@ -492,13 +498,21 @@ private void OnAgentFileContentUpdated(object? sender, JsonElement data)
     private void OnNodePairListUpdated(object? sender, PairingListInfo data)
     {
         if (sender != _currentClient) return;
-        EnqueueModelUpdate(() => _state.NodePairList = data);
+        EnqueueModelUpdate(() =>
+        {
+            _state.NodePairList = data;
+            PairListsChanged?.Invoke(this, EventArgs.Empty);
+        });
     }
 
     private void OnDevicePairListUpdated(object? sender, DevicePairingListInfo data)
     {
         if (sender != _currentClient) return;
-        EnqueueModelUpdate(() => _state.DevicePairList = data);
+        EnqueueModelUpdate(() =>
+        {
+            _state.DevicePairList = data;
+            PairListsChanged?.Invoke(this, EventArgs.Empty);
+        });
     }
 
     private void OnModelsListUpdated(object? sender, ModelsListInfo data)
diff --git a/src/OpenClaw.Tray.WinUI/Services/Logger.cs b/src/OpenClaw.Tray.WinUI/Services/Logger.cs
index 31c3cd9ed..ef46e4061 100644
--- a/src/OpenClaw.Tray.WinUI/Services/Logger.cs
+++ b/src/OpenClaw.Tray.WinUI/Services/Logger.cs
@@ -40,11 +40,7 @@ public static class Logger
     static Logger()
     {
         // OPENCLAW_TRAY_DATA_DIR keeps test instances out of the user's log file.
-        _logDirectory = Environment.GetEnvironmentVariable("OPENCLAW_TRAY_DATA_DIR") is { Length: > 0 } overrideDir
-            ? overrideDir
-            : Path.Combine(
-                Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
-                "OpenClawTray");
+        _logDirectory = AppIdentity.ResolveLocalDataDirectory();
 
         try { Directory.CreateDirectory(_logDirectory); }
         catch (Exception ex) { ReportWriteFailure($"create log dir: {ex.Message}"); }
diff --git a/src/OpenClaw.Tray.WinUI/Services/McpRuntimeStatePolicy.cs b/src/OpenClaw.Tray.WinUI/Services/McpRuntimeStatePolicy.cs
new file mode 100644
index 000000000..bbc494930
--- /dev/null
+++ b/src/OpenClaw.Tray.WinUI/Services/McpRuntimeStatePolicy.cs
@@ -0,0 +1,46 @@
+using System;
+
+namespace OpenClawTray.Services;
+
+internal readonly record struct McpStartupNotificationPlan(bool ShouldShow, string? Message)
+{
+    public bool ShouldDismiss => !ShouldShow;
+}
+
+internal static class McpRuntimeStatePolicy
+{
+    public const string DefaultStartupError = "Local MCP server did not start.";
+
+    public static McpStartupNotificationPlan PlanStartupNotification(
+        bool enableMcpServer,
+        bool isMcpRunning,
+        string? startupError)
+    {
+        if (!enableMcpServer)
+            return new McpStartupNotificationPlan(false, null);
+
+        if (!string.IsNullOrWhiteSpace(startupError))
+            return new McpStartupNotificationPlan(true, startupError);
+
+        return isMcpRunning
+            ? new McpStartupNotificationPlan(false, null)
+            : new McpStartupNotificationPlan(true, DefaultStartupError);
+    }
+
+    public static string? GetSettingsSetError(
+        string settingName,
+        object? convertedValue,
+        bool isMcpRunning,
+        string? startupError)
+    {
+        if (!string.Equals(settingName, nameof(SettingsManager.EnableMcpServer), StringComparison.OrdinalIgnoreCase) ||
+            convertedValue is not bool enableMcpServer ||
+            !enableMcpServer)
+        {
+            return null;
+        }
+
+        var plan = PlanStartupNotification(enableMcpServer, isMcpRunning, startupError);
+        return plan.ShouldShow ? plan.Message : null;
+    }
+}
diff --git a/src/OpenClaw.Tray.WinUI/Services/NodeCapabilityGating.cs b/src/OpenClaw.Tray.WinUI/Services/NodeCapabilityGating.cs
index a26bd026e..6a2c2911b 100644
--- a/src/OpenClaw.Tray.WinUI/Services/NodeCapabilityGating.cs
+++ b/src/OpenClaw.Tray.WinUI/Services/NodeCapabilityGating.cs
@@ -61,4 +61,17 @@ public static bool ShouldRegisterBrowserProxy(SettingsManager? s, string? shared
     }
 
     public static bool ShouldRegisterSystemRun(SettingsManager? s)    => s?.NodeSystemRunEnabled    != false;
+
+    /// <summary>Counts node capability categories served by local MCP without a gateway node client.</summary>
+    public static int CountMcpServedCapabilities(SettingsManager? s)
+    {
+        int n = 2; // system + device are always registered
+        if (ShouldRegisterCanvas(s)) n++;
+        if (ShouldRegisterScreen(s)) n++;
+        if (ShouldRegisterCamera(s)) n++;
+        if (ShouldRegisterLocation(s)) n++;
+        if (ShouldRegisterTts(s)) n++;
+        if (ShouldRegisterStt(s)) n++;
+        return n;
+    }
 }
diff --git a/src/OpenClaw.Tray.WinUI/Services/NodeInvokeActivityFormatter.cs b/src/OpenClaw.Tray.WinUI/Services/NodeInvokeActivityFormatter.cs
index ccd0a21d6..378641571 100644
--- a/src/OpenClaw.Tray.WinUI/Services/NodeInvokeActivityFormatter.cs
+++ b/src/OpenClaw.Tray.WinUI/Services/NodeInvokeActivityFormatter.cs
@@ -31,7 +31,8 @@ public static string GetPrivacyClass(string command)
         if (string.IsNullOrEmpty(command)) return Metadata;
 
         if (command.StartsWith("stt.", StringComparison.OrdinalIgnoreCase) ||
-            command.StartsWith("tts.", StringComparison.OrdinalIgnoreCase))
+            command.StartsWith("tts.", StringComparison.OrdinalIgnoreCase) ||
+            command.StartsWith("app.chat.", StringComparison.OrdinalIgnoreCase))
         {
             return PrivacySensitive;
         }
diff --git a/src/OpenClaw.Tray.WinUI/Services/NodeService.cs b/src/OpenClaw.Tray.WinUI/Services/NodeService.cs
index defa53847..671de442e 100644
--- a/src/OpenClaw.Tray.WinUI/Services/NodeService.cs
+++ b/src/OpenClaw.Tray.WinUI/Services/NodeService.cs
@@ -11,6 +11,7 @@
 using OpenClaw.Shared.ExecApprovals;
 using OpenClaw.Shared.Mcp;
 using OpenClaw.Shared.Mxc;
+using OpenClawTray.Chat;
 using OpenClawTray.A2UI.Actions;
 using OpenClawTray.A2UI.Rendering;
 using OpenClawTray.Helpers;
@@ -27,6 +28,8 @@ public sealed class NodeService : IDisposable, IAsyncDisposable
     private readonly IOpenClawLogger _logger;
     private readonly DispatcherQueue _dispatcherQueue;
     private readonly Func<FrameworkElement?> _rootProvider;
+    private readonly Func<OpenClawChatDataProvider?> _chatProviderProvider;
+    private readonly Func<string, bool> _inlineApprovalAvailable;
     private readonly SettingsManager? _settings;
     private readonly SemaphoreSlim _consentLock = new(1, 1);
     private readonly object _disposeLock = new();
@@ -91,7 +94,7 @@ public sealed class NodeService : IDisposable, IAsyncDisposable
     // Identity store location for the role-aware DeviceIdentity. Defaults to
     // _dataPath when no separate path is supplied (preserves existing test
     // behavior that hands a single temp directory to NodeService). The Tray
-    // app supplies %APPDATA%\OpenClawTray here so node device tokens land in
+    // app supplies its build-specific roaming data folder so node device tokens land in
     // the same DeviceIdentity store as operator tokens (Phase 1 model:
     // single shared location, role distinction inside).
     private readonly string _identityDataPath;
@@ -158,6 +161,7 @@ public sealed class NodeService : IDisposable, IAsyncDisposable
     public string McpEndpoint => McpServerUrl;
     /// <summary>Last MCP server startup error, or null if it started cleanly. Surfaced by Settings UI.</summary>
     public string? McpStartupError => _mcpStartupError;
+    public void SetMcpStartupError(string? error) => _mcpStartupError = string.IsNullOrWhiteSpace(error) ? null : error;
     
     // Events
     public event EventHandler<ConnectionStatus>? StatusChanged;
@@ -167,7 +171,8 @@ public sealed class NodeService : IDisposable, IAsyncDisposable
     public event EventHandler<NodeInvokeCompletedEventArgs>? InvokeCompleted;
     public event EventHandler<GatewaySelfInfo>? GatewaySelfUpdated;
     public event EventHandler<RecordingStateEventArgs>? RecordingStateChanged;
-    public event EventHandler<ToastContentBuilder>? ToastRequested;
+    public event EventHandler<NodeToastRequestedEventArgs>? ToastRequested;
+    public event EventHandler<ExecApprovalPromptRequestedEventArgs>? LocalExecApprovalRequested;
     public event EventHandler<ExecApprovalPromptDecidedEventArgs>? LocalExecApprovalDecided;
     
     public bool IsScreenRecording { get; private set; }
@@ -193,6 +198,8 @@ public NodeService(
         DispatcherQueue dispatcherQueue,
         string dataPath,
         Func<FrameworkElement?>? rootProvider = null,
+        Func<OpenClawChatDataProvider?>? chatProviderProvider = null,
+        Func<string, bool>? inlineApprovalAvailable = null,
         SettingsManager? settings = null,
         bool enableMcpServer = false,
         string? identityDataPath = null,
@@ -210,6 +217,8 @@ public NodeService(
         _activeGatewayTunnelResolver = activeGatewayTunnelResolver;
         _activeGatewayUrlResolver = activeGatewayUrlResolver;
         _rootProvider = rootProvider ?? (() => null);
+        _chatProviderProvider = chatProviderProvider ?? (() => null);
+        _inlineApprovalAvailable = inlineApprovalAvailable ?? (_ => false);
         _settings = settings;
         _enableMcpServer = enableMcpServer;
         _screenCaptureService = new ScreenCaptureService(logger);
@@ -235,8 +244,16 @@ public Task StartLocalOnlyAsync()
         // and are consumed by the MCP bridge directly.
         _logger.Info("Starting Windows Node in MCP-only mode (no gateway)");
         _token = null;
+        _mcpStartupError = null;
 
-        RegisterCapabilities();
+        try
+        {
+            RegisterCapabilities();
+        }
+        catch (Exception ex)
+        {
+            SetMcpStartupFailure(ex, "capability registration");
+        }
 
         return Task.CompletedTask;
     }
@@ -303,7 +320,13 @@ private void RegisterCapabilities()
         _systemCapability.PolicyAutoDecided += OnLocalExecApprovalDecided;
         _systemCapability.SetCommandRunner(BuildSystemRunRunner());
         _systemCapability.SetApprovalPolicy(new ExecApprovalPolicy(_dataPath, _logger));
-        var execPrompt = new ExecApprovalPromptService(_dispatcherQueue, _rootProvider, _logger);
+        var execPrompt = new ExecApprovalPromptService(
+            _dispatcherQueue,
+            _rootProvider,
+            _logger,
+            _chatProviderProvider,
+            _inlineApprovalAvailable);
+        execPrompt.InlineApprovalRequested += OnLocalExecApprovalRequested;
         execPrompt.Decided += OnLocalExecApprovalDecided;
         _systemCapability.SetPromptHandler(execPrompt);
         Register(_systemCapability);
@@ -353,6 +376,7 @@ private void RegisterCapabilities()
             _textToSpeechService ??= new TextToSpeechService(_logger, settings);
             _ttsCapability = new TtsCapability(_logger);
             _ttsCapability.SpeakRequested += OnTtsSpeakAsync;
+            _ttsCapability.StatusRequested += OnTtsStatusAsync;
             Register(_ttsCapability);
         }
 
@@ -553,16 +577,30 @@ private void DetachClientHandlers(WindowsNodeClient client)
     /// Build the <see cref="ICommandRunner"/> for system.run. Returns an
     /// <see cref="MxcCommandRunner"/> wrapping <see cref="DirectAppContainerExecutor"/>.
     /// The runner honors <see cref="SettingsData.SystemRunSandboxEnabled"/>
-    /// and, per issue #494, falls back to <see cref="LocalCommandRunner"/>
-    /// at runtime when MXC isn't available on this host.
+    /// by attempting MXC containment when available, preserving compatibility
+    /// host fallback when MXC is unavailable unless strict fallback blocking is
+    /// enabled, and rejecting unsupported sandbox request features while
+    /// sandboxing remains enabled.
     /// </summary>
     private ICommandRunner BuildSystemRunRunner()
     {
-        var availability = _mxcAvailability ??= MxcAvailability.Probe(_logger);
         var hostRunner = new LocalCommandRunner(_logger);
-        var executor = new DirectAppContainerExecutor(availability, _logger);
+        var executor = new DirectAppContainerExecutor(GetOrProbeMxcAvailability, _logger);
 
-        if (availability.HasAnyBackend)
+        // Do NOT probe synchronously here: this runs while _capabilitiesLock is held
+        // (RegisterCapabilities), and a blocking wxc-exec --probe (~15s) would stall
+        // capability registration / reconnect. Log from a non-blocking peek; the
+        // first real probe happens lazily on the first system.run via the
+        // availability gate / executor provider below (off any of our locks).
+        var peeked = PeekMxcAvailability();
+        if (peeked is null)
+        {
+            _logger.Info(
+                $"[mxc] system.run runner = MxcCommandRunner " +
+                $"(executor={executor.Name}; MXC availability probe deferred to first use; " +
+                $"sandboxEnabled={(_settings?.SystemRunSandboxEnabled ?? true)})");
+        }
+        else if (peeked.HasAnyBackend)
         {
             _logger.Info(
                 $"[mxc] system.run runner = MxcCommandRunner " +
@@ -571,11 +609,15 @@ private ICommandRunner BuildSystemRunRunner()
         else
         {
             // MXC unavailable on this host. The runner's top-level
-            // !_isSandboxAvailable() guard will route to the host fallback
-            // for every call; the executor is constructed only to satisfy
-            // the constructor contract and is never invoked.
-            var reason = string.Join("; ", availability.UnsupportedReasons);
-            _logger.Info($"[mxc] system.run runner = MxcCommandRunner (MXC unavailable, commands will run uncontained: {reason})");
+            // !_isSandboxAvailable() guard will either block or use the
+            // compatibility host fallback, depending on settings. The executor is
+            // constructed only to satisfy the constructor contract and is never
+            // invoked.
+            var reason = string.Join("; ", peeked.UnsupportedReasons);
+            var unavailableMode = (_settings?.SystemRunBlockHostFallbackWhenMxcUnavailable ?? false)
+                ? "commands will be blocked by strict fallback settings"
+                : "commands will run through host fallback";
+            _logger.Info($"[mxc] system.run runner = MxcCommandRunner (MXC unavailable, {unavailableMode}: {reason})");
         }
 
         var settingsDirectory = SettingsManager.SettingsDirectoryPath;
@@ -584,10 +626,11 @@ private ICommandRunner BuildSystemRunRunner()
             hostRunner,
             () => SnapshotSettings(),
             () => settingsDirectory,
-            // Re-probe on demand if the cache was invalidated by a prior
-            // SandboxUnavailableException (see invalidateAvailability below).
-            () => (_mxcAvailability ??= MxcAvailability.Probe(_logger)).HasAnyBackend,
-            invalidateAvailability: () => _mxcAvailability = null,
+            // Re-probe on demand when sandbox availability is checked: returns the
+            // cached definitive verdict, or re-probes (single-flight) after a
+            // transient error / a prior SandboxUnavailableException-driven invalidation.
+            () => GetOrProbeMxcAvailability().HasAnyBackend,
+            invalidateAvailability: InvalidateMxcAvailability,
             _logger);
     }
 
@@ -602,12 +645,14 @@ private SettingsData SnapshotSettings()
             return new SettingsData
             {
                 SystemRunSandboxEnabled = true,
+                SystemRunBlockHostFallbackWhenMxcUnavailable = false,
                 SystemRunAllowOutbound = false,
             };
 
         return new SettingsData
         {
             SystemRunSandboxEnabled = _settings.SystemRunSandboxEnabled,
+            SystemRunBlockHostFallbackWhenMxcUnavailable = _settings.SystemRunBlockHostFallbackWhenMxcUnavailable,
             SystemRunAllowOutbound = _settings.SystemRunAllowOutbound,
             // Sandbox page fields — read by MxcPolicyBuilder.ForSystemRun.
             SandboxClipboard = _settings.SandboxClipboard,
@@ -626,11 +671,108 @@ private SettingsData SnapshotSettings()
     }
 
     private MxcAvailability? _mxcAvailability;
+    private DateTime _mxcNextProbeAllowedAtUtc;
+    private Task<MxcAvailability>? _mxcProbeInFlight;
+    private readonly object _mxcAvailabilityLock = new();
+
+    /// <summary>
+    /// Minimum interval before re-probing after a transient probe error. Bounds the
+    /// cost of re-spawning <c>wxc-exec --probe</c> while a probe error persists,
+    /// while still letting a momentary glitch self-heal quickly.
+    /// </summary>
+    private static readonly TimeSpan MxcProbeRetryInterval = TimeSpan.FromSeconds(5);
 
-    private void StartMcpServer()
+    /// <summary>
+    /// Return the current MXC availability, probing if needed. Definitive verdicts
+    /// (supported / host-unsupported) are cached for the process lifetime; a transient
+    /// probe error (<see cref="MxcAvailability.ProbeErrored"/>) is NOT cached
+    /// permanently — once the retry window opens we re-probe so a momentary glitch
+    /// doesn't pin the whole process to uncontained execution.
+    /// </summary>
+    /// <remarks>
+    /// The blocking probe (<c>wxc-exec --probe</c>, up to ~15s) is NEVER run while
+    /// holding <see cref="_mxcAvailabilityLock"/>: concurrent callers share a single
+    /// in-flight probe (single-flight) and wait on it OUTSIDE the lock, so a slow
+    /// probe can't serialize unrelated callers or stall lock users. The retry window
+    /// opens only AFTER a probe completes, so a 15s timeout can't immediately permit a
+    /// back-to-back re-probe.
+    /// </remarks>
+    private MxcAvailability GetOrProbeMxcAvailability()
     {
-        if (!_enableMcpServer) return;
-        if (_mcpServer != null) return;
+        Task<MxcAvailability> probe;
+        lock (_mxcAvailabilityLock)
+        {
+            // Definitive verdict — cached for the process lifetime.
+            if (_mxcAvailability is { ProbeErrored: false } definitive)
+                return definitive;
+
+            // Transient error — keep serving it (routes to uncontained) until the
+            // retry window opens, so we don't re-probe on every command.
+            if (_mxcAvailability is { ProbeErrored: true } errored
+                && _mxcProbeInFlight is null
+                && DateTime.UtcNow < _mxcNextProbeAllowedAtUtc)
+                return errored;
+
+            // Start a probe if none is running, otherwise join the in-flight one.
+            probe = _mxcProbeInFlight ??= Task.Run(ProbeAndStoreMxcAvailability);
+        }
+
+        // Wait OUTSIDE the lock so other callers / lock users aren't blocked.
+        return probe.GetAwaiter().GetResult();
+    }
+
+    private MxcAvailability ProbeAndStoreMxcAvailability()
+    {
+        MxcAvailability result;
+        try
+        {
+            result = MxcAvailability.Probe(_logger);
+        }
+        catch (Exception ex)
+        {
+            // Probe() is designed not to throw, but never let an unexpected fault
+            // poison the single-flight slot or leak out of the shared task.
+            _logger.Warn($"[mxc] availability probe threw unexpectedly: {ex.GetType().Name}: {ex.Message}");
+            result = new MxcAvailability(
+                false, false, false, null,
+                new[] { "MXC availability probe failed unexpectedly." }, probeErrored: true);
+        }
+
+        lock (_mxcAvailabilityLock)
+        {
+            _mxcAvailability = result;
+            // Open the retry window only AFTER completion so a slow (timeout) probe
+            // doesn't immediately allow a back-to-back re-probe.
+            _mxcNextProbeAllowedAtUtc = DateTime.UtcNow + MxcProbeRetryInterval;
+            _mxcProbeInFlight = null;
+        }
+        return result;
+    }
+
+    /// <summary>
+    /// Non-blocking read of the cached MXC availability for diagnostics/logging.
+    /// Returns null when nothing has been probed yet. Never spawns or waits on a
+    /// probe, so it is safe to call while holding other locks (e.g. _capabilitiesLock).
+    /// </summary>
+    private MxcAvailability? PeekMxcAvailability()
+    {
+        lock (_mxcAvailabilityLock)
+            return _mxcAvailability;
+    }
+
+    private void InvalidateMxcAvailability()
+    {
+        lock (_mxcAvailabilityLock)
+        {
+            _mxcAvailability = null;
+            _mxcNextProbeAllowedAtUtc = default;
+        }
+    }
+
+    private bool StartMcpServer()
+    {
+        if (!_enableMcpServer) return true;
+        if (_mcpServer != null) return true;
         McpHttpServer? attempt = null;
         try
         {
@@ -657,7 +799,7 @@ private void StartMcpServer()
                 serverName: "openclaw-tray-mcp",
                 serverVersion: AppVersionInfo.Version);
             // Bearer-token auth. Token is created on first start and persists
-            // alongside other OpenClawTray data (so OPENCLAW_TRAY_DATA_DIR
+            // alongside other build-specific app data (so OPENCLAW_TRAY_DATA_DIR
             // isolation in tests scopes the token too); CLI/agent registration
             // reads from the same path. Loopback bind + Origin/Host checks
             // remain in front; this layer rejects untrusted local processes
@@ -674,6 +816,7 @@ private void StartMcpServer()
             attempt.Start();
             _mcpServer = attempt;
             _mcpStartupError = null;
+            return true;
         }
         catch (Exception ex)
         {
@@ -689,6 +832,7 @@ private void StartMcpServer()
                 _logger.Debug($"[MCP] Cleanup of half-started listener failed: {cleanupEx.Message}");
             }
             _mcpServer = null;
+            return false;
         }
     }
 
@@ -705,9 +849,16 @@ private void StartMcpServer()
             32 or 183 => $"Port {port} is already in use. Stop the other process or change the MCP port.",
             _ => $"HTTP listener error {hle.ErrorCode}: {hle.Message}",
         },
-        _ => ex.Message,
+        InvalidOperationException => $"Configuration error: {ex.Message}",
+        _ => $"MCP server startup failed: {ex.Message}",
     };
 
+    private void SetMcpStartupFailure(Exception ex, string phase)
+    {
+        _mcpStartupError = DescribeMcpStartupFailure(ex, McpPort);
+        _logger.Error($"[MCP] Failed during {phase}: {_mcpStartupError}", ex);
+    }
+
     private void StopMcpServer()
     {
         ObserveBackgroundFault(StopMcpServerAsync(), "[MCP] Dispose error");
@@ -756,16 +907,30 @@ public void SetMcpEnabled(bool enabled)
             if (_mcpServer != null) return; // already running
 
             _logger.Info("[MCP] SetMcpEnabled(true) — starting MCP server");
+            _mcpStartupError = null;
 
             bool needsCapabilities;
             lock (_capabilitiesLock) { needsCapabilities = _capabilities.Count == 0; }
-            if (needsCapabilities)
+            try
             {
-                RegisterCapabilities();
+                if (needsCapabilities)
+                {
+                    RegisterCapabilities();
+                }
+                else
+                {
+                    StartMcpServer();
+                }
             }
-            else
+            catch (Exception ex)
+            {
+                SetMcpStartupFailure(ex, "MCP enable");
+            }
+
+            if (_mcpServer == null && string.IsNullOrWhiteSpace(_mcpStartupError))
             {
-                StartMcpServer();
+                _mcpStartupError = "MCP server startup failed: listener did not start.";
+                _logger.Error($"[MCP] {_mcpStartupError}");
             }
         }
         else
@@ -902,6 +1067,14 @@ private void OnLocalExecApprovalDecided(object? sender, ExecApprovalPromptDecide
             LocalExecApprovalDecided?.Invoke(this, args);
         });
     }
+
+    private void OnLocalExecApprovalRequested(object? sender, ExecApprovalPromptRequestedEventArgs args)
+    {
+        _dispatcherQueue.TryEnqueue(() =>
+        {
+            LocalExecApprovalRequested?.Invoke(this, args);
+        });
+    }
     
     #endregion
     
@@ -921,7 +1094,7 @@ private void OnCanvasPresent(object? sender, CanvasPresentArgs args)
                 if (_canvasWindow == null || _canvasWindow.IsClosed)
                 {
                     _canvasWindow = new CanvasWindow();
-                    _canvasWindow.SetTrustedGatewayOrigin(GatewayUrl, _token);
+                    _canvasWindow.SetTrustedGatewayOrigin(GatewayUrl, _token, GetConfiguredGatewayUrl());
                 }
 
                 // Configure window
@@ -994,24 +1167,11 @@ private void OnCanvasHide(object? sender, EventArgs args)
     }
     
     /// <summary>
-    /// Service a <c>canvas.navigate</c> request by launching the URL in the
-    /// OS default browser. Always — even if a WebView2 canvas window is open.
-    /// Rationale: "open this link" on Windows means the default browser, and
-    /// the embedded WebView2 canvas runs URL-rewriting (gateway-origin pinning,
-    /// CSP, etc.) that mangles arbitrary external URLs. Agents that want to
-    /// load a page inside an embedded surface should use <c>canvas.present</c>.
-    ///
-    /// Open canvas windows are NOT closed after navigate. A2UI surfaces are
-    /// control panels / dashboards / launchers, not browser frames; clicking a
-    /// link inside one shouldn't dismiss it any more than clicking a link in
-    /// the Start Menu would. Agents that want explicit teardown should call
-    /// <c>canvas.hide</c> or emit <c>deleteSurface</c>.
-    ///
-    /// CanvasCapability has already validated the URL with HttpUrlValidator;
-    /// we re-validate here as defense-in-depth so the OS-level shell-execute
-    /// can never see an unvetted string.
+    /// Service a <c>canvas.navigate</c> request inside the WebView canvas.
+    /// CanvasCapability has already validated the URL; re-validate here before
+    /// handing it to WebView2.
     /// </summary>
-    private Task<string> OnCanvasNavigate(string url)
+    private async Task<string> OnCanvasNavigate(string url)
     {
         if (!HttpUrlValidator.TryParse(url, out var canonical, out var validationError))
         {
@@ -1019,37 +1179,40 @@ private Task<string> OnCanvasNavigate(string url)
             throw new InvalidOperationException($"Invalid url: {validationError}");
         }
 
-        var initialRisk = HttpUrlRiskEvaluator.Evaluate(canonical!);
+        var risk = await EnrichWithDnsRiskAsync(HttpUrlRiskEvaluator.Evaluate(canonical!)).ConfigureAwait(false);
+        if (risk.RequiresConfirmation)
+        {
+            _logger.Warn($"Canvas navigate unsupported in canvas: {OpenClaw.Shared.UrlLogSanitizer.Sanitize(risk.CanonicalOrigin)}");
+            return "unsupported_in_canvas";
+        }
 
-        // Move the entire decision off the request thread so the agent's
-        // response latency carries no signal about the user's decision (see
-        // long comment retained below). DNS resolution + prompt + launch all
-        // run from the worker.
-        _ = Task.Run(async () =>
+        var tcs = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
+        var cts = new CancellationTokenSource();
+        if (!_dispatcherQueue.TryEnqueue(() =>
         {
+            if (cts.IsCancellationRequested) return;
             try
             {
-                // Best-effort triage: resolve DNS now so a hostname pointing at
-                // an internal IP raises the prompt. This is NOT a pin on the
-                // launched request — the OS browser performs its own DNS
-                // resolution when handed the URL, so the actual trust boundary
-                // is the user's browser zone/proxy config. A second resolve
-                // immediately before ShellExecute would not change that.
-                var pinnedRisk = await EnrichWithDnsRiskAsync(initialRisk).ConfigureAwait(false);
-                if (await ShouldLaunchAfterPromptAsync(pinnedRisk).ConfigureAwait(false))
-                    LaunchInDefaultBrowser(canonical!);
+                CloseA2UICanvasWindow();
+                EnsureCanvasWindow();
+                if (_canvasWindow == null)
+                    throw new InvalidOperationException("Canvas window unavailable");
+
+                _canvasWindow.Navigate(canonical!);
+                _canvasWindow.BringToFront(false);
+                _logger.Info($"Canvas navigate -> canvas: {OpenClaw.Shared.UrlLogSanitizer.Sanitize(canonical)}");
+                tcs.TrySetResult("canvas");
             }
             catch (Exception ex)
             {
-                _logger.Error("Canvas navigate (deferred) failed", ex);
+                tcs.TrySetException(ex);
             }
-        });
+        }))
+        {
+            tcs.TrySetException(new InvalidOperationException("Failed to dispatch canvas.navigate to UI thread"));
+        }
 
-        // The agent gets the same response shape and the same response time
-        // whether or not a confirmation prompt is needed. If we awaited the
-        // prompt here, response latency would leak the user's decision time
-        // (or even the existence of a prompt).
-        return Task.FromResult("browser");
+        return await WaitWithTimeout(tcs.Task, cts, "canvas.navigate");
     }
 
     /// <summary>
@@ -1123,7 +1286,7 @@ private async Task<bool> ShouldLaunchAfterPromptAsync(HttpUrlRiskProfile pinnedR
                 if (decision.Kind == UrlNavigationApprovalDecisionKind.Deny)
                 {
                     _navigationDenyCooldown[pinnedRisk.HostKey] = DateTimeOffset.UtcNow + NavigationDenyCooldownDuration;
-                    _logger.Warn($"Canvas navigate denied: {OpenClaw.Shared.UrlLogSanitizer.Sanitize(pinnedRisk.CanonicalOrigin)} ({decision.Reason ?? "user denied"}); already reported success to agent");
+                    _logger.Warn($"Canvas navigate denied before WebView navigation: {OpenClaw.Shared.UrlLogSanitizer.Sanitize(pinnedRisk.CanonicalOrigin)} ({decision.Reason ?? "user denied"})");
                     return false;
                 }
                 // AllowHost (session-allowlist) is currently unreachable from
@@ -1427,11 +1590,13 @@ private void EnsureCanvasWindow()
         if (_canvasWindow == null || _canvasWindow.IsClosed)
         {
             _canvasWindow = new CanvasWindow();
-            _canvasWindow.SetTrustedGatewayOrigin(GatewayUrl, _token);
+            _canvasWindow.SetTrustedGatewayOrigin(GatewayUrl, _token, GetConfiguredGatewayUrl());
         }
         _canvasWindow?.Activate();
     }
 
+    private string? GetConfiguredGatewayUrl() => _activeGatewayUrlResolver?.Invoke();
+
     // Mutable context shared with GatewayActionTransport. SessionKey is updated
     // from push props (when the agent supplies one); host/instance stay tied to
     // the node client identity. Default sessionKey is "main", matching Android's
@@ -1578,6 +1743,31 @@ private void OnCanvasA2UIReset(object? sender, EventArgs args)
     #endregion
     
     #region Screen Capability Handlers
+
+    private void RequestNodeToast(
+        string title,
+        string message,
+        string dedupeKey,
+        AppNotificationSeverity severity = AppNotificationSeverity.Informational,
+        string category = "node.invoke",
+        bool mirrorInApp = false)
+    {
+        var appNotification = mirrorInApp
+            ? AppNotificationMapper.FromNodeActivity(
+                title,
+                message,
+                category,
+                severity,
+                dedupeKey)
+            : null;
+        ToastRequested?.Invoke(
+            this,
+            new NodeToastRequestedEventArgs(
+                new ToastContentBuilder()
+                    .AddText(title)
+                    .AddText(message),
+                appNotification));
+    }
     
     private async Task<ScreenCaptureResult> OnScreenCapture(ScreenCaptureArgs args)
     {
@@ -1591,9 +1781,10 @@ private async Task<ScreenCaptureResult> OnScreenCapture(ScreenCaptureArgs args)
         if ((now - _lastScreenCaptureNotification).TotalSeconds > 10)
         {
             _lastScreenCaptureNotification = now;
-            ToastRequested?.Invoke(this, new ToastContentBuilder()
-                .AddText(LocalizationHelper.GetString("Toast_ScreenCaptured"))
-                .AddText(LocalizationHelper.GetString("Toast_ScreenCapturedDetail")));
+            RequestNodeToast(
+                LocalizationHelper.GetString("Toast_ScreenCaptured"),
+                LocalizationHelper.GetString("Toast_ScreenCapturedDetail"),
+                "node:screen-captured");
         }
         
         return await _screenCaptureService.CaptureAsync(args);
@@ -1612,20 +1803,26 @@ private async Task<ScreenRecordResult> OnScreenRecord(ScreenRecordArgs args)
         SetRecordingState(RecordingType.Screen, true, args.DurationMs);
         try
         {
-            ToastRequested?.Invoke(this, new ToastContentBuilder()
-                .AddText(LocalizationHelper.GetString("Toast_ScreenRecordingStarted"))
-                .AddText(LocalizationHelper.GetString("Toast_ScreenRecordingStartedDetail")));
+            RequestNodeToast(
+                LocalizationHelper.GetString("Toast_ScreenRecordingStarted"),
+                LocalizationHelper.GetString("Toast_ScreenRecordingStartedDetail"),
+                "node:screen-recording-started");
             var result = await _screenRecordingService.RecordAsync(args);
-            ToastRequested?.Invoke(this, new ToastContentBuilder()
-                .AddText(LocalizationHelper.GetString("Toast_ScreenRecordingComplete"))
-                .AddText(LocalizationHelper.GetString("Toast_ScreenRecordingCompleteDetail")));
+            RequestNodeToast(
+                LocalizationHelper.GetString("Toast_ScreenRecordingComplete"),
+                LocalizationHelper.GetString("Toast_ScreenRecordingCompleteDetail"),
+                "node:screen-recording-complete",
+                AppNotificationSeverity.Success);
             return result;
         }
         catch (Exception ex) when (ex is not InvalidOperationException)
         {
-            ToastRequested?.Invoke(this, new ToastContentBuilder()
-                .AddText(LocalizationHelper.GetString("Toast_ScreenRecordingFailed"))
-                .AddText(LocalizationHelper.GetString("Toast_ScreenRecordingFailedDetail")));
+            RequestNodeToast(
+                LocalizationHelper.GetString("Toast_ScreenRecordingFailed"),
+                LocalizationHelper.GetString("Toast_ScreenRecordingFailedDetail"),
+                "node:screen-recording-failed",
+                AppNotificationSeverity.Error,
+                mirrorInApp: true);
             throw;
         }
         finally
@@ -1661,9 +1858,12 @@ private async Task<CameraSnapResult> OnCameraSnap(CameraSnapArgs args)
         }
         catch (UnauthorizedAccessException ex)
         {
-            ToastRequested?.Invoke(this, new ToastContentBuilder()
-                .AddText(LocalizationHelper.GetString("Toast_CameraBlocked"))
-                .AddText(LocalizationHelper.GetString("Toast_CameraBlockedDetail")));
+            RequestNodeToast(
+                LocalizationHelper.GetString("Toast_CameraBlocked"),
+                LocalizationHelper.GetString("Toast_CameraBlockedDetail"),
+                "node:camera-blocked",
+                AppNotificationSeverity.Error,
+                mirrorInApp: true);
             throw new InvalidOperationException(
                 "Camera access blocked. Enable camera access for desktop apps in Windows Privacy settings.",
                 ex);
@@ -1683,20 +1883,26 @@ private async Task<CameraClipResult> OnCameraClip(CameraClipArgs args)
         SetRecordingState(RecordingType.Camera, true, args.DurationMs);
         try
         {
-            ToastRequested?.Invoke(this, new ToastContentBuilder()
-                .AddText(LocalizationHelper.GetString("Toast_CameraRecordingStarted"))
-                .AddText(LocalizationHelper.GetString("Toast_CameraRecordingStartedDetail")));
+            RequestNodeToast(
+                LocalizationHelper.GetString("Toast_CameraRecordingStarted"),
+                LocalizationHelper.GetString("Toast_CameraRecordingStartedDetail"),
+                "node:camera-recording-started");
             var result = await _cameraCaptureService.ClipAsync(args);
-            ToastRequested?.Invoke(this, new ToastContentBuilder()
-                .AddText(LocalizationHelper.GetString("Toast_CameraRecordingComplete"))
-                .AddText(LocalizationHelper.GetString("Toast_CameraRecordingCompleteDetail")));
+            RequestNodeToast(
+                LocalizationHelper.GetString("Toast_CameraRecordingComplete"),
+                LocalizationHelper.GetString("Toast_CameraRecordingCompleteDetail"),
+                "node:camera-recording-complete",
+                AppNotificationSeverity.Success);
             return result;
         }
         catch (UnauthorizedAccessException ex)
         {
-            ToastRequested?.Invoke(this, new ToastContentBuilder()
-                .AddText(LocalizationHelper.GetString("Toast_CameraBlocked"))
-                .AddText(LocalizationHelper.GetString("Toast_CameraBlockedDetail")));
+            RequestNodeToast(
+                LocalizationHelper.GetString("Toast_CameraBlocked"),
+                LocalizationHelper.GetString("Toast_CameraBlockedDetail"),
+                "node:camera-blocked",
+                AppNotificationSeverity.Error,
+                mirrorInApp: true);
             throw new InvalidOperationException(
                 "Camera access blocked. Enable camera access for desktop apps in Windows Privacy settings.",
                 ex);
@@ -1736,6 +1942,14 @@ private Task<TtsSpeakResult> OnTtsSpeakAsync(TtsSpeakArgs args, CancellationToke
         return _textToSpeechService.SpeakAsync(args, cancellationToken);
     }
 
+    private Task<TtsStatusResult> OnTtsStatusAsync(CancellationToken cancellationToken)
+    {
+        if (_textToSpeechService == null)
+            throw new InvalidOperationException("Text-to-speech service not available");
+
+        return Task.FromResult(_textToSpeechService.GetStatus());
+    }
+
     // ============================================================
     // ============================================================
     // STT handlers
diff --git a/src/OpenClaw.Tray.WinUI/Services/NodeToastRequestedEventArgs.cs b/src/OpenClaw.Tray.WinUI/Services/NodeToastRequestedEventArgs.cs
new file mode 100644
index 000000000..b911e41dc
--- /dev/null
+++ b/src/OpenClaw.Tray.WinUI/Services/NodeToastRequestedEventArgs.cs
@@ -0,0 +1,16 @@
+using Microsoft.Toolkit.Uwp.Notifications;
+using System;
+
+namespace OpenClawTray.Services;
+
+public sealed class NodeToastRequestedEventArgs(
+    ToastContentBuilder toastBuilder,
+    AppNotification? appNotification = null,
+    string? toastTag = null,
+    string? toastDeviceId = null) : EventArgs
+{
+    public ToastContentBuilder ToastBuilder { get; } = toastBuilder ?? throw new ArgumentNullException(nameof(toastBuilder));
+    public AppNotification? AppNotification { get; } = appNotification;
+    public string? ToastTag { get; } = toastTag;
+    public string? ToastDeviceId { get; } = toastDeviceId;
+}
diff --git a/src/OpenClaw.Tray.WinUI/Services/PairingApprovalCoordinator.cs b/src/OpenClaw.Tray.WinUI/Services/PairingApprovalCoordinator.cs
new file mode 100644
index 000000000..dcd64bba0
--- /dev/null
+++ b/src/OpenClaw.Tray.WinUI/Services/PairingApprovalCoordinator.cs
@@ -0,0 +1,300 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using OpenClaw.Connection;
+using OpenClaw.Shared;
+
+namespace OpenClawTray.Services;
+
+/// <summary>Outcome of a confirmed approve/reject decision, surfaced for confirmation toasts/activity.</summary>
+public sealed class PairingDecisionResult
+{
+    public required PendingApproval Approval { get; init; }
+
+    /// <summary>True when the user approved, false when rejected.</summary>
+    public required bool Approved { get; init; }
+
+    /// <summary>True when the gateway confirmed the decision (the request left the pending list).</summary>
+    public required bool Success { get; init; }
+}
+
+/// <summary>
+/// Orchestrates inbound pairing approvals (devices and nodes requesting to join the gateway).
+/// Bridges the pure <see cref="PairingApprovalQueue"/> to the live operator client and the tray
+/// presentation layer:
+/// <list type="bullet">
+///   <item>Consumes pair-list snapshots from <see cref="GatewayService"/>.</item>
+///   <item>Raises <see cref="ApprovalRequested"/> for genuinely new requests so the app can present
+///         the approval window + an awareness toast (gated by scope and the user setting).</item>
+///   <item>Raises <see cref="ApprovalsChanged"/> whenever the actionable set changes so an open
+///         window refreshes.</item>
+///   <item>Executes approve/reject via the operator client and, once the gateway confirms the
+///         decision (the request leaves the pending list), reports <see cref="DecisionCompleted"/>.</item>
+/// </list>
+/// All members are expected to be invoked on the UI dispatcher thread (the gateway service marshals
+/// list updates there), so no internal locking is required.
+/// </summary>
+public sealed class PairingApprovalCoordinator
+{
+    private readonly PairingApprovalQueue _queue = new();
+    private readonly HashSet<string> _inFlight = new(StringComparer.Ordinal);
+    private bool _pollInFlight;
+    private readonly Func<IOperatorGatewayClient?> _getClient;
+    private readonly Func<IReadOnlyCollection<string>?> _getOwnNodeIds;
+    private readonly Func<bool> _isPromptEnabled;
+    private readonly IOpenClawLogger _logger;
+
+    public PairingApprovalCoordinator(
+        Func<IOperatorGatewayClient?> getClient,
+        Func<IReadOnlyCollection<string>?> getOwnNodeIds,
+        Func<bool> isPromptEnabled,
+        IOpenClawLogger logger)
+    {
+        _getClient = getClient ?? throw new ArgumentNullException(nameof(getClient));
+        _getOwnNodeIds = getOwnNodeIds ?? throw new ArgumentNullException(nameof(getOwnNodeIds));
+        _isPromptEnabled = isPromptEnabled ?? throw new ArgumentNullException(nameof(isPromptEnabled));
+        _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+    }
+
+    /// <summary>Raised for each newly-arrived, actionable request the user should be prompted to decide.</summary>
+    public event EventHandler<PendingApproval>? ApprovalRequested;
+
+    /// <summary>Raised whenever the actionable approval set changes (add, resolve, or decision).</summary>
+    public event EventHandler? ApprovalsChanged;
+
+    /// <summary>
+    /// Raised when a submitted approve/reject is CONFIRMED by the gateway (the request left the
+    /// pending list). This is the authoritative success signal — it does not fire on send-ack alone.
+    /// </summary>
+    public event EventHandler<PairingDecisionResult>? DecisionCompleted;
+
+    /// <summary>The current actionable approvals, oldest first.</summary>
+    public IReadOnlyList<PendingApproval> Current => _queue.Current;
+
+    /// <summary>
+    /// Feed a fresh device/node pair-list snapshot. Diffs against prior state and raises the
+    /// appropriate presentation events. A null list for a kind means "no fresh snapshot for that
+    /// kind" — its prior entries are carried forward rather than treated as resolved.
+    /// </summary>
+    public void OnPairListsUpdated(DevicePairingListInfo? devices, PairingListInfo? nodes)
+    {
+        // If we're not connected, an empty/missing list reflects lost visibility — NOT that
+        // requests resolved. Clearing silently here prevents a still-pending submitted decision
+        // from being mis-reported as a confirmed success on disconnect, and drops stale approvals.
+        var client = _getClient();
+        if (client is not { IsConnectedToGateway: true })
+        {
+            Reset();
+            return;
+        }
+
+        PairingApprovalDelta delta;
+        try
+        {
+            // A null list for a kind = no fresh snapshot (carried forward), not "now empty".
+            delta = _queue.Reconcile(devices, nodes, _getOwnNodeIds(), Environment.TickCount64);
+        }
+        catch (Exception ex)
+        {
+            _logger.Warn($"[PairApproval] Reconcile failed: {ex.Message}");
+            return;
+        }
+
+        if (!delta.HasChanges)
+            return;
+
+        // A submitted decision the gateway has now confirmed (request left the pending list) is the
+        // authoritative success signal — report it so the app shows the "approved/rejected" toast.
+        foreach (var resolved in delta.ConfirmedDecisions)
+        {
+            try
+            {
+                DecisionCompleted?.Invoke(this, new PairingDecisionResult
+                {
+                    Approval = resolved.Approval,
+                    Approved = resolved.Approved,
+                    Success = true,
+                });
+            }
+            catch (Exception ex)
+            {
+                _logger.Warn($"[PairApproval] DecisionCompleted handler threw: {ex.Message}");
+            }
+        }
+
+        ApprovalsChanged?.Invoke(this, EventArgs.Empty);
+
+        if (delta.Added.Count == 0)
+            return;
+
+        // Only prompt when the user hasn't opted out and we actually have the scope to act.
+        if (!_isPromptEnabled() || !CanApproveWith(client))
+            return;
+
+        foreach (var added in delta.Added)
+        {
+            try
+            {
+                ApprovalRequested?.Invoke(this, added);
+            }
+            catch (Exception ex)
+            {
+                _logger.Warn($"[PairApproval] ApprovalRequested handler threw: {ex.Message}");
+            }
+        }
+    }
+
+    /// <summary>
+    /// Safety-net refresh: asks the gateway to re-send the pending pair lists. The gateway
+    /// broadcasts pair requests with <c>dropIfSlow=true</c>, so a congested socket can silently
+    /// drop a "device wants to connect" event; a periodic refresh ensures the request is still
+    /// picked up (and the in-page banner stays current). No-op unless the operator is connected
+    /// with approval scope. <see cref="OpenClawGatewayClient"/> already short-circuits these
+    /// requests on gateways that don't support pair lists, so this is cheap on older gateways.
+    /// </summary>
+    public async Task RefreshFromGatewayAsync()
+    {
+        // Non-reentrant: if a wedged-but-"connected" transport makes a refresh hang, don't let the
+        // 20s timer stack up more tracked requests on top of it.
+        if (_pollInFlight)
+            return;
+
+        var client = _getClient();
+        if (!CanApproveWith(client))
+            return;
+
+        _pollInFlight = true;
+        try
+        {
+            try { await client!.RequestDevicePairListAsync(); }
+            catch (Exception ex) { _logger.Info($"[PairApproval] Device pair-list poll failed: {ex.Message}"); }
+
+            try { await client!.RequestNodePairListAsync(); }
+            catch (Exception ex) { _logger.Info($"[PairApproval] Node pair-list poll failed: {ex.Message}"); }
+        }
+        finally
+        {
+            _pollInFlight = false;
+        }
+    }
+
+    /// <summary>Approve the request identified by <paramref name="key"/> (<see cref="PendingApproval.Key"/>).</summary>
+    public Task<bool> ApproveAsync(string key) => DecideAsync(key, approve: true);
+
+    /// <summary>Reject the request identified by <paramref name="key"/>.</summary>
+    public Task<bool> RejectAsync(string key) => DecideAsync(key, approve: false);
+
+    /// <summary>Clear all tracked state (e.g. on disconnect or gateway switch).</summary>
+    public void Reset()
+    {
+        _queue.Reset();
+        _inFlight.Clear();
+        _pollInFlight = false;
+        ApprovalsChanged?.Invoke(this, EventArgs.Empty);
+    }
+
+    private async Task<bool> DecideAsync(string key, bool approve)
+    {
+        var approval = _queue.Find(key);
+        if (approval == null)
+        {
+            _logger.Info($"[PairApproval] Decision for unknown or already-submitted key '{key}' ignored");
+            return false;
+        }
+
+        // Legacy gateways may omit a request id; DecisionId then falls back to the device/node id.
+        // The gateway may ignore that, but the confirmed-resolution model handles it gracefully: the
+        // request simply isn't confirmed, expires, and re-surfaces — no permanent hide, no false toast.
+        if (string.IsNullOrEmpty(approval.RequestId))
+            _logger.Info($"[PairApproval] No request id; submitting decision with device/node id fallback for '{key}'");
+
+        // Guard against a double decision for the same request — e.g. a stray
+        // second click that slips through while the approve/reject RPC is still
+        // in flight. Single-threaded (UI dispatcher), so a HashSet is sufficient.
+        if (!_inFlight.Add(key))
+        {
+            _logger.Info($"[PairApproval] Decision already in flight for '{key}'");
+            return false;
+        }
+
+        try
+        {
+            var client = _getClient();
+            // Re-check connection AND approval scope at decision time — the dialog may have been
+            // open while scope was revoked or the operator reconnected with fewer scopes. The
+            // approve/reject frame is "send-acknowledged" (not gateway-acked), so guarding here
+            // avoids attempting an out-of-scope decision the gateway would silently reject.
+            if (client is not { IsConnectedToGateway: true }
+                || !OperatorScopeHelper.CanApproveDevices(client.GrantedOperatorScopes))
+            {
+                _logger.Warn("[PairApproval] Operator can no longer approve pairings (disconnected or scope lost); decision aborted");
+                return false;
+            }
+
+            bool ok = false;
+            try
+            {
+                ok = (approval.Kind, approve) switch
+                {
+                    (PairingApprovalKind.DevicePair, true) => await client.DevicePairApproveAsync(approval.DecisionId),
+                    (PairingApprovalKind.DevicePair, false) => await client.DevicePairRejectAsync(approval.DecisionId),
+                    (PairingApprovalKind.NodePair, true) => await client.NodePairApproveAsync(approval.DecisionId),
+                    (PairingApprovalKind.NodePair, false) => await client.NodePairRejectAsync(approval.DecisionId),
+                    _ => false,
+                };
+            }
+            catch (Exception ex)
+            {
+                _logger.Warn($"[PairApproval] {(approve ? "Approve" : "Reject")} RPC failed: {ex.Message}");
+                ok = false;
+            }
+
+            if (ok)
+            {
+                // Send-ack only means the frame left the socket, NOT that the gateway accepted it.
+                // But first re-validate the exact connection: a disconnect/reconnect may have raced
+                // the await (and already Reset() the queue). Recording a submission against a new
+                // client would strand a likely-dropped frame and risk a later false confirmation, so
+                // treat it as not completed instead — the request re-surfaces on reconnect for a
+                // clean retry.
+                var liveClient = _getClient();
+                if (!ReferenceEquals(liveClient, client) || !CanApproveWith(liveClient))
+                {
+                    _logger.Info("[PairApproval] Connection changed during decision; not recording optimistic submission");
+                    return false;
+                }
+
+                // Record the decision as optimistic-pending so the UI advances, but defer the
+                // success confirmation until the gateway drops the request from the pending list
+                // (surfaced as a ConfirmedDecision on a later reconcile). If it never does, the
+                // submission expires and the request re-surfaces for retry.
+                _queue.MarkSubmitted(approval, approve, Environment.TickCount64);
+
+                // Nudge the gateway to re-send the list so the resolved entry drops (and confirms) promptly.
+                try
+                {
+                    if (approval.Kind == PairingApprovalKind.DevicePair)
+                        await liveClient.RequestDevicePairListAsync();
+                    else
+                        await liveClient.RequestNodePairListAsync();
+                }
+                catch (Exception ex)
+                {
+                    _logger.Info($"[PairApproval] Post-decision list refresh failed: {ex.Message}");
+                }
+
+                ApprovalsChanged?.Invoke(this, EventArgs.Empty);
+            }
+
+            return ok;
+        }
+        finally
+        {
+            _inFlight.Remove(key);
+        }
+    }
+
+    private static bool CanApproveWith(IOperatorGatewayClient? client) =>
+        client is { IsConnectedToGateway: true }
+        && OperatorScopeHelper.CanApproveDevices(client.GrantedOperatorScopes);
+}
diff --git a/src/OpenClaw.Tray.WinUI/Services/SessionVisibilityFilter.cs b/src/OpenClaw.Tray.WinUI/Services/SessionVisibilityFilter.cs
new file mode 100644
index 000000000..2f2ee7cb8
--- /dev/null
+++ b/src/OpenClaw.Tray.WinUI/Services/SessionVisibilityFilter.cs
@@ -0,0 +1,33 @@
+using OpenClaw.Shared;
+
+namespace OpenClawTray.Services;
+
+public static class SessionVisibilityFilter
+{
+    public static IEnumerable<SessionInfo> VisibleSessions(IEnumerable<SessionInfo> sessions, bool showCompleted)
+        => showCompleted ? sessions : sessions.Where(IsVisibleWhenCompletedHidden);
+
+    public static bool IsVisibleWhenCompletedHidden(SessionInfo session)
+        => !IsCleanCompleted(session);
+
+    public static bool IsCleanCompleted(SessionInfo session)
+    {
+        if (session.AbortedLastRun)
+            return false;
+
+        var status = session.Status?.Trim();
+        return string.Equals(status, "done", StringComparison.OrdinalIgnoreCase)
+            || string.Equals(status, "completed", StringComparison.OrdinalIgnoreCase);
+    }
+
+    public static string ResolveActiveChannel(string activeChannel, IEnumerable<string> visibleChannels)
+    {
+        if (!string.Equals(activeChannel, "all", StringComparison.OrdinalIgnoreCase)
+            && visibleChannels.Any(channel => string.Equals(channel, activeChannel, StringComparison.OrdinalIgnoreCase)))
+        {
+            return activeChannel;
+        }
+
+        return "all";
+    }
+}
diff --git a/src/OpenClaw.Tray.WinUI/Services/SettingsManager.cs b/src/OpenClaw.Tray.WinUI/Services/SettingsManager.cs
index 55103c590..b7229c66f 100644
--- a/src/OpenClaw.Tray.WinUI/Services/SettingsManager.cs
+++ b/src/OpenClaw.Tray.WinUI/Services/SettingsManager.cs
@@ -18,7 +18,11 @@ public class SettingsManager
     private readonly string _settingsDirectory;
     private readonly string _settingsFilePath;
     private const string ProtectedSecretPrefix = "dpapi:";
+    private const int CurrentSettingsSchemaVersion = 1;
     private static readonly byte[] ProtectedSecretEntropy = Encoding.UTF8.GetBytes("OpenClawTray.Settings.v1");
+    public const string AppThemeSystem = "System";
+    public const string AppThemeLight = "Light";
+    public const string AppThemeDark = "Dark";
 
     public static string SettingsDirectoryPath => GetDefaultSettingsDirectory();
     public static string SettingsPath => Path.Combine(SettingsDirectoryPath, "settings.json");
@@ -31,7 +35,7 @@ public class SettingsManager
     private SettingsData _data = CreateDefaultData();
 
     // Connection
-    public string GatewayUrl { get => _data.GatewayUrl ?? "ws://localhost:18789"; set => _data = _data with { GatewayUrl = value }; }
+    public string GatewayUrl { get => _data.GatewayUrl ?? AppIdentity.SetupGatewayUrl; set => _data = _data with { GatewayUrl = value }; }
     public bool UseSshTunnel { get => _data.UseSshTunnel; set => _data = _data with { UseSshTunnel = value }; }
     public string SshTunnelUser { get => _data.SshTunnelUser ?? ""; set => _data = _data with { SshTunnelUser = value }; }
     public string SshTunnelHost { get => _data.SshTunnelHost ?? ""; set => _data = _data with { SshTunnelHost = value }; }
@@ -85,9 +89,15 @@ public List<OpenClaw.Shared.UserNotificationRule> UserRules
     /// Default false (native).
     /// </summary>
     public bool UseLegacyWebChat { get => _data.UseLegacyWebChat; set => _data = _data with { UseLegacyWebChat = value }; }
+    public bool ShowCompletedSessions { get => _data.ShowCompletedSessions; set => _data = _data with { ShowCompletedSessions = value }; }
+    public string AppTheme { get => NormalizeAppTheme(_data.AppTheme); set => _data = _data with { AppTheme = NormalizeAppTheme(value) }; }
+    public bool? ShowDiagnosticsOverride { get => _data.ShowDiagnostics; set => _data = _data with { ShowDiagnostics = value }; }
+    public bool ShowDiagnosticsEffective => _data.ShowDiagnostics ?? OpenClawTray.Helpers.DiagnosticsGate.BuildDefault;
 
     // Node mode(gateway WebSocket connection — separate from MCP)
     public bool EnableNodeMode { get => _data.EnableNodeMode; set => _data = _data with { EnableNodeMode = value }; }
+    /// <summary>Master switch for the focused inbound-pairing approval dialog + awareness toast.</summary>
+    public bool ShowPairingApprovalDialog { get => _data.ShowPairingApprovalDialog; set => _data = _data with { ShowPairingApprovalDialog = value }; }
     public bool NodeCanvasEnabled { get => _data.NodeCanvasEnabled; set => _data = _data with { NodeCanvasEnabled = value }; }
     public bool NodeScreenEnabled { get => _data.NodeScreenEnabled; set => _data = _data with { NodeScreenEnabled = value }; }
     public bool NodeCameraEnabled { get => _data.NodeCameraEnabled; set => _data = _data with { NodeCameraEnabled = value }; }
@@ -141,8 +151,10 @@ public List<string> A2UIImageHosts
     public string? PreferredGatewayId { get => _data.PreferredGatewayId; set => _data = _data with { PreferredGatewayId = value }; }
 
     // ── MXC sandbox ─────────────────────────────────────────────────────
-    /// <summary>Master switch for system.run containment. When true (default), system.run runs sandboxed and is denied if MXC is unavailable. When false, system.run runs on host like before.</summary>
+    /// <summary>Master switch for system.run containment. When true (default), system.run uses MXC when available and falls back to host execution when unavailable unless strict fallback blocking is enabled. When false, system.run runs on host like before.</summary>
     public bool SystemRunSandboxEnabled { get => _data.SystemRunSandboxEnabled; set => _data = _data with { SystemRunSandboxEnabled = value }; }
+    /// <summary>When true, sandbox-enabled system.run blocks instead of using the compatibility host fallback if MXC is unavailable. Default false.</summary>
+    public bool SystemRunBlockHostFallbackWhenMxcUnavailable { get => _data.SystemRunBlockHostFallbackWhenMxcUnavailable; set => _data = _data with { SystemRunBlockHostFallbackWhenMxcUnavailable = value }; }
     /// <summary>When sandboxed, allow system.run commands to reach the public internet. Default false.</summary>
     public bool SystemRunAllowOutbound { get => _data.SystemRunAllowOutbound; set => _data = _data with { SystemRunAllowOutbound = value }; }
 
@@ -175,11 +187,7 @@ public SettingsManager(string settingsDirectory)
 
     private static string GetDefaultSettingsDirectory()
     {
-        return Environment.GetEnvironmentVariable("OPENCLAW_TRAY_DATA_DIR") is { Length: > 0 } overrideDir
-            ? overrideDir
-            : Path.Combine(
-                Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
-                "OpenClawTray");
+        return AppIdentity.ResolveRoamingDataDirectory();
     }
 
     public void Load()
@@ -197,7 +205,7 @@ public void Load()
                 var loaded = SettingsData.FromJson(json);
                 if (loaded != null)
                 {
-                    _data = NormalizeLoadedData(loaded);
+                    _data = NormalizeLoadedData(loaded, json);
                 }
             }
         }
@@ -211,7 +219,8 @@ public void Load()
 
     private static SettingsData CreateDefaultData() => new()
     {
-        GatewayUrl = "ws://localhost:18789",
+        SettingsSchemaVersion = CurrentSettingsSchemaVersion,
+        GatewayUrl = AppIdentity.SetupGatewayUrl,
         UseSshTunnel = false,
         SshTunnelUser = "",
         SshTunnelHost = "",
@@ -235,6 +244,8 @@ public void Load()
         PreferStructuredCategories = true,
         UserRules = new(),
         UseLegacyWebChat = false,
+        ShowCompletedSessions = false,
+        AppTheme = AppThemeSystem,
         EnableNodeMode = false,
         NodeCanvasEnabled = true,
         NodeScreenEnabled = true,
@@ -264,6 +275,7 @@ public void Load()
         SkippedUpdateTag = "",
         PreferredGatewayId = null,
         SystemRunSandboxEnabled = true,
+        SystemRunBlockHostFallbackWhenMxcUnavailable = false,
         SystemRunAllowOutbound = false,
         SandboxClipboard = SandboxClipboardMode.None,
         SandboxDocumentsAccess = null,
@@ -274,11 +286,12 @@ public void Load()
         SandboxMaxOutputBytes = 4 * 1024 * 1024
     };
 
-    private static SettingsData NormalizeLoadedData(SettingsData loaded)
+    private static SettingsData NormalizeLoadedData(SettingsData loaded, string? rawJson = null)
     {
         var defaults = CreateDefaultData();
         var data = loaded with
         {
+            SettingsSchemaVersion = CurrentSettingsSchemaVersion,
             GatewayUrl = loaded.GatewayUrl ?? defaults.GatewayUrl,
             SshTunnelUser = loaded.SshTunnelUser ?? defaults.SshTunnelUser,
             SshTunnelHost = loaded.SshTunnelHost ?? defaults.SshTunnelHost,
@@ -298,8 +311,11 @@ private static SettingsData NormalizeLoadedData(SettingsData loaded)
             A2UIImageHosts = loaded.A2UIImageHosts is { Count: > 0 } hosts ? new List<string>(hosts) : new(),
             SkippedUpdateTag = loaded.SkippedUpdateTag ?? defaults.SkippedUpdateTag,
             PreferredGatewayId = loaded.PreferredGatewayId ?? defaults.PreferredGatewayId,
+            AppTheme = NormalizeAppTheme(loaded.AppTheme),
+            ShowDiagnostics = loaded.ShowDiagnostics,
             UserRules = loaded.UserRules != null ? new List<UserNotificationRule>(loaded.UserRules) : new(),
             SandboxCustomFolders = CloneSandboxCustomFolders(loaded.SandboxCustomFolders),
+            SystemRunBlockHostFallbackWhenMxcUnavailable = loaded.SystemRunBlockHostFallbackWhenMxcUnavailable,
             SandboxTimeoutMs = loaded.SandboxTimeoutMs > 0 ? loaded.SandboxTimeoutMs : defaults.SandboxTimeoutMs,
             SandboxMaxOutputBytes = loaded.SandboxMaxOutputBytes > 0 ? loaded.SandboxMaxOutputBytes : defaults.SandboxMaxOutputBytes,
             McpOnlyMode = null
@@ -380,6 +396,8 @@ public SettingsData ToSettingsData() => _data with
         TtsElevenLabsVoiceId = string.IsNullOrWhiteSpace(TtsElevenLabsVoiceId) ? null : TtsElevenLabsVoiceId,
         TtsWindowsVoiceId = string.IsNullOrWhiteSpace(TtsWindowsVoiceId) ? null : TtsWindowsVoiceId,
         TtsPiperVoiceId = TtsPiperVoiceId,
+        AppTheme = AppTheme,
+        ShowDiagnostics = ShowDiagnosticsOverride,
         A2UIImageHosts = A2UIImageHosts.Count == 0 ? null : new List<string>(A2UIImageHosts),
         SkippedUpdateTag = string.IsNullOrWhiteSpace(SkippedUpdateTag) ? null : SkippedUpdateTag,
         PreferredGatewayId = string.IsNullOrWhiteSpace(PreferredGatewayId) ? null : PreferredGatewayId,
@@ -390,6 +408,15 @@ public SettingsData ToSettingsData() => _data with
         McpOnlyMode = null
     };
 
+    public static string NormalizeAppTheme(string? value)
+    {
+        if (string.Equals(value, AppThemeLight, StringComparison.OrdinalIgnoreCase))
+            return AppThemeLight;
+        if (string.Equals(value, AppThemeDark, StringComparison.OrdinalIgnoreCase))
+            return AppThemeDark;
+        return AppThemeSystem;
+    }
+
     public void Save()
     {
         lock (_saveLock)
diff --git a/src/OpenClaw.Tray.WinUI/Services/SetupExistingGatewayClassifier.cs b/src/OpenClaw.Tray.WinUI/Services/SetupExistingGatewayClassifier.cs
index 8f086b51b..558e40ae7 100644
--- a/src/OpenClaw.Tray.WinUI/Services/SetupExistingGatewayClassifier.cs
+++ b/src/OpenClaw.Tray.WinUI/Services/SetupExistingGatewayClassifier.cs
@@ -13,7 +13,7 @@ public enum SetupExistingGatewayKind
 
 public static class SetupExistingGatewayClassifier
 {
-    private const string AppOwnedDistroName = "OpenClawGateway";
+    private static string AppOwnedDistroName => AppIdentity.SetupDistroName;
 
     public static SetupExistingGatewayKind ClassifyWithoutWslProbe(
         GatewayRegistry? registry,
@@ -154,12 +154,12 @@ private static bool SetupStateLooksLocal(string setupStatePath)
     public static string ResolveLocalDataPath()
     {
         if (Environment.GetEnvironmentVariable("OPENCLAW_TRAY_LOCALAPPDATA_DIR") is { Length: > 0 } localAppDataRoot)
-            return Path.Combine(localAppDataRoot, "OpenClawTray");
+            return Path.Combine(localAppDataRoot, AppIdentity.DataDirectoryName);
 
         if (Environment.GetEnvironmentVariable("OPENCLAW_TRAY_LOCAL_DATA_DIR") is { Length: > 0 } localDataDir)
             return localDataDir;
 
-        return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "OpenClawTray");
+        return AppIdentity.ResolveSetupLocalDataDirectory();
     }
 
     private static bool PhaseLooksActiveOrComplete(JsonElement phaseEl)
diff --git a/src/OpenClaw.Tray.WinUI/Services/StartupSetupState.cs b/src/OpenClaw.Tray.WinUI/Services/StartupSetupState.cs
index 95e2a1c97..6da89a094 100644
--- a/src/OpenClaw.Tray.WinUI/Services/StartupSetupState.cs
+++ b/src/OpenClaw.Tray.WinUI/Services/StartupSetupState.cs
@@ -5,8 +5,6 @@ namespace OpenClawTray.Services;
 
 internal static class StartupSetupState
 {
-    private const string DefaultGatewayUrl = "ws://localhost:18789";
-
     public static bool HasStoredNodeDeviceToken(string dataPath) =>
         HasAnyDeviceTokenForRole(dataPath, "node");
 
@@ -66,7 +64,7 @@ private static bool HasNonDefaultGatewayUrl(SettingsManager settings) =>
         !string.IsNullOrWhiteSpace(settings.GatewayUrl)
         && !string.Equals(
             settings.GatewayUrl,
-            DefaultGatewayUrl,
+            AppIdentity.SetupGatewayUrl,
             StringComparison.OrdinalIgnoreCase);
 
     public static bool CanStartNodeGateway(SettingsManager settings, string dataPath)
diff --git a/src/OpenClaw.Tray.WinUI/Services/TextToSpeech/TextToSpeechService.cs b/src/OpenClaw.Tray.WinUI/Services/TextToSpeech/TextToSpeechService.cs
index dbc43ea46..2381b3d9d 100644
--- a/src/OpenClaw.Tray.WinUI/Services/TextToSpeech/TextToSpeechService.cs
+++ b/src/OpenClaw.Tray.WinUI/Services/TextToSpeech/TextToSpeechService.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
@@ -50,9 +51,37 @@ internal TextToSpeechService(
 
     public async Task<TtsSpeakResult> SpeakAsync(TtsSpeakArgs args, CancellationToken cancellationToken = default)
     {
-        var provider = TtsCapability.ResolveProvider(args.Provider, _settings.TtsProvider);
+        // Resolve the provider that should actually serve this call. When the
+        // configured/default provider isn't usable (no ElevenLabs key, Piper
+        // voice not downloaded), fall back to Windows TTS so the assistant can
+        // still talk instead of failing the call outright. Explicit per-call
+        // provider requests stay strict so callers can rely on provider
+        // selection.
+        var readyProviders = BuildReadyProviderSet(args);
+        var allowFallback = string.IsNullOrWhiteSpace(args.Provider);
+        var resolution = TtsCapability.ResolveEffectiveProvider(
+            args.Provider, _settings.TtsProvider, readyProviders, allowFallback);
+        var provider = resolution.EffectiveProvider;
         var stopwatch = Stopwatch.StartNew();
 
+        if (resolution.FellBack)
+        {
+            // The per-call voiceId/model were meant for the originally
+            // requested provider; they're meaningless (and would throw, e.g.
+            // "Windows TTS voice '<piper-id>' was not found") on the fallback
+            // provider. Drop them so the fallback uses its own configured voice.
+            _logger.Info(
+                $"TTS provider '{resolution.RequestedProvider}' not usable; falling back to '{provider}'");
+            args = new TtsSpeakArgs
+            {
+                Text = args.Text,
+                Provider = provider,
+                VoiceId = null,
+                Model = null,
+                Interrupt = args.Interrupt
+            };
+        }
+
         if (string.Equals(provider, TtsCapability.WindowsProvider, StringComparison.OrdinalIgnoreCase))
         {
             await SpeakWithWindowsAsync(args, cancellationToken).ConfigureAwait(false);
@@ -74,6 +103,8 @@ public async Task<TtsSpeakResult> SpeakAsync(TtsSpeakArgs args, CancellationToke
         return new TtsSpeakResult
         {
             Provider = provider,
+            RequestedProvider = resolution.RequestedProvider,
+            FellBack = resolution.FellBack,
             ContentType = string.Equals(provider, TtsCapability.ElevenLabsProvider, StringComparison.OrdinalIgnoreCase)
                 ? "audio/mpeg"
                 : "audio/wav",
@@ -81,22 +112,135 @@ public async Task<TtsSpeakResult> SpeakAsync(TtsSpeakArgs args, CancellationToke
         };
     }
 
+    /// <summary>
+    /// Snapshot per-provider readiness plus the configured/effective default
+    /// provider, for the <c>tts.status</c> surface and Settings UI. PII-free:
+    /// reports only readiness states, never voice ids or key fragments.
+    /// </summary>
+    public TtsStatusResult GetStatus()
+    {
+        var providers = new List<TtsProviderStatus>(TtsCapability.AllProviders.Length);
+        foreach (var p in TtsCapability.AllProviders)
+        {
+            var readiness = GetProviderReadiness(p, args: null);
+            providers.Add(new TtsProviderStatus
+            {
+                Provider = p,
+                Readiness = readiness,
+                IsReady = string.Equals(readiness, TtsCapability.ReadinessReady, StringComparison.Ordinal)
+            });
+        }
+
+        var ready = providers
+            .Where(s => s.IsReady)
+            .Select(s => s.Provider)
+            .ToHashSet(StringComparer.OrdinalIgnoreCase);
+
+        var configured = TtsCapability.ResolveProvider(null, _settings.TtsProvider);
+        var resolution = TtsCapability.ResolveEffectiveProvider(
+            null,
+            _settings.TtsProvider,
+            ready,
+            allowFallback: true);
+
+        return new TtsStatusResult
+        {
+            ConfiguredProvider = configured,
+            EffectiveProvider = resolution.EffectiveProvider,
+            WillFallBack = resolution.FellBack,
+            Providers = providers
+        };
+    }
+
+    /// <summary>
+    /// Build the set of providers that can serve a call right now, taking the
+    /// per-call <paramref name="args"/> into account (a per-call voiceId can
+    /// make ElevenLabs/Piper usable even when no default is configured).
+    /// </summary>
+    private HashSet<string> BuildReadyProviderSet(TtsSpeakArgs? args)
+    {
+        var set = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        foreach (var p in TtsCapability.AllProviders)
+        {
+            if (string.Equals(GetProviderReadiness(p, args), TtsCapability.ReadinessReady, StringComparison.Ordinal))
+                set.Add(p);
+        }
+        return set;
+    }
+
+    /// <summary>
+    /// Determine a single provider's readiness. <paramref name="args"/> is
+    /// honored when present so a per-call voiceId counts toward readiness;
+    /// pass null for the configured-defaults view used by <see cref="GetStatus"/>.
+    /// </summary>
+    private string GetProviderReadiness(string provider, TtsSpeakArgs? args)
+    {
+        if (string.Equals(provider, TtsCapability.WindowsProvider, StringComparison.OrdinalIgnoreCase))
+        {
+            // The OS speech stack always has at least the default system voice.
+            return TtsCapability.ReadinessReady;
+        }
+
+        if (string.Equals(provider, TtsCapability.ElevenLabsProvider, StringComparison.OrdinalIgnoreCase))
+        {
+            if (string.IsNullOrWhiteSpace(_settings.TtsElevenLabsApiKey))
+                return TtsCapability.ReadinessNeedsApiKey;
+
+            var voiceId = !string.IsNullOrWhiteSpace(args?.VoiceId)
+                ? args!.VoiceId
+                : _settings.TtsElevenLabsVoiceId;
+            return string.IsNullOrWhiteSpace(voiceId)
+                ? TtsCapability.ReadinessNeedsVoice
+                : TtsCapability.ReadinessReady;
+        }
+
+        if (string.Equals(provider, TtsCapability.PiperProvider, StringComparison.OrdinalIgnoreCase))
+        {
+            var voiceId = !string.IsNullOrWhiteSpace(args?.VoiceId)
+                ? args!.VoiceId!
+                : _settings.TtsPiperVoiceId;
+            if (string.IsNullOrWhiteSpace(voiceId))
+                return TtsCapability.ReadinessNeedsVoice;
+            return _piperVoices.IsVoiceDownloaded(voiceId)
+                ? TtsCapability.ReadinessReady
+                : TtsCapability.ReadinessVoiceNotDownloaded;
+        }
+
+        return TtsCapability.ReadinessUnavailable;
+    }
+
     private async Task SpeakWithWindowsAsync(TtsSpeakArgs args, CancellationToken cancellationToken)
     {
         using var synthesizer = new SpeechSynthesizer();
-        var requestedVoice = string.IsNullOrWhiteSpace(args.VoiceId)
-            ? _settings.TtsWindowsVoiceId
-            : args.VoiceId;
+
+        // Distinguish an explicit per-call voice from the configured default.
+        // An explicit per-call voice that can't be resolved is a caller error
+        // and throws. A stale/removed *configured* voice must NOT throw — that
+        // would break the always-available fallback guarantee (a provider that
+        // fell back to Windows would still fail). In that case we silently use
+        // the synthesizer's system default voice.
+        var explicitVoice = !string.IsNullOrWhiteSpace(args.VoiceId);
+        var requestedVoice = explicitVoice ? args.VoiceId : _settings.TtsWindowsVoiceId;
         if (!string.IsNullOrWhiteSpace(requestedVoice))
         {
             requestedVoice = requestedVoice.Trim();
             var voice = SpeechSynthesizer.AllVoices.FirstOrDefault(v =>
                 string.Equals(v.Id, requestedVoice, StringComparison.OrdinalIgnoreCase) ||
                 string.Equals(v.DisplayName, requestedVoice, StringComparison.OrdinalIgnoreCase));
-            if (voice == null)
+            if (voice != null)
+            {
+                synthesizer.Voice = voice;
+            }
+            else if (explicitVoice)
+            {
                 throw new InvalidOperationException($"Windows TTS voice '{requestedVoice}' was not found.");
-
-            synthesizer.Voice = voice;
+            }
+            else
+            {
+                // Configured voice no longer installed — fall through with the
+                // system default so playback still happens.
+                _logger.Info("Configured Windows TTS voice not found; using system default voice");
+            }
         }
 
         using var stream = await synthesizer
diff --git a/src/OpenClaw.Tray.WinUI/Services/ToastActivationRouter.cs b/src/OpenClaw.Tray.WinUI/Services/ToastActivationRouter.cs
index a2f5d5619..065755f9b 100644
--- a/src/OpenClaw.Tray.WinUI/Services/ToastActivationRouter.cs
+++ b/src/OpenClaw.Tray.WinUI/Services/ToastActivationRouter.cs
@@ -8,6 +8,7 @@ public sealed class ToastActivationActions
     public required Action<string?> OpenChat { get; init; }
     public required Action OpenActivity { get; init; }
     public required Action<string> CopyPairingCommand { get; init; }
+    public required Action ReviewPairing { get; init; }
 }
 
 public static class ToastActivationRouter
@@ -45,6 +46,9 @@ public static void Route(
                 if (!string.IsNullOrWhiteSpace(command))
                     actions.CopyPairingCommand(command);
                 break;
+            case "review_pairing":
+                actions.ReviewPairing();
+                break;
         }
     }
 }
diff --git a/src/OpenClaw.Tray.WinUI/Services/ToastService.cs b/src/OpenClaw.Tray.WinUI/Services/ToastService.cs
index 920cf4697..7d2941d1f 100644
--- a/src/OpenClaw.Tray.WinUI/Services/ToastService.cs
+++ b/src/OpenClaw.Tray.WinUI/Services/ToastService.cs
@@ -9,7 +9,7 @@ namespace OpenClawTray.Services;
 /// Toast notification display with dedup and sound configuration.
 /// Extracted from App.xaml.cs to group toast-related state and logic.
 /// </summary>
-internal sealed class ToastService
+internal sealed class ToastService : IToastNotificationPublisher
 {
     private readonly Func<SettingsManager?> _getSettings;
     private readonly Dictionary<string, DateTime> _recentToastKeys = new(StringComparer.OrdinalIgnoreCase);
diff --git a/src/OpenClaw.Tray.WinUI/Services/TrayDashboardSummary.cs b/src/OpenClaw.Tray.WinUI/Services/TrayDashboardSummary.cs
new file mode 100644
index 000000000..760d63dbd
--- /dev/null
+++ b/src/OpenClaw.Tray.WinUI/Services/TrayDashboardSummary.cs
@@ -0,0 +1,277 @@
+using OpenClaw.Shared;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+
+namespace OpenClawTray.Services;
+
+internal enum TrayHealthSeverity
+{
+    Neutral,
+    Ok,
+    Caution,
+    Critical,
+}
+
+internal sealed record TrayDashboardActiveSession(
+    string Label,
+    string Title,
+    string? Detail,
+    int ContextPercent);
+
+/// <summary>
+/// Pure, render-free computation for the tray dashboard glance.
+/// </summary>
+internal sealed record TrayDashboardSummary
+{
+    internal required TrayHealthSeverity Severity { get; init; }
+    internal required string Headline { get; init; }
+    internal required string? Endpoint { get; init; }
+    internal required string? Heartbeat { get; init; }
+    internal required string? MetricsLine { get; init; }
+    internal required TrayDashboardActiveSession? ActiveSession { get; init; }
+
+    internal bool HasActiveSession => ActiveSession is not null;
+}
+
+/// <summary>
+/// Builds tray dashboard summary text from a menu snapshot.
+/// </summary>
+internal sealed class TrayDashboardSummaryBuilder
+{
+    private readonly TrayMenuSnapshot _snapshot;
+    private readonly DateTime _nowUtc;
+
+    internal TrayDashboardSummaryBuilder(TrayMenuSnapshot snapshot, DateTime? nowUtc = null)
+    {
+        _snapshot = snapshot;
+        _nowUtc = nowUtc ?? DateTime.UtcNow;
+    }
+
+    internal TrayDashboardSummary Build()
+    {
+        var overallState = _snapshot.OverallState;
+        var isConnected = ConnectionStatusPresenter.IsHealthy(overallState, _snapshot.CurrentStatus);
+
+        var (severity, headline) = ClassifyHealth();
+
+        string? endpoint = null;
+        if (!string.IsNullOrEmpty(_snapshot.GatewayUrl)
+            && Uri.TryCreate(_snapshot.GatewayUrl, UriKind.Absolute, out var uri))
+        {
+            endpoint = uri.IsDefaultPort ? uri.Host : $"{uri.Host}:{uri.Port}";
+        }
+
+        return new TrayDashboardSummary
+        {
+            Severity = severity,
+            Headline = headline,
+            Endpoint = endpoint,
+            Heartbeat = isConnected ? BuildHeartbeat() : null,
+            MetricsLine = BuildMetricsLine(isConnected),
+            ActiveSession = BuildActiveSession(),
+        };
+    }
+
+    private (TrayHealthSeverity, string) ClassifyHealth()
+    {
+        if (!string.IsNullOrEmpty(_snapshot.AuthFailureMessage))
+            return (TrayHealthSeverity.Critical, "Authentication failed");
+
+        if (HasRelevantMcpStartupError())
+            return (TrayHealthSeverity.Critical, "Local MCP failed");
+
+        if (IsStandaloneMcpOnly())
+        {
+            return (TrayHealthSeverity.Ok, "Local MCP only");
+        }
+
+        var pending = (_snapshot.NodePairList?.Pending.Count ?? 0)
+            + (_snapshot.DevicePairList?.Pending.Count ?? 0);
+        if (pending > 0)
+            return (TrayHealthSeverity.Caution, $"Pairing approval pending ({pending})");
+
+        if (_snapshot.OverallState is { } overall)
+        {
+            return overall switch
+            {
+                OpenClaw.Connection.OverallConnectionState.Connected or
+                OpenClaw.Connection.OverallConnectionState.Ready => (TrayHealthSeverity.Ok, "Connected"),
+                OpenClaw.Connection.OverallConnectionState.Connecting => (TrayHealthSeverity.Caution, "Connecting…"),
+                OpenClaw.Connection.OverallConnectionState.Degraded => (TrayHealthSeverity.Caution, "Connection degraded"),
+                OpenClaw.Connection.OverallConnectionState.PairingRequired => (TrayHealthSeverity.Caution, "Pairing required"),
+                OpenClaw.Connection.OverallConnectionState.Error => (TrayHealthSeverity.Critical, "Connection error"),
+                _ => (TrayHealthSeverity.Neutral, "Disconnected"),
+            };
+        }
+
+        return _snapshot.CurrentStatus switch
+        {
+            ConnectionStatus.Connected => (TrayHealthSeverity.Ok, "Connected"),
+            ConnectionStatus.Connecting => (TrayHealthSeverity.Caution, "Connecting…"),
+            ConnectionStatus.Error => (TrayHealthSeverity.Critical, "Connection error"),
+            _ => (TrayHealthSeverity.Neutral, "Disconnected"),
+        };
+    }
+
+    private bool IsStandaloneMcpOnly() =>
+        _snapshot.Settings?.EnableMcpServer == true &&
+        (_snapshot.Settings?.EnableNodeMode ?? false) == false &&
+        _snapshot.IsMcpRunning &&
+        (_snapshot.OverallState is null or OpenClaw.Connection.OverallConnectionState.Idle) &&
+        _snapshot.CurrentStatus != ConnectionStatus.Connected;
+
+    private bool HasRelevantMcpStartupError() =>
+        _snapshot.Settings?.EnableMcpServer == true &&
+        !string.IsNullOrWhiteSpace(_snapshot.McpStartupError);
+
+    private string? BuildHeartbeat()
+    {
+        if (_snapshot.LastUpdated is not { } updated)
+            return null;
+
+        var updatedUtc = updated.Kind == DateTimeKind.Utc ? updated : updated.ToUniversalTime();
+        var age = _nowUtc - updatedUtc;
+        if (age < TimeSpan.Zero) age = TimeSpan.Zero;
+        return $"Updated {FormatAge(age)}";
+    }
+
+    private string? BuildMetricsLine(bool isConnected)
+    {
+        var parts = new List<string>(3);
+
+        var nodesTotal = _snapshot.Nodes.Length;
+        if (nodesTotal > 0)
+        {
+            var online = _snapshot.Nodes.Count(n => n.IsOnline);
+            parts.Add($"{online}/{nodesTotal} {(nodesTotal == 1 ? "node" : "nodes")}");
+        }
+
+        var sessionCount = _snapshot.Sessions.Length;
+        if (sessionCount > 0)
+        {
+            var active = _snapshot.Sessions.Count(
+                s => string.Equals(s.Status, "active", StringComparison.OrdinalIgnoreCase));
+            parts.Add(active > 0
+                ? $"{sessionCount} {(sessionCount == 1 ? "session" : "sessions")} ({active} active)"
+                : $"{sessionCount} {(sessionCount == 1 ? "session" : "sessions")}");
+        }
+
+        if (isConnected)
+        {
+            var usage = BuildUsageGlance();
+            if (usage != null) parts.Add(usage);
+        }
+
+        return parts.Count == 0 ? null : string.Join(" · ", parts);
+    }
+
+    private string? BuildUsageGlance()
+    {
+        var cost = FirstPositiveCost(
+            _snapshot.Usage?.CostUsd,
+            _snapshot.UsageCost?.Totals.TotalCost);
+
+        var totalTokens = FirstPositiveTokens(
+            _snapshot.Usage?.TotalTokens,
+            _snapshot.UsageCost?.Totals.TotalTokens,
+            _snapshot.Sessions.Sum(SessionUsedTokens));
+
+        if (cost <= 0 && totalTokens <= 0)
+            return null;
+
+        if (cost >= 0.005)
+            return "$" + cost.ToString("F2", CultureInfo.InvariantCulture);
+        return $"{FormatTokenCount(totalTokens)} tokens";
+    }
+
+    internal static double FirstPositiveCost(params double?[] candidates)
+    {
+        foreach (var c in candidates)
+            if (c is > 0) return c.Value;
+        return 0.0;
+    }
+
+    internal static long FirstPositiveTokens(params long?[] candidates)
+    {
+        foreach (var c in candidates)
+            if (c is > 0) return c.Value;
+        return 0L;
+    }
+
+    internal static long SessionUsedTokens(SessionInfo session) =>
+        session.TotalTokens > 0 ? session.TotalTokens : session.InputTokens + session.OutputTokens;
+
+    internal static SessionInfo? SelectActiveSession(IReadOnlyList<SessionInfo> sessions)
+    {
+        if (sessions == null || sessions.Count == 0)
+            return null;
+
+        static bool IsActive(SessionInfo s) =>
+            string.Equals(s.Status, "active", StringComparison.OrdinalIgnoreCase);
+
+        var activeMain = sessions.FirstOrDefault(s => s.IsMain && IsActive(s));
+        if (activeMain != null) return activeMain;
+
+        var activeRecent = sessions
+            .Where(IsActive)
+            .OrderByDescending(s => s.UpdatedAt ?? s.LastSeen)
+            .FirstOrDefault();
+        if (activeRecent != null) return activeRecent;
+
+        var main = sessions.FirstOrDefault(s => s.IsMain);
+        if (main != null) return main;
+
+        return sessions.OrderByDescending(s => s.UpdatedAt ?? s.LastSeen).First();
+    }
+
+    private TrayDashboardActiveSession? BuildActiveSession()
+    {
+        var session = SelectActiveSession(_snapshot.Sessions);
+        if (session == null)
+            return null;
+
+        var isActive = string.Equals(session.Status, "active", StringComparison.OrdinalIgnoreCase);
+        var label = isActive ? "Active" : (session.IsMain ? "Main" : "Session");
+
+        var title = !string.IsNullOrWhiteSpace(session.DisplayName)
+            ? session.DisplayName!
+            : (session.IsMain ? "Main session" : (string.IsNullOrEmpty(session.Key) ? "Session" : session.ShortKey));
+
+        var usedTokens = SessionUsedTokens(session);
+        var contextTokens = session.ContextTokens > 0 ? session.ContextTokens : 200_000;
+        var pct = usedTokens > 0
+            ? (int)Math.Round(Math.Min(100.0, (double)usedTokens / contextTokens * 100.0))
+            : 0;
+
+        // Detail carries only stable metadata; CurrentActivity can include
+        // command/query/path/URL snippets and should stay out of the top-level
+        // tray glance.
+        var detailParts = new List<string>(1);
+        if (!string.IsNullOrWhiteSpace(session.Model)) detailParts.Add(session.Model!);
+        var detail = detailParts.Count == 0 ? null : string.Join(" · ", detailParts);
+
+        return new TrayDashboardActiveSession(
+            Label: label,
+            Title: title,
+            Detail: detail,
+            ContextPercent: pct);
+    }
+
+    private static string FormatTokenCount(long n)
+    {
+        if (n >= 1_000_000) return $"{n / 1_000_000.0:F1}M";
+        if (n >= 1_000) return $"{n / 1_000.0:F1}K";
+        return n.ToString(CultureInfo.InvariantCulture);
+    }
+
+    private static string FormatAge(TimeSpan age)
+    {
+        if (age.TotalSeconds < 60) return $"{(int)age.TotalSeconds}s ago";
+        if (age.TotalMinutes < 60) return $"{(int)age.TotalMinutes}m ago";
+        if (age.TotalHours < 24) return $"{(int)age.TotalHours}h ago";
+        return $"{(int)age.TotalDays}d ago";
+    }
+
+}
diff --git a/src/OpenClaw.Tray.WinUI/Services/TrayIconCoordinator.cs b/src/OpenClaw.Tray.WinUI/Services/TrayIconCoordinator.cs
new file mode 100644
index 000000000..1471b11a2
--- /dev/null
+++ b/src/OpenClaw.Tray.WinUI/Services/TrayIconCoordinator.cs
@@ -0,0 +1,66 @@
+using Microsoft.UI.Dispatching;
+using System;
+using WinUIEx;
+
+namespace OpenClawTray.Services;
+
+internal sealed class TrayIconCoordinator
+{
+    private readonly TrayIcon _trayIcon;
+    private readonly Func<bool> _hasThreadAccess;
+    private readonly Action<DispatcherQueueHandler> _marshal;
+    private readonly Func<TrayStateSnapshot> _captureSnapshot;
+    private readonly Func<bool> _isAlive;
+
+    internal TrayIconCoordinator(
+        TrayIcon trayIcon,
+        Func<bool> hasThreadAccess,
+        Action<DispatcherQueueHandler> marshal,
+        Func<TrayStateSnapshot> captureSnapshot,
+        Func<bool> isAlive)
+    {
+        _trayIcon = trayIcon;
+        _hasThreadAccess = hasThreadAccess;
+        _marshal = marshal;
+        _captureSnapshot = captureSnapshot;
+        _isAlive = isAlive;
+    }
+
+    internal void UpdateTrayIcon()
+    {
+        if (!_hasThreadAccess())
+        {
+            _marshal(UpdateTrayIcon);
+            return;
+        }
+
+        // A queued update may run after shutdown has disposed the tray icon.
+        // Bail out so we never touch a disposed instance.
+        if (!_isAlive())
+            return;
+
+        var iconPath = System.IO.Path.Combine(AppContext.BaseDirectory, "Assets", "openclaw.ico");
+        var tooltip = BuildTrayTooltip();
+
+        try
+        {
+            _trayIcon.SetIcon(iconPath);
+            ApplyTrayTooltip(tooltip);
+        }
+        catch (Exception ex)
+        {
+            Logger.Warn($"Failed to update tray icon: {ex.Message}");
+        }
+    }
+
+    internal void ApplyTrayTooltip(string tooltip)
+    {
+        if (string.Equals(_trayIcon.Tooltip, tooltip, StringComparison.Ordinal))
+            _trayIcon.Tooltip = string.Empty;
+
+        _trayIcon.Tooltip = tooltip;
+    }
+
+    private string BuildTrayTooltip() =>
+        new TrayTooltipBuilder(_captureSnapshot()).Build();
+}
diff --git a/src/OpenClaw.Tray.WinUI/Services/TrayMenuSnapshot.cs b/src/OpenClaw.Tray.WinUI/Services/TrayMenuSnapshot.cs
index 48415c611..808db3dfa 100644
--- a/src/OpenClaw.Tray.WinUI/Services/TrayMenuSnapshot.cs
+++ b/src/OpenClaw.Tray.WinUI/Services/TrayMenuSnapshot.cs
@@ -1,5 +1,7 @@
+using OpenClaw.Connection;
 using OpenClaw.Shared;
 using OpenClawTray.Services;
+using System;
 
 namespace OpenClawTray.Services;
 
@@ -7,6 +9,7 @@ internal sealed record TrayMenuSnapshot
 {
     // ── Conexión ──
     internal required ConnectionStatus CurrentStatus { get; init; }
+    internal OverallConnectionState? OverallState { get; init; }
     internal required string? AuthFailureMessage { get; init; }
     internal required string? GatewayUrl { get; init; }
     internal required GatewaySelfInfo? GatewaySelf { get; init; }
@@ -33,4 +36,9 @@ internal sealed record TrayMenuSnapshot
     internal required SettingsManager? Settings { get; init; }
     internal required string SetupMenuLabel { get; init; }
     internal required bool ShowSetupMenuEntry { get; init; }
+
+    // ── Dashboard glance ──
+    internal DateTime? LastUpdated { get; init; }
+    internal bool IsMcpRunning { get; init; }
+    internal string? McpStartupError { get; init; }
 }
diff --git a/src/OpenClaw.Tray.WinUI/Services/TrayMenuStateBuilder.cs b/src/OpenClaw.Tray.WinUI/Services/TrayMenuStateBuilder.cs
index 4d3e8ee8b..705503761 100644
--- a/src/OpenClaw.Tray.WinUI/Services/TrayMenuStateBuilder.cs
+++ b/src/OpenClaw.Tray.WinUI/Services/TrayMenuStateBuilder.cs
@@ -1,5 +1,6 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Automation;
+using Microsoft.UI.Xaml.Automation.Peers;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Controls.Primitives;
 using OpenClaw.Chat;
@@ -43,8 +44,10 @@ internal void Build(TrayMenuWindow menu)
         // ToggleAction delegates; recreate the lookup each rebuild.
         _permToggleActions.Clear();
 
-        var isConnected = _snapshot.CurrentStatus == ConnectionStatus.Connected;
-        var statusText = LocalizationHelper.GetConnectionStatusText(_snapshot.CurrentStatus);
+        var overallState = _snapshot.OverallState;
+        var isConnected = ConnectionStatusPresenter.IsHealthy(overallState, _snapshot.CurrentStatus);
+        var isLiveOrPending = ConnectionStatusPresenter.IsLiveOrPending(overallState, _snapshot.CurrentStatus);
+        var statusText = ConnectionStatusPresenter.PlainText(overallState, _snapshot.CurrentStatus);
 
         // Cache theme brushes once per build so cells don't each do a
         // resource lookup. The previous implementation looked up
@@ -96,13 +99,19 @@ internal void Build(TrayMenuWindow menu)
         Grid.SetColumn(brandRow, 0);
         brandGrid.Children.Add(brandRow);
 
-        var canToggleConnection = _snapshot.CurrentStatus == ConnectionStatus.Connected
-            || _snapshot.CurrentStatus == ConnectionStatus.Disconnected
-            || _snapshot.CurrentStatus == ConnectionStatus.Error;
-        var connectionToggle = menu.CreateMenuToggleSwitch(isConnected, "Gateway connection", canToggleConnection);
+        var canToggleConnection = overallState switch
+        {
+            null => _snapshot.CurrentStatus == ConnectionStatus.Connected
+                || _snapshot.CurrentStatus == ConnectionStatus.Disconnected
+                || _snapshot.CurrentStatus == ConnectionStatus.Error,
+            OpenClaw.Connection.OverallConnectionState.Connecting or
+            OpenClaw.Connection.OverallConnectionState.Disconnecting => false,
+            _ => true
+        };
+        var connectionToggle = menu.CreateMenuToggleSwitch(isLiveOrPending, "Gateway connection", canToggleConnection);
         connectionToggle.Margin = new Thickness(0);
         ToolTipService.SetToolTip(connectionToggle,
-            isConnected ? "Connected - toggle off to disconnect" : "Disconnected - toggle on to connect");
+            isLiveOrPending ? $"{statusText} - toggle off to disconnect" : $"{statusText} - toggle on to connect");
         connectionToggle.Toggled += (s, ev) =>
         {
             if (_callbacks.IsConnectionToggleSuspended())
@@ -116,6 +125,13 @@ internal void Build(TrayMenuWindow menu)
 
         menu.AddCustomElement(brandGrid);
 
+        // ── Dashboard glance (live status header) ──
+        var dashboard = new TrayDashboardSummaryBuilder(_snapshot).Build();
+        var glance = BuildDashboardGlance(
+            dashboard, successBrush, cautionBrush, neutralBrush, criticalBrush,
+            secondaryText, captionStyle);
+        menu.AddCustomElement(glance);
+
         // ── Pairing approval pending (high-priority action above Gateway) ──
         var nodePendingCount = _snapshot.NodePairList?.Pending.Count ?? 0;
         var devicePendingCount = _snapshot.DevicePairList?.Pending.Count ?? 0;
@@ -154,7 +170,12 @@ internal void Build(TrayMenuWindow menu)
             Width = 8, Height = 8,
             VerticalAlignment = VerticalAlignment.Center,
             Fill = isConnected ? successBrush
-                : _snapshot.CurrentStatus == ConnectionStatus.Connecting ? cautionBrush
+                : (overallState is OpenClaw.Connection.OverallConnectionState.Error ||
+                   (overallState is null && _snapshot.CurrentStatus == ConnectionStatus.Error)) ? criticalBrush
+                : ((overallState is OpenClaw.Connection.OverallConnectionState.Connecting
+                    or OpenClaw.Connection.OverallConnectionState.Degraded
+                    or OpenClaw.Connection.OverallConnectionState.PairingRequired) ||
+                   (overallState is null && _snapshot.CurrentStatus == ConnectionStatus.Connecting)) ? cautionBrush
                 : neutralBrush
         });
         gwNameRow.Children.Add(new TextBlock
@@ -272,7 +293,7 @@ internal void Build(TrayMenuWindow menu)
 
             var sessionCount = _snapshot.Sessions.Length;
             var activeCount = _snapshot.Sessions.Count(s => string.Equals(s.Status, "active", StringComparison.OrdinalIgnoreCase));
-            var totalTokensAll = _snapshot.Sessions.Sum(s => s.InputTokens + s.OutputTokens);
+            var totalTokensAll = _snapshot.Sessions.Sum(TrayDashboardSummaryBuilder.SessionUsedTokens);
 
             // Single collapsed entry whose hover flyout reveals the session list.
             var sessionsRow = BuildSessionsListRow(sessionCount, activeCount, totalTokensAll, secondaryText);
@@ -301,6 +322,7 @@ internal void Build(TrayMenuWindow menu)
         menu.AddMenuItem("Dashboard", FluentIconCatalog.Build(FluentIconCatalog.Dashboard), "dashboard");
         menu.AddMenuItem("Chat", FluentIconCatalog.Build(FluentIconCatalog.Chat), "openchat");
         menu.AddMenuItem("Canvas", FluentIconCatalog.Build(FluentIconCatalog.CanvasAct), "canvas");
+        menu.AddMenuItem("Diagnostics", FluentIconCatalog.Build(FluentIconCatalog.Bug), "diagnostics");
         // Voice overlay disabled — inline chat voice mode is used instead.
         // menu.AddMenuItem("Voice", FluentIconCatalog.Build(FluentIconCatalog.VoiceAct), "voice");
 
@@ -331,6 +353,173 @@ private static string FormatTokenCount(long n)
         return n.ToString();
     }
 
+    private static UIElement BuildDashboardGlance(
+        TrayDashboardSummary summary,
+        Microsoft.UI.Xaml.Media.Brush successBrush,
+        Microsoft.UI.Xaml.Media.Brush cautionBrush,
+        Microsoft.UI.Xaml.Media.Brush neutralBrush,
+        Microsoft.UI.Xaml.Media.Brush criticalBrush,
+        Microsoft.UI.Xaml.Media.Brush secondaryText,
+        Style captionStyle)
+    {
+        var dotBrush = summary.Severity switch
+        {
+            TrayHealthSeverity.Ok => successBrush,
+            TrayHealthSeverity.Caution => cautionBrush,
+            TrayHealthSeverity.Critical => criticalBrush,
+            _ => neutralBrush,
+        };
+
+        var outer = new StackPanel
+        {
+            Padding = new Thickness(12, 4, 12, 8),
+            Spacing = 4,
+            HorizontalAlignment = HorizontalAlignment.Stretch
+        };
+
+        // 3-column grid so the headline trims within 320px instead of pushing
+        // the heartbeat off-screen (a horizontal StackPanel measures unbounded).
+        var line1 = new Grid { ColumnSpacing = 6, HorizontalAlignment = HorizontalAlignment.Stretch };
+        line1.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
+        line1.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
+        line1.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
+
+        var dot = new Microsoft.UI.Xaml.Shapes.Ellipse
+        {
+            Width = 8, Height = 8,
+            VerticalAlignment = VerticalAlignment.Center,
+            Fill = dotBrush
+        };
+        Grid.SetColumn(dot, 0);
+        line1.Children.Add(dot);
+
+        var headlineText = summary.Endpoint != null
+            ? $"{summary.Headline} · {summary.Endpoint}"
+            : summary.Headline;
+        var headline = new TextBlock
+        {
+            Text = headlineText,
+            FontWeight = Microsoft.UI.Text.FontWeights.SemiBold,
+            FontSize = 13,
+            VerticalAlignment = VerticalAlignment.Center,
+            TextTrimming = TextTrimming.CharacterEllipsis,
+            IsTextSelectionEnabled = false
+        };
+        Grid.SetColumn(headline, 1);
+        line1.Children.Add(headline);
+
+        if (summary.Heartbeat != null)
+        {
+            var hb = new TextBlock
+            {
+                Text = summary.Heartbeat,
+                Style = captionStyle,
+                FontSize = 11,
+                Foreground = secondaryText,
+                VerticalAlignment = VerticalAlignment.Center,
+                IsTextSelectionEnabled = false
+            };
+            Grid.SetColumn(hb, 2);
+            line1.Children.Add(hb);
+        }
+        outer.Children.Add(line1);
+
+        if (!string.IsNullOrEmpty(summary.MetricsLine))
+        {
+            outer.Children.Add(new TextBlock
+            {
+                Text = summary.MetricsLine,
+                Style = captionStyle,
+                FontSize = 11,
+                Foreground = secondaryText,
+                TextTrimming = TextTrimming.CharacterEllipsis,
+                IsTextSelectionEnabled = false
+            });
+        }
+
+        if (summary.ActiveSession is { } active)
+        {
+            var sessionLine = new Grid { ColumnSpacing = 6, Margin = new Thickness(0, 2, 0, 0), HorizontalAlignment = HorizontalAlignment.Stretch };
+            sessionLine.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
+            sessionLine.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
+            sessionLine.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
+
+            var labelText = new TextBlock
+            {
+                Text = active.Label,
+                Style = captionStyle,
+                FontSize = 11,
+                Foreground = secondaryText,
+                VerticalAlignment = VerticalAlignment.Center,
+                IsTextSelectionEnabled = false
+            };
+            Grid.SetColumn(labelText, 0);
+            sessionLine.Children.Add(labelText);
+
+            var titleText = new TextBlock
+            {
+                Text = active.Title,
+                FontWeight = Microsoft.UI.Text.FontWeights.SemiBold,
+                FontSize = 12,
+                VerticalAlignment = VerticalAlignment.Center,
+                TextTrimming = TextTrimming.CharacterEllipsis,
+                IsTextSelectionEnabled = false
+            };
+            Grid.SetColumn(titleText, 1);
+            sessionLine.Children.Add(titleText);
+
+            if (active.ContextPercent > 0)
+            {
+                var ctx = new TextBlock
+                {
+                    Text = $"{active.ContextPercent}% ctx",
+                    Style = captionStyle,
+                    FontSize = 11,
+                    Foreground = secondaryText,
+                    VerticalAlignment = VerticalAlignment.Center,
+                    IsTextSelectionEnabled = false
+                };
+                Grid.SetColumn(ctx, 2);
+                sessionLine.Children.Add(ctx);
+            }
+            outer.Children.Add(sessionLine);
+
+            if (!string.IsNullOrEmpty(active.Detail))
+            {
+                outer.Children.Add(new TextBlock
+                {
+                    Text = active.Detail,
+                    Style = captionStyle,
+                    FontSize = 11,
+                    Foreground = secondaryText,
+                    TextTrimming = TextTrimming.CharacterEllipsis,
+                    IsTextSelectionEnabled = false
+                });
+            }
+
+        }
+
+        AutomationProperties.SetName(outer, BuildGlanceAutomationName(summary));
+        AutomationProperties.SetAccessibilityView(outer, AccessibilityView.Content);
+        return outer;
+    }
+
+    private static string BuildGlanceAutomationName(TrayDashboardSummary summary)
+    {
+        var parts = new List<string> { summary.Headline };
+        if (summary.Endpoint != null) parts.Add(summary.Endpoint);
+        if (summary.Heartbeat != null) parts.Add(summary.Heartbeat);
+        if (!string.IsNullOrEmpty(summary.MetricsLine)) parts.Add(summary.MetricsLine!);
+        if (summary.ActiveSession is { } a)
+        {
+            var sess = a.Label == "Session" ? $"Session {a.Title}" : $"{a.Label} session {a.Title}";
+            if (!string.IsNullOrEmpty(a.Detail)) sess += $", {a.Detail}";
+            if (a.ContextPercent > 0) sess += $", {a.ContextPercent}% context";
+            parts.Add(sess);
+        }
+        return string.Join(". ", parts) + ".";
+    }
+
     /// <summary>
     /// Mini progress bar built from Borders inside a Grid (two Star columns:
     /// pct and 100-pct). Avoids the default WinUI ProgressBar template which
@@ -347,8 +536,8 @@ private static FrameworkElement BuildMiniBar(double percent)
                                    : "SystemFillColorSuccessBrush";
         var accent = (Microsoft.UI.Xaml.Media.Brush)resources[accentKey];
         var track = (Microsoft.UI.Xaml.Media.Brush)resources["ControlAltFillColorTertiaryBrush"];
-        // Subtle hairline stroke — macOS-style — gives the bar a defined edge
-        // even when the fill is at 0% or matches the surrounding chrome.
+        // Subtle hairline stroke gives the bar a defined edge even when the
+        // fill is at 0% or matches the surrounding chrome.
         var stroke = (Microsoft.UI.Xaml.Media.Brush)resources["ControlStrokeColorDefaultBrush"];
 
         // Outer wrapper carries the rounded corners + track color and clips
@@ -671,9 +860,7 @@ private static UIElement BuildSessionListCard(
             TotalTokens = session.TotalTokens,
             ContextTokens = session.ContextTokens,
         }) ?? "";
-        var usedTokens = session.TotalTokens > 0
-            ? session.TotalTokens
-            : session.InputTokens + session.OutputTokens;
+        var usedTokens = TrayDashboardSummaryBuilder.SessionUsedTokens(session);
         var contextTokens = session.ContextTokens > 0 ? session.ContextTokens : 200_000;
         var pct = usedTokens > 0 ? Math.Min(100.0, (double)usedTokens / contextTokens * 100.0) : 0.0;
 
@@ -1056,11 +1243,15 @@ private UIElement BuildUsageRow(Microsoft.UI.Xaml.Media.Brush secondaryText)
         grid.Children.Add(title);
 
         // Right-side summary: $X.XX · Y tokens (always include both when any data present)
-        var totalTokens = _snapshot.Usage?.TotalTokens
-            ?? _snapshot.Sessions.Sum(s => s.InputTokens + s.OutputTokens);
-        var cost = _snapshot.Usage?.CostUsd
-            ?? _snapshot.UsageCost?.Totals.TotalCost
-            ?? 0.0;
+        // Use the shared positive-fallback helpers so this row can't contradict
+        // the dashboard glance (a present-but-zero Usage must not hide UsageCost).
+        var totalTokens = TrayDashboardSummaryBuilder.FirstPositiveTokens(
+            _snapshot.Usage?.TotalTokens,
+            _snapshot.UsageCost?.Totals.TotalTokens,
+            _snapshot.Sessions.Sum(TrayDashboardSummaryBuilder.SessionUsedTokens));
+        var cost = TrayDashboardSummaryBuilder.FirstPositiveCost(
+            _snapshot.Usage?.CostUsd,
+            _snapshot.UsageCost?.Totals.TotalCost);
         string summaryText;
         if (cost <= 0 && totalTokens <= 0)
         {
@@ -1099,15 +1290,17 @@ private List<TrayMenuFlyoutItem> BuildUsageFlyoutItems(Microsoft.UI.Xaml.Media.B
             new() { Text = "Usage", IsHeader = true }
         };
 
-        var totalTokens = _snapshot.Usage?.TotalTokens
-            ?? _snapshot.Sessions.Sum(s => s.InputTokens + s.OutputTokens);
+        var totalTokens = TrayDashboardSummaryBuilder.FirstPositiveTokens(
+            _snapshot.Usage?.TotalTokens,
+            _snapshot.UsageCost?.Totals.TotalTokens,
+            _snapshot.Sessions.Sum(TrayDashboardSummaryBuilder.SessionUsedTokens));
         var inputTokens = _snapshot.Usage?.InputTokens
             ?? _snapshot.Sessions.Sum(s => s.InputTokens);
         var outputTokens = _snapshot.Usage?.OutputTokens
             ?? _snapshot.Sessions.Sum(s => s.OutputTokens);
-        var cost = _snapshot.Usage?.CostUsd
-            ?? _snapshot.UsageCost?.Totals.TotalCost
-            ?? 0.0;
+        var cost = TrayDashboardSummaryBuilder.FirstPositiveCost(
+            _snapshot.Usage?.CostUsd,
+            _snapshot.UsageCost?.Totals.TotalCost);
         var requests = _snapshot.Usage?.RequestCount ?? 0;
 
         // Totals card
@@ -1234,7 +1427,7 @@ private List<TrayMenuFlyoutItem> BuildUsageFlyoutItems(Microsoft.UI.Xaml.Media.B
         var byModel = _snapshot.Sessions
             .Where(s => !string.IsNullOrEmpty(s.Model))
             .GroupBy(s => s.Model!, StringComparer.OrdinalIgnoreCase)
-            .Select(g => new { Model = g.Key, Tokens = g.Sum(s => s.InputTokens + s.OutputTokens) })
+            .Select(g => new { Model = g.Key, Tokens = g.Sum(TrayDashboardSummaryBuilder.SessionUsedTokens) })
             .Where(x => x.Tokens > 0)
             .OrderByDescending(x => x.Tokens)
             .Take(3)
diff --git a/src/OpenClaw.Tray.WinUI/Services/TrayStateSnapshot.cs b/src/OpenClaw.Tray.WinUI/Services/TrayStateSnapshot.cs
index 458c39cb8..b6b71f005 100644
--- a/src/OpenClaw.Tray.WinUI/Services/TrayStateSnapshot.cs
+++ b/src/OpenClaw.Tray.WinUI/Services/TrayStateSnapshot.cs
@@ -1,3 +1,4 @@
+using OpenClaw.Connection;
 using OpenClaw.Shared;
 using System;
 
@@ -6,6 +7,7 @@ namespace OpenClawTray.Services;
 internal sealed record TrayStateSnapshot
 {
     public ConnectionStatus Status             { get; init; }
+    public OverallConnectionState? OverallState { get; init; }
     public AgentActivity? CurrentActivity      { get; init; }
     public ChannelHealth[] Channels            { get; init; } = [];
     public GatewayNodeInfo[] Nodes             { get; init; } = [];
@@ -13,4 +15,6 @@ internal sealed record TrayStateSnapshot
     public string? AuthFailureMessage          { get; init; }
     public DateTime LastCheckTime              { get; init; }
     public SettingsManager? Settings           { get; init; }
+    public bool IsMcpRunning                   { get; init; }
+    public string? McpStartupError             { get; init; }
 }
diff --git a/src/OpenClaw.Tray.WinUI/Services/TrayTooltipBuilder.cs b/src/OpenClaw.Tray.WinUI/Services/TrayTooltipBuilder.cs
index 5eec68029..a44a65613 100644
--- a/src/OpenClaw.Tray.WinUI/Services/TrayTooltipBuilder.cs
+++ b/src/OpenClaw.Tray.WinUI/Services/TrayTooltipBuilder.cs
@@ -31,12 +31,16 @@ internal string Build()
             nodeOnline = localNode.IsOnline ? 1 : 0;
         }
 
+        var statusText = BuildStatusText();
+        var overallState = _snapshot.OverallState;
+        var isHealthy = ConnectionStatusPresenter.IsHealthy(overallState, _snapshot.Status);
         var warningCount = 0;
-        if (_snapshot.Status != ConnectionStatus.Connected) warningCount++;
+        if (!isHealthy) warningCount++;
         if (_snapshot.AuthFailureMessage != null) warningCount++;
-        if (_snapshot.Channels.Length == 0 && _snapshot.Status == ConnectionStatus.Connected) warningCount++;
+        if (HasRelevantMcpStartupError()) warningCount++;
+        if (_snapshot.Channels.Length == 0 && isHealthy) warningCount++;
 
-        var tooltip = $"OpenClaw Tray - {_snapshot.Status}; " +
+        var tooltip = $"{AppIdentity.TrayName} - {statusText}; " +
             $"{topology.DisplayName}; " +
             $"Channels {channelReady}/{_snapshot.Channels.Length}; " +
             $"Nodes {nodeOnline}/{nodeTotal}; " +
@@ -45,9 +49,33 @@ internal string Build()
 
         if (_snapshot.CurrentActivity != null && !string.IsNullOrEmpty(_snapshot.CurrentActivity.DisplayText))
         {
-            tooltip = $"OpenClaw Tray - {_snapshot.CurrentActivity.DisplayText}; {_snapshot.Status}";
+            tooltip = $"{AppIdentity.TrayName} - {_snapshot.CurrentActivity.DisplayText}; {statusText}";
         }
 
         return TrayTooltipFormatter.FitShellTooltip(tooltip);
     }
+
+    private string BuildStatusText()
+    {
+        if (HasRelevantMcpStartupError())
+            return "Local MCP failed";
+
+        if (IsStandaloneMcpOnly())
+        {
+            return "Local MCP only";
+        }
+
+        return ConnectionStatusPresenter.PlainText(_snapshot.OverallState, _snapshot.Status);
+    }
+
+    private bool IsStandaloneMcpOnly() =>
+        _snapshot.Settings?.EnableMcpServer == true &&
+        _snapshot.Settings?.EnableNodeMode == false &&
+        _snapshot.IsMcpRunning &&
+        (_snapshot.OverallState is null or OpenClaw.Connection.OverallConnectionState.Idle) &&
+        _snapshot.Status != ConnectionStatus.Connected;
+
+    private bool HasRelevantMcpStartupError() =>
+        _snapshot.Settings?.EnableMcpServer == true &&
+        !string.IsNullOrWhiteSpace(_snapshot.McpStartupError);
 }
diff --git a/src/OpenClaw.Tray.WinUI/Services/UpdateCoordinator.cs b/src/OpenClaw.Tray.WinUI/Services/UpdateCoordinator.cs
index 15de4b141..553a82f89 100644
--- a/src/OpenClaw.Tray.WinUI/Services/UpdateCoordinator.cs
+++ b/src/OpenClaw.Tray.WinUI/Services/UpdateCoordinator.cs
@@ -60,6 +60,20 @@ public async Task<bool> CheckForUpdatesAsync(bool userInitiated = false)
             return true; // Don't block launch
         }
 
+        if (AppIdentity.IsDev)
+        {
+            Logger.Info("Skipping release-channel update check in development build");
+            appState.UpdateInfo = new UpdateCommandCenterInfo
+            {
+                Status = "Skipped",
+                CurrentVersion = AppVersionInfo.Version,
+                CheckedAt = DateTime.UtcNow,
+                Detail = "development build"
+            };
+            _updateCheckGate.Release();
+            return true;
+        }
+
 #if DEBUG
         try
         {
@@ -348,19 +362,18 @@ await ShowUpdateInfoDialogAsync(
                             LocalizationHelper.GetString("Update_Title_Failed"),
                             failedMessage);
                         break;
-#if DEBUG
-                    // Status="Skipped" is only produced by the DEBUG short-circuit
-                    // in CheckForUpdatesAsync. User-skipped versions keep
-                    // Status="Available", so this case must not exist in RELEASE
-                    // or it would surface a confusing "disabled in debug builds"
-                    // dialog to end users.
+                    // User-skipped versions keep Status="Available". This state
+                    // only represents an app build whose update channel is
+                    // intentionally disabled.
                     case "Skipped":
                         await ShowUpdateInfoDialogAsync(
                             "Skipped",
                             LocalizationHelper.GetString("Update_Title_Skipped"),
-                            LocalizationHelper.GetString("Update_Message_Skipped_Debug"));
+                            LocalizationHelper.GetString(
+                                AppIdentity.IsDev
+                                    ? "Update_Message_Skipped_Dev"
+                                    : "Update_Message_Skipped_Debug"));
                         break;
-#endif
                 }
             }
 
diff --git a/src/OpenClaw.Tray.WinUI/Services/WslGatewayKeepAliveService.cs b/src/OpenClaw.Tray.WinUI/Services/WslGatewayKeepAliveService.cs
index 42f2901fc..07a3a1e10 100644
--- a/src/OpenClaw.Tray.WinUI/Services/WslGatewayKeepAliveService.cs
+++ b/src/OpenClaw.Tray.WinUI/Services/WslGatewayKeepAliveService.cs
@@ -215,9 +215,8 @@ private static string ResolveWslExePath()
     /// Resolves the WSL distro name to keep alive. Prefers the value persisted by
     /// onboarding in <c>setup-state.json</c> so the keepalive always targets the distro
     /// the user actually installed. In DEBUG / test builds, an
-    /// <c>OPENCLAW_WSL_DISTRO_NAME</c> environment override is honored to match
-    /// Resolves the local gateway distro name by reading setup-state.json.
-    /// Falls back to "OpenClawGateway" if not found.
+    /// <c>OPENCLAW_WSL_DISTRO_NAME</c> environment override is honored. Falls
+    /// back to the current dev or release app identity if no state exists.
     /// </summary>
     private async Task<string?> ResolveLocalGatewayDistroNameAsync(GatewayRecord? activeRecord)
     {
diff --git a/src/OpenClaw.Tray.WinUI/Services/WslKeepAlivePolicy.cs b/src/OpenClaw.Tray.WinUI/Services/WslKeepAlivePolicy.cs
index 5745a0f6b..7ef3fa3a9 100644
--- a/src/OpenClaw.Tray.WinUI/Services/WslKeepAlivePolicy.cs
+++ b/src/OpenClaw.Tray.WinUI/Services/WslKeepAlivePolicy.cs
@@ -5,8 +5,8 @@ namespace OpenClawTray.Services;
 
 internal static class WslKeepAlivePolicy
 {
-    private const string DefaultSetupManagedDistroName = "OpenClawGateway";
-    private const string DefaultSetupManagedFriendlyName = "Local (OpenClawGateway)";
+    private static string DefaultSetupManagedDistroName => AppIdentity.SetupDistroName;
+    private static string DefaultSetupManagedFriendlyName => $"Local ({AppIdentity.SetupDistroName})";
 
     public static bool ShouldStart(GatewayRecord? activeRecord, string? legacyGatewayUrl)
     {
@@ -72,9 +72,7 @@ public static bool IsKeepaliveCommandLine(string? commandLine, string distroName
         if (string.IsNullOrWhiteSpace(commandLine) || string.IsNullOrWhiteSpace(distroName))
             return false;
 
-        return commandLine.Contains(distroName, StringComparison.OrdinalIgnoreCase)
-            && commandLine.Contains("sleep", StringComparison.OrdinalIgnoreCase)
-            && commandLine.Contains("infinity", StringComparison.OrdinalIgnoreCase);
+        return WslCommandLineMatcher.IsKeepaliveForDistro(commandLine, distroName);
     }
 
     public static bool TryGetMarkerDistroName(string markerJson, out string distroName)
diff --git a/src/OpenClaw.Tray.WinUI/Strings/en-us/Resources.resw b/src/OpenClaw.Tray.WinUI/Strings/en-us/Resources.resw
index 4ba4f13a1..3f37a6a30 100644
--- a/src/OpenClaw.Tray.WinUI/Strings/en-us/Resources.resw
+++ b/src/OpenClaw.Tray.WinUI/Strings/en-us/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:element name="root" msdata:IsDataSet="true">
@@ -395,6 +395,9 @@
   <data name="Update_Message_Skipped_Debug" xml:space="preserve">
     <value>Update checks are disabled in debug builds.</value>
   </data>
+  <data name="Update_Message_Skipped_Dev" xml:space="preserve">
+    <value>Update checks are disabled in development builds.</value>
+  </data>
   <data name="Update_OK" xml:space="preserve">
     <value>OK</value>
   </data>
@@ -689,6 +692,75 @@ Use one of these options:
   <data name="Toast_PairingCommandCopied" xml:space="preserve">
     <value>Pairing command copied</value>
   </data>
+  <data name="Toast_PairingRequestTitle" xml:space="preserve">
+    <value>Pairing request</value>
+  </data>
+  <data name="Toast_PairingRequestBody" xml:space="preserve">
+    <value>{0} wants to connect</value>
+  </data>
+  <data name="Toast_PairingRequestBodyNode" xml:space="preserve">
+    <value>{0} wants to connect as a node</value>
+  </data>
+  <data name="Toast_PairingReview" xml:space="preserve">
+    <value>Review</value>
+  </data>
+  <data name="Toast_PairingApprovedTitle" xml:space="preserve">
+    <value>Pairing approved</value>
+  </data>
+  <data name="Toast_PairingApprovedBody" xml:space="preserve">
+    <value>{0} can now connect</value>
+  </data>
+  <data name="Toast_PairingRejectedTitle" xml:space="preserve">
+    <value>Pairing rejected</value>
+  </data>
+  <data name="Toast_PairingRejectedBody" xml:space="preserve">
+    <value>{0} was not allowed to connect</value>
+  </data>
+  <data name="PairingApproval_WindowTitle" xml:space="preserve">
+    <value>Pairing request</value>
+  </data>
+  <data name="PairingApproval_DeviceHeading" xml:space="preserve">
+    <value>A device wants to connect</value>
+  </data>
+  <data name="PairingApproval_NodeHeading" xml:space="preserve">
+    <value>A node wants to connect</value>
+  </data>
+  <data name="PairingApproval_Subtitle" xml:space="preserve">
+    <value>Only approve if you recognize this request. You can remove it later in Connection settings.</value>
+  </data>
+  <data name="PairingApproval_AccessRequested" xml:space="preserve">
+    <value>Access requested</value>
+  </data>
+  <data name="PairingApproval_RepairBadge" xml:space="preserve">
+    <value>Re-pair request — the device token will rotate.</value>
+  </data>
+  <data name="PairingApproval_Approve" xml:space="preserve">
+    <value>Approve</value>
+  </data>
+  <data name="PairingApproval_ApproveDevice" xml:space="preserve">
+    <value>Approve device</value>
+  </data>
+  <data name="PairingApproval_ApproveNode" xml:space="preserve">
+    <value>Approve node</value>
+  </data>
+  <data name="PairingApproval_Reject" xml:space="preserve">
+    <value>Reject</value>
+  </data>
+  <data name="PairingApproval_Later" xml:space="preserve">
+    <value>Decide later</value>
+  </data>
+  <data name="PairingApproval_MoreWaiting" xml:space="preserve">
+    <value>{0} more waiting</value>
+  </data>
+  <data name="PairingApproval_ApproveHint" xml:space="preserve">
+    <value>Approve becomes available in a moment</value>
+  </data>
+  <data name="PairingApproval_UnknownDevice" xml:space="preserve">
+    <value>Unknown device</value>
+  </data>
+  <data name="PairingApproval_UnknownPlatform" xml:space="preserve">
+    <value>Unknown platform</value>
+  </data>
   <data name="Toast_NodePaired" xml:space="preserve">
     <value>✅ Node Paired!</value>
   </data>
@@ -818,157 +890,6 @@ Use one of these options:
   <data name="Toast_ActivityStreamTipButton" xml:space="preserve">
     <value>Open Activity Stream</value>
   </data>
-  <!-- ==================== SetupWizardWindow (C# code) ==================== -->
-  <data name="Setup_Title" xml:space="preserve">
-    <value>OpenClaw Setup</value>
-  </data>
-  <data name="Setup_StepConnect" xml:space="preserve">
-    <value>Step 1 of 3 — Connect</value>
-  </data>
-  <data name="Setup_ConnectTitle" xml:space="preserve">
-    <value>Connect to your gateway</value>
-  </data>
-  <data name="Setup_ConnectDescription" xml:space="preserve">
-    <value>On your gateway host (Mac/Linux), run this to get a setup code:</value>
-  </data>
-  <data name="Setup_SetupCodeHeader" xml:space="preserve">
-    <value>Setup Code</value>
-  </data>
-  <data name="Setup_SetupCodePlaceholder" xml:space="preserve">
-    <value>Paste the setup code from your gateway dashboard</value>
-  </data>
-  <data name="Setup_PasteSetupButton" xml:space="preserve">
-    <value>Paste setup code / QR</value>
-  </data>
-  <data name="Setup_ImportQrButton" xml:space="preserve">
-    <value>Import QR image...</value>
-  </data>
-  <data name="Setup_QrDecoded" xml:space="preserve">
-    <value>✅ QR image decoded — press Test Connection</value>
-  </data>
-  <data name="Setup_QrDecodeFailed" xml:space="preserve">
-    <value>❌ Could not find a valid setup QR code in that image.</value>
-  </data>
-  <data name="Setup_ClipboardUnsupported" xml:space="preserve">
-    <value>❌ Clipboard does not contain setup code text or a QR image.</value>
-  </data>
-  <data name="Setup_ManualEntryToggle" xml:space="preserve">
-    <value>Or enter URL and token manually ▾</value>
-  </data>
-  <data name="Setup_ManualEntryToggleHide" xml:space="preserve">
-    <value>Hide manual entry ▴</value>
-  </data>
-  <data name="Setup_GatewayUrlHeader" xml:space="preserve">
-    <value>Gateway URL</value>
-  </data>
-  <data name="Setup_GatewayUrlPlaceholder" xml:space="preserve">
-    <value>ws://192.168.1.x:18789</value>
-  </data>
-  <data name="Setup_GatewayUrlHint" xml:space="preserve">
-    <value>💡 Accepts ws://, wss://, http://, or https://</value>
-  </data>
-  <data name="Setup_TokenHeader" xml:space="preserve">
-    <value>Gateway Token</value>
-  </data>
-  <data name="Setup_TokenPlaceholder" xml:space="preserve">
-    <value>Paste your token here</value>
-  </data>
-  <data name="Setup_TestButton" xml:space="preserve">
-    <value>Test Connection</value>
-  </data>
-  <data name="Setup_Testing" xml:space="preserve">
-    <value>⏳ Connecting to gateway...</value>
-  </data>
-  <data name="Setup_Connected" xml:space="preserve">
-    <value>✅ Connected!</value>
-  </data>
-  <data name="Setup_PairingRequired" xml:space="preserve">
-    <value>✅ Gateway reached! Device needs pairing approval.
-
-On your gateway host (Mac/Linux), run:
-
-  openclaw devices approve {0}</value>
-  </data>
-  <data name="Setup_TokenMismatch" xml:space="preserve">
-    <value>❌ Token doesn't match.
-
-💡 Check gateway auth token:
-  cat ~/.openclaw/openclaw.json | grep token</value>
-  </data>
-  <data name="Setup_OriginNotAllowed" xml:space="preserve">
-    <value>❌ Origin not allowed.
-
-💡 Add this machine to gateway.controlUi.allowedOrigins.</value>
-  </data>
-  <data name="Setup_RateLimited" xml:space="preserve">
-    <value>❌ Rate-limited. Wait a minute and try again.</value>
-  </data>
-  <data name="Setup_TimedOut" xml:space="preserve">
-    <value>❌ Timed out. Check the URL and gateway is running.</value>
-  </data>
-  <data name="Setup_TokenRequired" xml:space="preserve">
-    <value>❌ Please enter a token</value>
-  </data>
-  <data name="Setup_TestFirst" xml:space="preserve">
-    <value>⚠️ Please test the connection first</value>
-  </data>
-  <data name="Setup_CodeDecoded" xml:space="preserve">
-    <value>✅ Setup code decoded — press Test Connection</value>
-  </data>
-  <data name="Setup_NodeModeTitle" xml:space="preserve">
-    <value>Enable Node Mode (optional)</value>
-  </data>
-  <data name="Setup_NodeModeDescription" xml:space="preserve">
-    <value>Node Mode lets your Windows machine run tasks for OpenClaw — like screen capture, camera access, and canvas drawing.</value>
-  </data>
-  <data name="Setup_NodeModeSecurityTitle" xml:space="preserve">
-    <value>Only enable Node Mode for gateways and agents you trust</value>
-  </data>
-  <data name="Setup_NodeModeSecurityMessage" xml:space="preserve">
-    <value>Approved agents can run local commands and may access enabled device surfaces such as screen, camera, location, browser, and canvas. You can disable capability groups later in Settings.</value>
-  </data>
-  <data name="Setup_NodeModeToggle" xml:space="preserve">
-    <value>Enable Node Mode</value>
-  </data>
-  <data name="Setup_DeviceIdLoading" xml:space="preserve">
-    <value>Device ID: loading...</value>
-  </data>
-  <data name="Setup_DeviceIdFallback" xml:space="preserve">
-    <value>Device ID: (will be generated on first connect)</value>
-  </data>
-  <data name="Setup_CopyDeviceId" xml:space="preserve">
-    <value>📋 Copy Device ID</value>
-  </data>
-  <data name="Setup_DeviceIdCopied" xml:space="preserve">
-    <value>✅ Copied!</value>
-  </data>
-  <data name="Setup_ApproveInstructions" xml:space="preserve">
-    <value>To approve this node, run on your gateway host:</value>
-  </data>
-  <data name="Setup_ApproveHint" xml:space="preserve">
-    <value>💡 You can finish setup now — pairing will continue in the background. You'll get a notification when approved.</value>
-  </data>
-  <data name="Setup_DoneTitle" xml:space="preserve">
-    <value>🎉 You're all set!</value>
-  </data>
-  <data name="Setup_DoneDescription" xml:space="preserve">
-    <value>OpenClaw Tray will connect to your gateway and start monitoring.</value>
-  </data>
-  <data name="Setup_BackButton" xml:space="preserve">
-    <value>Back</value>
-  </data>
-  <data name="Setup_NextButton" xml:space="preserve">
-    <value>Next</value>
-  </data>
-  <data name="Setup_FinishButton" xml:space="preserve">
-    <value>Finish</value>
-  </data>
-  <data name="Setup_StepNodeMode" xml:space="preserve">
-    <value>Step 2 of 3 — Node Mode</value>
-  </data>
-  <data name="Setup_StepDone" xml:space="preserve">
-    <value>Step 3 of 3 — Done</value>
-  </data>
   <!-- ==================== Local MCP server (SettingsWindow) ==================== -->
   <data name="SettingsDeveloperModeHeader.Text" xml:space="preserve">
     <value>DEVELOPER MODE</value>
@@ -1494,58 +1415,7 @@ On your gateway host (Mac/Linux), run:
   <data name="Onboarding_Welcome_Trust_Screen" xml:space="preserve">
     <value>Capture screenshots</value>
   </data>
-  <data name="AboutPage_TextBlock_10.Text" xml:space="preserve">
-    <value>About</value>
-  </data>
-  <data name="AboutPage_TextBlock_19.Text" xml:space="preserve">
-    <value>OpenClaw Hub</value>
-  </data>
-  <data name="AboutPage_TextBlock_23.Text" xml:space="preserve">
-    <value>.NET / WinUI / Windows App SDK</value>
-  </data>
-  <data name="AboutPage_TextBlock_35.Text" xml:space="preserve">
-    <value>Gateway Info</value>
-  </data>
-  <data name="AboutPage_TextBlock_48.Text" xml:space="preserve">
-    <value>Version:</value>
-  </data>
-  <data name="AboutPage_TextBlock_52.Text" xml:space="preserve">
-    <value>Protocol:</value>
-  </data>
-  <data name="AboutPage_TextBlock_56.Text" xml:space="preserve">
-    <value>Auth mode:</value>
-  </data>
-  <data name="AboutPage_TextBlock_60.Text" xml:space="preserve">
-    <value>Uptime:</value>
-  </data>
-  <data name="AboutPage_TextBlock_72.Text" xml:space="preserve">
-    <value>Debug</value>
-  </data>
-  <data name="OpenLogButton.Content" xml:space="preserve">
-    <value>Open Log File</value>
-  </data>
-  <data name="OpenConfigButton.Content" xml:space="preserve">
-    <value>Open Config Folder</value>
-  </data>
-  <data name="CopySupportButton.Content" xml:space="preserve">
-    <value>Copy Support Context</value>
-  </data>
-  <data name="CheckUpdatesButton.Content" xml:space="preserve">
-    <value>Check for Updates</value>
-  </data>
-  <data name="AboutPage_TextBlock_91.Text" xml:space="preserve">
-    <value>Links</value>
-  </data>
-  <data name="AboutPage_HyperlinkButton_92.Content" xml:space="preserve">
-    <value>Documentation → docs.openclaw.ai/platforms/windows</value>
-  </data>
-  <data name="AboutPage_HyperlinkButton_94.Content" xml:space="preserve">
-    <value>GitHub → github.com/openclaw/openclaw-windows-node</value>
-  </data>
-  <data name="AboutPage_HyperlinkButton_96.Content" xml:space="preserve">
-    <value>Dashboard → openclaw://dashboard</value>
-  </data>
-  <data name="AgentEventsPage_TextBlock_18.Text" xml:space="preserve">
+<data name="AgentEventsPage_TextBlock_18.Text" xml:space="preserve">
     <value>Event Stream</value>
   </data>
   <data name="AgentFilterCombo.Header" xml:space="preserve">
@@ -1615,7 +1485,7 @@ On your gateway host (Mac/Linux), run:
     <value>Local MCP Server</value>
   </data>
   <data name="PermissionsPage_McpDescription.Text" xml:space="preserve">
-    <value>Expose capabilities via HTTP for CLI tools and local integrations.</value>
+    <value>Serves capabilities to local MCP clients (CLI tools, integrations) on this PC over HTTP.</value>
   </data>
   <data name="PermissionsPage_McpEndpointLabel.Text" xml:space="preserve">
     <value>Endpoint:</value>
@@ -1746,9 +1616,6 @@ On your gateway host (Mac/Linux), run:
   <data name="ConnectionPage_TextBlock_11.Text" xml:space="preserve">
     <value>Gateway endpoint used by both the operator client and node service.</value>
   </data>
-  <data name="AuthErrorBar.Title" xml:space="preserve">
-    <value>Connection Error</value>
-  </data>
   <data name="StatusText.Text" xml:space="preserve">
     <value>Disconnected</value>
   </data>
@@ -2068,10 +1935,13 @@ On your gateway host (Mac/Linux), run:
     <value>Command pattern (e.g. echo *)</value>
   </data>
   <data name="PermissionsPage_ComboBoxItem_54.Content" xml:space="preserve">
-    <value>allow</value>
+    <value>Deny</value>
   </data>
   <data name="PermissionsPage_ComboBoxItem_55.Content" xml:space="preserve">
-    <value>deny</value>
+    <value>Allow</value>
+  </data>
+  <data name="PermissionsPage_ComboBoxItem_56.Content" xml:space="preserve">
+    <value>Ask</value>
   </data>
   <data name="PermissionsPage_Button_57.Content" xml:space="preserve">
     <value>Add Rule</value>
@@ -2262,6 +2132,69 @@ On your gateway host (Mac/Linux), run:
   <data name="WorkspacePage_LoadingContent" xml:space="preserve">
     <value>Loading content…</value>
   </data>
+  <data name="WorkspacePage_SearchBox.PlaceholderText" xml:space="preserve">
+    <value>Search files</value>
+  </data>
+  <data name="WorkspacePage_ParentFolderButton.Content" xml:space="preserve">
+    <value>Up</value>
+  </data>
+  <data name="WorkspacePage_OpenConnectionSettings.Content" xml:space="preserve">
+    <value>Open Connection settings</value>
+  </data>
+  <data name="WorkspacePage_NoSearchResults.Text" xml:space="preserve">
+    <value>No files match your search.</value>
+  </data>
+  <data name="WorkspacePage_NoFolderResults" xml:space="preserve">
+    <value>No files found in this folder.</value>
+  </data>
+  <data name="WorkspacePage_LoadErrorMessage" xml:space="preserve">
+    <value>Couldn't load workspace files. Try refreshing.</value>
+  </data>
+  <data name="WorkspacePage_UnsupportedMessage" xml:space="preserve">
+    <value>This gateway doesn't support listing workspace files.</value>
+  </data>
+  <data name="WorkspacePage_Badge_Missing" xml:space="preserve">
+    <value>Missing</value>
+  </data>
+  <data name="WorkspacePage_Badge_Edited" xml:space="preserve">
+    <value>Edited</value>
+  </data>
+  <data name="WorkspacePage_Badge_Read" xml:space="preserve">
+    <value>Read</value>
+  </data>
+  <data name="WorkspacePage_FolderNote" xml:space="preserve">
+    <value>This is a folder.</value>
+  </data>
+  <data name="WorkspacePage_FileUnavailable" xml:space="preserve">
+    <value>Couldn't load this file.</value>
+  </data>
+  <data name="WorkspacePage_BrowserOnlyFileNote" xml:space="preserve">
+    <value>Only files read or edited in this session can be previewed.</value>
+  </data>
+  <data name="WorkspacePage_OpenFolder" xml:space="preserve">
+    <value>Open</value>
+  </data>
+  <data name="WorkspacePage_CopyPath" xml:space="preserve">
+    <value>Copy path</value>
+  </data>
+  <data name="WorkspacePage_CopyPathFailed" xml:space="preserve">
+    <value>Couldn't copy the path.</value>
+  </data>
+  <data name="WorkspacePage_FileType_File" xml:space="preserve">
+    <value>File</value>
+  </data>
+  <data name="WorkspacePage_FileType_Folder" xml:space="preserve">
+    <value>Folder</value>
+  </data>
+  <data name="WorkspacePage_RootFolder" xml:space="preserve">
+    <value>Root</value>
+  </data>
+  <data name="WorkspacePage_SearchResultsPath" xml:space="preserve">
+    <value>Search results for "{0}"</value>
+  </data>
+  <data name="WorkspacePage_BrowserTruncated" xml:space="preserve">
+    <value>Some results were omitted. Narrow your search or open a folder.</value>
+  </data>
   <data name="WorkspacePage_MissingFile" xml:space="preserve">
     <value>(file not found on disk)</value>
   </data>
@@ -2352,18 +2285,12 @@ On your gateway host (Mac/Linux), run:
   <data name="HubWindow_NavigationViewItem_136.Content" xml:space="preserve">
     <value>Permissions</value>
   </data>
-  <data name="HubWindow_NavigationViewItem_Notifications.Content" xml:space="preserve">
-    <value>Notifications</value>
-  </data>
   <data name="HubWindow_NavigationViewItem_145.Content" xml:space="preserve">
     <value>Diagnostics</value>
   </data>
-  <data name="HubWindow_NavigationViewItem_148.Content" xml:space="preserve">
-    <value>Info</value>
-  </data>
-  <data name="Onboarding_UnknownPage" xml:space="preserve">
-    <value>Unknown page</value>
-  </data>
+<data name="Onboarding_UnknownPage" xml:space="preserve">
+  <value>Unknown page</value>
+</data>
   <data name="Onboarding_Retry" xml:space="preserve">
     <value>Retry</value>
   </data>
@@ -2565,6 +2492,105 @@ On your gateway host (Mac/Linux), run:
   <data name="VoiceSettingsPage_PageDescription.Text" xml:space="preserve">
     <value>Configure speech-to-text and voice interaction settings. All speech processing runs locally on your device.</value>
   </data>
+  <data name="VoiceSettingsPage_AssistantHeader.Text" xml:space="preserve">
+    <value>Assistant</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantDescription.Text" xml:space="preserve">
+    <value>Always-listening assistant service and latest conversation turns.</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantRefreshButton.[using:Microsoft.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Refresh assistant status</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStartButtonText.Text" xml:space="preserve">
+    <value>Start</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStopButtonText.Text" xml:space="preserve">
+    <value>Stop</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStatusChecking.Text" xml:space="preserve">
+    <value>Checking assistant status...</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantRecentTurnsHeader.Text" xml:space="preserve">
+    <value>Recent turns</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStarting" xml:space="preserve">
+    <value>Starting assistant...</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStartingDetail" xml:space="preserve">
+    <value>Starting always-listening mode with local assistant routing and turn storage.</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStartFailed" xml:space="preserve">
+    <value>Assistant did not start</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStopping" xml:space="preserve">
+    <value>Stopping assistant...</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStopFailed" xml:space="preserve">
+    <value>Assistant did not stop</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantBridgeUnavailable" xml:space="preserve">
+    <value>Assistant bridge unavailable</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantNoTurnsLoaded" xml:space="preserve">
+    <value>No assistant turns loaded.</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantUnknown" xml:space="preserve">
+    <value>unknown</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantListeningFormat" xml:space="preserve">
+    <value>Assistant listening (PID {0})</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStopped" xml:space="preserve">
+    <value>Assistant stopped</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStatusFormat" xml:space="preserve">
+    <value>Assistant {0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantTranscriberFormat" xml:space="preserve">
+    <value>Transcriber: {0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantMicFormat" xml:space="preserve">
+    <value>Mic: {0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantSpeakerFormat" xml:space="preserve">
+    <value>Speaker: {0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantCloudRoutingFormat" xml:space="preserve">
+    <value>Cloud routing: {0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantSpeechOutputFormat" xml:space="preserve">
+    <value>Speech output: {0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantOn" xml:space="preserve">
+    <value>on</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantOff" xml:space="preserve">
+    <value>off</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantLastBridgeUpdateFormat" xml:space="preserve">
+    <value>Last bridge update: {0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantNoConversationTurns" xml:space="preserve">
+    <value>No conversation turns yet.</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantSourceDefault" xml:space="preserve">
+    <value>assistant</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantTurnMetadataFormat" xml:space="preserve">
+    <value>{0} | {1}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantTurnMetadataWithLatencyFormat" xml:space="preserve">
+    <value>{0} | {1} | {2} ms</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantUserTurnFormat" xml:space="preserve">
+    <value>You: {0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantResponseTurnFormat" xml:space="preserve">
+    <value>OpenClaw: {0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantEmptyValue" xml:space="preserve">
+    <value>(empty)</value>
+  </data>
   <data name="VoiceSettingsPage_SttHeader.Text" xml:space="preserve">
     <value>Speech-to-Text</value>
   </data>
@@ -2940,6 +2966,9 @@ On your gateway host (Mac/Linux), run:
   <data name="Chat_Timeline_LoadEarlier" xml:space="preserve">
     <value>Load earlier messages</value>
   </data>
+  <data name="Chat_Timeline_ScrollToLatest" xml:space="preserve">
+    <value>Scroll to latest message</value>
+  </data>
   <data name="Chat_Tool_CallLabel" xml:space="preserve">
     <value>Tool call</value>
   </data>
@@ -2976,6 +3005,15 @@ On your gateway host (Mac/Linux), run:
   <data name="Chat_Composer_Reasoning_Maximum" xml:space="preserve">
     <value>Maximum</value>
   </data>
+  <data name="Chat_Composer_Accessibility_Session" xml:space="preserve">
+    <value>Session</value>
+  </data>
+  <data name="Chat_Composer_Accessibility_Model" xml:space="preserve">
+    <value>Model</value>
+  </data>
+  <data name="Chat_Composer_Accessibility_Reasoning" xml:space="preserve">
+    <value>Reasoning</value>
+  </data>
   <data name="Chat_Composer_Placeholder_Connected" xml:space="preserve">
     <value>Message Assistant (Enter to send)</value>
   </data>
@@ -3012,6 +3050,30 @@ On your gateway host (Mac/Linux), run:
   <data name="Chat_Composer_AssistantWorking" xml:space="preserve">
     <value>Assistant is working…</value>
   </data>
+  <data name="Chat_Composer_QueuedCountFormat" xml:space="preserve">
+    <value>Queued ({0})</value>
+  </data>
+  <data name="Chat_Composer_QueuedMessageAutomationFormat" xml:space="preserve">
+    <value>Queued message: {0}</value>
+  </data>
+  <data name="Chat_Composer_QueuedMessageFailedAutomationFormat" xml:space="preserve">
+    <value>Queued message failed: {0}</value>
+  </data>
+  <data name="Chat_Composer_QueuedMessageFailed" xml:space="preserve">
+    <value>Failed</value>
+  </data>
+  <data name="Chat_Composer_QueuedMessageCancel" xml:space="preserve">
+    <value>Cancel queued message</value>
+  </data>
+  <data name="Chat_Composer_QueuedMessageCancelAutomationFormat" xml:space="preserve">
+    <value>Cancel queued message {0}: {1}</value>
+  </data>
+  <data name="Chat_Composer_QueuedMessageRemoveFailed" xml:space="preserve">
+    <value>Remove failed queued message</value>
+  </data>
+  <data name="Chat_Composer_QueuedMessageRemoveFailedAutomationFormat" xml:space="preserve">
+    <value>Remove failed queued message {0}: {1}</value>
+  </data>
   <data name="Chat_Assistant_Action_Copy" xml:space="preserve">
     <value>Copy message</value>
   </data>
@@ -3025,14 +3087,20 @@ On your gateway host (Mac/Linux), run:
     <value> … [{0} bytes truncated]</value>
   </data>
   <data name="Chat_Permission_Allow" xml:space="preserve">
-    <value>Allow</value>
+    <value>Allow once</value>
+  </data>
+  <data name="Chat_Permission_AllowAlways" xml:space="preserve">
+    <value>Always allow</value>
   </data>
   <data name="Chat_Permission_Deny" xml:space="preserve">
-    <value>Deny</value>
+    <value>Deny once</value>
   </data>
   <data name="Chat_Permission_DecisionAllowed" xml:space="preserve">
     <value>Allowed</value>
   </data>
+  <data name="Chat_Permission_DecisionAlwaysAllowed" xml:space="preserve">
+    <value>Always allowed</value>
+  </data>
   <data name="Chat_Permission_DecisionDenied" xml:space="preserve">
     <value>Denied</value>
   </data>
@@ -3057,12 +3125,118 @@ On your gateway host (Mac/Linux), run:
   <data name="AppNotification_LocalCommandDenied_PatternSuffixFormat" xml:space="preserve">
     <value>Matched pattern: {0}.</value>
   </data>
+  <data name="AppNotification_ExecApprovalPending_Title" xml:space="preserve">
+    <value>Command approval pending</value>
+  </data>
+  <data name="AppNotification_ExecApprovalPending_MessageFormat" xml:space="preserve">
+    <value>{0} is waiting for approval to run: {1}</value>
+  </data>
+  <data name="AppNotification_ExecApprovalPending_OpenChatAction" xml:space="preserve">
+    <value>Open chat</value>
+  </data>
+  <data name="AppNotification_ExecApprovalPending_UnknownChatLabel" xml:space="preserve">
+    <value>chat</value>
+  </data>
+  <data name="AppNotification_ExecApprovalPending_MainSessionLabel" xml:space="preserve">
+    <value>Main</value>
+  </data>
+  <data name="AppNotification_ExecApprovalPending_MainChatLabel" xml:space="preserve">
+    <value>Main chat</value>
+  </data>
+  <data name="AppNotification_ExecApprovalPending_AgentChatLabelFormat" xml:space="preserve">
+    <value>{0} chat</value>
+  </data>
+  <data name="AppNotification_ExecApprovalPending_AgentSlotLabelFormat" xml:space="preserve">
+    <value>{0} / {1}</value>
+  </data>
   <data name="AppNotification_RepeatedBadgeFormat" xml:space="preserve">
     <value>{0}x</value>
   </data>
   <data name="AppNotification_ShowMore" xml:space="preserve">
     <value>Show more</value>
   </data>
+  <data name="AppNotification_ActionOpenConnection" xml:space="preserve">
+    <value>Open Connection</value>
+  </data>
+  <data name="AppNotification_ActionOpenChannels" xml:space="preserve">
+    <value>Open Channels</value>
+  </data>
+  <data name="AppNotification_ActionOpenSandbox" xml:space="preserve">
+    <value>Open Sandbox</value>
+  </data>
+  <data name="AppNotification_ActionOpenCron" xml:space="preserve">
+    <value>Open Cron</value>
+  </data>
+  <data name="AppNotification_GatewayConnectionFailed_Title" xml:space="preserve">
+    <value>Gateway connection failed</value>
+  </data>
+  <data name="AppNotification_GatewayConnectionFailed_DefaultMessage" xml:space="preserve">
+    <value>OpenClaw could not connect to the active gateway.</value>
+  </data>
+  <data name="AppNotification_GatewayPairingRequired_Title" xml:space="preserve">
+    <value>Gateway pairing approval required</value>
+  </data>
+  <data name="AppNotification_GatewayPairingRequired_GenericMessage" xml:space="preserve">
+    <value>Open Connection to complete gateway pairing.</value>
+  </data>
+  <data name="AppNotification_GatewayPairingRequired_DeviceMessageFormat" xml:space="preserve">
+    <value>Open Connection to approve device {0}.</value>
+  </data>
+  <data name="AppNotification_WindowsNodeConnectionFailed_Title" xml:space="preserve">
+    <value>Windows node connection failed</value>
+  </data>
+  <data name="AppNotification_WindowsNodeConnectionFailed_DefaultMessage" xml:space="preserve">
+    <value>The gateway is connected, but this Windows node is not available.</value>
+  </data>
+  <data name="AppNotification_WindowsNodeRateLimited_Title" xml:space="preserve">
+    <value>Windows node connection rate-limited</value>
+  </data>
+  <data name="AppNotification_WindowsNodeRateLimited_DefaultMessage" xml:space="preserve">
+    <value>The gateway is connected, but this Windows node is temporarily rate-limited.</value>
+  </data>
+  <data name="AppNotification_ChannelNeedsAttention_TitleFormat" xml:space="preserve">
+    <value>{0} channel needs attention</value>
+  </data>
+  <data name="AppNotification_ChannelNeedsAttention_StatusMessageFormat" xml:space="preserve">
+    <value>The gateway reports {0} as {1}.</value>
+  </data>
+  <data name="AppNotification_SandboxDisabled_Title" xml:space="preserve">
+    <value>Node Sandbox is off — commands run uncontained</value>
+  </data>
+  <data name="AppNotification_SandboxDisabled_Message" xml:space="preserve">
+    <value>Agent-started Windows commands will run without sandbox containment until Node Sandbox is turned back on.</value>
+  </data>
+  <data name="AppNotification_SandboxUnavailable_Title" xml:space="preserve">
+    <value>Sandbox unavailable — host fallback</value>
+  </data>
+  <data name="AppNotification_SandboxUnavailable_MessageFormat" xml:space="preserve">
+    <value>{0}
+
+Commands will run on the host without sandbox protection while sandboxing is unavailable.</value>
+  </data>
+  <data name="AppNotification_SandboxUnavailableBlocked_Title" xml:space="preserve">
+    <value>Sandbox unavailable — commands blocked</value>
+  </data>
+  <data name="AppNotification_SandboxUnavailableBlocked_MessageFormat" xml:space="preserve">
+    <value>{0}
+
+Commands are blocked while sandboxing is unavailable because strict fallback blocking is enabled.</value>
+  </data>
+  <data name="AppNotification_SandboxUnavailable_DefaultReason" xml:space="preserve">
+    <value>MXC sandboxing primitives are not available on this machine.</value>
+  </data>
+  <data name="AppNotification_CronRunFailed_Title" xml:space="preserve">
+    <value>Cron job did not start</value>
+  </data>
+  <data name="AppNotification_CronRunFailed_DefaultDetail" xml:space="preserve">
+    <value>The request failed.</value>
+  </data>
+  <data name="AppNotification_CronRunRejectedDetail" xml:space="preserve">
+    <value>The gateway rejected the cron.run request.</value>
+  </data>
+  <data name="AppNotification_CronRunFailed_MessageFormat" xml:space="preserve">
+    <value>{0}: {1}</value>
+  </data>
   <data name="NotificationsPage_Title.Text" xml:space="preserve">
     <value>Notifications</value>
   </data>
@@ -3087,35 +3261,98 @@ On your gateway host (Mac/Linux), run:
   <data name="NotificationsPage_MetadataCategoryNodeInvoke" xml:space="preserve">
     <value>Node command</value>
   </data>
-  <data name="Chat_Permission_Title" xml:space="preserve">
-    <value>Exec approval needed</value>
+  <data name="NotificationsPage_MetadataAuthentication" xml:space="preserve">
+    <value>Authentication</value>
   </data>
-  <data name="Chat_Permission_Subtitle" xml:space="preserve">
-    <value>Approval is needed to run the command below on this Windows companion. Allow once to proceed, or Deny to cancel.</value>
+  <data name="NotificationsPage_MetadataBindings" xml:space="preserve">
+    <value>Bindings</value>
   </data>
-  <data name="Chat_Permission_Caption" xml:space="preserve">
-    <value>Approval is required for every command by the active policy. Your choice applies only to this request.</value>
+  <data name="NotificationsPage_MetadataChannels" xml:space="preserve">
+    <value>Channels</value>
   </data>
-  <data name="Chat_Root_ConnectingToGateway" xml:space="preserve">
-    <value>Connecting to gateway…</value>
+  <data name="NotificationsPage_MetadataConfig" xml:space="preserve">
+    <value>Config</value>
   </data>
-  <data name="Chat_Root_EmptyState_SelectSession" xml:space="preserve">
-    <value>Select a session from the sidebar to start chatting.</value>
+  <data name="NotificationsPage_MetadataConnection" xml:space="preserve">
+    <value>Connection</value>
   </data>
-  <data name="Chat_Notification_SendFailed" xml:space="preserve">
-    <value>Send failed</value>
+  <data name="NotificationsPage_MetadataCron" xml:space="preserve">
+    <value>Cron</value>
   </data>
-  <data name="Chat_Notification_AbortFailed" xml:space="preserve">
-    <value>Abort failed</value>
+  <data name="NotificationsPage_MetadataGateway" xml:space="preserve">
+    <value>Gateway</value>
   </data>
-  <data name="Chat_Notification_LoadHistoryFailed" xml:space="preserve">
-    <value>Failed to load history</value>
+  <data name="NotificationsPage_MetadataJobs" xml:space="preserve">
+    <value>Jobs</value>
   </data>
-  <data name="Chat_Notification_AssistantReplied" xml:space="preserve">
-    <value>Assistant replied</value>
+  <data name="NotificationsPage_MetadataLoad" xml:space="preserve">
+    <value>Load</value>
   </data>
-  <data name="Chat_Notification_ConnectionInterrupted" xml:space="preserve">
-    <value>Connection lost — response interrupted.</value>
+  <data name="NotificationsPage_MetadataLifecycle" xml:space="preserve">
+    <value>Lifecycle</value>
+  </data>
+  <data name="NotificationsPage_MetadataLocalGateway" xml:space="preserve">
+    <value>Local gateway</value>
+  </data>
+  <data name="NotificationsPage_MetadataNode" xml:space="preserve">
+    <value>Node</value>
+  </data>
+  <data name="NotificationsPage_MetadataPairing" xml:space="preserve">
+    <value>Pairing</value>
+  </data>
+  <data name="NotificationsPage_MetadataSandbox" xml:space="preserve">
+    <value>Sandbox</value>
+  </data>
+  <data name="NotificationsPage_MetadataSettings" xml:space="preserve">
+    <value>Settings</value>
+  </data>
+  <data name="NotificationsPage_MetadataStatus" xml:space="preserve">
+    <value>Status</value>
+  </data>
+  <data name="NotificationsPage_MetadataSystemRun" xml:space="preserve">
+    <value>system.run</value>
+  </data>
+  <data name="Chat_Permission_Title" xml:space="preserve">
+    <value>Exec approval needed</value>
+  </data>
+  <data name="Chat_Permission_CommandApprovalTitle" xml:space="preserve">
+    <value>Command approval requested</value>
+  </data>
+  <data name="Chat_Permission_Subtitle" xml:space="preserve">
+    <value>Approval is needed to run the command below on this Windows companion. Allow once to proceed, Always allow to remember this command, or Deny to cancel.</value>
+  </data>
+  <data name="Chat_Permission_Caption" xml:space="preserve">
+    <value>Allow once applies only to this request. Always allow saves an exact allow rule when possible.</value>
+  </data>
+  <data name="Chat_Permission_ResultSubmittedFormat" xml:space="preserve">
+    <value>Approval {0} submitted for {1}.</value>
+  </data>
+  <data name="Chat_Root_ConnectingToGateway" xml:space="preserve">
+    <value>Connecting to gateway…</value>
+  </data>
+  <data name="Chat_Root_EmptyState_SelectSession" xml:space="preserve">
+    <value>Select a session from the sidebar to start chatting.</value>
+  </data>
+  <data name="Chat_Notification_SendFailed" xml:space="preserve">
+    <value>Send failed</value>
+  </data>
+  <data name="Chat_Error_SendReturnedStatusFormat" xml:space="preserve">
+    <value>Gateway returned send status '{0}'.</value>
+  </data>
+  <data name="Chat_Error_SendFailedFormat" xml:space="preserve">
+    <value>Send failed: {0}</value>
+  </data>
+  <data name="Chat_Notification_AbortFailed" xml:space="preserve">
+    <value>Abort failed</value>
+  </data>
+  <data name="Chat_Notification_LoadHistoryFailed" xml:space="preserve">
+    <value>Failed to load history</value>
+  </data>
+  <data name="Chat_Notification_AssistantReplied" xml:space="preserve">
+    <value>Assistant replied</value>
+  </data>
+  <data name="Chat_Notification_ConnectionInterrupted" xml:space="preserve">
+    <value>Connection lost — response interrupted.</value>
   </data>
   <data name="Chat_Notification_KeylessEventDropped" xml:space="preserve">
     <value>Gateway timeline event dropped</value>
@@ -3204,6 +3441,18 @@ On your gateway host (Mac/Linux), run:
   <data name="PermissionsPage_NodeStatus_ActiveDetailsFormat" xml:space="preserve">
     <value>Providing {0} capabilities: {1}</value>
   </data>
+  <data name="PermissionsPage_NodeStatus_McpOnly" xml:space="preserve">
+    <value>Local MCP only</value>
+  </data>
+  <data name="PermissionsPage_NodeStatus_McpOnlyDetailsFormat" xml:space="preserve">
+    <value>Serving {0} capabilities to local MCP clients at {1}</value>
+  </data>
+  <data name="PermissionsPage_NodeStatus_Starting" xml:space="preserve">
+    <value>Node starting…</value>
+  </data>
+  <data name="PermissionsPage_NodeStatus_McpError" xml:space="preserve">
+    <value>Local MCP server failed to start</value>
+  </data>
   <data name="PermissionsPage_NodeStatus_NoCapabilities" xml:space="preserve">
     <value>No capabilities enabled.</value>
   </data>
@@ -3579,10 +3828,7 @@ On your gateway host (Mac/Linux), run:
   <data name="HubWindow_NavigationViewItem_Sandbox.Content" xml:space="preserve">
     <value>Sandbox</value>
   </data>
-  <data name="AboutPage_MoreDiagnosticsLink.Content" xml:space="preserve">
-    <value>More diagnostics →</value>
-  </data>
-  <data name="ChannelsPage_GuideBar.Title" xml:space="preserve">
+<data name="ChannelsPage_GuideBar.Title" xml:space="preserve">
     <value>Your gateway didn't list any channels</value>
   </data>
   <data name="ChannelsPage_GuideBar.Message" xml:space="preserve">
@@ -3649,10 +3895,10 @@ On your gateway host (Mac/Linux), run:
     <value>Connection state, gateway URL, runtime, tunnel.</value>
   </data>
   <data name="DiagnosticsPage_Card_CopyDebugBundle.Header" xml:space="preserve">
-    <value>Copy full debug bundle</value>
+    <value>Copy summary debug bundle</value>
   </data>
   <data name="DiagnosticsPage_Card_CopyDebugBundle.Description" xml:space="preserve">
-    <value>Everything the preview dialog produces, no preview.</value>
+    <value>Generated summaries only; excludes log tails. Use Create diagnostics bundle to review logs before sharing.</value>
   </data>
   <data name="DiagnosticsPage_Card_CopyBrowserSetup.Header" xml:space="preserve">
     <value>Copy browser setup guidance</value>
@@ -3714,16 +3960,7 @@ On your gateway host (Mac/Linux), run:
   <data name="DiagnosticsPage_Card_TrayChat.Header" xml:space="preserve">
     <value>Tray chat popup</value>
   </data>
-  <data name="DiagnosticsPage_Card_Reconfigure.Header" xml:space="preserve">
-    <value>Reconfigure…</value>
-  </data>
-  <data name="DiagnosticsPage_Card_Reconfigure.Description" xml:space="preserve">
-    <value>Reopens the OpenClaw onboarding wizard. You will be asked to confirm.</value>
-  </data>
-  <data name="DiagnosticsPage_ReconfigureButton.Content" xml:space="preserve">
-    <value>Reconfigure…</value>
-  </data>
-  <data name="DiagnosticsPage_DetailBack.Text" xml:space="preserve">
+<data name="DiagnosticsPage_DetailBack.Text" xml:space="preserve">
     <value>Back to Diagnostics</value>
   </data>
   <data name="SettingsRow_AutoStart_Description.Text" xml:space="preserve">
@@ -4231,7 +4468,7 @@ On your gateway host (Mac/Linux), run:
     <value>0 rules</value>
   </data>
   <data name="PermissionsPage_NoRulesYetAdd.Text" xml:space="preserve">
-    <value>No rules yet. Add a pattern below to allow or deny specific commands.</value>
+    <value>No rules yet. Add a pattern below to deny, allow, or ask for specific commands.</value>
   </data>
   <data name="PermissionsPage_WindowsPrivacy.Text" xml:space="preserve">
     <value>Windows privacy</value>
@@ -4425,6 +4662,9 @@ On your gateway host (Mac/Linux), run:
   <data name="SessionsPage_All.Text" xml:space="preserve">
     <value>All</value>
   </data>
+  <data name="SessionsPage_ShowCompleted.Header" xml:space="preserve">
+    <value>Show completed</value>
+  </data>
   <data name="SessionsPage_GatewayDisconnected.Title" xml:space="preserve">
     <value>Gateway disconnected</value>
   </data>
@@ -4446,15 +4686,81 @@ On your gateway host (Mac/Linux), run:
   <data name="SessionsPage_Compact.Text" xml:space="preserve">
     <value>Compact</value>
   </data>
+  <data name="SessionsPage_Checkpoints.Text" xml:space="preserve">
+    <value>Checkpoints</value>
+  </data>
+  <data name="SessionsPage_Checkpoints.[using:Microsoft.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>View, branch or restore compaction checkpoints</value>
+  </data>
+  <data name="SessionsPage_ExportTranscript.Text" xml:space="preserve">
+    <value>Export transcript</value>
+  </data>
+  <data name="SessionsPage_ExportTranscript.[using:Microsoft.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Save the conversation transcript to a text file</value>
+  </data>
   <data name="SessionsPage_Delete.Text" xml:space="preserve">
     <value>Delete</value>
   </data>
+  <data name="SessionActionPrompt_Reset_Title" xml:space="preserve">
+    <value>Reset session?</value>
+  </data>
+  <data name="SessionActionPrompt_Reset_BodyFormat" xml:space="preserve">
+    <value>Start a fresh session for “{0}”? The current conversation context will be cleared.</value>
+  </data>
+  <data name="SessionActionPrompt_Reset_ConfirmLabel" xml:space="preserve">
+    <value>Reset</value>
+  </data>
+  <data name="SessionActionPrompt_CancelLabel" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="SessionActionPrompt_Compact_Title" xml:space="preserve">
+    <value>Compact session log?</value>
+  </data>
+  <data name="SessionActionPrompt_Compact_BodyFormat" xml:space="preserve">
+    <value>Keep the most recent messages for “{0}” and archive the rest. This creates a compaction checkpoint; export the transcript first if you need the full history.</value>
+  </data>
+  <data name="SessionActionPrompt_Compact_ConfirmLabel" xml:space="preserve">
+    <value>Compact</value>
+  </data>
+  <data name="SessionActionPrompt_Delete_Title" xml:space="preserve">
+    <value>Delete session?</value>
+  </data>
+  <data name="SessionActionPrompt_Delete_BodyFormat" xml:space="preserve">
+    <value>Delete “{0}” and archive its transcript? It will be removed from the session list.</value>
+  </data>
+  <data name="SessionActionPrompt_Delete_ConfirmLabel" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="SessionActionPrompt_Restore_Title" xml:space="preserve">
+    <value>Restore checkpoint?</value>
+  </data>
+  <data name="SessionActionPrompt_Restore_BodyFormat" xml:space="preserve">
+    <value>Roll “{0}” back to this compaction checkpoint? Messages added after the checkpoint will be archived.</value>
+  </data>
+  <data name="SessionActionPrompt_Restore_ConfirmLabel" xml:space="preserve">
+    <value>Restore</value>
+  </data>
   <data name="SettingsPage_Settings.Text" xml:space="preserve">
     <value>Settings</value>
   </data>
   <data name="SettingsPage_General.Text" xml:space="preserve">
     <value>General</value>
   </data>
+  <data name="SettingsRow_AppTheme_Header.Text" xml:space="preserve">
+    <value>App theme</value>
+  </data>
+  <data name="SettingsRow_AppTheme_Description.Text" xml:space="preserve">
+    <value>Choose light, dark, or use your Windows setting.</value>
+  </data>
+  <data name="SettingsPage_AppTheme_System.Content" xml:space="preserve">
+    <value>System</value>
+  </data>
+  <data name="SettingsPage_AppTheme_Light.Content" xml:space="preserve">
+    <value>Light</value>
+  </data>
+  <data name="SettingsPage_AppTheme_Dark.Content" xml:space="preserve">
+    <value>Dark</value>
+  </data>
   <data name="SettingsPage_Notifications.Text" xml:space="preserve">
     <value>Notifications</value>
   </data>
@@ -4464,6 +4770,15 @@ On your gateway host (Mac/Linux), run:
   <data name="SettingsPage_LocalGateway.Text" xml:space="preserve">
     <value>Local Gateway</value>
   </data>
+  <data name="SettingsPage_Developer.Text" xml:space="preserve">
+    <value>Developer</value>
+  </data>
+  <data name="SettingsRow_ShowDiagnostics_Header.Text" xml:space="preserve">
+    <value>Enable Diagnostics</value>
+  </data>
+  <data name="SettingsRow_ShowDiagnostics_Description.Text" xml:space="preserve">
+    <value>Developer and troubleshooting tools. On by default for local builds.</value>
+  </data>
   <data name="SettingsPage_LocalGatewaySetup_Header.Text" xml:space="preserve">
     <value>Set up or reconfigure Local Gateway</value>
   </data>
@@ -4674,21 +4989,18 @@ On your gateway host (Mac/Linux), run:
   <data name="DiagnosticsBundleDialog_ReviewBeforeSharing.Title" xml:space="preserve">
     <value>Review before sharing</value>
   </data>
-  <data name="DiagnosticsBundleDialog_ReviewBeforeSharing.Message" xml:space="preserve">
-    <value>Sensitive tokens, command arguments, payloads, and recordings are excluded by the bundle builder.</value>
-  </data>
   <data name="HubWindow_Disconnected.Text" xml:space="preserve">
     <value>Disconnected</value>
   </data>
-  <data name="HubWindow_Op.Text" xml:space="preserve">
-    <value>Op</value>
-  </data>
-  <data name="HubWindow_Node.Text" xml:space="preserve">
-    <value>Node</value>
-  </data>
   <data name="HubWindow_Advanced.Content" xml:space="preserve">
     <value>Advanced</value>
   </data>
+  <data name="DiagnosticsBundleDialog_ReviewBeforeSharingMessage.Text" xml:space="preserve">
+    <value>Log tails are sanitized and truncated. Sensitive tokens, payloads, recordings, and raw settings files are excluded. Review before sharing.</value>
+  </data>
+  <data name="DiagnosticsBundleDialog_ReviewBeforeSharingTitle.Text" xml:space="preserve">
+    <value>Review before sharing</value>
+  </data>
   <data name="AgentEventsPage_LiveText.Text" xml:space="preserve">
     <value>Live</value>
   </data>
@@ -4716,9 +5028,6 @@ On your gateway host (Mac/Linux), run:
   <data name="VoiceSettingsPage_PreviewVoice.Text" xml:space="preserve">
     <value>Preview Voice</value>
   </data>
-  <data name="HubWindow_TitleStatus.Text" xml:space="preserve">
-    <value>Disconnected</value>
-  </data>
   <data name="SandboxPage_GatewayCommandsNote.Text" xml:space="preserve">
     <value>Commands the agent runs directly on the gateway aren't. If the gateway is on this PC they may still be able to reach your Windows files, clipboard, and network — check your gateway's configuration.</value>
   </data>  <data name="AgentEventsPage_AllAgents" xml:space="preserve">
@@ -4739,6 +5048,60 @@ On your gateway host (Mac/Linux), run:
   <data name="CronPage_Running" xml:space="preserve">
     <value>Running...</value>
   </data>
+  <data name="CronPage_CompletedOneTimeJobTooltip" xml:space="preserve">
+    <value>Completed one-time job</value>
+  </data>
+  <data name="CronPage_EnableJobTooltip" xml:space="preserve">
+    <value>Enable job</value>
+  </data>
+  <data name="CronPage_DisableJobTooltip" xml:space="preserve">
+    <value>Disable job</value>
+  </data>
+  <data name="CronPage_FullResponse" xml:space="preserve">
+    <value>Full response</value>
+  </data>
+  <data name="CronPage_OpenChat" xml:space="preserve">
+    <value>Open chat</value>
+  </data>
+  <data name="CronPage_RunNow" xml:space="preserve">
+    <value>Run Now</value>
+  </data>
+  <data name="CronPage_EditAction" xml:space="preserve">
+    <value>Edit</value>
+  </data>
+  <data name="CronPage_HistoryAction" xml:space="preserve">
+    <value>History</value>
+  </data>
+  <data name="CronPage_RemoveAction" xml:space="preserve">
+    <value>Remove</value>
+  </data>
+  <data name="CronPage_RunningBadge" xml:space="preserve">
+    <value>Running</value>
+  </data>
+  <data name="CronPage_RunHistory" xml:space="preserve">
+    <value>Run History</value>
+  </data>
+  <data name="CronPage_RunHistoryShowing" xml:space="preserve">
+    <value>Run History - showing {0} of {1}</value>
+  </data>
+  <data name="CronPage_RunHistoryCount" xml:space="preserve">
+    <value>Run History - {0} runs</value>
+  </data>
+  <data name="CronPage_LoadingRunHistory" xml:space="preserve">
+    <value>Loading run history...</value>
+  </data>
+  <data name="CronPage_NoRunHistoryAvailable" xml:space="preserve">
+    <value>No run history available.</value>
+  </data>
+  <data name="CronPage_LoadOlderRuns" xml:space="preserve">
+    <value>Load older runs ({0} more)...</value>
+  </data>
+  <data name="CronPage_LoadMoreRuns" xml:space="preserve">
+    <value>Load more runs...</value>
+  </data>
+  <data name="CronPage_Loading" xml:space="preserve">
+    <value>Loading...</value>
+  </data>
   <data name="CronPage_SaveChanges" xml:space="preserve">
     <value>Save Changes</value>
   </data>
@@ -4932,6 +5295,18 @@ Make sure the gateway is running.</value>
   <data name="ConnectionPage_NodeModeDisabledText" xml:space="preserve">
     <value>Node mode disabled</value>
   </data>
+  <data name="ConnectionPage_NodeStarting" xml:space="preserve">
+    <value>Node starting…</value>
+  </data>
+  <data name="ConnectionPage_NodeMcpOnly" xml:space="preserve">
+    <value>Serving capabilities locally (MCP only)</value>
+  </data>
+  <data name="ConnectionPage_NodeMcpOnlyReachable" xml:space="preserve">
+    <value>Reachable by local MCP clients at {0}</value>
+  </data>
+  <data name="ConnectionPage_NodeMcpError" xml:space="preserve">
+    <value>Local MCP server failed to start</value>
+  </data>
   <data name="ConnectionPage_NodeBodyNoCapabilities" xml:space="preserve">
     <value>No capabilities enabled. Pick what to share in Permissions.</value>
   </data>
@@ -4974,6 +5349,9 @@ Make sure the gateway is running.</value>
   <data name="ConnectionPage_OpenDashboard" xml:space="preserve">
     <value>Open dashboard</value>
   </data>
+  <data name="ConnectionPage_GatewayOptionsA11y" xml:space="preserve">
+    <value>Options for {0}</value>
+  </data>
   <data name="ConnectionPage_DisconnectAction" xml:space="preserve">
     <value>Disconnect</value>
   </data>
@@ -5178,9 +5556,6 @@ Make sure the gateway is running.</value>
   <data name="ConnectionPage_CancelAction" xml:space="preserve">
     <value>Cancel</value>
   </data>
-  <data name="ConnectionPage_ConnectFailed" xml:space="preserve">
-    <value>Connect failed</value>
-  </data>
   <data name="ConnectionPage_GatewayConnectionFailed" xml:space="preserve">
     <value>Gateway connection failed.</value>
   </data>
@@ -5211,31 +5586,6 @@ Make sure the gateway is running.</value>
   <data name="ConnectionPage_DenyPairingRequest" xml:space="preserve">
     <value>Deny pairing request</value>
   </data>
-  <data name="ConnectionPage_AuthGuidanceToken" xml:space="preserve">
-    <value>{0}
-
-Paste a new setup code from the Add Gateway flow.</value>
-  </data>
-  <data name="ConnectionPage_AuthGuidancePairing" xml:space="preserve">
-    <value>{0}
-
-Your device needs approval on the gateway host.</value>
-  </data>
-  <data name="ConnectionPage_AuthGuidancePassword" xml:space="preserve">
-    <value>{0}
-
-This gateway requires password authentication.</value>
-  </data>
-  <data name="ConnectionPage_AuthGuidanceSignature" xml:space="preserve">
-    <value>{0}
-
-The gateway may require a different auth protocol version.</value>
-  </data>
-  <data name="ConnectionPage_AuthGuidanceDefault" xml:space="preserve">
-    <value>{0}
-
-Check your connection settings and try again.</value>
-  </data>
   <data name="ConnectionPage_AuthModeBootstrap" xml:space="preserve">
     <value>bootstrap</value>
   </data>
@@ -5656,13 +6006,7 @@ Check your connection settings and try again.</value>
   <data name="Command_GoToNotifications_Title" xml:space="preserve">
     <value>Go to Notifications</value>
   </data>
-  <data name="Command_GoToInfo_Subtitle" xml:space="preserve">
-    <value>About this app</value>
-  </data>
-  <data name="Command_GoToInfo_Title" xml:space="preserve">
-    <value>Go to Info</value>
-  </data>
-  <data name="Command_GoToInstances_Subtitle" xml:space="preserve">
+<data name="Command_GoToInstances_Subtitle" xml:space="preserve">
     <value>Gateway instances</value>
   </data>
   <data name="Command_GoToInstances_Title" xml:space="preserve">
@@ -5791,6 +6135,345 @@ Check your connection settings and try again.</value>
   <data name="ConfigPage_ConfigUnavailable" xml:space="preserve">
     <value>Config unavailable</value>
   </data>
+  <data name="ConfigPage_EditingPathFormat" xml:space="preserve">
+    <value>Editing {0} via schema-guided form.</value>
+  </data>
+  <data name="ConfigPage_RenderConfigUnavailableTitle" xml:space="preserve">
+    <value>Config unavailable</value>
+  </data>
+  <data name="ConfigPage_RenderConfigUnavailableMessage" xml:space="preserve">
+    <value>The gateway config could not be rendered. Refresh and try again.</value>
+  </data>
+  <data name="ConfigPage_RenderSchemaUnavailableTitle" xml:space="preserve">
+    <value>Schema unavailable</value>
+  </data>
+  <data name="ConfigPage_RenderSchemaUnavailableMessage" xml:space="preserve">
+    <value>The gateway schema could not be rendered. Raw JSON remains available as a read-only preview.</value>
+  </data>
+  <data name="ConfigPage_StatusGatewayRestartingTitle" xml:space="preserve">
+    <value>Gateway restarting</value>
+  </data>
+  <data name="ConfigPage_StatusGatewayRestartingMessage" xml:space="preserve">
+    <value>Saving changes. The gateway is restarting and will reconnect automatically.</value>
+  </data>
+  <data name="ConfigPage_StatusNoChangesTitle" xml:space="preserve">
+    <value>No changes</value>
+  </data>
+  <data name="ConfigPage_StatusNoChangesMessage" xml:space="preserve">
+    <value>There is nothing to save.</value>
+  </data>
+  <data name="ConfigPage_StatusFixValidationErrorsTitle" xml:space="preserve">
+    <value>Fix validation errors</value>
+  </data>
+  <data name="ConfigPage_StatusValidationErrorMessageFormat" xml:space="preserve">
+    <value>{0}: {1}</value>
+  </data>
+  <data name="ConfigPage_StatusNotConnectedTitle" xml:space="preserve">
+    <value>Not connected</value>
+  </data>
+  <data name="ConfigPage_StatusNotConnectedMessage" xml:space="preserve">
+    <value>Connect to a gateway before saving config.</value>
+  </data>
+  <data name="ConfigPage_StatusReadOnlyMessage" xml:space="preserve">
+    <value>This operator token does not have operator.write permission, so config changes cannot be saved.</value>
+  </data>
+  <data name="ConfigPage_StatusConfigNotLoadedTitle" xml:space="preserve">
+    <value>Config not loaded</value>
+  </data>
+  <data name="ConfigPage_StatusConfigNotLoadedMessage" xml:space="preserve">
+    <value>Refresh the gateway config before saving.</value>
+  </data>
+  <data name="ConfigPage_StatusSavingConfigTitle" xml:space="preserve">
+    <value>Saving config…</value>
+  </data>
+  <data name="ConfigPage_StatusSavingConfigMessageFormat" xml:space="preserve">
+    <value>Writing {0} change(s) to the gateway.</value>
+  </data>
+  <data name="ConfigPage_StatusStaleConfigTitle" xml:space="preserve">
+    <value>Gateway config changed elsewhere</value>
+  </data>
+  <data name="ConfigPage_StatusStaleConfigMessageFormat" xml:space="preserve">
+    <value>Your edits are preserved. The latest config is being refreshed; review the form and try Save again. Details: {0}</value>
+  </data>
+  <data name="ConfigPage_StatusStaleConfigDefaultDetail" xml:space="preserve">
+    <value>stale config hash</value>
+  </data>
+  <data name="ConfigPage_StatusSaveFailedTitle" xml:space="preserve">
+    <value>Save failed</value>
+  </data>
+  <data name="ConfigPage_StatusSaveRejectedMessage" xml:space="preserve">
+    <value>The gateway rejected the config update. Your changes are preserved.</value>
+  </data>
+  <data name="ConfigPage_StatusSaveExceptionMessageFormat" xml:space="preserve">
+    <value>{0} Your changes are preserved.</value>
+  </data>
+  <data name="ConfigPage_SaveStatusCheckingConfigPermissions" xml:space="preserve">
+    <value>Checking config permissions…</value>
+  </data>
+  <data name="ConfigPage_SaveStatusRefreshing" xml:space="preserve">
+    <value>Refreshing…</value>
+  </data>
+  <data name="ConfigPage_StatusChangesDiscardedTitle" xml:space="preserve">
+    <value>Changes discarded</value>
+  </data>
+  <data name="ConfigPage_StatusChangesDiscardedMessage" xml:space="preserve">
+    <value>The form is back to the last config loaded from the gateway.</value>
+  </data>
+  <data name="ConfigPage_FullConfig" xml:space="preserve">
+    <value>Full config</value>
+  </data>
+  <data name="ConfigPage_StatusSectionResetTitle" xml:space="preserve">
+    <value>Section reset</value>
+  </data>
+  <data name="ConfigPage_StatusSectionResetMessageFormat" xml:space="preserve">
+    <value>{0} is back to the last loaded gateway value.</value>
+  </data>
+  <data name="ConfigPage_StatusCopiedJsonDiffTitle" xml:space="preserve">
+    <value>Copied JSON diff</value>
+  </data>
+  <data name="ConfigPage_StatusCopiedJsonDiffMessage" xml:space="preserve">
+    <value>The selected section diff was copied to the clipboard.</value>
+  </data>
+  <data name="ConfigPage_StatusGatewayReconnectedTitle" xml:space="preserve">
+    <value>Gateway reconnected</value>
+  </data>
+  <data name="ConfigPage_StatusGatewayReconnectedRefreshingMessage" xml:space="preserve">
+    <value>Configuration saved and the gateway connection is back. Refreshing the latest config.</value>
+  </data>
+  <data name="ConfigPage_StatusGatewayReconnectedLoadedMessage" xml:space="preserve">
+    <value>Configuration saved and the latest gateway config is loaded.</value>
+  </data>
+  <data name="ConfigPage_StatusGatewayStillReconnectingTitle" xml:space="preserve">
+    <value>Gateway still reconnecting</value>
+  </data>
+  <data name="ConfigPage_StatusGatewayStillReconnectingMessage" xml:space="preserve">
+    <value>The config save was accepted, but the gateway has not reconnected yet. You can keep this page open or use Connection to check status.</value>
+  </data>
+  <data name="ConfigPage_CheckingConfigPermissionsMessage" xml:space="preserve">
+    <value>Waiting for the gateway to report this operator's permissions.</value>
+  </data>
+  <data name="ConfigPage_ConfigUnavailableMessage" xml:space="preserve">
+    <value>This operator token lacks operator.read permission, so the gateway config cannot be loaded here.</value>
+  </data>
+  <data name="ConfigPage_ConfigIsReadOnlyMessage" xml:space="preserve">
+    <value>This operator token can read config but lacks operator.write permission. You can inspect and validate drafts, but Save is disabled.</value>
+  </data>
+  <data name="ConfigPage_MetaNoUnsavedChanges" xml:space="preserve">
+    <value>No unsaved changes.</value>
+  </data>
+  <data name="ConfigPage_MetaUnsavedChangesFormat" xml:space="preserve">
+    <value>{0} unsaved change(s)</value>
+  </data>
+  <data name="ConfigPage_MetaUnsavedChangesWithValidationFormat" xml:space="preserve">
+    <value>{0} unsaved change(s) · {1} validation issue(s)</value>
+  </data>
+  <data name="ConfigPage_SaveStatusSaving" xml:space="preserve">
+    <value>Saving…</value>
+  </data>
+  <data name="ConfigPage_SaveStatusGatewayRestarting" xml:space="preserve">
+    <value>Gateway restarting…</value>
+  </data>
+  <data name="ConfigPage_SaveStatusConnectToGateway" xml:space="preserve">
+    <value>Connect to a gateway to edit</value>
+  </data>
+  <data name="ConfigPage_SaveStatusCheckingPermissions" xml:space="preserve">
+    <value>Checking permissions…</value>
+  </data>
+  <data name="ConfigPage_SaveStatusMissingRead" xml:space="preserve">
+    <value>Config unavailable: missing operator.read</value>
+  </data>
+  <data name="ConfigPage_SaveStatusReadOnlyMissingWrite" xml:space="preserve">
+    <value>Read-only: missing operator.write</value>
+  </data>
+  <data name="ConfigPage_SaveStatusFixValidationBeforeSaving" xml:space="preserve">
+    <value>Fix validation errors before saving</value>
+  </data>
+  <data name="ConfigPage_SaveStatusUnsavedChanges" xml:space="preserve">
+    <value>Unsaved changes</value>
+  </data>
+  <data name="ConfigPage_SaveStatusNoUnsavedChanges" xml:space="preserve">
+    <value>No unsaved changes</value>
+  </data>
+  <data name="ConfigPage_AccessDisconnected" xml:space="preserve">
+    <value>Disconnected</value>
+  </data>
+  <data name="ConfigPage_AccessChecking" xml:space="preserve">
+    <value>Checking access</value>
+  </data>
+  <data name="ConfigPage_AccessNoRead" xml:space="preserve">
+    <value>No config read access</value>
+  </data>
+  <data name="ConfigPage_AccessReadOnly" xml:space="preserve">
+    <value>Read-only access</value>
+  </data>
+  <data name="ConfigPage_AccessReadWrite" xml:space="preserve">
+    <value>Read/write access</value>
+  </data>
+  <data name="ConfigPage_AccessUnknown" xml:space="preserve">
+    <value>Unknown access</value>
+  </data>
+  <data name="ConfigPage_AccessChangesFormat" xml:space="preserve">
+    <value>{0} change(s)</value>
+  </data>
+  <data name="ConfigPage_AccessValidationClean" xml:space="preserve">
+    <value>Local validation clean</value>
+  </data>
+  <data name="ConfigPage_AccessValidationIssuesFormat" xml:space="preserve">
+    <value>{0} validation issue(s)</value>
+  </data>
+  <data name="ConfigPage_AccessSummaryFormat" xml:space="preserve">
+    <value>{0} · {1} · {2}</value>
+  </data>
+  <data name="DebugPage_NoGatewayConfigured" xml:space="preserve">
+    <value>no gateway configured</value>
+  </data>
+  <data name="DebugPage_StatusConnectedFormat" xml:space="preserve">
+    <value>OpenClaw is connected to {0}.</value>
+  </data>
+  <data name="DebugPage_StatusConnectingFormat" xml:space="preserve">
+    <value>Connecting to {0}…</value>
+  </data>
+  <data name="DebugPage_StatusDisconnectedFormat" xml:space="preserve">
+    <value>Not connected. Gateway: {0}.</value>
+  </data>
+  <data name="DebugPage_StatusErrorFormat" xml:space="preserve">
+    <value>Last gateway: {0}. See the event timeline.</value>
+  </data>
+  <data name="DebugPage_StatusGatewayFormat" xml:space="preserve">
+    <value>Gateway: {0}.</value>
+  </data>
+  <data name="DebugPage_RecentLogTitle" xml:space="preserve">
+    <value>Recent log</value>
+  </data>
+  <data name="DebugPage_RecentLogCaptionFormat" xml:space="preserve">
+    <value>Last 200 lines of {0}. Severity is parsed from [info]/[warn]/[error] tags.</value>
+  </data>
+  <data name="DebugPage_CopyFeedbackFormat" xml:space="preserve">
+    <value>{0} copied to clipboard.</value>
+  </data>
+  <data name="SandboxPage_StatusUnavailableTitle" xml:space="preserve">
+    <value>Node Sandbox unavailable — host fallback</value>
+  </data>
+  <data name="SandboxPage_StatusUnavailableSubtext" xml:space="preserve">
+    <value>Containment isn't available on this PC, so agent-started commands run on the host without sandbox protection.</value>
+  </data>
+  <data name="SandboxPage_StatusUnavailableBlockedTitle" xml:space="preserve">
+    <value>Node Sandbox unavailable — commands blocked</value>
+  </data>
+  <data name="SandboxPage_StatusUnavailableBlockedSubtext" xml:space="preserve">
+    <value>Containment isn't available on this PC, and strict fallback blocking is on, so agent-started commands are blocked.</value>
+  </data>
+  <data name="SandboxPage_StatusUnavailableOffTitle" xml:space="preserve">
+    <value>Node Sandbox is off — host execution</value>
+  </data>
+  <data name="SandboxPage_StatusUnavailableOffSubtext" xml:space="preserve">
+    <value>Containment isn't available and Node Sandbox is off, so agent-started commands run on the host without sandbox protection.</value>
+  </data>
+  <data name="SandboxPage_StatusOnTitle" xml:space="preserve">
+    <value>Node Sandbox is on</value>
+  </data>
+  <data name="SandboxPage_StatusOnSubtext" xml:space="preserve">
+    <value>Programs the agent runs on this PC are contained.</value>
+  </data>
+  <data name="SandboxPage_StatusOffTitle" xml:space="preserve">
+    <value>Node Sandbox is off — high risk</value>
+  </data>
+  <data name="SandboxPage_StatusOffSubtext" xml:space="preserve">
+    <value>Programs the agent runs on this PC are not contained.</value>
+  </data>
+  <data name="SandboxPage_UnavailableDefaultReason" xml:space="preserve">
+    <value>MXC sandboxing primitives are not available on this machine.</value>
+  </data>
+  <data name="SandboxPage_ProbeErrorReason" xml:space="preserve">
+    <value>Couldn't check sandbox availability.</value>
+  </data>
+  <data name="SandboxPage_UnavailableBehaviorHostFallback" xml:space="preserve">
+    <value>Commands will run on the host without sandbox protection while sandboxing is unavailable.</value>
+  </data>
+  <data name="SandboxPage_UnavailableBehaviorBlocked" xml:space="preserve">
+    <value>Commands are blocked while sandboxing is unavailable because strict fallback blocking is enabled.</value>
+  </data>
+  <data name="SandboxPage_ProbeErrorTitle" xml:space="preserve">
+    <value>Couldn't verify sandbox availability</value>
+  </data>
+  <data name="SandboxPage_ProbeErrorMessageFormat" xml:space="preserve">
+    <value>{0}&#x0A;&#x0A;{1} The sandbox capability check didn't complete. This is usually transient (a slow or blocked check) — retry, and if it persists check whether security software is blocking wxc-exec.</value>
+  </data>
+  <data name="SandboxPage_Retry" xml:space="preserve">
+    <value>Retry</value>
+  </data>
+  <data name="SandboxPage_WindowsUnsupportedTitle" xml:space="preserve">
+    <value>Your Windows version doesn't support sandboxing yet</value>
+  </data>
+  <data name="SandboxPage_WindowsUnsupportedMessageFormat" xml:space="preserve">
+    <value>{0}&#x0A;&#x0A;{1} Sandboxing requires a recent Windows build with the AppContainer primitives shipped. Install the latest Windows updates (or join the Windows Insider Program for the newest builds) to enable containment.</value>
+  </data>
+  <data name="SandboxPage_OpenWindowsUpdate" xml:space="preserve">
+    <value>Open Windows Update</value>
+  </data>
+  <data name="SandboxPage_ComponentsMissingTitle" xml:space="preserve">
+    <value>Sandboxing components are missing</value>
+  </data>
+  <data name="SandboxPage_ComponentsMissingMessageFormat" xml:space="preserve">
+    <value>{0}&#x0A;&#x0A;The wxc-exec binary couldn't be located. {1} If this is a developer build, build the tray app so wxc-exec.exe is copied into the output folder. Otherwise reinstall the companion app to restore sandboxing.</value>
+  </data>
+  <data name="SandboxPage_ShowInstallInstructions" xml:space="preserve">
+    <value>Show install instructions</value>
+  </data>
+  <data name="SandboxPage_UnavailableTitle" xml:space="preserve">
+    <value>Sandbox unavailable — host fallback</value>
+  </data>
+  <data name="SandboxPage_UnavailableBlockedTitle" xml:space="preserve">
+    <value>Sandbox unavailable — commands blocked</value>
+  </data>
+  <data name="SettingsPage_LocalGatewayRemovedTitle" xml:space="preserve">
+    <value>Local gateway removed</value>
+  </data>
+  <data name="SettingsPage_LocalGatewayRemovedMessage" xml:space="preserve">
+    <value>Setup is reset; you can re-run setup from the tray menu.</value>
+  </data>
+  <data name="SettingsPage_LocalGatewayRemovalErrorsMessage" xml:space="preserve">
+    <value>Removal completed with errors. Check logs for details.</value>
+  </data>
+  <data name="SettingsPage_LocalGatewayRemovalCancelledTitle" xml:space="preserve">
+    <value>Removal cancelled</value>
+  </data>
+  <data name="SettingsPage_LocalGatewayRemovalCancelledMessage" xml:space="preserve">
+    <value>Gateway may be in a partially-removed state. Review logs or retry.</value>
+  </data>
+  <data name="SettingsPage_ViewLogs" xml:space="preserve">
+    <value>View Logs</value>
+  </data>
+  <data name="SettingsPage_LocalGatewayRemovalFailedTitle" xml:space="preserve">
+    <value>Removal failed</value>
+  </data>
+  <data name="SettingsPage_RemoveLocalGatewayButton" xml:space="preserve">
+    <value>Remove Local Gateway</value>
+  </data>
+  <data name="SettingsPage_RemovingDistro" xml:space="preserve">
+    <value>Removing distro…</value>
+  </data>
+  <data name="SettingsPage_RemovingLocalGatewayMessage" xml:space="preserve">
+    <value>Removing the local gateway. This may take 10–30 seconds…</value>
+  </data>
+  <data name="CronPage_NextWakeFormat" xml:space="preserve">
+    <value>· Next wake: {0}</value>
+  </data>
+  <data name="ChatWindow_UnableToLoadChatCredentials" xml:space="preserve">
+    <value>Unable to load chat. The gateway URL or token is not available.</value>
+  </data>
+  <data name="ChatWindow_UnableToLoadChatRetryFormat" xml:space="preserve">
+    <value>Unable to load chat. Please try again. ({0})</value>
+  </data>
+  <data name="ChatWindow_WebViewFailedFormat" xml:space="preserve">
+    <value>WebView2 failed: {0}</value>
+  </data>
+  <data name="CanvasWindow_WebViewInitFailedFormat" xml:space="preserve">
+    <value>Failed to initialize WebView2: {0}</value>
+  </data>
+  <data name="CanvasWindow_NavigationFailedFormat" xml:space="preserve">
+    <value>Navigation failed: {0}</value>
+  </data>
   <data name="ConnectionPage_GatewayHostControlsDescription_Format" xml:space="preserve">
     <value>Open a shell or manage the local gateway service in {0}.</value>
   </data>
@@ -5800,6 +6483,15 @@ Check your connection settings and try again.</value>
   <data name="CronPage_JobCompletedRanSuccessfully" xml:space="preserve">
     <value>&quot;{0}&quot; ran successfully and was removed.</value>
   </data>
+  <data name="CronPage_RunNotStarted" xml:space="preserve">
+    <value>Run not started</value>
+  </data>
+  <data name="CronPage_RunNotStartedGeneric" xml:space="preserve">
+    <value>{0} was not started.</value>
+  </data>
+  <data name="CronPage_RunNotStartedWithReason" xml:space="preserve">
+    <value>{0} was not started: {1}</value>
+  </data>
   <data name="GatewayHostAccess_NoTerminalAccess" xml:space="preserve">
     <value>This gateway does not have WSL or SSH terminal access.</value>
   </data>
@@ -5866,6 +6558,24 @@ Check your connection settings and try again.</value>
   <data name="ConnectionPage_NodeSurfaceNone" xml:space="preserve">
     <value>none</value>
   </data>
+  <data name="ConnectionPage_NodeTechnicalDetails.Text" xml:space="preserve">
+    <value>Show technical details</value>
+  </data>
+  <data name="ConnectionPage_NodePillState_Active" xml:space="preserve">
+    <value>Sharing now</value>
+  </data>
+  <data name="ConnectionPage_NodePillState_Pending" xml:space="preserve">
+    <value>Enabled, not active yet</value>
+  </data>
+  <data name="ConnectionPage_NodePillState_Off" xml:space="preserve">
+    <value>Off</value>
+  </data>
+  <data name="ConnectionPage_NodeCap_Device" xml:space="preserve">
+    <value>Device info</value>
+  </data>
+  <data name="ConnectionPage_NodeCap_System" xml:space="preserve">
+    <value>System access</value>
+  </data>
   <data name="ConnectionPage_NodeEffectiveCapabilities" xml:space="preserve">
     <value>Approved/effective capabilities: {0}</value>
   </data>
@@ -5884,4 +6594,265 @@ Check your connection settings and try again.</value>
   <data name="ConnectionPage_NodePendingDeclaredPermissions" xml:space="preserve">
     <value>Pending declared permissions: {0}</value>
   </data>
+  <data name="ConnectionPage_AdviceCleartextTitle" xml:space="preserve">
+    <value>Unencrypted connection</value>
+  </data>
+  <data name="ConnectionPage_AdviceCleartextMessage" xml:space="preserve">
+    <value>This remote gateway uses ws:// — your token would be sent in cleartext. Use wss:// (TLS), an SSH tunnel, or a trusted proxy / Tailscale.</value>
+  </data>
+  <data name="ConnectionPage_AdviceSecureTitle" xml:space="preserve">
+    <value>Encrypted (TLS)</value>
+  </data>
+  <data name="ConnectionPage_AdviceSecureMessage" xml:space="preserve">
+    <value>This gateway uses TLS. Your token is protected in transit when the certificate validates.</value>
+  </data>
+  <data name="ConnectionPage_AdviceTunnelTitle" xml:space="preserve">
+    <value>SSH tunnel</value>
+  </data>
+  <data name="ConnectionPage_AdviceTunnelMessage" xml:space="preserve">
+    <value>Traffic to this gateway is encrypted through the SSH tunnel.</value>
+  </data>
+  <data name="ConnectionPage_RecoveryHeaderTokenDrift" xml:space="preserve">
+    <value>Re-pair this device:</value>
+  </data>
+  <data name="ConnectionPage_RecoveryHeaderScope" xml:space="preserve">
+    <value>Upgrade this device's access:</value>
+  </data>
+  <data name="ConnectionPage_RecoveryHeaderTls" xml:space="preserve">
+    <value>Fix the secure connection:</value>
+  </data>
+  <data name="ConnectionPage_RecoveryTokenDriftBullet1" xml:space="preserve">
+    <value>The gateway no longer trusts this device's saved token (it was rotated or revoked).</value>
+  </data>
+  <data name="ConnectionPage_RecoveryTokenDriftBullet2" xml:space="preserve">
+    <value>Get a fresh setup code from the gateway host and paste it below to re-pair.</value>
+  </data>
+  <data name="ConnectionPage_RecoveryScopeBullet1" xml:space="preserve">
+    <value>This device is authenticated but is missing the scopes it needs (for example operator.admin or operator.pairing).</value>
+  </data>
+  <data name="ConnectionPage_RecoveryScopeBullet2" xml:space="preserve">
+    <value>Re-pair with a fresh setup code to request the required scopes, or approve the higher scopes on the gateway host.</value>
+  </data>
+  <data name="ConnectionPage_RecoveryTlsBullet1" xml:space="preserve">
+    <value>The gateway's TLS/secure transport could not be established.</value>
+  </data>
+  <data name="ConnectionPage_RecoveryTlsBullet2" xml:space="preserve">
+    <value>Verify the certificate on the gateway host, or connect over wss:// or an SSH tunnel.</value>
+  </data>
+  <data name="ConnectionPage_TokenOrPasswordHint.Text" xml:space="preserve">
+    <value>Paste a shared gateway token, or leave it blank to pair with a setup code.</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpDirect.Text" xml:space="preserve">
+    <value>Connect to wss:// or https:// when the gateway has a trusted certificate. Your token is encrypted in transit after certificate validation.</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpTunnel.Text" xml:space="preserve">
+    <value>When the gateway only listens on localhost, expand "Use SSH tunnel" below. The tray forwards a local port over SSH so traffic stays encrypted.</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpProxy.Text" xml:space="preserve">
+    <value>If a Tailscale or reverse proxy already encrypts the path, a plain ws:// URL over that private network is fine.</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpAuth.Text" xml:space="preserve">
+    <value>Paste a shared token, or leave it blank and pair with a setup code. Re-pairing also upgrades this device's scopes.</value>
+  </data>
+  <data name="ConnectionPage_RecoveryHeaderRateLimited" xml:space="preserve">
+    <value>Wait before reconnecting:</value>
+  </data>
+  <data name="ConnectionPage_RecoveryRateLimitedBullet1" xml:space="preserve">
+    <value>The gateway is rate-limiting this client after repeated failed attempts.</value>
+  </data>
+  <data name="ConnectionPage_RecoveryRateLimitedBullet2" xml:space="preserve">
+    <value>Stop retrying for a moment, then reconnect after correcting the token, password, or pairing state.</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpLink.Text" xml:space="preserve">
+    <value>How do I connect to a remote gateway?</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpTip.Title" xml:space="preserve">
+    <value>Connecting to a remote gateway</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpDirectTitle.Text" xml:space="preserve">
+    <value>Direct (TLS)</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpTunnelTitle.Text" xml:space="preserve">
+    <value>SSH tunnel</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpProxyTitle.Text" xml:space="preserve">
+    <value>Trusted proxy / Tailscale</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpAuthTitle.Text" xml:space="preserve">
+    <value>Auth</value>
+  </data>
+  <data name="HubWindow_StatusFlyout_Title.Text" xml:space="preserve">
+    <value>Connection</value>
+  </data>
+  <data name="HubWindow_StatusFlyout_OpenConnection.Content" xml:space="preserve">
+    <value>Open Connection</value>
+  </data>
+  <data name="HubWindow_StatusFlyout_GatewayLabel.Text" xml:space="preserve">
+    <value>Gateway</value>
+  </data>
+  <data name="HubWindow_StatusFlyout_Reconnect.Content" xml:space="preserve">
+    <value>Reconnect</value>
+  </data>
+  <data name="HubWindow_StatusFlyout_OperatorLabel.Text" xml:space="preserve">
+    <value>Operator</value>
+  </data>
+  <data name="HubWindow_StatusFlyout_NodeLabel.Text" xml:space="preserve">
+    <value>Node</value>
+  </data>
+  <data name="HubWindow_StatusFlyout_Approve.Content" xml:space="preserve">
+    <value>Approve…</value>
+  </data>
+  <data name="HubWindow_StatusPill_Tooltip" xml:space="preserve">
+    <value>Connection status</value>
+  </data>
+  <data name="HubWindow_Bell_Tooltip" xml:space="preserve">
+    <value>Notifications</value>
+  </data>
+  <data name="HubWindow_Pill_Ready" xml:space="preserve">
+    <value>Ready</value>
+  </data>
+  <data name="HubWindow_Pill_PairingRequired" xml:space="preserve">
+    <value>Pairing required</value>
+  </data>
+  <data name="HubWindow_Pill_Degraded" xml:space="preserve">
+    <value>Degraded</value>
+  </data>
+  <data name="HubWindow_Role_Off" xml:space="preserve">
+    <value>Off</value>
+  </data>
+  <data name="HubWindow_Role_PairingRequired" xml:space="preserve">
+    <value>Pairing required</value>
+  </data>
+  <data name="HubWindow_Role_PairingRejected" xml:space="preserve">
+    <value>Pairing rejected</value>
+  </data>
+  <data name="HubWindow_Role_RateLimited" xml:space="preserve">
+    <value>Rate limited</value>
+  </data>
+  <data name="HubWindow_Role_Disabled" xml:space="preserve">
+    <value>Disabled</value>
+  </data>
+  <data name="NotificationsFlyout_ClearAll.Content" xml:space="preserve">
+    <value>Clear all</value>
+  </data>
+  <data name="NotificationsFlyout_EmptyTitle.Text" xml:space="preserve">
+    <value>No notifications</value>
+  </data>
+  <data name="NotificationsFlyout_OpenPage.Content" xml:space="preserve">
+    <value>Open notifications</value>
+  </data>
+  <data name="NotificationsFlyout_ActiveCountFormat" xml:space="preserve">
+    <value>{0} active</value>
+  </data>
+  <data name="HubWindow_Role_PermissionsIncomplete" xml:space="preserve">
+    <value>Permissions incomplete</value>
+  </data>
+  <data name="SettingsPage_About.Text" xml:space="preserve">
+    <value>About</value>
+  </data>
+  <data name="SettingsPage_AppInfoExpander.Header" xml:space="preserve">
+    <value>App info</value>
+  </data>
+  <data name="SettingsPage_AppInfoCheckUpdates.Content" xml:space="preserve">
+    <value>Check for updates</value>
+  </data>
+  <data name="SettingsPage_AppInfoLabel_AppName.Text" xml:space="preserve">
+    <value>App name</value>
+  </data>
+  <data name="SettingsPage_AppInfoLabel_Version.Text" xml:space="preserve">
+    <value>Version</value>
+  </data>
+  <data name="SettingsPage_AppInfoLabel_BuildDate.Text" xml:space="preserve">
+    <value>Build date</value>
+  </data>
+  <data name="SettingsPage_AppInfoLabel_Runtime.Text" xml:space="preserve">
+    <value>Runtime</value>
+  </data>
+  <data name="SettingsPage_AppInfoLabel_Architecture.Text" xml:space="preserve">
+    <value>Architecture</value>
+  </data>
+  <data name="SettingsPage_AppInfoLabel_Windows.Text" xml:space="preserve">
+    <value>Windows</value>
+  </data>
+  <data name="SettingsPage_AppInfoLabel_UpdateChannel.Text" xml:space="preserve">
+    <value>Update channel</value>
+  </data>
+  <data name="SettingsPage_AppInfoLabel_InstallType.Text" xml:space="preserve">
+    <value>Install type</value>
+  </data>
+  <data name="SettingsPage_AppInfoRelatedLinks.Text" xml:space="preserve">
+    <value>Related links</value>
+  </data>
+  <data name="SettingsPage_AppInfoDocumentation.Content" xml:space="preserve">
+    <value>Documentation</value>
+  </data>
+  <data name="SettingsPage_AppInfoGitHub.Content" xml:space="preserve">
+    <value>GitHub</value>
+  </data>
+  <data name="SettingsPage_AppInfoDashboard.Content" xml:space="preserve">
+    <value>Dashboard</value>
+  </data>
+  <data name="SettingsPage_GatewayInfoExpander.Header" xml:space="preserve">
+    <value>Gateway info</value>
+  </data>
+  <data name="SettingsPage_GatewayInfoLabel_Version.Text" xml:space="preserve">
+    <value>Version</value>
+  </data>
+  <data name="SettingsPage_GatewayInfoLabel_Protocol.Text" xml:space="preserve">
+    <value>Protocol</value>
+  </data>
+  <data name="SettingsPage_GatewayInfoLabel_AuthMode.Text" xml:space="preserve">
+    <value>Auth mode</value>
+  </data>
+  <data name="SettingsPage_GatewayInfoLabel_Uptime.Text" xml:space="preserve">
+    <value>Uptime</value>
+  </data>
+  <data name="PermissionsPage_NewRuleAction.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Rule action</value>
+  </data>
+  <data name="SandboxPage_UnavailablePrimaryButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Sandbox action</value>
+  </data>
+  <data name="SandboxPage_PresetLockedButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Locked Down preset: No internet, no clipboard, no standard user folders</value>
+  </data>
+  <data name="SandboxPage_PresetBalancedButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Recommended preset: Internet on, read-only on Documents, Downloads, Desktop</value>
+  </data>
+  <data name="SandboxPage_PresetPermissiveButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Unprotected preset: Internet on, read and write on Documents, Downloads, Desktop</value>
+  </data>
+  <data name="SandboxPage_DocsAccessCombo.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Documents access level</value>
+  </data>
+  <data name="SandboxPage_DownloadsAccessCombo.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Downloads access level</value>
+  </data>
+  <data name="SandboxPage_DesktopAccessCombo.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Desktop access level</value>
+  </data>
+  <data name="SettingsPage_NotificationSoundComboBox.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Notification sound</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantRefreshButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Refresh voice assistant status</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStartButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Start voice assistant</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStopButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Stop voice assistant</value>
+  </data>
+  <data name="VoiceSettingsPage_LanguageCombo.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Voice language</value>
+  </data>
+  <data name="HubWindow_MainNavigation.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Main navigation</value>
+  </data>
+  <data name="JsonPreviewSplitter.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Resize JSON preview</value>
+  </data>
+  <data name="JsonPreviewSplitter.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.LocalizedControlType" xml:space="preserve">
+    <value>splitter</value>
+  </data>
 </root>
diff --git a/src/OpenClaw.Tray.WinUI/Strings/fr-fr/Resources.resw b/src/OpenClaw.Tray.WinUI/Strings/fr-fr/Resources.resw
index 71ed3930d..621d644b4 100644
--- a/src/OpenClaw.Tray.WinUI/Strings/fr-fr/Resources.resw
+++ b/src/OpenClaw.Tray.WinUI/Strings/fr-fr/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root xmlns:ns1="urn:schemas-microsoft-com:xml-msdata" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:schema id="root">
     <xs:element name="root" ns1:IsDataSet="true">
@@ -367,6 +367,9 @@
   <data name="Update_Message_Skipped_Debug" xml:space="preserve">
     <value>La vérification des mises à jour est désactivée dans les builds de débogage.</value>
   </data>
+  <data name="Update_Message_Skipped_Dev" xml:space="preserve">
+    <value>La vérification des mises à jour est désactivée dans les versions de développement.</value>
+  </data>
   <data name="Update_OK" xml:space="preserve">
     <value>OK</value>
   </data>
@@ -648,6 +651,75 @@ Utilisez l'une de ces options :
   <data name="Toast_PairingCommandCopied" xml:space="preserve">
     <value>Commande de jumelage copiée</value>
   </data>
+  <data name="Toast_PairingRequestTitle" xml:space="preserve">
+    <value>Demande de jumelage</value>
+  </data>
+  <data name="Toast_PairingRequestBody" xml:space="preserve">
+    <value>{0} souhaite se connecter</value>
+  </data>
+  <data name="Toast_PairingRequestBodyNode" xml:space="preserve">
+    <value>{0} souhaite se connecter en tant que nœud</value>
+  </data>
+  <data name="Toast_PairingReview" xml:space="preserve">
+    <value>Examiner</value>
+  </data>
+  <data name="Toast_PairingApprovedTitle" xml:space="preserve">
+    <value>Jumelage approuvé</value>
+  </data>
+  <data name="Toast_PairingApprovedBody" xml:space="preserve">
+    <value>{0} peut désormais se connecter</value>
+  </data>
+  <data name="Toast_PairingRejectedTitle" xml:space="preserve">
+    <value>Jumelage refusé</value>
+  </data>
+  <data name="Toast_PairingRejectedBody" xml:space="preserve">
+    <value>{0} n'a pas été autorisé à se connecter</value>
+  </data>
+  <data name="PairingApproval_WindowTitle" xml:space="preserve">
+    <value>Demande de jumelage</value>
+  </data>
+  <data name="PairingApproval_DeviceHeading" xml:space="preserve">
+    <value>Un appareil souhaite se connecter</value>
+  </data>
+  <data name="PairingApproval_NodeHeading" xml:space="preserve">
+    <value>Un nœud souhaite se connecter</value>
+  </data>
+  <data name="PairingApproval_Subtitle" xml:space="preserve">
+    <value>N'approuvez que si vous reconnaissez cette demande. Vous pourrez la supprimer plus tard dans les paramètres de connexion.</value>
+  </data>
+  <data name="PairingApproval_AccessRequested" xml:space="preserve">
+    <value>Accès demandé</value>
+  </data>
+  <data name="PairingApproval_RepairBadge" xml:space="preserve">
+    <value>Demande de réappairage — le jeton de l'appareil sera renouvelé.</value>
+  </data>
+  <data name="PairingApproval_Approve" xml:space="preserve">
+    <value>Approuver</value>
+  </data>
+  <data name="PairingApproval_ApproveDevice" xml:space="preserve">
+    <value>Approuver l'appareil</value>
+  </data>
+  <data name="PairingApproval_ApproveNode" xml:space="preserve">
+    <value>Approuver le nœud</value>
+  </data>
+  <data name="PairingApproval_Reject" xml:space="preserve">
+    <value>Refuser</value>
+  </data>
+  <data name="PairingApproval_Later" xml:space="preserve">
+    <value>Décider plus tard</value>
+  </data>
+  <data name="PairingApproval_MoreWaiting" xml:space="preserve">
+    <value>{0} en attente</value>
+  </data>
+  <data name="PairingApproval_ApproveHint" xml:space="preserve">
+    <value>L'approbation sera disponible dans un instant</value>
+  </data>
+  <data name="PairingApproval_UnknownDevice" xml:space="preserve">
+    <value>Appareil inconnu</value>
+  </data>
+  <data name="PairingApproval_UnknownPlatform" xml:space="preserve">
+    <value>Plateforme inconnue</value>
+  </data>
   <data name="Toast_NodePaired" xml:space="preserve">
     <value>✅ Noeud appairé!</value>
   </data>
@@ -775,156 +847,6 @@ Utilisez l'une de ces options :
   <data name="Toast_ActivityStreamTipButton" xml:space="preserve">
     <value>Créer un nouveau flux d'activités</value>
   </data>
-  <data name="Setup_Title" xml:space="preserve">
-    <value>Configuration d'OpenClaw</value>
-  </data>
-  <data name="Setup_StepConnect" xml:space="preserve">
-    <value>Étape 1 sur 3 — Connexion</value>
-  </data>
-  <data name="Setup_ConnectTitle" xml:space="preserve">
-    <value>Connectez-vous à votre passerelle</value>
-  </data>
-  <data name="Setup_ConnectDescription" xml:space="preserve">
-    <value>Sur votre hôte passerelle (Mac/Linux), exécutez cette commande pour obtenir un code de configuration :</value>
-  </data>
-  <data name="Setup_SetupCodeHeader" xml:space="preserve">
-    <value>Code de configuration</value>
-  </data>
-  <data name="Setup_SetupCodePlaceholder" xml:space="preserve">
-    <value>Collez le code de configuration depuis le tableau de bord de votre passerelle</value>
-  </data>
-  <data name="Setup_PasteSetupButton" xml:space="preserve">
-    <value>Coller le code / QR</value>
-  </data>
-  <data name="Setup_ImportQrButton" xml:space="preserve">
-    <value>Importer une image QR...</value>
-  </data>
-  <data name="Setup_QrDecoded" xml:space="preserve">
-    <value>✅ Image QR décodée — cliquez sur Tester la connexion</value>
-  </data>
-  <data name="Setup_QrDecodeFailed" xml:space="preserve">
-    <value>❌ Aucun code QR de configuration valide trouvé dans cette image.</value>
-  </data>
-  <data name="Setup_ClipboardUnsupported" xml:space="preserve">
-    <value>❌ Le presse-papiers ne contient pas de code de configuration texte ni d'image QR.</value>
-  </data>
-  <data name="Setup_ManualEntryToggle" xml:space="preserve">
-    <value>Ou entrez l'URL et le jeton manuellement ▾</value>
-  </data>
-  <data name="Setup_ManualEntryToggleHide" xml:space="preserve">
-    <value>Masquer la saisie manuelle ▴</value>
-  </data>
-  <data name="Setup_GatewayUrlHeader" xml:space="preserve">
-    <value>URL de la passerelle</value>
-  </data>
-  <data name="Setup_GatewayUrlPlaceholder" xml:space="preserve">
-    <value>ws://192.168.1.x:18789</value>
-  </data>
-  <data name="Setup_GatewayUrlHint" xml:space="preserve">
-    <value>💡 Accepte ws://, wss://, http:// ou https://</value>
-  </data>
-  <data name="Setup_TokenHeader" xml:space="preserve">
-    <value>Jeton de la passerelle</value>
-  </data>
-  <data name="Setup_TokenPlaceholder" xml:space="preserve">
-    <value>Collez votre jeton ici</value>
-  </data>
-  <data name="Setup_TestButton" xml:space="preserve">
-    <value>Tester la connexion</value>
-  </data>
-  <data name="Setup_Testing" xml:space="preserve">
-    <value>⏳ Connexion à la passerelle...</value>
-  </data>
-  <data name="Setup_Connected" xml:space="preserve">
-    <value>✅ Connecté !</value>
-  </data>
-  <data name="Setup_PairingRequired" xml:space="preserve">
-    <value>✅ Passerelle atteinte ! L'appareil nécessite une approbation d'appariement.
-
-Sur votre hôte passerelle (Mac/Linux), exécutez :
-
-  openclaw devices approve {0}</value>
-  </data>
-  <data name="Setup_TokenMismatch" xml:space="preserve">
-    <value>❌ Le jeton ne correspond pas.
-
-💡 Vérifiez le jeton d'authentification de la passerelle :
-  cat ~/.openclaw/openclaw.json | grep token</value>
-  </data>
-  <data name="Setup_OriginNotAllowed" xml:space="preserve">
-    <value>❌ Origine non autorisée.
-
-💡 Ajoutez cette machine à gateway.controlUi.allowedOrigins.</value>
-  </data>
-  <data name="Setup_RateLimited" xml:space="preserve">
-    <value>❌ Trop de tentatives. Attendez une minute et réessayez.</value>
-  </data>
-  <data name="Setup_TimedOut" xml:space="preserve">
-    <value>❌ Délai expiré. Vérifiez l'URL et que la passerelle fonctionne.</value>
-  </data>
-  <data name="Setup_TokenRequired" xml:space="preserve">
-    <value>❌ Veuillez entrer un jeton</value>
-  </data>
-  <data name="Setup_TestFirst" xml:space="preserve">
-    <value>⚠️ Veuillez d'abord tester la connexion</value>
-  </data>
-  <data name="Setup_CodeDecoded" xml:space="preserve">
-    <value>✅ Code de configuration décodé — appuyez sur Tester la connexion</value>
-  </data>
-  <data name="Setup_NodeModeTitle" xml:space="preserve">
-    <value>Activer le mode nœud (optionnel)</value>
-  </data>
-  <data name="Setup_NodeModeDescription" xml:space="preserve">
-    <value>Le mode nœud permet à votre machine Windows d'exécuter des tâches pour OpenClaw — comme la capture d'écran, l'accès caméra et le dessin sur canevas.</value>
-  </data>
-  <data name="Setup_NodeModeSecurityTitle" xml:space="preserve">
-    <value>Activez le mode nœud uniquement pour les passerelles et agents de confiance</value>
-  </data>
-  <data name="Setup_NodeModeSecurityMessage" xml:space="preserve">
-    <value>Les agents approuvés peuvent exécuter des commandes locales et accéder aux surfaces activées comme l'écran, la caméra, la localisation, le navigateur et le canevas. Vous pouvez désactiver des groupes de capacités plus tard dans Paramètres.</value>
-  </data>
-  <data name="Setup_NodeModeToggle" xml:space="preserve">
-    <value>Activer le mode nœud</value>
-  </data>
-  <data name="Setup_DeviceIdLoading" xml:space="preserve">
-    <value>ID de l'appareil : chargement...</value>
-  </data>
-  <data name="Setup_DeviceIdFallback" xml:space="preserve">
-    <value>ID de l'appareil : (sera généré lors de la première connexion)</value>
-  </data>
-  <data name="Setup_CopyDeviceId" xml:space="preserve">
-    <value>📋 Copier l'ID de l'appareil</value>
-  </data>
-  <data name="Setup_DeviceIdCopied" xml:space="preserve">
-    <value>✅ Copié !</value>
-  </data>
-  <data name="Setup_ApproveInstructions" xml:space="preserve">
-    <value>Pour approuver ce nœud, exécutez sur votre hôte passerelle :</value>
-  </data>
-  <data name="Setup_ApproveHint" xml:space="preserve">
-    <value>💡 Vous pouvez terminer la configuration maintenant — l'appariement continuera en arrière-plan. Vous recevrez une notification une fois approuvé.</value>
-  </data>
-  <data name="Setup_DoneTitle" xml:space="preserve">
-    <value>🎉 Tout est prêt !</value>
-  </data>
-  <data name="Setup_DoneDescription" xml:space="preserve">
-    <value>OpenClaw Tray se connectera à votre passerelle et commencera la surveillance.</value>
-  </data>
-  <data name="Setup_BackButton" xml:space="preserve">
-    <value>Retour</value>
-  </data>
-  <data name="Setup_NextButton" xml:space="preserve">
-    <value>Suivant</value>
-  </data>
-  <data name="Setup_FinishButton" xml:space="preserve">
-    <value>Terminer</value>
-  </data>
-  <data name="Setup_StepNodeMode" xml:space="preserve">
-    <value>Étape 2 sur 3 — Mode nœud</value>
-  </data>
-  <data name="Setup_StepDone" xml:space="preserve">
-    <value>Étape 3 sur 3 — Terminé</value>
-  </data>
   <data name="SettingsDeveloperModeHeader.Text" xml:space="preserve">
     <value>MODE DÉVELOPPEUR</value>
   </data>
@@ -1446,57 +1368,6 @@ Sur votre hôte passerelle (Mac/Linux), exécutez :
   <data name="Onboarding_LocalSetup_Phase_MintToken" xml:space="preserve">
     <value>Génération du code de configuration</value>
   </data>
-  <data name="AboutPage_TextBlock_10.Text" xml:space="preserve">
-    <value>À propos</value>
-  </data>
-  <data name="AboutPage_TextBlock_19.Text" xml:space="preserve">
-    <value>OpenClaw Hub</value>
-  </data>
-  <data name="AboutPage_TextBlock_23.Text" xml:space="preserve">
-    <value>.NET / WinUI / Windows App SDK</value>
-  </data>
-  <data name="AboutPage_TextBlock_35.Text" xml:space="preserve">
-    <value>Infos passerelle</value>
-  </data>
-  <data name="AboutPage_TextBlock_48.Text" xml:space="preserve">
-    <value>Version :</value>
-  </data>
-  <data name="AboutPage_TextBlock_52.Text" xml:space="preserve">
-    <value>Protocole :</value>
-  </data>
-  <data name="AboutPage_TextBlock_56.Text" xml:space="preserve">
-    <value>Mode d’authentification :</value>
-  </data>
-  <data name="AboutPage_TextBlock_60.Text" xml:space="preserve">
-    <value>Temps de fonctionnement :</value>
-  </data>
-  <data name="AboutPage_TextBlock_72.Text" xml:space="preserve">
-    <value>Débogage</value>
-  </data>
-  <data name="OpenLogButton.Content" xml:space="preserve">
-    <value>Ouvrir le fichier journal</value>
-  </data>
-  <data name="OpenConfigButton.Content" xml:space="preserve">
-    <value>Ouvrir le dossier de configuration</value>
-  </data>
-  <data name="CopySupportButton.Content" xml:space="preserve">
-    <value>Copier le contexte de support</value>
-  </data>
-  <data name="CheckUpdatesButton.Content" xml:space="preserve">
-    <value>Rechercher des mises à jour</value>
-  </data>
-  <data name="AboutPage_TextBlock_91.Text" xml:space="preserve">
-    <value>Liens</value>
-  </data>
-  <data name="AboutPage_HyperlinkButton_92.Content" xml:space="preserve">
-    <value>Documentation → docs.openclaw.ai/platforms/windows</value>
-  </data>
-  <data name="AboutPage_HyperlinkButton_94.Content" xml:space="preserve">
-    <value>GitHub → github.com/openclaw/openclaw-windows-node</value>
-  </data>
-  <data name="AboutPage_HyperlinkButton_96.Content" xml:space="preserve">
-    <value>Dashboard → openclaw://dashboard</value>
-  </data>
   <data name="AgentEventsPage_TextBlock_18.Text" xml:space="preserve">
     <value>Événements d’agent</value>
   </data>
@@ -1567,7 +1438,7 @@ Sur votre hôte passerelle (Mac/Linux), exécutez :
     <value>Serveur MCP local</value>
   </data>
   <data name="PermissionsPage_McpDescription.Text" xml:space="preserve">
-    <value>Exposez les fonctionnalités via HTTP pour les outils CLI et les intégrations locales.</value>
+    <value>Fournit des fonctionnalités aux clients MCP locaux (outils CLI, intégrations) sur ce PC via HTTP.</value>
   </data>
   <data name="PermissionsPage_McpEndpointLabel.Text" xml:space="preserve">
     <value>Point de terminaison :</value>
@@ -1698,9 +1569,6 @@ Sur votre hôte passerelle (Mac/Linux), exécutez :
   <data name="ConnectionPage_TextBlock_11.Text" xml:space="preserve">
     <value>Point de terminaison de passerelle utilisé par le client opérateur et le service de nœud.</value>
   </data>
-  <data name="AuthErrorBar.Title" xml:space="preserve">
-    <value>Erreur de connexion</value>
-  </data>
   <data name="StatusText.Text" xml:space="preserve">
     <value>Déconnecté</value>
   </data>
@@ -2020,10 +1888,13 @@ Sur votre hôte passerelle (Mac/Linux), exécutez :
     <value>Modèle de commande (par ex. echo *)</value>
   </data>
   <data name="PermissionsPage_ComboBoxItem_54.Content" xml:space="preserve">
-    <value>Autoriser</value>
+    <value>Refuser</value>
   </data>
   <data name="PermissionsPage_ComboBoxItem_55.Content" xml:space="preserve">
-    <value>Refuser</value>
+    <value>Autoriser</value>
+  </data>
+  <data name="PermissionsPage_ComboBoxItem_56.Content" xml:space="preserve">
+    <value>Demander</value>
   </data>
   <data name="PermissionsPage_Button_57.Content" xml:space="preserve">
     <value>Ajouter une règle</value>
@@ -2214,6 +2085,69 @@ Sur votre hôte passerelle (Mac/Linux), exécutez :
   <data name="WorkspacePage_LoadingContent" xml:space="preserve">
     <value>Chargement du contenu…</value>
   </data>
+  <data name="WorkspacePage_SearchBox.PlaceholderText" xml:space="preserve">
+    <value>Search files</value>
+  </data>
+  <data name="WorkspacePage_ParentFolderButton.Content" xml:space="preserve">
+    <value>Up</value>
+  </data>
+  <data name="WorkspacePage_OpenConnectionSettings.Content" xml:space="preserve">
+    <value>Open Connection settings</value>
+  </data>
+  <data name="WorkspacePage_NoSearchResults.Text" xml:space="preserve">
+    <value>No files match your search.</value>
+  </data>
+  <data name="WorkspacePage_NoFolderResults" xml:space="preserve">
+    <value>No files found in this folder.</value>
+  </data>
+  <data name="WorkspacePage_LoadErrorMessage" xml:space="preserve">
+    <value>Couldn't load workspace files. Try refreshing.</value>
+  </data>
+  <data name="WorkspacePage_UnsupportedMessage" xml:space="preserve">
+    <value>This gateway doesn't support listing workspace files.</value>
+  </data>
+  <data name="WorkspacePage_Badge_Missing" xml:space="preserve">
+    <value>Missing</value>
+  </data>
+  <data name="WorkspacePage_Badge_Edited" xml:space="preserve">
+    <value>Edited</value>
+  </data>
+  <data name="WorkspacePage_Badge_Read" xml:space="preserve">
+    <value>Read</value>
+  </data>
+  <data name="WorkspacePage_FolderNote" xml:space="preserve">
+    <value>This is a folder.</value>
+  </data>
+  <data name="WorkspacePage_FileUnavailable" xml:space="preserve">
+    <value>Couldn't load this file.</value>
+  </data>
+  <data name="WorkspacePage_BrowserOnlyFileNote" xml:space="preserve">
+    <value>Only files read or edited in this session can be previewed.</value>
+  </data>
+  <data name="WorkspacePage_OpenFolder" xml:space="preserve">
+    <value>Open</value>
+  </data>
+  <data name="WorkspacePage_CopyPath" xml:space="preserve">
+    <value>Copy path</value>
+  </data>
+  <data name="WorkspacePage_CopyPathFailed" xml:space="preserve">
+    <value>Couldn't copy the path.</value>
+  </data>
+  <data name="WorkspacePage_FileType_File" xml:space="preserve">
+    <value>File</value>
+  </data>
+  <data name="WorkspacePage_FileType_Folder" xml:space="preserve">
+    <value>Folder</value>
+  </data>
+  <data name="WorkspacePage_RootFolder" xml:space="preserve">
+    <value>Root</value>
+  </data>
+  <data name="WorkspacePage_SearchResultsPath" xml:space="preserve">
+    <value>Search results for "{0}"</value>
+  </data>
+  <data name="WorkspacePage_BrowserTruncated" xml:space="preserve">
+    <value>Some results were omitted. Narrow your search or open a folder.</value>
+  </data>
   <data name="WorkspacePage_MissingFile" xml:space="preserve">
     <value>(fichier introuvable sur le disque)</value>
   </data>
@@ -2307,12 +2241,6 @@ Sur votre hôte passerelle (Mac/Linux), exécutez :
   <data name="HubWindow_NavigationViewItem_145.Content" xml:space="preserve">
     <value>Débogage</value>
   </data>
-  <data name="HubWindow_NavigationViewItem_Notifications.Content" xml:space="preserve">
-    <value>Alertes</value>
-  </data>
-  <data name="HubWindow_NavigationViewItem_148.Content" xml:space="preserve">
-    <value>Informations</value>
-  </data>
   <data name="Onboarding_UnknownPage" xml:space="preserve">
     <value>Page inconnue</value>
   </data>
@@ -2517,6 +2445,105 @@ Sur votre hôte passerelle (Mac/Linux), exécutez :
   <data name="VoiceSettingsPage_PageDescription.Text" xml:space="preserve">
     <value>Configurez la reconnaissance vocale et les paramètres d'interaction vocale. Tout le traitement vocal s'exécute localement sur votre appareil.</value>
   </data>
+  <data name="VoiceSettingsPage_AssistantHeader.Text" xml:space="preserve">
+    <value>Assistant vocal</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantDescription.Text" xml:space="preserve">
+    <value>Service d'assistant toujours à l'écoute et derniers tours de conversation.</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantRefreshButton.[using:Microsoft.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Actualiser l'état de l'assistant</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStartButtonText.Text" xml:space="preserve">
+    <value>Démarrer</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStopButtonText.Text" xml:space="preserve">
+    <value>Arrêter</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStatusChecking.Text" xml:space="preserve">
+    <value>Vérification de l'état de l'assistant...</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantRecentTurnsHeader.Text" xml:space="preserve">
+    <value>Tours récents</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStarting" xml:space="preserve">
+    <value>Démarrage de l'assistant...</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStartingDetail" xml:space="preserve">
+    <value>Démarrage du mode toujours à l'écoute avec routage local de l'assistant et stockage des tours.</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStartFailed" xml:space="preserve">
+    <value>L'assistant n'a pas démarré</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStopping" xml:space="preserve">
+    <value>Arrêt de l'assistant...</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStopFailed" xml:space="preserve">
+    <value>L'assistant ne s'est pas arrêté</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantBridgeUnavailable" xml:space="preserve">
+    <value>Pont assistant indisponible</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantNoTurnsLoaded" xml:space="preserve">
+    <value>Aucun tour d'assistant chargé.</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantUnknown" xml:space="preserve">
+    <value>inconnu</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantListeningFormat" xml:space="preserve">
+    <value>Assistant à l'écoute (PID {0})</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStopped" xml:space="preserve">
+    <value>Assistant arrêté</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStatusFormat" xml:space="preserve">
+    <value>État de l'assistant : {0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantTranscriberFormat" xml:space="preserve">
+    <value>Transcripteur : {0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantMicFormat" xml:space="preserve">
+    <value>Micro : {0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantSpeakerFormat" xml:space="preserve">
+    <value>Haut-parleur : {0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantCloudRoutingFormat" xml:space="preserve">
+    <value>Routage cloud : {0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantSpeechOutputFormat" xml:space="preserve">
+    <value>Sortie vocale : {0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantOn" xml:space="preserve">
+    <value>activé</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantOff" xml:space="preserve">
+    <value>désactivé</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantLastBridgeUpdateFormat" xml:space="preserve">
+    <value>Dernière mise à jour du pont : {0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantNoConversationTurns" xml:space="preserve">
+    <value>Aucun tour de conversation pour le moment.</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantSourceDefault" xml:space="preserve">
+    <value>l'assistant</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantTurnMetadataFormat" xml:space="preserve">
+    <value>{0} / {1}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantTurnMetadataWithLatencyFormat" xml:space="preserve">
+    <value>{0} | {1} | {2} ms de latence</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantUserTurnFormat" xml:space="preserve">
+    <value>Vous : {0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantResponseTurnFormat" xml:space="preserve">
+    <value>OpenClaw : {0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantEmptyValue" xml:space="preserve">
+    <value>(vide)</value>
+  </data>
   <data name="VoiceSettingsPage_SttHeader.Text" xml:space="preserve">
     <value>Reconnaissance vocale</value>
   </data>
@@ -2892,8 +2919,11 @@ Sur votre hôte passerelle (Mac/Linux), exécutez :
   <data name="Chat_Timeline_LoadEarlier" xml:space="preserve">
     <value>Charger les messages précédents</value>
   </data>
+  <data name="Chat_Timeline_ScrollToLatest" xml:space="preserve">
+    <value>Faire défiler jusqu’au dernier message</value>
+  </data>
   <data name="Chat_Tool_CallLabel" xml:space="preserve">
-    <value>Appel d'outil</value>
+    <value>Appel d’outil</value>
   </data>
   <data name="Chat_Tool_OutputLabel" xml:space="preserve">
     <value>Sortie d'outil</value>
@@ -2928,6 +2958,15 @@ Sur votre hôte passerelle (Mac/Linux), exécutez :
   <data name="Chat_Composer_Reasoning_Maximum" xml:space="preserve">
     <value>Maximal</value>
   </data>
+  <data name="Chat_Composer_Accessibility_Session" xml:space="preserve">
+    <value>Conversation</value>
+  </data>
+  <data name="Chat_Composer_Accessibility_Model" xml:space="preserve">
+    <value>Modèle</value>
+  </data>
+  <data name="Chat_Composer_Accessibility_Reasoning" xml:space="preserve">
+    <value>Raisonnement</value>
+  </data>
   <data name="Chat_Composer_Placeholder_Connected" xml:space="preserve">
     <value>Envoyer un message à l'assistant (Entrée pour envoyer)</value>
   </data>
@@ -2964,6 +3003,30 @@ Sur votre hôte passerelle (Mac/Linux), exécutez :
   <data name="Chat_Composer_AssistantWorking" xml:space="preserve">
     <value>L'assistant travaille…</value>
   </data>
+  <data name="Chat_Composer_QueuedCountFormat" xml:space="preserve">
+    <value>En file d’attente ({0})</value>
+  </data>
+  <data name="Chat_Composer_QueuedMessageAutomationFormat" xml:space="preserve">
+    <value>Message en file d’attente : {0}</value>
+  </data>
+  <data name="Chat_Composer_QueuedMessageFailedAutomationFormat" xml:space="preserve">
+    <value>Échec du message en file d’attente : {0}</value>
+  </data>
+  <data name="Chat_Composer_QueuedMessageFailed" xml:space="preserve">
+    <value>Échec</value>
+  </data>
+  <data name="Chat_Composer_QueuedMessageCancel" xml:space="preserve">
+    <value>Annuler le message en file d’attente</value>
+  </data>
+  <data name="Chat_Composer_QueuedMessageCancelAutomationFormat" xml:space="preserve">
+    <value>Annuler le message en file d’attente {0} : {1}</value>
+  </data>
+  <data name="Chat_Composer_QueuedMessageRemoveFailed" xml:space="preserve">
+    <value>Supprimer le message en file d’attente en échec</value>
+  </data>
+  <data name="Chat_Composer_QueuedMessageRemoveFailedAutomationFormat" xml:space="preserve">
+    <value>Supprimer le message en file d’attente en échec {0} : {1}</value>
+  </data>
   <data name="Chat_Assistant_Action_Copy" xml:space="preserve">
     <value>Copier le message</value>
   </data>
@@ -2977,14 +3040,20 @@ Sur votre hôte passerelle (Mac/Linux), exécutez :
     <value> … [{0} octets tronqués]</value>
   </data>
   <data name="Chat_Permission_Allow" xml:space="preserve">
-    <value>Autoriser</value>
+    <value>Autoriser une fois</value>
+  </data>
+  <data name="Chat_Permission_AllowAlways" xml:space="preserve">
+    <value>Toujours autoriser</value>
   </data>
   <data name="Chat_Permission_Deny" xml:space="preserve">
-    <value>Refuser</value>
+    <value>Refuser une fois</value>
   </data>
   <data name="Chat_Permission_DecisionAllowed" xml:space="preserve">
     <value>Autorisé</value>
   </data>
+  <data name="Chat_Permission_DecisionAlwaysAllowed" xml:space="preserve">
+    <value>Toujours autorisé</value>
+  </data>
   <data name="Chat_Permission_DecisionDenied" xml:space="preserve">
     <value>Refusé</value>
   </data>
@@ -3015,6 +3084,88 @@ Sur votre hôte passerelle (Mac/Linux), exécutez :
   <data name="AppNotification_ShowMore" xml:space="preserve">
     <value>Afficher plus</value>
   </data>
+  <data name="AppNotification_ActionOpenConnection" xml:space="preserve">
+    <value>Ouvrir Connexion</value>
+  </data>
+  <data name="AppNotification_ActionOpenChannels" xml:space="preserve">
+    <value>Ouvrir Canaux</value>
+  </data>
+  <data name="AppNotification_ActionOpenSandbox" xml:space="preserve">
+    <value>Ouvrir Sandbox</value>
+  </data>
+  <data name="AppNotification_ActionOpenCron" xml:space="preserve">
+    <value>Ouvrir Cron</value>
+  </data>
+  <data name="AppNotification_GatewayConnectionFailed_Title" xml:space="preserve">
+    <value>Échec de la connexion à la passerelle</value>
+  </data>
+  <data name="AppNotification_GatewayConnectionFailed_DefaultMessage" xml:space="preserve">
+    <value>OpenClaw n'a pas pu se connecter à la passerelle active.</value>
+  </data>
+  <data name="AppNotification_GatewayPairingRequired_Title" xml:space="preserve">
+    <value>Approbation d'appairage de la passerelle requise</value>
+  </data>
+  <data name="AppNotification_GatewayPairingRequired_GenericMessage" xml:space="preserve">
+    <value>Ouvrez Connexion pour terminer l'appairage de la passerelle.</value>
+  </data>
+  <data name="AppNotification_GatewayPairingRequired_DeviceMessageFormat" xml:space="preserve">
+    <value>Ouvrez Connexion pour approuver l'appareil {0}.</value>
+  </data>
+  <data name="AppNotification_WindowsNodeConnectionFailed_Title" xml:space="preserve">
+    <value>Échec de la connexion du nœud Windows</value>
+  </data>
+  <data name="AppNotification_WindowsNodeConnectionFailed_DefaultMessage" xml:space="preserve">
+    <value>La passerelle est connectée, mais ce nœud Windows n'est pas disponible.</value>
+  </data>
+  <data name="AppNotification_WindowsNodeRateLimited_Title" xml:space="preserve">
+    <value>Connexion du nœud Windows limitée</value>
+  </data>
+  <data name="AppNotification_WindowsNodeRateLimited_DefaultMessage" xml:space="preserve">
+    <value>La passerelle est connectée, mais ce nœud Windows est temporairement limité.</value>
+  </data>
+  <data name="AppNotification_ChannelNeedsAttention_TitleFormat" xml:space="preserve">
+    <value>Le canal {0} nécessite une attention</value>
+  </data>
+  <data name="AppNotification_ChannelNeedsAttention_StatusMessageFormat" xml:space="preserve">
+    <value>La passerelle signale {0} comme {1}.</value>
+  </data>
+  <data name="AppNotification_SandboxDisabled_Title" xml:space="preserve">
+    <value>Le Sandbox du nœud est désactivé — les commandes s'exécutent sans confinement</value>
+  </data>
+  <data name="AppNotification_SandboxDisabled_Message" xml:space="preserve">
+    <value>Les commandes Windows lancées par l'agent s'exécuteront sans confinement jusqu'à ce que le Sandbox du nœud soit réactivé.</value>
+  </data>
+  <data name="AppNotification_SandboxUnavailable_Title" xml:space="preserve">
+    <value>Sandbox indisponible — repli sur l'hôte</value>
+  </data>
+  <data name="AppNotification_SandboxUnavailable_MessageFormat" xml:space="preserve">
+    <value>{0}
+
+Les commandes s'exécuteront sur l'hôte sans protection de sandbox tant que le sandboxing est indisponible.</value>
+  </data>
+  <data name="AppNotification_SandboxUnavailableBlocked_Title" xml:space="preserve">
+    <value>Sandbox indisponible — commandes bloquées</value>
+  </data>
+  <data name="AppNotification_SandboxUnavailableBlocked_MessageFormat" xml:space="preserve">
+    <value>{0}
+
+Les commandes sont bloquées tant que le sandboxing est indisponible, car le blocage strict du repli est activé.</value>
+  </data>
+  <data name="AppNotification_SandboxUnavailable_DefaultReason" xml:space="preserve">
+    <value>Les primitives de sandboxing MXC ne sont pas disponibles sur cette machine.</value>
+  </data>
+  <data name="AppNotification_CronRunFailed_Title" xml:space="preserve">
+    <value>La tâche Cron n'a pas démarré</value>
+  </data>
+  <data name="AppNotification_CronRunFailed_DefaultDetail" xml:space="preserve">
+    <value>La demande a échoué.</value>
+  </data>
+  <data name="AppNotification_CronRunRejectedDetail" xml:space="preserve">
+    <value>La passerelle a rejeté la demande cron.run.</value>
+  </data>
+  <data name="AppNotification_CronRunFailed_MessageFormat" xml:space="preserve">
+    <value>{0} : {1}</value>
+  </data>
   <data name="NotificationsPage_Title.Text" xml:space="preserve">
     <value>Alertes</value>
   </data>
@@ -3039,55 +3190,142 @@ Sur votre hôte passerelle (Mac/Linux), exécutez :
   <data name="NotificationsPage_MetadataCategoryNodeInvoke" xml:space="preserve">
     <value>Commande du nœud</value>
   </data>
-  <data name="Chat_Permission_Title" xml:space="preserve">
-    <value>Approbation d'exécution requise</value>
+  <data name="AppNotification_ExecApprovalPending_Title" xml:space="preserve">
+    <value>Approbation de commande en attente</value>
   </data>
-  <data name="Chat_Permission_Subtitle" xml:space="preserve">
-    <value>Une approbation est requise pour exécuter la commande ci-dessous sur ce compagnon Windows. Cliquez sur Autoriser pour continuer, ou Refuser pour annuler.</value>
+  <data name="AppNotification_ExecApprovalPending_MessageFormat" xml:space="preserve">
+    <value>{0} attend l'approbation pour exécuter : {1}</value>
   </data>
-  <data name="Chat_Permission_Caption" xml:space="preserve">
-    <value>Une approbation est requise pour chaque commande selon la stratégie active. Votre choix s'applique uniquement à cette demande.</value>
+  <data name="AppNotification_ExecApprovalPending_OpenChatAction" xml:space="preserve">
+    <value>Ouvrir le chat</value>
   </data>
-  <data name="Chat_Root_ConnectingToGateway" xml:space="preserve">
-    <value>Connexion à la passerelle…</value>
+  <data name="AppNotification_ExecApprovalPending_UnknownChatLabel" xml:space="preserve">
+    <value>discussion</value>
   </data>
-  <data name="Chat_Root_EmptyState_SelectSession" xml:space="preserve">
-    <value>Sélectionnez une session dans la barre latérale pour commencer à discuter.</value>
+  <data name="AppNotification_ExecApprovalPending_MainSessionLabel" xml:space="preserve">
+    <value>Principal</value>
   </data>
-  <data name="Chat_Notification_SendFailed" xml:space="preserve">
-    <value>Échec de l'envoi</value>
+  <data name="AppNotification_ExecApprovalPending_MainChatLabel" xml:space="preserve">
+    <value>Chat principal</value>
   </data>
-  <data name="Chat_Notification_AbortFailed" xml:space="preserve">
-    <value>Échec de l'abandon</value>
+  <data name="AppNotification_ExecApprovalPending_AgentChatLabelFormat" xml:space="preserve">
+    <value>Chat {0}</value>
   </data>
-  <data name="Chat_Notification_LoadHistoryFailed" xml:space="preserve">
-    <value>Échec du chargement de l'historique</value>
+  <data name="AppNotification_ExecApprovalPending_AgentSlotLabelFormat" xml:space="preserve">
+    <value>{0} / {1}</value>
   </data>
-  <data name="Chat_Notification_AssistantReplied" xml:space="preserve">
-    <value>L'assistant a répondu</value>
+  <data name="NotificationsPage_MetadataAuthentication" xml:space="preserve">
+    <value>Authentification</value>
   </data>
-  <data name="Chat_Notification_ConnectionInterrupted" xml:space="preserve">
-    <value>Connexion perdue — réponse interrompue.</value>
+  <data name="NotificationsPage_MetadataBindings" xml:space="preserve">
+    <value>Liaisons</value>
   </data>
-  <data name="Chat_Notification_KeylessEventDropped" xml:space="preserve">
-    <value>Événement de chronologie de passerelle ignoré</value>
+  <data name="NotificationsPage_MetadataChannels" xml:space="preserve">
+    <value>Canaux</value>
   </data>
-  <data name="Chat_Notification_KeylessEventDroppedMessage" xml:space="preserve">
-    <value>La passerelle a envoyé un événement de chronologie de chat sans clé de session ; OpenClaw l'a ignoré pour éviter de mélanger les conversations. Mettez à jour ou redémarrez la passerelle si cela continue.</value>
+  <data name="NotificationsPage_MetadataConfig" xml:space="preserve">
+    <value>Configuration</value>
   </data>
-  <data name="VoiceSettingsPage_TestVoiceButtonText.Text" xml:space="preserve">
-    <value>Tester la saisie vocale</value>
+  <data name="NotificationsPage_MetadataConnection" xml:space="preserve">
+    <value>Connexion</value>
   </data>
-  <data name="PermissionsPage_FeaturesDescription_Enabled" xml:space="preserve">
-    <value>Toggle individual features that agents may request from this PC.</value>
+  <data name="NotificationsPage_MetadataCron" xml:space="preserve">
+    <value>Cron</value>
   </data>
-  <data name="PermissionsPage_FeaturesDescription_Disabled" xml:space="preserve">
-    <value>Turn on Node Mode above to enable these features.</value>
+  <data name="NotificationsPage_MetadataGateway" xml:space="preserve">
+    <value>Passerelle</value>
   </data>
-  <data name="PermissionsPage_Cap_Browser_Label" xml:space="preserve">
-    <value>Browser control</value>
+  <data name="NotificationsPage_MetadataJobs" xml:space="preserve">
+    <value>Tâches</value>
   </data>
-  <data name="PermissionsPage_Cap_Browser_Description" xml:space="preserve">
+  <data name="NotificationsPage_MetadataLoad" xml:space="preserve">
+    <value>Chargement</value>
+  </data>
+  <data name="NotificationsPage_MetadataLifecycle" xml:space="preserve">
+    <value>Cycle de vie</value>
+  </data>
+  <data name="NotificationsPage_MetadataLocalGateway" xml:space="preserve">
+    <value>Passerelle locale</value>
+  </data>
+  <data name="NotificationsPage_MetadataNode" xml:space="preserve">
+    <value>Nœud</value>
+  </data>
+  <data name="NotificationsPage_MetadataPairing" xml:space="preserve">
+    <value>Appairage</value>
+  </data>
+  <data name="NotificationsPage_MetadataSandbox" xml:space="preserve">
+    <value>Bac à sable</value>
+  </data>
+  <data name="NotificationsPage_MetadataSettings" xml:space="preserve">
+    <value>Paramètres</value>
+  </data>
+  <data name="NotificationsPage_MetadataStatus" xml:space="preserve">
+    <value>État</value>
+  </data>
+  <data name="NotificationsPage_MetadataSystemRun" xml:space="preserve">
+    <value>system.run</value>
+  </data>
+  <data name="Chat_Permission_Title" xml:space="preserve">
+    <value>Approbation d'exécution requise</value>
+  </data>
+  <data name="Chat_Permission_CommandApprovalTitle" xml:space="preserve">
+    <value>Approbation de commande demandée</value>
+  </data>
+  <data name="Chat_Permission_Subtitle" xml:space="preserve">
+    <value>Une approbation est requise pour exécuter la commande ci-dessous sur ce compagnon Windows. Autorisez une fois pour continuer, autorisez toujours pour mémoriser cette commande, ou refusez pour annuler.</value>
+  </data>
+  <data name="Chat_Permission_Caption" xml:space="preserve">
+    <value>Autoriser une fois s'applique uniquement à cette demande. Toujours autoriser enregistre une règle d'autorisation exacte lorsque c'est possible.</value>
+  </data>
+  <data name="Chat_Permission_ResultSubmittedFormat" xml:space="preserve">
+    <value>Approbation {0} envoyée pour {1}.</value>
+  </data>
+  <data name="Chat_Root_ConnectingToGateway" xml:space="preserve">
+    <value>Connexion à la passerelle…</value>
+  </data>
+  <data name="Chat_Root_EmptyState_SelectSession" xml:space="preserve">
+    <value>Sélectionnez une session dans la barre latérale pour commencer à discuter.</value>
+  </data>
+  <data name="Chat_Notification_SendFailed" xml:space="preserve">
+    <value>Échec de l'envoi</value>
+  </data>
+  <data name="Chat_Error_SendReturnedStatusFormat" xml:space="preserve">
+    <value>La passerelle a renvoyé l’état d’envoi « {0} ».</value>
+  </data>
+  <data name="Chat_Error_SendFailedFormat" xml:space="preserve">
+    <value>Échec de l’envoi : {0}</value>
+  </data>
+  <data name="Chat_Notification_AbortFailed" xml:space="preserve">
+    <value>Échec de l'abandon</value>
+  </data>
+  <data name="Chat_Notification_LoadHistoryFailed" xml:space="preserve">
+    <value>Échec du chargement de l'historique</value>
+  </data>
+  <data name="Chat_Notification_AssistantReplied" xml:space="preserve">
+    <value>L'assistant a répondu</value>
+  </data>
+  <data name="Chat_Notification_ConnectionInterrupted" xml:space="preserve">
+    <value>Connexion perdue — réponse interrompue.</value>
+  </data>
+  <data name="Chat_Notification_KeylessEventDropped" xml:space="preserve">
+    <value>Événement de chronologie de passerelle ignoré</value>
+  </data>
+  <data name="Chat_Notification_KeylessEventDroppedMessage" xml:space="preserve">
+    <value>La passerelle a envoyé un événement de chronologie de chat sans clé de session ; OpenClaw l'a ignoré pour éviter de mélanger les conversations. Mettez à jour ou redémarrez la passerelle si cela continue.</value>
+  </data>
+  <data name="VoiceSettingsPage_TestVoiceButtonText.Text" xml:space="preserve">
+    <value>Tester la saisie vocale</value>
+  </data>
+  <data name="PermissionsPage_FeaturesDescription_Enabled" xml:space="preserve">
+    <value>Toggle individual features that agents may request from this PC.</value>
+  </data>
+  <data name="PermissionsPage_FeaturesDescription_Disabled" xml:space="preserve">
+    <value>Turn on Node Mode above to enable these features.</value>
+  </data>
+  <data name="PermissionsPage_Cap_Browser_Label" xml:space="preserve">
+    <value>Browser control</value>
+  </data>
+  <data name="PermissionsPage_Cap_Browser_Description" xml:space="preserve">
     <value>Lets agents drive a Chromium browser on this PC — open pages, click, and read content.</value>
   </data>
   <data name="PermissionsPage_Cap_Camera_Label" xml:space="preserve">
@@ -3156,6 +3394,18 @@ Sur votre hôte passerelle (Mac/Linux), exécutez :
   <data name="PermissionsPage_NodeStatus_ActiveDetailsFormat" xml:space="preserve">
     <value>Providing {0} capabilities: {1}</value>
   </data>
+  <data name="PermissionsPage_NodeStatus_McpOnly" xml:space="preserve">
+    <value>MCP local uniquement</value>
+  </data>
+  <data name="PermissionsPage_NodeStatus_McpOnlyDetailsFormat" xml:space="preserve">
+    <value>Fourniture de {0} capacités aux clients MCP locaux à {1}</value>
+  </data>
+  <data name="PermissionsPage_NodeStatus_Starting" xml:space="preserve">
+    <value>Node en cours de démarrage…</value>
+  </data>
+  <data name="PermissionsPage_NodeStatus_McpError" xml:space="preserve">
+    <value>Échec du démarrage du serveur MCP local</value>
+  </data>
   <data name="PermissionsPage_NodeStatus_NoCapabilities" xml:space="preserve">
     <value>No capabilities enabled.</value>
   </data>
@@ -3531,9 +3781,6 @@ Sur votre hôte passerelle (Mac/Linux), exécutez :
   <data name="HubWindow_NavigationViewItem_Sandbox.Content" xml:space="preserve">
     <value>Bac à sable</value>
   </data>
-  <data name="AboutPage_MoreDiagnosticsLink.Content" xml:space="preserve">
-    <value>More diagnostics →</value>
-  </data>
   <data name="ChannelsPage_GuideBar.Title" xml:space="preserve">
     <value>Your gateway didn't list any channels</value>
   </data>
@@ -3601,10 +3848,10 @@ Sur votre hôte passerelle (Mac/Linux), exécutez :
     <value>Connection state, gateway URL, runtime, tunnel.</value>
   </data>
   <data name="DiagnosticsPage_Card_CopyDebugBundle.Header" xml:space="preserve">
-    <value>Copy full debug bundle</value>
+    <value>Copier le résumé de diagnostic</value>
   </data>
   <data name="DiagnosticsPage_Card_CopyDebugBundle.Description" xml:space="preserve">
-    <value>Everything the preview dialog produces, no preview.</value>
+    <value>Résumés générés uniquement ; exclut les extraits de journaux. Utilisez Créer un lot de diagnostics pour examiner les journaux avant de les partager.</value>
   </data>
   <data name="DiagnosticsPage_Card_CopyBrowserSetup.Header" xml:space="preserve">
     <value>Copy browser setup guidance</value>
@@ -3666,15 +3913,6 @@ Sur votre hôte passerelle (Mac/Linux), exécutez :
   <data name="DiagnosticsPage_Card_TrayChat.Header" xml:space="preserve">
     <value>Tray chat popup</value>
   </data>
-  <data name="DiagnosticsPage_Card_Reconfigure.Header" xml:space="preserve">
-    <value>Reconfigure…</value>
-  </data>
-  <data name="DiagnosticsPage_Card_Reconfigure.Description" xml:space="preserve">
-    <value>Reopens the OpenClaw onboarding wizard. You will be asked to confirm.</value>
-  </data>
-  <data name="DiagnosticsPage_ReconfigureButton.Content" xml:space="preserve">
-    <value>Reconfigure…</value>
-  </data>
   <data name="DiagnosticsPage_DetailBack.Text" xml:space="preserve">
     <value>Back to Diagnostics</value>
   </data>
@@ -4183,7 +4421,7 @@ Sur votre hôte passerelle (Mac/Linux), exécutez :
     <value>0 règle</value>
   </data>
   <data name="PermissionsPage_NoRulesYetAdd.Text" xml:space="preserve">
-    <value>Aucune règle pour l'instant. Ajoutez un motif ci-dessous pour autoriser ou refuser des commandes spécifiques.</value>
+    <value>Aucune règle pour l'instant. Ajoutez un motif ci-dessous pour refuser, autoriser ou demander pour des commandes spécifiques.</value>
   </data>
   <data name="PermissionsPage_WindowsPrivacy.Text" xml:space="preserve">
     <value>Confidentialité Windows</value>
@@ -4377,6 +4615,9 @@ Sur votre hôte passerelle (Mac/Linux), exécutez :
   <data name="SessionsPage_All.Text" xml:space="preserve">
     <value>Tous</value>
   </data>
+  <data name="SessionsPage_ShowCompleted.Header" xml:space="preserve">
+    <value>Afficher les sessions terminées</value>
+  </data>
   <data name="SessionsPage_GatewayDisconnected.Title" xml:space="preserve">
     <value>Passerelle déconnectée</value>
   </data>
@@ -4398,15 +4639,81 @@ Sur votre hôte passerelle (Mac/Linux), exécutez :
   <data name="SessionsPage_Compact.Text" xml:space="preserve">
     <value>Compacter</value>
   </data>
+  <data name="SessionsPage_Checkpoints.Text" xml:space="preserve">
+    <value>Points de contrôle</value>
+  </data>
+  <data name="SessionsPage_Checkpoints.[using:Microsoft.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Afficher, créer une branche ou restaurer des points de contrôle de compactage</value>
+  </data>
+  <data name="SessionsPage_ExportTranscript.Text" xml:space="preserve">
+    <value>Exporter la transcription</value>
+  </data>
+  <data name="SessionsPage_ExportTranscript.[using:Microsoft.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Enregistrer la transcription de la conversation dans un fichier texte</value>
+  </data>
   <data name="SessionsPage_Delete.Text" xml:space="preserve">
     <value>Supprimer</value>
   </data>
+  <data name="SessionActionPrompt_Reset_Title" xml:space="preserve">
+    <value>Réinitialiser la session ?</value>
+  </data>
+  <data name="SessionActionPrompt_Reset_BodyFormat" xml:space="preserve">
+    <value>Démarrer une nouvelle session pour « {0} » ? Le contexte de conversation actuel sera effacé.</value>
+  </data>
+  <data name="SessionActionPrompt_Reset_ConfirmLabel" xml:space="preserve">
+    <value>Réinitialiser</value>
+  </data>
+  <data name="SessionActionPrompt_CancelLabel" xml:space="preserve">
+    <value>Annuler</value>
+  </data>
+  <data name="SessionActionPrompt_Compact_Title" xml:space="preserve">
+    <value>Compacter le journal de session ?</value>
+  </data>
+  <data name="SessionActionPrompt_Compact_BodyFormat" xml:space="preserve">
+    <value>Conserver les messages les plus récents pour « {0} » et archiver le reste. Cela crée un point de contrôle de compactage ; exportez d’abord la transcription si vous avez besoin de l’historique complet.</value>
+  </data>
+  <data name="SessionActionPrompt_Compact_ConfirmLabel" xml:space="preserve">
+    <value>Compacter</value>
+  </data>
+  <data name="SessionActionPrompt_Delete_Title" xml:space="preserve">
+    <value>Supprimer la session ?</value>
+  </data>
+  <data name="SessionActionPrompt_Delete_BodyFormat" xml:space="preserve">
+    <value>Supprimer « {0} » et archiver sa transcription ? Elle sera retirée de la liste des sessions.</value>
+  </data>
+  <data name="SessionActionPrompt_Delete_ConfirmLabel" xml:space="preserve">
+    <value>Supprimer</value>
+  </data>
+  <data name="SessionActionPrompt_Restore_Title" xml:space="preserve">
+    <value>Restaurer le point de contrôle ?</value>
+  </data>
+  <data name="SessionActionPrompt_Restore_BodyFormat" xml:space="preserve">
+    <value>Restaurer « {0} » à ce point de contrôle de compactage ? Les messages ajoutés après le point de contrôle seront archivés.</value>
+  </data>
+  <data name="SessionActionPrompt_Restore_ConfirmLabel" xml:space="preserve">
+    <value>Restaurer</value>
+  </data>
   <data name="SettingsPage_Settings.Text" xml:space="preserve">
     <value>Paramètres</value>
   </data>
   <data name="SettingsPage_General.Text" xml:space="preserve">
     <value>Général</value>
   </data>
+  <data name="SettingsRow_AppTheme_Header.Text" xml:space="preserve">
+    <value>Thème de l’application</value>
+  </data>
+  <data name="SettingsRow_AppTheme_Description.Text" xml:space="preserve">
+    <value>Choisissez clair, sombre ou utilisez votre paramètre Windows.</value>
+  </data>
+  <data name="SettingsPage_AppTheme_System.Content" xml:space="preserve">
+    <value>Système</value>
+  </data>
+  <data name="SettingsPage_AppTheme_Light.Content" xml:space="preserve">
+    <value>Clair</value>
+  </data>
+  <data name="SettingsPage_AppTheme_Dark.Content" xml:space="preserve">
+    <value>Sombre</value>
+  </data>
   <data name="SettingsPage_Notifications.Text" xml:space="preserve">
     <value>Mes notifications</value>
   </data>
@@ -4416,6 +4723,57 @@ Sur votre hôte passerelle (Mac/Linux), exécutez :
   <data name="SettingsPage_LocalGateway.Text" xml:space="preserve">
     <value>Passerelle locale</value>
   </data>
+  <data name="SettingsPage_Developer.Text" xml:space="preserve">
+    <value>Développeur</value>
+  </data>
+  <data name="SettingsPage_AppInfoExpander.Header" xml:space="preserve">
+    <value>Infos sur l’application</value>
+  </data>
+  <data name="SettingsPage_AppInfoCheckUpdates.Content" xml:space="preserve">
+    <value>Rechercher les mises à jour</value>
+  </data>
+  <data name="SettingsPage_AppInfoLabel_AppName.Text" xml:space="preserve">
+    <value>Nom de l’application</value>
+  </data>
+  <data name="SettingsPage_AppInfoLabel_Version.Text" xml:space="preserve">
+    <value>Version de l’application</value>
+  </data>
+  <data name="SettingsPage_AppInfoLabel_BuildDate.Text" xml:space="preserve">
+    <value>Date de compilation</value>
+  </data>
+  <data name="SettingsPage_AppInfoLabel_Runtime.Text" xml:space="preserve">
+    <value>Environnement d’exécution</value>
+  </data>
+  <data name="SettingsPage_AppInfoLabel_Architecture.Text" xml:space="preserve">
+    <value>Architecture du processus</value>
+  </data>
+  <data name="SettingsPage_AppInfoLabel_Windows.Text" xml:space="preserve">
+    <value>Version de Windows</value>
+  </data>
+  <data name="SettingsPage_AppInfoLabel_UpdateChannel.Text" xml:space="preserve">
+    <value>Canal de mise à jour</value>
+  </data>
+  <data name="SettingsPage_AppInfoLabel_InstallType.Text" xml:space="preserve">
+    <value>Type d’installation</value>
+  </data>
+  <data name="SettingsPage_AppInfoRelatedLinks.Text" xml:space="preserve">
+    <value>Liens connexes</value>
+  </data>
+  <data name="SettingsPage_AppInfoDocumentation.Content" xml:space="preserve">
+    <value>Docs</value>
+  </data>
+  <data name="SettingsPage_AppInfoGitHub.Content" xml:space="preserve">
+    <value>GitHub</value>
+  </data>
+  <data name="SettingsPage_AppInfoDashboard.Content" xml:space="preserve">
+    <value>Tableau de bord</value>
+  </data>
+  <data name="SettingsRow_ShowDiagnostics_Header.Text" xml:space="preserve">
+    <value>Activer les diagnostics</value>
+  </data>
+  <data name="SettingsRow_ShowDiagnostics_Description.Text" xml:space="preserve">
+    <value>Outils de développement et de dépannage. Activé par défaut pour les builds locales.</value>
+  </data>
   <data name="SettingsPage_LocalGatewaySetup_Header.Text" xml:space="preserve">
     <value>Configurer ou reconfigurer la passerelle locale</value>
   </data>
@@ -4626,21 +4984,18 @@ Sur votre hôte passerelle (Mac/Linux), exécutez :
   <data name="DiagnosticsBundleDialog_ReviewBeforeSharing.Title" xml:space="preserve">
     <value>Examiner avant de partager</value>
   </data>
-  <data name="DiagnosticsBundleDialog_ReviewBeforeSharing.Message" xml:space="preserve">
-    <value>Les jetons sensibles, les arguments de commande, les charges utiles et les enregistrements sont exclus par le générateur de lot.</value>
-  </data>
   <data name="HubWindow_Disconnected.Text" xml:space="preserve">
     <value>Déconnecté</value>
   </data>
-  <data name="HubWindow_Op.Text" xml:space="preserve">
-    <value>Op.</value>
-  </data>
-  <data name="HubWindow_Node.Text" xml:space="preserve">
-    <value>Nœud</value>
-  </data>
   <data name="HubWindow_Advanced.Content" xml:space="preserve">
     <value>Avancé</value>
   </data>
+  <data name="DiagnosticsBundleDialog_ReviewBeforeSharingMessage.Text" xml:space="preserve">
+    <value>Les extraits de journaux sont assainis et tronqués. Les jetons sensibles, les charges utiles, les enregistrements et les fichiers de paramètres bruts sont exclus. Vérifiez avant de partager.</value>
+  </data>
+  <data name="DiagnosticsBundleDialog_ReviewBeforeSharingTitle.Text" xml:space="preserve">
+    <value>Examiner avant de partager</value>
+  </data>
   <data name="AgentEventsPage_LiveText.Text" xml:space="preserve">
     <value>En direct</value>
   </data>
@@ -4668,12 +5023,10 @@ Sur votre hôte passerelle (Mac/Linux), exécutez :
   <data name="VoiceSettingsPage_PreviewVoice.Text" xml:space="preserve">
     <value>Aperçu de la voix</value>
   </data>
-  <data name="HubWindow_TitleStatus.Text" xml:space="preserve">
-    <value>Déconnecté</value>
-  </data>
   <data name="SandboxPage_GatewayCommandsNote.Text" xml:space="preserve">
     <value>Les commandes que l'agent exécute directement sur la passerelle ne le sont pas. Si la passerelle se trouve sur ce PC, elles peuvent toujours accéder à vos fichiers Windows, au presse-papiers et au réseau — vérifiez la configuration de votre passerelle.</value>
-  </data>  <data name="AgentEventsPage_AllAgents" xml:space="preserve">
+  </data>
+  <data name="AgentEventsPage_AllAgents" xml:space="preserve">
     <value>Tous les agents</value>
   </data>
   <data name="AgentEventsPage_EventsStatus" xml:space="preserve">
@@ -4691,6 +5044,60 @@ Sur votre hôte passerelle (Mac/Linux), exécutez :
   <data name="CronPage_Running" xml:space="preserve">
     <value>Exécution...</value>
   </data>
+  <data name="CronPage_CompletedOneTimeJobTooltip" xml:space="preserve">
+    <value>Tâche ponctuelle terminée</value>
+  </data>
+  <data name="CronPage_EnableJobTooltip" xml:space="preserve">
+    <value>Activer la tâche</value>
+  </data>
+  <data name="CronPage_DisableJobTooltip" xml:space="preserve">
+    <value>Désactiver la tâche</value>
+  </data>
+  <data name="CronPage_FullResponse" xml:space="preserve">
+    <value>Réponse complète</value>
+  </data>
+  <data name="CronPage_OpenChat" xml:space="preserve">
+    <value>Ouvrir le chat</value>
+  </data>
+  <data name="CronPage_RunNow" xml:space="preserve">
+    <value>Exécuter maintenant</value>
+  </data>
+  <data name="CronPage_EditAction" xml:space="preserve">
+    <value>Modifier</value>
+  </data>
+  <data name="CronPage_HistoryAction" xml:space="preserve">
+    <value>Historique</value>
+  </data>
+  <data name="CronPage_RemoveAction" xml:space="preserve">
+    <value>Supprimer</value>
+  </data>
+  <data name="CronPage_RunningBadge" xml:space="preserve">
+    <value>Exécution</value>
+  </data>
+  <data name="CronPage_RunHistory" xml:space="preserve">
+    <value>Historique des exécutions</value>
+  </data>
+  <data name="CronPage_RunHistoryShowing" xml:space="preserve">
+    <value>Historique des exécutions - {0} sur {1} affichées</value>
+  </data>
+  <data name="CronPage_RunHistoryCount" xml:space="preserve">
+    <value>Historique des exécutions - {0} exécutions</value>
+  </data>
+  <data name="CronPage_LoadingRunHistory" xml:space="preserve">
+    <value>Chargement de l’historique des exécutions...</value>
+  </data>
+  <data name="CronPage_NoRunHistoryAvailable" xml:space="preserve">
+    <value>Aucun historique d’exécution disponible.</value>
+  </data>
+  <data name="CronPage_LoadOlderRuns" xml:space="preserve">
+    <value>Charger les exécutions plus anciennes ({0} restantes)...</value>
+  </data>
+  <data name="CronPage_LoadMoreRuns" xml:space="preserve">
+    <value>Charger plus d’exécutions...</value>
+  </data>
+  <data name="CronPage_Loading" xml:space="preserve">
+    <value>Chargement...</value>
+  </data>
   <data name="CronPage_SaveChanges" xml:space="preserve">
     <value>Enregistrer les modifications</value>
   </data>
@@ -4884,6 +5291,18 @@ Assurez-vous que la passerelle est en cours d'exécution.</value>
   <data name="ConnectionPage_NodeModeDisabledText" xml:space="preserve">
     <value>Mode nœud désactivé</value>
   </data>
+  <data name="ConnectionPage_NodeStarting" xml:space="preserve">
+    <value>Node en cours de démarrage…</value>
+  </data>
+  <data name="ConnectionPage_NodeMcpOnly" xml:space="preserve">
+    <value>Capacités fournies localement (MCP uniquement)</value>
+  </data>
+  <data name="ConnectionPage_NodeMcpOnlyReachable" xml:space="preserve">
+    <value>Accessible par les clients MCP locaux à {0}</value>
+  </data>
+  <data name="ConnectionPage_NodeMcpError" xml:space="preserve">
+    <value>Échec du démarrage du serveur MCP local</value>
+  </data>
   <data name="ConnectionPage_NodeBodyNoCapabilities" xml:space="preserve">
     <value>Aucune capacité activée. Choisissez ce que vous souhaitez partager dans les Autorisations.</value>
   </data>
@@ -4926,6 +5345,9 @@ Assurez-vous que la passerelle est en cours d'exécution.</value>
   <data name="ConnectionPage_OpenDashboard" xml:space="preserve">
     <value>Ouvrir le tableau de bord</value>
   </data>
+  <data name="ConnectionPage_GatewayOptionsA11y" xml:space="preserve">
+    <value>Options pour {0}</value>
+  </data>
   <data name="ConnectionPage_DisconnectAction" xml:space="preserve">
     <value>Déconnecter</value>
   </data>
@@ -5130,9 +5552,6 @@ Assurez-vous que la passerelle est en cours d'exécution.</value>
   <data name="ConnectionPage_CancelAction" xml:space="preserve">
     <value>Annuler</value>
   </data>
-  <data name="ConnectionPage_ConnectFailed" xml:space="preserve">
-    <value>Échec de la connexion</value>
-  </data>
   <data name="ConnectionPage_GatewayConnectionFailed" xml:space="preserve">
     <value>Échec de la connexion à la passerelle.</value>
   </data>
@@ -5163,31 +5582,6 @@ Assurez-vous que la passerelle est en cours d'exécution.</value>
   <data name="ConnectionPage_DenyPairingRequest" xml:space="preserve">
     <value>Refuser la demande d’appairage</value>
   </data>
-  <data name="ConnectionPage_AuthGuidanceToken" xml:space="preserve">
-    <value>{0}
-
-Collez un nouveau code de configuration depuis le flux Ajouter une passerelle.</value>
-  </data>
-  <data name="ConnectionPage_AuthGuidancePairing" xml:space="preserve">
-    <value>{0}
-
-Votre appareil nécessite une approbation sur l’hôte de la passerelle.</value>
-  </data>
-  <data name="ConnectionPage_AuthGuidancePassword" xml:space="preserve">
-    <value>{0}
-
-Cette passerelle nécessite une authentification par mot de passe.</value>
-  </data>
-  <data name="ConnectionPage_AuthGuidanceSignature" xml:space="preserve">
-    <value>{0}
-
-La passerelle pourrait nécessiter une version différente du protocole d’authentification.</value>
-  </data>
-  <data name="ConnectionPage_AuthGuidanceDefault" xml:space="preserve">
-    <value>{0}
-
-Vérifiez vos paramètres de connexion et réessayez.</value>
-  </data>
   <data name="ConnectionPage_AuthModeBootstrap" xml:space="preserve">
     <value>amorçage</value>
   </data>
@@ -5270,7 +5664,7 @@ Vérifiez vos paramètres de connexion et réessayez.</value>
     <value>Associer votre téléphone WhatsApp</value>
   </data>
   <data name="ChannelsPage_GuideWhatsAppStep1" xml:space="preserve">
-    <value>Cliquez sur &quot;Show QR&quot; dans la section Liaison ci-dessous.</value>
+    <value>Cliquez sur "Show QR" dans la section Liaison ci-dessous.</value>
   </data>
   <data name="ChannelsPage_GuideWhatsAppStep2" xml:space="preserve">
     <value>Sur votre téléphone : WhatsApp → Paramètres → Appareils liés → Lier un appareil.</value>
@@ -5282,7 +5676,7 @@ Vérifiez vos paramètres de connexion et réessayez.</value>
     <value>Associer votre téléphone Signal</value>
   </data>
   <data name="ChannelsPage_GuideSignalStep1" xml:space="preserve">
-    <value>Cliquez sur &quot;Show QR&quot; dans la section Liaison ci-dessous.</value>
+    <value>Cliquez sur "Show QR" dans la section Liaison ci-dessous.</value>
   </data>
   <data name="ChannelsPage_GuideSignalStep2" xml:space="preserve">
     <value>Sur votre téléphone : Signal → Paramètres → Appareils liés → Lier un nouvel appareil.</value>
@@ -5303,7 +5697,7 @@ Vérifiez vos paramètres de connexion et réessayez.</value>
     <value>Collez le jeton dans le formulaire de configuration ci-dessous.</value>
   </data>
   <data name="ChannelsPage_GuideTelegramStep4" xml:space="preserve">
-    <value>Cliquez sur &quot;Save and start&quot;. Le canal démarrera automatiquement.</value>
+    <value>Cliquez sur "Save and start". Le canal démarrera automatiquement.</value>
   </data>
   <data name="ChannelsPage_GuideDiscordHeadline" xml:space="preserve">
     <value>Connecter Discord via un webhook</value>
@@ -5312,13 +5706,13 @@ Vérifiez vos paramètres de connexion et réessayez.</value>
     <value>Ouvrez les paramètres de votre serveur Discord → Intégrations → Webhooks.</value>
   </data>
   <data name="ChannelsPage_GuideDiscordStep2" xml:space="preserve">
-    <value>Cliquez sur &quot;New Webhook&quot;, donnez-lui un nom et copiez l’URL du webhook.</value>
+    <value>Cliquez sur "New Webhook", donnez-lui un nom et copiez l’URL du webhook.</value>
   </data>
   <data name="ChannelsPage_GuideDiscordStep3" xml:space="preserve">
     <value>Collez l’URL dans le formulaire de configuration ci-dessous.</value>
   </data>
   <data name="ChannelsPage_GuideDiscordStep4" xml:space="preserve">
-    <value>Cliquez sur &quot;Save and start&quot;.</value>
+    <value>Cliquez sur "Save and start".</value>
   </data>
   <data name="ChannelsPage_GuideGoogleChatHeadline" xml:space="preserve">
     <value>Connecter Google Chat via un webhook</value>
@@ -5333,7 +5727,7 @@ Vérifiez vos paramètres de connexion et réessayez.</value>
     <value>Collez l’URL dans le formulaire de configuration ci-dessous.</value>
   </data>
   <data name="ChannelsPage_GuideGoogleChatStep4" xml:space="preserve">
-    <value>Cliquez sur &quot;Save and start&quot;.</value>
+    <value>Cliquez sur "Save and start".</value>
   </data>
   <data name="ChannelsPage_GuideSlackHeadline" xml:space="preserve">
     <value>Connecter Slack via une application</value>
@@ -5348,7 +5742,7 @@ Vérifiez vos paramètres de connexion et réessayez.</value>
     <value>Collez les deux dans le formulaire de configuration ci-dessous.</value>
   </data>
   <data name="ChannelsPage_GuideSlackStep4" xml:space="preserve">
-    <value>Cliquez sur &quot;Save and start&quot;.</value>
+    <value>Cliquez sur "Save and start".</value>
   </data>
   <data name="ChannelsPage_GuideNostrHeadline" xml:space="preserve">
     <value>Connecter Nostr via des relais</value>
@@ -5363,7 +5757,7 @@ Vérifiez vos paramètres de connexion et réessayez.</value>
     <value>Collez les deux dans le formulaire de configuration ci-dessous.</value>
   </data>
   <data name="ChannelsPage_GuideNostrStep4" xml:space="preserve">
-    <value>Cliquez sur &quot;Save and start&quot;.</value>
+    <value>Cliquez sur "Save and start".</value>
   </data>
   <data name="ChannelsPage_GuideIMessageHeadline" xml:space="preserve">
     <value>iMessage est réservé à macOS</value>
@@ -5381,10 +5775,10 @@ Vérifiez vos paramètres de connexion et réessayez.</value>
     <value>Connecter ce canal</value>
   </data>
   <data name="ChannelsPage_GuideGenericStep1" xml:space="preserve">
-    <value>&quot;{0}&quot; est un canal de plugin. Consultez sa documentation pour connaître les champs requis.</value>
+    <value>"{0}" est un canal de plugin. Consultez sa documentation pour connaître les champs requis.</value>
   </data>
   <data name="ChannelsPage_GuideGenericStep2" xml:space="preserve">
-    <value>Utilisez &quot;Open Config page&quot; dans la section Configuration ci-dessous pour ajouter des paramètres sous channels.{0}.</value>
+    <value>Utilisez "Open Config page" dans la section Configuration ci-dessous pour ajouter des paramètres sous channels.{0}.</value>
   </data>
   <data name="ChannelsPage_GuideGenericStep3" xml:space="preserve">
     <value>Enregistrez la configuration ; OpenClaw démarrera le canal automatiquement.</value>
@@ -5602,12 +5996,6 @@ Vérifiez vos paramètres de connexion et réessayez.</value>
   <data name="Command_GoToDiagnostics_Title" xml:space="preserve">
     <value>Go to Diagnostics</value>
   </data>
-  <data name="Command_GoToInfo_Subtitle" xml:space="preserve">
-    <value>About this app</value>
-  </data>
-  <data name="Command_GoToInfo_Title" xml:space="preserve">
-    <value>Go to Info</value>
-  </data>
   <data name="Command_GoToNotifications_Subtitle" xml:space="preserve">
     <value>Consulter les notifications actives de l'application</value>
   </data>
@@ -5735,13 +6123,358 @@ Vérifiez vos paramètres de connexion et réessayez.</value>
     <value>Waiting for gateway health</value>
   </data>
   <data name="ConfigPage_CheckingConfigPermissions" xml:space="preserve">
-    <value>Checking config permissions</value>
+    <value>Vérification des autorisations de configuration</value>
   </data>
   <data name="ConfigPage_ConfigIsReadOnly" xml:space="preserve">
-    <value>Config is read-only</value>
+    <value>La configuration est en lecture seule</value>
   </data>
   <data name="ConfigPage_ConfigUnavailable" xml:space="preserve">
-    <value>Config unavailable</value>
+    <value>Configuration indisponible</value>
+  </data>
+  <data name="ConfigPage_EditingPathFormat" xml:space="preserve">
+    <value>Modification de {0} via le formulaire guidé par schéma.</value>
+  </data>
+  <data name="ConfigPage_RenderConfigUnavailableTitle" xml:space="preserve">
+    <value>Configuration indisponible</value>
+  </data>
+  <data name="ConfigPage_RenderConfigUnavailableMessage" xml:space="preserve">
+    <value>La configuration de la passerelle n'a pas pu être affichée. Actualisez et réessayez.</value>
+  </data>
+  <data name="ConfigPage_RenderSchemaUnavailableTitle" xml:space="preserve">
+    <value>Schéma indisponible</value>
+  </data>
+  <data name="ConfigPage_RenderSchemaUnavailableMessage" xml:space="preserve">
+    <value>Le schéma de la passerelle n'a pas pu être affiché. Le JSON brut reste disponible en aperçu en lecture seule.</value>
+  </data>
+  <data name="ConfigPage_StatusGatewayRestartingTitle" xml:space="preserve">
+    <value>Redémarrage de la passerelle</value>
+  </data>
+  <data name="ConfigPage_StatusGatewayRestartingMessage" xml:space="preserve">
+    <value>Enregistrement des modifications. La passerelle redémarre et se reconnectera automatiquement.</value>
+  </data>
+  <data name="ConfigPage_StatusNoChangesTitle" xml:space="preserve">
+    <value>Aucune modification</value>
+  </data>
+  <data name="ConfigPage_StatusNoChangesMessage" xml:space="preserve">
+    <value>Il n'y a rien à enregistrer.</value>
+  </data>
+  <data name="ConfigPage_StatusFixValidationErrorsTitle" xml:space="preserve">
+    <value>Corriger les erreurs de validation</value>
+  </data>
+  <data name="ConfigPage_StatusValidationErrorMessageFormat" xml:space="preserve">
+    <value>{0} : {1}</value>
+  </data>
+  <data name="ConfigPage_StatusNotConnectedTitle" xml:space="preserve">
+    <value>Non connecté</value>
+  </data>
+  <data name="ConfigPage_StatusNotConnectedMessage" xml:space="preserve">
+    <value>Connectez-vous à une passerelle avant d'enregistrer la configuration.</value>
+  </data>
+  <data name="ConfigPage_StatusReadOnlyMessage" xml:space="preserve">
+    <value>Ce jeton opérateur ne dispose pas de l'autorisation operator.write ; les modifications de configuration ne peuvent donc pas être enregistrées.</value>
+  </data>
+  <data name="ConfigPage_StatusConfigNotLoadedTitle" xml:space="preserve">
+    <value>Configuration non chargée</value>
+  </data>
+  <data name="ConfigPage_StatusConfigNotLoadedMessage" xml:space="preserve">
+    <value>Actualisez la configuration de la passerelle avant d'enregistrer.</value>
+  </data>
+  <data name="ConfigPage_StatusSavingConfigTitle" xml:space="preserve">
+    <value>Enregistrement de la configuration…</value>
+  </data>
+  <data name="ConfigPage_StatusSavingConfigMessageFormat" xml:space="preserve">
+    <value>Écriture de {0} modification(s) vers la passerelle.</value>
+  </data>
+  <data name="ConfigPage_StatusStaleConfigTitle" xml:space="preserve">
+    <value>La configuration de la passerelle a changé ailleurs</value>
+  </data>
+  <data name="ConfigPage_StatusStaleConfigMessageFormat" xml:space="preserve">
+    <value>Vos modifications sont conservées. La dernière configuration est en cours d'actualisation ; vérifiez le formulaire et réessayez Enregistrer. Détails : {0}</value>
+  </data>
+  <data name="ConfigPage_StatusStaleConfigDefaultDetail" xml:space="preserve">
+    <value>hachage de configuration obsolète</value>
+  </data>
+  <data name="ConfigPage_StatusSaveFailedTitle" xml:space="preserve">
+    <value>Échec de l'enregistrement</value>
+  </data>
+  <data name="ConfigPage_StatusSaveRejectedMessage" xml:space="preserve">
+    <value>La passerelle a rejeté la mise à jour de configuration. Vos modifications sont conservées.</value>
+  </data>
+  <data name="ConfigPage_StatusSaveExceptionMessageFormat" xml:space="preserve">
+    <value>{0} Vos modifications sont conservées.</value>
+  </data>
+  <data name="ConfigPage_SaveStatusCheckingConfigPermissions" xml:space="preserve">
+    <value>Vérification des autorisations de configuration…</value>
+  </data>
+  <data name="ConfigPage_SaveStatusRefreshing" xml:space="preserve">
+    <value>Actualisation…</value>
+  </data>
+  <data name="ConfigPage_StatusChangesDiscardedTitle" xml:space="preserve">
+    <value>Modifications ignorées</value>
+  </data>
+  <data name="ConfigPage_StatusChangesDiscardedMessage" xml:space="preserve">
+    <value>Le formulaire est revenu à la dernière configuration chargée depuis la passerelle.</value>
+  </data>
+  <data name="ConfigPage_FullConfig" xml:space="preserve">
+    <value>Configuration complète</value>
+  </data>
+  <data name="ConfigPage_StatusSectionResetTitle" xml:space="preserve">
+    <value>Section réinitialisée</value>
+  </data>
+  <data name="ConfigPage_StatusSectionResetMessageFormat" xml:space="preserve">
+    <value>{0} est revenu à la dernière valeur chargée depuis la passerelle.</value>
+  </data>
+  <data name="ConfigPage_StatusCopiedJsonDiffTitle" xml:space="preserve">
+    <value>Diff JSON copié</value>
+  </data>
+  <data name="ConfigPage_StatusCopiedJsonDiffMessage" xml:space="preserve">
+    <value>Le diff de la section sélectionnée a été copié dans le presse-papiers.</value>
+  </data>
+  <data name="ConfigPage_StatusGatewayReconnectedTitle" xml:space="preserve">
+    <value>Passerelle reconnectée</value>
+  </data>
+  <data name="ConfigPage_StatusGatewayReconnectedRefreshingMessage" xml:space="preserve">
+    <value>Configuration enregistrée et connexion à la passerelle rétablie. Actualisation de la dernière configuration.</value>
+  </data>
+  <data name="ConfigPage_StatusGatewayReconnectedLoadedMessage" xml:space="preserve">
+    <value>Configuration enregistrée et dernière configuration de la passerelle chargée.</value>
+  </data>
+  <data name="ConfigPage_StatusGatewayStillReconnectingTitle" xml:space="preserve">
+    <value>La passerelle se reconnecte encore</value>
+  </data>
+  <data name="ConfigPage_StatusGatewayStillReconnectingMessage" xml:space="preserve">
+    <value>L'enregistrement de la configuration a été accepté, mais la passerelle ne s'est pas encore reconnectée. Vous pouvez garder cette page ouverte ou utiliser Connexion pour vérifier l'état.</value>
+  </data>
+  <data name="ConfigPage_CheckingConfigPermissionsMessage" xml:space="preserve">
+    <value>En attente du rapport des autorisations de cet opérateur par la passerelle.</value>
+  </data>
+  <data name="ConfigPage_ConfigUnavailableMessage" xml:space="preserve">
+    <value>Ce jeton opérateur ne dispose pas de l'autorisation operator.read ; la configuration de la passerelle ne peut donc pas être chargée ici.</value>
+  </data>
+  <data name="ConfigPage_ConfigIsReadOnlyMessage" xml:space="preserve">
+    <value>Ce jeton opérateur peut lire la configuration, mais ne dispose pas de l'autorisation operator.write. Vous pouvez inspecter et valider les brouillons, mais Enregistrer est désactivé.</value>
+  </data>
+  <data name="ConfigPage_MetaNoUnsavedChanges" xml:space="preserve">
+    <value>Aucune modification non enregistrée.</value>
+  </data>
+  <data name="ConfigPage_MetaUnsavedChangesFormat" xml:space="preserve">
+    <value>{0} modification(s) non enregistrée(s)</value>
+  </data>
+  <data name="ConfigPage_MetaUnsavedChangesWithValidationFormat" xml:space="preserve">
+    <value>{0} modification(s) non enregistrée(s) · {1} problème(s) de validation</value>
+  </data>
+  <data name="ConfigPage_SaveStatusSaving" xml:space="preserve">
+    <value>Enregistrement…</value>
+  </data>
+  <data name="ConfigPage_SaveStatusGatewayRestarting" xml:space="preserve">
+    <value>Redémarrage de la passerelle…</value>
+  </data>
+  <data name="ConfigPage_SaveStatusConnectToGateway" xml:space="preserve">
+    <value>Connectez-vous à une passerelle pour modifier</value>
+  </data>
+  <data name="ConfigPage_SaveStatusCheckingPermissions" xml:space="preserve">
+    <value>Vérification des autorisations…</value>
+  </data>
+  <data name="ConfigPage_SaveStatusMissingRead" xml:space="preserve">
+    <value>Configuration indisponible : operator.read manquant</value>
+  </data>
+  <data name="ConfigPage_SaveStatusReadOnlyMissingWrite" xml:space="preserve">
+    <value>Lecture seule : operator.write manquant</value>
+  </data>
+  <data name="ConfigPage_SaveStatusFixValidationBeforeSaving" xml:space="preserve">
+    <value>Corrigez les erreurs de validation avant d'enregistrer</value>
+  </data>
+  <data name="ConfigPage_SaveStatusUnsavedChanges" xml:space="preserve">
+    <value>Modifications non enregistrées</value>
+  </data>
+  <data name="ConfigPage_SaveStatusNoUnsavedChanges" xml:space="preserve">
+    <value>Aucune modification non enregistrée</value>
+  </data>
+  <data name="ConfigPage_AccessDisconnected" xml:space="preserve">
+    <value>Déconnecté</value>
+  </data>
+  <data name="ConfigPage_AccessChecking" xml:space="preserve">
+    <value>Vérification de l'accès</value>
+  </data>
+  <data name="ConfigPage_AccessNoRead" xml:space="preserve">
+    <value>Aucun accès en lecture à la configuration</value>
+  </data>
+  <data name="ConfigPage_AccessReadOnly" xml:space="preserve">
+    <value>Accès en lecture seule</value>
+  </data>
+  <data name="ConfigPage_AccessReadWrite" xml:space="preserve">
+    <value>Accès en lecture/écriture</value>
+  </data>
+  <data name="ConfigPage_AccessUnknown" xml:space="preserve">
+    <value>Accès inconnu</value>
+  </data>
+  <data name="ConfigPage_AccessChangesFormat" xml:space="preserve">
+    <value>{0} modification(s)</value>
+  </data>
+  <data name="ConfigPage_AccessValidationClean" xml:space="preserve">
+    <value>Validation locale correcte</value>
+  </data>
+  <data name="ConfigPage_AccessValidationIssuesFormat" xml:space="preserve">
+    <value>{0} problème(s) de validation</value>
+  </data>
+  <data name="ConfigPage_AccessSummaryFormat" xml:space="preserve">
+    <value>{0} · {1} · {2}</value>
+  </data>
+  <data name="DebugPage_NoGatewayConfigured" xml:space="preserve">
+    <value>aucune passerelle configurée</value>
+  </data>
+  <data name="DebugPage_StatusConnectedFormat" xml:space="preserve">
+    <value>OpenClaw est connecté à {0}.</value>
+  </data>
+  <data name="DebugPage_StatusConnectingFormat" xml:space="preserve">
+    <value>Connexion à {0}…</value>
+  </data>
+  <data name="DebugPage_StatusDisconnectedFormat" xml:space="preserve">
+    <value>Non connecté. Passerelle : {0}.</value>
+  </data>
+  <data name="DebugPage_StatusErrorFormat" xml:space="preserve">
+    <value>Dernière passerelle : {0}. Consultez la chronologie des événements.</value>
+  </data>
+  <data name="DebugPage_StatusGatewayFormat" xml:space="preserve">
+    <value>Passerelle : {0}.</value>
+  </data>
+  <data name="DebugPage_RecentLogTitle" xml:space="preserve">
+    <value>Journal récent</value>
+  </data>
+  <data name="DebugPage_RecentLogCaptionFormat" xml:space="preserve">
+    <value>Les 200 dernières lignes de {0}. La gravité est analysée à partir des balises [info]/[warn]/[error].</value>
+  </data>
+  <data name="DebugPage_CopyFeedbackFormat" xml:space="preserve">
+    <value>{0} copié dans le presse-papiers.</value>
+  </data>
+  <data name="SandboxPage_StatusUnavailableTitle" xml:space="preserve">
+    <value>Sandbox du nœud indisponible — repli sur l'hôte</value>
+  </data>
+  <data name="SandboxPage_StatusUnavailableSubtext" xml:space="preserve">
+    <value>Le confinement n'est pas disponible sur ce PC ; les commandes lancées par l'agent s'exécutent donc sur l'hôte sans protection de sandbox.</value>
+  </data>
+  <data name="SandboxPage_StatusUnavailableBlockedTitle" xml:space="preserve">
+    <value>Sandbox du nœud indisponible — commandes bloquées</value>
+  </data>
+  <data name="SandboxPage_StatusUnavailableBlockedSubtext" xml:space="preserve">
+    <value>Le confinement n'est pas disponible sur ce PC et le blocage strict du repli est activé ; les commandes lancées par l'agent sont donc bloquées.</value>
+  </data>
+  <data name="SandboxPage_StatusUnavailableOffTitle" xml:space="preserve">
+    <value>Le Sandbox du nœud est désactivé — exécution sur l'hôte</value>
+  </data>
+  <data name="SandboxPage_StatusUnavailableOffSubtext" xml:space="preserve">
+    <value>Le confinement n'est pas disponible et le Sandbox du nœud est désactivé ; les commandes lancées par l'agent s'exécutent donc sur l'hôte sans protection de sandbox.</value>
+  </data>
+  <data name="SandboxPage_StatusOnTitle" xml:space="preserve">
+    <value>Le Sandbox du nœud est activé</value>
+  </data>
+  <data name="SandboxPage_StatusOnSubtext" xml:space="preserve">
+    <value>Les programmes exécutés par l'agent sur ce PC sont confinés.</value>
+  </data>
+  <data name="SandboxPage_StatusOffTitle" xml:space="preserve">
+    <value>Le Sandbox du nœud est désactivé — risque élevé</value>
+  </data>
+  <data name="SandboxPage_StatusOffSubtext" xml:space="preserve">
+    <value>Les programmes exécutés par l'agent sur ce PC ne sont pas confinés.</value>
+  </data>
+  <data name="SandboxPage_UnavailableDefaultReason" xml:space="preserve">
+    <value>Les primitives de sandboxing MXC ne sont pas disponibles sur cette machine.</value>
+  </data>
+  <data name="SandboxPage_ProbeErrorReason" xml:space="preserve">
+    <value>Impossible de vérifier la disponibilité du sandbox.</value>
+  </data>
+  <data name="SandboxPage_UnavailableBehaviorHostFallback" xml:space="preserve">
+    <value>Les commandes s'exécuteront sur l'hôte sans protection de sandbox tant que le sandboxing est indisponible.</value>
+  </data>
+  <data name="SandboxPage_UnavailableBehaviorBlocked" xml:space="preserve">
+    <value>Les commandes sont bloquées tant que le sandboxing est indisponible, car le blocage strict du repli est activé.</value>
+  </data>
+  <data name="SandboxPage_ProbeErrorTitle" xml:space="preserve">
+    <value>Impossible de vérifier la disponibilité du sandbox</value>
+  </data>
+  <data name="SandboxPage_ProbeErrorMessageFormat" xml:space="preserve">
+    <value>{0}
+
+{1} La vérification des capacités du sandbox ne s'est pas terminée. C'est généralement transitoire (vérification lente ou bloquée) — réessayez, et si le problème persiste, vérifiez si un logiciel de sécurité bloque wxc-exec.</value>
+  </data>
+  <data name="SandboxPage_Retry" xml:space="preserve">
+    <value>Réessayer</value>
+  </data>
+  <data name="SandboxPage_WindowsUnsupportedTitle" xml:space="preserve">
+    <value>Votre version de Windows ne prend pas encore en charge le sandboxing</value>
+  </data>
+  <data name="SandboxPage_WindowsUnsupportedMessageFormat" xml:space="preserve">
+    <value>{0}
+
+{1} Le sandboxing nécessite une version récente de Windows avec les primitives AppContainer. Installez les dernières mises à jour Windows (ou rejoignez le programme Windows Insider pour les versions les plus récentes) afin d'activer le confinement.</value>
+  </data>
+  <data name="SandboxPage_OpenWindowsUpdate" xml:space="preserve">
+    <value>Ouvrir Windows Update</value>
+  </data>
+  <data name="SandboxPage_ComponentsMissingTitle" xml:space="preserve">
+    <value>Des composants de sandboxing sont manquants</value>
+  </data>
+  <data name="SandboxPage_ComponentsMissingMessageFormat" xml:space="preserve">
+    <value>{0}
+
+Le binaire wxc-exec est introuvable. {1} S'il s'agit d'une build développeur, compilez l'application Tray pour copier wxc-exec.exe dans le dossier de sortie. Sinon, réinstallez le compagnon pour restaurer le sandboxing.</value>
+  </data>
+  <data name="SandboxPage_ShowInstallInstructions" xml:space="preserve">
+    <value>Afficher les instructions d'installation</value>
+  </data>
+  <data name="SandboxPage_UnavailableTitle" xml:space="preserve">
+    <value>Sandbox indisponible — repli sur l'hôte</value>
+  </data>
+  <data name="SandboxPage_UnavailableBlockedTitle" xml:space="preserve">
+    <value>Sandbox indisponible — commandes bloquées</value>
+  </data>
+  <data name="SettingsPage_LocalGatewayRemovedTitle" xml:space="preserve">
+    <value>Passerelle locale supprimée</value>
+  </data>
+  <data name="SettingsPage_LocalGatewayRemovedMessage" xml:space="preserve">
+    <value>La configuration est réinitialisée ; vous pouvez relancer la configuration depuis le menu de la barre d'état.</value>
+  </data>
+  <data name="SettingsPage_LocalGatewayRemovalErrorsMessage" xml:space="preserve">
+    <value>La suppression s'est terminée avec des erreurs. Consultez les journaux pour plus de détails.</value>
+  </data>
+  <data name="SettingsPage_LocalGatewayRemovalCancelledTitle" xml:space="preserve">
+    <value>Suppression annulée</value>
+  </data>
+  <data name="SettingsPage_LocalGatewayRemovalCancelledMessage" xml:space="preserve">
+    <value>La passerelle peut être dans un état partiellement supprimé. Consultez les journaux ou réessayez.</value>
+  </data>
+  <data name="SettingsPage_ViewLogs" xml:space="preserve">
+    <value>Afficher les journaux</value>
+  </data>
+  <data name="SettingsPage_LocalGatewayRemovalFailedTitle" xml:space="preserve">
+    <value>Échec de la suppression</value>
+  </data>
+  <data name="SettingsPage_RemoveLocalGatewayButton" xml:space="preserve">
+    <value>Supprimer la passerelle locale</value>
+  </data>
+  <data name="SettingsPage_RemovingDistro" xml:space="preserve">
+    <value>Suppression de la distribution…</value>
+  </data>
+  <data name="SettingsPage_RemovingLocalGatewayMessage" xml:space="preserve">
+    <value>Suppression de la passerelle locale. Cela peut prendre 10 à 30 secondes…</value>
+  </data>
+  <data name="CronPage_NextWakeFormat" xml:space="preserve">
+    <value>· Prochain réveil : {0}</value>
+  </data>
+  <data name="ChatWindow_UnableToLoadChatCredentials" xml:space="preserve">
+    <value>Impossible de charger le chat. L'URL ou le jeton de la passerelle n'est pas disponible.</value>
+  </data>
+  <data name="ChatWindow_UnableToLoadChatRetryFormat" xml:space="preserve">
+    <value>Impossible de charger le chat. Réessayez. ({0})</value>
+  </data>
+  <data name="ChatWindow_WebViewFailedFormat" xml:space="preserve">
+    <value>Échec de WebView2 : {0}</value>
+  </data>
+  <data name="CanvasWindow_WebViewInitFailedFormat" xml:space="preserve">
+    <value>Échec de l'initialisation de WebView2 : {0}</value>
+  </data>
+  <data name="CanvasWindow_NavigationFailedFormat" xml:space="preserve">
+    <value>Échec de la navigation : {0}</value>
   </data>
   <data name="ConnectionPage_GatewayHostControlsDescription_Format" xml:space="preserve">
     <value>Open a shell or manage the local gateway service in {0}.</value>
@@ -5750,7 +6483,16 @@ Vérifiez vos paramètres de connexion et réessayez.</value>
     <value>Job completed</value>
   </data>
   <data name="CronPage_JobCompletedRanSuccessfully" xml:space="preserve">
-    <value>&quot;{0}&quot; ran successfully and was removed.</value>
+    <value>"{0}" ran successfully and was removed.</value>
+  </data>
+  <data name="CronPage_RunNotStarted" xml:space="preserve">
+    <value>Exécution non démarrée</value>
+  </data>
+  <data name="CronPage_RunNotStartedGeneric" xml:space="preserve">
+    <value>{0} n’a pas été démarrée.</value>
+  </data>
+  <data name="CronPage_RunNotStartedWithReason" xml:space="preserve">
+    <value>{0} n’a pas été démarrée : {1}</value>
   </data>
   <data name="GatewayHostAccess_NoTerminalAccess" xml:space="preserve">
     <value>This gateway does not have WSL or SSH terminal access.</value>
@@ -5818,6 +6560,24 @@ Vérifiez vos paramètres de connexion et réessayez.</value>
   <data name="ConnectionPage_NodeSurfaceNone" xml:space="preserve">
     <value>none</value>
   </data>
+  <data name="ConnectionPage_NodeTechnicalDetails.Text" xml:space="preserve">
+    <value>Show technical details</value>
+  </data>
+  <data name="ConnectionPage_NodePillState_Active" xml:space="preserve">
+    <value>Sharing now</value>
+  </data>
+  <data name="ConnectionPage_NodePillState_Pending" xml:space="preserve">
+    <value>Enabled, not active yet</value>
+  </data>
+  <data name="ConnectionPage_NodePillState_Off" xml:space="preserve">
+    <value>Off</value>
+  </data>
+  <data name="ConnectionPage_NodeCap_Device" xml:space="preserve">
+    <value>Device info</value>
+  </data>
+  <data name="ConnectionPage_NodeCap_System" xml:space="preserve">
+    <value>System access</value>
+  </data>
   <data name="ConnectionPage_NodeEffectiveCapabilities" xml:space="preserve">
     <value>Approved/effective capabilities: {0}</value>
   </data>
@@ -5836,4 +6596,223 @@ Vérifiez vos paramètres de connexion et réessayez.</value>
   <data name="ConnectionPage_NodePendingDeclaredPermissions" xml:space="preserve">
     <value>Pending declared permissions: {0}</value>
   </data>
+  <data name="ConnectionPage_AdviceCleartextTitle" xml:space="preserve">
+    <value>Connexion non chiffrée</value>
+  </data>
+  <data name="ConnectionPage_AdviceCleartextMessage" xml:space="preserve">
+    <value>Cette gateway distante utilise ws:// — votre token serait envoyé en clair. Utilisez wss:// (TLS), un tunnel SSH, ou un proxy de confiance / Tailscale.</value>
+  </data>
+  <data name="ConnectionPage_AdviceSecureTitle" xml:space="preserve">
+    <value>Chiffré (TLS)</value>
+  </data>
+  <data name="ConnectionPage_AdviceSecureMessage" xml:space="preserve">
+    <value>Cette gateway utilise TLS. Votre token est protégé en transit lorsque le certificat est validé.</value>
+  </data>
+  <data name="ConnectionPage_AdviceTunnelTitle" xml:space="preserve">
+    <value>Tunnel SSH</value>
+  </data>
+  <data name="ConnectionPage_AdviceTunnelMessage" xml:space="preserve">
+    <value>Le trafic vers cette gateway est chiffré via le tunnel SSH.</value>
+  </data>
+  <data name="ConnectionPage_RecoveryHeaderTokenDrift" xml:space="preserve">
+    <value>Réappairer cet appareil :</value>
+  </data>
+  <data name="ConnectionPage_RecoveryHeaderScope" xml:space="preserve">
+    <value>Mettre à niveau l'accès de cet appareil :</value>
+  </data>
+  <data name="ConnectionPage_RecoveryHeaderTls" xml:space="preserve">
+    <value>Corriger la connexion sécurisée :</value>
+  </data>
+  <data name="ConnectionPage_RecoveryTokenDriftBullet1" xml:space="preserve">
+    <value>La gateway ne fait plus confiance au token enregistré de cet appareil (il a été renouvelé ou révoqué).</value>
+  </data>
+  <data name="ConnectionPage_RecoveryTokenDriftBullet2" xml:space="preserve">
+    <value>Obtenez un nouveau code de configuration depuis l'hôte de la gateway et collez-le ci-dessous pour réappairer.</value>
+  </data>
+  <data name="ConnectionPage_RecoveryScopeBullet1" xml:space="preserve">
+    <value>Cet appareil est authentifié mais il manque les scopes nécessaires (par exemple operator.admin ou operator.pairing).</value>
+  </data>
+  <data name="ConnectionPage_RecoveryScopeBullet2" xml:space="preserve">
+    <value>Réappairez avec un nouveau code de configuration pour demander les scopes requis, ou approuvez les scopes supérieurs sur l'hôte de la gateway.</value>
+  </data>
+  <data name="ConnectionPage_RecoveryTlsBullet1" xml:space="preserve">
+    <value>Le transport TLS/sécurisé de la gateway n'a pas pu être établi.</value>
+  </data>
+  <data name="ConnectionPage_RecoveryTlsBullet2" xml:space="preserve">
+    <value>Vérifiez le certificat sur l'hôte de la gateway, ou connectez-vous via wss:// ou un tunnel SSH.</value>
+  </data>
+  <data name="ConnectionPage_TokenOrPasswordHint.Text" xml:space="preserve">
+    <value>Collez un token de gateway partagé, ou laissez-le vide pour appairer avec un code de configuration.</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpDirect.Text" xml:space="preserve">
+    <value>Connectez-vous à wss:// ou https:// lorsque la gateway possède un certificat de confiance. Votre token est chiffré en transit après validation du certificat.</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpTunnel.Text" xml:space="preserve">
+    <value>Lorsque la gateway n'écoute que sur localhost, développez « Utiliser un tunnel SSH » ci-dessous. La tray transfère un port local via SSH afin que le trafic reste chiffré.</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpProxy.Text" xml:space="preserve">
+    <value>Si Tailscale ou un reverse proxy chiffre déjà le chemin, une simple URL ws:// sur ce réseau privé convient.</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpAuth.Text" xml:space="preserve">
+    <value>Collez un token partagé, ou laissez-le vide et appairez avec un code de configuration. Le réappairage met aussi à niveau les scopes de cet appareil.</value>
+  </data>
+  <data name="ConnectionPage_RecoveryHeaderRateLimited" xml:space="preserve">
+    <value>Attendez avant de vous reconnecter :</value>
+  </data>
+  <data name="ConnectionPage_RecoveryRateLimitedBullet1" xml:space="preserve">
+    <value>La gateway limite temporairement ce client après plusieurs tentatives échouées.</value>
+  </data>
+  <data name="ConnectionPage_RecoveryRateLimitedBullet2" xml:space="preserve">
+    <value>Arrêtez les nouvelles tentatives un moment, puis reconnectez-vous après avoir corrigé le token, le mot de passe ou l’état d’appairage.</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpLink.Text" xml:space="preserve">
+    <value>Comment me connecter à une gateway distante ?</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpTip.Title" xml:space="preserve">
+    <value>Se connecter à une gateway distante</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpDirectTitle.Text" xml:space="preserve">
+    <value>Connexion directe (TLS)</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpTunnelTitle.Text" xml:space="preserve">
+    <value>Tunnel SSH</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpProxyTitle.Text" xml:space="preserve">
+    <value>Proxy de confiance / Tailscale</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpAuthTitle.Text" xml:space="preserve">
+    <value>Authentification</value>
+  </data>
+  <data name="HubWindow_StatusFlyout_Title.Text" xml:space="preserve">
+    <value>Connection</value>
+  </data>
+  <data name="HubWindow_StatusFlyout_OpenConnection.Content" xml:space="preserve">
+    <value>Open Connection</value>
+  </data>
+  <data name="HubWindow_StatusFlyout_GatewayLabel.Text" xml:space="preserve">
+    <value>Gateway</value>
+  </data>
+  <data name="HubWindow_StatusFlyout_Reconnect.Content" xml:space="preserve">
+    <value>Reconnect</value>
+  </data>
+  <data name="HubWindow_StatusFlyout_OperatorLabel.Text" xml:space="preserve">
+    <value>Operator</value>
+  </data>
+  <data name="HubWindow_StatusFlyout_NodeLabel.Text" xml:space="preserve">
+    <value>Node</value>
+  </data>
+  <data name="HubWindow_StatusFlyout_Approve.Content" xml:space="preserve">
+    <value>Approve…</value>
+  </data>
+  <data name="HubWindow_StatusPill_Tooltip" xml:space="preserve">
+    <value>Connection status</value>
+  </data>
+  <data name="HubWindow_Bell_Tooltip" xml:space="preserve">
+    <value>Notifications</value>
+  </data>
+  <data name="HubWindow_Pill_Ready" xml:space="preserve">
+    <value>Ready</value>
+  </data>
+  <data name="HubWindow_Pill_PairingRequired" xml:space="preserve">
+    <value>Pairing required</value>
+  </data>
+  <data name="HubWindow_Pill_Degraded" xml:space="preserve">
+    <value>Degraded</value>
+  </data>
+  <data name="HubWindow_Role_Off" xml:space="preserve">
+    <value>Off</value>
+  </data>
+  <data name="HubWindow_Role_PairingRequired" xml:space="preserve">
+    <value>Pairing required</value>
+  </data>
+  <data name="HubWindow_Role_PairingRejected" xml:space="preserve">
+    <value>Pairing rejected</value>
+  </data>
+  <data name="HubWindow_Role_RateLimited" xml:space="preserve">
+    <value>Rate limited</value>
+  </data>
+  <data name="HubWindow_Role_Disabled" xml:space="preserve">
+    <value>Disabled</value>
+  </data>
+  <data name="NotificationsFlyout_ClearAll.Content" xml:space="preserve">
+    <value>Clear all</value>
+  </data>
+  <data name="NotificationsFlyout_EmptyTitle.Text" xml:space="preserve">
+    <value>No notifications</value>
+  </data>
+  <data name="NotificationsFlyout_OpenPage.Content" xml:space="preserve">
+    <value>Open notifications</value>
+  </data>
+  <data name="NotificationsFlyout_ActiveCountFormat" xml:space="preserve">
+    <value>{0} active</value>
+  </data>
+  <data name="HubWindow_Role_PermissionsIncomplete" xml:space="preserve">
+    <value>Permissions incomplete</value>
+  </data>
+  <data name="SettingsPage_About.Text" xml:space="preserve">
+    <value>About</value>
+  </data>
+  <data name="SettingsPage_GatewayInfoExpander.Header" xml:space="preserve">
+    <value>Gateway info</value>
+  </data>
+  <data name="SettingsPage_GatewayInfoLabel_Version.Text" xml:space="preserve">
+    <value>Version</value>
+  </data>
+  <data name="SettingsPage_GatewayInfoLabel_Protocol.Text" xml:space="preserve">
+    <value>Protocol</value>
+  </data>
+  <data name="SettingsPage_GatewayInfoLabel_AuthMode.Text" xml:space="preserve">
+    <value>Auth mode</value>
+  </data>
+  <data name="SettingsPage_GatewayInfoLabel_Uptime.Text" xml:space="preserve">
+    <value>Uptime</value>
+  </data>
+  <data name="PermissionsPage_NewRuleAction.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Action de la règle</value>
+  </data>
+  <data name="SandboxPage_UnavailablePrimaryButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Action du bac à sable</value>
+  </data>
+  <data name="SandboxPage_PresetLockedButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Préréglage verrouillé : aucun accès Internet, aucun presse-papiers, aucun dossier utilisateur standard</value>
+  </data>
+  <data name="SandboxPage_PresetBalancedButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Préréglage recommandé : accès Internet activé, lecture seule pour Documents, Téléchargements et Bureau</value>
+  </data>
+  <data name="SandboxPage_PresetPermissiveButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Préréglage non protégé : accès Internet activé, lecture et écriture pour Documents, Téléchargements et Bureau</value>
+  </data>
+  <data name="SandboxPage_DocsAccessCombo.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Niveau d’accès aux Documents</value>
+  </data>
+  <data name="SandboxPage_DownloadsAccessCombo.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Niveau d’accès aux Téléchargements</value>
+  </data>
+  <data name="SandboxPage_DesktopAccessCombo.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Niveau d’accès au Bureau</value>
+  </data>
+  <data name="SettingsPage_NotificationSoundComboBox.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Son de notification</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantRefreshButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Actualiser l’état de l’assistant vocal</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStartButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Démarrer l’assistant vocal</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStopButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Arrêter l’assistant vocal</value>
+  </data>
+  <data name="VoiceSettingsPage_LanguageCombo.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Langue vocale</value>
+  </data>
+  <data name="HubWindow_MainNavigation.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Navigation principale</value>
+  </data>
+  <data name="JsonPreviewSplitter.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Redimensionner l’aperçu JSON</value>
+  </data>
+  <data name="JsonPreviewSplitter.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.LocalizedControlType" xml:space="preserve">
+    <value>séparateur</value>
+  </data>
 </root>
diff --git a/src/OpenClaw.Tray.WinUI/Strings/nl-nl/Resources.resw b/src/OpenClaw.Tray.WinUI/Strings/nl-nl/Resources.resw
index 8997fa1db..7d325b012 100644
--- a/src/OpenClaw.Tray.WinUI/Strings/nl-nl/Resources.resw
+++ b/src/OpenClaw.Tray.WinUI/Strings/nl-nl/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root xmlns:ns1="urn:schemas-microsoft-com:xml-msdata" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:schema id="root">
     <xs:element name="root" ns1:IsDataSet="true">
@@ -368,6 +368,9 @@
   <data name="Update_Message_Skipped_Debug" xml:space="preserve">
     <value>Updatecontroles zijn uitgeschakeld in debug-builds.</value>
   </data>
+  <data name="Update_Message_Skipped_Dev" xml:space="preserve">
+    <value>Updatecontroles zijn uitgeschakeld in ontwikkelbuilds.</value>
+  </data>
   <data name="Update_OK" xml:space="preserve">
     <value>OK</value>
   </data>
@@ -649,6 +652,75 @@ Gebruik een van deze opties:
   <data name="Toast_PairingCommandCopied" xml:space="preserve">
     <value>Koppelingsopdracht gekopieerd</value>
   </data>
+  <data name="Toast_PairingRequestTitle" xml:space="preserve">
+    <value>Koppelingsverzoek</value>
+  </data>
+  <data name="Toast_PairingRequestBody" xml:space="preserve">
+    <value>{0} wil verbinding maken</value>
+  </data>
+  <data name="Toast_PairingRequestBodyNode" xml:space="preserve">
+    <value>{0} wil verbinding maken als node</value>
+  </data>
+  <data name="Toast_PairingReview" xml:space="preserve">
+    <value>Bekijken</value>
+  </data>
+  <data name="Toast_PairingApprovedTitle" xml:space="preserve">
+    <value>Koppeling goedgekeurd</value>
+  </data>
+  <data name="Toast_PairingApprovedBody" xml:space="preserve">
+    <value>{0} kan nu verbinding maken</value>
+  </data>
+  <data name="Toast_PairingRejectedTitle" xml:space="preserve">
+    <value>Koppeling geweigerd</value>
+  </data>
+  <data name="Toast_PairingRejectedBody" xml:space="preserve">
+    <value>{0} mocht geen verbinding maken</value>
+  </data>
+  <data name="PairingApproval_WindowTitle" xml:space="preserve">
+    <value>Koppelingsverzoek</value>
+  </data>
+  <data name="PairingApproval_DeviceHeading" xml:space="preserve">
+    <value>Een apparaat wil verbinding maken</value>
+  </data>
+  <data name="PairingApproval_NodeHeading" xml:space="preserve">
+    <value>Een node wil verbinding maken</value>
+  </data>
+  <data name="PairingApproval_Subtitle" xml:space="preserve">
+    <value>Keur dit alleen goed als je dit verzoek herkent. Je kunt het later verwijderen in de verbindingsinstellingen.</value>
+  </data>
+  <data name="PairingApproval_AccessRequested" xml:space="preserve">
+    <value>Gevraagde toegang</value>
+  </data>
+  <data name="PairingApproval_RepairBadge" xml:space="preserve">
+    <value>Verzoek om opnieuw te koppelen — het apparaattoken wordt vernieuwd.</value>
+  </data>
+  <data name="PairingApproval_Approve" xml:space="preserve">
+    <value>Goedkeuren</value>
+  </data>
+  <data name="PairingApproval_ApproveDevice" xml:space="preserve">
+    <value>Apparaat goedkeuren</value>
+  </data>
+  <data name="PairingApproval_ApproveNode" xml:space="preserve">
+    <value>Node goedkeuren</value>
+  </data>
+  <data name="PairingApproval_Reject" xml:space="preserve">
+    <value>Weigeren</value>
+  </data>
+  <data name="PairingApproval_Later" xml:space="preserve">
+    <value>Later beslissen</value>
+  </data>
+  <data name="PairingApproval_MoreWaiting" xml:space="preserve">
+    <value>Nog {0} in wachtrij</value>
+  </data>
+  <data name="PairingApproval_ApproveHint" xml:space="preserve">
+    <value>Goedkeuren komt zo beschikbaar</value>
+  </data>
+  <data name="PairingApproval_UnknownDevice" xml:space="preserve">
+    <value>Onbekend apparaat</value>
+  </data>
+  <data name="PairingApproval_UnknownPlatform" xml:space="preserve">
+    <value>Onbekend platform</value>
+  </data>
   <data name="Toast_NodePaired" xml:space="preserve">
     <value>✅ Node gekoppeld!</value>
   </data>
@@ -776,156 +848,6 @@ Gebruik een van deze opties:
   <data name="Toast_ActivityStreamTipButton" xml:space="preserve">
     <value>Activiteitenstroom openen</value>
   </data>
-  <data name="Setup_Title" xml:space="preserve">
-    <value>OpenClaw Instellen</value>
-  </data>
-  <data name="Setup_StepConnect" xml:space="preserve">
-    <value>Stap 1 van 3 — Verbinden</value>
-  </data>
-  <data name="Setup_ConnectTitle" xml:space="preserve">
-    <value>Verbind met uw gateway</value>
-  </data>
-  <data name="Setup_ConnectDescription" xml:space="preserve">
-    <value>Voer op uw gateway-host (Mac/Linux) deze opdracht uit om een installatiecode te krijgen:</value>
-  </data>
-  <data name="Setup_SetupCodeHeader" xml:space="preserve">
-    <value>Installatiecode</value>
-  </data>
-  <data name="Setup_SetupCodePlaceholder" xml:space="preserve">
-    <value>Plak de installatiecode van uw gateway-dashboard</value>
-  </data>
-  <data name="Setup_PasteSetupButton" xml:space="preserve">
-    <value>Setupcode / QR plakken</value>
-  </data>
-  <data name="Setup_ImportQrButton" xml:space="preserve">
-    <value>QR-afbeelding importeren...</value>
-  </data>
-  <data name="Setup_QrDecoded" xml:space="preserve">
-    <value>✅ QR-afbeelding gedecodeerd — klik op Verbinding testen</value>
-  </data>
-  <data name="Setup_QrDecodeFailed" xml:space="preserve">
-    <value>❌ Geen geldige setup-QR-code gevonden in die afbeelding.</value>
-  </data>
-  <data name="Setup_ClipboardUnsupported" xml:space="preserve">
-    <value>❌ Het klembord bevat geen setupcodetekst of QR-afbeelding.</value>
-  </data>
-  <data name="Setup_ManualEntryToggle" xml:space="preserve">
-    <value>Of voer URL en token handmatig in ▾</value>
-  </data>
-  <data name="Setup_ManualEntryToggleHide" xml:space="preserve">
-    <value>Handmatige invoer verbergen ▴</value>
-  </data>
-  <data name="Setup_GatewayUrlHeader" xml:space="preserve">
-    <value>Gateway-URL</value>
-  </data>
-  <data name="Setup_GatewayUrlPlaceholder" xml:space="preserve">
-    <value>ws://192.168.1.x:18789</value>
-  </data>
-  <data name="Setup_GatewayUrlHint" xml:space="preserve">
-    <value>💡 Accepteert ws://, wss://, http:// of https://</value>
-  </data>
-  <data name="Setup_TokenHeader" xml:space="preserve">
-    <value>Gateway-token</value>
-  </data>
-  <data name="Setup_TokenPlaceholder" xml:space="preserve">
-    <value>Plak hier uw token</value>
-  </data>
-  <data name="Setup_TestButton" xml:space="preserve">
-    <value>Verbinding testen</value>
-  </data>
-  <data name="Setup_Testing" xml:space="preserve">
-    <value>⏳ Verbinden met gateway...</value>
-  </data>
-  <data name="Setup_Connected" xml:space="preserve">
-    <value>✅ Verbonden!</value>
-  </data>
-  <data name="Setup_PairingRequired" xml:space="preserve">
-    <value>✅ Gateway bereikt! Apparaat moet worden goedgekeurd voor koppeling.
-
-Voer op uw gateway-host (Mac/Linux) uit:
-
-  openclaw devices approve {0}</value>
-  </data>
-  <data name="Setup_TokenMismatch" xml:space="preserve">
-    <value>❌ Token komt niet overeen.
-
-💡 Controleer het gateway-verificatietoken:
-  cat ~/.openclaw/openclaw.json | grep token</value>
-  </data>
-  <data name="Setup_OriginNotAllowed" xml:space="preserve">
-    <value>❌ Oorsprong niet toegestaan.
-
-💡 Voeg deze machine toe aan gateway.controlUi.allowedOrigins.</value>
-  </data>
-  <data name="Setup_RateLimited" xml:space="preserve">
-    <value>❌ Te veel verzoeken. Wacht een minuut en probeer opnieuw.</value>
-  </data>
-  <data name="Setup_TimedOut" xml:space="preserve">
-    <value>❌ Time-out. Controleer de URL en of de gateway draait.</value>
-  </data>
-  <data name="Setup_TokenRequired" xml:space="preserve">
-    <value>❌ Voer een token in</value>
-  </data>
-  <data name="Setup_TestFirst" xml:space="preserve">
-    <value>⚠️ Test eerst de verbinding</value>
-  </data>
-  <data name="Setup_CodeDecoded" xml:space="preserve">
-    <value>✅ Installatiecode gedecodeerd — druk op Verbinding testen</value>
-  </data>
-  <data name="Setup_NodeModeTitle" xml:space="preserve">
-    <value>Knooppuntmodus inschakelen (optioneel)</value>
-  </data>
-  <data name="Setup_NodeModeDescription" xml:space="preserve">
-    <value>Knooppuntmodus laat uw Windows-machine taken uitvoeren voor OpenClaw — zoals schermopname, cameratoegang en canvas-tekenen.</value>
-  </data>
-  <data name="Setup_NodeModeSecurityTitle" xml:space="preserve">
-    <value>Schakel knooppuntmodus alleen in voor gateways en agents die u vertrouwt</value>
-  </data>
-  <data name="Setup_NodeModeSecurityMessage" xml:space="preserve">
-    <value>Goedgekeurde agents kunnen lokale opdrachten uitvoeren en toegang krijgen tot ingeschakelde oppervlakken zoals scherm, camera, locatie, browser en canvas. U kunt capaciteitsgroepen later uitschakelen in Instellingen.</value>
-  </data>
-  <data name="Setup_NodeModeToggle" xml:space="preserve">
-    <value>Knooppuntmodus inschakelen</value>
-  </data>
-  <data name="Setup_DeviceIdLoading" xml:space="preserve">
-    <value>Apparaat-ID: laden...</value>
-  </data>
-  <data name="Setup_DeviceIdFallback" xml:space="preserve">
-    <value>Apparaat-ID: (wordt gegenereerd bij eerste verbinding)</value>
-  </data>
-  <data name="Setup_CopyDeviceId" xml:space="preserve">
-    <value>📋 Apparaat-ID kopiëren</value>
-  </data>
-  <data name="Setup_DeviceIdCopied" xml:space="preserve">
-    <value>✅ Gekopieerd!</value>
-  </data>
-  <data name="Setup_ApproveInstructions" xml:space="preserve">
-    <value>Om dit knooppunt goed te keuren, voer uit op uw gateway-host:</value>
-  </data>
-  <data name="Setup_ApproveHint" xml:space="preserve">
-    <value>💡 U kunt de installatie nu voltooien — koppeling gaat op de achtergrond door. U ontvangt een melding wanneer goedgekeurd.</value>
-  </data>
-  <data name="Setup_DoneTitle" xml:space="preserve">
-    <value>🎉 Alles is klaar!</value>
-  </data>
-  <data name="Setup_DoneDescription" xml:space="preserve">
-    <value>OpenClaw Tray zal verbinding maken met uw gateway en beginnen met monitoren.</value>
-  </data>
-  <data name="Setup_BackButton" xml:space="preserve">
-    <value>Vorige</value>
-  </data>
-  <data name="Setup_NextButton" xml:space="preserve">
-    <value>Volgende</value>
-  </data>
-  <data name="Setup_FinishButton" xml:space="preserve">
-    <value>Voltooien</value>
-  </data>
-  <data name="Setup_StepNodeMode" xml:space="preserve">
-    <value>Stap 2 van 3 — Knooppuntmodus</value>
-  </data>
-  <data name="Setup_StepDone" xml:space="preserve">
-    <value>Stap 3 van 3 — Gereed</value>
-  </data>
   <data name="SettingsDeveloperModeHeader.Text" xml:space="preserve">
     <value>ONTWIKKELAARSMODUS</value>
   </data>
@@ -1447,57 +1369,6 @@ Voer op uw gateway-host (Mac/Linux) uit:
   <data name="Onboarding_LocalSetup_Phase_MintToken" xml:space="preserve">
     <value>Installatiecode genereren</value>
   </data>
-  <data name="AboutPage_TextBlock_10.Text" xml:space="preserve">
-    <value>Over</value>
-  </data>
-  <data name="AboutPage_TextBlock_19.Text" xml:space="preserve">
-    <value>OpenClaw Hub</value>
-  </data>
-  <data name="AboutPage_TextBlock_23.Text" xml:space="preserve">
-    <value>.NET / WinUI / Windows App SDK</value>
-  </data>
-  <data name="AboutPage_TextBlock_35.Text" xml:space="preserve">
-    <value>Gatewaygegevens</value>
-  </data>
-  <data name="AboutPage_TextBlock_48.Text" xml:space="preserve">
-    <value>Versie:</value>
-  </data>
-  <data name="AboutPage_TextBlock_52.Text" xml:space="preserve">
-    <value>Protocolversie:</value>
-  </data>
-  <data name="AboutPage_TextBlock_56.Text" xml:space="preserve">
-    <value>Verificatiemodus:</value>
-  </data>
-  <data name="AboutPage_TextBlock_60.Text" xml:space="preserve">
-    <value>Actieve tijd:</value>
-  </data>
-  <data name="AboutPage_TextBlock_72.Text" xml:space="preserve">
-    <value>Foutopsporing</value>
-  </data>
-  <data name="OpenLogButton.Content" xml:space="preserve">
-    <value>Logbestand openen</value>
-  </data>
-  <data name="OpenConfigButton.Content" xml:space="preserve">
-    <value>Configuratiemap openen</value>
-  </data>
-  <data name="CopySupportButton.Content" xml:space="preserve">
-    <value>Ondersteuningscontext kopiëren</value>
-  </data>
-  <data name="CheckUpdatesButton.Content" xml:space="preserve">
-    <value>Updates zoeken</value>
-  </data>
-  <data name="AboutPage_TextBlock_91.Text" xml:space="preserve">
-    <value>Koppelingen</value>
-  </data>
-  <data name="AboutPage_HyperlinkButton_92.Content" xml:space="preserve">
-    <value>Documentation → docs.openclaw.ai/platforms/windows</value>
-  </data>
-  <data name="AboutPage_HyperlinkButton_94.Content" xml:space="preserve">
-    <value>GitHub → github.com/openclaw/openclaw-windows-node</value>
-  </data>
-  <data name="AboutPage_HyperlinkButton_96.Content" xml:space="preserve">
-    <value>Dashboard → openclaw://dashboard</value>
-  </data>
   <data name="AgentEventsPage_TextBlock_18.Text" xml:space="preserve">
     <value>Agentgebeurtenissen</value>
   </data>
@@ -1568,7 +1439,7 @@ Voer op uw gateway-host (Mac/Linux) uit:
     <value>Lokale MCP-server</value>
   </data>
   <data name="PermissionsPage_McpDescription.Text" xml:space="preserve">
-    <value>Stel mogelijkheden beschikbaar via HTTP voor CLI-hulpprogramma’s en lokale integraties.</value>
+    <value>Levert mogelijkheden aan lokale MCP-clients (CLI-hulpprogramma's, integraties) op deze pc via HTTP.</value>
   </data>
   <data name="PermissionsPage_McpEndpointLabel.Text" xml:space="preserve">
     <value>Eindpunt:</value>
@@ -1699,9 +1570,6 @@ Voer op uw gateway-host (Mac/Linux) uit:
   <data name="ConnectionPage_TextBlock_11.Text" xml:space="preserve">
     <value>Gateway-eindpunt dat door zowel de operatorclient als de knooppuntservice wordt gebruikt.</value>
   </data>
-  <data name="AuthErrorBar.Title" xml:space="preserve">
-    <value>Verbindingsfout</value>
-  </data>
   <data name="StatusText.Text" xml:space="preserve">
     <value>Verbinding verbroken</value>
   </data>
@@ -2021,10 +1889,13 @@ Voer op uw gateway-host (Mac/Linux) uit:
     <value>Opdrachtpatroon (bijv. echo *)</value>
   </data>
   <data name="PermissionsPage_ComboBoxItem_54.Content" xml:space="preserve">
-    <value>Toestaan</value>
+    <value>Weigeren</value>
   </data>
   <data name="PermissionsPage_ComboBoxItem_55.Content" xml:space="preserve">
-    <value>Weigeren</value>
+    <value>Toestaan</value>
+  </data>
+  <data name="PermissionsPage_ComboBoxItem_56.Content" xml:space="preserve">
+    <value>Vragen</value>
   </data>
   <data name="PermissionsPage_Button_57.Content" xml:space="preserve">
     <value>Regel toevoegen</value>
@@ -2215,6 +2086,69 @@ Voer op uw gateway-host (Mac/Linux) uit:
   <data name="WorkspacePage_LoadingContent" xml:space="preserve">
     <value>Inhoud laden…</value>
   </data>
+  <data name="WorkspacePage_SearchBox.PlaceholderText" xml:space="preserve">
+    <value>Search files</value>
+  </data>
+  <data name="WorkspacePage_ParentFolderButton.Content" xml:space="preserve">
+    <value>Up</value>
+  </data>
+  <data name="WorkspacePage_OpenConnectionSettings.Content" xml:space="preserve">
+    <value>Open Connection settings</value>
+  </data>
+  <data name="WorkspacePage_NoSearchResults.Text" xml:space="preserve">
+    <value>No files match your search.</value>
+  </data>
+  <data name="WorkspacePage_NoFolderResults" xml:space="preserve">
+    <value>No files found in this folder.</value>
+  </data>
+  <data name="WorkspacePage_LoadErrorMessage" xml:space="preserve">
+    <value>Couldn't load workspace files. Try refreshing.</value>
+  </data>
+  <data name="WorkspacePage_UnsupportedMessage" xml:space="preserve">
+    <value>This gateway doesn't support listing workspace files.</value>
+  </data>
+  <data name="WorkspacePage_Badge_Missing" xml:space="preserve">
+    <value>Missing</value>
+  </data>
+  <data name="WorkspacePage_Badge_Edited" xml:space="preserve">
+    <value>Edited</value>
+  </data>
+  <data name="WorkspacePage_Badge_Read" xml:space="preserve">
+    <value>Read</value>
+  </data>
+  <data name="WorkspacePage_FolderNote" xml:space="preserve">
+    <value>This is a folder.</value>
+  </data>
+  <data name="WorkspacePage_FileUnavailable" xml:space="preserve">
+    <value>Couldn't load this file.</value>
+  </data>
+  <data name="WorkspacePage_BrowserOnlyFileNote" xml:space="preserve">
+    <value>Only files read or edited in this session can be previewed.</value>
+  </data>
+  <data name="WorkspacePage_OpenFolder" xml:space="preserve">
+    <value>Open</value>
+  </data>
+  <data name="WorkspacePage_CopyPath" xml:space="preserve">
+    <value>Copy path</value>
+  </data>
+  <data name="WorkspacePage_CopyPathFailed" xml:space="preserve">
+    <value>Couldn't copy the path.</value>
+  </data>
+  <data name="WorkspacePage_FileType_File" xml:space="preserve">
+    <value>File</value>
+  </data>
+  <data name="WorkspacePage_FileType_Folder" xml:space="preserve">
+    <value>Folder</value>
+  </data>
+  <data name="WorkspacePage_RootFolder" xml:space="preserve">
+    <value>Root</value>
+  </data>
+  <data name="WorkspacePage_SearchResultsPath" xml:space="preserve">
+    <value>Search results for "{0}"</value>
+  </data>
+  <data name="WorkspacePage_BrowserTruncated" xml:space="preserve">
+    <value>Some results were omitted. Narrow your search or open a folder.</value>
+  </data>
   <data name="WorkspacePage_MissingFile" xml:space="preserve">
     <value>(bestand niet gevonden op schijf)</value>
   </data>
@@ -2308,12 +2242,6 @@ Voer op uw gateway-host (Mac/Linux) uit:
   <data name="HubWindow_NavigationViewItem_145.Content" xml:space="preserve">
     <value>Foutopsporing</value>
   </data>
-  <data name="HubWindow_NavigationViewItem_Notifications.Content" xml:space="preserve">
-    <value>Meldingen</value>
-  </data>
-  <data name="HubWindow_NavigationViewItem_148.Content" xml:space="preserve">
-    <value>Informatie</value>
-  </data>
   <data name="Onboarding_UnknownPage" xml:space="preserve">
     <value>Onbekende pagina</value>
   </data>
@@ -2518,6 +2446,105 @@ Voer op uw gateway-host (Mac/Linux) uit:
   <data name="VoiceSettingsPage_PageDescription.Text" xml:space="preserve">
     <value>Configureer spraak-naar-tekst en spraakinteractie-instellingen. Alle spraakverwerking draait lokaal op uw apparaat.</value>
   </data>
+  <data name="VoiceSettingsPage_AssistantHeader.Text" xml:space="preserve">
+    <value>Assistent</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantDescription.Text" xml:space="preserve">
+    <value>Altijd luisterende assistentservice en nieuwste gespreksbeurten.</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantRefreshButton.[using:Microsoft.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Assistentstatus vernieuwen</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStartButtonText.Text" xml:space="preserve">
+    <value>Starten</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStopButtonText.Text" xml:space="preserve">
+    <value>Stoppen</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStatusChecking.Text" xml:space="preserve">
+    <value>Assistentstatus controleren...</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantRecentTurnsHeader.Text" xml:space="preserve">
+    <value>Recente beurten</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStarting" xml:space="preserve">
+    <value>Assistent starten...</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStartingDetail" xml:space="preserve">
+    <value>Altijd-luisterende modus starten met lokale assistentroutering en opslag van beurten.</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStartFailed" xml:space="preserve">
+    <value>Assistent is niet gestart</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStopping" xml:space="preserve">
+    <value>Assistent stoppen...</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStopFailed" xml:space="preserve">
+    <value>Assistent is niet gestopt</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantBridgeUnavailable" xml:space="preserve">
+    <value>Assistentbrug niet beschikbaar</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantNoTurnsLoaded" xml:space="preserve">
+    <value>Geen assistentbeurten geladen.</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantUnknown" xml:space="preserve">
+    <value>onbekend</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantListeningFormat" xml:space="preserve">
+    <value>Assistent luistert (PID {0})</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStopped" xml:space="preserve">
+    <value>Assistent gestopt</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStatusFormat" xml:space="preserve">
+    <value>Assistent {0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantTranscriberFormat" xml:space="preserve">
+    <value>Transcriptie: {0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantMicFormat" xml:space="preserve">
+    <value>Microfoon: {0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantSpeakerFormat" xml:space="preserve">
+    <value>Luidspreker: {0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantCloudRoutingFormat" xml:space="preserve">
+    <value>Cloudroutering: {0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantSpeechOutputFormat" xml:space="preserve">
+    <value>Spraakuitvoer: {0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantOn" xml:space="preserve">
+    <value>aan</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantOff" xml:space="preserve">
+    <value>uit</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantLastBridgeUpdateFormat" xml:space="preserve">
+    <value>Laatste brugupdate: {0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantNoConversationTurns" xml:space="preserve">
+    <value>Nog geen gespreksbeurten.</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantSourceDefault" xml:space="preserve">
+    <value>assistent</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantTurnMetadataFormat" xml:space="preserve">
+    <value>{0} / {1}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantTurnMetadataWithLatencyFormat" xml:space="preserve">
+    <value>{0} | {1} | {2} ms vertraging</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantUserTurnFormat" xml:space="preserve">
+    <value>Jij: {0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantResponseTurnFormat" xml:space="preserve">
+    <value>OpenClaw-antwoord: {0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantEmptyValue" xml:space="preserve">
+    <value>(leeg)</value>
+  </data>
   <data name="VoiceSettingsPage_SttHeader.Text" xml:space="preserve">
     <value>Spraak-naar-tekst</value>
   </data>
@@ -2893,6 +2920,9 @@ Voer op uw gateway-host (Mac/Linux) uit:
   <data name="Chat_Timeline_LoadEarlier" xml:space="preserve">
     <value>Eerdere berichten laden</value>
   </data>
+  <data name="Chat_Timeline_ScrollToLatest" xml:space="preserve">
+    <value>Naar nieuwste bericht scrollen</value>
+  </data>
   <data name="Chat_Tool_CallLabel" xml:space="preserve">
     <value>Hulpmiddelaanroep</value>
   </data>
@@ -2929,6 +2959,15 @@ Voer op uw gateway-host (Mac/Linux) uit:
   <data name="Chat_Composer_Reasoning_Maximum" xml:space="preserve">
     <value>Maximaal</value>
   </data>
+  <data name="Chat_Composer_Accessibility_Session" xml:space="preserve">
+    <value>Sessie</value>
+  </data>
+  <data name="Chat_Composer_Accessibility_Model" xml:space="preserve">
+    <value>Taalmodel</value>
+  </data>
+  <data name="Chat_Composer_Accessibility_Reasoning" xml:space="preserve">
+    <value>Redenering</value>
+  </data>
   <data name="Chat_Composer_Placeholder_Connected" xml:space="preserve">
     <value>Bericht aan assistent (Enter om te verzenden)</value>
   </data>
@@ -2965,6 +3004,30 @@ Voer op uw gateway-host (Mac/Linux) uit:
   <data name="Chat_Composer_AssistantWorking" xml:space="preserve">
     <value>Assistent is bezig…</value>
   </data>
+  <data name="Chat_Composer_QueuedCountFormat" xml:space="preserve">
+    <value>In wachtrij ({0})</value>
+  </data>
+  <data name="Chat_Composer_QueuedMessageAutomationFormat" xml:space="preserve">
+    <value>Bericht in wachtrij: {0}</value>
+  </data>
+  <data name="Chat_Composer_QueuedMessageFailedAutomationFormat" xml:space="preserve">
+    <value>Bericht in wachtrij mislukt: {0}</value>
+  </data>
+  <data name="Chat_Composer_QueuedMessageFailed" xml:space="preserve">
+    <value>Mislukt</value>
+  </data>
+  <data name="Chat_Composer_QueuedMessageCancel" xml:space="preserve">
+    <value>Bericht in wachtrij annuleren</value>
+  </data>
+  <data name="Chat_Composer_QueuedMessageCancelAutomationFormat" xml:space="preserve">
+    <value>Bericht {0} in wachtrij annuleren: {1}</value>
+  </data>
+  <data name="Chat_Composer_QueuedMessageRemoveFailed" xml:space="preserve">
+    <value>Mislukt bericht in wachtrij verwijderen</value>
+  </data>
+  <data name="Chat_Composer_QueuedMessageRemoveFailedAutomationFormat" xml:space="preserve">
+    <value>Mislukt bericht {0} in wachtrij verwijderen: {1}</value>
+  </data>
   <data name="Chat_Assistant_Action_Copy" xml:space="preserve">
     <value>Bericht kopiëren</value>
   </data>
@@ -2978,14 +3041,20 @@ Voer op uw gateway-host (Mac/Linux) uit:
     <value> … [{0} bytes afgekapt]</value>
   </data>
   <data name="Chat_Permission_Allow" xml:space="preserve">
-    <value>Toestaan</value>
+    <value>Eenmalig toestaan</value>
+  </data>
+  <data name="Chat_Permission_AllowAlways" xml:space="preserve">
+    <value>Altijd toestaan</value>
   </data>
   <data name="Chat_Permission_Deny" xml:space="preserve">
-    <value>Weigeren</value>
+    <value>Eenmalig weigeren</value>
   </data>
   <data name="Chat_Permission_DecisionAllowed" xml:space="preserve">
     <value>Toegestaan</value>
   </data>
+  <data name="Chat_Permission_DecisionAlwaysAllowed" xml:space="preserve">
+    <value>Altijd toegestaan</value>
+  </data>
   <data name="Chat_Permission_DecisionDenied" xml:space="preserve">
     <value>Geweigerd</value>
   </data>
@@ -3016,6 +3085,88 @@ Voer op uw gateway-host (Mac/Linux) uit:
   <data name="AppNotification_ShowMore" xml:space="preserve">
     <value>Meer weergeven</value>
   </data>
+  <data name="AppNotification_ActionOpenConnection" xml:space="preserve">
+    <value>Verbinding openen</value>
+  </data>
+  <data name="AppNotification_ActionOpenChannels" xml:space="preserve">
+    <value>Kanalen openen</value>
+  </data>
+  <data name="AppNotification_ActionOpenSandbox" xml:space="preserve">
+    <value>Sandbox openen</value>
+  </data>
+  <data name="AppNotification_ActionOpenCron" xml:space="preserve">
+    <value>Cron openen</value>
+  </data>
+  <data name="AppNotification_GatewayConnectionFailed_Title" xml:space="preserve">
+    <value>Gatewayverbinding mislukt</value>
+  </data>
+  <data name="AppNotification_GatewayConnectionFailed_DefaultMessage" xml:space="preserve">
+    <value>OpenClaw kon geen verbinding maken met de actieve gateway.</value>
+  </data>
+  <data name="AppNotification_GatewayPairingRequired_Title" xml:space="preserve">
+    <value>Goedkeuring voor gatewaykoppeling vereist</value>
+  </data>
+  <data name="AppNotification_GatewayPairingRequired_GenericMessage" xml:space="preserve">
+    <value>Open Verbinding om de gatewaykoppeling te voltooien.</value>
+  </data>
+  <data name="AppNotification_GatewayPairingRequired_DeviceMessageFormat" xml:space="preserve">
+    <value>Open Verbinding om apparaat {0} goed te keuren.</value>
+  </data>
+  <data name="AppNotification_WindowsNodeConnectionFailed_Title" xml:space="preserve">
+    <value>Windows-nodeverbinding mislukt</value>
+  </data>
+  <data name="AppNotification_WindowsNodeConnectionFailed_DefaultMessage" xml:space="preserve">
+    <value>De gateway is verbonden, maar deze Windows-node is niet beschikbaar.</value>
+  </data>
+  <data name="AppNotification_WindowsNodeRateLimited_Title" xml:space="preserve">
+    <value>Windows-nodeverbinding beperkt</value>
+  </data>
+  <data name="AppNotification_WindowsNodeRateLimited_DefaultMessage" xml:space="preserve">
+    <value>De gateway is verbonden, maar deze Windows-node is tijdelijk beperkt.</value>
+  </data>
+  <data name="AppNotification_ChannelNeedsAttention_TitleFormat" xml:space="preserve">
+    <value>Kanaal {0} heeft aandacht nodig</value>
+  </data>
+  <data name="AppNotification_ChannelNeedsAttention_StatusMessageFormat" xml:space="preserve">
+    <value>De gateway meldt {0} als {1}.</value>
+  </data>
+  <data name="AppNotification_SandboxDisabled_Title" xml:space="preserve">
+    <value>Node-sandbox is uitgeschakeld — opdrachten worden onbeperkt uitgevoerd</value>
+  </data>
+  <data name="AppNotification_SandboxDisabled_Message" xml:space="preserve">
+    <value>Door agents gestarte Windows-opdrachten worden zonder sandboxbeperking uitgevoerd totdat Node-sandbox weer is ingeschakeld.</value>
+  </data>
+  <data name="AppNotification_SandboxUnavailable_Title" xml:space="preserve">
+    <value>Sandbox niet beschikbaar — host-fallback</value>
+  </data>
+  <data name="AppNotification_SandboxUnavailable_MessageFormat" xml:space="preserve">
+    <value>{0}
+
+Opdrachten worden op de host uitgevoerd zonder sandboxbescherming zolang sandboxing niet beschikbaar is.</value>
+  </data>
+  <data name="AppNotification_SandboxUnavailableBlocked_Title" xml:space="preserve">
+    <value>Sandbox niet beschikbaar — opdrachten geblokkeerd</value>
+  </data>
+  <data name="AppNotification_SandboxUnavailableBlocked_MessageFormat" xml:space="preserve">
+    <value>{0}
+
+Opdrachten worden geblokkeerd zolang sandboxing niet beschikbaar is, omdat strikte fallbackblokkering is ingeschakeld.</value>
+  </data>
+  <data name="AppNotification_SandboxUnavailable_DefaultReason" xml:space="preserve">
+    <value>MXC-sandboxprimitieven zijn niet beschikbaar op deze machine.</value>
+  </data>
+  <data name="AppNotification_CronRunFailed_Title" xml:space="preserve">
+    <value>Cron-taak is niet gestart</value>
+  </data>
+  <data name="AppNotification_CronRunFailed_DefaultDetail" xml:space="preserve">
+    <value>De aanvraag is mislukt.</value>
+  </data>
+  <data name="AppNotification_CronRunRejectedDetail" xml:space="preserve">
+    <value>De gateway heeft de cron.run-aanvraag geweigerd.</value>
+  </data>
+  <data name="AppNotification_CronRunFailed_MessageFormat" xml:space="preserve">
+    <value>{0} — {1}</value>
+  </data>
   <data name="NotificationsPage_Title.Text" xml:space="preserve">
     <value>Meldingen</value>
   </data>
@@ -3040,52 +3191,139 @@ Voer op uw gateway-host (Mac/Linux) uit:
   <data name="NotificationsPage_MetadataCategoryNodeInvoke" xml:space="preserve">
     <value>Node-opdracht</value>
   </data>
-  <data name="Chat_Permission_Title" xml:space="preserve">
-    <value>Goedkeuring voor uitvoering vereist</value>
+  <data name="AppNotification_ExecApprovalPending_Title" xml:space="preserve">
+    <value>Opdrachtgoedkeuring in behandeling</value>
   </data>
-  <data name="Chat_Permission_Subtitle" xml:space="preserve">
-    <value>Goedkeuring is nodig om de onderstaande opdracht uit te voeren op deze Windows-companion. Klik op Toestaan om door te gaan, of Weigeren om te annuleren.</value>
+  <data name="AppNotification_ExecApprovalPending_MessageFormat" xml:space="preserve">
+    <value>{0} wacht op goedkeuring om uit te voeren: {1}</value>
   </data>
-  <data name="Chat_Permission_Caption" xml:space="preserve">
-    <value>Voor elke opdracht is goedkeuring vereist volgens het actieve beleid. Uw keuze geldt alleen voor deze aanvraag.</value>
+  <data name="AppNotification_ExecApprovalPending_OpenChatAction" xml:space="preserve">
+    <value>Chat openen</value>
   </data>
-  <data name="Chat_Root_ConnectingToGateway" xml:space="preserve">
-    <value>Verbinden met gateway…</value>
+  <data name="AppNotification_ExecApprovalPending_UnknownChatLabel" xml:space="preserve">
+    <value>gesprek</value>
   </data>
-  <data name="Chat_Root_EmptyState_SelectSession" xml:space="preserve">
-    <value>Selecteer een sessie in de zijbalk om te beginnen met chatten.</value>
+  <data name="AppNotification_ExecApprovalPending_MainSessionLabel" xml:space="preserve">
+    <value>Hoofd</value>
   </data>
-  <data name="Chat_Notification_SendFailed" xml:space="preserve">
-    <value>Verzenden mislukt</value>
+  <data name="AppNotification_ExecApprovalPending_MainChatLabel" xml:space="preserve">
+    <value>Hoofdchat</value>
   </data>
-  <data name="Chat_Notification_AbortFailed" xml:space="preserve">
-    <value>Afbreken mislukt</value>
+  <data name="AppNotification_ExecApprovalPending_AgentChatLabelFormat" xml:space="preserve">
+    <value>{0}-chat</value>
   </data>
-  <data name="Chat_Notification_LoadHistoryFailed" xml:space="preserve">
-    <value>Geschiedenis laden mislukt</value>
+  <data name="AppNotification_ExecApprovalPending_AgentSlotLabelFormat" xml:space="preserve">
+    <value>{0} / {1}</value>
   </data>
-  <data name="Chat_Notification_AssistantReplied" xml:space="preserve">
-    <value>Assistent heeft geantwoord</value>
+  <data name="NotificationsPage_MetadataAuthentication" xml:space="preserve">
+    <value>Verificatie</value>
   </data>
-  <data name="Chat_Notification_ConnectionInterrupted" xml:space="preserve">
-    <value>Verbinding verbroken — antwoord onderbroken.</value>
+  <data name="NotificationsPage_MetadataBindings" xml:space="preserve">
+    <value>Bindingen</value>
   </data>
-  <data name="Chat_Notification_KeylessEventDropped" xml:space="preserve">
-    <value>Gateway-tijdlijngebeurtenis genegeerd</value>
+  <data name="NotificationsPage_MetadataChannels" xml:space="preserve">
+    <value>Kanalen</value>
   </data>
-  <data name="Chat_Notification_KeylessEventDroppedMessage" xml:space="preserve">
-    <value>De gateway heeft een chattijdlijngebeurtenis zonder sessiesleutel verzonden, dus OpenClaw heeft deze genegeerd om te voorkomen dat tijdlijnen door elkaar lopen. Werk de gateway bij of start deze opnieuw als dit doorgaat.</value>
+  <data name="NotificationsPage_MetadataConfig" xml:space="preserve">
+    <value>Configuratie</value>
   </data>
-  <data name="VoiceSettingsPage_TestVoiceButtonText.Text" xml:space="preserve">
-    <value>Spraakinvoer testen</value>
+  <data name="NotificationsPage_MetadataConnection" xml:space="preserve">
+    <value>Verbinding</value>
   </data>
-  <data name="PermissionsPage_FeaturesDescription_Enabled" xml:space="preserve">
-    <value>Toggle individual features that agents may request from this PC.</value>
+  <data name="NotificationsPage_MetadataCron" xml:space="preserve">
+    <value>Cron</value>
   </data>
-  <data name="PermissionsPage_FeaturesDescription_Disabled" xml:space="preserve">
-    <value>Turn on Node Mode above to enable these features.</value>
+  <data name="NotificationsPage_MetadataGateway" xml:space="preserve">
+    <value>Gatewaydienst</value>
   </data>
-  <data name="PermissionsPage_Cap_Browser_Label" xml:space="preserve">
+  <data name="NotificationsPage_MetadataJobs" xml:space="preserve">
+    <value>Taken</value>
+  </data>
+  <data name="NotificationsPage_MetadataLoad" xml:space="preserve">
+    <value>Laden</value>
+  </data>
+  <data name="NotificationsPage_MetadataLifecycle" xml:space="preserve">
+    <value>Levenscyclus</value>
+  </data>
+  <data name="NotificationsPage_MetadataLocalGateway" xml:space="preserve">
+    <value>Lokale gateway</value>
+  </data>
+  <data name="NotificationsPage_MetadataNode" xml:space="preserve">
+    <value>Knooppunt</value>
+  </data>
+  <data name="NotificationsPage_MetadataPairing" xml:space="preserve">
+    <value>Koppeling</value>
+  </data>
+  <data name="NotificationsPage_MetadataSandbox" xml:space="preserve">
+    <value>Zandbak</value>
+  </data>
+  <data name="NotificationsPage_MetadataSettings" xml:space="preserve">
+    <value>Instellingen</value>
+  </data>
+  <data name="NotificationsPage_MetadataStatus" xml:space="preserve">
+    <value>Toestand</value>
+  </data>
+  <data name="NotificationsPage_MetadataSystemRun" xml:space="preserve">
+    <value>system.run</value>
+  </data>
+  <data name="Chat_Permission_Title" xml:space="preserve">
+    <value>Goedkeuring voor uitvoering vereist</value>
+  </data>
+  <data name="Chat_Permission_CommandApprovalTitle" xml:space="preserve">
+    <value>Opdrachtgoedkeuring aangevraagd</value>
+  </data>
+  <data name="Chat_Permission_Subtitle" xml:space="preserve">
+    <value>Goedkeuring is nodig om de onderstaande opdracht uit te voeren op deze Windows-companion. Sta eenmalig toe om door te gaan, sta altijd toe om deze opdracht te onthouden, of weiger om te annuleren.</value>
+  </data>
+  <data name="Chat_Permission_Caption" xml:space="preserve">
+    <value>Eenmalig toestaan geldt alleen voor deze aanvraag. Altijd toestaan slaat waar mogelijk een exacte toestaan-regel op.</value>
+  </data>
+  <data name="Chat_Permission_ResultSubmittedFormat" xml:space="preserve">
+    <value>Goedkeuring {0} ingediend voor {1}.</value>
+  </data>
+  <data name="Chat_Root_ConnectingToGateway" xml:space="preserve">
+    <value>Verbinden met gateway…</value>
+  </data>
+  <data name="Chat_Root_EmptyState_SelectSession" xml:space="preserve">
+    <value>Selecteer een sessie in de zijbalk om te beginnen met chatten.</value>
+  </data>
+  <data name="Chat_Notification_SendFailed" xml:space="preserve">
+    <value>Verzenden mislukt</value>
+  </data>
+  <data name="Chat_Error_SendReturnedStatusFormat" xml:space="preserve">
+    <value>Gateway heeft verzendstatus '{0}' geretourneerd.</value>
+  </data>
+  <data name="Chat_Error_SendFailedFormat" xml:space="preserve">
+    <value>Verzenden mislukt: {0}</value>
+  </data>
+  <data name="Chat_Notification_AbortFailed" xml:space="preserve">
+    <value>Afbreken mislukt</value>
+  </data>
+  <data name="Chat_Notification_LoadHistoryFailed" xml:space="preserve">
+    <value>Geschiedenis laden mislukt</value>
+  </data>
+  <data name="Chat_Notification_AssistantReplied" xml:space="preserve">
+    <value>Assistent heeft geantwoord</value>
+  </data>
+  <data name="Chat_Notification_ConnectionInterrupted" xml:space="preserve">
+    <value>Verbinding verbroken — antwoord onderbroken.</value>
+  </data>
+  <data name="Chat_Notification_KeylessEventDropped" xml:space="preserve">
+    <value>Gateway-tijdlijngebeurtenis genegeerd</value>
+  </data>
+  <data name="Chat_Notification_KeylessEventDroppedMessage" xml:space="preserve">
+    <value>De gateway heeft een chattijdlijngebeurtenis zonder sessiesleutel verzonden, dus OpenClaw heeft deze genegeerd om te voorkomen dat tijdlijnen door elkaar lopen. Werk de gateway bij of start deze opnieuw als dit doorgaat.</value>
+  </data>
+  <data name="VoiceSettingsPage_TestVoiceButtonText.Text" xml:space="preserve">
+    <value>Spraakinvoer testen</value>
+  </data>
+  <data name="PermissionsPage_FeaturesDescription_Enabled" xml:space="preserve">
+    <value>Toggle individual features that agents may request from this PC.</value>
+  </data>
+  <data name="PermissionsPage_FeaturesDescription_Disabled" xml:space="preserve">
+    <value>Turn on Node Mode above to enable these features.</value>
+  </data>
+  <data name="PermissionsPage_Cap_Browser_Label" xml:space="preserve">
     <value>Browser control</value>
   </data>
   <data name="PermissionsPage_Cap_Browser_Description" xml:space="preserve">
@@ -3157,6 +3395,18 @@ Voer op uw gateway-host (Mac/Linux) uit:
   <data name="PermissionsPage_NodeStatus_ActiveDetailsFormat" xml:space="preserve">
     <value>Providing {0} capabilities: {1}</value>
   </data>
+  <data name="PermissionsPage_NodeStatus_McpOnly" xml:space="preserve">
+    <value>Alleen lokale MCP</value>
+  </data>
+  <data name="PermissionsPage_NodeStatus_McpOnlyDetailsFormat" xml:space="preserve">
+    <value>Levert {0} mogelijkheden aan lokale MCP-clients op {1}</value>
+  </data>
+  <data name="PermissionsPage_NodeStatus_Starting" xml:space="preserve">
+    <value>Node wordt gestart…</value>
+  </data>
+  <data name="PermissionsPage_NodeStatus_McpError" xml:space="preserve">
+    <value>Lokale MCP-server kon niet worden gestart</value>
+  </data>
   <data name="PermissionsPage_NodeStatus_NoCapabilities" xml:space="preserve">
     <value>No capabilities enabled.</value>
   </data>
@@ -3532,9 +3782,6 @@ Voer op uw gateway-host (Mac/Linux) uit:
   <data name="HubWindow_NavigationViewItem_Sandbox.Content" xml:space="preserve">
     <value>Sandboxomgeving</value>
   </data>
-  <data name="AboutPage_MoreDiagnosticsLink.Content" xml:space="preserve">
-    <value>More diagnostics →</value>
-  </data>
   <data name="ChannelsPage_GuideBar.Title" xml:space="preserve">
     <value>Your gateway didn't list any channels</value>
   </data>
@@ -3602,10 +3849,10 @@ Voer op uw gateway-host (Mac/Linux) uit:
     <value>Connection state, gateway URL, runtime, tunnel.</value>
   </data>
   <data name="DiagnosticsPage_Card_CopyDebugBundle.Header" xml:space="preserve">
-    <value>Copy full debug bundle</value>
+    <value>Samenvattende debugbundel kopiëren</value>
   </data>
   <data name="DiagnosticsPage_Card_CopyDebugBundle.Description" xml:space="preserve">
-    <value>Everything the preview dialog produces, no preview.</value>
+    <value>Alleen gegenereerde samenvattingen; logfragmenten zijn uitgesloten. Gebruik Diagnostische bundel maken om logs vóór het delen te bekijken.</value>
   </data>
   <data name="DiagnosticsPage_Card_CopyBrowserSetup.Header" xml:space="preserve">
     <value>Copy browser setup guidance</value>
@@ -3667,15 +3914,6 @@ Voer op uw gateway-host (Mac/Linux) uit:
   <data name="DiagnosticsPage_Card_TrayChat.Header" xml:space="preserve">
     <value>Tray chat popup</value>
   </data>
-  <data name="DiagnosticsPage_Card_Reconfigure.Header" xml:space="preserve">
-    <value>Reconfigure…</value>
-  </data>
-  <data name="DiagnosticsPage_Card_Reconfigure.Description" xml:space="preserve">
-    <value>Reopens the OpenClaw onboarding wizard. You will be asked to confirm.</value>
-  </data>
-  <data name="DiagnosticsPage_ReconfigureButton.Content" xml:space="preserve">
-    <value>Reconfigure…</value>
-  </data>
   <data name="DiagnosticsPage_DetailBack.Text" xml:space="preserve">
     <value>Back to Diagnostics</value>
   </data>
@@ -4184,7 +4422,7 @@ Voer op uw gateway-host (Mac/Linux) uit:
     <value>0 regels</value>
   </data>
   <data name="PermissionsPage_NoRulesYetAdd.Text" xml:space="preserve">
-    <value>Nog geen regels. Voeg hieronder een patroon toe om specifieke opdrachten toe te staan of te weigeren.</value>
+    <value>Nog geen regels. Voeg hieronder een patroon toe om specifieke opdrachten te weigeren, toe te staan of te vragen.</value>
   </data>
   <data name="PermissionsPage_WindowsPrivacy.Text" xml:space="preserve">
     <value>Windows-privacy</value>
@@ -4378,6 +4616,9 @@ Voer op uw gateway-host (Mac/Linux) uit:
   <data name="SessionsPage_All.Text" xml:space="preserve">
     <value>Alle</value>
   </data>
+  <data name="SessionsPage_ShowCompleted.Header" xml:space="preserve">
+    <value>Voltooide sessies tonen</value>
+  </data>
   <data name="SessionsPage_GatewayDisconnected.Title" xml:space="preserve">
     <value>Gateway losgekoppeld</value>
   </data>
@@ -4399,15 +4640,81 @@ Voer op uw gateway-host (Mac/Linux) uit:
   <data name="SessionsPage_Compact.Text" xml:space="preserve">
     <value>Compact maken</value>
   </data>
+  <data name="SessionsPage_Checkpoints.Text" xml:space="preserve">
+    <value>Controlepunten</value>
+  </data>
+  <data name="SessionsPage_Checkpoints.[using:Microsoft.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Compactiecontrolepunten bekijken, vertakken of herstellen</value>
+  </data>
+  <data name="SessionsPage_ExportTranscript.Text" xml:space="preserve">
+    <value>Transcript exporteren</value>
+  </data>
+  <data name="SessionsPage_ExportTranscript.[using:Microsoft.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Het gesprekstranscript opslaan als tekstbestand</value>
+  </data>
   <data name="SessionsPage_Delete.Text" xml:space="preserve">
     <value>Verwijderen</value>
   </data>
+  <data name="SessionActionPrompt_Reset_Title" xml:space="preserve">
+    <value>Sessie resetten?</value>
+  </data>
+  <data name="SessionActionPrompt_Reset_BodyFormat" xml:space="preserve">
+    <value>Een nieuwe sessie starten voor '{0}'? De huidige gesprekscontext wordt gewist.</value>
+  </data>
+  <data name="SessionActionPrompt_Reset_ConfirmLabel" xml:space="preserve">
+    <value>Resetten</value>
+  </data>
+  <data name="SessionActionPrompt_CancelLabel" xml:space="preserve">
+    <value>Annuleren</value>
+  </data>
+  <data name="SessionActionPrompt_Compact_Title" xml:space="preserve">
+    <value>Sessielog compact maken?</value>
+  </data>
+  <data name="SessionActionPrompt_Compact_BodyFormat" xml:space="preserve">
+    <value>Bewaar de meest recente berichten voor '{0}' en archiveer de rest. Hiermee wordt een compactiecontrolepunt gemaakt; exporteer eerst het transcript als u de volledige geschiedenis nodig hebt.</value>
+  </data>
+  <data name="SessionActionPrompt_Compact_ConfirmLabel" xml:space="preserve">
+    <value>Compact maken</value>
+  </data>
+  <data name="SessionActionPrompt_Delete_Title" xml:space="preserve">
+    <value>Sessie verwijderen?</value>
+  </data>
+  <data name="SessionActionPrompt_Delete_BodyFormat" xml:space="preserve">
+    <value>'{0}' verwijderen en het transcript archiveren? De sessie wordt uit de sessielijst verwijderd.</value>
+  </data>
+  <data name="SessionActionPrompt_Delete_ConfirmLabel" xml:space="preserve">
+    <value>Verwijderen</value>
+  </data>
+  <data name="SessionActionPrompt_Restore_Title" xml:space="preserve">
+    <value>Controlepunt herstellen?</value>
+  </data>
+  <data name="SessionActionPrompt_Restore_BodyFormat" xml:space="preserve">
+    <value>'{0}' terugzetten naar dit compactiecontrolepunt? Berichten die na het controlepunt zijn toegevoegd, worden gearchiveerd.</value>
+  </data>
+  <data name="SessionActionPrompt_Restore_ConfirmLabel" xml:space="preserve">
+    <value>Herstellen</value>
+  </data>
   <data name="SettingsPage_Settings.Text" xml:space="preserve">
     <value>Instellingen</value>
   </data>
   <data name="SettingsPage_General.Text" xml:space="preserve">
     <value>Algemeen</value>
   </data>
+  <data name="SettingsRow_AppTheme_Header.Text" xml:space="preserve">
+    <value>Appthema</value>
+  </data>
+  <data name="SettingsRow_AppTheme_Description.Text" xml:space="preserve">
+    <value>Kies licht, donker of gebruik uw Windows-instelling.</value>
+  </data>
+  <data name="SettingsPage_AppTheme_System.Content" xml:space="preserve">
+    <value>Systeem</value>
+  </data>
+  <data name="SettingsPage_AppTheme_Light.Content" xml:space="preserve">
+    <value>Licht</value>
+  </data>
+  <data name="SettingsPage_AppTheme_Dark.Content" xml:space="preserve">
+    <value>Donker</value>
+  </data>
   <data name="SettingsPage_Notifications.Text" xml:space="preserve">
     <value>Meldingen</value>
   </data>
@@ -4417,6 +4724,57 @@ Voer op uw gateway-host (Mac/Linux) uit:
   <data name="SettingsPage_LocalGateway.Text" xml:space="preserve">
     <value>Lokale gateway</value>
   </data>
+  <data name="SettingsPage_Developer.Text" xml:space="preserve">
+    <value>Ontwikkelaar</value>
+  </data>
+  <data name="SettingsPage_AppInfoExpander.Header" xml:space="preserve">
+    <value>Appgegevens</value>
+  </data>
+  <data name="SettingsPage_AppInfoCheckUpdates.Content" xml:space="preserve">
+    <value>Controleren op updates</value>
+  </data>
+  <data name="SettingsPage_AppInfoLabel_AppName.Text" xml:space="preserve">
+    <value>Appnaam</value>
+  </data>
+  <data name="SettingsPage_AppInfoLabel_Version.Text" xml:space="preserve">
+    <value>Versie</value>
+  </data>
+  <data name="SettingsPage_AppInfoLabel_BuildDate.Text" xml:space="preserve">
+    <value>Builddatum</value>
+  </data>
+  <data name="SettingsPage_AppInfoLabel_Runtime.Text" xml:space="preserve">
+    <value>Runtimeomgeving</value>
+  </data>
+  <data name="SettingsPage_AppInfoLabel_Architecture.Text" xml:space="preserve">
+    <value>Architectuur</value>
+  </data>
+  <data name="SettingsPage_AppInfoLabel_Windows.Text" xml:space="preserve">
+    <value>Windows-versie</value>
+  </data>
+  <data name="SettingsPage_AppInfoLabel_UpdateChannel.Text" xml:space="preserve">
+    <value>Updatekanaal</value>
+  </data>
+  <data name="SettingsPage_AppInfoLabel_InstallType.Text" xml:space="preserve">
+    <value>Installatietype</value>
+  </data>
+  <data name="SettingsPage_AppInfoRelatedLinks.Text" xml:space="preserve">
+    <value>Gerelateerde koppelingen</value>
+  </data>
+  <data name="SettingsPage_AppInfoDocumentation.Content" xml:space="preserve">
+    <value>Documentatie</value>
+  </data>
+  <data name="SettingsPage_AppInfoGitHub.Content" xml:space="preserve">
+    <value>GitHub</value>
+  </data>
+  <data name="SettingsPage_AppInfoDashboard.Content" xml:space="preserve">
+    <value>Dashboardpagina</value>
+  </data>
+  <data name="SettingsRow_ShowDiagnostics_Header.Text" xml:space="preserve">
+    <value>Diagnostiek inschakelen</value>
+  </data>
+  <data name="SettingsRow_ShowDiagnostics_Description.Text" xml:space="preserve">
+    <value>Ontwikkelaars- en probleemoplossingshulpmiddelen. Standaard ingeschakeld voor lokale builds.</value>
+  </data>
   <data name="SettingsPage_LocalGatewaySetup_Header.Text" xml:space="preserve">
     <value>Lokale gateway instellen of opnieuw configureren</value>
   </data>
@@ -4627,21 +4985,18 @@ Voer op uw gateway-host (Mac/Linux) uit:
   <data name="DiagnosticsBundleDialog_ReviewBeforeSharing.Title" xml:space="preserve">
     <value>Controleer voor het delen</value>
   </data>
-  <data name="DiagnosticsBundleDialog_ReviewBeforeSharing.Message" xml:space="preserve">
-    <value>Gevoelige tokens, opdrachtargumenten, payloads en opnames worden door de bundelmaker uitgesloten.</value>
-  </data>
   <data name="HubWindow_Disconnected.Text" xml:space="preserve">
     <value>Niet verbonden</value>
   </data>
-  <data name="HubWindow_Op.Text" xml:space="preserve">
-    <value>Op.</value>
-  </data>
-  <data name="HubWindow_Node.Text" xml:space="preserve">
-    <value>Knooppunt</value>
-  </data>
   <data name="HubWindow_Advanced.Content" xml:space="preserve">
     <value>Geavanceerd</value>
   </data>
+  <data name="DiagnosticsBundleDialog_ReviewBeforeSharingMessage.Text" xml:space="preserve">
+    <value>Logfragmenten worden opgeschoond en ingekort. Gevoelige tokens, payloads, opnames en onbewerkte instellingenbestanden worden uitgesloten. Controleer dit voordat u deelt.</value>
+  </data>
+  <data name="DiagnosticsBundleDialog_ReviewBeforeSharingTitle.Text" xml:space="preserve">
+    <value>Controleer voor het delen</value>
+  </data>
   <data name="AgentEventsPage_LiveText.Text" xml:space="preserve">
     <value>Actueel</value>
   </data>
@@ -4669,12 +5024,10 @@ Voer op uw gateway-host (Mac/Linux) uit:
   <data name="VoiceSettingsPage_PreviewVoice.Text" xml:space="preserve">
     <value>Stemvoorbeeld</value>
   </data>
-  <data name="HubWindow_TitleStatus.Text" xml:space="preserve">
-    <value>Niet verbonden</value>
-  </data>
   <data name="SandboxPage_GatewayCommandsNote.Text" xml:space="preserve">
     <value>Opdrachten die de agent rechtstreeks op de gateway uitvoert, vallen hier niet onder. Als de gateway op deze pc staat, hebben ze mogelijk nog steeds toegang tot uw Windows-bestanden, klembord en netwerk — controleer de configuratie van uw gateway.</value>
-  </data>  <data name="AgentEventsPage_AllAgents" xml:space="preserve">
+  </data>
+  <data name="AgentEventsPage_AllAgents" xml:space="preserve">
     <value>Alle agenten</value>
   </data>
   <data name="AgentEventsPage_EventsStatus" xml:space="preserve">
@@ -4692,6 +5045,60 @@ Voer op uw gateway-host (Mac/Linux) uit:
   <data name="CronPage_Running" xml:space="preserve">
     <value>Uitvoeren...</value>
   </data>
+  <data name="CronPage_CompletedOneTimeJobTooltip" xml:space="preserve">
+    <value>Eenmalige taak voltooid</value>
+  </data>
+  <data name="CronPage_EnableJobTooltip" xml:space="preserve">
+    <value>Taak inschakelen</value>
+  </data>
+  <data name="CronPage_DisableJobTooltip" xml:space="preserve">
+    <value>Taak uitschakelen</value>
+  </data>
+  <data name="CronPage_FullResponse" xml:space="preserve">
+    <value>Volledig antwoord</value>
+  </data>
+  <data name="CronPage_OpenChat" xml:space="preserve">
+    <value>Chat openen</value>
+  </data>
+  <data name="CronPage_RunNow" xml:space="preserve">
+    <value>Nu uitvoeren</value>
+  </data>
+  <data name="CronPage_EditAction" xml:space="preserve">
+    <value>Bewerken</value>
+  </data>
+  <data name="CronPage_HistoryAction" xml:space="preserve">
+    <value>Geschiedenis</value>
+  </data>
+  <data name="CronPage_RemoveAction" xml:space="preserve">
+    <value>Verwijderen</value>
+  </data>
+  <data name="CronPage_RunningBadge" xml:space="preserve">
+    <value>Wordt uitgevoerd</value>
+  </data>
+  <data name="CronPage_RunHistory" xml:space="preserve">
+    <value>Uitvoeringsgeschiedenis</value>
+  </data>
+  <data name="CronPage_RunHistoryShowing" xml:space="preserve">
+    <value>Uitvoeringsgeschiedenis - {0} van {1} weergegeven</value>
+  </data>
+  <data name="CronPage_RunHistoryCount" xml:space="preserve">
+    <value>Uitvoeringsgeschiedenis - {0} uitvoeringen</value>
+  </data>
+  <data name="CronPage_LoadingRunHistory" xml:space="preserve">
+    <value>Uitvoeringsgeschiedenis laden...</value>
+  </data>
+  <data name="CronPage_NoRunHistoryAvailable" xml:space="preserve">
+    <value>Geen uitvoeringsgeschiedenis beschikbaar.</value>
+  </data>
+  <data name="CronPage_LoadOlderRuns" xml:space="preserve">
+    <value>Oudere uitvoeringen laden (nog {0})...</value>
+  </data>
+  <data name="CronPage_LoadMoreRuns" xml:space="preserve">
+    <value>Meer uitvoeringen laden...</value>
+  </data>
+  <data name="CronPage_Loading" xml:space="preserve">
+    <value>Laden...</value>
+  </data>
   <data name="CronPage_SaveChanges" xml:space="preserve">
     <value>Wijzigingen opslaan</value>
   </data>
@@ -4885,6 +5292,18 @@ Controleer of de gateway actief is.</value>
   <data name="ConnectionPage_NodeModeDisabledText" xml:space="preserve">
     <value>Nodemodus uitgeschakeld</value>
   </data>
+  <data name="ConnectionPage_NodeStarting" xml:space="preserve">
+    <value>Node wordt gestart…</value>
+  </data>
+  <data name="ConnectionPage_NodeMcpOnly" xml:space="preserve">
+    <value>Mogelijkheden lokaal beschikbaar (alleen MCP)</value>
+  </data>
+  <data name="ConnectionPage_NodeMcpOnlyReachable" xml:space="preserve">
+    <value>Bereikbaar voor lokale MCP-clients op {0}</value>
+  </data>
+  <data name="ConnectionPage_NodeMcpError" xml:space="preserve">
+    <value>Lokale MCP-server kon niet worden gestart</value>
+  </data>
   <data name="ConnectionPage_NodeBodyNoCapabilities" xml:space="preserve">
     <value>Geen mogelijkheden ingeschakeld. Kies wat u wilt delen bij Machtigingen.</value>
   </data>
@@ -4927,6 +5346,9 @@ Controleer of de gateway actief is.</value>
   <data name="ConnectionPage_OpenDashboard" xml:space="preserve">
     <value>Dashboard openen</value>
   </data>
+  <data name="ConnectionPage_GatewayOptionsA11y" xml:space="preserve">
+    <value>Opties voor {0}</value>
+  </data>
   <data name="ConnectionPage_DisconnectAction" xml:space="preserve">
     <value>Verbinding verbreken</value>
   </data>
@@ -5131,9 +5553,6 @@ Controleer of de gateway actief is.</value>
   <data name="ConnectionPage_CancelAction" xml:space="preserve">
     <value>Annuleren</value>
   </data>
-  <data name="ConnectionPage_ConnectFailed" xml:space="preserve">
-    <value>Verbinding mislukt</value>
-  </data>
   <data name="ConnectionPage_GatewayConnectionFailed" xml:space="preserve">
     <value>Gatewayverbinding mislukt.</value>
   </data>
@@ -5164,31 +5583,6 @@ Controleer of de gateway actief is.</value>
   <data name="ConnectionPage_DenyPairingRequest" xml:space="preserve">
     <value>Koppelingverzoek weigeren</value>
   </data>
-  <data name="ConnectionPage_AuthGuidanceToken" xml:space="preserve">
-    <value>{0}
-
-Plak een nieuwe installatiecode vanuit het Gateway toevoegen-proces.</value>
-  </data>
-  <data name="ConnectionPage_AuthGuidancePairing" xml:space="preserve">
-    <value>{0}
-
-Uw apparaat moet worden goedgekeurd op de gatewayhost.</value>
-  </data>
-  <data name="ConnectionPage_AuthGuidancePassword" xml:space="preserve">
-    <value>{0}
-
-Deze gateway vereist wachtwoordverificatie.</value>
-  </data>
-  <data name="ConnectionPage_AuthGuidanceSignature" xml:space="preserve">
-    <value>{0}
-
-De gateway vereist mogelijk een andere versie van het verificatieprotocol.</value>
-  </data>
-  <data name="ConnectionPage_AuthGuidanceDefault" xml:space="preserve">
-    <value>{0}
-
-Controleer uw verbindingsinstellingen en probeer het opnieuw.</value>
-  </data>
   <data name="ConnectionPage_AuthModeBootstrap" xml:space="preserve">
     <value>bootstrap-modus</value>
   </data>
@@ -5271,7 +5665,7 @@ Controleer uw verbindingsinstellingen en probeer het opnieuw.</value>
     <value>Koppel uw WhatsApp-telefoon</value>
   </data>
   <data name="ChannelsPage_GuideWhatsAppStep1" xml:space="preserve">
-    <value>Klik op &quot;Show QR&quot; in het gedeelte Koppelen hieronder.</value>
+    <value>Klik op "Show QR" in het gedeelte Koppelen hieronder.</value>
   </data>
   <data name="ChannelsPage_GuideWhatsAppStep2" xml:space="preserve">
     <value>Op uw telefoon: WhatsApp → Instellingen → Gekoppelde apparaten → Apparaat koppelen.</value>
@@ -5283,7 +5677,7 @@ Controleer uw verbindingsinstellingen en probeer het opnieuw.</value>
     <value>Koppel uw Signal-telefoon</value>
   </data>
   <data name="ChannelsPage_GuideSignalStep1" xml:space="preserve">
-    <value>Klik op &quot;Show QR&quot; in het gedeelte Koppelen hieronder.</value>
+    <value>Klik op "Show QR" in het gedeelte Koppelen hieronder.</value>
   </data>
   <data name="ChannelsPage_GuideSignalStep2" xml:space="preserve">
     <value>Op uw telefoon: Signal → Instellingen → Gekoppelde apparaten → Nieuw apparaat koppelen.</value>
@@ -5304,7 +5698,7 @@ Controleer uw verbindingsinstellingen en probeer het opnieuw.</value>
     <value>Plak het token in het configuratieformulier hieronder.</value>
   </data>
   <data name="ChannelsPage_GuideTelegramStep4" xml:space="preserve">
-    <value>Klik op &quot;Save and start&quot;. Het kanaal start automatisch.</value>
+    <value>Klik op "Save and start". Het kanaal start automatisch.</value>
   </data>
   <data name="ChannelsPage_GuideDiscordHeadline" xml:space="preserve">
     <value>Discord verbinden via een webhook</value>
@@ -5313,13 +5707,13 @@ Controleer uw verbindingsinstellingen en probeer het opnieuw.</value>
     <value>Open uw Discord-serverinstellingen → Integraties → Webhooks.</value>
   </data>
   <data name="ChannelsPage_GuideDiscordStep2" xml:space="preserve">
-    <value>Klik op &quot;New Webhook&quot;, geef het een naam en kopieer de webhook-URL.</value>
+    <value>Klik op "New Webhook", geef het een naam en kopieer de webhook-URL.</value>
   </data>
   <data name="ChannelsPage_GuideDiscordStep3" xml:space="preserve">
     <value>Plak de URL in het configuratieformulier hieronder.</value>
   </data>
   <data name="ChannelsPage_GuideDiscordStep4" xml:space="preserve">
-    <value>Klik op &quot;Save and start&quot;.</value>
+    <value>Klik op "Save and start".</value>
   </data>
   <data name="ChannelsPage_GuideGoogleChatHeadline" xml:space="preserve">
     <value>Google Chat verbinden via een webhook</value>
@@ -5334,7 +5728,7 @@ Controleer uw verbindingsinstellingen en probeer het opnieuw.</value>
     <value>Plak de URL in het configuratieformulier hieronder.</value>
   </data>
   <data name="ChannelsPage_GuideGoogleChatStep4" xml:space="preserve">
-    <value>Klik op &quot;Save and start&quot;.</value>
+    <value>Klik op "Save and start".</value>
   </data>
   <data name="ChannelsPage_GuideSlackHeadline" xml:space="preserve">
     <value>Slack verbinden via een app</value>
@@ -5349,7 +5743,7 @@ Controleer uw verbindingsinstellingen en probeer het opnieuw.</value>
     <value>Plak beide in het configuratieformulier hieronder.</value>
   </data>
   <data name="ChannelsPage_GuideSlackStep4" xml:space="preserve">
-    <value>Klik op &quot;Save and start&quot;.</value>
+    <value>Klik op "Save and start".</value>
   </data>
   <data name="ChannelsPage_GuideNostrHeadline" xml:space="preserve">
     <value>Nostr verbinden via relays</value>
@@ -5364,7 +5758,7 @@ Controleer uw verbindingsinstellingen en probeer het opnieuw.</value>
     <value>Plak beide in het configuratieformulier hieronder.</value>
   </data>
   <data name="ChannelsPage_GuideNostrStep4" xml:space="preserve">
-    <value>Klik op &quot;Save and start&quot;.</value>
+    <value>Klik op "Save and start".</value>
   </data>
   <data name="ChannelsPage_GuideIMessageHeadline" xml:space="preserve">
     <value>iMessage is alleen beschikbaar op macOS</value>
@@ -5382,10 +5776,10 @@ Controleer uw verbindingsinstellingen en probeer het opnieuw.</value>
     <value>Dit kanaal verbinden</value>
   </data>
   <data name="ChannelsPage_GuideGenericStep1" xml:space="preserve">
-    <value>&quot;{0}&quot; is een pluginkanaal. Raadpleeg de documentatie voor de vereiste velden.</value>
+    <value>"{0}" is een pluginkanaal. Raadpleeg de documentatie voor de vereiste velden.</value>
   </data>
   <data name="ChannelsPage_GuideGenericStep2" xml:space="preserve">
-    <value>Gebruik &quot;Open Config page&quot; in het gedeelte Configuratie hieronder om instellingen toe te voegen onder channels.{0}.</value>
+    <value>Gebruik "Open Config page" in het gedeelte Configuratie hieronder om instellingen toe te voegen onder channels.{0}.</value>
   </data>
   <data name="ChannelsPage_GuideGenericStep3" xml:space="preserve">
     <value>Sla de configuratie op; OpenClaw start het kanaal automatisch.</value>
@@ -5603,12 +5997,6 @@ Controleer uw verbindingsinstellingen en probeer het opnieuw.</value>
   <data name="Command_GoToDiagnostics_Title" xml:space="preserve">
     <value>Go to Diagnostics</value>
   </data>
-  <data name="Command_GoToInfo_Subtitle" xml:space="preserve">
-    <value>About this app</value>
-  </data>
-  <data name="Command_GoToInfo_Title" xml:space="preserve">
-    <value>Go to Info</value>
-  </data>
   <data name="Command_GoToNotifications_Subtitle" xml:space="preserve">
     <value>Actieve app-meldingen bekijken</value>
   </data>
@@ -5736,13 +6124,358 @@ Controleer uw verbindingsinstellingen en probeer het opnieuw.</value>
     <value>Waiting for gateway health</value>
   </data>
   <data name="ConfigPage_CheckingConfigPermissions" xml:space="preserve">
-    <value>Checking config permissions</value>
+    <value>Configuratiemachtigingen controleren</value>
   </data>
   <data name="ConfigPage_ConfigIsReadOnly" xml:space="preserve">
-    <value>Config is read-only</value>
+    <value>Configuratie is alleen-lezen</value>
   </data>
   <data name="ConfigPage_ConfigUnavailable" xml:space="preserve">
-    <value>Config unavailable</value>
+    <value>Configuratie niet beschikbaar</value>
+  </data>
+  <data name="ConfigPage_EditingPathFormat" xml:space="preserve">
+    <value>{0} bewerken via schema-gestuurd formulier.</value>
+  </data>
+  <data name="ConfigPage_RenderConfigUnavailableTitle" xml:space="preserve">
+    <value>Configuratie niet beschikbaar</value>
+  </data>
+  <data name="ConfigPage_RenderConfigUnavailableMessage" xml:space="preserve">
+    <value>De gatewayconfiguratie kon niet worden weergegeven. Vernieuw en probeer het opnieuw.</value>
+  </data>
+  <data name="ConfigPage_RenderSchemaUnavailableTitle" xml:space="preserve">
+    <value>Schema niet beschikbaar</value>
+  </data>
+  <data name="ConfigPage_RenderSchemaUnavailableMessage" xml:space="preserve">
+    <value>Het gatewayschema kon niet worden weergegeven. Ruwe JSON blijft beschikbaar als alleen-lezen voorbeeld.</value>
+  </data>
+  <data name="ConfigPage_StatusGatewayRestartingTitle" xml:space="preserve">
+    <value>Gateway wordt opnieuw gestart</value>
+  </data>
+  <data name="ConfigPage_StatusGatewayRestartingMessage" xml:space="preserve">
+    <value>Wijzigingen worden opgeslagen. De gateway wordt opnieuw gestart en maakt automatisch opnieuw verbinding.</value>
+  </data>
+  <data name="ConfigPage_StatusNoChangesTitle" xml:space="preserve">
+    <value>Geen wijzigingen</value>
+  </data>
+  <data name="ConfigPage_StatusNoChangesMessage" xml:space="preserve">
+    <value>Er is niets om op te slaan.</value>
+  </data>
+  <data name="ConfigPage_StatusFixValidationErrorsTitle" xml:space="preserve">
+    <value>Validatiefouten oplossen</value>
+  </data>
+  <data name="ConfigPage_StatusValidationErrorMessageFormat" xml:space="preserve">
+    <value>{0} — {1}</value>
+  </data>
+  <data name="ConfigPage_StatusNotConnectedTitle" xml:space="preserve">
+    <value>Niet verbonden</value>
+  </data>
+  <data name="ConfigPage_StatusNotConnectedMessage" xml:space="preserve">
+    <value>Maak verbinding met een gateway voordat u de configuratie opslaat.</value>
+  </data>
+  <data name="ConfigPage_StatusReadOnlyMessage" xml:space="preserve">
+    <value>Dit operatortoken heeft geen operator.write-machtiging, dus configuratiewijzigingen kunnen niet worden opgeslagen.</value>
+  </data>
+  <data name="ConfigPage_StatusConfigNotLoadedTitle" xml:space="preserve">
+    <value>Configuratie niet geladen</value>
+  </data>
+  <data name="ConfigPage_StatusConfigNotLoadedMessage" xml:space="preserve">
+    <value>Vernieuw de gatewayconfiguratie voordat u opslaat.</value>
+  </data>
+  <data name="ConfigPage_StatusSavingConfigTitle" xml:space="preserve">
+    <value>Configuratie opslaan…</value>
+  </data>
+  <data name="ConfigPage_StatusSavingConfigMessageFormat" xml:space="preserve">
+    <value>{0} wijziging(en) naar de gateway schrijven.</value>
+  </data>
+  <data name="ConfigPage_StatusStaleConfigTitle" xml:space="preserve">
+    <value>Gatewayconfiguratie is elders gewijzigd</value>
+  </data>
+  <data name="ConfigPage_StatusStaleConfigMessageFormat" xml:space="preserve">
+    <value>Uw bewerkingen blijven behouden. De nieuwste configuratie wordt vernieuwd; controleer het formulier en probeer opnieuw op te slaan. Details: {0}</value>
+  </data>
+  <data name="ConfigPage_StatusStaleConfigDefaultDetail" xml:space="preserve">
+    <value>verouderde configuratiehash</value>
+  </data>
+  <data name="ConfigPage_StatusSaveFailedTitle" xml:space="preserve">
+    <value>Opslaan mislukt</value>
+  </data>
+  <data name="ConfigPage_StatusSaveRejectedMessage" xml:space="preserve">
+    <value>De gateway heeft de configuratie-update geweigerd. Uw wijzigingen blijven behouden.</value>
+  </data>
+  <data name="ConfigPage_StatusSaveExceptionMessageFormat" xml:space="preserve">
+    <value>{0} Uw wijzigingen blijven behouden.</value>
+  </data>
+  <data name="ConfigPage_SaveStatusCheckingConfigPermissions" xml:space="preserve">
+    <value>Configuratiemachtigingen controleren…</value>
+  </data>
+  <data name="ConfigPage_SaveStatusRefreshing" xml:space="preserve">
+    <value>Vernieuwen…</value>
+  </data>
+  <data name="ConfigPage_StatusChangesDiscardedTitle" xml:space="preserve">
+    <value>Wijzigingen genegeerd</value>
+  </data>
+  <data name="ConfigPage_StatusChangesDiscardedMessage" xml:space="preserve">
+    <value>Het formulier is teruggezet naar de laatst geladen configuratie van de gateway.</value>
+  </data>
+  <data name="ConfigPage_FullConfig" xml:space="preserve">
+    <value>Volledige configuratie</value>
+  </data>
+  <data name="ConfigPage_StatusSectionResetTitle" xml:space="preserve">
+    <value>Sectie opnieuw ingesteld</value>
+  </data>
+  <data name="ConfigPage_StatusSectionResetMessageFormat" xml:space="preserve">
+    <value>{0} is teruggezet naar de laatst geladen gatewaywaarde.</value>
+  </data>
+  <data name="ConfigPage_StatusCopiedJsonDiffTitle" xml:space="preserve">
+    <value>JSON-diff gekopieerd</value>
+  </data>
+  <data name="ConfigPage_StatusCopiedJsonDiffMessage" xml:space="preserve">
+    <value>De diff van de geselecteerde sectie is naar het klembord gekopieerd.</value>
+  </data>
+  <data name="ConfigPage_StatusGatewayReconnectedTitle" xml:space="preserve">
+    <value>Gateway opnieuw verbonden</value>
+  </data>
+  <data name="ConfigPage_StatusGatewayReconnectedRefreshingMessage" xml:space="preserve">
+    <value>Configuratie opgeslagen en de gatewayverbinding is terug. De nieuwste configuratie wordt vernieuwd.</value>
+  </data>
+  <data name="ConfigPage_StatusGatewayReconnectedLoadedMessage" xml:space="preserve">
+    <value>Configuratie opgeslagen en de nieuwste gatewayconfiguratie is geladen.</value>
+  </data>
+  <data name="ConfigPage_StatusGatewayStillReconnectingTitle" xml:space="preserve">
+    <value>Gateway maakt nog steeds opnieuw verbinding</value>
+  </data>
+  <data name="ConfigPage_StatusGatewayStillReconnectingMessage" xml:space="preserve">
+    <value>Het opslaan van de configuratie is geaccepteerd, maar de gateway heeft nog geen nieuwe verbinding gemaakt. U kunt deze pagina open houden of Verbinding gebruiken om de status te controleren.</value>
+  </data>
+  <data name="ConfigPage_CheckingConfigPermissionsMessage" xml:space="preserve">
+    <value>Wachten tot de gateway de machtigingen van deze operator meldt.</value>
+  </data>
+  <data name="ConfigPage_ConfigUnavailableMessage" xml:space="preserve">
+    <value>Dit operatortoken mist de operator.read-machtiging, dus de gatewayconfiguratie kan hier niet worden geladen.</value>
+  </data>
+  <data name="ConfigPage_ConfigIsReadOnlyMessage" xml:space="preserve">
+    <value>Dit operatortoken kan de configuratie lezen, maar mist de operator.write-machtiging. U kunt concepten bekijken en valideren, maar Opslaan is uitgeschakeld.</value>
+  </data>
+  <data name="ConfigPage_MetaNoUnsavedChanges" xml:space="preserve">
+    <value>Geen niet-opgeslagen wijzigingen.</value>
+  </data>
+  <data name="ConfigPage_MetaUnsavedChangesFormat" xml:space="preserve">
+    <value>{0} niet-opgeslagen wijziging(en)</value>
+  </data>
+  <data name="ConfigPage_MetaUnsavedChangesWithValidationFormat" xml:space="preserve">
+    <value>{0} niet-opgeslagen wijziging(en) · {1} validatieproble(e)m(en)</value>
+  </data>
+  <data name="ConfigPage_SaveStatusSaving" xml:space="preserve">
+    <value>Opslaan…</value>
+  </data>
+  <data name="ConfigPage_SaveStatusGatewayRestarting" xml:space="preserve">
+    <value>Gateway wordt opnieuw gestart…</value>
+  </data>
+  <data name="ConfigPage_SaveStatusConnectToGateway" xml:space="preserve">
+    <value>Maak verbinding met een gateway om te bewerken</value>
+  </data>
+  <data name="ConfigPage_SaveStatusCheckingPermissions" xml:space="preserve">
+    <value>Machtigingen controleren…</value>
+  </data>
+  <data name="ConfigPage_SaveStatusMissingRead" xml:space="preserve">
+    <value>Configuratie niet beschikbaar: operator.read ontbreekt</value>
+  </data>
+  <data name="ConfigPage_SaveStatusReadOnlyMissingWrite" xml:space="preserve">
+    <value>Alleen-lezen: operator.write ontbreekt</value>
+  </data>
+  <data name="ConfigPage_SaveStatusFixValidationBeforeSaving" xml:space="preserve">
+    <value>Los validatiefouten op voordat u opslaat</value>
+  </data>
+  <data name="ConfigPage_SaveStatusUnsavedChanges" xml:space="preserve">
+    <value>Niet-opgeslagen wijzigingen</value>
+  </data>
+  <data name="ConfigPage_SaveStatusNoUnsavedChanges" xml:space="preserve">
+    <value>Geen niet-opgeslagen wijzigingen</value>
+  </data>
+  <data name="ConfigPage_AccessDisconnected" xml:space="preserve">
+    <value>Verbinding verbroken</value>
+  </data>
+  <data name="ConfigPage_AccessChecking" xml:space="preserve">
+    <value>Toegang controleren</value>
+  </data>
+  <data name="ConfigPage_AccessNoRead" xml:space="preserve">
+    <value>Geen leestoegang tot configuratie</value>
+  </data>
+  <data name="ConfigPage_AccessReadOnly" xml:space="preserve">
+    <value>Alleen-lezen toegang</value>
+  </data>
+  <data name="ConfigPage_AccessReadWrite" xml:space="preserve">
+    <value>Lees-/schrijftoegang</value>
+  </data>
+  <data name="ConfigPage_AccessUnknown" xml:space="preserve">
+    <value>Onbekende toegang</value>
+  </data>
+  <data name="ConfigPage_AccessChangesFormat" xml:space="preserve">
+    <value>{0} wijziging(en)</value>
+  </data>
+  <data name="ConfigPage_AccessValidationClean" xml:space="preserve">
+    <value>Lokale validatie in orde</value>
+  </data>
+  <data name="ConfigPage_AccessValidationIssuesFormat" xml:space="preserve">
+    <value>{0} validatieproble(e)m(en)</value>
+  </data>
+  <data name="ConfigPage_AccessSummaryFormat" xml:space="preserve">
+    <value>{0} · {1} · {2}</value>
+  </data>
+  <data name="DebugPage_NoGatewayConfigured" xml:space="preserve">
+    <value>geen gateway geconfigureerd</value>
+  </data>
+  <data name="DebugPage_StatusConnectedFormat" xml:space="preserve">
+    <value>OpenClaw is verbonden met {0}.</value>
+  </data>
+  <data name="DebugPage_StatusConnectingFormat" xml:space="preserve">
+    <value>Verbinding maken met {0}…</value>
+  </data>
+  <data name="DebugPage_StatusDisconnectedFormat" xml:space="preserve">
+    <value>Niet verbonden. Gateway: {0}.</value>
+  </data>
+  <data name="DebugPage_StatusErrorFormat" xml:space="preserve">
+    <value>Laatste gateway: {0}. Bekijk de gebeurtenistijdlijn.</value>
+  </data>
+  <data name="DebugPage_StatusGatewayFormat" xml:space="preserve">
+    <value>Gatewaydienst: {0}.</value>
+  </data>
+  <data name="DebugPage_RecentLogTitle" xml:space="preserve">
+    <value>Recent logboek</value>
+  </data>
+  <data name="DebugPage_RecentLogCaptionFormat" xml:space="preserve">
+    <value>Laatste 200 regels van {0}. Ernst wordt afgeleid uit [info]/[warn]/[error]-tags.</value>
+  </data>
+  <data name="DebugPage_CopyFeedbackFormat" xml:space="preserve">
+    <value>{0} gekopieerd naar klembord.</value>
+  </data>
+  <data name="SandboxPage_StatusUnavailableTitle" xml:space="preserve">
+    <value>Node-sandbox niet beschikbaar — host-fallback</value>
+  </data>
+  <data name="SandboxPage_StatusUnavailableSubtext" xml:space="preserve">
+    <value>Containment is niet beschikbaar op deze pc, dus opdrachten die de agent start, worden op de host uitgevoerd zonder sandboxbescherming.</value>
+  </data>
+  <data name="SandboxPage_StatusUnavailableBlockedTitle" xml:space="preserve">
+    <value>Node-sandbox niet beschikbaar — opdrachten geblokkeerd</value>
+  </data>
+  <data name="SandboxPage_StatusUnavailableBlockedSubtext" xml:space="preserve">
+    <value>Containment is niet beschikbaar op deze pc en strikte fallbackblokkering staat aan, dus opdrachten die de agent start, worden geblokkeerd.</value>
+  </data>
+  <data name="SandboxPage_StatusUnavailableOffTitle" xml:space="preserve">
+    <value>Node-sandbox is uitgeschakeld — hostuitvoering</value>
+  </data>
+  <data name="SandboxPage_StatusUnavailableOffSubtext" xml:space="preserve">
+    <value>Containment is niet beschikbaar en Node-sandbox is uitgeschakeld, dus opdrachten die de agent start, worden op de host uitgevoerd zonder sandboxbescherming.</value>
+  </data>
+  <data name="SandboxPage_StatusOnTitle" xml:space="preserve">
+    <value>Node-sandbox is ingeschakeld</value>
+  </data>
+  <data name="SandboxPage_StatusOnSubtext" xml:space="preserve">
+    <value>Programma's die de agent op deze pc uitvoert, zijn ingesloten.</value>
+  </data>
+  <data name="SandboxPage_StatusOffTitle" xml:space="preserve">
+    <value>Node-sandbox is uitgeschakeld — hoog risico</value>
+  </data>
+  <data name="SandboxPage_StatusOffSubtext" xml:space="preserve">
+    <value>Programma's die de agent op deze pc uitvoert, zijn niet ingesloten.</value>
+  </data>
+  <data name="SandboxPage_UnavailableDefaultReason" xml:space="preserve">
+    <value>MXC-sandboxprimitieven zijn niet beschikbaar op deze machine.</value>
+  </data>
+  <data name="SandboxPage_ProbeErrorReason" xml:space="preserve">
+    <value>Kan de beschikbaarheid van de sandbox niet controleren.</value>
+  </data>
+  <data name="SandboxPage_UnavailableBehaviorHostFallback" xml:space="preserve">
+    <value>Opdrachten worden op de host uitgevoerd zonder sandboxbescherming zolang sandboxing niet beschikbaar is.</value>
+  </data>
+  <data name="SandboxPage_UnavailableBehaviorBlocked" xml:space="preserve">
+    <value>Opdrachten worden geblokkeerd zolang sandboxing niet beschikbaar is, omdat strikte fallbackblokkering is ingeschakeld.</value>
+  </data>
+  <data name="SandboxPage_ProbeErrorTitle" xml:space="preserve">
+    <value>Kan de beschikbaarheid van de sandbox niet verifiëren</value>
+  </data>
+  <data name="SandboxPage_ProbeErrorMessageFormat" xml:space="preserve">
+    <value>{0}
+
+{1} De sandboxcapaciteitscontrole is niet voltooid. Dit is meestal tijdelijk (een trage of geblokkeerde controle) — probeer het opnieuw en controleer, als het probleem blijft bestaan, of beveiligingssoftware wxc-exec blokkeert.</value>
+  </data>
+  <data name="SandboxPage_Retry" xml:space="preserve">
+    <value>Opnieuw proberen</value>
+  </data>
+  <data name="SandboxPage_WindowsUnsupportedTitle" xml:space="preserve">
+    <value>Uw Windows-versie ondersteunt sandboxing nog niet</value>
+  </data>
+  <data name="SandboxPage_WindowsUnsupportedMessageFormat" xml:space="preserve">
+    <value>{0}
+
+{1} Sandboxing vereist een recente Windows-build met de AppContainer-primitieven. Installeer de nieuwste Windows-updates (of neem deel aan het Windows Insider-programma voor de nieuwste builds) om containment in te schakelen.</value>
+  </data>
+  <data name="SandboxPage_OpenWindowsUpdate" xml:space="preserve">
+    <value>Windows Update openen</value>
+  </data>
+  <data name="SandboxPage_ComponentsMissingTitle" xml:space="preserve">
+    <value>Sandboxing-onderdelen ontbreken</value>
+  </data>
+  <data name="SandboxPage_ComponentsMissingMessageFormat" xml:space="preserve">
+    <value>{0}
+
+Het binaire bestand wxc-exec is niet gevonden. {1} Als dit een ontwikkelaarsbuild is, bouw dan de tray-app zodat wxc-exec.exe naar de uitvoermap wordt gekopieerd. Installeer anders de companion-app opnieuw om sandboxing te herstellen.</value>
+  </data>
+  <data name="SandboxPage_ShowInstallInstructions" xml:space="preserve">
+    <value>Installatie-instructies weergeven</value>
+  </data>
+  <data name="SandboxPage_UnavailableTitle" xml:space="preserve">
+    <value>Sandbox niet beschikbaar — host-fallback</value>
+  </data>
+  <data name="SandboxPage_UnavailableBlockedTitle" xml:space="preserve">
+    <value>Sandbox niet beschikbaar — opdrachten geblokkeerd</value>
+  </data>
+  <data name="SettingsPage_LocalGatewayRemovedTitle" xml:space="preserve">
+    <value>Lokale gateway verwijderd</value>
+  </data>
+  <data name="SettingsPage_LocalGatewayRemovedMessage" xml:space="preserve">
+    <value>Setup is opnieuw ingesteld; u kunt setup opnieuw uitvoeren vanuit het traymenu.</value>
+  </data>
+  <data name="SettingsPage_LocalGatewayRemovalErrorsMessage" xml:space="preserve">
+    <value>Verwijderen is voltooid met fouten. Controleer de logboeken voor details.</value>
+  </data>
+  <data name="SettingsPage_LocalGatewayRemovalCancelledTitle" xml:space="preserve">
+    <value>Verwijderen geannuleerd</value>
+  </data>
+  <data name="SettingsPage_LocalGatewayRemovalCancelledMessage" xml:space="preserve">
+    <value>Gateway bevindt zich mogelijk in een gedeeltelijk verwijderde staat. Controleer logboeken of probeer opnieuw.</value>
+  </data>
+  <data name="SettingsPage_ViewLogs" xml:space="preserve">
+    <value>Logboeken weergeven</value>
+  </data>
+  <data name="SettingsPage_LocalGatewayRemovalFailedTitle" xml:space="preserve">
+    <value>Verwijderen mislukt</value>
+  </data>
+  <data name="SettingsPage_RemoveLocalGatewayButton" xml:space="preserve">
+    <value>Lokale gateway verwijderen</value>
+  </data>
+  <data name="SettingsPage_RemovingDistro" xml:space="preserve">
+    <value>Distro verwijderen…</value>
+  </data>
+  <data name="SettingsPage_RemovingLocalGatewayMessage" xml:space="preserve">
+    <value>De lokale gateway wordt verwijderd. Dit kan 10–30 seconden duren…</value>
+  </data>
+  <data name="CronPage_NextWakeFormat" xml:space="preserve">
+    <value>· Volgende wake: {0}</value>
+  </data>
+  <data name="ChatWindow_UnableToLoadChatCredentials" xml:space="preserve">
+    <value>Kan chat niet laden. De gateway-URL of het token is niet beschikbaar.</value>
+  </data>
+  <data name="ChatWindow_UnableToLoadChatRetryFormat" xml:space="preserve">
+    <value>Kan chat niet laden. Probeer het opnieuw. ({0})</value>
+  </data>
+  <data name="ChatWindow_WebViewFailedFormat" xml:space="preserve">
+    <value>WebView2 is mislukt: {0}</value>
+  </data>
+  <data name="CanvasWindow_WebViewInitFailedFormat" xml:space="preserve">
+    <value>Kan WebView2 niet initialiseren: {0}</value>
+  </data>
+  <data name="CanvasWindow_NavigationFailedFormat" xml:space="preserve">
+    <value>Navigatie mislukt: {0}</value>
   </data>
   <data name="ConnectionPage_GatewayHostControlsDescription_Format" xml:space="preserve">
     <value>Open a shell or manage the local gateway service in {0}.</value>
@@ -5751,7 +6484,16 @@ Controleer uw verbindingsinstellingen en probeer het opnieuw.</value>
     <value>Job completed</value>
   </data>
   <data name="CronPage_JobCompletedRanSuccessfully" xml:space="preserve">
-    <value>&quot;{0}&quot; ran successfully and was removed.</value>
+    <value>"{0}" ran successfully and was removed.</value>
+  </data>
+  <data name="CronPage_RunNotStarted" xml:space="preserve">
+    <value>Uitvoering niet gestart</value>
+  </data>
+  <data name="CronPage_RunNotStartedGeneric" xml:space="preserve">
+    <value>{0} is niet gestart.</value>
+  </data>
+  <data name="CronPage_RunNotStartedWithReason" xml:space="preserve">
+    <value>{0} is niet gestart: {1}</value>
   </data>
   <data name="GatewayHostAccess_NoTerminalAccess" xml:space="preserve">
     <value>This gateway does not have WSL or SSH terminal access.</value>
@@ -5819,6 +6561,24 @@ Controleer uw verbindingsinstellingen en probeer het opnieuw.</value>
   <data name="ConnectionPage_NodeSurfaceNone" xml:space="preserve">
     <value>none</value>
   </data>
+  <data name="ConnectionPage_NodeTechnicalDetails.Text" xml:space="preserve">
+    <value>Show technical details</value>
+  </data>
+  <data name="ConnectionPage_NodePillState_Active" xml:space="preserve">
+    <value>Sharing now</value>
+  </data>
+  <data name="ConnectionPage_NodePillState_Pending" xml:space="preserve">
+    <value>Enabled, not active yet</value>
+  </data>
+  <data name="ConnectionPage_NodePillState_Off" xml:space="preserve">
+    <value>Off</value>
+  </data>
+  <data name="ConnectionPage_NodeCap_Device" xml:space="preserve">
+    <value>Device info</value>
+  </data>
+  <data name="ConnectionPage_NodeCap_System" xml:space="preserve">
+    <value>System access</value>
+  </data>
   <data name="ConnectionPage_NodeEffectiveCapabilities" xml:space="preserve">
     <value>Approved/effective capabilities: {0}</value>
   </data>
@@ -5837,4 +6597,223 @@ Controleer uw verbindingsinstellingen en probeer het opnieuw.</value>
   <data name="ConnectionPage_NodePendingDeclaredPermissions" xml:space="preserve">
     <value>Pending declared permissions: {0}</value>
   </data>
+  <data name="ConnectionPage_AdviceCleartextTitle" xml:space="preserve">
+    <value>Niet-versleutelde verbinding</value>
+  </data>
+  <data name="ConnectionPage_AdviceCleartextMessage" xml:space="preserve">
+    <value>Deze externe gateway gebruikt ws:// — uw token zou onversleuteld worden verzonden. Gebruik wss:// (TLS), een SSH-tunnel of een vertrouwde proxy / Tailscale.</value>
+  </data>
+  <data name="ConnectionPage_AdviceSecureTitle" xml:space="preserve">
+    <value>Versleuteld (TLS)</value>
+  </data>
+  <data name="ConnectionPage_AdviceSecureMessage" xml:space="preserve">
+    <value>Deze gateway gebruikt TLS. Uw token is beschermd tijdens het transport wanneer het certificaat wordt gevalideerd.</value>
+  </data>
+  <data name="ConnectionPage_AdviceTunnelTitle" xml:space="preserve">
+    <value>SSH-tunnel</value>
+  </data>
+  <data name="ConnectionPage_AdviceTunnelMessage" xml:space="preserve">
+    <value>Verkeer naar deze gateway wordt versleuteld via de SSH-tunnel.</value>
+  </data>
+  <data name="ConnectionPage_RecoveryHeaderTokenDrift" xml:space="preserve">
+    <value>Koppel dit apparaat opnieuw:</value>
+  </data>
+  <data name="ConnectionPage_RecoveryHeaderScope" xml:space="preserve">
+    <value>Werk de toegang van dit apparaat bij:</value>
+  </data>
+  <data name="ConnectionPage_RecoveryHeaderTls" xml:space="preserve">
+    <value>Herstel de beveiligde verbinding:</value>
+  </data>
+  <data name="ConnectionPage_RecoveryTokenDriftBullet1" xml:space="preserve">
+    <value>De gateway vertrouwt het opgeslagen token van dit apparaat niet meer (het is gewijzigd of ingetrokken).</value>
+  </data>
+  <data name="ConnectionPage_RecoveryTokenDriftBullet2" xml:space="preserve">
+    <value>Haal een nieuwe installatiecode op van de gateway-host en plak deze hieronder om opnieuw te koppelen.</value>
+  </data>
+  <data name="ConnectionPage_RecoveryScopeBullet1" xml:space="preserve">
+    <value>Dit apparaat is geverifieerd maar mist de benodigde scopes (bijvoorbeeld operator.admin of operator.pairing).</value>
+  </data>
+  <data name="ConnectionPage_RecoveryScopeBullet2" xml:space="preserve">
+    <value>Koppel opnieuw met een nieuwe installatiecode om de vereiste scopes aan te vragen, of keur de hogere scopes goed op de gateway-host.</value>
+  </data>
+  <data name="ConnectionPage_RecoveryTlsBullet1" xml:space="preserve">
+    <value>Het TLS-/beveiligde transport van de gateway kon niet tot stand worden gebracht.</value>
+  </data>
+  <data name="ConnectionPage_RecoveryTlsBullet2" xml:space="preserve">
+    <value>Controleer het certificaat op de gateway-host, of maak verbinding via wss:// of een SSH-tunnel.</value>
+  </data>
+  <data name="ConnectionPage_TokenOrPasswordHint.Text" xml:space="preserve">
+    <value>Plak een gedeeld gateway-token, of laat het leeg om te koppelen met een installatiecode.</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpDirect.Text" xml:space="preserve">
+    <value>Maak verbinding met wss:// of https:// wanneer de gateway een vertrouwd certificaat heeft. Uw token wordt tijdens het transport versleuteld na certificaatvalidatie.</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpTunnel.Text" xml:space="preserve">
+    <value>Wanneer de gateway alleen op localhost luistert, vouwt u "SSH-tunnel gebruiken" hieronder uit. De tray stuurt een lokale poort door via SSH zodat het verkeer versleuteld blijft.</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpProxy.Text" xml:space="preserve">
+    <value>Als Tailscale of een reverse proxy het pad al versleutelt, is een gewone ws://-URL over dat privénetwerk prima.</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpAuth.Text" xml:space="preserve">
+    <value>Plak een gedeeld token, of laat het leeg en koppel met een installatiecode. Opnieuw koppelen werkt ook de scopes van dit apparaat bij.</value>
+  </data>
+  <data name="ConnectionPage_RecoveryHeaderRateLimited" xml:space="preserve">
+    <value>Wacht voordat u opnieuw verbinding maakt:</value>
+  </data>
+  <data name="ConnectionPage_RecoveryRateLimitedBullet1" xml:space="preserve">
+    <value>De gateway beperkt deze client tijdelijk na herhaalde mislukte pogingen.</value>
+  </data>
+  <data name="ConnectionPage_RecoveryRateLimitedBullet2" xml:space="preserve">
+    <value>Stop even met opnieuw proberen en verbind opnieuw nadat het token, wachtwoord of de koppelingsstatus is gecorrigeerd.</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpLink.Text" xml:space="preserve">
+    <value>Hoe maak ik verbinding met een externe gateway?</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpTip.Title" xml:space="preserve">
+    <value>Verbinding maken met een externe gateway</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpDirectTitle.Text" xml:space="preserve">
+    <value>Directe verbinding (TLS)</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpTunnelTitle.Text" xml:space="preserve">
+    <value>SSH-tunnel</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpProxyTitle.Text" xml:space="preserve">
+    <value>Vertrouwde proxy / Tailscale</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpAuthTitle.Text" xml:space="preserve">
+    <value>Verificatie</value>
+  </data>
+  <data name="HubWindow_StatusFlyout_Title.Text" xml:space="preserve">
+    <value>Connection</value>
+  </data>
+  <data name="HubWindow_StatusFlyout_OpenConnection.Content" xml:space="preserve">
+    <value>Open Connection</value>
+  </data>
+  <data name="HubWindow_StatusFlyout_GatewayLabel.Text" xml:space="preserve">
+    <value>Gateway</value>
+  </data>
+  <data name="HubWindow_StatusFlyout_Reconnect.Content" xml:space="preserve">
+    <value>Reconnect</value>
+  </data>
+  <data name="HubWindow_StatusFlyout_OperatorLabel.Text" xml:space="preserve">
+    <value>Operator</value>
+  </data>
+  <data name="HubWindow_StatusFlyout_NodeLabel.Text" xml:space="preserve">
+    <value>Node</value>
+  </data>
+  <data name="HubWindow_StatusFlyout_Approve.Content" xml:space="preserve">
+    <value>Approve…</value>
+  </data>
+  <data name="HubWindow_StatusPill_Tooltip" xml:space="preserve">
+    <value>Connection status</value>
+  </data>
+  <data name="HubWindow_Bell_Tooltip" xml:space="preserve">
+    <value>Notifications</value>
+  </data>
+  <data name="HubWindow_Pill_Ready" xml:space="preserve">
+    <value>Ready</value>
+  </data>
+  <data name="HubWindow_Pill_PairingRequired" xml:space="preserve">
+    <value>Pairing required</value>
+  </data>
+  <data name="HubWindow_Pill_Degraded" xml:space="preserve">
+    <value>Degraded</value>
+  </data>
+  <data name="HubWindow_Role_Off" xml:space="preserve">
+    <value>Off</value>
+  </data>
+  <data name="HubWindow_Role_PairingRequired" xml:space="preserve">
+    <value>Pairing required</value>
+  </data>
+  <data name="HubWindow_Role_PairingRejected" xml:space="preserve">
+    <value>Pairing rejected</value>
+  </data>
+  <data name="HubWindow_Role_RateLimited" xml:space="preserve">
+    <value>Rate limited</value>
+  </data>
+  <data name="HubWindow_Role_Disabled" xml:space="preserve">
+    <value>Disabled</value>
+  </data>
+  <data name="NotificationsFlyout_ClearAll.Content" xml:space="preserve">
+    <value>Clear all</value>
+  </data>
+  <data name="NotificationsFlyout_EmptyTitle.Text" xml:space="preserve">
+    <value>No notifications</value>
+  </data>
+  <data name="NotificationsFlyout_OpenPage.Content" xml:space="preserve">
+    <value>Open notifications</value>
+  </data>
+  <data name="NotificationsFlyout_ActiveCountFormat" xml:space="preserve">
+    <value>{0} active</value>
+  </data>
+  <data name="HubWindow_Role_PermissionsIncomplete" xml:space="preserve">
+    <value>Permissions incomplete</value>
+  </data>
+  <data name="SettingsPage_About.Text" xml:space="preserve">
+    <value>About</value>
+  </data>
+  <data name="SettingsPage_GatewayInfoExpander.Header" xml:space="preserve">
+    <value>Gateway info</value>
+  </data>
+  <data name="SettingsPage_GatewayInfoLabel_Version.Text" xml:space="preserve">
+    <value>Version</value>
+  </data>
+  <data name="SettingsPage_GatewayInfoLabel_Protocol.Text" xml:space="preserve">
+    <value>Protocol</value>
+  </data>
+  <data name="SettingsPage_GatewayInfoLabel_AuthMode.Text" xml:space="preserve">
+    <value>Auth mode</value>
+  </data>
+  <data name="SettingsPage_GatewayInfoLabel_Uptime.Text" xml:space="preserve">
+    <value>Uptime</value>
+  </data>
+  <data name="PermissionsPage_NewRuleAction.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Regelactie</value>
+  </data>
+  <data name="SandboxPage_UnavailablePrimaryButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Sandboxactie</value>
+  </data>
+  <data name="SandboxPage_PresetLockedButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Vergrendelde voorinstelling: Geen internet, geen klembord, geen standaardgebruikersmappen</value>
+  </data>
+  <data name="SandboxPage_PresetBalancedButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Aanbevolen voorinstelling: Internet aan, alleen-lezen voor Documenten, Downloads en Bureaublad</value>
+  </data>
+  <data name="SandboxPage_PresetPermissiveButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Onbeveiligde voorinstelling: Internet aan, lezen en schrijven voor Documenten, Downloads en Bureaublad</value>
+  </data>
+  <data name="SandboxPage_DocsAccessCombo.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Toegangsniveau voor Documenten</value>
+  </data>
+  <data name="SandboxPage_DownloadsAccessCombo.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Toegangsniveau voor Downloads</value>
+  </data>
+  <data name="SandboxPage_DesktopAccessCombo.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Toegangsniveau voor Bureaublad</value>
+  </data>
+  <data name="SettingsPage_NotificationSoundComboBox.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Meldingsgeluid</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantRefreshButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Status van spraakassistent vernieuwen</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStartButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Spraakassistent starten</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStopButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Spraakassistent stoppen</value>
+  </data>
+  <data name="VoiceSettingsPage_LanguageCombo.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Spraaktaal</value>
+  </data>
+  <data name="HubWindow_MainNavigation.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Hoofdnavigatie</value>
+  </data>
+  <data name="JsonPreviewSplitter.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Formaat van JSON-voorbeeld wijzigen</value>
+  </data>
+  <data name="JsonPreviewSplitter.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.LocalizedControlType" xml:space="preserve">
+    <value>scheidingslijn</value>
+  </data>
 </root>
diff --git a/src/OpenClaw.Tray.WinUI/Strings/zh-cn/Resources.resw b/src/OpenClaw.Tray.WinUI/Strings/zh-cn/Resources.resw
index f6b026062..fbbf5f9e7 100644
--- a/src/OpenClaw.Tray.WinUI/Strings/zh-cn/Resources.resw
+++ b/src/OpenClaw.Tray.WinUI/Strings/zh-cn/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root xmlns:ns1="urn:schemas-microsoft-com:xml-msdata" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:schema id="root">
     <xs:element name="root" ns1:IsDataSet="true">
@@ -367,6 +367,9 @@
   <data name="Update_Message_Skipped_Debug" xml:space="preserve">
     <value>调试版本已禁用更新检查。</value>
   </data>
+  <data name="Update_Message_Skipped_Dev" xml:space="preserve">
+    <value>开发版本已禁用更新检查。</value>
+  </data>
   <data name="Update_OK" xml:space="preserve">
     <value>确定</value>
   </data>
@@ -648,6 +651,75 @@
   <data name="Toast_PairingCommandCopied" xml:space="preserve">
     <value>配对命令已复制</value>
   </data>
+  <data name="Toast_PairingRequestTitle" xml:space="preserve">
+    <value>配对请求</value>
+  </data>
+  <data name="Toast_PairingRequestBody" xml:space="preserve">
+    <value>{0} 想要连接</value>
+  </data>
+  <data name="Toast_PairingRequestBodyNode" xml:space="preserve">
+    <value>{0} 想要作为节点连接</value>
+  </data>
+  <data name="Toast_PairingReview" xml:space="preserve">
+    <value>查看</value>
+  </data>
+  <data name="Toast_PairingApprovedTitle" xml:space="preserve">
+    <value>配对已批准</value>
+  </data>
+  <data name="Toast_PairingApprovedBody" xml:space="preserve">
+    <value>{0} 现在可以连接</value>
+  </data>
+  <data name="Toast_PairingRejectedTitle" xml:space="preserve">
+    <value>配对已拒绝</value>
+  </data>
+  <data name="Toast_PairingRejectedBody" xml:space="preserve">
+    <value>{0} 未获允许连接</value>
+  </data>
+  <data name="PairingApproval_WindowTitle" xml:space="preserve">
+    <value>配对请求</value>
+  </data>
+  <data name="PairingApproval_DeviceHeading" xml:space="preserve">
+    <value>有设备想要连接</value>
+  </data>
+  <data name="PairingApproval_NodeHeading" xml:space="preserve">
+    <value>有节点想要连接</value>
+  </data>
+  <data name="PairingApproval_Subtitle" xml:space="preserve">
+    <value>仅在您认识此请求时才批准。稍后可在“连接”设置中将其移除。</value>
+  </data>
+  <data name="PairingApproval_AccessRequested" xml:space="preserve">
+    <value>请求的访问权限</value>
+  </data>
+  <data name="PairingApproval_RepairBadge" xml:space="preserve">
+    <value>重新配对请求——设备令牌将轮换。</value>
+  </data>
+  <data name="PairingApproval_Approve" xml:space="preserve">
+    <value>批准</value>
+  </data>
+  <data name="PairingApproval_ApproveDevice" xml:space="preserve">
+    <value>批准设备</value>
+  </data>
+  <data name="PairingApproval_ApproveNode" xml:space="preserve">
+    <value>批准节点</value>
+  </data>
+  <data name="PairingApproval_Reject" xml:space="preserve">
+    <value>拒绝</value>
+  </data>
+  <data name="PairingApproval_Later" xml:space="preserve">
+    <value>稍后决定</value>
+  </data>
+  <data name="PairingApproval_MoreWaiting" xml:space="preserve">
+    <value>还有 {0} 个等待</value>
+  </data>
+  <data name="PairingApproval_ApproveHint" xml:space="preserve">
+    <value>批准将在稍后可用</value>
+  </data>
+  <data name="PairingApproval_UnknownDevice" xml:space="preserve">
+    <value>未知设备</value>
+  </data>
+  <data name="PairingApproval_UnknownPlatform" xml:space="preserve">
+    <value>未知平台</value>
+  </data>
   <data name="Toast_NodePaired" xml:space="preserve">
     <value>✅ 节点已配对！</value>
   </data>
@@ -775,156 +847,6 @@
   <data name="Toast_ActivityStreamTipButton" xml:space="preserve">
     <value>打开活动流</value>
   </data>
-  <data name="Setup_Title" xml:space="preserve">
-    <value>OpenClaw 设置</value>
-  </data>
-  <data name="Setup_StepConnect" xml:space="preserve">
-    <value>第 1 步（共 3 步）— 连接</value>
-  </data>
-  <data name="Setup_ConnectTitle" xml:space="preserve">
-    <value>连接到您的网关</value>
-  </data>
-  <data name="Setup_ConnectDescription" xml:space="preserve">
-    <value>在您的网关主机（Mac/Linux）上运行以下命令获取设置码：</value>
-  </data>
-  <data name="Setup_SetupCodeHeader" xml:space="preserve">
-    <value>设置码</value>
-  </data>
-  <data name="Setup_SetupCodePlaceholder" xml:space="preserve">
-    <value>粘贴来自网关仪表板的设置码</value>
-  </data>
-  <data name="Setup_PasteSetupButton" xml:space="preserve">
-    <value>粘贴设置码 / QR</value>
-  </data>
-  <data name="Setup_ImportQrButton" xml:space="preserve">
-    <value>导入 QR 图片...</value>
-  </data>
-  <data name="Setup_QrDecoded" xml:space="preserve">
-    <value>✅ QR 图片已解码 — 请点击"测试连接"</value>
-  </data>
-  <data name="Setup_QrDecodeFailed" xml:space="preserve">
-    <value>❌ 无法在该图片中找到有效的设置 QR 码。</value>
-  </data>
-  <data name="Setup_ClipboardUnsupported" xml:space="preserve">
-    <value>❌ 剪贴板不包含设置码文本或 QR 图片。</value>
-  </data>
-  <data name="Setup_ManualEntryToggle" xml:space="preserve">
-    <value>或手动输入 URL 和令牌 ▾</value>
-  </data>
-  <data name="Setup_ManualEntryToggleHide" xml:space="preserve">
-    <value>隐藏手动输入 ▴</value>
-  </data>
-  <data name="Setup_GatewayUrlHeader" xml:space="preserve">
-    <value>网关地址</value>
-  </data>
-  <data name="Setup_GatewayUrlPlaceholder" xml:space="preserve">
-    <value>ws://192.168.1.x:18789</value>
-  </data>
-  <data name="Setup_GatewayUrlHint" xml:space="preserve">
-    <value>💡 支持 ws://、wss://、http:// 或 https://</value>
-  </data>
-  <data name="Setup_TokenHeader" xml:space="preserve">
-    <value>网关令牌</value>
-  </data>
-  <data name="Setup_TokenPlaceholder" xml:space="preserve">
-    <value>在此粘贴您的令牌</value>
-  </data>
-  <data name="Setup_TestButton" xml:space="preserve">
-    <value>测试连接</value>
-  </data>
-  <data name="Setup_Testing" xml:space="preserve">
-    <value>⏳ 正在连接网关...</value>
-  </data>
-  <data name="Setup_Connected" xml:space="preserve">
-    <value>✅ 连接成功！</value>
-  </data>
-  <data name="Setup_PairingRequired" xml:space="preserve">
-    <value>✅ 已连接到网关！设备需要配对批准。
-
-在您的网关主机（Mac/Linux）上运行：
-
-  openclaw devices approve {0}</value>
-  </data>
-  <data name="Setup_TokenMismatch" xml:space="preserve">
-    <value>❌ 令牌不匹配。
-
-💡 检查网关认证令牌：
-  cat ~/.openclaw/openclaw.json | grep token</value>
-  </data>
-  <data name="Setup_OriginNotAllowed" xml:space="preserve">
-    <value>❌ 来源不被允许。
-
-💡 将此机器添加到 gateway.controlUi.allowedOrigins。</value>
-  </data>
-  <data name="Setup_RateLimited" xml:space="preserve">
-    <value>❌ 请求过于频繁。请等待一分钟后重试。</value>
-  </data>
-  <data name="Setup_TimedOut" xml:space="preserve">
-    <value>❌ 连接超时。请检查 URL 和网关是否正在运行。</value>
-  </data>
-  <data name="Setup_TokenRequired" xml:space="preserve">
-    <value>❌ 请输入令牌</value>
-  </data>
-  <data name="Setup_TestFirst" xml:space="preserve">
-    <value>⚠️ 请先测试连接</value>
-  </data>
-  <data name="Setup_CodeDecoded" xml:space="preserve">
-    <value>✅ 设置码已解码 — 请点击"测试连接"</value>
-  </data>
-  <data name="Setup_NodeModeTitle" xml:space="preserve">
-    <value>启用节点模式（可选）</value>
-  </data>
-  <data name="Setup_NodeModeDescription" xml:space="preserve">
-    <value>节点模式允许您的 Windows 电脑为 OpenClaw 执行任务 — 如屏幕截图、摄像头访问和画布绘制。</value>
-  </data>
-  <data name="Setup_NodeModeSecurityTitle" xml:space="preserve">
-    <value>仅为您信任的网关和代理启用节点模式</value>
-  </data>
-  <data name="Setup_NodeModeSecurityMessage" xml:space="preserve">
-    <value>已批准的代理可以运行本地命令，并可能访问已启用的设备表面，例如屏幕、摄像头、位置、浏览器和画布。您稍后可以在设置中禁用能力组。</value>
-  </data>
-  <data name="Setup_NodeModeToggle" xml:space="preserve">
-    <value>启用节点模式</value>
-  </data>
-  <data name="Setup_DeviceIdLoading" xml:space="preserve">
-    <value>设备 ID：加载中...</value>
-  </data>
-  <data name="Setup_DeviceIdFallback" xml:space="preserve">
-    <value>设备 ID：（将在首次连接时生成）</value>
-  </data>
-  <data name="Setup_CopyDeviceId" xml:space="preserve">
-    <value>📋 复制设备 ID</value>
-  </data>
-  <data name="Setup_DeviceIdCopied" xml:space="preserve">
-    <value>✅ 已复制！</value>
-  </data>
-  <data name="Setup_ApproveInstructions" xml:space="preserve">
-    <value>要批准此节点，请在网关主机上运行：</value>
-  </data>
-  <data name="Setup_ApproveHint" xml:space="preserve">
-    <value>💡 您可以现在完成设置 — 配对将在后台继续。获得批准后会收到通知。</value>
-  </data>
-  <data name="Setup_DoneTitle" xml:space="preserve">
-    <value>🎉 一切就绪！</value>
-  </data>
-  <data name="Setup_DoneDescription" xml:space="preserve">
-    <value>OpenClaw 托盘将连接到您的网关并开始监控。</value>
-  </data>
-  <data name="Setup_BackButton" xml:space="preserve">
-    <value>上一步</value>
-  </data>
-  <data name="Setup_NextButton" xml:space="preserve">
-    <value>下一步</value>
-  </data>
-  <data name="Setup_FinishButton" xml:space="preserve">
-    <value>完成</value>
-  </data>
-  <data name="Setup_StepNodeMode" xml:space="preserve">
-    <value>第 2 步（共 3 步）— 节点模式</value>
-  </data>
-  <data name="Setup_StepDone" xml:space="preserve">
-    <value>第 3 步（共 3 步）— 完成</value>
-  </data>
   <data name="SettingsDeveloperModeHeader.Text" xml:space="preserve">
     <value>开发者模式</value>
   </data>
@@ -1446,57 +1368,6 @@
   <data name="Onboarding_LocalSetup_Phase_MintToken" xml:space="preserve">
     <value>正在生成设置代码</value>
   </data>
-  <data name="AboutPage_TextBlock_10.Text" xml:space="preserve">
-    <value>关于</value>
-  </data>
-  <data name="AboutPage_TextBlock_19.Text" xml:space="preserve">
-    <value>OpenClaw Hub</value>
-  </data>
-  <data name="AboutPage_TextBlock_23.Text" xml:space="preserve">
-    <value>.NET / WinUI / Windows App SDK</value>
-  </data>
-  <data name="AboutPage_TextBlock_35.Text" xml:space="preserve">
-    <value>网关信息</value>
-  </data>
-  <data name="AboutPage_TextBlock_48.Text" xml:space="preserve">
-    <value>版本：</value>
-  </data>
-  <data name="AboutPage_TextBlock_52.Text" xml:space="preserve">
-    <value>协议：</value>
-  </data>
-  <data name="AboutPage_TextBlock_56.Text" xml:space="preserve">
-    <value>身份验证模式：</value>
-  </data>
-  <data name="AboutPage_TextBlock_60.Text" xml:space="preserve">
-    <value>运行时间：</value>
-  </data>
-  <data name="AboutPage_TextBlock_72.Text" xml:space="preserve">
-    <value>调试</value>
-  </data>
-  <data name="OpenLogButton.Content" xml:space="preserve">
-    <value>打开日志文件</value>
-  </data>
-  <data name="OpenConfigButton.Content" xml:space="preserve">
-    <value>打开配置文件夹</value>
-  </data>
-  <data name="CopySupportButton.Content" xml:space="preserve">
-    <value>复制支持上下文</value>
-  </data>
-  <data name="CheckUpdatesButton.Content" xml:space="preserve">
-    <value>检查更新</value>
-  </data>
-  <data name="AboutPage_TextBlock_91.Text" xml:space="preserve">
-    <value>链接</value>
-  </data>
-  <data name="AboutPage_HyperlinkButton_92.Content" xml:space="preserve">
-    <value>Documentation → docs.openclaw.ai/platforms/windows</value>
-  </data>
-  <data name="AboutPage_HyperlinkButton_94.Content" xml:space="preserve">
-    <value>GitHub → github.com/openclaw/openclaw-windows-node</value>
-  </data>
-  <data name="AboutPage_HyperlinkButton_96.Content" xml:space="preserve">
-    <value>Dashboard → openclaw://dashboard</value>
-  </data>
   <data name="AgentEventsPage_TextBlock_18.Text" xml:space="preserve">
     <value>代理事件</value>
   </data>
@@ -1567,7 +1438,7 @@
     <value>本地 MCP 服务器</value>
   </data>
   <data name="PermissionsPage_McpDescription.Text" xml:space="preserve">
-    <value>通过 HTTP 向 CLI 工具和本地集成公开功能。</value>
+    <value>通过 HTTP 向此电脑上的本地 MCP 客户端（CLI 工具、集成）提供功能。</value>
   </data>
   <data name="PermissionsPage_McpEndpointLabel.Text" xml:space="preserve">
     <value>终结点：</value>
@@ -1662,7 +1533,7 @@
   <data name="DetailPath.Text" xml:space="preserve">
     <value>选择配置部分</value>
   </data>
-<data name="ConfigPage_TabViewItem_82.Text" xml:space="preserve">
+  <data name="ConfigPage_TabViewItem_82.Text" xml:space="preserve">
     <value>原始 JSON</value>
   </data>
   <data name="ConfigPage_TextBlock_95.Text" xml:space="preserve">
@@ -1698,9 +1569,6 @@
   <data name="ConnectionPage_TextBlock_11.Text" xml:space="preserve">
     <value>操作员客户端和节点服务共同使用的网关终结点。</value>
   </data>
-  <data name="AuthErrorBar.Title" xml:space="preserve">
-    <value>连接错误</value>
-  </data>
   <data name="StatusText.Text" xml:space="preserve">
     <value>已断开连接</value>
   </data>
@@ -2020,10 +1888,13 @@
     <value>命令模式（例如 echo *）</value>
   </data>
   <data name="PermissionsPage_ComboBoxItem_54.Content" xml:space="preserve">
-    <value>允许</value>
+    <value>拒绝</value>
   </data>
   <data name="PermissionsPage_ComboBoxItem_55.Content" xml:space="preserve">
-    <value>拒绝</value>
+    <value>允许</value>
+  </data>
+  <data name="PermissionsPage_ComboBoxItem_56.Content" xml:space="preserve">
+    <value>询问</value>
   </data>
   <data name="PermissionsPage_Button_57.Content" xml:space="preserve">
     <value>添加规则</value>
@@ -2214,6 +2085,69 @@
   <data name="WorkspacePage_LoadingContent" xml:space="preserve">
     <value>正在加载内容…</value>
   </data>
+  <data name="WorkspacePage_SearchBox.PlaceholderText" xml:space="preserve">
+    <value>Search files</value>
+  </data>
+  <data name="WorkspacePage_ParentFolderButton.Content" xml:space="preserve">
+    <value>Up</value>
+  </data>
+  <data name="WorkspacePage_OpenConnectionSettings.Content" xml:space="preserve">
+    <value>Open Connection settings</value>
+  </data>
+  <data name="WorkspacePage_NoSearchResults.Text" xml:space="preserve">
+    <value>No files match your search.</value>
+  </data>
+  <data name="WorkspacePage_NoFolderResults" xml:space="preserve">
+    <value>No files found in this folder.</value>
+  </data>
+  <data name="WorkspacePage_LoadErrorMessage" xml:space="preserve">
+    <value>Couldn't load workspace files. Try refreshing.</value>
+  </data>
+  <data name="WorkspacePage_UnsupportedMessage" xml:space="preserve">
+    <value>This gateway doesn't support listing workspace files.</value>
+  </data>
+  <data name="WorkspacePage_Badge_Missing" xml:space="preserve">
+    <value>Missing</value>
+  </data>
+  <data name="WorkspacePage_Badge_Edited" xml:space="preserve">
+    <value>Edited</value>
+  </data>
+  <data name="WorkspacePage_Badge_Read" xml:space="preserve">
+    <value>Read</value>
+  </data>
+  <data name="WorkspacePage_FolderNote" xml:space="preserve">
+    <value>This is a folder.</value>
+  </data>
+  <data name="WorkspacePage_FileUnavailable" xml:space="preserve">
+    <value>Couldn't load this file.</value>
+  </data>
+  <data name="WorkspacePage_BrowserOnlyFileNote" xml:space="preserve">
+    <value>Only files read or edited in this session can be previewed.</value>
+  </data>
+  <data name="WorkspacePage_OpenFolder" xml:space="preserve">
+    <value>Open</value>
+  </data>
+  <data name="WorkspacePage_CopyPath" xml:space="preserve">
+    <value>Copy path</value>
+  </data>
+  <data name="WorkspacePage_CopyPathFailed" xml:space="preserve">
+    <value>Couldn't copy the path.</value>
+  </data>
+  <data name="WorkspacePage_FileType_File" xml:space="preserve">
+    <value>File</value>
+  </data>
+  <data name="WorkspacePage_FileType_Folder" xml:space="preserve">
+    <value>Folder</value>
+  </data>
+  <data name="WorkspacePage_RootFolder" xml:space="preserve">
+    <value>Root</value>
+  </data>
+  <data name="WorkspacePage_SearchResultsPath" xml:space="preserve">
+    <value>Search results for "{0}"</value>
+  </data>
+  <data name="WorkspacePage_BrowserTruncated" xml:space="preserve">
+    <value>Some results were omitted. Narrow your search or open a folder.</value>
+  </data>
   <data name="WorkspacePage_MissingFile" xml:space="preserve">
     <value>(磁盘上找不到文件)</value>
   </data>
@@ -2307,12 +2241,6 @@
   <data name="HubWindow_NavigationViewItem_145.Content" xml:space="preserve">
     <value>调试</value>
   </data>
-  <data name="HubWindow_NavigationViewItem_Notifications.Content" xml:space="preserve">
-    <value>通知</value>
-  </data>
-  <data name="HubWindow_NavigationViewItem_148.Content" xml:space="preserve">
-    <value>信息</value>
-  </data>
   <data name="Onboarding_UnknownPage" xml:space="preserve">
     <value>未知页面</value>
   </data>
@@ -2517,6 +2445,105 @@
   <data name="VoiceSettingsPage_PageDescription.Text" xml:space="preserve">
     <value>配置语音转文字和语音交互设置。所有语音处理均在本机本地运行。</value>
   </data>
+  <data name="VoiceSettingsPage_AssistantHeader.Text" xml:space="preserve">
+    <value>助手</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantDescription.Text" xml:space="preserve">
+    <value>始终监听的助手服务和最新对话轮次。</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantRefreshButton.[using:Microsoft.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>刷新助手状态</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStartButtonText.Text" xml:space="preserve">
+    <value>启动</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStopButtonText.Text" xml:space="preserve">
+    <value>停止</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStatusChecking.Text" xml:space="preserve">
+    <value>正在检查助手状态...</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantRecentTurnsHeader.Text" xml:space="preserve">
+    <value>最近轮次</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStarting" xml:space="preserve">
+    <value>正在启动助手...</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStartingDetail" xml:space="preserve">
+    <value>正在启动始终监听模式，并使用本地助手路由和轮次存储。</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStartFailed" xml:space="preserve">
+    <value>助手未启动</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStopping" xml:space="preserve">
+    <value>正在停止助手...</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStopFailed" xml:space="preserve">
+    <value>助手未停止</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantBridgeUnavailable" xml:space="preserve">
+    <value>助手桥不可用</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantNoTurnsLoaded" xml:space="preserve">
+    <value>未加载助手轮次。</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantUnknown" xml:space="preserve">
+    <value>未知</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantListeningFormat" xml:space="preserve">
+    <value>助手正在监听 (PID {0})</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStopped" xml:space="preserve">
+    <value>助手已停止</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStatusFormat" xml:space="preserve">
+    <value>助手 {0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantTranscriberFormat" xml:space="preserve">
+    <value>转录器：{0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantMicFormat" xml:space="preserve">
+    <value>麦克风：{0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantSpeakerFormat" xml:space="preserve">
+    <value>扬声器：{0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantCloudRoutingFormat" xml:space="preserve">
+    <value>云路由：{0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantSpeechOutputFormat" xml:space="preserve">
+    <value>语音输出：{0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantOn" xml:space="preserve">
+    <value>开启</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantOff" xml:space="preserve">
+    <value>关闭</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantLastBridgeUpdateFormat" xml:space="preserve">
+    <value>上次桥更新：{0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantNoConversationTurns" xml:space="preserve">
+    <value>还没有对话轮次。</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantSourceDefault" xml:space="preserve">
+    <value>助手</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantTurnMetadataFormat" xml:space="preserve">
+    <value>{0} / {1}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantTurnMetadataWithLatencyFormat" xml:space="preserve">
+    <value>{0} | {1} | {2} 毫秒</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantUserTurnFormat" xml:space="preserve">
+    <value>你：{0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantResponseTurnFormat" xml:space="preserve">
+    <value>OpenClaw：{0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantEmptyValue" xml:space="preserve">
+    <value>（空）</value>
+  </data>
   <data name="VoiceSettingsPage_SttHeader.Text" xml:space="preserve">
     <value>语音转文字</value>
   </data>
@@ -2892,6 +2919,9 @@
   <data name="Chat_Timeline_LoadEarlier" xml:space="preserve">
     <value>加载更早的消息</value>
   </data>
+  <data name="Chat_Timeline_ScrollToLatest" xml:space="preserve">
+    <value>滚动到最新消息</value>
+  </data>
   <data name="Chat_Tool_CallLabel" xml:space="preserve">
     <value>工具调用</value>
   </data>
@@ -2928,6 +2958,15 @@
   <data name="Chat_Composer_Reasoning_Maximum" xml:space="preserve">
     <value>最大</value>
   </data>
+  <data name="Chat_Composer_Accessibility_Session" xml:space="preserve">
+    <value>会话</value>
+  </data>
+  <data name="Chat_Composer_Accessibility_Model" xml:space="preserve">
+    <value>模型</value>
+  </data>
+  <data name="Chat_Composer_Accessibility_Reasoning" xml:space="preserve">
+    <value>推理</value>
+  </data>
   <data name="Chat_Composer_Placeholder_Connected" xml:space="preserve">
     <value>给助手发送消息（按 Enter 发送）</value>
   </data>
@@ -2964,6 +3003,30 @@
   <data name="Chat_Composer_AssistantWorking" xml:space="preserve">
     <value>助手正在工作…</value>
   </data>
+  <data name="Chat_Composer_QueuedCountFormat" xml:space="preserve">
+    <value>已排队 ({0})</value>
+  </data>
+  <data name="Chat_Composer_QueuedMessageAutomationFormat" xml:space="preserve">
+    <value>已排队消息：{0}</value>
+  </data>
+  <data name="Chat_Composer_QueuedMessageFailedAutomationFormat" xml:space="preserve">
+    <value>已排队消息失败：{0}</value>
+  </data>
+  <data name="Chat_Composer_QueuedMessageFailed" xml:space="preserve">
+    <value>失败</value>
+  </data>
+  <data name="Chat_Composer_QueuedMessageCancel" xml:space="preserve">
+    <value>取消已排队消息</value>
+  </data>
+  <data name="Chat_Composer_QueuedMessageCancelAutomationFormat" xml:space="preserve">
+    <value>取消已排队消息 {0}：{1}</value>
+  </data>
+  <data name="Chat_Composer_QueuedMessageRemoveFailed" xml:space="preserve">
+    <value>移除失败的已排队消息</value>
+  </data>
+  <data name="Chat_Composer_QueuedMessageRemoveFailedAutomationFormat" xml:space="preserve">
+    <value>移除失败的已排队消息 {0}：{1}</value>
+  </data>
   <data name="Chat_Assistant_Action_Copy" xml:space="preserve">
     <value>复制消息</value>
   </data>
@@ -2977,14 +3040,20 @@
     <value> … [已截断 {0} 字节]</value>
   </data>
   <data name="Chat_Permission_Allow" xml:space="preserve">
-    <value>允许</value>
+    <value>允许一次</value>
+  </data>
+  <data name="Chat_Permission_AllowAlways" xml:space="preserve">
+    <value>始终允许</value>
   </data>
   <data name="Chat_Permission_Deny" xml:space="preserve">
-    <value>拒绝</value>
+    <value>拒绝一次</value>
   </data>
   <data name="Chat_Permission_DecisionAllowed" xml:space="preserve">
     <value>已允许</value>
   </data>
+  <data name="Chat_Permission_DecisionAlwaysAllowed" xml:space="preserve">
+    <value>已始终允许</value>
+  </data>
   <data name="Chat_Permission_DecisionDenied" xml:space="preserve">
     <value>已拒绝</value>
   </data>
@@ -3015,6 +3084,88 @@
   <data name="AppNotification_ShowMore" xml:space="preserve">
     <value>显示更多</value>
   </data>
+  <data name="AppNotification_ActionOpenConnection" xml:space="preserve">
+    <value>打开连接</value>
+  </data>
+  <data name="AppNotification_ActionOpenChannels" xml:space="preserve">
+    <value>打开频道</value>
+  </data>
+  <data name="AppNotification_ActionOpenSandbox" xml:space="preserve">
+    <value>打开沙盒</value>
+  </data>
+  <data name="AppNotification_ActionOpenCron" xml:space="preserve">
+    <value>打开 Cron</value>
+  </data>
+  <data name="AppNotification_GatewayConnectionFailed_Title" xml:space="preserve">
+    <value>网关连接失败</value>
+  </data>
+  <data name="AppNotification_GatewayConnectionFailed_DefaultMessage" xml:space="preserve">
+    <value>OpenClaw 无法连接到活动网关。</value>
+  </data>
+  <data name="AppNotification_GatewayPairingRequired_Title" xml:space="preserve">
+    <value>需要批准网关配对</value>
+  </data>
+  <data name="AppNotification_GatewayPairingRequired_GenericMessage" xml:space="preserve">
+    <value>打开“连接”以完成网关配对。</value>
+  </data>
+  <data name="AppNotification_GatewayPairingRequired_DeviceMessageFormat" xml:space="preserve">
+    <value>打开“连接”以批准设备 {0}。</value>
+  </data>
+  <data name="AppNotification_WindowsNodeConnectionFailed_Title" xml:space="preserve">
+    <value>Windows 节点连接失败</value>
+  </data>
+  <data name="AppNotification_WindowsNodeConnectionFailed_DefaultMessage" xml:space="preserve">
+    <value>网关已连接，但此 Windows 节点不可用。</value>
+  </data>
+  <data name="AppNotification_WindowsNodeRateLimited_Title" xml:space="preserve">
+    <value>Windows 节点连接受到速率限制</value>
+  </data>
+  <data name="AppNotification_WindowsNodeRateLimited_DefaultMessage" xml:space="preserve">
+    <value>网关已连接，但此 Windows 节点暂时受到速率限制。</value>
+  </data>
+  <data name="AppNotification_ChannelNeedsAttention_TitleFormat" xml:space="preserve">
+    <value>{0} 频道需要注意</value>
+  </data>
+  <data name="AppNotification_ChannelNeedsAttention_StatusMessageFormat" xml:space="preserve">
+    <value>网关报告 {0} 为 {1}。</value>
+  </data>
+  <data name="AppNotification_SandboxDisabled_Title" xml:space="preserve">
+    <value>节点沙盒已关闭 — 命令将不受限制地运行</value>
+  </data>
+  <data name="AppNotification_SandboxDisabled_Message" xml:space="preserve">
+    <value>在重新启用节点沙盒之前，代理启动的 Windows 命令将在没有沙盒隔离的情况下运行。</value>
+  </data>
+  <data name="AppNotification_SandboxUnavailable_Title" xml:space="preserve">
+    <value>沙盒不可用 — 回退到主机</value>
+  </data>
+  <data name="AppNotification_SandboxUnavailable_MessageFormat" xml:space="preserve">
+    <value>{0}
+
+在沙盒不可用期间，命令将在主机上运行，且没有沙盒保护。</value>
+  </data>
+  <data name="AppNotification_SandboxUnavailableBlocked_Title" xml:space="preserve">
+    <value>沙盒不可用 — 命令已阻止</value>
+  </data>
+  <data name="AppNotification_SandboxUnavailableBlocked_MessageFormat" xml:space="preserve">
+    <value>{0}
+
+由于已启用严格回退阻止，沙盒不可用期间命令会被阻止。</value>
+  </data>
+  <data name="AppNotification_SandboxUnavailable_DefaultReason" xml:space="preserve">
+    <value>此计算机上没有可用的 MXC 沙盒基元。</value>
+  </data>
+  <data name="AppNotification_CronRunFailed_Title" xml:space="preserve">
+    <value>Cron 作业未启动</value>
+  </data>
+  <data name="AppNotification_CronRunFailed_DefaultDetail" xml:space="preserve">
+    <value>请求失败。</value>
+  </data>
+  <data name="AppNotification_CronRunRejectedDetail" xml:space="preserve">
+    <value>网关拒绝了 cron.run 请求。</value>
+  </data>
+  <data name="AppNotification_CronRunFailed_MessageFormat" xml:space="preserve">
+    <value>{0}：{1}</value>
+  </data>
   <data name="NotificationsPage_Title.Text" xml:space="preserve">
     <value>通知</value>
   </data>
@@ -3039,44 +3190,131 @@
   <data name="NotificationsPage_MetadataCategoryNodeInvoke" xml:space="preserve">
     <value>节点命令</value>
   </data>
-  <data name="Chat_Permission_Title" xml:space="preserve">
-    <value>需要执行批准</value>
+  <data name="AppNotification_ExecApprovalPending_Title" xml:space="preserve">
+    <value>命令批准待处理</value>
   </data>
-  <data name="Chat_Permission_Subtitle" xml:space="preserve">
-    <value>在此 Windows 伴侣上运行以下命令需要获得批准。单击"允许"继续执行，或单击"拒绝"取消。</value>
+  <data name="AppNotification_ExecApprovalPending_MessageFormat" xml:space="preserve">
+    <value>{0} 正在等待批准以运行：{1}</value>
   </data>
-  <data name="Chat_Permission_Caption" xml:space="preserve">
-    <value>根据当前策略，每条命令都需要批准。您的选择仅适用于此请求。</value>
+  <data name="AppNotification_ExecApprovalPending_OpenChatAction" xml:space="preserve">
+    <value>打开聊天</value>
   </data>
-  <data name="Chat_Root_ConnectingToGateway" xml:space="preserve">
-    <value>正在连接到网关…</value>
+  <data name="AppNotification_ExecApprovalPending_UnknownChatLabel" xml:space="preserve">
+    <value>聊天</value>
   </data>
-  <data name="Chat_Root_EmptyState_SelectSession" xml:space="preserve">
-    <value>在侧栏中选择一个会话以开始聊天。</value>
+  <data name="AppNotification_ExecApprovalPending_MainSessionLabel" xml:space="preserve">
+    <value>主</value>
   </data>
-  <data name="Chat_Notification_SendFailed" xml:space="preserve">
-    <value>发送失败</value>
+  <data name="AppNotification_ExecApprovalPending_MainChatLabel" xml:space="preserve">
+    <value>主聊天</value>
   </data>
-  <data name="Chat_Notification_AbortFailed" xml:space="preserve">
-    <value>中止失败</value>
+  <data name="AppNotification_ExecApprovalPending_AgentChatLabelFormat" xml:space="preserve">
+    <value>{0} 聊天</value>
   </data>
-  <data name="Chat_Notification_LoadHistoryFailed" xml:space="preserve">
-    <value>加载历史失败</value>
+  <data name="AppNotification_ExecApprovalPending_AgentSlotLabelFormat" xml:space="preserve">
+    <value>{0} / {1}</value>
   </data>
-  <data name="Chat_Notification_AssistantReplied" xml:space="preserve">
-    <value>助手已回复</value>
+  <data name="NotificationsPage_MetadataAuthentication" xml:space="preserve">
+    <value>身份验证</value>
   </data>
-  <data name="Chat_Notification_ConnectionInterrupted" xml:space="preserve">
-    <value>连接已断开 — 回复已中断。</value>
+  <data name="NotificationsPage_MetadataBindings" xml:space="preserve">
+    <value>绑定</value>
   </data>
-  <data name="Chat_Notification_KeylessEventDropped" xml:space="preserve">
-    <value>已丢弃网关时间线事件</value>
+  <data name="NotificationsPage_MetadataChannels" xml:space="preserve">
+    <value>频道</value>
   </data>
-  <data name="Chat_Notification_KeylessEventDroppedMessage" xml:space="preserve">
-    <value>网关发送了缺少会话键的聊天时间线事件，OpenClaw 已将其忽略，以避免混淆时间线。如果此情况持续，请更新或重启网关。</value>
+  <data name="NotificationsPage_MetadataConfig" xml:space="preserve">
+    <value>配置</value>
   </data>
-  <data name="VoiceSettingsPage_TestVoiceButtonText.Text" xml:space="preserve">
-    <value>测试语音输入</value>
+  <data name="NotificationsPage_MetadataConnection" xml:space="preserve">
+    <value>连接</value>
+  </data>
+  <data name="NotificationsPage_MetadataCron" xml:space="preserve">
+    <value>Cron</value>
+  </data>
+  <data name="NotificationsPage_MetadataGateway" xml:space="preserve">
+    <value>网关</value>
+  </data>
+  <data name="NotificationsPage_MetadataJobs" xml:space="preserve">
+    <value>作业</value>
+  </data>
+  <data name="NotificationsPage_MetadataLoad" xml:space="preserve">
+    <value>加载</value>
+  </data>
+  <data name="NotificationsPage_MetadataLifecycle" xml:space="preserve">
+    <value>生命周期</value>
+  </data>
+  <data name="NotificationsPage_MetadataLocalGateway" xml:space="preserve">
+    <value>本地网关</value>
+  </data>
+  <data name="NotificationsPage_MetadataNode" xml:space="preserve">
+    <value>节点</value>
+  </data>
+  <data name="NotificationsPage_MetadataPairing" xml:space="preserve">
+    <value>配对</value>
+  </data>
+  <data name="NotificationsPage_MetadataSandbox" xml:space="preserve">
+    <value>沙盒</value>
+  </data>
+  <data name="NotificationsPage_MetadataSettings" xml:space="preserve">
+    <value>设置</value>
+  </data>
+  <data name="NotificationsPage_MetadataStatus" xml:space="preserve">
+    <value>状态</value>
+  </data>
+  <data name="NotificationsPage_MetadataSystemRun" xml:space="preserve">
+    <value>system.run</value>
+  </data>
+  <data name="Chat_Permission_Title" xml:space="preserve">
+    <value>需要执行批准</value>
+  </data>
+  <data name="Chat_Permission_CommandApprovalTitle" xml:space="preserve">
+    <value>已请求命令批准</value>
+  </data>
+  <data name="Chat_Permission_Subtitle" xml:space="preserve">
+    <value>在此 Windows 伴侣上运行以下命令需要获得批准。允许一次以继续，始终允许以记住此命令，或拒绝以取消。</value>
+  </data>
+  <data name="Chat_Permission_Caption" xml:space="preserve">
+    <value>“允许一次”仅适用于此请求。“始终允许”会在可能时保存一条精确的允许规则。</value>
+  </data>
+  <data name="Chat_Permission_ResultSubmittedFormat" xml:space="preserve">
+    <value>已为 {1} 提交批准 {0}。</value>
+  </data>
+  <data name="Chat_Root_ConnectingToGateway" xml:space="preserve">
+    <value>正在连接到网关…</value>
+  </data>
+  <data name="Chat_Root_EmptyState_SelectSession" xml:space="preserve">
+    <value>在侧栏中选择一个会话以开始聊天。</value>
+  </data>
+  <data name="Chat_Notification_SendFailed" xml:space="preserve">
+    <value>发送失败</value>
+  </data>
+  <data name="Chat_Error_SendReturnedStatusFormat" xml:space="preserve">
+    <value>网关返回发送状态“{0}”。</value>
+  </data>
+  <data name="Chat_Error_SendFailedFormat" xml:space="preserve">
+    <value>发送失败：{0}</value>
+  </data>
+  <data name="Chat_Notification_AbortFailed" xml:space="preserve">
+    <value>中止失败</value>
+  </data>
+  <data name="Chat_Notification_LoadHistoryFailed" xml:space="preserve">
+    <value>加载历史失败</value>
+  </data>
+  <data name="Chat_Notification_AssistantReplied" xml:space="preserve">
+    <value>助手已回复</value>
+  </data>
+  <data name="Chat_Notification_ConnectionInterrupted" xml:space="preserve">
+    <value>连接已断开 — 回复已中断。</value>
+  </data>
+  <data name="Chat_Notification_KeylessEventDropped" xml:space="preserve">
+    <value>已丢弃网关时间线事件</value>
+  </data>
+  <data name="Chat_Notification_KeylessEventDroppedMessage" xml:space="preserve">
+    <value>网关发送了缺少会话键的聊天时间线事件，OpenClaw 已将其忽略，以避免混淆时间线。如果此情况持续，请更新或重启网关。</value>
+  </data>
+  <data name="VoiceSettingsPage_TestVoiceButtonText.Text" xml:space="preserve">
+    <value>测试语音输入</value>
   </data>
   <data name="PermissionsPage_FeaturesDescription_Enabled" xml:space="preserve">
     <value>Toggle individual features that agents may request from this PC.</value>
@@ -3156,6 +3394,18 @@
   <data name="PermissionsPage_NodeStatus_ActiveDetailsFormat" xml:space="preserve">
     <value>Providing {0} capabilities: {1}</value>
   </data>
+  <data name="PermissionsPage_NodeStatus_McpOnly" xml:space="preserve">
+    <value>仅本地 MCP</value>
+  </data>
+  <data name="PermissionsPage_NodeStatus_McpOnlyDetailsFormat" xml:space="preserve">
+    <value>正在通过 {1} 向本地 MCP 客户端提供 {0} 项功能</value>
+  </data>
+  <data name="PermissionsPage_NodeStatus_Starting" xml:space="preserve">
+    <value>Node 正在启动…</value>
+  </data>
+  <data name="PermissionsPage_NodeStatus_McpError" xml:space="preserve">
+    <value>本地 MCP 服务器启动失败</value>
+  </data>
   <data name="PermissionsPage_NodeStatus_NoCapabilities" xml:space="preserve">
     <value>No capabilities enabled.</value>
   </data>
@@ -3531,9 +3781,6 @@
   <data name="HubWindow_NavigationViewItem_Sandbox.Content" xml:space="preserve">
     <value>沙盒</value>
   </data>
-  <data name="AboutPage_MoreDiagnosticsLink.Content" xml:space="preserve">
-    <value>More diagnostics →</value>
-  </data>
   <data name="ChannelsPage_GuideBar.Title" xml:space="preserve">
     <value>Your gateway didn't list any channels</value>
   </data>
@@ -3601,10 +3848,10 @@
     <value>Connection state, gateway URL, runtime, tunnel.</value>
   </data>
   <data name="DiagnosticsPage_Card_CopyDebugBundle.Header" xml:space="preserve">
-    <value>Copy full debug bundle</value>
+    <value>复制摘要调试包</value>
   </data>
   <data name="DiagnosticsPage_Card_CopyDebugBundle.Description" xml:space="preserve">
-    <value>Everything the preview dialog produces, no preview.</value>
+    <value>仅包含生成的摘要；不包含日志尾部。请使用“创建诊断包”在共享前检查日志。</value>
   </data>
   <data name="DiagnosticsPage_Card_CopyBrowserSetup.Header" xml:space="preserve">
     <value>Copy browser setup guidance</value>
@@ -3666,15 +3913,6 @@
   <data name="DiagnosticsPage_Card_TrayChat.Header" xml:space="preserve">
     <value>Tray chat popup</value>
   </data>
-  <data name="DiagnosticsPage_Card_Reconfigure.Header" xml:space="preserve">
-    <value>Reconfigure…</value>
-  </data>
-  <data name="DiagnosticsPage_Card_Reconfigure.Description" xml:space="preserve">
-    <value>Reopens the OpenClaw onboarding wizard. You will be asked to confirm.</value>
-  </data>
-  <data name="DiagnosticsPage_ReconfigureButton.Content" xml:space="preserve">
-    <value>Reconfigure…</value>
-  </data>
   <data name="DiagnosticsPage_DetailBack.Text" xml:space="preserve">
     <value>Back to Diagnostics</value>
   </data>
@@ -4183,7 +4421,7 @@
     <value>0 条规则</value>
   </data>
   <data name="PermissionsPage_NoRulesYetAdd.Text" xml:space="preserve">
-    <value>尚无规则。在下方添加模式以允许或拒绝特定命令。</value>
+    <value>尚无规则。在下方添加模式以拒绝、允许或询问特定命令。</value>
   </data>
   <data name="PermissionsPage_WindowsPrivacy.Text" xml:space="preserve">
     <value>Windows 隐私</value>
@@ -4377,6 +4615,9 @@
   <data name="SessionsPage_All.Text" xml:space="preserve">
     <value>全部</value>
   </data>
+  <data name="SessionsPage_ShowCompleted.Header" xml:space="preserve">
+    <value>显示已完成的会话</value>
+  </data>
   <data name="SessionsPage_GatewayDisconnected.Title" xml:space="preserve">
     <value>网关已断开</value>
   </data>
@@ -4398,15 +4639,81 @@
   <data name="SessionsPage_Compact.Text" xml:space="preserve">
     <value>压缩</value>
   </data>
+  <data name="SessionsPage_Checkpoints.Text" xml:space="preserve">
+    <value>检查点</value>
+  </data>
+  <data name="SessionsPage_Checkpoints.[using:Microsoft.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>查看、分支或还原压缩检查点</value>
+  </data>
+  <data name="SessionsPage_ExportTranscript.Text" xml:space="preserve">
+    <value>导出转录</value>
+  </data>
+  <data name="SessionsPage_ExportTranscript.[using:Microsoft.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>将对话转录保存到文本文件</value>
+  </data>
   <data name="SessionsPage_Delete.Text" xml:space="preserve">
     <value>删除</value>
   </data>
+  <data name="SessionActionPrompt_Reset_Title" xml:space="preserve">
+    <value>重置会话？</value>
+  </data>
+  <data name="SessionActionPrompt_Reset_BodyFormat" xml:space="preserve">
+    <value>为“{0}”启动新会话？当前对话上下文将被清除。</value>
+  </data>
+  <data name="SessionActionPrompt_Reset_ConfirmLabel" xml:space="preserve">
+    <value>重置</value>
+  </data>
+  <data name="SessionActionPrompt_CancelLabel" xml:space="preserve">
+    <value>取消</value>
+  </data>
+  <data name="SessionActionPrompt_Compact_Title" xml:space="preserve">
+    <value>压缩会话日志？</value>
+  </data>
+  <data name="SessionActionPrompt_Compact_BodyFormat" xml:space="preserve">
+    <value>保留“{0}”的最新消息并归档其余内容。这会创建一个压缩检查点；如果需要完整历史记录，请先导出转录。</value>
+  </data>
+  <data name="SessionActionPrompt_Compact_ConfirmLabel" xml:space="preserve">
+    <value>压缩</value>
+  </data>
+  <data name="SessionActionPrompt_Delete_Title" xml:space="preserve">
+    <value>删除会话？</value>
+  </data>
+  <data name="SessionActionPrompt_Delete_BodyFormat" xml:space="preserve">
+    <value>删除“{0}”并归档其转录？它将从会话列表中移除。</value>
+  </data>
+  <data name="SessionActionPrompt_Delete_ConfirmLabel" xml:space="preserve">
+    <value>删除</value>
+  </data>
+  <data name="SessionActionPrompt_Restore_Title" xml:space="preserve">
+    <value>还原检查点？</value>
+  </data>
+  <data name="SessionActionPrompt_Restore_BodyFormat" xml:space="preserve">
+    <value>将“{0}”回滚到此压缩检查点？检查点之后添加的消息将被归档。</value>
+  </data>
+  <data name="SessionActionPrompt_Restore_ConfirmLabel" xml:space="preserve">
+    <value>还原</value>
+  </data>
   <data name="SettingsPage_Settings.Text" xml:space="preserve">
     <value>设置</value>
   </data>
   <data name="SettingsPage_General.Text" xml:space="preserve">
     <value>常规</value>
   </data>
+  <data name="SettingsRow_AppTheme_Header.Text" xml:space="preserve">
+    <value>应用主题</value>
+  </data>
+  <data name="SettingsRow_AppTheme_Description.Text" xml:space="preserve">
+    <value>选择浅色、深色，或使用 Windows 设置。</value>
+  </data>
+  <data name="SettingsPage_AppTheme_System.Content" xml:space="preserve">
+    <value>系统</value>
+  </data>
+  <data name="SettingsPage_AppTheme_Light.Content" xml:space="preserve">
+    <value>浅色</value>
+  </data>
+  <data name="SettingsPage_AppTheme_Dark.Content" xml:space="preserve">
+    <value>深色</value>
+  </data>
   <data name="SettingsPage_Notifications.Text" xml:space="preserve">
     <value>通知</value>
   </data>
@@ -4416,6 +4723,57 @@
   <data name="SettingsPage_LocalGateway.Text" xml:space="preserve">
     <value>本地网关</value>
   </data>
+  <data name="SettingsPage_Developer.Text" xml:space="preserve">
+    <value>开发者</value>
+  </data>
+  <data name="SettingsPage_AppInfoExpander.Header" xml:space="preserve">
+    <value>应用信息</value>
+  </data>
+  <data name="SettingsPage_AppInfoCheckUpdates.Content" xml:space="preserve">
+    <value>检查更新</value>
+  </data>
+  <data name="SettingsPage_AppInfoLabel_AppName.Text" xml:space="preserve">
+    <value>应用名称</value>
+  </data>
+  <data name="SettingsPage_AppInfoLabel_Version.Text" xml:space="preserve">
+    <value>版本</value>
+  </data>
+  <data name="SettingsPage_AppInfoLabel_BuildDate.Text" xml:space="preserve">
+    <value>生成日期</value>
+  </data>
+  <data name="SettingsPage_AppInfoLabel_Runtime.Text" xml:space="preserve">
+    <value>运行时</value>
+  </data>
+  <data name="SettingsPage_AppInfoLabel_Architecture.Text" xml:space="preserve">
+    <value>体系结构</value>
+  </data>
+  <data name="SettingsPage_AppInfoLabel_Windows.Text" xml:space="preserve">
+    <value>Windows 版本</value>
+  </data>
+  <data name="SettingsPage_AppInfoLabel_UpdateChannel.Text" xml:space="preserve">
+    <value>更新通道</value>
+  </data>
+  <data name="SettingsPage_AppInfoLabel_InstallType.Text" xml:space="preserve">
+    <value>安装类型</value>
+  </data>
+  <data name="SettingsPage_AppInfoRelatedLinks.Text" xml:space="preserve">
+    <value>相关链接</value>
+  </data>
+  <data name="SettingsPage_AppInfoDocumentation.Content" xml:space="preserve">
+    <value>文档</value>
+  </data>
+  <data name="SettingsPage_AppInfoGitHub.Content" xml:space="preserve">
+    <value>GitHub</value>
+  </data>
+  <data name="SettingsPage_AppInfoDashboard.Content" xml:space="preserve">
+    <value>仪表板</value>
+  </data>
+  <data name="SettingsRow_ShowDiagnostics_Header.Text" xml:space="preserve">
+    <value>启用诊断</value>
+  </data>
+  <data name="SettingsRow_ShowDiagnostics_Description.Text" xml:space="preserve">
+    <value>开发者和故障排除工具。默认对本地版本启用。</value>
+  </data>
   <data name="SettingsPage_LocalGatewaySetup_Header.Text" xml:space="preserve">
     <value>设置或重新配置本地网关</value>
   </data>
@@ -4626,21 +4984,18 @@
   <data name="DiagnosticsBundleDialog_ReviewBeforeSharing.Title" xml:space="preserve">
     <value>分享前请审阅</value>
   </data>
-  <data name="DiagnosticsBundleDialog_ReviewBeforeSharing.Message" xml:space="preserve">
-    <value>捆绑包生成器会排除敏感令牌、命令参数、负载和录制内容。</value>
-  </data>
   <data name="HubWindow_Disconnected.Text" xml:space="preserve">
     <value>已断开连接</value>
   </data>
-  <data name="HubWindow_Op.Text" xml:space="preserve">
-    <value>操作</value>
-  </data>
-  <data name="HubWindow_Node.Text" xml:space="preserve">
-    <value>节点</value>
-  </data>
   <data name="HubWindow_Advanced.Content" xml:space="preserve">
     <value>高级</value>
   </data>
+  <data name="DiagnosticsBundleDialog_ReviewBeforeSharingMessage.Text" xml:space="preserve">
+    <value>日志尾部会经过清理并截断。敏感令牌、负载、录制内容和原始设置文件会被排除。共享前请先检查。</value>
+  </data>
+  <data name="DiagnosticsBundleDialog_ReviewBeforeSharingTitle.Text" xml:space="preserve">
+    <value>分享前请检查</value>
+  </data>
   <data name="AgentEventsPage_LiveText.Text" xml:space="preserve">
     <value>实时</value>
   </data>
@@ -4668,9 +5023,6 @@
   <data name="VoiceSettingsPage_PreviewVoice.Text" xml:space="preserve">
     <value>语音预览</value>
   </data>
-  <data name="HubWindow_TitleStatus.Text" xml:space="preserve">
-    <value>已断开连接</value>
-  </data>
   <data name="SandboxPage_GatewayCommandsNote.Text" xml:space="preserve">
     <value>代理直接在网关上运行的命令不受此限制。如果网关在此电脑上，它们仍可能访问您的 Windows 文件、剪贴板和网络——请检查网关的配置。</value>
   </data>
@@ -4692,6 +5044,60 @@
   <data name="CronPage_Running" xml:space="preserve">
     <value>正在运行...</value>
   </data>
+  <data name="CronPage_CompletedOneTimeJobTooltip" xml:space="preserve">
+    <value>一次性作业已完成</value>
+  </data>
+  <data name="CronPage_EnableJobTooltip" xml:space="preserve">
+    <value>启用作业</value>
+  </data>
+  <data name="CronPage_DisableJobTooltip" xml:space="preserve">
+    <value>禁用作业</value>
+  </data>
+  <data name="CronPage_FullResponse" xml:space="preserve">
+    <value>完整回复</value>
+  </data>
+  <data name="CronPage_OpenChat" xml:space="preserve">
+    <value>打开聊天</value>
+  </data>
+  <data name="CronPage_RunNow" xml:space="preserve">
+    <value>立即运行</value>
+  </data>
+  <data name="CronPage_EditAction" xml:space="preserve">
+    <value>编辑</value>
+  </data>
+  <data name="CronPage_HistoryAction" xml:space="preserve">
+    <value>历史记录</value>
+  </data>
+  <data name="CronPage_RemoveAction" xml:space="preserve">
+    <value>移除</value>
+  </data>
+  <data name="CronPage_RunningBadge" xml:space="preserve">
+    <value>正在运行</value>
+  </data>
+  <data name="CronPage_RunHistory" xml:space="preserve">
+    <value>运行历史记录</value>
+  </data>
+  <data name="CronPage_RunHistoryShowing" xml:space="preserve">
+    <value>运行历史记录 - 正在显示 {0}/{1}</value>
+  </data>
+  <data name="CronPage_RunHistoryCount" xml:space="preserve">
+    <value>运行历史记录 - {0} 次运行</value>
+  </data>
+  <data name="CronPage_LoadingRunHistory" xml:space="preserve">
+    <value>正在加载运行历史记录...</value>
+  </data>
+  <data name="CronPage_NoRunHistoryAvailable" xml:space="preserve">
+    <value>没有可用的运行历史记录。</value>
+  </data>
+  <data name="CronPage_LoadOlderRuns" xml:space="preserve">
+    <value>加载较早的运行（还有 {0} 个）...</value>
+  </data>
+  <data name="CronPage_LoadMoreRuns" xml:space="preserve">
+    <value>加载更多运行...</value>
+  </data>
+  <data name="CronPage_Loading" xml:space="preserve">
+    <value>正在加载...</value>
+  </data>
   <data name="CronPage_SaveChanges" xml:space="preserve">
     <value>保存更改</value>
   </data>
@@ -4885,6 +5291,18 @@
   <data name="ConnectionPage_NodeModeDisabledText" xml:space="preserve">
     <value>节点模式已禁用</value>
   </data>
+  <data name="ConnectionPage_NodeStarting" xml:space="preserve">
+    <value>Node 正在启动…</value>
+  </data>
+  <data name="ConnectionPage_NodeMcpOnly" xml:space="preserve">
+    <value>正在本地提供功能（仅 MCP）</value>
+  </data>
+  <data name="ConnectionPage_NodeMcpOnlyReachable" xml:space="preserve">
+    <value>本地 MCP 客户端可通过 {0} 访问</value>
+  </data>
+  <data name="ConnectionPage_NodeMcpError" xml:space="preserve">
+    <value>本地 MCP 服务器启动失败</value>
+  </data>
   <data name="ConnectionPage_NodeBodyNoCapabilities" xml:space="preserve">
     <value>未启用任何能力。请在权限中选择要共享的内容。</value>
   </data>
@@ -4927,6 +5345,9 @@
   <data name="ConnectionPage_OpenDashboard" xml:space="preserve">
     <value>打开仪表板</value>
   </data>
+  <data name="ConnectionPage_GatewayOptionsA11y" xml:space="preserve">
+    <value>{0} 的选项</value>
+  </data>
   <data name="ConnectionPage_DisconnectAction" xml:space="preserve">
     <value>断开连接</value>
   </data>
@@ -5131,9 +5552,6 @@
   <data name="ConnectionPage_CancelAction" xml:space="preserve">
     <value>取消</value>
   </data>
-  <data name="ConnectionPage_ConnectFailed" xml:space="preserve">
-    <value>连接失败</value>
-  </data>
   <data name="ConnectionPage_GatewayConnectionFailed" xml:space="preserve">
     <value>网关连接失败。</value>
   </data>
@@ -5164,31 +5582,6 @@
   <data name="ConnectionPage_DenyPairingRequest" xml:space="preserve">
     <value>拒绝配对请求</value>
   </data>
-  <data name="ConnectionPage_AuthGuidanceToken" xml:space="preserve">
-    <value>{0}
-
-从添加网关流程中粘贴新的设置代码。</value>
-  </data>
-  <data name="ConnectionPage_AuthGuidancePairing" xml:space="preserve">
-    <value>{0}
-
-您的设备需要在网关主机上获得批准。</value>
-  </data>
-  <data name="ConnectionPage_AuthGuidancePassword" xml:space="preserve">
-    <value>{0}
-
-此网关需要密码身份验证。</value>
-  </data>
-  <data name="ConnectionPage_AuthGuidanceSignature" xml:space="preserve">
-    <value>{0}
-
-网关可能需要不同版本的认证协议。</value>
-  </data>
-  <data name="ConnectionPage_AuthGuidanceDefault" xml:space="preserve">
-    <value>{0}
-
-请检查您的连接设置并重试。</value>
-  </data>
   <data name="ConnectionPage_AuthModeBootstrap" xml:space="preserve">
     <value>引导</value>
   </data>
@@ -5271,7 +5664,7 @@
     <value>关联您的 WhatsApp 手机</value>
   </data>
   <data name="ChannelsPage_GuideWhatsAppStep1" xml:space="preserve">
-    <value>点击下方“关联”部分中的 &quot;Show QR&quot;。</value>
+    <value>点击下方“关联”部分中的 "Show QR"。</value>
   </data>
   <data name="ChannelsPage_GuideWhatsAppStep2" xml:space="preserve">
     <value>在手机上：WhatsApp → 设置 → 已关联设备 → 关联设备。</value>
@@ -5283,7 +5676,7 @@
     <value>关联您的 Signal 手机</value>
   </data>
   <data name="ChannelsPage_GuideSignalStep1" xml:space="preserve">
-    <value>点击下方“关联”部分中的 &quot;Show QR&quot;。</value>
+    <value>点击下方“关联”部分中的 "Show QR"。</value>
   </data>
   <data name="ChannelsPage_GuideSignalStep2" xml:space="preserve">
     <value>在手机上：Signal → 设置 → 已关联设备 → 关联新设备。</value>
@@ -5304,7 +5697,7 @@
     <value>将令牌粘贴到下方的配置表单中。</value>
   </data>
   <data name="ChannelsPage_GuideTelegramStep4" xml:space="preserve">
-    <value>点击 &quot;Save and start&quot;。频道将自动启动。</value>
+    <value>点击 "Save and start"。频道将自动启动。</value>
   </data>
   <data name="ChannelsPage_GuideDiscordHeadline" xml:space="preserve">
     <value>通过 webhook 连接 Discord</value>
@@ -5313,13 +5706,13 @@
     <value>打开您的 Discord 服务器设置 → 集成 → Webhooks。</value>
   </data>
   <data name="ChannelsPage_GuideDiscordStep2" xml:space="preserve">
-    <value>点击 &quot;New Webhook&quot;，为其命名，然后复制 webhook URL。</value>
+    <value>点击 "New Webhook"，为其命名，然后复制 webhook URL。</value>
   </data>
   <data name="ChannelsPage_GuideDiscordStep3" xml:space="preserve">
     <value>将 URL 粘贴到下方的配置表单中。</value>
   </data>
   <data name="ChannelsPage_GuideDiscordStep4" xml:space="preserve">
-    <value>点击 &quot;Save and start&quot;。</value>
+    <value>点击 "Save and start"。</value>
   </data>
   <data name="ChannelsPage_GuideGoogleChatHeadline" xml:space="preserve">
     <value>通过 webhook 连接 Google Chat</value>
@@ -5334,7 +5727,7 @@
     <value>将 URL 粘贴到下方的配置表单中。</value>
   </data>
   <data name="ChannelsPage_GuideGoogleChatStep4" xml:space="preserve">
-    <value>点击 &quot;Save and start&quot;。</value>
+    <value>点击 "Save and start"。</value>
   </data>
   <data name="ChannelsPage_GuideSlackHeadline" xml:space="preserve">
     <value>通过应用连接 Slack</value>
@@ -5349,7 +5742,7 @@
     <value>将两者粘贴到下方的配置表单中。</value>
   </data>
   <data name="ChannelsPage_GuideSlackStep4" xml:space="preserve">
-    <value>点击 &quot;Save and start&quot;。</value>
+    <value>点击 "Save and start"。</value>
   </data>
   <data name="ChannelsPage_GuideNostrHeadline" xml:space="preserve">
     <value>通过中继连接 Nostr</value>
@@ -5364,7 +5757,7 @@
     <value>将两者粘贴到下方的配置表单中。</value>
   </data>
   <data name="ChannelsPage_GuideNostrStep4" xml:space="preserve">
-    <value>点击 &quot;Save and start&quot;。</value>
+    <value>点击 "Save and start"。</value>
   </data>
   <data name="ChannelsPage_GuideIMessageHeadline" xml:space="preserve">
     <value>iMessage 仅适用于 macOS</value>
@@ -5382,10 +5775,10 @@
     <value>连接此频道</value>
   </data>
   <data name="ChannelsPage_GuideGenericStep1" xml:space="preserve">
-    <value>&quot;{0}&quot; 是一个插件频道。请参阅其文档以了解所需字段。</value>
+    <value>"{0}" 是一个插件频道。请参阅其文档以了解所需字段。</value>
   </data>
   <data name="ChannelsPage_GuideGenericStep2" xml:space="preserve">
-    <value>使用下方“配置”部分中的 &quot;Open Config page&quot; 在 channels.{0} 下添加设置。</value>
+    <value>使用下方“配置”部分中的 "Open Config page" 在 channels.{0} 下添加设置。</value>
   </data>
   <data name="ChannelsPage_GuideGenericStep3" xml:space="preserve">
     <value>保存配置；OpenClaw 将自动启动频道。</value>
@@ -5603,12 +5996,6 @@
   <data name="Command_GoToDiagnostics_Title" xml:space="preserve">
     <value>Go to Diagnostics</value>
   </data>
-  <data name="Command_GoToInfo_Subtitle" xml:space="preserve">
-    <value>About this app</value>
-  </data>
-  <data name="Command_GoToInfo_Title" xml:space="preserve">
-    <value>Go to Info</value>
-  </data>
   <data name="Command_GoToNotifications_Subtitle" xml:space="preserve">
     <value>查看活动的应用通知</value>
   </data>
@@ -5736,13 +6123,358 @@
     <value>Waiting for gateway health</value>
   </data>
   <data name="ConfigPage_CheckingConfigPermissions" xml:space="preserve">
-    <value>Checking config permissions</value>
+    <value>正在检查配置权限</value>
   </data>
   <data name="ConfigPage_ConfigIsReadOnly" xml:space="preserve">
-    <value>Config is read-only</value>
+    <value>配置为只读</value>
   </data>
   <data name="ConfigPage_ConfigUnavailable" xml:space="preserve">
-    <value>Config unavailable</value>
+    <value>配置不可用</value>
+  </data>
+  <data name="ConfigPage_EditingPathFormat" xml:space="preserve">
+    <value>正在通过架构引导表单编辑 {0}。</value>
+  </data>
+  <data name="ConfigPage_RenderConfigUnavailableTitle" xml:space="preserve">
+    <value>配置不可用</value>
+  </data>
+  <data name="ConfigPage_RenderConfigUnavailableMessage" xml:space="preserve">
+    <value>无法呈现网关配置。请刷新后重试。</value>
+  </data>
+  <data name="ConfigPage_RenderSchemaUnavailableTitle" xml:space="preserve">
+    <value>架构不可用</value>
+  </data>
+  <data name="ConfigPage_RenderSchemaUnavailableMessage" xml:space="preserve">
+    <value>无法呈现网关架构。原始 JSON 仍可作为只读预览使用。</value>
+  </data>
+  <data name="ConfigPage_StatusGatewayRestartingTitle" xml:space="preserve">
+    <value>网关正在重启</value>
+  </data>
+  <data name="ConfigPage_StatusGatewayRestartingMessage" xml:space="preserve">
+    <value>正在保存更改。网关正在重启，并将自动重新连接。</value>
+  </data>
+  <data name="ConfigPage_StatusNoChangesTitle" xml:space="preserve">
+    <value>没有更改</value>
+  </data>
+  <data name="ConfigPage_StatusNoChangesMessage" xml:space="preserve">
+    <value>没有需要保存的内容。</value>
+  </data>
+  <data name="ConfigPage_StatusFixValidationErrorsTitle" xml:space="preserve">
+    <value>修复验证错误</value>
+  </data>
+  <data name="ConfigPage_StatusValidationErrorMessageFormat" xml:space="preserve">
+    <value>{0}：{1}</value>
+  </data>
+  <data name="ConfigPage_StatusNotConnectedTitle" xml:space="preserve">
+    <value>未连接</value>
+  </data>
+  <data name="ConfigPage_StatusNotConnectedMessage" xml:space="preserve">
+    <value>保存配置前请先连接到网关。</value>
+  </data>
+  <data name="ConfigPage_StatusReadOnlyMessage" xml:space="preserve">
+    <value>此操作员令牌没有 operator.write 权限，因此无法保存配置更改。</value>
+  </data>
+  <data name="ConfigPage_StatusConfigNotLoadedTitle" xml:space="preserve">
+    <value>配置未加载</value>
+  </data>
+  <data name="ConfigPage_StatusConfigNotLoadedMessage" xml:space="preserve">
+    <value>保存前请刷新网关配置。</value>
+  </data>
+  <data name="ConfigPage_StatusSavingConfigTitle" xml:space="preserve">
+    <value>正在保存配置…</value>
+  </data>
+  <data name="ConfigPage_StatusSavingConfigMessageFormat" xml:space="preserve">
+    <value>正在向网关写入 {0} 项更改。</value>
+  </data>
+  <data name="ConfigPage_StatusStaleConfigTitle" xml:space="preserve">
+    <value>网关配置已在其他位置更改</value>
+  </data>
+  <data name="ConfigPage_StatusStaleConfigMessageFormat" xml:space="preserve">
+    <value>你的编辑已保留。正在刷新最新配置；请检查表单并再次尝试保存。详细信息：{0}</value>
+  </data>
+  <data name="ConfigPage_StatusStaleConfigDefaultDetail" xml:space="preserve">
+    <value>过期的配置哈希</value>
+  </data>
+  <data name="ConfigPage_StatusSaveFailedTitle" xml:space="preserve">
+    <value>保存失败</value>
+  </data>
+  <data name="ConfigPage_StatusSaveRejectedMessage" xml:space="preserve">
+    <value>网关拒绝了配置更新。你的更改已保留。</value>
+  </data>
+  <data name="ConfigPage_StatusSaveExceptionMessageFormat" xml:space="preserve">
+    <value>{0} 你的更改已保留。</value>
+  </data>
+  <data name="ConfigPage_SaveStatusCheckingConfigPermissions" xml:space="preserve">
+    <value>正在检查配置权限…</value>
+  </data>
+  <data name="ConfigPage_SaveStatusRefreshing" xml:space="preserve">
+    <value>正在刷新…</value>
+  </data>
+  <data name="ConfigPage_StatusChangesDiscardedTitle" xml:space="preserve">
+    <value>更改已放弃</value>
+  </data>
+  <data name="ConfigPage_StatusChangesDiscardedMessage" xml:space="preserve">
+    <value>表单已恢复为上次从网关加载的配置。</value>
+  </data>
+  <data name="ConfigPage_FullConfig" xml:space="preserve">
+    <value>完整配置</value>
+  </data>
+  <data name="ConfigPage_StatusSectionResetTitle" xml:space="preserve">
+    <value>部分已重置</value>
+  </data>
+  <data name="ConfigPage_StatusSectionResetMessageFormat" xml:space="preserve">
+    <value>{0} 已恢复为上次加载的网关值。</value>
+  </data>
+  <data name="ConfigPage_StatusCopiedJsonDiffTitle" xml:space="preserve">
+    <value>已复制 JSON 差异</value>
+  </data>
+  <data name="ConfigPage_StatusCopiedJsonDiffMessage" xml:space="preserve">
+    <value>所选部分的差异已复制到剪贴板。</value>
+  </data>
+  <data name="ConfigPage_StatusGatewayReconnectedTitle" xml:space="preserve">
+    <value>网关已重新连接</value>
+  </data>
+  <data name="ConfigPage_StatusGatewayReconnectedRefreshingMessage" xml:space="preserve">
+    <value>配置已保存，网关连接已恢复。正在刷新最新配置。</value>
+  </data>
+  <data name="ConfigPage_StatusGatewayReconnectedLoadedMessage" xml:space="preserve">
+    <value>配置已保存，并已加载最新的网关配置。</value>
+  </data>
+  <data name="ConfigPage_StatusGatewayStillReconnectingTitle" xml:space="preserve">
+    <value>网关仍在重新连接</value>
+  </data>
+  <data name="ConfigPage_StatusGatewayStillReconnectingMessage" xml:space="preserve">
+    <value>配置保存已被接受，但网关尚未重新连接。你可以保持此页面打开，或使用“连接”检查状态。</value>
+  </data>
+  <data name="ConfigPage_CheckingConfigPermissionsMessage" xml:space="preserve">
+    <value>正在等待网关报告此操作员的权限。</value>
+  </data>
+  <data name="ConfigPage_ConfigUnavailableMessage" xml:space="preserve">
+    <value>此操作员令牌缺少 operator.read 权限，因此无法在此处加载网关配置。</value>
+  </data>
+  <data name="ConfigPage_ConfigIsReadOnlyMessage" xml:space="preserve">
+    <value>此操作员令牌可以读取配置，但缺少 operator.write 权限。你可以检查并验证草稿，但“保存”已禁用。</value>
+  </data>
+  <data name="ConfigPage_MetaNoUnsavedChanges" xml:space="preserve">
+    <value>没有未保存的更改。</value>
+  </data>
+  <data name="ConfigPage_MetaUnsavedChangesFormat" xml:space="preserve">
+    <value>{0} 项未保存的更改</value>
+  </data>
+  <data name="ConfigPage_MetaUnsavedChangesWithValidationFormat" xml:space="preserve">
+    <value>{0} 项未保存的更改 · {1} 个验证问题</value>
+  </data>
+  <data name="ConfigPage_SaveStatusSaving" xml:space="preserve">
+    <value>正在保存…</value>
+  </data>
+  <data name="ConfigPage_SaveStatusGatewayRestarting" xml:space="preserve">
+    <value>网关正在重启…</value>
+  </data>
+  <data name="ConfigPage_SaveStatusConnectToGateway" xml:space="preserve">
+    <value>连接到网关以编辑</value>
+  </data>
+  <data name="ConfigPage_SaveStatusCheckingPermissions" xml:space="preserve">
+    <value>正在检查权限…</value>
+  </data>
+  <data name="ConfigPage_SaveStatusMissingRead" xml:space="preserve">
+    <value>配置不可用：缺少 operator.read</value>
+  </data>
+  <data name="ConfigPage_SaveStatusReadOnlyMissingWrite" xml:space="preserve">
+    <value>只读：缺少 operator.write</value>
+  </data>
+  <data name="ConfigPage_SaveStatusFixValidationBeforeSaving" xml:space="preserve">
+    <value>保存前请修复验证错误</value>
+  </data>
+  <data name="ConfigPage_SaveStatusUnsavedChanges" xml:space="preserve">
+    <value>未保存的更改</value>
+  </data>
+  <data name="ConfigPage_SaveStatusNoUnsavedChanges" xml:space="preserve">
+    <value>没有未保存的更改</value>
+  </data>
+  <data name="ConfigPage_AccessDisconnected" xml:space="preserve">
+    <value>已断开连接</value>
+  </data>
+  <data name="ConfigPage_AccessChecking" xml:space="preserve">
+    <value>正在检查访问权限</value>
+  </data>
+  <data name="ConfigPage_AccessNoRead" xml:space="preserve">
+    <value>没有配置读取访问权限</value>
+  </data>
+  <data name="ConfigPage_AccessReadOnly" xml:space="preserve">
+    <value>只读访问权限</value>
+  </data>
+  <data name="ConfigPage_AccessReadWrite" xml:space="preserve">
+    <value>读/写访问权限</value>
+  </data>
+  <data name="ConfigPage_AccessUnknown" xml:space="preserve">
+    <value>未知访问权限</value>
+  </data>
+  <data name="ConfigPage_AccessChangesFormat" xml:space="preserve">
+    <value>{0} 项更改</value>
+  </data>
+  <data name="ConfigPage_AccessValidationClean" xml:space="preserve">
+    <value>本地验证通过</value>
+  </data>
+  <data name="ConfigPage_AccessValidationIssuesFormat" xml:space="preserve">
+    <value>{0} 个验证问题</value>
+  </data>
+  <data name="ConfigPage_AccessSummaryFormat" xml:space="preserve">
+    <value>{0} · {1} · {2}</value>
+  </data>
+  <data name="DebugPage_NoGatewayConfigured" xml:space="preserve">
+    <value>未配置网关</value>
+  </data>
+  <data name="DebugPage_StatusConnectedFormat" xml:space="preserve">
+    <value>OpenClaw 已连接到 {0}。</value>
+  </data>
+  <data name="DebugPage_StatusConnectingFormat" xml:space="preserve">
+    <value>正在连接到 {0}…</value>
+  </data>
+  <data name="DebugPage_StatusDisconnectedFormat" xml:space="preserve">
+    <value>未连接。网关：{0}。</value>
+  </data>
+  <data name="DebugPage_StatusErrorFormat" xml:space="preserve">
+    <value>上次网关：{0}。请查看事件时间线。</value>
+  </data>
+  <data name="DebugPage_StatusGatewayFormat" xml:space="preserve">
+    <value>网关：{0}。</value>
+  </data>
+  <data name="DebugPage_RecentLogTitle" xml:space="preserve">
+    <value>最近日志</value>
+  </data>
+  <data name="DebugPage_RecentLogCaptionFormat" xml:space="preserve">
+    <value>{0} 的最后 200 行。严重性根据 [info]/[warn]/[error] 标记解析。</value>
+  </data>
+  <data name="DebugPage_CopyFeedbackFormat" xml:space="preserve">
+    <value>{0} 已复制到剪贴板。</value>
+  </data>
+  <data name="SandboxPage_StatusUnavailableTitle" xml:space="preserve">
+    <value>节点沙盒不可用 — 回退到主机</value>
+  </data>
+  <data name="SandboxPage_StatusUnavailableSubtext" xml:space="preserve">
+    <value>此电脑上无法使用隔离，因此代理启动的命令会在主机上运行，且没有沙盒保护。</value>
+  </data>
+  <data name="SandboxPage_StatusUnavailableBlockedTitle" xml:space="preserve">
+    <value>节点沙盒不可用 — 命令已阻止</value>
+  </data>
+  <data name="SandboxPage_StatusUnavailableBlockedSubtext" xml:space="preserve">
+    <value>此电脑上无法使用隔离，并且已启用严格回退阻止，因此代理启动的命令会被阻止。</value>
+  </data>
+  <data name="SandboxPage_StatusUnavailableOffTitle" xml:space="preserve">
+    <value>节点沙盒已关闭 — 主机执行</value>
+  </data>
+  <data name="SandboxPage_StatusUnavailableOffSubtext" xml:space="preserve">
+    <value>隔离不可用且节点沙盒已关闭，因此代理启动的命令会在主机上运行，且没有沙盒保护。</value>
+  </data>
+  <data name="SandboxPage_StatusOnTitle" xml:space="preserve">
+    <value>节点沙盒已开启</value>
+  </data>
+  <data name="SandboxPage_StatusOnSubtext" xml:space="preserve">
+    <value>代理在此电脑上运行的程序会被隔离。</value>
+  </data>
+  <data name="SandboxPage_StatusOffTitle" xml:space="preserve">
+    <value>节点沙盒已关闭 — 高风险</value>
+  </data>
+  <data name="SandboxPage_StatusOffSubtext" xml:space="preserve">
+    <value>代理在此电脑上运行的程序不会被隔离。</value>
+  </data>
+  <data name="SandboxPage_UnavailableDefaultReason" xml:space="preserve">
+    <value>此计算机上没有可用的 MXC 沙盒基元。</value>
+  </data>
+  <data name="SandboxPage_ProbeErrorReason" xml:space="preserve">
+    <value>无法检查沙盒可用性。</value>
+  </data>
+  <data name="SandboxPage_UnavailableBehaviorHostFallback" xml:space="preserve">
+    <value>在沙盒不可用期间，命令将在主机上运行，且没有沙盒保护。</value>
+  </data>
+  <data name="SandboxPage_UnavailableBehaviorBlocked" xml:space="preserve">
+    <value>由于已启用严格回退阻止，沙盒不可用期间命令会被阻止。</value>
+  </data>
+  <data name="SandboxPage_ProbeErrorTitle" xml:space="preserve">
+    <value>无法验证沙盒可用性</value>
+  </data>
+  <data name="SandboxPage_ProbeErrorMessageFormat" xml:space="preserve">
+    <value>{0}
+
+{1} 沙盒功能检查未完成。这通常是暂时性的（检查缓慢或被阻止）— 请重试；如果问题仍然存在，请检查安全软件是否阻止了 wxc-exec。</value>
+  </data>
+  <data name="SandboxPage_Retry" xml:space="preserve">
+    <value>重试</value>
+  </data>
+  <data name="SandboxPage_WindowsUnsupportedTitle" xml:space="preserve">
+    <value>你的 Windows 版本尚不支持沙盒</value>
+  </data>
+  <data name="SandboxPage_WindowsUnsupportedMessageFormat" xml:space="preserve">
+    <value>{0}
+
+{1} 沙盒需要包含 AppContainer 基元的较新 Windows 版本。请安装最新 Windows 更新（或加入 Windows 预览体验计划以获取最新版本）以启用隔离。</value>
+  </data>
+  <data name="SandboxPage_OpenWindowsUpdate" xml:space="preserve">
+    <value>打开 Windows 更新</value>
+  </data>
+  <data name="SandboxPage_ComponentsMissingTitle" xml:space="preserve">
+    <value>缺少沙盒组件</value>
+  </data>
+  <data name="SandboxPage_ComponentsMissingMessageFormat" xml:space="preserve">
+    <value>{0}
+
+找不到 wxc-exec 二进制文件。{1} 如果这是开发者版本，请生成托盘应用，以便将 wxc-exec.exe 复制到输出文件夹。否则请重新安装伴侣应用以恢复沙盒。</value>
+  </data>
+  <data name="SandboxPage_ShowInstallInstructions" xml:space="preserve">
+    <value>显示安装说明</value>
+  </data>
+  <data name="SandboxPage_UnavailableTitle" xml:space="preserve">
+    <value>沙盒不可用 — 回退到主机</value>
+  </data>
+  <data name="SandboxPage_UnavailableBlockedTitle" xml:space="preserve">
+    <value>沙盒不可用 — 命令已阻止</value>
+  </data>
+  <data name="SettingsPage_LocalGatewayRemovedTitle" xml:space="preserve">
+    <value>本地网关已移除</value>
+  </data>
+  <data name="SettingsPage_LocalGatewayRemovedMessage" xml:space="preserve">
+    <value>设置已重置；你可以从托盘菜单重新运行设置。</value>
+  </data>
+  <data name="SettingsPage_LocalGatewayRemovalErrorsMessage" xml:space="preserve">
+    <value>移除已完成但出现错误。请查看日志了解详细信息。</value>
+  </data>
+  <data name="SettingsPage_LocalGatewayRemovalCancelledTitle" xml:space="preserve">
+    <value>移除已取消</value>
+  </data>
+  <data name="SettingsPage_LocalGatewayRemovalCancelledMessage" xml:space="preserve">
+    <value>网关可能处于部分移除状态。请查看日志或重试。</value>
+  </data>
+  <data name="SettingsPage_ViewLogs" xml:space="preserve">
+    <value>查看日志</value>
+  </data>
+  <data name="SettingsPage_LocalGatewayRemovalFailedTitle" xml:space="preserve">
+    <value>移除失败</value>
+  </data>
+  <data name="SettingsPage_RemoveLocalGatewayButton" xml:space="preserve">
+    <value>移除本地网关</value>
+  </data>
+  <data name="SettingsPage_RemovingDistro" xml:space="preserve">
+    <value>正在移除发行版…</value>
+  </data>
+  <data name="SettingsPage_RemovingLocalGatewayMessage" xml:space="preserve">
+    <value>正在移除本地网关。这可能需要 10–30 秒…</value>
+  </data>
+  <data name="CronPage_NextWakeFormat" xml:space="preserve">
+    <value>· 下次唤醒：{0}</value>
+  </data>
+  <data name="ChatWindow_UnableToLoadChatCredentials" xml:space="preserve">
+    <value>无法加载聊天。网关 URL 或令牌不可用。</value>
+  </data>
+  <data name="ChatWindow_UnableToLoadChatRetryFormat" xml:space="preserve">
+    <value>无法加载聊天。请重试。({0})</value>
+  </data>
+  <data name="ChatWindow_WebViewFailedFormat" xml:space="preserve">
+    <value>WebView2 失败：{0}</value>
+  </data>
+  <data name="CanvasWindow_WebViewInitFailedFormat" xml:space="preserve">
+    <value>无法初始化 WebView2：{0}</value>
+  </data>
+  <data name="CanvasWindow_NavigationFailedFormat" xml:space="preserve">
+    <value>导航失败：{0}</value>
   </data>
   <data name="ConnectionPage_GatewayHostControlsDescription_Format" xml:space="preserve">
     <value>Open a shell or manage the local gateway service in {0}.</value>
@@ -5751,7 +6483,16 @@
     <value>Job completed</value>
   </data>
   <data name="CronPage_JobCompletedRanSuccessfully" xml:space="preserve">
-    <value>&quot;{0}&quot; ran successfully and was removed.</value>
+    <value>"{0}" ran successfully and was removed.</value>
+  </data>
+  <data name="CronPage_RunNotStarted" xml:space="preserve">
+    <value>运行未启动</value>
+  </data>
+  <data name="CronPage_RunNotStartedGeneric" xml:space="preserve">
+    <value>{0} 未启动。</value>
+  </data>
+  <data name="CronPage_RunNotStartedWithReason" xml:space="preserve">
+    <value>{0} 未启动：{1}</value>
   </data>
   <data name="GatewayHostAccess_NoTerminalAccess" xml:space="preserve">
     <value>This gateway does not have WSL or SSH terminal access.</value>
@@ -5819,6 +6560,24 @@
   <data name="ConnectionPage_NodeSurfaceNone" xml:space="preserve">
     <value>none</value>
   </data>
+  <data name="ConnectionPage_NodeTechnicalDetails.Text" xml:space="preserve">
+    <value>Show technical details</value>
+  </data>
+  <data name="ConnectionPage_NodePillState_Active" xml:space="preserve">
+    <value>Sharing now</value>
+  </data>
+  <data name="ConnectionPage_NodePillState_Pending" xml:space="preserve">
+    <value>Enabled, not active yet</value>
+  </data>
+  <data name="ConnectionPage_NodePillState_Off" xml:space="preserve">
+    <value>Off</value>
+  </data>
+  <data name="ConnectionPage_NodeCap_Device" xml:space="preserve">
+    <value>Device info</value>
+  </data>
+  <data name="ConnectionPage_NodeCap_System" xml:space="preserve">
+    <value>System access</value>
+  </data>
   <data name="ConnectionPage_NodeEffectiveCapabilities" xml:space="preserve">
     <value>Approved/effective capabilities: {0}</value>
   </data>
@@ -5837,4 +6596,223 @@
   <data name="ConnectionPage_NodePendingDeclaredPermissions" xml:space="preserve">
     <value>Pending declared permissions: {0}</value>
   </data>
+  <data name="ConnectionPage_AdviceCleartextTitle" xml:space="preserve">
+    <value>未加密的连接</value>
+  </data>
+  <data name="ConnectionPage_AdviceCleartextMessage" xml:space="preserve">
+    <value>此远程 gateway 使用 ws:// — 您的 token 将以明文发送。请使用 wss://（TLS）、SSH 隧道或受信任的代理 / Tailscale。</value>
+  </data>
+  <data name="ConnectionPage_AdviceSecureTitle" xml:space="preserve">
+    <value>已加密 (TLS)</value>
+  </data>
+  <data name="ConnectionPage_AdviceSecureMessage" xml:space="preserve">
+    <value>此 gateway 使用 TLS。证书验证通过后，您的 token 在传输过程中受到保护。</value>
+  </data>
+  <data name="ConnectionPage_AdviceTunnelTitle" xml:space="preserve">
+    <value>SSH 隧道</value>
+  </data>
+  <data name="ConnectionPage_AdviceTunnelMessage" xml:space="preserve">
+    <value>到此 gateway 的流量通过 SSH 隧道加密。</value>
+  </data>
+  <data name="ConnectionPage_RecoveryHeaderTokenDrift" xml:space="preserve">
+    <value>重新配对此设备：</value>
+  </data>
+  <data name="ConnectionPage_RecoveryHeaderScope" xml:space="preserve">
+    <value>升级此设备的访问权限：</value>
+  </data>
+  <data name="ConnectionPage_RecoveryHeaderTls" xml:space="preserve">
+    <value>修复安全连接：</value>
+  </data>
+  <data name="ConnectionPage_RecoveryTokenDriftBullet1" xml:space="preserve">
+    <value>gateway 不再信任此设备保存的 token（它已被轮换或吊销）。</value>
+  </data>
+  <data name="ConnectionPage_RecoveryTokenDriftBullet2" xml:space="preserve">
+    <value>从 gateway 主机获取新的设置代码，并粘贴到下方以重新配对。</value>
+  </data>
+  <data name="ConnectionPage_RecoveryScopeBullet1" xml:space="preserve">
+    <value>此设备已通过身份验证，但缺少所需的 scope（例如 operator.admin 或 operator.pairing）。</value>
+  </data>
+  <data name="ConnectionPage_RecoveryScopeBullet2" xml:space="preserve">
+    <value>使用新的设置代码重新配对以请求所需的 scope，或在 gateway 主机上批准更高的 scope。</value>
+  </data>
+  <data name="ConnectionPage_RecoveryTlsBullet1" xml:space="preserve">
+    <value>无法建立 gateway 的 TLS/安全传输。</value>
+  </data>
+  <data name="ConnectionPage_RecoveryTlsBullet2" xml:space="preserve">
+    <value>验证 gateway 主机上的证书，或通过 wss:// 或 SSH 隧道连接。</value>
+  </data>
+  <data name="ConnectionPage_TokenOrPasswordHint.Text" xml:space="preserve">
+    <value>粘贴共享 gateway token，或将其留空以使用设置代码配对。</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpDirect.Text" xml:space="preserve">
+    <value>当 gateway 拥有受信任证书时，连接到 wss:// 或 https://。证书验证通过后，您的 token 会在传输过程中加密。</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpTunnel.Text" xml:space="preserve">
+    <value>当 gateway 仅在 localhost 上侦听时，请展开下方的“使用 SSH 隧道”。tray 会通过 SSH 转发本地端口，使流量保持加密。</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpProxy.Text" xml:space="preserve">
+    <value>如果 Tailscale 或反向代理已加密路径，则在该专用网络上使用普通 ws:// URL 即可。</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpAuth.Text" xml:space="preserve">
+    <value>粘贴共享 token，或将其留空并使用设置代码配对。重新配对还会升级此设备的 scope。</value>
+  </data>
+  <data name="ConnectionPage_RecoveryHeaderRateLimited" xml:space="preserve">
+    <value>请稍后再重新连接：</value>
+  </data>
+  <data name="ConnectionPage_RecoveryRateLimitedBullet1" xml:space="preserve">
+    <value>gateway 在多次失败尝试后正在对此客户端限速。</value>
+  </data>
+  <data name="ConnectionPage_RecoveryRateLimitedBullet2" xml:space="preserve">
+    <value>暂时停止重试，然后在修正 token、密码或配对状态后重新连接。</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpLink.Text" xml:space="preserve">
+    <value>如何连接到远程 gateway？</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpTip.Title" xml:space="preserve">
+    <value>连接到远程 gateway</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpDirectTitle.Text" xml:space="preserve">
+    <value>直连 (TLS)</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpTunnelTitle.Text" xml:space="preserve">
+    <value>SSH 隧道</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpProxyTitle.Text" xml:space="preserve">
+    <value>受信任代理 / Tailscale</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpAuthTitle.Text" xml:space="preserve">
+    <value>身份验证</value>
+  </data>
+  <data name="HubWindow_StatusFlyout_Title.Text" xml:space="preserve">
+    <value>Connection</value>
+  </data>
+  <data name="HubWindow_StatusFlyout_OpenConnection.Content" xml:space="preserve">
+    <value>Open Connection</value>
+  </data>
+  <data name="HubWindow_StatusFlyout_GatewayLabel.Text" xml:space="preserve">
+    <value>Gateway</value>
+  </data>
+  <data name="HubWindow_StatusFlyout_Reconnect.Content" xml:space="preserve">
+    <value>Reconnect</value>
+  </data>
+  <data name="HubWindow_StatusFlyout_OperatorLabel.Text" xml:space="preserve">
+    <value>Operator</value>
+  </data>
+  <data name="HubWindow_StatusFlyout_NodeLabel.Text" xml:space="preserve">
+    <value>Node</value>
+  </data>
+  <data name="HubWindow_StatusFlyout_Approve.Content" xml:space="preserve">
+    <value>Approve…</value>
+  </data>
+  <data name="HubWindow_StatusPill_Tooltip" xml:space="preserve">
+    <value>Connection status</value>
+  </data>
+  <data name="HubWindow_Bell_Tooltip" xml:space="preserve">
+    <value>Notifications</value>
+  </data>
+  <data name="HubWindow_Pill_Ready" xml:space="preserve">
+    <value>Ready</value>
+  </data>
+  <data name="HubWindow_Pill_PairingRequired" xml:space="preserve">
+    <value>Pairing required</value>
+  </data>
+  <data name="HubWindow_Pill_Degraded" xml:space="preserve">
+    <value>Degraded</value>
+  </data>
+  <data name="HubWindow_Role_Off" xml:space="preserve">
+    <value>Off</value>
+  </data>
+  <data name="HubWindow_Role_PairingRequired" xml:space="preserve">
+    <value>Pairing required</value>
+  </data>
+  <data name="HubWindow_Role_PairingRejected" xml:space="preserve">
+    <value>Pairing rejected</value>
+  </data>
+  <data name="HubWindow_Role_RateLimited" xml:space="preserve">
+    <value>Rate limited</value>
+  </data>
+  <data name="HubWindow_Role_Disabled" xml:space="preserve">
+    <value>Disabled</value>
+  </data>
+  <data name="NotificationsFlyout_ClearAll.Content" xml:space="preserve">
+    <value>Clear all</value>
+  </data>
+  <data name="NotificationsFlyout_EmptyTitle.Text" xml:space="preserve">
+    <value>No notifications</value>
+  </data>
+  <data name="NotificationsFlyout_OpenPage.Content" xml:space="preserve">
+    <value>Open notifications</value>
+  </data>
+  <data name="NotificationsFlyout_ActiveCountFormat" xml:space="preserve">
+    <value>{0} active</value>
+  </data>
+  <data name="HubWindow_Role_PermissionsIncomplete" xml:space="preserve">
+    <value>Permissions incomplete</value>
+  </data>
+  <data name="SettingsPage_About.Text" xml:space="preserve">
+    <value>About</value>
+  </data>
+  <data name="SettingsPage_GatewayInfoExpander.Header" xml:space="preserve">
+    <value>Gateway info</value>
+  </data>
+  <data name="SettingsPage_GatewayInfoLabel_Version.Text" xml:space="preserve">
+    <value>Version</value>
+  </data>
+  <data name="SettingsPage_GatewayInfoLabel_Protocol.Text" xml:space="preserve">
+    <value>Protocol</value>
+  </data>
+  <data name="SettingsPage_GatewayInfoLabel_AuthMode.Text" xml:space="preserve">
+    <value>Auth mode</value>
+  </data>
+  <data name="SettingsPage_GatewayInfoLabel_Uptime.Text" xml:space="preserve">
+    <value>Uptime</value>
+  </data>
+  <data name="PermissionsPage_NewRuleAction.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>规则操作</value>
+  </data>
+  <data name="SandboxPage_UnavailablePrimaryButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>沙盒操作</value>
+  </data>
+  <data name="SandboxPage_PresetLockedButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>锁定预设：无互联网、无剪贴板、无标准用户文件夹</value>
+  </data>
+  <data name="SandboxPage_PresetBalancedButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>推荐预设：启用互联网，文档、下载和桌面为只读</value>
+  </data>
+  <data name="SandboxPage_PresetPermissiveButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>不受保护预设：启用互联网，可读写文档、下载和桌面</value>
+  </data>
+  <data name="SandboxPage_DocsAccessCombo.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>文档访问级别</value>
+  </data>
+  <data name="SandboxPage_DownloadsAccessCombo.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>下载访问级别</value>
+  </data>
+  <data name="SandboxPage_DesktopAccessCombo.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>桌面访问级别</value>
+  </data>
+  <data name="SettingsPage_NotificationSoundComboBox.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>通知声音</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantRefreshButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>刷新语音助手状态</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStartButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>启动语音助手</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStopButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>停止语音助手</value>
+  </data>
+  <data name="VoiceSettingsPage_LanguageCombo.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>语音语言</value>
+  </data>
+  <data name="HubWindow_MainNavigation.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>主导航</value>
+  </data>
+  <data name="JsonPreviewSplitter.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>调整 JSON 预览大小</value>
+  </data>
+  <data name="JsonPreviewSplitter.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.LocalizedControlType" xml:space="preserve">
+    <value>分隔条</value>
+  </data>
 </root>
diff --git a/src/OpenClaw.Tray.WinUI/Strings/zh-tw/Resources.resw b/src/OpenClaw.Tray.WinUI/Strings/zh-tw/Resources.resw
index c4ce94bee..aea0d4b4b 100644
--- a/src/OpenClaw.Tray.WinUI/Strings/zh-tw/Resources.resw
+++ b/src/OpenClaw.Tray.WinUI/Strings/zh-tw/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root xmlns:ns1="urn:schemas-microsoft-com:xml-msdata" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:schema id="root">
     <xs:element name="root" ns1:IsDataSet="true">
@@ -367,6 +367,9 @@
   <data name="Update_Message_Skipped_Debug" xml:space="preserve">
     <value>偵錯版本已停用更新檢查。</value>
   </data>
+  <data name="Update_Message_Skipped_Dev" xml:space="preserve">
+    <value>開發版本已停用更新檢查。</value>
+  </data>
   <data name="Update_OK" xml:space="preserve">
     <value>確定</value>
   </data>
@@ -648,6 +651,75 @@
   <data name="Toast_PairingCommandCopied" xml:space="preserve">
     <value>配對命令已複製</value>
   </data>
+  <data name="Toast_PairingRequestTitle" xml:space="preserve">
+    <value>配對要求</value>
+  </data>
+  <data name="Toast_PairingRequestBody" xml:space="preserve">
+    <value>{0} 想要連線</value>
+  </data>
+  <data name="Toast_PairingRequestBodyNode" xml:space="preserve">
+    <value>{0} 想要作為節點連線</value>
+  </data>
+  <data name="Toast_PairingReview" xml:space="preserve">
+    <value>檢視</value>
+  </data>
+  <data name="Toast_PairingApprovedTitle" xml:space="preserve">
+    <value>配對已核准</value>
+  </data>
+  <data name="Toast_PairingApprovedBody" xml:space="preserve">
+    <value>{0} 現在可以連線</value>
+  </data>
+  <data name="Toast_PairingRejectedTitle" xml:space="preserve">
+    <value>配對已拒絕</value>
+  </data>
+  <data name="Toast_PairingRejectedBody" xml:space="preserve">
+    <value>{0} 未獲允許連線</value>
+  </data>
+  <data name="PairingApproval_WindowTitle" xml:space="preserve">
+    <value>配對要求</value>
+  </data>
+  <data name="PairingApproval_DeviceHeading" xml:space="preserve">
+    <value>有裝置想要連線</value>
+  </data>
+  <data name="PairingApproval_NodeHeading" xml:space="preserve">
+    <value>有節點想要連線</value>
+  </data>
+  <data name="PairingApproval_Subtitle" xml:space="preserve">
+    <value>僅在您認得此要求時才核准。稍後可在「連線」設定中將其移除。</value>
+  </data>
+  <data name="PairingApproval_AccessRequested" xml:space="preserve">
+    <value>要求的存取權限</value>
+  </data>
+  <data name="PairingApproval_RepairBadge" xml:space="preserve">
+    <value>重新配對要求——裝置權杖將輪替。</value>
+  </data>
+  <data name="PairingApproval_Approve" xml:space="preserve">
+    <value>核准</value>
+  </data>
+  <data name="PairingApproval_ApproveDevice" xml:space="preserve">
+    <value>核准裝置</value>
+  </data>
+  <data name="PairingApproval_ApproveNode" xml:space="preserve">
+    <value>核准節點</value>
+  </data>
+  <data name="PairingApproval_Reject" xml:space="preserve">
+    <value>拒絕</value>
+  </data>
+  <data name="PairingApproval_Later" xml:space="preserve">
+    <value>稍後決定</value>
+  </data>
+  <data name="PairingApproval_MoreWaiting" xml:space="preserve">
+    <value>還有 {0} 個等待</value>
+  </data>
+  <data name="PairingApproval_ApproveHint" xml:space="preserve">
+    <value>核准將在稍後可用</value>
+  </data>
+  <data name="PairingApproval_UnknownDevice" xml:space="preserve">
+    <value>未知裝置</value>
+  </data>
+  <data name="PairingApproval_UnknownPlatform" xml:space="preserve">
+    <value>未知平台</value>
+  </data>
   <data name="Toast_NodePaired" xml:space="preserve">
     <value>✅ 節點已配對！</value>
   </data>
@@ -775,156 +847,6 @@
   <data name="Toast_ActivityStreamTipButton" xml:space="preserve">
     <value>打開串流活動</value>
   </data>
-  <data name="Setup_Title" xml:space="preserve">
-    <value>OpenClaw 設定</value>
-  </data>
-  <data name="Setup_StepConnect" xml:space="preserve">
-    <value>第 1 步（共 3 步）— 連線</value>
-  </data>
-  <data name="Setup_ConnectTitle" xml:space="preserve">
-    <value>連線到您的閘道器</value>
-  </data>
-  <data name="Setup_ConnectDescription" xml:space="preserve">
-    <value>在您的閘道器主機（Mac/Linux）上執行以下命令取得設定碼：</value>
-  </data>
-  <data name="Setup_SetupCodeHeader" xml:space="preserve">
-    <value>設定碼</value>
-  </data>
-  <data name="Setup_SetupCodePlaceholder" xml:space="preserve">
-    <value>貼上來自閘道器儀表板的設定碼</value>
-  </data>
-  <data name="Setup_PasteSetupButton" xml:space="preserve">
-    <value>貼上設定碼 / QR</value>
-  </data>
-  <data name="Setup_ImportQrButton" xml:space="preserve">
-    <value>匯入 QR 圖片...</value>
-  </data>
-  <data name="Setup_QrDecoded" xml:space="preserve">
-    <value>✅ QR 圖片已解碼 — 請按「測試連線」</value>
-  </data>
-  <data name="Setup_QrDecodeFailed" xml:space="preserve">
-    <value>❌ 無法在該圖片中找到有效的設定 QR 碼。</value>
-  </data>
-  <data name="Setup_ClipboardUnsupported" xml:space="preserve">
-    <value>❌ 剪貼簿不包含設定碼文字或 QR 圖片。</value>
-  </data>
-  <data name="Setup_ManualEntryToggle" xml:space="preserve">
-    <value>或手動輸入 URL 和權杖 ▾</value>
-  </data>
-  <data name="Setup_ManualEntryToggleHide" xml:space="preserve">
-    <value>隱藏手動輸入 ▴</value>
-  </data>
-  <data name="Setup_GatewayUrlHeader" xml:space="preserve">
-    <value>閘道器網址</value>
-  </data>
-  <data name="Setup_GatewayUrlPlaceholder" xml:space="preserve">
-    <value>ws://192.168.1.x:18789</value>
-  </data>
-  <data name="Setup_GatewayUrlHint" xml:space="preserve">
-    <value>💡 支援 ws://、wss://、http:// 或 https://</value>
-  </data>
-  <data name="Setup_TokenHeader" xml:space="preserve">
-    <value>閘道器權杖</value>
-  </data>
-  <data name="Setup_TokenPlaceholder" xml:space="preserve">
-    <value>在此貼上您的權杖</value>
-  </data>
-  <data name="Setup_TestButton" xml:space="preserve">
-    <value>測試連線</value>
-  </data>
-  <data name="Setup_Testing" xml:space="preserve">
-    <value>⏳ 正在連線到閘道器...</value>
-  </data>
-  <data name="Setup_Connected" xml:space="preserve">
-    <value>✅ 已連線！</value>
-  </data>
-  <data name="Setup_PairingRequired" xml:space="preserve">
-    <value>✅ 已連線到閘道器！裝置需要配對核准。
-
-在您的閘道器主機（Mac/Linux）上執行：
-
-  openclaw devices approve {0}</value>
-  </data>
-  <data name="Setup_TokenMismatch" xml:space="preserve">
-    <value>❌ 權杖不符。
-
-💡 檢查閘道器認證權杖：
-  cat ~/.openclaw/openclaw.json | grep token</value>
-  </data>
-  <data name="Setup_OriginNotAllowed" xml:space="preserve">
-    <value>❌ 來源不被允許。
-
-💡 將此機器加入 gateway.controlUi.allowedOrigins。</value>
-  </data>
-  <data name="Setup_RateLimited" xml:space="preserve">
-    <value>❌ 請求過於頻繁。請等待一分鐘後重試。</value>
-  </data>
-  <data name="Setup_TimedOut" xml:space="preserve">
-    <value>❌ 連線逾時。請檢查網址和閘道器是否正在執行。</value>
-  </data>
-  <data name="Setup_TokenRequired" xml:space="preserve">
-    <value>❌ 請輸入權杖</value>
-  </data>
-  <data name="Setup_TestFirst" xml:space="preserve">
-    <value>⚠️ 請先測試連線</value>
-  </data>
-  <data name="Setup_CodeDecoded" xml:space="preserve">
-    <value>✅ 設定碼已解碼 — 請點擊「測試連線」</value>
-  </data>
-  <data name="Setup_NodeModeTitle" xml:space="preserve">
-    <value>啟用節點模式（選用）</value>
-  </data>
-  <data name="Setup_NodeModeDescription" xml:space="preserve">
-    <value>節點模式允許您的 Windows 電腦為 OpenClaw 執行任務 — 如螢幕擷取、攝影機存取和畫布繪製。</value>
-  </data>
-  <data name="Setup_NodeModeSecurityTitle" xml:space="preserve">
-    <value>只為您信任的閘道和代理程式啟用節點模式</value>
-  </data>
-  <data name="Setup_NodeModeSecurityMessage" xml:space="preserve">
-    <value>已核准的代理程式可以執行本機命令，並可能存取已啟用的裝置介面，例如螢幕、攝影機、位置、瀏覽器和畫布。您稍後可以在設定中停用能力群組。</value>
-  </data>
-  <data name="Setup_NodeModeToggle" xml:space="preserve">
-    <value>啟用節點模式</value>
-  </data>
-  <data name="Setup_DeviceIdLoading" xml:space="preserve">
-    <value>裝置 ID：載入中...</value>
-  </data>
-  <data name="Setup_DeviceIdFallback" xml:space="preserve">
-    <value>裝置 ID：（將在首次連線時產生）</value>
-  </data>
-  <data name="Setup_CopyDeviceId" xml:space="preserve">
-    <value>📋 複製裝置 ID</value>
-  </data>
-  <data name="Setup_DeviceIdCopied" xml:space="preserve">
-    <value>✅ 已複製！</value>
-  </data>
-  <data name="Setup_ApproveInstructions" xml:space="preserve">
-    <value>要核准此節點，請在閘道器主機上執行：</value>
-  </data>
-  <data name="Setup_ApproveHint" xml:space="preserve">
-    <value>💡 您可以現在完成設定 — 配對將在背景繼續。獲得核准後會收到通知。</value>
-  </data>
-  <data name="Setup_DoneTitle" xml:space="preserve">
-    <value>🎉 一切就緒！</value>
-  </data>
-  <data name="Setup_DoneDescription" xml:space="preserve">
-    <value>OpenClaw 系統匣將連線到您的閘道器並開始監控。</value>
-  </data>
-  <data name="Setup_BackButton" xml:space="preserve">
-    <value>上一步</value>
-  </data>
-  <data name="Setup_NextButton" xml:space="preserve">
-    <value>下一步</value>
-  </data>
-  <data name="Setup_FinishButton" xml:space="preserve">
-    <value>完成</value>
-  </data>
-  <data name="Setup_StepNodeMode" xml:space="preserve">
-    <value>第 2 步（共 3 步）— 節點模式</value>
-  </data>
-  <data name="Setup_StepDone" xml:space="preserve">
-    <value>第 3 步（共 3 步）— 完成</value>
-  </data>
   <data name="SettingsDeveloperModeHeader.Text" xml:space="preserve">
     <value>開發人員模式</value>
   </data>
@@ -1446,57 +1368,6 @@
   <data name="Onboarding_LocalSetup_Phase_MintToken" xml:space="preserve">
     <value>正在產生設定碼</value>
   </data>
-  <data name="AboutPage_TextBlock_10.Text" xml:space="preserve">
-    <value>關於</value>
-  </data>
-  <data name="AboutPage_TextBlock_19.Text" xml:space="preserve">
-    <value>OpenClaw Hub</value>
-  </data>
-  <data name="AboutPage_TextBlock_23.Text" xml:space="preserve">
-    <value>.NET / WinUI / Windows App SDK</value>
-  </data>
-  <data name="AboutPage_TextBlock_35.Text" xml:space="preserve">
-    <value>閘道資訊</value>
-  </data>
-  <data name="AboutPage_TextBlock_48.Text" xml:space="preserve">
-    <value>版本：</value>
-  </data>
-  <data name="AboutPage_TextBlock_52.Text" xml:space="preserve">
-    <value>通訊協定：</value>
-  </data>
-  <data name="AboutPage_TextBlock_56.Text" xml:space="preserve">
-    <value>驗證模式：</value>
-  </data>
-  <data name="AboutPage_TextBlock_60.Text" xml:space="preserve">
-    <value>執行時間：</value>
-  </data>
-  <data name="AboutPage_TextBlock_72.Text" xml:space="preserve">
-    <value>偵錯</value>
-  </data>
-  <data name="OpenLogButton.Content" xml:space="preserve">
-    <value>開啟記錄檔</value>
-  </data>
-  <data name="OpenConfigButton.Content" xml:space="preserve">
-    <value>開啟設定資料夾</value>
-  </data>
-  <data name="CopySupportButton.Content" xml:space="preserve">
-    <value>複製支援內容</value>
-  </data>
-  <data name="CheckUpdatesButton.Content" xml:space="preserve">
-    <value>檢查更新</value>
-  </data>
-  <data name="AboutPage_TextBlock_91.Text" xml:space="preserve">
-    <value>連結</value>
-  </data>
-  <data name="AboutPage_HyperlinkButton_92.Content" xml:space="preserve">
-    <value>Documentation → docs.openclaw.ai/platforms/windows</value>
-  </data>
-  <data name="AboutPage_HyperlinkButton_94.Content" xml:space="preserve">
-    <value>GitHub → github.com/openclaw/openclaw-windows-node</value>
-  </data>
-  <data name="AboutPage_HyperlinkButton_96.Content" xml:space="preserve">
-    <value>Dashboard → openclaw://dashboard</value>
-  </data>
   <data name="AgentEventsPage_TextBlock_18.Text" xml:space="preserve">
     <value>代理程式事件</value>
   </data>
@@ -1567,7 +1438,7 @@
     <value>本機 MCP 伺服器</value>
   </data>
   <data name="PermissionsPage_McpDescription.Text" xml:space="preserve">
-    <value>透過 HTTP 向 CLI 工具和本機整合公開功能。</value>
+    <value>透過 HTTP 向此電腦上的本機 MCP 用戶端（CLI 工具、整合）提供功能。</value>
   </data>
   <data name="PermissionsPage_McpEndpointLabel.Text" xml:space="preserve">
     <value>端點：</value>
@@ -1662,7 +1533,7 @@
   <data name="DetailPath.Text" xml:space="preserve">
     <value>選取設定區段</value>
   </data>
-<data name="ConfigPage_TabViewItem_82.Text" xml:space="preserve">
+  <data name="ConfigPage_TabViewItem_82.Text" xml:space="preserve">
     <value>原始 JSON</value>
   </data>
   <data name="ConfigPage_TextBlock_95.Text" xml:space="preserve">
@@ -1698,9 +1569,6 @@
   <data name="ConnectionPage_TextBlock_11.Text" xml:space="preserve">
     <value>操作員用戶端和節點服務共同使用的閘道端點。</value>
   </data>
-  <data name="AuthErrorBar.Title" xml:space="preserve">
-    <value>連線錯誤</value>
-  </data>
   <data name="StatusText.Text" xml:space="preserve">
     <value>已中斷連線</value>
   </data>
@@ -2020,10 +1888,13 @@
     <value>命令模式 (例如 echo *)</value>
   </data>
   <data name="PermissionsPage_ComboBoxItem_54.Content" xml:space="preserve">
-    <value>允許</value>
+    <value>拒絕</value>
   </data>
   <data name="PermissionsPage_ComboBoxItem_55.Content" xml:space="preserve">
-    <value>拒絕</value>
+    <value>允許</value>
+  </data>
+  <data name="PermissionsPage_ComboBoxItem_56.Content" xml:space="preserve">
+    <value>詢問</value>
   </data>
   <data name="PermissionsPage_Button_57.Content" xml:space="preserve">
     <value>新增規則</value>
@@ -2214,6 +2085,69 @@
   <data name="WorkspacePage_LoadingContent" xml:space="preserve">
     <value>正在載入內容…</value>
   </data>
+  <data name="WorkspacePage_SearchBox.PlaceholderText" xml:space="preserve">
+    <value>Search files</value>
+  </data>
+  <data name="WorkspacePage_ParentFolderButton.Content" xml:space="preserve">
+    <value>Up</value>
+  </data>
+  <data name="WorkspacePage_OpenConnectionSettings.Content" xml:space="preserve">
+    <value>Open Connection settings</value>
+  </data>
+  <data name="WorkspacePage_NoSearchResults.Text" xml:space="preserve">
+    <value>No files match your search.</value>
+  </data>
+  <data name="WorkspacePage_NoFolderResults" xml:space="preserve">
+    <value>No files found in this folder.</value>
+  </data>
+  <data name="WorkspacePage_LoadErrorMessage" xml:space="preserve">
+    <value>Couldn't load workspace files. Try refreshing.</value>
+  </data>
+  <data name="WorkspacePage_UnsupportedMessage" xml:space="preserve">
+    <value>This gateway doesn't support listing workspace files.</value>
+  </data>
+  <data name="WorkspacePage_Badge_Missing" xml:space="preserve">
+    <value>Missing</value>
+  </data>
+  <data name="WorkspacePage_Badge_Edited" xml:space="preserve">
+    <value>Edited</value>
+  </data>
+  <data name="WorkspacePage_Badge_Read" xml:space="preserve">
+    <value>Read</value>
+  </data>
+  <data name="WorkspacePage_FolderNote" xml:space="preserve">
+    <value>This is a folder.</value>
+  </data>
+  <data name="WorkspacePage_FileUnavailable" xml:space="preserve">
+    <value>Couldn't load this file.</value>
+  </data>
+  <data name="WorkspacePage_BrowserOnlyFileNote" xml:space="preserve">
+    <value>Only files read or edited in this session can be previewed.</value>
+  </data>
+  <data name="WorkspacePage_OpenFolder" xml:space="preserve">
+    <value>Open</value>
+  </data>
+  <data name="WorkspacePage_CopyPath" xml:space="preserve">
+    <value>Copy path</value>
+  </data>
+  <data name="WorkspacePage_CopyPathFailed" xml:space="preserve">
+    <value>Couldn't copy the path.</value>
+  </data>
+  <data name="WorkspacePage_FileType_File" xml:space="preserve">
+    <value>File</value>
+  </data>
+  <data name="WorkspacePage_FileType_Folder" xml:space="preserve">
+    <value>Folder</value>
+  </data>
+  <data name="WorkspacePage_RootFolder" xml:space="preserve">
+    <value>Root</value>
+  </data>
+  <data name="WorkspacePage_SearchResultsPath" xml:space="preserve">
+    <value>Search results for "{0}"</value>
+  </data>
+  <data name="WorkspacePage_BrowserTruncated" xml:space="preserve">
+    <value>Some results were omitted. Narrow your search or open a folder.</value>
+  </data>
   <data name="WorkspacePage_MissingFile" xml:space="preserve">
     <value>(磁碟上找不到檔案)</value>
   </data>
@@ -2307,12 +2241,6 @@
   <data name="HubWindow_NavigationViewItem_145.Content" xml:space="preserve">
     <value>偵錯</value>
   </data>
-  <data name="HubWindow_NavigationViewItem_Notifications.Content" xml:space="preserve">
-    <value>通知</value>
-  </data>
-  <data name="HubWindow_NavigationViewItem_148.Content" xml:space="preserve">
-    <value>資訊</value>
-  </data>
   <data name="Onboarding_UnknownPage" xml:space="preserve">
     <value>未知頁面</value>
   </data>
@@ -2517,6 +2445,105 @@
   <data name="VoiceSettingsPage_PageDescription.Text" xml:space="preserve">
     <value>設定語音轉文字和語音互動設定。所有語音處理均在本機本地執行。</value>
   </data>
+  <data name="VoiceSettingsPage_AssistantHeader.Text" xml:space="preserve">
+    <value>助理</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantDescription.Text" xml:space="preserve">
+    <value>永遠聆聽的助理服務和最新對話輪次。</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantRefreshButton.[using:Microsoft.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>重新整理助理狀態</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStartButtonText.Text" xml:space="preserve">
+    <value>啟動</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStopButtonText.Text" xml:space="preserve">
+    <value>停止</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStatusChecking.Text" xml:space="preserve">
+    <value>正在檢查助理狀態...</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantRecentTurnsHeader.Text" xml:space="preserve">
+    <value>最近輪次</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStarting" xml:space="preserve">
+    <value>正在啟動助理...</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStartingDetail" xml:space="preserve">
+    <value>正在啟動永遠聆聽模式，並使用本機助理路由和輪次儲存。</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStartFailed" xml:space="preserve">
+    <value>助理未啟動</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStopping" xml:space="preserve">
+    <value>正在停止助理...</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStopFailed" xml:space="preserve">
+    <value>助理未停止</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantBridgeUnavailable" xml:space="preserve">
+    <value>助理橋接器無法使用</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantNoTurnsLoaded" xml:space="preserve">
+    <value>未載入助理輪次。</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantUnknown" xml:space="preserve">
+    <value>未知</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantListeningFormat" xml:space="preserve">
+    <value>助理正在聆聽 (PID {0})</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStopped" xml:space="preserve">
+    <value>助理已停止</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStatusFormat" xml:space="preserve">
+    <value>助理 {0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantTranscriberFormat" xml:space="preserve">
+    <value>轉錄器：{0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantMicFormat" xml:space="preserve">
+    <value>麥克風：{0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantSpeakerFormat" xml:space="preserve">
+    <value>喇叭：{0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantCloudRoutingFormat" xml:space="preserve">
+    <value>雲端路由：{0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantSpeechOutputFormat" xml:space="preserve">
+    <value>語音輸出：{0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantOn" xml:space="preserve">
+    <value>開啟</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantOff" xml:space="preserve">
+    <value>關閉</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantLastBridgeUpdateFormat" xml:space="preserve">
+    <value>上次橋接器更新：{0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantNoConversationTurns" xml:space="preserve">
+    <value>尚無對話輪次。</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantSourceDefault" xml:space="preserve">
+    <value>助理</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantTurnMetadataFormat" xml:space="preserve">
+    <value>{0} / {1}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantTurnMetadataWithLatencyFormat" xml:space="preserve">
+    <value>{0} | {1} | {2} 毫秒</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantUserTurnFormat" xml:space="preserve">
+    <value>你：{0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantResponseTurnFormat" xml:space="preserve">
+    <value>OpenClaw：{0}</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantEmptyValue" xml:space="preserve">
+    <value>（空）</value>
+  </data>
   <data name="VoiceSettingsPage_SttHeader.Text" xml:space="preserve">
     <value>語音轉文字</value>
   </data>
@@ -2892,6 +2919,9 @@
   <data name="Chat_Timeline_LoadEarlier" xml:space="preserve">
     <value>載入較早的訊息</value>
   </data>
+  <data name="Chat_Timeline_ScrollToLatest" xml:space="preserve">
+    <value>捲動到最新訊息</value>
+  </data>
   <data name="Chat_Tool_CallLabel" xml:space="preserve">
     <value>工具呼叫</value>
   </data>
@@ -2928,6 +2958,15 @@
   <data name="Chat_Composer_Reasoning_Maximum" xml:space="preserve">
     <value>最大</value>
   </data>
+  <data name="Chat_Composer_Accessibility_Session" xml:space="preserve">
+    <value>工作階段</value>
+  </data>
+  <data name="Chat_Composer_Accessibility_Model" xml:space="preserve">
+    <value>模型</value>
+  </data>
+  <data name="Chat_Composer_Accessibility_Reasoning" xml:space="preserve">
+    <value>推理</value>
+  </data>
   <data name="Chat_Composer_Placeholder_Connected" xml:space="preserve">
     <value>傳訊息給助理（按 Enter 傳送）</value>
   </data>
@@ -2964,6 +3003,30 @@
   <data name="Chat_Composer_AssistantWorking" xml:space="preserve">
     <value>助理處理中…</value>
   </data>
+  <data name="Chat_Composer_QueuedCountFormat" xml:space="preserve">
+    <value>已排入佇列 ({0})</value>
+  </data>
+  <data name="Chat_Composer_QueuedMessageAutomationFormat" xml:space="preserve">
+    <value>已排入佇列的訊息：{0}</value>
+  </data>
+  <data name="Chat_Composer_QueuedMessageFailedAutomationFormat" xml:space="preserve">
+    <value>已排入佇列的訊息失敗：{0}</value>
+  </data>
+  <data name="Chat_Composer_QueuedMessageFailed" xml:space="preserve">
+    <value>失敗</value>
+  </data>
+  <data name="Chat_Composer_QueuedMessageCancel" xml:space="preserve">
+    <value>取消已排入佇列的訊息</value>
+  </data>
+  <data name="Chat_Composer_QueuedMessageCancelAutomationFormat" xml:space="preserve">
+    <value>取消已排入佇列的訊息 {0}：{1}</value>
+  </data>
+  <data name="Chat_Composer_QueuedMessageRemoveFailed" xml:space="preserve">
+    <value>移除失敗的已排入佇列訊息</value>
+  </data>
+  <data name="Chat_Composer_QueuedMessageRemoveFailedAutomationFormat" xml:space="preserve">
+    <value>移除失敗的已排入佇列訊息 {0}：{1}</value>
+  </data>
   <data name="Chat_Assistant_Action_Copy" xml:space="preserve">
     <value>複製訊息</value>
   </data>
@@ -2977,14 +3040,20 @@
     <value> … [已截斷 {0} 位元組]</value>
   </data>
   <data name="Chat_Permission_Allow" xml:space="preserve">
-    <value>允許</value>
+    <value>允許一次</value>
+  </data>
+  <data name="Chat_Permission_AllowAlways" xml:space="preserve">
+    <value>一律允許</value>
   </data>
   <data name="Chat_Permission_Deny" xml:space="preserve">
-    <value>拒絕</value>
+    <value>拒絕一次</value>
   </data>
   <data name="Chat_Permission_DecisionAllowed" xml:space="preserve">
     <value>已允許</value>
   </data>
+  <data name="Chat_Permission_DecisionAlwaysAllowed" xml:space="preserve">
+    <value>已一律允許</value>
+  </data>
   <data name="Chat_Permission_DecisionDenied" xml:space="preserve">
     <value>已拒絕</value>
   </data>
@@ -3015,6 +3084,88 @@
   <data name="AppNotification_ShowMore" xml:space="preserve">
     <value>顯示更多</value>
   </data>
+  <data name="AppNotification_ActionOpenConnection" xml:space="preserve">
+    <value>開啟連線</value>
+  </data>
+  <data name="AppNotification_ActionOpenChannels" xml:space="preserve">
+    <value>開啟頻道</value>
+  </data>
+  <data name="AppNotification_ActionOpenSandbox" xml:space="preserve">
+    <value>開啟沙箱</value>
+  </data>
+  <data name="AppNotification_ActionOpenCron" xml:space="preserve">
+    <value>開啟 Cron</value>
+  </data>
+  <data name="AppNotification_GatewayConnectionFailed_Title" xml:space="preserve">
+    <value>閘道連線失敗</value>
+  </data>
+  <data name="AppNotification_GatewayConnectionFailed_DefaultMessage" xml:space="preserve">
+    <value>OpenClaw 無法連線到作用中閘道。</value>
+  </data>
+  <data name="AppNotification_GatewayPairingRequired_Title" xml:space="preserve">
+    <value>需要核准閘道配對</value>
+  </data>
+  <data name="AppNotification_GatewayPairingRequired_GenericMessage" xml:space="preserve">
+    <value>開啟「連線」以完成閘道配對。</value>
+  </data>
+  <data name="AppNotification_GatewayPairingRequired_DeviceMessageFormat" xml:space="preserve">
+    <value>開啟「連線」以核准裝置 {0}。</value>
+  </data>
+  <data name="AppNotification_WindowsNodeConnectionFailed_Title" xml:space="preserve">
+    <value>Windows 節點連線失敗</value>
+  </data>
+  <data name="AppNotification_WindowsNodeConnectionFailed_DefaultMessage" xml:space="preserve">
+    <value>閘道已連線，但此 Windows 節點無法使用。</value>
+  </data>
+  <data name="AppNotification_WindowsNodeRateLimited_Title" xml:space="preserve">
+    <value>Windows 節點連線受到速率限制</value>
+  </data>
+  <data name="AppNotification_WindowsNodeRateLimited_DefaultMessage" xml:space="preserve">
+    <value>閘道已連線，但此 Windows 節點暫時受到速率限制。</value>
+  </data>
+  <data name="AppNotification_ChannelNeedsAttention_TitleFormat" xml:space="preserve">
+    <value>{0} 頻道需要注意</value>
+  </data>
+  <data name="AppNotification_ChannelNeedsAttention_StatusMessageFormat" xml:space="preserve">
+    <value>閘道回報 {0} 為 {1}。</value>
+  </data>
+  <data name="AppNotification_SandboxDisabled_Title" xml:space="preserve">
+    <value>節點沙箱已關閉 — 命令將不受限制地執行</value>
+  </data>
+  <data name="AppNotification_SandboxDisabled_Message" xml:space="preserve">
+    <value>在重新啟用節點沙箱之前，代理程式啟動的 Windows 命令將在沒有沙箱隔離的情況下執行。</value>
+  </data>
+  <data name="AppNotification_SandboxUnavailable_Title" xml:space="preserve">
+    <value>沙箱無法使用 — 回退到主機</value>
+  </data>
+  <data name="AppNotification_SandboxUnavailable_MessageFormat" xml:space="preserve">
+    <value>{0}
+
+在沙箱無法使用期間，命令將在主機上執行，且沒有沙箱保護。</value>
+  </data>
+  <data name="AppNotification_SandboxUnavailableBlocked_Title" xml:space="preserve">
+    <value>沙箱無法使用 — 命令已封鎖</value>
+  </data>
+  <data name="AppNotification_SandboxUnavailableBlocked_MessageFormat" xml:space="preserve">
+    <value>{0}
+
+由於已啟用嚴格回退封鎖，沙箱無法使用期間命令會被封鎖。</value>
+  </data>
+  <data name="AppNotification_SandboxUnavailable_DefaultReason" xml:space="preserve">
+    <value>此電腦上沒有可用的 MXC 沙箱基元。</value>
+  </data>
+  <data name="AppNotification_CronRunFailed_Title" xml:space="preserve">
+    <value>Cron 作業未啟動</value>
+  </data>
+  <data name="AppNotification_CronRunFailed_DefaultDetail" xml:space="preserve">
+    <value>要求失敗。</value>
+  </data>
+  <data name="AppNotification_CronRunRejectedDetail" xml:space="preserve">
+    <value>閘道拒絕了 cron.run 要求。</value>
+  </data>
+  <data name="AppNotification_CronRunFailed_MessageFormat" xml:space="preserve">
+    <value>{0}：{1}</value>
+  </data>
   <data name="NotificationsPage_Title.Text" xml:space="preserve">
     <value>通知</value>
   </data>
@@ -3039,46 +3190,133 @@
   <data name="NotificationsPage_MetadataCategoryNodeInvoke" xml:space="preserve">
     <value>節點命令</value>
   </data>
-  <data name="Chat_Permission_Title" xml:space="preserve">
-    <value>需要執行核准</value>
+  <data name="AppNotification_ExecApprovalPending_Title" xml:space="preserve">
+    <value>命令核准待處理</value>
   </data>
-  <data name="Chat_Permission_Subtitle" xml:space="preserve">
-    <value>在此 Windows 伴侶上執行以下命令需要核准。按一下「允許」以繼續，或按一下「拒絕」以取消。</value>
+  <data name="AppNotification_ExecApprovalPending_MessageFormat" xml:space="preserve">
+    <value>{0} 正在等待核准以執行：{1}</value>
   </data>
-  <data name="Chat_Permission_Caption" xml:space="preserve">
-    <value>根據目前策略，每條命令都需要核准。您的選擇僅適用於此請求。</value>
+  <data name="AppNotification_ExecApprovalPending_OpenChatAction" xml:space="preserve">
+    <value>開啟聊天</value>
   </data>
-  <data name="Chat_Root_ConnectingToGateway" xml:space="preserve">
-    <value>連線到閘道中…</value>
+  <data name="AppNotification_ExecApprovalPending_UnknownChatLabel" xml:space="preserve">
+    <value>聊天</value>
   </data>
-  <data name="Chat_Root_EmptyState_SelectSession" xml:space="preserve">
-    <value>在側邊欄選擇一個工作階段以開始聊天。</value>
+  <data name="AppNotification_ExecApprovalPending_MainSessionLabel" xml:space="preserve">
+    <value>主要</value>
   </data>
-  <data name="Chat_Notification_SendFailed" xml:space="preserve">
-    <value>傳送失敗</value>
+  <data name="AppNotification_ExecApprovalPending_MainChatLabel" xml:space="preserve">
+    <value>主要聊天</value>
   </data>
-  <data name="Chat_Notification_AbortFailed" xml:space="preserve">
-    <value>中止失敗</value>
+  <data name="AppNotification_ExecApprovalPending_AgentChatLabelFormat" xml:space="preserve">
+    <value>{0} 聊天</value>
   </data>
-  <data name="Chat_Notification_LoadHistoryFailed" xml:space="preserve">
-    <value>載入歷史記錄失敗</value>
+  <data name="AppNotification_ExecApprovalPending_AgentSlotLabelFormat" xml:space="preserve">
+    <value>{0} / {1}</value>
   </data>
-  <data name="Chat_Notification_AssistantReplied" xml:space="preserve">
-    <value>助理已回覆</value>
+  <data name="NotificationsPage_MetadataAuthentication" xml:space="preserve">
+    <value>驗證</value>
   </data>
-  <data name="Chat_Notification_ConnectionInterrupted" xml:space="preserve">
-    <value>連線已中斷 — 回覆已中斷。</value>
+  <data name="NotificationsPage_MetadataBindings" xml:space="preserve">
+    <value>繫結</value>
   </data>
-  <data name="Chat_Notification_KeylessEventDropped" xml:space="preserve">
-    <value>已捨棄閘道時間軸事件</value>
+  <data name="NotificationsPage_MetadataChannels" xml:space="preserve">
+    <value>頻道</value>
   </data>
-  <data name="Chat_Notification_KeylessEventDroppedMessage" xml:space="preserve">
-    <value>閘道傳送了缺少工作階段金鑰的聊天時間軸事件，OpenClaw 已將其忽略，以避免混淆時間軸。如果此情況持續，請更新或重新啟動閘道。</value>
+  <data name="NotificationsPage_MetadataConfig" xml:space="preserve">
+    <value>設定</value>
   </data>
-  <data name="VoiceSettingsPage_TestVoiceButtonText.Text" xml:space="preserve">
-    <value>測試語音輸入</value>
+  <data name="NotificationsPage_MetadataConnection" xml:space="preserve">
+    <value>連線</value>
   </data>
-  <data name="PermissionsPage_FeaturesDescription_Enabled" xml:space="preserve">
+  <data name="NotificationsPage_MetadataCron" xml:space="preserve">
+    <value>Cron</value>
+  </data>
+  <data name="NotificationsPage_MetadataGateway" xml:space="preserve">
+    <value>閘道</value>
+  </data>
+  <data name="NotificationsPage_MetadataJobs" xml:space="preserve">
+    <value>作業</value>
+  </data>
+  <data name="NotificationsPage_MetadataLoad" xml:space="preserve">
+    <value>載入</value>
+  </data>
+  <data name="NotificationsPage_MetadataLifecycle" xml:space="preserve">
+    <value>生命週期</value>
+  </data>
+  <data name="NotificationsPage_MetadataLocalGateway" xml:space="preserve">
+    <value>本機閘道</value>
+  </data>
+  <data name="NotificationsPage_MetadataNode" xml:space="preserve">
+    <value>節點</value>
+  </data>
+  <data name="NotificationsPage_MetadataPairing" xml:space="preserve">
+    <value>配對</value>
+  </data>
+  <data name="NotificationsPage_MetadataSandbox" xml:space="preserve">
+    <value>沙箱</value>
+  </data>
+  <data name="NotificationsPage_MetadataSettings" xml:space="preserve">
+    <value>設定</value>
+  </data>
+  <data name="NotificationsPage_MetadataStatus" xml:space="preserve">
+    <value>狀態</value>
+  </data>
+  <data name="NotificationsPage_MetadataSystemRun" xml:space="preserve">
+    <value>system.run</value>
+  </data>
+  <data name="Chat_Permission_Title" xml:space="preserve">
+    <value>需要執行核准</value>
+  </data>
+  <data name="Chat_Permission_CommandApprovalTitle" xml:space="preserve">
+    <value>已要求命令核准</value>
+  </data>
+  <data name="Chat_Permission_Subtitle" xml:space="preserve">
+    <value>在此 Windows 伴侶上執行以下命令需要核准。允許一次以繼續，一律允許以記住此命令，或拒絕以取消。</value>
+  </data>
+  <data name="Chat_Permission_Caption" xml:space="preserve">
+    <value>「允許一次」僅適用於此請求。「一律允許」會在可能時儲存一條精確的允許規則。</value>
+  </data>
+  <data name="Chat_Permission_ResultSubmittedFormat" xml:space="preserve">
+    <value>已為 {1} 提交核准 {0}。</value>
+  </data>
+  <data name="Chat_Root_ConnectingToGateway" xml:space="preserve">
+    <value>連線到閘道中…</value>
+  </data>
+  <data name="Chat_Root_EmptyState_SelectSession" xml:space="preserve">
+    <value>在側邊欄選擇一個工作階段以開始聊天。</value>
+  </data>
+  <data name="Chat_Notification_SendFailed" xml:space="preserve">
+    <value>傳送失敗</value>
+  </data>
+  <data name="Chat_Error_SendReturnedStatusFormat" xml:space="preserve">
+    <value>閘道傳回傳送狀態「{0}」。</value>
+  </data>
+  <data name="Chat_Error_SendFailedFormat" xml:space="preserve">
+    <value>傳送失敗：{0}</value>
+  </data>
+  <data name="Chat_Notification_AbortFailed" xml:space="preserve">
+    <value>中止失敗</value>
+  </data>
+  <data name="Chat_Notification_LoadHistoryFailed" xml:space="preserve">
+    <value>載入歷史記錄失敗</value>
+  </data>
+  <data name="Chat_Notification_AssistantReplied" xml:space="preserve">
+    <value>助理已回覆</value>
+  </data>
+  <data name="Chat_Notification_ConnectionInterrupted" xml:space="preserve">
+    <value>連線已中斷 — 回覆已中斷。</value>
+  </data>
+  <data name="Chat_Notification_KeylessEventDropped" xml:space="preserve">
+    <value>已捨棄閘道時間軸事件</value>
+  </data>
+  <data name="Chat_Notification_KeylessEventDroppedMessage" xml:space="preserve">
+    <value>閘道傳送了缺少工作階段金鑰的聊天時間軸事件，OpenClaw 已將其忽略，以避免混淆時間軸。如果此情況持續，請更新或重新啟動閘道。</value>
+  </data>
+  <data name="VoiceSettingsPage_TestVoiceButtonText.Text" xml:space="preserve">
+    <value>測試語音輸入</value>
+  </data>
+  <data name="PermissionsPage_FeaturesDescription_Enabled" xml:space="preserve">
     <value>Toggle individual features that agents may request from this PC.</value>
   </data>
   <data name="PermissionsPage_FeaturesDescription_Disabled" xml:space="preserve">
@@ -3156,6 +3394,18 @@
   <data name="PermissionsPage_NodeStatus_ActiveDetailsFormat" xml:space="preserve">
     <value>Providing {0} capabilities: {1}</value>
   </data>
+  <data name="PermissionsPage_NodeStatus_McpOnly" xml:space="preserve">
+    <value>僅本機 MCP</value>
+  </data>
+  <data name="PermissionsPage_NodeStatus_McpOnlyDetailsFormat" xml:space="preserve">
+    <value>正在透過 {1} 向本機 MCP 用戶端提供 {0} 項功能</value>
+  </data>
+  <data name="PermissionsPage_NodeStatus_Starting" xml:space="preserve">
+    <value>Node 正在啟動…</value>
+  </data>
+  <data name="PermissionsPage_NodeStatus_McpError" xml:space="preserve">
+    <value>本機 MCP 伺服器啟動失敗</value>
+  </data>
   <data name="PermissionsPage_NodeStatus_NoCapabilities" xml:space="preserve">
     <value>No capabilities enabled.</value>
   </data>
@@ -3531,9 +3781,6 @@
   <data name="HubWindow_NavigationViewItem_Sandbox.Content" xml:space="preserve">
     <value>沙盒</value>
   </data>
-  <data name="AboutPage_MoreDiagnosticsLink.Content" xml:space="preserve">
-    <value>More diagnostics →</value>
-  </data>
   <data name="ChannelsPage_GuideBar.Title" xml:space="preserve">
     <value>Your gateway didn't list any channels</value>
   </data>
@@ -3601,10 +3848,10 @@
     <value>Connection state, gateway URL, runtime, tunnel.</value>
   </data>
   <data name="DiagnosticsPage_Card_CopyDebugBundle.Header" xml:space="preserve">
-    <value>Copy full debug bundle</value>
+    <value>複製摘要偵錯套件</value>
   </data>
   <data name="DiagnosticsPage_Card_CopyDebugBundle.Description" xml:space="preserve">
-    <value>Everything the preview dialog produces, no preview.</value>
+    <value>僅包含產生的摘要；不包含記錄尾端。請使用「建立診斷套件」在分享前檢查記錄。</value>
   </data>
   <data name="DiagnosticsPage_Card_CopyBrowserSetup.Header" xml:space="preserve">
     <value>Copy browser setup guidance</value>
@@ -3666,15 +3913,6 @@
   <data name="DiagnosticsPage_Card_TrayChat.Header" xml:space="preserve">
     <value>Tray chat popup</value>
   </data>
-  <data name="DiagnosticsPage_Card_Reconfigure.Header" xml:space="preserve">
-    <value>Reconfigure…</value>
-  </data>
-  <data name="DiagnosticsPage_Card_Reconfigure.Description" xml:space="preserve">
-    <value>Reopens the OpenClaw onboarding wizard. You will be asked to confirm.</value>
-  </data>
-  <data name="DiagnosticsPage_ReconfigureButton.Content" xml:space="preserve">
-    <value>Reconfigure…</value>
-  </data>
   <data name="DiagnosticsPage_DetailBack.Text" xml:space="preserve">
     <value>Back to Diagnostics</value>
   </data>
@@ -4183,7 +4421,7 @@
     <value>0 條規則</value>
   </data>
   <data name="PermissionsPage_NoRulesYetAdd.Text" xml:space="preserve">
-    <value>尚無規則。在下方新增模式以允許或拒絕特定命令。</value>
+    <value>尚無規則。在下方新增模式以拒絕、允許或詢問特定命令。</value>
   </data>
   <data name="PermissionsPage_WindowsPrivacy.Text" xml:space="preserve">
     <value>Windows 隱私</value>
@@ -4377,6 +4615,9 @@
   <data name="SessionsPage_All.Text" xml:space="preserve">
     <value>全部</value>
   </data>
+  <data name="SessionsPage_ShowCompleted.Header" xml:space="preserve">
+    <value>顯示已完成的工作階段</value>
+  </data>
   <data name="SessionsPage_GatewayDisconnected.Title" xml:space="preserve">
     <value>閘道已中斷</value>
   </data>
@@ -4398,15 +4639,81 @@
   <data name="SessionsPage_Compact.Text" xml:space="preserve">
     <value>壓縮</value>
   </data>
+  <data name="SessionsPage_Checkpoints.Text" xml:space="preserve">
+    <value>檢查點</value>
+  </data>
+  <data name="SessionsPage_Checkpoints.[using:Microsoft.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>檢視、分支或還原壓縮檢查點</value>
+  </data>
+  <data name="SessionsPage_ExportTranscript.Text" xml:space="preserve">
+    <value>匯出逐字稿</value>
+  </data>
+  <data name="SessionsPage_ExportTranscript.[using:Microsoft.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>將對話逐字稿儲存為文字檔</value>
+  </data>
   <data name="SessionsPage_Delete.Text" xml:space="preserve">
     <value>刪除</value>
   </data>
+  <data name="SessionActionPrompt_Reset_Title" xml:space="preserve">
+    <value>重設工作階段？</value>
+  </data>
+  <data name="SessionActionPrompt_Reset_BodyFormat" xml:space="preserve">
+    <value>為「{0}」啟動新的工作階段？目前的對話內容將被清除。</value>
+  </data>
+  <data name="SessionActionPrompt_Reset_ConfirmLabel" xml:space="preserve">
+    <value>重設</value>
+  </data>
+  <data name="SessionActionPrompt_CancelLabel" xml:space="preserve">
+    <value>取消</value>
+  </data>
+  <data name="SessionActionPrompt_Compact_Title" xml:space="preserve">
+    <value>壓縮工作階段記錄？</value>
+  </data>
+  <data name="SessionActionPrompt_Compact_BodyFormat" xml:space="preserve">
+    <value>保留「{0}」的最新訊息並封存其餘內容。這會建立一個壓縮檢查點；如果需要完整歷程記錄，請先匯出逐字稿。</value>
+  </data>
+  <data name="SessionActionPrompt_Compact_ConfirmLabel" xml:space="preserve">
+    <value>壓縮</value>
+  </data>
+  <data name="SessionActionPrompt_Delete_Title" xml:space="preserve">
+    <value>刪除工作階段？</value>
+  </data>
+  <data name="SessionActionPrompt_Delete_BodyFormat" xml:space="preserve">
+    <value>刪除「{0}」並封存其逐字稿？它將從工作階段清單中移除。</value>
+  </data>
+  <data name="SessionActionPrompt_Delete_ConfirmLabel" xml:space="preserve">
+    <value>刪除</value>
+  </data>
+  <data name="SessionActionPrompt_Restore_Title" xml:space="preserve">
+    <value>還原檢查點？</value>
+  </data>
+  <data name="SessionActionPrompt_Restore_BodyFormat" xml:space="preserve">
+    <value>將「{0}」回復到此壓縮檢查點？檢查點之後新增的訊息將被封存。</value>
+  </data>
+  <data name="SessionActionPrompt_Restore_ConfirmLabel" xml:space="preserve">
+    <value>還原</value>
+  </data>
   <data name="SettingsPage_Settings.Text" xml:space="preserve">
     <value>設定</value>
   </data>
   <data name="SettingsPage_General.Text" xml:space="preserve">
     <value>一般</value>
   </data>
+  <data name="SettingsRow_AppTheme_Header.Text" xml:space="preserve">
+    <value>應用程式佈景主題</value>
+  </data>
+  <data name="SettingsRow_AppTheme_Description.Text" xml:space="preserve">
+    <value>選擇淺色、深色，或使用 Windows 設定。</value>
+  </data>
+  <data name="SettingsPage_AppTheme_System.Content" xml:space="preserve">
+    <value>系統</value>
+  </data>
+  <data name="SettingsPage_AppTheme_Light.Content" xml:space="preserve">
+    <value>淺色</value>
+  </data>
+  <data name="SettingsPage_AppTheme_Dark.Content" xml:space="preserve">
+    <value>深色</value>
+  </data>
   <data name="SettingsPage_Notifications.Text" xml:space="preserve">
     <value>通知</value>
   </data>
@@ -4416,6 +4723,57 @@
   <data name="SettingsPage_LocalGateway.Text" xml:space="preserve">
     <value>本機閘道</value>
   </data>
+  <data name="SettingsPage_Developer.Text" xml:space="preserve">
+    <value>開發人員</value>
+  </data>
+  <data name="SettingsPage_AppInfoExpander.Header" xml:space="preserve">
+    <value>應用程式資訊</value>
+  </data>
+  <data name="SettingsPage_AppInfoCheckUpdates.Content" xml:space="preserve">
+    <value>檢查更新</value>
+  </data>
+  <data name="SettingsPage_AppInfoLabel_AppName.Text" xml:space="preserve">
+    <value>應用程式名稱</value>
+  </data>
+  <data name="SettingsPage_AppInfoLabel_Version.Text" xml:space="preserve">
+    <value>版本</value>
+  </data>
+  <data name="SettingsPage_AppInfoLabel_BuildDate.Text" xml:space="preserve">
+    <value>組建日期</value>
+  </data>
+  <data name="SettingsPage_AppInfoLabel_Runtime.Text" xml:space="preserve">
+    <value>執行階段</value>
+  </data>
+  <data name="SettingsPage_AppInfoLabel_Architecture.Text" xml:space="preserve">
+    <value>架構</value>
+  </data>
+  <data name="SettingsPage_AppInfoLabel_Windows.Text" xml:space="preserve">
+    <value>Windows 版本</value>
+  </data>
+  <data name="SettingsPage_AppInfoLabel_UpdateChannel.Text" xml:space="preserve">
+    <value>更新通道</value>
+  </data>
+  <data name="SettingsPage_AppInfoLabel_InstallType.Text" xml:space="preserve">
+    <value>安裝類型</value>
+  </data>
+  <data name="SettingsPage_AppInfoRelatedLinks.Text" xml:space="preserve">
+    <value>相關連結</value>
+  </data>
+  <data name="SettingsPage_AppInfoDocumentation.Content" xml:space="preserve">
+    <value>文件</value>
+  </data>
+  <data name="SettingsPage_AppInfoGitHub.Content" xml:space="preserve">
+    <value>GitHub</value>
+  </data>
+  <data name="SettingsPage_AppInfoDashboard.Content" xml:space="preserve">
+    <value>儀表板</value>
+  </data>
+  <data name="SettingsRow_ShowDiagnostics_Header.Text" xml:space="preserve">
+    <value>啟用診斷</value>
+  </data>
+  <data name="SettingsRow_ShowDiagnostics_Description.Text" xml:space="preserve">
+    <value>開發人員與疑難排解工具。預設會在本機組建中開啟。</value>
+  </data>
   <data name="SettingsPage_LocalGatewaySetup_Header.Text" xml:space="preserve">
     <value>設定或重新設定本機閘道</value>
   </data>
@@ -4626,21 +4984,18 @@
   <data name="DiagnosticsBundleDialog_ReviewBeforeSharing.Title" xml:space="preserve">
     <value>分享前請檢閱</value>
   </data>
-  <data name="DiagnosticsBundleDialog_ReviewBeforeSharing.Message" xml:space="preserve">
-    <value>套件產生器會排除敏感權杖、命令引數、內容與錄製。</value>
-  </data>
   <data name="HubWindow_Disconnected.Text" xml:space="preserve">
     <value>已中斷連線</value>
   </data>
-  <data name="HubWindow_Op.Text" xml:space="preserve">
-    <value>操作</value>
-  </data>
-  <data name="HubWindow_Node.Text" xml:space="preserve">
-    <value>節點</value>
-  </data>
   <data name="HubWindow_Advanced.Content" xml:space="preserve">
     <value>進階</value>
   </data>
+  <data name="DiagnosticsBundleDialog_ReviewBeforeSharingMessage.Text" xml:space="preserve">
+    <value>記錄尾端會經過清理並截斷。敏感權杖、內容、錄製資料與原始設定檔會被排除。分享前請先檢查。</value>
+  </data>
+  <data name="DiagnosticsBundleDialog_ReviewBeforeSharingTitle.Text" xml:space="preserve">
+    <value>分享前請檢查</value>
+  </data>
   <data name="AgentEventsPage_LiveText.Text" xml:space="preserve">
     <value>即時</value>
   </data>
@@ -4668,9 +5023,6 @@
   <data name="VoiceSettingsPage_PreviewVoice.Text" xml:space="preserve">
     <value>語音預覽</value>
   </data>
-  <data name="HubWindow_TitleStatus.Text" xml:space="preserve">
-    <value>已中斷連線</value>
-  </data>
   <data name="SandboxPage_GatewayCommandsNote.Text" xml:space="preserve">
     <value>代理直接在閘道上執行的命令不受此限制。如果閘道在此電腦上，它們仍可能存取您的 Windows 檔案、剪貼簿和網路——請檢查閘道的設定。</value>
   </data>
@@ -4692,6 +5044,60 @@
   <data name="CronPage_Running" xml:space="preserve">
     <value>正在執行...</value>
   </data>
+  <data name="CronPage_CompletedOneTimeJobTooltip" xml:space="preserve">
+    <value>一次性作業已完成</value>
+  </data>
+  <data name="CronPage_EnableJobTooltip" xml:space="preserve">
+    <value>啟用作業</value>
+  </data>
+  <data name="CronPage_DisableJobTooltip" xml:space="preserve">
+    <value>停用作業</value>
+  </data>
+  <data name="CronPage_FullResponse" xml:space="preserve">
+    <value>完整回覆</value>
+  </data>
+  <data name="CronPage_OpenChat" xml:space="preserve">
+    <value>開啟聊天</value>
+  </data>
+  <data name="CronPage_RunNow" xml:space="preserve">
+    <value>立即執行</value>
+  </data>
+  <data name="CronPage_EditAction" xml:space="preserve">
+    <value>編輯</value>
+  </data>
+  <data name="CronPage_HistoryAction" xml:space="preserve">
+    <value>歷史記錄</value>
+  </data>
+  <data name="CronPage_RemoveAction" xml:space="preserve">
+    <value>移除</value>
+  </data>
+  <data name="CronPage_RunningBadge" xml:space="preserve">
+    <value>正在執行</value>
+  </data>
+  <data name="CronPage_RunHistory" xml:space="preserve">
+    <value>執行歷史記錄</value>
+  </data>
+  <data name="CronPage_RunHistoryShowing" xml:space="preserve">
+    <value>執行歷史記錄 - 正在顯示 {0}/{1}</value>
+  </data>
+  <data name="CronPage_RunHistoryCount" xml:space="preserve">
+    <value>執行歷史記錄 - {0} 次執行</value>
+  </data>
+  <data name="CronPage_LoadingRunHistory" xml:space="preserve">
+    <value>正在載入執行歷史記錄...</value>
+  </data>
+  <data name="CronPage_NoRunHistoryAvailable" xml:space="preserve">
+    <value>沒有可用的執行歷史記錄。</value>
+  </data>
+  <data name="CronPage_LoadOlderRuns" xml:space="preserve">
+    <value>載入較早的執行（還有 {0} 個）...</value>
+  </data>
+  <data name="CronPage_LoadMoreRuns" xml:space="preserve">
+    <value>載入更多執行...</value>
+  </data>
+  <data name="CronPage_Loading" xml:space="preserve">
+    <value>正在載入...</value>
+  </data>
   <data name="CronPage_SaveChanges" xml:space="preserve">
     <value>儲存變更</value>
   </data>
@@ -4885,6 +5291,18 @@
   <data name="ConnectionPage_NodeModeDisabledText" xml:space="preserve">
     <value>節點模式已停用</value>
   </data>
+  <data name="ConnectionPage_NodeStarting" xml:space="preserve">
+    <value>Node 正在啟動…</value>
+  </data>
+  <data name="ConnectionPage_NodeMcpOnly" xml:space="preserve">
+    <value>正在本機提供功能（僅 MCP）</value>
+  </data>
+  <data name="ConnectionPage_NodeMcpOnlyReachable" xml:space="preserve">
+    <value>本機 MCP 用戶端可透過 {0} 存取</value>
+  </data>
+  <data name="ConnectionPage_NodeMcpError" xml:space="preserve">
+    <value>本機 MCP 伺服器啟動失敗</value>
+  </data>
   <data name="ConnectionPage_NodeBodyNoCapabilities" xml:space="preserve">
     <value>未啟用任何功能。請在權限中選擇要共用的內容。</value>
   </data>
@@ -4927,6 +5345,9 @@
   <data name="ConnectionPage_OpenDashboard" xml:space="preserve">
     <value>開啟儀表板</value>
   </data>
+  <data name="ConnectionPage_GatewayOptionsA11y" xml:space="preserve">
+    <value>{0} 的選項</value>
+  </data>
   <data name="ConnectionPage_DisconnectAction" xml:space="preserve">
     <value>中斷連線</value>
   </data>
@@ -5131,9 +5552,6 @@
   <data name="ConnectionPage_CancelAction" xml:space="preserve">
     <value>取消</value>
   </data>
-  <data name="ConnectionPage_ConnectFailed" xml:space="preserve">
-    <value>連線失敗</value>
-  </data>
   <data name="ConnectionPage_GatewayConnectionFailed" xml:space="preserve">
     <value>閘道連線失敗。</value>
   </data>
@@ -5164,31 +5582,6 @@
   <data name="ConnectionPage_DenyPairingRequest" xml:space="preserve">
     <value>拒絕配對請求</value>
   </data>
-  <data name="ConnectionPage_AuthGuidanceToken" xml:space="preserve">
-    <value>{0}
-
-從新增閘道流程中貼上新的設定碼。</value>
-  </data>
-  <data name="ConnectionPage_AuthGuidancePairing" xml:space="preserve">
-    <value>{0}
-
-您的裝置需要在閘道主機上獲得核准。</value>
-  </data>
-  <data name="ConnectionPage_AuthGuidancePassword" xml:space="preserve">
-    <value>{0}
-
-此閘道需要密碼驗證。</value>
-  </data>
-  <data name="ConnectionPage_AuthGuidanceSignature" xml:space="preserve">
-    <value>{0}
-
-閘道可能需要不同版本的認證協定。</value>
-  </data>
-  <data name="ConnectionPage_AuthGuidanceDefault" xml:space="preserve">
-    <value>{0}
-
-請檢查您的連線設定並重試。</value>
-  </data>
   <data name="ConnectionPage_AuthModeBootstrap" xml:space="preserve">
     <value>引導</value>
   </data>
@@ -5271,7 +5664,7 @@
     <value>連結您的 WhatsApp 手機</value>
   </data>
   <data name="ChannelsPage_GuideWhatsAppStep1" xml:space="preserve">
-    <value>點擊下方「連結」區段中的 &quot;Show QR&quot;。</value>
+    <value>點擊下方「連結」區段中的 "Show QR"。</value>
   </data>
   <data name="ChannelsPage_GuideWhatsAppStep2" xml:space="preserve">
     <value>在手機上：WhatsApp → 設定 → 已連結裝置 → 連結裝置。</value>
@@ -5283,7 +5676,7 @@
     <value>連結您的 Signal 手機</value>
   </data>
   <data name="ChannelsPage_GuideSignalStep1" xml:space="preserve">
-    <value>點擊下方「連結」區段中的 &quot;Show QR&quot;。</value>
+    <value>點擊下方「連結」區段中的 "Show QR"。</value>
   </data>
   <data name="ChannelsPage_GuideSignalStep2" xml:space="preserve">
     <value>在手機上：Signal → 設定 → 已連結裝置 → 連結新裝置。</value>
@@ -5304,7 +5697,7 @@
     <value>將權杖貼到下方的設定表單中。</value>
   </data>
   <data name="ChannelsPage_GuideTelegramStep4" xml:space="preserve">
-    <value>點擊 &quot;Save and start&quot;。頻道將自動啟動。</value>
+    <value>點擊 "Save and start"。頻道將自動啟動。</value>
   </data>
   <data name="ChannelsPage_GuideDiscordHeadline" xml:space="preserve">
     <value>透過 webhook 連接 Discord</value>
@@ -5313,13 +5706,13 @@
     <value>開啟您的 Discord 伺服器設定 → 整合 → Webhooks。</value>
   </data>
   <data name="ChannelsPage_GuideDiscordStep2" xml:space="preserve">
-    <value>點擊 &quot;New Webhook&quot;，為其命名，然後複製 webhook URL。</value>
+    <value>點擊 "New Webhook"，為其命名，然後複製 webhook URL。</value>
   </data>
   <data name="ChannelsPage_GuideDiscordStep3" xml:space="preserve">
     <value>將 URL 貼到下方的設定表單中。</value>
   </data>
   <data name="ChannelsPage_GuideDiscordStep4" xml:space="preserve">
-    <value>點擊 &quot;Save and start&quot;。</value>
+    <value>點擊 "Save and start"。</value>
   </data>
   <data name="ChannelsPage_GuideGoogleChatHeadline" xml:space="preserve">
     <value>透過 webhook 連接 Google Chat</value>
@@ -5334,7 +5727,7 @@
     <value>將 URL 貼到下方的設定表單中。</value>
   </data>
   <data name="ChannelsPage_GuideGoogleChatStep4" xml:space="preserve">
-    <value>點擊 &quot;Save and start&quot;。</value>
+    <value>點擊 "Save and start"。</value>
   </data>
   <data name="ChannelsPage_GuideSlackHeadline" xml:space="preserve">
     <value>透過應用程式連接 Slack</value>
@@ -5349,7 +5742,7 @@
     <value>將兩者貼到下方的設定表單中。</value>
   </data>
   <data name="ChannelsPage_GuideSlackStep4" xml:space="preserve">
-    <value>點擊 &quot;Save and start&quot;。</value>
+    <value>點擊 "Save and start"。</value>
   </data>
   <data name="ChannelsPage_GuideNostrHeadline" xml:space="preserve">
     <value>透過中繼連接 Nostr</value>
@@ -5364,7 +5757,7 @@
     <value>將兩者貼到下方的設定表單中。</value>
   </data>
   <data name="ChannelsPage_GuideNostrStep4" xml:space="preserve">
-    <value>點擊 &quot;Save and start&quot;。</value>
+    <value>點擊 "Save and start"。</value>
   </data>
   <data name="ChannelsPage_GuideIMessageHeadline" xml:space="preserve">
     <value>iMessage 僅適用於 macOS</value>
@@ -5382,10 +5775,10 @@
     <value>連接此頻道</value>
   </data>
   <data name="ChannelsPage_GuideGenericStep1" xml:space="preserve">
-    <value>&quot;{0}&quot; 是一個外掛頻道。請參閱其文件以了解所需欄位。</value>
+    <value>"{0}" 是一個外掛頻道。請參閱其文件以了解所需欄位。</value>
   </data>
   <data name="ChannelsPage_GuideGenericStep2" xml:space="preserve">
-    <value>使用下方「設定」區段中的 &quot;Open Config page&quot; 在 channels.{0} 下新增設定。</value>
+    <value>使用下方「設定」區段中的 "Open Config page" 在 channels.{0} 下新增設定。</value>
   </data>
   <data name="ChannelsPage_GuideGenericStep3" xml:space="preserve">
     <value>儲存設定；OpenClaw 將自動啟動頻道。</value>
@@ -5603,12 +5996,6 @@
   <data name="Command_GoToDiagnostics_Title" xml:space="preserve">
     <value>Go to Diagnostics</value>
   </data>
-  <data name="Command_GoToInfo_Subtitle" xml:space="preserve">
-    <value>About this app</value>
-  </data>
-  <data name="Command_GoToInfo_Title" xml:space="preserve">
-    <value>Go to Info</value>
-  </data>
   <data name="Command_GoToNotifications_Subtitle" xml:space="preserve">
     <value>檢閱作用中的應用程式通知</value>
   </data>
@@ -5736,13 +6123,358 @@
     <value>Waiting for gateway health</value>
   </data>
   <data name="ConfigPage_CheckingConfigPermissions" xml:space="preserve">
-    <value>Checking config permissions</value>
+    <value>正在檢查設定權限</value>
   </data>
   <data name="ConfigPage_ConfigIsReadOnly" xml:space="preserve">
-    <value>Config is read-only</value>
+    <value>設定為唯讀</value>
   </data>
   <data name="ConfigPage_ConfigUnavailable" xml:space="preserve">
-    <value>Config unavailable</value>
+    <value>設定無法使用</value>
+  </data>
+  <data name="ConfigPage_EditingPathFormat" xml:space="preserve">
+    <value>正在透過架構引導表單編輯 {0}。</value>
+  </data>
+  <data name="ConfigPage_RenderConfigUnavailableTitle" xml:space="preserve">
+    <value>設定無法使用</value>
+  </data>
+  <data name="ConfigPage_RenderConfigUnavailableMessage" xml:space="preserve">
+    <value>無法呈現閘道設定。請重新整理後再試一次。</value>
+  </data>
+  <data name="ConfigPage_RenderSchemaUnavailableTitle" xml:space="preserve">
+    <value>架構無法使用</value>
+  </data>
+  <data name="ConfigPage_RenderSchemaUnavailableMessage" xml:space="preserve">
+    <value>無法呈現閘道架構。原始 JSON 仍可作為唯讀預覽使用。</value>
+  </data>
+  <data name="ConfigPage_StatusGatewayRestartingTitle" xml:space="preserve">
+    <value>閘道正在重新啟動</value>
+  </data>
+  <data name="ConfigPage_StatusGatewayRestartingMessage" xml:space="preserve">
+    <value>正在儲存變更。閘道正在重新啟動，並會自動重新連線。</value>
+  </data>
+  <data name="ConfigPage_StatusNoChangesTitle" xml:space="preserve">
+    <value>沒有變更</value>
+  </data>
+  <data name="ConfigPage_StatusNoChangesMessage" xml:space="preserve">
+    <value>沒有需要儲存的內容。</value>
+  </data>
+  <data name="ConfigPage_StatusFixValidationErrorsTitle" xml:space="preserve">
+    <value>修正驗證錯誤</value>
+  </data>
+  <data name="ConfigPage_StatusValidationErrorMessageFormat" xml:space="preserve">
+    <value>{0}：{1}</value>
+  </data>
+  <data name="ConfigPage_StatusNotConnectedTitle" xml:space="preserve">
+    <value>未連線</value>
+  </data>
+  <data name="ConfigPage_StatusNotConnectedMessage" xml:space="preserve">
+    <value>儲存設定前請先連線到閘道。</value>
+  </data>
+  <data name="ConfigPage_StatusReadOnlyMessage" xml:space="preserve">
+    <value>此操作員權杖沒有 operator.write 權限，因此無法儲存設定變更。</value>
+  </data>
+  <data name="ConfigPage_StatusConfigNotLoadedTitle" xml:space="preserve">
+    <value>設定未載入</value>
+  </data>
+  <data name="ConfigPage_StatusConfigNotLoadedMessage" xml:space="preserve">
+    <value>儲存前請重新整理閘道設定。</value>
+  </data>
+  <data name="ConfigPage_StatusSavingConfigTitle" xml:space="preserve">
+    <value>正在儲存設定…</value>
+  </data>
+  <data name="ConfigPage_StatusSavingConfigMessageFormat" xml:space="preserve">
+    <value>正在將 {0} 項變更寫入閘道。</value>
+  </data>
+  <data name="ConfigPage_StatusStaleConfigTitle" xml:space="preserve">
+    <value>閘道設定已在其他位置變更</value>
+  </data>
+  <data name="ConfigPage_StatusStaleConfigMessageFormat" xml:space="preserve">
+    <value>您的編輯已保留。正在重新整理最新設定；請檢閱表單並再次嘗試儲存。詳細資料：{0}</value>
+  </data>
+  <data name="ConfigPage_StatusStaleConfigDefaultDetail" xml:space="preserve">
+    <value>過期的設定雜湊</value>
+  </data>
+  <data name="ConfigPage_StatusSaveFailedTitle" xml:space="preserve">
+    <value>儲存失敗</value>
+  </data>
+  <data name="ConfigPage_StatusSaveRejectedMessage" xml:space="preserve">
+    <value>閘道拒絕了設定更新。您的變更已保留。</value>
+  </data>
+  <data name="ConfigPage_StatusSaveExceptionMessageFormat" xml:space="preserve">
+    <value>{0} 您的變更已保留。</value>
+  </data>
+  <data name="ConfigPage_SaveStatusCheckingConfigPermissions" xml:space="preserve">
+    <value>正在檢查設定權限…</value>
+  </data>
+  <data name="ConfigPage_SaveStatusRefreshing" xml:space="preserve">
+    <value>正在重新整理…</value>
+  </data>
+  <data name="ConfigPage_StatusChangesDiscardedTitle" xml:space="preserve">
+    <value>變更已捨棄</value>
+  </data>
+  <data name="ConfigPage_StatusChangesDiscardedMessage" xml:space="preserve">
+    <value>表單已回復為上次從閘道載入的設定。</value>
+  </data>
+  <data name="ConfigPage_FullConfig" xml:space="preserve">
+    <value>完整設定</value>
+  </data>
+  <data name="ConfigPage_StatusSectionResetTitle" xml:space="preserve">
+    <value>區段已重設</value>
+  </data>
+  <data name="ConfigPage_StatusSectionResetMessageFormat" xml:space="preserve">
+    <value>{0} 已回復為上次載入的閘道值。</value>
+  </data>
+  <data name="ConfigPage_StatusCopiedJsonDiffTitle" xml:space="preserve">
+    <value>已複製 JSON 差異</value>
+  </data>
+  <data name="ConfigPage_StatusCopiedJsonDiffMessage" xml:space="preserve">
+    <value>所選區段的差異已複製到剪貼簿。</value>
+  </data>
+  <data name="ConfigPage_StatusGatewayReconnectedTitle" xml:space="preserve">
+    <value>閘道已重新連線</value>
+  </data>
+  <data name="ConfigPage_StatusGatewayReconnectedRefreshingMessage" xml:space="preserve">
+    <value>設定已儲存，閘道連線已恢復。正在重新整理最新設定。</value>
+  </data>
+  <data name="ConfigPage_StatusGatewayReconnectedLoadedMessage" xml:space="preserve">
+    <value>設定已儲存，且已載入最新的閘道設定。</value>
+  </data>
+  <data name="ConfigPage_StatusGatewayStillReconnectingTitle" xml:space="preserve">
+    <value>閘道仍在重新連線</value>
+  </data>
+  <data name="ConfigPage_StatusGatewayStillReconnectingMessage" xml:space="preserve">
+    <value>設定儲存已被接受，但閘道尚未重新連線。您可以保持此頁面開啟，或使用「連線」檢查狀態。</value>
+  </data>
+  <data name="ConfigPage_CheckingConfigPermissionsMessage" xml:space="preserve">
+    <value>正在等待閘道回報此操作員的權限。</value>
+  </data>
+  <data name="ConfigPage_ConfigUnavailableMessage" xml:space="preserve">
+    <value>此操作員權杖缺少 operator.read 權限，因此無法在此載入閘道設定。</value>
+  </data>
+  <data name="ConfigPage_ConfigIsReadOnlyMessage" xml:space="preserve">
+    <value>此操作員權杖可以讀取設定，但缺少 operator.write 權限。您可以檢查並驗證草稿，但「儲存」已停用。</value>
+  </data>
+  <data name="ConfigPage_MetaNoUnsavedChanges" xml:space="preserve">
+    <value>沒有未儲存的變更。</value>
+  </data>
+  <data name="ConfigPage_MetaUnsavedChangesFormat" xml:space="preserve">
+    <value>{0} 項未儲存的變更</value>
+  </data>
+  <data name="ConfigPage_MetaUnsavedChangesWithValidationFormat" xml:space="preserve">
+    <value>{0} 項未儲存的變更 · {1} 個驗證問題</value>
+  </data>
+  <data name="ConfigPage_SaveStatusSaving" xml:space="preserve">
+    <value>正在儲存…</value>
+  </data>
+  <data name="ConfigPage_SaveStatusGatewayRestarting" xml:space="preserve">
+    <value>閘道正在重新啟動…</value>
+  </data>
+  <data name="ConfigPage_SaveStatusConnectToGateway" xml:space="preserve">
+    <value>連線到閘道以編輯</value>
+  </data>
+  <data name="ConfigPage_SaveStatusCheckingPermissions" xml:space="preserve">
+    <value>正在檢查權限…</value>
+  </data>
+  <data name="ConfigPage_SaveStatusMissingRead" xml:space="preserve">
+    <value>設定無法使用：缺少 operator.read</value>
+  </data>
+  <data name="ConfigPage_SaveStatusReadOnlyMissingWrite" xml:space="preserve">
+    <value>唯讀：缺少 operator.write</value>
+  </data>
+  <data name="ConfigPage_SaveStatusFixValidationBeforeSaving" xml:space="preserve">
+    <value>儲存前請修正驗證錯誤</value>
+  </data>
+  <data name="ConfigPage_SaveStatusUnsavedChanges" xml:space="preserve">
+    <value>未儲存的變更</value>
+  </data>
+  <data name="ConfigPage_SaveStatusNoUnsavedChanges" xml:space="preserve">
+    <value>沒有未儲存的變更</value>
+  </data>
+  <data name="ConfigPage_AccessDisconnected" xml:space="preserve">
+    <value>已中斷連線</value>
+  </data>
+  <data name="ConfigPage_AccessChecking" xml:space="preserve">
+    <value>正在檢查存取權</value>
+  </data>
+  <data name="ConfigPage_AccessNoRead" xml:space="preserve">
+    <value>沒有設定讀取存取權</value>
+  </data>
+  <data name="ConfigPage_AccessReadOnly" xml:space="preserve">
+    <value>唯讀存取權</value>
+  </data>
+  <data name="ConfigPage_AccessReadWrite" xml:space="preserve">
+    <value>讀取/寫入存取權</value>
+  </data>
+  <data name="ConfigPage_AccessUnknown" xml:space="preserve">
+    <value>未知存取權</value>
+  </data>
+  <data name="ConfigPage_AccessChangesFormat" xml:space="preserve">
+    <value>{0} 項變更</value>
+  </data>
+  <data name="ConfigPage_AccessValidationClean" xml:space="preserve">
+    <value>本機驗證通過</value>
+  </data>
+  <data name="ConfigPage_AccessValidationIssuesFormat" xml:space="preserve">
+    <value>{0} 個驗證問題</value>
+  </data>
+  <data name="ConfigPage_AccessSummaryFormat" xml:space="preserve">
+    <value>{0} · {1} · {2}</value>
+  </data>
+  <data name="DebugPage_NoGatewayConfigured" xml:space="preserve">
+    <value>未設定閘道</value>
+  </data>
+  <data name="DebugPage_StatusConnectedFormat" xml:space="preserve">
+    <value>OpenClaw 已連線到 {0}。</value>
+  </data>
+  <data name="DebugPage_StatusConnectingFormat" xml:space="preserve">
+    <value>正在連線到 {0}…</value>
+  </data>
+  <data name="DebugPage_StatusDisconnectedFormat" xml:space="preserve">
+    <value>未連線。閘道：{0}。</value>
+  </data>
+  <data name="DebugPage_StatusErrorFormat" xml:space="preserve">
+    <value>上次閘道：{0}。請查看事件時間軸。</value>
+  </data>
+  <data name="DebugPage_StatusGatewayFormat" xml:space="preserve">
+    <value>閘道：{0}。</value>
+  </data>
+  <data name="DebugPage_RecentLogTitle" xml:space="preserve">
+    <value>最近記錄</value>
+  </data>
+  <data name="DebugPage_RecentLogCaptionFormat" xml:space="preserve">
+    <value>{0} 的最後 200 行。嚴重性會從 [info]/[warn]/[error] 標籤解析。</value>
+  </data>
+  <data name="DebugPage_CopyFeedbackFormat" xml:space="preserve">
+    <value>{0} 已複製到剪貼簿。</value>
+  </data>
+  <data name="SandboxPage_StatusUnavailableTitle" xml:space="preserve">
+    <value>節點沙箱無法使用 — 回退到主機</value>
+  </data>
+  <data name="SandboxPage_StatusUnavailableSubtext" xml:space="preserve">
+    <value>此電腦上無法使用隔離，因此代理程式啟動的命令會在主機上執行，且沒有沙箱保護。</value>
+  </data>
+  <data name="SandboxPage_StatusUnavailableBlockedTitle" xml:space="preserve">
+    <value>節點沙箱無法使用 — 命令已封鎖</value>
+  </data>
+  <data name="SandboxPage_StatusUnavailableBlockedSubtext" xml:space="preserve">
+    <value>此電腦上無法使用隔離，且已啟用嚴格回退封鎖，因此代理程式啟動的命令會被封鎖。</value>
+  </data>
+  <data name="SandboxPage_StatusUnavailableOffTitle" xml:space="preserve">
+    <value>節點沙箱已關閉 — 主機執行</value>
+  </data>
+  <data name="SandboxPage_StatusUnavailableOffSubtext" xml:space="preserve">
+    <value>隔離無法使用且節點沙箱已關閉，因此代理程式啟動的命令會在主機上執行，且沒有沙箱保護。</value>
+  </data>
+  <data name="SandboxPage_StatusOnTitle" xml:space="preserve">
+    <value>節點沙箱已開啟</value>
+  </data>
+  <data name="SandboxPage_StatusOnSubtext" xml:space="preserve">
+    <value>代理程式在此電腦上執行的程式會被隔離。</value>
+  </data>
+  <data name="SandboxPage_StatusOffTitle" xml:space="preserve">
+    <value>節點沙箱已關閉 — 高風險</value>
+  </data>
+  <data name="SandboxPage_StatusOffSubtext" xml:space="preserve">
+    <value>代理程式在此電腦上執行的程式不會被隔離。</value>
+  </data>
+  <data name="SandboxPage_UnavailableDefaultReason" xml:space="preserve">
+    <value>此電腦上沒有可用的 MXC 沙箱基元。</value>
+  </data>
+  <data name="SandboxPage_ProbeErrorReason" xml:space="preserve">
+    <value>無法檢查沙箱可用性。</value>
+  </data>
+  <data name="SandboxPage_UnavailableBehaviorHostFallback" xml:space="preserve">
+    <value>在沙箱無法使用期間，命令將在主機上執行，且沒有沙箱保護。</value>
+  </data>
+  <data name="SandboxPage_UnavailableBehaviorBlocked" xml:space="preserve">
+    <value>由於已啟用嚴格回退封鎖，沙箱無法使用期間命令會被封鎖。</value>
+  </data>
+  <data name="SandboxPage_ProbeErrorTitle" xml:space="preserve">
+    <value>無法驗證沙箱可用性</value>
+  </data>
+  <data name="SandboxPage_ProbeErrorMessageFormat" xml:space="preserve">
+    <value>{0}
+
+{1} 沙箱功能檢查未完成。這通常是暫時性的（檢查緩慢或遭封鎖）— 請重試；如果問題仍然存在，請檢查安全性軟體是否封鎖了 wxc-exec。</value>
+  </data>
+  <data name="SandboxPage_Retry" xml:space="preserve">
+    <value>重試</value>
+  </data>
+  <data name="SandboxPage_WindowsUnsupportedTitle" xml:space="preserve">
+    <value>您的 Windows 版本尚不支援沙箱</value>
+  </data>
+  <data name="SandboxPage_WindowsUnsupportedMessageFormat" xml:space="preserve">
+    <value>{0}
+
+{1} 沙箱需要包含 AppContainer 基元的較新 Windows 版本。請安裝最新 Windows 更新（或加入 Windows 測試人員計畫以取得最新版本）以啟用隔離。</value>
+  </data>
+  <data name="SandboxPage_OpenWindowsUpdate" xml:space="preserve">
+    <value>開啟 Windows Update</value>
+  </data>
+  <data name="SandboxPage_ComponentsMissingTitle" xml:space="preserve">
+    <value>缺少沙箱元件</value>
+  </data>
+  <data name="SandboxPage_ComponentsMissingMessageFormat" xml:space="preserve">
+    <value>{0}
+
+找不到 wxc-exec 二進位檔。{1} 如果這是開發人員組建，請建置托盤應用程式，讓 wxc-exec.exe 複製到輸出資料夾。否則請重新安裝伴侶應用程式以還原沙箱。</value>
+  </data>
+  <data name="SandboxPage_ShowInstallInstructions" xml:space="preserve">
+    <value>顯示安裝指示</value>
+  </data>
+  <data name="SandboxPage_UnavailableTitle" xml:space="preserve">
+    <value>沙箱無法使用 — 回退到主機</value>
+  </data>
+  <data name="SandboxPage_UnavailableBlockedTitle" xml:space="preserve">
+    <value>沙箱無法使用 — 命令已封鎖</value>
+  </data>
+  <data name="SettingsPage_LocalGatewayRemovedTitle" xml:space="preserve">
+    <value>本機閘道已移除</value>
+  </data>
+  <data name="SettingsPage_LocalGatewayRemovedMessage" xml:space="preserve">
+    <value>設定已重設；您可以從托盤功能表重新執行設定。</value>
+  </data>
+  <data name="SettingsPage_LocalGatewayRemovalErrorsMessage" xml:space="preserve">
+    <value>移除已完成但發生錯誤。請查看記錄以取得詳細資料。</value>
+  </data>
+  <data name="SettingsPage_LocalGatewayRemovalCancelledTitle" xml:space="preserve">
+    <value>移除已取消</value>
+  </data>
+  <data name="SettingsPage_LocalGatewayRemovalCancelledMessage" xml:space="preserve">
+    <value>閘道可能處於部分移除狀態。請查看記錄或重試。</value>
+  </data>
+  <data name="SettingsPage_ViewLogs" xml:space="preserve">
+    <value>檢視記錄</value>
+  </data>
+  <data name="SettingsPage_LocalGatewayRemovalFailedTitle" xml:space="preserve">
+    <value>移除失敗</value>
+  </data>
+  <data name="SettingsPage_RemoveLocalGatewayButton" xml:space="preserve">
+    <value>移除本機閘道</value>
+  </data>
+  <data name="SettingsPage_RemovingDistro" xml:space="preserve">
+    <value>正在移除散發套件…</value>
+  </data>
+  <data name="SettingsPage_RemovingLocalGatewayMessage" xml:space="preserve">
+    <value>正在移除本機閘道。這可能需要 10–30 秒…</value>
+  </data>
+  <data name="CronPage_NextWakeFormat" xml:space="preserve">
+    <value>· 下次喚醒：{0}</value>
+  </data>
+  <data name="ChatWindow_UnableToLoadChatCredentials" xml:space="preserve">
+    <value>無法載入聊天。閘道 URL 或權杖無法使用。</value>
+  </data>
+  <data name="ChatWindow_UnableToLoadChatRetryFormat" xml:space="preserve">
+    <value>無法載入聊天。請重試。({0})</value>
+  </data>
+  <data name="ChatWindow_WebViewFailedFormat" xml:space="preserve">
+    <value>WebView2 失敗：{0}</value>
+  </data>
+  <data name="CanvasWindow_WebViewInitFailedFormat" xml:space="preserve">
+    <value>無法初始化 WebView2：{0}</value>
+  </data>
+  <data name="CanvasWindow_NavigationFailedFormat" xml:space="preserve">
+    <value>瀏覽失敗：{0}</value>
   </data>
   <data name="ConnectionPage_GatewayHostControlsDescription_Format" xml:space="preserve">
     <value>Open a shell or manage the local gateway service in {0}.</value>
@@ -5751,7 +6483,16 @@
     <value>Job completed</value>
   </data>
   <data name="CronPage_JobCompletedRanSuccessfully" xml:space="preserve">
-    <value>&quot;{0}&quot; ran successfully and was removed.</value>
+    <value>"{0}" ran successfully and was removed.</value>
+  </data>
+  <data name="CronPage_RunNotStarted" xml:space="preserve">
+    <value>執行未啟動</value>
+  </data>
+  <data name="CronPage_RunNotStartedGeneric" xml:space="preserve">
+    <value>{0} 未啟動。</value>
+  </data>
+  <data name="CronPage_RunNotStartedWithReason" xml:space="preserve">
+    <value>{0} 未啟動：{1}</value>
   </data>
   <data name="GatewayHostAccess_NoTerminalAccess" xml:space="preserve">
     <value>This gateway does not have WSL or SSH terminal access.</value>
@@ -5819,6 +6560,24 @@
   <data name="ConnectionPage_NodeSurfaceNone" xml:space="preserve">
     <value>none</value>
   </data>
+  <data name="ConnectionPage_NodeTechnicalDetails.Text" xml:space="preserve">
+    <value>Show technical details</value>
+  </data>
+  <data name="ConnectionPage_NodePillState_Active" xml:space="preserve">
+    <value>Sharing now</value>
+  </data>
+  <data name="ConnectionPage_NodePillState_Pending" xml:space="preserve">
+    <value>Enabled, not active yet</value>
+  </data>
+  <data name="ConnectionPage_NodePillState_Off" xml:space="preserve">
+    <value>Off</value>
+  </data>
+  <data name="ConnectionPage_NodeCap_Device" xml:space="preserve">
+    <value>Device info</value>
+  </data>
+  <data name="ConnectionPage_NodeCap_System" xml:space="preserve">
+    <value>System access</value>
+  </data>
   <data name="ConnectionPage_NodeEffectiveCapabilities" xml:space="preserve">
     <value>Approved/effective capabilities: {0}</value>
   </data>
@@ -5837,4 +6596,223 @@
   <data name="ConnectionPage_NodePendingDeclaredPermissions" xml:space="preserve">
     <value>Pending declared permissions: {0}</value>
   </data>
+  <data name="ConnectionPage_AdviceCleartextTitle" xml:space="preserve">
+    <value>未加密的連線</value>
+  </data>
+  <data name="ConnectionPage_AdviceCleartextMessage" xml:space="preserve">
+    <value>此遠端 gateway 使用 ws:// — 您的 token 將以明文傳送。請使用 wss://（TLS）、SSH 通道或受信任的 Proxy / Tailscale。</value>
+  </data>
+  <data name="ConnectionPage_AdviceSecureTitle" xml:space="preserve">
+    <value>已加密 (TLS)</value>
+  </data>
+  <data name="ConnectionPage_AdviceSecureMessage" xml:space="preserve">
+    <value>此 gateway 使用 TLS。憑證驗證通過後，您的 token 在傳輸過程中受到保護。</value>
+  </data>
+  <data name="ConnectionPage_AdviceTunnelTitle" xml:space="preserve">
+    <value>SSH 通道</value>
+  </data>
+  <data name="ConnectionPage_AdviceTunnelMessage" xml:space="preserve">
+    <value>到此 gateway 的流量透過 SSH 通道加密。</value>
+  </data>
+  <data name="ConnectionPage_RecoveryHeaderTokenDrift" xml:space="preserve">
+    <value>重新配對此裝置：</value>
+  </data>
+  <data name="ConnectionPage_RecoveryHeaderScope" xml:space="preserve">
+    <value>升級此裝置的存取權限：</value>
+  </data>
+  <data name="ConnectionPage_RecoveryHeaderTls" xml:space="preserve">
+    <value>修復安全連線：</value>
+  </data>
+  <data name="ConnectionPage_RecoveryTokenDriftBullet1" xml:space="preserve">
+    <value>gateway 不再信任此裝置儲存的 token（它已被輪換或撤銷）。</value>
+  </data>
+  <data name="ConnectionPage_RecoveryTokenDriftBullet2" xml:space="preserve">
+    <value>從 gateway 主機取得新的設定代碼，並貼到下方以重新配對。</value>
+  </data>
+  <data name="ConnectionPage_RecoveryScopeBullet1" xml:space="preserve">
+    <value>此裝置已通過驗證，但缺少所需的 scope（例如 operator.admin 或 operator.pairing）。</value>
+  </data>
+  <data name="ConnectionPage_RecoveryScopeBullet2" xml:space="preserve">
+    <value>使用新的設定代碼重新配對以請求所需的 scope，或在 gateway 主機上核准更高的 scope。</value>
+  </data>
+  <data name="ConnectionPage_RecoveryTlsBullet1" xml:space="preserve">
+    <value>無法建立 gateway 的 TLS/安全傳輸。</value>
+  </data>
+  <data name="ConnectionPage_RecoveryTlsBullet2" xml:space="preserve">
+    <value>驗證 gateway 主機上的憑證，或透過 wss:// 或 SSH 通道連線。</value>
+  </data>
+  <data name="ConnectionPage_TokenOrPasswordHint.Text" xml:space="preserve">
+    <value>貼上共用 gateway token，或將其留空以使用設定代碼配對。</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpDirect.Text" xml:space="preserve">
+    <value>當 gateway 擁有受信任憑證時，連線到 wss:// 或 https://。憑證驗證通過後，您的 token 會在傳輸過程中加密。</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpTunnel.Text" xml:space="preserve">
+    <value>當 gateway 僅在 localhost 上接聽時，請展開下方的「使用 SSH 通道」。tray 會透過 SSH 轉發本機連接埠，使流量保持加密。</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpProxy.Text" xml:space="preserve">
+    <value>如果 Tailscale 或反向 Proxy 已加密路徑，則在該私人網路上使用一般 ws:// URL 即可。</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpAuth.Text" xml:space="preserve">
+    <value>貼上共用 token，或將其留空並使用設定代碼配對。重新配對也會升級此裝置的 scope。</value>
+  </data>
+  <data name="ConnectionPage_RecoveryHeaderRateLimited" xml:space="preserve">
+    <value>請稍後再重新連線：</value>
+  </data>
+  <data name="ConnectionPage_RecoveryRateLimitedBullet1" xml:space="preserve">
+    <value>gateway 在多次失敗嘗試後正在對此用戶端限速。</value>
+  </data>
+  <data name="ConnectionPage_RecoveryRateLimitedBullet2" xml:space="preserve">
+    <value>暫時停止重試，然後在修正 token、密碼或配對狀態後重新連線。</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpLink.Text" xml:space="preserve">
+    <value>如何連線到遠端 gateway？</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpTip.Title" xml:space="preserve">
+    <value>連線到遠端 gateway</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpDirectTitle.Text" xml:space="preserve">
+    <value>直連 (TLS)</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpTunnelTitle.Text" xml:space="preserve">
+    <value>SSH 通道</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpProxyTitle.Text" xml:space="preserve">
+    <value>受信任 Proxy / Tailscale</value>
+  </data>
+  <data name="ConnectionPage_RemoteSetupHelpAuthTitle.Text" xml:space="preserve">
+    <value>驗證</value>
+  </data>
+  <data name="HubWindow_StatusFlyout_Title.Text" xml:space="preserve">
+    <value>Connection</value>
+  </data>
+  <data name="HubWindow_StatusFlyout_OpenConnection.Content" xml:space="preserve">
+    <value>Open Connection</value>
+  </data>
+  <data name="HubWindow_StatusFlyout_GatewayLabel.Text" xml:space="preserve">
+    <value>Gateway</value>
+  </data>
+  <data name="HubWindow_StatusFlyout_Reconnect.Content" xml:space="preserve">
+    <value>Reconnect</value>
+  </data>
+  <data name="HubWindow_StatusFlyout_OperatorLabel.Text" xml:space="preserve">
+    <value>Operator</value>
+  </data>
+  <data name="HubWindow_StatusFlyout_NodeLabel.Text" xml:space="preserve">
+    <value>Node</value>
+  </data>
+  <data name="HubWindow_StatusFlyout_Approve.Content" xml:space="preserve">
+    <value>Approve…</value>
+  </data>
+  <data name="HubWindow_StatusPill_Tooltip" xml:space="preserve">
+    <value>Connection status</value>
+  </data>
+  <data name="HubWindow_Bell_Tooltip" xml:space="preserve">
+    <value>Notifications</value>
+  </data>
+  <data name="HubWindow_Pill_Ready" xml:space="preserve">
+    <value>Ready</value>
+  </data>
+  <data name="HubWindow_Pill_PairingRequired" xml:space="preserve">
+    <value>Pairing required</value>
+  </data>
+  <data name="HubWindow_Pill_Degraded" xml:space="preserve">
+    <value>Degraded</value>
+  </data>
+  <data name="HubWindow_Role_Off" xml:space="preserve">
+    <value>Off</value>
+  </data>
+  <data name="HubWindow_Role_PairingRequired" xml:space="preserve">
+    <value>Pairing required</value>
+  </data>
+  <data name="HubWindow_Role_PairingRejected" xml:space="preserve">
+    <value>Pairing rejected</value>
+  </data>
+  <data name="HubWindow_Role_RateLimited" xml:space="preserve">
+    <value>Rate limited</value>
+  </data>
+  <data name="HubWindow_Role_Disabled" xml:space="preserve">
+    <value>Disabled</value>
+  </data>
+  <data name="NotificationsFlyout_ClearAll.Content" xml:space="preserve">
+    <value>Clear all</value>
+  </data>
+  <data name="NotificationsFlyout_EmptyTitle.Text" xml:space="preserve">
+    <value>No notifications</value>
+  </data>
+  <data name="NotificationsFlyout_OpenPage.Content" xml:space="preserve">
+    <value>Open notifications</value>
+  </data>
+  <data name="NotificationsFlyout_ActiveCountFormat" xml:space="preserve">
+    <value>{0} active</value>
+  </data>
+  <data name="HubWindow_Role_PermissionsIncomplete" xml:space="preserve">
+    <value>Permissions incomplete</value>
+  </data>
+  <data name="SettingsPage_About.Text" xml:space="preserve">
+    <value>About</value>
+  </data>
+  <data name="SettingsPage_GatewayInfoExpander.Header" xml:space="preserve">
+    <value>Gateway info</value>
+  </data>
+  <data name="SettingsPage_GatewayInfoLabel_Version.Text" xml:space="preserve">
+    <value>Version</value>
+  </data>
+  <data name="SettingsPage_GatewayInfoLabel_Protocol.Text" xml:space="preserve">
+    <value>Protocol</value>
+  </data>
+  <data name="SettingsPage_GatewayInfoLabel_AuthMode.Text" xml:space="preserve">
+    <value>Auth mode</value>
+  </data>
+  <data name="SettingsPage_GatewayInfoLabel_Uptime.Text" xml:space="preserve">
+    <value>Uptime</value>
+  </data>
+  <data name="PermissionsPage_NewRuleAction.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>規則動作</value>
+  </data>
+  <data name="SandboxPage_UnavailablePrimaryButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>沙箱動作</value>
+  </data>
+  <data name="SandboxPage_PresetLockedButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>鎖定預設：無網際網路、無剪貼簿、無標準使用者資料夾</value>
+  </data>
+  <data name="SandboxPage_PresetBalancedButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>建議預設：啟用網際網路，文件、下載和桌面為唯讀</value>
+  </data>
+  <data name="SandboxPage_PresetPermissiveButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>未受保護預設：啟用網際網路，可讀寫文件、下載和桌面</value>
+  </data>
+  <data name="SandboxPage_DocsAccessCombo.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>文件存取層級</value>
+  </data>
+  <data name="SandboxPage_DownloadsAccessCombo.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>下載存取層級</value>
+  </data>
+  <data name="SandboxPage_DesktopAccessCombo.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>桌面存取層級</value>
+  </data>
+  <data name="SettingsPage_NotificationSoundComboBox.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>通知音效</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantRefreshButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>重新整理語音助理狀態</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStartButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>啟動語音助理</value>
+  </data>
+  <data name="VoiceSettingsPage_AssistantStopButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>停止語音助理</value>
+  </data>
+  <data name="VoiceSettingsPage_LanguageCombo.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>語音語言</value>
+  </data>
+  <data name="HubWindow_MainNavigation.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>主要導覽</value>
+  </data>
+  <data name="JsonPreviewSplitter.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>調整 JSON 預覽大小</value>
+  </data>
+  <data name="JsonPreviewSplitter.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.LocalizedControlType" xml:space="preserve">
+    <value>分隔線</value>
+  </data>
 </root>
diff --git a/src/OpenClaw.Tray.WinUI/THIRD_PARTY_NOTICES.md b/src/OpenClaw.Tray.WinUI/THIRD_PARTY_NOTICES.md
index 75e0eb92e..c7158b0db 100644
--- a/src/OpenClaw.Tray.WinUI/THIRD_PARTY_NOTICES.md
+++ b/src/OpenClaw.Tray.WinUI/THIRD_PARTY_NOTICES.md
@@ -4,14 +4,9 @@ The colorful sidebar SVG files in `Assets/SidebarIcons/` are derived from the
 **Fluent UI System Icons** project by Microsoft, color variant
 (20 selected icons from the full `fluent-color` set in the Iconify ecosystem).
 
-The app/tray/window lobster icon (`Assets/openclaw.ico`, plus the
-`Square*` / `StoreLogo` / `LockScreenLogo` PNG family) is derived from the
-**Fluent Emoji "Lobster"** 3D source already shipping at `Assets/Setup/Lobster.png`.
-
 - Upstream repositories:
   - <https://github.com/microsoft/fluentui-system-icons> (sidebar icons)
-  - <https://github.com/microsoft/fluentui-emoji> (lobster)
-- License: MIT (both)
+- License: MIT
 - Attribution: not required by MIT; this file documents derivation for compliance.
 
 ## Mapping (sidebar item → upstream icon name)
diff --git a/src/OpenClaw.Tray.WinUI/ViewModels/NotificationItemViewModel.cs b/src/OpenClaw.Tray.WinUI/ViewModels/NotificationItemViewModel.cs
new file mode 100644
index 000000000..3a4d84031
--- /dev/null
+++ b/src/OpenClaw.Tray.WinUI/ViewModels/NotificationItemViewModel.cs
@@ -0,0 +1,93 @@
+using Microsoft.UI.Xaml;
+using OpenClawTray.Helpers;
+using OpenClawTray.Services;
+using System.Globalization;
+using System.Linq;
+
+namespace OpenClawTray.ViewModels;
+
+/// <summary>
+/// Presentation model for a single app notification card. Shared by the
+/// full <c>NotificationsPage</c> and the title-bar notifications bell flyout
+/// so severity glyphs and metadata localization stay defined in one place.
+/// </summary>
+internal sealed record NotificationItemViewModel(
+    string Id,
+    string SeverityGlyph,
+    string Title,
+    string Message,
+    string Metadata,
+    string? ActionLabel,
+    string? ActionRoute,
+    Visibility ActionVisibility,
+    string OccurrenceText,
+    Visibility OccurrenceVisibility,
+    string DismissAutomationName)
+{
+    // ListViewItem derives its default accessible name from the item string.
+    public override string ToString() => Title;
+
+    public static NotificationItemViewModel From(AppNotification notification)
+    {
+        var metadata = new[]
+            {
+                LocalizeMetadataValue(notification.Source),
+                LocalizeMetadataValue(notification.Category),
+                notification.CreatedAt.ToLocalTime().ToString("g", CultureInfo.CurrentCulture)
+            }
+            .Where(value => !string.IsNullOrWhiteSpace(value));
+
+        var occurrenceText = LocalizationHelper.Format(
+            "AppNotification_RepeatedBadgeFormat",
+            notification.OccurrenceCount);
+
+        return new(
+            notification.Id,
+            ToSeverityGlyph(notification.Severity),
+            notification.Title,
+            notification.Message,
+            string.Join(" - ", metadata),
+            notification.ActionLabel,
+            notification.ActionRoute,
+            !string.IsNullOrWhiteSpace(notification.ActionLabel) &&
+            !string.IsNullOrWhiteSpace(notification.ActionRoute)
+                ? Visibility.Visible
+                : Visibility.Collapsed,
+            occurrenceText,
+            notification.OccurrenceCount > 1 ? Visibility.Visible : Visibility.Collapsed,
+            LocalizationHelper.Format("NotificationsPage_DismissAutomationNameFormat", notification.Title));
+    }
+
+    private static string ToSeverityGlyph(AppNotificationSeverity severity) => severity switch
+    {
+        AppNotificationSeverity.Success => "\uE930",
+        AppNotificationSeverity.Warning => "\uE7BA",
+        AppNotificationSeverity.Error => "\uE783",
+        _ => "\uE946"
+    };
+
+    private static string? LocalizeMetadataValue(string? value) => value switch
+    {
+        null or "" => null,
+        "authentication" => LocalizationHelper.GetString("NotificationsPage_MetadataAuthentication"),
+        "bindings" => LocalizationHelper.GetString("NotificationsPage_MetadataBindings"),
+        "channels" => LocalizationHelper.GetString("NotificationsPage_MetadataChannels"),
+        "config" => LocalizationHelper.GetString("NotificationsPage_MetadataConfig"),
+        "connection" => LocalizationHelper.GetString("NotificationsPage_MetadataConnection"),
+        "cron" => LocalizationHelper.GetString("NotificationsPage_MetadataCron"),
+        "exec-approval" => LocalizationHelper.GetString("NotificationsPage_MetadataSourceExecApproval"),
+        "gateway" => LocalizationHelper.GetString("NotificationsPage_MetadataGateway"),
+        "jobs" => LocalizationHelper.GetString("NotificationsPage_MetadataJobs"),
+        "load" => LocalizationHelper.GetString("NotificationsPage_MetadataLoad"),
+        "lifecycle" => LocalizationHelper.GetString("NotificationsPage_MetadataLifecycle"),
+        "local-gateway" => LocalizationHelper.GetString("NotificationsPage_MetadataLocalGateway"),
+        "node.invoke" => LocalizationHelper.GetString("NotificationsPage_MetadataCategoryNodeInvoke"),
+        "node" => LocalizationHelper.GetString("NotificationsPage_MetadataNode"),
+        "pairing" => LocalizationHelper.GetString("NotificationsPage_MetadataPairing"),
+        "sandbox" => LocalizationHelper.GetString("NotificationsPage_MetadataSandbox"),
+        "settings" => LocalizationHelper.GetString("NotificationsPage_MetadataSettings"),
+        "status" => LocalizationHelper.GetString("NotificationsPage_MetadataStatus"),
+        "system.run" => LocalizationHelper.GetString("NotificationsPage_MetadataSystemRun"),
+        _ => value
+    };
+}
diff --git a/src/OpenClaw.Tray.WinUI/Windows/CanvasWindow.xaml.cs b/src/OpenClaw.Tray.WinUI/Windows/CanvasWindow.xaml.cs
index 1eceb824b..b5dc5bbdf 100644
--- a/src/OpenClaw.Tray.WinUI/Windows/CanvasWindow.xaml.cs
+++ b/src/OpenClaw.Tray.WinUI/Windows/CanvasWindow.xaml.cs
@@ -49,8 +49,7 @@ public sealed partial class CanvasWindow : WindowEx
     private TaskCompletionSource<bool>? _navigationTcs;
 
     private readonly string _canvasDir = Path.Combine(
-        Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
-        "OpenClawTray", "canvas");
+        AppIdentity.ResolveLocalDataDirectory(), "canvas");
     private FileSystemWatcher? _canvasWatcher;
     private long _lastReloadTicks = 0;
 
@@ -133,6 +132,7 @@ private static bool IsSafeDataUrl(string url)
     
     public bool IsClosed { get; private set; }
     private string? _trustedGatewayOrigin;
+    private string? _configuredGatewayOrigin;
     private string? _gatewayOriginForRewrite;
     private string? _gatewayToken;
 
@@ -142,17 +142,18 @@ private static bool IsSafeDataUrl(string url)
     /// Also rewrites gateway URLs to use the node's effective connection
     /// (e.g., localhost when connected via SSH tunnel).
     /// </summary>
-    public void SetTrustedGatewayOrigin(string? gatewayUrl, string? token = null)
+    public void SetTrustedGatewayOrigin(string? gatewayUrl, string? token = null, string? configuredGatewayUrl = null)
     {
         if (string.IsNullOrEmpty(gatewayUrl)) return;
         _gatewayToken = token;
         try
         {
-            var uri = new Uri(GatewayUrlHelper.NormalizeForWebSocket(gatewayUrl));
-            var httpScheme = uri.Scheme == "wss" ? "https" : "http";
-            _trustedGatewayOrigin = $"{httpScheme}://{uri.Host}:{uri.Port}";
+            _trustedGatewayOrigin = CanvasGatewayUrlRewriter.ToHttpOrigin(gatewayUrl);
+            _configuredGatewayOrigin = string.IsNullOrWhiteSpace(configuredGatewayUrl)
+                ? _trustedGatewayOrigin
+                : CanvasGatewayUrlRewriter.ToHttpOrigin(configuredGatewayUrl);
             _gatewayOriginForRewrite = _trustedGatewayOrigin;
-            Logger.Info($"[Canvas] Trusted gateway origin: {_trustedGatewayOrigin}");
+            Logger.Info($"[Canvas] Trusted gateway origin: {_trustedGatewayOrigin}; configured gateway origin: {_configuredGatewayOrigin}");
             ConfigureGatewayAuthHeaderInjection();
         }
         catch (Exception ex)
@@ -172,24 +173,13 @@ private string RewriteGatewayUrl(string url)
         try
         {
             // Handle relative paths — prepend the gateway origin
-            if (url.StartsWith("/"))
+            var rewritten = CanvasGatewayUrlRewriter.Rewrite(url, _gatewayOriginForRewrite, _configuredGatewayOrigin);
+            if (!string.Equals(url, rewritten, StringComparison.Ordinal))
             {
-                var rewritten = _gatewayOriginForRewrite + url;
                 rewritten = AppendGatewayToken(rewritten);
-                Logger.Info($"[Canvas] Resolved relative URL to gateway origin");
-                return rewritten;
-            }
-
-            var uri = new Uri(url);
-            var httpScheme = uri.Scheme;
-            var urlOrigin = $"{httpScheme}://{uri.Host}:{uri.Port}";
-
-            // If the URL's origin differs from our effective gateway origin, rewrite it
-            if (!urlOrigin.Equals(_gatewayOriginForRewrite, StringComparison.OrdinalIgnoreCase))
-            {
-                var rewritten = _gatewayOriginForRewrite + uri.PathAndQuery;
-                rewritten = AppendGatewayToken(rewritten);
-                Logger.Info($"[Canvas] Rewrote URL to effective gateway origin");
+                Logger.Info(url.StartsWith("/", StringComparison.Ordinal)
+                    ? "[Canvas] Resolved relative URL to gateway origin"
+                    : "[Canvas] Rewrote URL to effective gateway origin");
                 return rewritten;
             }
 
@@ -231,6 +221,7 @@ private string AppendGatewayToken(string url)
     public CanvasWindow()
     {
         this.InitializeComponent();
+        Title = AppIdentity.DecorateWindowTitle("OpenClaw Canvas");
         AutomationProperties.SetName(
             CanvasTitlebarReloadButton,
             LocalizationHelper.GetString("CanvasReloadButton_AutomationName"));
@@ -430,7 +421,7 @@ await CanvasWebView.CoreWebView2.AddScriptToExecuteOnDocumentCreatedAsync("""
         {
             LoadingRing.IsActive = false;
             ErrorPanel.Visibility = Visibility.Visible;
-            ErrorText.Text = $"Failed to initialize WebView2: {ex.Message}";
+            ErrorText.Text = LocalizationHelper.Format("CanvasWindow_WebViewInitFailedFormat", ex.Message);
             _webViewReadyTcs.TrySetException(ex);
         }
     }
@@ -502,7 +493,7 @@ private void OnNavigationCompleted(CoreWebView2 sender, CoreWebView2NavigationCo
             // Show error for failed navigation
             ErrorPanel.Visibility = Visibility.Visible;
             CanvasWebView.Visibility = Visibility.Collapsed;
-            ErrorText.Text = $"Navigation failed: {args.WebErrorStatus}";
+            ErrorText.Text = LocalizationHelper.Format("CanvasWindow_NavigationFailedFormat", args.WebErrorStatus);
         }
         else
         {
@@ -548,6 +539,7 @@ private void OnWindowClosed(object sender, WindowEventArgs args)
         _canvasWatcher?.Dispose();
         _canvasWatcher = null;
         _trustedGatewayOrigin = null;
+        _configuredGatewayOrigin = null;
         _gatewayOriginForRewrite = null;
     }
     
diff --git a/src/OpenClaw.Tray.WinUI/Windows/ChatWindow.xaml.cs b/src/OpenClaw.Tray.WinUI/Windows/ChatWindow.xaml.cs
index e173d5d63..cf3d5e296 100644
--- a/src/OpenClaw.Tray.WinUI/Windows/ChatWindow.xaml.cs
+++ b/src/OpenClaw.Tray.WinUI/Windows/ChatWindow.xaml.cs
@@ -9,6 +9,7 @@
 using OpenClawTray.Helpers;
 using OpenClawTray.Services;
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Threading;
@@ -28,6 +29,7 @@ public sealed partial class ChatWindow : WindowEx
     private IChatDataProvider? _mountedProvider;
     private bool _webViewInitialized;
     private bool _webViewMode;
+    private bool _shownNearTray;
     public bool IsClosed { get; private set; }
 
     [DllImport("user32.dll")] private static extern int GetWindowLong(IntPtr hWnd, int nIndex);
@@ -70,6 +72,7 @@ public ChatWindow(string gatewayUrl, string token)
         _token = token;
         _chatUrl = ChatSurfaceResolver.BuildChatUrl(gatewayUrl, token);
         InitializeComponent();
+        Title = AppIdentity.DecorateWindowTitle("OpenClaw Chat");
 
         this.SetWindowSize(DefaultChatWidth, DefaultChatHeight);
         this.SetIcon("Assets\\openclaw.ico");
@@ -103,7 +106,7 @@ public ChatWindow(string gatewayUrl, string token)
             escAccel.Invoked += (_, args) =>
             {
                 args.Handled = true;
-                this.Hide();
+                HideNearTray();
             };
             contentRoot.KeyboardAccelerators.Add(escAccel);
             // Suppress the default "Esc" tooltip that WinUI shows for
@@ -188,11 +191,13 @@ private void ShowFunctionalSurface()
         LoadingRing.Visibility = Visibility.Collapsed;
         ErrorPanel.Visibility = Visibility.Collapsed;
         TryMountFunctionalChat();
+        UpdateNativeChatSurfaceActive();
     }
 
     private void ShowWebViewSurface()
     {
         _webViewMode = true;
+        UpdateNativeChatSurfaceActive();
 
         // Tear down native chat so the WebView2 owns the row.
         DisposeFunctionalHost();
@@ -235,7 +240,7 @@ private void ShowMissingChatCredentialError()
         WebView.Visibility = Visibility.Collapsed;
         PlaceholderPanel.Visibility = Visibility.Collapsed;
         ErrorPanel.Visibility = Visibility.Visible;
-        ErrorText.Text = "Unable to load chat. The gateway URL or token is not available.";
+        ErrorText.Text = LocalizationHelper.GetString("ChatWindow_UnableToLoadChatCredentials");
     }
 
     private void StopWebViewNavigation()
@@ -283,7 +288,7 @@ public void RefreshCredentials(string gatewayUrl, string token)
                 LoadingRing.Visibility = Visibility.Collapsed;
                 WebView.Visibility = Visibility.Collapsed;
                 ErrorPanel.Visibility = Visibility.Visible;
-                ErrorText.Text = "Unable to load chat. The gateway URL or token is not available.";
+                ErrorText.Text = LocalizationHelper.GetString("ChatWindow_UnableToLoadChatCredentials");
                 return;
             }
 
@@ -301,7 +306,7 @@ public void RefreshCredentials(string gatewayUrl, string token)
                 LoadingRing.Visibility = Visibility.Collapsed;
                 WebView.Visibility = Visibility.Collapsed;
                 ErrorPanel.Visibility = Visibility.Visible;
-                ErrorText.Text = $"Unable to load chat. Please try again. ({ex.Message})";
+                ErrorText.Text = LocalizationHelper.Format("ChatWindow_UnableToLoadChatRetryFormat", ex.Message);
                 Logger.Warn($"ChatWindow.RefreshCredentials navigate failed: {ex.Message}");
             }
         }
@@ -368,7 +373,7 @@ CoreWebView2WebErrorStatus.ServerUnreachable or
             LoadingRing.Visibility = Visibility.Collapsed;
             PlaceholderPanel.Visibility = Visibility.Collapsed;
             ErrorPanel.Visibility = Visibility.Visible;
-            ErrorText.Text = $"WebView2 failed: {ex.Message}";
+            ErrorText.Text = LocalizationHelper.Format("ChatWindow_WebViewFailedFormat", ex.Message);
         }
     }
 
@@ -403,6 +408,7 @@ private void TryMountFunctionalChat()
         {
             PlaceholderPanel.Visibility = Visibility.Collapsed;
             ChatHost.Visibility = Visibility.Visible;
+            UpdateNativeChatSurfaceActive();
             return;
         }
 
@@ -412,6 +418,7 @@ private void TryMountFunctionalChat()
         {
             PlaceholderPanel.Visibility = Visibility.Visible;
             ChatHost.Visibility = Visibility.Collapsed;
+            UpdateNativeChatSurfaceActive();
             return;
         }
 
@@ -430,6 +437,7 @@ private void TryMountFunctionalChat()
             initialMuted: appInstance?.Settings?.VoiceTtsEnabled == false,
             isCompact: true);
         _mountedProvider = provider;
+        UpdateNativeChatSurfaceActive();
     }
 
     private void DisposeFunctionalHost()
@@ -437,10 +445,29 @@ private void DisposeFunctionalHost()
         var host = _functionalHost;
         _functionalHost = null;
         _mountedProvider = null;
+        UpdateNativeChatSurfaceActive();
         try { host?.Dispose(); }
         catch (Exception ex) { Logger.Debug($"ChatWindow: functional host dispose tear-down race: {ex.Message}"); }
     }
 
+    private void SetShownNearTray(bool shown)
+    {
+        _shownNearTray = shown;
+        UpdateNativeChatSurfaceActive();
+    }
+
+    public void HideNearTray()
+    {
+        SetShownNearTray(false);
+        this.Hide();
+    }
+
+    private void UpdateNativeChatSurfaceActive()
+    {
+        if (App.Current is App app)
+            app.SetTrayNativeChatSurfaceActive(_shownNearTray && !_webViewMode && _functionalHost is not null);
+    }
+
     private void EagerlyLoadChatHistory()
     {
         var provider = (App.Current as App)?.ChatProvider;
@@ -585,13 +612,16 @@ private async Task PickAndAttachFileAsync()
             ChatWindowPinState.IsPinned = true;
 
             var hwnd = WinRT.Interop.WindowNative.GetWindowHandle((Window)this);
-            var path = await Win32FilePickerHelper.PickSingleFileAsync(hwnd, "Attach file");
-            if (path is null) return;
-            Logger.Info($"[ChatWindow] File selected: {path}");
+            var paths = await Win32FilePickerHelper.PickMultipleFilesAsync(hwnd, "Attach files");
+            if (paths.Count == 0) return;
 
-            Logger.Info($"[ChatWindow] File selected: {path}");
-            var attachment = await ChatAttachment.FromFileAsync(path);
-            _functionalHost?.AttachFile(attachment);
+            var attachments = new List<ChatAttachment>(paths.Count);
+            foreach (var path in paths)
+            {
+                Logger.Info($"[ChatWindow] File selected: {path}");
+                attachments.Add(await ChatAttachment.FromFileAsync(path));
+            }
+            _functionalHost?.AttachFiles(attachments);
         }
         catch (InvalidOperationException ex)
         {
@@ -655,7 +685,7 @@ private void OnWindowActivated(object sender, WindowActivatedEventArgs args)
         // Pinned via Chat exploration panel — keep open so the user can
         // preview backdrop/composer changes side-by-side.
         if (ChatWindowPinState.IsPinned) return;
-        this.Hide();
+        HideNearTray();
     }
 
     private static Microsoft.UI.Xaml.Controls.TextBox? FindFirstFocusableTextBox(DependencyObject root)
@@ -673,7 +703,7 @@ private void OnWindowActivated(object sender, WindowActivatedEventArgs args)
 
     private void OnCloseClick(object sender, RoutedEventArgs e)
     {
-        this.Hide();
+        HideNearTray();
     }
 
     /// <summary>Position near the system tray and show with animation.</summary>
@@ -703,6 +733,11 @@ public void ShowNearTray()
         const uint SWP_NOACTIVATE = 0x0010;
         SetWindowPos(hwnd, IntPtr.Zero, x, y, panelWPx, panelHPx, SWP_NOZORDER | SWP_NOACTIVATE);
 
+        // Mark active before remount/show work below can pump messages; otherwise
+        // an approval arriving during this narrow window may choose native fallback
+        // even though the tray chat is already in the process of opening.
+        SetShownNearTray(true);
+
         // Provider may have arrived after construction — re-apply surface so
         // a native-mode window swaps placeholder → live tree on first show.
         ApplyChatSurface();
@@ -710,7 +745,6 @@ public void ShowNearTray()
         // Eagerly load chat history so the tray popup renders messages
         // immediately instead of showing the zero-state while history loads.
         EagerlyLoadChatHistory();
-
         this.Show();
         SetForegroundWindow(hwnd);
         RequestChatInputFocus();
@@ -723,7 +757,7 @@ private void OnWindowClosing(object sender, WindowEventArgs args)
     {
         // Intercept close → hide instead (keeps native chat state warm).
         args.Handled = true;
-        this.Hide();
+        HideNearTray();
     }
 
     /// <summary>Actually close and dispose (called on app shutdown).</summary>
@@ -738,6 +772,7 @@ public void ForceClose()
         }
         OpenClawTray.Chat.DebugChatSurfaceOverrides.Changed -= OnDebugOverrideChanged;
         IsClosed = true;
+        SetShownNearTray(false);
         DisposeFunctionalHost();
         Close();
     }
@@ -749,7 +784,7 @@ private void OnPopout(object sender, RoutedEventArgs e)
         try
         {
             (App.Current as App)?.ShowHub("chat");
-            this.Hide();
+            HideNearTray();
         }
         catch (Exception ex)
         {
diff --git a/src/OpenClaw.Tray.WinUI/Windows/ConnectionStatusWindow.xaml.cs b/src/OpenClaw.Tray.WinUI/Windows/ConnectionStatusWindow.xaml.cs
index c7fca064d..19f21cd48 100644
--- a/src/OpenClaw.Tray.WinUI/Windows/ConnectionStatusWindow.xaml.cs
+++ b/src/OpenClaw.Tray.WinUI/Windows/ConnectionStatusWindow.xaml.cs
@@ -545,7 +545,7 @@ private static string FormatPlain(ConnectionDiagnosticEvent evt)
 
     private void OnCopyTimeline(object sender, RoutedEventArgs e)
     {
-        ClipboardHelper.CopyText(_plainBuffer.ToString());
+        ClipboardHelper.CopyText(DiagnosticsExportSanitizer.SanitizeTextBlock(_plainBuffer.ToString()));
     }
 
     private void OnClearTimeline(object sender, RoutedEventArgs e)
diff --git a/src/OpenClaw.Tray.WinUI/Windows/DiagnosticsBundleDialog.xaml b/src/OpenClaw.Tray.WinUI/Windows/DiagnosticsBundleDialog.xaml
index 53ef90679..d13b85f81 100644
--- a/src/OpenClaw.Tray.WinUI/Windows/DiagnosticsBundleDialog.xaml
+++ b/src/OpenClaw.Tray.WinUI/Windows/DiagnosticsBundleDialog.xaml
@@ -10,20 +10,47 @@
     CloseButtonText="Close"
     DefaultButton="Primary">
 
-    <Grid RowSpacing="12" MinWidth="640" MaxWidth="860">
+    <Grid RowSpacing="12" HorizontalAlignment="Stretch">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
 
-        <InfoBar x:Uid="DiagnosticsBundleDialog_ReviewBeforeSharing"
+        <Border
             Grid.Row="0"
-            IsOpen="True"
-            IsClosable="False"
-            Severity="Informational"
-            Title="Review before sharing"
-            Message="Sensitive tokens, command arguments, payloads, and recordings are excluded by the bundle builder."/>
+            HorizontalAlignment="Stretch"
+            Padding="14"
+            Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}"
+            BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+            BorderThickness="1"
+            CornerRadius="4">
+            <Grid ColumnSpacing="12" HorizontalAlignment="Stretch">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="*"/>
+                </Grid.ColumnDefinitions>
+                <FontIcon
+                    Grid.Column="0"
+                    Glyph="&#xE946;"
+                    FontSize="16"
+                    Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}"
+                    FontFamily="{ThemeResource SymbolThemeFontFamily}"/>
+                <StackPanel Grid.Column="1" Spacing="6" HorizontalAlignment="Stretch">
+                    <TextBlock
+                        x:Uid="DiagnosticsBundleDialog_ReviewBeforeSharingTitle"
+                        Text="Review before sharing"
+                        FontWeight="SemiBold"
+                        HorizontalAlignment="Stretch"
+                        TextWrapping="WrapWholeWords"/>
+                    <TextBlock
+                        x:Uid="DiagnosticsBundleDialog_ReviewBeforeSharingMessage"
+                        Text="Log tails are sanitized and truncated. Sensitive tokens, payloads, recordings, and raw settings files are excluded. Review before sharing."
+                        HorizontalAlignment="Stretch"
+                        TextWrapping="WrapWholeWords"/>
+                </StackPanel>
+            </Grid>
+        </Border>
 
         <TextBlock
             Grid.Row="1"
@@ -34,12 +61,13 @@
 
         <Border
             Grid.Row="2"
+            HorizontalAlignment="Stretch"
             Background="{ThemeResource ControlAltFillColorTertiaryBrush}"
             BorderBrush="{ThemeResource ControlStrokeColorDefaultBrush}"
             BorderThickness="1"
             CornerRadius="4">
             <ScrollViewer
-                MaxHeight="420"
+                Height="420"
                 VerticalScrollBarVisibility="Auto"
                 HorizontalScrollBarVisibility="Auto">
                 <TextBox
@@ -49,6 +77,7 @@
                     TextWrapping="NoWrap"
                     FontFamily="Consolas"
                     FontSize="12"
+                    HorizontalAlignment="Stretch"
                     BorderThickness="0"
                     Background="Transparent"
                     AutomationProperties.Name="Diagnostics bundle text"/>
diff --git a/src/OpenClaw.Tray.WinUI/Windows/DiagnosticsBundleDialog.xaml.cs b/src/OpenClaw.Tray.WinUI/Windows/DiagnosticsBundleDialog.xaml.cs
index 2f41827ff..c9f56fef6 100644
--- a/src/OpenClaw.Tray.WinUI/Windows/DiagnosticsBundleDialog.xaml.cs
+++ b/src/OpenClaw.Tray.WinUI/Windows/DiagnosticsBundleDialog.xaml.cs
@@ -1,12 +1,11 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using OpenClaw.Shared;
 using OpenClawTray.Helpers;
+using OpenClawTray.Services;
 using System;
 using System.IO;
 using System.Threading.Tasks;
-using Windows.Storage;
-using Windows.Storage.Pickers;
-using WinRT.Interop;
 
 namespace OpenClawTray.Windows;
 
@@ -34,8 +33,8 @@ public DiagnosticsBundleDialog()
     /// when "Save to file" is clicked, so we resolve the host HWND
     /// just-in-time (Hanselman v2 #4 + #7). If the host window has
     /// closed between Configure and Save, the provider returns
-    /// IntPtr.Zero and the picker silently no-ops instead of crashing
-    /// on a stale handle.
+    /// IntPtr.Zero and the picker reports a failure instead of crashing
+    /// on a stale handle or writing diagnostics somewhere unexpected.
     /// </summary>
     public void Configure(string bundleText, string headerCaption, string suggestedFileName, Func<IntPtr> hwndProvider)
     {
@@ -44,8 +43,16 @@ public void Configure(string bundleText, string headerCaption, string suggestedF
             ? "openclaw-diagnostics.txt"
             : suggestedFileName;
         _hwndProvider = hwndProvider;
-        BundleText.Text = _bundleText;
         BundleHeaderText.Text = headerCaption ?? string.Empty;
+        SetBundleText(_bundleText, isReady: true);
+    }
+
+    public void SetBundleText(string bundleText, bool isReady)
+    {
+        _bundleText = bundleText ?? string.Empty;
+        BundleText.Text = _bundleText;
+        IsPrimaryButtonEnabled = isReady;
+        IsSecondaryButtonEnabled = isReady;
     }
 
     private void OnCopyClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)
@@ -69,53 +76,69 @@ private void OnSaveClick(ContentDialog sender, ContentDialogButtonClickEventArgs
     {
         // Keep the dialog open after Save so the user can also Copy
         // (or save again to a different location). Mirrors OnCopyClick.
-        // Previously this method used GetDeferral + ContinueWith but
-        // because we unconditionally cancel the close, the deferral was
-        // dead code (Hanselman review finding #6).
+        // Use a deferral so picker/write failures can update the button
+        // instead of vanishing in a fire-and-forget task.
         args.Cancel = true;
-        _ = SaveToFileAsync();
+        var deferral = args.GetDeferral();
+        AsyncEventHandlerGuard.Run(
+            async () =>
+            {
+                try
+                {
+                    SecondaryButtonText = "Saving...";
+                    var result = await SaveToFileAsync();
+                    SecondaryButtonText = result.ButtonText;
+                }
+                finally
+                {
+                    deferral.Complete();
+                }
+
+                var timer = DispatcherQueue.CreateTimer();
+                timer.Interval = TimeSpan.FromSeconds(2);
+                timer.Tick += (_, _) =>
+                {
+                    SecondaryButtonText = "Save to file";
+                    timer.Stop();
+                };
+                timer.Start();
+            },
+            new OpenClawTray.AppLogger(),
+            nameof(OnSaveClick));
     }
 
-    private async Task SaveToFileAsync()
+    private async Task<SaveResult> SaveToFileAsync()
     {
         try
         {
             // Resolve HWND just-in-time so a closed/recreated host
-            // window never lands a stale handle in
-            // InitializeWithWindow.Initialize (Hanselman v2 #4).
+            // window never lands a stale handle in the native save dialog.
             var hwnd = _hwndProvider?.Invoke() ?? IntPtr.Zero;
             if (hwnd == IntPtr.Zero)
             {
-                System.Diagnostics.Debug.WriteLine("DiagnosticsBundleDialog save: no host hwnd; skipping picker.");
-                return;
+                Logger.Warn("DiagnosticsBundleDialog save skipped: no host hwnd available for save picker.");
+                return new SaveResult(null, "Save failed");
             }
 
-            var picker = new FileSavePicker
-            {
-                SuggestedStartLocation = PickerLocationId.Desktop,
-                SuggestedFileName = Path.GetFileNameWithoutExtension(_suggestedFileName),
-            };
-            picker.FileTypeChoices.Add("Text file", new[] { ".txt" });
-            InitializeWithWindow.Initialize(picker, hwnd);
-
-            var file = await picker.PickSaveFileAsync();
-            if (file != null)
+            var selectedPath = await Win32FilePickerHelper.PickSaveFileAsync(
+                hwnd,
+                title: "Save diagnostics bundle",
+                suggestedFileName: Path.GetFileName(_suggestedFileName),
+                defaultExtension: "txt");
+            if (!string.IsNullOrWhiteSpace(selectedPath))
             {
-                await FileIO.WriteTextAsync(file, _bundleText);
-                SecondaryButtonText = "Saved";
-                var timer = DispatcherQueue.CreateTimer();
-                timer.Interval = TimeSpan.FromSeconds(2);
-                timer.Tick += (_, _) =>
-                {
-                    SecondaryButtonText = "Save to file";
-                    timer.Stop();
-                };
-                timer.Start();
+                await File.WriteAllTextAsync(selectedPath, _bundleText);
+                return new SaveResult(selectedPath, "Saved");
             }
+
+            return new SaveResult(null, "Save cancelled");
         }
         catch (Exception ex)
         {
-            System.Diagnostics.Debug.WriteLine($"DiagnosticsBundleDialog save failed: {ex.Message}");
+            Logger.Error($"DiagnosticsBundleDialog save failed: {ex}");
+            return new SaveResult(null, "Save failed");
         }
     }
+
+    private sealed record SaveResult(string? Path, string ButtonText);
 }
diff --git a/src/OpenClaw.Tray.WinUI/Windows/HubWindow.xaml b/src/OpenClaw.Tray.WinUI/Windows/HubWindow.xaml
index 1402ad533..a1945c7e1 100644
--- a/src/OpenClaw.Tray.WinUI/Windows/HubWindow.xaml
+++ b/src/OpenClaw.Tray.WinUI/Windows/HubWindow.xaml
@@ -3,6 +3,7 @@
     x:Class="OpenClawTray.Windows.HubWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:OpenClawTray.Controls"
     xmlns:winex="using:WinUIEx"
     Title="OpenClaw"
     MinWidth="1000" MinHeight="400">
@@ -60,7 +61,10 @@
             </StackPanel>
 
             <!-- Icon + Title -->
-            <TextBlock Grid.Column="1" Text="🦞" FontSize="18" VerticalAlignment="Center" Margin="8,0,8,0" Translation="0,-1,0"/>
+            <controls:BrandMark Grid.Column="1"
+                                MarkSize="18"
+                                VerticalAlignment="Center"
+                                Margin="8,0,8,0"/>
             <TextBlock x:Uid="TitleText" Grid.Column="2" x:Name="TitleText" Text="OpenClaw Windows Companion"
                         FontSize="13" VerticalAlignment="Center"
                         Style="{StaticResource CaptionTextBlockStyle}"/>
@@ -90,26 +94,240 @@
                 </AutoSuggestBox.ItemTemplate>
             </AutoSuggestBox>
 
-            <!-- Status indicator on the right (clickable → navigates to Connection page) -->
-            <StackPanel Grid.Column="4" Orientation="Horizontal" Spacing="12" VerticalAlignment="Center"
-                        Tapped="OnTitleBarStatusTapped">
-                <StackPanel Orientation="Horizontal" Spacing="6">
-                    <Ellipse x:Name="TitleStatusDot" Width="8" Height="8" VerticalAlignment="Center" Fill="Gray"/>
-                    <TextBlock x:Uid="HubWindow_TitleStatus" x:Name="TitleStatusText" Text="Disconnected"
-                               FontSize="11" VerticalAlignment="Center" MinWidth="80"
-                               Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
-                </StackPanel>
-                <Border Background="{ThemeResource DividerStrokeColorDefaultBrush}" Width="1" Height="14" VerticalAlignment="Center"/>
-                <StackPanel Orientation="Horizontal" Spacing="4">
-                    <Ellipse x:Name="TitleOpDot" Width="6" Height="6" VerticalAlignment="Center" Fill="Gray"/>
-                    <TextBlock x:Uid="HubWindow_Op" x:Name="TitleOpLabel" Text="Op" FontSize="10" VerticalAlignment="Center"
-                               Foreground="{ThemeResource TextFillColorTertiaryBrush}"/>
-                </StackPanel>
-                <StackPanel Orientation="Horizontal" Spacing="4">
-                    <Ellipse x:Name="TitleNodeDot" Width="6" Height="6" VerticalAlignment="Center" Fill="Gray"/>
-                    <TextBlock x:Uid="HubWindow_Node" x:Name="TitleNodeLabel" Text="Node" FontSize="10" VerticalAlignment="Center"
-                               Foreground="{ThemeResource TextFillColorTertiaryBrush}"/>
-                </StackPanel>
+            <StackPanel Grid.Column="4" Orientation="Horizontal" Spacing="8" VerticalAlignment="Center">
+
+                <Button x:Name="StatusPillButton"
+                        Height="30"
+                        Padding="11,0"
+                        CornerRadius="15"
+                        VerticalAlignment="Center"
+                        AutomationProperties.Name="Connection status">
+                    <StackPanel Orientation="Horizontal" Spacing="7" VerticalAlignment="Center">
+                        <Ellipse x:Name="StatusPillDot" Width="10" Height="10" VerticalAlignment="Center" Fill="Gray"/>
+                        <TextBlock x:Name="StatusPillText" Text="Disconnected"
+                                   Style="{StaticResource CaptionTextBlockStyle}"
+                                   VerticalAlignment="Center"/>
+                        <FontIcon Glyph="&#xE70D;" FontSize="8" VerticalAlignment="Center"
+                                  Foreground="{ThemeResource TextFillColorTertiaryBrush}"
+                                  FontFamily="{ThemeResource SymbolThemeFontFamily}"/>
+                    </StackPanel>
+                    <Button.Flyout>
+                        <Flyout x:Name="StatusFlyout" Placement="Bottom" Opening="OnStatusFlyoutOpening">
+                            <StackPanel Width="304" Spacing="0">
+                                <Grid Padding="0,0,0,10" ColumnSpacing="11">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="*"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                    </Grid.ColumnDefinitions>
+                                    <Ellipse x:Name="GatewayRowDot" Width="10" Height="10" VerticalAlignment="Center" Fill="Gray"/>
+                                    <StackPanel Grid.Column="1" Spacing="1">
+                                        <TextBlock x:Uid="HubWindow_StatusFlyout_GatewayLabel" Text="Gateway"
+                                                   Style="{StaticResource BodyStrongTextBlockStyle}"/>
+                                        <TextBlock x:Name="GatewayRowDetail" Text=""
+                                                   Style="{StaticResource CaptionTextBlockStyle}"
+                                                   Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                   TextTrimming="CharacterEllipsis"/>
+                                    </StackPanel>
+                                    <HyperlinkButton x:Name="GatewayRowAction" x:Uid="HubWindow_StatusFlyout_Reconnect"
+                                                     Grid.Column="2" Content="Reconnect"
+                                                     Padding="4,0" VerticalAlignment="Center"
+                                                     Visibility="Collapsed"
+                                                     Click="OnStatusFlyoutReconnectClick"/>
+                                </Grid>
+                                <Border Height="1" Background="{ThemeResource CardStrokeColorDefaultBrush}"/>
+
+                                <Grid Padding="0,10" ColumnSpacing="11">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="*"/>
+                                    </Grid.ColumnDefinitions>
+                                    <Ellipse x:Name="OperatorRowDot" Width="10" Height="10" VerticalAlignment="Center" Fill="Gray"/>
+                                    <StackPanel Grid.Column="1" Spacing="1">
+                                        <TextBlock x:Uid="HubWindow_StatusFlyout_OperatorLabel" Text="Operator"
+                                                   Style="{StaticResource BodyStrongTextBlockStyle}"/>
+                                        <TextBlock x:Name="OperatorRowDetail" Text=""
+                                                   Style="{StaticResource CaptionTextBlockStyle}"
+                                                   Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
+                                    </StackPanel>
+                                </Grid>
+                                <Border Height="1" Background="{ThemeResource CardStrokeColorDefaultBrush}"/>
+
+                                <Grid Padding="0,10" ColumnSpacing="11">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="*"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                    </Grid.ColumnDefinitions>
+                                    <Ellipse x:Name="NodeRowDot" Width="10" Height="10" VerticalAlignment="Center" Fill="Gray"/>
+                                    <StackPanel Grid.Column="1" Spacing="1">
+                                        <TextBlock x:Uid="HubWindow_StatusFlyout_NodeLabel" Text="Node"
+                                                   Style="{StaticResource BodyStrongTextBlockStyle}"/>
+                                        <TextBlock x:Name="NodeRowDetail" Text=""
+                                                   Style="{StaticResource CaptionTextBlockStyle}"
+                                                   Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
+                                    </StackPanel>
+                                    <HyperlinkButton x:Name="NodeRowAction" x:Uid="HubWindow_StatusFlyout_Approve"
+                                                     Grid.Column="2" Content="Approve…"
+                                                     Padding="4,0" VerticalAlignment="Center"
+                                                     Visibility="Collapsed"
+                                                     Click="OnStatusFlyoutNodeActionClick"/>
+                                </Grid>
+
+                                <Border Height="1" Background="{ThemeResource CardStrokeColorDefaultBrush}"/>
+                                <HyperlinkButton x:Uid="HubWindow_StatusFlyout_OpenConnection"
+                                                 Content="Open Connection"
+                                                 Margin="2,8,2,0" Padding="4,0"
+                                                 Click="OnStatusFlyoutOpenConnectionClick"/>
+                            </StackPanel>
+                        </Flyout>
+                    </Button.Flyout>
+                </Button>
+
+                <Button x:Name="NotificationsBellButton"
+                        MinWidth="36" Height="30"
+                        Padding="0"
+                        VerticalAlignment="Center"
+                        AutomationProperties.Name="Notifications">
+                    <Grid>
+                        <FontIcon Glyph="&#xE7E7;" FontSize="16"
+                                  FontFamily="{ThemeResource SymbolThemeFontFamily}"/>
+                        <InfoBadge x:Name="NotificationsBadge"
+                                   Value="0"
+                                   Visibility="Collapsed"
+                                   HorizontalAlignment="Right" VerticalAlignment="Top"
+                                   Margin="0,-6,-8,0"/>
+                    </Grid>
+                    <Button.Flyout>
+                        <Flyout x:Name="NotificationsFlyout" Placement="Bottom" Opening="OnNotificationsFlyoutOpening">
+                            <Grid Width="352" MaxHeight="440" RowSpacing="0">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto"/>
+                                    <RowDefinition Height="*"/>
+                                    <RowDefinition Height="Auto"/>
+                                </Grid.RowDefinitions>
+
+                                <Grid Grid.Row="0" Margin="2,0,2,8">
+                                    <HyperlinkButton x:Name="BellClearAllButton" x:Uid="NotificationsFlyout_ClearAll"
+                                                     Content="Clear all"
+                                                     HorizontalAlignment="Right"
+                                                     Padding="4,0" VerticalAlignment="Center"
+                                                     Click="OnBellClearAllClick"/>
+                                </Grid>
+
+                                <ListView x:Name="BellNotificationsList"
+                                          Grid.Row="1"
+                                          SelectionMode="None"
+                                          IsItemClickEnabled="False"
+                                          Padding="0"
+                                          Margin="-4,0">
+                                    <ListView.ItemContainerStyle>
+                                        <Style TargetType="ListViewItem">
+                                            <Setter Property="Padding" Value="0"/>
+                                            <Setter Property="Margin" Value="0"/>
+                                            <Setter Property="MinHeight" Value="0"/>
+                                            <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+                                        </Style>
+                                    </ListView.ItemContainerStyle>
+                                    <ListView.ItemTemplate>
+                                        <DataTemplate>
+                                            <Border Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                                                    BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                                                    BorderThickness="1"
+                                                    CornerRadius="8"
+                                                    Padding="12"
+                                                    Margin="4,4,4,4">
+                                                <Grid ColumnSpacing="11">
+                                                    <Grid.ColumnDefinitions>
+                                                        <ColumnDefinition Width="Auto"/>
+                                                        <ColumnDefinition Width="*"/>
+                                                        <ColumnDefinition Width="Auto"/>
+                                                    </Grid.ColumnDefinitions>
+                                                    <FontIcon Grid.Column="0"
+                                                              Glyph="{Binding SeverityGlyph}"
+                                                              FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                                              FontSize="16"
+                                                              VerticalAlignment="Top"
+                                                              Margin="0,2,0,0"/>
+                                                    <StackPanel Grid.Column="1" Spacing="3">
+                                                        <StackPanel Orientation="Horizontal" Spacing="8">
+                                                            <TextBlock Text="{Binding Title}"
+                                                                       Style="{StaticResource BodyStrongTextBlockStyle}"
+                                                                       TextWrapping="WrapWholeWords"/>
+                                                            <Border Visibility="{Binding OccurrenceVisibility}"
+                                                                    Background="{ThemeResource SystemFillColorCautionBackgroundBrush}"
+                                                                    CornerRadius="10"
+                                                                    Padding="7,1"
+                                                                    VerticalAlignment="Center">
+                                                                <TextBlock Text="{Binding OccurrenceText}"
+                                                                           Style="{StaticResource CaptionTextBlockStyle}"/>
+                                                            </Border>
+                                                        </StackPanel>
+                                                        <TextBlock Text="{Binding Message}"
+                                                                   Style="{StaticResource CaptionTextBlockStyle}"
+                                                                   TextWrapping="WrapWholeWords"/>
+                                                        <TextBlock Text="{Binding Metadata}"
+                                                                   Style="{StaticResource CaptionTextBlockStyle}"
+                                                                   Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
+                                                    </StackPanel>
+                                                    <Button Grid.Column="2"
+                                                            Tag="{Binding Id}"
+                                                            AutomationProperties.Name="{Binding DismissAutomationName}"
+                                                            Padding="6"
+                                                            MinWidth="30" MinHeight="30"
+                                                            VerticalAlignment="Top"
+                                                            Background="Transparent"
+                                                            BorderThickness="0"
+                                                            Click="OnBellDismissNotificationClick">
+                                                        <FontIcon Glyph="&#xE711;"
+                                                                  FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                                                  FontSize="11"/>
+                                                    </Button>
+                                                </Grid>
+                                            </Border>
+                                        </DataTemplate>
+                                    </ListView.ItemTemplate>
+                                </ListView>
+
+                                <Border x:Name="BellEmptyState"
+                                        Grid.Row="1"
+                                        Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                                        BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                                        BorderThickness="1"
+                                        CornerRadius="8"
+                                        Padding="20"
+                                        Margin="0,4"
+                                        VerticalAlignment="Top">
+                                    <StackPanel Spacing="6">
+                                        <TextBlock x:Uid="NotificationsFlyout_EmptyTitle"
+                                                   Text="No notifications"
+                                                   Style="{StaticResource BodyStrongTextBlockStyle}"/>
+                                        <TextBlock x:Uid="NotificationsPage_EmptyDescription"
+                                                   Text="New app notifications will appear here until you dismiss or clear them."
+                                                   Style="{StaticResource CaptionTextBlockStyle}"
+                                                   Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                   TextWrapping="WrapWholeWords"/>
+                                    </StackPanel>
+                                </Border>
+
+                                <Grid Grid.Row="2" Margin="2,8,2,0" ColumnSpacing="8">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                    </Grid.ColumnDefinitions>
+                                    <HyperlinkButton x:Uid="NotificationsFlyout_OpenPage"
+                                                     Content="Open notifications"
+                                                     Padding="4,0" VerticalAlignment="Center"
+                                                     Click="OnBellOpenPageClick"/>
+                                    <TextBlock x:Name="BellActiveCountText" Grid.Column="1" Text=""
+                                               Style="{StaticResource CaptionTextBlockStyle}"
+                                               Foreground="{ThemeResource TextFillColorTertiaryBrush}"
+                                               VerticalAlignment="Center"/>
+                                </Grid>
+                            </Grid>
+                        </Flyout>
+                    </Button.Flyout>
+                </Button>
             </StackPanel>
         </Grid>
 
@@ -121,19 +339,25 @@
                  IsClosable="True"
                  Closed="OnAppNotificationInfoBarClosed">
             <InfoBar.Content>
-                <Grid ColumnSpacing="12" Margin="0,0,0,8">
+                <Grid ColumnSpacing="12" Margin="0,0,0,4" VerticalAlignment="Center">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"/>
                         <ColumnDefinition Width="Auto"/>
                     </Grid.ColumnDefinitions>
+                    <!-- Single-line message: bold headline + regular detail
+                         (Runs set in RenderAppNotification). Trims rather than
+                         wrapping so the banner stays one line tall. -->
                     <TextBlock x:Name="AppNotificationMessageText"
-                               TextWrapping="WrapWholeWords"
-                               VerticalAlignment="Center"/>
-                    <Button x:Name="AppNotificationActionButton"
-                           Grid.Column="1"
-                           Visibility="Collapsed"
-                           VerticalAlignment="Center"
-                           Click="OnAppNotificationActionButtonClick"/>
+                               VerticalAlignment="Center"
+                               TextWrapping="NoWrap"
+                               TextTrimming="CharacterEllipsis"/>
+                    <!-- Action sits at the far right of the banner, before the
+                         close button — mirrors the prior Connection-page bar. -->
+                    <HyperlinkButton x:Name="AppNotificationActionButton"
+                            Grid.Column="1"
+                            Visibility="Collapsed"
+                            VerticalAlignment="Center"
+                            Click="OnAppNotificationActionButtonClick"/>
                 </Grid>
             </InfoBar.Content>
         </InfoBar>
@@ -147,6 +371,7 @@
             </Grid.Clip>
 
             <NavigationView
+                x:Uid="HubWindow_MainNavigation"
                 x:Name="NavView"
                 IsBackButtonVisible="Collapsed"
                 IsSettingsVisible="False"
@@ -189,59 +414,57 @@
                 <SvgImageSource x:Key="Permissions_Icon" UriSource="ms-appx:///Assets/SidebarIcons/Permissions.svg"/>
                 <SvgImageSource x:Key="Sandbox_Icon" UriSource="ms-appx:///Assets/SidebarIcons/Sandbox.svg"/>
                 <SvgImageSource x:Key="Activity_Icon" UriSource="ms-appx:///Assets/SidebarIcons/Activity.svg"/>
-                <SvgImageSource x:Key="Notifications_Icon" UriSource="ms-appx:///Assets/SidebarIcons/Notifications.svg"/>
                 <SvgImageSource x:Key="Debug_Icon" UriSource="ms-appx:///Assets/SidebarIcons/Debug.svg"/>
-                <SvgImageSource x:Key="Info_Icon" UriSource="ms-appx:///Assets/SidebarIcons/Info.svg"/>
             </NavigationView.Resources>
 
             <NavigationView.MenuItems>
                 <NavigationViewItem x:Uid="HubWindow_NavigationViewItem_82" x:Name="NavChat" Tag="chat" Content="Chat">
-                    <NavigationViewItem.Icon><ImageIcon Source="{StaticResource Chat_Icon}"/></NavigationViewItem.Icon>
+                    <NavigationViewItem.Icon><ImageIcon Source="{StaticResource Chat_Icon}" AutomationProperties.AccessibilityView="Raw"/></NavigationViewItem.Icon>
                 </NavigationViewItem>
                 <NavigationViewItemSeparator/>
 
             <NavigationViewItemHeader x:Uid="HubWindow_NavigationViewItemHeader_87" x:Name="NavGatewayHeader" Content="Gateway"/>
             <NavigationViewItem x:Uid="HubWindow_NavigationViewItem_88" Tag="connection" Content="Connection">
-                <NavigationViewItem.Icon><ImageIcon Source="{StaticResource Connection_Icon}"/></NavigationViewItem.Icon>
+                <NavigationViewItem.Icon><ImageIcon Source="{StaticResource Connection_Icon}" AutomationProperties.AccessibilityView="Raw"/></NavigationViewItem.Icon>
             </NavigationViewItem>
             <NavigationViewItem x:Uid="HubWindow_NavigationViewItem_91" x:Name="NavSessions" Tag="sessions" Content="Sessions">
-                <NavigationViewItem.Icon><ImageIcon Source="{StaticResource Sessions_Icon}"/></NavigationViewItem.Icon>
+                <NavigationViewItem.Icon><ImageIcon Source="{StaticResource Sessions_Icon}" AutomationProperties.AccessibilityView="Raw"/></NavigationViewItem.Icon>
             </NavigationViewItem>
             <NavigationViewItem x:Uid="HubWindow_NavigationViewItem_97" x:Name="NavSkills" Tag="skills" Content="Skills">
-                <NavigationViewItem.Icon><ImageIcon Source="{StaticResource Skills_Icon}"/></NavigationViewItem.Icon>
+                <NavigationViewItem.Icon><ImageIcon Source="{StaticResource Skills_Icon}" AutomationProperties.AccessibilityView="Raw"/></NavigationViewItem.Icon>
             </NavigationViewItem>
             <NavigationViewItem x:Uid="HubWindow_NavigationViewItem_109" x:Name="NavChannels" Tag="channels" Content="Channels">
-                <NavigationViewItem.Icon><ImageIcon Source="{StaticResource Channels_Icon}"/></NavigationViewItem.Icon>
+                <NavigationViewItem.Icon><ImageIcon Source="{StaticResource Channels_Icon}" AutomationProperties.AccessibilityView="Raw"/></NavigationViewItem.Icon>
             </NavigationViewItem>
             <NavigationViewItem x:Uid="HubWindow_NavigationViewItem_112" x:Name="NavInstances" Tag="instances" Content="Instances">
-                <NavigationViewItem.Icon><ImageIcon Source="{StaticResource Instances_Icon}"/></NavigationViewItem.Icon>
+                <NavigationViewItem.Icon><ImageIcon Source="{StaticResource Instances_Icon}" AutomationProperties.AccessibilityView="Raw"/></NavigationViewItem.Icon>
             </NavigationViewItem>
             <NavigationViewItem x:Uid="HubWindow_NavigationViewItem_124" x:Name="NavCron" Tag="cron" Content="Cron">
-                <NavigationViewItem.Icon><ImageIcon Source="{StaticResource Cron_Icon}"/></NavigationViewItem.Icon>
+                <NavigationViewItem.Icon><ImageIcon Source="{StaticResource Cron_Icon}" AutomationProperties.AccessibilityView="Raw"/></NavigationViewItem.Icon>
             </NavigationViewItem>
             <!-- Advanced — consolidates gateway-oriented pages -->
             <NavigationViewItem x:Uid="HubWindow_Advanced" x:Name="NavAdvanced" Content="Advanced" SelectsOnInvoked="False">
-                <NavigationViewItem.Icon><ImageIcon Source="{StaticResource Advanced_Icon}"/></NavigationViewItem.Icon>
+                <NavigationViewItem.Icon><ImageIcon Source="{StaticResource Advanced_Icon}" AutomationProperties.AccessibilityView="Raw"/></NavigationViewItem.Icon>
                 <NavigationViewItem.MenuItems>
                     <NavigationViewItem x:Uid="HubWindow_NavigationViewItem_94" Tag="agentevents" Content="Event Stream">
-                        <NavigationViewItem.Icon><ImageIcon Source="{StaticResource AgentEvents_Icon}"/></NavigationViewItem.Icon>
+                        <NavigationViewItem.Icon><ImageIcon Source="{StaticResource AgentEvents_Icon}" AutomationProperties.AccessibilityView="Raw"/></NavigationViewItem.Icon>
                     </NavigationViewItem>
                     <NavigationViewItem x:Uid="AgentsNavItem" x:Name="AgentsNavItem" Content="Agents" SelectsOnInvoked="False" IsExpanded="True">
-                        <NavigationViewItem.Icon><ImageIcon Source="{StaticResource Agents_Icon}"/></NavigationViewItem.Icon>
+                        <NavigationViewItem.Icon><ImageIcon Source="{StaticResource Agents_Icon}" AutomationProperties.AccessibilityView="Raw"/></NavigationViewItem.Icon>
                         <NavigationViewItem.MenuItems>
                             <NavigationViewItem x:Uid="DefaultAgentNavItem" x:Name="DefaultAgentNavItem" Content="main" Tag="agent:main">
-                                <NavigationViewItem.Icon><ImageIcon Source="{StaticResource Agents_Icon}"/></NavigationViewItem.Icon>
+                                <NavigationViewItem.Icon><ImageIcon Source="{StaticResource Agents_Icon}" AutomationProperties.AccessibilityView="Raw"/></NavigationViewItem.Icon>
                             </NavigationViewItem>
                         </NavigationViewItem.MenuItems>
                     </NavigationViewItem>
                     <NavigationViewItem x:Uid="HubWindow_NavigationViewItem_115" Tag="bindings" Content="Bindings">
-                        <NavigationViewItem.Icon><ImageIcon Source="{StaticResource Bindings_Icon}"/></NavigationViewItem.Icon>
+                        <NavigationViewItem.Icon><ImageIcon Source="{StaticResource Bindings_Icon}" AutomationProperties.AccessibilityView="Raw"/></NavigationViewItem.Icon>
                     </NavigationViewItem>
                     <NavigationViewItem x:Uid="HubWindow_NavigationViewItem_118" Tag="config" Content="Config">
-                        <NavigationViewItem.Icon><ImageIcon Source="{StaticResource Config_Icon}"/></NavigationViewItem.Icon>
+                        <NavigationViewItem.Icon><ImageIcon Source="{StaticResource Config_Icon}" AutomationProperties.AccessibilityView="Raw"/></NavigationViewItem.Icon>
                     </NavigationViewItem>
                     <NavigationViewItem x:Uid="HubWindow_NavigationViewItem_121" Tag="usage" Content="Usage">
-                        <NavigationViewItem.Icon><ImageIcon Source="{StaticResource Usage_Icon}"/></NavigationViewItem.Icon>
+                        <NavigationViewItem.Icon><ImageIcon Source="{StaticResource Usage_Icon}" AutomationProperties.AccessibilityView="Raw"/></NavigationViewItem.Icon>
                     </NavigationViewItem>
                 </NavigationViewItem.MenuItems>
             </NavigationViewItem>
@@ -249,28 +472,22 @@
 
             <NavigationViewItemHeader x:Uid="HubWindow_NavigationViewItemHeader_129" Content="This Computer"/>
             <NavigationViewItem x:Uid="HubWindow_NavigationViewItem_Voice" Tag="voice" Content="Voice &amp; Audio">
-                <NavigationViewItem.Icon><ImageIcon Source="{StaticResource Voice_Icon}"/></NavigationViewItem.Icon>
-            </NavigationViewItem>
-            <NavigationViewItem x:Uid="HubWindow_NavigationViewItem_133" Tag="settings" Content="Settings">
-                <NavigationViewItem.Icon><ImageIcon Source="{StaticResource Settings_Icon}"/></NavigationViewItem.Icon>
+                <NavigationViewItem.Icon><ImageIcon Source="{StaticResource Voice_Icon}" AutomationProperties.AccessibilityView="Raw"/></NavigationViewItem.Icon>
             </NavigationViewItem>
             <NavigationViewItem x:Uid="HubWindow_NavigationViewItem_136" Tag="permissions" Content="Permissions">
-                <NavigationViewItem.Icon><ImageIcon Source="{StaticResource Permissions_Icon}"/></NavigationViewItem.Icon>
+                <NavigationViewItem.Icon><ImageIcon Source="{StaticResource Permissions_Icon}" AutomationProperties.AccessibilityView="Raw"/></NavigationViewItem.Icon>
             </NavigationViewItem>
             <NavigationViewItem x:Uid="HubWindow_NavigationViewItem_Sandbox" Tag="sandbox" Content="Sandbox">
-                <NavigationViewItem.Icon><ImageIcon Source="{StaticResource Sandbox_Icon}"/></NavigationViewItem.Icon>
+                <NavigationViewItem.Icon><ImageIcon Source="{StaticResource Sandbox_Icon}" AutomationProperties.AccessibilityView="Raw"/></NavigationViewItem.Icon>
+            </NavigationViewItem>
+            <NavigationViewItem x:Uid="HubWindow_NavigationViewItem_133" Tag="settings" Content="Settings">
+                <NavigationViewItem.Icon><ImageIcon Source="{StaticResource Settings_Icon}" AutomationProperties.AccessibilityView="Raw"/></NavigationViewItem.Icon>
             </NavigationViewItem>
         </NavigationView.MenuItems>
 
         <NavigationView.FooterMenuItems>
-            <NavigationViewItem x:Uid="HubWindow_NavigationViewItem_Notifications" Tag="notifications" Content="Notifications">
-                <NavigationViewItem.Icon><ImageIcon Source="{StaticResource Notifications_Icon}"/></NavigationViewItem.Icon>
-            </NavigationViewItem>
-            <NavigationViewItem x:Uid="HubWindow_NavigationViewItem_145" Tag="debug" Content="Debug">
-                <NavigationViewItem.Icon><ImageIcon Source="{StaticResource Debug_Icon}"/></NavigationViewItem.Icon>
-            </NavigationViewItem>
-            <NavigationViewItem x:Uid="HubWindow_NavigationViewItem_148" Tag="info" Content="Info">
-                <NavigationViewItem.Icon><ImageIcon Source="{StaticResource Info_Icon}"/></NavigationViewItem.Icon>
+            <NavigationViewItem x:Uid="HubWindow_NavigationViewItem_145" x:Name="NavDiagnostics" Tag="debug" Content="Debug">
+                <NavigationViewItem.Icon><ImageIcon Source="{StaticResource Debug_Icon}" AutomationProperties.AccessibilityView="Raw"/></NavigationViewItem.Icon>
             </NavigationViewItem>
             </NavigationView.FooterMenuItems>
 
diff --git a/src/OpenClaw.Tray.WinUI/Windows/HubWindow.xaml.cs b/src/OpenClaw.Tray.WinUI/Windows/HubWindow.xaml.cs
index f6faa2df3..309253625 100644
--- a/src/OpenClaw.Tray.WinUI/Windows/HubWindow.xaml.cs
+++ b/src/OpenClaw.Tray.WinUI/Windows/HubWindow.xaml.cs
@@ -1,12 +1,18 @@
+using Microsoft.UI.Text;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Documents;
 using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using OpenClaw.Connection;
 using OpenClaw.Shared;
 using OpenClawTray.Helpers;
 using OpenClawTray.Pages;
 using OpenClawTray.Services;
+using OpenClawTray.ViewModels;
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Linq;
 using WinUIEx;
@@ -36,6 +42,9 @@ private static TaskCompletionSource<bool> CreateCompletedContentReady()
     private bool _suppressAppNotificationClosed;
     private bool _appNotificationActionShowsMore;
 
+    private readonly ObservableCollection<NotificationItemViewModel> _bellItems = new();
+    private bool _bellListBound;
+
     // Legacy compatibility alias
     public string SelectedAgentId => _currentAgentId;
     public Action<string?>? OpenDashboardAction { get; set; }
@@ -87,6 +96,8 @@ private static TaskCompletionSource<bool> CreateCompletedContentReady()
     public HubWindow()
     {
         InitializeComponent();
+        Title = AppIdentity.DisplayName;
+        RefreshDiagnosticsNavVisibility();
         ApplyHighContrastFallbackIfNeeded();
         ExtendsContentIntoTitleBar = true;
         SetTitleBar(AppTitleBar);
@@ -106,6 +117,29 @@ public HubWindow()
         this.SetIcon(IconHelper.GetStatusIconPath(ConnectionStatus.Connected));
 
         RootGrid.SizeChanged += OnRootGridSizeChanged;
+
+        ToolTipService.SetToolTip(StatusPillButton, LocalizationHelper.GetString("HubWindow_StatusPill_Tooltip"));
+        ToolTipService.SetToolTip(NotificationsBellButton, LocalizationHelper.GetString("HubWindow_Bell_Tooltip"));
+    }
+
+    public void RefreshDiagnosticsNavVisibility()
+    {
+        var isVisible = DiagnosticsGate.IsVisible;
+        NavDiagnostics.Visibility = isVisible ? Visibility.Visible : Visibility.Collapsed;
+        if (isVisible)
+            return;
+
+        RemoveBackStackEntries("debug");
+        if (string.Equals(_currentNavTag, "debug", StringComparison.Ordinal))
+        {
+            NavigateInternal("settings");
+            RemoveBackStackEntries("debug");
+            UpdateBackButton();
+        }
+        else
+        {
+            UpdateBackButton();
+        }
     }
 
     /// <summary>
@@ -148,12 +182,22 @@ private void OnAppNotificationChanged(object? sender, AppNotificationChangedEven
     private void RenderAppNotification(AppNotificationSnapshot snapshot)
     {
         _lastAppNotificationSnapshot = snapshot;
+
+        UpdateNotificationsBell(snapshot);
+
+        var bannerActive = snapshot.ActiveNotifications
+            .Where(n => IsBannerSeverity(n.Severity))
+            .ToList();
+        var bannerSnapshot = bannerActive.Count == snapshot.ActiveNotifications.Count
+            ? snapshot
+            : snapshot with { ActiveNotifications = bannerActive };
+
         var displayedNotificationWasRemoved = _currentAppNotification is not null
             && AppNotificationInfoBar.IsOpen
-            && !snapshot.ActiveNotifications.Any(notification =>
+            && !bannerSnapshot.ActiveNotifications.Any(notification =>
                 string.Equals(notification.Id, _currentAppNotification.Id, StringComparison.Ordinal));
         _currentAppNotification = _appNotificationBannerState.SelectVisibleNotification(
-            snapshot,
+            bannerSnapshot,
             revealHiddenIfNeeded: displayedNotificationWasRemoved);
         if (_currentAppNotification is null)
         {
@@ -164,18 +208,29 @@ private void RenderAppNotification(AppNotificationSnapshot snapshot)
         var notification = _currentAppNotification;
         AppNotificationInfoBar.Visibility = Visibility.Visible;
         AppNotificationInfoBar.Severity = ToInfoBarSeverity(notification.Severity);
-        AppNotificationInfoBar.Title = notification.Title;
+        AppNotificationInfoBar.Title = string.Empty;
         AppNotificationInfoBar.Message = string.Empty;
-        AppNotificationMessageText.Text = notification.Message;
 
-        if (snapshot.HasMultipleActiveNotifications)
+        AppNotificationMessageText.Inlines.Clear();
+        AppNotificationMessageText.Inlines.Add(new Run
         {
-            _appNotificationActionShowsMore = true;
-            AppNotificationActionButton.Content = LocalizationHelper.GetString("AppNotification_ShowMore");
-            AppNotificationActionButton.Visibility = Visibility.Visible;
-            UpdateAppNotificationActionEnabledState();
+            Text = notification.Title,
+            FontWeight = FontWeights.SemiBold
+        });
+        if (!string.IsNullOrWhiteSpace(notification.Message))
+        {
+            AppNotificationMessageText.Inlines.Add(new Run
+            {
+                Text = $" — {notification.Message}"
+            });
         }
-        else if (!string.IsNullOrWhiteSpace(notification.ActionLabel) &&
+
+        // Action-button precedence: if the visible notification is itself
+        // actionable (e.g. a connection issue routes to the Connection page),
+        // surface that action so the user can act on the banner they're
+        // looking at. Only fall back to "Show more" when the visible
+        // notification has no action of its own but others are queued.
+        if (!string.IsNullOrWhiteSpace(notification.ActionLabel) &&
             !string.IsNullOrWhiteSpace(notification.ActionRoute))
         {
             _appNotificationActionShowsMore = false;
@@ -183,6 +238,13 @@ private void RenderAppNotification(AppNotificationSnapshot snapshot)
             AppNotificationActionButton.Visibility = Visibility.Visible;
             UpdateAppNotificationActionEnabledState();
         }
+        else if (snapshot.HasMultipleActiveNotifications)
+        {
+            _appNotificationActionShowsMore = true;
+            AppNotificationActionButton.Content = LocalizationHelper.GetString("AppNotification_ShowMore");
+            AppNotificationActionButton.Visibility = Visibility.Visible;
+            UpdateAppNotificationActionEnabledState();
+        }
         else
         {
             _appNotificationActionShowsMore = false;
@@ -200,7 +262,7 @@ private void HideAppNotificationInfoBar()
         AppNotificationInfoBar.Visibility = Visibility.Collapsed;
         AppNotificationInfoBar.Title = string.Empty;
         AppNotificationInfoBar.Message = string.Empty;
-        AppNotificationMessageText.Text = string.Empty;
+        AppNotificationMessageText.Inlines.Clear();
         AppNotificationActionButton.Visibility = Visibility.Collapsed;
         _appNotificationActionShowsMore = false;
         _currentAppNotification = null;
@@ -222,6 +284,197 @@ private void UpdateAppNotificationActionEnabledState()
         _ => InfoBarSeverity.Informational
     };
 
+    private static bool IsBannerSeverity(AppNotificationSeverity severity) =>
+        severity is AppNotificationSeverity.Error or AppNotificationSeverity.Warning;
+
+    private void UpdateNotificationsBell(AppNotificationSnapshot snapshot)
+    {
+        var count = snapshot.ActiveNotifications.Count;
+
+        if (NotificationsBadge is not null)
+        {
+            NotificationsBadge.Value = count;
+            NotificationsBadge.Visibility = count > 0 ? Visibility.Visible : Visibility.Collapsed;
+        }
+
+        SyncBellItems(snapshot.ActiveNotifications.Select(NotificationItemViewModel.From).ToList());
+
+        SyncBellFlyoutEmptyState();
+    }
+
+    private void SyncBellItems(IReadOnlyList<NotificationItemViewModel> desiredItems)
+    {
+        var desiredIds = desiredItems
+            .Select(item => item.Id)
+            .ToHashSet(StringComparer.Ordinal);
+
+        for (var i = _bellItems.Count - 1; i >= 0; i--)
+        {
+            if (!desiredIds.Contains(_bellItems[i].Id))
+                _bellItems.RemoveAt(i);
+        }
+
+        for (var i = 0; i < desiredItems.Count; i++)
+        {
+            var item = desiredItems[i];
+            if (i < _bellItems.Count && string.Equals(_bellItems[i].Id, item.Id, StringComparison.Ordinal))
+            {
+                if (!_bellItems[i].Equals(item))
+                    _bellItems[i] = item;
+                continue;
+            }
+
+            var existingIndex = -1;
+            for (var j = i + 1; j < _bellItems.Count; j++)
+            {
+                if (string.Equals(_bellItems[j].Id, item.Id, StringComparison.Ordinal))
+                {
+                    existingIndex = j;
+                    break;
+                }
+            }
+
+            if (existingIndex >= 0)
+            {
+                _bellItems.Move(existingIndex, i);
+                if (!_bellItems[i].Equals(item))
+                    _bellItems[i] = item;
+            }
+            else
+            {
+                _bellItems.Insert(i, item);
+            }
+        }
+    }
+
+    private void SyncBellFlyoutEmptyState()
+    {
+        var hasItems = _bellItems.Count > 0;
+
+        if (BellNotificationsList is not null)
+            BellNotificationsList.Visibility = hasItems ? Visibility.Visible : Visibility.Collapsed;
+        if (BellEmptyState is not null)
+            BellEmptyState.Visibility = hasItems ? Visibility.Collapsed : Visibility.Visible;
+        if (BellClearAllButton is not null)
+            BellClearAllButton.Visibility = hasItems ? Visibility.Visible : Visibility.Collapsed;
+        if (BellActiveCountText is not null)
+            BellActiveCountText.Text = hasItems
+                ? LocalizationHelper.Format("NotificationsFlyout_ActiveCountFormat", _bellItems.Count)
+                : string.Empty;
+    }
+
+    private void OnNotificationsFlyoutOpening(object sender, object e)
+    {
+        if (BellNotificationsList is not null && !_bellListBound)
+        {
+            BellNotificationsList.ItemsSource = _bellItems;
+            _bellListBound = true;
+        }
+        SyncBellFlyoutEmptyState();
+    }
+
+    private void OnBellClearAllClick(object sender, RoutedEventArgs e)
+        => _appNotificationService?.ClearAll();
+
+    private void OnBellDismissNotificationClick(object sender, RoutedEventArgs e)
+    {
+        if (sender is FrameworkElement { Tag: string notificationId })
+            _appNotificationService?.Dismiss(notificationId);
+    }
+
+    private void OnBellOpenPageClick(object sender, RoutedEventArgs e)
+    {
+        NotificationsFlyout.Hide();
+        NavigateTo("notifications");
+    }
+
+    private void OnStatusFlyoutOpening(object sender, object e)
+    {
+        var snapshot = CurrentApp.ConnectionManager?.CurrentSnapshot;
+        var settings = CurrentApp.Settings;
+        var nodeEnabled = settings?.EnableNodeMode == true;
+        var enabledCapabilities = CountEnabledCapabilities(settings);
+        var op = snapshot?.OperatorState ?? RoleConnectionState.Idle;
+
+        GatewayRowDot.Fill = AccentBrush(ConnectionStatusPresenter.RoleAccent(op));
+        GatewayRowDetail.Text = BuildGatewayDetail(snapshot);
+        GatewayRowAction.Visibility =
+            op is RoleConnectionState.Connected or RoleConnectionState.Connecting
+                ? Visibility.Collapsed
+                : Visibility.Visible;
+
+        OperatorRowDot.Fill = AccentBrush(ConnectionStatusPresenter.RoleAccent(op));
+        OperatorRowDetail.Text = LocalizationHelper.GetString(
+            ConnectionStatusPresenter.RoleStateLabelKey(op));
+
+        if (snapshot is not null)
+        {
+            var (nodeKey, nodeAccent) = ConnectionStatusPresenter.NodeRow(snapshot, nodeEnabled, enabledCapabilities);
+            NodeRowDot.Fill = AccentBrush(nodeAccent);
+            NodeRowDetail.Text = LocalizationHelper.GetString(nodeKey);
+            NodeRowAction.Visibility = ConnectionStatusPresenter.NodeNeedsApproval(snapshot, nodeEnabled)
+                ? Visibility.Visible
+                : Visibility.Collapsed;
+        }
+        else
+        {
+            NodeRowDot.Fill = AccentBrush(ConnectionStatusAccent.Neutral);
+            NodeRowDetail.Text = LocalizationHelper.GetString("HubWindow_Role_Disabled");
+            NodeRowAction.Visibility = Visibility.Collapsed;
+        }
+    }
+
+    private string BuildGatewayDetail(GatewayConnectionSnapshot? snapshot)
+    {
+        var parts = new List<string>();
+        if (!string.IsNullOrWhiteSpace(snapshot?.GatewayName))
+            parts.Add(snapshot!.GatewayName!);
+        if (!string.IsNullOrWhiteSpace(snapshot?.GatewayUrl))
+            parts.Add(snapshot!.GatewayUrl!);
+        if (LastGatewaySelf is { ServerVersion: { Length: > 0 } ver })
+            parts.Add($"v{ver}");
+        return parts.Count > 0
+            ? string.Join(" · ", parts)
+            : LocalizationHelper.GetString("StatusDisplay_Disconnected");
+    }
+
+    private static int CountEnabledCapabilities(SettingsManager? settings)
+    {
+        if (settings is null) return 0;
+
+        var count = 0;
+        if (settings.NodeBrowserProxyEnabled) count++;
+        if (settings.NodeCameraEnabled) count++;
+        if (settings.NodeCanvasEnabled) count++;
+        if (settings.NodeScreenEnabled) count++;
+        if (settings.NodeLocationEnabled) count++;
+        if (settings.NodeTtsEnabled) count++;
+        if (settings.NodeSttEnabled) count++;
+        return count;
+    }
+
+    private void OnStatusFlyoutOpenConnectionClick(object sender, RoutedEventArgs e)
+    {
+        StatusFlyout.Hide();
+        NavigateTo("connection");
+    }
+
+    private void OnStatusFlyoutReconnectClick(object sender, RoutedEventArgs e)
+    {
+        StatusFlyout.Hide();
+        if (ReconnectAction is not null)
+            ReconnectAction.Invoke();
+        else
+            ConnectAction?.Invoke();
+    }
+
+    private void OnStatusFlyoutNodeActionClick(object sender, RoutedEventArgs e)
+    {
+        StatusFlyout.Hide();
+        NavigateTo("connection");
+    }
+
+
     private void OnAppNotificationInfoBarClosed(InfoBar sender, InfoBarClosedEventArgs args)
     {
         if (_suppressAppNotificationClosed)
@@ -249,7 +502,19 @@ private void OnAppNotificationActionButtonClick(object sender, RoutedEventArgs e
 
         if (_currentAppNotification?.ActionRoute is { Length: > 0 } route)
         {
-            NavigateTo(route);
+            if (AppNotificationActionRoutes.TryGetChatSessionKey(route, out var sessionKey))
+            {
+                CurrentApp.PendingChatSessionKey = sessionKey;
+                PendingChatSessionKey = sessionKey;
+                if (CurrentPage is ChatPage chatPage)
+                    chatPage.SelectSession(sessionKey!);
+                else
+                    NavigateTo("chat");
+            }
+            else
+            {
+                NavigateTo(route);
+            }
             _appNotificationService?.Dismiss(_currentAppNotification.Id);
             return;
         }
@@ -282,8 +547,6 @@ private void OnAppModelChanged(object? sender, PropertyChangedEventArgs e)
                 {
                     if (IsClosed) return;
                     UpdateTitleBarStatus(AppModel!.Status);
-                    if (ContentFrame?.Content is AboutPage about)
-                        about.RefreshGatewayInfo();
                 });
                 break;
             case nameof(AppState.AgentsList):
@@ -329,11 +592,6 @@ private void OnNavContentHostSizeChanged(object sender, SizeChangedEventArgs e)
         NavContentClip.Rect = new global::Windows.Foundation.Rect(0, 0, e.NewSize.Width, e.NewSize.Height);
     }
 
-    private void OnTitleBarStatusTapped(object sender, Microsoft.UI.Xaml.Input.TappedRoutedEventArgs e)
-    {
-        NavigateTo("connection");
-    }
-
     private void OnNavPaneToggleButtonClick(object sender, RoutedEventArgs e)
     {
         NavView.IsPaneOpen = !NavView.IsPaneOpen;
@@ -410,7 +668,7 @@ private string NormalizeNavTag(string tag)
         // layout on Connection. Any caller still using "home" or "general"
         // (deep links, persisted nav state, command palette) lands here.
         if (tag == "home" || tag == "general") return "connection";
-        if (tag == "about") return "info";
+        if (tag == "about" || tag == "info") return "settings";
         if (tag == "nodes") return "instances";
         // Map legacy agent-scoped workspace/cron tags
         if (tag == "cron") return $"agent:{_currentAgentId}:cron";
@@ -420,6 +678,9 @@ private string NormalizeNavTag(string tag)
 
     private void NavigateInternal(string tag)
     {
+        if (tag == "debug" && !DiagnosticsGate.IsVisible)
+            tag = "settings";
+
         var pageType = TagToPageType(tag);
         if (pageType == null) return;
 
@@ -461,6 +722,14 @@ private void SyncNavSelection(string? tag)
             _syncingNavSelection = true;
             try { NavView.SelectedItem = item; }
             finally { _syncingNavSelection = false; }
+            return;
+        }
+
+        if (item == null && NavView.SelectedItem != null)
+        {
+            _syncingNavSelection = true;
+            try { NavView.SelectedItem = null; }
+            finally { _syncingNavSelection = false; }
         }
     }
 
@@ -498,52 +767,57 @@ public async Task WaitForCurrentContentReadyAsync()
 
     private void UpdateTitleBarStatus(ConnectionStatus status)
     {
-        var color = status switch
-        {
-            ConnectionStatus.Connected => Microsoft.UI.Colors.LimeGreen,
-            ConnectionStatus.Connecting => Microsoft.UI.Colors.Orange,
-            ConnectionStatus.Error => Microsoft.UI.Colors.Red,
-            _ => Microsoft.UI.Colors.Gray
-        };
-
-        TitleStatusDot.Fill = new Microsoft.UI.Xaml.Media.SolidColorBrush(color);
+        var snapshot = CurrentApp.ConnectionManager?.CurrentSnapshot;
+        var (text, accent) = ComputePillState(status, snapshot);
+        StatusPillText.Text = text;
+        StatusPillDot.Fill = AccentBrush(accent);
+    }
 
-        // Build status text with version when connected
-        if (status == ConnectionStatus.Connected && LastGatewaySelf is { ServerVersion: { Length: > 0 } ver })
-            TitleStatusText.Text = $"v{ver}";
-        else
-            TitleStatusText.Text = LocalizationHelper.GetConnectionStatusText(status);
+    internal void UpdateTitleBarStatus(GatewayConnectionSnapshot snapshot, ConnectionStatus status)
+    {
+        var (text, accent) = ComputePillState(status, snapshot);
+        StatusPillText.Text = text;
+        StatusPillDot.Fill = AccentBrush(accent);
+    }
 
-        // Update role indicator dots
-        var snapshot = CurrentApp.ConnectionManager?.CurrentSnapshot;
-        if (snapshot != null)
+    private static (string Text, ConnectionStatusAccent Accent) ComputePillState(
+        ConnectionStatus status, GatewayConnectionSnapshot? snapshot)
+    {
+        if (snapshot is not null)
         {
-            TitleOpDot.Fill = RoleDotBrush(snapshot.OperatorState);
-            TitleNodeDot.Fill = RoleDotBrush(snapshot.NodeState);
+            var (labelKey, accent) = ConnectionStatusPresenter.Pill(snapshot.OverallState);
+            return (LocalizationHelper.GetString(labelKey), accent);
         }
-        else
+
+        return status switch
         {
-            var gray = new Microsoft.UI.Xaml.Media.SolidColorBrush(Microsoft.UI.Colors.Gray);
-            TitleOpDot.Fill = gray;
-            TitleNodeDot.Fill = gray;
-        }
+            ConnectionStatus.Connected => (LocalizationHelper.GetString("StatusDisplay_Connected"), ConnectionStatusAccent.Success),
+            ConnectionStatus.Connecting => (LocalizationHelper.GetString("StatusDisplay_Connecting"), ConnectionStatusAccent.Caution),
+            ConnectionStatus.Error => (LocalizationHelper.GetString("StatusDisplay_Error"), ConnectionStatusAccent.Critical),
+            _ => (LocalizationHelper.GetString("StatusDisplay_Disconnected"), ConnectionStatusAccent.Neutral),
+        };
     }
 
-    private static Microsoft.UI.Xaml.Media.SolidColorBrush RoleDotBrush(OpenClaw.Connection.RoleConnectionState state) => state switch
+    private static string AccentBrushKey(ConnectionStatusAccent accent) => accent switch
     {
-        OpenClaw.Connection.RoleConnectionState.Connected =>
-            new Microsoft.UI.Xaml.Media.SolidColorBrush(Microsoft.UI.Colors.LimeGreen),
-        OpenClaw.Connection.RoleConnectionState.Connecting =>
-            new Microsoft.UI.Xaml.Media.SolidColorBrush(Microsoft.UI.Colors.Orange),
-        OpenClaw.Connection.RoleConnectionState.PairingRequired =>
-            new Microsoft.UI.Xaml.Media.SolidColorBrush(Microsoft.UI.Colors.Orange),
-        OpenClaw.Connection.RoleConnectionState.Error or
-        OpenClaw.Connection.RoleConnectionState.PairingRejected or
-        OpenClaw.Connection.RoleConnectionState.RateLimited =>
-            new Microsoft.UI.Xaml.Media.SolidColorBrush(Microsoft.UI.Colors.Red),
-        _ => new Microsoft.UI.Xaml.Media.SolidColorBrush(Microsoft.UI.Colors.Gray),
+        ConnectionStatusAccent.Success => "SystemFillColorSuccessBrush",
+        ConnectionStatusAccent.Caution => "SystemFillColorCautionBrush",
+        ConnectionStatusAccent.Critical => "SystemFillColorCriticalBrush",
+        _ => "SystemFillColorNeutralBrush",
     };
 
+    private static Brush AccentBrush(ConnectionStatusAccent accent)
+    {
+        var resources = Application.Current.Resources;
+        if (resources.TryGetValue(AccentBrushKey(accent), out var brush) && brush is Brush typed)
+            return typed;
+
+        if (resources.TryGetValue("SystemFillColorNeutralBrush", out var neutral) && neutral is Brush fallback)
+            return fallback;
+
+        return new SolidColorBrush(Microsoft.UI.Colors.Transparent);
+    }
+
     private void ScheduleGatewayNavVisibilityForStatus(ConnectionStatus status, bool debounceDisconnected)
     {
         switch (GatewayNavVisibilityDebouncePolicy.GetDecision(status, debounceDisconnected))
@@ -637,13 +911,18 @@ private void RemoveUnavailableGatewayBackStackEntries()
         if (AppModel?.Status == ConnectionStatus.Connected)
             return;
 
+        RemoveBackStackEntries(GatewayNavVisibilityDebouncePolicy.IsGatewayPageTag);
+    }
+
+    private void RemoveBackStackEntries(string tag) =>
+        RemoveBackStackEntries(candidate => string.Equals(candidate, tag, StringComparison.Ordinal));
+
+    private void RemoveBackStackEntries(Func<string, bool> shouldRemove)
+    {
         for (var i = ContentFrame.BackStack.Count - 1; i >= 0; i--)
         {
-            if (ContentFrame.BackStack[i].Parameter is string tag &&
-                GatewayNavVisibilityDebouncePolicy.IsGatewayPageTag(tag))
-            {
+            if (ContentFrame.BackStack[i].Parameter is string tag && shouldRemove(tag))
                 ContentFrame.BackStack.RemoveAt(i);
-            }
         }
     }
 
@@ -828,7 +1107,6 @@ private void InitializeCurrentPage()
             case SettingsPage settings: settings.Initialize(); break;
             case NotificationsPage notifications: notifications.Initialize(_appNotificationService); break;
             case DebugPage debug: debug.Initialize(); break;
-            case AboutPage about: about.Initialize(); break;
         }
     }
 
@@ -859,7 +1137,7 @@ public void SetActivityFilter(string? filter)
         "settings" => typeof(SettingsPage),
         "notifications" => typeof(NotificationsPage),
         "debug" => typeof(DebugPage),
-        "info" => typeof(AboutPage),
+        "info" => typeof(SettingsPage),
         // Legacy tags
         "home" => typeof(ConnectionPage),
         "general" => typeof(ConnectionPage),
@@ -869,7 +1147,7 @@ public void SetActivityFilter(string? filter)
         "skills" => typeof(SkillsPage),
         "cron" => typeof(CronPage),
         "workspace" => typeof(WorkspacePage),
-        "about" => typeof(AboutPage),
+        "about" => typeof(SettingsPage),
         // Agent-scoped pages
         _ when tag?.StartsWith("agent:") == true => ResolveAgentPageType(tag),
         _ => null
@@ -995,14 +1273,17 @@ internal List<CommandItem> BuildCommandList()
             new() { Icon = "🛡️", Title = LocalizationHelper.GetString("Command_GoToPermissions_Title"), Subtitle = LocalizationHelper.GetString("Command_GoToPermissions_Subtitle"), Tag = "permissions" },
             new() { Icon = "⚙️", Title = LocalizationHelper.GetString("Command_GoToSettings_Title"), Subtitle = LocalizationHelper.GetString("Command_GoToSettings_Subtitle"), Tag = "settings" },
             new() { Icon = "🔔", Title = LocalizationHelper.GetString("Command_GoToNotifications_Title"), Subtitle = LocalizationHelper.GetString("Command_GoToNotifications_Subtitle"), Tag = "notifications" },
-            new() { Icon = "🐛", Title = LocalizationHelper.GetString("Command_GoToDiagnostics_Title"), Subtitle = LocalizationHelper.GetString("Command_GoToDiagnostics_Subtitle"), Tag = "debug" },
-            new() { Icon = "ℹ️", Title = LocalizationHelper.GetString("Command_GoToInfo_Title"), Subtitle = LocalizationHelper.GetString("Command_GoToInfo_Subtitle"), Tag = "info" },
 
             // Actions
             new() { Icon = "💬", Title = LocalizationHelper.GetString("Command_OpenChatWindow_Title"), Subtitle = LocalizationHelper.GetString("Command_OpenChatWindow_Subtitle"), Tag = "chat" },
             new() { Icon = "🌐", Title = LocalizationHelper.GetString("Command_OpenDashboard_Title"), Subtitle = LocalizationHelper.GetString("Command_OpenDashboard_Subtitle"), Execute = () => ((IAppCommands)Application.Current).OpenDashboard(null) },
         };
 
+        if (DiagnosticsGate.IsVisible)
+        {
+            commands.Add(new CommandItem { Icon = "🐛", Title = LocalizationHelper.GetString("Command_GoToDiagnostics_Title"), Subtitle = LocalizationHelper.GetString("Command_GoToDiagnostics_Subtitle"), Tag = "debug" });
+        }
+
         // Toggle commands
         var settings = CurrentApp.Settings;
         if (settings != null)
@@ -1102,7 +1383,6 @@ private void ExecuteCommand(CommandItem cmd)
         { "activity",    "\uEA95" },
         { "notifications", "\uE7F4" },
         { "debug",       "\uEBE8" },
-        { "info",        "\uE946" },
     };
 
     // Glyphs for the two parent NavigationViewItems that don't carry a Tag
diff --git a/src/OpenClaw.Tray.WinUI/Windows/SetupWizardWindow.cs b/src/OpenClaw.Tray.WinUI/Windows/SetupWizardWindow.cs
deleted file mode 100644
index c2ae343c1..000000000
--- a/src/OpenClaw.Tray.WinUI/Windows/SetupWizardWindow.cs
+++ /dev/null
@@ -1,975 +0,0 @@
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Automation;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Text;
-using OpenClaw.Shared;
-using OpenClawTray.Helpers;
-using OpenClawTray.Services;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.WindowsRuntime;
-using System.Text.Json;
-using System.Threading.Tasks;
-using Windows.ApplicationModel.DataTransfer;
-using Windows.Storage.Pickers;
-using WinUIEx;
-using ZXing;
-using ZXing.Common;
-using DrawingBitmap = System.Drawing.Bitmap;
-using DrawingGraphics = System.Drawing.Graphics;
-using DrawingImageLockMode = System.Drawing.Imaging.ImageLockMode;
-using DrawingPixelFormat = System.Drawing.Imaging.PixelFormat;
-
-namespace OpenClawTray.Windows;
-
-/// <summary>
-/// Multi-step setup wizard for first-run and re-configuration.
-/// Steps: Gateway URL → Token → Node Mode (optional) → Done
-/// Settings are drafted in memory and committed once on Finish.
-/// </summary>
-public sealed class SetupWizardWindow : WindowEx
-{
-    private int _currentStep = 0;
-    private const int TotalSteps = 3;
-
-    // Draft settings (not saved until Finish)
-    private string _draftGatewayUrl = "ws://";
-    private string _draftToken = "";
-    private string _draftBootstrapToken = "";
-    private bool _draftEnableNodeMode = false;
-
-    // UI elements
-    private readonly StackPanel[] _stepPanels = new StackPanel[TotalSteps];
-    private readonly Button _backButton;
-    private readonly Button _nextButton;
-    private readonly TextBlock _stepIndicator;
-
-    // Step 0: Setup code + manual entry
-    private readonly TextBox _setupCodeBox;
-    private readonly TextBox _gatewayUrlBox;
-    private readonly TextBox _tokenBox;
-    private readonly TextBlock _testStatusLabel;
-    private readonly Button _testButton;
-    private readonly StackPanel _manualEntryPanel;
-    private bool _connectionTested = false;
-
-    // Step 1: Node mode
-    private readonly ToggleSwitch _nodeModeToggle;
-    private readonly TextBlock _deviceIdText;
-    private readonly Button _copyDeviceIdButton;
-    private readonly TextBlock _pairingStatusText;
-    private bool _hasStoredDeviceToken;
-
-    // Result
-    public bool Completed { get; private set; } = false;
-    public event EventHandler? SetupCompleted;
-
-    private readonly SettingsManager _existingSettings;
-
-    public SetupWizardWindow(SettingsManager settings)
-    {
-        _existingSettings = settings;
-        _draftGatewayUrl = settings.GatewayUrl;
-        _draftToken = "";
-        _draftBootstrapToken = "";
-        _draftEnableNodeMode = settings.EnableNodeMode;
-
-        Title = LocalizationHelper.GetString("Setup_Title");
-        ExtendsContentIntoTitleBar = true;
-        this.SetWindowSize(720, 900);
-        this.CenterOnScreen();
-        this.SetIcon("Assets\\openclaw.ico");
-        SystemBackdrop = new MicaBackdrop();
-
-        var root = new Grid { Padding = new Thickness(32) };
-        root.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto }); // Header
-        root.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto }); // Step indicator
-        root.RowDefinitions.Add(new RowDefinition { Height = new GridLength(1, GridUnitType.Star) }); // Content
-        root.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto }); // Buttons
-
-        // Header
-        var header = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 12, Margin = new Thickness(0, 0, 0, 8) };
-        header.Children.Add(new TextBlock { Text = "🦞", FontSize = 36 });
-        header.Children.Add(new TextBlock
-        {
-            Text = LocalizationHelper.GetString("Setup_Title"),
-            Style = (Style)Application.Current.Resources["TitleTextBlockStyle"],
-            VerticalAlignment = VerticalAlignment.Center
-        });
-        Grid.SetRow(header, 0);
-        root.Children.Add(header);
-
-        // Step indicator
-        _stepIndicator = new TextBlock
-        {
-            Text = LocalizationHelper.GetString("Setup_StepConnect"),
-            Foreground = (SolidColorBrush)Application.Current.Resources["TextFillColorSecondaryBrush"],
-            Margin = new Thickness(0, 0, 0, 16)
-        };
-        Grid.SetRow(_stepIndicator, 1);
-        root.Children.Add(_stepIndicator);
-
-        // Content area — all step panels stacked, visibility toggled
-        var contentArea = new Grid();
-
-        // === Step 0: Setup Code (combined URL + Token) ===
-        _stepPanels[0] = new StackPanel { Spacing = 12 };
-        _stepPanels[0].Children.Add(new TextBlock
-        {
-            Text = LocalizationHelper.GetString("Setup_ConnectTitle"),
-            FontWeight = FontWeights.SemiBold,
-            Style = (Style)Application.Current.Resources["SubtitleTextBlockStyle"]
-        });
-        _stepPanels[0].Children.Add(new TextBlock
-        {
-            Text = LocalizationHelper.GetString("Setup_ConnectDescription"),
-            TextWrapping = TextWrapping.Wrap,
-            Foreground = (SolidColorBrush)Application.Current.Resources["TextFillColorSecondaryBrush"]
-        });
-        var cmdHint = new TextBox
-        {
-            Text = "openclaw qr --url ws://your-gateway-ip:18789",
-            IsReadOnly = true,
-            FontFamily = new FontFamily("Cascadia Mono, Consolas"),
-            BorderThickness = new Thickness(1),
-            Background = (SolidColorBrush)Application.Current.Resources["CardBackgroundFillColorDefaultBrush"],
-            Foreground = (SolidColorBrush)Application.Current.Resources["SystemFillColorSuccessBrush"],
-            Padding = new Thickness(12, 8, 12, 8)
-        };
-        _stepPanels[0].Children.Add(cmdHint);
-        _setupCodeBox = new TextBox
-        {
-            Header = LocalizationHelper.GetString("Setup_SetupCodeHeader"),
-            PlaceholderText = LocalizationHelper.GetString("Setup_SetupCodePlaceholder"),
-            TextWrapping = TextWrapping.Wrap,
-            AcceptsReturn = false
-        };
-        AutomationProperties.SetAutomationId(_setupCodeBox, "SetupCodeBox");
-        _setupCodeBox.TextChanged += OnSetupCodeChanged;
-        _stepPanels[0].Children.Add(_setupCodeBox);
-
-        var setupCodeActions = new StackPanel
-        {
-            Orientation = Orientation.Horizontal,
-            Spacing = 8
-        };
-        var pasteSetupButton = new Button { Content = LocalizationHelper.GetString("Setup_PasteSetupButton") };
-        AutomationProperties.SetAutomationId(pasteSetupButton, "PasteSetupButton");
-        pasteSetupButton.Click += OnPasteSetupFromClipboard;
-        setupCodeActions.Children.Add(pasteSetupButton);
-
-        var importQrButton = new Button { Content = LocalizationHelper.GetString("Setup_ImportQrButton") };
-        AutomationProperties.SetAutomationId(importQrButton, "ImportQrButton");
-        importQrButton.Click += OnImportQrImage;
-        setupCodeActions.Children.Add(importQrButton);
-        _stepPanels[0].Children.Add(setupCodeActions);
-
-        // Manual entry toggle
-        var manualToggle = new HyperlinkButton { Content = LocalizationHelper.GetString("Setup_ManualEntryToggle") };
-        AutomationProperties.SetAutomationId(manualToggle, "ManualEntryToggle");
-        _manualEntryPanel = new StackPanel { Spacing = 8, Visibility = Visibility.Collapsed };
-        manualToggle.Click += (s, e) =>
-        {
-            _manualEntryPanel.Visibility = _manualEntryPanel.Visibility == Visibility.Visible
-                ? Visibility.Collapsed : Visibility.Visible;
-            manualToggle.Content = _manualEntryPanel.Visibility == Visibility.Visible
-                ? LocalizationHelper.GetString("Setup_ManualEntryToggleHide") : LocalizationHelper.GetString("Setup_ManualEntryToggle");
-        };
-        _stepPanels[0].Children.Add(manualToggle);
-
-        _gatewayUrlBox = new TextBox
-        {
-            Header = LocalizationHelper.GetString("Setup_GatewayUrlHeader"),
-            PlaceholderText = LocalizationHelper.GetString("Setup_GatewayUrlPlaceholder"),
-            Text = _draftGatewayUrl
-        };
-        AutomationProperties.SetAutomationId(_gatewayUrlBox, "GatewayUrlBox");
-        _gatewayUrlBox.TextChanged += (s, e) => _connectionTested = false;
-        _manualEntryPanel.Children.Add(_gatewayUrlBox);
-        _manualEntryPanel.Children.Add(new TextBlock
-        {
-            Text = LocalizationHelper.GetString("Setup_GatewayUrlHint"),
-            Style = (Style)Application.Current.Resources["CaptionTextBlockStyle"],
-            Foreground = (SolidColorBrush)Application.Current.Resources["TextFillColorSecondaryBrush"]
-        });
-        _tokenBox = new TextBox
-        {
-            Header = LocalizationHelper.GetString("Setup_TokenHeader"),
-            PlaceholderText = LocalizationHelper.GetString("Setup_TokenPlaceholder"),
-            Text = _draftToken
-        };
-        AutomationProperties.SetAutomationId(_tokenBox, "TokenBox");
-        _tokenBox.TextChanged += (s, e) => _connectionTested = false;
-        _tokenBox.TextChanged += (s, e) =>
-        {
-            _draftToken = _tokenBox.Text;
-            UpdatePairingStatusText();
-        };
-        _manualEntryPanel.Children.Add(_tokenBox);
-        _stepPanels[0].Children.Add(_manualEntryPanel);
-
-        // Test connection
-        _testButton = new Button { Content = LocalizationHelper.GetString("Setup_TestButton") };
-        AutomationProperties.SetAutomationId(_testButton, "TestConnectionButton");
-        _testButton.Click += OnTestConnection;
-        _stepPanels[0].Children.Add(_testButton);
-        _testStatusLabel = new TextBlock
-        {
-            TextWrapping = TextWrapping.Wrap,
-            Margin = new Thickness(0, 4, 0, 0)
-        };
-        _stepPanels[0].Children.Add(_testStatusLabel);
-        contentArea.Children.Add(_stepPanels[0]);
-
-        // === Step 1: Node Mode ===
-        _stepPanels[1] = new StackPanel { Spacing = 12, Visibility = Visibility.Collapsed };
-        _stepPanels[1].Children.Add(new TextBlock
-        {
-            Text = LocalizationHelper.GetString("Setup_NodeModeTitle"),
-            FontWeight = FontWeights.SemiBold,
-            Style = (Style)Application.Current.Resources["SubtitleTextBlockStyle"]
-        });
-        _stepPanels[1].Children.Add(new TextBlock
-        {
-            Text = LocalizationHelper.GetString("Setup_NodeModeDescription"),
-            TextWrapping = TextWrapping.Wrap,
-            Foreground = (SolidColorBrush)Application.Current.Resources["TextFillColorSecondaryBrush"]
-        });
-        var securityWarning = new InfoBar
-        {
-            Title = LocalizationHelper.GetString("Setup_NodeModeSecurityTitle"),
-            Message = LocalizationHelper.GetString("Setup_NodeModeSecurityMessage"),
-            Severity = InfoBarSeverity.Warning,
-            IsOpen = true,
-            IsClosable = false
-        };
-        AutomationProperties.SetAutomationId(securityWarning, "SetupNodeModeSecurityWarning");
-        _stepPanels[1].Children.Add(securityWarning);
-        _nodeModeToggle = new ToggleSwitch
-        {
-            Header = LocalizationHelper.GetString("Setup_NodeModeToggle"),
-            IsOn = _draftEnableNodeMode
-        };
-        AutomationProperties.SetAutomationId(_nodeModeToggle, "NodeModeToggle");
-        _nodeModeToggle.Toggled += (s, e) =>
-        {
-            UpdateNodeModePairingVisibility(_nodeModeToggle.IsOn);
-        };
-        _stepPanels[1].Children.Add(_nodeModeToggle);
-
-        _deviceIdText = new TextBlock
-        {
-            Text = LocalizationHelper.GetString("Setup_DeviceIdLoading"),
-            FontFamily = new FontFamily("Cascadia Mono, Consolas"),
-            IsTextSelectionEnabled = true,
-            TextWrapping = TextWrapping.Wrap,
-            Visibility = _draftEnableNodeMode ? Visibility.Visible : Visibility.Collapsed
-        };
-        _stepPanels[1].Children.Add(_deviceIdText);
-
-        _copyDeviceIdButton = new Button
-        {
-            Content = LocalizationHelper.GetString("Setup_CopyDeviceId"),
-            Visibility = _draftEnableNodeMode ? Visibility.Visible : Visibility.Collapsed
-        };
-        AutomationProperties.SetAutomationId(_copyDeviceIdButton, "CopyDeviceIdButton");
-        _copyDeviceIdButton.Click += OnCopyDeviceId;
-        _stepPanels[1].Children.Add(_copyDeviceIdButton);
-
-        _pairingStatusText = new TextBlock
-        {
-            TextWrapping = TextWrapping.Wrap,
-            Visibility = _draftEnableNodeMode ? Visibility.Visible : Visibility.Collapsed
-        };
-        AutomationProperties.SetAutomationId(_pairingStatusText, "SetupPairingStatusText");
-        _stepPanels[1].Children.Add(_pairingStatusText);
-
-        var pairingInstructions = new StackPanel
-        {
-            Spacing = 4,
-            Margin = new Thickness(0, 8, 0, 0)
-        };
-        pairingInstructions.Children.Add(new TextBlock
-        {
-            Text = LocalizationHelper.GetString("Setup_ApproveInstructions"),
-            TextWrapping = TextWrapping.Wrap,
-            Foreground = (SolidColorBrush)Application.Current.Resources["TextFillColorSecondaryBrush"]
-        });
-        var approveCmd = new TextBox
-        {
-            Text = "openclaw devices list\nopenclaw devices approve <device-id>",
-            IsReadOnly = true,
-            FontFamily = new FontFamily("Cascadia Mono, Consolas"),
-            BorderThickness = new Thickness(1),
-            Background = (SolidColorBrush)Application.Current.Resources["CardBackgroundFillColorDefaultBrush"],
-            Foreground = (SolidColorBrush)Application.Current.Resources["SystemFillColorSuccessBrush"],
-            Padding = new Thickness(12, 8, 12, 8),
-            AcceptsReturn = true,
-            TextWrapping = TextWrapping.Wrap
-        };
-        pairingInstructions.Children.Add(approveCmd);
-        pairingInstructions.Children.Add(new TextBlock
-        {
-            Text = LocalizationHelper.GetString("Setup_ApproveHint"),
-            TextWrapping = TextWrapping.Wrap,
-            Style = (Style)Application.Current.Resources["CaptionTextBlockStyle"],
-            Foreground = (SolidColorBrush)Application.Current.Resources["TextFillColorSecondaryBrush"]
-        });
-        _stepPanels[1].Children.Add(pairingInstructions);
-        contentArea.Children.Add(_stepPanels[1]);
-
-        // === Step 2: Done ===
-        _stepPanels[2] = new StackPanel { Spacing = 12, Visibility = Visibility.Collapsed };
-        _stepPanels[2].Children.Add(new TextBlock
-        {
-            Text = LocalizationHelper.GetString("Setup_DoneTitle"),
-            FontWeight = FontWeights.SemiBold,
-            Style = (Style)Application.Current.Resources["SubtitleTextBlockStyle"]
-        });
-        _stepPanels[2].Children.Add(new TextBlock
-        {
-            Text = LocalizationHelper.GetString("Setup_DoneDescription"),
-            TextWrapping = TextWrapping.Wrap,
-            Foreground = (SolidColorBrush)Application.Current.Resources["TextFillColorSecondaryBrush"]
-        });
-        contentArea.Children.Add(_stepPanels[2]);
-
-        var scrollViewer = new ScrollViewer
-        {
-            Content = contentArea,
-            VerticalScrollBarVisibility = ScrollBarVisibility.Auto
-        };
-        Grid.SetRow(scrollViewer, 2);
-        root.Children.Add(scrollViewer);
-
-        // Navigation buttons
-        var navPanel = new StackPanel
-        {
-            Orientation = Orientation.Horizontal,
-            HorizontalAlignment = HorizontalAlignment.Right,
-            Spacing = 8,
-            Margin = new Thickness(0, 16, 0, 0)
-        };
-        _backButton = new Button { Content = LocalizationHelper.GetString("Setup_BackButton"), Visibility = Visibility.Collapsed };
-        AutomationProperties.SetAutomationId(_backButton, "BackButton");
-        _backButton.Click += (s, e) => GoToStep(_currentStep - 1);
-        navPanel.Children.Add(_backButton);
-
-        _nextButton = new Button
-        {
-            Content = LocalizationHelper.GetString("Setup_NextButton"),
-            Style = (Style)Application.Current.Resources["AccentButtonStyle"]
-        };
-        AutomationProperties.SetAutomationId(_nextButton, "NextButton");
-        _nextButton.Click += OnNextClicked;
-        navPanel.Children.Add(_nextButton);
-
-        Grid.SetRow(navPanel, 3);
-        root.Children.Add(navPanel);
-
-        // Wrap content in a container with custom titlebar
-        var outerGrid = new Grid();
-        outerGrid.RowDefinitions.Add(new RowDefinition { Height = new GridLength(48) });
-        outerGrid.RowDefinitions.Add(new RowDefinition { Height = new GridLength(1, GridUnitType.Star) });
-
-        var titleBar = new Grid { Padding = new Thickness(16, 0, 140, 0) };
-        var titleIcon = new TextBlock
-        {
-            Text = "🦞",
-            FontSize = 20,
-            VerticalAlignment = VerticalAlignment.Center,
-            Margin = new Thickness(0, 0, 10, 0)
-        };
-        var titleText = new TextBlock
-        {
-            Text = LocalizationHelper.GetString("Setup_Title"),
-            FontSize = 13,
-            Style = (Style)Application.Current.Resources["CaptionTextBlockStyle"],
-            VerticalAlignment = VerticalAlignment.Center
-        };
-        var titleStack = new StackPanel { Orientation = Orientation.Horizontal };
-        titleStack.Children.Add(titleIcon);
-        titleStack.Children.Add(titleText);
-        titleBar.Children.Add(titleStack);
-        Grid.SetRow(titleBar, 0);
-        outerGrid.Children.Add(titleBar);
-
-        Grid.SetRow(root, 1);
-        outerGrid.Children.Add(root);
-        Content = outerGrid;
-        SetTitleBar(titleBar);
-        Logger.Info("[Setup] Wizard opened");
-
-        // Load device identity for step 3
-        LoadDeviceIdentity();
-    }
-
-    private void GoToStep(int step)
-    {
-        if (step < 0 || step >= TotalSteps) return;
-
-        _stepPanels[_currentStep].Visibility = Visibility.Collapsed;
-        _currentStep = step;
-        _stepPanels[_currentStep].Visibility = Visibility.Visible;
-
-        _backButton.Visibility = _currentStep > 0 ? Visibility.Visible : Visibility.Collapsed;
-
-        var stepKeys = new[] { "Setup_StepConnect", "Setup_StepNodeMode", "Setup_StepDone" };
-        _stepIndicator.Text = LocalizationHelper.GetString(stepKeys[_currentStep]);
-
-        if (_currentStep == TotalSteps - 1)
-        {
-            _nextButton.Content = LocalizationHelper.GetString("Setup_FinishButton");
-        }
-        else
-        {
-            _nextButton.Content = LocalizationHelper.GetString("Setup_NextButton");
-        }
-    }
-
-    private void OnNextClicked(object sender, RoutedEventArgs e)
-    {
-        switch (_currentStep)
-        {
-            case 0: // Connection — must have tested successfully
-                if (!_connectionTested)
-                {
-                    _testStatusLabel.Text = LocalizationHelper.GetString("Setup_TestFirst");
-                    return;
-                }
-                GoToStep(1);
-                break;
-
-            case 1: // Node mode
-                _draftEnableNodeMode = _nodeModeToggle.IsOn;
-                GoToStep(2);
-                break;
-
-            case 2: // Finish — save and close
-                SaveAndFinish();
-                break;
-        }
-    }
-
-    private void OnSetupCodeChanged(object sender, TextChangedEventArgs e)
-    {
-        _connectionTested = false;
-        var code = _setupCodeBox.Text.Trim();
-        if (string.IsNullOrEmpty(code))
-        {
-            _draftBootstrapToken = "";
-            return;
-        }
-
-        if (!TryApplySetupCode(code, LocalizationHelper.GetString("Setup_CodeDecoded")))
-        {
-            // Not a valid setup code; that's fine, user might be typing manually.
-            _draftBootstrapToken = "";
-        }
-    }
-
-    private bool TryApplySetupCode(string code, string successMessage)
-    {
-        try
-        {
-            // Try base64url decode
-            var b64 = code.Trim().Replace('-', '+').Replace('_', '/');
-            var pad = b64.Length % 4;
-            if (pad > 0) b64 += new string('=', 4 - pad);
-
-            var json = System.Text.Encoding.UTF8.GetString(Convert.FromBase64String(b64));
-            using var doc = System.Text.Json.JsonDocument.Parse(json);
-
-            if (doc.RootElement.TryGetProperty("url", out var urlProp))
-            {
-                _draftGatewayUrl = urlProp.GetString() ?? "";
-                _gatewayUrlBox.Text = _draftGatewayUrl;
-            }
-            if (doc.RootElement.TryGetProperty("bootstrapToken", out var tokenProp))
-            {
-                _draftBootstrapToken = tokenProp.GetString() ?? "";
-                _draftEnableNodeMode = !string.IsNullOrWhiteSpace(_draftBootstrapToken);
-                _nodeModeToggle.IsOn = _draftEnableNodeMode;
-                UpdateNodeModePairingVisibility(_draftEnableNodeMode);
-                UpdatePairingStatusText();
-            }
-
-            if (TryGetSetupCodeExpiry(doc.RootElement, out var expiresAt) &&
-                expiresAt <= DateTimeOffset.UtcNow)
-            {
-                _draftBootstrapToken = "";
-                _connectionTested = false;
-                _testStatusLabel.Text = "❌ Setup code expired. Generate a fresh QR/setup code from the gateway and try again.";
-                Logger.Warn($"[Setup] Setup code expired at {expiresAt:O}");
-                return false;
-            }
-
-            if (string.IsNullOrWhiteSpace(_draftGatewayUrl) ||
-                string.IsNullOrWhiteSpace(_draftBootstrapToken))
-            {
-                return false;
-            }
-
-            // Show manual fields so user can see what was decoded
-            _manualEntryPanel.Visibility = Visibility.Visible;
-            _testStatusLabel.Text = successMessage;
-            _connectionTested = GatewayUrlHelper.IsValidGatewayUrl(_draftGatewayUrl);
-            Logger.Info($"[Setup] Setup code decoded: gateway={GatewayUrlHelper.SanitizeForDisplay(_draftGatewayUrl)}");
-            return true;
-        }
-        catch (System.FormatException)
-        {
-            return false;
-        }
-        catch (System.Text.Json.JsonException)
-        {
-            return false;
-        }
-    }
-
-    internal static bool TryGetSetupCodeExpiry(JsonElement payload, out DateTimeOffset expiresAt)
-    {
-        foreach (var propertyName in new[] { "expiresAt", "expires_at", "expires", "expiry", "exp" })
-        {
-            if (payload.TryGetProperty(propertyName, out var value) &&
-                TryParseSetupCodeExpiryValue(value, out expiresAt))
-            {
-                return true;
-            }
-        }
-
-        expiresAt = default;
-        return false;
-    }
-
-    private static bool TryParseSetupCodeExpiryValue(JsonElement value, out DateTimeOffset expiresAt)
-    {
-        if (value.ValueKind == JsonValueKind.String)
-        {
-            var text = value.GetString();
-            if (DateTimeOffset.TryParse(
-                text,
-                CultureInfo.InvariantCulture,
-                DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal,
-                out expiresAt))
-            {
-                return true;
-            }
-
-            if (long.TryParse(text, NumberStyles.Integer, CultureInfo.InvariantCulture, out var unixFromString))
-            {
-                expiresAt = UnixTimeToDateTimeOffset(unixFromString);
-                return true;
-            }
-        }
-        else if (value.ValueKind == JsonValueKind.Number && value.TryGetInt64(out var unix))
-        {
-            expiresAt = UnixTimeToDateTimeOffset(unix);
-            return true;
-        }
-
-        expiresAt = default;
-        return false;
-    }
-
-    private static DateTimeOffset UnixTimeToDateTimeOffset(long value) =>
-        value > 10_000_000_000
-            ? DateTimeOffset.FromUnixTimeMilliseconds(value)
-            : DateTimeOffset.FromUnixTimeSeconds(value);
-
-    private void OnPasteSetupFromClipboard(object sender, RoutedEventArgs e) =>
-        AsyncEventHandlerGuard.Run(
-            OnPasteSetupFromClipboardAsync,
-            new OpenClawTray.AppLogger(),
-            nameof(OnPasteSetupFromClipboard));
-
-    private async Task OnPasteSetupFromClipboardAsync()
-    {
-        try
-        {
-            var content = Clipboard.GetContent();
-            if (content.Contains(StandardDataFormats.Text))
-            {
-                var text = await content.GetTextAsync();
-                ApplyDecodedSetupCode(text, LocalizationHelper.GetString("Setup_CodeDecoded"));
-                return;
-            }
-
-            if (content.Contains(StandardDataFormats.Bitmap))
-            {
-                var bitmapReference = await content.GetBitmapAsync();
-                using var randomAccessStream = await bitmapReference.OpenReadAsync();
-                using var stream = randomAccessStream.AsStreamForRead();
-                var setupCode = DecodeQrSetupCode(stream);
-                ApplyDecodedSetupCode(setupCode, LocalizationHelper.GetString("Setup_QrDecoded"));
-                return;
-            }
-
-            _testStatusLabel.Text = LocalizationHelper.GetString("Setup_ClipboardUnsupported");
-        }
-        catch (Exception ex) when (ex is InvalidOperationException or COMException or IOException or UnauthorizedAccessException)
-        {
-            Logger.Warn($"[Setup] Clipboard setup import failed: {ex.Message}");
-            _testStatusLabel.Text = ex is InvalidOperationException
-                ? ex.Message
-                : LocalizationHelper.GetString("Setup_ClipboardUnsupported");
-        }
-    }
-
-    private void OnImportQrImage(object sender, RoutedEventArgs e) =>
-        AsyncEventHandlerGuard.Run(
-            OnImportQrImageAsync,
-            new OpenClawTray.AppLogger(),
-            nameof(OnImportQrImage));
-
-    private async Task OnImportQrImageAsync()
-    {
-        try
-        {
-            var picker = new FileOpenPicker();
-            var hwnd = WinRT.Interop.WindowNative.GetWindowHandle(this);
-            WinRT.Interop.InitializeWithWindow.Initialize(picker, hwnd);
-            picker.FileTypeFilter.Add(".png");
-            picker.FileTypeFilter.Add(".jpg");
-            picker.FileTypeFilter.Add(".jpeg");
-            picker.FileTypeFilter.Add(".bmp");
-            picker.FileTypeFilter.Add(".gif");
-
-            var file = await picker.PickSingleFileAsync();
-            if (file == null)
-            {
-                return;
-            }
-
-            using var randomAccessStream = await file.OpenReadAsync();
-            using var stream = randomAccessStream.AsStreamForRead();
-            var setupCode = DecodeQrSetupCode(stream);
-            ApplyDecodedSetupCode(setupCode, LocalizationHelper.GetString("Setup_QrDecoded"));
-        }
-        catch (Exception ex) when (ex is InvalidOperationException or COMException or IOException or UnauthorizedAccessException)
-        {
-            Logger.Warn($"[Setup] QR image import failed: {ex.Message}");
-            _testStatusLabel.Text = ex is InvalidOperationException
-                ? ex.Message
-                : LocalizationHelper.GetString("Setup_QrDecodeFailed");
-        }
-    }
-
-    private void ApplyDecodedSetupCode(string setupCode, string successMessage)
-    {
-        if (string.IsNullOrWhiteSpace(setupCode))
-        {
-            throw new InvalidOperationException(LocalizationHelper.GetString("Setup_QrDecodeFailed"));
-        }
-
-        _setupCodeBox.Text = setupCode.Trim();
-        if (!TryApplySetupCode(setupCode, successMessage))
-        {
-            throw new InvalidOperationException(LocalizationHelper.GetString("Setup_QrDecodeFailed"));
-        }
-    }
-
-    private static string DecodeQrSetupCode(Stream stream)
-    {
-        using var source = new DrawingBitmap(stream);
-        using var bitmap = new DrawingBitmap(source.Width, source.Height, DrawingPixelFormat.Format32bppArgb);
-        using (var graphics = DrawingGraphics.FromImage(bitmap))
-        {
-            graphics.DrawImage(source, 0, 0, source.Width, source.Height);
-        }
-
-        var bounds = new System.Drawing.Rectangle(0, 0, bitmap.Width, bitmap.Height);
-        var data = bitmap.LockBits(bounds, DrawingImageLockMode.ReadOnly, DrawingPixelFormat.Format32bppArgb);
-        try
-        {
-            var rowBytes = bitmap.Width * 4;
-            var pixels = new byte[rowBytes * bitmap.Height];
-            for (var y = 0; y < bitmap.Height; y++)
-            {
-                Marshal.Copy(IntPtr.Add(data.Scan0, y * data.Stride), pixels, y * rowBytes, rowBytes);
-            }
-
-            var reader = new BarcodeReaderGeneric
-            {
-                AutoRotate = true,
-                Options = new DecodingOptions
-                {
-                    PossibleFormats = new List<BarcodeFormat> { BarcodeFormat.QR_CODE },
-                    TryHarder = true,
-                    TryInverted = true
-                }
-            };
-
-            var result = reader.Decode(pixels, bitmap.Width, bitmap.Height, RGBLuminanceSource.BitmapFormat.BGRA32);
-            if (string.IsNullOrWhiteSpace(result?.Text))
-            {
-                throw new InvalidOperationException(LocalizationHelper.GetString("Setup_QrDecodeFailed"));
-            }
-
-            return result.Text;
-        }
-        finally
-        {
-            bitmap.UnlockBits(data);
-        }
-    }
-
-    private void UpdateNodeModePairingVisibility(bool showPairing)
-    {
-        _deviceIdText.Visibility = showPairing ? Visibility.Visible : Visibility.Collapsed;
-        _copyDeviceIdButton.Visibility = showPairing ? Visibility.Visible : Visibility.Collapsed;
-        _pairingStatusText.Visibility = showPairing ? Visibility.Visible : Visibility.Collapsed;
-        _draftEnableNodeMode = showPairing;
-        UpdatePairingStatusText();
-    }
-
-    private void OnTestConnection(object sender, RoutedEventArgs e) =>
-        AsyncEventHandlerGuard.Run(
-            OnTestConnectionAsync,
-            new OpenClawTray.AppLogger(),
-            nameof(OnTestConnection));
-
-    private async Task OnTestConnectionAsync()
-    {
-        _draftGatewayUrl = _gatewayUrlBox.Text.Trim();
-        _draftToken = _tokenBox.Text;
-        UpdatePairingStatusText();
-
-        if (!GatewayUrlHelper.IsValidGatewayUrl(_draftGatewayUrl))
-        {
-            _testStatusLabel.Text = $"❌ {GatewayUrlHelper.ValidationMessage}";
-            return;
-        }
-
-        if (string.IsNullOrWhiteSpace(_draftToken) &&
-            string.IsNullOrWhiteSpace(_draftBootstrapToken))
-        {
-            _testStatusLabel.Text = LocalizationHelper.GetString("Setup_TokenRequired");
-            return;
-        }
-
-        if (string.IsNullOrWhiteSpace(_draftToken) &&
-            !string.IsNullOrWhiteSpace(_draftBootstrapToken))
-        {
-            _testStatusLabel.Text = LocalizationHelper.GetString("Setup_CodeDecoded");
-            _connectionTested = true;
-            return;
-        }
-
-        _testStatusLabel.Text = LocalizationHelper.GetString("Setup_Testing");
-        _testButton.IsEnabled = false;
-        _connectionTested = false;
-
-        Logger.Info("[Setup] Test connection initiated");
-
-        try
-        {
-            var testLogger = new SetupTestLogger();
-            using var client = new OpenClawGatewayClient(
-                _draftGatewayUrl,
-                _draftToken,
-                testLogger);
-
-            var connected = false;
-            var tcs = new TaskCompletionSource<bool>();
-
-            client.StatusChanged += (s, status) =>
-            {
-                if (status == ConnectionStatus.Connected)
-                {
-                    connected = true;
-                    tcs.TrySetResult(true);
-                }
-                else if (status == ConnectionStatus.Error)
-                {
-                    tcs.TrySetResult(false);
-                }
-            };
-
-            _ = client.ConnectAsync();
-
-            // Wait up to 15 seconds (device signature cycling takes time)
-            var completedTask = await Task.WhenAny(tcs.Task, Task.Delay(15000));
-            if (completedTask != tcs.Task)
-                connected = false;
-
-            var lastError = testLogger.LastError ?? "";
-            var lastWarn = testLogger.LastWarn ?? "";
-
-            if (connected)
-            {
-                Logger.Info("[Setup] Test succeeded - fully connected");
-                _testStatusLabel.Text = LocalizationHelper.GetString("Setup_Connected");
-                _connectionTested = true;
-            }
-            else if (lastError.Contains("pairing required", StringComparison.OrdinalIgnoreCase) ||
-                     lastWarn.Contains("Pairing approval required", StringComparison.OrdinalIgnoreCase))
-            {
-                Logger.Info("[Setup] Test succeeded - pairing approval needed");
-                var deviceId = _copyDeviceIdButton.Tag?.ToString() ?? "your-device-id";
-                _testStatusLabel.Text = string.Format(LocalizationHelper.GetString("Setup_PairingRequired"), deviceId);
-                _connectionTested = true;
-            }
-            else if (lastError.Contains("token mismatch", StringComparison.OrdinalIgnoreCase))
-            {
-                _testStatusLabel.Text = LocalizationHelper.GetString("Setup_TokenMismatch");
-            }
-            else if (lastError.Contains("origin not allowed", StringComparison.OrdinalIgnoreCase))
-            {
-                _testStatusLabel.Text = LocalizationHelper.GetString("Setup_OriginNotAllowed");
-            }
-            else if (lastError.Contains("too many failed", StringComparison.OrdinalIgnoreCase))
-            {
-                _testStatusLabel.Text = LocalizationHelper.GetString("Setup_RateLimited");
-            }
-            else if (!string.IsNullOrEmpty(lastError))
-            {
-                _testStatusLabel.Text = $"❌ {lastError}";
-            }
-            else
-            {
-                _testStatusLabel.Text = LocalizationHelper.GetString("Setup_TimedOut");
-            }
-        }
-        catch (Exception ex)
-        {
-            Logger.Error($"[Setup] Test connection error: {ex.Message}");
-            _testStatusLabel.Text = $"❌ {ex.Message}";
-        }
-        finally
-        {
-            _testButton.IsEnabled = true;
-        }
-    }
-
-    private void SaveAndFinish()
-    {
-        Logger.Info($"[Setup] Saving settings: gateway={GatewayUrlHelper.SanitizeForDisplay(_draftGatewayUrl)}, nodeMode={_draftEnableNodeMode}");
-
-        _existingSettings.GatewayUrl = _draftGatewayUrl;
-        _existingSettings.EnableNodeMode = _draftEnableNodeMode;
-        _existingSettings.Save();
-
-        Completed = true;
-        SetupCompleted?.Invoke(this, EventArgs.Empty);
-        Logger.Info("[Setup] Wizard completed");
-        Close();
-    }
-
-    private void LoadDeviceIdentity()
-    {
-        try
-        {
-            var dataPath = Environment.GetEnvironmentVariable("OPENCLAW_TRAY_DATA_DIR") is { Length: > 0 } overridePath
-                ? overridePath
-                : System.IO.Path.Combine(
-                    Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
-                    "OpenClawTray");
-            var identity = new DeviceIdentity(dataPath);
-            identity.Initialize();
-            var fullId = identity.PublicKeyBase64Url;
-            var shortId = fullId.Length > 12 ? fullId[..12] : fullId;
-            _deviceIdText.Text = $"Device ID: {shortId}...";
-            _copyDeviceIdButton.Tag = fullId;
-            _hasStoredDeviceToken = !string.IsNullOrWhiteSpace(identity.DeviceToken);
-            UpdatePairingStatusText();
-        }
-        catch (Exception ex)
-        {
-            Logger.Warn($"[Setup] Could not load device identity: {ex.Message}");
-            _deviceIdText.Text = LocalizationHelper.GetString("Setup_DeviceIdFallback");
-            _hasStoredDeviceToken = false;
-            UpdatePairingStatusText();
-        }
-    }
-
-    private void UpdatePairingStatusText()
-    {
-        if (_pairingStatusText == null)
-        {
-            return;
-        }
-
-        _pairingStatusText.Text = BuildPairingExpectationText(
-            _draftEnableNodeMode,
-            _hasStoredDeviceToken,
-            !string.IsNullOrWhiteSpace(_draftBootstrapToken),
-            !string.IsNullOrWhiteSpace(_draftToken));
-    }
-
-    internal static string BuildPairingExpectationText(
-        bool nodeModeEnabled,
-        bool hasStoredDeviceToken,
-        bool hasBootstrapToken,
-        bool hasGatewayToken)
-    {
-        if (!nodeModeEnabled)
-        {
-            return "Node Mode is off; this tray will only act as an operator UI.";
-        }
-
-        if (hasStoredDeviceToken)
-        {
-            return "Already paired: this device has a saved gateway device token and should reconnect without manual approval.";
-        }
-
-        if (hasBootstrapToken)
-        {
-            return "Auto-pairing expected: this setup code includes a bootstrap token. Finish setup and the gateway should approve this node automatically. If the bootstrap token expired or was already used, Command Center will show a waiting-for-approval repair command.";
-        }
-
-        if (hasGatewayToken)
-        {
-            return "Manual approval expected: this setup uses a gateway token, not a bootstrap token. Finish setup, then approve the device from the gateway CLI if Command Center reports that the node is waiting for approval.";
-        }
-
-        return "Pairing method unknown: enter a setup code for auto-pairing or a gateway token for manual approval.";
-    }
-
-    private void OnCopyDeviceId(object sender, RoutedEventArgs e)
-    {
-        try
-        {
-            var fullId = _copyDeviceIdButton.Tag?.ToString();
-            if (string.IsNullOrEmpty(fullId)) return;
-
-            ClipboardHelper.CopyText(fullId);
-            _copyDeviceIdButton.Content = LocalizationHelper.GetString("Setup_DeviceIdCopied");
-            Logger.Info("[Setup] Device ID copied to clipboard");
-
-            // Reset button text after 2 seconds
-            _ = Task.Delay(2000).ContinueWith(_ =>
-            {
-                DispatcherQueue.TryEnqueue(() => _copyDeviceIdButton.Content = LocalizationHelper.GetString("Setup_CopyDeviceId"));
-            });
-        }
-        catch (Exception ex)
-        {
-            Logger.Warn($"[Setup] Failed to copy device ID: {ex.Message}");
-        }
-    }
-
-    private class SetupTestLogger : IOpenClawLogger
-    {
-        public string? LastError { get; private set; }
-        public string? LastWarn { get; private set; }
-
-        public void Info(string message) => Logger.Info($"[Setup:TestClient] {message}");
-        public void Debug(string message) { }
-        public void Warn(string message)
-        {
-            LastWarn = message;
-            LastError ??= message;
-            Logger.Warn($"[Setup:TestClient] {message}");
-        }
-        public void Error(string message, Exception? ex = null)
-        {
-            LastError = message;
-            Logger.Error($"[Setup:TestClient] {message}");
-        }
-    }
-}
diff --git a/src/OpenClaw.Tray.WinUI/Windows/TrayMenuWindow.xaml.cs b/src/OpenClaw.Tray.WinUI/Windows/TrayMenuWindow.xaml.cs
index ff60ab41f..4d5f69fa6 100644
--- a/src/OpenClaw.Tray.WinUI/Windows/TrayMenuWindow.xaml.cs
+++ b/src/OpenClaw.Tray.WinUI/Windows/TrayMenuWindow.xaml.cs
@@ -23,6 +23,7 @@ public sealed partial class TrayMenuWindow : WindowEx
 {
     private const int MenuWidthViewUnits = 320;
     private const int SubmenuWidthViewUnits = 280;
+    private const int MinimumMenuHeightViewUnits = 100;
 
     #region Win32 Imports
     [DllImport("user32.dll")]
@@ -59,6 +60,9 @@ public sealed partial class TrayMenuWindow : WindowEx
     [DllImport("user32.dll")]
     private static extern bool GetWindowRect(IntPtr hWnd, out RECT lpRect);
 
+    [DllImport("user32.dll")]
+    private static extern bool GetClientRect(IntPtr hWnd, out RECT lpRect);
+
     [DllImport("user32.dll")]
     private static extern IntPtr GetForegroundWindow();
 
@@ -109,7 +113,8 @@ private enum MonitorDpiType
 
     public event EventHandler<string>? MenuItemClicked;
 
-    private int _menuHeight = 400;
+    private int _menuWidthPx = 320;
+    private int _menuHeightPx = 400;
     private int _itemCount = 0;
     private int _separatorCount = 0;
     private int _headerCount = 0;
@@ -181,6 +186,7 @@ private TrayMenuWindow(TrayMenuWindow? ownerMenu)
         _ownerMenu = ownerMenu;
 
         InitializeComponent();
+        Title = AppIdentity.DecorateWindowTitle("OpenClaw Menu");
 
         // Configure as popup-style window
         this.IsMaximizable = false;
@@ -260,8 +266,8 @@ public void ShowAtCursor()
             var hwnd = WinRT.Interop.WindowNative.GetWindowHandle(this);
             var dpi = GetEffectiveMonitorDpi(hMonitor, hwnd);
             SizeToContent(workArea.Bottom - workArea.Top, dpi);
-            var menuWidthPx = ConvertViewUnitsToPixels(MenuWidthViewUnits, dpi);
-            var menuHeightPx = ConvertViewUnitsToPixels(_menuHeight, dpi);
+            var menuWidthPx = _menuWidthPx;
+            var menuHeightPx = _menuHeightPx;
 
             const int margin = 8;
 
@@ -313,8 +319,8 @@ private void ShowAdjacentTo(FrameworkElement parentElement)
         var hwnd = WinRT.Interop.WindowNative.GetWindowHandle(this);
         var dpi = GetEffectiveMonitorDpi(hMonitor, hwnd);
         SizeToContent(monitorInfo.rcWork.Bottom - monitorInfo.rcWork.Top, dpi, SubmenuWidthViewUnits);
-        var submenuWidthPx = ConvertViewUnitsToPixels(SubmenuWidthViewUnits, dpi);
-        var submenuHeightPx = ConvertViewUnitsToPixels(_menuHeight, dpi);
+        var submenuWidthPx = _menuWidthPx;
+        var submenuHeightPx = _menuHeightPx;
 
         const int overlap = 2;
         const int margin = 8;
@@ -324,8 +330,8 @@ private void ShowAdjacentTo(FrameworkElement parentElement)
         if (submenuHeightPx > maxSubmenuHeightPx)
         {
             submenuHeightPx = maxSubmenuHeightPx;
-            _menuHeight = MenuSizingHelper.ConvertPixelsToViewUnits(submenuHeightPx, dpi);
-            this.SetWindowSize(SubmenuWidthViewUnits, _menuHeight);
+            _menuHeightPx = submenuHeightPx;
+            ResizeWindowToPixelSize(submenuWidthPx, submenuHeightPx);
         }
 
         var roomRight = workArea.Right - parentRect.Right;
@@ -952,24 +958,58 @@ private void SizeToContent(int workAreaHeightPx, uint dpi)
 
     private void SizeToContent(int workAreaHeightPx, uint dpi, int widthViewUnits)
     {
+        dpi = dpi == 0 ? 96 : dpi;
         PrepareLayoutForMeasurement(dpi);
 
-        // Measure the actual content size instead of estimating
-        MenuPanel.Measure(new global::Windows.Foundation.Size(widthViewUnits, double.PositiveInfinity));
-        var desiredHeight = MenuPanel.DesiredSize.Height;
-        
-        // Add border chrome (1px border top+bottom = 2px, plus small rounding buffer)
-        var contentHeight = (int)Math.Ceiling(desiredHeight) + 2;
-        _menuHeight = Math.Max(contentHeight, 100);
+        var hwnd = WinRT.Interop.WindowNative.GetWindowHandle(this);
+        var windowWidthPx = Math.Max(1, MenuSizingHelper.ConvertViewUnitsToPixels(widthViewUnits, dpi));
+        var nonClientSize = GetNonClientSize(hwnd);
+        var clientWidthPx = Math.Max(1, windowWidthPx - nonClientSize.Width);
+        var clientWidthViewUnits = Math.Max(1, MenuSizingHelper.ConvertPixelsToViewUnits(clientWidthPx, dpi));
+
+        // Measure the full XAML root at the width it will actually receive.
+        // This lets the platform account for Border, ScrollViewer, padding, and
+        // any text wrapping caused by the final client width.
+        RootGrid.Measure(new global::Windows.Foundation.Size(clientWidthViewUnits, double.PositiveInfinity));
+
+        var desiredClientHeightPx = MenuSizingHelper.ConvertViewUnitsToPixels(RootGrid.DesiredSize.Height, dpi);
+        var desiredWindowHeightPx = Math.Max(1, desiredClientHeightPx + nonClientSize.Height);
+        var minimumHeightPx = MenuSizingHelper.ConvertViewUnitsToPixels(MinimumMenuHeightViewUnits, dpi);
+
+        _menuWidthPx = windowWidthPx;
+        _menuHeightPx = MenuSizingHelper.CalculateWindowHeight(
+            desiredWindowHeightPx,
+            workAreaHeightPx,
+            minimumHeightPx);
+
+        ResizeWindowToPixelSize(_menuWidthPx, _menuHeightPx);
+        ApplyRoundedWindowRegion();
+    }
+
+    private void ResizeWindowToPixelSize(int widthPx, int heightPx)
+    {
+        AppWindow.Resize(new global::Windows.Graphics.SizeInt32(
+            Math.Max(1, widthPx),
+            Math.Max(1, heightPx)));
+    }
 
-        if (workAreaHeightPx > 0)
+    private static (int Width, int Height) GetNonClientSize(IntPtr hwnd)
+    {
+        if (hwnd == IntPtr.Zero ||
+            !GetWindowRect(hwnd, out var windowRect) ||
+            !GetClientRect(hwnd, out var clientRect))
         {
-            var workAreaHeight = MenuSizingHelper.ConvertPixelsToViewUnits(workAreaHeightPx, dpi);
-            _menuHeight = MenuSizingHelper.CalculateWindowHeight(_menuHeight, workAreaHeight);
+            return (0, 0);
         }
 
-        this.SetWindowSize(widthViewUnits, _menuHeight);
-        ApplyRoundedWindowRegion();
+        var windowWidth = windowRect.Right - windowRect.Left;
+        var windowHeight = windowRect.Bottom - windowRect.Top;
+        var clientWidth = clientRect.Right - clientRect.Left;
+        var clientHeight = clientRect.Bottom - clientRect.Top;
+
+        return (
+            Math.Max(0, windowWidth - clientWidth),
+            Math.Max(0, windowHeight - clientHeight));
     }
 
     private void PrepareLayoutForMeasurement(uint dpi)
@@ -1087,7 +1127,7 @@ private void ApplyRoundedWindowRegion()
             return;
 
         var dpi = GetDpiForWindow(hwnd);
-        var cornerDiameter = ConvertViewUnitsToPixels(16, dpi);
+        var cornerDiameter = MenuSizingHelper.ConvertViewUnitsToPixels(16, dpi);
         var region = CreateRoundRectRgn(0, 0, width + 1, height + 1, cornerDiameter, cornerDiameter);
         if (region == IntPtr.Zero)
             return;
@@ -1169,8 +1209,6 @@ private void ShowCascadingFlyout(Button ownerButton, IReadOnlyList<TrayMenuFlyou
         }
         _activeFlyoutTag = ownerButton.Tag as string;
 
-        flyoutWindow.SizeToContent(SubmenuWidthViewUnits);
-
         flyoutWindow.ShowAdjacentTo(ownerButton);
     }
 
@@ -1227,17 +1265,6 @@ private bool TryGetElementScreenRect(FrameworkElement element, out RECT rect)
         }
     }
 
-    private static int ConvertViewUnitsToPixels(int viewUnits, uint dpi)
-    {
-        if (viewUnits <= 0)
-            return 1;
-
-        if (dpi == 0)
-            dpi = 96;
-
-        return Math.Max(1, (int)Math.Ceiling(viewUnits * dpi / 96.0));
-    }
-
     private void OnMenuPanelKeyDown(object sender, KeyRoutedEventArgs e)
     {
         var buttons = MenuPanel.Children
diff --git a/src/OpenClaw.Tray.WinUI/Windows/VoiceOverlayWindow.xaml.cs b/src/OpenClaw.Tray.WinUI/Windows/VoiceOverlayWindow.xaml.cs
index b20ffe58a..a91a4a2ae 100644
--- a/src/OpenClaw.Tray.WinUI/Windows/VoiceOverlayWindow.xaml.cs
+++ b/src/OpenClaw.Tray.WinUI/Windows/VoiceOverlayWindow.xaml.cs
@@ -51,6 +51,7 @@ public VoiceOverlayWindow(VoiceService voiceService, IOpenClawLogger logger, boo
             Title = "Test Voice Input";
             IsAlwaysOnTop = false;
         }
+        Title = AppIdentity.DecorateWindowTitle(Title);
 
         _voiceService.TranscriptionReceived += OnTranscriptionReceived;
         _voiceService.UtteranceCompleted += OnUtteranceCompleted;
diff --git a/src/OpenClaw.WinNode.Cli/Program.cs b/src/OpenClaw.WinNode.Cli/Program.cs
index bdd829d05..2e2231e29 100644
--- a/src/OpenClaw.WinNode.Cli/Program.cs
+++ b/src/OpenClaw.WinNode.Cli/Program.cs
@@ -4,6 +4,7 @@
 using System.Text;
 using System.Text.Json;
 using System.Text.RegularExpressions;
+using OpenClaw.Shared;
 using OpenClaw.Shared.Mcp;
 
 namespace OpenClaw.WinNode.Cli;
@@ -19,6 +20,7 @@ internal sealed class WinNodeOptions
     public string? McpUrlOverride { get; set; }
     public int? McpPortOverride { get; set; }
     public string? McpTokenOverride { get; set; }
+    public string? Identity { get; set; }
     public bool Verbose { get; set; }
 }
 
@@ -151,6 +153,16 @@ public static async Task<int> RunAsync(
             return 2;
         }
 
+        try
+        {
+            options.Identity = OpenClawAppIdentity.ResolveIdentity(envLookup, options.Identity);
+        }
+        catch (ArgumentException ex)
+        {
+            stderr.WriteLine($"Argument error: {ex.Message}");
+            return 2;
+        }
+
         var token = ResolveAuthToken(options, envLookup, stderr);
         if (token.Source == "error")
         {
@@ -533,7 +545,9 @@ private static int ResolveEnvPort(Func<string, string?> envLookup, bool verbose,
     ///   per-tool secret env-var convention — same shape as <c>GITHUB_TOKEN</c>,
     ///   <c>ANTHROPIC_API_KEY</c>, <c>NUGET_API_KEY</c>.</item>
     ///   <item>The on-disk token file the tray writes when MCP is enabled —
-    ///   <c>%APPDATA%\OpenClawTray\mcp-token.txt</c> by default, or
+    ///   <c>%APPDATA%\OpenClawTray\mcp-token.txt</c> by default,
+    ///   <c>%APPDATA%\OpenClawTray-Dev\mcp-token.txt</c> when
+    ///   <c>--identity dev</c> or <c>OPENCLAW_APP_IDENTITY=dev</c> is set, or
     ///   <c>$OPENCLAW_TRAY_DATA_DIR\mcp-token.txt</c> when the tray was launched
     ///   with that sandbox override (the integration test fixture uses it).</item>
     /// </list>
@@ -559,7 +573,7 @@ internal static AuthTokenResult ResolveAuthToken(
             return new AuthTokenResult(envToken, "OPENCLAW_MCP_TOKEN");
         }
 
-        var path = ResolveTokenPath(envLookup);
+        var path = ResolveTokenPath(envLookup, options.Identity);
 
         // F-08: resolve to canonical form and require the result still live
         // under the requested directory tree. Defeats a same-user attacker
@@ -697,7 +711,7 @@ private static bool PathStartsWith(string candidate, string prefix)
             || normCandidate.StartsWith(normPrefix + Path.DirectorySeparatorChar, cmp);
     }
 
-    internal static string ResolveTokenPath(Func<string, string?> envLookup)
+    internal static string ResolveTokenPath(Func<string, string?> envLookup, string? identity = null)
     {
         // Mirror SettingsManager.SettingsDirectoryPath: when the tray was
         // launched with OPENCLAW_TRAY_DATA_DIR, settings (including the token
@@ -705,13 +719,7 @@ internal static string ResolveTokenPath(Func<string, string?> envLookup)
         // so a CLI invoked in the same shell as a sandboxed tray Just Works,
         // and the integration test fixture can redirect both the producer
         // (tray) and the consumer (CLI) with one env var.
-        var dataDirOverride = envLookup("OPENCLAW_TRAY_DATA_DIR");
-        var dir = !string.IsNullOrWhiteSpace(dataDirOverride)
-            ? dataDirOverride!
-            : Path.Combine(
-                Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
-                "OpenClawTray");
-        return Path.Combine(dir, "mcp-token.txt");
+        return OpenClawAppIdentity.ResolveMcpTokenPath(envLookup, identity);
     }
 
     /// <summary>
@@ -774,6 +782,9 @@ internal static WinNodeOptions ParseArgs(string[] args)
                 case "--mcp-token":
                     options.McpTokenOverride = RequireValue(args, ref i, arg);
                     break;
+                case "--identity":
+                    options.Identity = OpenClawAppIdentity.NormalizeIdentity(RequireValue(args, ref i, arg));
+                    break;
                 case "--verbose":
                     options.Verbose = true;
                     break;
@@ -830,6 +841,8 @@ internal static void PrintUsage(TextWriter stdout)
         stdout.WriteLine("  --mcp-token <token>          Bearer token (testing/explicit overrides only - visible to");
         stdout.WriteLine("                               other processes via the OS process listing). Prefer");
         stdout.WriteLine("                               $OPENCLAW_MCP_TOKEN or %APPDATA%\\OpenClawTray\\mcp-token.txt");
+        stdout.WriteLine("  --identity <release|dev>     Select tray profile for default token lookup");
+        stdout.WriteLine("                               (default: $OPENCLAW_APP_IDENTITY or release)");
         stdout.WriteLine("  --verbose                    Print endpoint + ignored flags to stderr");
         stdout.WriteLine("  --help, -h                   Show this help");
         stdout.WriteLine();
diff --git a/src/OpenClaw.WinNode.Cli/skill.md b/src/OpenClaw.WinNode.Cli/skill.md
index 954f32470..3077c2348 100644
--- a/src/OpenClaw.WinNode.Cli/skill.md
+++ b/src/OpenClaw.WinNode.Cli/skill.md
@@ -23,8 +23,8 @@ argument shape, and the A2UI v0.8 JSONL grammar. It is shipped alongside
 ## Invocation shape
 
 ```
-winnode --command <name> [--params '<json-object>'] [--invoke-timeout <ms>]
-winnode --list-tools [--mcp-url <url>|--mcp-port <port>]
+winnode --command <name> [--params '<json-object>'] [--invoke-timeout <ms>] [--identity release|dev]
+winnode --list-tools [--mcp-url <url>|--mcp-port <port>] [--identity release|dev]
 ```
 
 - `--command` (required) — node command (e.g. `system.which`, `canvas.a2ui.push`).
@@ -50,9 +50,14 @@ winnode --list-tools [--mcp-url <url>|--mcp-port <port>]
   listing** (`Get-CimInstance Win32_Process | Select CommandLine`,
   Process Explorer, etc.). The CLI emits a stderr warning when this flag is
   used. **Prefer `OPENCLAW_MCP_TOKEN` (env var) or the on-disk
-  `%APPDATA%\OpenClawTray\mcp-token.txt`** which the tray writes when MCP is
-  enabled. Both `OPENCLAW_MCP_TOKEN` and the on-disk file should themselves be
-  treated as sensitive operational secrets.
+  `%APPDATA%\OpenClawTray\mcp-token.txt`** which the release tray writes when
+  MCP is enabled. Both `OPENCLAW_MCP_TOKEN` and the on-disk file should
+  themselves be treated as sensitive operational secrets.
+- `--identity release|dev` — selects which tray profile supplies the default
+  on-disk MCP token. Defaults to `OPENCLAW_APP_IDENTITY`, then `release`.
+  Use `--identity dev` for a side-by-side dev tray; its default token path is
+  `%APPDATA%\OpenClawTray-Dev\mcp-token.txt`. `OPENCLAW_TRAY_DATA_DIR` still
+  wins for isolated runs and points directly at the data folder.
 - `--verbose` — log endpoint + ignored flags to stderr. Without `--verbose`,
   HTTP error bodies are emitted only as the first line; with `--verbose`, the
   full body is shown (after sanitization + token-shape redaction).
@@ -272,13 +277,27 @@ Speak text aloud on the Windows node.
 ```
 {
   "text": "string",           // required
-  "provider": "piper|windows|elevenlabs",  // optional, falls back to TtsProvider setting
+  "provider": "piper|windows|elevenlabs",  // optional; omit to use TtsProvider setting
   "voiceId": "string",        // optional, overrides the per-provider configured voice
   "model": "string",          // optional, ElevenLabs only
   "interrupt": false          // default false; true cuts off any in-progress playback
 }
 ```
-Returns `{ spoken, provider, contentType, durationMs }`.
+When `provider` is omitted and the configured provider isn't usable (no
+ElevenLabs key, Piper voice not downloaded), the node falls back to Windows
+TTS so playback still happens. Explicit `provider` requests stay strict and
+do not silently reroute. Returns `{ spoken, provider, requestedProvider, fellBack, contentType, durationMs }`
+where `provider` is the provider that actually spoke.
+
+### tts.status
+TTS provider readiness. No params. Carries no PII (no voice ids, no key
+fragments, no device names).
+Returns `{ configuredProvider, effectiveProvider, willFallBack, providers[{ provider, readiness, isReady }] }`
+where `effectiveProvider` is what would run now after fallback and `readiness`
+∈ `"ready" | "needs-api-key" | "needs-voice" | "voice-not-downloaded" | "unavailable"`.
+The configured/effective view reflects configured defaults only; explicit
+`tts.speak` provider requests stay strict and may not match the default
+snapshot.
 
 ## App control (app.*)
 
@@ -294,7 +313,7 @@ Returns `{ navigated, page }`.
 
 ### app.status
 Current connection / node state.
-No params. Returns `{ connectionStatus, nodeConnected, nodePaired, nodePendingApproval, gatewayVersion, sessionCount, nodeCount }`.
+No params. Returns `{ connectionStatus, overallState, operatorState, nodeState, nodeConnected, nodePaired, nodePendingApproval, nodeError, gatewayVersion, sessionCount, nodeCount }`.
 
 ### app.sessions
 Active sessions, optionally filtered by agent.
@@ -326,15 +345,15 @@ Read a local app setting by name.
 Returns the setting value (type depends on the setting).
 
 ### app.settings.set
-Set a local app setting.
+Set a local app setting, persist it, and apply the same reconnect/reload behavior as saving settings in the app UI.
 ```
 {"name": "string", "value": "string"}  // both required
 ```
-Returns `{ name, value }`.
+Returns `{ name, value }`; runtime apply failures surface as tool errors.
 
 ### app.menu
 Get tray menu state (status, session count, node count). No params.
-Returns array of menu items.
+Returns array of menu items; the status item includes `status`, `overallState`, `nodeState`, and `nodeError`.
 
 ### app.search
 Search the command palette and return matching commands.
@@ -350,6 +369,59 @@ Build the same gateway dashboard URL the tray opens.
 ```
 Returns `{ url, credentialSource, usesSharedGatewayToken, hasTokenQuery }`.
 
+### app.chat.snapshot
+Read the current native chat snapshot for local automation and diagnostics.
+**READ-ALL:** returns recent chat text from the selected timeline and outgoing
+queue text.
+```
+{"threadId": "string"}       // optional; "sessionKey" alias also accepted
+```
+Returns `{ connectionStatus, defaultThreadId, composeTarget, threads, queue, selectedTimeline }`.
+
+### app.chat.send
+Send a message through the same native chat provider used by the Chat UI.
+```
+{
+  "message": "string",       // required
+  "threadId": "string"       // optional; defaults to compose/default thread
+}
+```
+Returns `{ sent, threadId, entryCount, turnActive, error? }`.
+
+### app.chat.reset
+Reset the target chat session through the gateway `sessions.reset` path.
+```
+{"threadId": "string"}       // optional; "sessionKey" alias also accepted
+```
+When `threadId`/`sessionKey` is omitted this resets the current compose/default
+thread, which usually means the active chat session. Returns `{ reset, threadId,
+error? }`.
+
+### app.chat.queue.list
+List native chat outgoing queue entries.
+**READ-ALL:** returns queued message text.
+```
+{"threadId": "string"}       // optional; "sessionKey" alias also accepted
+```
+When `threadId`/`sessionKey` is omitted this returns all queued threads. Returns:
+`{ defaultThreadId, requestedThreadId, totalCount, selectedThread, threads }`
+where each thread has `{ threadId, count, messages }`, and each message has
+`{ id, text, createdAt, sendState, errorText, canCancel }`. Queue message IDs
+are ephemeral UI/provider IDs; read them from the current `app.chat.queue.list`
+or `app.chat.snapshot` response and do not cache them across app lifetimes.
+
+### app.chat.queue.cancel
+Cancel/remove one native chat outgoing queue entry before it is sent.
+```
+{
+  "queuedMessageId": "string", // required; from the current app.chat.queue.list or app.chat.snapshot queue
+  "threadId": "string"         // required; "sessionKey" alias also accepted
+}
+```
+Only `Queued` and `Failed` entries can be removed. `Sending` entries may already
+have reached the gateway and are not canceled. Returns
+`{ canceled, threadId, queuedMessageId, remainingCount, error? }`.
+
 ## Location (location.*)
 
 ### location.get
diff --git a/src/OpenClawTray.FunctionalUI/FunctionalUI.cs b/src/OpenClawTray.FunctionalUI/FunctionalUI.cs
index 24c841be1..c7a334e35 100644
--- a/src/OpenClawTray.FunctionalUI/FunctionalUI.cs
+++ b/src/OpenClawTray.FunctionalUI/FunctionalUI.cs
@@ -202,6 +202,7 @@ public sealed record ComboBoxElement(string[] Items, int SelectedIndex, Action<i
 public sealed record ImageElement(string Source) : Element;
 public sealed record BorderElement(Element? Child) : Element;
 public sealed record StackElement(Orientation Orientation, double Spacing, IReadOnlyList<Element?> Children) : Element;
+public sealed record VirtualStackElement(Orientation Orientation, double Spacing, IReadOnlyList<Element?> Children) : Element;
 public sealed record FlexRowElement(IReadOnlyList<Element?> Children) : Element
 {
     public double ColumnGap { get; init; }
@@ -209,6 +210,7 @@ public sealed record FlexRowElement(IReadOnlyList<Element?> Children) : Element
 public sealed record GridElement(string[] Columns, string[] Rows, IReadOnlyList<Element?> Children) : Element;
 public sealed record ScrollViewElement(Element? Child) : Element;
 public sealed record ExpanderElement(string Header, Element? Child, bool IsExpanded = false) : Element;
+public sealed record NativeElement(string Identity, Func<FrameworkElement> Create, Action<FrameworkElement>? Configure = null) : Element;
 public sealed record ComponentElement(Type ComponentType, object? Props) : Element;
 public abstract record FlyoutElement(FlyoutPlacementMode Placement);
 public sealed record ContentFlyoutElement(Element Content, FlyoutPlacementMode Placement) : FlyoutElement(Placement);
@@ -597,11 +599,21 @@ public static ComboBoxElement ComboBox(string[] items, int selectedIndex = -1, A
     public static StackElement VStack(double spacing, params Element?[] children) => new(Orientation.Vertical, spacing, children);
     public static StackElement HStack(params Element?[] children) => new(Orientation.Horizontal, 0, children);
     public static StackElement HStack(double spacing, params Element?[] children) => new(Orientation.Horizontal, spacing, children);
+    public static VirtualStackElement VirtualVStack(double spacing, params Element?[] children) => new(Orientation.Vertical, spacing, children);
+    public static VirtualStackElement VirtualHStack(double spacing, params Element?[] children) => new(Orientation.Horizontal, spacing, children);
     public static GridElement Grid(string[] columns, string[] rows, params Element?[] children) => new(columns, rows, children);
     public static GridElement Grid(GridSize[] columns, GridSize[] rows, params Element?[] children) =>
         new(columns.Select(c => c.ToString()).ToArray(), rows.Select(r => r.ToString()).ToArray(), children);
     public static ScrollViewElement ScrollView(Element? child) => new(child);
     public static ExpanderElement Expander(string header, Element? child, bool isExpanded = false) => new(header, child, isExpanded);
+    public static NativeElement Native<TControl>(Func<TControl> create, Action<TControl>? configure = null, string? key = null)
+        where TControl : FrameworkElement =>
+        new(
+            key ?? typeof(TControl).AssemblyQualifiedName ?? typeof(TControl).FullName ?? typeof(TControl).Name,
+            () => create(),
+            configure is null ? null : element => configure((TControl)element));
+    public static NativeElement Native(Func<FrameworkElement> create, Action<FrameworkElement>? configure = null, string? key = null) =>
+        new(key ?? $"{create.Method.Module.ModuleVersionId:N}:{create.Method.MetadataToken}", create, configure);
     public static ContentFlyoutElement ContentFlyout(Element content, FlyoutPlacementMode placement = FlyoutPlacementMode.Bottom) =>
         new(content, placement);
     public static MenuFlyoutContentElement MenuItems(params MenuFlyoutItemBase[] items) =>
@@ -813,6 +825,7 @@ public sealed class FunctionalHostControl : ContentControl, IDisposable
     /// survives page navigation.
     /// </summary>
     public bool SuppressAutoDispose { get; set; }
+    internal int CachedVirtualStackControlCount => _renderer.CachedVirtualStackControlCount;
 
     public FunctionalHostControl()
     {
@@ -827,18 +840,29 @@ public FunctionalHostControl()
 
     public void Mount(Component component)
     {
+        if (!ReferenceEquals(_rootComponent, component) || _rootRender is not null || _rootContext is not null)
+            ClearRootState();
+
         _rootRender = null;
         _rootContext = null;
         _rootComponent = component;
         RequestRender();
     }
 
-    public void Mount(Func<RenderContext, Element> render)
+    public void Mount(Func<RenderContext, Element> render, bool preserveRootContext = false, bool renderImmediately = false)
     {
+        if (!preserveRootContext || _rootComponent is not null || _rootContext is null)
+        {
+            ClearRootState();
+            _rootContext = new RenderContext();
+        }
+
         _rootComponent = null;
         _rootRender = render;
-        _rootContext = new RenderContext();
-        RequestRender();
+        if (renderImmediately && _dispatcherQueue.HasThreadAccess)
+            Render();
+        else
+            RequestRender();
     }
 
     public void Dispose()
@@ -851,6 +875,12 @@ public void Dispose()
         Content = null;
     }
 
+    private void ClearRootState()
+    {
+        _rootComponent?.Context.RunEffectCleanups();
+        _rootContext?.RunEffectCleanups();
+    }
+
     private void RequestRender()
     {
         if (_disposed) return;
@@ -911,11 +941,34 @@ internal sealed class UiRenderer(Action requestRender)
 {
     private readonly Dictionary<string, UIElement> _controls = new();
     private readonly Dictionary<string, Component> _components = new();
+    private readonly Dictionary<string, Flyout> _contentFlyouts = new();
     private readonly HashSet<string> _mountedPaths = new();
+    private readonly HashSet<string> _visitedControlPaths = new();
+    private readonly HashSet<string> _visitedComponentKeys = new();
+    private readonly HashSet<string> _visitedContentFlyoutPaths = new();
+    private readonly HashSet<string> _visitedVirtualStackPaths = new();
+    private readonly Dictionary<string, string[]> _virtualStackOwnedPathPrefixes = new();
+
+    internal int CachedVirtualStackControlCount =>
+        _controls.Keys.Count(IsOwnedByVirtualStack);
+
+    private static readonly DependencyProperty NativeIdentityProperty =
+        DependencyProperty.RegisterAttached(
+            "NativeIdentity",
+            typeof(string),
+            typeof(UiRenderer),
+            new PropertyMetadata(null));
 
     public UIElement Render(Element element, string path, List<Action> effects)
     {
-        return RenderElement(element, path, effects);
+        _visitedControlPaths.Clear();
+        _visitedComponentKeys.Clear();
+        _visitedContentFlyoutPaths.Clear();
+        _visitedVirtualStackPaths.Clear();
+
+        var rendered = RenderElement(element, path, effects);
+        PruneUnvisitedPaths();
+        return rendered;
     }
 
     public void Dispose()
@@ -928,14 +981,19 @@ public void Dispose()
 
         _components.Clear();
         _controls.Clear();
+        _contentFlyouts.Clear();
         _mountedPaths.Clear();
+        _visitedVirtualStackPaths.Clear();
+        _virtualStackOwnedPathPrefixes.Clear();
     }
 
     private UIElement RenderElement(Element element, string path, List<Action> effects)
     {
-        if (!string.IsNullOrEmpty(element.Key))
-            path += "#" + element.Key;
+        return RenderElementCore(element, ResolveElementPath(path, element), effects);
+    }
 
+    private UIElement RenderElementCore(Element element, string path, List<Action> effects)
+    {
         var control = element switch
         {
             TextBlockElement e => ConfigureTextBlock(GetOrCreate<TextBlock>(path), e),
@@ -953,10 +1011,12 @@ private UIElement RenderElement(Element element, string path, List<Action> effec
             ImageElement e => ConfigureImage(GetOrCreate<Image>(path), e),
             BorderElement e => ConfigureBorder(GetOrCreate<Border>(path), e, path, effects),
             StackElement e => ConfigureStack(GetOrCreate<Border>(path), e, path, effects),
+            VirtualStackElement e => ConfigureVirtualStack(GetOrCreate<Border>(path), e, path, effects),
             FlexRowElement e => ConfigureFlexRow(GetOrCreate<Border>(path), e, path, effects),
             GridElement e => ConfigureGrid(GetOrCreate<Border>(path), e, path, effects),
             ScrollViewElement e => ConfigureScrollView(GetOrCreate<ScrollViewer>(path), e, path, effects),
             ExpanderElement e => ConfigureExpander(GetOrCreate<Expander>(path), e, path, effects),
+            NativeElement e => ConfigureNative(GetOrCreate<ContentControl>(path), e),
             ComponentElement e => RenderComponent(e, path, effects),
             INavigationHostElement e => RenderNavigationHost(e, path, effects),
             _ => throw new NotSupportedException($"Unsupported functional UI element: {element.GetType().Name}")
@@ -966,6 +1026,9 @@ private UIElement RenderElement(Element element, string path, List<Action> effec
         return control;
     }
 
+    private static string ResolveElementPath(string path, Element element) =>
+        string.IsNullOrEmpty(element.Key) ? path : path + "#" + element.Key;
+
     /// <summary>
     /// Renders a navigation host into a STABLE Border wrapper at <paramref name="path"/>
     /// whose Child is swapped to the current route's content on every render. This
@@ -991,6 +1054,8 @@ private UIElement RenderNavigationHost(INavigationHostElement element, string pa
 
     private T GetOrCreate<T>(string path) where T : UIElement, new()
     {
+        _visitedControlPaths.Add(path);
+
         if (_controls.TryGetValue(path, out var existing) && existing is T typed)
             return typed;
 
@@ -1018,6 +1083,8 @@ private UIElement RenderComponent(ComponentElement element, string path, List<Ac
     {
         var componentKey = GetComponentKey(element.ComponentType);
         var key = path + ":" + componentKey;
+        _visitedComponentKeys.Add(key);
+
         if (!_components.TryGetValue(key, out var component))
         {
             component = (Component)Activator.CreateInstance(element.ComponentType)!;
@@ -1264,6 +1331,192 @@ private Border ConfigureStack(Border wrapper, StackElement element, string path,
         return wrapper;
     }
 
+    private Border ConfigureVirtualStack(Border wrapper, VirtualStackElement element, string path, List<Action> effects)
+    {
+        var repeater = GetOrCreate<ItemsRepeater>(path + ".repeater");
+        _visitedVirtualStackPaths.Add(path);
+        if (repeater.Layout is not StackLayout layout)
+        {
+            layout = new StackLayout();
+            repeater.Layout = layout;
+        }
+        layout.Orientation = element.Orientation;
+        layout.Spacing = element.Spacing;
+
+        var items = element.Children
+            .Select((child, index) => child is null ? null : new VirtualStackItem(
+                index,
+                ResolveElementPath(ChildPath(path, index, child), child),
+                child))
+            .Where(item => item is not null)
+            .Cast<VirtualStackItem>()
+            .ToArray();
+        _virtualStackOwnedPathPrefixes[path] = items.Select(item => item.Path).ToArray();
+
+        if (repeater.ItemsSource is VirtualStackItem[] currentItems && VirtualStackItemsMatch(currentItems, items))
+        {
+            for (var i = 0; i < currentItems.Length; i++)
+            {
+                currentItems[i].Index = items[i].Index;
+                currentItems[i].Element = items[i].Element;
+            }
+            UpdateRealizedVirtualStackItems(currentItems, effects);
+        }
+        else
+        {
+            repeater.ItemsSource = items;
+        }
+
+        if (repeater.ItemTemplate is not VirtualStackItemTemplate template || !template.Matches(this, path))
+            repeater.ItemTemplate = new VirtualStackItemTemplate(this, path);
+
+        repeater.HorizontalAlignment = HorizontalAlignment.Stretch;
+        repeater.VerticalAlignment = VerticalAlignment.Stretch;
+
+        SetChild(wrapper, repeater);
+        ApplyModifiers(wrapper, element);
+        ApplySetters(repeater, element);
+        return wrapper;
+    }
+
+    private void UpdateRealizedVirtualStackItems(IEnumerable<VirtualStackItem> items, List<Action> effects)
+    {
+        foreach (var item in items)
+        {
+            if (item.RealizedContainer is null)
+                continue;
+
+            var child = RenderElementCore(item.Element, item.Path, effects);
+            SetChild(item.RealizedContainer, child);
+            PruneUnvisitedCachedSubtree(item.Path);
+        }
+    }
+
+    private static bool VirtualStackItemsMatch(VirtualStackItem[] currentItems, VirtualStackItem[] nextItems)
+    {
+        if (currentItems.Length != nextItems.Length)
+            return false;
+
+        for (var i = 0; i < currentItems.Length; i++)
+        {
+            if (!string.Equals(currentItems[i].Path, nextItems[i].Path, StringComparison.Ordinal))
+                return false;
+            if (currentItems[i].Element.GetType() != nextItems[i].Element.GetType())
+                return false;
+            if (currentItems[i].Element is ComponentElement currentComponent
+                && nextItems[i].Element is ComponentElement nextComponent
+                && currentComponent.ComponentType != nextComponent.ComponentType)
+            {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    private sealed class VirtualStackItem(int index, string path, Element element)
+    {
+        public int Index { get; set; } = index;
+        public string Path { get; } = path;
+        public Element Element { get; set; } = element;
+        public Border? RealizedContainer { get; set; }
+    }
+
+    private sealed class VirtualStackItemTemplate(UiRenderer renderer, string path) : IElementFactory
+    {
+        private readonly Dictionary<UIElement, VirtualStackItem> _realizedItems = new();
+
+        public bool Matches(UiRenderer otherRenderer, string otherPath) =>
+            ReferenceEquals(renderer, otherRenderer) && string.Equals(path, otherPath, StringComparison.Ordinal);
+
+        public UIElement GetElement(ElementFactoryGetArgs args)
+        {
+            if (args.Data is not VirtualStackItem item)
+                return new Border();
+
+            var container = new Border { HorizontalAlignment = HorizontalAlignment.Stretch };
+            var effects = new List<Action>();
+            var child = renderer.RenderElementCore(item.Element, item.Path, effects);
+            renderer.SetChild(container, child);
+            item.RealizedContainer = container;
+            _realizedItems[container] = item;
+            foreach (var effect in effects)
+                effect();
+            return container;
+        }
+
+        public void RecycleElement(ElementFactoryRecycleArgs args)
+        {
+            if (args.Element is not { } control || !_realizedItems.Remove(control, out var item))
+                return;
+
+            if (ReferenceEquals(item.RealizedContainer, control))
+                item.RealizedContainer = null;
+            renderer.RemoveCachedSubtree(item.Path);
+        }
+    }
+
+    private void PruneUnvisitedCachedSubtree(string prefix)
+    {
+        foreach (var (key, component) in _components
+                     .Where(pair => IsPathAtOrBelow(pair.Key, prefix) && !_visitedComponentKeys.Contains(pair.Key))
+                     .ToArray())
+        {
+            component.Context.RunEffectCleanups();
+            _components.Remove(key);
+        }
+
+        foreach (var (path, flyout) in _contentFlyouts
+                     .Where(pair => IsPathAtOrBelow(pair.Key, prefix) && !_visitedContentFlyoutPaths.Contains(pair.Key))
+                     .ToArray())
+        {
+            flyout.Hide();
+            flyout.Content = null;
+            _contentFlyouts.Remove(path);
+        }
+
+        foreach (var (path, cachedControl) in _controls
+                     .Where(pair => IsPathAtOrBelow(pair.Key, prefix) && !_visitedControlPaths.Contains(pair.Key))
+                     .OrderByDescending(pair => pair.Key.Length)
+                     .ToArray())
+        {
+            _mountedPaths.Remove(path);
+            DetachChildren(cachedControl);
+            RemoveFromParent(cachedControl);
+            _controls.Remove(path);
+        }
+    }
+
+    private void RemoveCachedSubtree(string prefix)
+    {
+        foreach (var (key, component) in _components
+                     .Where(pair => IsPathAtOrBelow(pair.Key, prefix))
+                     .ToArray())
+        {
+            component.Context.RunEffectCleanups();
+            _components.Remove(key);
+        }
+
+        foreach (var (path, flyout) in _contentFlyouts
+                     .Where(pair => IsPathAtOrBelow(pair.Key, prefix))
+                     .ToArray())
+        {
+            flyout.Hide();
+            _contentFlyouts.Remove(path);
+        }
+
+        foreach (var (path, cachedControl) in _controls
+                     .Where(pair => IsPathAtOrBelow(pair.Key, prefix))
+                     .OrderByDescending(pair => pair.Key.Length)
+                     .ToArray())
+        {
+            _mountedPaths.Remove(path);
+            DetachChildren(cachedControl);
+            RemoveFromParent(cachedControl);
+            _controls.Remove(path);
+        }
+    }
+
     private Border ConfigureFlexRow(Border wrapper, FlexRowElement element, string path, List<Action> effects)
     {
         var panel = GetOrCreate<StackPanel>(path + ".panel");
@@ -1364,6 +1617,34 @@ private Expander ConfigureExpander(Expander control, ExpanderElement element, st
         return control;
     }
 
+    private ContentControl ConfigureNative(ContentControl wrapper, NativeElement element)
+    {
+        var currentIdentity = (string?)wrapper.GetValue(NativeIdentityProperty);
+        if (wrapper.Content is not FrameworkElement native
+            || !string.Equals(currentIdentity, element.Identity, StringComparison.Ordinal))
+        {
+            DisposeNativeContent(wrapper.Content);
+            native = element.Create();
+            native.HorizontalAlignment = HorizontalAlignment.Stretch;
+            native.VerticalAlignment = VerticalAlignment.Stretch;
+            wrapper.Content = native;
+            wrapper.SetValue(NativeIdentityProperty, element.Identity);
+        }
+
+        wrapper.HorizontalContentAlignment = HorizontalAlignment.Stretch;
+        wrapper.VerticalContentAlignment = VerticalAlignment.Stretch;
+        element.Configure?.Invoke(native);
+        ApplyModifiers(wrapper, element);
+        ApplySetters(native, element);
+        return wrapper;
+    }
+
+    private static void DisposeNativeContent(object? content)
+    {
+        if (content is IDisposable disposable)
+            disposable.Dispose();
+    }
+
     private FlyoutBase CreateFlyout(FlyoutElement element, string path, List<Action> effects)
     {
         return element switch
@@ -1376,13 +1657,91 @@ private FlyoutBase CreateFlyout(FlyoutElement element, string path, List<Action>
 
     private Flyout CreateContentFlyout(ContentFlyoutElement element, string path, List<Action> effects)
     {
-        var flyout = new Flyout { Placement = element.Placement };
+        _visitedContentFlyoutPaths.Add(path);
+
+        // Cache the Flyout instance per path so its identity is STABLE across
+        // re-renders. ConfigureButton reassigns control.Flyout on every render,
+        // and a full-root re-render fires on every state change (including the
+        // flyout content's own search box). If we minted a `new Flyout()` each
+        // time, an already-open flyout would (a) become unreachable from
+        // control.Flyout (so callers' `Flyout.Hide()` would target an orphan and
+        // no-op) and (b) have its reused content control reparented out from
+        // under the visible popup. Reusing the same Flyout keeps it dismissable
+        // and stops the open popup from being torn apart mid-interaction.
+        if (!_contentFlyouts.TryGetValue(path, out var flyout))
+        {
+            flyout = new Flyout();
+            _contentFlyouts[path] = flyout;
+        }
+
+        flyout.Placement = element.Placement;
         var content = RenderElement(element.Content, path + ".content", effects);
-        RemoveFromParent(content);
-        flyout.Content = content;
+        if (!ReferenceEquals(flyout.Content, content))
+        {
+            RemoveFromParent(content);
+            flyout.Content = content;
+        }
         return flyout;
     }
 
+    private void PruneUnvisitedPaths()
+    {
+        foreach (var path in _virtualStackOwnedPathPrefixes.Keys.ToArray())
+        {
+            if (!_visitedVirtualStackPaths.Contains(path))
+                _virtualStackOwnedPathPrefixes.Remove(path);
+        }
+
+        foreach (var (key, component) in _components.ToArray())
+        {
+            if (_visitedComponentKeys.Contains(key) || IsOwnedByVirtualStack(key))
+                continue;
+
+            component.Context.RunEffectCleanups();
+            _components.Remove(key);
+        }
+
+        foreach (var (path, flyout) in _contentFlyouts.ToArray())
+        {
+            if (_visitedContentFlyoutPaths.Contains(path) || IsOwnedByVirtualStack(path))
+                continue;
+
+            flyout.Hide();
+            flyout.Content = null;
+            _contentFlyouts.Remove(path);
+        }
+
+        foreach (var (path, control) in _controls.ToArray())
+        {
+            if (_visitedControlPaths.Contains(path) || IsOwnedByVirtualStack(path))
+                continue;
+
+            _mountedPaths.Remove(path);
+            DetachChildren(control);
+            RemoveFromParent(control);
+            _controls.Remove(path);
+        }
+    }
+
+    private bool IsOwnedByVirtualStack(string path)
+    {
+        foreach (var prefixes in _virtualStackOwnedPathPrefixes.Values)
+        {
+            foreach (var prefix in prefixes)
+            {
+                if (IsPathAtOrBelow(path, prefix))
+                    return true;
+            }
+        }
+
+        return false;
+    }
+
+    private static bool IsPathAtOrBelow(string path, string prefix) =>
+        string.Equals(path, prefix, StringComparison.Ordinal)
+        || path.StartsWith(prefix + ".", StringComparison.Ordinal)
+        || path.StartsWith(prefix + ":", StringComparison.Ordinal);
+
     private static MenuFlyout CreateMenuFlyout(MenuFlyoutContentElement element)
     {
         var flyout = new MenuFlyout { Placement = element.Placement };
@@ -1590,6 +1949,7 @@ private static void DetachChildren(UIElement element)
                 scrollViewer.Content = null;
                 break;
             case ContentControl contentControl:
+                DisposeNativeContent(contentControl.Content);
                 contentControl.Content = null;
                 break;
         }
@@ -1600,20 +1960,37 @@ private static void ApplyModifiers(FrameworkElement control, Element element)
         var m = element.Modifiers;
         control.Tag = element;
         if (m.Margin is { } margin) control.Margin = margin;
+        else control.ClearValue(FrameworkElement.MarginProperty);
         if (m.Width is { } width) control.Width = width;
+        else control.ClearValue(FrameworkElement.WidthProperty);
         if (m.Height is { } height) control.Height = height;
+        else control.ClearValue(FrameworkElement.HeightProperty);
         if (m.MinWidth is { } minWidth) control.MinWidth = minWidth;
+        else control.ClearValue(FrameworkElement.MinWidthProperty);
         if (m.MaxWidth is { } maxWidth) control.MaxWidth = maxWidth;
+        else control.ClearValue(FrameworkElement.MaxWidthProperty);
         if (m.MinHeight is { } minHeight) control.MinHeight = minHeight;
+        else control.ClearValue(FrameworkElement.MinHeightProperty);
         if (m.MaxHeight is { } maxHeight) control.MaxHeight = maxHeight;
+        else control.ClearValue(FrameworkElement.MaxHeightProperty);
         if (m.HorizontalAlignment is { } hAlign) control.HorizontalAlignment = hAlign;
+        else control.ClearValue(FrameworkElement.HorizontalAlignmentProperty);
         if (m.VerticalAlignment is { } vAlign) control.VerticalAlignment = vAlign;
+        else control.ClearValue(FrameworkElement.VerticalAlignmentProperty);
         if (m.Opacity is { } opacity) control.Opacity = opacity;
+        else control.ClearValue(UIElement.OpacityProperty);
         if (m.AutomationName is { } automationName) AutomationProperties.SetName(control, automationName);
+        else control.ClearValue(AutomationProperties.NameProperty);
         if (m.LiveRegion is { } liveRegion) AutomationProperties.SetLiveSetting(control, liveRegion);
+        else control.ClearValue(AutomationProperties.LiveSettingProperty);
         ApplyResourceOverrides(control, m.ResourceOverrides);
-        if (m.Disabled is { } disabled && control is Control disabledControl)
-            disabledControl.IsEnabled = !disabled;
+        if (control is Control disabledControl)
+        {
+            if (m.Disabled is { } disabled)
+                disabledControl.IsEnabled = !disabled;
+            else
+                disabledControl.ClearValue(Control.IsEnabledProperty);
+        }
 
         control.KeyDown -= ElementKeyDown;
         if (m.KeyDown is not null) control.KeyDown += ElementKeyDown;
@@ -1626,37 +2003,59 @@ private static void ApplyModifiers(FrameworkElement control, Element element)
         {
             case TextBlock tb:
                 if (m.FontSize is { } textSize) tb.FontSize = textSize;
+                else tb.ClearValue(TextBlock.FontSizeProperty);
                 if (m.FontWeight is { } textWeight) tb.FontWeight = textWeight;
+                else tb.ClearValue(TextBlock.FontWeightProperty);
                 if (m.FontFamily is { } textFamily) tb.FontFamily = textFamily;
+                else tb.ClearValue(TextBlock.FontFamilyProperty);
                 if (m.TextWrapping is { } wrapping) tb.TextWrapping = wrapping;
+                else tb.ClearValue(TextBlock.TextWrappingProperty);
                 if (m.Padding is { } textPadding) tb.Padding = textPadding;
+                else tb.ClearValue(TextBlock.PaddingProperty);
                 if (m.ForegroundResourceKey is { } textFgResource) tb.Foreground = ThemeResources.ResolveBrush(textFgResource);
                 else if (m.Foreground is { } textFg) tb.Foreground = textFg;
+                else tb.ClearValue(TextBlock.ForegroundProperty);
+                tb.ClearValue(TextBlock.TextTrimmingProperty);
+                tb.ClearValue(TextBlock.MaxLinesProperty);
+                tb.ClearValue(TextBlock.LineHeightProperty);
+                tb.ClearValue(TextBlock.CharacterSpacingProperty);
                 break;
             case Control c:
                 if (m.Padding is { } controlPadding) c.Padding = controlPadding;
+                else c.ClearValue(Control.PaddingProperty);
                 if (m.FontSize is { } controlSize) c.FontSize = controlSize;
+                else c.ClearValue(Control.FontSizeProperty);
                 if (m.FontWeight is { } controlWeight) c.FontWeight = controlWeight;
+                else c.ClearValue(Control.FontWeightProperty);
                 if (m.FontFamily is { } controlFamily) c.FontFamily = controlFamily;
+                else c.ClearValue(Control.FontFamilyProperty);
                 if (m.ForegroundResourceKey is { } controlFgResource) c.Foreground = ThemeResources.ResolveBrush(controlFgResource);
                 else if (m.Foreground is { } controlFg) c.Foreground = controlFg;
+                else c.ClearValue(Control.ForegroundProperty);
                 if (m.BorderBrushResourceKey is { } controlBorderResource) c.BorderBrush = ThemeResources.ResolveBrush(controlBorderResource);
                 else if (m.BorderBrush is { } controlBorder) c.BorderBrush = controlBorder;
+                else c.ClearValue(Control.BorderBrushProperty);
                 if (m.BorderThickness is { } controlThickness) c.BorderThickness = controlThickness;
+                else c.ClearValue(Control.BorderThicknessProperty);
                 break;
             case Border b:
                 if (m.Padding is { } borderPadding) b.Padding = borderPadding;
+                else b.ClearValue(Border.PaddingProperty);
                 if (m.BackgroundResourceKey is { } backgroundResourceKey)
                     b.Background = ThemeResources.ResolveBrush(backgroundResourceKey);
                 else if (m.Background is { } bg)
                     b.Background = bg;
+                else b.ClearValue(Border.BackgroundProperty);
                 if (m.BorderBrushResourceKey is { } borderResourceKey)
                     b.BorderBrush = ThemeResources.ResolveBrush(borderResourceKey);
                 else if (m.BorderBrush is { } borderBrush)
                     b.BorderBrush = borderBrush;
+                else b.ClearValue(Border.BorderBrushProperty);
                 if (m.BorderThickness is { } borderThickness)
                     b.BorderThickness = borderThickness;
+                else b.ClearValue(Border.BorderThicknessProperty);
                 if (m.CornerRadius is { } radius) b.CornerRadius = radius;
+                else b.ClearValue(Border.CornerRadiusProperty);
                 break;
         }
     }
diff --git a/src/OpenClawTray.FunctionalUI/OpenClawTray.FunctionalUI.csproj b/src/OpenClawTray.FunctionalUI/OpenClawTray.FunctionalUI.csproj
index fd79b32ea..bcbfea11b 100644
--- a/src/OpenClawTray.FunctionalUI/OpenClawTray.FunctionalUI.csproj
+++ b/src/OpenClawTray.FunctionalUI/OpenClawTray.FunctionalUI.csproj
@@ -23,6 +23,9 @@
     <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
       <_Parameter1>OpenClawTray.FunctionalUI.Tests</_Parameter1>
     </AssemblyAttribute>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
+      <_Parameter1>OpenClaw.Tray.UITests</_Parameter1>
+    </AssemblyAttribute>
   </ItemGroup>
 
 </Project>
diff --git a/src/skills/windows-a2ui/SKILL.md b/src/skills/windows-a2ui/SKILL.md
index f8d719e4f..1d60a50cb 100644
--- a/src/skills/windows-a2ui/SKILL.md
+++ b/src/skills/windows-a2ui/SKILL.md
@@ -71,9 +71,13 @@ A `path` is a JSON Pointer into the surface's data model. The renderer subscribe
   { "key": "first",  "valueString": "Alice" },
   { "key": "last",   "valueString": "Smith" }
 ] }
+{ "key": "tags",     "valueArray": [
+  { "valueString": "admin" },
+  { "valueString": "beta" }
+] }
 ```
 
-Exactly one of `valueString` / `valueNumber` / `valueBoolean` / `valueMap` should be set per entry. `valueMap` is a recursive adjacency list (each item is itself an entry). Arrays of strings are not first-class on the data-model side — store them as a `path` consumed by `MultipleChoice.selections` or by a literalArray default.
+Exactly one of `valueString` / `valueNumber` / `valueBoolean` / `valueMap` / `valueArray` should be set per entry. `valueMap` is a recursive adjacency list (each item is itself an entry). `valueArray` is an ordered list whose items are value-typed entries with no `key` (they may be scalars, maps, or nested arrays) — this is the first-class way to seed an array the renderer consumes, e.g. `MultipleChoice.selections`. Bare-primitive arrays (`["a","b"]`) are also tolerated.
 
 ## Components
 
diff --git a/tests/OpenClaw.Connection.Tests/ConnectionDiagnosticsTests.cs b/tests/OpenClaw.Connection.Tests/ConnectionDiagnosticsTests.cs
index 48006fc57..c5269e609 100644
--- a/tests/OpenClaw.Connection.Tests/ConnectionDiagnosticsTests.cs
+++ b/tests/OpenClaw.Connection.Tests/ConnectionDiagnosticsTests.cs
@@ -110,7 +110,24 @@ public void RecordWebSocketEvent_RecordsEvent()
         var all = _diag.GetAll();
         Assert.Equal("websocket", all[0].Category);
         Assert.Equal("Connected", all[0].Message);
-        Assert.Equal("wss://test", all[0].Detail);
+        Assert.Equal("wss://<host>/", all[0].Detail);
+    }
+
+    [Fact]
+    public void Record_SanitizesSensitiveValuesBeforeBuffering()
+    {
+        _diag.Record(
+            "websocket",
+            "Connecting with Authorization: Bearer secret-token",
+            "wss://alice:password@gateway.example.com/reset?token=secret");
+
+        var evt = Assert.Single(_diag.GetAll());
+        Assert.DoesNotContain("secret-token", evt.Message);
+        Assert.DoesNotContain("alice", evt.Detail);
+        Assert.DoesNotContain("password", evt.Detail);
+        Assert.DoesNotContain("token=secret", evt.Detail);
+        Assert.Contains("Authorization: [REDACTED]", evt.Message);
+        Assert.Contains("wss://<host>/reset", evt.Detail);
     }
 
     [Fact]
diff --git a/tests/OpenClaw.Connection.Tests/ConnectionStateMachineTests.cs b/tests/OpenClaw.Connection.Tests/ConnectionStateMachineTests.cs
index 29b401b69..dcf71a49f 100644
--- a/tests/OpenClaw.Connection.Tests/ConnectionStateMachineTests.cs
+++ b/tests/OpenClaw.Connection.Tests/ConnectionStateMachineTests.cs
@@ -278,6 +278,22 @@ public void NodePairingRequired_WithOperatorConnected_DerivesPairingRequired()
         Assert.Equal(OpenClaw.Shared.PairingStatus.Pending, _sm.Current.NodePairingStatus);
     }
 
+    [Fact]
+    public void NodePairingRequired_FromNodeError_ClearsStaleNodeError()
+    {
+        _sm.SetNodeEnabled(true);
+        GoToConnected();
+        _sm.StartNodeConnecting();
+        Assert.True(_sm.TryTransition(ConnectionTrigger.NodeError, "transport failed"));
+
+        Assert.True(_sm.TryTransition(ConnectionTrigger.NodePairingRequired));
+
+        Assert.Equal(OverallConnectionState.PairingRequired, _sm.Current.OverallState);
+        Assert.Equal(RoleConnectionState.PairingRequired, _sm.Current.NodeState);
+        Assert.Null(_sm.Current.NodeError);
+        Assert.Equal(OpenClaw.Shared.PairingStatus.Pending, _sm.Current.NodePairingStatus);
+    }
+
     [Fact]
     public void SetNodeInfo_PendingWithoutRequestId_ClearsStaleRequestIdAndKind()
     {
@@ -337,15 +353,17 @@ public void NodePairingRejected_DerivesDegraded()
     }
 
     [Fact]
-    public void NodeDisconnected_FromConnected_DerivesConnected()
+    public void NodeDisconnected_FromConnected_DerivesDegradedWhenNodeStillIntended()
     {
         _sm.SetNodeEnabled(true);
         GoToConnected();
         _sm.StartNodeConnecting();
         _sm.TryTransition(ConnectionTrigger.NodeConnected);
         Assert.True(_sm.TryTransition(ConnectionTrigger.NodeDisconnected));
-        // Operator still connected, node idle → Connected (not Ready)
+        // Operator still connected, node mode still intended, node idle → Degraded (not healthy).
         Assert.Equal(RoleConnectionState.Idle, _sm.Current.NodeState);
+        Assert.Equal(OverallConnectionState.Degraded, _sm.Current.OverallState);
+        Assert.True(_sm.Current.NodeConnectionIntended);
     }
 
     [Fact]
@@ -378,6 +396,7 @@ public void SetNodeEnabled_True_SetsNodeToIdle()
     {
         _sm.SetNodeEnabled(true);
         Assert.Equal(RoleConnectionState.Idle, _sm.Current.NodeState);
+        Assert.True(_sm.Current.NodeConnectionIntended);
     }
 
     [Fact]
@@ -385,6 +404,32 @@ public void SetNodeEnabled_False_SetsNodeToDisabled()
     {
         _sm.SetNodeEnabled(false);
         Assert.Equal(RoleConnectionState.Disabled, _sm.Current.NodeState);
+        Assert.False(_sm.Current.NodeConnectionIntended);
+    }
+
+    [Fact]
+    public void BlockNodeStart_WithOperatorConnected_DerivesDegradedAndKeepsReason()
+    {
+        _sm.SetNodeEnabled(true);
+        GoToConnected();
+
+        _sm.BlockNodeStart("No node credential available");
+
+        Assert.Equal(OverallConnectionState.Degraded, _sm.Current.OverallState);
+        Assert.Equal(RoleConnectionState.Error, _sm.Current.NodeState);
+        Assert.Equal("No node credential available", _sm.Current.NodeError);
+        Assert.True(_sm.Current.NodeConnectionIntended);
+    }
+
+    [Fact]
+    public void BlockNodeStart_WithoutOperatorConnected_DerivesErrorAndKeepsReason()
+    {
+        _sm.BlockNodeStart("No node credential available");
+
+        Assert.Equal(OverallConnectionState.Error, _sm.Current.OverallState);
+        Assert.Equal(RoleConnectionState.Error, _sm.Current.NodeState);
+        Assert.Equal("No node credential available", _sm.Current.NodeError);
+        Assert.True(_sm.Current.NodeConnectionIntended);
     }
 
     // ─── Reset ───
@@ -420,10 +465,14 @@ public void Reset_ReturnsToIdle()
     [InlineData(RoleConnectionState.Connected, RoleConnectionState.RateLimited, false, OverallConnectionState.Ready)]
     // Node connecting is ignored when node mode is disabled → Ready (not Connecting).
     [InlineData(RoleConnectionState.Connected, RoleConnectionState.Connecting, false, OverallConnectionState.Ready)]
-    // Operator connected, node idle, node enabled → operator-only connected (fallthrough).
-    [InlineData(RoleConnectionState.Connected, RoleConnectionState.Idle, true, OverallConnectionState.Connected)]
+    // Operator connected, node idle, node enabled → intended node is blocked/degraded.
+    [InlineData(RoleConnectionState.Connected, RoleConnectionState.Idle, true, OverallConnectionState.Degraded)]
     // Node PairingRequired is reported regardless of nodeEnabled.
     [InlineData(RoleConnectionState.Connected, RoleConnectionState.PairingRequired, false, OverallConnectionState.PairingRequired)]
+    [InlineData(RoleConnectionState.Idle, RoleConnectionState.Connecting, true, OverallConnectionState.Connecting)]
+    [InlineData(RoleConnectionState.Idle, RoleConnectionState.Error, true, OverallConnectionState.Error)]
+    [InlineData(RoleConnectionState.Idle, RoleConnectionState.PairingRequired, true, OverallConnectionState.PairingRequired)]
+    [InlineData(RoleConnectionState.Idle, RoleConnectionState.Connected, true, OverallConnectionState.Connected)]
     public void DeriveOverall_ReturnsCorrectState(
         RoleConnectionState op, RoleConnectionState node, bool nodeEnabled, OverallConnectionState expected)
     {
diff --git a/tests/OpenClaw.Connection.Tests/DeviceIdentityStoreTests.cs b/tests/OpenClaw.Connection.Tests/DeviceIdentityStoreTests.cs
index e17f9c1f2..94b45bbc7 100644
--- a/tests/OpenClaw.Connection.Tests/DeviceIdentityStoreTests.cs
+++ b/tests/OpenClaw.Connection.Tests/DeviceIdentityStoreTests.cs
@@ -111,6 +111,18 @@ public void ClearStoredTokens_WhenFileAbsent_DoesNotThrow()
         Assert.Null(ex);
     }
 
+    [Fact]
+    public void ClearStoredTokens_WhenJsonRootIsNotObject_DoesNotThrow()
+    {
+        var path = Path.Combine(_tempDir, "device-key-ed25519.json");
+        File.WriteAllText(path, "[]");
+
+        var ex = Record.Exception(() => DeviceIdentityStore.ClearStoredTokens(_tempDir));
+
+        Assert.Null(ex);
+        Assert.Equal("[]", File.ReadAllText(path));
+    }
+
     [Fact]
     public void ClearStoredTokens_WhenNoTokenFields_PreservesAllProperties()
     {
diff --git a/tests/OpenClaw.Connection.Tests/GatewayClientEndpointResolverTests.cs b/tests/OpenClaw.Connection.Tests/GatewayClientEndpointResolverTests.cs
new file mode 100644
index 000000000..5511d22c9
--- /dev/null
+++ b/tests/OpenClaw.Connection.Tests/GatewayClientEndpointResolverTests.cs
@@ -0,0 +1,55 @@
+namespace OpenClaw.Connection.Tests;
+
+public sealed class GatewayClientEndpointResolverTests
+{
+    [Fact]
+    public void Resolve_UsesRecordUrlIncludingCustomPort()
+    {
+        var record = new GatewayRecord
+        {
+            Id = "local-custom-port",
+            Url = "ws://localhost:27555",
+        };
+
+        Assert.Equal("ws://localhost:27555", GatewayClientEndpointResolver.Resolve(record));
+    }
+
+    [Fact]
+    public void Resolve_UsesLocalForwardForTunnelBackedRecord()
+    {
+        var record = new GatewayRecord
+        {
+            Id = "mixed-managed-wsl-ssh",
+            Url = "ws://remote.internal:18789",
+            SetupManagedDistroName = "OpenClawGateway",
+            SshTunnel = new SshTunnelConfig(
+                "user",
+                "remote.internal",
+                RemotePort: 18789,
+                LocalPort: 45678),
+        };
+
+        Assert.Equal("ws://localhost:45678", GatewayClientEndpointResolver.Resolve(record));
+    }
+
+    [Theory]
+    [InlineData(0)]
+    [InlineData(65536)]
+    public void Resolve_RejectsInvalidTunnelLocalPort(int localPort)
+    {
+        var record = new GatewayRecord
+        {
+            Id = "invalid-tunnel",
+            Url = "wss://remote.example",
+            SshTunnel = new SshTunnelConfig(
+                "user",
+                "remote.example",
+                RemotePort: 18789,
+                LocalPort: localPort),
+        };
+
+        var error = Assert.Throws<InvalidOperationException>(() => GatewayClientEndpointResolver.Resolve(record));
+
+        Assert.Contains("local port", error.Message, StringComparison.OrdinalIgnoreCase);
+    }
+}
diff --git a/tests/OpenClaw.Connection.Tests/GatewayConnectionManagerTests.cs b/tests/OpenClaw.Connection.Tests/GatewayConnectionManagerTests.cs
index 8e82da628..d1e36d08d 100644
--- a/tests/OpenClaw.Connection.Tests/GatewayConnectionManagerTests.cs
+++ b/tests/OpenClaw.Connection.Tests/GatewayConnectionManagerTests.cs
@@ -308,6 +308,256 @@ public async Task HandshakeSucceeded_StartsManagerNodeConnector_WhenGateAllows()
         Assert.Equal("wss://remote.example", nodeConnector.LastGatewayUrl);
     }
 
+    [Fact]
+    public async Task HandshakeSucceeded_NodeModeEnabledMarksNodeConnectingBeforeEmitting()
+    {
+        SetupGateway("gw-remote", "wss://remote.example", isLocal: false);
+        _resolver.OperatorCredential = new GatewayCredential("op-tok", false, "test");
+        _resolver.NodeCredential = new GatewayCredential("node-tok", false, "test");
+        var nodeConnector = new CountingNodeConnector();
+        using var manager = new GatewayConnectionManager(
+            _resolver,
+            _factory,
+            _registry,
+            NullLogger.Instance,
+            nodeConnector: nodeConnector,
+            isNodeEnabled: () => true);
+        var snapshots = new List<GatewayConnectionSnapshot>();
+        manager.StateChanged += (_, snapshot) => snapshots.Add(snapshot);
+
+        await manager.ConnectAsync("gw-remote");
+        await InvokeHandshakeSucceededAsync(manager);
+
+        Assert.Contains(snapshots, snapshot =>
+            snapshot.OperatorState == RoleConnectionState.Connected &&
+            snapshot.NodeState == RoleConnectionState.Connecting &&
+            snapshot.OverallState == OverallConnectionState.Connecting);
+        Assert.DoesNotContain(snapshots, snapshot =>
+            snapshot.OperatorState == RoleConnectionState.Connected &&
+            snapshot.NodeState == RoleConnectionState.Idle &&
+            snapshot.OverallState == OverallConnectionState.Degraded);
+    }
+
+    [Fact]
+    public async Task HandshakeSucceeded_NodeModeEnabledMissingGatewayRecord_ReportsBlockedNode()
+    {
+        SetupGateway("gw-remote", "wss://remote.example", isLocal: false);
+        _resolver.OperatorCredential = new GatewayCredential("op-tok", false, "test");
+        _resolver.NodeCredential = new GatewayCredential("node-tok", false, "test");
+        var nodeConnector = new CountingNodeConnector();
+        using var manager = new GatewayConnectionManager(
+            _resolver,
+            _factory,
+            _registry,
+            NullLogger.Instance,
+            nodeConnector: nodeConnector,
+            isNodeEnabled: () => true);
+
+        await manager.ConnectAsync("gw-remote");
+        _registry.Remove("gw-remote");
+        await InvokeHandshakeSucceededAsync(manager);
+
+        Assert.Equal(0, nodeConnector.ConnectCount);
+        Assert.Equal(RoleConnectionState.Error, manager.CurrentSnapshot.NodeState);
+        Assert.True(manager.CurrentSnapshot.NodeConnectionIntended);
+        Assert.Equal(OverallConnectionState.Degraded, manager.CurrentSnapshot.OverallState);
+        Assert.Contains("gateway record", manager.CurrentSnapshot.NodeError, StringComparison.OrdinalIgnoreCase);
+    }
+
+    [Fact]
+    public async Task HandshakeSucceeded_NodeModeEnabledMissingGatewayRecord_EmitsNoReadySnapshot()
+    {
+        SetupGateway("gw-remote", "wss://remote.example", isLocal: false);
+        _resolver.OperatorCredential = new GatewayCredential("op-tok", false, "test");
+        _resolver.NodeCredential = new GatewayCredential("node-tok", false, "test");
+        var nodeConnector = new CountingNodeConnector();
+        using var manager = new GatewayConnectionManager(
+            _resolver,
+            _factory,
+            _registry,
+            NullLogger.Instance,
+            nodeConnector: nodeConnector,
+            isNodeEnabled: () => true);
+        var snapshots = new List<GatewayConnectionSnapshot>();
+        manager.StateChanged += (_, snapshot) => snapshots.Add(snapshot);
+
+        await manager.ConnectAsync("gw-remote");
+        _registry.Remove("gw-remote");
+        await InvokeHandshakeSucceededAsync(manager);
+
+        Assert.DoesNotContain(snapshots, snapshot =>
+            snapshot.OperatorState == RoleConnectionState.Connected &&
+            snapshot.OverallState == OverallConnectionState.Ready);
+        Assert.Contains(snapshots, snapshot =>
+            snapshot.NodeState == RoleConnectionState.Error &&
+            snapshot.NodeError?.Contains("gateway record", StringComparison.OrdinalIgnoreCase) == true);
+    }
+
+    [Fact]
+    public async Task HandshakeSucceeded_NodeModeEnabledMissingConnector_EmitsNoReadySnapshot()
+    {
+        SetupGateway("gw-remote", "wss://remote.example", isLocal: false);
+        _resolver.OperatorCredential = new GatewayCredential("op-tok", false, "test");
+        using var manager = new GatewayConnectionManager(
+            _resolver,
+            _factory,
+            _registry,
+            NullLogger.Instance,
+            isNodeEnabled: () => true);
+        var snapshots = new List<GatewayConnectionSnapshot>();
+        manager.StateChanged += (_, snapshot) => snapshots.Add(snapshot);
+
+        await manager.ConnectAsync("gw-remote");
+        await InvokeHandshakeSucceededAsync(manager);
+
+        Assert.DoesNotContain(snapshots, snapshot =>
+            snapshot.OperatorState == RoleConnectionState.Connected &&
+            snapshot.OverallState == OverallConnectionState.Ready);
+        Assert.Equal(RoleConnectionState.Error, manager.CurrentSnapshot.NodeState);
+        Assert.Contains("no node connector", manager.CurrentSnapshot.NodeError, StringComparison.OrdinalIgnoreCase);
+    }
+
+    [Fact]
+    public async Task ReconnectAfterNodeModeDisabled_ClearsNodeIntentAndDoesNotDeriveDegraded()
+    {
+        var nodeEnabled = true;
+        SetupGateway("gw-remote", "wss://remote.example", isLocal: false);
+        _resolver.OperatorCredential = new GatewayCredential("op-tok", false, "test");
+        _resolver.NodeCredential = new GatewayCredential("node-tok", false, "test");
+        var nodeConnector = new CountingNodeConnector();
+        using var manager = new GatewayConnectionManager(
+            _resolver,
+            _factory,
+            _registry,
+            NullLogger.Instance,
+            nodeConnector: nodeConnector,
+            isNodeEnabled: () => nodeEnabled);
+
+        await manager.ConnectAsync("gw-remote");
+        await InvokeHandshakeSucceededAsync(manager);
+        Assert.True(manager.CurrentSnapshot.NodeConnectionIntended);
+
+        nodeEnabled = false;
+        await manager.ReconnectAsync();
+        await InvokeHandshakeSucceededAsync(manager);
+
+        Assert.False(manager.CurrentSnapshot.NodeConnectionIntended);
+        Assert.Equal(RoleConnectionState.Disabled, manager.CurrentSnapshot.NodeState);
+        Assert.Equal(OverallConnectionState.Ready, manager.CurrentSnapshot.OverallState);
+    }
+
+    [Fact]
+    public async Task HandshakeSucceeded_NodeModeEnabledWithoutNodeCredential_DerivesDegradedBlockedNode()
+    {
+        SetupGateway("gw-remote", "wss://remote.example", isLocal: false);
+        _resolver.OperatorCredential = new GatewayCredential("op-tok", false, "test");
+        _resolver.NodeCredential = null;
+        var nodeConnector = new CountingNodeConnector();
+        using var manager = new GatewayConnectionManager(
+            _resolver,
+            _factory,
+            _registry,
+            NullLogger.Instance,
+            nodeConnector: nodeConnector,
+            isNodeEnabled: () => true);
+
+        await manager.ConnectAsync("gw-remote");
+        await InvokeHandshakeSucceededAsync(manager);
+
+        Assert.Equal(0, nodeConnector.ConnectCount);
+        Assert.Equal(RoleConnectionState.Connected, manager.CurrentSnapshot.OperatorState);
+        Assert.Equal(RoleConnectionState.Error, manager.CurrentSnapshot.NodeState);
+        Assert.True(manager.CurrentSnapshot.NodeConnectionIntended);
+        Assert.Equal(OverallConnectionState.Degraded, manager.CurrentSnapshot.OverallState);
+        Assert.Contains("No node credential", manager.CurrentSnapshot.NodeError);
+        Assert.Null(manager.CurrentSnapshot.NodeCredentialSource);
+    }
+
+    [Fact]
+    public async Task HandshakeSucceeded_NodeConnectorThrows_ReportsBlockedNode()
+    {
+        SetupGateway("gw-remote", "wss://remote.example", isLocal: false);
+        _resolver.OperatorCredential = new GatewayCredential("op-tok", false, "test");
+        _resolver.NodeCredential = new GatewayCredential("node-tok", false, "test");
+        var nodeConnector = new ScriptedNodeConnector
+        {
+            ConnectAction = (_, _) => throw new InvalidOperationException("connector boom")
+        };
+        using var manager = new GatewayConnectionManager(
+            _resolver,
+            _factory,
+            _registry,
+            NullLogger.Instance,
+            nodeConnector: nodeConnector,
+            isNodeEnabled: () => true);
+        var snapshots = new List<GatewayConnectionSnapshot>();
+        manager.StateChanged += (_, snapshot) => snapshots.Add(snapshot);
+
+        await manager.ConnectAsync("gw-remote");
+        await InvokeHandshakeSucceededAsync(manager);
+
+        Assert.Equal(1, nodeConnector.ConnectCount);
+        Assert.Equal(RoleConnectionState.Error, manager.CurrentSnapshot.NodeState);
+        Assert.Equal(OverallConnectionState.Degraded, manager.CurrentSnapshot.OverallState);
+        Assert.True(manager.CurrentSnapshot.NodeConnectionIntended);
+        Assert.Contains("connector boom", manager.CurrentSnapshot.NodeError, StringComparison.OrdinalIgnoreCase);
+        Assert.Contains(snapshots, snapshot =>
+            snapshot.NodeState == RoleConnectionState.Error &&
+            snapshot.NodeError?.Contains("connector boom", StringComparison.OrdinalIgnoreCase) == true);
+        Assert.NotEqual(RoleConnectionState.Connecting, snapshots.Last().NodeState);
+    }
+
+    [Fact]
+    public async Task HandshakeSucceeded_PreviousNodeDisconnectThrows_ReportsBlockedNode()
+    {
+        SetupGateway("gw-remote", "wss://remote.example", isLocal: false);
+        _resolver.OperatorCredential = new GatewayCredential("op-tok", false, "test");
+        _resolver.NodeCredential = new GatewayCredential("node-tok", false, "test");
+        var nodeConnector = new ThrowingNodeDisconnectConnector();
+        using var manager = new GatewayConnectionManager(
+            _resolver,
+            _factory,
+            _registry,
+            NullLogger.Instance,
+            nodeConnector: nodeConnector,
+            isNodeEnabled: () => true);
+        var snapshots = new List<GatewayConnectionSnapshot>();
+        manager.StateChanged += (_, snapshot) => snapshots.Add(snapshot);
+
+        await manager.ConnectAsync("gw-remote");
+        await InvokeHandshakeSucceededAsync(manager);
+
+        Assert.Equal(RoleConnectionState.Error, manager.CurrentSnapshot.NodeState);
+        Assert.Equal(OverallConnectionState.Degraded, manager.CurrentSnapshot.OverallState);
+        Assert.Contains("disconnect failed", manager.CurrentSnapshot.NodeError, StringComparison.OrdinalIgnoreCase);
+        Assert.Contains(snapshots, snapshot =>
+            snapshot.NodeState == RoleConnectionState.Error &&
+            snapshot.NodeError?.Contains("disconnect failed", StringComparison.OrdinalIgnoreCase) == true);
+        Assert.NotEqual(RoleConnectionState.Connecting, snapshots.Last().NodeState);
+    }
+
+    [Fact]
+    public async Task BlockNodeStartAsync_StaleLifecycleGeneration_DoesNotOverwriteCurrentSnapshot()
+    {
+        SetupGateway("gw-remote", "wss://remote.example", isLocal: false);
+        _resolver.OperatorCredential = new GatewayCredential("op-tok", false, "test");
+        using var manager = new GatewayConnectionManager(
+            _resolver,
+            _factory,
+            _registry,
+            NullLogger.Instance);
+
+        await manager.ConnectAsync("gw-remote");
+        var before = manager.CurrentSnapshot;
+
+        await InvokeBlockNodeStartAsync(
+            manager,
+            "stale blocker",
+            expectedLifecycleGeneration: GetPrivateLong(manager, "_generation") + 1);
+
+        Assert.Equal(before, manager.CurrentSnapshot);
+    }
+
     [Fact]
     public async Task ConnectAsync_WithPersistedV2Requirement_SetsClientUseV2Signature()
     {
@@ -481,10 +731,56 @@ private static async Task InvokeHandshakeSucceededAsync(GatewayConnectionManager
             "HandleHandshakeSucceededAsync",
             System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic);
         Assert.NotNull(method);
-        var task = (Task)method!.Invoke(manager, [1L])!;
+        var task = (Task)method!.Invoke(manager, [GetPrivateLong(manager, "_generation")])!;
+        await task;
+    }
+
+    private static async Task<bool> InvokeStartNodeConnectionCoreAsync(
+        GatewayConnectionManager manager,
+        long nodeGeneration)
+    {
+        var method = typeof(GatewayConnectionManager).GetMethod(
+            "StartNodeConnectionCoreAsync",
+            System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic);
+        Assert.NotNull(method);
+        var task = (Task<bool>)method!.Invoke(manager, [GetPrivateLong(manager, "_generation"), nodeGeneration, CancellationToken.None])!;
+        return await task;
+    }
+
+    private static async Task InvokeBlockNodeStartAsync(
+        GatewayConnectionManager manager,
+        string detail,
+        long? expectedLifecycleGeneration = null,
+        long? expectedNodeGeneration = null)
+    {
+        var method = typeof(GatewayConnectionManager).GetMethod(
+            "BlockNodeStartAsync",
+            System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic);
+        Assert.NotNull(method);
+        var task = (Task)method!.Invoke(
+            manager,
+            [detail, CancellationToken.None, expectedLifecycleGeneration, expectedNodeGeneration])!;
         await task;
     }
 
+    private static void SetPrivateField(GatewayConnectionManager manager, string fieldName, object? value)
+    {
+        var field = typeof(GatewayConnectionManager).GetField(
+            fieldName,
+            System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic);
+        Assert.NotNull(field);
+        field!.SetValue(manager, value);
+    }
+
+    private static long GetPrivateLong(GatewayConnectionManager manager, string fieldName)
+    {
+        var field = typeof(GatewayConnectionManager).GetField(
+            fieldName,
+            System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic);
+        Assert.NotNull(field);
+        return (long)field!.GetValue(manager)!;
+    }
+
     private static async Task WaitUntilAsync(Func<bool> condition)
     {
         var deadline = DateTime.UtcNow + TimeSpan.FromSeconds(2);
@@ -587,6 +883,62 @@ public async Task ConnectNodeOnlyAsync_UsesNodeCredential_WhenOperatorCredential
         Assert.Equal(CredentialResolver.SourceNodeDeviceToken, manager.CurrentSnapshot.NodeCredentialSource);
     }
 
+    [Fact]
+    public async Task ConnectNodeOnlyAsync_MissingNodeCredential_ReportsBlockedNode()
+    {
+        SetupGateway("gw-1", "wss://test");
+        _resolver.OperatorCredential = null;
+        _resolver.NodeCredential = null;
+        var node = new CountingNodeConnector();
+        using var manager = new GatewayConnectionManager(
+            _resolver,
+            _factory,
+            _registry,
+            NullLogger.Instance,
+            nodeConnector: node);
+
+        await manager.ConnectNodeOnlyAsync("gw-1");
+
+        Assert.Equal(0, node.ConnectCount);
+        Assert.Empty(_factory.CreatedCredentials);
+        Assert.Equal(RoleConnectionState.Error, manager.CurrentSnapshot.NodeState);
+        Assert.True(manager.CurrentSnapshot.NodeConnectionIntended);
+        Assert.Equal(OverallConnectionState.Error, manager.CurrentSnapshot.OverallState);
+        Assert.Contains("No node credential", manager.CurrentSnapshot.NodeError);
+        Assert.Null(manager.CurrentSnapshot.NodeCredentialSource);
+    }
+
+    [Fact]
+    public async Task StartNodeConnectionCoreAsync_MissingActiveGatewayContext_ReportsBlockedNode()
+    {
+        SetupGateway("gw-1", "wss://test");
+        _resolver.OperatorCredential = new GatewayCredential("operator-token", false, "test");
+        _resolver.NodeCredential = new GatewayCredential("node-token", false, "test");
+        var node = new CountingNodeConnector();
+        using var manager = new GatewayConnectionManager(
+            _resolver,
+            _factory,
+            _registry,
+            NullLogger.Instance,
+            nodeConnector: node,
+            shouldStartNodeConnection: (_, _) => false);
+
+        await manager.ConnectAsync("gw-1");
+        await InvokeHandshakeSucceededAsync(manager);
+        SetPrivateField(manager, "_activeGatewayRecordId", null);
+
+        var started = await InvokeStartNodeConnectionCoreAsync(
+            manager,
+            GetPrivateLong(manager, "_nodeConnectionGeneration"));
+
+        Assert.False(started);
+        Assert.Equal(0, node.ConnectCount);
+        Assert.Equal(RoleConnectionState.Error, manager.CurrentSnapshot.NodeState);
+        Assert.True(manager.CurrentSnapshot.NodeConnectionIntended);
+        Assert.Equal(OverallConnectionState.Degraded, manager.CurrentSnapshot.OverallState);
+        Assert.Contains("no active gateway context", manager.CurrentSnapshot.NodeError, StringComparison.OrdinalIgnoreCase);
+    }
+
     [Fact]
     public async Task ConnectNodeOnlyAsync_PreservesConnectedOperatorForNodeListRefresh()
     {
@@ -728,6 +1080,44 @@ public async Task ConnectNodeOnlyAsync_StartsSshTunnel_WhenGatewayUsesTunnel()
         Assert.Equal(CredentialResolver.SourceNodeDeviceToken, manager.CurrentSnapshot.NodeCredentialSource);
     }
 
+    [Fact]
+    public async Task ConnectNodeOnlyAsync_TunnelStartFailure_ReportsBlockedNode()
+    {
+        _registry.AddOrUpdate(new GatewayRecord
+        {
+            Id = "gw-ssh",
+            Url = "wss://remote.example",
+            SshTunnel = new SshTunnelConfig("user", "host.example", 18789, 45678)
+        });
+        _registry.SetActive("gw-ssh");
+        _resolver.OperatorCredential = null;
+        _resolver.NodeCredential = new GatewayCredential(
+            "node-token",
+            IsBootstrapToken: false,
+            Source: CredentialResolver.SourceNodeDeviceToken);
+        var node = new CountingNodeConnector();
+        var tunnel = new FailingTunnelManager();
+        using var manager = new GatewayConnectionManager(
+            _resolver,
+            _factory,
+            _registry,
+            NullLogger.Instance,
+            nodeConnector: node,
+            tunnelManager: tunnel);
+        var snapshots = new List<GatewayConnectionSnapshot>();
+        manager.StateChanged += (_, snapshot) => snapshots.Add(snapshot);
+
+        await manager.ConnectNodeOnlyAsync("gw-ssh");
+
+        Assert.Equal(0, node.ConnectCount);
+        Assert.Equal(RoleConnectionState.Error, manager.CurrentSnapshot.NodeState);
+        Assert.True(manager.CurrentSnapshot.NodeConnectionIntended);
+        Assert.Equal(OverallConnectionState.Error, manager.CurrentSnapshot.OverallState);
+        Assert.Contains("SSH tunnel", manager.CurrentSnapshot.NodeError, StringComparison.OrdinalIgnoreCase);
+        Assert.Contains(snapshots, snapshot => snapshot.NodeState == RoleConnectionState.Error);
+        Assert.NotEqual(RoleConnectionState.Connecting, snapshots.Last().NodeState);
+    }
+
     [Fact]
     public async Task ConnectAsync_StartsSshTunnelAndUsesTunnelUrl_WhenGatewayUsesTunnel()
     {
@@ -1347,6 +1737,39 @@ public async Task DisconnectAsync()
         public void Dispose() { }
     }
 
+    private sealed class ThrowingNodeDisconnectConnector : INodeConnector
+    {
+        public bool IsConnected => true;
+        public PairingStatus PairingStatus => PairingStatus.Paired;
+        public string? NodeDeviceId => "throwing-disconnect-node";
+        public NodeConnectionMode Mode => NodeConnectionMode.Gateway;
+
+#pragma warning disable CS0067 // Events required by interface but not fired in tests
+        public event EventHandler<ConnectionStatus>? StatusChanged;
+        public event EventHandler<PairingStatusEventArgs>? PairingStatusChanged;
+        public event EventHandler<DeviceTokenReceivedEventArgs>? DeviceTokenReceived;
+        public event EventHandler<NodeClientCreatedEventArgs>? ClientCreated;
+#pragma warning restore CS0067
+
+        public Task ConnectAsync(string gatewayUrl, GatewayCredential credential, string identityPath, bool useV2Signature = false)
+            => Task.CompletedTask;
+
+        public Task ConnectAsync(
+            string gatewayUrl,
+            GatewayCredential credential,
+            string identityPath,
+            bool useV2Signature,
+            CancellationToken cancellationToken)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+            return ConnectAsync(gatewayUrl, credential, identityPath, useV2Signature);
+        }
+
+        public Task DisconnectAsync() => throw new InvalidOperationException("disconnect failed");
+
+        public void Dispose() { }
+    }
+
     private sealed class CountingTunnelManager : ISshTunnelManager
     {
         public int StartCount { get; private set; }
@@ -1372,6 +1795,19 @@ public Task StopAsync()
         public void Dispose() { }
     }
 
+    private sealed class FailingTunnelManager : ISshTunnelManager
+    {
+        public bool IsActive => false;
+        public string? LocalTunnelUrl => null;
+
+        public Task<string> StartAsync(SshTunnelConfig config, CancellationToken ct) =>
+            throw new InvalidOperationException("tunnel failed");
+
+        public Task StopAsync() => Task.CompletedTask;
+
+        public void Dispose() { }
+    }
+
     /// <summary>
     /// Test connector that fires StatusChanged / PairingStatusChanged events synchronously
     /// so tests can drive the manager's state machine through realistic transitions.
diff --git a/tests/OpenClaw.Connection.Tests/OperatorScopeHelperTests.cs b/tests/OpenClaw.Connection.Tests/OperatorScopeHelperTests.cs
index 01a085072..ebc37aaf6 100644
--- a/tests/OpenClaw.Connection.Tests/OperatorScopeHelperTests.cs
+++ b/tests/OpenClaw.Connection.Tests/OperatorScopeHelperTests.cs
@@ -173,7 +173,7 @@ public void SimulateConnected()
         public Task ReconnectAsync() => Task.CompletedTask;
         public Task SwitchGatewayAsync(string gatewayId) => Task.CompletedTask;
         public Task EnsureNodeConnectedAsync(CancellationToken cancellationToken = default) => Task.CompletedTask;
-        public Task<SetupCodeResult> ApplySetupCodeAsync(string setupCode) => Task.FromResult(new SetupCodeResult(SetupCodeOutcome.InvalidCode));
+        public Task<SetupCodeResult> ApplySetupCodeAsync(string setupCode, SshTunnelConfig? sshTunnel = null) => Task.FromResult(new SetupCodeResult(SetupCodeOutcome.InvalidCode));
         public Task<SetupCodeResult> ConnectWithSharedTokenAsync(string gatewayUrl, string token, SshTunnelConfig? sshTunnel = null) => Task.FromResult(new SetupCodeResult(SetupCodeOutcome.InvalidCode));
         public void Dispose() { }
         public ValueTask DisposeAsync() => ValueTask.CompletedTask;
diff --git a/tests/OpenClaw.Connection.Tests/PairingApprovalQueueTests.cs b/tests/OpenClaw.Connection.Tests/PairingApprovalQueueTests.cs
new file mode 100644
index 000000000..f6b7a1190
--- /dev/null
+++ b/tests/OpenClaw.Connection.Tests/PairingApprovalQueueTests.cs
@@ -0,0 +1,403 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using OpenClaw.Connection;
+using OpenClaw.Shared;
+using Xunit;
+
+namespace OpenClaw.Connection.Tests;
+
+public class PendingApprovalTests
+{
+    [Fact]
+    public void FromDevice_MapsAllFields_AndNormalizesIp()
+    {
+        var req = new DevicePairingRequest
+        {
+            RequestId = "req-1",
+            DeviceId = "dev-1",
+            DisplayName = "Bedroom iPad",
+            Platform = "iPadOS",
+            Role = "operator",
+            Scopes = new[] { "operator.read", "", "operator.admin" },
+            RemoteIp = "::ffff:192.168.1.50",
+            IsRepair = true,
+            Ts = 1234,
+        };
+
+        var a = PendingApproval.FromDevice(req);
+
+        Assert.Equal(PairingApprovalKind.DevicePair, a.Kind);
+        Assert.Equal("req-1", a.RequestId);
+        Assert.Equal("dev-1", a.DeviceId);
+        Assert.Equal("Bedroom iPad", a.DisplayName);
+        Assert.Equal("iPadOS", a.Platform);
+        Assert.Equal("operator", a.Role);
+        Assert.Equal(new[] { "operator.read", "operator.admin" }, a.Scopes);
+        Assert.Equal("192.168.1.50", a.RemoteIp);
+        Assert.True(a.IsRepair);
+        Assert.Equal(1234, a.Ts);
+    }
+
+    [Fact]
+    public void FromDevice_DefaultsRoleToOperator_WhenMissing()
+    {
+        var a = PendingApproval.FromDevice(new DevicePairingRequest { RequestId = "r", DeviceId = "d" });
+        Assert.Equal("operator", a.Role);
+    }
+
+    [Fact]
+    public void FromNode_MapsFields_AndHasNoScopes()
+    {
+        var req = new PairingRequest
+        {
+            RequestId = "req-2",
+            NodeId = "node-9",
+            DisplayName = "Studio PC",
+            Platform = "windows",
+            Version = "1.2.3",
+            RemoteIp = "10.0.0.4",
+            Ts = 99,
+        };
+
+        var a = PendingApproval.FromNode(req);
+
+        Assert.Equal(PairingApprovalKind.NodePair, a.Kind);
+        Assert.Equal("node-9", a.DeviceId);
+        Assert.Equal("node", a.Role);
+        Assert.Empty(a.Scopes);
+        Assert.Equal("1.2.3", a.Version);
+    }
+
+    [Fact]
+    public void DecisionId_PrefersRequestId_FallsBackToDeviceId()
+    {
+        Assert.Equal("req", PendingApproval.FromDevice(new DevicePairingRequest { RequestId = "req", DeviceId = "dev" }).DecisionId);
+        Assert.Equal("dev", PendingApproval.FromDevice(new DevicePairingRequest { RequestId = "", DeviceId = "dev" }).DecisionId);
+    }
+
+    [Fact]
+    public void Key_IsKindScoped()
+    {
+        var device = PendingApproval.FromDevice(new DevicePairingRequest { RequestId = "same", DeviceId = "x" });
+        var node = PendingApproval.FromNode(new PairingRequest { RequestId = "same", NodeId = "y" });
+        Assert.NotEqual(device.Key, node.Key);
+    }
+
+    [Fact]
+    public void IsActionable_FalseWhenNoIds()
+    {
+        Assert.False(PendingApproval.FromNode(new PairingRequest { RequestId = "", NodeId = "" }).IsActionable);
+        Assert.True(PendingApproval.FromDevice(new DevicePairingRequest { RequestId = "", DeviceId = "d" }).IsActionable);
+    }
+}
+
+public class PairingApprovalQueueTests
+{
+    private static DevicePairingListInfo Devices(params DevicePairingRequest[] reqs) =>
+        new() { Pending = reqs.ToList() };
+
+    private static PairingListInfo Nodes(params PairingRequest[] reqs) =>
+        new() { Pending = reqs.ToList() };
+
+    private static DevicePairingRequest Device(string id, double ts = 0, string[]? scopes = null) =>
+        new() { RequestId = id, DeviceId = $"d-{id}", DisplayName = id, Ts = ts, Scopes = scopes };
+
+    private static PairingRequest Node(string id, string? nodeId = null, double ts = 0) =>
+        new() { RequestId = id, NodeId = nodeId ?? $"n-{id}", DisplayName = id, Ts = ts };
+
+    [Fact]
+    public void Reconcile_SurfacesNewDeviceAndNodeRequests()
+    {
+        var q = new PairingApprovalQueue();
+        var delta = q.Reconcile(Devices(Device("a")), Nodes(Node("b")));
+
+        Assert.Equal(2, delta.Added.Count);
+        Assert.Empty(delta.ResolvedKeys);
+        Assert.Equal(2, delta.Current.Count);
+    }
+
+    [Fact]
+    public void Reconcile_DoesNotReAddKnownRequest()
+    {
+        var q = new PairingApprovalQueue();
+        q.Reconcile(Devices(Device("a")), null);
+        var second = q.Reconcile(Devices(Device("a")), null);
+
+        Assert.Empty(second.Added);
+        Assert.Single(second.Current);
+    }
+
+    [Fact]
+    public void Reconcile_ReportsResolvedWhenRequestLeaves()
+    {
+        var q = new PairingApprovalQueue();
+        q.Reconcile(Devices(Device("a")), null);
+        var delta = q.Reconcile(Devices(), null);
+
+        Assert.Single(delta.ResolvedKeys);
+        Assert.Equal("DevicePair:a", delta.ResolvedKeys[0]);
+        Assert.Empty(delta.Current);
+    }
+
+    [Fact]
+    public void Reconcile_FiltersOwnNodeRequest()
+    {
+        var q = new PairingApprovalQueue();
+        var delta = q.Reconcile(null, Nodes(Node("self", nodeId: "MY-NODE"), Node("other", nodeId: "OTHER")), ownNodeDeviceIds: new[] { "my-node" });
+
+        Assert.Single(delta.Added);
+        Assert.Equal("other", delta.Added[0].RequestId);
+    }
+
+    [Fact]
+    public void Reconcile_FiltersOwnNodeByAnyAdvertisedId()
+    {
+        var q = new PairingApprovalQueue();
+        // The own node may surface under its device id OR its gateway node id — both must filter.
+        var delta = q.Reconcile(
+            null,
+            Nodes(Node("a", nodeId: "device-fingerprint"), Node("b", nodeId: "gateway-node-id"), Node("c", nodeId: "remote")),
+            ownNodeDeviceIds: new[] { "device-fingerprint", "gateway-node-id" });
+
+        Assert.Single(delta.Added);
+        Assert.Equal("c", delta.Added[0].RequestId);
+    }
+
+    [Fact]
+    public void Reconcile_DropsUnactionableEntries()
+    {
+        var q = new PairingApprovalQueue();
+        var delta = q.Reconcile(null, Nodes(new PairingRequest { RequestId = "", NodeId = "" }));
+        Assert.Empty(delta.Added);
+    }
+
+    [Fact]
+    public void Reconcile_DedupsDuplicateIds()
+    {
+        var q = new PairingApprovalQueue();
+        var delta = q.Reconcile(Devices(Device("a"), Device("a")), null);
+        Assert.Single(delta.Added);
+    }
+
+    [Fact]
+    public void Reconcile_OrdersCurrentByTimestamp()
+    {
+        var q = new PairingApprovalQueue();
+        var delta = q.Reconcile(Devices(Device("late", ts: 200), Device("early", ts: 100)), null);
+        Assert.Equal("early", delta.Current[0].RequestId);
+        Assert.Equal("late", delta.Current[1].RequestId);
+    }
+
+    [Fact]
+    public void MarkSubmitted_SuppressesFromActionableSet()
+    {
+        var q = new PairingApprovalQueue();
+        var first = q.Reconcile(Devices(Device("a")), null);
+        q.MarkSubmitted(first.Added[0], approved: true, nowMs: 1000);
+
+        var second = q.Reconcile(Devices(Device("a")), null, nowMs: 1100); // gateway still echoes it
+        Assert.Empty(second.Added);
+        Assert.Empty(second.Current); // submitted => not actionable
+        Assert.Empty(second.ConfirmedDecisions); // not yet resolved
+    }
+
+    [Fact]
+    public void MarkSubmitted_ConfirmsDecisionWhenRequestLeavesList()
+    {
+        var q = new PairingApprovalQueue();
+        var first = q.Reconcile(Devices(Device("a")), null);
+        q.MarkSubmitted(first.Added[0], approved: true, nowMs: 1000);
+
+        // Gateway accepted -> request drops from the pending list -> confirmed.
+        var delta = q.Reconcile(Devices(), null, nowMs: 1200);
+        Assert.Single(delta.ConfirmedDecisions);
+        Assert.True(delta.ConfirmedDecisions[0].Approved);
+        Assert.Equal("a", delta.ConfirmedDecisions[0].Approval.RequestId);
+        Assert.True(delta.HasChanges);
+    }
+
+    [Fact]
+    public void MarkSubmitted_ConfirmsRejectionWithCorrectFlag()
+    {
+        var q = new PairingApprovalQueue();
+        var first = q.Reconcile(Devices(Device("a")), null);
+        q.MarkSubmitted(first.Added[0], approved: false, nowMs: 0);
+
+        var delta = q.Reconcile(Devices(), null, nowMs: 100);
+        Assert.Single(delta.ConfirmedDecisions);
+        Assert.False(delta.ConfirmedDecisions[0].Approved);
+    }
+
+    [Fact]
+    public void MarkSubmitted_ReSurfacesAfterTimeoutWhenGatewayNeverActs()
+    {
+        var q = new PairingApprovalQueue();
+        var first = q.Reconcile(Devices(Device("a")), null, nowMs: 0);
+        q.MarkSubmitted(first.Added[0], approved: true, nowMs: 0);
+
+        // Still echoed, before timeout: suppressed, not re-added.
+        var before = q.Reconcile(Devices(Device("a")), null, nowMs: PairingApprovalQueue.SubmissionResolveTimeoutMs - 1);
+        Assert.Empty(before.Added);
+        Assert.Empty(before.Current);
+        Assert.Empty(before.ConfirmedDecisions);
+
+        // Past timeout, still echoed: re-surfaced for retry, NOT confirmed.
+        var after = q.Reconcile(Devices(Device("a")), null, nowMs: PairingApprovalQueue.SubmissionResolveTimeoutMs + 1);
+        Assert.Single(after.Added);
+        Assert.Single(after.Current);
+        Assert.Empty(after.ConfirmedDecisions);
+    }
+
+    [Fact]
+    public void Reconcile_NullListForKind_CarriesForwardAndDoesNotConfirm()
+    {
+        var q = new PairingApprovalQueue();
+        // Two kinds present.
+        var first = q.Reconcile(Devices(Device("dev")), Nodes(Node("n1")), nowMs: 0);
+        Assert.Equal(2, first.Current.Count);
+
+        // Submit the device decision (optimistic-pending).
+        var dev = first.Added.First(a => a.Kind == PairingApprovalKind.DevicePair);
+        q.MarkSubmitted(dev, approved: true, nowMs: 0);
+
+        // A node-only update arrives (device list is null = no fresh device snapshot). The device
+        // submission must NOT be confirmed by its absence, and the node entry must survive.
+        var nodeOnly = q.Reconcile(null, Nodes(Node("n1")), nowMs: 100);
+        Assert.Empty(nodeOnly.ConfirmedDecisions);
+        Assert.Contains(nodeOnly.Current, a => a.Kind == PairingApprovalKind.NodePair);
+
+        // When the device list genuinely returns without the request, it confirms.
+        var deviceResolved = q.Reconcile(Devices(), Nodes(Node("n1")), nowMs: 200);
+        Assert.Single(deviceResolved.ConfirmedDecisions);
+        Assert.Equal("dev", deviceResolved.ConfirmedDecisions[0].Approval.RequestId);
+    }
+
+    [Fact]
+    public void Reconcile_NullNodeList_DoesNotDropExistingNodeRequests()
+    {
+        var q = new PairingApprovalQueue();
+        q.Reconcile(Devices(Device("dev")), Nodes(Node("n1")));
+
+        // Device-only refresh (node list null): the node request must not vanish.
+        var delta = q.Reconcile(Devices(Device("dev")), null);
+        Assert.Contains(delta.Current, a => a.Kind == PairingApprovalKind.NodePair && a.RequestId == "n1");
+        Assert.DoesNotContain("NodePair:n1", delta.ResolvedKeys);
+    }
+
+    [Fact]
+    public void Reconcile_DropsAmbiguousLegacyFallbackIds()
+    {
+        var q = new PairingApprovalQueue();
+        var delta = q.Reconcile(Devices(
+            new DevicePairingRequest { RequestId = "", DeviceId = "legacy", DisplayName = "first" },
+            new DevicePairingRequest { RequestId = "", DeviceId = "legacy", DisplayName = "second" }), null);
+
+        Assert.Empty(delta.Added);
+        Assert.Empty(delta.Current);
+    }
+
+    [Fact]
+    public void Reconcile_DropsAmbiguousLegacyNodeFallbackIds()
+    {
+        var q = new PairingApprovalQueue();
+        var delta = q.Reconcile(null, Nodes(
+            new PairingRequest { RequestId = "", NodeId = "legacy-node", DisplayName = "first" },
+            new PairingRequest { RequestId = "", NodeId = "legacy-node", DisplayName = "second" }));
+
+        Assert.Empty(delta.Added);
+        Assert.Empty(delta.Current);
+    }
+
+    [Fact]
+    public void Reconcile_DoesNotConfirmSubmittedDecisionWhenFallbackIdBecomesAmbiguous()
+    {
+        var q = new PairingApprovalQueue();
+        var first = q.Reconcile(Devices(
+            new DevicePairingRequest { RequestId = "", DeviceId = "legacy", DisplayName = "first" }), null);
+        q.MarkSubmitted(first.Added[0], approved: true, nowMs: 0);
+
+        var delta = q.Reconcile(Devices(
+            new DevicePairingRequest { RequestId = "", DeviceId = "legacy", DisplayName = "first" },
+            new DevicePairingRequest { RequestId = "", DeviceId = "legacy", DisplayName = "second" }), null, nowMs: 100);
+
+        Assert.Empty(delta.ConfirmedDecisions);
+        Assert.Empty(delta.Current);
+    }
+
+    [Fact]
+    public void Find_ReturnsTrackedButNotSubmitted()
+    {
+        var q = new PairingApprovalQueue();
+        var delta = q.Reconcile(Devices(Device("a")), null);
+        var approval = delta.Added[0];
+
+        Assert.NotNull(q.Find(approval.Key));
+        q.MarkSubmitted(approval, approved: true, nowMs: 0);
+        Assert.Null(q.Find(approval.Key));
+    }
+
+    [Fact]
+    public void Reset_ClearsEverything()
+    {
+        var q = new PairingApprovalQueue();
+        q.Reconcile(Devices(Device("a")), null);
+        q.Reset();
+        Assert.True(q.IsEmpty);
+
+        // After reset the same request surfaces again.
+        var delta = q.Reconcile(Devices(Device("a")), null);
+        Assert.Single(delta.Added);
+    }
+}
+
+public class PairingScopeDescriptionsTests
+{
+    [Theory]
+    [InlineData("operator.admin", "Admin access")]
+    [InlineData("operator.read", "Read OpenClaw data")]
+    [InlineData("operator.write", "Send messages and make changes")]
+    [InlineData("operator.approvals", "Manage approvals")]
+    [InlineData("operator.pairing", "Pair and repair devices")]
+    [InlineData("operator.talk.secrets", "Use Talk credentials")]
+    [InlineData("OPERATOR.ADMIN", "Admin access")]
+    public void Describe_ReturnsFriendlyLabel_ForKnownScope(string scope, string expected)
+    {
+        Assert.Equal(expected, PairingScopeDescriptions.Describe(scope));
+    }
+
+    [Fact]
+    public void Describe_ReturnsRawScope_ForUnknown()
+    {
+        Assert.Equal("custom.scope", PairingScopeDescriptions.Describe(" custom.scope "));
+    }
+
+    [Fact]
+    public void Describe_ReturnsEmpty_ForBlank()
+    {
+        Assert.Equal(string.Empty, PairingScopeDescriptions.Describe("   "));
+    }
+
+    [Fact]
+    public void DescribeAll_DropsBlanksAndDeduplicates_PreservingOrder()
+    {
+        var result = PairingScopeDescriptions.DescribeAll(
+            new[] { "operator.admin", "", "operator.admin", "operator.read" });
+        Assert.Equal(new[] { "Admin access", "Read OpenClaw data" }, result);
+    }
+
+    [Fact]
+    public void DescribeAll_ReturnsEmpty_ForNull()
+    {
+        Assert.Empty(PairingScopeDescriptions.DescribeAll(null));
+    }
+
+    [Theory]
+    [InlineData("operator.admin", true)]
+    [InlineData("unknown.scope", false)]
+    [InlineData("", false)]
+    public void IsKnown_ReflectsMapMembership(string scope, bool expected)
+    {
+        Assert.Equal(expected, PairingScopeDescriptions.IsKnown(scope));
+    }
+}
diff --git a/tests/OpenClaw.Connection.Tests/SetupCodeFlowTests.cs b/tests/OpenClaw.Connection.Tests/SetupCodeFlowTests.cs
index e0d2a8db2..12deec914 100644
--- a/tests/OpenClaw.Connection.Tests/SetupCodeFlowTests.cs
+++ b/tests/OpenClaw.Connection.Tests/SetupCodeFlowTests.cs
@@ -102,6 +102,34 @@ public async Task ApplySetupCode_CredentialResolverReturnsBootstrap()
         manager.Dispose();
     }
 
+    [Fact]
+    public async Task ApplySetupCode_WithSshTunnel_PersistsTunnelConfig()
+    {
+        var json = """{"url":"ws://gateway.example.com:18789","bootstrapToken":"boot-tok-ssh"}""";
+        var code = Convert.ToBase64String(System.Text.Encoding.UTF8.GetBytes(json));
+        var sshTunnel = new SshTunnelConfig(
+            "operator",
+            "ssh.example.com",
+            RemotePort: 18789,
+            LocalPort: 18791,
+            IncludeBrowserProxyForward: true,
+            SshPort: 2222);
+
+        var resolver = new CredentialResolver(new FakeIdentityReader());
+        var factory = new RecordingClientFactory();
+        var manager = new GatewayConnectionManager(
+            resolver, factory, _registry, NullLogger.Instance);
+
+        var result = await manager.ApplySetupCodeAsync(code, sshTunnel);
+
+        Assert.Equal(SetupCodeOutcome.Success, result.Outcome);
+        var active = _registry.GetActive();
+        Assert.NotNull(active);
+        Assert.Equal(sshTunnel, active.SshTunnel);
+
+        manager.Dispose();
+    }
+
     [Fact]
     public async Task ApplySetupCode_WithExistingCredential_ForcesBootstrapForImmediatePairing()
     {
diff --git a/tests/OpenClaw.E2ETests/E2EFactAttribute.cs b/tests/OpenClaw.E2ETests/E2EFactAttribute.cs
index 5f4e77f93..f40c97f45 100644
--- a/tests/OpenClaw.E2ETests/E2EFactAttribute.cs
+++ b/tests/OpenClaw.E2ETests/E2EFactAttribute.cs
@@ -1,4 +1,5 @@
 using Xunit;
+using OpenClaw.Shared.Mxc;
 
 namespace OpenClaw.E2ETests;
 
@@ -16,6 +17,177 @@ public E2EFactAttribute()
     }
 }
 
+/// <summary>
+/// Focused E2E tests that require MXC support must not fail the regular E2E
+/// shard on Windows runners where the Gateway path works but MXC is unavailable.
+/// </summary>
+public sealed class MxcE2EFactAttribute : FactAttribute
+{
+    public MxcE2EFactAttribute()
+    {
+        Skip = MxcE2ETestGate.SkipReason;
+    }
+}
+
+internal static class MxcE2ETestGate
+{
+    private const string GitHubActionsEnvVar = "GITHUB_ACTIONS";
+    private const string ExplicitGitHubActionsOptInEnvVar = "OPENCLAW_RUN_MXC_E2E";
+    private static readonly Lazy<string?> s_skipReason = new(GetSkipReason);
+
+    public static string? SkipReason => s_skipReason.Value;
+
+    private static string? GetSkipReason()
+    {
+        if (!E2ETestGate.IsEnabled)
+            return $"E2E tests disabled. Set {E2ETestGate.EnvVar}=1 to enable.";
+
+        if (IsEnabled(GitHubActionsEnvVar) && !IsEnabled(ExplicitGitHubActionsOptInEnvVar))
+        {
+            return "MXC E2E test skipped in GitHub Actions because hosted runners do not provide a working MXC/AppContainer runtime. " +
+                $"Run on a local MXC-enabled Windows machine, or set {ExplicitGitHubActionsOptInEnvVar}=1 only on an MXC-enabled self-hosted runner.";
+        }
+
+        try
+        {
+            var availability = ProbeAvailabilityForE2E();
+            var hasBackend = availability.IsAppContainerAvailable || availability.IsIsolationSessionAvailable;
+            if (!hasBackend)
+            {
+                var reason = availability.UnsupportedReasons.Count == 0
+                    ? "MXC backend is unavailable."
+                    : string.Join("; ", availability.UnsupportedReasons);
+                return $"MXC E2E test skipped: {reason}";
+            }
+
+            if (!availability.IsWxcExecResolvable && !TryFindE2EWxcExec(out _))
+            {
+                var reason = availability.UnsupportedReasons.Count == 0
+                    ? "wxc-exec.exe is unavailable."
+                    : string.Join("; ", availability.UnsupportedReasons);
+                return $"MXC E2E test skipped: {reason}";
+            }
+
+            return null;
+        }
+        catch (Exception ex)
+        {
+            return $"MXC E2E test skipped: availability probe failed ({ex.GetType().Name}: {ex.Message}).";
+        }
+    }
+
+    private static MxcAvailability ProbeAvailabilityForE2E()
+    {
+        if (TryFindE2EWxcExec(out var wxcExecPath))
+        {
+            var previousOverride = Environment.GetEnvironmentVariable(MxcAvailability.WxcExecOverrideEnvVar);
+            try
+            {
+                Environment.SetEnvironmentVariable(MxcAvailability.WxcExecOverrideEnvVar, wxcExecPath);
+                return MxcAvailability.Probe();
+            }
+            finally
+            {
+                Environment.SetEnvironmentVariable(MxcAvailability.WxcExecOverrideEnvVar, previousOverride);
+            }
+        }
+
+        return MxcAvailability.Probe();
+    }
+
+    private static bool TryFindE2EWxcExec(out string? path)
+    {
+        var overridePath = Environment.GetEnvironmentVariable(MxcAvailability.WxcExecOverrideEnvVar);
+        if (FileExists(overridePath))
+        {
+            path = overridePath;
+            return true;
+        }
+
+        foreach (var repoRoot in CandidateRepoRoots())
+        {
+            var arch = GetSdkArchString();
+            var nodeModulesWxcExec = Path.Combine(repoRoot, "node_modules", "@microsoft", "mxc-sdk", "bin", arch, "wxc-exec.exe");
+            if (FileExists(nodeModulesWxcExec))
+            {
+                path = nodeModulesWxcExec;
+                return true;
+            }
+
+            var trayBin = Path.Combine(repoRoot, "src", "OpenClaw.Tray.WinUI", "bin");
+            if (Directory.Exists(trayBin))
+            {
+                try
+                {
+                    var trayWxcExec = Directory.EnumerateFiles(trayBin, "wxc-exec.exe", SearchOption.AllDirectories)
+                        .FirstOrDefault(file => file.EndsWith(Path.Combine("mxc", arch, "wxc-exec.exe"), StringComparison.OrdinalIgnoreCase));
+                    if (FileExists(trayWxcExec))
+                    {
+                        path = trayWxcExec;
+                        return true;
+                    }
+                }
+                catch
+                {
+                    // Discovery-only guard; a failed search should become an
+                    // ordinary MXC skip rather than a discovery failure.
+                }
+            }
+        }
+
+        path = null;
+        return false;
+    }
+
+    private static IEnumerable<string> CandidateRepoRoots()
+    {
+        var seen = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        foreach (var start in new[]
+        {
+            Environment.GetEnvironmentVariable("OPENCLAW_REPO_ROOT"),
+            Directory.GetCurrentDirectory(),
+            AppContext.BaseDirectory,
+        })
+        {
+            if (string.IsNullOrWhiteSpace(start))
+                continue;
+
+            var dir = Directory.Exists(start)
+                ? new DirectoryInfo(start)
+                : new FileInfo(start).Directory;
+            while (dir is not null)
+            {
+                if (File.Exists(Path.Combine(dir.FullName, "package.json"))
+                    && Directory.Exists(Path.Combine(dir.FullName, "src", "OpenClaw.Tray.WinUI")))
+                {
+                    if (seen.Add(dir.FullName))
+                        yield return dir.FullName;
+                    break;
+                }
+                dir = dir.Parent;
+            }
+        }
+    }
+
+    private static bool FileExists(string? path)
+    {
+        try { return !string.IsNullOrWhiteSpace(path) && File.Exists(path); }
+        catch { return false; }
+    }
+
+    private static bool IsEnabled(string envVar) =>
+        Environment.GetEnvironmentVariable(envVar) is { } value &&
+        (string.Equals(value, "1", StringComparison.OrdinalIgnoreCase) ||
+         string.Equals(value, "true", StringComparison.OrdinalIgnoreCase));
+
+    private static string GetSdkArchString() => System.Runtime.InteropServices.RuntimeInformation.OSArchitecture switch
+    {
+        System.Runtime.InteropServices.Architecture.Arm64 => "arm64",
+        System.Runtime.InteropServices.Architecture.X64 => "x64",
+        _ => "x64",
+    };
+}
+
 internal static class E2ETestGate
 {
     public const string EnvVar = "OPENCLAW_RUN_E2E";
diff --git a/tests/OpenClaw.E2ETests/Setup/E2ESetupFixture.cs b/tests/OpenClaw.E2ETests/Setup/E2ESetupFixture.cs
index eba576840..507cfecc2 100644
--- a/tests/OpenClaw.E2ETests/Setup/E2ESetupFixture.cs
+++ b/tests/OpenClaw.E2ETests/Setup/E2ESetupFixture.cs
@@ -22,6 +22,8 @@ namespace OpenClaw.E2ETests.Setup;
 /// </summary>
 public sealed class E2ESetupFixture : IAsyncLifetime
 {
+    private readonly Action<Dictionary<string, object>>? _settingsPatch;
+
     /// <summary>
     /// Persistent artifact directory that survives test cleanup.
     /// CI uploads this as a test artifact for post-mortem debugging.
@@ -51,7 +53,14 @@ public sealed class E2ESetupFixture : IAsyncLifetime
     private Process? _trayProcess;
 
     public E2ESetupFixture()
+        : this(settingsPatch: null)
+    {
+    }
+
+    internal E2ESetupFixture(Action<Dictionary<string, object>>? settingsPatch)
     {
+        _settingsPatch = settingsPatch;
+
         if (!E2ETestGate.IsEnabled)
         {
             _distroName = "OpenClawE2E-disabled";
@@ -257,7 +266,7 @@ private void WriteConfig()
         File.WriteAllText(_configPath, json);
     }
 
-    private static void PatchSettingsForMcp(string settingsPath)
+    private void PatchSettingsForMcp(string settingsPath)
     {
         var json = File.ReadAllText(settingsPath);
         var settings = JsonSerializer.Deserialize<Dictionary<string, JsonElement>>(json) ?? [];
@@ -269,6 +278,7 @@ private static void PatchSettingsForMcp(string settingsPath)
         merged["HasSeenActivityStreamTip"] = true;
         merged["ShowNotifications"] = false;
         merged["GlobalHotkeyEnabled"] = false;
+        _settingsPatch?.Invoke(merged);
         File.WriteAllText(settingsPath, JsonSerializer.Serialize(merged, new JsonSerializerOptions { WriteIndented = true }));
     }
 
@@ -468,7 +478,8 @@ private Process SpawnTray(string exePath)
     public async Task<OpenClaw.SetupEngine.CommandResult> RunInWslAsync(
         string command,
         TimeSpan? timeout = null,
-        IReadOnlyDictionary<string, string>? environment = null)
+        IReadOnlyDictionary<string, string>? environment = null,
+        bool inputViaStdin = false)
     {
         command = command.Replace("\r", "");
         Log($"WSL command: {SanitizeForLog(command)}");
@@ -479,6 +490,7 @@ private Process SpawnTray(string exePath)
             UseShellExecute = false,
             RedirectStandardOutput = true,
             RedirectStandardError = true,
+            RedirectStandardInput = inputViaStdin,
             CreateNoWindow = true,
         };
 
@@ -486,8 +498,9 @@ private Process SpawnTray(string exePath)
         psi.ArgumentList.Add(_distroName);
         psi.ArgumentList.Add("--");
         psi.ArgumentList.Add("bash");
-        psi.ArgumentList.Add("-c");
-        psi.ArgumentList.Add(command);
+        psi.ArgumentList.Add(inputViaStdin ? "-s" : "-c");
+        if (!inputViaStdin)
+            psi.ArgumentList.Add(command);
 
         if (environment is { Count: > 0 })
         {
@@ -505,6 +518,13 @@ private Process SpawnTray(string exePath)
         using var process = Process.Start(psi)
             ?? throw new InvalidOperationException("Failed to start wsl.exe");
 
+        if (inputViaStdin)
+        {
+            await process.StandardInput.WriteAsync(command);
+            await process.StandardInput.WriteAsync("\n");
+            process.StandardInput.Close();
+        }
+
         var stdoutTask = process.StandardOutput.ReadToEndAsync();
         var stderrTask = process.StandardError.ReadToEndAsync();
         var timedOut = false;
diff --git a/tests/OpenClaw.E2ETests/Setup/MxcE2ESetupFixture.cs b/tests/OpenClaw.E2ETests/Setup/MxcE2ESetupFixture.cs
new file mode 100644
index 000000000..1b626c753
--- /dev/null
+++ b/tests/OpenClaw.E2ETests/Setup/MxcE2ESetupFixture.cs
@@ -0,0 +1,40 @@
+using OpenClaw.E2ETests;
+using Xunit;
+
+namespace OpenClaw.E2ETests.Setup;
+
+// AssemblyInfo disables parallelization for the whole E2E assembly; this separate
+// collection exists so the MXC gate can skip before initializing WSL/tray state.
+[CollectionDefinition("E2E MXC Setup", DisableParallelization = true)]
+public sealed class MxcE2ESetupCollection : ICollectionFixture<MxcE2ESetupFixture> { }
+
+/// <summary>
+/// Gates the expensive setup fixture before xUnit initializes WSL/tray state for
+/// MXC-only proofs. Method-level skips are too late for collection fixtures.
+/// </summary>
+public sealed class MxcE2ESetupFixture : IAsyncLifetime
+{
+    private E2ESetupFixture? _inner;
+
+    public E2ESetupFixture Inner => _inner
+        ?? throw new InvalidOperationException($"MXC E2E fixture was not initialized: {MxcE2ETestGate.SkipReason ?? "unknown reason"}");
+
+    public async Task InitializeAsync()
+    {
+        if (MxcE2ETestGate.SkipReason is not null)
+            return;
+
+        _inner = new E2ESetupFixture(settings =>
+        {
+            settings["SandboxTimeoutMs"] = 120_000;
+            settings["SystemRunBlockHostFallbackWhenMxcUnavailable"] = true;
+        });
+        await _inner.InitializeAsync();
+    }
+
+    public async Task DisposeAsync()
+    {
+        if (_inner is not null)
+            await _inner.DisposeAsync();
+    }
+}
diff --git a/tests/OpenClaw.E2ETests/Setup/MxcSetupAndConnectTests.cs b/tests/OpenClaw.E2ETests/Setup/MxcSetupAndConnectTests.cs
new file mode 100644
index 000000000..9a4c53612
--- /dev/null
+++ b/tests/OpenClaw.E2ETests/Setup/MxcSetupAndConnectTests.cs
@@ -0,0 +1,479 @@
+using System.Text.Json;
+using OpenClaw.SetupEngine;
+
+namespace OpenClaw.E2ETests.Setup;
+
+[Collection("E2E MXC Setup")]
+public sealed class MxcSetupAndConnectTests
+{
+    private const int SystemRunProofTimeoutMs = 60_000;
+    private const int NodeInvokeProofTimeoutMs = 90_000;
+    private const int GatewayCliProofTimeoutMs = 120_000;
+    private static readonly TimeSpan GatewayCliProofProcessTimeout = TimeSpan.FromSeconds(130);
+
+    private readonly E2ESetupFixture _fixture;
+
+    public MxcSetupAndConnectTests(MxcE2ESetupFixture fixture)
+    {
+        _fixture = fixture.Inner;
+
+        if (_fixture.SetupError is not null)
+            throw new InvalidOperationException($"E2E setup failed: {_fixture.SetupError}");
+        if (_fixture.Client is null)
+            throw new InvalidOperationException("E2E fixture MCP client not initialized");
+    }
+
+    [MxcE2EFact]
+    public async Task RealGateway_SystemRun_ExecutesThroughWindowsNodeMxcSandbox()
+    {
+        const string marker = "OPENCLAW_GATEWAY_SYSTEM_RUN_MXC_OK";
+
+        await AssertPrimaryTrayReadyAndGatewayCliHealthyAsync();
+        await SetExecApprovalForSystemRunProofAsync();
+
+        var gateway = _fixture.ReadActiveGatewayRecord();
+        var env = GatewayTokenEnv(gateway.SharedGatewayToken);
+        var nodeId = _fixture.ReadActiveGatewayDeviceId();
+        var logCursor = GetTrayLogCursor();
+        var invokeParams = JsonSerializer.Serialize(new
+        {
+            nodeId,
+            command = "system.run",
+            @params = new
+            {
+                command = $"echo {marker}",
+                shell = "cmd",
+                timeoutMs = SystemRunProofTimeoutMs
+            },
+            timeoutMs = NodeInvokeProofTimeoutMs,
+            idempotencyKey = Guid.NewGuid().ToString("N")
+        });
+
+        var invoke = await _fixture.RunInWslAsync(
+            $"openclaw gateway call node.invoke --params {ShellSingleQuote(invokeParams)} --json --timeout {GatewayCliProofTimeoutMs}",
+            GatewayCliProofProcessTimeout,
+            env);
+
+        AssertCommandSucceeded(invoke, "invoke Windows node system.run through real gateway");
+        Assert.Contains(marker, invoke.Stdout, StringComparison.Ordinal);
+
+        using var invokeDoc = JsonDocument.Parse(ExtractJsonObject(invoke.Stdout));
+        var responseShape = string.Join(",", invokeDoc.RootElement.EnumerateObject().Select(property => property.Name));
+        Console.WriteLine($"[E2E] gateway node.invoke system.run response shape: {responseShape}");
+        if (invokeDoc.RootElement.TryGetProperty("ok", out var ok))
+        {
+            Assert.True(ok.GetBoolean(), $"Expected gateway node.invoke ok=true; response: {invokeDoc.RootElement.GetRawText()}");
+        }
+
+        var payload = ReadNodeInvokePayload(invokeDoc.RootElement);
+        Assert.Equal(0, payload.GetProperty("exitCode").GetInt32());
+        if (payload.TryGetProperty("timedOut", out var timedOut))
+            Assert.False(timedOut.GetBoolean(), $"system.run timed out; payload: {payload.GetRawText()}");
+
+        var stdout = payload.GetProperty("stdout").GetString() ?? "";
+        Assert.Contains(marker, stdout, StringComparison.Ordinal);
+        var stderrLength = payload.TryGetProperty("stderr", out var stderr)
+            ? (stderr.GetString() ?? "").Length
+            : 0;
+        Console.WriteLine($"[E2E] gateway system.run payload: exitCode=0; stdout={stdout.Trim()}; stderrLength={stderrLength}");
+
+        var requestLog = await WaitForTrayLogLineContainingAsync(
+            TimeSpan.FromSeconds(30),
+            logCursor,
+            "[mxc] system.run sandbox request",
+            "executor=mxc-direct-appc",
+            "contained=True",
+            "shell=cmd");
+        var resultLog = await WaitForTrayLogLineContainingAsync(
+            TimeSpan.FromSeconds(30),
+            logCursor,
+            "[mxc] system.run sandbox result",
+            "exitCode=0",
+            "containment=mxc");
+
+        Console.WriteLine($"[E2E] MXC request diagnostic: {requestLog}");
+        Console.WriteLine($"[E2E] MXC result diagnostic: {resultLog}");
+    }
+
+    [MxcE2EFact]
+    public async Task RealGateway_SystemRun_BlocksWritesToTrayDataDirectoryInMxcSandbox()
+    {
+        const string sourcePayload = "OPENCLAW_GATEWAY_SYSTEM_RUN_MXC_DENIED_PAYLOAD";
+        const string sourceReadyMarker = "OPENCLAW_GATEWAY_SYSTEM_RUN_MXC_SOURCE_READY";
+        var blockedPath = Path.Combine(_fixture.DataDir, $"mxc-denied-write-{Guid.NewGuid():N}.txt");
+        var blockedPathForCmd = blockedPath.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
+        var sourcePathForCmd = "%TEMP%/openclaw-mxc-denied-source.txt";
+
+        await AssertPrimaryTrayReadyAndGatewayCliHealthyAsync();
+        await SetExecApprovalForSystemRunProofAsync();
+
+        Assert.False(File.Exists(blockedPath), $"Unexpected pre-existing MXC deny proof file: {blockedPath}");
+
+        var gateway = _fixture.ReadActiveGatewayRecord();
+        var env = GatewayTokenEnv(gateway.SharedGatewayToken);
+        var nodeId = _fixture.ReadActiveGatewayDeviceId();
+        var logCursor = GetTrayLogCursor();
+        var invokeParams = JsonSerializer.Serialize(new
+        {
+            nodeId,
+            command = "system.run",
+            @params = new
+            {
+                command = $"echo {sourcePayload} > {CmdQuote(sourcePathForCmd)} && echo {sourceReadyMarker} && copy /Y {CmdQuote(sourcePathForCmd)} {CmdQuote(blockedPathForCmd)}",
+                shell = "cmd",
+                timeoutMs = SystemRunProofTimeoutMs
+            },
+            timeoutMs = NodeInvokeProofTimeoutMs,
+            idempotencyKey = Guid.NewGuid().ToString("N")
+        });
+
+        var invoke = await _fixture.RunInWslAsync(
+            $"openclaw gateway call node.invoke --params {ShellSingleQuote(invokeParams)} --json --timeout {GatewayCliProofTimeoutMs}",
+            GatewayCliProofProcessTimeout,
+            env);
+
+        AssertCommandSucceeded(invoke, "invoke Windows node system.run denied-write proof through real gateway");
+
+        using var invokeDoc = JsonDocument.Parse(ExtractJsonObject(invoke.Stdout));
+        if (invokeDoc.RootElement.TryGetProperty("ok", out var ok))
+        {
+            Assert.True(ok.GetBoolean(), $"Expected gateway node.invoke ok=true; response: {invokeDoc.RootElement.GetRawText()}");
+        }
+
+        var payload = ReadNodeInvokePayload(invokeDoc.RootElement);
+        var exitCode = payload.GetProperty("exitCode").GetInt32();
+        if (payload.TryGetProperty("timedOut", out var timedOut))
+            Assert.False(timedOut.GetBoolean(), $"denied-write proof timed out; payload: {payload.GetRawText()}");
+
+        var stdout = payload.GetProperty("stdout").GetString() ?? "";
+        var stderr = payload.TryGetProperty("stderr", out var stderrElement)
+            ? stderrElement.GetString() ?? ""
+            : "";
+        var combinedOutput = stdout + stderr;
+
+        // The shell's access-denied text is localized; sourceReadyMarker proves the
+        // scratch source was created before the denied destination copy was attempted.
+        Assert.NotEqual(0, exitCode);
+        Assert.True(combinedOutput.Length > 0, $"Expected denied write to emit output; payload: {payload.GetRawText()}");
+        Assert.Contains(sourceReadyMarker, combinedOutput, StringComparison.Ordinal);
+        Assert.DoesNotContain(sourcePayload, combinedOutput, StringComparison.Ordinal);
+        Assert.False(File.Exists(blockedPath),
+            $"MXC sandbox should not create files inside the tray data/settings directory: {blockedPath}");
+
+        var requestLog = await WaitForTrayLogLineContainingAsync(
+            TimeSpan.FromSeconds(30),
+            logCursor,
+            "[mxc] system.run sandbox request",
+            "executor=mxc-direct-appc",
+            "contained=True",
+            "shell=cmd");
+        var resultLog = await WaitForTrayLogLineContainingAsync(
+            TimeSpan.FromSeconds(30),
+            logCursor,
+            "[mxc] system.run sandbox result",
+            $"exitCode={exitCode}",
+            "containment=mxc");
+
+        Console.WriteLine(
+            $"[E2E] MXC denied-write payload: exitCode={exitCode}; stdoutLength={stdout.Length}; stderrLength={stderr.Length}; fileExists={File.Exists(blockedPath)}");
+        Console.WriteLine($"[E2E] MXC denied-write request diagnostic: {requestLog}");
+        Console.WriteLine($"[E2E] MXC denied-write result diagnostic: {resultLog}");
+    }
+
+    private async Task AssertPrimaryTrayReadyAndGatewayCliHealthyAsync()
+    {
+        await _fixture.WaitForConnectionReady();
+        await _fixture.WaitForNodeListReady();
+
+        var gateway = _fixture.ReadActiveGatewayRecord();
+        var env = GatewayTokenEnv(gateway.SharedGatewayToken);
+
+        var devices = await _fixture.RunInWslAsync("openclaw devices list --json", TimeSpan.FromSeconds(30), env);
+        AssertCommandSucceeded(devices, "list gateway devices before MXC proof");
+        AssertNoPendingRequests(devices.Stdout);
+
+        var nodes = await _fixture.RunInWslAsync("openclaw nodes list --json", TimeSpan.FromSeconds(30), env);
+        AssertCommandSucceeded(nodes, "list gateway nodes before MXC proof");
+        AssertNoPendingRequests(nodes.Stdout);
+        Assert.Contains("windows", nodes.Stdout, StringComparison.OrdinalIgnoreCase);
+
+        var allowCommands = await _fixture.RunInWslAsync(
+            "openclaw config get gateway.nodes.allowCommands --json",
+            TimeSpan.FromSeconds(30),
+            env);
+        AssertCommandSucceeded(allowCommands, "read gateway.nodes.allowCommands before MXC proof");
+        using var allowCommandsDoc = JsonDocument.Parse(ExtractJsonValue(allowCommands.Stdout));
+        var allowed = ReadStringArray(allowCommandsDoc.RootElement);
+        Assert.Contains(allowed, command => command == "system.run");
+        Assert.Contains(allowed, command => command == "system.run.prepare");
+        Assert.Contains(allowed, command => command == "system.which");
+        Console.WriteLine("[E2E] gateway.nodes.allowCommands includes system.run/system.run.prepare/system.which");
+
+        using var statusDoc = await _fixture.Client!.CallToolExpectSuccessAsync("app.status");
+        AssertReadyStatus(statusDoc.RootElement);
+        AssertOperatorCanApproveNodeTrust(statusDoc.RootElement);
+    }
+
+    private async Task SetExecApprovalForSystemRunProofAsync()
+    {
+        using var policy = await _fixture.Client!.CallToolExpectSuccessAsync("system.execApprovals.get");
+        var baseHash = policy.RootElement.GetProperty("hash").GetString();
+        Assert.False(string.IsNullOrWhiteSpace(baseHash));
+
+        using var updated = await _fixture.Client!.CallToolExpectSuccessAsync("system.execApprovals.set", new
+        {
+            baseHash,
+            defaultAction = "deny",
+            rules = new object[]
+            {
+                new
+                {
+                    pattern = "echo OPENCLAW_GATEWAY_SYSTEM_RUN_MXC_OK",
+                    action = "allow",
+                    shells = new[] { "cmd" },
+                    description = "E2E Gateway system.run MXC success proof",
+                    enabled = true
+                },
+                new
+                {
+                    pattern = "echo OPENCLAW_GATEWAY_SYSTEM_RUN_MXC_DENIED_PAYLOAD > *openclaw-mxc-denied-source.txt\"" +
+                              " && echo OPENCLAW_GATEWAY_SYSTEM_RUN_MXC_SOURCE_READY" +
+                              " && copy /Y *openclaw-mxc-denied-source.txt\" *mxc-denied-write-*.txt\"",
+                    action = "allow",
+                    shells = new[] { "cmd" },
+                    description = "E2E Gateway system.run MXC denied-write wrapper proof",
+                    enabled = true
+                },
+                new
+                {
+                    pattern = "echo OPENCLAW_GATEWAY_SYSTEM_RUN_MXC_DENIED_PAYLOAD > *openclaw-mxc-denied-source.txt\"",
+                    action = "allow",
+                    shells = new[] { "cmd" },
+                    description = "E2E Gateway system.run MXC denied-write source prep",
+                    enabled = true
+                },
+                new
+                {
+                    pattern = "echo OPENCLAW_GATEWAY_SYSTEM_RUN_MXC_SOURCE_READY",
+                    action = "allow",
+                    shells = new[] { "cmd" },
+                    description = "E2E Gateway system.run MXC denied-write source marker",
+                    enabled = true
+                },
+                new
+                {
+                    pattern = "copy /Y *openclaw-mxc-denied-source.txt\" *mxc-denied-write-*.txt\"",
+                    action = "allow",
+                    shells = new[] { "cmd" },
+                    description = "E2E Gateway system.run MXC denied-write proof",
+                    enabled = true
+                },
+            },
+        });
+
+        Assert.True(updated.RootElement.GetProperty("updated").GetBoolean());
+        Console.WriteLine("[E2E] exec approval policy prepared for Gateway system.run proof: defaultAction=deny; allow=scoped cmd MXC proof commands");
+    }
+
+    private TrayLogCursor GetTrayLogCursor()
+    {
+        var logPath = Path.Combine(_fixture.DataDir, "openclaw-tray.log");
+        var rotatedLogPath = logPath + ".old";
+        var currentInfo = File.Exists(logPath) ? new FileInfo(logPath) : null;
+        var rotatedInfo = File.Exists(rotatedLogPath) ? new FileInfo(rotatedLogPath) : null;
+        return new TrayLogCursor(
+            currentInfo is not null,
+            currentInfo?.Length ?? 0,
+            currentInfo?.CreationTimeUtc,
+            rotatedInfo?.Length ?? -1,
+            rotatedInfo?.CreationTimeUtc,
+            rotatedInfo?.LastWriteTimeUtc);
+    }
+
+    private async Task<string> WaitForTrayLogLineContainingAsync(TimeSpan timeout, TrayLogCursor cursor, params string[] fragments)
+    {
+        var logPath = Path.Combine(_fixture.DataDir, "openclaw-tray.log");
+        var deadline = DateTime.UtcNow.Add(timeout);
+        var tail = "";
+
+        while (DateTime.UtcNow < deadline)
+        {
+            if (File.Exists(logPath) || File.Exists(logPath + ".old"))
+            {
+                var lines = await ReadTrayLogLinesSinceAsync(logPath, cursor);
+                tail = string.Join(Environment.NewLine, lines.TakeLast(20));
+                var match = lines.LastOrDefault(line =>
+                    fragments.All(fragment => line.Contains(fragment, StringComparison.Ordinal)));
+                if (match is not null)
+                    return match;
+            }
+
+            await Task.Delay(500);
+        }
+
+        throw new TimeoutException(
+            $"Timed out waiting for tray log fragments [{string.Join(", ", fragments)}]. Log path: {logPath}. Tail: {tail}");
+    }
+
+    private static async Task<string[]> ReadTrayLogLinesSinceAsync(string logPath, TrayLogCursor cursor)
+    {
+        var lines = new List<string>();
+        var rotatedLogPath = logPath + ".old";
+        var rotationObserved = CurrentLogGenerationChanged(logPath, cursor) || RotatedLogChanged(rotatedLogPath, cursor);
+        if (rotationObserved && File.Exists(rotatedLogPath))
+        {
+            lines.AddRange(await ReadLogLinesFromOffsetAsync(rotatedLogPath, cursor.CurrentLength));
+        }
+
+        if (File.Exists(logPath))
+        {
+            lines.AddRange(await ReadLogLinesFromOffsetAsync(logPath, rotationObserved ? 0 : cursor.CurrentLength));
+        }
+
+        return lines.ToArray();
+    }
+
+    private static bool RotatedLogChanged(string rotatedLogPath, TrayLogCursor cursor)
+    {
+        if (!File.Exists(rotatedLogPath))
+            return false;
+
+        var info = new FileInfo(rotatedLogPath);
+        return info.Length != cursor.RotatedLength
+            || info.CreationTimeUtc != cursor.RotatedCreationUtc
+            || info.LastWriteTimeUtc != cursor.RotatedLastWriteUtc;
+    }
+
+    private static bool CurrentLogGenerationChanged(string logPath, TrayLogCursor cursor)
+    {
+        if (!cursor.CurrentExists)
+            return false;
+
+        if (!File.Exists(logPath))
+            return false;
+
+        var info = new FileInfo(logPath);
+        return info.CreationTimeUtc != cursor.CurrentCreationUtc;
+    }
+
+    private static async Task<string[]> ReadLogLinesFromOffsetAsync(string logPath, long startOffset)
+    {
+        await using var stream = new FileStream(logPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite | FileShare.Delete);
+        var seekOffset = Math.Min(startOffset, stream.Length);
+        stream.Seek(seekOffset, SeekOrigin.Begin);
+
+        using var reader = new StreamReader(stream);
+        var text = await reader.ReadToEndAsync();
+        return text.Replace("\r\n", "\n", StringComparison.Ordinal)
+            .Split('\n', StringSplitOptions.RemoveEmptyEntries);
+    }
+
+    private static void AssertReadyStatus(JsonElement root)
+    {
+        var rawJson = root.GetRawText();
+        var connectionStatus = root.GetProperty("connectionStatus").GetString();
+        Assert.True(connectionStatus is "Ready" or "Connected",
+            $"connectionStatus should be Ready or Connected, got '{connectionStatus}'; full status: {rawJson}");
+        Assert.True(root.GetProperty("nodeConnected").GetBoolean(), $"nodeConnected should be true; full status: {rawJson}");
+        Assert.True(root.GetProperty("nodePaired").GetBoolean(), $"nodePaired should be true; full status: {rawJson}");
+    }
+
+    private static void AssertOperatorCanApproveNodeTrust(JsonElement root)
+    {
+        var rawJson = root.GetRawText();
+        Assert.True(root.TryGetProperty("operatorScopes", out var scopes), $"operatorScopes missing from app.status: {rawJson}");
+        var values = ReadStringArray(scopes);
+        Assert.Contains(values, scope => string.Equals(scope, "operator.admin", StringComparison.OrdinalIgnoreCase));
+        Assert.Contains(values, scope => string.Equals(scope, "operator.pairing", StringComparison.OrdinalIgnoreCase));
+    }
+
+    private static string[] ReadStringArray(JsonElement element)
+    {
+        Assert.Equal(JsonValueKind.Array, element.ValueKind);
+        return element.EnumerateArray()
+            .Select(item => item.GetString())
+            .Where(value => !string.IsNullOrWhiteSpace(value))
+            .Select(value => value!)
+            .Order(StringComparer.OrdinalIgnoreCase)
+            .ToArray();
+    }
+
+    private static void AssertNoPendingRequests(string output)
+    {
+        using var doc = JsonDocument.Parse(ExtractJsonObject(output));
+        if (doc.RootElement.TryGetProperty("pending", out var pending))
+        {
+            Assert.Equal(JsonValueKind.Array, pending.ValueKind);
+            Assert.Equal(0, pending.GetArrayLength());
+        }
+    }
+
+    private static void AssertCommandSucceeded(CommandResult result, string description)
+    {
+        Assert.False(result.TimedOut, $"{description} timed out");
+        Assert.Equal(0, result.ExitCode);
+    }
+
+    private static Dictionary<string, string> GatewayTokenEnv(string? sharedGatewayToken)
+    {
+        Assert.False(string.IsNullOrWhiteSpace(sharedGatewayToken));
+        return new Dictionary<string, string> { ["OPENCLAW_GATEWAY_TOKEN"] = sharedGatewayToken! };
+    }
+
+    private static string ExtractJsonObject(string output)
+    {
+        var start = output.IndexOf('{');
+        var end = output.LastIndexOf('}');
+        Assert.True(start >= 0 && end > start, $"Expected JSON object in output: {output}");
+        return output[start..(end + 1)];
+    }
+
+    private static string ExtractJsonValue(string output)
+    {
+        var objectStart = output.IndexOf('{');
+        var arrayStart = output.IndexOf('[');
+        var start = objectStart switch
+        {
+            >= 0 when arrayStart >= 0 => Math.Min(objectStart, arrayStart),
+            >= 0 => objectStart,
+            _ => arrayStart
+        };
+
+        Assert.True(start >= 0, $"Expected JSON value in output: {output}");
+        var endChar = output[start] == '{' ? '}' : ']';
+        var end = output.LastIndexOf(endChar);
+        Assert.True(end > start, $"Expected JSON value in output: {output}");
+        return output[start..(end + 1)];
+    }
+
+    private static JsonElement ReadNodeInvokePayload(JsonElement root)
+    {
+        if (root.TryGetProperty("payload", out var payload) &&
+            payload.ValueKind == JsonValueKind.Object)
+        {
+            return payload.Clone();
+        }
+
+        if (root.TryGetProperty("payloadJSON", out var payloadJson) &&
+            payloadJson.ValueKind == JsonValueKind.String &&
+            !string.IsNullOrWhiteSpace(payloadJson.GetString()))
+        {
+            using var doc = JsonDocument.Parse(payloadJson.GetString()!);
+            return doc.RootElement.Clone();
+        }
+
+        throw new InvalidDataException($"Gateway node.invoke response did not include a payload object: {root.GetRawText()}");
+    }
+
+    private static string ShellSingleQuote(string value) => "'" + value.Replace("'", "'\"'\"'") + "'";
+
+    private static string CmdQuote(string value) => "\"" + value.Replace("\"", "\"\"") + "\"";
+
+    private sealed record TrayLogCursor(
+        bool CurrentExists,
+        long CurrentLength,
+        DateTime? CurrentCreationUtc,
+        long RotatedLength,
+        DateTime? RotatedCreationUtc,
+        DateTime? RotatedLastWriteUtc);
+}
diff --git a/tests/OpenClaw.E2ETests/Setup/SetupAndConnectTests.cs b/tests/OpenClaw.E2ETests/Setup/SetupAndConnectTests.cs
index 9b3423f8e..2d8a07eae 100644
--- a/tests/OpenClaw.E2ETests/Setup/SetupAndConnectTests.cs
+++ b/tests/OpenClaw.E2ETests/Setup/SetupAndConnectTests.cs
@@ -99,6 +99,15 @@ public async Task FullSetup_WslAndGatewayConfiguration_FilesValidated()
         Assert.Contains("default=openclaw", wslConf.Stdout);
         Assert.Contains("useWindowsTimezone=true", wslConf.Stdout);
 
+        var agentsContext = await _fixture.RunInWslAsync(
+            "cat /home/openclaw/.openclaw/workspace/AGENTS.md",
+            TimeSpan.FromSeconds(15));
+        AssertCommandSucceeded(agentsContext, "read managed Windows node context");
+        Assert.Contains("<!-- BEGIN OPENCLAW WINDOWS NODE CONTEXT: managed by OpenClaw Windows setup -->", agentsContext.Stdout);
+        Assert.Contains("exec host=node", agentsContext.Stdout);
+        Assert.Contains("<!-- END OPENCLAW WINDOWS NODE CONTEXT -->", agentsContext.Stdout);
+        Assert.DoesNotContain("tools.exec.security full", agentsContext.Stdout);
+
         var openClawJsonProbe = await _fixture.RunInWslAsync(
             "paths=$(find /home/openclaw/.openclaw /opt/openclaw /etc/openclaw -type f -name openclaw.json 2>/dev/null | sort); if [ -z \"$paths\" ]; then echo 'OPENCLAW_JSON_PATH:<not-found>'; else for path in $paths; do echo OPENCLAW_JSON_PATH:$path; cat \"$path\"; done; fi",
             TimeSpan.FromSeconds(15));
@@ -154,6 +163,41 @@ public async Task FullSetup_WslAndGatewayConfiguration_FilesValidated()
         Assert.Contains(Directory.EnumerateFiles(identityDir), path => Path.GetFileName(path).Contains("device-key", StringComparison.OrdinalIgnoreCase));
     }
 
+    [E2EFact]
+    public async Task FullSetup_WindowsNodeContext_RemainsIdempotentAfterCrlfEdit()
+    {
+        const string agents = "/home/openclaw/.openclaw/workspace/AGENTS.md";
+        const string beginMarker = "<!-- BEGIN OPENCLAW WINDOWS NODE CONTEXT: managed by OpenClaw Windows setup -->";
+        const string endMarker = "<!-- END OPENCLAW WINDOWS NODE CONTEXT -->";
+        var convert = await _fixture.RunInWslAsync(
+            $"tmp=$(mktemp); {{ printf 'CRLF_SENTINEL\\r\\n'; awk '{{ printf \"%s\\r\\n\", $0 }}' {agents}; }} > \"$tmp\"; mv \"$tmp\" {agents}",
+            TimeSpan.FromSeconds(15),
+            inputViaStdin: true);
+        AssertCommandSucceeded(convert, "convert AGENTS.md to CRLF");
+
+        var config = SetupConfig.LoadFromFile(_fixture.ConfigPath);
+        using var logger = new SetupLogger(filePath: null);
+        using var journal = new TransactionJournal(filePath: null, logger);
+        var context = new SetupContext(
+            config,
+            logger,
+            journal,
+            new CommandRunner(logger),
+            CancellationToken.None,
+            _fixture.DataDir,
+            _fixture.LocalAppDataRoot);
+
+        var result = await new WindowsNodeBootstrapContextStep().ExecuteAsync(context, CancellationToken.None);
+        Assert.True(result.IsSuccess, result.Message);
+
+        var probe = await _fixture.RunInWslAsync(
+            $"awk 'BEGIN {{ b=0; e=0 }} {{ line=$0; sub(/\\r$/, \"\", line); if (line == \"{beginMarker}\") b++; if (line == \"{endMarker}\") e++ }} END {{ print b, e }}' {agents}; grep -q $'CRLF_SENTINEL\\r$' {agents}",
+            TimeSpan.FromSeconds(15),
+            inputViaStdin: true);
+        AssertCommandSucceeded(probe, "verify CRLF context replacement");
+        Assert.Contains("1 1", probe.Stdout);
+    }
+
     [E2EFact]
     public async Task FullSetup_TrayStartsWslKeepAlive()
     {
@@ -312,56 +356,79 @@ public async Task ExternalLike_QrOnlyFreshTray_RequiresExplicitDeviceApproval()
         var env = GatewayTokenEnv(gateway.SharedGatewayToken);
         var pendingBefore = await ReadPendingDeviceRequestIdsAsync();
         var pendingNodeBefore = await ReadPendingNodeRequestIdsAsync();
+        var handledDeviceRequestIds = new HashSet<string>(StringComparer.Ordinal);
+        var handledNodeRequestIds = new HashSet<string>(StringComparer.Ordinal);
         var setupCode = await MintRealGatewaySetupCodeAsync(env, "mint real gateway setup code for external-like tray");
+        IsolatedTrayInstance? externalTray = null;
+        Exception? testFailure = null;
 
-        await using var externalTray = await IsolatedTrayInstance.StartAsync(_fixture.ArtifactDir, "external-qr-only");
-        using var applyDoc = await externalTray.Client.CallToolExpectSuccessAsync(
-            "app.connection.applySetupCode",
-            new { setupCode });
-        var apply = applyDoc.RootElement;
-        Console.WriteLine($"[E2E] external-like applySetupCode response: {apply.GetRawText()}");
-        Assert.Equal("Success", apply.GetProperty("outcome").GetString());
-
-        var active = externalTray.ReadActiveGatewayRecord();
-        Assert.NotNull(active.GatewayUrl);
-        Assert.Contains($":{_fixture.GatewayPort}", active.GatewayUrl, StringComparison.Ordinal);
-        Assert.True(string.IsNullOrWhiteSpace(active.SharedGatewayToken),
-            "QR-only external-like onboarding must not invent or persist the shared gateway token.");
-
-        var credentials = externalTray.ReadCredentialState();
-        Assert.False(credentials.HasNodeToken, "QR-only external-like onboarding should wait for explicit device approval before persisting a node token.");
-        Assert.False(credentials.HasOperatorToken,
-            "Current LKG QR-only external-like onboarding does not provide an admin operator token.");
-        Assert.True(credentials.HasBootstrapToken,
-            "Bootstrap remains as recovery material while explicit approval is pending.");
-
-        using var statusDoc = await externalTray.Client.CallToolExpectSuccessAsync("app.status");
-        var status = statusDoc.RootElement;
-        var rawStatus = status.GetRawText();
-        Assert.False(status.GetProperty("nodeConnected").GetBoolean(), $"Expected nodeConnected=false before approval; status={rawStatus}");
-        Assert.False(status.GetProperty("nodePaired").GetBoolean(), $"Expected nodePaired=false before approval; status={rawStatus}");
-        Assert.True(status.TryGetProperty("operatorScopes", out var scopes), $"operatorScopes missing: {rawStatus}");
-        Assert.DoesNotContain(ReadStringArray(scopes), scope => string.Equals(scope, "operator.admin", StringComparison.OrdinalIgnoreCase));
-
-        var requestId = await WaitForFirstPendingDeviceRequestIdAsync(pendingBefore);
-        Assert.False(string.IsNullOrWhiteSpace(requestId));
-
-        using var dashboardDoc = await externalTray.Client.CallToolExpectSuccessAsync("app.dashboard.url");
-        var dashboard = dashboardDoc.RootElement;
-        Assert.Equal("record.BootstrapToken", dashboard.GetProperty("credentialSource").GetString());
-        Assert.False(dashboard.GetProperty("usesSharedGatewayToken").GetBoolean());
-        Assert.False(dashboard.GetProperty("hasTokenQuery").GetBoolean());
-
-        using var rejectDoc = await RejectDevicePairingFromConnectionPageAsync(requestId);
-        Console.WriteLine($"[E2E] rejected external-like pending device request via Connection page: {rejectDoc.RootElement.GetRawText()}");
-
-        var nodeRequests = await ReadNewPendingNodeApprovalsUntilAsync(
-            pendingNodeBefore,
-            TimeSpan.FromSeconds(10));
-        foreach (var nodeRequest in nodeRequests)
+        try
         {
-            using var rejectNodeDoc = await RejectNodePairingFromConnectionPageAsync(nodeRequest.RequestId);
-            Console.WriteLine($"[E2E] rejected external-like pending node-trust request via Connection page: {rejectNodeDoc.RootElement.GetRawText()}");
+            externalTray = await IsolatedTrayInstance.StartAsync(_fixture.ArtifactDir, "external-qr-only");
+            using var applyDoc = await externalTray.Client.CallToolExpectSuccessAsync(
+                "app.connection.applySetupCode",
+                new { setupCode });
+            var apply = applyDoc.RootElement;
+            Console.WriteLine($"[E2E] external-like applySetupCode response: {apply.GetRawText()}");
+            Assert.Equal("Success", apply.GetProperty("outcome").GetString());
+
+            var active = externalTray.ReadActiveGatewayRecord();
+            Assert.NotNull(active.GatewayUrl);
+            Assert.Contains($":{_fixture.GatewayPort}", active.GatewayUrl, StringComparison.Ordinal);
+            Assert.True(string.IsNullOrWhiteSpace(active.SharedGatewayToken),
+                "QR-only external-like onboarding must not invent or persist the shared gateway token.");
+
+            var credentials = externalTray.ReadCredentialState();
+            Assert.False(credentials.HasNodeToken, "QR-only external-like onboarding should wait for explicit device approval before persisting a node token.");
+            Assert.False(credentials.HasOperatorToken,
+                "Current LKG QR-only external-like onboarding does not provide an admin operator token.");
+            Assert.True(credentials.HasBootstrapToken,
+                "Bootstrap remains as recovery material while explicit approval is pending.");
+
+            using var statusDoc = await externalTray.Client.CallToolExpectSuccessAsync("app.status");
+            var status = statusDoc.RootElement;
+            var rawStatus = status.GetRawText();
+            Assert.False(status.GetProperty("nodeConnected").GetBoolean(), $"Expected nodeConnected=false before approval; status={rawStatus}");
+            Assert.False(status.GetProperty("nodePaired").GetBoolean(), $"Expected nodePaired=false before approval; status={rawStatus}");
+            Assert.True(status.TryGetProperty("operatorScopes", out var scopes), $"operatorScopes missing: {rawStatus}");
+            Assert.DoesNotContain(ReadStringArray(scopes), scope => string.Equals(scope, "operator.admin", StringComparison.OrdinalIgnoreCase));
+
+            var requestId = await WaitForFirstPendingDeviceRequestIdAsync(pendingBefore);
+            Assert.False(string.IsNullOrWhiteSpace(requestId));
+
+            using var dashboardDoc = await externalTray.Client.CallToolExpectSuccessAsync("app.dashboard.url");
+            var dashboard = dashboardDoc.RootElement;
+            Assert.Equal("record.BootstrapToken", dashboard.GetProperty("credentialSource").GetString());
+            Assert.False(dashboard.GetProperty("usesSharedGatewayToken").GetBoolean());
+            Assert.False(dashboard.GetProperty("hasTokenQuery").GetBoolean());
+
+            using var rejectDoc = await RejectDevicePairingFromConnectionPageAsync(requestId);
+            handledDeviceRequestIds.Add(requestId);
+            Console.WriteLine($"[E2E] rejected external-like pending device request via Connection page: {rejectDoc.RootElement.GetRawText()}");
+        }
+        catch (Exception ex)
+        {
+            testFailure = ex;
+            throw;
+        }
+        finally
+        {
+            if (externalTray is not null)
+                await externalTray.DisposeAsync();
+
+            try
+            {
+                await RejectNewPendingApprovalsUntilQuietAsync(
+                    pendingBefore,
+                    pendingNodeBefore,
+                    handledDeviceRequestIds,
+                    handledNodeRequestIds,
+                    TimeSpan.FromSeconds(45));
+            }
+            catch (Exception ex) when (testFailure is not null)
+            {
+                Console.WriteLine($"[E2E] Cleanup after failed external QR-only tray test also failed: {ex}");
+            }
         }
     }
 
@@ -402,34 +469,66 @@ public async Task ExternalLike_FreshTray_SharedTokenFlow_PairsOperatorAndNode()
         var sharedGatewayToken = RequireSharedGatewayToken(gateway.SharedGatewayToken);
         var pendingBefore = await ReadPendingDeviceRequestIdsAsync();
         var pendingNodeBefore = await ReadPendingNodeRequestIdsAsync();
+        var handledDeviceRequestIds = new HashSet<string>(StringComparer.Ordinal);
+        var handledNodeRequestIds = new HashSet<string>(StringComparer.Ordinal);
+        IsolatedTrayInstance? externalTray = null;
+        Exception? testFailure = null;
 
-        await using var externalTray = await IsolatedTrayInstance.StartAsync(_fixture.ArtifactDir, "external-shared-token");
-        using var connectDoc = await externalTray.Client.CallToolExpectSuccessAsync(
-            "app.connection.connectSharedToken",
-            new { gatewayUrl = gateway.GatewayUrl, token = sharedGatewayToken });
-        var connect = connectDoc.RootElement;
-        Console.WriteLine($"[E2E] external shared-token connect response: {connect.GetRawText()}");
-        Assert.Equal("Success", connect.GetProperty("outcome").GetString());
+        try
+        {
+            externalTray = await IsolatedTrayInstance.StartAsync(_fixture.ArtifactDir, "external-shared-token");
+            using var connectDoc = await externalTray.Client.CallToolExpectSuccessAsync(
+                "app.connection.connectSharedToken",
+                new { gatewayUrl = gateway.GatewayUrl, token = sharedGatewayToken });
+            var connect = connectDoc.RootElement;
+            Console.WriteLine($"[E2E] external shared-token connect response: {connect.GetRawText()}");
+            Assert.Equal("Success", connect.GetProperty("outcome").GetString());
+
+            await ApproveNewPendingDeviceRequestsUntilReadyAsync(pendingBefore, handledDeviceRequestIds, externalTray);
+            var nodeRequest = Assert.Single(await ReadNewPendingNodeApprovalsUntilAsync(
+                pendingNodeBefore,
+                TimeSpan.FromSeconds(30)));
+            using (var approve = await ApproveNodePairingFromConnectionPageAsync(nodeRequest.RequestId))
+            {
+                handledNodeRequestIds.Add(nodeRequest.RequestId);
+                Console.WriteLine($"[E2E] explicitly approved external node-trust request via Connection page: {approve.RootElement.GetRawText()}");
+            }
 
-        await ApproveNewPendingDeviceRequestsUntilReadyAsync(pendingBefore, externalTray);
-        var nodeRequest = Assert.Single(await ReadNewPendingNodeApprovalsUntilAsync(
-            pendingNodeBefore,
-            TimeSpan.FromSeconds(30)));
-        using (var approve = await ApproveNodePairingFromConnectionPageAsync(nodeRequest.RequestId))
+            using var reconnectNode = await externalTray.Client.CallToolExpectSuccessAsync("app.connection.reconnectNode");
+            Assert.True(reconnectNode.RootElement.GetProperty("reconnected").GetBoolean());
+            await externalTray.WaitForConnectionReady(TimeSpan.FromSeconds(120));
+            await WaitForNodeEffectiveStateAsync(
+                externalTray.Client,
+                nodeRequest.NodeId,
+                new CapabilitiesConfig { Tts = false },
+                TimeSpan.FromSeconds(90));
+            AssertExternalTrayDurablePairing(externalTray);
+            await AssertGatewayCliStateHealthy();
+        }
+        catch (Exception ex)
         {
-            Console.WriteLine($"[E2E] explicitly approved external node-trust request via Connection page: {approve.RootElement.GetRawText()}");
+            testFailure = ex;
+            throw;
         }
+        finally
+        {
+            if (externalTray is not null)
+                await externalTray.DisposeAsync();
 
-        using var reconnectNode = await externalTray.Client.CallToolExpectSuccessAsync("app.connection.reconnectNode");
-        Assert.True(reconnectNode.RootElement.GetProperty("reconnected").GetBoolean());
-        await externalTray.WaitForConnectionReady(TimeSpan.FromSeconds(120));
-        await WaitForNodeEffectiveStateAsync(
-            externalTray.Client,
-            nodeRequest.NodeId,
-            new CapabilitiesConfig { Tts = false },
-            TimeSpan.FromSeconds(90));
-        AssertExternalTrayDurablePairing(externalTray);
-        await AssertGatewayCliStateHealthy();
+            try
+            {
+                await RejectNewPendingApprovalsUntilQuietAsync(
+                    pendingBefore,
+                    pendingNodeBefore,
+                    handledDeviceRequestIds,
+                    handledNodeRequestIds,
+                    TimeSpan.FromSeconds(45));
+            }
+            catch (Exception ex) when (testFailure is not null)
+            {
+                Console.WriteLine($"[E2E] Cleanup after failed external shared-token tray test also failed: {ex}");
+            }
+        }
     }
 
     [E2EFact]
@@ -713,9 +812,13 @@ private async Task<string> WaitForFirstPendingDeviceRequestIdAsync(
 
     private async Task ApproveNewPendingDeviceRequestsUntilReadyAsync(
         HashSet<string> ignoredRequestIds,
+        HashSet<string> approvedRequestIds,
         IsolatedTrayInstance tray)
     {
         var approved = new HashSet<string>(ignoredRequestIds, StringComparer.Ordinal);
+        foreach (var requestId in approvedRequestIds)
+            approved.Add(requestId);
+
         var deadline = DateTime.UtcNow.AddSeconds(90);
         string lastDevicesOutput = "<none>";
         while (DateTime.UtcNow < deadline)
@@ -724,6 +827,14 @@ private async Task ApproveNewPendingDeviceRequestsUntilReadyAsync(
             if (credentials.HasOperatorToken && credentials.HasNodeToken && !credentials.HasBootstrapToken)
                 return;
 
+            if (credentials.HasOperatorToken && !credentials.HasNodeToken && !credentials.HasBootstrapToken)
+            {
+                using var reconnectNodeDoc = await tray.Client.CallToolExpectSuccessAsync("app.connection.reconnectNode");
+                Assert.True(reconnectNodeDoc.RootElement.GetProperty("reconnected").GetBoolean());
+                await Task.Delay(500);
+                continue;
+            }
+
             using var approvals = await ReadPendingApprovalsFromConnectionPageAsync();
             lastDevicesOutput = approvals.RootElement.GetRawText();
             var approvedAny = false;
@@ -733,6 +844,7 @@ private async Task ApproveNewPendingDeviceRequestsUntilReadyAsync(
             {
                 using var approve = await ApproveDevicePairingFromConnectionPageAsync(requestId);
                 Console.WriteLine($"[E2E] approved external-like device request via Connection page: {approve.RootElement.GetRawText()}");
+                approvedRequestIds.Add(requestId);
                 approvedAny = true;
             }
 
@@ -757,6 +869,78 @@ private async Task ApproveNewPendingDeviceRequestsUntilReadyAsync(
         throw new TimeoutException($"Timed out waiting for clean external-like tray credentials. Last devices list: {lastDevicesOutput}");
     }
 
+    private async Task RejectNewPendingApprovalsUntilQuietAsync(
+        HashSet<string> deviceRequestIdsBefore,
+        HashSet<string> nodeRequestIdsBefore,
+        HashSet<string> handledDeviceRequestIds,
+        HashSet<string> handledNodeRequestIds,
+        TimeSpan timeout)
+    {
+        var deadline = DateTime.UtcNow.Add(timeout);
+        DateTime? quietSince = null;
+        string lastOutput = "<none>";
+
+        while (DateTime.UtcNow < deadline)
+        {
+            using var approvals = await ReadPendingApprovalsFromConnectionPageAsync();
+            lastOutput = approvals.RootElement.GetRawText();
+            var rejectedAny = false;
+            var handledRequestStillVisible = false;
+
+            foreach (var requestId in ReadPendingApprovalIds(approvals.RootElement, "devicePending", "RequestId", "DeviceId")
+                         .ToArray())
+            {
+                if (deviceRequestIdsBefore.Contains(requestId))
+                    continue;
+
+                if (handledDeviceRequestIds.Contains(requestId))
+                {
+                    handledRequestStillVisible = true;
+                    continue;
+                }
+
+                using var reject = await RejectDevicePairingFromConnectionPageAsync(requestId);
+                handledDeviceRequestIds.Add(requestId);
+                Console.WriteLine($"[E2E] cleaned up pending device request {requestId}: {reject.RootElement.GetRawText()}");
+                rejectedAny = true;
+            }
+
+            foreach (var request in ReadPendingNodeApprovals(approvals.RootElement)
+                         .ToArray())
+            {
+                if (nodeRequestIdsBefore.Contains(request.RequestId))
+                    continue;
+
+                if (handledNodeRequestIds.Contains(request.RequestId))
+                {
+                    handledRequestStillVisible = true;
+                    continue;
+                }
+
+                using var reject = await RejectNodePairingFromConnectionPageAsync(request.RequestId);
+                handledNodeRequestIds.Add(request.RequestId);
+                Console.WriteLine($"[E2E] cleaned up pending node-trust request {request.RequestId} for {request.NodeId}: {reject.RootElement.GetRawText()}");
+                rejectedAny = true;
+            }
+
+            if (rejectedAny || handledRequestStillVisible)
+            {
+                quietSince = null;
+            }
+            else
+            {
+                quietSince ??= DateTime.UtcNow;
+                if (DateTime.UtcNow - quietSince >= TimeSpan.FromSeconds(3))
+                    return;
+            }
+
+            await Task.Delay(500);
+        }
+
+        throw new TimeoutException(
+            $"Timed out waiting for external-tray pending approvals to remain clear. Last output: {lastOutput}");
+    }
+
     private async Task<JsonDocument> ReadPendingApprovalsFromConnectionPageAsync()
     {
         await NavigateAdminTrayToConnectionPageAsync();
diff --git a/tests/OpenClaw.SetupEngine.Tests/CommandRunnerTests.cs b/tests/OpenClaw.SetupEngine.Tests/CommandRunnerTests.cs
new file mode 100644
index 000000000..cfbcb8a1a
--- /dev/null
+++ b/tests/OpenClaw.SetupEngine.Tests/CommandRunnerTests.cs
@@ -0,0 +1,51 @@
+using System.Diagnostics;
+
+namespace OpenClaw.SetupEngine.Tests;
+
+public class CommandRunnerTests
+{
+    private static readonly string s_largeStdin = new('x', 8 * 1024 * 1024);
+
+    [Fact]
+    public async Task RunAsync_LargeStdinWriteObeysTimeout()
+    {
+        var runner = CreateRunner();
+        var (executable, arguments) = SleepingCommand();
+        var stopwatch = Stopwatch.StartNew();
+
+        var result = await runner.RunAsync(
+            executable,
+            arguments,
+            TimeSpan.FromMilliseconds(250),
+            stdinInput: s_largeStdin);
+
+        Assert.True(result.TimedOut);
+        Assert.InRange(stopwatch.Elapsed, TimeSpan.Zero, TimeSpan.FromSeconds(5));
+    }
+
+    [Fact]
+    public async Task RunAsync_LargeStdinWriteObeysCallerCancellation()
+    {
+        var runner = CreateRunner();
+        var (executable, arguments) = SleepingCommand();
+        using var cts = new CancellationTokenSource(TimeSpan.FromMilliseconds(250));
+        var stopwatch = Stopwatch.StartNew();
+
+        await Assert.ThrowsAnyAsync<OperationCanceledException>(() => runner.RunAsync(
+            executable,
+            arguments,
+            TimeSpan.FromSeconds(30),
+            stdinInput: s_largeStdin,
+            ct: cts.Token));
+
+        Assert.InRange(stopwatch.Elapsed, TimeSpan.Zero, TimeSpan.FromSeconds(5));
+    }
+
+    private static CommandRunner CreateRunner()
+        => new(new SetupLogger(filePath: null, LogLevel.Trace));
+
+    private static (string Executable, string[] Arguments) SleepingCommand()
+        => OperatingSystem.IsWindows()
+            ? ("cmd.exe", ["/d", "/s", "/c", "ping 127.0.0.1 -n 30 >nul"])
+            : ("/bin/sh", ["-c", "sleep 30"]);
+}
diff --git a/tests/OpenClaw.SetupEngine.Tests/SetupConfigTests.cs b/tests/OpenClaw.SetupEngine.Tests/SetupConfigTests.cs
index 675f367b0..77bed545c 100644
--- a/tests/OpenClaw.SetupEngine.Tests/SetupConfigTests.cs
+++ b/tests/OpenClaw.SetupEngine.Tests/SetupConfigTests.cs
@@ -3,6 +3,7 @@
 
 namespace OpenClaw.SetupEngine.Tests;
 
+[Collection(EnvironmentVariableCollection.Name)]
 public class SetupConfigTests : IDisposable
 {
     private readonly string _tempDir;
@@ -33,6 +34,9 @@ public void Defaults_AreReasonable()
         Assert.Equal("loopback", config.Gateway.Bind);
         Assert.False(config.SkipPermissions);
         Assert.False(config.SkipWizard);
+        Assert.True(config.WindowsNodeContext.Enabled);
+        Assert.Null(config.WindowsNodeContext.WorkspacePath);
+        Assert.Equal(180, config.WindowsNodeContext.TimeoutSeconds);
     }
 
     [Fact]
@@ -180,6 +184,7 @@ public void CapabilitiesConfig_GetEnabledCommandIds_FlattensEnabledCapabilities(
 
         Assert.Contains("system.notify", commands);
         Assert.Contains("tts.speak", commands);
+        Assert.Contains("tts.status", commands);
         Assert.DoesNotContain("camera.snap", commands);
         Assert.DoesNotContain("stt.listen", commands);
         Assert.Equal(commands.Count, commands.Distinct(StringComparer.OrdinalIgnoreCase).Count());
@@ -204,7 +209,7 @@ public void TraySettingsConfig_MergesIntoFile_OverwritesSetupKeysAndPreservesUnk
         var settingsPath = Path.Combine(_tempDir, "settings.json");
         File.WriteAllText(settingsPath, """{"CustomKey": "custom_value", "EnableNodeMode": false, "AutoStart": true, "NodeCameraEnabled": false}""");
 
-        var traySettings = new TraySettingsConfig { EnableNodeMode = true, AutoStart = false };
+        var traySettings = new TraySettingsConfig { EnableNodeMode = true, AutoStart = false, NodeCameraEnabled = false };
         traySettings.MergeIntoSettingsFile(settingsPath);
 
         var result = JsonDocument.Parse(File.ReadAllText(settingsPath));
@@ -214,6 +219,96 @@ public void TraySettingsConfig_MergesIntoFile_OverwritesSetupKeysAndPreservesUnk
         Assert.Equal("custom_value", result.RootElement.GetProperty("CustomKey").GetString());
     }
 
+    [Fact]
+    public void TraySettingsConfig_ApplyCapabilities_MapsSetupCapabilitiesToRuntimeNodeSettings()
+    {
+        var caps = new CapabilitiesConfig
+        {
+            System = false,
+            Canvas = true,
+            Screen = true,
+            Camera = false,
+            Location = false,
+            Browser = false,
+            Device = true,
+            Tts = true,
+            Stt = false,
+        };
+
+        var traySettings = new TraySettingsConfig();
+        traySettings.ApplyCapabilities(caps);
+
+        Assert.False(traySettings.NodeSystemRunEnabled);
+        Assert.True(traySettings.NodeCanvasEnabled);
+        Assert.True(traySettings.NodeScreenEnabled);
+        Assert.False(traySettings.NodeCameraEnabled);
+        Assert.False(traySettings.NodeLocationEnabled);
+        Assert.False(traySettings.NodeBrowserProxyEnabled);
+        Assert.True(traySettings.NodeTtsEnabled);
+        Assert.False(traySettings.NodeSttEnabled);
+    }
+
+    [Fact]
+    public void SetupReviewSummary_UsesActiveSetupConfig()
+    {
+        var oldData = Environment.GetEnvironmentVariable("OPENCLAW_TRAY_DATA_DIR");
+        var oldLocalData = Environment.GetEnvironmentVariable("OPENCLAW_TRAY_LOCAL_DATA_DIR");
+        try
+        {
+            Environment.SetEnvironmentVariable("OPENCLAW_TRAY_DATA_DIR", Path.Combine(_tempDir, "roaming"));
+            Environment.SetEnvironmentVariable("OPENCLAW_TRAY_LOCAL_DATA_DIR", Path.Combine(_tempDir, "local"));
+            var config = new SetupConfig
+            {
+                DistroName = "CustomClaw",
+                BaseDistro = "Debian",
+                GatewayPort = 19999,
+                Gateway = { Bind = "lan", InstallUrl = "https://example.test/install.sh" }
+            };
+
+            var summary = SetupReviewSummaryBuilder.Build(config);
+
+            Assert.Contains("Debian", summary.DistroTitle);
+            Assert.Contains("CustomClaw", summary.DistroDescription);
+            Assert.Contains("19999", summary.GatewayEndpoint);
+            Assert.Contains("LAN bind enabled", summary.GatewayDescription);
+            Assert.Contains("example.test", summary.InstallerDescription);
+            Assert.Contains("CustomClaw", summary.ExactCommands);
+            Assert.Contains("19999", summary.ExactCommands);
+            Assert.Equal("CustomClaw · LAN:19999", summary.CompletionGatewaySummary);
+        }
+        finally
+        {
+            Environment.SetEnvironmentVariable("OPENCLAW_TRAY_DATA_DIR", oldData);
+            Environment.SetEnvironmentVariable("OPENCLAW_TRAY_LOCAL_DATA_DIR", oldLocalData);
+        }
+    }
+
+    [Fact]
+    public void SetupConfig_UsesBundledDefaultConfig_IsRuntimeOnly()
+    {
+        var config = new SetupConfig { UsesBundledDefaultConfig = true };
+        var path = Path.Combine(_tempDir, "config.json");
+
+        File.WriteAllText(path, JsonSerializer.Serialize(config, SetupConfig.JsonWriteOptions));
+        var roundTripped = SetupConfig.LoadFromFile(path);
+
+        Assert.False(roundTripped.UsesBundledDefaultConfig);
+    }
+
+    [Fact]
+    public void TraySettingsConfig_UpdateAutoStartInSettingsFile_PreservesCapabilitySettings()
+    {
+        var settingsPath = Path.Combine(_tempDir, "settings.json");
+        File.WriteAllText(settingsPath, """{"AutoStart": false, "NodeCameraEnabled": false, "NodeSystemRunEnabled": false}""");
+
+        TraySettingsConfig.UpdateAutoStartInSettingsFile(settingsPath, autoStart: true);
+
+        var result = JsonDocument.Parse(File.ReadAllText(settingsPath));
+        Assert.True(result.RootElement.GetProperty("AutoStart").GetBoolean());
+        Assert.False(result.RootElement.GetProperty("NodeCameraEnabled").GetBoolean());
+        Assert.False(result.RootElement.GetProperty("NodeSystemRunEnabled").GetBoolean());
+    }
+
     [Fact]
     public void TraySettingsConfig_CorruptExistingFile_BacksUpAndThrows()
     {
@@ -227,6 +322,18 @@ public void TraySettingsConfig_CorruptExistingFile_BacksUpAndThrows()
         Assert.Single(Directory.EnumerateFiles(_tempDir, "settings.json.corrupt-*.bak"));
     }
 
+    [Fact]
+    public void TraySettingsConfig_CorruptExistingFile_BackupNamesDoNotCollide()
+    {
+        var settingsPath = Path.Combine(_tempDir, "settings.json");
+        File.WriteAllText(settingsPath, "{not json");
+
+        Assert.Throws<InvalidDataException>(() => new TraySettingsConfig().MergeIntoSettingsFile(settingsPath));
+        Assert.Throws<InvalidDataException>(() => TraySettingsConfig.UpdateAutoStartInSettingsFile(settingsPath, autoStart: true));
+
+        Assert.Equal(2, Directory.EnumerateFiles(_tempDir, "settings.json.corrupt-*.bak").Count());
+    }
+
     [Fact]
     public void TraySettingsConfig_CreatesNewFile_WhenMissing()
     {
@@ -287,6 +394,19 @@ public void PairingConfig_Defaults()
         Assert.Equal(60, pairing.TimeoutSeconds);
     }
 
+    [Fact]
+    public void WindowsNodeContextSection_ManagedBlock_ContainsMarkersAndPayload()
+    {
+        var block = WindowsNodeContextSection.ManagedBlock;
+
+        Assert.StartsWith(WindowsNodeContextSection.BeginMarker + "\n", block);
+        Assert.Contains("This WSL gateway may be paired", block);
+        Assert.Contains("exec host=node", block);
+        Assert.DoesNotContain("tools.exec.security full", block);
+        Assert.DoesNotContain("tools.exec.ask off", block);
+        Assert.EndsWith("\n" + WindowsNodeContextSection.EndMarker, block);
+    }
+
     [Fact]
     public void StepResult_Ok_IsSuccess()
     {
diff --git a/tests/OpenClaw.SetupEngine.Tests/SetupContextTests.cs b/tests/OpenClaw.SetupEngine.Tests/SetupContextTests.cs
index 42b07d7af..5f331a52b 100644
--- a/tests/OpenClaw.SetupEngine.Tests/SetupContextTests.cs
+++ b/tests/OpenClaw.SetupEngine.Tests/SetupContextTests.cs
@@ -70,6 +70,25 @@ public void Constructor_SetsLocalDataDirFromLocalAppDataRootEnvironment()
         }
     }
 
+    [Fact]
+    public void Constructor_ExplicitDirectoriesOverrideReleaseDefaults()
+    {
+        using var logger = new SetupLogger(filePath: null);
+        var journal = new TransactionJournal(filePath: null);
+        var commands = new CommandRunner(logger);
+        var ctx = new SetupContext(
+            new SetupConfig(),
+            logger,
+            journal,
+            commands,
+            CancellationToken.None,
+            dataDir: @"C:\custom\roaming-dev",
+            localDataDir: @"C:\custom\local-dev");
+
+        Assert.Equal(@"C:\custom\roaming-dev", ctx.DataDir);
+        Assert.Equal(@"C:\custom\local-dev", ctx.LocalDataDir);
+    }
+
     [Fact]
     public void WslPathPrefix_UsesConfiguredUser()
     {
diff --git a/tests/OpenClaw.SetupEngine.Tests/SetupLoggerTests.cs b/tests/OpenClaw.SetupEngine.Tests/SetupLoggerTests.cs
index 60b22b997..4f0f04b6b 100644
--- a/tests/OpenClaw.SetupEngine.Tests/SetupLoggerTests.cs
+++ b/tests/OpenClaw.SetupEngine.Tests/SetupLoggerTests.cs
@@ -69,6 +69,42 @@ public void Redaction_RedactsGenericMessagesAndStructuredData()
         Assert.Contains("safe-request-id", serialized);
     }
 
+    [Fact]
+    public void Redaction_RedactsPiiFromMessagesAndStructuredData()
+    {
+        var entries = new List<LogEntry>();
+        using var logger = new SetupLogger(filePath: null);
+        logger.LogEmitted += (_, e) => entries.Add(e);
+
+        logger.Info(
+            @"Failed for C:\Users\alice\AppData\Roaming\OpenClawTray\settings.json from alice@example.com at 10.1.2.3 via alice@host:22",
+            new
+            {
+                windowsPath = @"C:\Users\alice\AppData\Local\OpenClawTray\openclaw-tray.log",
+                forwardSlashPath = "C:/Users/alice/AppData/Local/OpenClawTray/openclaw-tray.log",
+                wslPath = "/mnt/c/Users/alice/AppData/Roaming/OpenClawTray/settings.json",
+                url = "https://gateway.example.com:19001/path/to/resource?token=secret",
+                email = "alice@example.com",
+                ip = "10.1.2.3",
+                ssh = "alice@host:22"
+            });
+
+        var serialized = System.Text.Json.JsonSerializer.Serialize(
+            entries[0],
+            new System.Text.Json.JsonSerializerOptions
+            {
+                Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping
+            });
+
+        Assert.DoesNotContain("alice", serialized, StringComparison.OrdinalIgnoreCase);
+        Assert.DoesNotContain("gateway.example.com", serialized, StringComparison.OrdinalIgnoreCase);
+        Assert.DoesNotContain("10.1.2.3", serialized, StringComparison.OrdinalIgnoreCase);
+        Assert.Contains("%USERPROFILE%", serialized);
+        Assert.Contains("<email>", serialized);
+        Assert.Contains("<ip>", serialized);
+        Assert.Contains("<user>@<host>", serialized);
+    }
+
     [Fact]
     public void StepCompleted_RedactsResultMessage()
     {
@@ -98,7 +134,7 @@ public void Redaction_RedactsHexTokens(int length)
         Assert.Single(entries);
         var serialized = System.Text.Json.JsonSerializer.Serialize(entries[0].Data);
         Assert.DoesNotContain(hexToken, serialized);
-        Assert.Contains("[REDACTED-HEX]", serialized);
+        Assert.Contains("[REDACTED", serialized);
     }
 
     [Fact]
@@ -134,6 +170,68 @@ public void WritesToFile_WhenPathProvided()
         Assert.Contains("hello", lines[0]);
     }
 
+    [Fact]
+    public void CommandCompleted_WritesReadableJsonWithoutUnicodeOrNewlineEscapes()
+    {
+        var path = Path.Combine(_tempDir, "readable.jsonl");
+        using (var logger = new SetupLogger(path))
+        {
+            logger.CommandCompleted(
+                "wsl.exe",
+                new CommandResult(
+                    0,
+                    """
+                    {
+                      "cli": {
+                        "version": "2026.5.28",
+                        "entrypoint": "/home/openclaw/.openclaw/tools/node-v22.22.0/lib/node_modules/openclaw/dist/entry.js"
+                      },
+                      "timestamp": "2026-06-03T18:42:49.9079864+00:00"
+                    }
+                    """,
+                    "",
+                    TimeSpan.FromSeconds(1),
+                    false),
+                TimeSpan.FromSeconds(1));
+        }
+
+        var line = File.ReadAllText(path);
+
+        Assert.DoesNotContain("\\u0022", line, StringComparison.Ordinal);
+        Assert.DoesNotContain("\\u002B", line, StringComparison.Ordinal);
+        Assert.DoesNotContain("\\r\\n", line, StringComparison.Ordinal);
+        Assert.Contains("+00:00", line, StringComparison.Ordinal);
+        Assert.Contains("\"stdout\":{\"cli\"", line, StringComparison.Ordinal);
+    }
+
+    [Fact]
+    public void CommandCompleted_WritesPiiRedactedJsonl()
+    {
+        var path = Path.Combine(_tempDir, "pii.jsonl");
+        using (var logger = new SetupLogger(path))
+        {
+            logger.CommandCompleted(
+                "wsl.exe",
+                new CommandResult(
+                    0,
+                    @"Using C:\Users\alice\AppData\Roaming\OpenClawTray and alice@example.com from 10.1.2.3",
+                    "/mnt/c/Users/alice/.openclaw failed against https://gateway.example.com:19001/full/path?token=secret",
+                    TimeSpan.FromSeconds(1),
+                    false),
+                TimeSpan.FromSeconds(1));
+        }
+
+        var line = File.ReadAllText(path);
+
+        Assert.DoesNotContain("alice", line, StringComparison.OrdinalIgnoreCase);
+        Assert.DoesNotContain("gateway.example.com", line, StringComparison.OrdinalIgnoreCase);
+        Assert.DoesNotContain("10.1.2.3", line, StringComparison.OrdinalIgnoreCase);
+        Assert.Contains("%USERPROFILE%", line);
+        Assert.Contains("<email>", line);
+        Assert.Contains("<ip>", line);
+        Assert.Contains("https://<host>:19001/full/…", line);
+    }
+
     [Fact]
     public void RunId_IsPopulated()
     {
diff --git a/tests/OpenClaw.SetupEngine.Tests/SetupPipelineTests.cs b/tests/OpenClaw.SetupEngine.Tests/SetupPipelineTests.cs
index d56e4afa9..9b51d4cca 100644
--- a/tests/OpenClaw.SetupEngine.Tests/SetupPipelineTests.cs
+++ b/tests/OpenClaw.SetupEngine.Tests/SetupPipelineTests.cs
@@ -60,16 +60,34 @@ public void BuildDefaultSteps_IncludesCurrentSetupFlow()
     {
         var steps = SetupStepFactory.BuildDefaultSteps();
 
-        Assert.Equal(18, steps.Count);
+        Assert.Equal(19, steps.Count);
         Assert.IsType<PreflightOsStep>(steps[0]);
         Assert.IsType<PreflightWslStep>(steps[1]);
         Assert.IsType<CleanupStaleDistroStep>(steps[2]);
         Assert.IsType<CleanupStaleGatewayStep>(steps[3]);
         Assert.Contains(steps, s => s is ValidateWslLockdownStep);
+        var lockdownIndex = steps.FindIndex(s => s is ValidateWslLockdownStep);
+        var cliInstallIndex = steps.FindIndex(s => s is InstallCliStep);
+        Assert.Equal(lockdownIndex + 1, cliInstallIndex);
         Assert.Contains(steps, s => s is RunGatewayWizardStep);
+        var pairNodeIndex = steps.FindIndex(s => s is PairNodeStep);
+        Assert.IsType<VerifyEndToEndStep>(steps[pairNodeIndex + 1]);
+        var wizardIndex = steps.FindIndex(s => s is RunGatewayWizardStep);
+        Assert.IsType<WindowsNodeBootstrapContextStep>(steps[wizardIndex + 1]);
         Assert.IsType<StartKeepaliveStep>(steps[^1]);
     }
 
+    [Fact]
+    public void BuildWizardOnlySteps_FinalizesWindowsNodeContextAfterWizard()
+    {
+        var steps = SetupStepFactory.BuildWizardOnlySteps();
+
+        Assert.Collection(
+            steps,
+            step => Assert.IsType<RunGatewayWizardStep>(step),
+            step => Assert.IsType<WindowsNodeBootstrapContextStep>(step));
+    }
+
     [Fact]
     public async Task RunAsync_StepFails_ReturnsFailed()
     {
@@ -207,6 +225,26 @@ public async Task RunAsync_StepFails_WithoutRollbackConfig_NoRollback()
         Assert.False(rollbackCalled);
     }
 
+    [Fact]
+    public async Task RunAsync_StepFails_WithRollbackOverrideDisabled_NoRollback()
+    {
+        var rollbackCalled = false;
+        var config = new SetupConfig { RollbackOnFailure = true };
+        var ctx = CreateContext(config);
+        var pipeline = new SetupPipeline([
+            new MockStep(
+                "refresh",
+                (_, _) => Task.FromResult(StepResult.Fail("refresh failed")),
+                (_, _) => { rollbackCalled = true; return Task.CompletedTask; }),
+        ], rollbackOnFailureOverride: false);
+
+        var result = await pipeline.RunAsync(ctx);
+
+        Assert.Equal(PipelineOutcome.Failed, result.Outcome);
+        Assert.False(rollbackCalled);
+        Assert.True(config.RollbackOnFailure);
+    }
+
     [Fact]
     public async Task RunAsync_SkippableStep_IsSkipped()
     {
diff --git a/tests/OpenClaw.SetupEngine.Tests/SetupStepsTests.cs b/tests/OpenClaw.SetupEngine.Tests/SetupStepsTests.cs
index 16c1fce25..0c5a55c7a 100644
--- a/tests/OpenClaw.SetupEngine.Tests/SetupStepsTests.cs
+++ b/tests/OpenClaw.SetupEngine.Tests/SetupStepsTests.cs
@@ -2,6 +2,7 @@
 using System.Net;
 using System.Net.Sockets;
 using System.Runtime.InteropServices;
+using System.Text.Json;
 
 namespace OpenClaw.SetupEngine.Tests;
 
@@ -45,6 +46,39 @@ private SetupContext CreateContext(SetupConfig? config = null, ICommandRunner? c
         return new SetupContext(cfg, logger, journal, commands ?? new CommandRunner(logger), CancellationToken.None);
     }
 
+    [Fact]
+    public void WriteSettingsJson_AppliesConfiguredCapabilitiesBeforePersisting()
+    {
+        var config = new SetupConfig
+        {
+            Capabilities = new CapabilitiesConfig
+            {
+                System = false,
+                Canvas = true,
+                Screen = true,
+                Camera = false,
+                Location = false,
+                Browser = false,
+                Device = true,
+                Tts = true,
+                Stt = false,
+            },
+        };
+        var ctx = CreateContext(config);
+
+        VerifyEndToEndStep.WriteSettingsJson(ctx);
+
+        using var result = JsonDocument.Parse(File.ReadAllText(Path.Combine(_tempDir, "settings.json")));
+        Assert.False(result.RootElement.GetProperty("NodeSystemRunEnabled").GetBoolean());
+        Assert.True(result.RootElement.GetProperty("NodeCanvasEnabled").GetBoolean());
+        Assert.True(result.RootElement.GetProperty("NodeScreenEnabled").GetBoolean());
+        Assert.False(result.RootElement.GetProperty("NodeCameraEnabled").GetBoolean());
+        Assert.False(result.RootElement.GetProperty("NodeLocationEnabled").GetBoolean());
+        Assert.False(result.RootElement.GetProperty("NodeBrowserProxyEnabled").GetBoolean());
+        Assert.True(result.RootElement.GetProperty("NodeTtsEnabled").GetBoolean());
+        Assert.False(result.RootElement.GetProperty("NodeSttEnabled").GetBoolean());
+    }
+
     // ─── CleanupStaleGatewayStep: Preserve non-local records ───
 
     [Fact]
@@ -429,9 +463,6 @@ public async Task CreateWslInstance_PartialCleanupSkipsInstallPathDeleteWhenDist
                 return Fail("terminate unavailable");
             if (args.SequenceEqual(["--unregister", "OpenClawGateway"]))
                 return Fail("unregister unavailable");
-            if (args.SequenceEqual(["--shutdown"]))
-                return Ok();
-
             return Fail($"unexpected args: {string.Join(' ', args)}");
         });
         var ctx = CreateContext(commands: commands);
@@ -444,6 +475,7 @@ public async Task CreateWslInstance_PartialCleanupSkipsInstallPathDeleteWhenDist
         Assert.Contains("could not confirm whether distro 'OpenClawGateway' is still registered", result.Message);
         Assert.Contains("skipped deleting app-owned install path", result.Message);
         Assert.True(File.Exists(Path.Combine(installPath, "ext4.vhdx")));
+        Assert.DoesNotContain(commands.Calls, c => c.Arguments.SequenceEqual(["--shutdown"]));
     }
 
     [Fact]
@@ -708,13 +740,36 @@ public void WslInstallSupport_TryGetEnvironmentIssue_DetectsUnsupportedMachineCo
             + "Enable \"Virtual Machine Platform\" by running: wsl.exe --install --no-distribution\r\n\r\n"
             + "For information please visit https://aka.ms/enablevirtualization\r\n");
 
-        Assert.True(WslInstallSupport.TryGetEnvironmentIssue(status, out var message));
+        Assert.True(WslInstallSupport.TryGetEnvironmentIssue(status, Architecture.X64, out var message));
         Assert.Contains("Virtual Machine Platform", message, StringComparison.OrdinalIgnoreCase);
         Assert.Contains("virtualization", message, StringComparison.OrdinalIgnoreCase);
         Assert.Contains("wsl --install --no-distribution", message);
+        Assert.Contains("VT-x", message, StringComparison.OrdinalIgnoreCase);
+        Assert.Contains("BIOS/UEFI", message, StringComparison.OrdinalIgnoreCase);
         Assert.Contains("reboot", message, StringComparison.OrdinalIgnoreCase);
     }
 
+    [Fact]
+    public void WslInstallSupport_TryGetEnvironmentIssue_UsesArm64WordingForUnsupportedMachineConfiguration()
+    {
+        var status = NulSeparated("Default Version: 2\r\n\r\n"
+            + "WSL2 is not supported with your current machine configuration.\r\n\r\n"
+            + "Please enable the \"Virtual Machine Platform\" optional component and ensure virtualization is enabled in the BIOS.\r\n\r\n"
+            + "Enable \"Virtual Machine Platform\" by running: wsl.exe --install --no-distribution\r\n\r\n"
+            + "For information please visit https://aka.ms/enablevirtualization\r\n");
+
+        Assert.True(WslInstallSupport.TryGetEnvironmentIssue(status, Architecture.Arm64, out var message));
+        Assert.Contains("Virtual Machine Platform", message, StringComparison.OrdinalIgnoreCase);
+        Assert.Contains("ARM64", message, StringComparison.OrdinalIgnoreCase);
+        Assert.Contains("Surface", message, StringComparison.OrdinalIgnoreCase);
+        Assert.Contains("device-management policy", message, StringComparison.OrdinalIgnoreCase);
+        Assert.Contains("wsl --install --no-distribution", message);
+        Assert.DoesNotContain("BIOS", message, StringComparison.OrdinalIgnoreCase);
+        Assert.DoesNotContain("VT-x", message, StringComparison.OrdinalIgnoreCase);
+        Assert.DoesNotContain("AMD-V", message, StringComparison.OrdinalIgnoreCase);
+        Assert.DoesNotContain("SVM", message, StringComparison.OrdinalIgnoreCase);
+    }
+
     [Fact]
     public void WslInstallSupport_TryGetEnvironmentIssue_ReturnsFalseForHealthyStatus()
     {
@@ -1277,6 +1332,12 @@ public void IsKeepaliveCommandLine_RequiresDistroAndSleepInfinity()
         Assert.False(StartKeepaliveStep.IsKeepaliveCommandLine(
             @"C:\Windows\System32\wsl.exe -d OtherGateway -- sleep infinity",
             "OpenClawGateway"));
+        Assert.False(StartKeepaliveStep.IsKeepaliveCommandLine(
+            @"C:\Windows\System32\wsl.exe -d OpenClawGateway-Dev -- sleep infinity",
+            "OpenClawGateway"));
+        Assert.True(StartKeepaliveStep.IsKeepaliveCommandLine(
+            "wsl.exe --distribution \"OpenClawGateway-Dev\" -- sleep infinity",
+            "OpenClawGateway-Dev"));
     }
 
     [Fact]
@@ -1460,6 +1521,609 @@ public async Task PairOperatorStep_FailsWhenGatewayNotReachableFromWindows()
         Assert.Contains("not reachable", result.Message, StringComparison.OrdinalIgnoreCase);
     }
 
+    [Fact]
+    public void WindowsNodeContext_CanSkipWhenDisabled()
+    {
+        var ctx = CreateContext(new SetupConfig
+        {
+            WindowsNodeContext = new WindowsNodeContextConfig { Enabled = false }
+        });
+
+        Assert.True(new WindowsNodeBootstrapContextStep().CanSkip(ctx));
+    }
+
+    [Fact]
+    public void WindowsNodeContext_BuildApplyScript_UsesAbsolutePathAndMinimalShape()
+    {
+        var script = WindowsNodeBootstrapContextStep.BuildApplyScript("/home/openclaw/.openclaw/workspace");
+
+        Assert.Contains("set -o pipefail", script);
+        Assert.Contains("workspace='/home/openclaw/.openclaw/workspace'", script);
+        Assert.Contains("AGENTS_SYMLINK:$agents", script);
+        Assert.Contains("mkdir -p \"$workspace\"", script);
+        Assert.Contains(": > \"$agents\"", script);
+        Assert.Contains("WINDOWS_NODE_CONTEXT_BOOTSTRAP_FALLBACK", script);
+        Assert.Contains("awk -v BEGIN_M=\"$begin_marker\" -v END_M=\"$end_marker\"", script);
+        Assert.Contains("printf '%s' \"$block_b64\" | base64 -d >> \"$tmp\"", script);
+        Assert.Contains("mktemp \"$workspace/.AGENTS.md.openclaw.XXXXXX\"", script);
+        Assert.Contains("chmod --reference=\"$agents\" \"$tmp\"", script);
+        Assert.Contains("sub(/\\r$/, \"\", marker_line)", script);
+        Assert.Contains("WINDOWS_NODE_CONTEXT_MARKERS_MALFORMED", script);
+        Assert.Contains("WINDOWS_NODE_CONTEXT_READY", script);
+        // Must not depend on node or carry an embedded JS payload.
+        Assert.DoesNotContain(" node ", script);
+        Assert.DoesNotContain(" node -", script);
+        Assert.DoesNotContain("apply_js_b64", script);
+        Assert.DoesNotContain("openclaw setup", script);
+        Assert.DoesNotContain("openclaw config get", script);
+        Assert.DoesNotContain("AGENTS_MISSING_AFTER_SETUP", script);
+        Assert.DoesNotContain("$HOME", script);
+        Assert.DoesNotContain("case \"$candidate\"", script);
+        Assert.DoesNotContain("<<'NODE'", script);
+        Assert.DoesNotContain("OPENCLAW_GATEWAY_TOKEN", script);
+    }
+
+    [Fact]
+    public void WindowsNodeContext_BuildRollbackScript_UsesAbsolutePathAndMinimalShape()
+    {
+        var script = WindowsNodeBootstrapContextStep.BuildRollbackScript("/home/openclaw/.openclaw/workspace");
+
+        Assert.Contains("set -o pipefail", script);
+        Assert.Contains("workspace='/home/openclaw/.openclaw/workspace'", script);
+        Assert.Contains("awk -v BEGIN_M=\"$begin_marker\" -v END_M=\"$end_marker\"", script);
+        Assert.Contains("mktemp \"$workspace/.AGENTS.md.openclaw.XXXXXX\"", script);
+        Assert.Contains("chmod --reference=\"$agents\" \"$tmp\"", script);
+        Assert.Contains("sub(/\\r$/, \"\", marker_line)", script);
+        Assert.Contains("WINDOWS_NODE_CONTEXT_ABSENT", script);
+        Assert.Contains("WINDOWS_NODE_CONTEXT_REMOVED", script);
+        Assert.Contains("AGENTS_SYMLINK_ROLLBACK_SKIPPED:$agents", script);
+        Assert.Contains("exit 5", script);
+        // Must not depend on node or carry an embedded JS payload.
+        Assert.DoesNotContain(" node ", script);
+        Assert.DoesNotContain(" node -", script);
+        Assert.DoesNotContain("rollback_js_b64", script);
+        Assert.DoesNotContain("openclaw setup", script);
+        Assert.DoesNotContain("openclaw config get", script);
+        Assert.DoesNotContain("rm -f \"$agents\"", script);
+        Assert.DoesNotContain("$HOME", script);
+        Assert.DoesNotContain("case \"$candidate\"", script);
+        Assert.DoesNotContain("<<'NODE'", script);
+    }
+
+    [Theory]
+    [InlineData("/home/openclaw/.openclaw/workspace", "/home/openclaw", "/home/openclaw/.openclaw/workspace")]
+    [InlineData("~", "/home/openclaw", "/home/openclaw")]
+    [InlineData("~/.openclaw/custom workspace", "/home/openclaw", "/home/openclaw/.openclaw/custom workspace")]
+    [InlineData("relative/path", "/home/openclaw", "/home/openclaw/relative/path")]
+    [InlineData("", "/home/openclaw", "/home/openclaw/.openclaw/workspace")]
+    [InlineData("null", "/home/openclaw", "/home/openclaw/.openclaw/workspace")]
+    [InlineData("undefined", "/home/openclaw", "/home/openclaw/.openclaw/workspace")]
+    [InlineData("/abs/path", "/home/openclaw/", "/abs/path")]
+    [InlineData("~/x", "/home/openclaw/", "/home/openclaw/x")]
+    public void WindowsNodeContext_ExpandLinuxPath_ResolvesCorrectly(string input, string home, string expected)
+    {
+        Assert.Equal(expected, WindowsNodeBootstrapContextStep.ExpandLinuxPath(input, home));
+    }
+
+    [Theory]
+    [InlineData("\"/home/openclaw/.openclaw/workspace\"\n", "/home/openclaw/.openclaw/workspace")]
+    [InlineData("Config warnings:\n- plugins.entries.device-pair\n\"/home/openclaw/.openclaw/workspace\"\n", "/home/openclaw/.openclaw/workspace")]
+    [InlineData("\"~/.openclaw/workspace\"\n", "~/.openclaw/workspace")]
+    [InlineData("/home/openclaw/.openclaw/workspace\n", "/home/openclaw/.openclaw/workspace")]
+    [InlineData("null\n", null)]
+    [InlineData("", null)]
+    public void WindowsNodeContext_ExtractWorkspaceFromConfigOutput_ParsesValues(string stdout, string? expected)
+    {
+        Assert.Equal(expected, WindowsNodeBootstrapContextStep.ExtractWorkspaceFromConfigOutput(stdout));
+    }
+
+    [Theory]
+    [InlineData("[{\"id\":\"main\",\"workspace\":\"/home/openclaw/main\",\"isDefault\":true}]", "/home/openclaw/main")]
+    [InlineData("Warning\n[\n  {\"id\":\"other\",\"workspace\":\"/home/openclaw/other\",\"isDefault\":false},\n  {\"id\":\"primary\",\"workspace\":\"/home/openclaw/primary\",\"isDefault\":true}\n]\n", "/home/openclaw/primary")]
+    [InlineData("[{\"id\":\"main\",\"workspace\":\"~/main\"}]", "~/main")]
+    [InlineData("not json", null)]
+    public void WindowsNodeContext_ExtractDefaultAgentWorkspace_ParsesCanonicalAgentsList(string stdout, string? expected)
+    {
+        Assert.Equal(expected, WindowsNodeBootstrapContextStep.ExtractDefaultAgentWorkspaceFromAgentsOutput(stdout));
+    }
+
+    [Fact]
+    public async Task WindowsNodeContext_Execute_RunsInWslAsConfiguredUserAndResolvesWorkspace()
+    {
+        var commands = new FakeCommandRunner(
+            _ => Fail("unexpected RunAsync"),
+            (_, command, _) =>
+            {
+                if (command.Contains("getent passwd"))
+                    return Ok("/home/openclaw\n");
+                if (command.Contains("openclaw agents list --json"))
+                    return Ok(AgentsListJson("/home/openclaw/.openclaw/workspace"));
+                if (command.Contains("openclaw setup"))
+                    return Ok("");
+                if (command.Contains("openclaw config get agents.defaults.workspace"))
+                    return Ok("\"~/.openclaw/workspace\"\n");
+                if (command.Contains("WINDOWS_NODE_CONTEXT_READY"))
+                    return Ok(string.Join("\n",
+                        "WINDOWS_NODE_CONTEXT_BOOTSTRAP_FALLBACK:/home/openclaw/.openclaw/workspace/AGENTS.md",
+                        "WINDOWS_NODE_CONTEXT_WORKSPACE:/home/openclaw/.openclaw/workspace",
+                        "WINDOWS_NODE_CONTEXT_READY",
+                        ""));
+                return Fail($"unexpected wsl command: {command}");
+            });
+        var ctx = CreateContext(commands: commands);
+
+        var result = await new WindowsNodeBootstrapContextStep().ExecuteAsync(ctx, CancellationToken.None);
+
+        Assert.True(result.IsSuccess, result.Message);
+        Assert.Equal(5, commands.WslCalls.Count);
+        Assert.All(commands.WslCalls, c =>
+        {
+            Assert.Equal("OpenClawGateway", c.DistroName);
+            Assert.Equal("openclaw", c.User);
+        });
+        Assert.Contains("getent passwd", commands.WslCalls[0].Command);
+        Assert.Contains("openclaw agents list --json", commands.WslCalls[1].Command);
+        Assert.Contains("openclaw config get agents.defaults.workspace", commands.WslCalls[2].Command);
+        Assert.Contains("openclaw setup --help", commands.WslCalls[3].Command);
+        Assert.Contains("openclaw setup --baseline --workspace '/home/openclaw/.openclaw/workspace'", commands.WslCalls[3].Command);
+        Assert.Contains("openclaw setup --workspace '/home/openclaw/.openclaw/workspace'", commands.WslCalls[3].Command);
+        Assert.Contains("workspace='/home/openclaw/.openclaw/workspace'", commands.WslCalls[4].Command);
+        // getent uses $(id -un) command-substitution and no $vars, so argv path is safe.
+        Assert.False(commands.WslCalls[0].InputViaStdin);
+        // agents list + config get + openclaw setup scripts reference $PATH via WslPathPrefix,
+        // which wsl.exe would rewrite on the argv path — see docs/WSL_EXE_ARGV_PITFALL.md.
+        Assert.True(commands.WslCalls[1].InputViaStdin);
+        Assert.True(commands.WslCalls[2].InputViaStdin);
+        Assert.True(commands.WslCalls[3].InputViaStdin);
+        // Apply script uses $workspace etc., must use stdin.
+        Assert.True(commands.WslCalls[4].InputViaStdin);
+        var state = await WindowsNodeBootstrapContextStep.ReadInstallStateAsync(ctx, CancellationToken.None);
+        Assert.Contains(state.Targets, target =>
+            target.DistroName == "OpenClawGateway" &&
+            target.User == "openclaw" &&
+            target.WorkspacePath == "/home/openclaw/.openclaw/workspace");
+    }
+
+    [Fact]
+    public async Task WindowsNodeContext_Execute_ResolvesRelativeConfiguredWorkspaceFromGatewayUserHome()
+    {
+        var commands = new FakeCommandRunner(
+            _ => Fail("unexpected RunAsync"),
+            (_, command, _) =>
+            {
+                if (command.Contains("getent passwd"))
+                    return Ok("/home/openclaw\n");
+                if (command.Contains("openclaw agents list --json"))
+                    return Ok(AgentsListJson("/home/openclaw/relative/workspace"));
+                if (command.Contains("openclaw setup"))
+                    return Ok("");
+                if (command.Contains("openclaw config get agents.defaults.workspace"))
+                    return Ok("\"relative/workspace\"\n");
+                if (command.Contains("workspace='/home/openclaw/relative/workspace'"))
+                    return Ok("WINDOWS_NODE_CONTEXT_READY\n");
+                return Fail($"unexpected wsl command: {command}");
+            });
+        var ctx = CreateContext(commands: commands);
+
+        var result = await new WindowsNodeBootstrapContextStep().ExecuteAsync(ctx, CancellationToken.None);
+
+        Assert.True(result.IsSuccess, result.Message);
+        Assert.Contains(commands.WslCalls,
+            c => c.Command.Contains("openclaw setup --workspace '/home/openclaw/relative/workspace'"));
+        Assert.Contains(commands.WslCalls,
+            c => c.Command.Contains("workspace='/home/openclaw/relative/workspace'"));
+        Assert.DoesNotContain(commands.WslCalls, c => c.Command == "pwd -P");
+    }
+
+    [Fact]
+    public async Task WindowsNodeContext_Execute_UsesDefaultOnlyWhenWorkspaceKeyIsAbsent()
+    {
+        var commands = new FakeCommandRunner(
+            _ => Fail("unexpected RunAsync"),
+            (_, command, _) =>
+            {
+                if (command.Contains("getent passwd"))
+                    return Ok("/home/openclaw\n");
+                if (command.Contains("openclaw agents list --json"))
+                    return Ok(AgentsListJson("/home/openclaw/.openclaw/workspace"));
+                if (command.Contains("openclaw config get agents.defaults.workspace"))
+                    return new CommandResult(
+                        1,
+                        "",
+                        "Config path not found: agents.defaults.workspace. Run openclaw config validate to inspect config shape.",
+                        TimeSpan.Zero,
+                        TimedOut: false);
+                if (command.Contains("openclaw setup --workspace '/home/openclaw/.openclaw/workspace'"))
+                    return Ok();
+                if (command.Contains("workspace='/home/openclaw/.openclaw/workspace'"))
+                    return Ok("WINDOWS_NODE_CONTEXT_READY\n");
+                return Fail($"unexpected wsl command: {command}");
+            });
+        var ctx = CreateContext(commands: commands);
+
+        var result = await new WindowsNodeBootstrapContextStep().ExecuteAsync(ctx, CancellationToken.None);
+
+        Assert.True(result.IsSuccess, result.Message);
+        Assert.Contains(commands.WslCalls,
+            c => c.Command.Contains("openclaw setup --workspace '/home/openclaw/.openclaw/workspace'"));
+    }
+
+    [Fact]
+    public async Task WindowsNodeContext_Execute_DoesNotPersistDefaultWhenWorkspaceLookupFails()
+    {
+        var commands = new FakeCommandRunner(
+            _ => Fail("unexpected RunAsync"),
+            (_, command, _) =>
+            {
+                if (command.Contains("getent passwd"))
+                    return Ok("/home/openclaw\n");
+                if (command.Contains("openclaw agents list --json"))
+                    return Ok(AgentsListJson("/home/openclaw/.openclaw/workspace"));
+                if (command.Contains("openclaw config get agents.defaults.workspace"))
+                    return Fail("gateway config is temporarily unavailable");
+                return Fail($"unexpected wsl command: {command}");
+            });
+        var ctx = CreateContext(commands: commands);
+
+        var result = await new WindowsNodeBootstrapContextStep().ExecuteAsync(ctx, CancellationToken.None);
+
+        Assert.Equal(StepOutcome.Failed, result.Outcome);
+        Assert.Contains("Could not resolve OpenClaw default workspace path", result.Message);
+        Assert.DoesNotContain(commands.WslCalls, c => c.Command.Contains("openclaw setup"));
+    }
+
+    [Fact]
+    public async Task WindowsNodeContext_Execute_DoesNotPersistDefaultForMalformedWorkspaceOutput()
+    {
+        var commands = new FakeCommandRunner(
+            _ => Fail("unexpected RunAsync"),
+            (_, command, _) =>
+            {
+                if (command.Contains("getent passwd"))
+                    return Ok("/home/openclaw\n");
+                if (command.Contains("openclaw agents list --json"))
+                    return Ok(AgentsListJson("/home/openclaw/.openclaw/workspace"));
+                if (command.Contains("openclaw config get agents.defaults.workspace"))
+                    return Ok("Config warning without a value\n");
+                return Fail($"unexpected wsl command: {command}");
+            });
+        var ctx = CreateContext(commands: commands);
+
+        var result = await new WindowsNodeBootstrapContextStep().ExecuteAsync(ctx, CancellationToken.None);
+
+        Assert.Equal(StepOutcome.Failed, result.Outcome);
+        Assert.DoesNotContain(commands.WslCalls, c => c.Command.Contains("openclaw setup"));
+    }
+
+    [Fact]
+    public async Task WindowsNodeContext_Execute_UsesEffectiveDefaultAgentWorkspaceWithoutRewritingDefaults()
+    {
+        var commands = new FakeCommandRunner(
+            _ => Fail("unexpected RunAsync"),
+            (_, command, _) =>
+            {
+                if (command.Contains("getent passwd"))
+                    return Ok("/home/openclaw\n");
+                if (command.Contains("openclaw agents list --json"))
+                    return Ok(AgentsListJson("/home/openclaw/main-agent"));
+                if (command.Contains("openclaw config get agents.defaults.workspace"))
+                    return Ok("\"~/.openclaw/workspace\"\n");
+                if (command.Contains("workspace='/home/openclaw/main-agent'"))
+                    return Ok("WINDOWS_NODE_CONTEXT_READY\n");
+                return Fail($"unexpected wsl command: {command}");
+            });
+        var ctx = CreateContext(commands: commands);
+
+        var result = await new WindowsNodeBootstrapContextStep().ExecuteAsync(ctx, CancellationToken.None);
+
+        Assert.True(result.IsSuccess, result.Message);
+        Assert.DoesNotContain(commands.WslCalls, c => c.Command.Contains("openclaw setup"));
+        Assert.Contains(commands.WslCalls, c => c.Command.Contains("workspace='/home/openclaw/main-agent'"));
+    }
+
+    [Fact]
+    public async Task WindowsNodeContext_Execute_FailsWhenEffectiveAgentWorkspaceLookupFails()
+    {
+        var commands = new FakeCommandRunner(
+            _ => Fail("unexpected RunAsync"),
+            (_, command, _) =>
+            {
+                if (command.Contains("getent passwd"))
+                    return Ok("/home/openclaw\n");
+                if (command.Contains("openclaw agents list --json"))
+                    return Fail("agents unavailable");
+                return Fail($"unexpected wsl command: {command}");
+            });
+        var ctx = CreateContext(commands: commands);
+        var priorTarget = new WindowsNodeContextTarget("prior-distro", "openclaw", "/prior/workspace");
+        await WindowsNodeBootstrapContextStep.RecordAppliedTargetAsync(
+            ctx,
+            priorTarget,
+            CancellationToken.None);
+
+        var step = new WindowsNodeBootstrapContextStep();
+        var result = await step.ExecuteAsync(ctx, CancellationToken.None);
+        var callsAfterExecute = commands.WslCalls.Count;
+        await step.RollbackAsync(ctx, CancellationToken.None);
+
+        Assert.Equal(StepOutcome.Failed, result.Outcome);
+        Assert.Contains("Could not resolve OpenClaw agent workspace path", result.Message);
+        Assert.DoesNotContain(commands.WslCalls, c => c.Command.Contains("openclaw config get"));
+        Assert.DoesNotContain(commands.WslCalls, c => c.Command.Contains("openclaw setup"));
+        Assert.Equal(callsAfterExecute, commands.WslCalls.Count);
+        var state = await WindowsNodeBootstrapContextStep.ReadInstallStateAsync(ctx, CancellationToken.None);
+        Assert.Equal([priorTarget], state.Targets);
+    }
+
+    [Fact]
+    public async Task WindowsNodeContext_Execute_RemovesNewStateWhenSymlinkCheckMakesNoChange()
+    {
+        var commands = new FakeCommandRunner(
+            _ => Fail("unexpected RunAsync"),
+            (_, command, _) =>
+            {
+                if (command.Contains("getent passwd"))
+                    return Ok("/home/openclaw\n");
+                if (command.Contains("openclaw agents list --json"))
+                    return Ok(AgentsListJson("/home/openclaw/.openclaw/workspace"));
+                if (command.Contains("openclaw config get agents.defaults.workspace"))
+                    return Ok("\"~/.openclaw/workspace\"\n");
+                if (command.Contains("openclaw setup"))
+                    return Ok();
+                if (command.Contains("AGENTS_SYMLINK:$agents"))
+                    return new CommandResult(2, "", "AGENTS_SYMLINK", TimeSpan.Zero, TimedOut: false);
+                return Fail($"unexpected wsl command: {command}");
+            });
+        var ctx = CreateContext(commands: commands);
+
+        var step = new WindowsNodeBootstrapContextStep();
+        var result = await step.ExecuteAsync(ctx, CancellationToken.None);
+        var callsAfterExecute = commands.WslCalls.Count;
+        await step.RollbackAsync(ctx, CancellationToken.None);
+
+        Assert.Equal(StepOutcome.Failed, result.Outcome);
+        Assert.False(File.Exists(WindowsNodeBootstrapContextStep.InstallStatePath(ctx)));
+        Assert.Equal(callsAfterExecute, commands.WslCalls.Count);
+    }
+
+    [Fact]
+    public async Task WindowsNodeContext_Execute_UsesExplicitWorkspaceOverride()
+    {
+        var commands = new FakeCommandRunner(
+            _ => Fail("unexpected RunAsync"),
+            (_, command, _) =>
+            {
+                if (command.Contains("getent passwd"))
+                    return Ok("/home/openclaw\n");
+                if (command.Contains("openclaw setup --workspace"))
+                    return Ok("");
+                if (command.Contains("workspace='/custom/abs/path'"))
+                    return Ok("WINDOWS_NODE_CONTEXT_READY\n");
+                return Fail($"unexpected wsl command: {command}");
+            });
+        var ctx = CreateContext(new SetupConfig
+        {
+            WindowsNodeContext = new WindowsNodeContextConfig { WorkspacePath = "/custom/abs/path" }
+        }, commands);
+
+        var result = await new WindowsNodeBootstrapContextStep().ExecuteAsync(ctx, CancellationToken.None);
+
+        Assert.True(result.IsSuccess, result.Message);
+        // No config-get call when override is set.
+        Assert.DoesNotContain(commands.WslCalls, c => c.Command.Contains("openclaw config get"));
+        // Absolute path threads through to BOTH the setup command and the apply script
+        // (verified by the apply script asserting workspace='/custom/abs/path').
+        Assert.Contains(commands.WslCalls, c => c.Command.Contains("openclaw setup --workspace '/custom/abs/path'"));
+    }
+
+    [Fact]
+    public async Task WindowsNodeContext_Execute_OverrideWithTilde_ExpandsBeforePassingToSetup()
+    {
+        // Regression: a ~/foo override must be expanded once so that the same
+        // absolute path goes to `openclaw setup --workspace` and the apply script.
+        var commands = new FakeCommandRunner(
+            _ => Fail("unexpected RunAsync"),
+            (_, command, _) =>
+            {
+                if (command.Contains("getent passwd"))
+                    return Ok("/home/openclaw\n");
+                if (command.Contains("openclaw setup --workspace"))
+                    return Ok("");
+                if (command.Contains("workspace='/home/openclaw/custom-ws'"))
+                    return Ok("WINDOWS_NODE_CONTEXT_READY\n");
+                return Fail($"unexpected wsl command: {command}");
+            });
+        var ctx = CreateContext(new SetupConfig
+        {
+            WindowsNodeContext = new WindowsNodeContextConfig { WorkspacePath = "~/custom-ws" }
+        }, commands);
+
+        var result = await new WindowsNodeBootstrapContextStep().ExecuteAsync(ctx, CancellationToken.None);
+
+        Assert.True(result.IsSuccess, result.Message);
+        Assert.Contains(commands.WslCalls,
+            c => c.Command.Contains("openclaw setup --workspace '/home/openclaw/custom-ws'"));
+        Assert.DoesNotContain(commands.WslCalls,
+            c => c.Command.Contains("--workspace '~/custom-ws'"));
+    }
+
+    [Fact]
+    public async Task WindowsNodeContext_Rollback_RunsRollbackScriptViaStdin()
+    {
+        var commands = new FakeCommandRunner(
+            _ => Fail("unexpected RunAsync"),
+            (_, command, _) =>
+            {
+                if (command.Contains("getent passwd"))
+                    return Ok("/home/openclaw\n");
+                if (command.Contains("openclaw agents list --json"))
+                    return Ok(AgentsListJson("/home/openclaw/.openclaw/workspace"));
+                if (command.Contains("WINDOWS_NODE_CONTEXT_REMOVED"))
+                    return Ok("WINDOWS_NODE_CONTEXT_REMOVED\n");
+                return Fail($"unexpected wsl command: {command}");
+            });
+        var ctx = CreateContext(commands: commands);
+        await WindowsNodeBootstrapContextStep.RecordAppliedTargetAsync(
+            ctx,
+            new WindowsNodeContextTarget("recorded-distro", "recorded-user", "/recorded/workspace"),
+            CancellationToken.None);
+
+        await new WindowsNodeBootstrapContextStep().RollbackAsync(ctx, CancellationToken.None);
+
+        Assert.NotEmpty(commands.WslCalls);
+        // Last call is the rollback script and must use stdin.
+        Assert.Contains("WINDOWS_NODE_CONTEXT_REMOVED", commands.WslCalls[^1].Command);
+        Assert.True(commands.WslCalls[^1].InputViaStdin);
+        var rollback = Assert.Single(commands.WslCalls);
+        Assert.Equal("recorded-distro", rollback.DistroName);
+        Assert.Equal("recorded-user", rollback.User);
+        Assert.Contains("workspace='/recorded/workspace'", rollback.Command);
+        Assert.False(File.Exists(WindowsNodeBootstrapContextStep.InstallStatePath(ctx)));
+    }
+
+    [Fact]
+    public async Task WindowsNodeContext_Rollback_PropagatesCleanupFailureAndKeepsStateForRetry()
+    {
+        var commands = new FakeCommandRunner(
+            _ => Fail("unexpected RunAsync"),
+            (_, command, _) => command.Contains("WINDOWS_NODE_CONTEXT_REMOVED")
+                ? Fail("cannot update AGENTS.md")
+                : Fail($"unexpected wsl command: {command}"));
+        var ctx = CreateContext(commands: commands);
+        await WindowsNodeBootstrapContextStep.RecordAppliedTargetAsync(
+            ctx,
+            new WindowsNodeContextTarget("recorded-distro", "recorded-user", "/recorded/workspace"),
+            CancellationToken.None);
+
+        var error = await Assert.ThrowsAsync<InvalidOperationException>(() =>
+            new WindowsNodeBootstrapContextStep().RollbackAsync(ctx, CancellationToken.None));
+
+        Assert.Contains("cannot update AGENTS.md", error.Message);
+        Assert.True(File.Exists(WindowsNodeBootstrapContextStep.InstallStatePath(ctx)));
+    }
+
+    [Fact]
+    public async Task WindowsNodeContext_Rollback_RemovesExistingTargetStateAfterCleanup()
+    {
+        var commands = new FakeCommandRunner(
+            _ => Fail("unexpected RunAsync"),
+            (_, command, _) =>
+            {
+                if (command.Contains("getent passwd"))
+                    return Ok("/home/openclaw\n");
+                if (command.Contains("openclaw agents list --json"))
+                    return Ok(AgentsListJson("/home/openclaw/.openclaw/workspace"));
+                if (command.Contains("openclaw config get agents.defaults.workspace"))
+                    return Ok("\"~/.openclaw/workspace\"\n");
+                if (command.Contains("openclaw setup"))
+                    return Ok();
+                if (command.Contains("WINDOWS_NODE_CONTEXT_READY"))
+                    return Ok("WINDOWS_NODE_CONTEXT_READY\n");
+                if (command.Contains("WINDOWS_NODE_CONTEXT_REMOVED"))
+                    return Ok("WINDOWS_NODE_CONTEXT_REMOVED\n");
+                return Fail($"unexpected wsl command: {command}");
+            });
+        var ctx = CreateContext(commands: commands);
+        var target = new WindowsNodeContextTarget(
+            "OpenClawGateway",
+            "openclaw",
+            "/home/openclaw/.openclaw/workspace");
+        await WindowsNodeBootstrapContextStep.RecordAppliedTargetAsync(ctx, target, CancellationToken.None);
+        var step = new WindowsNodeBootstrapContextStep();
+        Assert.True((await step.ExecuteAsync(ctx, CancellationToken.None)).IsSuccess);
+
+        await step.RollbackAsync(ctx, CancellationToken.None);
+
+        Assert.False(File.Exists(WindowsNodeBootstrapContextStep.InstallStatePath(ctx)));
+    }
+
+    [Fact]
+    public async Task WindowsNodeContext_Rollback_TreatsMissingRecordedDistroAsCleaned()
+    {
+        var commands = new FakeCommandRunner(
+            _ => Fail("unexpected RunAsync"),
+            (_, command, _) => command.Contains("WINDOWS_NODE_CONTEXT_REMOVED")
+                ? new CommandResult(1, "", "WSL_E_DISTRO_NOT_FOUND", TimeSpan.Zero, TimedOut: false)
+                : Fail($"unexpected wsl command: {command}"));
+        var ctx = CreateContext(commands: commands);
+        await WindowsNodeBootstrapContextStep.RecordAppliedTargetAsync(
+            ctx,
+            new WindowsNodeContextTarget("missing-distro", "openclaw", "/recorded/workspace"),
+            CancellationToken.None);
+
+        await new WindowsNodeBootstrapContextStep().RollbackAsync(ctx, CancellationToken.None);
+
+        Assert.False(File.Exists(WindowsNodeBootstrapContextStep.InstallStatePath(ctx)));
+    }
+
+    [Fact]
+    public async Task WindowsNodeContext_Rollback_CleansLegacyEffectiveWorkspaceWithoutStateFile()
+    {
+        var commands = new FakeCommandRunner(
+            _ => Fail("unexpected RunAsync"),
+            (_, command, _) =>
+            {
+                if (command.Contains("getent passwd"))
+                    return Ok("/home/openclaw\n");
+                if (command.Contains("openclaw agents list --json"))
+                    return Ok(AgentsListJson("/home/openclaw/legacy-main"));
+                if (command.Contains("WINDOWS_NODE_CONTEXT_REMOVED"))
+                    return Ok("WINDOWS_NODE_CONTEXT_REMOVED\n");
+                return Fail($"unexpected wsl command: {command}");
+            });
+        var ctx = CreateContext(commands: commands);
+
+        await new WindowsNodeBootstrapContextStep().RollbackAsync(ctx, CancellationToken.None);
+
+        Assert.Contains(commands.WslCalls, call => call.Command.Contains("getent passwd"));
+        Assert.Contains(commands.WslCalls, call => call.Command.Contains("openclaw agents list --json"));
+        Assert.Contains(commands.WslCalls, call => call.Command.Contains("workspace='/home/openclaw/legacy-main'"));
+    }
+
+    [Fact]
+    public async Task WindowsNodeContext_Execute_FailsWhenHomeUnresolvable()
+    {
+        var commands = new FakeCommandRunner(
+            _ => Fail("unexpected RunAsync"),
+            (_, command, _) =>
+            {
+                if (command.Contains("getent passwd"))
+                    return new CommandResult(1, "", "", TimeSpan.Zero, TimedOut: false);
+                return Fail($"unexpected wsl command: {command}");
+            });
+        var ctx = CreateContext(commands: commands);
+
+        var result = await new WindowsNodeBootstrapContextStep().ExecuteAsync(ctx, CancellationToken.None);
+
+        Assert.Equal(StepOutcome.Failed, result.Outcome);
+        Assert.Contains("Could not resolve Linux home directory", result.Message);
+    }
+
+    [Fact]
+    public async Task WindowsNodeContext_Execute_FailsWithoutReadyMarker()
+    {
+        var commands = new FakeCommandRunner(
+            _ => Fail("unexpected RunAsync"),
+            (_, command, _) =>
+            {
+                if (command.Contains("getent passwd"))
+                    return Ok("/home/openclaw\n");
+                if (command.Contains("openclaw agents list --json"))
+                    return Ok(AgentsListJson("/home/openclaw/.openclaw/workspace"));
+                if (command.Contains("openclaw setup"))
+                    return Ok("");
+                if (command.Contains("openclaw config get agents.defaults.workspace"))
+                    return Ok("\"~/.openclaw/workspace\"\n");
+                return Fail("apply script failed");
+            });
+        var ctx = CreateContext(commands: commands);
+
+        var result = await new WindowsNodeBootstrapContextStep().ExecuteAsync(ctx, CancellationToken.None);
+
+        Assert.Equal(StepOutcome.Failed, result.Outcome);
+        Assert.Contains("Windows node context injection failed", result.Message);
+    }
+
     private static CommandResult Ok(string stdout = "", string stderr = "")
         => new(0, stdout, stderr, TimeSpan.Zero, TimedOut: false);
 
@@ -1472,6 +2136,9 @@ private static CommandResult FailWithStdout(string stdout)
     private static CommandResult TimedOut()
         => new(-1, "", "", TimeSpan.FromSeconds(30), TimedOut: true);
 
+    private static string AgentsListJson(string workspace, string id = "main", bool isDefault = true)
+        => JsonSerializer.Serialize(new[] { new { id, workspace, isDefault } });
+
     private static string NulSeparated(string value)
         => string.Join("\0", value.ToCharArray()) + "\0";
 
@@ -1491,7 +2158,8 @@ private sealed class FakeCommandRunner(
         Func<string, string, TimeSpan, CommandResult>? runInWsl = null) : ICommandRunner
     {
         public List<(string Executable, string[] Arguments)> Calls { get; } = [];
-        public List<(string DistroName, string Command, TimeSpan Timeout)> WslCalls { get; } = [];
+        public List<(string Executable, string[] Arguments, string? StdinInput)> DetailedCalls { get; } = [];
+        public List<(string DistroName, string Command, TimeSpan Timeout, string? User, bool InputViaStdin)> WslCalls { get; } = [];
 
         public Task<CommandResult> RunAsync(
             string executable,
@@ -1503,6 +2171,7 @@ public Task<CommandResult> RunAsync(
             CancellationToken ct = default)
         {
             Calls.Add((executable, arguments));
+            DetailedCalls.Add((executable, arguments, stdinInput));
             return Task.FromResult(run(arguments));
         }
 
@@ -1512,12 +2181,13 @@ public Task<CommandResult> RunInWslAsync(
             TimeSpan timeout,
             IReadOnlyDictionary<string, string>? environment = null,
             CancellationToken ct = default,
-            string? user = null)
+            string? user = null,
+            bool inputViaStdin = false)
         {
+            WslCalls.Add((distroName, command, timeout, user, inputViaStdin));
             if (runInWsl == null)
                 throw new NotSupportedException("RunInWslAsync is not expected in these tests.");
 
-            WslCalls.Add((distroName, command, timeout));
             return Task.FromResult(runInWsl(distroName, command, timeout));
         }
     }
diff --git a/tests/OpenClaw.SetupEngine.Tests/WizardDefaultAnswerMatrixTests.cs b/tests/OpenClaw.SetupEngine.Tests/WizardDefaultAnswerMatrixTests.cs
new file mode 100644
index 000000000..33fd43957
--- /dev/null
+++ b/tests/OpenClaw.SetupEngine.Tests/WizardDefaultAnswerMatrixTests.cs
@@ -0,0 +1,125 @@
+using System.Text.Json;
+
+namespace OpenClaw.SetupEngine.Tests;
+
+public class WizardDefaultAnswerMatrixTests
+{
+    private static readonly string[] ProviderOptions =
+    [
+        "skip",
+        "github-copilot",
+        "lmstudio",
+        "lm-studio",
+        "openai",
+        "azure-openai",
+    ];
+
+    private static readonly string[] ChannelOptions =
+    [
+        "__skip__",
+        "teams",
+        "telegram",
+        "discord",
+        "whatsapp",
+    ];
+
+    [Fact]
+    public void DefaultConfig_CoversProviderChannelAndSearchWizardSteps()
+    {
+        var answers = LoadDefaultWizardAnswers();
+
+        AssertConfiguredSelect(answers, "model-auth-provider", ProviderOptions);
+        AssertConfiguredSelect(answers, "default-model", ["__keep__", "gpt-5.5", "gpt-5.4", "claude-sonnet-4.6"]);
+        AssertConfiguredMultiselect(answers, "select-channel-quickstart", ChannelOptions);
+        AssertConfiguredSelect(answers, "search-provider", ["__skip__", "tavily", "brave", "bing"]);
+
+        Assert.True(answers.TryGetValue("configure-skills-now-recommended", out var configureSkills));
+        Assert.False((bool)WizardAnswerBuilder.BuildWireValue("confirm", configureSkills, []));
+    }
+
+    [Theory]
+    [MemberData(nameof(RepresentativeProviderChannelMatrix))]
+    public void WizardAnswerBuilder_ValidatesRepresentativeProviderChannelCombinations(
+        string provider,
+        string channels)
+    {
+        var providerOptions = Options(ProviderOptions);
+        var channelOptions = Options(ChannelOptions);
+
+        Assert.True(WizardAnswerBuilder.TryFindOption(providerOptions, provider, out _));
+        Assert.True(WizardAnswerBuilder.TryResolveOptions(channelOptions, channels, out var selectedChannels));
+        Assert.NotEmpty(selectedChannels);
+
+        var providerWire = WizardAnswerBuilder.BuildWireValue("select", provider, providerOptions);
+        var channelsWire = WizardAnswerBuilder.BuildWireValue("multiselect", channels, channelOptions);
+
+        Assert.Equal(JsonSerializer.Serialize(provider), JsonSerializer.Serialize(providerWire));
+        Assert.StartsWith("[", JsonSerializer.Serialize(channelsWire), StringComparison.Ordinal);
+    }
+
+    public static IEnumerable<object[]> RepresentativeProviderChannelMatrix()
+    {
+        foreach (var provider in ProviderOptions)
+        {
+            yield return [provider, "__skip__"];
+            yield return [provider, "teams"];
+            yield return [provider, "telegram"];
+            yield return [provider, "discord,whatsapp"];
+        }
+    }
+
+    private static Dictionary<string, string> LoadDefaultWizardAnswers()
+    {
+        var configPath = Path.Combine(RepositoryRoot(), "src", "OpenClaw.SetupEngine", "default-config.json");
+        var config = SetupConfig.LoadFromFile(configPath);
+        return config.WizardAnswers ?? new Dictionary<string, string>();
+    }
+
+    private static void AssertConfiguredSelect(
+        Dictionary<string, string> answers,
+        string key,
+        IReadOnlyList<string> values)
+    {
+        Assert.True(answers.TryGetValue(key, out var answer), $"Missing WizardAnswers['{key}']");
+        Assert.True(WizardAnswerBuilder.TryFindOption(Options(values), answer, out _),
+            $"WizardAnswers['{key}'] value '{answer}' was not present in representative options.");
+    }
+
+    private static void AssertConfiguredMultiselect(
+        Dictionary<string, string> answers,
+        string key,
+        IReadOnlyList<string> values)
+    {
+        Assert.True(answers.TryGetValue(key, out var answer), $"Missing WizardAnswers['{key}']");
+        Assert.True(WizardAnswerBuilder.TryResolveOptions(Options(values), answer, out var selected),
+            $"WizardAnswers['{key}'] value '{answer}' could not be resolved from representative options.");
+        Assert.NotEmpty(selected);
+    }
+
+    private static IReadOnlyList<WizardOptionValue> Options(IReadOnlyList<string> values)
+    {
+        var json = JsonSerializer.Serialize(new
+        {
+            options = values.Select(value => new { label = value, value })
+        });
+        using var document = JsonDocument.Parse(json);
+        return WizardAnswerBuilder.ReadOptions(document.RootElement);
+    }
+
+    private static string RepositoryRoot()
+    {
+        if (Environment.GetEnvironmentVariable("OPENCLAW_REPO_ROOT") is { Length: > 0 } configured)
+            return configured;
+
+        var directory = AppContext.BaseDirectory;
+        while (!string.IsNullOrWhiteSpace(directory))
+        {
+            if (File.Exists(Path.Combine(directory, "src", "OpenClaw.SetupEngine", "default-config.json")))
+                return directory;
+
+            directory = Directory.GetParent(directory)?.FullName;
+        }
+
+        throw new DirectoryNotFoundException("Could not locate repository root for default-config.json.");
+    }
+}
diff --git a/tests/OpenClaw.SetupEngine.Tests/WizardMessageFormattingTests.cs b/tests/OpenClaw.SetupEngine.Tests/WizardMessageFormattingTests.cs
new file mode 100644
index 000000000..5f8914e58
--- /dev/null
+++ b/tests/OpenClaw.SetupEngine.Tests/WizardMessageFormattingTests.cs
@@ -0,0 +1,75 @@
+namespace OpenClaw.SetupEngine.Tests;
+
+public class WizardMessageFormattingTests
+{
+    [Fact]
+    public void PlainText_ClassifiesAsText()
+    {
+        var segment = WizardMessageFormatting.ClassifyLine("Just some instructions.");
+        Assert.Equal(WizardLineKind.Text, segment.Kind);
+        Assert.Equal("Just some instructions.", segment.Text);
+    }
+
+    [Fact]
+    public void Url_IsDetected_WithPrefixAndSuffix()
+    {
+        var segment = WizardMessageFormatting.ClassifyLine("Open https://example.com/auth to continue");
+        Assert.Equal(WizardLineKind.Url, segment.Kind);
+        Assert.Equal("https://example.com/auth", segment.Highlight);
+        Assert.Equal("Open ", segment.Prefix);
+        Assert.Equal(" to continue", segment.Suffix);
+    }
+
+    [Fact]
+    public void Url_TrailingPunctuation_IsTrimmed()
+    {
+        var segment = WizardMessageFormatting.ClassifyLine("Visit https://example.com/device.");
+        Assert.Equal(WizardLineKind.Url, segment.Kind);
+        Assert.Equal("https://example.com/device", segment.Highlight);
+    }
+
+    [Theory]
+    [InlineData("Code: ABCD-EFGH", "Code: ", "ABCD-EFGH")]
+    [InlineData("user_code = ABC123", "user_code = ", "ABC123")]
+    [InlineData("USER_CODE: WDJB-MJHT", "USER_CODE: ", "WDJB-MJHT")]
+    public void DeviceCode_IsDetected(string line, string expectedPrefix, string expectedCode)
+    {
+        var segment = WizardMessageFormatting.ClassifyLine(line);
+        Assert.Equal(WizardLineKind.Code, segment.Kind);
+        Assert.Equal(expectedPrefix, segment.Prefix);
+        Assert.Equal(expectedCode, segment.Highlight);
+    }
+
+    [Fact]
+    public void Null_ClassifiesAsEmptyText()
+    {
+        var segment = WizardMessageFormatting.ClassifyLine(null);
+        Assert.Equal(WizardLineKind.Text, segment.Kind);
+        Assert.Equal(string.Empty, segment.Text);
+    }
+
+    [Fact]
+    public void ExtractUrls_ReturnsDistinctAbsoluteUrls()
+    {
+        var message = "Go to https://example.com/a and https://example.com/b\nor retry https://example.com/a";
+        var urls = WizardMessageFormatting.ExtractUrls(message);
+
+        Assert.Equal(2, urls.Count);
+        Assert.Contains("https://example.com/a", urls);
+        Assert.Contains("https://example.com/b", urls);
+    }
+
+    [Fact]
+    public void ExtractUrls_EmptyForNoUrls()
+    {
+        Assert.Empty(WizardMessageFormatting.ExtractUrls("nothing to see here"));
+        Assert.Empty(WizardMessageFormatting.ExtractUrls(null));
+    }
+
+    [Fact]
+    public void ContainsAuthUrl_TrueOnlyWhenUrlPresent()
+    {
+        Assert.True(WizardMessageFormatting.ContainsAuthUrl("login at https://accounts.google.com/o/oauth2"));
+        Assert.False(WizardMessageFormatting.ContainsAuthUrl("paste your API key"));
+    }
+}
diff --git a/tests/OpenClaw.SetupEngine.Tests/WizardNextPayloadTests.cs b/tests/OpenClaw.SetupEngine.Tests/WizardNextPayloadTests.cs
new file mode 100644
index 000000000..3eb5253df
--- /dev/null
+++ b/tests/OpenClaw.SetupEngine.Tests/WizardNextPayloadTests.cs
@@ -0,0 +1,58 @@
+using System.Text.Json;
+
+namespace OpenClaw.SetupEngine.Tests;
+
+public class WizardNextPayloadTests
+{
+    [Fact]
+    public void Acknowledge_SerializesGatewayCompatibleAnswerEnvelope()
+    {
+        var payload = WizardNextPayload.Acknowledge("session-1", "step-progress");
+
+        using var doc = JsonDocument.Parse(JsonSerializer.Serialize(payload, SetupConfig.JsonOptions));
+        var root = doc.RootElement;
+
+        Assert.Equal("session-1", root.GetProperty("sessionId").GetString());
+        var answer = root.GetProperty("answer");
+        Assert.Equal("step-progress", answer.GetProperty("stepId").GetString());
+        Assert.False(answer.TryGetProperty("value", out _));
+    }
+
+    [Theory]
+    [InlineData("progress")]
+    [InlineData("action")]
+    public void Acknowledge_AdvancesGatewayCurrentStep_ForDriveThroughTypes(string stepType)
+    {
+        _ = stepType; // documents the drive-through categories this contract protects.
+        var session = new FakeWizardSession();
+
+        Assert.Equal("step-1", session.Next(new { sessionId = "session-1" }));
+        Assert.Equal("step-1", session.Next(new { sessionId = "session-1" }));
+        Assert.Equal("step-2", session.Next(WizardNextPayload.Acknowledge("session-1", "step-1")));
+        Assert.Equal("step-2", session.Next(new { sessionId = "session-1" }));
+    }
+
+    private sealed class FakeWizardSession
+    {
+        private string? _currentStepId = "step-1";
+        private bool _acknowledged;
+
+        public string? Next(object payload)
+        {
+            if (HasAnswer(payload))
+            {
+                _currentStepId = null;
+                _acknowledged = true;
+            }
+
+            _currentStepId ??= _acknowledged ? "step-2" : "step-1";
+            return _currentStepId;
+        }
+
+        private static bool HasAnswer(object payload)
+        {
+            using var doc = JsonDocument.Parse(JsonSerializer.Serialize(payload, SetupConfig.JsonOptions));
+            return doc.RootElement.TryGetProperty("answer", out _);
+        }
+    }
+}
diff --git a/tests/OpenClaw.SetupEngine.Tests/WizardStepClassifierTests.cs b/tests/OpenClaw.SetupEngine.Tests/WizardStepClassifierTests.cs
new file mode 100644
index 000000000..c6a51e21f
--- /dev/null
+++ b/tests/OpenClaw.SetupEngine.Tests/WizardStepClassifierTests.cs
@@ -0,0 +1,85 @@
+namespace OpenClaw.SetupEngine.Tests;
+
+public class WizardStepClassifierTests
+{
+    [Theory]
+    [InlineData("text")]
+    [InlineData("select")]
+    [InlineData("multiselect")]
+    public void InteractiveTypes_RequireAnswer(string type)
+    {
+        Assert.Equal(WizardStepCategory.RequiresAnswer, WizardStepClassifier.Categorize(type, hasOptions: false));
+    }
+
+    [Fact]
+    public void Confirm_IsConfirm()
+    {
+        Assert.Equal(WizardStepCategory.Confirm, WizardStepClassifier.Categorize("confirm", hasOptions: false));
+    }
+
+    [Fact]
+    public void Note_IsAcknowledge()
+    {
+        Assert.Equal(WizardStepCategory.Acknowledge, WizardStepClassifier.Categorize("note", hasOptions: false));
+    }
+
+    [Theory]
+    [InlineData("progress")]
+    [InlineData("status")]
+    [InlineData("working")]
+    [InlineData("PROGRESS")]
+    [InlineData("  Progress ")]
+    public void ProgressTypes_AreProgress(string type)
+    {
+        Assert.True(WizardStepClassifier.IsProgress(type));
+        Assert.Equal(WizardStepCategory.Progress, WizardStepClassifier.Categorize(type, hasOptions: false));
+    }
+
+    [Fact]
+    public void ProgressWithOptions_StillProgress()
+    {
+        // A status step that happens to carry options is still a poll-through.
+        Assert.Equal(WizardStepCategory.Progress, WizardStepClassifier.Categorize("progress", hasOptions: true));
+    }
+
+    [Theory]
+    [InlineData("action")]
+    [InlineData("info")]
+    [InlineData("future-thing")]
+    [InlineData("")]
+    [InlineData(null)]
+    public void UnknownWithoutOptions_IsNonInteractive(string? type)
+    {
+        Assert.Equal(WizardStepCategory.NonInteractive, WizardStepClassifier.Categorize(type, hasOptions: false));
+    }
+
+    [Theory]
+    [InlineData("action")]
+    [InlineData("future-choice")]
+    public void UnknownWithOptions_IsTreatedAsChoice(string type)
+    {
+        Assert.Equal(WizardStepCategory.RequiresAnswer, WizardStepClassifier.Categorize(type, hasOptions: true));
+    }
+
+    [Theory]
+    [InlineData("Text")]
+    [InlineData("SELECT")]
+    [InlineData("Confirm")]
+    [InlineData("NOTE")]
+    public void Categorization_IsCaseInsensitive(string type)
+    {
+        // Should not fall through to NonInteractive just because of casing.
+        Assert.NotEqual(WizardStepCategory.NonInteractive, WizardStepClassifier.Categorize(type, hasOptions: false));
+    }
+
+    [Theory]
+    [InlineData(WizardStepCategory.Progress, true)]
+    [InlineData(WizardStepCategory.NonInteractive, true)]
+    [InlineData(WizardStepCategory.RequiresAnswer, false)]
+    [InlineData(WizardStepCategory.Confirm, false)]
+    [InlineData(WizardStepCategory.Acknowledge, false)]
+    public void ContinuesWithoutAnswer_OnlyForDriveThrough(WizardStepCategory category, bool expected)
+    {
+        Assert.Equal(expected, WizardStepClassifier.ContinuesWithoutAnswer(category));
+    }
+}
diff --git a/tests/OpenClaw.SetupEngine.Tests/WizardTimeoutsTests.cs b/tests/OpenClaw.SetupEngine.Tests/WizardTimeoutsTests.cs
new file mode 100644
index 000000000..44a8eb650
--- /dev/null
+++ b/tests/OpenClaw.SetupEngine.Tests/WizardTimeoutsTests.cs
@@ -0,0 +1,126 @@
+using System.Text.Json;
+
+namespace OpenClaw.SetupEngine.Tests;
+
+public class WizardTimeoutsTests
+{
+    [Theory]
+    [InlineData("Authorize device")]
+    [InlineData("Please sign in to continue")]
+    [InlineData("Complete the OAuth login")]
+    [InlineData("Open your browser to authenticate")]
+    [InlineData("Enter the verification code")]
+    public void AuthSteps_GetExtendedTimeout(string text)
+    {
+        Assert.Equal(WizardTimeouts.SlowStepTimeoutMs, WizardTimeouts.ForStep(text, string.Empty));
+    }
+
+    [Fact]
+    public void AuthHint_DetectedInMessage()
+    {
+        Assert.Equal(
+            WizardTimeouts.SlowStepTimeoutMs,
+            WizardTimeouts.ForStep("Setup", "Visit the device authorization page"));
+    }
+
+    [Theory]
+    [InlineData("Setup", "Downloading plugin package", "")]
+    [InlineData("Setup", "Installing integration", "")]
+    [InlineData("Setup", "Working", "install-channel-plugin")]
+    public void SlowSetupSteps_GetExtendedTimeout(string title, string message, string stepId)
+    {
+        Assert.Equal(
+            WizardTimeouts.SlowStepTimeoutMs,
+            WizardTimeouts.ForStep(title, message, stepId));
+    }
+
+    [Theory]
+    [InlineData("opaque-value", "Microsoft Teams", "")]
+    [InlineData("teams", "Collaboration", "")]
+    [InlineData("opaque-value", "Collaboration", "Download and configure the plugin")]
+    public void SelectedSlowOptionMetadata_GetsExtendedTimeout(string value, string label, string hint)
+    {
+        var selected = new WizardOptionValue(
+            value,
+            label,
+            hint,
+            JsonSerializer.SerializeToElement(value));
+
+        Assert.Equal(
+            WizardTimeouts.SlowStepTimeoutMs,
+            WizardTimeouts.ForStep("Choose an integration", "Pick one.", selectedOptions: [selected]));
+    }
+
+    [Theory]
+    [InlineData("Choose a connector")]
+    [InlineData("Enter a friendly name")]
+    [InlineData("")]
+    public void OrdinarySteps_GetDefaultTimeout(string text)
+    {
+        Assert.Equal(WizardTimeouts.DefaultTimeoutMs, WizardTimeouts.ForStep(text, string.Empty));
+    }
+
+    [Fact]
+    public void OrdinarySelectedOption_KeepsDefaultTimeout()
+    {
+        var selected = new WizardOptionValue(
+            "matrix",
+            "Matrix",
+            "Configure an existing connection",
+            JsonSerializer.SerializeToElement("matrix"));
+
+        Assert.Equal(
+            WizardTimeouts.DefaultTimeoutMs,
+            WizardTimeouts.ForStep("Choose an integration", "Pick one.", selectedOptions: [selected]));
+    }
+
+    [Theory]
+    [InlineData("__skip__", "Skip for now", "")]
+    [InlineData("matrix", "Matrix", "Existing connection")]
+    [InlineData("browser", "Open in browser", "")]
+    public void ChannelSelector_NonSlowOption_KeepsDefaultTimeout(string value, string label, string hint)
+    {
+        var selected = new WizardOptionValue(
+            value,
+            label,
+            hint,
+            JsonSerializer.SerializeToElement(value));
+
+        Assert.Equal(
+            WizardTimeouts.DefaultTimeoutMs,
+            WizardTimeouts.ForStep(
+                "Choose a channel",
+                "Select where OpenClaw should send messages.",
+                "select-channel-quickstart",
+                [selected]));
+    }
+
+    [Fact]
+    public void ProgressStep_WithIncidentalOptions_UsesStepMetadata()
+    {
+        var incidentalOption = new WizardOptionValue(
+            "details",
+            "Show details",
+            "",
+            JsonSerializer.SerializeToElement("details"));
+
+        Assert.Equal(
+            WizardTimeouts.SlowStepTimeoutMs,
+            WizardTimeouts.ForGatewayStep(
+                "Setup",
+                "Working",
+                "install-channel-plugin",
+                "progress",
+                [incidentalOption]));
+    }
+
+    [Fact]
+    public void ProgressPollBudget_AllowsSingleLongSetupStepToUseTotalBudget()
+    {
+        Assert.Equal(WizardTimeouts.MaxTotalProgressPolls, WizardTimeouts.MaxProgressPollsPerStep);
+        var totalBudget = TimeSpan.FromTicks(
+            WizardTimeouts.ProgressPollDelay.Ticks * WizardTimeouts.MaxTotalProgressPolls);
+        Assert.True(
+            totalBudget >= TimeSpan.FromMinutes(20));
+    }
+}
diff --git a/tests/OpenClaw.Shared.Tests/AppCapabilityTests.cs b/tests/OpenClaw.Shared.Tests/AppCapabilityTests.cs
index 112bca4cf..1c71bf587 100644
--- a/tests/OpenClaw.Shared.Tests/AppCapabilityTests.cs
+++ b/tests/OpenClaw.Shared.Tests/AppCapabilityTests.cs
@@ -27,7 +27,9 @@ public void Commands_ContainsAllExpectedTools()
     {
         var cap = new AppCapability(NullLogger.Instance);
         var expected = new[] { "app.navigate", "app.status", "app.sessions", "app.agents",
-            "app.nodes", "app.config.get", "app.settings.get", "app.settings.set", "app.menu", "app.search" };
+            "app.nodes", "app.config.get", "app.settings.get", "app.settings.set", "app.menu", "app.search",
+            "app.dashboard.url", "app.chat.snapshot", "app.chat.send", "app.chat.reset",
+            "app.chat.queue.list", "app.chat.queue.cancel" };
         foreach (var cmd in expected)
         {
             Assert.Contains(cmd, cap.Commands);
@@ -83,6 +85,45 @@ public async Task SettingsGet_WithNoHandler_ReturnsError()
         Assert.False(res.Ok);
     }
 
+    [Fact]
+    public async Task SettingsSet_WithHandlerErrorPayload_ReturnsCommandError()
+    {
+        var cap = new AppCapability(NullLogger.Instance)
+        {
+            SettingsSetHandler = (_, _) => new { error = "MCP server startup failed" }
+        };
+        var req = new NodeInvokeRequest
+        {
+            Id = "1",
+            Command = "app.settings.set",
+            Args = ParseArgs("{\"name\":\"EnableMcpServer\",\"value\":\"true\"}")
+        };
+
+        var res = await cap.ExecuteAsync(req);
+
+        Assert.False(res.Ok);
+        Assert.Equal("MCP server startup failed", res.Error);
+    }
+
+    [Fact]
+    public async Task SettingsSet_WithHandlerSuccessPayload_ReturnsData()
+    {
+        var cap = new AppCapability(NullLogger.Instance)
+        {
+            SettingsSetHandler = (name, _) => new { name, value = true }
+        };
+        var req = new NodeInvokeRequest
+        {
+            Id = "1",
+            Command = "app.settings.set",
+            Args = ParseArgs("{\"name\":\"EnableMcpServer\",\"value\":\"true\"}")
+        };
+
+        var res = await cap.ExecuteAsync(req);
+
+        Assert.True(res.Ok);
+    }
+
     [Fact]
     public async Task UnknownCommand_ReturnsError()
     {
@@ -92,4 +133,169 @@ public async Task UnknownCommand_ReturnsError()
         Assert.False(res.Ok);
         Assert.Contains("Unknown", res.Error);
     }
+
+    [Fact]
+    public async Task ChatSend_WithHandler_SendsMessageToDefaultThread()
+    {
+        var cap = new AppCapability(NullLogger.Instance);
+        string? capturedThreadId = "unset";
+        string? capturedMessage = null;
+        cap.ChatSendHandler = (threadId, message) =>
+        {
+            capturedThreadId = threadId;
+            capturedMessage = message;
+            return Task.FromResult<object?>(new { sent = true });
+        };
+
+        var req = new NodeInvokeRequest
+        {
+            Id = "1",
+            Command = "app.chat.send",
+            Args = ParseArgs("{\"message\":\"hello\"}")
+        };
+
+        var res = await cap.ExecuteAsync(req);
+
+        Assert.True(res.Ok);
+        Assert.Null(capturedThreadId);
+        Assert.Equal("hello", capturedMessage);
+    }
+
+    [Fact]
+    public async Task ChatSend_WithSessionKeyAlias_ForwardsThreadId()
+    {
+        var cap = new AppCapability(NullLogger.Instance);
+        string? capturedThreadId = null;
+        cap.ChatSendHandler = (threadId, message) =>
+        {
+            capturedThreadId = threadId;
+            return Task.FromResult<object?>(new { sent = true, message });
+        };
+
+        var req = new NodeInvokeRequest
+        {
+            Id = "1",
+            Command = "app.chat.send",
+            Args = ParseArgs("{\"sessionKey\":\"agent:main:default\",\"message\":\"hello\"}")
+        };
+
+        var res = await cap.ExecuteAsync(req);
+
+        Assert.True(res.Ok);
+        Assert.Equal("agent:main:default", capturedThreadId);
+    }
+
+    [Fact]
+    public async Task ChatSend_WithoutMessage_ReturnsError()
+    {
+        var cap = new AppCapability(NullLogger.Instance);
+        cap.ChatSendHandler = (_, _) => Task.FromResult<object?>(new { sent = true });
+
+        var req = new NodeInvokeRequest
+        {
+            Id = "1",
+            Command = "app.chat.send",
+            Args = ParseArgs("{}")
+        };
+
+        var res = await cap.ExecuteAsync(req);
+
+        Assert.False(res.Ok);
+        Assert.Contains("message", res.Error);
+    }
+
+    [Fact]
+    public async Task ChatQueueList_WithSessionKeyAlias_ForwardsThreadId()
+    {
+        var cap = new AppCapability(NullLogger.Instance);
+        string? capturedThreadId = null;
+        cap.ChatQueueListHandler = threadId =>
+        {
+            capturedThreadId = threadId;
+            return Task.FromResult<object?>(new { totalCount = 1 });
+        };
+
+        var req = new NodeInvokeRequest
+        {
+            Id = "1",
+            Command = "app.chat.queue.list",
+            Args = ParseArgs("{\"sessionKey\":\"agent:main:default\"}")
+        };
+
+        var res = await cap.ExecuteAsync(req);
+
+        Assert.True(res.Ok);
+        Assert.Equal("agent:main:default", capturedThreadId);
+    }
+
+    [Fact]
+    public async Task ChatQueueCancel_WithHandler_ForwardsThreadAndQueuedMessage()
+    {
+        var cap = new AppCapability(NullLogger.Instance);
+        string? capturedThreadId = null;
+        string? capturedQueuedMessageId = null;
+        cap.ChatQueueCancelHandler = (threadId, queuedMessageId) =>
+        {
+            capturedThreadId = threadId;
+            capturedQueuedMessageId = queuedMessageId;
+            return Task.FromResult<object?>(new { canceled = true });
+        };
+
+        var req = new NodeInvokeRequest
+        {
+            Id = "1",
+            Command = "app.chat.queue.cancel",
+            Args = ParseArgs("{\"threadId\":\"main\",\"queuedMessageId\":\"q7\"}")
+        };
+
+        var res = await cap.ExecuteAsync(req);
+
+        Assert.True(res.Ok);
+        Assert.Equal("main", capturedThreadId);
+        Assert.Equal("q7", capturedQueuedMessageId);
+    }
+
+    [Fact]
+    public async Task ChatQueueCancel_WithoutQueuedMessageId_ReturnsError()
+    {
+        var cap = new AppCapability(NullLogger.Instance);
+        cap.ChatQueueCancelHandler = (_, _) => Task.FromResult<object?>(new { canceled = true });
+
+        var req = new NodeInvokeRequest
+        {
+            Id = "1",
+            Command = "app.chat.queue.cancel",
+            Args = ParseArgs("{\"threadId\":\"main\"}")
+        };
+
+        var res = await cap.ExecuteAsync(req);
+
+        Assert.False(res.Ok);
+        Assert.Contains("queuedMessageId", res.Error);
+    }
+
+    [Fact]
+    public async Task ChatQueueCancel_WithoutThreadId_ReturnsError()
+    {
+        var cap = new AppCapability(NullLogger.Instance);
+        var handlerCalled = false;
+        cap.ChatQueueCancelHandler = (_, _) =>
+        {
+            handlerCalled = true;
+            return Task.FromResult<object?>(new { canceled = true });
+        };
+
+        var req = new NodeInvokeRequest
+        {
+            Id = "1",
+            Command = "app.chat.queue.cancel",
+            Args = ParseArgs("{\"queuedMessageId\":\"q7\"}")
+        };
+
+        var res = await cap.ExecuteAsync(req);
+
+        Assert.False(res.Ok);
+        Assert.Contains("threadId", res.Error);
+        Assert.False(handlerCalled);
+    }
 }
diff --git a/tests/OpenClaw.Shared.Tests/CapabilityTests.cs b/tests/OpenClaw.Shared.Tests/CapabilityTests.cs
index 353294de9..d159c9c6a 100644
--- a/tests/OpenClaw.Shared.Tests/CapabilityTests.cs
+++ b/tests/OpenClaw.Shared.Tests/CapabilityTests.cs
@@ -112,6 +112,27 @@ public async Task Run_AcceptsCommandAsArray()
         Assert.Equal(new[] { "hello", "world" }, runner.LastRequest.Args);
     }
 
+    [Fact]
+    public async Task Run_PassesApprovedEffectiveShellToRunner()
+    {
+        var cap = new SystemCapability(NullLogger.Instance);
+        var runner = new FakeCommandRunner { ForcedEffectiveShell = "cmd" };
+        cap.SetCommandRunner(runner);
+
+        var req = new NodeInvokeRequest
+        {
+            Id = "r1-shell",
+            Command = "system.run",
+            Args = Parse("""{"command":"hostname"}""")
+        };
+
+        var res = await cap.ExecuteAsync(req);
+
+        Assert.True(res.Ok);
+        Assert.Equal("cmd", runner.LastRequest!.ApprovedEffectiveShell);
+        Assert.Null(runner.LastRequest.Shell);
+    }
+
     [Fact]
     public async Task Run_AcceptsCommandAsString()
     {
@@ -370,6 +391,29 @@ public async Task RunPrepare_ReturnsPlan_WithArgvAndCwd()
         Assert.Equal("agent1", agentId.GetString());
     }
 
+    [Fact]
+    public async Task RunPrepare_ReturnsRequestedAndEffectiveShellFromRunner()
+    {
+        var runner = new FakeCommandRunner { ForcedEffectiveShell = "cmd" };
+        var cap = new SystemCapability(NullLogger.Instance);
+        cap.SetCommandRunner(runner);
+        var req = new NodeInvokeRequest
+        {
+            Id = "p-shell",
+            Command = "system.run.prepare",
+            Args = Parse("""{"command":"echo hi","shell":"bash"}""")
+        };
+
+        var res = await cap.ExecuteAsync(req);
+
+        Assert.True(res.Ok);
+        Assert.Equal("bash", runner.LastResolvedShell);
+        var payload = JsonSerializer.Deserialize<JsonElement>(JsonSerializer.Serialize(res.Payload));
+        var plan = payload.GetProperty("plan");
+        Assert.Equal("bash", plan.GetProperty("requestedShell").GetString());
+        Assert.Equal("cmd", plan.GetProperty("effectiveShell").GetString());
+    }
+
     [Fact]
     public async Task RunPrepare_ReturnsError_WhenMissingCommand()
     {
@@ -743,6 +787,26 @@ private class FakeCommandRunner : ICommandRunner
     {
         public string Name => "fake";
         public CommandRequest? LastRequest { get; private set; }
+        public string? LastResolvedShell { get; private set; }
+        public string? ForcedEffectiveShell { get; set; }
+
+        public string ResolveEffectiveShell(string? requestedShell)
+        {
+            LastResolvedShell = requestedShell;
+            if (ForcedEffectiveShell != null)
+                return ForcedEffectiveShell;
+
+            if (string.IsNullOrWhiteSpace(requestedShell))
+                return "powershell";
+
+            return requestedShell.Trim().ToLowerInvariant() switch
+            {
+                "cmd" => "cmd",
+                "pwsh" => "pwsh",
+                "powershell" => "powershell",
+                _ => "powershell",
+            };
+        }
 
         public Task<CommandResult> RunAsync(CommandRequest request, CancellationToken ct = default)
         {
@@ -1624,6 +1688,28 @@ public async Task Navigate_ResponseIncludesOpenerAndCanonicalUrl()
         Assert.Contains("\"url\":\"https://example.com/Path\"", json);
     }
 
+    [Theory]
+    [InlineData("denied")]
+    [InlineData("unsupported_in_canvas")]
+    public async Task Navigate_NotOpenedByHandler_ReturnsNotNavigated(string opener)
+    {
+        var cap = new CanvasCapability(NullLogger.Instance);
+        cap.NavigateRequested += _ => Task.FromResult(opener);
+
+        var req = new NodeInvokeRequest
+        {
+            Id = "c12b-denied",
+            Command = "canvas.navigate",
+            Args = Parse("""{"url":"http://127.0.0.1:9/"}""")
+        };
+        var res = await cap.ExecuteAsync(req);
+        Assert.True(res.Ok);
+
+        var json = System.Text.Json.JsonSerializer.Serialize(res.Payload);
+        Assert.Contains($"\"opener\":\"{opener}\"", json);
+        Assert.Contains("\"navigated\":false", json);
+    }
+
     [Theory]
     [InlineData("javascript:alert(1)")]
     [InlineData("file:///C:/Windows/System32/calc.exe")]
@@ -2474,6 +2560,114 @@ public async Task Capture_UsesMonitorAlias_ForScreenIndex()
         Assert.Equal(2, receivedArgs!.MonitorIndex);
     }
 
+    [Fact]
+    public async Task Capture_RejectsUnsupportedFormat()
+    {
+        // Reject before the capture handler runs so a caller-supplied format
+        // cannot reach the data URI MIME type.
+        var cap = new ScreenCapability(NullLogger.Instance);
+        var handlerCalled = false;
+        cap.CaptureRequested += (_) =>
+        {
+            handlerCalled = true;
+            return Task.FromResult(new ScreenCaptureResult { Format = "png", Base64 = "x" });
+        };
+
+        var req = new NodeInvokeRequest
+        {
+            Id = "sfmt1",
+            Command = "screen.snapshot",
+            Args = Parse("""{"format":"svg+xml"}""")
+        };
+
+        var res = await cap.ExecuteAsync(req);
+        Assert.False(res.Ok);
+        Assert.False(handlerCalled);
+        Assert.Contains("Unsupported screen snapshot format", res.Error);
+    }
+
+    [Fact]
+    public async Task Capture_NormalizesJpgToJpeg()
+    {
+        // Normalize the alias before invoking the capture handler.
+        var cap = new ScreenCapability(NullLogger.Instance);
+        ScreenCaptureArgs? received = null;
+        cap.CaptureRequested += (args) =>
+        {
+            received = args;
+            return Task.FromResult(new ScreenCaptureResult { Format = args.Format, Width = 10, Height = 10, Base64 = "data" });
+        };
+
+        var req = new NodeInvokeRequest
+        {
+            Id = "sfmt2",
+            Command = "screen.snapshot",
+            Args = Parse("""{"format":"jpg"}""")
+        };
+
+        var res = await cap.ExecuteAsync(req);
+        Assert.True(res.Ok);
+        Assert.NotNull(received);
+        Assert.Equal("jpeg", received!.Format);
+
+        var json = JsonSerializer.Serialize(res.Payload);
+        using var doc = JsonDocument.Parse(json);
+        var root = doc.RootElement;
+        Assert.Equal("jpeg", root.GetProperty("format").GetString());
+        Assert.StartsWith("data:image/jpeg;base64,", root.GetProperty("image").GetString());
+    }
+
+    [Fact]
+    public async Task Capture_DataUri_IgnoresHandlerEchoedFormat()
+    {
+        // The response MIME type comes from the validated request format.
+        var cap = new ScreenCapability(NullLogger.Instance);
+        cap.CaptureRequested += (_) => Task.FromResult(new ScreenCaptureResult
+        {
+            Format = "svg+xml\";base64,evil",
+            Width = 1,
+            Height = 1,
+            Base64 = "abc123"
+        });
+
+        var req = new NodeInvokeRequest
+        {
+            Id = "sfmt3",
+            Command = "screen.snapshot",
+            Args = Parse("""{"format":"png"}""")
+        };
+
+        var res = await cap.ExecuteAsync(req);
+        Assert.True(res.Ok);
+
+        var json = JsonSerializer.Serialize(res.Payload);
+        using var doc = JsonDocument.Parse(json);
+        var root = doc.RootElement;
+        Assert.Equal("png", root.GetProperty("format").GetString());
+        Assert.Equal("data:image/png;base64,abc123", root.GetProperty("image").GetString());
+    }
+
+    [Fact]
+    public void TryNormalizeSnapshotFormat_AllowsKnownFormats_RejectsOthers()
+    {
+        Assert.True(ScreenCapability.TryNormalizeSnapshotFormat("png", out var png));
+        Assert.Equal("png", png);
+        Assert.True(ScreenCapability.TryNormalizeSnapshotFormat("PNG", out var pngUpper));
+        Assert.Equal("png", pngUpper);
+        Assert.True(ScreenCapability.TryNormalizeSnapshotFormat("jpeg", out var jpeg));
+        Assert.Equal("jpeg", jpeg);
+        Assert.True(ScreenCapability.TryNormalizeSnapshotFormat("  JPG  ", out var jpg));
+        Assert.Equal("jpeg", jpg);
+        Assert.True(ScreenCapability.TryNormalizeSnapshotFormat(null, out var def));
+        Assert.Equal("png", def);
+        Assert.True(ScreenCapability.TryNormalizeSnapshotFormat("", out var empty));
+        Assert.Equal("png", empty);
+
+        Assert.False(ScreenCapability.TryNormalizeSnapshotFormat("webp", out _));
+        Assert.False(ScreenCapability.TryNormalizeSnapshotFormat("gif", out _));
+        Assert.False(ScreenCapability.TryNormalizeSnapshotFormat("png;base64,x", out _));
+    }
+
     [Fact]
     public async Task Record_ReturnsError_WhenNoHandler()
     {
@@ -3069,6 +3263,152 @@ public async Task UnknownCommand_ReturnsError()
         Assert.False(res.Ok);
         Assert.Contains("Unknown command", res.Error);
     }
+
+    [Fact]
+    public void Commands_IncludeSpeakAndStatus()
+    {
+        var cap = new TtsCapability(NullLogger.Instance);
+
+        Assert.Contains(TtsCapability.SpeakCommand, cap.Commands);
+        Assert.Contains(TtsCapability.StatusCommand, cap.Commands);
+        Assert.True(cap.CanHandle("tts.status"));
+    }
+
+    [Theory]
+    // Preferred provider is ready → no fallback.
+    [InlineData("piper", "piper", "piper,windows", false, "piper", "piper", false)]
+    [InlineData("elevenlabs", "piper", "elevenlabs,windows", false, "elevenlabs", "elevenlabs", false)]
+    // Configured/default preferred provider not ready, Windows available → fall back to Windows.
+    [InlineData(null, "piper", "windows", true, "piper", "windows", true)]
+    [InlineData(null, "elevenlabs", "windows", true, "elevenlabs", "windows", true)]
+    // Explicit provider requests stay strict and do not silently reroute.
+    [InlineData("piper", "windows", "windows", false, "piper", "piper", false)]
+    [InlineData("elevenlabs", "windows", "windows", false, "elevenlabs", "elevenlabs", false)]
+    [InlineData("unknown-provider", "windows", "windows", false, "unknown-provider", "unknown-provider", false)]
+    // Preferred IS Windows but somehow not ready → no self-fallback.
+    [InlineData("windows", "windows", "piper", false, "windows", "windows", false)]
+    // Nothing ready → preferred returned unchanged so the dispatch error is meaningful.
+    [InlineData(null, "elevenlabs", "", true, "elevenlabs", "elevenlabs", false)]
+    public void ResolveEffectiveProvider_FallsBackToWindows(
+        string? requested,
+        string? configured,
+        string readyCsv,
+        bool allowFallback,
+        string expectedRequested,
+        string expectedEffective,
+        bool expectedFellBack)
+    {
+        var ready = readyCsv.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries)
+            .ToHashSet(StringComparer.OrdinalIgnoreCase);
+
+        var resolution = TtsCapability.ResolveEffectiveProvider(requested, configured, ready, allowFallback);
+
+        Assert.Equal(expectedRequested, resolution.RequestedProvider);
+        Assert.Equal(expectedEffective, resolution.EffectiveProvider);
+        Assert.Equal(expectedFellBack, resolution.FellBack);
+    }
+
+    [Fact]
+    public async Task Speak_Projection_IncludesRequestedProviderAndFellBack()
+    {
+        var cap = new TtsCapability(NullLogger.Instance);
+        cap.SpeakRequested += (_, _) => Task.FromResult(new TtsSpeakResult
+        {
+            Provider = TtsCapability.WindowsProvider,
+            RequestedProvider = TtsCapability.ElevenLabsProvider,
+            FellBack = true,
+            ContentType = "audio/wav",
+            DurationMs = 50
+        });
+
+        var res = await cap.ExecuteAsync(new NodeInvokeRequest
+        {
+            Id = "tts-fallback",
+            Command = "tts.speak",
+            Args = Parse("""{"text":"hello","provider":"elevenlabs"}""")
+        });
+
+        Assert.True(res.Ok);
+        var json = JsonSerializer.Serialize(res.Payload);
+        using var doc = JsonDocument.Parse(json);
+        var root = doc.RootElement;
+        Assert.Equal("windows", root.GetProperty("provider").GetString());
+        Assert.Equal("elevenlabs", root.GetProperty("requestedProvider").GetString());
+        Assert.True(root.GetProperty("fellBack").GetBoolean());
+    }
+
+    [Fact]
+    public async Task Status_ReturnsError_WhenNoHandler()
+    {
+        var cap = new TtsCapability(NullLogger.Instance);
+
+        var res = await cap.ExecuteAsync(new NodeInvokeRequest
+        {
+            Id = "tts-status-unavailable",
+            Command = "tts.status",
+            Args = Parse("""{}""")
+        });
+
+        Assert.False(res.Ok);
+        Assert.Contains("not available", res.Error, StringComparison.OrdinalIgnoreCase);
+    }
+
+    [Fact]
+    public async Task Status_ProjectsProviderReadiness()
+    {
+        var cap = new TtsCapability(NullLogger.Instance);
+        cap.StatusRequested += _ => Task.FromResult(new TtsStatusResult
+        {
+            ConfiguredProvider = TtsCapability.PiperProvider,
+            EffectiveProvider = TtsCapability.WindowsProvider,
+            WillFallBack = true,
+            Providers =
+            [
+                new TtsProviderStatus { Provider = TtsCapability.PiperProvider, Readiness = TtsCapability.ReadinessVoiceNotDownloaded, IsReady = false },
+                new TtsProviderStatus { Provider = TtsCapability.WindowsProvider, Readiness = TtsCapability.ReadinessReady, IsReady = true },
+                new TtsProviderStatus { Provider = TtsCapability.ElevenLabsProvider, Readiness = TtsCapability.ReadinessNeedsApiKey, IsReady = false }
+            ]
+        });
+
+        var res = await cap.ExecuteAsync(new NodeInvokeRequest
+        {
+            Id = "tts-status",
+            Command = "tts.status",
+            Args = Parse("""{}""")
+        });
+
+        Assert.True(res.Ok);
+        var json = JsonSerializer.Serialize(res.Payload);
+        using var doc = JsonDocument.Parse(json);
+        var root = doc.RootElement;
+        Assert.Equal("piper", root.GetProperty("configuredProvider").GetString());
+        Assert.Equal("windows", root.GetProperty("effectiveProvider").GetString());
+        Assert.True(root.GetProperty("willFallBack").GetBoolean());
+        var providers = root.GetProperty("providers");
+        Assert.Equal(3, providers.GetArrayLength());
+        Assert.Equal("voice-not-downloaded", providers[0].GetProperty("readiness").GetString());
+        Assert.False(providers[0].GetProperty("isReady").GetBoolean());
+        Assert.True(providers[1].GetProperty("isReady").GetBoolean());
+    }
+
+    [Fact]
+    public async Task Status_ReturnsSanitizedError_WhenHandlerThrows()
+    {
+        var cap = new TtsCapability(NullLogger.Instance);
+        cap.StatusRequested += _ => throw new InvalidOperationException("voice id secret-voice-xyz on device Mic-42");
+
+        var res = await cap.ExecuteAsync(new NodeInvokeRequest
+        {
+            Id = "tts-status-fail",
+            Command = "tts.status",
+            Args = Parse("""{}""")
+        });
+
+        Assert.False(res.Ok);
+        Assert.Equal("Status failed", res.Error);
+        Assert.DoesNotContain("secret-voice-xyz", res.Error);
+        Assert.DoesNotContain("Mic-42", res.Error);
+    }
 }
 
 public class LocationCapabilityTests
diff --git a/tests/OpenClaw.Shared.Tests/CommandCatalogPresentationTests.cs b/tests/OpenClaw.Shared.Tests/CommandCatalogPresentationTests.cs
new file mode 100644
index 000000000..7d7309927
--- /dev/null
+++ b/tests/OpenClaw.Shared.Tests/CommandCatalogPresentationTests.cs
@@ -0,0 +1,422 @@
+using System.Linq;
+using OpenClaw.Shared;
+using Xunit;
+
+namespace OpenClaw.Shared.Tests;
+
+// Tests for the UI-facing presentation helpers layered on top of the
+// GatewayCommand DTO (GatewayCommandPresentation + the ranked
+// ChatCommandCatalogView). The wire DTOs / parsing / CommandCatalogQuery are
+// covered separately by GatewayProtocolModelsTests.
+public class CommandCatalogPresentationTests
+{
+    private static GatewayCommand[] Sample() => new[]
+    {
+        new GatewayCommand { Name = "clear", NativeName = "/clear", Description = "Clear the conversation", Category = "Session", Source = "native", Scope = "session" },
+        new GatewayCommand
+        {
+            Name = "model", NativeName = "/model", Description = "Switch the active model", Category = "Session",
+            Source = "native", Scope = "session", AcceptsArgs = true,
+            Args = new[] { new GatewayCommandArg { Name = "id", Required = true, Type = "string" } }
+        },
+        new GatewayCommand { Name = "summarize", TextAliases = new[] { "/summarize", "/tldr" }, Description = "Summarize the thread", Category = "Text", Source = "text" },
+        new GatewayCommand { Name = "deploy", Description = "Run the deploy skill", Source = "skill", Category = "Skills" },
+        new GatewayCommand { Name = "jira", NativeName = "/jira", Source = "plugin" },
+    };
+
+    // ── GatewayCommandPresentation ──
+
+    [Fact]
+    public void DisplayName_PrefersNativeThenAliasThenName()
+    {
+        Assert.Equal("/clear", new GatewayCommand { Name = "clear", NativeName = "/clear" }.DisplayName());
+        Assert.Equal("/tldr", new GatewayCommand { Name = "summarize", TextAliases = new[] { "/tldr" } }.DisplayName());
+        Assert.Equal("/bare", new GatewayCommand { Name = "bare" }.DisplayName());
+        // Already-prefixed names are not double-slashed.
+        Assert.Equal("/x", new GatewayCommand { Name = "/x" }.DisplayName());
+    }
+
+    [Theory]
+    [InlineData("native", "Native")]
+    [InlineData("skill", "Skill")]
+    [InlineData("plugin", "Plugin")]
+    [InlineData("", "")]
+    [InlineData(null, "")]
+    public void SourceLabel_CapitalizesSource(string? source, string expected)
+    {
+        Assert.Equal(expected, new GatewayCommand { Name = "x", Source = source }.SourceLabel());
+    }
+
+    [Fact]
+    public void RequiresArgs_TrueWhenAcceptsArgsOrRequiredArg()
+    {
+        Assert.False(new GatewayCommand { Name = "a" }.RequiresArgs());
+        Assert.True(new GatewayCommand { Name = "a", AcceptsArgs = true }.RequiresArgs());
+        Assert.True(new GatewayCommand
+        {
+            Name = "a",
+            Args = new[] { new GatewayCommandArg { Name = "x", Required = true } }
+        }.RequiresArgs());
+        // Optional-only arg, AcceptsArgs not set → no required input.
+        Assert.False(new GatewayCommand
+        {
+            Name = "a",
+            Args = new[] { new GatewayCommandArg { Name = "x", Required = false } }
+        }.RequiresArgs());
+    }
+
+    [Fact]
+    public void BuildInsertionText_AppendsSpaceOnlyWhenArgsNeeded()
+    {
+        Assert.Equal("/clear", new GatewayCommand { Name = "clear", NativeName = "/clear" }.BuildInsertionText());
+        Assert.Equal("/model ", new GatewayCommand { Name = "model", NativeName = "/model", AcceptsArgs = true }.BuildInsertionText());
+        var withRequired = new GatewayCommand
+        {
+            Name = "m", NativeName = "/m",
+            Args = new[] { new GatewayCommandArg { Name = "id", Required = true } }
+        };
+        Assert.Equal("/m ", withRequired.BuildInsertionText());
+    }
+
+    // ── Mac-parity presentation helpers ──
+
+    [Fact]
+    public void ArgTemplate_FormatsRequiredAndOptionalArgs()
+    {
+        Assert.Equal("", new GatewayCommand { Name = "a" }.ArgTemplate());
+        var cmd = new GatewayCommand
+        {
+            Name = "a",
+            Args = new[]
+            {
+                new GatewayCommandArg { Name = "message", Required = true },
+                new GatewayCommandArg { Name = "level", Required = false },
+            },
+        };
+        Assert.Equal("<message> [level]", cmd.ArgTemplate());
+    }
+
+    [Fact]
+    public void OptionCount_CountsStaticChoicesOnFirstArgOnly()
+    {
+        Assert.Equal(0, new GatewayCommand { Name = "a" }.OptionCount());
+        var withChoices = new GatewayCommand
+        {
+            Name = "a",
+            Args = new[]
+            {
+                new GatewayCommandArg
+                {
+                    Name = "id",
+                    Choices = new[]
+                    {
+                        new GatewayCommandArgChoice { Value = "fast" },
+                        new GatewayCommandArgChoice { Value = "slow" },
+                    },
+                },
+            },
+        };
+        Assert.Equal(2, withChoices.OptionCount());
+        // Dynamic choices are not counted (resolved by the gateway at runtime).
+        var dynamic = new GatewayCommand
+        {
+            Name = "a",
+            Args = new[] { new GatewayCommandArg { Name = "id", IsDynamic = true, Choices = new[] { new GatewayCommandArgChoice { Value = "x" } } } },
+        };
+        Assert.Equal(0, dynamic.OptionCount());
+    }
+
+    [Fact]
+    public void FirstArgChoices_ReturnsStaticChoicesElseEmpty()
+    {
+        Assert.Empty(new GatewayCommand { Name = "a" }.FirstArgChoices());
+        var cmd = new GatewayCommand
+        {
+            Name = "a",
+            Args = new[]
+            {
+                new GatewayCommandArg { Name = "id", Choices = new[] { new GatewayCommandArgChoice { Value = "fast", Label = "Fast" } } },
+            },
+        };
+        Assert.Single(cmd.FirstArgChoices());
+        Assert.Equal("fast", cmd.FirstArgChoices()[0].Value);
+    }
+
+    [Fact]
+    public void BuildArgInsertionText_BuildsSlashNameValue()
+    {
+        var cmd = new GatewayCommand { Name = "model", NativeName = "/model" };
+        Assert.Equal("/model gpt-5", cmd.BuildArgInsertionText("gpt-5"));
+        Assert.Equal("/model gpt-5", cmd.BuildArgInsertionText("  gpt-5 "));
+    }
+
+    [Theory]
+    [InlineData("model", true)]
+    [InlineData("/model", true)]
+    [InlineData("MODEL", true)]
+    [InlineData("tldr", true)]   // text alias
+    [InlineData("nope", false)]
+    [InlineData("", false)]
+    public void MatchesName_MatchesNativeNameAndAliases(string probe, bool expected)
+    {
+        var cmd = new GatewayCommand { Name = "model", NativeName = "/model", TextAliases = new[] { "/tldr" } };
+        Assert.Equal(expected, cmd.MatchesName(probe));
+    }
+
+    // ── ChatCommandCatalogView search ──
+
+    [Fact]
+    public void Search_EmptyQuery_ReturnsAllOrderedByDisplayName()
+    {
+        var view = new ChatCommandCatalogView(Sample());
+        var all = view.Search("");
+        Assert.Equal(5, all.Count);
+        var names = all.Select(c => c.DisplayName()).ToList();
+        Assert.Equal(names.OrderBy(n => n, System.StringComparer.OrdinalIgnoreCase).ToList(), names);
+    }
+
+    [Theory]
+    [InlineData("clear")]
+    [InlineData("CLE")]
+    [InlineData("/clear")]
+    public void Search_MatchesByNameNativeAndIsCaseInsensitive(string query)
+    {
+        var view = new ChatCommandCatalogView(Sample());
+        Assert.Contains(view.Search(query), c => c.Name == "clear");
+    }
+
+    [Fact]
+    public void Search_MatchesByAlias()
+    {
+        var view = new ChatCommandCatalogView(Sample());
+        Assert.Contains(view.Search("tldr"), c => c.Name == "summarize");
+    }
+
+    [Fact]
+    public void Search_MatchesByDescriptionAndCategory()
+    {
+        var view = new ChatCommandCatalogView(Sample());
+        Assert.Contains(view.Search("Switch the active"), c => c.Name == "model");
+        Assert.Contains(view.Search("Skills"), c => c.Name == "deploy");
+    }
+
+    [Fact]
+    public void Search_RanksPrefixMatchesAboveContainsMatches()
+    {
+        var view = new ChatCommandCatalogView(new[]
+        {
+            new GatewayCommand { Name = "preview", NativeName = "/preview" },
+            new GatewayCommand { Name = "view", NativeName = "/view" },
+        });
+        var results = view.Search("view");
+        // "/view" is a prefix match; "/preview" only a contains match → view first.
+        Assert.Equal("view", results[0].Name);
+    }
+
+    [Fact]
+    public void Search_NoMatch_ReturnsEmpty()
+    {
+        var view = new ChatCommandCatalogView(Sample());
+        Assert.Empty(view.Search("zzzznotacommand"));
+    }
+
+    // ── ChatCommandCatalogView grouping ──
+
+    [Fact]
+    public void GroupByCategory_GroupsAndOrders()
+    {
+        var view = new ChatCommandCatalogView(Sample());
+        var groups = view.GroupByCategory();
+        var categories = groups.Select(g => g.Category).ToList();
+        Assert.Contains("Session", categories);
+        Assert.Contains("Text", categories);
+        Assert.Contains("Skills", categories);
+        Assert.Equal(categories.OrderBy(c => c, System.StringComparer.OrdinalIgnoreCase).ToList(), categories);
+        var session = groups.Single(g => g.Category == "Session");
+        Assert.Equal(new[] { "/clear", "/model" }, session.Commands.Select(c => c.DisplayName()).ToArray());
+    }
+
+    [Fact]
+    public void GroupByCategory_FallsBackToSourceLabelThenOther()
+    {
+        var view = new ChatCommandCatalogView(new[]
+        {
+            new GatewayCommand { Name = "a", Source = "plugin" },  // no category → "Plugin"
+            new GatewayCommand { Name = "b" },                       // no category/source → "Other"
+        });
+        var categories = view.GroupByCategory().Select(g => g.Category).ToList();
+        Assert.Contains("Plugin", categories);
+        Assert.Contains("Other", categories);
+    }
+
+    [Fact]
+    public void GroupByCategory_RespectsSearchFilter()
+    {
+        var view = new ChatCommandCatalogView(Sample());
+        var all = view.GroupByCategory("model").SelectMany(g => g.Commands).ToList();
+        Assert.Single(all);
+        Assert.Equal("model", all[0].Name);
+    }
+
+    [Fact]
+    public void GroupBy_WithExplicitCategoryOrder_OrdersBySequenceThenAlphabetical()
+    {
+        var view = new ChatCommandCatalogView(new[]
+        {
+            new GatewayCommand { Name = "verbose", NativeName = "/verbose", Category = "options" },
+            new GatewayCommand { Name = "stop", NativeName = "/stop", Category = "session" },
+            new GatewayCommand { Name = "send", NativeName = "/send", Category = "management" },
+            new GatewayCommand { Name = "zeta", NativeName = "/zeta", Category = "zzz-unknown" },
+        });
+
+        // Listed categories follow the supplied order; the unlisted one sorts last.
+        var order = new[] { "session", "options", "management" };
+        var categories = view.GroupByCategory(null, order).Select(g => g.Category).ToList();
+
+        Assert.Equal(new[] { "session", "options", "management", "zzz-unknown" }, categories);
+    }
+
+    [Fact]
+    public void GroupByCategory_NullCategoryOrder_StillOrdersAlphabetically()
+    {
+        var view = new ChatCommandCatalogView(Sample());
+        var categories = view.GroupByCategory(null, null).Select(g => g.Category).ToList();
+        Assert.Equal(categories.OrderBy(c => c, System.StringComparer.OrdinalIgnoreCase).ToList(), categories);
+    }
+
+    // ── CommandCategories: Mac 4-bucket mapping ──
+
+    [Fact]
+    public void GroupBy_MacBucket_GroupsRunOptionsUnderModel()
+    {
+        var view = new ChatCommandCatalogView(new[]
+        {
+            new GatewayCommand { Name = "verbose", NativeName = "/verbose", Category = "options" },
+            new GatewayCommand { Name = "exec", NativeName = "/exec", Category = "options" },
+            new GatewayCommand { Name = "usage", NativeName = "/usage", Category = "options" },   // override → tools
+            new GatewayCommand { Name = "stop", NativeName = "/stop", Category = "session" },
+            new GatewayCommand { Name = "send", NativeName = "/send", Category = "management" },   // → tools
+            new GatewayCommand { Name = "steer", NativeName = "/steer", Category = "tools" },      // override → agents
+        });
+
+        var groups = view.GroupBy(CommandCategories.Bucket, null, CommandCategories.DisplayOrder);
+        var keys = groups.Select(g => g.Category).ToList();
+
+        // Mac order: session, model, tools, agents.
+        Assert.Equal(new[] { "session", "model", "tools", "agents" }, keys);
+        Assert.Equal(new[] { "/exec", "/verbose" }, groups.Single(g => g.Category == "model").Commands.Select(c => c.DisplayName()).ToArray());
+        Assert.Contains(groups.Single(g => g.Category == "tools").Commands, c => c.Name == "usage");
+        Assert.Contains(groups.Single(g => g.Category == "tools").Commands, c => c.Name == "send");
+        Assert.Contains(groups.Single(g => g.Category == "agents").Commands, c => c.Name == "steer");
+    }
+
+    [Fact]
+    public void GroupBy_PreservesSearchRelevanceWithinGroup_NotAlphabetical()
+    {
+        // Both commands bucket under "model" (raw category options). For query
+        // "model", "model" is an exact match while "amodel" is only a contains
+        // match — relevance must keep "model" first even though "amodel" sorts
+        // first alphabetically. Guards against re-introducing a within-group sort.
+        var view = new ChatCommandCatalogView(new[]
+        {
+            new GatewayCommand { Name = "amodel", NativeName = "/amodel", Category = "options" },
+            new GatewayCommand { Name = "model", NativeName = "/model", Category = "options" },
+        });
+
+        var model = view.GroupBy(CommandCategories.Bucket, "model", CommandCategories.DisplayOrder)
+            .Single(g => g.Category == "model");
+
+        Assert.Equal(new[] { "/model", "/amodel" }, model.Commands.Select(c => c.DisplayName()).ToArray());
+    }
+
+    [Fact]
+    public void GroupForPalette_DefaultSelection_PinsGlobalBestAcrossBuckets()
+    {
+        // "exec" is an exact match in the Model bucket; "reexec" is only a contains
+        // match in the earlier Session bucket. Display grouping renders Session
+        // first, so the weak match is row 0 — but DefaultSelectionIndex must point
+        // at the global best (exec), so Enter/Tab still inserts the strongest match
+        // rather than the first visible row. Regression guard for grouped selection.
+        var view = new ChatCommandCatalogView(new[]
+        {
+            new GatewayCommand { Name = "reexec", NativeName = "/reexec", Category = "session" },
+            new GatewayCommand { Name = "exec", NativeName = "/exec", Category = "options" },
+        });
+
+        var palette = view.GroupForPalette(CommandCategories.Bucket, "exec", CommandCategories.DisplayOrder);
+
+        // Flattened (render/nav) order follows bucket order: weak Session match first.
+        Assert.Equal(new[] { "reexec", "exec" }, palette.Flattened.Select(c => c.Name).ToArray());
+        // But the default keyboard selection is the global best match, not row 0.
+        Assert.Equal(1, palette.DefaultSelectionIndex);
+        Assert.Equal("exec", palette.Flattened[palette.DefaultSelectionIndex].Name);
+    }
+
+    [Fact]
+    public void GroupForPalette_DefaultSelection_IsZeroWhenNoMatches()
+    {
+        var view = new ChatCommandCatalogView(new[]
+        {
+            new GatewayCommand { Name = "exec", NativeName = "/exec", Category = "options" },
+        });
+        var palette = view.GroupForPalette(CommandCategories.Bucket, "zzznope", CommandCategories.DisplayOrder);
+        Assert.Empty(palette.Flattened);
+        Assert.Equal(0, palette.DefaultSelectionIndex);
+    }
+
+    [Fact]
+    public void GroupForPalette_FlattenedMatchesGroupedOrder()
+    {
+        // Flattened must equal the groups concatenated in order, so the composer's
+        // running render index stays aligned with the keyboard-navigation list.
+        var view = new ChatCommandCatalogView(Sample());
+        var palette = view.GroupForPalette(CommandCategories.Bucket, null, CommandCategories.DisplayOrder);
+        Assert.Equal(
+            palette.Groups.SelectMany(g => g.Commands).Select(c => c.Name).ToArray(),
+            palette.Flattened.Select(c => c.Name).ToArray());
+    }
+
+    [Theory]
+    [InlineData("verbose", "options", "model")]   // run option → Model
+    [InlineData("exec", "options", "model")]
+    [InlineData("trace", "options", "model")]     // no override; raw "options" → model
+    [InlineData("usage", "options", "tools")]     // override wins over raw category
+    [InlineData("think", "options", "model")]
+    [InlineData("stop", "session", "session")]
+    [InlineData("send", "management", "tools")]    // raw "management" → tools
+    [InlineData("steer", "tools", "agents")]       // override → agents
+    [InlineData("mystery", "weirdcat", "tools")]   // unknown name + unknown category → tools
+    public void Bucket_MapsCommandToMacDisplayBucket(string name, string category, string expected)
+    {
+        var cmd = new GatewayCommand { Name = name, NativeName = "/" + name, Category = category };
+        Assert.Equal(expected, CommandCategories.Bucket(cmd));
+    }
+
+    [Theory]
+    [InlineData("session", "Session")]
+    [InlineData("model", "Model")]
+    [InlineData("tools", "Tools")]
+    [InlineData("agents", "Agents")]
+    [InlineData("custom", "Custom")]   // unknown → Title-cased
+    [InlineData("", "Other")]
+    [InlineData(null, "Other")]
+    public void CommandCategories_Label_MapsKnownAndTitleCasesUnknown(string? bucket, string expected)
+    {
+        Assert.Equal(expected, CommandCategories.Label(bucket));
+    }
+
+    [Fact]
+    public void CommandCategories_DisplayOrder_MatchesMac()
+    {
+        Assert.Equal(new[] { "session", "model", "tools", "agents" }, CommandCategories.DisplayOrder.ToArray());
+    }
+
+    [Fact]
+    public void View_NullCommands_IsEmpty()
+    {
+        var view = new ChatCommandCatalogView(null);
+        Assert.Equal(0, view.Count);
+        Assert.Empty(view.Search("anything"));
+        Assert.Empty(view.GroupByCategory());
+    }
+}
diff --git a/tests/OpenClaw.Shared.Tests/CronPayloadShapeTests.cs b/tests/OpenClaw.Shared.Tests/CronPayloadShapeTests.cs
index cb0c3e357..a051b0633 100644
--- a/tests/OpenClaw.Shared.Tests/CronPayloadShapeTests.cs
+++ b/tests/OpenClaw.Shared.Tests/CronPayloadShapeTests.cs
@@ -47,16 +47,52 @@ public void CronRuns_Payload_Uses_Id_Not_JobId()
     }
 
     [Fact]
-    public void CronRun_Payload_Uses_Id()
+    public void CronRun_Payload_Uses_JobId()
     {
         // Mirrors the wire object built by RunCronJobAsync
-        var payload = new { id = "job-789", force = true };
+        var payload = new { jobId = "job-789" };
         var el = Serialize(payload);
 
-        Assert.True(el.TryGetProperty("id", out var idProp));
+        Assert.True(el.TryGetProperty("jobId", out var idProp));
         Assert.Equal("job-789", idProp.GetString());
-        Assert.False(el.TryGetProperty("jobId", out _));
-        Assert.True(el.GetProperty("force").GetBoolean());
+        Assert.False(el.TryGetProperty("id", out _));
+        Assert.False(el.TryGetProperty("force", out _));
+    }
+
+    [Fact]
+    public void CronRun_Response_EmptyPayload_IsAcceptedLegacyAck()
+    {
+        var payload = Serialize(new { });
+
+        var result = OpenClawGatewayClient.ParseCronRunRequestResult(payload);
+
+        Assert.True(result.Accepted);
+        Assert.True(result.Enqueued);
+        Assert.Null(result.RunId);
+    }
+
+    [Fact]
+    public void CronRun_Response_DetailedEnqueue_PreservesRunId()
+    {
+        var payload = Serialize(new { ok = true, enqueued = true, runId = "manual:job:1" });
+
+        var result = OpenClawGatewayClient.ParseCronRunRequestResult(payload);
+
+        Assert.True(result.Accepted);
+        Assert.True(result.Enqueued);
+        Assert.Equal("manual:job:1", result.RunId);
+    }
+
+    [Fact]
+    public void CronRun_Response_ExplicitRanFalse_IsNotEnqueued()
+    {
+        var payload = Serialize(new { ok = true, ran = false, reason = "not-due" });
+
+        var result = OpenClawGatewayClient.ParseCronRunRequestResult(payload);
+
+        Assert.True(result.Accepted);
+        Assert.False(result.Enqueued);
+        Assert.Equal("not-due", result.Reason);
     }
 
     [Fact]
diff --git a/tests/OpenClaw.Shared.Tests/DeepLinkParserTests.cs b/tests/OpenClaw.Shared.Tests/DeepLinkParserTests.cs
index 891064d22..2db0a38d2 100644
--- a/tests/OpenClaw.Shared.Tests/DeepLinkParserTests.cs
+++ b/tests/OpenClaw.Shared.Tests/DeepLinkParserTests.cs
@@ -112,6 +112,17 @@ public void ParseDeepLink_HandlesWindowsCanonicalizedForm_SlashBeforeQuery()
         Assert.Equal("hello", result.Parameters["text"]);
     }
 
+    [Fact]
+    public void ParseDeepLink_CustomScheme_IsStrictlyIsolated()
+    {
+        var result = DeepLinkParser.ParseDeepLink("openclaw-dev://settings", "openclaw-dev");
+
+        Assert.NotNull(result);
+        Assert.Equal("settings", result.Path);
+        Assert.Null(DeepLinkParser.ParseDeepLink("openclaw://settings", "openclaw-dev"));
+        Assert.Null(DeepLinkParser.ParseDeepLink("openclaw-dev://settings"));
+    }
+
     // ─── GetQueryParam ────────────────────────────────────────────────────────
 
     [Theory]
diff --git a/tests/OpenClaw.Shared.Tests/ExecApprovalPolicyTests.cs b/tests/OpenClaw.Shared.Tests/ExecApprovalPolicyTests.cs
index dc617b912..82384c916 100644
--- a/tests/OpenClaw.Shared.Tests/ExecApprovalPolicyTests.cs
+++ b/tests/OpenClaw.Shared.Tests/ExecApprovalPolicyTests.cs
@@ -281,6 +281,103 @@ public void CorruptPolicyFile_FallsBackToDefaults()
         var result = policy.Evaluate("echo hello");
         Assert.True(result.Allowed);
     }
+
+    [Fact]
+    public void Load_AcceptsLegacyAskAlias_WithoutDataLoss()
+    {
+        var legacy = """
+        {
+          "defaultAction": "ask",
+          "rules": [
+            { "pattern": "my-custom *", "action": "ask" },
+            { "pattern": "secret-only", "action": "allow" }
+          ]
+        }
+        """;
+        File.WriteAllText(Path.Combine(_tempDir, "exec-policy.json"), legacy);
+
+        var policy = CreatePolicy();
+
+        Assert.Equal(ExecApprovalAction.Prompt, policy.DefaultAction);
+        Assert.Equal(2, policy.Rules.Count);
+        Assert.Equal("my-custom *", policy.Rules[0].Pattern);
+        Assert.Equal(ExecApprovalAction.Prompt, policy.Rules[0].Action);
+        Assert.Equal(ExecApprovalAction.Allow, policy.Rules[1].Action);
+    }
+
+    [Fact]
+    public void Load_AcceptsLegacyNumericActionValues_WithoutDataLoss()
+    {
+        var legacy = """
+        {
+          "defaultAction": 2,
+          "rules": [
+            { "pattern": "my-numeric-prompt *", "action": 2 },
+            { "pattern": "my-numeric-allow *", "action": 0 },
+            { "pattern": "my-numeric-deny *", "action": 1 }
+          ]
+        }
+        """;
+        var path = Path.Combine(_tempDir, "exec-policy.json");
+        File.WriteAllText(path, legacy);
+
+        var policy = CreatePolicy();
+
+        Assert.Equal(ExecApprovalAction.Prompt, policy.DefaultAction);
+        Assert.Equal(3, policy.Rules.Count);
+        Assert.Equal(ExecApprovalAction.Prompt, policy.Rules[0].Action);
+        Assert.Equal(ExecApprovalAction.Allow, policy.Rules[1].Action);
+        Assert.Equal(ExecApprovalAction.Deny, policy.Rules[2].Action);
+        Assert.Contains("my-numeric-prompt", File.ReadAllText(path));
+    }
+
+    [Fact]
+    public void Load_LegacyAskFile_DoesNotOverwriteWithDefaultRules()
+    {
+        var legacy = """
+        {
+          "defaultAction": "ask",
+          "rules": [
+            { "pattern": "my-unique-pattern-xyz *", "action": "allow" }
+          ]
+        }
+        """;
+        var path = Path.Combine(_tempDir, "exec-policy.json");
+        File.WriteAllText(path, legacy);
+
+        _ = CreatePolicy();
+
+        var after = File.ReadAllText(path);
+        Assert.Contains("my-unique-pattern-xyz", after);
+    }
+
+    [Fact]
+    public void Save_AfterLoadingLegacyAsk_EmitsCanonicalPrompt()
+    {
+        var legacy = """{"defaultAction":"ask","rules":[]}""";
+        var path = Path.Combine(_tempDir, "exec-policy.json");
+        File.WriteAllText(path, legacy);
+
+        var policy = CreatePolicy();
+        policy.Save();
+
+        var after = File.ReadAllText(path);
+        Assert.Contains("\"prompt\"", after);
+        Assert.DoesNotContain("\"ask\"", after);
+    }
+
+    [Fact]
+    public void Load_AcceptsCanonicalPromptValue()
+    {
+        var canonical = """{"defaultAction":"prompt","rules":[{"pattern":"x","action":"prompt"}]}""";
+        File.WriteAllText(Path.Combine(_tempDir, "exec-policy.json"), canonical);
+
+        var policy = CreatePolicy();
+
+        Assert.Equal(ExecApprovalAction.Prompt, policy.DefaultAction);
+        Assert.Single(policy.Rules);
+        Assert.Equal(ExecApprovalAction.Prompt, policy.Rules[0].Action);
+    }
     
     [Fact]
     public void InsertRule_ClampsToZero_ForNegativeIndex()
@@ -393,84 +490,6 @@ public void ShellFilter_DefaultsToLowercase_WhenShellNotProvided()
         Assert.False(result.Allowed); // cmd rule didn't match, default deny applies
     }
 
-    // ── Legacy "ask" alias migration (regression for silent rule wipe) ──
-    // Older Permissions UI versions wrote "ask" instead of the canonical "prompt".
-    // Before the fix, Load() would throw on "ask", fall back to default rules, and
-    // overwrite the user's file — silently destroying any custom rules they had.
-
-    [Fact]
-    public void Load_AcceptsLegacyAskAlias_WithoutDataLoss()
-    {
-        var legacy = """
-        {
-          "defaultAction": "ask",
-          "rules": [
-            { "pattern": "my-custom *", "action": "ask" },
-            { "pattern": "secret-only", "action": "allow" }
-          ]
-        }
-        """;
-        File.WriteAllText(Path.Combine(_tempDir, "exec-policy.json"), legacy);
-
-        var policy = CreatePolicy();
-
-        Assert.Equal(ExecApprovalAction.Prompt, policy.DefaultAction);
-        Assert.Equal(2, policy.Rules.Count);
-        Assert.Equal("my-custom *", policy.Rules[0].Pattern);
-        Assert.Equal(ExecApprovalAction.Prompt, policy.Rules[0].Action);
-        Assert.Equal(ExecApprovalAction.Allow, policy.Rules[1].Action);
-    }
-
-    [Fact]
-    public void Load_LegacyAskFile_DoesNotOverwriteWithDefaultRules()
-    {
-        var legacy = """
-        {
-          "defaultAction": "ask",
-          "rules": [
-            { "pattern": "my-unique-pattern-xyz *", "action": "allow" }
-          ]
-        }
-        """;
-        var path = Path.Combine(_tempDir, "exec-policy.json");
-        File.WriteAllText(path, legacy);
-
-        _ = CreatePolicy(); // triggers Load()
-
-        // File contents must still contain the user's custom rule. If the bug regresses,
-        // Load()'s catch handler would overwrite the file with CreateDefaultRules().
-        var after = File.ReadAllText(path);
-        Assert.Contains("my-unique-pattern-xyz", after);
-    }
-
-    [Fact]
-    public void Save_AfterLoadingLegacyAsk_EmitsCanonicalPrompt()
-    {
-        var legacy = """{"defaultAction":"ask","rules":[]}""";
-        var path = Path.Combine(_tempDir, "exec-policy.json");
-        File.WriteAllText(path, legacy);
-
-        var policy = CreatePolicy();
-        policy.Save();
-
-        var after = File.ReadAllText(path);
-        Assert.Contains("\"prompt\"", after);
-        Assert.DoesNotContain("\"ask\"", after);
-    }
-
-    [Fact]
-    public void Load_AcceptsCanonicalPromptValue()
-    {
-        var canonical = """{"defaultAction":"prompt","rules":[{"pattern":"x","action":"prompt"}]}""";
-        File.WriteAllText(Path.Combine(_tempDir, "exec-policy.json"), canonical);
-
-        var policy = CreatePolicy();
-
-        Assert.Equal(ExecApprovalAction.Prompt, policy.DefaultAction);
-        Assert.Single(policy.Rules);
-        Assert.Equal(ExecApprovalAction.Prompt, policy.Rules[0].Action);
-    }
-
     // ── Hot-reload regression tests ──
     // The Permissions UI writes exec-policy.json directly. The engine holds an
     // ExecApprovalPolicy in memory, so without hot-reload the user's edits had
diff --git a/tests/OpenClaw.Shared.Tests/GatewayErrorClassifierTests.cs b/tests/OpenClaw.Shared.Tests/GatewayErrorClassifierTests.cs
new file mode 100644
index 000000000..b08636b03
--- /dev/null
+++ b/tests/OpenClaw.Shared.Tests/GatewayErrorClassifierTests.cs
@@ -0,0 +1,159 @@
+using OpenClaw.Shared;
+using Xunit;
+
+namespace OpenClaw.Shared.Tests;
+
+public class GatewayErrorClassifierTests
+{
+    [Theory]
+    [InlineData(null, GatewayErrorKind.Unknown)]
+    [InlineData("", GatewayErrorKind.Unknown)]
+    [InlineData("   ", GatewayErrorKind.Unknown)]
+    public void Classify_Empty_IsUnknown(string? error, GatewayErrorKind expected)
+    {
+        Assert.Equal(expected, GatewayErrorClassifier.Classify(error));
+    }
+
+    [Theory]
+    [InlineData("Insufficient scope: operator.admin required")]
+    [InlineData("Forbidden — missing scope operator.pairing")]
+    [InlineData("permission denied for this operation")]
+    [InlineData("client is not permitted to approve devices")]
+    public void Classify_ScopeProblems_AreScopeMismatch(string error)
+    {
+        Assert.Equal(GatewayErrorKind.ScopeMismatch, GatewayErrorClassifier.Classify(error));
+    }
+
+    [Theory]
+    [InlineData("Device token no longer recognized by gateway")]
+    [InlineData("device token invalid — please re-pair")]
+    [InlineData("token rotated on the server")]
+    [InlineData("token revoked")]
+    [InlineData("device token unknown")]
+    public void Classify_TokenDrift_IsTokenDrift(string error)
+    {
+        Assert.Equal(GatewayErrorKind.TokenDrift, GatewayErrorClassifier.Classify(error));
+    }
+
+    [Theory]
+    [InlineData("Pairing approval pending on the gateway host")]
+    [InlineData("device pairing required")]
+    public void Classify_PairingPending_IsPairingRequired(string error)
+    {
+        Assert.Equal(GatewayErrorKind.PairingRequired, GatewayErrorClassifier.Classify(error));
+    }
+
+    [Theory]
+    [InlineData("Pairing request was rejected")]
+    [InlineData("approval denied by operator")]
+    public void Classify_PairingRejected_IsPairingRejected(string error)
+    {
+        Assert.Equal(GatewayErrorKind.PairingRejected, GatewayErrorClassifier.Classify(error));
+    }
+
+    [Theory]
+    [InlineData("TLS handshake failed")]
+    [InlineData("certificate validation error")]
+    [InlineData("server requires a secure (non-cleartext) connection")]
+    public void Classify_Tls_IsTls(string error)
+    {
+        Assert.Equal(GatewayErrorKind.Tls, GatewayErrorClassifier.Classify(error));
+    }
+
+    [Theory]
+    [InlineData("ssh tunnel exited unexpectedly")]
+    [InlineData("tunnel could not bind local port")]
+    public void Classify_Tunnel_IsTunnel(string error)
+    {
+        Assert.Equal(GatewayErrorKind.Tunnel, GatewayErrorClassifier.Classify(error));
+    }
+
+    [Theory]
+    [InlineData("401 Unauthorized")]
+    [InlineData("invalid credential supplied")]
+    [InlineData("authentication failed")]
+    public void Classify_GenericAuth_IsAuth(string error)
+    {
+        Assert.Equal(GatewayErrorKind.Auth, GatewayErrorClassifier.Classify(error));
+    }
+
+    [Theory]
+    [InlineData("500 internal error")]
+    [InlineData("gateway returned a server error")]
+    public void Classify_Server_IsServer(string error)
+    {
+        Assert.Equal(GatewayErrorKind.Server, GatewayErrorClassifier.Classify(error));
+    }
+
+    [Theory]
+    [InlineData("connection refused")]
+    [InlineData("host unreachable")]
+    [InlineData("connect timed out")]
+    public void Classify_Network_IsNetwork(string error)
+    {
+        Assert.Equal(GatewayErrorKind.Network, GatewayErrorClassifier.Classify(error));
+    }
+
+    [Theory]
+    [InlineData("rate limit exceeded")]
+    [InlineData("429 Too Many Requests")]
+    [InlineData("too many requests, slow down")]
+    public void Classify_RateLimited_IsRateLimited(string error)
+    {
+        Assert.Equal(GatewayErrorKind.RateLimited, GatewayErrorClassifier.Classify(error));
+    }
+
+    [Fact]
+    public void Classify_SshPermissionDenied_IsTunnel_NotScope()
+    {
+        // SSH failures read "Permission denied (publickey)" — must not be
+        // mistaken for a scope problem (tunnel detection runs first).
+        Assert.Equal(
+            GatewayErrorKind.Tunnel,
+            GatewayErrorClassifier.Classify("SSH tunnel failed: Permission denied (publickey)"));
+    }
+
+    [Fact]
+    public void Classify_ServerErrorMentioningToken_IsServer_NotAuth()
+    {
+        // A transient 5xx that merely mentions a token must not route to the
+        // re-pair (Auth) path.
+        Assert.Equal(
+            GatewayErrorKind.Server,
+            GatewayErrorClassifier.Classify("500 internal error: token validation failed"));
+    }
+
+    [Fact]
+    public void Classify_CertificateNotApproved_IsTls_NotPairing()
+    {
+        Assert.Equal(
+            GatewayErrorKind.Tls,
+            GatewayErrorClassifier.Classify("certificate not approved by CA"));
+    }
+
+    [Fact]
+    public void Classify_RepairWord_DoesNotMatchPairing()
+    {
+        // "repair" contains "pair" — must not be classified as pairing.
+        Assert.NotEqual(
+            GatewayErrorKind.PairingRequired,
+            GatewayErrorClassifier.Classify("could not repair connection to gateway"));
+    }
+
+    [Fact]
+    public void Classify_ScopeWins_OverGenericAuthKeywords()
+    {
+        // Contains both "unauthorized" and "scope" — scope is the actionable kind.
+        Assert.Equal(
+            GatewayErrorKind.ScopeMismatch,
+            GatewayErrorClassifier.Classify("Unauthorized: insufficient scope operator.write"));
+    }
+
+    [Fact]
+    public void Classify_TokenDriftWins_OverGenericAuthKeywords()
+    {
+        Assert.Equal(
+            GatewayErrorKind.TokenDrift,
+            GatewayErrorClassifier.Classify("auth failed: device token no longer valid, re-pair required"));
+    }
+}
diff --git a/tests/OpenClaw.Shared.Tests/GatewayProtocolLiveRoundTripTests.cs b/tests/OpenClaw.Shared.Tests/GatewayProtocolLiveRoundTripTests.cs
index 7a4afc1b6..b5e6469b7 100644
--- a/tests/OpenClaw.Shared.Tests/GatewayProtocolLiveRoundTripTests.cs
+++ b/tests/OpenClaw.Shared.Tests/GatewayProtocolLiveRoundTripTests.cs
@@ -84,7 +84,15 @@ public async Task NewProtocolMethods_RealWebSocketRoundTrip_SendCorrectWireFrame
             Assert.Equal("hello world", file.Content);
             Assert.Contains("\"sessionKey\"", server.FrameFor("sessions.files.get"));
 
-            // ── 3. sessions.compaction.list + branch (param key/checkpointId; branch returns sourceKey + new key) ──
+            // ── 3. chat.history (real client transcript export path) ──
+            var history = await client.RequestChatHistoryAsync(key, timeoutMs: rpc);
+            Assert.Equal("sid-1", history.SessionId);
+            var message = Assert.Single(history.Messages);
+            Assert.Equal("assistant", message.Role);
+            Assert.Equal("done", message.Text);
+            Assert.Contains("\"sessionKey\"", server.FrameFor("chat.history"));
+
+            // ── 4. sessions.compaction.list + branch (param key/checkpointId; branch returns sourceKey + new key) ──
             var checkpoints = await client.ListCompactionCheckpointsAsync(key, timeoutMs: rpc);
             Assert.True(checkpoints.IsSupported);
             Assert.Equal("cp1", Assert.Single(checkpoints.Checkpoints).Id);
@@ -95,7 +103,7 @@ public async Task NewProtocolMethods_RealWebSocketRoundTrip_SendCorrectWireFrame
             Assert.Equal("agent:main:branch-1", branch.ResultSessionKey);
             Assert.Contains("\"checkpointId\"", server.FrameFor("sessions.compaction.branch"));
 
-            // ── 4. sessions.patch SET then CLEAR (the tri-state proof) ──
+            // ── 5. sessions.patch SET then CLEAR (the tri-state proof) ──
             // PatchSessionAsync is fire-and-tracked (returns on send, not on
             // response), so wait for the captured frame to arrive on the server.
             var setOk = await client.PatchSessionAsync(key, new SessionPatch { Model = "gpt-5", FastMode = SessionFastMode.Auto });
@@ -117,6 +125,95 @@ public async Task NewProtocolMethods_RealWebSocketRoundTrip_SendCorrectWireFrame
         }
     }
 
+    [Fact]
+    public async Task CronRunDetailed_FallsBackToLegacyIdPayload_WhenJobIdPayloadIsRejected()
+    {
+        using var server = new LoopbackGatewayServer();
+        var requestCount = 0;
+        var observedParameters = new ConcurrentQueue<JsonElement>();
+        server.OnMethod("cron.run", parameters =>
+        {
+            requestCount++;
+            observedParameters.Enqueue(parameters.Clone());
+            if (requestCount == 1)
+                return LoopbackResponse.Fail("invalid cron.run params: unexpected property jobId");
+
+            return new { ok = true, enqueued = true, runId = "manual:job-legacy:1" };
+        });
+
+        var logger = new TestLogger();
+        var client = new OpenClawGatewayClient(
+            server.WebSocketUrl, "test-token", logger,
+            tokenIsBootstrapToken: false, bootstrapPairAsNode: false,
+            identityPath: _identityDir);
+
+        try
+        {
+            await ConnectAndWaitAsync(client, server);
+
+            var result = await client.RunCronJobDetailedAsync("job-legacy", timeoutMs: 20000);
+
+            Assert.True(result.Accepted);
+            Assert.True(result.Enqueued);
+            Assert.Equal("manual:job-legacy:1", result.RunId);
+            Assert.Equal(2, requestCount);
+            await server.WaitFrameAsync("cron.run", occurrence: 1, timeoutMs: 20000);
+
+            var payloads = observedParameters.ToArray();
+            Assert.Equal(2, payloads.Length);
+            Assert.True(payloads[0].TryGetProperty("jobId", out var jobId));
+            Assert.Equal("job-legacy", jobId.GetString());
+            Assert.False(payloads[0].TryGetProperty("id", out _));
+            Assert.True(payloads[1].TryGetProperty("id", out var id));
+            Assert.Equal("job-legacy", id.GetString());
+            Assert.True(payloads[1].TryGetProperty("force", out var force));
+            Assert.True(force.GetBoolean());
+            Assert.False(payloads[1].TryGetProperty("jobId", out _));
+        }
+        finally
+        {
+            await client.DisconnectAsync();
+        }
+    }
+
+    [Fact]
+    public async Task ChatSend_UsesCallerProvidedIdempotencyKeyOnWire()
+    {
+        using var server = new LoopbackGatewayServer();
+        server.OnMethod("chat.send", parameters =>
+        {
+            Assert.Equal("agent:main:main", parameters.GetProperty("sessionKey").GetString());
+            Assert.Equal("Hello", parameters.GetProperty("message").GetString());
+            Assert.Equal("send-run-123", parameters.GetProperty("idempotencyKey").GetString());
+            return new { runId = "send-run-123", sessionKey = "agent:main:main", status = "started" };
+        });
+
+        var logger = new TestLogger();
+        var client = new OpenClawGatewayClient(
+            server.WebSocketUrl, "test-token", logger,
+            tokenIsBootstrapToken: false, bootstrapPairAsNode: false,
+            identityPath: _identityDir);
+
+        try
+        {
+            await ConnectAndWaitAsync(client, server);
+
+            var result = await client.SendChatMessageForRunAsync(
+                "Hello",
+                sessionKey: "agent:main:main",
+                idempotencyKey: "send-run-123");
+
+            Assert.Equal("send-run-123", result.RunId);
+            Assert.Equal("started", result.Status);
+            var frame = await server.WaitFrameAsync("chat.send", occurrence: 0, timeoutMs: 20000);
+            Assert.Contains("\"idempotencyKey\":\"send-run-123\"", frame);
+        }
+        finally
+        {
+            await client.DisconnectAsync();
+        }
+    }
+
     private static void ConfigureResponders(LoopbackGatewayServer server)
     {
         // NOTE: intentionally NO hello-ok responder. The new methods only require
@@ -167,6 +264,20 @@ private static void ConfigureResponders(LoopbackGatewayServer server)
             }
         });
 
+        server.OnMethod("chat.history", _ => new
+        {
+            sessionId = "sid-1",
+            messages = new object[]
+            {
+                new
+                {
+                    role = "assistant",
+                    content = "done",
+                    timestamp = 1700000000001L
+                }
+            }
+        });
+
         server.OnMethod("sessions.compaction.list", _ => new
         {
             ok = true,
@@ -401,7 +512,11 @@ private async Task HandleFrameAsync(WebSocket socket, string frame)
                 ? responder(parameters)
                 : new { };
 
-            var response = JsonSerializer.Serialize(new { type = "res", id, ok = true, payload });
+            var response = payload is LoopbackResponse loopbackResponse
+                ? loopbackResponse.Ok
+                    ? JsonSerializer.Serialize(new { type = "res", id, ok = true, payload = loopbackResponse.Payload })
+                    : JsonSerializer.Serialize(new { type = "res", id, ok = false, error = loopbackResponse.Error })
+                : JsonSerializer.Serialize(new { type = "res", id, ok = true, payload });
             var bytes = Encoding.UTF8.GetBytes(response);
             await socket.SendAsync(new ArraySegment<byte>(bytes), WebSocketMessageType.Text, endOfMessage: true, CancellationToken.None);
         }
@@ -424,4 +539,9 @@ public void Dispose()
             _cts.Dispose();
         }
     }
+
+    private sealed record LoopbackResponse(bool Ok, object? Payload = null, string? Error = null)
+    {
+        public static LoopbackResponse Fail(string error) => new(false, Error: error);
+    }
 }
diff --git a/tests/OpenClaw.Shared.Tests/GatewayProtocolModelsTests.cs b/tests/OpenClaw.Shared.Tests/GatewayProtocolModelsTests.cs
index 4e42030ae..99723360c 100644
--- a/tests/OpenClaw.Shared.Tests/GatewayProtocolModelsTests.cs
+++ b/tests/OpenClaw.Shared.Tests/GatewayProtocolModelsTests.cs
@@ -2,6 +2,7 @@
 using System.Reflection;
 using System.Text.Json;
 using OpenClaw.Shared;
+using OpenClaw.Shared.Sessions;
 using Xunit;
 
 namespace OpenClaw.Shared.Tests;
@@ -538,6 +539,29 @@ public void ParseCompactionCheckpointList_ParsesCheckpoints()
         Assert.NotNull(cp.CreatedAt);
     }
 
+    [Fact]
+    public void ParseCompactionCheckpointList_PreservesUntargetableCheckpointsForRestoreSafety()
+    {
+        var payload = Parse("""
+        {
+          "ok": true,
+          "key": "agent:main:main",
+          "checkpoints": [
+            { "createdAt": 1700000001000, "reason": "missing-id" },
+            { "checkpointId": "cp1", "createdAt": 1700000000000, "reason": "manual" }
+          ]
+        }
+        """);
+
+        var list = OpenClawGatewayClient.ParseCompactionCheckpointList(payload, "agent:main:main");
+
+        Assert.Equal(2, list.Checkpoints.Count);
+        Assert.Equal("", list.Checkpoints[0].Id);
+        Assert.Equal("missing-id", list.Checkpoints[0].Reason);
+        Assert.Equal("cp1", list.Checkpoints[1].Id);
+        Assert.Null(SessionCheckpointSelection.ResolveUnambiguousLatest(list.Checkpoints));
+    }
+
     [Fact]
     public void ParseCompactionCheckpointResult_ParsesSingleCheckpoint()
     {
diff --git a/tests/OpenClaw.Shared.Tests/MenuHelpersTests.cs b/tests/OpenClaw.Shared.Tests/MenuHelpersTests.cs
index 4ead3d291..505c8de04 100644
--- a/tests/OpenClaw.Shared.Tests/MenuHelpersTests.cs
+++ b/tests/OpenClaw.Shared.Tests/MenuHelpersTests.cs
@@ -177,6 +177,27 @@ public void ConvertPixelsToViewUnits_SmallResult_ReturnsAtLeastOne()
         Assert.Equal(1, MenuSizingHelper.ConvertPixelsToViewUnits(1, 192));
     }
 
+    [Fact]
+    public void ConvertViewUnitsToPixels_96Dpi_ReturnsSameViewUnits()
+    {
+        Assert.Equal(100, MenuSizingHelper.ConvertViewUnitsToPixels(100, 96));
+    }
+
+    [Fact]
+    public void ConvertViewUnitsToPixels_FractionalDpi_RoundsUpToContainingPixel()
+    {
+        Assert.Equal(125, MenuSizingHelper.ConvertViewUnitsToPixels(100, 120));
+        Assert.Equal(151, MenuSizingHelper.ConvertViewUnitsToPixels(100.5, 144));
+    }
+
+    [Fact]
+    public void ConvertViewUnitsToPixels_InvalidOrNonPositive_ReturnsZero()
+    {
+        Assert.Equal(0, MenuSizingHelper.ConvertViewUnitsToPixels(0, 96));
+        Assert.Equal(0, MenuSizingHelper.ConvertViewUnitsToPixels(-1, 96));
+        Assert.Equal(0, MenuSizingHelper.ConvertViewUnitsToPixels(double.NaN, 96));
+    }
+
     // ── HasDpiOrScaleChanged ─────────────────────────────────────────────────
 
     [Fact]
diff --git a/tests/OpenClaw.Shared.Tests/ModelsTests.cs b/tests/OpenClaw.Shared.Tests/ModelsTests.cs
index e73860d89..9f9f33c7b 100644
--- a/tests/OpenClaw.Shared.Tests/ModelsTests.cs
+++ b/tests/OpenClaw.Shared.Tests/ModelsTests.cs
@@ -5,6 +5,41 @@
 
 namespace OpenClaw.Shared.Tests;
 
+public class ChatSendResultTests
+{
+    [Theory]
+    [InlineData("failed")]
+    [InlineData("failure")]
+    [InlineData("error")]
+    [InlineData("rejected")]
+    [InlineData("denied")]
+    [InlineData("aborted")]
+    [InlineData("timeout")]
+    [InlineData("cancelled")]
+    [InlineData("canceled")]
+    public void IsTerminalFailure_ReturnsTrue_ForTerminalStatus(string status)
+    {
+        var result = new ChatSendResult { Status = status };
+
+        Assert.True(result.IsTerminalFailure);
+        Assert.True(ChatSendResult.IsFailureStatus(status));
+    }
+
+    [Theory]
+    [InlineData(null)]
+    [InlineData("")]
+    [InlineData("started")]
+    [InlineData("in_flight")]
+    [InlineData("ok")]
+    public void IsTerminalFailure_ReturnsFalse_ForNonTerminalStatus(string? status)
+    {
+        var result = new ChatSendResult { Status = status };
+
+        Assert.False(result.IsTerminalFailure);
+        Assert.False(ChatSendResult.IsFailureStatus(status));
+    }
+}
+
 public class AgentActivityTests
 {
     [Fact]
@@ -2002,6 +2037,16 @@ public void MacNodeParityCommands_ExcludesSttTranscribe()
         Assert.DoesNotContain("stt.transcribe", CommandCenterCommandGroups.MacNodeParityCommands);
     }
 
+    [Fact]
+    public void DangerousCommands_IncludesTtsStatus()
+    {
+        // tts.status is gated behind NodeTtsEnabled alongside tts.speak so the
+        // readiness probe isn't advertised until TTS is explicitly enabled.
+        Assert.Contains("tts.speak", CommandCenterCommandGroups.DangerousCommands);
+        Assert.Contains("tts.status", CommandCenterCommandGroups.DangerousCommands);
+        Assert.Contains("tts.status", (IReadOnlySet<string>)CommandCenterCommandGroups.DangerousCommandSet);
+    }
+
     [Fact]
     public void CommonDangerousCommands_StillIncludedInMacParity()
     {
diff --git a/tests/OpenClaw.Shared.Tests/Mxc/DirectAppContainerExecutorTests.cs b/tests/OpenClaw.Shared.Tests/Mxc/DirectAppContainerExecutorTests.cs
index 24682c2e7..c8e808e9b 100644
--- a/tests/OpenClaw.Shared.Tests/Mxc/DirectAppContainerExecutorTests.cs
+++ b/tests/OpenClaw.Shared.Tests/Mxc/DirectAppContainerExecutorTests.cs
@@ -36,7 +36,7 @@ public async Task ExecuteAsync_AppContainerUnavailable_Throws()
             isWxcExecResolvable: false,
             wxcExecPath: null,
             unsupportedReasons: new[] { "test reason" });
-        var executor = new DirectAppContainerExecutor(availability, NullLogger.Instance);
+        var executor = new DirectAppContainerExecutor(() => availability, NullLogger.Instance);
 
         var ex = await Assert.ThrowsAsync<SandboxUnavailableException>(() => executor.ExecuteAsync(NewRequest()));
         Assert.Contains("test reason", ex.Message);
@@ -51,7 +51,7 @@ public async Task ExecuteAsync_WxcExecNotResolvable_Throws()
             isWxcExecResolvable: false,
             wxcExecPath: null,
             unsupportedReasons: Array.Empty<string>());
-        var executor = new DirectAppContainerExecutor(availability, NullLogger.Instance);
+        var executor = new DirectAppContainerExecutor(() => availability, NullLogger.Instance);
 
         var ex = await Assert.ThrowsAsync<SandboxUnavailableException>(() => executor.ExecuteAsync(NewRequest()));
         Assert.Contains("wxc-exec.exe not found", ex.Message);
@@ -66,18 +66,94 @@ public async Task ExecuteAsync_WxcExecPathMissingOnDisk_Throws()
             isWxcExecResolvable: true,
             wxcExecPath: "C:\\does\\not\\exist\\wxc-exec.exe",
             unsupportedReasons: Array.Empty<string>());
-        var executor = new DirectAppContainerExecutor(availability, NullLogger.Instance);
+        var executor = new DirectAppContainerExecutor(() => availability, NullLogger.Instance);
 
         // MxcExecutor's ctor throws FileNotFoundException → wrapped in SandboxUnavailableException.
         await Assert.ThrowsAsync<SandboxUnavailableException>(() => executor.ExecuteAsync(NewRequest()));
     }
 
+    [Fact]
+    public async Task ExecuteAsync_ResolvesAvailabilityPerCall_PicksUpRecovery()
+    {
+        // Simulates a transient startup probe error that later recovers. The executor
+        // must read the provider on each call, not freeze the first snapshot — else a
+        // momentary startup glitch would pin it to "unavailable" for its lifetime.
+        var calls = 0;
+        var unavailable = new MxcAvailability(
+            isAppContainerAvailable: false,
+            isIsolationSessionAvailable: false,
+            isWxcExecResolvable: true,
+            wxcExecPath: null,
+            unsupportedReasons: new[] { "transient probe error" },
+            probeErrored: true);
+        var recoveredButPathMissing = new MxcAvailability(
+            isAppContainerAvailable: true,
+            isIsolationSessionAvailable: false,
+            isWxcExecResolvable: true,
+            wxcExecPath: "C:\\does\\not\\exist\\wxc-exec.exe",
+            unsupportedReasons: Array.Empty<string>());
+
+        var executor = new DirectAppContainerExecutor(
+            () => { calls++; return calls == 1 ? unavailable : recoveredButPathMissing; },
+            NullLogger.Instance);
+
+        // First call: unavailable → throws with the transient reason.
+        var ex1 = await Assert.ThrowsAsync<SandboxUnavailableException>(() => executor.ExecuteAsync(NewRequest()));
+        Assert.Contains("transient probe error", ex1.Message);
+
+        // Second call: provider now reports available (path just doesn't exist on
+        // disk). The DIFFERENT failure proves the executor re-resolved availability
+        // instead of reusing the first (unavailable) snapshot.
+        var ex2 = await Assert.ThrowsAsync<SandboxUnavailableException>(() => executor.ExecuteAsync(NewRequest()));
+        Assert.Contains("wxc-exec.exe not found at", ex2.Message);
+        Assert.Equal(2, calls);
+    }
+
     [Fact]
     public void Name_IsStableForTelemetry()
     {
         var availability = new MxcAvailability(false, false, false, null, Array.Empty<string>());
-        var executor = new DirectAppContainerExecutor(availability, NullLogger.Instance);
+        var executor = new DirectAppContainerExecutor(() => availability, NullLogger.Instance);
         Assert.Equal("mxc-direct-appc", executor.Name);
         Assert.True(executor.IsContained);
     }
+
+    [Fact]
+    public void BuildRedactedConfigSummary_DoesNotExposeWxcExecOrRequestPaths()
+    {
+        var availability = new MxcAvailability(
+            isAppContainerAvailable: true,
+            isIsolationSessionAvailable: false,
+            isWxcExecResolvable: true,
+            wxcExecPath: "C:\\secret\\mxc\\wxc-exec.exe",
+            unsupportedReasons: Array.Empty<string>());
+        var config = new MxcConfig
+        {
+            ContainerId = "test",
+            Process = new MxcProcess
+            {
+                CommandLine = "cmd /c echo hi",
+                Cwd = "C:\\secret\\work",
+                Env = new[] { "SECRET_PATH=C:\\secret\\value" },
+            },
+            Filesystem = new MxcFilesystem
+            {
+                ReadwritePaths = new[] { "C:\\secret\\repo" },
+                ReadonlyPaths = new[] { "C:\\secret\\docs" },
+                DeniedPaths = new[] { "C:\\secret\\.ssh" },
+            },
+        };
+
+        var summary = DirectAppContainerExecutor.BuildRedactedConfigSummary(
+            availability,
+            config,
+            "{\"fake\":true}",
+            NewRequest());
+
+        Assert.Contains("wxcExec=<set>", summary);
+        Assert.Contains("cwd=<set>", summary);
+        Assert.Contains("envKeys=[SECRET_PATH]", summary);
+        Assert.DoesNotContain("C:\\secret", summary, StringComparison.OrdinalIgnoreCase);
+        Assert.DoesNotContain("cmd /c echo hi", summary, StringComparison.OrdinalIgnoreCase);
+    }
 }
diff --git a/tests/OpenClaw.Shared.Tests/Mxc/Golden/sdk-config-balanced.json b/tests/OpenClaw.Shared.Tests/Mxc/Golden/sdk-config-balanced.json
index 43c731074..793d6de41 100644
--- a/tests/OpenClaw.Shared.Tests/Mxc/Golden/sdk-config-balanced.json
+++ b/tests/OpenClaw.Shared.Tests/Mxc/Golden/sdk-config-balanced.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.4.0-alpha",
+  "version": "0.7.0-alpha",
   "containerId": "golden-balanced",
   "lifecycle": {
     "destroyOnExit": true,
@@ -14,15 +14,6 @@
       "C:\\Golden\\Documents",
       "C:\\Golden\\Downloads",
       "C:\\Golden\\Desktop"
-    ],
-    "deniedPaths": [
-      "C:\\Golden\\Settings",
-      "C:\\Golden\\.ssh",
-      "C:\\Golden\\Chrome",
-      "C:\\Golden\\Edge",
-      "C:\\Golden\\Brave",
-      "C:\\Golden\\Firefox",
-      "C:\\Golden\\PSReadLine"
     ]
   },
   "ui": {
@@ -34,7 +25,7 @@
     "defaultPolicy": "allow",
     "enforcementMode": "capabilities"
   },
-  "appContainer": {
+  "processContainer": {
     "leastPrivilege": false,
     "capabilities": [
       "internetClient"
diff --git a/tests/OpenClaw.Shared.Tests/Mxc/Golden/sdk-config-custom.json b/tests/OpenClaw.Shared.Tests/Mxc/Golden/sdk-config-custom.json
index 9b41d91f1..8d7a6155a 100644
--- a/tests/OpenClaw.Shared.Tests/Mxc/Golden/sdk-config-custom.json
+++ b/tests/OpenClaw.Shared.Tests/Mxc/Golden/sdk-config-custom.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.4.0-alpha",
+  "version": "0.7.0-alpha",
   "containerId": "golden-custom",
   "lifecycle": {
     "destroyOnExit": true,
@@ -13,15 +13,6 @@
     ],
     "readonlyPaths": [
       "C:\\Golden\\Documents"
-    ],
-    "deniedPaths": [
-      "C:\\Golden\\Settings",
-      "C:\\Golden\\.ssh",
-      "C:\\Golden\\Chrome",
-      "C:\\Golden\\Edge",
-      "C:\\Golden\\Brave",
-      "C:\\Golden\\Firefox",
-      "C:\\Golden\\PSReadLine"
     ]
   },
   "ui": {
@@ -33,7 +24,7 @@
     "defaultPolicy": "allow",
     "enforcementMode": "capabilities"
   },
-  "appContainer": {
+  "processContainer": {
     "leastPrivilege": false,
     "capabilities": [
       "internetClient"
diff --git a/tests/OpenClaw.Shared.Tests/Mxc/Golden/sdk-config-locked-down.json b/tests/OpenClaw.Shared.Tests/Mxc/Golden/sdk-config-locked-down.json
index 21a3a9837..5fd2e8432 100644
--- a/tests/OpenClaw.Shared.Tests/Mxc/Golden/sdk-config-locked-down.json
+++ b/tests/OpenClaw.Shared.Tests/Mxc/Golden/sdk-config-locked-down.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.4.0-alpha",
+  "version": "0.7.0-alpha",
   "containerId": "golden-locked-down",
   "lifecycle": {
     "destroyOnExit": true,
@@ -10,16 +10,7 @@
     "readwritePaths": [
       "C:\\Golden\\Scratch"
     ],
-    "readonlyPaths": [],
-    "deniedPaths": [
-      "C:\\Golden\\Settings",
-      "C:\\Golden\\.ssh",
-      "C:\\Golden\\Chrome",
-      "C:\\Golden\\Edge",
-      "C:\\Golden\\Brave",
-      "C:\\Golden\\Firefox",
-      "C:\\Golden\\PSReadLine"
-    ]
+    "readonlyPaths": []
   },
   "ui": {
     "disable": true,
@@ -30,7 +21,7 @@
     "defaultPolicy": "block",
     "enforcementMode": "capabilities"
   },
-  "appContainer": {
+  "processContainer": {
     "leastPrivilege": false,
     "capabilities": [],
     "ui": {
diff --git a/tests/OpenClaw.Shared.Tests/Mxc/Golden/sdk-config-permissive.json b/tests/OpenClaw.Shared.Tests/Mxc/Golden/sdk-config-permissive.json
index 0ee7957a0..2a9890ec6 100644
--- a/tests/OpenClaw.Shared.Tests/Mxc/Golden/sdk-config-permissive.json
+++ b/tests/OpenClaw.Shared.Tests/Mxc/Golden/sdk-config-permissive.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.4.0-alpha",
+  "version": "0.7.0-alpha",
   "containerId": "golden-permissive",
   "lifecycle": {
     "destroyOnExit": true,
@@ -13,16 +13,7 @@
       "C:\\Golden\\Desktop",
       "C:\\Golden\\Scratch"
     ],
-    "readonlyPaths": [],
-    "deniedPaths": [
-      "C:\\Golden\\Settings",
-      "C:\\Golden\\.ssh",
-      "C:\\Golden\\Chrome",
-      "C:\\Golden\\Edge",
-      "C:\\Golden\\Brave",
-      "C:\\Golden\\Firefox",
-      "C:\\Golden\\PSReadLine"
-    ]
+    "readonlyPaths": []
   },
   "ui": {
     "disable": true,
@@ -33,7 +24,7 @@
     "defaultPolicy": "allow",
     "enforcementMode": "capabilities"
   },
-  "appContainer": {
+  "processContainer": {
     "leastPrivilege": false,
     "capabilities": [
       "internetClient"
diff --git a/tests/OpenClaw.Shared.Tests/Mxc/MxcAvailabilityTests.cs b/tests/OpenClaw.Shared.Tests/Mxc/MxcAvailabilityTests.cs
index f8e1a9994..ffb72188f 100644
--- a/tests/OpenClaw.Shared.Tests/Mxc/MxcAvailabilityTests.cs
+++ b/tests/OpenClaw.Shared.Tests/Mxc/MxcAvailabilityTests.cs
@@ -64,30 +64,286 @@ public void Constructor_StoresAllFields()
         Assert.True(availability.HasAnyBackend);
     }
 
+    [Fact]
+    public void ParseProbeOutput_ValidTier_ReportsSupported()
+    {
+        var result = MxcAvailability.ParseProbeOutput(
+            WxcProbeStatus.Completed,
+            exitCode: 0,
+            stdout: "{\"tier\":\"base-container\",\"needsDaclAugmentation\":false,\"warnings\":[]}",
+            stderr: "");
+
+        Assert.Equal(MxcProbeOutcome.Supported, result.Outcome);
+        Assert.True(result.Supported);
+        Assert.Equal("base-container", result.Tier);
+        Assert.False(result.NeedsDaclAugmentation);
+        Assert.Empty(result.Warnings);
+        Assert.Null(result.FailureReason);
+    }
+
+    [Fact]
+    public void ParseProbeOutput_CapturesWarningsAndDaclFlag()
+    {
+        var result = MxcAvailability.ParseProbeOutput(
+            WxcProbeStatus.Completed,
+            exitCode: 0,
+            stdout: "{\"tier\":\"appcontainer-dacl\",\"needsDaclAugmentation\":true,\"warnings\":[\"fell back to dacl\"]}",
+            stderr: "");
+
+        Assert.Equal(MxcProbeOutcome.Supported, result.Outcome);
+        Assert.True(result.Supported);
+        Assert.Equal("appcontainer-dacl", result.Tier);
+        Assert.True(result.NeedsDaclAugmentation);
+        Assert.Equal(new[] { "fell back to dacl" }, result.Warnings);
+    }
+
+    [Fact]
+    public void ParseProbeOutput_CompletedNonZeroExit_ReportsProbeError()
+    {
+        var result = MxcAvailability.ParseProbeOutput(
+            WxcProbeStatus.Completed,
+            exitCode: 1,
+            stdout: "",
+            stderr: "unknown option --probe");
+
+        Assert.Equal(MxcProbeOutcome.ProbeError, result.Outcome);
+        Assert.False(result.Supported);
+        Assert.Null(result.Tier);
+        Assert.NotNull(result.FailureReason);
+        Assert.Contains("Could not determine", result.FailureReason!);
+    }
+
+    [Fact]
+    public void ParseProbeOutput_CompletedJsonError_ReportsUnsupportedHost()
+    {
+        var result = MxcAvailability.ParseProbeOutput(
+            WxcProbeStatus.Completed,
+            exitCode: 1,
+            stdout: "{\"error\":\"unsupported Windows build\",\"warnings\":[\"need newer host\"]}",
+            stderr: "");
+
+        Assert.Equal(MxcProbeOutcome.UnsupportedHost, result.Outcome);
+        Assert.False(result.Supported);
+        Assert.Null(result.Tier);
+        Assert.Equal(["need newer host"], result.Warnings);
+        Assert.NotNull(result.FailureReason);
+        Assert.Contains("unsupported Windows build", result.FailureReason!);
+    }
+
+    [Fact]
+    public void ParseProbeOutput_TimedOutStatus_ReportsProbeError()
+    {
+        // Timeout is our own infrastructure failure — transient, regardless of exit code.
+        var result = MxcAvailability.ParseProbeOutput(
+            WxcProbeStatus.TimedOut, exitCode: 0, stdout: "", stderr: "wxc-exec --probe timed out.");
+
+        Assert.Equal(MxcProbeOutcome.ProbeError, result.Outcome);
+        Assert.False(result.Supported);
+        Assert.NotNull(result.FailureReason);
+        Assert.Contains("Could not determine", result.FailureReason!);
+    }
+
+    [Fact]
+    public void ParseProbeOutput_LaunchFailedStatus_ReportsProbeError()
+    {
+        var result = MxcAvailability.ParseProbeOutput(
+            WxcProbeStatus.LaunchFailed, exitCode: 0, stdout: "", stderr: "Failed to launch wxc-exec --probe: access denied");
+
+        Assert.Equal(MxcProbeOutcome.ProbeError, result.Outcome);
+        Assert.False(result.Supported);
+        Assert.NotNull(result.FailureReason);
+        Assert.Contains("Could not determine", result.FailureReason!);
+    }
+
+    [Fact]
+    public void ParseProbeOutput_NonCompletedStatus_IgnoresExitCode()
+    {
+        // Even a "successful-looking" exit code must not flip a timeout/launch failure
+        // into a definitive verdict — the status wins.
+        var result = MxcAvailability.ParseProbeOutput(
+            WxcProbeStatus.TimedOut,
+            exitCode: 0,
+            stdout: "{\"tier\":\"base-container\"}",
+            stderr: "");
+
+        Assert.Equal(MxcProbeOutcome.ProbeError, result.Outcome);
+        Assert.Null(result.Tier);
+    }
+
     [Theory]
-    [InlineData(26299, 9999, "is not MXC supported build 26300")]
-    [InlineData(26300, 8288, "Windows UBR 8288 below MXC minimum 8289")]
-    [InlineData(26301, 9999, "is not MXC supported build 26300")]
-    [InlineData(27999, 9999, "is not MXC supported build 26300")]
-    [InlineData(28000, 9999, "is not MXC supported build 26300")]
-    public void GetWindowsBuildUnsupportedReason_RejectsUnsupportedBuilds(
-        int build,
-        int ubr,
-        string expectedReason)
+    [InlineData("")]
+    [InlineData("   ")]
+    [InlineData("{\"needsDaclAugmentation\":false}")]
+    [InlineData("{\"tier\":\"\"}")]
+    [InlineData("not json at all")]
+    public void ParseProbeOutput_CompletedExitZeroButNoUsableOutput_ReportsProbeError(string stdout)
     {
-        var reason = MxcAvailability.GetWindowsBuildUnsupportedReason(build, ubr);
+        // Exit 0 with missing/garbled output is a binary anomaly, not a clear
+        // "unsupported" verdict — treat as retryable probe error.
+        var result = MxcAvailability.ParseProbeOutput(WxcProbeStatus.Completed, exitCode: 0, stdout: stdout, stderr: "");
 
-        Assert.NotNull(reason);
-        Assert.Contains(expectedReason, reason);
+        Assert.Equal(MxcProbeOutcome.ProbeError, result.Outcome);
+        Assert.False(result.Supported);
+        Assert.Null(result.Tier);
+        Assert.NotNull(result.FailureReason);
     }
 
     [Theory]
-    [InlineData(26300, 8289)]
-    [InlineData(26300, 9999)]
-    public void GetWindowsBuildUnsupportedReason_AllowsSupportedBuilds(int build, int ubr)
+    [InlineData("base-container", false, false)]
+    [InlineData("appcontainer-bfs", false, false)]
+    [InlineData("appcontainer-dacl", false, true)]
+    [InlineData("base-container", true, true)]   // needsDaclAugmentation forces degraded
+    [InlineData("some-future-tier", false, true)] // unrecognized tier => degraded
+    public void IsDegradedContainment_ReflectsTierAndDaclFlag(string tier, bool needsDacl, bool expectedDegraded)
+    {
+        var availability = new MxcAvailability(
+            isAppContainerAvailable: true,
+            isIsolationSessionAvailable: false,
+            isWxcExecResolvable: true,
+            wxcExecPath: "C:\\fake\\wxc-exec.exe",
+            unsupportedReasons: Array.Empty<string>(),
+            isolationTier: tier,
+            needsDaclAugmentation: needsDacl);
+
+        Assert.True(availability.HasAnyBackend);
+        Assert.Equal(expectedDegraded, availability.IsDegradedContainment);
+    }
+
+    [Fact]
+    public void IsDegradedContainment_FalseWhenNoBackend()
+    {
+        var availability = new MxcAvailability(
+            isAppContainerAvailable: false,
+            isIsolationSessionAvailable: false,
+            isWxcExecResolvable: true,
+            wxcExecPath: "C:\\fake\\wxc-exec.exe",
+            unsupportedReasons: new[] { "nope" },
+            isolationTier: "appcontainer-dacl",
+            needsDaclAugmentation: true);
+
+        Assert.False(availability.HasAnyBackend);
+        Assert.False(availability.IsDegradedContainment);
+    }
+
+    [Fact]
+    public void Probe_WhenProbeReportsTier_ReportsAvailable()
+    {
+        if (!OperatingSystem.IsWindows()) return;
+
+        var fakeExe = Path.Combine(Path.GetTempPath(), $"wxc-fake-{Guid.NewGuid():N}.exe");
+        File.WriteAllText(fakeExe, string.Empty);
+        try
+        {
+            Environment.SetEnvironmentVariable(MxcAvailability.WxcExecOverrideEnvVar, fakeExe);
+
+            var availability = MxcAvailability.Probe(
+                NullLogger.Instance,
+                _ => new WxcProbeInvocation(WxcProbeStatus.Completed, 0, "{\"tier\":\"base-container\",\"warnings\":[]}", string.Empty));
+
+            Assert.True(availability.IsAppContainerAvailable);
+            Assert.True(availability.IsWxcExecResolvable);
+            Assert.Equal(fakeExe, availability.WxcExecPath);
+            Assert.Empty(availability.UnsupportedReasons);
+            Assert.False(availability.ProbeErrored);
+            Assert.Equal("base-container", availability.IsolationTier);
+            Assert.False(availability.IsDegradedContainment);
+        }
+        finally
+        {
+            Environment.SetEnvironmentVariable(MxcAvailability.WxcExecOverrideEnvVar, null);
+            try { File.Delete(fakeExe); } catch { /* best-effort */ }
+        }
+    }
+
+    [Fact]
+    public void Probe_WhenProbeReportsNoTier_ReportsUnavailableWithReason()
     {
-        var reason = MxcAvailability.GetWindowsBuildUnsupportedReason(build, ubr);
+        if (!OperatingSystem.IsWindows()) return;
+
+        var fakeExe = Path.Combine(Path.GetTempPath(), $"wxc-fake-{Guid.NewGuid():N}.exe");
+        File.WriteAllText(fakeExe, string.Empty);
+        try
+        {
+            Environment.SetEnvironmentVariable(MxcAvailability.WxcExecOverrideEnvVar, fakeExe);
+
+            var availability = MxcAvailability.Probe(
+                NullLogger.Instance,
+                _ => new WxcProbeInvocation(WxcProbeStatus.Completed, 1, string.Empty, "unsupported os build"));
 
-        Assert.Null(reason);
+            Assert.True(availability.IsWxcExecResolvable);
+            Assert.False(availability.IsAppContainerAvailable);
+            Assert.False(availability.HasAnyBackend);
+            Assert.NotEmpty(availability.UnsupportedReasons);
+            Assert.True(availability.ProbeErrored);
+        }
+        finally
+        {
+            Environment.SetEnvironmentVariable(MxcAvailability.WxcExecOverrideEnvVar, null);
+            try { File.Delete(fakeExe); } catch { /* best-effort */ }
+        }
     }
+
+    [Fact]
+    public void Probe_WhenProbeTimesOut_ReportsProbeErrored()
+    {
+        if (!OperatingSystem.IsWindows()) return;
+
+        var fakeExe = Path.Combine(Path.GetTempPath(), $"wxc-fake-{Guid.NewGuid():N}.exe");
+        File.WriteAllText(fakeExe, string.Empty);
+        try
+        {
+            Environment.SetEnvironmentVariable(MxcAvailability.WxcExecOverrideEnvVar, fakeExe);
+
+            // TimedOut status → transient probe error.
+            var availability = MxcAvailability.Probe(
+                NullLogger.Instance,
+                _ => new WxcProbeInvocation(WxcProbeStatus.TimedOut, 0, string.Empty, "wxc-exec --probe timed out."));
+
+            Assert.True(availability.IsWxcExecResolvable);
+            Assert.False(availability.IsAppContainerAvailable);
+            Assert.False(availability.HasAnyBackend);
+            Assert.True(availability.ProbeErrored);
+            Assert.NotEmpty(availability.UnsupportedReasons);
+        }
+        finally
+        {
+            Environment.SetEnvironmentVariable(MxcAvailability.WxcExecOverrideEnvVar, null);
+            try { File.Delete(fakeExe); } catch { /* best-effort */ }
+        }
+    }
+
+    [Fact]
+    public void Probe_WhenProbeReportsDaclTier_ReportsDegraded()
+    {
+        if (!OperatingSystem.IsWindows()) return;
+
+        var fakeExe = Path.Combine(Path.GetTempPath(), $"wxc-fake-{Guid.NewGuid():N}.exe");
+        File.WriteAllText(fakeExe, string.Empty);
+        try
+        {
+            Environment.SetEnvironmentVariable(MxcAvailability.WxcExecOverrideEnvVar, fakeExe);
+
+            var availability = MxcAvailability.Probe(
+                NullLogger.Instance,
+                _ => new WxcProbeInvocation(
+                    WxcProbeStatus.Completed,
+                    0,
+                    "{\"tier\":\"appcontainer-dacl\",\"needsDaclAugmentation\":true,\"warnings\":[\"fallback\"]}",
+                    string.Empty));
+
+            // Still contained (don't downgrade to uncontained), but flagged degraded.
+            Assert.True(availability.IsAppContainerAvailable);
+            Assert.True(availability.HasAnyBackend);
+            Assert.True(availability.IsDegradedContainment);
+            Assert.Equal("appcontainer-dacl", availability.IsolationTier);
+            Assert.True(availability.NeedsDaclAugmentation);
+            Assert.False(availability.ProbeErrored);
+        }
+        finally
+        {
+            Environment.SetEnvironmentVariable(MxcAvailability.WxcExecOverrideEnvVar, null);
+            try { File.Delete(fakeExe); } catch { /* best-effort */ }
+        }
+    }
+
 }
diff --git a/tests/OpenClaw.Shared.Tests/Mxc/MxcCommandRunnerIntegrationTests.cs b/tests/OpenClaw.Shared.Tests/Mxc/MxcCommandRunnerIntegrationTests.cs
index 94588d625..ffb35f0db 100644
--- a/tests/OpenClaw.Shared.Tests/Mxc/MxcCommandRunnerIntegrationTests.cs
+++ b/tests/OpenClaw.Shared.Tests/Mxc/MxcCommandRunnerIntegrationTests.cs
@@ -50,7 +50,7 @@ public class MxcCommandRunnerIntegrationTests
             return null;
         }
 
-        var executor = new DirectAppContainerExecutor(availability, new ConsoleLogger());
+        var executor = new DirectAppContainerExecutor(() => availability, new ConsoleLogger());
 
         var settings = new SettingsData
         {
@@ -91,20 +91,19 @@ public async Task SystemRun_EchoCmd_ExecutesInsideAppContainer()
     }
 
     [IntegrationFact]
-    public async Task SystemRun_PowerShell_ReturnsStdout()
+    public async Task SystemRun_DefaultShell_ExecutesInsideAppContainer()
     {
         var runner = TryBuildRunner();
         if (runner is null) return; // skip — MXC unavailable on this host
 
         var result = await runner.RunAsync(new CommandRequest
         {
-            Command = "Write-Output 'pwsh-from-mxc'",
-            Shell = "powershell",
+            Command = "echo hello-default-mxc",
             TimeoutMs = 30_000,
         });
 
         Assert.True(
-            result.ExitCode == 0 && result.Stdout.Contains("pwsh-from-mxc"),
+            result.ExitCode == 0 && result.Stdout.Contains("hello-default-mxc"),
             $"ExitCode={result.ExitCode}\nStdout={result.Stdout}\nStderr={result.Stderr}\nTimedOut={result.TimedOut}\nDurationMs={result.DurationMs}");
     }
 
@@ -183,6 +182,113 @@ public async Task SystemRun_CmdDir_ReadsGrantedCustomFolder()
         }
     }
 
+    [IntegrationFact]
+    public async Task SystemRun_FilesystemAccessMatrix_EnforcesReadwriteAndReadonlyPaths()
+    {
+        var root = Directory.CreateDirectory(Path.Combine(AppContext.BaseDirectory, "openclaw-mxc-fs-matrix-" + Guid.NewGuid().ToString("N"))).FullName;
+        var rwDir = Directory.CreateDirectory(Path.Combine(root, "rw")).FullName;
+        var roDir = Directory.CreateDirectory(Path.Combine(root, "ro")).FullName;
+
+        var roInput = Path.Combine(roDir, "input.txt");
+        var rwOutput = Path.Combine(rwDir, "rw_marker.tmp");
+        var roForbidden = Path.Combine(roDir, "forbidden.tmp");
+
+        await File.WriteAllTextAsync(roInput, "readonly test data");
+
+        try
+        {
+            if (!HasSupportedSandboxPath(root))
+            {
+                Console.WriteLine(
+                    "[mxc-integration] SKIPPING: filesystem matrix path is not in a supported local sandbox location.");
+                return;
+            }
+
+            var runner = TryBuildRunner(
+                configure: settings =>
+                {
+                    settings.SandboxCustomFolders = new List<SandboxCustomFolder>
+                    {
+                        new() { Path = rwDir, Access = SandboxFolderAccess.ReadWrite },
+                        new() { Path = roDir, Access = SandboxFolderAccess.ReadOnly },
+                    };
+                });
+            if (runner is null) return; // skip — MXC unavailable on this host
+
+            var command = string.Join(" & ", new[]
+            {
+                $"(echo RW_WRITE_VALUE > {CmdQuote(rwOutput)} && echo RW_WRITE=PASS || echo RW_WRITE=FAIL)",
+                $"(type {CmdQuote(rwOutput)} > nul && echo RW_READ=PASS || echo RW_READ=FAIL)",
+                $"(type {CmdQuote(roInput)} > nul && echo RO_READ=PASS || echo RO_READ=FAIL)",
+                $"(echo RO_WRITE_VALUE > {CmdQuote(roForbidden)} && echo RO_WRITE=PASS || echo RO_WRITE=FAIL)",
+            });
+
+            var result = await runner.RunAsync(new CommandRequest
+            {
+                Command = command,
+                Shell = "cmd",
+                TimeoutMs = 30_000,
+            });
+
+            Assert.False(result.TimedOut, $"Filesystem matrix timed out.\nStdout={result.Stdout}\nStderr={result.Stderr}");
+            var matrix = ParseMatrix(result.Stdout);
+            AssertMatrix(matrix, "RW_WRITE", "PASS", result);
+            AssertMatrix(matrix, "RW_READ", "PASS", result);
+            AssertMatrix(matrix, "RO_READ", "PASS", result);
+            AssertMatrix(matrix, "RO_WRITE", "FAIL", result);
+
+            Assert.True(File.Exists(rwOutput), $"RW output should exist on host: {rwOutput}");
+            Assert.False(File.Exists(roForbidden), $"RO output should not exist on host: {roForbidden}");
+        }
+        finally
+        {
+            // slopwatch-ignore: SW003 Test cleanup or fixture teardown is best-effort and must not hide the test outcome.
+            try { Directory.Delete(root, recursive: true); } catch { }
+        }
+    }
+
+    [IntegrationFact]
+    public async Task SystemRun_CustomEnv_DeniesBeforeMxcUnavailableHostFallback()
+    {
+        var executor = new ThrowIfCalledSandboxExecutor();
+        var hostFallback = new LocalCommandRunner(NullLogger.Instance);
+        var settings = new SettingsData
+        {
+            SystemRunSandboxEnabled = true,
+            SystemRunBlockHostFallbackWhenMxcUnavailable = false,
+        };
+        var runner = new MxcCommandRunner(
+            executor,
+            hostFallback,
+            () => settings,
+            () => Path.Combine(Path.GetTempPath(), "openclaw-mxc-smoke-test-settings"),
+            () => false,
+            invalidateAvailability: null,
+            new ConsoleLogger());
+
+        var result = await runner.RunAsync(new CommandRequest
+        {
+            Command = "echo %OPENCLAW_MXC_ENV_FALLBACK_MARKER%",
+            Shell = "cmd",
+            Env = new Dictionary<string, string>
+            {
+                ["OPENCLAW_MXC_ENV_FALLBACK_MARKER"] = "OPENCLAW_ENV_FALLBACK_SHOULD_NOT_RUN",
+            },
+            TimeoutMs = 30_000,
+        });
+
+        Console.WriteLine(
+            "[mxc-integration] custom-env-deny " +
+            $"exitCode={result.ExitCode}; " +
+            $"fallbackMarkerSeen={result.Stdout.Contains("OPENCLAW_ENV_FALLBACK_SHOULD_NOT_RUN", StringComparison.Ordinal)}; " +
+            $"stderrContainsCustomEnv={result.Stderr.Contains("custom environment variables", StringComparison.OrdinalIgnoreCase)}");
+
+        Assert.Equal(-1, result.ExitCode);
+        Assert.Contains("custom environment variables", result.Stderr);
+        Assert.DoesNotContain("OPENCLAW_ENV_FALLBACK_SHOULD_NOT_RUN", result.Stdout);
+        Assert.Equal(0, executor.CallCount);
+    }
+
     private static bool HasSupportedSandboxPath(string path)
     {
         try
@@ -205,5 +311,51 @@ private static bool HasSupportedSandboxPath(string path)
 
     private static bool IsGitHubActions()
         => string.Equals(Environment.GetEnvironmentVariable("GITHUB_ACTIONS"), "true", StringComparison.OrdinalIgnoreCase);
-}
 
+    private static Dictionary<string, string> ParseMatrix(string stdout)
+    {
+        var matrix = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+        foreach (var rawLine in stdout.Split(new[] { "\r\n", "\n" }, StringSplitOptions.RemoveEmptyEntries))
+        {
+            var line = rawLine.Trim();
+            var separator = line.IndexOf('=');
+            if (separator <= 0)
+                continue;
+
+            var key = line[..separator];
+            var value = line[(separator + 1)..];
+            if (value is "PASS" or "FAIL")
+                matrix[key] = value;
+        }
+
+        return matrix;
+    }
+
+    private static void AssertMatrix(
+        IReadOnlyDictionary<string, string> matrix,
+        string key,
+        string expected,
+        CommandResult result)
+    {
+        Assert.True(matrix.TryGetValue(key, out var actual),
+            $"Missing matrix key {key}.\nStdout={result.Stdout}\nStderr={result.Stderr}\nExitCode={result.ExitCode}");
+        Assert.Equal(expected, actual);
+    }
+
+    private static string CmdQuote(string value) => "\"" + value.Replace("\"", "\"\"") + "\"";
+
+    private sealed class ThrowIfCalledSandboxExecutor : ISandboxExecutor
+    {
+        public string Name => "throw-if-called";
+        public bool IsContained => true;
+        public int CallCount { get; private set; }
+
+        public Task<SandboxExecutionResult> ExecuteAsync(
+            SandboxExecutionRequest request,
+            CancellationToken ct = default)
+        {
+            CallCount++;
+            throw new InvalidOperationException("Custom-env denial should happen before sandbox execution.");
+        }
+    }
+}
diff --git a/tests/OpenClaw.Shared.Tests/Mxc/MxcCommandRunnerTests.cs b/tests/OpenClaw.Shared.Tests/Mxc/MxcCommandRunnerTests.cs
index c9f45a081..fbf8e05a8 100644
--- a/tests/OpenClaw.Shared.Tests/Mxc/MxcCommandRunnerTests.cs
+++ b/tests/OpenClaw.Shared.Tests/Mxc/MxcCommandRunnerTests.cs
@@ -7,11 +7,14 @@ namespace OpenClaw.Shared.Tests.Mxc;
 
 public class MxcCommandRunnerTests
 {
-    private static SettingsData NewSettings(bool sandboxEnabled = true)
+    private static SettingsData NewSettings(
+        bool sandboxEnabled = true,
+        bool blockHostFallbackWhenMxcUnavailable = false)
     {
         return new SettingsData
         {
             SystemRunSandboxEnabled = sandboxEnabled,
+            SystemRunBlockHostFallbackWhenMxcUnavailable = blockHostFallbackWhenMxcUnavailable,
             SystemRunAllowOutbound = false,
         };
     }
@@ -34,23 +37,155 @@ private static MxcCommandRunner NewRunner(
     }
 
     [Fact]
-    public async Task RunAsync_SandboxEnabled_FallsBackToHostWhenExecutorIsUnavailable()
+    public void ResolveEffectiveShell_DefaultsToSandboxCmd_WhenSandboxEnabled()
+    {
+        var fallback = new FakeCommandRunner { EffectiveShellForNull = "pwsh" };
+        var runner = NewRunner(new FakeSandboxExecutor(), fallback, NewSettings(sandboxEnabled: true));
+
+        Assert.Equal("cmd", runner.ResolveEffectiveShell(null));
+        Assert.Equal("cmd", runner.ResolveEffectiveShell(" cmd "));
+        Assert.Equal("powershell", runner.ResolveEffectiveShell("bash"));
+    }
+
+    [Fact]
+    public void ResolveEffectiveShell_DelegatesToHost_WhenSandboxDisabled()
+    {
+        var fallback = new FakeCommandRunner { EffectiveShellForNull = "pwsh" };
+        var runner = NewRunner(new FakeSandboxExecutor(), fallback, NewSettings(sandboxEnabled: false));
+
+        Assert.Equal("pwsh", runner.ResolveEffectiveShell(null));
+        Assert.Equal("powershell", runner.ResolveEffectiveShell(" powershell "));
+        Assert.Equal("powershell", runner.ResolveEffectiveShell("bash"));
+    }
+
+    [Fact]
+    public void ResolveEffectiveShell_DelegatesToHost_WhenMxcUnavailableAndCompatibilityFallbackEnabled()
+    {
+        var fallback = new FakeCommandRunner { EffectiveShellForNull = "pwsh" };
+        var runner = NewRunner(
+            new FakeSandboxExecutor(),
+            fallback,
+            NewSettings(
+                sandboxEnabled: true,
+                blockHostFallbackWhenMxcUnavailable: false),
+            sandboxAvailable: false);
+
+        Assert.Equal("pwsh", runner.ResolveEffectiveShell(null));
+        Assert.Equal("powershell", runner.ResolveEffectiveShell(" powershell "));
+        Assert.Equal("powershell", runner.ResolveEffectiveShell("bash"));
+    }
+
+    [Fact]
+    public void ResolveEffectiveShell_UsesSandboxShell_WhenStrictFallbackBlockingEnabledAndMxcUnavailable()
+    {
+        var fallback = new FakeCommandRunner { EffectiveShellForNull = "pwsh" };
+        var runner = NewRunner(
+            new FakeSandboxExecutor(),
+            fallback,
+            NewSettings(
+                sandboxEnabled: true,
+                blockHostFallbackWhenMxcUnavailable: true),
+            sandboxAvailable: false);
+
+        Assert.Equal("cmd", runner.ResolveEffectiveShell(null));
+        Assert.Equal("powershell", runner.ResolveEffectiveShell(" powershell "));
+        Assert.Equal("powershell", runner.ResolveEffectiveShell("bash"));
+    }
+
+    [Fact]
+    public async Task RunAsync_SandboxEnabled_FallsBackWhenExecutorIsUnavailableAndCompatibilityFallbackEnabled()
     {
-        // Issue #494: when MXC is enabled but the executor reports unavailable at
-        // runtime, fall back to host instead of denying — older Windows users
-        // need their commands to run uncontained, with a warning in the UI.
         var executor = new FakeSandboxExecutor { ThrowsUnavailable = true, UnavailableReason = "test reason" };
         var fallback = new FakeCommandRunner
         {
             Result = new CommandResult { ExitCode = 0, Stdout = "host-ran" },
         };
-        var runner = NewRunner(executor, fallback, NewSettings(sandboxEnabled: true));
+        var runner = NewRunner(
+            executor,
+            fallback,
+            NewSettings(
+                sandboxEnabled: true,
+                blockHostFallbackWhenMxcUnavailable: false));
 
-        var result = await runner.RunAsync(new CommandRequest { Command = "echo hi" });
+        var result = await runner.RunAsync(new CommandRequest { Command = "echo hi", Shell = "powershell" });
+
+        Assert.Equal(0, result.ExitCode);
+        Assert.Equal("host-ran", result.Stdout);
+        Assert.NotNull(fallback.LastRequest);
+        Assert.Equal("powershell", fallback.LastRequest!.Shell);
+    }
+
+    [Fact]
+    public async Task RunAsync_SandboxEnabled_OmittedShellFallsBackToApprovedHostDefaultWhenExecutorIsUnavailable()
+    {
+        var executor = new FakeSandboxExecutor { ThrowsUnavailable = true, UnavailableReason = "test reason" };
+        var fallback = new FakeCommandRunner
+        {
+            Result = new CommandResult { ExitCode = 0, Stdout = "host-ran" },
+        };
+        var runner = NewRunner(
+            executor,
+            fallback,
+            NewSettings(
+                sandboxEnabled: true,
+                blockHostFallbackWhenMxcUnavailable: false));
+
+        var result = await runner.RunAsync(new CommandRequest
+        {
+            Command = "echo hi",
+            ApprovedEffectiveShell = "cmd",
+            ApprovedHostFallbackShell = "powershell",
+        });
 
         Assert.Equal(0, result.ExitCode);
         Assert.Equal("host-ran", result.Stdout);
         Assert.NotNull(fallback.LastRequest);
+        Assert.Equal("powershell", fallback.LastRequest!.Shell);
+    }
+
+    [Fact]
+    public async Task RunAsync_SandboxEnabled_DeniesOmittedShellFallbackWhenHostDefaultWasNotApproved()
+    {
+        var executor = new FakeSandboxExecutor { ThrowsUnavailable = true, UnavailableReason = "test reason" };
+        var fallback = new FakeCommandRunner
+        {
+            Result = new CommandResult { ExitCode = 0, Stdout = "host-ran" },
+        };
+        var runner = NewRunner(
+            executor,
+            fallback,
+            NewSettings(
+                sandboxEnabled: true,
+                blockHostFallbackWhenMxcUnavailable: false));
+
+        var result = await runner.RunAsync(new CommandRequest { Command = "echo hi" });
+
+        Assert.Equal(-1, result.ExitCode);
+        Assert.Contains("without prior approval", result.Stderr);
+        Assert.Null(fallback.LastRequest);
+    }
+
+    [Fact]
+    public async Task RunAsync_DeniesWhenEffectiveShellDriftsAfterApproval()
+    {
+        var executor = new FakeSandboxExecutor();
+        var fallback = new FakeCommandRunner();
+        var runner = NewRunner(
+            executor,
+            fallback,
+            NewSettings(sandboxEnabled: true),
+            sandboxAvailable: true);
+
+        var result = await runner.RunAsync(new CommandRequest
+        {
+            Command = "echo hi",
+            ApprovedEffectiveShell = "powershell",
+        });
+
+        Assert.Equal(-1, result.ExitCode);
+        Assert.Contains("effective shell changed after approval", result.Stderr);
+        Assert.Null(executor.LastRequest);
+        Assert.Null(fallback.LastRequest);
     }
 
     [Fact]
@@ -61,24 +196,78 @@ public async Task RunAsync_SandboxDisabled_AlwaysRoutesToHost()
         {
             Result = new CommandResult { ExitCode = 0, Stdout = "host" },
         };
-        var runner = NewRunner(executor, fallback, NewSettings(sandboxEnabled: false));
+        var availabilityChecks = 0;
+        var runner = new MxcCommandRunner(
+            executor,
+            fallback,
+            () => NewSettings(sandboxEnabled: false),
+            () => "C:\\test\\settings",
+            () =>
+            {
+                availabilityChecks++;
+                return true;
+            },
+            invalidateAvailability: null,
+            NullLogger.Instance);
 
         var result = await runner.RunAsync(new CommandRequest { Command = "echo hi" });
 
         Assert.Equal("host", result.Stdout);
         Assert.NotNull(fallback.LastRequest);
+        Assert.Equal(0, availabilityChecks);
         // Executor must not have been touched.
         Assert.Null(executor.LastRequest);
     }
 
     [Fact]
-    public async Task RunAsync_MxcUnavailable_FallsBackToHost_WithSandboxToggleOff()
+    public async Task RunAsync_SandboxEnabled_RejectsCustomEnvWithoutHostFallback()
     {
-        // Issue #494: on hosts where MXC is unavailable (Windows 10 / old build /
-        // missing wxc-exec), the agent must still be able to run commands.
-        // Route through the host runner; the Sandbox page UI shows a clear
-        // "running uncontained" warning so the user knows the protection
-        // boundary isn't active.
+        var executor = new FakeSandboxExecutor();
+        var fallback = new FakeCommandRunner();
+        var runner = NewRunner(executor, fallback, NewSettings(sandboxEnabled: true));
+
+        var result = await runner.RunAsync(new CommandRequest
+        {
+            Command = "echo hi",
+            Env = new Dictionary<string, string> { ["FOO"] = "bar" },
+        });
+
+        Assert.Equal(-1, result.ExitCode);
+        Assert.Contains("custom environment variables", result.Stderr);
+        Assert.Null(executor.LastRequest);
+        Assert.Null(fallback.LastRequest);
+    }
+
+    [Fact]
+    public async Task RunAsync_SandboxEnabled_MxcUnavailable_RejectsCustomEnvWithoutHostFallback()
+    {
+        var executor = new FakeSandboxExecutor();
+        var fallback = new FakeCommandRunner();
+        var runner = NewRunner(
+            executor,
+            fallback,
+            NewSettings(
+                sandboxEnabled: true,
+                blockHostFallbackWhenMxcUnavailable: false),
+            sandboxAvailable: false);
+
+        var result = await runner.RunAsync(new CommandRequest
+        {
+            Command = "echo hi",
+            Env = new Dictionary<string, string> { ["FOO"] = "bar" },
+        });
+
+        Assert.Equal(-1, result.ExitCode);
+        Assert.Contains("custom environment variables", result.Stderr);
+        Assert.Null(executor.LastRequest);
+        Assert.Null(fallback.LastRequest);
+    }
+
+    [Fact]
+    public async Task RunAsync_MxcUnavailable_RoutesToHost_WithSandboxToggleOff()
+    {
+        // Explicit sandbox opt-out means host execution is intentional, even on
+        // hosts where MXC is unavailable.
         var executor = new FakeSandboxExecutor();
         var fallback = new FakeCommandRunner
         {
@@ -99,11 +288,8 @@ public async Task RunAsync_MxcUnavailable_FallsBackToHost_WithSandboxToggleOff()
     }
 
     [Fact]
-    public async Task RunAsync_MxcUnavailable_FallsBackToHost_WithSandboxToggleOn()
+    public async Task RunAsync_MxcUnavailable_RoutesToHost_WhenCompatibilityFallbackEnabled()
     {
-        // Same as the toggle-off variant — the !_isSandboxAvailable() short-circuit
-        // fires before either the toggle check or the executor path, and both
-        // routes lead to the host fallback.
         var executor = new FakeSandboxExecutor { ThrowsUnavailable = true, UnavailableReason = "MXC missing" };
         var fallback = new FakeCommandRunner
         {
@@ -112,7 +298,9 @@ public async Task RunAsync_MxcUnavailable_FallsBackToHost_WithSandboxToggleOn()
         var runner = NewRunner(
             executor,
             fallback,
-            NewSettings(sandboxEnabled: true),
+            NewSettings(
+                sandboxEnabled: true,
+                blockHostFallbackWhenMxcUnavailable: false),
             sandboxAvailable: false);
 
         var result = await runner.RunAsync(new CommandRequest { Command = "echo hi" });
@@ -120,7 +308,29 @@ public async Task RunAsync_MxcUnavailable_FallsBackToHost_WithSandboxToggleOn()
         Assert.Equal(0, result.ExitCode);
         Assert.Equal("host", result.Stdout);
         Assert.NotNull(fallback.LastRequest);
+        Assert.Equal("powershell", fallback.LastRequest!.Shell);
+        Assert.Null(executor.LastRequest);
+    }
+
+    [Fact]
+    public async Task RunAsync_MxcUnavailable_Denies_WithStrictFallbackBlocking()
+    {
+        var executor = new FakeSandboxExecutor();
+        var fallback = new FakeCommandRunner();
+        var runner = NewRunner(
+            executor,
+            fallback,
+            NewSettings(
+                sandboxEnabled: true,
+                blockHostFallbackWhenMxcUnavailable: true),
+            sandboxAvailable: false);
+
+        var result = await runner.RunAsync(new CommandRequest { Command = "echo hi" });
+
+        Assert.Equal(-1, result.ExitCode);
+        Assert.Contains("host fallback is blocked", result.Stderr);
         Assert.Null(executor.LastRequest);
+        Assert.Null(fallback.LastRequest);
     }
 
     [Fact]
@@ -161,10 +371,33 @@ public async Task RunAsync_Success_MapsSandboxResultIntoCommandResult()
         Assert.Equal(5000, executor.LastRequest.TimeoutMs);
     }
 
+    [Fact]
+    public async Task RunAsync_DefaultShell_UsesCmdForMxcProcessContainer()
+    {
+        var executor = new FakeSandboxExecutor
+        {
+            Result = new SandboxExecutionResult(
+                ExitCode: 0,
+                Stdout: "hello",
+                Stderr: string.Empty,
+                TimedOut: false,
+                DurationMs: 1,
+                ContainmentTag: "mxc"),
+        };
+        var fallback = new FakeCommandRunner();
+        var runner = NewRunner(executor, fallback, NewSettings(sandboxEnabled: true));
+
+        await runner.RunAsync(new CommandRequest { Command = "echo hello" });
+
+        Assert.NotNull(executor.LastRequest);
+        var args = executor.LastRequest!.Args;
+        Assert.Equal("cmd", args.GetProperty("shell").GetString());
+    }
+
     [Fact]
     public async Task RunAsync_SandboxEnabled_DoesNotFallBack_OnSandboxFailure()
     {
-        // SandboxUnavailableException is the only exception that triggers the deny path.
+        // SandboxUnavailableException is the only exception that triggers the fallback path.
         // A normal failed exec inside the sandbox propagates as an error CommandResult.
         var executor = new FakeSandboxExecutor
         {
@@ -191,9 +424,8 @@ public async Task RunAsync_SandboxEnabled_DoesNotFallBack_OnSandboxFailure()
     public async Task RunAsync_SandboxUnavailableException_InvalidatesAvailabilityCacheAndFallsBack()
     {
         // When the executor throws SandboxUnavailableException at runtime the
-        // runner invokes its invalidate-availability callback (so the next
-        // command re-probes) AND falls back to the host runner for this call
-        // (issue #494 — don't strand the agent).
+        // runner invokes its invalidate-availability callback and preserves
+        // the compatible host fallback path for this call.
         var executor = new FakeSandboxExecutor { ThrowsUnavailable = true, UnavailableReason = "wxc-exec went missing" };
         var fallback = new FakeCommandRunner
         {
@@ -203,18 +435,82 @@ public async Task RunAsync_SandboxUnavailableException_InvalidatesAvailabilityCa
         var runner = new MxcCommandRunner(
             executor,
             fallback,
-            () => NewSettings(sandboxEnabled: true),
+            () => NewSettings(
+                sandboxEnabled: true,
+                blockHostFallbackWhenMxcUnavailable: false),
             () => "C:\\test\\settings",
             () => true,
             invalidateAvailability: () => invalidationCount++,
             NullLogger.Instance);
 
-        var result = await runner.RunAsync(new CommandRequest { Command = "echo hi" });
+        var result = await runner.RunAsync(new CommandRequest { Command = "echo hi", Shell = "powershell" });
 
         Assert.Equal(0, result.ExitCode);
         Assert.Equal("host", result.Stdout);
         Assert.Equal(1, invalidationCount);
         Assert.NotNull(fallback.LastRequest);
+        Assert.Equal("powershell", fallback.LastRequest!.Shell);
+    }
+
+    [Fact]
+    public async Task RunAsync_CustomEnv_RejectsBeforeReprobeOrHostFallback()
+    {
+        var executor = new FakeSandboxExecutor();
+        var fallback = new FakeCommandRunner();
+        var sandboxAvailable = true;
+        var invalidationCount = 0;
+        var runner = new MxcCommandRunner(
+            executor,
+            fallback,
+            () => NewSettings(
+                sandboxEnabled: true,
+                blockHostFallbackWhenMxcUnavailable: false),
+            () => "C:\\test\\settings",
+            () => sandboxAvailable,
+            invalidateAvailability: () =>
+            {
+                invalidationCount++;
+                sandboxAvailable = false;
+            },
+            NullLogger.Instance);
+
+        var result = await runner.RunAsync(new CommandRequest
+        {
+            Command = "echo hi",
+            Shell = "powershell",
+            Env = new Dictionary<string, string> { ["FOO"] = "bar" },
+        });
+
+        Assert.Equal(-1, result.ExitCode);
+        Assert.Contains("custom environment variables", result.Stderr);
+        Assert.Equal(0, invalidationCount);
+        Assert.Null(executor.LastRequest);
+        Assert.Null(fallback.LastRequest);
+    }
+
+    [Fact]
+    public async Task RunAsync_SandboxUnavailableException_Denies_WhenStrictFallbackBlockingEnabled()
+    {
+        var executor = new FakeSandboxExecutor { ThrowsUnavailable = true, UnavailableReason = "wxc-exec went missing" };
+        var fallback = new FakeCommandRunner();
+        var invalidationCount = 0;
+        var runner = new MxcCommandRunner(
+            executor,
+            fallback,
+            () => NewSettings(
+                sandboxEnabled: true,
+                blockHostFallbackWhenMxcUnavailable: true),
+            () => "C:\\test\\settings",
+            () => true,
+            invalidateAvailability: () => invalidationCount++,
+            NullLogger.Instance);
+
+        var result = await runner.RunAsync(new CommandRequest { Command = "echo hi" });
+
+        Assert.Equal(-1, result.ExitCode);
+        Assert.Contains("host fallback is blocked", result.Stderr);
+        Assert.Equal(1, invalidationCount);
+        Assert.Null(fallback.LastRequest);
     }
 
     [Fact]
@@ -235,7 +531,68 @@ public async Task RunAsync_GenericException_ReturnsDeny_DoesNotPropagate()
         Assert.Equal(-1, result.ExitCode);
         Assert.Contains("bridge JSON parse error", result.Stderr);
         Assert.Contains("InvalidOperationException", result.Stderr);
-        // Host fallback must NOT have been touched — fail closed, not fallback.
+        // Unexpected executor errors must not become host execution.
+        Assert.Null(fallback.LastRequest);
+    }
+
+    [Fact]
+    public async Task RunAsync_PowerShellUiUnsupported_DeniesEvenWhenCompatibilityFallbackEnabled()
+    {
+        var executor = new FakeSandboxExecutor
+        {
+            ThrowsArbitrary = new NotSupportedException("PowerShell-family shells require UI access"),
+        };
+        var fallback = new FakeCommandRunner
+        {
+            Result = new CommandResult { ExitCode = 0, Stdout = "host" },
+        };
+        var runner = NewRunner(
+            executor,
+            fallback,
+            NewSettings(sandboxEnabled: true, blockHostFallbackWhenMxcUnavailable: false));
+
+        var result = await runner.RunAsync(new CommandRequest { Command = "Write-Output hi", Shell = "powershell" });
+
+        Assert.Equal(-1, result.ExitCode);
+        Assert.Contains("cannot execute PowerShell-family shells", result.Stderr);
+        Assert.Null(fallback.LastRequest);
+    }
+
+    [Fact]
+    public async Task RunAsync_PowerShellUiUnsupported_DeniesWhenStrictFallbackBlockingEnabled()
+    {
+        var executor = new FakeSandboxExecutor
+        {
+            ThrowsArbitrary = new NotSupportedException("PowerShell-family shells require UI access"),
+        };
+        var fallback = new FakeCommandRunner();
+        var runner = NewRunner(
+            executor,
+            fallback,
+            NewSettings(sandboxEnabled: true, blockHostFallbackWhenMxcUnavailable: true));
+
+        var result = await runner.RunAsync(new CommandRequest { Command = "Write-Output hi", Shell = "powershell" });
+
+        Assert.Equal(-1, result.ExitCode);
+        Assert.Contains("cannot execute PowerShell-family shells", result.Stderr);
+        Assert.Null(fallback.LastRequest);
+    }
+
+    [Fact]
+    public async Task RunAsync_OtherNotSupportedException_ReturnsExplicitDeny_DoesNotFallBack()
+    {
+        var executor = new FakeSandboxExecutor
+        {
+            ThrowsArbitrary = new NotSupportedException("Explicit environment variables are not supported by the Windows MXC 0.7 processcontainer backend."),
+        };
+        var fallback = new FakeCommandRunner();
+        var runner = NewRunner(executor, fallback, NewSettings(sandboxEnabled: true));
+
+        var result = await runner.RunAsync(new CommandRequest { Command = "echo hi" });
+
+        Assert.Equal(-1, result.ExitCode);
+        Assert.Contains("Explicit environment variables are not supported", result.Stderr);
+        Assert.DoesNotContain("unexpected", result.Stderr, StringComparison.OrdinalIgnoreCase);
         Assert.Null(fallback.LastRequest);
     }
 
@@ -328,6 +685,22 @@ private sealed class FakeCommandRunner : ICommandRunner
         public string Name => "fake-host";
         public CommandRequest? LastRequest { get; private set; }
         public CommandResult Result { get; set; } = new() { ExitCode = 0, Stdout = string.Empty };
+        public string EffectiveShellForNull { get; set; } = "powershell";
+
+        public string ResolveEffectiveShell(string? requestedShell)
+        {
+            if (string.IsNullOrWhiteSpace(requestedShell))
+                return EffectiveShellForNull;
+
+            return requestedShell.Trim().ToLowerInvariant() switch
+            {
+                "cmd" => "cmd",
+                "pwsh" => "pwsh",
+                "powershell" => "powershell",
+                _ => "powershell",
+            };
+        }
+
         public Task<CommandResult> RunAsync(CommandRequest request, CancellationToken ct = default)
         {
             LastRequest = request;
@@ -373,7 +746,66 @@ public async Task RunAsync_PassesMaxOutputBytesToExecutor()
     }
 
     [Fact]
-    public async Task RunAsync_LogsSandboxSettingsSnapshotAndPolicy()
+    public async Task RunAsync_SandboxRequestUsesNormalizedEffectiveShellForUnsupportedExplicitShell()
+    {
+        var executor = new FakeSandboxExecutor();
+        var fallback = new FakeCommandRunner();
+        var runner = NewRunner(executor, fallback, NewSettings(sandboxEnabled: true));
+
+        await runner.RunAsync(new CommandRequest { Command = "echo hi", Shell = "bash" });
+
+        Assert.NotNull(executor.LastRequest);
+        Assert.Equal("powershell", executor.LastRequest!.Args.GetProperty("shell").GetString());
+        Assert.False(executor.LastRequest.Policy.Ui!.AllowWindows);
+    }
+
+    [Theory]
+    [InlineData("powershell")]
+    [InlineData("pwsh")]
+    public async Task RunAsync_SandboxRequestKeepsUiDeniedForPowerShellFamilyShells(string shell)
+    {
+        var executor = new FakeSandboxExecutor();
+        var fallback = new FakeCommandRunner();
+        var runner = NewRunner(executor, fallback, NewSettings(sandboxEnabled: true));
+
+        await runner.RunAsync(new CommandRequest { Command = "Write-Output hi", Shell = shell });
+
+        Assert.NotNull(executor.LastRequest);
+        Assert.False(executor.LastRequest!.Policy.Ui!.AllowWindows);
+    }
+
+    [Fact]
+    public async Task RunAsync_SandboxRequestKeepsUiDeniedForCmdShell()
+    {
+        var executor = new FakeSandboxExecutor();
+        var fallback = new FakeCommandRunner();
+        var runner = NewRunner(executor, fallback, NewSettings(sandboxEnabled: true));
+
+        await runner.RunAsync(new CommandRequest { Command = "echo hi", Shell = "cmd" });
+
+        Assert.NotNull(executor.LastRequest);
+        Assert.False(executor.LastRequest!.Policy.Ui!.AllowWindows);
+    }
+
+    [Fact]
+    public async Task RunAsync_HostFallbackUsesNormalizedEffectiveShellForUnsupportedExplicitShell()
+    {
+        var executor = new FakeSandboxExecutor();
+        var fallback = new FakeCommandRunner();
+        var runner = NewRunner(
+            executor,
+            fallback,
+            NewSettings(sandboxEnabled: true, blockHostFallbackWhenMxcUnavailable: false),
+            sandboxAvailable: false);
+
+        await runner.RunAsync(new CommandRequest { Command = "echo hi", Shell = "bash" });
+
+        Assert.NotNull(fallback.LastRequest);
+        Assert.Equal("powershell", fallback.LastRequest!.Shell);
+    }
+
+    [Fact]
+    public async Task RunAsync_LogsRedactedSandboxSettingsAndPolicySummary()
     {
         var executor = new FakeSandboxExecutor();
         var fallback = new FakeCommandRunner();
@@ -391,14 +823,50 @@ public async Task RunAsync_LogsSandboxSettingsSnapshotAndPolicy()
         await runner.RunAsync(new CommandRequest { Command = "echo hi" });
 
         var requestLog = Assert.Single(logger.DebugMessages, m => m.Contains("system.run sandbox request", StringComparison.Ordinal));
-        Assert.Contains("sandboxSettingsJson=", requestLog);
-        Assert.Contains("\"systemRunAllowOutbound\":true", requestLog);
-        Assert.Contains("\"sandboxClipboard\":\"both\"", requestLog);
-        Assert.Contains("\"path\":\"C:\\\\Code\\\\repo\"", requestLog);
-        Assert.Contains("\"access\":\"readWrite\"", requestLog);
-        Assert.Contains("policyJson=", requestLog);
-        Assert.Contains("\"network\":{\"allowOutbound\":true", requestLog);
-        Assert.Contains("\"readwritePaths\":[\"C:\\\\Code\\\\repo\"", requestLog);
+        Assert.Contains("sandboxSettings={enabled=True", requestLog);
+        Assert.Contains("allowOutbound=True", requestLog);
+        Assert.Contains("clipboard=Both", requestLog);
+        Assert.Contains("customFolderCount=1", requestLog);
+        Assert.Contains("settingsDirectoryPath=<set>", requestLog);
+        Assert.Contains("policy={readonlyCount=", requestLog);
+        Assert.Contains("readwriteCount=1", requestLog);
+        Assert.Contains("networkAllowOutbound=True", requestLog);
+        Assert.DoesNotContain("sandboxSettingsJson=", requestLog);
+        Assert.DoesNotContain("policyJson=", requestLog);
+        Assert.DoesNotContain("C:\\Code\\repo", requestLog, StringComparison.OrdinalIgnoreCase);
+        Assert.DoesNotContain("C:\\test\\settings", requestLog, StringComparison.OrdinalIgnoreCase);
+    }
+
+    [Fact]
+    public async Task RunAsync_LogsFullSandboxSettingsAndPolicy_WhenFullConfigDiagnosticsEnabled()
+    {
+        var previous = Environment.GetEnvironmentVariable(DirectAppContainerExecutor.LogFullConfigEnvVar);
+        try
+        {
+            Environment.SetEnvironmentVariable(DirectAppContainerExecutor.LogFullConfigEnvVar, "1");
+            var executor = new FakeSandboxExecutor();
+            var fallback = new FakeCommandRunner();
+            var settings = NewSettings(sandboxEnabled: true);
+            settings.SystemRunAllowOutbound = true;
+            settings.SandboxCustomFolders = new()
+            {
+                new SandboxCustomFolder { Path = "C:\\Code\\repo", Access = SandboxFolderAccess.ReadWrite },
+            };
+            var logger = new CapturingLogger();
+            var runner = NewRunner(executor, fallback, settings, logger: logger);
+
+            await runner.RunAsync(new CommandRequest { Command = "echo hi" });
+
+            var fullLog = Assert.Single(logger.DebugMessages, m => m.Contains("system.run sandbox request (full)", StringComparison.Ordinal));
+            Assert.Contains("sandboxSettingsJson=", fullLog);
+            Assert.Contains("policyJson=", fullLog);
+            Assert.Contains("\"path\":\"C:\\\\Code\\\\repo\"", fullLog);
+            Assert.Contains("\"readwritePaths\":[\"C:\\\\Code\\\\repo\"", fullLog);
+        }
+        finally
+        {
+            Environment.SetEnvironmentVariable(DirectAppContainerExecutor.LogFullConfigEnvVar, previous);
+        }
     }
 
     [Fact]
@@ -418,10 +886,8 @@ public async Task RunAsync_PolicyTimeoutCapsAgentTimeout()
     }
 
     [Fact]
-    public async Task RunAsync_UnavailableExecutor_FallsBackToHost()
+    public async Task RunAsync_UnavailableExecutor_FallsBackToHost_WhenCompatibilityFallbackEnabled()
     {
-        // Issue #494: executor reports unavailable at runtime → fall back to
-        // host runner with a warning, not a -1 deny.
         var executor = new FakeSandboxExecutor
         {
             ThrowsUnavailable = true,
@@ -431,12 +897,18 @@ public async Task RunAsync_UnavailableExecutor_FallsBackToHost()
         {
             Result = new CommandResult { ExitCode = 0, Stdout = "host" },
         };
-        var runner = NewRunner(executor, fallback, NewSettings(sandboxEnabled: true));
+        var runner = NewRunner(
+            executor,
+            fallback,
+            NewSettings(
+                sandboxEnabled: true,
+                blockHostFallbackWhenMxcUnavailable: false));
 
-        var result = await runner.RunAsync(new CommandRequest { Command = "echo hi" });
+        var result = await runner.RunAsync(new CommandRequest { Command = "echo hi", Shell = "powershell" });
 
         Assert.Equal(0, result.ExitCode);
         Assert.Equal("host", result.Stdout);
         Assert.NotNull(fallback.LastRequest);
+        Assert.Equal("powershell", fallback.LastRequest!.Shell);
     }
 }
diff --git a/tests/OpenClaw.Shared.Tests/Mxc/MxcConfigBuilderTests.cs b/tests/OpenClaw.Shared.Tests/Mxc/MxcConfigBuilderTests.cs
index 30fb88976..3729804e1 100644
--- a/tests/OpenClaw.Shared.Tests/Mxc/MxcConfigBuilderTests.cs
+++ b/tests/OpenClaw.Shared.Tests/Mxc/MxcConfigBuilderTests.cs
@@ -1,3 +1,4 @@
+using System.Text;
 using System.Text.Json;
 using Xunit;
 using OpenClaw.Shared.Mxc;
@@ -10,7 +11,7 @@ namespace OpenClaw.Shared.Tests.Mxc;
 /// <item>Golden tests vs SDK output captured by <c>tools/mxc/dump-sdk-config.cjs</c>.</item>
 /// <item>Per-Sandbox-UI-setting audit tests.</item>
 /// <item>Round-trip JSON shape (camelCase, no orphan fields).</item>
-/// <item>Env scrub case-insensitivity.</item>
+/// <item>Explicit env limitation for the Windows MXC 0.7 processcontainer backend.</item>
 /// <item><c>ResolveToolDirsFromPath</c> via synthetic PATH.</item>
 /// </list>
 /// </summary>
@@ -91,6 +92,29 @@ private static class P
         Policy: policy,
         TimeoutMs: 0); // explicitly zero so timeout in builder uses request.TimeoutMs=0 → default 30s
 
+    private static MxcConfig BuildConfig(
+        SandboxExecutionRequest request,
+        string scratchDir = P.Scratch,
+        string? containerId = null,
+        string? pathEnvVar = "",
+        Func<string, bool>? readonlyGrantIsBackendSafe = null) =>
+        MxcConfigBuilder.Build(
+            request,
+            scratchDir,
+            new MxcConfigBuildContext(
+                ContainerId: containerId,
+                PathEnvVar: pathEnvVar,
+                ReadonlyGrantIsBackendSafe: readonlyGrantIsBackendSafe));
+
+    private static string ExpectedSystemCmdExe()
+    {
+        var systemRoot = Environment.GetEnvironmentVariable("SystemRoot")
+            ?? Environment.GetEnvironmentVariable("windir");
+        return string.IsNullOrWhiteSpace(systemRoot)
+            ? "cmd.exe"
+            : Path.Combine(systemRoot, "System32", "cmd.exe");
+    }
+
     [Theory]
     [InlineData("locked-down", "LockedDown")]
     [InlineData("balanced", "Balanced")]
@@ -107,11 +131,15 @@ public void BuiltConfig_MatchesSdkGolden(string preset, string presetMethod)
         };
 
         // The golden test reproduces the exact harness recipe: no commandLine,
-        // no env, no cwd, no PATH-resolved tool dirs. We pass an empty PATH and
-        // an empty agent env. The harness stripped process.* (commandLine, cwd,
-        // env, timeout) too; do the same on the C# side before comparing.
-        var request = RequestFor(policy);
-        var config = MxcConfigBuilder.Build(
+        // no cwd, no shell PATH dirs. We pass an empty PATH and no
+        // caller env. The C# config still emits env: [] to make the sandbox env
+        // boundary explicit and bootstraps shell env in commandLine; the
+        // harness stripped process.* (commandLine, cwd, env, timeout), so do
+        // the same on the C# side before comparing. Use cmd so this pure
+        // policy golden stays independent from shell command-line encoding.
+        using var argsDoc = JsonDocument.Parse("""{"shell":"cmd"}""");
+        var request = RequestFor(policy) with { Args = argsDoc.RootElement.Clone() };
+        var config = BuildConfig(
             request,
             scratchDir: P.Scratch,
             containerId: GoldenContainerId,
@@ -172,8 +200,8 @@ private static string ResolveGoldenPath(string preset)
     public void Build_OutboundOn_AddsInternetClientCapability()
     {
         var policy = BalancedPolicy();
-        var config = MxcConfigBuilder.Build(RequestFor(policy), P.Scratch, pathEnvVar: "");
-        Assert.Contains("internetClient", config.AppContainer!.Capabilities!);
+        var config = BuildConfig(RequestFor(policy), pathEnvVar: "");
+        Assert.Contains("internetClient", config.ProcessContainer!.Capabilities!);
         Assert.Equal("allow", config.Network!.DefaultPolicy);
     }
 
@@ -181,8 +209,8 @@ public void Build_OutboundOn_AddsInternetClientCapability()
     public void Build_OutboundOff_OmitsInternetClient_AndNetworkBlocks()
     {
         var policy = LockedDownPolicy();
-        var config = MxcConfigBuilder.Build(RequestFor(policy), P.Scratch, pathEnvVar: "");
-        Assert.DoesNotContain("internetClient", config.AppContainer!.Capabilities!);
+        var config = BuildConfig(RequestFor(policy), pathEnvVar: "");
+        Assert.DoesNotContain("internetClient", config.ProcessContainer!.Capabilities!);
         Assert.Equal("block", config.Network!.DefaultPolicy);
     }
 
@@ -194,19 +222,19 @@ public void Build_OutboundOff_OmitsInternetClient_AndNetworkBlocks()
     public void Build_ClipboardMode_RoundTripsToWxcExecString(ClipboardPolicy mode, string expected)
     {
         var policy = LockedDownPolicy() with { Ui = new UiPolicy(false, mode, false) };
-        var config = MxcConfigBuilder.Build(RequestFor(policy), P.Scratch, pathEnvVar: "");
+        var config = BuildConfig(RequestFor(policy), pathEnvVar: "");
         Assert.Equal(expected, config.Ui!.Clipboard);
     }
 
     [Fact]
     public void Build_AddsScratchDirToReadwritePaths()
     {
-        var config = MxcConfigBuilder.Build(RequestFor(BalancedPolicy()), P.Scratch, pathEnvVar: "");
+        var config = BuildConfig(RequestFor(BalancedPolicy()), pathEnvVar: "");
         Assert.Contains(P.Scratch, config.Filesystem!.ReadwritePaths!);
     }
 
     [Fact]
-    public void Build_OverridesTempEnvVarsToScratch()
+    public void Build_RejectsExplicitEnvironmentUntilBackendSupportsIt()
     {
         var request = RequestFor(BalancedPolicy()) with
         {
@@ -217,18 +245,17 @@ public void Build_OverridesTempEnvVarsToScratch()
                 ["TMPDIR"] = "C:\\real-tmpdir",
             },
         };
-        var config = MxcConfigBuilder.Build(request, P.Scratch, pathEnvVar: "");
-        var env = config.Process.Env!;
-        Assert.Contains($"TEMP={P.Scratch}", env);
-        Assert.Contains($"TMP={P.Scratch}", env);
-        Assert.Contains($"TMPDIR={P.Scratch}", env);
+
+        var ex = Assert.Throws<NotSupportedException>(() =>
+            BuildConfig(request, pathEnvVar: ""));
+        Assert.Contains("Explicit environment variables", ex.Message);
     }
 
     [Fact]
     public void Build_AutoGrantsCwdAsReadonly_WhenNotAlreadyCovered()
     {
         var request = RequestFor(BalancedPolicy()) with { Cwd = "C:\\unrelated\\workdir" };
-        var config = MxcConfigBuilder.Build(request, P.Scratch, pathEnvVar: "");
+        var config = BuildConfig(request, pathEnvVar: "");
         Assert.Contains("C:\\unrelated\\workdir", config.Filesystem!.ReadonlyPaths!);
         Assert.DoesNotContain("C:\\unrelated\\workdir", config.Filesystem!.ReadwritePaths!);
     }
@@ -238,7 +265,7 @@ public void Build_DoesNotDowngradeCwd_WhenAlreadyCoveredByReadwrite()
     {
         var policy = PermissivePolicy(); // Documents already in readwrite
         var request = RequestFor(policy) with { Cwd = Path.Combine(P.Documents, "subfolder") };
-        var config = MxcConfigBuilder.Build(request, P.Scratch, pathEnvVar: "");
+        var config = BuildConfig(request, pathEnvVar: "");
 
         Assert.DoesNotContain(Path.Combine(P.Documents, "subfolder"), config.Filesystem!.ReadonlyPaths!);
         Assert.DoesNotContain(Path.Combine(P.Documents, "subfolder"), config.Filesystem!.ReadwritePaths!);
@@ -249,7 +276,7 @@ public void Build_DoesNotAutoGrantCwd_WhenAlreadyCovered()
     {
         var policy = BalancedPolicy(); // Documents already in readonly
         var request = RequestFor(policy) with { Cwd = Path.Combine(P.Documents, "subfolder") };
-        var config = MxcConfigBuilder.Build(request, P.Scratch, pathEnvVar: "");
+        var config = BuildConfig(request, pathEnvVar: "");
         // Should not have added the subfolder explicitly (parent already grants).
         Assert.DoesNotContain(Path.Combine(P.Documents, "subfolder"), config.Filesystem!.ReadonlyPaths!);
     }
@@ -259,20 +286,103 @@ public void Build_DoesNotAutoGrantCwd_WhenOverlapsDenied()
     {
         var policy = BalancedPolicy();
         var request = RequestFor(policy) with { Cwd = Path.Combine(P.Ssh, "keys") };
-        var config = MxcConfigBuilder.Build(request, P.Scratch, pathEnvVar: "");
+        var config = BuildConfig(request, pathEnvVar: "");
         Assert.DoesNotContain(Path.Combine(P.Ssh, "keys"), config.Filesystem!.ReadonlyPaths!);
     }
 
     [Fact]
-    public void ResolvePathDirsForReadonly_ReturnsExistingPathDirs()
+    public void Build_OmitsDeniedPathsBeforeBackendEmissionButStillFiltersAllows()
+    {
+        var localAppData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
+        if (string.IsNullOrWhiteSpace(localAppData))
+            return;
+
+        var userProfile = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
+        if (string.IsNullOrWhiteSpace(userProfile))
+            return;
+
+        var chromeProfile = Path.Combine(localAppData, "Google", "Chrome", "User Data");
+        var sshPath = Path.Combine(userProfile, ".ssh");
+        var settingsDeny = Path.Combine(P.Settings, "openclaw-settings");
+        var policy = new SandboxPolicy(
+            Version: MxcPolicyBuilder.SupportedPolicyVersion,
+            Filesystem: new FilesystemPolicy(
+                ReadwritePaths: new[] { chromeProfile, userProfile },
+                ReadonlyPaths: Array.Empty<string>(),
+                DeniedPaths: new[] { chromeProfile, sshPath, settingsDeny },
+                ClearPolicyOnExit: true),
+            Network: new NetworkPolicy(false, false),
+            Ui: new UiPolicy(false, ClipboardPolicy.None, false),
+            TimeoutMs: 30_000);
+
+        var config = BuildConfig(RequestFor(policy), pathEnvVar: "");
+
+        Assert.DoesNotContain(chromeProfile, config.Filesystem!.ReadwritePaths!, StringComparer.OrdinalIgnoreCase);
+        Assert.DoesNotContain(userProfile, config.Filesystem.ReadwritePaths!, StringComparer.OrdinalIgnoreCase);
+        Assert.Null(config.Filesystem.DeniedPaths);
+    }
+
+    [Fact]
+    public void Build_RemovesParentReadwriteGrantContainingDeniedSettingsDirectory_WhenDeniedPathsAreNotEmitted()
     {
-        // Synthesize an existing dir on PATH; ensure it shows up as a readonly
-        // grant candidate. No tool-name filter — every existing PATH dir
-        // counts (mirrors the SDK's getAvailableToolsPolicy behavior).
+        var parent = "C:\\Users\\example\\AppData\\Roaming";
+        var settingsDeny = Path.Combine(parent, "OpenClawTray");
+        var policy = new SandboxPolicy(
+            Version: MxcPolicyBuilder.SupportedPolicyVersion,
+            Filesystem: new FilesystemPolicy(
+                ReadwritePaths: new[] { parent, settingsDeny },
+                ReadonlyPaths: Array.Empty<string>(),
+                DeniedPaths: new[] { settingsDeny },
+                ClearPolicyOnExit: true),
+            Network: new NetworkPolicy(false, false),
+            Ui: new UiPolicy(false, ClipboardPolicy.None, false),
+            TimeoutMs: 30_000);
+
+        var config = BuildConfig(
+            RequestFor(policy),
+            pathEnvVar: "");
+
+        Assert.DoesNotContain(parent, config.Filesystem!.ReadwritePaths!, StringComparer.OrdinalIgnoreCase);
+        Assert.DoesNotContain(settingsDeny, config.Filesystem.ReadwritePaths!, StringComparer.OrdinalIgnoreCase);
+        Assert.DoesNotContain(settingsDeny, config.Filesystem.ReadonlyPaths!, StringComparer.OrdinalIgnoreCase);
+        Assert.Null(config.Filesystem.DeniedPaths);
+    }
+
+    [Fact]
+    public void Build_RemovesParentReadonlyGrantContainingDeniedSettingsDirectory_WhenDeniedPathsAreNotEmitted()
+    {
+        var parent = "C:\\Users\\example\\AppData\\Roaming";
+        var settingsDeny = Path.Combine(parent, "OpenClawTray");
+        var policy = new SandboxPolicy(
+            Version: MxcPolicyBuilder.SupportedPolicyVersion,
+            Filesystem: new FilesystemPolicy(
+                ReadwritePaths: Array.Empty<string>(),
+                ReadonlyPaths: new[] { parent, settingsDeny },
+                DeniedPaths: new[] { settingsDeny },
+                ClearPolicyOnExit: true),
+            Network: new NetworkPolicy(false, false),
+            Ui: new UiPolicy(false, ClipboardPolicy.None, false),
+            TimeoutMs: 30_000);
+
+        var config = BuildConfig(
+            RequestFor(policy),
+            pathEnvVar: "");
+
+        Assert.DoesNotContain(parent, config.Filesystem!.ReadonlyPaths!, StringComparer.OrdinalIgnoreCase);
+        Assert.DoesNotContain(settingsDeny, config.Filesystem.ReadwritePaths!, StringComparer.OrdinalIgnoreCase);
+        Assert.DoesNotContain(settingsDeny, config.Filesystem.ReadonlyPaths!, StringComparer.OrdinalIgnoreCase);
+        Assert.Null(config.Filesystem.DeniedPaths);
+    }
+
+    [Fact]
+    public void ResolvePathDirsForShellPath_ReturnsExistingPathDirs()
+    {
+        // Synthesize an existing dir on PATH; ensure it shows up in the shell
+        // PATH bootstrap.
         var tempDir = Directory.CreateDirectory(Path.Combine(Path.GetTempPath(), "mxc-tool-test-" + Guid.NewGuid().ToString("N"))).FullName;
         try
         {
-            var dirs = MxcConfigBuilder.ResolvePathDirsForReadonly(pathEnvVar: tempDir);
+            var dirs = MxcConfigBuilder.ResolvePathDirsForShellPath(pathEnvVar: tempDir);
             Assert.Contains(tempDir, dirs);
         }
         finally
@@ -283,14 +393,84 @@ public void ResolvePathDirsForReadonly_ReturnsExistingPathDirs()
     }
 
     [Fact]
-    public void Build_SynthesizesPathEnvFromGrantedPathDirs()
+    public void Build_BootstrapsShellPathAndGrantsBackendSafePathDirsReadonly()
     {
         var tempDir = Directory.CreateDirectory(Path.Combine(Path.GetTempPath(), "mxc-path-env-test-" + Guid.NewGuid().ToString("N"))).FullName;
         try
         {
-            var config = MxcConfigBuilder.Build(RequestFor(BalancedPolicy()), P.Scratch, pathEnvVar: tempDir);
-            Assert.Contains($"PATH={tempDir}", config.Process.Env!);
+            using var argsDoc = JsonDocument.Parse("""{"command":"git --version","shell":"cmd"}""");
+            var request = RequestFor(BalancedPolicy()) with { Args = argsDoc.RootElement.Clone() };
+
+            var config = BuildConfig(request, pathEnvVar: tempDir);
+
+            Assert.NotNull(config.Process.Env);
+            Assert.Empty(config.Process.Env);
             Assert.Contains(tempDir, config.Filesystem!.ReadonlyPaths!);
+            Assert.Contains($"set \"TEMP={P.Scratch}\"", config.Process.CommandLine);
+            Assert.Contains($"set \"TMP={P.Scratch}\"", config.Process.CommandLine);
+            Assert.Contains($"set \"TMPDIR={P.Scratch}\"", config.Process.CommandLine);
+            Assert.Contains($"set \"PATH={tempDir}\"", config.Process.CommandLine);
+            Assert.Contains("git --version", config.Process.CommandLine);
+        }
+        finally
+        {
+            // slopwatch-ignore: SW003 Test cleanup or fixture teardown is best-effort and must not hide the test outcome.
+            try { Directory.Delete(tempDir, true); } catch { }
+        }
+    }
+
+    [Fact]
+    public void Build_BootstrapsUnsafePathDirsWithoutGrantingThem()
+    {
+        var unsafeDir = Directory.CreateDirectory(Path.Combine(Path.GetTempPath(), "mxc-path-env-unsafe-" + Guid.NewGuid().ToString("N"))).FullName;
+        var safeDir = Directory.CreateDirectory(Path.Combine(Path.GetTempPath(), "mxc-path-env-safe-" + Guid.NewGuid().ToString("N"))).FullName;
+        try
+        {
+            using var argsDoc = JsonDocument.Parse("""{"command":"tool --version","shell":"cmd"}""");
+            var request = RequestFor(BalancedPolicy()) with { Args = argsDoc.RootElement.Clone() };
+            var pathEnv = string.Join(Path.PathSeparator, unsafeDir, safeDir);
+
+            var config = BuildConfig(
+                request,
+                pathEnvVar: pathEnv,
+                readonlyGrantIsBackendSafe: dir => !string.Equals(dir, unsafeDir, StringComparison.OrdinalIgnoreCase));
+
+            Assert.Contains($"set \"PATH={pathEnv}\"", config.Process.CommandLine);
+            Assert.DoesNotContain(unsafeDir, config.Filesystem!.ReadonlyPaths!, StringComparer.OrdinalIgnoreCase);
+            Assert.Contains(safeDir, config.Filesystem.ReadonlyPaths!, StringComparer.OrdinalIgnoreCase);
+        }
+        finally
+        {
+            // slopwatch-ignore: SW003 Test cleanup or fixture teardown is best-effort and must not hide the test outcome.
+            try { Directory.Delete(unsafeDir, true); } catch { }
+            try { Directory.Delete(safeDir, true); } catch { }
+        }
+    }
+
+    [Fact]
+    public void Build_CmdShell_RewritesBootstrapPercentEnvRefsToDelayedExpansion()
+    {
+        var tempDir = Directory.CreateDirectory(Path.Combine(Path.GetTempPath(), "mxc-path-env-test-" + Guid.NewGuid().ToString("N"))).FullName;
+        try
+        {
+            using var argsDoc = JsonDocument.Parse("""
+            {
+                "command": "echo %TEMP% %TMP% %TMPDIR% %PATH%",
+                "shell": "cmd",
+                "args": ["%TEMP%\\out.txt"]
+            }
+            """);
+            var request = RequestFor(BalancedPolicy()) with { Args = argsDoc.RootElement.Clone() };
+
+            var config = BuildConfig(request, pathEnvVar: tempDir);
+
+            Assert.Contains(" /V:ON /S /C \"", config.Process.CommandLine, StringComparison.Ordinal);
+            Assert.Contains("echo !TEMP! !TMP! !TMPDIR! !PATH!", config.Process.CommandLine, StringComparison.Ordinal);
+            Assert.Contains("!TEMP!\\out.txt", config.Process.CommandLine, StringComparison.Ordinal);
+            Assert.DoesNotContain("%TEMP%", config.Process.CommandLine, StringComparison.OrdinalIgnoreCase);
+            Assert.DoesNotContain("%TMP%", config.Process.CommandLine, StringComparison.OrdinalIgnoreCase);
+            Assert.DoesNotContain("%TMPDIR%", config.Process.CommandLine, StringComparison.OrdinalIgnoreCase);
+            Assert.DoesNotContain("%PATH%", config.Process.CommandLine, StringComparison.OrdinalIgnoreCase);
         }
         finally
         {
@@ -300,7 +480,7 @@ public void Build_SynthesizesPathEnvFromGrantedPathDirs()
     }
 
     [Fact]
-    public void Build_AddsDriveRootReadonlyForGrantedFolderTraversal()
+    public void Build_DoesNotAddDriveRootCompatibilityGrant()
     {
         var policy = new SandboxPolicy(
             Version: MxcPolicyBuilder.SupportedPolicyVersion,
@@ -313,8 +493,8 @@ public void Build_AddsDriveRootReadonlyForGrantedFolderTraversal()
             Ui: new UiPolicy(false, ClipboardPolicy.None, false),
             TimeoutMs: 30_000);
 
-        var config = MxcConfigBuilder.Build(RequestFor(policy), P.Scratch, pathEnvVar: "");
-        Assert.Contains("C:\\", config.Filesystem!.ReadonlyPaths!);
+        var config = BuildConfig(RequestFor(policy), pathEnvVar: "");
+        Assert.DoesNotContain("C:\\", config.Filesystem!.ReadonlyPaths!);
     }
 
     [Fact]
@@ -331,26 +511,59 @@ public void Build_DoesNotTreatReadwriteChildAsCoveringParentCwd()
             Ui: new UiPolicy(false, ClipboardPolicy.None, false),
             TimeoutMs: 30_000);
 
-        var config = MxcConfigBuilder.Build(RequestFor(policy) with { Cwd = "C:\\workspace" }, P.Scratch, pathEnvVar: "");
+        var config = BuildConfig(RequestFor(policy) with { Cwd = "C:\\workspace" }, pathEnvVar: "");
         Assert.Contains("C:\\workspace", config.Filesystem!.ReadonlyPaths!);
         Assert.DoesNotContain("C:\\workspace", config.Filesystem!.ReadwritePaths!);
     }
 
     [Fact]
-    public void ResolvePathDirsForReadonly_SkipsNonExistentDirs()
+    public void ResolvePathDirsForShellPath_SkipsNonExistentDirs()
     {
         var fake = Path.Combine(Path.GetTempPath(), "definitely-not-real-xyzqq-" + Guid.NewGuid().ToString("N"));
-        var dirs = MxcConfigBuilder.ResolvePathDirsForReadonly(pathEnvVar: fake);
+        var dirs = MxcConfigBuilder.ResolvePathDirsForShellPath(pathEnvVar: fake);
         Assert.Empty(dirs);
     }
 
     [Fact]
-    public void ResolvePathDirsForReadonly_SkipsDriveRoots()
+    public void ResolvePathDirsForShellPath_SkipsDriveRoots()
     {
-        var dirs = MxcConfigBuilder.ResolvePathDirsForReadonly(pathEnvVar: "C:\\");
+        var dirs = MxcConfigBuilder.ResolvePathDirsForShellPath(pathEnvVar: "C:\\");
         Assert.Empty(dirs);
     }
 
+    [Fact]
+    public void ResolvePathDirsForShellPath_KeepsProtectedDirsInPathOnly()
+    {
+        if (!OperatingSystem.IsWindows())
+            return;
+
+        var programFiles = Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles);
+        if (string.IsNullOrWhiteSpace(programFiles))
+            return;
+
+        var dirs = MxcConfigBuilder.ResolvePathDirsForShellPath(pathEnvVar: programFiles);
+        Assert.Contains(programFiles, dirs, StringComparer.OrdinalIgnoreCase);
+    }
+
+    [Fact]
+    public void Build_BootstrapsProtectedPathDirsWithoutGrantingThem()
+    {
+        if (!OperatingSystem.IsWindows())
+            return;
+
+        var programFiles = Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles);
+        if (string.IsNullOrWhiteSpace(programFiles))
+            return;
+
+        using var argsDoc = JsonDocument.Parse("""{"command":"tool --version","shell":"cmd"}""");
+        var request = RequestFor(BalancedPolicy()) with { Args = argsDoc.RootElement.Clone() };
+
+        var config = BuildConfig(request, pathEnvVar: programFiles);
+
+        Assert.Contains($"set \"PATH={programFiles}\"", config.Process.CommandLine);
+        Assert.DoesNotContain(programFiles, config.Filesystem!.ReadonlyPaths!, StringComparer.OrdinalIgnoreCase);
+    }
+
     [Fact]
     public void Build_DefensiveFilterStripsAllowEntriesOverlappingDenied()
     {
@@ -365,7 +578,7 @@ public void Build_DefensiveFilterStripsAllowEntriesOverlappingDenied()
             Network: new NetworkPolicy(false, false),
             Ui: new UiPolicy(false, ClipboardPolicy.None, false),
             TimeoutMs: 30_000);
-        var config = MxcConfigBuilder.Build(RequestFor(policy), P.Scratch, pathEnvVar: "");
+        var config = BuildConfig(RequestFor(policy), pathEnvVar: "");
         Assert.DoesNotContain(Path.Combine(P.Ssh, "keys"), config.Filesystem!.ReadwritePaths!);
         Assert.DoesNotContain(Path.Combine(P.Chrome, "Profile 1"), config.Filesystem!.ReadonlyPaths!);
     }
@@ -373,7 +586,7 @@ public void Build_DefensiveFilterStripsAllowEntriesOverlappingDenied()
     [Fact]
     public void Build_TimeoutDefaultsTo30sWhenRequestZero()
     {
-        var config = MxcConfigBuilder.Build(RequestFor(BalancedPolicy()), P.Scratch, pathEnvVar: "");
+        var config = BuildConfig(RequestFor(BalancedPolicy()), pathEnvVar: "");
         Assert.Equal(30_000, config.Process.TimeoutMs);
     }
 
@@ -381,12 +594,296 @@ public void Build_TimeoutDefaultsTo30sWhenRequestZero()
     public void Build_TimeoutHonorsRequestValue()
     {
         var req = RequestFor(BalancedPolicy()) with { TimeoutMs = 12_345 };
-        var config = MxcConfigBuilder.Build(req, P.Scratch, pathEnvVar: "");
+        var config = BuildConfig(req, pathEnvVar: "");
         Assert.Equal(12_345, config.Process.TimeoutMs);
     }
 
+    [Fact]
+    public void Build_DefaultShell_UsesCmdAndPreservesUiDeny()
+    {
+        using var argsDoc = JsonDocument.Parse("""{"command":"echo hi"}""");
+        var request = RequestFor(BalancedPolicy()) with { Args = argsDoc.RootElement.Clone() };
+
+        var config = BuildConfig(request, pathEnvVar: "");
+
+        Assert.StartsWith(ExpectedSystemCmdExe(), config.Process.CommandLine, StringComparison.OrdinalIgnoreCase);
+        Assert.Contains(" /S /C \"set \"TEMP=", config.Process.CommandLine, StringComparison.Ordinal);
+        Assert.Contains("echo hi\"", config.Process.CommandLine, StringComparison.Ordinal);
+        Assert.True(config.Ui!.Disable);
+        Assert.Equal("container", config.ProcessContainer!.Ui!.Isolation);
+    }
+
+    [Fact]
+    public void Build_PowerShellShell_WhenPolicyAllowsWindows_EnablesDesktopIsolation()
+    {
+        using var argsDoc = JsonDocument.Parse("""{"command":"Write-Output hi","shell":"powershell"}""");
+        var policy = BalancedPolicy() with
+        {
+            Ui = new UiPolicy(AllowWindows: true, Clipboard: ClipboardPolicy.Read, AllowInputInjection: false),
+        };
+        var request = RequestFor(policy) with { Args = argsDoc.RootElement.Clone() };
+
+        var config = BuildConfig(request, pathEnvVar: "");
+
+        Assert.False(config.Ui!.Disable);
+        Assert.Equal("desktop", config.ProcessContainer!.Ui!.Isolation);
+    }
+
+    [Theory]
+    [InlineData("powershell")]
+    [InlineData("pwsh")]
+    public void Build_PowerShellFamilyShell_WhenUiDenied_FailsClosed(string shell)
+    {
+        using var argsDoc = JsonDocument.Parse($$"""{"command":"Write-Output hi","shell":"{{shell}}"}""");
+        var request = RequestFor(BalancedPolicy()) with { Args = argsDoc.RootElement.Clone() };
+
+        var ex = Assert.Throws<NotSupportedException>(() => BuildConfig(request, pathEnvVar: ""));
+
+        Assert.Contains("PowerShell-family shells require UI access", ex.Message);
+    }
+
+    [Fact]
+    public void Build_UnsupportedShell_FailsClosedBeforeCommandLineFallback()
+    {
+        using var argsDoc = JsonDocument.Parse("""{"command":"echo hi","shell":"bash"}""");
+        var request = RequestFor(BalancedPolicy()) with { Args = argsDoc.RootElement.Clone() };
+
+        var ex = Assert.Throws<NotSupportedException>(() => BuildConfig(request, pathEnvVar: ""));
+
+        Assert.Contains("Unsupported shell 'bash'", ex.Message);
+    }
+
+    [Fact]
+    public void Build_CmdShell_UsesResolvedCmdExe()
+    {
+        using var argsDoc = JsonDocument.Parse("""{"command":"echo hi","shell":"cmd"}""");
+        var request = RequestFor(BalancedPolicy()) with { Args = argsDoc.RootElement.Clone() };
+
+        var config = BuildConfig(request, pathEnvVar: "");
+
+        Assert.StartsWith(ExpectedSystemCmdExe(), config.Process.CommandLine, StringComparison.OrdinalIgnoreCase);
+        Assert.Contains(" /S /C \"set \"TEMP=", config.Process.CommandLine, StringComparison.Ordinal);
+        Assert.Contains("echo hi\"", config.Process.CommandLine, StringComparison.Ordinal);
+        Assert.True(config.Ui!.Disable);
+        Assert.Equal("container", config.ProcessContainer!.Ui!.Isolation);
+    }
+
+    [Fact]
+    public void Build_CmdShell_CommandWithLineBreak_FailsClosed()
+    {
+        using var argsDoc = JsonDocument.Parse("""{"command":"echo ok\r\nwhoami","shell":"cmd"}""");
+        var request = RequestFor(BalancedPolicy()) with { Args = argsDoc.RootElement.Clone() };
+
+        var ex = Assert.Throws<NotSupportedException>(() => BuildConfig(request, pathEnvVar: ""));
+
+        Assert.Contains("cannot contain CR or LF", ex.Message);
+    }
+
+    [Fact]
+    public void Build_CmdShell_ArgvWithLineBreak_FailsClosed()
+    {
+        using var argsDoc = JsonDocument.Parse("""{"command":"echo","args":["ok\r\nwhoami"],"shell":"cmd"}""");
+        var request = RequestFor(BalancedPolicy()) with { Args = argsDoc.RootElement.Clone() };
+
+        var ex = Assert.Throws<NotSupportedException>(() => BuildConfig(request, pathEnvVar: ""));
+
+        Assert.Contains("cannot contain CR or LF", ex.Message);
+    }
+
+    [Fact]
+    public void Build_CmdShell_IgnoresHostComSpec()
+    {
+        var previous = Environment.GetEnvironmentVariable("ComSpec");
+        try
+        {
+            Environment.SetEnvironmentVariable("ComSpec", "C:\\malicious\\cmd.exe");
+            using var argsDoc = JsonDocument.Parse("""{"command":"echo hi","shell":"cmd"}""");
+            var request = RequestFor(BalancedPolicy()) with { Args = argsDoc.RootElement.Clone() };
+
+            var config = BuildConfig(request, pathEnvVar: "");
+
+            Assert.StartsWith(ExpectedSystemCmdExe(), config.Process.CommandLine, StringComparison.OrdinalIgnoreCase);
+            Assert.DoesNotContain("C:\\malicious\\cmd.exe", config.Process.CommandLine, StringComparison.OrdinalIgnoreCase);
+        }
+        finally
+        {
+            Environment.SetEnvironmentVariable("ComSpec", previous);
+        }
+    }
+
+    [Fact]
+    public void Build_PwshShell_WhenPolicyAllowsWindows_UsesPwshAndEnablesDesktopIsolation()
+    {
+        using var argsDoc = JsonDocument.Parse("""{"command":"Write-Output hi","shell":"pwsh"}""");
+        var policy = BalancedPolicy() with
+        {
+            Ui = new UiPolicy(AllowWindows: true, Clipboard: ClipboardPolicy.Read, AllowInputInjection: false),
+        };
+        var request = RequestFor(policy) with { Args = argsDoc.RootElement.Clone() };
+
+        var config = BuildConfig(request, pathEnvVar: "");
+
+        Assert.StartsWith("pwsh.exe", config.Process.CommandLine, StringComparison.OrdinalIgnoreCase);
+        Assert.Contains(" -NoProfile -NonInteractive -EncodedCommand ", config.Process.CommandLine, StringComparison.Ordinal);
+        Assert.False(config.Ui!.Disable);
+        Assert.Equal("desktop", config.ProcessContainer!.Ui!.Isolation);
+    }
+
+    [Fact]
+    public void Build_PwshShell_ResolvesPwshFromPathBeforeClearingProcessEnvironment()
+    {
+        var tempRoot = Directory.CreateDirectory(Path.Combine(Path.GetTempPath(), "mxc-pwsh-resolve-test-" + Guid.NewGuid().ToString("N"))).FullName;
+        try
+        {
+            var binDir = Directory.CreateDirectory(Path.Combine(tempRoot, "bin")).FullName;
+            var pwshPath = Path.Combine(binDir, "pwsh.exe");
+            File.WriteAllBytes(pwshPath, Array.Empty<byte>());
+            using var argsDoc = JsonDocument.Parse("""{"command":"Write-Output hi","shell":"pwsh"}""");
+            var policy = BalancedPolicy() with
+            {
+                Ui = new UiPolicy(AllowWindows: true, Clipboard: ClipboardPolicy.Read, AllowInputInjection: false),
+            };
+            var request = RequestFor(policy) with { Args = argsDoc.RootElement.Clone() };
+
+            var config = BuildConfig(request, pathEnvVar: binDir);
+
+            var expectedPrefix = pwshPath.IndexOfAny(new[] { ' ', '\t', '"' }) < 0
+                ? pwshPath
+                : "\"" + pwshPath.Replace("\"", "\\\"") + "\"";
+            Assert.StartsWith(expectedPrefix, config.Process.CommandLine, StringComparison.OrdinalIgnoreCase);
+            Assert.Empty(config.Process.Env!);
+            Assert.Contains(" -NoProfile -NonInteractive -EncodedCommand ", config.Process.CommandLine, StringComparison.Ordinal);
+        }
+        finally
+        {
+            // slopwatch-ignore: SW003 Test cleanup or fixture teardown is best-effort and must not hide the test outcome.
+            try { Directory.Delete(tempRoot, true); } catch { }
+        }
+    }
+
+    [Fact]
+    public void Build_PowerShellShell_UsesResolvedWindowsPowerShellExe()
+    {
+        using var argsDoc = JsonDocument.Parse("""{"command":"Write-Output hi","shell":"powershell"}""");
+        var policy = BalancedPolicy() with
+        {
+            Ui = new UiPolicy(AllowWindows: true, Clipboard: ClipboardPolicy.Read, AllowInputInjection: false),
+        };
+        var request = RequestFor(policy) with { Args = argsDoc.RootElement.Clone() };
+
+        var config = BuildConfig(request, pathEnvVar: "");
+
+        var systemRoot = Environment.GetEnvironmentVariable("SystemRoot")
+            ?? Environment.GetEnvironmentVariable("windir");
+        var expected = string.IsNullOrWhiteSpace(systemRoot)
+            ? "powershell.exe"
+            : Path.Combine(systemRoot, "System32", "WindowsPowerShell", "v1.0", "powershell.exe");
+
+        Assert.StartsWith(expected, config.Process.CommandLine, StringComparison.OrdinalIgnoreCase);
+        Assert.Contains(" -NoProfile -NonInteractive -EncodedCommand ", config.Process.CommandLine, StringComparison.Ordinal);
+        Assert.False(config.Ui!.Disable);
+        Assert.Equal("desktop", config.ProcessContainer!.Ui!.Isolation);
+    }
+
+    [Fact]
+    public void Build_PowerShellShell_QuotesPathBootstrapValue()
+    {
+        var tempRoot = Directory.CreateDirectory(Path.Combine(Path.GetTempPath(), "mxc-pwsh-path-test-" + Guid.NewGuid().ToString("N"))).FullName;
+        try
+        {
+            var dir1 = Directory.CreateDirectory(Path.Combine(tempRoot, "bin1")).FullName;
+            var dir2 = Directory.CreateDirectory(Path.Combine(tempRoot, "bin2")).FullName;
+            var pathEnv = string.Join(Path.PathSeparator, dir1, dir2);
+            using var argsDoc = JsonDocument.Parse("""{"command":"Write-Output $env:PATH","shell":"powershell"}""");
+            var policy = BalancedPolicy() with
+            {
+                Ui = new UiPolicy(AllowWindows: true, Clipboard: ClipboardPolicy.Read, AllowInputInjection: false),
+            };
+            var request = RequestFor(policy) with { Args = argsDoc.RootElement.Clone() };
+
+            var config = BuildConfig(request, pathEnvVar: pathEnv);
+            var script = DecodePowershellEncodedCommand(config.Process.CommandLine);
+
+            Assert.Contains("$env:PATH = '" + pathEnv.Replace("'", "''") + "';", script);
+            Assert.DoesNotContain("$env:PATH = " + pathEnv + ";", script);
+        }
+        finally
+        {
+            // slopwatch-ignore: SW003 Test cleanup or fixture teardown is best-effort and must not hide the test outcome.
+            try { Directory.Delete(tempRoot, true); } catch { }
+        }
+    }
+
+    [Fact]
+    public void Build_CmdShell_BoundsPathBootstrapBeforeCommandLine()
+    {
+        var tempRoot = Directory.CreateDirectory(Path.Combine(Path.GetTempPath(), "mxc-cmd-long-path-" + Guid.NewGuid().ToString("N"))).FullName;
+        try
+        {
+            var dirs = Enumerable.Range(0, 180)
+                .Select(i => Directory.CreateDirectory(Path.Combine(tempRoot, $"bin{i:D3}")).FullName)
+                .ToArray();
+            var pathEnv = string.Join(Path.PathSeparator, dirs);
+            using var argsDoc = JsonDocument.Parse("""{"command":"echo %PATH%","shell":"cmd"}""");
+            var request = RequestFor(BalancedPolicy()) with { Args = argsDoc.RootElement.Clone() };
+
+            var config = BuildConfig(request, pathEnvVar: pathEnv);
+
+            Assert.Contains("set \"PATH=", config.Process.CommandLine, StringComparison.Ordinal);
+            Assert.Contains(dirs[0], config.Process.CommandLine, StringComparison.OrdinalIgnoreCase);
+            Assert.DoesNotContain(dirs[^1], config.Process.CommandLine, StringComparison.OrdinalIgnoreCase);
+            Assert.True(config.Process.CommandLine.Length < 12_000, config.Process.CommandLine);
+        }
+        finally
+        {
+            // slopwatch-ignore: SW003 Test cleanup or fixture teardown is best-effort and must not hide the test outcome.
+            try { Directory.Delete(tempRoot, true); } catch { }
+        }
+    }
+
+    [Fact]
+    public void Build_PowerShellShell_BoundsPathBootstrapBeforeEncoding()
+    {
+        var tempRoot = Directory.CreateDirectory(Path.Combine(Path.GetTempPath(), "mxc-pwsh-long-path-" + Guid.NewGuid().ToString("N"))).FullName;
+        try
+        {
+            var dirs = Enumerable.Range(0, 180)
+                .Select(i => Directory.CreateDirectory(Path.Combine(tempRoot, $"bin{i:D3}")).FullName)
+                .ToArray();
+            var pathEnv = string.Join(Path.PathSeparator, dirs);
+            using var argsDoc = JsonDocument.Parse("""{"command":"Write-Output $env:PATH","shell":"powershell"}""");
+            var policy = BalancedPolicy() with
+            {
+                Ui = new UiPolicy(AllowWindows: true, Clipboard: ClipboardPolicy.Read, AllowInputInjection: false),
+            };
+            var request = RequestFor(policy) with { Args = argsDoc.RootElement.Clone() };
+
+            var config = BuildConfig(request, pathEnvVar: pathEnv);
+            var script = DecodePowershellEncodedCommand(config.Process.CommandLine);
+
+            Assert.Contains("$env:PATH = '", script, StringComparison.Ordinal);
+            Assert.Contains(dirs[0], script, StringComparison.OrdinalIgnoreCase);
+            Assert.DoesNotContain(dirs[^1], script, StringComparison.OrdinalIgnoreCase);
+            Assert.True(script.Length < 8_000, script);
+        }
+        finally
+        {
+            // slopwatch-ignore: SW003 Test cleanup or fixture teardown is best-effort and must not hide the test outcome.
+            try { Directory.Delete(tempRoot, true); } catch { }
+        }
+    }
+
     // ---- helpers for tolerant JSON comparison ----
 
+    private static string DecodePowershellEncodedCommand(string commandLine)
+    {
+        const string marker = " -EncodedCommand ";
+        var markerIndex = commandLine.IndexOf(marker, StringComparison.OrdinalIgnoreCase);
+        Assert.True(markerIndex >= 0, commandLine);
+        var encoded = commandLine[(markerIndex + marker.Length)..].Trim();
+        return Encoding.Unicode.GetString(Convert.FromBase64String(encoded));
+    }
+
     private static void AssertJsonEqual(JsonObjectNode expected, JsonObjectNode actual, string path)
     {
         foreach (var key in expected.Keys)
@@ -430,14 +927,14 @@ private static bool IsToleratedExtraKey(string fullPath)
     {
         // commandLine/cwd/env/timeoutMs live under "process" — the SDK leaves
         // process empty when called with createConfigFromPolicy and we add
-        // these ourselves. appContainer.name is a per-invocation random hex
+        // these ourselves. processContainer.name is a per-invocation random hex
         // that we stripped from the goldens.
         return fullPath is
             "$.process.commandLine" or
             "$.process.cwd" or
             "$.process.env" or
             "$.process.timeoutMs" or
-            "$.appContainer.name";
+            "$.processContainer.name";
     }
 
     private static void AssertNodeEqual(object? expected, object? actual, string path)
diff --git a/tests/OpenClaw.Shared.Tests/Mxc/MxcPolicyBuilderTests.cs b/tests/OpenClaw.Shared.Tests/Mxc/MxcPolicyBuilderTests.cs
index cfbad2e07..dfe9a3443 100644
--- a/tests/OpenClaw.Shared.Tests/Mxc/MxcPolicyBuilderTests.cs
+++ b/tests/OpenClaw.Shared.Tests/Mxc/MxcPolicyBuilderTests.cs
@@ -28,11 +28,35 @@ public void ForSystemRun_DefaultSettings_DefaultDenyAcrossTheBoard()
     public void ForSystemRun_DeniesSettingsDirectoryPath()
     {
         var settings = new SettingsData();
-        var policy = MxcPolicyBuilder.ForSystemRun(settings, "C:\\Users\\test\\AppData\\OpenClawTray");
+        var settingsDir = CreateTempDeniedDir();
+
+        try
+        {
+            var policy = MxcPolicyBuilder.ForSystemRun(settings, settingsDir);
+
+            Assert.NotNull(policy.Filesystem);
+            Assert.NotNull(policy.Filesystem!.DeniedPaths);
+            Assert.Contains(policy.Filesystem.DeniedPaths!, p =>
+                string.Equals(p, settingsDir, StringComparison.OrdinalIgnoreCase));
+        }
+        finally
+        {
+            TryDeleteTempDir(settingsDir);
+        }
+    }
+
+    [Fact]
+    public void ForSystemRun_DeniesMissingSettingsDirectoryPath()
+    {
+        var settings = new SettingsData();
+        var missingSettingsDir = Path.Combine(Path.GetTempPath(), "openclaw-missing-settings-" + Guid.NewGuid().ToString("N"));
+
+        var policy = MxcPolicyBuilder.ForSystemRun(settings, missingSettingsDir);
 
         Assert.NotNull(policy.Filesystem);
         Assert.NotNull(policy.Filesystem!.DeniedPaths);
-        Assert.Contains("C:\\Users\\test\\AppData\\OpenClawTray", policy.Filesystem.DeniedPaths!);
+        Assert.Contains(policy.Filesystem.DeniedPaths!, p =>
+            string.Equals(p, missingSettingsDir, StringComparison.OrdinalIgnoreCase));
     }
 
     [Fact]
@@ -43,8 +67,8 @@ public void ForSystemRun_DeniesSshDirectoryByDefault()
 
         Assert.NotNull(policy.Filesystem);
         Assert.NotNull(policy.Filesystem!.DeniedPaths);
-        // .ssh path is the home-relative one; verify it's present and ends with ".ssh".
-        Assert.Contains(policy.Filesystem.DeniedPaths!, p => p.EndsWith(".ssh"));
+        var expected = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".ssh");
+        Assert.Contains(policy.Filesystem.DeniedPaths!, p => string.Equals(p, expected, StringComparison.OrdinalIgnoreCase));
     }
 
     [Fact]
@@ -179,20 +203,50 @@ public void ForSystemRun_TimeoutMsZero_TreatedAsUnset()
     [Fact]
     public void ForSystemRun_BrowserProfileDirectories_AreDenied()
     {
-        // The UI claims SSH keys, browser profiles, and OpenClaw's own settings
-        // are always blocked. Verify the policy backs that claim for browsers —
-        // these paths must always appear in DeniedPaths regardless of settings,
-        // even if the browser isn't installed (the AppContainer policy treats
-        // nonexistent denies as a no-op).
+        // These roots stay in the logical deny list even when absent so parent
+        // grants cannot create sensitive profile directories. Backend emission
+        // is filtered later by MxcConfigBuilder for MXC 0.7 DACL safety.
         var settings = new SettingsData();
         var policy = MxcPolicyBuilder.ForSystemRun(settings, "C:\\settings");
 
         var denied = policy.Filesystem!.DeniedPaths!;
-        Assert.Contains(denied, p => p.EndsWith("Google\\Chrome\\User Data", StringComparison.OrdinalIgnoreCase));
-        Assert.Contains(denied, p => p.EndsWith("Microsoft\\Edge\\User Data", StringComparison.OrdinalIgnoreCase));
-        Assert.Contains(denied, p => p.EndsWith("Mozilla\\Firefox\\Profiles", StringComparison.OrdinalIgnoreCase));
-        Assert.Contains(denied, p => p.EndsWith("BraveSoftware\\Brave-Browser\\User Data", StringComparison.OrdinalIgnoreCase));
-        Assert.Contains(denied, p => p.EndsWith("Microsoft\\Windows\\PowerShell\\PSReadLine", StringComparison.OrdinalIgnoreCase));
+        AssertDeniedPath(denied, Path.Combine(
+            Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
+            "Google", "Chrome", "User Data"));
+        AssertDeniedPath(denied, Path.Combine(
+            Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
+            "Microsoft", "Edge", "User Data"));
+        AssertDeniedPath(denied, Path.Combine(
+            Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
+            "Mozilla", "Firefox", "Profiles"));
+        AssertDeniedPath(denied, Path.Combine(
+            Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
+            "BraveSoftware", "Brave-Browser", "User Data"));
+        AssertDeniedPath(denied, Path.Combine(
+            Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
+            "Microsoft", "Windows", "PowerShell", "PSReadLine"));
+    }
+
+    [Fact]
+    public void ForSystemRun_UserProfileGrant_FilteredBecauseItContainsSsh()
+    {
+        var userProfile = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
+        if (string.IsNullOrWhiteSpace(userProfile))
+            return;
+
+        var settings = new SettingsData
+        {
+            SandboxCustomFolders = new()
+            {
+                new SandboxCustomFolder { Path = userProfile, Access = SandboxFolderAccess.ReadWrite },
+            },
+        };
+
+        var policy = MxcPolicyBuilder.ForSystemRun(settings, "C:\\settings");
+
+        AssertDeniedPath(policy.Filesystem!.DeniedPaths!, Path.Combine(userProfile, ".ssh"));
+        Assert.DoesNotContain(policy.Filesystem.ReadwritePaths!, p =>
+            string.Equals(Path.GetFullPath(p), Path.GetFullPath(userProfile), StringComparison.OrdinalIgnoreCase));
     }
 
     [Fact]
@@ -200,22 +254,28 @@ public void ForSystemRun_CustomFolder_PointingAtDeniedPath_FilteredOut()
     {
         // A user (or malicious settings.json) can't punch through the always-denied
         // list by adding a custom folder grant equal to one of the denies.
-        var userProfile = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
-        var sshPath = Path.Combine(userProfile, ".ssh");
+        var settingsDir = CreateTempDeniedDir();
         var settings = new SettingsData
         {
             SandboxCustomFolders = new()
             {
-                new SandboxCustomFolder { Path = sshPath, Access = SandboxFolderAccess.ReadWrite },
+                new SandboxCustomFolder { Path = settingsDir, Access = SandboxFolderAccess.ReadWrite },
             },
         };
 
-        var policy = MxcPolicyBuilder.ForSystemRun(settings, "C:\\settings");
+        try
+        {
+            var policy = MxcPolicyBuilder.ForSystemRun(settings, settingsDir);
 
-        Assert.DoesNotContain(policy.Filesystem!.ReadwritePaths!, p =>
-            string.Equals(Path.GetFullPath(p), Path.GetFullPath(sshPath), StringComparison.OrdinalIgnoreCase));
-        Assert.DoesNotContain(policy.Filesystem.ReadonlyPaths!, p =>
-            string.Equals(Path.GetFullPath(p), Path.GetFullPath(sshPath), StringComparison.OrdinalIgnoreCase));
+            Assert.DoesNotContain(policy.Filesystem!.ReadwritePaths!, p =>
+                string.Equals(Path.GetFullPath(p), Path.GetFullPath(settingsDir), StringComparison.OrdinalIgnoreCase));
+            Assert.DoesNotContain(policy.Filesystem.ReadonlyPaths!, p =>
+                string.Equals(Path.GetFullPath(p), Path.GetFullPath(settingsDir), StringComparison.OrdinalIgnoreCase));
+        }
+        finally
+        {
+            TryDeleteTempDir(settingsDir);
+        }
     }
 
     [Fact]
@@ -224,40 +284,83 @@ public void ForSystemRun_CustomFolder_NestedInsideDeniedPath_FilteredOut()
         // Even subdirectories of denied paths must be stripped — a grant of
         // ~\.ssh\config or %LOCALAPPDATA%\Google\Chrome\User Data\Default
         // can't bleed through.
-        var userProfile = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
-        var sshConfig = Path.Combine(userProfile, ".ssh", "config");
+        var settingsDir = CreateTempDeniedDir();
+        var nested = Path.Combine(settingsDir, "nested");
         var settings = new SettingsData
         {
             SandboxCustomFolders = new()
             {
-                new SandboxCustomFolder { Path = sshConfig, Access = SandboxFolderAccess.ReadOnly },
+                new SandboxCustomFolder { Path = nested, Access = SandboxFolderAccess.ReadOnly },
             },
         };
 
-        var policy = MxcPolicyBuilder.ForSystemRun(settings, "C:\\settings");
+        try
+        {
+            var policy = MxcPolicyBuilder.ForSystemRun(settings, settingsDir);
 
-        Assert.DoesNotContain(policy.Filesystem!.ReadonlyPaths!, p =>
-            Path.GetFullPath(p).StartsWith(
-                Path.TrimEndingDirectorySeparator(Path.GetFullPath(Path.Combine(userProfile, ".ssh"))),
-                StringComparison.OrdinalIgnoreCase));
+            Assert.DoesNotContain(policy.Filesystem!.ReadonlyPaths!, p =>
+                Path.GetFullPath(p).StartsWith(
+                    Path.TrimEndingDirectorySeparator(Path.GetFullPath(settingsDir)),
+                    StringComparison.OrdinalIgnoreCase));
+        }
+        finally
+        {
+            TryDeleteTempDir(settingsDir);
+        }
     }
 
     [Fact]
     public void ForSystemRun_CustomFolder_ParentOfDeniedPath_FilteredOut()
     {
-        var userProfile = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
+        var settingsDir = CreateTempDeniedDir();
+        var parent = Directory.GetParent(settingsDir)!.FullName;
         var settings = new SettingsData
         {
             SandboxCustomFolders = new()
             {
-                new SandboxCustomFolder { Path = userProfile, Access = SandboxFolderAccess.ReadWrite },
+                new SandboxCustomFolder { Path = parent, Access = SandboxFolderAccess.ReadWrite },
             },
         };
 
-        var policy = MxcPolicyBuilder.ForSystemRun(settings, "C:\\settings");
+        try
+        {
+            var policy = MxcPolicyBuilder.ForSystemRun(settings, settingsDir);
 
-        Assert.DoesNotContain(policy.Filesystem!.ReadwritePaths!, p =>
-            string.Equals(Path.GetFullPath(p), Path.GetFullPath(userProfile), StringComparison.OrdinalIgnoreCase));
+            Assert.DoesNotContain(policy.Filesystem!.ReadwritePaths!, p =>
+                string.Equals(Path.GetFullPath(p), Path.GetFullPath(parent), StringComparison.OrdinalIgnoreCase));
+        }
+        finally
+        {
+            TryDeleteTempDir(settingsDir);
+        }
+    }
+
+    [Fact]
+    public void ForSystemRun_CustomFolder_ParentOfMissingSettingsDirectory_FilteredOut()
+    {
+        var parent = Directory.CreateDirectory(Path.Combine(Path.GetTempPath(), "openclaw-settings-parent-" + Guid.NewGuid().ToString("N"))).FullName;
+        var missingSettingsDir = Path.Combine(parent, "OpenClawTray");
+        var settings = new SettingsData
+        {
+            SandboxCustomFolders = new()
+            {
+                new SandboxCustomFolder { Path = parent, Access = SandboxFolderAccess.ReadWrite },
+            },
+        };
+
+        try
+        {
+            var policy = MxcPolicyBuilder.ForSystemRun(settings, missingSettingsDir);
+
+            Assert.Contains(policy.Filesystem!.DeniedPaths!, p =>
+                string.Equals(Path.GetFullPath(p), Path.GetFullPath(missingSettingsDir), StringComparison.OrdinalIgnoreCase));
+            Assert.DoesNotContain(policy.Filesystem.ReadwritePaths!, p =>
+                string.Equals(Path.GetFullPath(p), Path.GetFullPath(parent), StringComparison.OrdinalIgnoreCase));
+        }
+        finally
+        {
+            TryDeleteTempDir(parent);
+        }
     }
 
     [Fact]
@@ -277,6 +380,34 @@ public void ForSystemRun_CustomFolder_NotOverlappingDeny_StillGranted()
         Assert.Contains("D:\\code\\my-project", policy.Filesystem!.ReadwritePaths!);
     }
 
+    private static void AssertDeniedPath(IReadOnlyList<string> denied, string path)
+    {
+        if (string.IsNullOrWhiteSpace(path))
+            return;
+
+        Assert.Contains(denied, p => string.Equals(p, path, StringComparison.OrdinalIgnoreCase));
+    }
+
+    private static string CreateTempDeniedDir()
+    {
+        var path = Path.Combine(Path.GetTempPath(), "openclaw-denied-" + Guid.NewGuid().ToString("N"));
+        Directory.CreateDirectory(path);
+        return path;
+    }
+
+    private static void TryDeleteTempDir(string path)
+    {
+        try
+        {
+            if (Directory.Exists(path))
+                Directory.Delete(path, recursive: true);
+        }
+        catch
+        {
+            // Test cleanup is best-effort and should not hide the assertion result.
+        }
+    }
+
     private static string GetExpectedDownloadsPath()
     {
         var userProfile = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
diff --git a/tests/OpenClaw.Shared.Tests/OpenClawAppIdentityTests.cs b/tests/OpenClaw.Shared.Tests/OpenClawAppIdentityTests.cs
new file mode 100644
index 000000000..a3f5f3eb6
--- /dev/null
+++ b/tests/OpenClaw.Shared.Tests/OpenClawAppIdentityTests.cs
@@ -0,0 +1,86 @@
+using OpenClaw.Shared;
+
+namespace OpenClaw.Shared.Tests;
+
+public sealed class OpenClawAppIdentityTests
+{
+    [Fact]
+    public void ResolveRoamingDataDirectory_DefaultsToReleaseProfile()
+    {
+        var root = Path.Combine(Path.GetTempPath(), "openclaw-appdata");
+        var path = OpenClawAppIdentity.ResolveRoamingDataDirectory(
+            key => key == OpenClawAppIdentity.AppDataRootEnvironmentVariable ? root : null);
+
+        Assert.Equal(Path.Combine(root, "OpenClawTray"), path);
+    }
+
+    [Fact]
+    public void ResolveRoamingDataDirectory_UsesDevProfileFromEnvironment()
+    {
+        var root = Path.Combine(Path.GetTempPath(), "openclaw-appdata");
+        var path = OpenClawAppIdentity.ResolveRoamingDataDirectory(
+            key => key switch
+            {
+                OpenClawAppIdentity.AppDataRootEnvironmentVariable => root,
+                OpenClawAppIdentity.IdentityEnvironmentVariable => OpenClawAppIdentity.DevIdentity,
+                _ => null
+            });
+
+        Assert.Equal(Path.Combine(root, "OpenClawTray-Dev"), path);
+    }
+
+    [Fact]
+    public void ResolveRoamingDataDirectory_ExplicitIdentityWinsOverEnvironment()
+    {
+        var root = Path.Combine(Path.GetTempPath(), "openclaw-appdata");
+        var path = OpenClawAppIdentity.ResolveRoamingDataDirectory(
+            key => key switch
+            {
+                OpenClawAppIdentity.AppDataRootEnvironmentVariable => root,
+                OpenClawAppIdentity.IdentityEnvironmentVariable => OpenClawAppIdentity.DevIdentity,
+                _ => null
+            },
+            explicitIdentity: OpenClawAppIdentity.ReleaseIdentity);
+
+        Assert.Equal(Path.Combine(root, "OpenClawTray"), path);
+    }
+
+    [Fact]
+    public void ResolveRoamingDataDirectory_DataDirOverrideWinsOverIdentity()
+    {
+        var direct = Path.Combine(Path.GetTempPath(), "openclaw-direct-data");
+        var path = OpenClawAppIdentity.ResolveRoamingDataDirectory(
+            key => key switch
+            {
+                OpenClawAppIdentity.DataDirectoryOverrideEnvironmentVariable => direct,
+                OpenClawAppIdentity.IdentityEnvironmentVariable => OpenClawAppIdentity.DevIdentity,
+                _ => null
+            });
+
+        Assert.Equal(direct, path);
+    }
+
+    [Fact]
+    public void ResolveSettingsAndTokenPaths_UseSelectedProfile()
+    {
+        var root = Path.Combine(Path.GetTempPath(), "openclaw-appdata");
+        Func<string, string?> env = key =>
+            key == OpenClawAppIdentity.AppDataRootEnvironmentVariable ? root : null;
+
+        Assert.Equal(
+            Path.Combine(root, "OpenClawTray-Dev", "settings.json"),
+            OpenClawAppIdentity.ResolveSettingsPath(env, OpenClawAppIdentity.DevIdentity));
+        Assert.Equal(
+            Path.Combine(root, "OpenClawTray-Dev", "mcp-token.txt"),
+            OpenClawAppIdentity.ResolveMcpTokenPath(env, OpenClawAppIdentity.DevIdentity));
+    }
+
+    [Fact]
+    public void NormalizeIdentity_RejectsUnknownIdentity()
+    {
+        var ex = Assert.Throws<ArgumentException>(() => OpenClawAppIdentity.NormalizeIdentity("staging"));
+
+        Assert.Contains("release", ex.Message);
+        Assert.Contains("dev", ex.Message);
+    }
+}
diff --git a/tests/OpenClaw.Shared.Tests/OpenClawGatewayClientTests.cs b/tests/OpenClaw.Shared.Tests/OpenClawGatewayClientTests.cs
index 4f1605084..06eab7cd6 100644
--- a/tests/OpenClaw.Shared.Tests/OpenClawGatewayClientTests.cs
+++ b/tests/OpenClaw.Shared.Tests/OpenClawGatewayClientTests.cs
@@ -23,6 +23,10 @@ public GatewayClientTestHelper(
             string gatewayUrl = "ws://localhost:18789",
             string? identityPath = null)
         {
+            // Isolate test identities because other test classes can construct
+            // gateway clients concurrently under the same AppData root.
+            identityPath ??= CreateTempIdentityPath();
+
             _client = new OpenClawGatewayClient(
                 gatewayUrl,
                 "test-token",
@@ -34,7 +38,11 @@ public GatewayClientTestHelper(
 
         public GatewayClientTestHelper(IOpenClawLogger logger)
         {
-            _client = new OpenClawGatewayClient("ws://localhost:18789", "test-token", logger);
+            _client = new OpenClawGatewayClient(
+                "ws://localhost:18789",
+                "test-token",
+                logger,
+                identityPath: CreateTempIdentityPath());
         }
 
         public string ClassifyNotification(string text)
@@ -116,6 +124,24 @@ public void ProcessRawMessage(string json)
             method!.Invoke(_client, new object[] { json });
         }
 
+        public ChatHistoryInfo ParseChatHistoryPayload(string payloadJson, string sessionKey = "main")
+        {
+            using var document = JsonDocument.Parse(payloadJson);
+            var method = typeof(OpenClawGatewayClient).GetMethod(
+                "ParseChatHistory",
+                System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Static);
+            return (ChatHistoryInfo)method!.Invoke(null, new object[] { document.RootElement.Clone(), sessionKey })!;
+        }
+
+        public ChatSendResult ParseChatSendResponse(string responseJson)
+        {
+            using var document = JsonDocument.Parse(responseJson);
+            var method = typeof(OpenClawGatewayClient).GetMethod(
+                "ParseChatSendResult",
+                System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Static);
+            return (ChatSendResult)method!.Invoke(null, new object[] { document.RootElement.Clone() })!;
+        }
+
         public long ExtractChatTimestampMs(string payloadJson)
         {
             using var document = JsonDocument.Parse(payloadJson);
@@ -258,7 +284,7 @@ public void ParseSessionsPayload(string payloadJson)
         public ModelsListInfo ParseModelsListPayload(string payloadJson)
         {
             ModelsListInfo? parsed = null;
-            EventHandler<ModelsListInfo> handler = (_, models) => parsed = models;
+            EventHandler<ModelsListInfo> handler = (_, info) => parsed = info;
             _client.ModelsListUpdated += handler;
 
             try
@@ -773,6 +799,295 @@ public void ProcessRawMessage_ChatEventLogsRawLengthWithoutPayloadContent()
         Assert.DoesNotContain(logger.Logs, log => log.Contains("super-secret", StringComparison.OrdinalIgnoreCase));
     }
 
+    [Fact]
+    public void ProcessRawMessage_SessionMessageWithStringContent_EmitsChatMessage()
+    {
+        var helper = new GatewayClientTestHelper();
+        ChatMessageInfo? received = null;
+        helper.Client.ChatMessageReceived += (_, message) => received = message;
+
+        helper.ProcessRawMessage("""
+        {
+          "type": "event",
+          "event": "session.message",
+          "payload": {
+            "sessionKey": "agent:main:whatsapp:direct:+15551234567",
+            "message": {
+              "role": "user",
+              "content": "testing from whatsapp",
+              "timestamp": 1781631273567
+            },
+            "state": "final"
+          }
+        }
+        """);
+
+        Assert.NotNull(received);
+        Assert.Equal("agent:main:whatsapp:direct:+15551234567", received!.SessionKey);
+        Assert.Equal("user", received.Role);
+        Assert.Equal("testing from whatsapp", received.Text);
+        Assert.Equal("final", received.State);
+        Assert.Equal(1781631273567, received.Ts);
+    }
+
+    [Fact]
+    public void ProcessRawMessage_SessionMessageWithOpenClawMetadata_EmitsMessageIdentity()
+    {
+        var helper = new GatewayClientTestHelper();
+        ChatMessageInfo? received = null;
+        helper.Client.ChatMessageReceived += (_, message) => received = message;
+
+        helper.ProcessRawMessage("""
+        {
+          "type": "event",
+          "event": "session.message",
+          "payload": {
+            "sessionKey": "main",
+            "message": {
+              "role": "user",
+              "content": "queued spam message",
+              "timestamp": 1781631273567,
+              "__openclaw": {
+                "id": "msg-user-a",
+                "seq": 42
+              }
+            },
+            "state": "final"
+          }
+        }
+        """);
+
+        Assert.NotNull(received);
+        Assert.Equal("msg-user-a", received!.OpenClawId);
+        Assert.Equal(42, received.OpenClawSeq);
+    }
+
+    [Fact]
+    public void ProcessRawMessage_SessionMessageWithContentBlocks_EmitsChatMessage()
+    {
+        var helper = new GatewayClientTestHelper();
+        ChatMessageInfo? received = null;
+        helper.Client.ChatMessageReceived += (_, message) => received = message;
+
+        helper.ProcessRawMessage("""
+        {
+          "type": "event",
+          "event": "session.message",
+          "payload": {
+            "sessionKey": "agent:main:whatsapp:direct:+15551234567",
+            "message": {
+              "role": "assistant",
+              "content": [
+                { "type": "text", "text": "hello from assistant" }
+              ],
+              "timestamp": 1781631280633
+            },
+            "state": "final"
+          }
+        }
+        """);
+
+        Assert.NotNull(received);
+        Assert.Equal("agent:main:whatsapp:direct:+15551234567", received!.SessionKey);
+        Assert.Equal("assistant", received.Role);
+        Assert.Equal("hello from assistant", received.Text);
+        Assert.Equal("final", received.State);
+        Assert.Equal(1781631280633, received.Ts);
+    }
+
+    [Fact]
+    public void ProcessRawMessage_SessionMessageAssistantNoReply_DropsFrame()
+    {
+        var helper = new GatewayClientTestHelper();
+        ChatMessageInfo? received = null;
+        OpenClawNotification? notification = null;
+        helper.Client.ChatMessageReceived += (_, message) => received = message;
+        helper.Client.NotificationReceived += (_, value) => notification = value;
+
+        helper.ProcessRawMessage("""
+        {
+          "type": "event",
+          "event": "session.message",
+          "payload": {
+            "sessionKey": "main",
+            "message": {
+              "role": "assistant",
+              "content": "  NO_REPLY\n",
+              "timestamp": 1781631280633
+            },
+            "state": "final"
+          }
+        }
+        """);
+
+        Assert.Null(received);
+        Assert.Null(notification);
+    }
+
+    [Fact]
+    public void ProcessRawMessage_SessionMessageUserNoReply_IsNotDropped()
+    {
+        var helper = new GatewayClientTestHelper();
+        ChatMessageInfo? received = null;
+        helper.Client.ChatMessageReceived += (_, message) => received = message;
+
+        helper.ProcessRawMessage("""
+        {
+          "type": "event",
+          "event": "session.message",
+          "payload": {
+            "sessionKey": "main",
+            "message": {
+              "role": "user",
+              "content": "NO_REPLY",
+              "timestamp": 1781631280633
+            },
+            "state": "final"
+          }
+        }
+        """);
+
+        Assert.NotNull(received);
+        Assert.Equal("user", received!.Role);
+        Assert.Equal("NO_REPLY", received.Text);
+    }
+
+    [Fact]
+    public void ParseChatHistoryPayload_AssistantNoReply_DropsTranscriptEntry()
+    {
+        var helper = new GatewayClientTestHelper();
+
+        var history = helper.ParseChatHistoryPayload("""
+        {
+          "messages": [
+            { "role": "user", "content": "before", "timestamp": 1 },
+            { "role": "assistant", "content": "NO_REPLY", "timestamp": 2 },
+            { "role": "assistant", "content": "visible reply", "timestamp": 3 }
+          ]
+        }
+        """);
+
+        Assert.Equal(["before", "visible reply"], history.Messages.Select(m => m.Text).ToArray());
+    }
+
+    [Fact]
+    public void ParseChatHistoryPayload_OpenClawMetadata_PreservesMessageIdentity()
+    {
+        var helper = new GatewayClientTestHelper();
+
+        var history = helper.ParseChatHistoryPayload("""
+        {
+          "messages": [
+            {
+              "role": "user",
+              "content": "a",
+              "timestamp": 1,
+              "__openclaw": {
+                "id": "msg-history-a",
+                "seq": 7
+              }
+            }
+          ]
+        }
+        """);
+
+        var message = Assert.Single(history.Messages);
+        Assert.Equal("msg-history-a", message.OpenClawId);
+        Assert.Equal(7, message.OpenClawSeq);
+    }
+
+    [Fact]
+    public void ProcessRawMessage_SessionMessageWithMalformedMessage_DropsFrame()
+    {
+        var logger = new TestLogger();
+        var helper = new GatewayClientTestHelper(logger);
+        ChatMessageInfo? received = null;
+        helper.Client.ChatMessageReceived += (_, message) => received = message;
+
+        helper.ProcessRawMessage("""
+        {
+          "type": "event",
+          "event": "session.message",
+          "payload": {
+            "sessionKey": "agent:main:whatsapp:direct:+15551234567",
+            "message": "not-an-object",
+            "state": "final"
+          }
+        }
+        """);
+
+        Assert.Null(received);
+        Assert.Contains(logger.Logs, log => log.Contains("message payload was not an object", StringComparison.OrdinalIgnoreCase));
+    }
+
+    [Theory]
+    [InlineData("final", true)]
+    [InlineData("streaming", false)]
+    public void ProcessRawMessage_SessionMessageAssistantNotification_DependsOnFinalState(string state, bool expectNotification)
+    {
+        var helper = new GatewayClientTestHelper();
+        OpenClawNotification? notification = null;
+        helper.Client.NotificationReceived += (_, value) => notification = value;
+
+        helper.ProcessRawMessage($$"""
+        {
+          "type": "event",
+          "event": "session.message",
+          "payload": {
+            "sessionKey": "agent:main:whatsapp:direct:+15551234567",
+            "message": {
+              "role": "assistant",
+              "content": "assistant reply",
+              "timestamp": 1781631280633
+            },
+            "state": "{{state}}"
+          }
+        }
+        """);
+
+        if (expectNotification)
+        {
+            Assert.NotNull(notification);
+            Assert.Equal("assistant reply", notification!.Message);
+            Assert.True(notification.IsChat);
+        }
+        else
+        {
+            Assert.Null(notification);
+        }
+    }
+
+    [Fact]
+    public void ProcessRawMessage_SessionMessageAssistantNotification_PreservesFullMessage()
+    {
+        var helper = new GatewayClientTestHelper();
+        OpenClawNotification? notification = null;
+        helper.Client.NotificationReceived += (_, value) => notification = value;
+
+        var fullMessage = new string('x', 240);
+
+        helper.ProcessRawMessage($$"""
+        {
+          "type": "event",
+          "event": "session.message",
+          "payload": {
+            "sessionKey": "agent:main:whatsapp:direct:+15551234567",
+            "message": {
+              "role": "assistant",
+              "content": "{{fullMessage}}",
+              "timestamp": 1781631280633
+            },
+            "state": "final"
+          }
+        }
+        """);
+
+        Assert.NotNull(notification);
+        Assert.True(notification!.IsChat);
+        Assert.Equal(fullMessage[..200] + "…", notification.Message);
+        Assert.Equal(fullMessage, notification.FullMessage);
+    }
+
     [Fact]
     public void ProcessRawMessage_AgentEventLogsRawLengthWithoutPayloadContent()
     {
@@ -978,6 +1293,54 @@ public async Task PendingChatSend_CompletesOnSuccessfulResponse()
         Assert.Equal("run-1", result.RunId);
     }
 
+    [Fact]
+    public void ParseChatSendResponse_ReadsQueueAckStatus()
+    {
+        var helper = new GatewayClientTestHelper();
+
+        var result = helper.ParseChatSendResponse("""
+        {
+            "type": "res",
+            "id": "chat-1",
+            "ok": true,
+            "payload": {
+                "runId": "run-1",
+                "sessionKey": "main",
+                "status": "started"
+            },
+            "meta": { "cached": true }
+        }
+        """);
+
+        Assert.Equal("run-1", result.RunId);
+        Assert.Equal("main", result.SessionKey);
+        Assert.Equal("started", result.Status);
+        Assert.True(result.Cached);
+        Assert.False(result.IsTerminalFailure);
+    }
+
+    [Fact]
+    public void ParseChatSendResponse_ReadsTerminalFailureStatus()
+    {
+        var helper = new GatewayClientTestHelper();
+
+        var result = helper.ParseChatSendResponse("""
+        {
+            "type": "res",
+            "id": "chat-1",
+            "ok": true,
+            "payload": {
+                "status": "failed",
+                "error": { "message": "model unavailable" }
+            }
+        }
+        """);
+
+        Assert.Equal("failed", result.Status);
+        Assert.Equal("model unavailable", result.Error);
+        Assert.True(result.IsTerminalFailure);
+    }
+
     [Fact]
     public async Task PendingChatSend_FailsOnErrorResponse()
     {
@@ -1552,6 +1915,97 @@ public void ParseNodeListPayload_EmptyArray_ReturnsEmpty()
         Assert.Empty(nodes);
     }
 
+    [Fact]
+    public void ParseModelsList_PopulatesProviderRichMetadata()
+    {
+        var helper = new GatewayClientTestHelper();
+        var info = helper.ParseModelsListPayload("""
+            {
+              "models": [
+                {
+                  "id": "claude-opus-4.8",
+                  "name": "Claude Opus 4.8",
+                  "provider": "Anthropic",
+                  "contextWindow": 200000,
+                  "configured": true,
+                  "default": true
+                },
+                {
+                  "id": "gemini-3.1-pro",
+                  "name": "Gemini 3.1 Pro",
+                  "provider": "Google",
+                  "contextWindow": 1000000,
+                  "requiresAuth": true
+                },
+                {
+                  "id": "local-llama",
+                  "provider": "Ollama",
+                  "unavailable": true
+                }
+              ]
+            }
+            """);
+
+        Assert.Equal(3, info.Models.Count);
+
+        var opus = info.Models[0];
+        Assert.Equal("claude-opus-4.8", opus.Id);
+        Assert.Equal("Anthropic", opus.Provider);
+        Assert.Equal(200000, opus.ContextWindow);
+        Assert.True(opus.IsConfigured);
+        Assert.True(opus.IsDefault);
+        Assert.True(opus.IsAvailable);
+        Assert.False(opus.RequiresAuth);
+
+        var gemini = info.Models[1];
+        Assert.True(gemini.RequiresAuth);
+        Assert.False(gemini.IsDefault);
+        Assert.True(gemini.IsAvailable); // no availability signal → usable
+
+        var llama = info.Models[2];
+        Assert.False(llama.IsAvailable); // unavailable:true inverts to false
+        Assert.Equal("local-llama", llama.DisplayName); // name omitted → id
+    }
+
+    [Fact]
+    public void ParseModelsList_DefaultsAvailableTrue_WhenNoReadinessSignals()
+    {
+        var helper = new GatewayClientTestHelper();
+        var info = helper.ParseModelsListPayload("""
+            { "models": [ { "id": "gpt-5.5", "name": "GPT-5.5" } ] }
+            """);
+
+        var m = Assert.Single(info.Models);
+        Assert.True(m.IsAvailable);
+        Assert.False(m.RequiresAuth);
+        Assert.False(m.IsDefault);
+        Assert.False(m.IsConfigured);
+    }
+
+    [Fact]
+    public void ParseModelsList_AvailableFalse_MarksUnavailable()
+    {
+        var helper = new GatewayClientTestHelper();
+        var info = helper.ParseModelsListPayload("""
+            { "models": [ { "id": "x", "available": false } ] }
+            """);
+
+        Assert.False(Assert.Single(info.Models).IsAvailable);
+    }
+
+    [Fact]
+    public void ParseModelsList_AcceptsIsDefaultAndAuthNeededAliases()
+    {
+        var helper = new GatewayClientTestHelper();
+        var info = helper.ParseModelsListPayload("""
+            { "models": [ { "id": "x", "isDefault": true, "authNeeded": true } ] }
+            """);
+
+        var m = Assert.Single(info.Models);
+        Assert.True(m.IsDefault);
+        Assert.True(m.RequiresAuth);
+    }
+
     [Fact]
     public void ParseNodeListPayload_SameOnlineStatus_SortsByLastSeenDescending()
     {
@@ -1850,7 +2304,11 @@ public void ParseNodeListPayload_DefaultsForMinimalPayload()
     public async Task NodeRenameAsync_RejectsEmptyNodeId_WithoutHittingTransport()
     {
         var logger = new TestLogger();
-        var client = new OpenClawGatewayClient("http://test:8080", "my-token", logger);
+        var client = new OpenClawGatewayClient(
+            "http://test:8080",
+            "my-token",
+            logger,
+            identityPath: CreateTempIdentityPath());
 
         var result = await client.NodeRenameAsync("", "New Name");
 
@@ -1862,7 +2320,11 @@ public async Task NodeRenameAsync_RejectsEmptyNodeId_WithoutHittingTransport()
     public async Task NodeRenameAsync_RejectsEmptyDisplayName_WithoutHittingTransport()
     {
         var logger = new TestLogger();
-        var client = new OpenClawGatewayClient("http://test:8080", "my-token", logger);
+        var client = new OpenClawGatewayClient(
+            "http://test:8080",
+            "my-token",
+            logger,
+            identityPath: CreateTempIdentityPath());
 
         var result = await client.NodeRenameAsync("node-1", "   ");
 
@@ -1874,7 +2336,11 @@ public async Task NodeRenameAsync_RejectsEmptyDisplayName_WithoutHittingTranspor
     public async Task NodeRenameAsync_ReturnsErrorWhenNotConnected()
     {
         var logger = new TestLogger();
-        var client = new OpenClawGatewayClient("http://test:8080", "my-token", logger);
+        var client = new OpenClawGatewayClient(
+            "http://test:8080",
+            "my-token",
+            logger,
+            identityPath: CreateTempIdentityPath());
 
         var result = await client.NodeRenameAsync("node-1", "Pretty Name");
 
@@ -1886,7 +2352,11 @@ public async Task NodeRenameAsync_ReturnsErrorWhenNotConnected()
     public async Task NodePairRemoveAsync_ReturnsFailureForEmptyNodeId()
     {
         var logger = new TestLogger();
-        var client = new OpenClawGatewayClient("http://test:8080", "my-token", logger);
+        var client = new OpenClawGatewayClient(
+            "http://test:8080",
+            "my-token",
+            logger,
+            identityPath: CreateTempIdentityPath());
 
         var result = await client.NodePairRemoveAsync("");
 
@@ -1898,7 +2368,11 @@ public async Task NodePairRemoveAsync_ReturnsFailureForEmptyNodeId()
     public async Task NodePairRemoveAsync_ReturnsFailureWhenNotConnected()
     {
         var logger = new TestLogger();
-        var client = new OpenClawGatewayClient("http://test:8080", "my-token", logger);
+        var client = new OpenClawGatewayClient(
+            "http://test:8080",
+            "my-token",
+            logger,
+            identityPath: CreateTempIdentityPath());
 
         var result = await client.NodePairRemoveAsync("node-1");
 
@@ -1910,7 +2384,11 @@ public async Task NodePairRemoveAsync_ReturnsFailureWhenNotConnected()
     public void Constructor_InitializesWithProvidedValues()
     {
         var logger = new TestLogger();
-        var client = new OpenClawGatewayClient("http://test:8080", "my-token", logger);
+        var client = new OpenClawGatewayClient(
+            "http://test:8080",
+            "my-token",
+            logger,
+            identityPath: CreateTempIdentityPath());
         
         // Verify URL was normalized (http → ws) — field is now on base class WebSocketClientBase
         var field = typeof(OpenClawGatewayClient).BaseType?.GetField(
@@ -1924,7 +2402,10 @@ public void Constructor_InitializesWithProvidedValues()
     public void Constructor_UsesNullLogger_WhenNotProvided()
     {
         // Verify construction without logger doesn't throw and still normalizes URL
-        var client = new OpenClawGatewayClient("https://test:8080", "my-token");
+        var client = new OpenClawGatewayClient(
+            "https://test:8080",
+            "my-token",
+            identityPath: CreateTempIdentityPath());
         
         var field = typeof(OpenClawGatewayClient).BaseType?.GetField(
             "_gatewayUrl",
@@ -1944,7 +2425,10 @@ public void Constructor_UsesNullLogger_WhenNotProvided()
     [InlineData("HTTPS://HOST.EXAMPLE.COM", "wss://HOST.EXAMPLE.COM")]
     public void Constructor_NormalizesHttpToWs(string inputUrl, string expectedWsUrl)
     {
-        var client = new OpenClawGatewayClient(inputUrl, "test-token");
+        var client = new OpenClawGatewayClient(
+            inputUrl,
+            "test-token",
+            identityPath: CreateTempIdentityPath());
 
         var field = typeof(OpenClawGatewayClient).BaseType?.GetField(
             "_gatewayUrl",
diff --git a/tests/OpenClaw.Shared.Tests/ProductionSourceFiles.cs b/tests/OpenClaw.Shared.Tests/ProductionSourceFiles.cs
index da1c7eb3e..adc0b0d73 100644
--- a/tests/OpenClaw.Shared.Tests/ProductionSourceFiles.cs
+++ b/tests/OpenClaw.Shared.Tests/ProductionSourceFiles.cs
@@ -27,7 +27,7 @@ private static bool IsBuildOutputPath(string path) =>
         path.Contains(Path.DirectorySeparatorChar + "bin" + Path.DirectorySeparatorChar, StringComparison.Ordinal) ||
         path.Contains(Path.DirectorySeparatorChar + "obj" + Path.DirectorySeparatorChar, StringComparison.Ordinal);
 
-    private static string FindRepoRoot()
+    internal static string FindRepoRoot()
     {
         var envRoot = Environment.GetEnvironmentVariable("OPENCLAW_REPO_ROOT");
         if (!string.IsNullOrWhiteSpace(envRoot) &&
diff --git a/tests/OpenClaw.Shared.Tests/Protocol/GatewayProtocolDriftTests.cs b/tests/OpenClaw.Shared.Tests/Protocol/GatewayProtocolDriftTests.cs
new file mode 100644
index 000000000..9ab9fa42a
--- /dev/null
+++ b/tests/OpenClaw.Shared.Tests/Protocol/GatewayProtocolDriftTests.cs
@@ -0,0 +1,942 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Text.Json;
+using System.Text.RegularExpressions;
+using Xunit;
+
+namespace OpenClaw.Shared.Tests.Protocol;
+
+/// <summary>
+/// Protocol drift guard for the OpenClaw gateway <c>sessions</c> / <c>files</c> /
+/// <c>commands</c> / compaction surface.
+///
+/// The Windows companion can silently drift from the upstream
+/// <c>openclaw/openclaw</c> gateway protocol
+/// (<c>packages/gateway-protocol/src/schema/{sessions,commands}.ts</c>): because
+/// the gateway tolerates unknown/extra fields, a client sending stale shapes fails
+/// no existing test. This test pins a hand-maintained mirror of that schema in
+/// <c>Protocol/gateway-protocol-snapshot.json</c> and cross-checks it against what
+/// the typed client (<c>OpenClawGatewayClient</c> + its <c>.Protocol</c> partial,
+/// and the <c>SessionPatch</c>/DTO builders in <c>GatewayProtocolModels.cs</c>)
+/// actually <em>sends</em>, <em>handles</em>, and constructs — so any future
+/// divergence fails loudly in CI instead of shipping a drifted client.
+///
+/// This complements (does not duplicate) the behavioural parser tests in
+/// <c>GatewayProtocolModelsTests</c>: those parse sample JSON and assert DTO
+/// mapping; this guard statically pins the method / request-field / response-
+/// envelope <em>surface</em>, so an upstream rename or a dropped API is caught even
+/// when the parser unit tests still pass on their fixed samples.
+///
+/// The guard is deterministic and fully repo-contained: it does NOT require a
+/// clone of the upstream OpenClaw repository or any network access. When upstream
+/// changes, refresh the snapshot per <c>docs/gateway-protocol-drift-guard.md</c>.
+///
+/// Extraction is intent-specific and resilient. Two views of each source are kept,
+/// index-aligned: a <c>Code</c> view with comments blanked but string/char literals
+/// preserved (used for literal/identifier extraction, so commented-out code never
+/// counts), and a <c>Masked</c> view with comments AND literals blanked (used for
+/// brace structure, so literal/comment braces never desync the matcher).
+/// </summary>
+public class GatewayProtocolDriftTests
+{
+    // Identifier characters for wire field/method names. Wide enough to cover
+    // camelCase, digits, and underscores so a future field like `contextV2` or
+    // `started_at` is representable on both sides of the comparison.
+    private const string Ident = "[A-Za-z_][A-Za-z0-9_]*";
+
+    // Dispatcher-call identifiers that are logging/diagnostic sinks, not RPC
+    // dispatch. A method literal passed to one of these does not count as the
+    // client "sending" that method (avoids a false "used").
+    private static readonly HashSet<string> LoggingSinks = new(StringComparer.Ordinal)
+    {
+        "Warn", "Warning", "Info", "Information", "Error", "Debug", "Trace", "Log",
+        "LogWarning", "LogError", "LogInformation", "LogDebug", "LogTrace", "WriteLine",
+    };
+
+    /// <summary>
+    /// Guard A — method surface, intent-specific. Every in-scope method the client
+    /// actually wires (request methods it dispatches with a method literal, plus
+    /// notifications it handles via a <c>case</c> label) must be pinned in the
+    /// snapshot. Every method pinned <c>used</c> must still be wired the way its
+    /// <c>kind</c> implies. A <c>planned</c> method must not already be wired.
+    /// </summary>
+    [Fact]
+    public void ScopedMethodSurface_matches_snapshot()
+    {
+        var snapshot = LoadSnapshot();
+        var client = LoadClientSource();
+
+        var sent = ExtractDispatchedRequestMethods(client, snapshot.ScopePrefixes).Keys.ToHashSet(StringComparer.Ordinal);
+        var handled = ExtractHandledMethods(client.Code, snapshot.ScopePrefixes);
+        var wired = sent.Union(handled).ToHashSet(StringComparer.Ordinal);
+
+        var pinned = snapshot.Methods.Select(m => m.Method).ToHashSet(StringComparer.Ordinal);
+        var failures = new List<string>();
+
+        foreach (var method in wired.Except(pinned).OrderBy(s => s, StringComparer.Ordinal))
+            failures.Add($"client wires '{method}' but it is NOT pinned in the snapshot (refresh the snapshot or fix a typo)");
+
+        foreach (var method in snapshot.Methods)
+        {
+            var isWired = wired.Contains(method.Method);
+            if (method.WindowsUsage == "used")
+            {
+                var ok = method.Kind == "request" ? sent.Contains(method.Method) : handled.Contains(method.Method);
+                if (!ok)
+                {
+                    var how = method.Kind == "request" ? "dispatched with a method literal" : "handled via a 'case' label";
+                    failures.Add($"'{method.Method}' is pinned windowsUsage=\"used\" ({method.Kind}) but is no longer {how} by the client (the client stopped using a method it should still send)");
+                }
+            }
+            else if (method.WindowsUsage == "planned" && isWired)
+            {
+                failures.Add($"'{method.Method}' is pinned windowsUsage=\"planned\" but the client now wires it — flip it to \"used\" and verify/clear its response-field shape against upstream");
+            }
+        }
+
+        if (failures.Count > 0)
+            Assert.Fail("Gateway protocol method-surface drift detected:\n  - " + string.Join("\n  - ", failures) + "\nSee docs/gateway-protocol-drift-guard.md.");
+    }
+
+    /// <summary>
+    /// Guard B — <c>sessions.list</c> response shape. The session fields the legacy
+    /// session parser reads off the wire (scoped to the two session-parsing
+    /// methods) must exactly equal the snapshot's pinned <c>responseFields</c>.
+    /// </summary>
+    [Fact]
+    public void SessionsList_responseShape_matches_snapshot()
+    {
+        var snapshot = LoadSnapshot();
+        var client = LoadClientSource();
+
+        var pinned = snapshot.Methods.Single(m => m.Method == "sessions.list").ResponseFields.ToHashSet(StringComparer.Ordinal);
+
+        var signatures = new[] { "void PopulateSessionFromObject(", "string? ParseSessionItem(" };
+        var readByClient = new HashSet<string>(StringComparer.Ordinal);
+        var missingSignatures = new List<string>();
+
+        foreach (var sig in signatures)
+        {
+            var region = ExtractMethodBody(client, sig);
+            if (region is null)
+            {
+                missingSignatures.Add(sig);
+                continue;
+            }
+
+            foreach (Match m in Regex.Matches(region.Code, $"\\.TryGetProperty\\(\\s*\"({Ident})\""))
+                readByClient.Add(m.Groups[1].Value);
+            foreach (Match m in Regex.Matches(region.Code, $"(?:GetLong|GetString|GetBool|ParseUnixTimestampMs)\\(\\s*item\\s*,\\s*\"({Ident})\""))
+                readByClient.Add(m.Groups[1].Value);
+        }
+
+        Assert.True(
+            missingSignatures.Count == 0,
+            $"Could not locate session-parsing method(s): [{string.Join(", ", missingSignatures)}]. " +
+            "The extraction signatures in GatewayProtocolDriftTests likely need updating after a refactor (a test-maintenance issue, not protocol drift).");
+
+        var clientNotPinned = readByClient.Except(pinned).OrderBy(s => s, StringComparer.Ordinal).ToList();
+        var pinnedNotRead = pinned.Except(readByClient).OrderBy(s => s, StringComparer.Ordinal).ToList();
+
+        if (clientNotPinned.Count > 0 || pinnedNotRead.Count > 0)
+        {
+            Assert.Fail(
+                "sessions.list response shape drift detected.\n" +
+                $"  Fields parsed by the client but NOT in the snapshot (upstream renamed/removed, or refresh the snapshot): [{string.Join(", ", clientNotPinned)}]\n" +
+                $"  Fields pinned but no longer parsed by the client: [{string.Join(", ", pinnedNotRead)}]\n" +
+                "See docs/gateway-protocol-drift-guard.md.");
+        }
+    }
+
+    /// <summary>
+    /// Guard C — request shapes, scoped and <b>bidirectional</b>. For each
+    /// <c>used</c> request method, the set of wire keys the client actually
+    /// constructs in the request-construction region (the explicit
+    /// <c>requestFieldsSource</c> builder body when set, otherwise the enclosing
+    /// block of an actual dispatch call) must exactly equal the pinned
+    /// <c>requestFields</c>, modulo a per-method <c>allowedExtraRequestFields</c>
+    /// allowlist:
+    /// <list type="bullet">
+    /// <item><b>missing</b> = pinned − constructed: the client no longer sends a
+    /// field the schema expects (upstream rename/removal not reconciled, or stale
+    /// snapshot).</item>
+    /// <item><b>unexpected</b> = constructed − pinned − allowed: the client still
+    /// sends a stale/extra key after upstream removed or renamed it — strict
+    /// gateways (<c>additionalProperties:false</c>) reject the whole request.</item>
+    /// </list>
+    /// A constructed key is an anonymous-object member or dictionary string key in
+    /// the region (see <see cref="ExtractConstructedKeys"/>); the comparison is over
+    /// constructed keys, not token presence, so a rename where the old name survives
+    /// as a local/parameter is still caught.
+    /// </summary>
+    [Fact]
+    public void RequestParameterNames_arePresentInConstructionRegion()
+    {
+        var snapshot = LoadSnapshot();
+        var client = LoadClientSource();
+        var protocol = LoadProtocolSource();
+
+        var sentIndices = ExtractDispatchedRequestMethods(client, snapshot.ScopePrefixes);
+        var failures = new List<string>();
+
+        foreach (var method in snapshot.Methods.Where(m => m.WindowsUsage == "used" && m.Kind == "request"))
+        {
+            var regions = new List<Region>();
+
+            if (!string.IsNullOrEmpty(method.RequestFieldsSource))
+            {
+                var fragment = method.RequestFieldsSource!;
+                var occurrences = CountOccurrences(protocol.Masked, fragment);
+                if (occurrences == 0)
+                {
+                    failures.Add($"{method.Method}: requestFieldsSource '{fragment}' not found (refactor? update the snapshot/guard)");
+                    continue;
+                }
+                if (occurrences > 1)
+                {
+                    failures.Add($"{method.Method}: requestFieldsSource '{fragment}' is ambiguous (matches {occurrences} sites) — make it unique");
+                    continue;
+                }
+                var region = ExtractMethodBody(protocol, fragment);
+                if (region is null)
+                {
+                    failures.Add($"{method.Method}: requestFieldsSource '{fragment}' did not resolve to a body");
+                    continue;
+                }
+                if (ExtractConstructedKeys(region).Count == 0)
+                {
+                    failures.Add($"{method.Method}: requestFieldsSource '{fragment}' body constructs no request keys (new {{ … }} or [\"…\"]) — it is not a request builder");
+                    continue;
+                }
+                regions.Add(region);
+            }
+            else
+            {
+                if (!sentIndices.TryGetValue(method.Method, out var indices) || indices.Count == 0)
+                {
+                    failures.Add($"{method.Method}: no dispatch call site found to validate request fields");
+                    continue;
+                }
+
+                var degenerate = false;
+                foreach (var idx in indices)
+                {
+                    var (region, isTypeBody) = ExtractEnclosingBlock(client, idx);
+                    if (region is null) continue;
+                    if (isTypeBody)
+                    {
+                        degenerate = true;
+                        break;
+                    }
+                    regions.Add(region);
+                }
+
+                if (degenerate)
+                {
+                    failures.Add($"{method.Method}: dispatched from an expression-bodied member, so the construction region degrades to the whole type — add a 'requestFieldsSource' pointing at the real payload builder");
+                    continue;
+                }
+                if (regions.Count == 0)
+                {
+                    failures.Add($"{method.Method}: could not resolve the enclosing block of any dispatch call site");
+                    continue;
+                }
+            }
+
+            var constructedKeys = new HashSet<string>(StringComparer.Ordinal);
+            foreach (var r in regions)
+                constructedKeys.UnionWith(ExtractConstructedKeys(r));
+
+            // Bidirectional comparison (both directions are real drift):
+            //   missing    = pinned fields the client no longer constructs (upstream
+            //                rename/removal not reconciled, or stale snapshot).
+            //   unexpected = wire keys the client still constructs that are NOT pinned
+            //                and NOT an explicitly-allowed extra — i.e. the client
+            //                sends a stale/extra key after upstream removed/renamed it.
+            // allowedExtraRequestFields lets a method declare intentional extras (e.g.
+            // a client-only param the strict gateway tolerates) without weakening the
+            // check for everything else.
+            var allowed = new HashSet<string>(method.AllowedExtraRequestFields, StringComparer.Ordinal);
+
+            var missing = method.RequestFields
+                .Where(f => !constructedKeys.Contains(f))
+                .OrderBy(s => s, StringComparer.Ordinal)
+                .ToList();
+            var unexpected = constructedKeys
+                .Where(k => !method.RequestFields.Contains(k) && !allowed.Contains(k))
+                .OrderBy(s => s, StringComparer.Ordinal)
+                .ToList();
+
+            foreach (var field in missing)
+                failures.Add($"{method.Method}.{field}: pinned but NOT constructed as a request wire key in the construction region (upstream rename not reconciled, or refresh the snapshot). Constructed keys: [{string.Join(", ", constructedKeys.OrderBy(s => s, StringComparer.Ordinal))}]");
+            foreach (var key in unexpected)
+                failures.Add($"{method.Method}.{key}: constructed as a request wire key but NOT pinned in the snapshot (client sends a stale/extra key after an upstream change — remove it, or add it to requestFields / allowedExtraRequestFields). Pinned: [{string.Join(", ", method.RequestFields.OrderBy(s => s, StringComparer.Ordinal))}]");
+        }
+
+        if (failures.Count > 0)
+            Assert.Fail("Gateway request-parameter drift detected:\n  - " + string.Join("\n  - ", failures.OrderBy(s => s, StringComparer.Ordinal)) + "\nSee docs/gateway-protocol-drift-guard.md.");
+    }
+
+    /// <summary>
+    /// Guard D — response envelope. For each <c>used</c> method that pins a
+    /// <c>responseEnvelope</c> property, the client must read that property
+    /// (<c>TryGetProperty("…")</c> or <c>TryGetArray(payload, "…")</c>) inside the
+    /// method's own parser body (pinned via <c>responseEnvelopeSource</c>), so one
+    /// parser reading the same property name cannot satisfy another method's
+    /// envelope, and an upstream envelope rename forces client reconciliation. Runs
+    /// over the comment-stripped view so commented-out reads don't count.
+    /// </summary>
+    [Fact]
+    public void ResponseEnvelopes_areReadByClient()
+    {
+        var snapshot = LoadSnapshot();
+        var client = LoadClientSource();
+
+        var failures = new List<string>();
+        foreach (var method in snapshot.Methods.Where(m => m.WindowsUsage == "used" && m.ResponseEnvelope.Count > 0))
+        {
+            // Symmetric with requestFieldsSource: a pinned envelope must name the
+            // specific parser body, and that fragment must resolve uniquely — no
+            // whole-client fallback (which would let any parser reading the same
+            // property name satisfy a different method's envelope).
+            if (string.IsNullOrEmpty(method.ResponseEnvelopeSource))
+            {
+                failures.Add($"{method.Method}: responseEnvelope is pinned but responseEnvelopeSource is missing — add the parser-body fragment so the envelope check is method-scoped");
+                continue;
+            }
+            var occurrences = CountOccurrences(client.Masked, method.ResponseEnvelopeSource!);
+            if (occurrences == 0)
+            {
+                failures.Add($"{method.Method}: responseEnvelopeSource '{method.ResponseEnvelopeSource}' not found (refactor? update the snapshot)");
+                continue;
+            }
+            if (occurrences > 1)
+            {
+                failures.Add($"{method.Method}: responseEnvelopeSource '{method.ResponseEnvelopeSource}' is ambiguous (matches {occurrences} sites) — make it unique");
+                continue;
+            }
+            var region = ExtractMethodBody(client, method.ResponseEnvelopeSource!);
+            if (region is null)
+            {
+                failures.Add($"{method.Method}: responseEnvelopeSource '{method.ResponseEnvelopeSource}' did not resolve to a body");
+                continue;
+            }
+
+            foreach (var envelope in method.ResponseEnvelope)
+            {
+                var pattern = $"TryGet(?:Property|Array)\\(\\s*(?:{Ident}\\s*,\\s*)?\"{Regex.Escape(envelope)}\"";
+                if (!Regex.IsMatch(region.Code, pattern))
+                    failures.Add($"{method.Method}: response envelope property \"{envelope}\" is never read (TryGetProperty/TryGetArray) by its parser");
+            }
+        }
+
+        if (failures.Count > 0)
+            Assert.Fail("Gateway response-envelope drift detected:\n  - " + string.Join("\n  - ", failures) + "\nSee docs/gateway-protocol-drift-guard.md.");
+    }
+
+    /// <summary>
+    /// Guard E — snapshot integrity. The pinned snapshot itself must stay
+    /// well-formed, keep covering the protocol-foundation shapes, and keep its
+    /// honesty invariant (provisional response fields only on <c>planned</c>
+    /// methods).
+    /// </summary>
+    [Fact]
+    public void Snapshot_isWellFormed_andCoversFoundationShapes()
+    {
+        var snapshot = LoadSnapshot();
+
+        Assert.NotEmpty(snapshot.Methods);
+        Assert.NotEmpty(snapshot.ScopePrefixes);
+
+        var validUsage = new HashSet<string>(StringComparer.Ordinal) { "used", "planned" };
+        var validKind = new HashSet<string>(StringComparer.Ordinal) { "request", "response", "notification" };
+        var seen = new HashSet<string>(StringComparer.Ordinal);
+
+        foreach (var method in snapshot.Methods)
+        {
+            Assert.False(string.IsNullOrWhiteSpace(method.Method), "Snapshot method name must not be blank.");
+            Assert.True(seen.Add(method.Method), $"Duplicate snapshot method entry: {method.Method}");
+            Assert.True(validUsage.Contains(method.WindowsUsage),
+                $"{method.Method}: invalid windowsUsage '{method.WindowsUsage}' (expected used|planned).");
+            Assert.True(validKind.Contains(method.Kind),
+                $"{method.Method}: invalid kind '{method.Kind}' (expected request|response|notification).");
+            Assert.True(snapshot.ScopePrefixes.Any(p => method.Method.StartsWith(p, StringComparison.Ordinal)),
+                $"{method.Method}: outside declared scopePrefixes [{string.Join(", ", snapshot.ScopePrefixes)}].");
+
+            if (method.ProvisionalResponseFields)
+                Assert.True(method.WindowsUsage == "planned",
+                    $"{method.Method}: provisionalResponseFields=true is only allowed while windowsUsage=\"planned\". " +
+                    "Verify the response fields against upstream and clear the flag before marking it used.");
+
+            // Tri-state contract honesty: the semantics tag and the contract object
+            // must co-exist, and a present contract must carry markers + states.
+            var isTriStateNullable = method.RequestFieldSemantics == "tristate-nullable";
+            Assert.True(isTriStateNullable == (method.TriState is not null),
+                $"{method.Method}: requestFieldSemantics=\"tristate-nullable\" and a 'tristateContract' object must be present together (one without the other is a snapshot mistake).");
+            if (method.TriState is not null)
+            {
+                Assert.NotEmpty(method.TriState.Markers);
+                Assert.NotEmpty(method.TriState.StateMembers);
+                Assert.False(string.IsNullOrWhiteSpace(method.TriState.BuilderSource), $"{method.Method}: tristateContract.builderSource must be set.");
+                Assert.False(string.IsNullOrWhiteSpace(method.TriState.StateTypeSource), $"{method.Method}: tristateContract.stateTypeSource must be set.");
+            }
+        }
+
+        foreach (var required in new[]
+                 {
+                     "commands.list",
+                     "sessions.list", "sessions.patch", "sessions.compact",
+                     "agents.files.list", "agents.files.get",
+                     "sessions.files.list", "sessions.files.get",
+                     "sessions.compaction.list", "sessions.compaction.get",
+                     "sessions.compaction.branch", "sessions.compaction.restore",
+                 })
+            Assert.True(seen.Contains(required), $"Snapshot is missing required foundation method: {required}");
+
+        Assert.NotEmpty(snapshot.Methods.Single(m => m.Method == "sessions.list").ResponseFields);
+        Assert.NotEmpty(snapshot.Methods.Single(m => m.Method == "commands.list").ResponseEnvelope);
+    }
+
+    /// <summary>
+    /// Guard F — tri-state clear contract (structural presence). Upstream
+    /// <c>SessionsPatchParamsSchema</c> types every field as
+    /// <c>Union([&lt;value&gt;, Null])</c>, where an explicit null removes a session
+    /// override; the client models this with a tri-state
+    /// <see cref="OpenClaw.Shared.PatchField{T}"/> (unset → omitted, value → sent
+    /// with blank omitted, <c>SessionPatch.Clear</c> → explicit JSON null).
+    ///
+    /// This guard pins the <em>structural presence</em> of that machinery for any
+    /// method declaring <c>requestFieldSemantics: "tristate-nullable"</c>: each
+    /// snapshot marker (a regex over a specific, uniquely-resolving source body)
+    /// must be present, and the <c>PatchField&lt;T&gt;</c> type must still publicly
+    /// expose its state members. It deliberately does NOT prove routing
+    /// <em>semantics</em> — a static presence check cannot see, e.g., a value sent
+    /// when blank, nor the <c>unset → omit</c> behaviour (the absence of an else
+    /// branch). Those, and the exact JSON emission for each state, are owned by the
+    /// behavioural tests in <c>GatewayProtocolModelsTests</c>. Guard F is the
+    /// complement that catches the machinery being removed/renamed/gutted.
+    /// </summary>
+    [Fact]
+    public void TriStateClearContract_isWiredInClient()
+    {
+        var snapshot = LoadSnapshot();
+        var protocol = LoadProtocolSource();
+
+        var failures = new List<string>();
+        foreach (var method in snapshot.Methods.Where(m => m.TriState is not null))
+        {
+            var contract = method.TriState!;
+
+            // Always resolve builderSource (and reuse it for markers that don't pin
+            // their own source) so it can never go stale/ambiguous unchecked, even
+            // if every marker specifies an explicit source.
+            if (!TryResolveUniqueBody(protocol, contract.BuilderSource, $"{method.Method}: builderSource", failures, out var builderRegion))
+                builderRegion = null;
+
+            // Each marker is checked inside its own uniquely-resolving source body
+            // (defaulting to builderSource) — so e.g. AddString regressing is caught
+            // even if AddEncoded is still correct.
+            foreach (var marker in contract.Markers)
+            {
+                Region? region;
+                if (string.IsNullOrEmpty(marker.Source))
+                {
+                    region = builderRegion;
+                    if (region is null) continue; // builderSource already reported as failed
+                }
+                else if (!TryResolveUniqueBody(protocol, marker.Source!, $"{method.Method}: marker '{marker.Name}' source", failures, out region))
+                {
+                    continue;
+                }
+                if (!Regex.IsMatch(region!.Code, marker.Pattern))
+                    failures.Add($"{method.Method}: tri-state contract marker '{marker.Name}' (/{marker.Pattern}/) is missing from '{(string.IsNullOrEmpty(marker.Source) ? contract.BuilderSource : marker.Source)}' — the tri-state routing drifted");
+            }
+
+            // The tri-state value type must still publicly expose all three states.
+            if (TryResolveUniqueBody(protocol, contract.StateTypeSource, $"{method.Method}: stateTypeSource", failures, out var stateType))
+            {
+                foreach (var state in contract.StateMembers)
+                {
+                    // Require a public member declaration (not a bare token), tolerating
+                    // common modifiers before the type so a future `public required T x`
+                    // / `public static …` doesn't false-fail.
+                    if (!Regex.IsMatch(stateType!.Code, $"public\\s+(?:(?:static|readonly|required|virtual|override|sealed|new)\\s+)*[A-Za-z_][\\w<>?]*\\s+{Regex.Escape(state)}\\b"))
+                        failures.Add($"{method.Method}: tri-state value type '{contract.StateTypeSource}' no longer publicly exposes state '{state}'");
+                }
+            }
+        }
+
+        if (failures.Count > 0)
+            Assert.Fail("Gateway tri-state clear-contract drift detected:\n  - " + string.Join("\n  - ", failures) + "\nSee docs/gateway-protocol-drift-guard.md.");
+    }
+
+    /// <summary>
+    /// Resolves a snapshot source fragment to a unique method/type body, mirroring
+    /// the uniqueness discipline of Guard C/D: a 0-match or &gt;1-match fragment is a
+    /// loud failure (recorded in <paramref name="failures"/>) rather than a silent
+    /// first-match bind.
+    /// </summary>
+    private static bool TryResolveUniqueBody(Source source, string fragment, string label, List<string> failures, out Region? region)
+    {
+        region = null;
+        var occurrences = CountOccurrences(source.Masked, fragment);
+        if (occurrences == 0)
+        {
+            failures.Add($"{label} '{fragment}' not found (refactor? update the snapshot)");
+            return false;
+        }
+        if (occurrences > 1)
+        {
+            failures.Add($"{label} '{fragment}' is ambiguous (matches {occurrences} sites) — make it unique");
+            return false;
+        }
+        region = ExtractMethodBody(source, fragment);
+        if (region is null)
+        {
+            failures.Add($"{label} '{fragment}' did not resolve to a body");
+            return false;
+        }
+        return true;
+    }
+
+    // --- request-key extraction ---------------------------------------------
+
+    /// <summary>
+    /// Extracts the request wire keys actually constructed in a region: the member
+    /// names of anonymous-object payloads (<c>new { key, sessionKey = x }</c>), the
+    /// string keys of dictionary payloads (<c>payload["key"] = …</c>,
+    /// <c>new Dictionary&lt;…&gt; { ["key"] = … }</c>), and the key literal of an
+    /// add-helper call whose first argument is the payload dictionary
+    /// (<c>AddString(payload, "key", …)</c> / <c>AddEncoded(payload, "key", …)</c>,
+    /// as the tri-state <c>SessionPatch.ToPayload</c> uses). Comparing pinned
+    /// request fields against the ACTUAL constructed keys (not mere token presence)
+    /// catches a client-side wire-key rename even when the old name survives as a
+    /// local or parameter — e.g. <c>new { sessionKey = key }</c> yields key
+    /// <c>sessionKey</c>, not <c>key</c>. Object initializers
+    /// (<c>new TypeName { Prop = … }</c>) are intentionally excluded — only
+    /// anonymous <c>new { … }</c> payloads count.
+    /// </summary>
+    private static HashSet<string> ExtractConstructedKeys(Region region)
+    {
+        var keys = new HashSet<string>(StringComparer.Ordinal);
+
+        // Dictionary string keys: ["field"] — strings are preserved in the code view.
+        foreach (Match m in Regex.Matches(region.Code, $"\\[\\s*\"({Ident})\"\\s*\\]"))
+            keys.Add(m.Groups[1].Value);
+
+        // Add-helper calls: Add*(payload, "field", …) — the key is the second arg
+        // when the helper name starts with "Add" and the first arg is the payload
+        // dictionary. This covers the tri-state builder (ToPayload delegates to
+        // AddString/AddEncoded), while excluding unrelated 2-arg calls like
+        // Validate(payload, "x") or string.Equals(x, "y") that would otherwise
+        // inject spurious keys.
+        foreach (Match m in Regex.Matches(region.Code, $"\\bAdd[A-Za-z0-9_]*\\(\\s*payload\\s*,\\s*\"({Ident})\""))
+            keys.Add(m.Groups[1].Value);
+
+        // Anonymous-object members: each `new {` block (no type name between `new`
+        // and `{`). Parse the masked block so commas inside strings don't split.
+        foreach (Match m in Regex.Matches(region.Masked, "new\\s*\\{"))
+        {
+            var open = region.Masked.IndexOf('{', m.Index);
+            if (open < 0) continue;
+            var close = MatchBrace(region.Masked, open);
+            if (close < 0) continue;
+
+            var inner = region.Masked.Substring(open + 1, close - open - 1);
+            foreach (var segment in SplitTopLevel(inner))
+            {
+                var member = Regex.Match(segment.Trim(), $"^({Ident})");
+                if (member.Success)
+                    keys.Add(member.Groups[1].Value);
+            }
+        }
+
+        return keys;
+    }
+
+    /// <summary>Splits on top-level commas, ignoring commas nested in (), [], or {}.</summary>
+    private static IEnumerable<string> SplitTopLevel(string text)
+    {
+        var depth = 0;
+        var start = 0;
+        for (var i = 0; i < text.Length; i++)
+        {
+            var c = text[i];
+            if (c is '(' or '[' or '{') depth++;
+            else if (c is ')' or ']' or '}') depth--;
+            else if (c == ',' && depth == 0)
+            {
+                yield return text.Substring(start, i - start);
+                start = i + 1;
+            }
+        }
+        if (start < text.Length)
+            yield return text.Substring(start);
+    }
+
+    // --- method-surface extraction -----------------------------------------
+
+    /// <summary>
+    /// Returns the in-scope request methods dispatched by the client, mapped to the
+    /// char offsets of each dispatch call. A dispatch call is any non-logging method
+    /// call whose first argument is a quote-bounded scoped method literal — e.g.
+    /// <c>TrySendTrackedRequestAsync("sessions.patch", …)</c>,
+    /// <c>TryRequestPayloadAsync("commands.list", …)</c>, or the private
+    /// <c>MutateCompactionAsync("sessions.compaction.branch", …)</c> forwarder.
+    /// This recognises new dispatcher wrappers automatically and excludes non-call
+    /// uses (<c>case "…":</c>, <c>method is "…"</c>, log sentences) which is the
+    /// false-"used" trap.
+    /// </summary>
+    private static Dictionary<string, List<int>> ExtractDispatchedRequestMethods(Source source, IReadOnlyList<string> scopePrefixes)
+    {
+        var scope = ScopeAlternation(scopePrefixes);
+        var rx = new Regex($"(?<![A-Za-z0-9_])({Ident})\\s*\\(\\s*\"((?:{scope})[A-Za-z0-9_.]+)\"", RegexOptions.CultureInvariant);
+        var map = new Dictionary<string, List<int>>(StringComparer.Ordinal);
+        foreach (Match m in rx.Matches(source.Code))
+        {
+            var dispatcher = m.Groups[1].Value;
+            if (LoggingSinks.Contains(dispatcher)) continue;
+            var name = m.Groups[2].Value;
+            if (!map.TryGetValue(name, out var list))
+                map[name] = list = new List<int>();
+            list.Add(m.Index);
+        }
+        return map;
+    }
+
+    /// <summary>Returns the in-scope methods handled by a <c>case "…":</c> label.</summary>
+    private static HashSet<string> ExtractHandledMethods(string code, IReadOnlyList<string> scopePrefixes)
+    {
+        var scope = ScopeAlternation(scopePrefixes);
+        var rx = new Regex($"case\\s*\"((?:{scope})[A-Za-z0-9_.]+)\"\\s*:", RegexOptions.CultureInvariant);
+        var set = new HashSet<string>(StringComparer.Ordinal);
+        foreach (Match m in rx.Matches(code))
+            set.Add(m.Groups[1].Value);
+        return set;
+    }
+
+    private static string ScopeAlternation(IReadOnlyList<string> scopePrefixes) =>
+        string.Join("|", scopePrefixes.Select(p => Regex.Escape(p)));
+
+    // --- block extraction ---------------------------------------------------
+
+    /// <summary>
+    /// Returns the body (including braces) of the first method/block whose
+    /// declaration contains <paramref name="signatureFragment"/>, as both the
+    /// comment-stripped code view and the fully-masked view (same indices). Brace
+    /// matching uses the masked view. Returns null when the fragment is absent.
+    /// </summary>
+    private static Region? ExtractMethodBody(Source source, string signatureFragment)
+    {
+        var sigIndex = source.Masked.IndexOf(signatureFragment, StringComparison.Ordinal);
+        if (sigIndex < 0) return null;
+
+        var open = source.Masked.IndexOf('{', sigIndex);
+        if (open < 0) return null;
+        var close = MatchBrace(source.Masked, open);
+        if (close < 0) return null;
+        return Slice(source, open, close);
+    }
+
+    /// <summary>
+    /// Returns the innermost <c>{ … }</c> block enclosing <paramref name="position"/>
+    /// (both views) and a flag indicating whether that block is a type body rather
+    /// than a method body — which happens when the dispatch call is in an
+    /// expression-bodied member and the enclosing block degrades to the whole class.
+    /// </summary>
+    private static (Region? region, bool isTypeBody) ExtractEnclosingBlock(Source source, int position)
+    {
+        var masked = source.Masked;
+        var depth = 0;
+        var open = -1;
+        for (var i = Math.Min(position, masked.Length) - 1; i >= 0; i--)
+        {
+            var c = masked[i];
+            if (c == '}') depth++;
+            else if (c == '{')
+            {
+                if (depth == 0) { open = i; break; }
+                depth--;
+            }
+        }
+        if (open < 0) return (null, false);
+
+        var close = MatchBrace(masked, open);
+        if (close < 0) return (null, false);
+
+        var isTypeBody = IsTypeDeclarationBefore(masked, open);
+        return (Slice(source, open, close), isTypeBody);
+    }
+
+    /// <summary>
+    /// True when the <c>{</c> at <paramref name="openIndex"/> opens a type body —
+    /// i.e. the nearest declaration keyword immediately preceding it is
+    /// class/struct/record/interface <em>followed by a type name</em> (no
+    /// intervening <c>;</c>/<c>{</c>/<c>}</c>). Requiring the type name avoids a
+    /// false positive on a generic constraint such as <c>where T : class { … }</c>,
+    /// where the keyword is not introducing a type declaration.
+    /// </summary>
+    private static bool IsTypeDeclarationBefore(string masked, int openIndex)
+    {
+        var start = Math.Max(0, openIndex - 400);
+        var prefix = masked.Substring(start, openIndex - start);
+        return Regex.IsMatch(prefix, $"\\b(class|struct|record|interface)\\s+{Ident}[^;{{}}]*$");
+    }
+
+    private static Region Slice(Source source, int open, int close) =>
+        new(source.Code.Substring(open, close - open + 1), source.Masked.Substring(open, close - open + 1));
+
+    private static int MatchBrace(string masked, int openIndex)
+    {
+        var depth = 0;
+        for (var i = openIndex; i < masked.Length; i++)
+        {
+            if (masked[i] == '{') depth++;
+            else if (masked[i] == '}')
+            {
+                depth--;
+                if (depth == 0) return i;
+            }
+        }
+        return -1;
+    }
+
+    private static int CountOccurrences(string haystack, string needle)
+    {
+        if (string.IsNullOrEmpty(needle)) return 0;
+        var count = 0;
+        var idx = 0;
+        while ((idx = haystack.IndexOf(needle, idx, StringComparison.Ordinal)) >= 0)
+        {
+            count++;
+            idx += needle.Length;
+        }
+        return count;
+    }
+
+    // --- source preprocessing ----------------------------------------------
+
+    /// <summary>
+    /// Produces two index-aligned, equal-length views of <paramref name="source"/>:
+    /// <c>Code</c> blanks comments only (string/char literals preserved), and
+    /// <c>Masked</c> blanks comments AND string/char/verbatim/interpolated literals.
+    /// Newlines are preserved in both. A single lexer pass guarantees the two views
+    /// stay aligned. Precondition: interpolated-string holes in scanned regions do
+    /// not contain a closing quote inside the hole; the scanned OpenClaw methods
+    /// satisfy this.
+    /// </summary>
+    private static (string Code, string Masked) Preprocess(string source)
+    {
+        var code = new StringBuilder(source.Length);
+        var masked = new StringBuilder(source.Length);
+        var i = 0;
+
+        void Emit(char c) { code.Append(c); masked.Append(c); }
+        void Blank(int n) { code.Append(' ', n); masked.Append(' ', n); }            // comment: blank both
+        void Keep(char c) { code.Append(c); masked.Append(' '); }                    // literal char: keep in Code, blank in Masked
+        void NL() { code.Append('\n'); masked.Append('\n'); }
+
+        while (i < source.Length)
+        {
+            var c = source[i];
+            var next = i + 1 < source.Length ? source[i + 1] : '\0';
+
+            if (c == '/' && next == '/')
+            {
+                while (i < source.Length && source[i] != '\n') { if (source[i] == '\n') NL(); else Blank(1); i++; }
+                continue;
+            }
+            if (c == '/' && next == '*')
+            {
+                Blank(2); i += 2;
+                while (i < source.Length && !(source[i] == '*' && i + 1 < source.Length && source[i + 1] == '/'))
+                { if (source[i] == '\n') NL(); else Blank(1); i++; }
+                if (i < source.Length) { Blank(2); i += 2; }
+                continue;
+            }
+            if (c == '@' && next == '"')
+            {
+                Keep('@'); Keep('"'); i += 2;
+                while (i < source.Length)
+                {
+                    if (source[i] == '"')
+                    {
+                        if (i + 1 < source.Length && source[i + 1] == '"') { Keep('"'); Keep('"'); i += 2; continue; }
+                        Keep('"'); i++; break;
+                    }
+                    if (source[i] == '\n') NL(); else Keep(source[i]);
+                    i++;
+                }
+                continue;
+            }
+            if (c == '"' || (c == '$' && next == '"'))
+            {
+                if (c == '$') { Keep('$'); i++; }
+                Keep('"'); i++;
+                while (i < source.Length)
+                {
+                    if (source[i] == '\\') { Keep('\\'); if (i + 1 < source.Length) Keep(source[i + 1]); i += 2; continue; }
+                    if (source[i] == '"') { Keep('"'); i++; break; }
+                    if (source[i] == '\n') NL(); else Keep(source[i]);
+                    i++;
+                }
+                continue;
+            }
+            if (c == '\'')
+            {
+                Keep('\''); i++;
+                while (i < source.Length)
+                {
+                    if (source[i] == '\\') { Keep('\\'); if (i + 1 < source.Length) Keep(source[i + 1]); i += 2; continue; }
+                    if (source[i] == '\'') { Keep('\''); i++; break; }
+                    Keep(source[i]); i++;
+                }
+                continue;
+            }
+
+            if (c == '\n') NL(); else Emit(c);
+            i++;
+        }
+
+        return (code.ToString(), masked.ToString());
+    }
+
+    // --- loading ------------------------------------------------------------
+
+    /// <summary>The client dispatch surface: the OpenClawGatewayClient partial class files.</summary>
+    private static Source LoadClientSource() =>
+        ConcatSources(f => FileNameMatches(f.Path, "OpenClawGatewayClient", ".cs"),
+            "Could not locate OpenClawGatewayClient*.cs under src/.");
+
+    /// <summary>The client surface plus the DTO/payload builders (GatewayProtocolModels.cs).</summary>
+    private static Source LoadProtocolSource() =>
+        ConcatSources(
+            f => FileNameMatches(f.Path, "OpenClawGatewayClient", ".cs") || EndsWith(f.Path, "GatewayProtocolModels.cs"),
+            "Could not locate the gateway protocol source under src/.");
+
+    private static Source ConcatSources(Func<SourceFileSnapshot, bool> predicate, string notFound)
+    {
+        var files = ProductionSourceFiles.All
+            .Where(predicate)
+            .OrderBy(f => f.Path, StringComparer.Ordinal)
+            .ToList();
+        Assert.True(files.Count > 0, notFound);
+        // Join with a newline so per-file brace balance is preserved across the
+        // concatenation (each .cs is itself balanced, so blocks never span files).
+        var text = string.Join("\n", files.Select(f => f.Text));
+        var (code, masked) = Preprocess(text);
+
+        // Self-check: a desynced masker (e.g. an unhandled string/raw-string form
+        // leaving a brace "live") would make brace matching unreliable and could
+        // produce false passes. The masked view must keep brace balance.
+        var opens = masked.Count(ch => ch == '{');
+        var closes = masked.Count(ch => ch == '}');
+        Assert.True(opens == closes,
+            $"Literal/comment masker desynced on the gateway protocol source (masked braces {opens} open vs {closes} close). " +
+            "A new C# string form (e.g. a raw string literal) likely needs handling in Preprocess.");
+
+        return new Source(code, masked);
+    }
+
+    private static bool FileNameMatches(string path, string prefix, string suffix)
+    {
+        var name = Path.GetFileName(path);
+        return name.StartsWith(prefix, StringComparison.Ordinal) && name.EndsWith(suffix, StringComparison.Ordinal);
+    }
+
+    private static bool EndsWith(string path, string fileName) =>
+        string.Equals(Path.GetFileName(path), fileName, StringComparison.Ordinal);
+
+    private static ProtocolSnapshot LoadSnapshot()
+    {
+        var path = Path.Combine(ProductionSourceFiles.FindRepoRoot(), "tests", "OpenClaw.Shared.Tests", "Protocol", "gateway-protocol-snapshot.json");
+        Assert.True(File.Exists(path), $"Protocol snapshot fixture not found at {path}.");
+
+        using var doc = JsonDocument.Parse(File.ReadAllText(path));
+        var root = doc.RootElement;
+
+        var scopePrefixes = root.GetProperty("scopePrefixes").EnumerateArray().Select(e => e.GetString()!).ToList();
+
+        var methods = new List<ProtocolMethod>();
+        foreach (var m in root.GetProperty("methods").EnumerateArray())
+        {
+            methods.Add(new ProtocolMethod(
+                Method: m.GetProperty("method").GetString()!,
+                Kind: m.GetProperty("kind").GetString()!,
+                WindowsUsage: m.GetProperty("windowsUsage").GetString()!,
+                RequestFields: ReadStringArray(m, "requestFields"),
+                AllowedExtraRequestFields: ReadStringArray(m, "allowedExtraRequestFields"),
+                ResponseFields: ReadStringArray(m, "responseFields"),
+                ResponseEnvelope: ReadStringArray(m, "responseEnvelope"),
+                RequestFieldsSource: m.TryGetProperty("requestFieldsSource", out var s) && s.ValueKind == JsonValueKind.String ? s.GetString() : null,
+                ResponseEnvelopeSource: m.TryGetProperty("responseEnvelopeSource", out var es) && es.ValueKind == JsonValueKind.String ? es.GetString() : null,
+                RequestFieldSemantics: m.TryGetProperty("requestFieldSemantics", out var rs) && rs.ValueKind == JsonValueKind.String ? rs.GetString() : null,
+                TriState: ReadTriStateContract(m),
+                ProvisionalResponseFields: m.TryGetProperty("provisionalResponseFields", out var p) && p.ValueKind == JsonValueKind.True));
+        }
+
+        return new ProtocolSnapshot(scopePrefixes, methods);
+    }
+
+    private static IReadOnlyList<string> ReadStringArray(JsonElement obj, string property)
+    {
+        if (!obj.TryGetProperty(property, out var arr) || arr.ValueKind != JsonValueKind.Array)
+            return Array.Empty<string>();
+        return arr.EnumerateArray().Select(e => e.GetString()!).ToList();
+    }
+
+    private static TriStateContract? ReadTriStateContract(JsonElement method)
+    {
+        if (!method.TryGetProperty("tristateContract", out var c) || c.ValueKind != JsonValueKind.Object)
+            return null;
+
+        var markers = new List<TriStateMarker>();
+        if (c.TryGetProperty("markers", out var ms) && ms.ValueKind == JsonValueKind.Array)
+        {
+            foreach (var m in ms.EnumerateArray())
+            {
+                markers.Add(new TriStateMarker(
+                    Name: m.GetProperty("name").GetString()!,
+                    Pattern: m.GetProperty("pattern").GetString()!,
+                    Source: m.TryGetProperty("source", out var src) && src.ValueKind == JsonValueKind.String ? src.GetString() : null));
+            }
+        }
+
+        return new TriStateContract(
+            BuilderSource: c.GetProperty("builderSource").GetString()!,
+            Markers: markers,
+            StateTypeSource: c.GetProperty("stateTypeSource").GetString()!,
+            StateMembers: ReadStringArray(c, "stateMembers"));
+    }
+
+    private sealed record Source(string Code, string Masked);
+
+    private sealed record Region(string Code, string Masked);
+
+    private sealed record TriStateMarker(string Name, string Pattern, string? Source);
+
+    private sealed record TriStateContract(
+        string BuilderSource,
+        IReadOnlyList<TriStateMarker> Markers,
+        string StateTypeSource,
+        IReadOnlyList<string> StateMembers);
+
+    private sealed record ProtocolSnapshot(IReadOnlyList<string> ScopePrefixes, IReadOnlyList<ProtocolMethod> Methods);
+
+    private sealed record ProtocolMethod(
+        string Method,
+        string Kind,
+        string WindowsUsage,
+        IReadOnlyList<string> RequestFields,
+        IReadOnlyList<string> AllowedExtraRequestFields,
+        IReadOnlyList<string> ResponseFields,
+        IReadOnlyList<string> ResponseEnvelope,
+        string? RequestFieldsSource,
+        string? ResponseEnvelopeSource,
+        string? RequestFieldSemantics,
+        TriStateContract? TriState,
+        bool ProvisionalResponseFields);
+}
diff --git a/tests/OpenClaw.Shared.Tests/Protocol/gateway-protocol-snapshot.json b/tests/OpenClaw.Shared.Tests/Protocol/gateway-protocol-snapshot.json
new file mode 100644
index 000000000..5988b11b6
--- /dev/null
+++ b/tests/OpenClaw.Shared.Tests/Protocol/gateway-protocol-snapshot.json
@@ -0,0 +1,228 @@
+{
+  "_comment": [
+    "CANONICAL MIRROR of the upstream OpenClaw gateway protocol schema for the",
+    "sessions / files / commands / compaction surface. This file is the pinned",
+    "reference that GatewayProtocolDriftTests checks the Windows companion against.",
+    "It is maintained BY HAND from upstream main. When upstream changes, refresh",
+    "this file (see docs/gateway-protocol-drift-guard.md) and the drift test will",
+    "force the Windows client to be reconciled.",
+    "",
+    "This guard complements — it does not duplicate — the behavioural parser tests",
+    "in GatewayProtocolModelsTests. Those parse sample JSON and assert DTO mapping;",
+    "this guard statically pins the method / request-field / response-envelope",
+    "SURFACE against the typed client so an upstream rename or a dropped API fails",
+    "loudly even if the parser unit tests still pass on their fixed samples.",
+    "",
+    "windowsUsage:",
+    "  used     - the client sends/handles this method today; the guard REQUIRES it",
+    "             to remain wired up (dropping it means the client stopped",
+    "             implementing a method it should send).",
+    "  planned  - defined upstream but not yet consumed by the client; the shape is",
+    "             pinned for future adoption but the client is not required to use",
+    "             it yet. (Currently none — the typed client wires the whole",
+    "             sessions/files/commands/compaction surface.)",
+    "",
+    "Per-method enforced fields (see docs 'Enforced vs documentation-only'):",
+    "  requestFields   - validated BIDIRECTIONALLY against the ACTUAL constructed wire",
+    "                    keys (anonymous-object members + dictionary string keys) in the",
+    "                    request-construction region (the send call site's enclosing",
+    "                    block, or requestFieldsSource): missing (pinned but not built)",
+    "                    AND unexpected (built but not pinned) both fail. So renaming a",
+    "                    wire key (old name surviving as a local) and leaving a stale",
+    "                    extra key are both caught.",
+    "  allowedExtraRequestFields - optional per-method allowlist exempting intentional",
+    "                    client-only extra wire keys from the 'unexpected' direction.",
+    "  responseEnvelope- the top-level container property the client must read",
+    "                    (TryGetProperty / TryGetArray), scoped to responseEnvelopeSource",
+    "                    (the specific parser body) so one parser reading the same",
+    "                    property name cannot satisfy another method's envelope.",
+    "  responseFields  - (sessions.list only) the exact session field set the legacy",
+    "                    session parser reads; cross-checked both directions.",
+    "  requestFieldsSource    - declaration-signature fragment whose body holds the",
+    "                    request-field construction, when it is NOT inline at the send",
+    "                    call site (e.g. SessionPatch.ToPayload, MutateCompactionAsync).",
+    "                    Must resolve uniquely to a body that actually constructs keys.",
+    "  responseEnvelopeSource - declaration-signature fragment of the parser body that",
+    "                    reads this method's response envelope."
+  ],
+  "upstreamSourceOfTruth": "openclaw/openclaw — packages/gateway-protocol/src/schema/{sessions,commands}.ts",
+  "upstreamRef": "main",
+  "upstreamVerified": {
+    "date": "2026-06-23",
+    "sessionsTsBlobSha": "d938f80f68cb285719e20801e83f74893aa04332",
+    "commandsTsBlobSha": "a24972162dfbe4f95e05bf19211097707d30f9bb",
+    "result": "All enforced request fields, response envelopes, and the sessions.patch tri-state nullable (Union([value, Null])) contract match upstream main exactly. The snapshot is a deliberate SUBSET: the Windows client does not yet implement these upstream sessions.patch fields — label, agentId, spawnedBy, spawnedWorkspaceDir, spawnedCwd, spawnDepth, subagentRole, subagentControlScope, inheritedToolAllow, inheritedToolDeny (spawn/subagent orchestration); nor the compaction checkpoint preCompaction/postCompaction references. These are upstream fields the client does not implement yet, not drift."
+  },
+  "clientFoundationCommit": "2cae69ba",
+  "_clientFoundationCommitNote": "The commit on main that introduced the typed gateway protocol client (OpenClawGatewayClient.Protocol.cs + GatewayProtocolModels.cs) this guard cross-checks.",
+  "snapshotUpdated": "2026-06-24",
+  "scopePrefixes": ["sessions.", "agents.files.", "commands."],
+  "methods": [
+    {
+      "method": "sessions.list",
+      "kind": "request",
+      "windowsUsage": "used",
+      "requestFields": ["agentId"],
+      "responseEnvelope": ["sessions"],
+      "responseEnvelopeSource": "TryGetSessionsPayload(JsonElement payload",
+      "responseFields": [
+        "key", "isMain", "status", "model", "channel", "displayName", "provider",
+        "subject", "room", "space", "sessionId", "thinkingLevel", "verboseLevel",
+        "systemSent", "abortedLastRun", "inputTokens", "outputTokens", "totalTokens",
+        "contextTokens", "updatedAt", "startedAt"
+      ]
+    },
+    {
+      "method": "sessions.subscribe",
+      "kind": "request",
+      "windowsUsage": "used",
+      "requestFields": []
+    },
+    {
+      "method": "sessions.changed",
+      "kind": "notification",
+      "windowsUsage": "used",
+      "requestFields": []
+    },
+    {
+      "method": "sessions.preview",
+      "kind": "request",
+      "windowsUsage": "used",
+      "requestFields": ["keys", "limit", "maxChars"]
+    },
+    {
+      "method": "sessions.patch",
+      "kind": "request",
+      "windowsUsage": "used",
+      "requestFields": [
+        "key", "model", "thinkingLevel", "fastMode", "verboseLevel", "traceLevel",
+        "reasoningLevel", "responseUsage", "elevatedLevel", "execHost", "execSecurity",
+        "execAsk", "execNode", "sendPolicy", "groupActivation"
+      ],
+      "requestFieldsSource": "ToPayload(string key",
+      "_note": "Extended field set built by SessionPatch.ToPayload (strict additionalProperties:false upstream). The exact wire key allowlist is also asserted at runtime by GatewayProtocolModelsTests.SessionPatch_ToPayload_EmitsOnlyKnownGatewaySchemaFields.",
+      "requestFieldSemantics": "tristate-nullable",
+      "tristateContract": {
+        "_doc": [
+          "Upstream SessionsPatchParamsSchema types every field as Union([<value>, Null]):",
+          "an explicit null REMOVES a session override. The Windows client models this as",
+          "a tri-state PatchField<T>: unset (null reference) -> omitted; a value -> sent",
+          "(blank string omitted per NonEmptyString); SessionPatch.Clear -> explicit JSON",
+          "null. This guard pins the STRUCTURAL PRESENCE of that machinery; the runtime",
+          "routing SEMANTICS (incl. unset->omit and value-when-blank) are owned by",
+          "GatewayProtocolModelsTests (ClearEmitsExplicitNull*, MixesSetAndClearAndUnset,",
+          "PatchField_TriStateFlags). Each marker is a regex over a specific source body;",
+          "'source' defaults to builderSource when omitted. Every source must resolve uniquely."
+        ],
+        "builderSource": "public sealed class SessionPatch",
+        "markers": [
+          { "name": "clear sentinel type referenced in builder", "pattern": "PatchFieldClear" },
+          { "name": "AddString has a clear branch", "source": "void AddString(", "pattern": "\\bIsClear\\b" },
+          { "name": "AddString emits explicit null on clear", "source": "void AddString(", "pattern": "payload\\[\\s*name\\s*\\]\\s*=\\s*null" },
+          { "name": "AddString omits blank string value", "source": "void AddString(", "pattern": "IsNullOrWhiteSpace" },
+          { "name": "AddEncoded has a clear branch", "source": "void AddEncoded", "pattern": "\\bIsClear\\b" },
+          { "name": "AddEncoded emits explicit null on clear", "source": "void AddEncoded", "pattern": "payload\\[\\s*name\\s*\\]\\s*=\\s*null" },
+          { "name": "AddEncoded gates emission on set value", "source": "void AddEncoded", "pattern": "\\bHasValue\\b" },
+          { "name": "unset (null reference) maps to default/unset", "source": "struct PatchField<T>", "pattern": "value is null\\s*\\?\\s*default" }
+        ],
+        "stateTypeSource": "struct PatchField<T>",
+        "stateMembers": ["IsSpecified", "IsClear", "HasValue"]
+      }
+    },
+    {
+      "method": "sessions.reset",
+      "kind": "request",
+      "windowsUsage": "used",
+      "requestFields": ["key"]
+    },
+    {
+      "method": "sessions.delete",
+      "kind": "request",
+      "windowsUsage": "used",
+      "requestFields": ["key", "deleteTranscript"]
+    },
+    {
+      "method": "sessions.compact",
+      "kind": "request",
+      "windowsUsage": "used",
+      "requestFields": ["key", "maxLines"]
+    },
+    {
+      "method": "agents.files.list",
+      "kind": "request",
+      "windowsUsage": "used",
+      "requestFields": ["agentId"]
+    },
+    {
+      "method": "agents.files.get",
+      "kind": "request",
+      "windowsUsage": "used",
+      "requestFields": ["agentId", "name"]
+    },
+    {
+      "method": "commands.list",
+      "kind": "request",
+      "windowsUsage": "used",
+      "requestFields": [],
+      "responseEnvelope": ["commands"],
+      "responseEnvelopeSource": "ParseCommandCatalog(JsonElement payload",
+      "itemFields": [
+        "name", "nativeName", "textAliases", "description", "category", "source",
+        "scope", "acceptsArgs", "args"
+      ],
+      "_itemFieldsNote": "Per-command descriptor fields parsed by ParseCommand; documentation-only (behaviour covered by GatewayProtocolModelsTests.ParseCommandCatalog_*)."
+    },
+    {
+      "method": "sessions.files.list",
+      "kind": "request",
+      "windowsUsage": "used",
+      "requestFields": ["sessionKey", "path", "search"],
+      "responseEnvelope": ["files"],
+      "responseEnvelopeSource": "ParseSessionFileList(JsonElement payload",
+      "itemFields": ["path", "name", "kind", "missing", "size", "updatedAtMs", "content"],
+      "_itemFieldsNote": "File entry fields parsed by ParseFileEntry; documentation-only (covered by GatewayProtocolModelsTests.ParseSessionFileList_*)."
+    },
+    {
+      "method": "sessions.files.get",
+      "kind": "request",
+      "windowsUsage": "used",
+      "requestFields": ["sessionKey", "path"],
+      "responseEnvelope": ["file"],
+      "responseEnvelopeSource": "ParseSessionFileContent(JsonElement payload",
+      "itemFields": ["path", "name", "kind", "content", "size", "updatedAtMs", "missing"],
+      "_itemFieldsNote": "Nested file fields parsed by ParseSessionFileContent; documentation-only."
+    },
+    {
+      "method": "sessions.compaction.list",
+      "kind": "request",
+      "windowsUsage": "used",
+      "requestFields": ["key"],
+      "responseEnvelope": ["checkpoints"],
+      "responseEnvelopeSource": "ParseCompactionCheckpointList(JsonElement payload",
+      "itemFields": ["checkpointId", "sessionKey", "sessionId", "createdAt", "reason", "tokensBefore", "tokensAfter", "summary", "firstKeptEntryId"],
+      "_itemFieldsNote": "Checkpoint fields parsed by ParseCompactionCheckpoint; documentation-only."
+    },
+    {
+      "method": "sessions.compaction.get",
+      "kind": "request",
+      "windowsUsage": "used",
+      "requestFields": ["key", "checkpointId"],
+      "responseEnvelope": ["checkpoint"],
+      "responseEnvelopeSource": "ParseCompactionCheckpointResult(JsonElement payload"
+    },
+    {
+      "method": "sessions.compaction.branch",
+      "kind": "request",
+      "windowsUsage": "used",
+      "requestFields": ["key", "checkpointId"],
+      "requestFieldsSource": "string method, string key, string checkpointId"
+    },
+    {
+      "method": "sessions.compaction.restore",
+      "kind": "request",
+      "windowsUsage": "used",
+      "requestFields": ["key", "checkpointId"],
+      "requestFieldsSource": "string method, string key, string checkpointId"
+    }
+  ]
+}
diff --git a/tests/OpenClaw.Shared.Tests/README.md b/tests/OpenClaw.Shared.Tests/README.md
index dbde8dfc0..d219a0286 100644
--- a/tests/OpenClaw.Shared.Tests/README.md
+++ b/tests/OpenClaw.Shared.Tests/README.md
@@ -68,12 +68,16 @@ dotnet test --filter "FullyQualifiedName~AgentActivityTests"
 - ✅ device.status returns Mac-compatible status payload
 - ✅ Unknown command returns error
 
-#### ScreenCapabilityTests (9 tests)
+#### ScreenCapabilityTests (13 tests)
 - ✅ CanHandle screen.snapshot/screen.record and rejects non-gateway screen.capture/screen.list/start/stop commands
 - ✅ Capture returns error when no handler
 - ✅ Capture calls handler with parsed args (format, maxWidth, quality, screenIndex)
 - ✅ Capture returns error when handler throws
 - ✅ Capture includes data URI response
+- ✅ Capture rejects unsupported format (e.g. svg+xml) before invoking handler
+- ✅ Capture normalizes jpg → jpeg so encoded bytes and MIME type cannot diverge
+- ✅ Capture data URI derives MIME from validated format, not handler echo
+- ✅ TryNormalizeSnapshotFormat allows png/jpeg/jpg, rejects others
 - ✅ Record returns error when no handler
 - ✅ Record calls handler with Mac-compatible args
 - ✅ Record rejects unsupported non-mp4 format
diff --git a/tests/OpenClaw.Shared.Tests/RemoteGatewayClassifierTests.cs b/tests/OpenClaw.Shared.Tests/RemoteGatewayClassifierTests.cs
new file mode 100644
index 000000000..79ea41ad7
--- /dev/null
+++ b/tests/OpenClaw.Shared.Tests/RemoteGatewayClassifierTests.cs
@@ -0,0 +1,89 @@
+using OpenClaw.Shared;
+using Xunit;
+
+namespace OpenClaw.Shared.Tests;
+
+public class RemoteGatewayClassifierTests
+{
+    [Theory]
+    [InlineData("ws://localhost:18789")]
+    [InlineData("wss://127.0.0.1:18789")]
+    [InlineData("http://[::1]:18789")]
+    public void Classify_LoopbackHosts_AreLocalLoopback(string url)
+    {
+        var profile = RemoteGatewayClassifier.Classify(url);
+
+        Assert.Equal(GatewayConnectionTopology.Local, profile.Topology);
+        Assert.Equal(GatewayTransportSecurity.LocalLoopback, profile.Security);
+        Assert.True(profile.IsLocal);
+        Assert.False(profile.IsRemote);
+        Assert.False(profile.RecommendsTransportHardening);
+    }
+
+    [Theory]
+    [InlineData("wss://gateway.example.com:18789")]
+    [InlineData("https://gateway.example.com")]
+    public void Classify_RemoteTls_IsDirectSecure(string url)
+    {
+        var profile = RemoteGatewayClassifier.Classify(url);
+
+        Assert.Equal(GatewayConnectionTopology.DirectSecure, profile.Topology);
+        Assert.Equal(GatewayTransportSecurity.Encrypted, profile.Security);
+        Assert.True(profile.IsRemote);
+        Assert.True(profile.IsTls);
+        Assert.False(profile.RecommendsTransportHardening);
+    }
+
+    [Theory]
+    [InlineData("ws://gateway.example.com:18789")]
+    [InlineData("http://10.0.0.5:18789")]
+    [InlineData("ws://machine-name:18789")]
+    public void Classify_RemoteCleartext_IsDirectInsecure_AndWarns(string url)
+    {
+        var profile = RemoteGatewayClassifier.Classify(url);
+
+        Assert.Equal(GatewayConnectionTopology.DirectInsecure, profile.Topology);
+        Assert.Equal(GatewayTransportSecurity.Cleartext, profile.Security);
+        Assert.True(profile.IsRemote);
+        Assert.False(profile.IsTls);
+        Assert.True(profile.RecommendsTransportHardening);
+    }
+
+    [Fact]
+    public void Classify_WithSshTunnel_IsEncryptedTunnel_EvenForLoopbackUrl()
+    {
+        // The WebSocket talks to localhost but the bytes are SSH-encrypted to a
+        // remote host — treat as remote-but-encrypted, never warn.
+        var profile = RemoteGatewayClassifier.Classify("ws://localhost:18789", hasSshTunnel: true);
+
+        Assert.Equal(GatewayConnectionTopology.SshTunnel, profile.Topology);
+        Assert.Equal(GatewayTransportSecurity.Encrypted, profile.Security);
+        Assert.True(profile.IsRemote);
+        Assert.False(profile.IsLocal);
+        Assert.False(profile.RecommendsTransportHardening);
+    }
+
+    [Fact]
+    public void Classify_SshTunnel_TakesPrecedenceOverCleartextRemoteUrl()
+    {
+        var profile = RemoteGatewayClassifier.Classify("ws://gateway.example.com:18789", hasSshTunnel: true);
+
+        Assert.Equal(GatewayConnectionTopology.SshTunnel, profile.Topology);
+        Assert.False(profile.RecommendsTransportHardening);
+    }
+
+    [Theory]
+    [InlineData("")]
+    [InlineData("   ")]
+    [InlineData(null)]
+    [InlineData("not a url")]
+    [InlineData("ws://")]
+    public void Classify_UnparseableInput_IsUnknown_AndDoesNotWarn(string? url)
+    {
+        var profile = RemoteGatewayClassifier.Classify(url);
+
+        Assert.Equal(GatewayConnectionTopology.Unknown, profile.Topology);
+        Assert.False(profile.RecommendsTransportHardening);
+        Assert.False(profile.IsRemote);
+    }
+}
diff --git a/tests/OpenClaw.Shared.Tests/SessionActionPlannerTests.cs b/tests/OpenClaw.Shared.Tests/SessionActionPlannerTests.cs
new file mode 100644
index 000000000..a208813b2
--- /dev/null
+++ b/tests/OpenClaw.Shared.Tests/SessionActionPlannerTests.cs
@@ -0,0 +1,176 @@
+using OpenClaw.Shared.Sessions;
+using Xunit;
+
+namespace OpenClaw.Shared.Tests;
+
+public class SessionActionPlannerTests
+{
+    [Theory]
+    [InlineData(SessionActionKind.Reset, true)]
+    [InlineData(SessionActionKind.Compact, true)]
+    [InlineData(SessionActionKind.Delete, true)]
+    [InlineData(SessionActionKind.Restore, true)]
+    [InlineData(SessionActionKind.Export, false)]
+    [InlineData(SessionActionKind.OpenChat, false)]
+    [InlineData(SessionActionKind.Branch, false)]
+    public void RequiresConfirmation_MatchesPolicy(SessionActionKind kind, bool expected)
+    {
+        Assert.Equal(expected, SessionActionPlanner.RequiresConfirmation(kind));
+    }
+
+    [Theory]
+    [InlineData(SessionActionKind.Reset, true)]
+    [InlineData(SessionActionKind.Delete, true)]
+    [InlineData(SessionActionKind.Restore, true)]
+    [InlineData(SessionActionKind.Compact, false)]
+    [InlineData(SessionActionKind.Export, false)]
+    [InlineData(SessionActionKind.OpenChat, false)]
+    public void IsDestructive_MatchesPolicy(SessionActionKind kind, bool expected)
+    {
+        Assert.Equal(expected, SessionActionPlanner.IsDestructive(kind));
+    }
+
+    [Fact]
+    public void IsAllowed_BlocksDeleteOfMainSession_WithReason()
+    {
+        var allowed = SessionActionPlanner.IsAllowed(SessionActionKind.Delete, isMainSession: true, out var reason);
+
+        Assert.False(allowed);
+        Assert.False(string.IsNullOrWhiteSpace(reason));
+        Assert.Contains("main session", reason!, System.StringComparison.OrdinalIgnoreCase);
+    }
+
+    [Fact]
+    public void IsAllowed_PermitsDeleteOfNonMainSession()
+    {
+        var allowed = SessionActionPlanner.IsAllowed(SessionActionKind.Delete, isMainSession: false, out var reason);
+
+        Assert.True(allowed);
+        Assert.Null(reason);
+    }
+
+    [Fact]
+    public void IsAllowed_BlocksRestoreOfMainSession_WithReason()
+    {
+        var allowed = SessionActionPlanner.IsAllowed(SessionActionKind.Restore, isMainSession: true, out var reason);
+
+        Assert.False(allowed);
+        Assert.False(string.IsNullOrWhiteSpace(reason));
+    }
+
+    [Fact]
+    public void IsAllowed_PermitsRestoreOfNonMain_AndBranchOfMain()
+    {
+        Assert.True(SessionActionPlanner.IsAllowed(SessionActionKind.Restore, isMainSession: false, out var r1));
+        Assert.Null(r1);
+        Assert.True(SessionActionPlanner.IsAllowed(SessionActionKind.Branch, isMainSession: true, out var r2));
+        Assert.Null(r2);
+    }
+
+    [Theory]
+    [InlineData(SessionActionKind.Delete)]
+    [InlineData(SessionActionKind.Restore)]
+    public void IsAllowed_BlocksDestructiveActions_WhenMainStateUnknown(SessionActionKind kind)
+    {
+        var allowed = SessionActionPlanner.IsAllowed(kind, SessionMainState.Unknown, out var reason);
+
+        Assert.False(allowed);
+        Assert.False(string.IsNullOrWhiteSpace(reason));
+    }
+
+    [Theory]
+    [InlineData("main")]
+    [InlineData("agent:main")]
+    [InlineData("agent:main:main")]
+    public void ResolveMainState_ProtectsCanonicalMainKeyShapes(string key)
+    {
+        Assert.Equal(SessionMainState.Main, SessionActionPlanner.ResolveMainState(key));
+    }
+
+    [Fact]
+    public void ResolveMainState_UsesMainSessionKey_WhenAvailable()
+    {
+        Assert.Equal(
+            SessionMainState.Main,
+            SessionActionPlanner.ResolveMainState("agent:abc", mainSessionKey: "agent:abc"));
+        Assert.Equal(
+            SessionMainState.NotMain,
+            SessionActionPlanner.ResolveMainState("agent:abc", mainSessionKey: "agent:def"));
+    }
+
+    [Fact]
+    public void ResolveMainState_UsesSessionList_WhenMainKeyUnavailable()
+    {
+        var sessions = new[]
+        {
+            new SessionInfo { Key = "mainish", IsMain = true },
+            new SessionInfo { Key = "other", IsMain = false },
+        };
+
+        Assert.Equal(SessionMainState.Main, SessionActionPlanner.ResolveMainState("mainish", sessions: sessions));
+        Assert.Equal(SessionMainState.NotMain, SessionActionPlanner.ResolveMainState("other", sessions: sessions));
+        Assert.Equal(SessionMainState.Unknown, SessionActionPlanner.ResolveMainState("missing", sessions: sessions));
+    }
+
+    [Theory]
+    [InlineData(SessionActionKind.Reset)]
+    [InlineData(SessionActionKind.Compact)]
+    public void IsAllowed_PermitsResetAndCompactOfMain(SessionActionKind kind)
+    {
+        Assert.True(SessionActionPlanner.IsAllowed(kind, isMainSession: true, out var reason));
+        Assert.Null(reason);
+    }
+
+    [Fact]
+    public void BuildPrompt_ReturnsNull_ForNonConfirmingActions()
+    {
+        Assert.Null(SessionActionPlanner.BuildPrompt(SessionActionKind.Export, "k", null, false));
+        Assert.Null(SessionActionPlanner.BuildPrompt(SessionActionKind.OpenChat, "k", null, false));
+        Assert.Null(SessionActionPlanner.BuildPrompt(SessionActionKind.Branch, "k", null, false));
+    }
+
+    [Fact]
+    public void BuildPrompt_Delete_IsDestructive_AndUsesDisplayName()
+    {
+        var prompt = SessionActionPlanner.BuildPrompt(
+            SessionActionKind.Delete, "agent:main:wa", "WhatsApp · Bob", isMainSession: false);
+
+        Assert.NotNull(prompt);
+        Assert.Equal(SessionActionKind.Delete, prompt!.Kind);
+        Assert.Equal("WhatsApp \u00B7 Bob", prompt.SessionName);
+        Assert.True(prompt!.IsDestructive);
+        Assert.Equal("Delete", prompt.ConfirmLabel);
+        Assert.Contains("WhatsApp \u00B7 Bob", prompt.Body);
+        Assert.DoesNotContain("agent:main:wa", prompt.Body);
+    }
+
+    [Fact]
+    public void BuildPrompt_Compact_IsNotDestructive_AndMentionsCheckpoint()
+    {
+        var prompt = SessionActionPlanner.BuildPrompt(
+            SessionActionKind.Compact, "main", null, isMainSession: true);
+
+        Assert.NotNull(prompt);
+        Assert.False(prompt!.IsDestructive);
+        Assert.Equal("Compact", prompt.ConfirmLabel);
+        Assert.Contains("checkpoint", prompt.Body, System.StringComparison.OrdinalIgnoreCase);
+    }
+
+    [Fact]
+    public void BuildPrompt_FallsBackToKey_WhenNoDisplayName()
+    {
+        var prompt = SessionActionPlanner.BuildPrompt(
+            SessionActionKind.Reset, "agent:main:main", null, isMainSession: true);
+
+        Assert.NotNull(prompt);
+        Assert.Contains("agent:main:main", prompt!.Body);
+    }
+
+    [Fact]
+    public void Describe_PrefersDisplayName_FallsBackToKey()
+    {
+        Assert.Equal("Pretty", SessionActionPlanner.Describe("key", "Pretty"));
+        Assert.Equal("key", SessionActionPlanner.Describe("key", null));
+        Assert.Equal("key", SessionActionPlanner.Describe("key", "   "));
+    }
+}
diff --git a/tests/OpenClaw.Shared.Tests/SessionCheckpointSelectionTests.cs b/tests/OpenClaw.Shared.Tests/SessionCheckpointSelectionTests.cs
new file mode 100644
index 000000000..fcd346225
--- /dev/null
+++ b/tests/OpenClaw.Shared.Tests/SessionCheckpointSelectionTests.cs
@@ -0,0 +1,77 @@
+using OpenClaw.Shared.Sessions;
+using Xunit;
+
+namespace OpenClaw.Shared.Tests;
+
+public sealed class SessionCheckpointSelectionTests
+{
+    private static SessionCompactionCheckpoint Checkpoint(string id, DateTime? createdAt) => new()
+    {
+        Id = id,
+        CreatedAt = createdAt,
+    };
+
+    [Fact]
+    public void ResolveUnambiguousLatest_ReturnsNull_ForEmptyList()
+    {
+        Assert.Null(SessionCheckpointSelection.ResolveUnambiguousLatest(Array.Empty<SessionCompactionCheckpoint>()));
+    }
+
+    [Fact]
+    public void ResolveUnambiguousLatest_ReturnsOnlyCheckpoint_WhenDated()
+    {
+        var checkpoint = Checkpoint("one", new DateTime(2026, 1, 1, 12, 0, 0, DateTimeKind.Utc));
+
+        Assert.Same(checkpoint, SessionCheckpointSelection.ResolveUnambiguousLatest(new[] { checkpoint }));
+    }
+
+    [Fact]
+    public void ResolveUnambiguousLatest_ReturnsNewest_WhenStrictlyNewer()
+    {
+        var older = Checkpoint("older", new DateTime(2026, 1, 1, 12, 0, 0, DateTimeKind.Utc));
+        var newer = Checkpoint("newer", new DateTime(2026, 1, 1, 12, 5, 0, DateTimeKind.Utc));
+
+        var latest = SessionCheckpointSelection.ResolveUnambiguousLatest(new[] { older, newer });
+
+        Assert.Same(newer, latest);
+    }
+
+    [Fact]
+    public void ResolveUnambiguousLatest_ReturnsNull_WhenAnyCheckpointLacksTimestamp()
+    {
+        var dated = Checkpoint("dated", new DateTime(2026, 1, 1, 12, 0, 0, DateTimeKind.Utc));
+        var unknown = Checkpoint("unknown", null);
+
+        Assert.Null(SessionCheckpointSelection.ResolveUnambiguousLatest(new[] { dated, unknown }));
+    }
+
+    [Fact]
+    public void ResolveUnambiguousLatest_ReturnsNull_WhenNewestTimestampTies()
+    {
+        var t = new DateTime(2026, 1, 1, 12, 0, 0, DateTimeKind.Utc);
+
+        Assert.Null(SessionCheckpointSelection.ResolveUnambiguousLatest(new[]
+        {
+            Checkpoint("a", t),
+            Checkpoint("b", t),
+        }));
+    }
+
+    [Fact]
+    public void ResolveUnambiguousLatest_ReturnsNull_WhenNewestCheckpointLacksId()
+    {
+        var older = Checkpoint("older", new DateTime(2026, 1, 1, 12, 5, 0, DateTimeKind.Utc));
+        var missingId = Checkpoint("", new DateTime(2026, 1, 1, 12, 10, 0, DateTimeKind.Utc));
+
+        Assert.Null(SessionCheckpointSelection.ResolveUnambiguousLatest(new[] { older, missingId }));
+    }
+
+    [Fact]
+    public void ResolveUnambiguousLatest_ReturnsNewest_WhenOlderCheckpointLacksId()
+    {
+        var latest = Checkpoint("newer", new DateTime(2026, 1, 1, 12, 10, 0, DateTimeKind.Utc));
+        var missingId = Checkpoint("", new DateTime(2026, 1, 1, 12, 5, 0, DateTimeKind.Utc));
+
+        Assert.Same(latest, SessionCheckpointSelection.ResolveUnambiguousLatest(new[] { latest, missingId }));
+    }
+}
diff --git a/tests/OpenClaw.Shared.Tests/SessionTranscriptFormatterTests.cs b/tests/OpenClaw.Shared.Tests/SessionTranscriptFormatterTests.cs
new file mode 100644
index 000000000..38312ff13
--- /dev/null
+++ b/tests/OpenClaw.Shared.Tests/SessionTranscriptFormatterTests.cs
@@ -0,0 +1,74 @@
+using System.Collections.Generic;
+using OpenClaw.Shared;
+using OpenClaw.Shared.Sessions;
+using Xunit;
+
+namespace OpenClaw.Shared.Tests;
+
+public class SessionTranscriptFormatterTests
+{
+    [Fact]
+    public void Format_IncludesHeaderAndMessages()
+    {
+        var history = new ChatHistoryInfo
+        {
+            SessionKey = "main",
+            SessionId = "uuid-1",
+            Messages = new List<ChatMessageInfo>
+            {
+                new() { Role = "user", Text = "hello", Ts = 1735732800000 },
+                new() { Role = "assistant", Text = "hi there" },
+            },
+        };
+
+        var text = SessionTranscriptFormatter.Format(history);
+
+        Assert.Contains("OpenClaw session transcript", text);
+        Assert.Contains("Session: main", text);
+        Assert.Contains("Session ID: uuid-1", text);
+        Assert.Contains("Messages: 2", text);
+        Assert.Contains("[user", text);
+        Assert.Contains("hello", text);
+        Assert.Contains("[assistant]", text);
+        Assert.Contains("hi there", text);
+    }
+
+    [Fact]
+    public void Format_HandlesEmptyTranscript()
+    {
+        var history = new ChatHistoryInfo { SessionKey = "main" };
+        var text = SessionTranscriptFormatter.Format(history);
+        Assert.Contains("Messages: 0", text);
+    }
+
+    [Fact]
+    public void Format_TimestampOnlyWhenPresent()
+    {
+        var history = new ChatHistoryInfo
+        {
+            SessionKey = "main",
+            Messages = new List<ChatMessageInfo> { new() { Role = "assistant", Text = "x", Ts = 0 } },
+        };
+
+        var text = SessionTranscriptFormatter.Format(history);
+        Assert.Contains("[assistant]", text); // no " · timestamp" suffix when Ts == 0
+    }
+
+    [Fact]
+    public void SuggestFileName_IsFilesystemSafe()
+    {
+        var name = SessionTranscriptFormatter.SuggestFileName("agent:main:wa/bob");
+
+        Assert.StartsWith("openclaw-transcript-", name);
+        Assert.EndsWith(".txt", name);
+        Assert.DoesNotContain(":", name);
+        Assert.DoesNotContain("/", name);
+    }
+
+    [Fact]
+    public void SuggestFileName_FallsBackForBlankKey()
+    {
+        var name = SessionTranscriptFormatter.SuggestFileName(null);
+        Assert.Contains("session", name);
+    }
+}
diff --git a/tests/OpenClaw.Shared.Tests/SystemRunTests.cs b/tests/OpenClaw.Shared.Tests/SystemRunTests.cs
index eaabd7d63..38d9c31d7 100644
--- a/tests/OpenClaw.Shared.Tests/SystemRunTests.cs
+++ b/tests/OpenClaw.Shared.Tests/SystemRunTests.cs
@@ -432,6 +432,245 @@ public async Task SystemRun_WithPromptPolicy_AllowsOnce_WhenUserApproves()
         }
     }
 
+    [Fact]
+    public async Task SystemRun_WithPromptPolicy_UsesPayloadSessionKey_WhenArgsOmitSessionKey()
+    {
+        var tempDir = Path.Combine(Path.GetTempPath(), $"test-{Guid.NewGuid():N}");
+        Directory.CreateDirectory(tempDir);
+
+        try
+        {
+            var logger = new ExecTestLogger();
+            var policy = new ExecApprovalPolicy(tempDir, logger);
+            policy.SetRules(Array.Empty<ExecApprovalRule>(), ExecApprovalAction.Prompt);
+            var runner = new FakeCommandRunner();
+            var prompt = new FakePromptHandler(ExecApprovalPromptDecision.AllowOnce());
+            var cap = new SystemCapability(logger);
+            cap.SetCommandRunner(runner);
+            cap.SetApprovalPolicy(policy);
+            cap.SetPromptHandler(prompt);
+
+            var res = await cap.ExecuteAsync(new NodeInvokeRequest
+            {
+                Id = "prompt-session-1",
+                Command = "system.run",
+                Args = Parse("""{"command":"Write-Output hello","shell":"powershell"}"""),
+                SessionKey = "payload-session"
+            });
+
+            Assert.True(res.Ok, res.Error);
+            Assert.Equal(1, prompt.CallCount);
+            Assert.Equal("payload-session", prompt.LastRequest?.SessionKey);
+            Assert.NotNull(runner.LastRequest);
+        }
+        finally
+        {
+            // slopwatch-ignore: SW003 Test cleanup or fixture teardown is best-effort and must not hide the test outcome.
+            try { Directory.Delete(tempDir, true); } catch { }
+        }
+    }
+
+    [Fact]
+    public async Task SystemRun_WithPromptPolicy_PayloadSessionKeyOverridesArgsSessionKey()
+    {
+        var tempDir = Path.Combine(Path.GetTempPath(), $"test-{Guid.NewGuid():N}");
+        Directory.CreateDirectory(tempDir);
+
+        try
+        {
+            var logger = new ExecTestLogger();
+            var policy = new ExecApprovalPolicy(tempDir, logger);
+            policy.SetRules(Array.Empty<ExecApprovalRule>(), ExecApprovalAction.Prompt);
+            var runner = new FakeCommandRunner();
+            var prompt = new FakePromptHandler(ExecApprovalPromptDecision.AllowOnce());
+            var cap = new SystemCapability(logger);
+            cap.SetCommandRunner(runner);
+            cap.SetApprovalPolicy(policy);
+            cap.SetPromptHandler(prompt);
+
+            var res = await cap.ExecuteAsync(new NodeInvokeRequest
+            {
+                Id = "prompt-session-override",
+                Command = "system.run",
+                Args = Parse("""{"command":"Write-Output hello","shell":"powershell","sessionKey":"spoofed-session"}"""),
+                SessionKey = "trusted-session"
+            });
+
+            Assert.True(res.Ok, res.Error);
+            Assert.Equal(1, prompt.CallCount);
+            Assert.Equal("trusted-session", prompt.LastRequest?.SessionKey);
+            Assert.NotNull(runner.LastRequest);
+        }
+        finally
+        {
+            // slopwatch-ignore: SW003 Test cleanup or fixture teardown is best-effort and must not hide the test outcome.
+            try { Directory.Delete(tempDir, true); } catch { }
+        }
+    }
+
+    [Fact]
+    public async Task SystemRun_WithPolicy_EvaluatesImplicitShellUsingRunnerEffectiveShell()
+    {
+        var tempDir = Path.Combine(Path.GetTempPath(), $"test-{Guid.NewGuid():N}");
+        Directory.CreateDirectory(tempDir);
+
+        try
+        {
+            var logger = new ExecTestLogger();
+            var policy = new ExecApprovalPolicy(tempDir, logger);
+            policy.SetRules(
+                new[]
+                {
+                    new ExecApprovalRule
+                    {
+                        Pattern = "Get-Process",
+                        Action = ExecApprovalAction.Allow,
+                        Shells = new[] { "powershell" }
+                    }
+                },
+                ExecApprovalAction.Deny);
+            var runner = new FakeCommandRunner { EffectiveShellForNull = "pwsh" };
+            var cap = new SystemCapability(logger);
+            cap.SetCommandRunner(runner);
+            cap.SetApprovalPolicy(policy);
+
+            var res = await cap.ExecuteAsync(new NodeInvokeRequest
+            {
+                Id = "implicit-shell-policy",
+                Command = "system.run",
+                Args = Parse("""{"command":"Get-Process"}""")
+            });
+
+            Assert.False(res.Ok);
+            Assert.Contains("denied", res.Error!, StringComparison.OrdinalIgnoreCase);
+            Assert.Null(runner.LastRequest);
+        }
+        finally
+        {
+            // slopwatch-ignore: SW003 Test cleanup or fixture teardown is best-effort and must not hide the test outcome.
+            try { Directory.Delete(tempDir, true); } catch { }
+        }
+    }
+
+    [Fact]
+    public async Task SystemRun_WithPolicy_NormalizesUnsupportedExplicitShellBeforeApproval()
+    {
+        var tempDir = Path.Combine(Path.GetTempPath(), $"test-{Guid.NewGuid():N}");
+        Directory.CreateDirectory(tempDir);
+
+        try
+        {
+            var logger = new ExecTestLogger();
+            var policy = new ExecApprovalPolicy(tempDir, logger);
+            policy.SetRules(
+                new[]
+                {
+                    new ExecApprovalRule
+                    {
+                        Pattern = "Get-Process",
+                        Action = ExecApprovalAction.Allow,
+                        Shells = new[] { "bash" }
+                    }
+                },
+                ExecApprovalAction.Deny);
+            var runner = new FakeCommandRunner();
+            var cap = new SystemCapability(logger);
+            cap.SetCommandRunner(runner);
+            cap.SetApprovalPolicy(policy);
+
+            var res = await cap.ExecuteAsync(new NodeInvokeRequest
+            {
+                Id = "unsupported-explicit-shell-policy",
+                Command = "system.run",
+                Args = Parse("""{"command":"Get-Process","shell":"bash"}""")
+            });
+
+            Assert.False(res.Ok);
+            Assert.Contains("denied", res.Error!, StringComparison.OrdinalIgnoreCase);
+            Assert.Null(runner.LastRequest);
+        }
+        finally
+        {
+            // slopwatch-ignore: SW003 Test cleanup or fixture teardown is best-effort and must not hide the test outcome.
+            try { Directory.Delete(tempDir, true); } catch { }
+        }
+    }
+
+    [Fact]
+    public async Task SystemRun_PreservesOmittedShellWhenCallingRunner()
+    {
+        var logger = new ExecTestLogger();
+        var policy = new ExecApprovalPolicy(Path.Combine(Path.GetTempPath(), $"test-{Guid.NewGuid():N}"), logger);
+        policy.SetRules(
+            new[]
+            {
+                new ExecApprovalRule
+                {
+                    Pattern = "echo hi",
+                    Action = ExecApprovalAction.Allow,
+                    Shells = new[] { "cmd", "powershell" }
+                }
+            },
+            ExecApprovalAction.Deny);
+        var runner = new FakeCommandRunner
+        {
+            EffectiveShellForNull = "cmd",
+            HostFallbackShellForApproval = "powershell"
+        };
+        var cap = new SystemCapability(logger);
+        cap.SetCommandRunner(runner);
+        cap.SetApprovalPolicy(policy);
+
+        var res = await cap.ExecuteAsync(new NodeInvokeRequest
+        {
+            Id = "preserve-omitted-shell",
+            Command = "system.run",
+            Args = Parse("""{"command":"echo hi"}""")
+        });
+
+        Assert.True(res.Ok, res.Error);
+        Assert.NotNull(runner.LastRequest);
+        Assert.Null(runner.LastRequest!.Shell);
+        Assert.Equal("powershell", runner.LastRequest.ApprovedHostFallbackShell);
+    }
+
+    [Fact]
+    public async Task SystemRun_DeniesOmittedShellWhenFallbackShellIsNotApproved()
+    {
+        var logger = new ExecTestLogger();
+        var policy = new ExecApprovalPolicy(Path.Combine(Path.GetTempPath(), $"test-{Guid.NewGuid():N}"), logger);
+        policy.SetRules(
+            new[]
+            {
+                new ExecApprovalRule
+                {
+                    Pattern = "echo hi",
+                    Action = ExecApprovalAction.Allow,
+                    Shells = new[] { "cmd" }
+                }
+            },
+            ExecApprovalAction.Deny);
+        var runner = new FakeCommandRunner
+        {
+            EffectiveShellForNull = "cmd",
+            HostFallbackShellForApproval = "powershell"
+        };
+        var cap = new SystemCapability(logger);
+        cap.SetCommandRunner(runner);
+        cap.SetApprovalPolicy(policy);
+
+        var res = await cap.ExecuteAsync(new NodeInvokeRequest
+        {
+            Id = "deny-unapproved-fallback-shell",
+            Command = "system.run",
+            Args = Parse("""{"command":"echo hi"}""")
+        });
+
+        Assert.False(res.Ok);
+        Assert.Contains("denied", res.Error!, StringComparison.OrdinalIgnoreCase);
+        Assert.Null(runner.LastRequest);
+    }
+
     [Fact]
     public async Task SystemRun_WithPromptPolicy_PromptsOnceForShellWrapper_WhenUserApprovesOnce()
     {
@@ -625,12 +864,31 @@ public async Task SystemRun_WithPromptPolicy_Denies_WhenUserDenies()
     /// <summary>
     /// Fake runner for unit testing — no actual process execution.
     /// </summary>
-    private class FakeCommandRunner : ICommandRunner
+    private class FakeCommandRunner : IHostFallbackAwareCommandRunner
     {
         public string Name => "fake";
         public CommandRequest? LastRequest { get; private set; }
         public CommandResult Result { get; set; } = new() { Stdout = "ok", ExitCode = 0 };
         public bool ShouldThrow { get; set; }
+        public string EffectiveShellForNull { get; set; } = "powershell";
+        public string? HostFallbackShellForApproval { get; set; }
+
+        public string ResolveEffectiveShell(string? requestedShell)
+        {
+            if (string.IsNullOrWhiteSpace(requestedShell))
+                return EffectiveShellForNull;
+
+            return requestedShell.Trim().ToLowerInvariant() switch
+            {
+                "cmd" => "cmd",
+                "pwsh" => "pwsh",
+                "powershell" => "powershell",
+                _ => "powershell",
+            };
+        }
+
+        public string? ResolveHostFallbackShellForApproval(string? requestedShell, string effectiveShell) =>
+            HostFallbackShellForApproval;
 
         public Task<CommandResult> RunAsync(CommandRequest request, CancellationToken ct = default)
         {
@@ -651,17 +909,93 @@ public FakePromptHandler(ExecApprovalPromptDecision decision)
         }
 
         public int CallCount { get; private set; }
+        public ExecApprovalPromptRequest? LastRequest { get; private set; }
 
         public Task<ExecApprovalPromptDecision> RequestAsync(
             ExecApprovalPromptRequest request,
             CancellationToken cancellationToken = default)
         {
             CallCount++;
+            LastRequest = request;
             return Task.FromResult(_decision);
         }
     }
 }
 
+public class LocalCommandRunnerTests
+{
+    [Fact]
+    public void BuildProcessArgs_DefaultShellUsesWindowsPowerShellWhenPwshAvailableOnPath()
+    {
+        var tempDir = Directory.CreateDirectory(Path.Combine(Path.GetTempPath(), "openclaw-pwsh-path-" + Guid.NewGuid().ToString("N"))).FullName;
+        var fakePwsh = Path.Combine(tempDir, "pwsh.exe");
+        try
+        {
+            File.WriteAllBytes(fakePwsh, Array.Empty<byte>());
+
+            var (fileName, arguments) = LocalCommandRunner.BuildProcessArgs(new CommandRequest
+            {
+                Command = "Write-Output hi",
+            }, pathEnvVar: tempDir);
+
+            Assert.Equal(ExpectedWindowsPowerShellExe(), fileName);
+            Assert.Contains("-NoProfile -NonInteractive -Command Write-Output hi", arguments);
+        }
+        finally
+        {
+            // slopwatch-ignore: SW003 Test cleanup is best-effort and must not hide assertion failures.
+            try { Directory.Delete(tempDir, recursive: true); } catch { }
+        }
+    }
+
+    [Fact]
+    public void BuildProcessArgs_DefaultShellFallsBackToWindowsPowerShellWhenPwshMissing()
+    {
+        var (fileName, arguments) = LocalCommandRunner.BuildProcessArgs(new CommandRequest
+        {
+            Command = "Write-Output hi",
+        }, pathEnvVar: string.Empty);
+
+        Assert.Equal(ExpectedWindowsPowerShellExe(), fileName);
+        Assert.Contains("-NoProfile -NonInteractive -Command Write-Output hi", arguments);
+    }
+
+    [Fact]
+    public void BuildProcessArgs_ExplicitPwshDoesNotFallback()
+    {
+        var (fileName, arguments) = LocalCommandRunner.BuildProcessArgs(new CommandRequest
+        {
+            Command = "Write-Output hi",
+            Shell = "pwsh",
+        }, pathEnvVar: string.Empty);
+
+        Assert.Equal("pwsh.exe", fileName);
+        Assert.Contains("-NoProfile -NonInteractive -Command Write-Output hi", arguments);
+    }
+
+    [Fact]
+    public void BuildProcessArgs_ExplicitWindowsPowerShellUsesWindowsPowerShell()
+    {
+        var (fileName, arguments) = LocalCommandRunner.BuildProcessArgs(new CommandRequest
+        {
+            Command = "Write-Output hi",
+            Shell = "powershell",
+        });
+
+        Assert.Equal(ExpectedWindowsPowerShellExe(), fileName);
+        Assert.Contains("-NoProfile -NonInteractive -Command Write-Output hi", arguments);
+    }
+
+    private static string ExpectedWindowsPowerShellExe()
+    {
+        var systemRoot = Environment.GetEnvironmentVariable("SystemRoot")
+            ?? Environment.GetEnvironmentVariable("windir");
+        return string.IsNullOrWhiteSpace(systemRoot)
+            ? "powershell.exe"
+            : Path.Combine(systemRoot, "System32", "WindowsPowerShell", "v1.0", "powershell.exe");
+    }
+}
+
 /// <summary>
 /// Integration tests for LocalCommandRunner — actually executes processes.
 /// Gated by OPENCLAW_RUN_INTEGRATION=1.
@@ -937,7 +1271,7 @@ public void LegacyPath_WhenArgvNull_WrapsInPowerShell()
 
         Assert.False(plan.IsDirectArgv);
         Assert.Null(plan.ArgList);
-        Assert.Equal("powershell.exe", plan.FileName);
+        Assert.EndsWith("powershell.exe", plan.FileName, StringComparison.OrdinalIgnoreCase);
         Assert.Contains("Write-Output hi", plan.Arguments);
     }
 
diff --git a/tests/OpenClaw.Shared.Tests/TokenSanitizerTests.cs b/tests/OpenClaw.Shared.Tests/TokenSanitizerTests.cs
index c5bedae43..9ac3b1db8 100644
--- a/tests/OpenClaw.Shared.Tests/TokenSanitizerTests.cs
+++ b/tests/OpenClaw.Shared.Tests/TokenSanitizerTests.cs
@@ -1,4 +1,5 @@
 using OpenClaw.Shared;
+using System.Text.Json;
 
 namespace OpenClaw.Shared.Tests;
 
@@ -237,6 +238,59 @@ public void SanitizeLogMessage_RedactsLocalUserPaths()
         Assert.Contains("%USERPROFILE%", sanitized);
     }
 
+    [Theory]
+    [InlineData(@"C:/Users/alice/AppData/Local/OpenClawTray/openclaw-tray.log")]
+    [InlineData(@"/mnt/c/Users/alice/AppData/Roaming/OpenClawTray/settings.json")]
+    [InlineData(@"""C:\\Users\\alice\\AppData\\Local\\OpenClawTray\\openclaw-tray.log""")]
+    [InlineData(@"""C:\\\\Users\\\\alice\\\\AppData\\\\Local\\\\OpenClawTray\\\\openclaw-tray.log""")]
+    public void SanitizeLogMessage_RedactsUserFolderPathVariants(string path)
+    {
+        var sanitized = TokenSanitizer.SanitizeLogMessage($"path={path}");
+
+        Assert.DoesNotContain("alice", sanitized, StringComparison.OrdinalIgnoreCase);
+        Assert.Contains("%USERPROFILE%", sanitized);
+    }
+
+    [Theory]
+    [InlineData("/home/openclaw/.openclaw/sessions/abc123/session.jsonl")]
+    [InlineData("/home/alice/.config/openclaw/gateway-health.json")]
+    public void SanitizeLogMessage_RedactsLinuxHomePathVariants(string path)
+    {
+        var sanitized = TokenSanitizer.SanitizeLogMessage($"gateway payload path={path}");
+
+        Assert.DoesNotContain("/home/openclaw", sanitized, StringComparison.OrdinalIgnoreCase);
+        Assert.DoesNotContain("/home/alice", sanitized, StringComparison.OrdinalIgnoreCase);
+        Assert.DoesNotContain("openclaw/.openclaw", sanitized, StringComparison.OrdinalIgnoreCase);
+        Assert.DoesNotContain("alice/.config", sanitized, StringComparison.OrdinalIgnoreCase);
+        Assert.Contains("$HOME", sanitized);
+    }
+
+    [Fact]
+    public void SanitizeLogMessage_RedactsCurrentUserAndMachineNames()
+    {
+        var user = Environment.UserName;
+        var machine = Environment.MachineName;
+        if (!ShouldRedactLocalIdentityName(user) || !ShouldRedactLocalIdentityName(machine))
+        {
+            return;
+        }
+
+        var sanitized = TokenSanitizer.SanitizeLogMessage($"user={user} machine={machine}");
+
+        Assert.DoesNotContain(user, sanitized, StringComparison.OrdinalIgnoreCase);
+        Assert.DoesNotContain(machine, sanitized, StringComparison.OrdinalIgnoreCase);
+        Assert.Contains("<user>", sanitized);
+        Assert.Contains("<host>", sanitized);
+    }
+
+    private static bool ShouldRedactLocalIdentityName(string? value) =>
+        !string.IsNullOrWhiteSpace(value) &&
+        value.Length >= 3 &&
+        !value.Equals("user", StringComparison.OrdinalIgnoreCase) &&
+        !value.Equals("admin", StringComparison.OrdinalIgnoreCase) &&
+        !value.Equals("desktop", StringComparison.OrdinalIgnoreCase) &&
+        !value.Equals("localhost", StringComparison.OrdinalIgnoreCase);
+
     [Fact]
     public void SanitizeLogMessage_RedactsNetworkAndIdentityValues()
     {
@@ -252,6 +306,128 @@ public void SanitizeLogMessage_RedactsNetworkAndIdentityValues()
         Assert.Contains("<user>@<host>:22", sanitized);
     }
 
+    [Fact]
+    public void SanitizeLogMessage_RedactsDiagnosticSecretShapesBeforePersisting()
+    {
+        var dpapi = "dpapi:abcdefghijklmnopqrstuvwxyz0123456789+/=";
+        var guid = "c5cacc40-2732-4008-a4d9-56b6a2c0643a";
+        var input = string.Join(Environment.NewLine,
+            "-----BEGIN PRIVATE KEY-----",
+            "abcdefghijklmnopqrstuvwxyz",
+            "-----END PRIVATE KEY-----",
+            """{"setupCode":123456,"nonce":"nonce-secret","deviceId":"device-secret","raw_error_response":"raw-secret","ok":42}""",
+            "Cookie: sessionid=browser-cookie; csrftoken=csrf-secret",
+            $"protected={dpapi}",
+            "session=agent:abc123:some-session-key",
+            $"signed: v3|token|cli|operator|1779894994338|sig|{guid}|windows|desktop",
+            "openclaw connect --token shared-secret --setup-code setup-secret --password pass-secret");
+
+        var sanitized = TokenSanitizer.SanitizeLogMessage(input);
+
+        foreach (var secret in new[]
+        {
+            "123456",
+            "nonce-secret",
+            "device-secret",
+            "raw-secret",
+            "browser-cookie",
+            "csrf-secret",
+            dpapi,
+            "agent:abc123:some-session-key",
+            "1779894994338",
+            guid,
+            "shared-secret",
+            "setup-secret",
+            "pass-secret",
+            "BEGIN PRIVATE KEY",
+            "abcdefghijklmnopqrstuvwxyz"
+        })
+        {
+            Assert.DoesNotContain(secret, sanitized, StringComparison.OrdinalIgnoreCase);
+        }
+
+        Assert.Contains("\"ok\":42", sanitized);
+        Assert.Contains("Cookie: [REDACTED]", sanitized);
+        Assert.Contains("signed: [REDACTED_HANDSHAKE]", sanitized);
+        Assert.Contains("[REDACTED_PRIVATE_KEY]", sanitized);
+        Assert.Contains("--token [REDACTED]", sanitized);
+    }
+
+    [Fact]
+    public void SanitizeLogMessage_RedactsSensitiveKeyValuesWithWhitespaceBeforeDelimiter()
+    {
+        const string input = """setupCode = 123456 {"password" : "password-secret","ok":true}""";
+
+        var sanitized = TokenSanitizer.SanitizeLogMessage(input);
+
+        Assert.DoesNotContain("123456", sanitized);
+        Assert.DoesNotContain("password-secret", sanitized);
+        Assert.Contains("setupCode = [REDACTED]", sanitized);
+        Assert.Contains("\"password\" : \"[REDACTED]\"", sanitized);
+        Assert.Contains("\"ok\":true", sanitized);
+    }
+
+    [Fact]
+    public void SanitizeLogMessage_RedactsSensitiveJsonValuesWithEscapedQuotes()
+    {
+        const string input = """{"password":"abc\"def","apiToken":"ghi\"jkl","ok":"visible"}""";
+
+        var sanitized = TokenSanitizer.SanitizeLogMessage(input);
+
+        using var document = JsonDocument.Parse(sanitized);
+        Assert.Equal("[REDACTED]", document.RootElement.GetProperty("password").GetString());
+        Assert.Equal("[REDACTED]", document.RootElement.GetProperty("apiToken").GetString());
+        Assert.Equal("visible", document.RootElement.GetProperty("ok").GetString());
+        Assert.DoesNotContain("abc", sanitized);
+        Assert.DoesNotContain("def", sanitized);
+        Assert.DoesNotContain("ghi", sanitized);
+        Assert.DoesNotContain("jkl", sanitized);
+    }
+
+    [Fact]
+    public void SanitizeLogMessage_RedactsNumericJsonSensitiveValuesWithoutBreakingJson()
+    {
+        const string input = """{"setupCode":123456,"ok":42}""";
+
+        var sanitized = TokenSanitizer.SanitizeLogMessage(input);
+
+        using var document = JsonDocument.Parse(sanitized);
+        Assert.Equal("[REDACTED]", document.RootElement.GetProperty("setupCode").GetString());
+        Assert.Equal(42, document.RootElement.GetProperty("ok").GetInt32());
+        Assert.DoesNotContain("123456", sanitized);
+    }
+
+    [Theory]
+    [InlineData("""{"apiToken":["secret1","secret2"],"ok":1}""", "apiToken")]
+    [InlineData("""{"password":{"nested":"secret"},"ok":1}""", "password")]
+    public void SanitizeLogMessage_RedactsSensitiveJsonCompoundValuesWithoutLeakingSuffixes(string input, string key)
+    {
+        var sanitized = TokenSanitizer.SanitizeLogMessage(input);
+
+        using var document = JsonDocument.Parse(sanitized);
+        Assert.Equal("[REDACTED]", document.RootElement.GetProperty(key).GetString());
+        Assert.Equal(1, document.RootElement.GetProperty("ok").GetInt32());
+        Assert.DoesNotContain("secret", sanitized, StringComparison.OrdinalIgnoreCase);
+    }
+
+    [Fact]
+    public void SanitizeLogMessage_RedactsPrefixedTokensInsideJsonStringsWithoutBreakingJson()
+    {
+        const string input = """
+            {"session":"agent:abc123:some-session-key","protected":"dpapi:abcdefghijklmnopqrstuvwxyz0123456789+/=","ok":42}
+            """;
+
+        var sanitized = TokenSanitizer.SanitizeLogMessage(input);
+
+        using var document = JsonDocument.Parse(sanitized);
+        var root = document.RootElement;
+        Assert.Equal("[REDACTED_SESSION_KEY]", root.GetProperty("session").GetString());
+        Assert.Equal("dpapi:[REDACTED]", root.GetProperty("protected").GetString());
+        Assert.Equal(42, root.GetProperty("ok").GetInt32());
+        Assert.DoesNotContain("agent:abc123:some-session-key", sanitized);
+        Assert.DoesNotContain("abcdefghijklmnopqrstuvwxyz0123456789+/=", sanitized);
+    }
+
     [Fact]
     public void SanitizeLogMessage_RedactsUrlUserInfoCredentials()
     {
@@ -301,7 +477,7 @@ public void SanitizeLogMessage_DoesNotRedactTimestamps()
     public void SanitizeLogMessage_DoesNotRedactBracketedTimestampsOrShortHexTokens()
     {
         // Bracketed values that lack IPv6 structure must not be redacted: [HH:MM:SS], [hexword], [hex:hex].
-        const string input = "Event [14:58:46] tag=[face] id=[abc] correlation=[dead:beef]";
+        const string input = "Event [14:58:46] tag=[face] label=[abc] correlation=[dead:beef]";
         var sanitized = TokenSanitizer.SanitizeLogMessage(input);
 
         Assert.Contains("[14:58:46]", sanitized);
diff --git a/tests/OpenClaw.Shared.Tests/WebSocketClientBaseTests.cs b/tests/OpenClaw.Shared.Tests/WebSocketClientBaseTests.cs
index 422c36212..14fc49871 100644
--- a/tests/OpenClaw.Shared.Tests/WebSocketClientBaseTests.cs
+++ b/tests/OpenClaw.Shared.Tests/WebSocketClientBaseTests.cs
@@ -70,6 +70,7 @@ public void TestRaiseStatusChanged(ConnectionStatus status)
     public IOpenClawLogger TestLogger => _logger;
 }
 
+[Collection("WebSocketClientBase")]
 public class WebSocketClientBaseTests
 {
     private readonly TestLogger _logger = new();
@@ -408,7 +409,9 @@ await WaitForConditionAsync(
             Task.Delay(TimeSpan.FromSeconds(3)));
 
         Assert.Same(client.ThirdConnected, reconnect);
-        Assert.True(server.AcceptedCount >= 3);
+        await WaitForConditionAsync(
+            () => server.AcceptedCount >= 3,
+            TimeSpan.FromSeconds(2));
 
         client.Dispose();
     }
@@ -427,6 +430,11 @@ private static async Task WaitForConditionAsync(Func<bool> predicate, TimeSpan t
     }
 }
 
+[CollectionDefinition("WebSocketClientBase", DisableParallelization = true)]
+public sealed class WebSocketClientBaseTestCollection
+{
+}
+
 internal sealed class BlockingFirstConnectClient : WebSocketClientBase
 {
     private readonly TaskCompletionSource _firstConnectEntered = new(TaskCreationOptions.RunContinuationsAsynchronously);
diff --git a/tests/OpenClaw.Shared.Tests/WindowsNodeClientTests.cs b/tests/OpenClaw.Shared.Tests/WindowsNodeClientTests.cs
index 3e7608f66..7b0e1be1d 100644
--- a/tests/OpenClaw.Shared.Tests/WindowsNodeClientTests.cs
+++ b/tests/OpenClaw.Shared.Tests/WindowsNodeClientTests.cs
@@ -1439,6 +1439,7 @@ private sealed class MockCapability : INodeCapability
         private readonly TaskCompletionSource<bool> _executedTcs = new(TaskCreationOptions.RunContinuationsAsynchronously);
         public int ExecuteCount { get; private set; }
         public string? LastCommand { get; private set; }
+        public NodeInvokeRequest? LastRequest { get; private set; }
         /// <summary>Completes when ExecuteAsync is first called. Use in tests to await fire-and-forget dispatch.</summary>
         public Task ExecutedTask => _executedTcs.Task;
 
@@ -1456,6 +1457,7 @@ public Task<NodeInvokeResponse> ExecuteAsync(NodeInvokeRequest request)
         {
             ExecuteCount++;
             LastCommand = request.Command;
+            LastRequest = request;
             _executedTcs.TrySetResult(true);
             return Task.FromResult(new NodeInvokeResponse { Id = request.Id, Ok = true, Payload = new { dispatched = true } });
         }
@@ -1594,6 +1596,123 @@ public async Task CommandDispatch_RoutesToRegisteredCapability()
         }
     }
 
+    [Fact]
+    public async Task CommandDispatch_ReqPath_PropagatesParamsSessionKey()
+    {
+        var dataPath = Path.Combine(Path.GetTempPath(), $"openclaw-node-test-{Guid.NewGuid():N}");
+        Directory.CreateDirectory(dataPath);
+
+        try
+        {
+            using var client = new WindowsNodeClient("ws://localhost:18789", "test-token", dataPath);
+            var cap = new MockCapability("mock", "mock.ping");
+            client.RegisterCapability(cap);
+
+            var json = """
+                {
+                  "type": "req",
+                  "id": "req-session-params",
+                  "method": "node.invoke",
+                  "params": {
+                    "requestId": "inv-session-params",
+                    "command": "mock.ping",
+                    "sessionKey": "chat-thread-from-params",
+                    "args": {}
+                  }
+                }
+                """;
+
+            await InvokeProcessMessageAsync(client, json);
+            await cap.ExecutedTask.WaitAsync(TimeSpan.FromSeconds(5));
+
+            Assert.Equal("chat-thread-from-params", cap.LastRequest?.SessionKey);
+        }
+        finally
+        {
+            if (Directory.Exists(dataPath))
+                Directory.Delete(dataPath, true);
+        }
+    }
+
+    [Fact]
+    public async Task CommandDispatch_ReqPath_PropagatesArgsSessionKey()
+    {
+        var dataPath = Path.Combine(Path.GetTempPath(), $"openclaw-node-test-{Guid.NewGuid():N}");
+        Directory.CreateDirectory(dataPath);
+
+        try
+        {
+            using var client = new WindowsNodeClient("ws://localhost:18789", "test-token", dataPath);
+            var cap = new MockCapability("mock", "mock.ping");
+            client.RegisterCapability(cap);
+
+            var json = """
+                {
+                  "type": "req",
+                  "id": "req-session-args",
+                  "method": "node.invoke",
+                  "params": {
+                    "requestId": "inv-session-args",
+                    "command": "mock.ping",
+                    "args": {
+                      "sessionKey": "chat-thread-from-args"
+                    }
+                  }
+                }
+                """;
+
+            await InvokeProcessMessageAsync(client, json);
+            await cap.ExecutedTask.WaitAsync(TimeSpan.FromSeconds(5));
+
+            Assert.Equal("chat-thread-from-args", cap.LastRequest?.SessionKey);
+        }
+        finally
+        {
+            if (Directory.Exists(dataPath))
+                Directory.Delete(dataPath, true);
+        }
+    }
+
+    [Fact]
+    public async Task CommandDispatch_ReqPath_ParamsSessionKeyOverridesArgsSessionKey()
+    {
+        var dataPath = Path.Combine(Path.GetTempPath(), $"openclaw-node-test-{Guid.NewGuid():N}");
+        Directory.CreateDirectory(dataPath);
+
+        try
+        {
+            using var client = new WindowsNodeClient("ws://localhost:18789", "test-token", dataPath);
+            var cap = new MockCapability("mock", "mock.ping");
+            client.RegisterCapability(cap);
+
+            var json = """
+                {
+                  "type": "req",
+                  "id": "req-session-override",
+                  "method": "node.invoke",
+                  "params": {
+                    "requestId": "inv-session-override",
+                    "command": "mock.ping",
+                    "sessionKey": "trusted-session",
+                    "args": {
+                      "sessionKey": "spoofed-session"
+                    }
+                  }
+                }
+                """;
+
+            await InvokeProcessMessageAsync(client, json);
+            await cap.ExecutedTask.WaitAsync(TimeSpan.FromSeconds(5));
+
+            Assert.Equal("trusted-session", cap.LastRequest?.SessionKey);
+        }
+        finally
+        {
+            if (Directory.Exists(dataPath))
+                Directory.Delete(dataPath, true);
+        }
+    }
+
     [Fact]
     public async Task CommandDispatch_UnknownCommand_DoesNotInvokeAnyCapability()
     {
diff --git a/tests/OpenClaw.Tray.Tests/A2UIDataModelArrayTests.cs b/tests/OpenClaw.Tray.Tests/A2UIDataModelArrayTests.cs
new file mode 100644
index 000000000..45771befc
--- /dev/null
+++ b/tests/OpenClaw.Tray.Tests/A2UIDataModelArrayTests.cs
@@ -0,0 +1,182 @@
+using System.Linq;
+using System.Text.Json.Nodes;
+using OpenClawTray.A2UI.Protocol;
+using Xunit;
+
+namespace OpenClaw.Tray.Tests;
+
+/// <summary>
+/// Conformance tests for the v0.8 <c>dataModelUpdate.valueArray</c> typed value.
+///
+/// The protocol (docs/a2ui/protocol.md §2.2 and data-and-actions.md) lists
+/// <c>valueArray</c> alongside <c>valueString/Number/Boolean/valueMap</c> as the
+/// unambiguous way to seed an array into the data model — e.g. for
+/// <c>MultipleChoice.selections</c>. These tests pin that the parser produces a
+/// real <see cref="JsonArray"/> (it previously dropped the value entirely).
+/// </summary>
+public sealed class A2UIDataModelArrayTests
+{
+    /// <summary>Parse a single dataModelUpdate line and return the entry with the given key.</summary>
+    private static DataModelEntry EntryFor(string jsonl, string key)
+    {
+        var msg = Assert.IsType<DataModelUpdateMessage>(A2UIMessageParser.ParseLine(jsonl));
+        return msg.Contents.Single(c => c.Key == key);
+    }
+
+    [Fact]
+    public void ValueArray_OfStrings_ParsesToJsonArray()
+    {
+        const string jsonl =
+            """{"dataModelUpdate":{"surfaceId":"s","contents":[{"key":"tags","valueArray":[{"valueString":"admin"},{"valueString":"beta"}]}]}}""";
+
+        var node = EntryFor(jsonl, "tags").ToJsonNode();
+
+        var arr = Assert.IsType<JsonArray>(node);
+        Assert.Equal(new[] { "admin", "beta" }, arr.Select(n => n!.GetValue<string>()));
+    }
+
+    [Fact]
+    public void ValueArray_OfMixedScalars_PreservesTypes()
+    {
+        const string jsonl =
+            """{"dataModelUpdate":{"surfaceId":"s","contents":[{"key":"mixed","valueArray":[{"valueString":"x"},{"valueNumber":7},{"valueBoolean":true}]}]}}""";
+
+        var arr = Assert.IsType<JsonArray>(EntryFor(jsonl, "mixed").ToJsonNode());
+
+        Assert.Equal(3, arr.Count);
+        Assert.Equal("x", arr[0]!.GetValue<string>());
+        Assert.Equal(7, arr[1]!.GetValue<double>());
+        Assert.True(arr[2]!.GetValue<bool>());
+    }
+
+    [Fact]
+    public void ValueArray_OfMaps_ProducesArrayOfObjects()
+    {
+        const string jsonl =
+            """{"dataModelUpdate":{"surfaceId":"s","contents":[{"key":"rows","valueArray":[""" +
+                """{"valueMap":[{"key":"id","valueNumber":1},{"key":"name","valueString":"Ada"}]},""" +
+                """{"valueMap":[{"key":"id","valueNumber":2},{"key":"name","valueString":"Bob"}]}""" +
+            """]}]}}""";
+
+        var arr = Assert.IsType<JsonArray>(EntryFor(jsonl, "rows").ToJsonNode());
+
+        Assert.Equal(2, arr.Count);
+        var first = Assert.IsType<JsonObject>(arr[0]);
+        Assert.Equal(1, first["id"]!.GetValue<double>());
+        Assert.Equal("Ada", first["name"]!.GetValue<string>());
+        var second = Assert.IsType<JsonObject>(arr[1]);
+        Assert.Equal("Bob", second["name"]!.GetValue<string>());
+    }
+
+    [Fact]
+    public void ValueArray_Nested_ProducesArrayOfArrays()
+    {
+        const string jsonl =
+            """{"dataModelUpdate":{"surfaceId":"s","contents":[{"key":"grid","valueArray":[""" +
+                """{"valueArray":[{"valueNumber":1},{"valueNumber":2}]},""" +
+                """{"valueArray":[{"valueNumber":3}]}""" +
+            """]}]}}""";
+
+        var arr = Assert.IsType<JsonArray>(EntryFor(jsonl, "grid").ToJsonNode());
+
+        var inner0 = Assert.IsType<JsonArray>(arr[0]);
+        Assert.Equal(new double[] { 1, 2 }, inner0.Select(n => n!.GetValue<double>()));
+        var inner1 = Assert.IsType<JsonArray>(arr[1]);
+        Assert.Equal(new double[] { 3 }, inner1.Select(n => n!.GetValue<double>()));
+    }
+
+    [Fact]
+    public void ValueArray_BarePrimitiveElements_AreTolerated()
+    {
+        // An agent may emit a JSON array of bare primitives rather than the
+        // wrapped { "valueString": ... } shape. We round-trip those too.
+        const string jsonl =
+            """{"dataModelUpdate":{"surfaceId":"s","contents":[{"key":"vals","valueArray":["a",2,false]}]}}""";
+
+        var arr = Assert.IsType<JsonArray>(EntryFor(jsonl, "vals").ToJsonNode());
+
+        Assert.Equal(3, arr.Count);
+        Assert.Equal("a", arr[0]!.GetValue<string>());
+        Assert.Equal(2, arr[1]!.GetValue<double>());
+        Assert.False(arr[2]!.GetValue<bool>());
+    }
+
+    [Fact]
+    public void ValueArray_Empty_ProducesEmptyArray()
+    {
+        const string jsonl =
+            """{"dataModelUpdate":{"surfaceId":"s","contents":[{"key":"empty","valueArray":[]}]}}""";
+
+        var arr = Assert.IsType<JsonArray>(EntryFor(jsonl, "empty").ToJsonNode());
+        Assert.Empty(arr);
+    }
+
+    [Fact]
+    public void ValueArray_SelectionsShape_MatchesMultipleChoiceMultiRead()
+    {
+        // MultipleChoice (multi) reads selections as a JsonArray of strings; an
+        // agent seeds the initial selection through valueArray. Pin the exact
+        // shape MultipleChoice.ResolveMulti expects.
+        const string jsonl =
+            """{"dataModelUpdate":{"surfaceId":"s","path":"/form","contents":[{"key":"picked","valueArray":[{"valueString":"red"},{"valueString":"blue"}]}]}}""";
+
+        var msg = Assert.IsType<DataModelUpdateMessage>(A2UIMessageParser.ParseLine(jsonl));
+        Assert.Equal("/form", msg.Path);
+        var arr = Assert.IsType<JsonArray>(msg.Contents.Single().ToJsonNode());
+        Assert.Equal(new[] { "red", "blue" }, arr.Select(n => n!.GetValue<string>()));
+    }
+
+    [Fact]
+    public void ValueArray_NullElement_PreservedAsNullSlot()
+    {
+        // A JSON null element keeps its position so index-sensitive consumers
+        // don't see a shifted array.
+        const string jsonl =
+            """{"dataModelUpdate":{"surfaceId":"s","contents":[{"key":"vals","valueArray":[{"valueString":"a"},null,{"valueString":"b"}]}]}}""";
+
+        var arr = Assert.IsType<JsonArray>(EntryFor(jsonl, "vals").ToJsonNode());
+
+        Assert.Equal(3, arr.Count);
+        Assert.Equal("a", arr[0]!.GetValue<string>());
+        Assert.Null(arr[1]);
+        Assert.Equal("b", arr[2]!.GetValue<string>());
+    }
+
+    [Fact]
+    public void ValueArray_ValuelessObjectElement_PreservedAsNullSlot()
+    {
+        // A wrapped element carrying no recognized value also yields a null slot
+        // — consistent with the bare-null case above.
+        const string jsonl =
+            """{"dataModelUpdate":{"surfaceId":"s","contents":[{"key":"vals","valueArray":[{},{"valueString":"b"}]}]}}""";
+
+        var arr = Assert.IsType<JsonArray>(EntryFor(jsonl, "vals").ToJsonNode());
+
+        Assert.Equal(2, arr.Count);
+        Assert.Null(arr[0]);
+        Assert.Equal("b", arr[1]!.GetValue<string>());
+    }
+
+    [Fact]
+    public void ValueMap_StillParses_NoRegression()
+    {
+        const string jsonl =
+            """{"dataModelUpdate":{"surfaceId":"s","contents":[{"key":"user","valueMap":[{"key":"first","valueString":"Ada"},{"key":"last","valueString":"Lovelace"}]}]}}""";
+
+        var obj = Assert.IsType<JsonObject>(EntryFor(jsonl, "user").ToJsonNode());
+        Assert.Equal("Ada", obj["first"]!.GetValue<string>());
+        Assert.Equal("Lovelace", obj["last"]!.GetValue<string>());
+    }
+
+    [Fact]
+    public void ScalarEntries_StillParse_NoRegression()
+    {
+        const string jsonl =
+            """{"dataModelUpdate":{"surfaceId":"s","contents":[{"key":"name","valueString":"Ada"},{"key":"age","valueNumber":36},{"key":"active","valueBoolean":true}]}}""";
+
+        var msg = Assert.IsType<DataModelUpdateMessage>(A2UIMessageParser.ParseLine(jsonl));
+        Assert.Equal("Ada", msg.Contents.Single(c => c.Key == "name").ToJsonNode()!.GetValue<string>());
+        Assert.Equal(36, msg.Contents.Single(c => c.Key == "age").ToJsonNode()!.GetValue<double>());
+        Assert.True(msg.Contents.Single(c => c.Key == "active").ToJsonNode()!.GetValue<bool>());
+    }
+}
diff --git a/tests/OpenClaw.Tray.Tests/AppRefactorContractTests.cs b/tests/OpenClaw.Tray.Tests/AppRefactorContractTests.cs
index d21a6c91f..c57263d4e 100644
--- a/tests/OpenClaw.Tray.Tests/AppRefactorContractTests.cs
+++ b/tests/OpenClaw.Tray.Tests/AppRefactorContractTests.cs
@@ -40,6 +40,43 @@ public void Startup_Order_PreservesInitializationInvariants()
             "StartDeepLinkServer();");
     }
 
+    [Fact]
+    public void Startup_WslKeepAlive_IsOwnedByDedicatedService()
+    {
+        var source = ReadAppSources();
+        var startup = ExtractMethod(source, "OnLaunchedAsync");
+        var service = ReadWslKeepAliveServiceSource();
+
+        Assert.Contains("new WslGatewayKeepAliveService(() => _settings, () => _gatewayRegistry)", startup);
+        Assert.Contains("Task.Run(wslKeepAlive.TryEnsureAsync)", startup);
+
+        foreach (var duplicateMethod in new[]
+        {
+            "TryEnsureLocalGatewayKeepAliveAsync",
+            "StopStaleLocalGatewayKeepAliveAsync",
+            "ReadKeepAliveMarkerDistroNames",
+            "ReadSetupStateDistroNameAsync",
+            "StopKeepAliveProcessesForDistro",
+            "DeleteKeepAliveMarker",
+            "GetProcessCommandLine",
+            "ResolveWslExePath",
+            "ResolveLocalGatewayDistroNameAsync",
+        })
+        {
+            Assert.DoesNotContain(duplicateMethod, source);
+        }
+
+        Assert.Contains("public async Task TryEnsureAsync()", service);
+        Assert.Contains("StopStaleLocalGatewayKeepAliveAsync", service);
+        Assert.Contains("ReadKeepAliveMarkerDistroNames", service);
+        Assert.Contains("ReadSetupStateDistroNameAsync", service);
+        Assert.Contains("StopKeepAliveProcessesForDistro", service);
+        Assert.Contains("DeleteKeepAliveMarker", service);
+        Assert.Contains("GetProcessCommandLine", service);
+        Assert.Contains("ResolveWslExePath", service);
+        Assert.Contains("ResolveLocalGatewayDistroNameAsync", service);
+    }
+
     [Fact]
     public void McpOnlyStartup_DoesNotRequireGatewayCredentials()
     {
@@ -49,7 +86,11 @@ public void McpOnlyStartup_DoesNotRequireGatewayCredentials()
         Assert.Contains("!_settings.EnableMcpServer || _settings.EnableNodeMode", method);
         Assert.Contains("EnsureNodeService(_settings)", method);
         Assert.Contains("StartLocalOnlyAsync()", method);
+        Assert.Contains("McpRuntimeStatePolicy.PlanStartupNotification", method);
+        Assert.Contains("ApplyMcpStartupNotificationPlan", method);
         Assert.Contains("WireAppCapabilityHandlers()", method);
+        AssertInOrder(method, "nodeService.StartLocalOnlyAsync()", "WireAppCapabilityHandlers()");
+        AssertInOrder(method, "WireAppCapabilityHandlers()", "Started MCP-only node service without gateway connection");
 
         var init = ExtractMethod(source, "InitializeGatewayClient");
         AssertInOrder(init, "TryStartLocalMcpOnlyNode();", "Gateway URL not configured");
@@ -71,6 +112,152 @@ public void LegacyCredentialMigration_StaysRegistryBacked()
         Assert.DoesNotContain("BootstrapToken =", method);
     }
 
+    [Fact]
+    public void LifecycleStatus_IsWrittenFromManagerSnapshotOnly()
+    {
+        var source = ReadAppSources();
+        var managerHandler = ExtractMethod(source, "OnManagerStateChanged");
+        var rawHandler = ExtractMethod(source, "OnGatewayConnectionStatusChanged");
+
+        Assert.Contains("ConnectionStatusPresenter.ToLegacyStatus(snap)", managerHandler);
+        Assert.Contains("SyncConnectionToggle(mapped, snap.OverallState)", managerHandler);
+        Assert.Contains("_hubWindow?.UpdateTitleBarStatus(snap, mapped)", managerHandler);
+        Assert.Contains("_appState.Status = mapped", managerHandler);
+        Assert.DoesNotContain("_appState.Status =", rawHandler);
+        Assert.DoesNotContain("SyncConnectionToggle(status)", rawHandler);
+        Assert.DoesNotContain("RunHealthCheckAsync()", rawHandler);
+        Assert.DoesNotContain("TryConnectLocalNodeServiceAsync()", rawHandler);
+    }
+
+    [Fact]
+    public void Dashboard_SurfacesSshTunnelConfigurationFailure()
+    {
+        var source = ReadAppSources();
+        var method = ExtractMethod(source, "OpenDashboard");
+
+        Assert.Contains("if (!EnsureSshTunnelConfigured())", method);
+        Assert.Contains("_toastService?.ShowToast", method);
+        Assert.Contains("Check SSH tunnel settings and logs.", method);
+    }
+
+    [Fact]
+    public void ConnectionIssueNotification_PrefersNodeOwnedFailuresBeforeGenericGatewayError()
+    {
+        var source = ReadAppSources();
+
+        AssertInOrder(
+            source,
+            "snapshot.NodeState == RoleConnectionState.PairingRequired",
+            "TryBuildNodeConnectionIssueNotification(snapshot",
+            "if (snapshot.OverallState == OverallConnectionState.Error)");
+        Assert.Contains("TryBuildNodeConnectionIssueNotification", source);
+        Assert.Contains("snapshot.OperatorState == RoleConnectionState.Error", source);
+    }
+
+    [Fact]
+    public void CommandCenter_UsesOverallStateBeforeLegacyStatus()
+    {
+        var root = TestRepositoryPaths.GetRepositoryRoot();
+        var source = File.ReadAllText(Path.Combine(
+            root, "src", "OpenClaw.Tray.WinUI", "Services", "CommandCenterStateBuilder.cs"));
+
+        AssertInOrder(
+            source,
+            "if (overallState == OpenClaw.Connection.OverallConnectionState.Degraded)",
+            "else if (_snapshot.Status == ConnectionStatus.Error)");
+        Assert.Contains("_snapshot.Settings?.EnableMcpServer == true", source);
+        Assert.Contains("!string.IsNullOrWhiteSpace(mcpStartupError)", source);
+    }
+
+    [Fact]
+    public void AppSettingsSet_AppliesSettingsSavedLifecycle()
+    {
+        var source = ReadAppSources();
+        var method = ExtractMethod(source, "WireAppCapabilityHandlers");
+
+        AssertInOrder(
+            method,
+            "app.SettingsSetHandler = (name, value) =>",
+            "_settings.Save();",
+            "OnSettingsSaved(this, EventArgs.Empty);",
+            "McpRuntimeStatePolicy.GetSettingsSetError",
+            "return new { error = runtimeError };",
+            "return new { name, value = prop.GetValue(_settings) };");
+    }
+
+    [Fact]
+    public void OnSettingsSaved_AppliesMcpStartupNotificationPlan()
+    {
+        var source = ReadAppSources();
+        var method = ExtractMethod(source, "OnSettingsSaved");
+
+        Assert.Contains("nodeService?.SetMcpEnabled(_settings.EnableMcpServer)", method);
+        Assert.Contains("McpRuntimeStatePolicy.PlanStartupNotification", method);
+        Assert.Contains("ApplyMcpStartupNotificationPlan", method);
+        AssertInOrder(
+            method,
+            "nodeService?.SetMcpEnabled(_settings.EnableMcpServer)",
+            "ApplyMcpStartupNotificationPlan",
+            "McpRuntimeStatePolicy.PlanStartupNotification");
+    }
+
+    [Fact]
+    public void AppStatus_ReportsNodeStateFromManagerSnapshot()
+    {
+        var source = ReadAppSources();
+        var method = ExtractMethod(source, "WireAppCapabilityHandlers");
+
+        Assert.Contains("var snapshot = _connectionManager?.CurrentSnapshot;", method);
+        Assert.Contains("overallState = snapshot?.OverallState.ToString()", method);
+        Assert.Contains("operatorState = snapshot?.OperatorState.ToString()", method);
+        Assert.Contains("nodeState = snapshot?.NodeState.ToString()", method);
+        Assert.Contains("nodeConnected = snapshot?.NodeState == RoleConnectionState.Connected", method);
+        Assert.Contains("nodePaired = snapshot?.NodePairingStatus == PairingStatus.Paired", method);
+        Assert.Contains("nodePendingApproval = snapshot?.NodeState == RoleConnectionState.PairingRequired", method);
+        Assert.Contains("nodeError = snapshot?.NodeError", method);
+        Assert.Contains("operatorDeviceId = snapshot?.OperatorDeviceId", method);
+    }
+
+    [Fact]
+    public void AppMenu_StatusItemIncludesManagerSnapshotState()
+    {
+        var source = ReadAppSources();
+        var method = ExtractMethod(source, "WireAppCapabilityHandlers");
+
+        Assert.Contains("app.MenuHandler = () =>", method);
+        Assert.Contains("overallState = snapshot?.OverallState.ToString()", method);
+        Assert.Contains("nodeState = snapshot?.NodeState.ToString()", method);
+        Assert.Contains("nodeError = snapshot?.NodeError", method);
+    }
+
+    [Fact]
+    public void AppChatQueueMcpHandlers_AreWiredToAppCapability()
+    {
+        var source = ReadAppSources();
+        var method = ExtractMethod(source, "WireAppCapabilityHandlers");
+
+        Assert.Contains("app.ChatQueueListHandler = ListQueuedChatMessagesForMcpAsync;", method);
+        Assert.Contains("app.ChatQueueCancelHandler = CancelQueuedChatMessageForMcpAsync;", method);
+    }
+
+    [Fact]
+    public void AppChatSnapshot_IncludesQueuePayload()
+    {
+        var source = ReadAppSources();
+        var snapshotMethod = ExtractMethod(source, "BuildChatSnapshotPayload");
+        var queueMethod = ExtractMethod(source, "BuildChatQueuePayload");
+        var queueMessageMethod = ExtractMethod(source, "ToMcpQueuedMessage");
+        var cancelMethod = ExtractMethod(source, "CancelQueuedChatMessageForMcpAsync");
+
+        Assert.Contains("queue = BuildChatQueuePayload(snapshot, resolvedThreadId, filterToThread: false)", snapshotMethod);
+        Assert.Contains("snapshot.QueuedMessagesByThread", queueMethod);
+        Assert.Contains("sendState = message.SendState.ToString()", queueMessageMethod);
+        Assert.Contains("canCancel = CanCancelQueuedMessage(message)", queueMessageMethod);
+        Assert.Contains("canceled = await provider.CancelQueuedMessageAsync(resolvedThreadId, queuedMessageId)", cancelMethod);
+        Assert.Contains("Queued message is already sending and cannot be canceled", cancelMethod);
+        Assert.Contains("it may have started sending before cancellation was processed", cancelMethod);
+    }
+
     [Fact]
     public void Startup_NodeOnlyReconnect_UsesNodeCredentialAndLegacyIdentityFallback()
     {
@@ -135,6 +322,30 @@ public void ChatWebView_KeepsBaseChatUrlSeparateFromPendingSessionKey()
         Assert.DoesNotContain("WebView.CoreWebView2.Navigate(_chatUrl)", readiness);
     }
 
+    [Fact]
+    public void PermissionsPage_ExecPolicy_UsesAppDataDirectory()
+    {
+        var root = TestRepositoryPaths.GetRepositoryRoot();
+        var source = File.ReadAllText(Path.Combine(root, "src", "OpenClaw.Tray.WinUI", "Pages", "PermissionsPage.xaml.cs"));
+
+        Assert.Contains("Path.Combine(CurrentApp.DataDirectoryPath, \"exec-policy.json\")", source);
+        Assert.DoesNotContain("SpecialFolder.LocalApplicationData", source);
+        Assert.DoesNotContain("SettingsManager.SettingsDirectoryPath, \"exec-policy.json\"", source);
+    }
+
+    [Fact]
+    public void PermissionsPage_ExecPolicyRemoveButtons_HaveAccessibleNames()
+    {
+        var root = TestRepositoryPaths.GetRepositoryRoot();
+        var xaml = File.ReadAllText(Path.Combine(root, "src", "OpenClaw.Tray.WinUI", "Pages", "PermissionsPage.xaml"));
+        var codeBehind = File.ReadAllText(Path.Combine(root, "src", "OpenClaw.Tray.WinUI", "Pages", "PermissionsPage.xaml.cs"));
+
+        Assert.Contains("AutomationProperties.Name=\"{Binding RemoveRuleAutomationName}\"", xaml);
+        Assert.Contains("AutomationProperties.AutomationId=\"{Binding RemoveRuleAutomationId}\"", xaml);
+        Assert.Contains("RemoveRuleAutomationName = $\"Remove rule {r.Pattern}\"", codeBehind);
+        Assert.Contains("RemoveRuleAutomationId = $\"RemoveExecPolicyRuleButton_{r.Index}\"", codeBehind);
+    }
+
     [Fact]
     public void Shutdown_Order_PreservesAwaitedTeardownBeforeExit()
     {
@@ -145,9 +356,9 @@ public void Shutdown_Order_PreservesAwaitedTeardownBeforeExit()
             method,
             "_deepLinkCts.Cancel()",
             "global hotkey",
+            "chat coordinator",
             "gateway client",
             "connectionManager.DisposeAsync()",
-            "chat coordinator",
             "node service",
             "nodeService.DisposeAsync()",
             "standalone voice service",
@@ -165,27 +376,328 @@ public void Setup_IsHostedInTrayAndUsesSelfRestartAfterCompletion()
         var source = ReadAppSources();
         var root = TestRepositoryPaths.GetRepositoryRoot();
         var setupWindow = File.ReadAllText(Path.Combine(root, "src", "OpenClaw.SetupEngine.UI", "SetupWindow.xaml.cs"));
+        var welcomePage = File.ReadAllText(Path.Combine(root, "src", "OpenClaw.SetupEngine.UI", "Pages", "WelcomePage.xaml.cs"));
+        var wizardPage = File.ReadAllText(Path.Combine(root, "src", "OpenClaw.SetupEngine.UI", "Pages", "WizardPage.xaml.cs"));
+        var progressPage = File.ReadAllText(Path.Combine(root, "src", "OpenClaw.SetupEngine.UI", "Pages", "ProgressPage.xaml.cs"));
+        var updateCoordinator = File.ReadAllText(Path.Combine(root, "src", "OpenClaw.Tray.WinUI", "Services", "UpdateCoordinator.cs"));
+        var cliUninstall = File.ReadAllText(Path.Combine(root, "src", "OpenClaw.Tray.WinUI", "CliUninstallHandler.cs"));
+        var setupProgram = File.ReadAllText(Path.Combine(root, "src", "OpenClaw.SetupEngine", "Program.cs"));
+        var settingsPage = File.ReadAllText(Path.Combine(root, "src", "OpenClaw.Tray.WinUI", "Pages", "SettingsPage.xaml.cs"));
+        var settingsManager = File.ReadAllText(Path.Combine(root, "src", "OpenClaw.Tray.WinUI", "Services", "SettingsManager.cs"));
+        var keepAlivePolicy = File.ReadAllText(Path.Combine(root, "src", "OpenClaw.Tray.WinUI", "Services", "WslKeepAlivePolicy.cs"));
+        var setupClassifier = File.ReadAllText(Path.Combine(root, "src", "OpenClaw.Tray.WinUI", "Services", "SetupExistingGatewayClassifier.cs"));
 
-        Assert.Contains("new SetupWindow()", source);
+        Assert.Contains("var setupWindow = new SetupWindow(", source);
+        Assert.Contains("dataDir: AppIdentity.ResolveRoamingDataDirectory()", source);
+        Assert.Contains("localDataDir: AppIdentity.ResolveSetupLocalDataDirectory()", source);
+        Assert.Contains("distroNameOverride: AppIdentity.SetupDistroName", source);
+        Assert.Contains("gatewayPortOverride: AppIdentity.SetupGatewayPort", source);
+        Assert.Contains("SetupRunLock.TryAcquire(_dataDir", setupWindow);
+        Assert.Contains("new SetupContext(", progressPage);
+        Assert.Contains("step is not RunGatewayWizardStep", progressPage);
+        Assert.Contains("config.SkipWizard || step is not WindowsNodeBootstrapContextStep", progressPage);
+        Assert.Contains("_dataDir,", progressPage);
+        Assert.Contains("_localDataDir);", progressPage);
+        Assert.Contains("setupWindow?.DataDir ?? SetupContext.ResolveDataDir()", welcomePage);
+        Assert.Contains("SetupWindow.Active?.DataDir ?? SetupContext.ResolveDataDir()", wizardPage);
+        Assert.Contains("await CompleteSetupAsync(generation)", wizardPage);
+        Assert.Contains("ApplyWindowsNodeContextAsync", wizardPage);
+        Assert.Contains("var pipeline = new SetupPipeline(", setupWindow);
+        Assert.Contains("[new WindowsNodeBootstrapContextStep()]", setupWindow);
+        Assert.Contains("rollbackOnFailureOverride: false", setupWindow);
+        AssertInOrder(
+            setupWindow,
+            "_lifetimeCts.Cancel()",
+            "await contextApplyTask",
+            "_setupLock?.Dispose()");
+        Assert.Contains("distroNameOverride: _config.DistroName", wizardPage);
+        Assert.Contains("if (AppIdentity.IsDev)", updateCoordinator);
+        Assert.Contains("Skipping release-channel update check in development build", updateCoordinator);
+        Assert.Contains("\"Update_Message_Skipped_Dev\"", updateCoordinator);
+        Assert.Contains("\"--data-dir\", AppIdentity.ResolveRoamingDataDirectory()", cliUninstall);
+        Assert.Contains("\"--local-data-dir\", AppIdentity.ResolveSetupLocalDataDirectory()", cliUninstall);
+        Assert.Contains("\"--distro-name\", AppIdentity.SetupDistroName", cliUninstall);
+        Assert.Contains("\"--autostart-name\", AppIdentity.AutoStartRegistryName", cliUninstall);
+        Assert.Contains("AppIdentity.SetupDistroName", settingsPage);
+        Assert.Contains("AppIdentity.SetupGatewayUrl", settingsManager);
+        Assert.Contains("AppIdentity.SetupDistroName", keepAlivePolicy);
+        Assert.Contains("AppIdentity.SetupDistroName", setupClassifier);
+        Assert.Contains("TrayArtifactCleanup.Run(ctx, preserveLogs, autoStartName, startupTaskName)", setupProgram);
         Assert.Contains("setupWindow.SetupCompleted += OnSetupCompleted", source);
         Assert.Contains("ShowGatewayWizardAsync", source);
-        Assert.Contains("setupWindow.TryNavigateToWizard()", source);
+        Assert.Contains("EnsureSetupWindowAsync(startAtGatewayInstalledMilestone: true)", source);
+        Assert.Contains("startAtGatewayInstalledMilestone", setupWindow);
+        Assert.Contains("_persistStartupPreferenceOnComplete = false", setupWindow);
+        Assert.Contains("_showStartupPreferenceOnComplete = false", setupWindow);
+        Assert.Contains("CanNavigateToGatewayInstalledMilestone", setupWindow);
+        Assert.Contains("RootFrame.Content is not ProgressPage { IsPipelineRunning: true }", setupWindow);
+        Assert.Contains("RootFrame.Content is not WizardPage", setupWindow);
+        Assert.Contains("TryNavigateToGatewayInstalledMilestone", setupWindow);
+        Assert.Contains("setupWindow.TryNavigateToGatewayInstalledMilestone()", source);
+        AssertInOrder(
+            setupWindow,
+            "SetupRunLock.TryAcquire",
+            "if (startAtGatewayInstalledMilestone)",
+            "NavigateToGatewayInstalledMilestone()");
         Assert.Contains("CanNavigateToWizard", setupWindow);
-        // Direct onboarding must not hijack an already-open setup window: it
-        // only navigates a freshly created window so it cannot cancel an
-        // in-progress install running on ProgressPage.
+        // Direct onboarding may reuse an already-open idle setup window, but
+        // must not cancel an in-progress install running on ProgressPage.
         Assert.Contains("EnsureSetupWindowAsync", source);
         Assert.Contains("if (!createdNew)", source);
         Assert.Contains("RestartAfterSetupAsync", source);
         Assert.Contains("\"--post-setup-restart\"", source);
         Assert.Contains("\"--wait-for-pid\"", source);
         Assert.Contains("\"--post-setup-launch\"", source);
-        Assert.Contains("? \"openclaw://chat\" : null", source);
+        Assert.Contains("$\"{AppIdentity.ProtocolScheme}://chat\"", source);
         Assert.Contains("WaitForRestartSourceIfRequested(Environment.GetCommandLineArgs())", source);
         AssertInOrder(source, "WaitForRestartSourceIfRequested(Environment.GetCommandLineArgs())", "_mutex = new Mutex");
+        Assert.DoesNotContain("setupWindow.TryNavigateToWizard()", source);
         Assert.DoesNotContain("ResolveSetupEngineUiPath", source);
         Assert.DoesNotContain("OpenClaw.SetupEngine.UI.exe", source);
         Assert.DoesNotContain("Process.GetProcessesByName(\"OpenClaw.SetupEngine.UI\")", source);
+        Assert.False(File.Exists(Path.Combine(root, "src", "OpenClaw.Tray.WinUI", "Windows", "SetupWizardWindow.cs")));
+    }
+
+    [Fact]
+    public void GatewayInstalledMilestone_ShowsInlineStatusIfWizardCannotStart()
+    {
+        var root = TestRepositoryPaths.GetRepositoryRoot();
+        var xaml = File.ReadAllText(Path.Combine(root, "src", "OpenClaw.SetupEngine.UI", "Pages", "ProgressPage.xaml"));
+        var code = File.ReadAllText(Path.Combine(root, "src", "OpenClaw.SetupEngine.UI", "Pages", "ProgressPage.xaml.cs"));
+        var onBoard = ExtractMethod(code, "Onboard_Click");
+
+        Assert.Contains("x:Name=\"MilestoneStatusText\"", xaml);
+        Assert.Contains("SetupWindow.Active?.TryNavigateToWizard() == true", onBoard);
+        Assert.Contains("AutomationProperties.LiveSetting=\"Assertive\"", xaml);
+        Assert.Contains("MilestoneStatusText.Text", onBoard);
+        Assert.DoesNotContain("NavigateToWizard();", onBoard);
+    }
+
+    [Fact]
+    public void SetupCompletion_PersistsStartupChoiceBeforeRestart()
+    {
+        var root = TestRepositoryPaths.GetRepositoryRoot();
+        var source = File.ReadAllText(Path.Combine(root, "src", "OpenClaw.SetupEngine.UI", "SetupWindow.xaml.cs"));
+        var method = ExtractMethod(source, "RequestSetupCompleted");
+
+        Assert.Contains("if (_persistStartupPreferenceOnComplete)", method);
+        Assert.Contains("_config.Settings.AutoStart = enableAutoStart", method);
+        Assert.Contains("TraySettingsConfig.UpdateAutoStartInSettingsFile", method);
+        AssertInOrder(
+            method,
+            "if (_persistStartupPreferenceOnComplete)",
+            "_config.Settings.AutoStart = enableAutoStart",
+            "TraySettingsConfig.UpdateAutoStartInSettingsFile",
+            "handler.Invoke");
+    }
+
+    [Fact]
+    public void SetupWindowOwnership_WaitsForCleanupBeforeAllowingAnotherRun()
+    {
+        var root = TestRepositoryPaths.GetRepositoryRoot();
+        var app = File.ReadAllText(Path.Combine(root, "src", "OpenClaw.Tray.WinUI", "App.xaml.cs"));
+        var setupWindow = File.ReadAllText(Path.Combine(root, "src", "OpenClaw.SetupEngine.UI", "SetupWindow.xaml.cs"));
+
+        Assert.Contains("public Task CleanupCompleted => _cleanupCompleted.Task", setupWindow);
+        AssertInOrder(
+            setupWindow,
+            "_lifetimeCts.Cancel()",
+            "await contextApplyTask",
+            "catch (OperationCanceledException)",
+            "_setupLock?.Dispose()",
+            "_cleanupCompleted.TrySetResult(true)");
+        Assert.Contains("rollbackOnFailureOverride: false", setupWindow);
+        AssertInOrder(
+            app,
+            "while (_setupWindow != null)",
+            "await existingSetupWindow.WaitForInitialContentReadyAsync()",
+            "if (!existingSetupWindow.IsClosed)",
+            "await existingSetupWindow.CleanupCompleted",
+            "_setupWindow = null",
+            "new SetupWindow(");
+        AssertInOrder(
+            app,
+            "setupWindow.Closed += async",
+            "await setupWindow.CleanupCompleted",
+            "_setupWindow = null");
+    }
+
+    [Fact]
+    public void CompletePage_UsesCompletionArgsForStartupPreference()
+    {
+        var root = TestRepositoryPaths.GetRepositoryRoot();
+        var setupWindow = File.ReadAllText(Path.Combine(root, "src", "OpenClaw.SetupEngine.UI", "SetupWindow.xaml.cs"));
+        var complete = File.ReadAllText(Path.Combine(root, "src", "OpenClaw.SetupEngine.UI", "Pages", "CompletePage.xaml.cs"));
+        var navigate = ExtractMethod(setupWindow, "NavigateToComplete");
+
+        Assert.Contains("DefaultAutoStart: true", navigate);
+        Assert.Contains("ShowStartupPreference: _showStartupPreferenceOnComplete", navigate);
+        Assert.Contains("StartupToggle.IsOn = args.DefaultAutoStart", complete);
+        Assert.Contains("StartupRow.Visibility = args.ShowStartupPreference ? Visibility.Visible : Visibility.Collapsed", complete);
+        Assert.Contains("StartupRow.Visibility == Visibility.Visible && StartupToggle.IsOn", complete);
+        Assert.DoesNotContain("StartupToggle.IsOn = true", complete);
+    }
+
+    [Fact]
+    public void CapabilitiesPage_PersistsSelectedProfileIntoRuntimeNodeSettings()
+    {
+        var root = TestRepositoryPaths.GetRepositoryRoot();
+        var source = File.ReadAllText(Path.Combine(root, "src", "OpenClaw.SetupEngine.UI", "Pages", "CapabilitiesPage.xaml.cs"));
+        var method = ExtractMethod(source, "WriteCapabilities");
+
+        Assert.Contains("config.Settings.ApplyCapabilities(caps)", method);
+        AssertInOrder(
+            method,
+            "prop?.SetValue(caps, toggle.IsOn)",
+            "config.Settings.ApplyCapabilities(caps)");
+        Assert.Contains("_config.UsesBundledDefaultConfig", source);
+        Assert.Contains("_treatBundledAllOnAsPlaceholder ? 1 : 2", source);
+        Assert.Contains("return -1", source);
+    }
+
+    [Fact]
+    public void CapabilitiesPage_PermissionProbeFaultsShowInlineWarning()
+    {
+        var root = TestRepositoryPaths.GetRepositoryRoot();
+        var source = File.ReadAllText(Path.Combine(root, "src", "OpenClaw.SetupEngine.UI", "Pages", "CapabilitiesPage.xaml.cs"));
+        var click = ExtractMethod(source, "PrimaryClickAsync");
+        var build = ExtractMethod(source, "BuildPermissionRows");
+
+        Assert.Contains("!permissionsTask.IsCompletedSuccessfully", click);
+        Assert.Contains("catch (Exception ex)", build);
+        Assert.Contains("new InfoBar", build);
+        Assert.Contains("Couldn't read Windows permission status", build);
+        Assert.Contains("Review permissions later in Settings", build);
+    }
+
+    [Fact]
+    public void CapabilitiesPage_RefreshesPermissionStateWhenSetupIsReactivated()
+    {
+        var root = TestRepositoryPaths.GetRepositoryRoot();
+        var source = File.ReadAllText(Path.Combine(root, "src", "OpenClaw.SetupEngine.UI", "Pages", "CapabilitiesPage.xaml.cs"));
+        var activated = ExtractMethod(source, "SetupWindow_Activated");
+        var refresh = ExtractMethod(source, "RefreshPermissionRowsAsync");
+
+        Assert.Contains("_setupWindow.Activated += SetupWindow_Activated", source);
+        Assert.Contains("_setupWindow.Activated -= SetupWindow_Activated", source);
+        Assert.Contains("WindowActivationState.Deactivated", activated);
+        Assert.Contains("RefreshPermissionRowsAsync(_permissionsTask)", activated);
+        AssertInOrder(refresh, "await previousRefresh", "await BuildPermissionRows()");
+    }
+
+    [Fact]
+    public void CapabilitiesPage_ExposesExplicitCustomCapabilitySetsForReview()
+    {
+        var root = TestRepositoryPaths.GetRepositoryRoot();
+        var source = File.ReadAllText(Path.Combine(root, "src", "OpenClaw.SetupEngine.UI", "Pages", "CapabilitiesPage.xaml.cs"));
+        var xaml = File.ReadAllText(Path.Combine(root, "src", "OpenClaw.SetupEngine.UI", "Pages", "CapabilitiesPage.xaml"));
+        var detectProfile = ExtractMethod(source, "DetectProfileIndex");
+
+        Assert.Contains("x:Name=\"CapabilityExpander\"", xaml);
+        Assert.Contains("\"Custom capabilities (review)\"", source);
+        Assert.Contains("CapabilityExpander.IsExpanded = true", source);
+        Assert.Contains("_treatBundledAllOnAsPlaceholder ? 1 : 2", detectProfile);
+        Assert.Contains("return -1", detectProfile);
+        Assert.Contains("toggle.Toggled += Capability_Toggled", source);
+        AssertInOrder(
+            source,
+            "_treatBundledAllOnAsPlaceholder = _config.UsesBundledDefaultConfig",
+            "_suppressProfile = true",
+            "ApplyProfile(1)",
+            "_suppressProfile = false",
+            "_treatBundledAllOnAsPlaceholder = false");
+        AssertInOrder(
+            ExtractMethod(source, "Capability_Toggled"),
+            "DetectProfileIndex()",
+            "ProfileRadio.SelectedIndex = profileIndex",
+            "UpdateCapabilityProfilePresentation(profileIndex)");
+    }
+
+    [Fact]
+    public void CapabilitiesPage_DisclosesAlwaysOnDeviceStatusWithoutOfferingFalseToggle()
+    {
+        var root = TestRepositoryPaths.GetRepositoryRoot();
+        var source = File.ReadAllText(Path.Combine(root, "src", "OpenClaw.SetupEngine.UI", "Pages", "CapabilitiesPage.xaml.cs"));
+        var xaml = File.ReadAllText(Path.Combine(root, "src", "OpenClaw.SetupEngine.UI", "Pages", "CapabilitiesPage.xaml"));
+
+        Assert.DoesNotContain("(\"Device\", \"Device\"", source);
+        Assert.DoesNotContain("[\"Canvas\", \"Screen\", \"Device\"]", source);
+        Assert.Contains("_config.Capabilities.Device = true", source);
+        Assert.Contains("Basic device info and status stay available while Node Mode is on.", xaml);
+    }
+
+    [Fact]
+    public void WizardSecondaryButton_DoesNotSkipEntireWizardInErrorState()
+    {
+        var root = TestRepositoryPaths.GetRepositoryRoot();
+        var source = File.ReadAllText(Path.Combine(root, "src", "OpenClaw.SetupEngine.UI", "Pages", "WizardPage.xaml.cs"));
+        var method = ExtractMethod(source, "SecondaryClickAsync");
+
+        Assert.DoesNotContain("_errorState", method);
+        Assert.DoesNotContain("SkipWizardAsync", method);
+        Assert.Contains("SendCurrentAnswerAsync(skip: true)", method);
+    }
+
+    [Fact]
+    public void WizardProgressPolling_UsesStepIdForTimeoutClassification()
+    {
+        var root = TestRepositoryPaths.GetRepositoryRoot();
+        var source = File.ReadAllText(Path.Combine(root, "src", "OpenClaw.SetupEngine.UI", "Pages", "WizardPage.xaml.cs"));
+
+        Assert.Contains("WizardTimeouts.ForStep(title, message, _stepId)", source);
+    }
+
+    [Fact]
+    public void WizardResetInputs_RemovesOverflowMoreButton()
+    {
+        var root = TestRepositoryPaths.GetRepositoryRoot();
+        var source = File.ReadAllText(Path.Combine(root, "src", "OpenClaw.SetupEngine.UI", "Pages", "WizardPage.xaml.cs"));
+        var reset = ExtractMethod(source, "ResetInputs");
+
+        // The "More ▾" overflow button is a sibling of SelectOptions in the shared
+        // StackPanel, so ResetInputs must remove it between steps or it leaks forward.
+        Assert.Contains("_moreOptionsButton", reset);
+        Assert.Contains("morePanel.Children.Remove(_moreOptionsButton)", reset);
+        Assert.Contains("_moreOptionsButton = null", reset);
+    }
+
+    [Fact]
+    public void WizardCompletion_AppliesWindowsNodeContextBeforeSummary()
+    {
+        var root = TestRepositoryPaths.GetRepositoryRoot();
+        var source = File.ReadAllText(Path.Combine(root, "src", "OpenClaw.SetupEngine.UI", "Pages", "WizardPage.xaml.cs"));
+        var complete = ExtractMethod(source, "CompleteSetupAsync");
+        var skip = ExtractMethod(source, "SkipWizardAsync");
+        var primary = ExtractMethod(source, "PrimaryClickAsync");
+        var finalizationError = ExtractMethod(source, "ShowFinalizationError");
+
+        AssertInOrder(
+            complete,
+            "ApplyWindowsNodeContextAsync",
+            "if (!contextResult.IsSuccess)",
+            "NavigateToComplete(true");
+        Assert.Contains("await CompleteSetupAsync(generation)", skip);
+        Assert.Contains("_errorState = false", skip);
+        AssertInOrder(
+            primary,
+            "if (_finalizationErrorState)",
+            "_errorState = false",
+            "await CompleteSetupAsync(_operationGeneration)",
+            "await StartWizardAsync()");
+        Assert.Contains("ShowFinalizationError", complete);
+        Assert.Contains("Retry Windows integration", finalizationError);
+    }
+
+    [Fact]
+    public void WizardConnect_UsesActiveGatewayRecordUrl()
+    {
+        var root = TestRepositoryPaths.GetRepositoryRoot();
+        var source = File.ReadAllText(Path.Combine(root, "src", "OpenClaw.SetupEngine.UI", "Pages", "WizardPage.xaml.cs"));
+        var method = ExtractMethod(source, "ConnectClientAsync");
+
+        Assert.Contains("GatewayClientEndpointResolver.Resolve(record)", method);
+        Assert.Contains("new OpenClawGatewayClient(gatewayUrl, token", method);
+        Assert.DoesNotContain("config.EffectiveGatewayUrl", method);
     }
 
     [Fact]
@@ -211,7 +723,7 @@ public void HubBackNavigation_PrunesUnavailableGatewayPages()
 
         Assert.Contains("RemoveUnavailableGatewayBackStackEntries", source);
         Assert.Contains("ContentFrame.BackStack.RemoveAt(i)", source);
-        Assert.Contains("GatewayNavVisibilityDebouncePolicy.IsGatewayPageTag(tag)", source);
+        Assert.Contains("RemoveBackStackEntries(GatewayNavVisibilityDebouncePolicy.IsGatewayPageTag)", source);
         Assert.Contains("RemoveUnavailableGatewayBackStackEntries();", ExtractMethod(source, "GoBack"));
         Assert.Contains("RemoveUnavailableGatewayBackStackEntries();", ExtractMethod(source, "UpdateGatewayNavVisibility"));
     }
@@ -268,10 +780,201 @@ public void SetupUiImages_UseLibraryQualifiedAssetUris()
                 .OrderBy(Path.GetFileName)
                 .Select(File.ReadAllText));
 
-        Assert.Contains("ms-appx:///OpenClaw.SetupEngine.UI/Assets/Setup/Lobster.png", xaml);
+        Assert.Contains("ms-appx:///OpenClaw.SetupEngine.UI/Assets/Setup/OpenClawMascot.png", xaml);
         Assert.DoesNotContain("ms-appx:///Assets/Setup/", xaml);
     }
 
+    [Fact]
+    public void SetupWelcomePage_RunsExistingConfigDetectionOffUiThread()
+    {
+        var root = TestRepositoryPaths.GetRepositoryRoot();
+        var source = File.ReadAllText(Path.Combine(root, "src", "OpenClaw.SetupEngine.UI", "Pages", "WelcomePage.xaml.cs"));
+        var method = ExtractMethod(source, "StartInstallAsync");
+
+        Assert.Contains("NextButton.IsEnabled = false", method);
+        Assert.Contains("InstallTitle.Text = CheckingButtonText", method);
+        Assert.Contains("CheckingButtonText", method);
+        Assert.Contains("var setupWindow = SetupWindow.Active", method);
+        Assert.Contains("await Task.Run(() => ExistingConfigDetector.Detect", method);
+        Assert.Contains("setupWindow is null or { IsClosed: true } || xamlRoot is null", method);
+        Assert.Contains("setupWindow is { IsClosed: false }", method);
+        Assert.Contains("InstallTitle.Text = InstallButtonText", method);
+        Assert.Contains("NextButton.IsEnabled = true", method);
+        AssertInOrder(
+            method,
+            "NextButton.IsEnabled = false",
+            "await Task.Run(() => ExistingConfigDetector.Detect",
+            "setupWindow is null or { IsClosed: true } || xamlRoot is null",
+            "dialog.ShowAsync()",
+            "setupWindow.NavigateToCapabilities()");
+    }
+
+    [Fact]
+    public void WizardErrorState_UsesMoreOptionsAndPreservesTranscriptOnGatewayRestart()
+    {
+        var root = TestRepositoryPaths.GetRepositoryRoot();
+        var source = File.ReadAllText(Path.Combine(root, "src", "OpenClaw.SetupEngine.UI", "Pages", "WizardPage.xaml.cs"));
+        var showError = ExtractMethod(source, "ShowError");
+        var restart = ExtractMethod(source, "RestartGatewayAsync");
+
+        Assert.Contains("SecondaryButton.Visibility = Visibility.Collapsed", showError);
+        Assert.Contains("ShowRecoveryActions()", showError);
+        Assert.DoesNotContain("SecondaryButton.Content = \"Skip wizard\"", showError);
+        Assert.Contains("StartWizardAsync(clearTranscript: false)", restart);
+    }
+
+    [Fact]
+    public void TrayIcon_UpdateDelegatesToCoordinator()
+    {
+        var source = ReadAppSources();
+        var method = ExtractMethod(source, "UpdateTrayIcon");
+
+        Assert.Contains("_trayIconCoordinator?.UpdateTrayIcon()", method);
+        Assert.DoesNotContain("SetIcon(", method);
+        Assert.DoesNotContain("private void ApplyTrayTooltip", source);
+    }
+
+    [Fact]
+    public void TrayCoordinator_UpdateGuardsLivenessBeforeTouchingIcon()
+    {
+        var source = ReadCoordinatorSource();
+        var method = ExtractMethod(source, "UpdateTrayIcon");
+
+        // A queued update can run after shutdown disposes the tray icon, so the
+        // coordinator must bail on the liveness check before it ever calls SetIcon.
+        var guardIndex = method.IndexOf("_isAlive()", StringComparison.Ordinal);
+        var setIconIndex = method.IndexOf("SetIcon(", StringComparison.Ordinal);
+
+        Assert.True(guardIndex >= 0, "UpdateTrayIcon must check the liveness guard");
+        Assert.True(setIconIndex >= 0, "UpdateTrayIcon must still set the icon");
+        Assert.True(guardIndex < setIconIndex, "Liveness guard must run before SetIcon");
+    }
+
+    [Fact]
+    public void AppNotifications_ConnectionIssueUsesStableDedupeKey()
+    {
+        var source = ReadAppSources();
+        var method = ExtractMethod(source, "UpdateConnectionIssueNotification");
+
+        Assert.Contains("private const string ConnectionIssueNotificationDedupeKey = \"connection:issue\"", source);
+        Assert.Contains("ConnectionIssueNotificationDedupeKey", method);
+        Assert.DoesNotContain("$\"connection:{key}\"", method);
+    }
+
+    [Fact]
+    public void AppNotifications_SandboxRiskProbeRunsOffUiPath()
+    {
+        var source = ReadAppSources();
+        var publishMethod = ExtractMethod(source, "PublishSandboxRiskNotificationIfNeeded");
+        var probeMethod = ExtractMethod(source, "StartSandboxRiskProbeIfNeeded");
+
+        Assert.DoesNotContain("MxcAvailability.Probe", publishMethod);
+        Assert.Contains("Task.Run(() => MxcAvailability.Probe", probeMethod);
+        Assert.Contains("ContinueWith", probeMethod);
+    }
+
+    [Fact]
+    public void AppNotifications_SandboxRiskUsesStableDedupeKey()
+    {
+        var source = ReadAppSources();
+
+        Assert.Contains("private const string SandboxRiskNotificationId = \"sandbox:risk\"", source);
+        Assert.Contains("private const string SandboxRiskNotificationDedupeKey = \"sandbox:risk\"", source);
+        Assert.Contains("SandboxRiskNotificationDedupeKey", source);
+        Assert.Contains("id: SandboxRiskNotificationId", source);
+        Assert.DoesNotContain("$\"sandbox:{riskKey}\"", source);
+    }
+
+    [Fact]
+    public void AppNotifications_SandboxRiskMessageReflectsStrictFallbackBlocking()
+    {
+        var source = ReadAppSources();
+        var method = ExtractMethod(source, "PublishSandboxRiskNotification");
+
+        Assert.Contains("SystemRunBlockHostFallbackWhenMxcUnavailable", method);
+        Assert.Contains("AppNotification_SandboxUnavailableBlocked_Title", method);
+        Assert.Contains("AppNotification_SandboxUnavailableBlocked_MessageFormat", method);
+        Assert.Contains("host-fallback", method);
+        Assert.Contains("blocked", method);
+    }
+
+    [Fact]
+    public void SandboxPage_NormalizesDefinitiveUnavailableMxcOff()
+    {
+        var source = ReadSandboxPageSource();
+        var refresh = ExtractMethod(source, "RefreshAvailabilityAsync");
+        var loadState = ExtractMethod(source, "LoadState");
+        var definitiveUnavailable = ExtractMethod(source, "IsSandboxDefinitivelyUnavailable");
+        var normalize = ExtractMethod(source, "NormalizeSandboxToggleForAvailability");
+
+        AssertInOrder(
+            refresh,
+            "NormalizeSandboxToggleForAvailability();",
+            "UpdateSandboxStatusCard();",
+            "UpdateControlsEnabledState();");
+        AssertInOrder(
+            loadState,
+            "NormalizeSandboxToggleForAvailability();",
+            "UpdatePresetHighlight();",
+            "UpdateSandboxStatusCard();",
+            "UpdateControlsEnabledState();");
+        Assert.Contains("HasAnyBackend: false", definitiveUnavailable);
+        Assert.Contains("ProbeErrored: false", definitiveUnavailable);
+        AssertInOrder(
+            normalize,
+            "settings.SystemRunSandboxEnabled",
+            "settings.SystemRunBlockHostFallbackWhenMxcUnavailable",
+            "settings.SystemRunSandboxEnabled = false");
+        Assert.Contains("settings.SystemRunSandboxEnabled = false", normalize);
+        Assert.Contains("SandboxEnabledToggle.IsOn = false", normalize);
+        Assert.Contains("Save();", normalize);
+    }
+
+    [Fact]
+    public void SandboxPage_RejectsTurningOnWhenMxcIsDefinitivelyUnavailable()
+    {
+        var source = ReadSandboxPageSource();
+        var toggle = ExtractMethod(source, "OnSandboxEnabledToggledAsync");
+        var reject = ExtractMethod(source, "RejectSandboxEnableWhenUnavailableAsync");
+
+        AssertInOrder(
+            toggle,
+            "newValue",
+            "!oldValue",
+            "IsSandboxDefinitivelyUnavailable()",
+            "!s.SystemRunBlockHostFallbackWhenMxcUnavailable",
+            "await RejectSandboxEnableWhenUnavailableAsync();",
+            "return;");
+        Assert.Contains("SandboxEnabledToggle.IsOn = false", reject);
+        Assert.Contains("Node Sandbox unavailable", reject);
+        Assert.Contains("usable MXC backend", reject);
+    }
+
+    [Fact]
+    public void ChatSlashPalette_HiddenNoMatchStateDoesNotTrapKeys()
+    {
+        var source = ReadChatComposerSource();
+
+        Assert.Contains("else if (slashActive && Props.AvailableCommands is null)", source);
+        Assert.Contains("No-match input hides the popup", source);
+        Assert.Contains("ordinary composer text", source);
+        Assert.DoesNotContain("var slashLoading = Props.AvailableCommands is null;", source);
+    }
+
+    private static string ReadCoordinatorSource()
+    {
+        var root = TestRepositoryPaths.GetRepositoryRoot();
+        return File.ReadAllText(Path.Combine(
+            root, "src", "OpenClaw.Tray.WinUI", "Services", "TrayIconCoordinator.cs"));
+    }
+
+    private static string ReadWslKeepAliveServiceSource()
+    {
+        var root = TestRepositoryPaths.GetRepositoryRoot();
+        return File.ReadAllText(Path.Combine(
+            root, "src", "OpenClaw.Tray.WinUI", "Services", "WslGatewayKeepAliveService.cs"));
+    }
+
     private static string ReadAppSources()
     {
         var root = TestRepositoryPaths.GetRepositoryRoot();
@@ -284,11 +987,25 @@ private static string ReadAppSources()
                 .Select(File.ReadAllText));
     }
 
+    private static string ReadSandboxPageSource()
+    {
+        var root = TestRepositoryPaths.GetRepositoryRoot();
+        return File.ReadAllText(Path.Combine(
+            root, "src", "OpenClaw.Tray.WinUI", "Pages", "SandboxPage.xaml.cs"));
+    }
+
+    private static string ReadChatComposerSource()
+    {
+        var root = TestRepositoryPaths.GetRepositoryRoot();
+        return File.ReadAllText(Path.Combine(
+            root, "src", "OpenClaw.Tray.WinUI", "Chat", "ChatComposer.cs"));
+    }
+
     private static string ExtractMethod(string source, string methodName)
     {
         var match = Regex.Match(
             source,
-            $@"(?m)^\s*(?:private|protected|public|internal)\s+(?:async\s+)?(?:Task(?:<[^>]+>)?|void|bool|string\??|IntPtr|OpenClaw\.Connection\.GatewayCredential\?)\s+{Regex.Escape(methodName)}\s*\(");
+            $@"(?m)^\s*(?:private|protected|public|internal)\s+(?:static\s+)?(?:async\s+)?(?:Task(?:<[^>]+>)?|System\.Threading\.Tasks\.Task|void|bool|int|string\??|object\??|IntPtr|OpenClaw\.Connection\.GatewayCredential\?)\s+{Regex.Escape(methodName)}\s*\(");
         Assert.True(match.Success, $"Could not find method {methodName}.");
 
         var brace = source.IndexOf('{', match.Index);
diff --git a/tests/OpenClaw.Tray.Tests/AssistantBridgeServiceTests.cs b/tests/OpenClaw.Tray.Tests/AssistantBridgeServiceTests.cs
new file mode 100644
index 000000000..498cfe49f
--- /dev/null
+++ b/tests/OpenClaw.Tray.Tests/AssistantBridgeServiceTests.cs
@@ -0,0 +1,294 @@
+using OpenClaw.Shared;
+using OpenClawTray.Services;
+using System.Diagnostics;
+
+namespace OpenClaw.Tray.Tests;
+
+public sealed class AssistantBridgeServiceTests
+{
+    [Fact]
+    public void ParseStatus_ReadsListenServiceAndRecentTurns()
+    {
+        const string json = """
+        {
+          "generated_at": "2026-06-21T19:40:30+00:00",
+          "user_id": "owner",
+          "assistant": {
+            "listen_service": {
+              "allow_cloud": true,
+              "configured": true,
+              "input_mode": "always-listening",
+              "log_file": "C:\\Users\\RipauvGohil\\AppData\\Local\\OpenClaw\\runtime\\assistant-listen-owner.log",
+              "pid": 20656,
+              "speak_aloud": true,
+              "status": "running",
+              "transcriber": "local-whisper"
+            },
+            "recent_turns": [
+              {
+                "created_at": "2026-06-21T19:26:59+00:00",
+                "source": "local-whisper",
+                "input_text": "OpenClaw, say only live voice smoke ok.",
+                "display_response_text": "live voice smoke ok",
+                "provider": "local-openai-compatible",
+                "model_profile": "local-private",
+                "stage": "answered",
+                "total_ms": 23502
+              }
+            ]
+          },
+          "voice": {
+            "preferred_input_device": "Microphone (Yeti Nano)",
+            "preferred_output_device": "LG TV SSCR2 (NVIDIA High Definition Audio)"
+          }
+        }
+        """;
+
+        var snapshot = AssistantBridgeService.ParseStatus(json);
+
+        Assert.True(snapshot.IsAvailable);
+        Assert.Equal("owner", snapshot.UserId);
+        Assert.Equal("2026-06-21T19:40:30+00:00", snapshot.GeneratedAt);
+        Assert.Equal("Microphone (Yeti Nano)", snapshot.PreferredInputDevice);
+        Assert.Equal("LG TV SSCR2 (NVIDIA High Definition Audio)", snapshot.PreferredOutputDevice);
+        Assert.True(snapshot.ListenService.IsRunning);
+        Assert.True(snapshot.ListenService.AllowCloud);
+        Assert.True(snapshot.ListenService.SpeakAloud);
+        Assert.Equal(20656, snapshot.ListenService.Pid);
+        Assert.Equal("local-whisper", snapshot.ListenService.Transcriber);
+        Assert.Single(snapshot.RecentTurns);
+        Assert.Equal("OpenClaw, say only live voice smoke ok.", snapshot.RecentTurns[0].InputText);
+        Assert.Equal("live voice smoke ok", snapshot.RecentTurns[0].ResponseText);
+        Assert.Equal(23502, snapshot.RecentTurns[0].TotalMs);
+    }
+
+    [Fact]
+    public void ResolveOpenClawCli_PrefersBackendRootEnvironmentOverride()
+    {
+        var oldValue = Environment.GetEnvironmentVariable("OPENCLAW_BACKEND_ROOT");
+        var root = Path.Combine(
+            Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
+            "Projects",
+            "OpenClaw.Tray.Tests",
+            Guid.NewGuid().ToString("N"));
+        try
+        {
+            var scripts = Path.Combine(root, ".venv", "Scripts");
+            Directory.CreateDirectory(scripts);
+            var exe = Path.Combine(scripts, "openclaw.exe");
+            File.WriteAllText(exe, "");
+
+            Environment.SetEnvironmentVariable("OPENCLAW_BACKEND_ROOT", root);
+
+            var launcher = AssistantBridgeService.ResolveOpenClawCli();
+
+            Assert.NotNull(launcher);
+            Assert.Equal(exe, launcher!.ExecutablePath);
+            Assert.Equal(root, launcher.WorkingDirectory);
+            Assert.Empty(launcher.PrefixArgs);
+        }
+        finally
+        {
+            Environment.SetEnvironmentVariable("OPENCLAW_BACKEND_ROOT", oldValue);
+            try { Directory.Delete(root, recursive: true); } catch { }
+        }
+    }
+
+    [Fact]
+    public void ResolveOpenClawCli_IgnoresBackendRootOutsideTrustedParents()
+    {
+        var oldValue = Environment.GetEnvironmentVariable("OPENCLAW_BACKEND_ROOT");
+        var root = Path.Combine(Path.GetTempPath(), "OpenClaw.Tray.Tests", Guid.NewGuid().ToString("N"));
+        try
+        {
+            var scripts = Path.Combine(root, ".venv", "Scripts");
+            Directory.CreateDirectory(scripts);
+            var exe = Path.Combine(scripts, "openclaw.exe");
+            File.WriteAllText(exe, "");
+
+            Environment.SetEnvironmentVariable("OPENCLAW_BACKEND_ROOT", root);
+
+            var launcher = AssistantBridgeService.ResolveOpenClawCli();
+
+            Assert.True(
+                launcher == null || !string.Equals(launcher.ExecutablePath, exe, StringComparison.OrdinalIgnoreCase),
+                "OPENCLAW_BACKEND_ROOT should not execute arbitrary binaries outside trusted checkout parents.");
+        }
+        finally
+        {
+            Environment.SetEnvironmentVariable("OPENCLAW_BACKEND_ROOT", oldValue);
+            try { Directory.Delete(root, recursive: true); } catch { }
+        }
+    }
+
+    [Fact]
+    public void TryNormalizeBackendRoot_RejectsRelativePaths()
+    {
+        Assert.False(AssistantBridgeService.TryNormalizeBackendRoot("OpenClaw", out _));
+    }
+
+    [Fact]
+    public void TryNormalizeBackendRoot_AcceptsTrustedCheckoutParents()
+    {
+        var root = Path.Combine(
+            Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
+            "Projects",
+            "OpenClaw");
+
+        Assert.True(AssistantBridgeService.TryNormalizeBackendRoot(root, out var normalizedRoot));
+        Assert.Equal(Path.GetFullPath(root), normalizedRoot);
+    }
+
+    [Fact]
+    public void BuildBackendNotFoundMessage_ListsSearchedLocations()
+    {
+        var message = AssistantBridgeService.BuildBackendNotFoundMessage();
+
+        Assert.Contains("Searched:", message);
+        Assert.Contains(@"D:\Projects\OpenClaw", message);
+        Assert.Contains("OPENCLAW_BACKEND_ROOT", message);
+    }
+
+    [Fact]
+    public async Task StartListenServiceAsync_DefaultsToLocalAssistantRouting()
+    {
+        var root = Path.Combine(Path.GetTempPath(), "OpenClaw.Tray.Tests", Guid.NewGuid().ToString("N"));
+        var argsPath = Path.Combine(root, "args.txt");
+        Directory.CreateDirectory(root);
+        try
+        {
+            var scriptPath = Path.Combine(root, "capture-args.ps1");
+            File.WriteAllText(
+                scriptPath,
+                $"Set-Content -LiteralPath {PsQuote(argsPath)} -Value ($args -join [Environment]::NewLine)");
+            var launcher = PowerShellScriptLauncher(scriptPath, root);
+            var service = new AssistantBridgeService(
+                NullLogger.Instance,
+                "owner",
+                () => launcher);
+
+            var result = await service.StartListenServiceAsync();
+
+            Assert.True(result.Success, result.ErrorMessage);
+            var args = File.ReadAllLines(argsPath);
+            Assert.Contains("assistant", args);
+            Assert.Contains("listen-service", args);
+            Assert.Contains("start", args);
+            Assert.Contains("--store-turn", args);
+            Assert.Contains("--json", args);
+            Assert.DoesNotContain("--allow-cloud", args);
+        }
+        finally
+        {
+            try { Directory.Delete(root, recursive: true); } catch { }
+        }
+    }
+
+    [Fact]
+    public async Task StartListenServiceAsync_KillsTimedOutBackendCommand()
+    {
+        var root = Path.Combine(Path.GetTempPath(), "OpenClaw.Tray.Tests", Guid.NewGuid().ToString("N"));
+        var pidPath = Path.Combine(root, "pid.txt");
+        Directory.CreateDirectory(root);
+        int? pid = null;
+        try
+        {
+            var scriptPath = Path.Combine(root, "sleep.ps1");
+            File.WriteAllText(
+                scriptPath,
+                $"Set-Content -LiteralPath {PsQuote(pidPath)} -Value $PID; Start-Sleep -Seconds 30");
+            var launcher = PowerShellScriptLauncher(scriptPath, root);
+            var service = new AssistantBridgeService(
+                NullLogger.Instance,
+                "owner",
+                () => launcher,
+                TimeSpan.FromSeconds(5));
+
+            var result = await service.StartListenServiceAsync();
+
+            Assert.False(result.Success);
+            Assert.Contains("timed out", result.ErrorMessage, StringComparison.OrdinalIgnoreCase);
+            pid = await ReadPidAsync(pidPath);
+            Assert.True(
+                await WaitForProcessExitAsync(pid.Value),
+                $"Expected timed-out backend process {pid.Value} to be killed.");
+        }
+        finally
+        {
+            if (pid is int runningPid)
+                TryKillProcess(runningPid);
+            try { Directory.Delete(root, recursive: true); } catch { }
+        }
+    }
+
+    private static OpenClawCliLauncher PowerShellScriptLauncher(string scriptPath, string workingDirectory)
+    {
+        var exe = Path.Combine(
+            Environment.GetFolderPath(Environment.SpecialFolder.System),
+            "WindowsPowerShell",
+            "v1.0",
+            "powershell.exe");
+        if (!File.Exists(exe))
+            exe = "powershell.exe";
+
+        return new OpenClawCliLauncher(
+            exe,
+            workingDirectory,
+            ["-NoProfile", "-ExecutionPolicy", "Bypass", "-File", scriptPath]);
+    }
+
+    private static string PsQuote(string value) => "'" + value.Replace("'", "''") + "'";
+
+    private static async Task<int> ReadPidAsync(string pidPath)
+    {
+        for (var i = 0; i < 50; i++)
+        {
+            if (File.Exists(pidPath) &&
+                int.TryParse((await File.ReadAllTextAsync(pidPath)).Trim(), out var pid))
+            {
+                return pid;
+            }
+
+            await Task.Delay(100);
+        }
+
+        Assert.Fail("Timed-out backend command did not write its process id.");
+        return 0;
+    }
+
+    private static async Task<bool> WaitForProcessExitAsync(int pid)
+    {
+        for (var i = 0; i < 50; i++)
+        {
+            try
+            {
+                using var process = Process.GetProcessById(pid);
+                if (process.HasExited)
+                    return true;
+            }
+            catch (ArgumentException)
+            {
+                return true;
+            }
+
+            await Task.Delay(100);
+        }
+
+        return false;
+    }
+
+    private static void TryKillProcess(int pid)
+    {
+        try
+        {
+            using var process = Process.GetProcessById(pid);
+            process.Kill(entireProcessTree: true);
+        }
+        catch (ArgumentException)
+        {
+        }
+        catch (InvalidOperationException)
+        {
+        }
+    }
+}
diff --git a/tests/OpenClaw.Tray.Tests/BrandMarkContractTests.cs b/tests/OpenClaw.Tray.Tests/BrandMarkContractTests.cs
new file mode 100644
index 000000000..973a629d8
--- /dev/null
+++ b/tests/OpenClaw.Tray.Tests/BrandMarkContractTests.cs
@@ -0,0 +1,85 @@
+namespace OpenClaw.Tray.Tests;
+
+public sealed class BrandMarkContractTests
+{
+    private const string LobsterEmoji = "\ud83e\udd9e";
+    private const string RobotEmoji = "\ud83e\udd16";
+    private const string RedBotAssetName = "Square44x44Logo.targetsize-256_altform-unplated.png";
+    private static string RepoRoot => TestRepositoryPaths.GetRepositoryRoot();
+
+    private static string ReadTrayFile(params string[] pathParts)
+        => File.ReadAllText(Path.Combine(new[] { RepoRoot, "src", "OpenClaw.Tray.WinUI" }.Concat(pathParts).ToArray()));
+
+    [Fact]
+    public void BrandMark_UsesSharedRedBotImageAsset()
+    {
+        var xaml = ReadTrayFile("Controls", "BrandMark.xaml");
+        var code = ReadTrayFile("Controls", "BrandMark.xaml.cs");
+        var assets = ReadTrayFile("Helpers", "BrandAssets.cs");
+        var redBotAssetPath = Path.Combine(
+            RepoRoot,
+            "src",
+            "OpenClaw.Tray.WinUI",
+            "Assets",
+            RedBotAssetName);
+
+        Assert.Contains("<Image", xaml);
+        Assert.Contains("AutomationProperties.AccessibilityView=\"Raw\"", xaml);
+        Assert.Contains("IsHitTestVisible=\"False\"", xaml);
+        Assert.Contains("IsTabStop=\"False\"", xaml);
+        Assert.Contains("BrandAssets.CreateRedBotMarkSource()", code);
+        Assert.Contains(RedBotAssetName, assets);
+        Assert.True(File.Exists(redBotAssetPath), $"BrandMark asset is missing: {redBotAssetPath}");
+        Assert.DoesNotContain("FontIcon", xaml);
+        Assert.DoesNotContain($"Text=\"{LobsterEmoji}\"", xaml);
+    }
+
+    [Fact]
+    public void KnownBrandSurfaces_UseBrandMark()
+    {
+        Assert.Contains("controls:BrandMark", ReadTrayFile("Windows", "HubWindow.xaml"));
+        Assert.Contains("controls:BrandMark", ReadTrayFile("Pages", "AgentEventsPage.xaml"));
+
+        var expectedCodeFiles = new[]
+        {
+            Path.Combine("Dialogs", "WelcomeDialog.cs"),
+            Path.Combine("Dialogs", "PairingApprovalDialog.cs"),
+            Path.Combine("Dialogs", "RecordingConsentDialog.cs"),
+        };
+
+        foreach (var file in expectedCodeFiles)
+        {
+            Assert.Contains("new BrandMark", ReadTrayFile(file.Split(Path.DirectorySeparatorChar)));
+        }
+    }
+
+    [Fact]
+    public void TrayWinUiSources_DoNotRenderEmojiBrandMarks()
+    {
+        var sourceRoot = Path.Combine(RepoRoot, "src", "OpenClaw.Tray.WinUI");
+        var offenders = Directory
+            .EnumerateFiles(sourceRoot, "*", SearchOption.AllDirectories)
+            .Where(path => path.EndsWith(".cs", StringComparison.OrdinalIgnoreCase)
+                || path.EndsWith(".xaml", StringComparison.OrdinalIgnoreCase))
+            .Where(path => !IsBuildArtifact(sourceRoot, path))
+            .SelectMany(path => File.ReadLines(path)
+                .Select((line, index) => (path, line, lineNumber: index + 1)))
+            .Where(item => item.line.Contains(LobsterEmoji, StringComparison.Ordinal)
+                || item.line.Contains(RobotEmoji, StringComparison.Ordinal))
+            .Select(item => $"{Path.GetRelativePath(RepoRoot, item.path)}:{item.lineNumber}")
+            .ToArray();
+
+        Assert.True(
+            offenders.Length == 0,
+            "Use the shared BrandMark control instead of emoji brand marks:"
+            + Environment.NewLine
+            + string.Join(Environment.NewLine, offenders));
+
+        static bool IsBuildArtifact(string sourceRoot, string path)
+        {
+            var relative = Path.GetRelativePath(sourceRoot, path);
+            return relative.StartsWith($"bin{Path.DirectorySeparatorChar}", StringComparison.OrdinalIgnoreCase)
+                || relative.StartsWith($"obj{Path.DirectorySeparatorChar}", StringComparison.OrdinalIgnoreCase);
+        }
+    }
+}
diff --git a/tests/OpenClaw.Tray.Tests/CanvasGatewayUrlRewriterTests.cs b/tests/OpenClaw.Tray.Tests/CanvasGatewayUrlRewriterTests.cs
new file mode 100644
index 000000000..5d91a3713
--- /dev/null
+++ b/tests/OpenClaw.Tray.Tests/CanvasGatewayUrlRewriterTests.cs
@@ -0,0 +1,46 @@
+using OpenClawTray.Helpers;
+
+namespace OpenClaw.Tray.Tests;
+
+public class CanvasGatewayUrlRewriterTests
+{
+    [Fact]
+    public void Rewrite_LeavesExternalUrlUntouched()
+    {
+        var rewritten = CanvasGatewayUrlRewriter.Rewrite(
+            "https://example.com/path?q=1",
+            "http://localhost:18789",
+            "https://gateway.example");
+
+        Assert.Equal("https://example.com/path?q=1", rewritten);
+    }
+
+    [Fact]
+    public void Rewrite_MapsConfiguredGatewayOriginToEffectiveTunnelOrigin()
+    {
+        var rewritten = CanvasGatewayUrlRewriter.Rewrite(
+            "https://gateway.example/__openclaw__/a2ui/?session=main",
+            CanvasGatewayUrlRewriter.ToHttpOrigin("ws://localhost:18789"),
+            CanvasGatewayUrlRewriter.ToHttpOrigin("wss://gateway.example"));
+
+        Assert.Equal("http://localhost:18789/__openclaw__/a2ui/?session=main", rewritten);
+    }
+
+    [Fact]
+    public void Rewrite_MapsRelativePathToEffectiveGatewayOrigin()
+    {
+        var rewritten = CanvasGatewayUrlRewriter.Rewrite(
+            "/__openclaw__/a2ui/",
+            "http://localhost:18789",
+            "https://gateway.example");
+
+        Assert.Equal("http://localhost:18789/__openclaw__/a2ui/", rewritten);
+    }
+
+    [Fact]
+    public void ToHttpOrigin_NormalizesWebSocketUrls()
+    {
+        Assert.Equal("https://gateway.example:443", CanvasGatewayUrlRewriter.ToHttpOrigin("wss://gateway.example"));
+        Assert.Equal("http://localhost:18789", CanvasGatewayUrlRewriter.ToHttpOrigin("ws://localhost:18789"));
+    }
+}
diff --git a/tests/OpenClaw.Tray.Tests/ChatMarkdownSanitizerTests.cs b/tests/OpenClaw.Tray.Tests/ChatMarkdownSanitizerTests.cs
index e3b5bf730..7db141c2d 100644
--- a/tests/OpenClaw.Tray.Tests/ChatMarkdownSanitizerTests.cs
+++ b/tests/OpenClaw.Tray.Tests/ChatMarkdownSanitizerTests.cs
@@ -326,7 +326,7 @@ public void Sanitize_IndentedCodeBlock_PreservesLinkSyntax()
     // ── chat rubber-duck round 2 MEDIUM 3: LinkBuilder hook safety ──
     //
     // These exercise the pure plain-text helper that the WinUI
-    // OpenClawChatTimeline wires into MarkdownOptions.LinkBuilder. The
+    // ChatTimeline wires into MarkdownOptions.LinkBuilder. The
     // contract: no matter what shape the parser produces (autolink,
     // bare URL, full ``[text](url)`` after sanitization, nested image
     // inside a link), the LinkBuilder collapses it to inert text
diff --git a/tests/OpenClaw.Tray.Tests/ChatModelChoiceTests.cs b/tests/OpenClaw.Tray.Tests/ChatModelChoiceTests.cs
new file mode 100644
index 000000000..1b31d2ae6
--- /dev/null
+++ b/tests/OpenClaw.Tray.Tests/ChatModelChoiceTests.cs
@@ -0,0 +1,285 @@
+using OpenClaw.Chat;
+using OpenClaw.Shared;
+
+namespace OpenClaw.Tray.Tests;
+
+public class ChatModelChoiceTests
+{
+    // ── FromModelsList mapping ───────────────────────────────────────────
+
+    [Fact]
+    public void FromModelsList_MapsAllFields()
+    {
+        var info = new ModelsListInfo
+        {
+            Models =
+            {
+                new ModelInfo
+                {
+                    Id = "claude-opus-4.8",
+                    Name = "Claude Opus 4.8",
+                    Provider = "Anthropic",
+                    ContextWindow = 200000,
+                    IsConfigured = true,
+                    IsDefault = true,
+                    IsAvailable = true,
+                    RequiresAuth = false,
+                },
+            }
+        };
+
+        var choices = ChatModelChoice.FromModelsList(info);
+
+        var c = Assert.Single(choices);
+        Assert.Equal("claude-opus-4.8", c.Id);
+        Assert.Equal("Anthropic/claude-opus-4.8", c.SelectionId);
+        Assert.Equal("Claude Opus 4.8", c.DisplayName);
+        Assert.Equal("Anthropic", c.Provider);
+        Assert.Equal(200000, c.ContextWindow);
+        Assert.True(c.IsConfigured);
+        Assert.True(c.IsDefault);
+        Assert.True(c.IsAvailable);
+        Assert.True(c.IsSelectable);
+    }
+
+    [Fact]
+    public void FromModelsList_DedupesBySelectionId_FirstWins_SkipsEmptyIds()
+    {
+        var info = new ModelsListInfo
+        {
+            Models =
+            {
+                new ModelInfo { Id = "gpt-5.4", Name = "GPT-5.4", Provider = "openai" },
+                new ModelInfo { Id = "gpt-5.4", Name = "GPT-5.4 via OpenRouter", Provider = "openrouter" },
+                new ModelInfo { Id = "gpt-5.4", Name = "dupe", Provider = "openai" },
+                new ModelInfo { Id = "", Name = "blank" },
+            }
+        };
+
+        var choices = ChatModelChoice.FromModelsList(info);
+
+        Assert.Equal(2, choices.Count);
+        Assert.Equal("GPT-5.4", choices[0].DisplayName);
+        Assert.Equal("openai/gpt-5.4", choices[0].SelectionId);
+        Assert.Equal("GPT-5.4 via OpenRouter", choices[1].DisplayName);
+        Assert.Equal("openrouter/gpt-5.4", choices[1].SelectionId);
+    }
+
+    [Fact]
+    public void FromModelsList_NullOrEmpty_ReturnsEmpty()
+    {
+        Assert.Empty(ChatModelChoice.FromModelsList(null));
+        Assert.Empty(ChatModelChoice.FromModelsList(new ModelsListInfo()));
+    }
+
+    [Fact]
+    public void FromModelsList_FallsBackToIdWhenNameMissing()
+    {
+        var info = new ModelsListInfo { Models = { new ModelInfo { Id = "ollama-x" } } };
+        Assert.Equal("ollama-x", ChatModelChoice.FromModelsList(info)[0].DisplayName);
+    }
+
+    [Fact]
+    public void FromModelsList_HidesExplicitlyUnconfiguredModels()
+    {
+        var info = new ModelsListInfo
+        {
+            Models =
+            {
+                // Provider explicitly reported as not configured with no auth path → hidden.
+                new ModelInfo { Id = "unconfigured", HasConfiguredFlag = true, IsConfigured = false },
+                // Auth-needed rows stay visible so users can choose the provider-auth path.
+                new ModelInfo { Id = "needs-key", HasConfiguredFlag = true, IsConfigured = false, RequiresAuth = true },
+                // Configured → kept.
+                new ModelInfo { Id = "ready", HasConfiguredFlag = true, IsConfigured = true },
+                // Flag omitted entirely → kept (we don't know, so don't hide).
+                new ModelInfo { Id = "unknown" },
+            }
+        };
+
+        var choices = ChatModelChoice.FromModelsList(info);
+        Assert.Equal(new[] { "needs-key", "ready", "unknown" }, choices.Select(c => c.Id).ToArray());
+        Assert.True(choices[0].RequiresAuth);
+        Assert.True(choices[0].IsSelectable);
+    }
+
+    // ── Selectability ────────────────────────────────────────────────────
+
+    [Fact]
+    public void IsSelectable_FalseOnlyWhenUnavailable()
+    {
+        Assert.True(new ChatModelChoice("x", "X").IsSelectable);
+        // Auth-needed stays selectable (routes to provider auth).
+        Assert.True(new ChatModelChoice("x", "X", RequiresAuth: true).IsSelectable);
+        Assert.False(new ChatModelChoice("x", "X", IsAvailable: false).IsSelectable);
+    }
+
+    [Theory]
+    [InlineData("gpt-5.4", "openai", "openai/gpt-5.4")]
+    [InlineData("openai/gpt-5.4", "openai", "openai/gpt-5.4")]
+    [InlineData("openai/gpt-5.4", "vercel-ai-gateway", "vercel-ai-gateway/openai/gpt-5.4")]
+    [InlineData("custom-model", null, "custom-model")]
+    public void SelectionId_ProviderQualifiesRawModelIds(string modelId, string? provider, string expected)
+    {
+        var c = new ChatModelChoice(modelId, modelId, Provider: provider);
+        Assert.Equal(expected, c.SelectionId);
+    }
+
+    [Fact]
+    public void ResolveSelectionId_UsesProviderToDisambiguateDuplicateRawModelIds()
+    {
+        var choices = new[]
+        {
+            new ChatModelChoice("gpt-5.4", "GPT-5.4", Provider: "openai"),
+            new ChatModelChoice("gpt-5.4", "GPT-5.4", Provider: "openrouter"),
+        };
+
+        Assert.Equal(
+            "openrouter/gpt-5.4",
+            ChatModelChoice.ResolveSelectionId("gpt-5.4", "openrouter", choices));
+        Assert.Equal("gpt-5.4", ChatModelChoice.ResolveSelectionId("gpt-5.4", null, choices));
+    }
+
+    [Fact]
+    public void ResolveSelectionId_MatchesProviderCaseInsensitively()
+    {
+        var choices = new[]
+        {
+            new ChatModelChoice("gpt-5.4", "GPT-5.4", Provider: "Anthropic"),
+        };
+
+        Assert.Equal(
+            "Anthropic/gpt-5.4",
+            ChatModelChoice.ResolveSelectionId("gpt-5.4", "anthropic", choices));
+    }
+
+    [Fact]
+    public void ResolveSelectionId_UsesBareCachedChoiceWhenProviderRichChoiceIsUnavailable()
+    {
+        var choices = new[]
+        {
+            new ChatModelChoice("gpt-5.4", "GPT-5.4"),
+        };
+
+        Assert.Equal("gpt-5.4", ChatModelChoice.ResolveSelectionId("gpt-5.4", "openrouter", choices));
+    }
+
+    // ── Tracking-default predicate ───────────────────────────────────────
+
+    [Theory]
+    [InlineData(null, true)]
+    [InlineData("", true)]
+    [InlineData("gpt-5.5", false)]
+    public void IsTrackingDefault_DetectsEmptyOrNull(string? id, bool expected) =>
+        Assert.Equal(expected, ChatModelLabels.IsTrackingDefault(id));
+
+    // ── Context-window formatting ────────────────────────────────────────
+
+    [Theory]
+    [InlineData(272000, "272K")]
+    [InlineData(200000, "200K")]
+    [InlineData(128000, "128K")]
+    [InlineData(1000000, "1M")]
+    [InlineData(2000000, "2M")]
+    [InlineData(1500000, "1.5M")]
+    [InlineData(8000, "8K")]
+    [InlineData(500, "500")]
+    [InlineData(0, "")]
+    public void FormatContextWindow_FormatsCompactly(int contextWindow, string expected) =>
+        Assert.Equal(expected, ChatModelLabels.FormatContextWindow(contextWindow));
+
+    // ── Meta segment ─────────────────────────────────────────────────────
+
+    [Fact]
+    public void BuildMetaSegment_CombinesProviderAndContext()
+    {
+        var c = new ChatModelChoice("x", "X", Provider: "OpenAI", ContextWindow: 272000);
+        Assert.Equal("OpenAI · 272K", ChatModelLabels.BuildMetaSegment(c));
+    }
+
+    [Fact]
+    public void BuildMetaSegment_ProviderOnly()
+    {
+        var c = new ChatModelChoice("x", "X", Provider: "OpenAI");
+        Assert.Equal("OpenAI", ChatModelLabels.BuildMetaSegment(c));
+    }
+
+    [Fact]
+    public void BuildMetaSegment_ContextOnly()
+    {
+        var c = new ChatModelChoice("x", "X", ContextWindow: 200000);
+        Assert.Equal("200K", ChatModelLabels.BuildMetaSegment(c));
+    }
+
+    [Fact]
+    public void BuildMetaSegment_NeitherKnown_ReturnsEmpty() =>
+        Assert.Equal("", ChatModelLabels.BuildMetaSegment(new ChatModelChoice("x", "X")));
+
+    // ── State markers ────────────────────────────────────────────────────
+
+    [Fact]
+    public void BuildStateMarker_Unavailable_TakesPrecedence()
+    {
+        var c = new ChatModelChoice("x", "X", IsAvailable: false, RequiresAuth: true, IsDefault: true);
+        Assert.Equal("unavailable", ChatModelLabels.BuildStateMarker(c));
+    }
+
+    [Fact]
+    public void BuildStateMarker_AuthNeeded_BeforeDefault()
+    {
+        var c = new ChatModelChoice("x", "X", RequiresAuth: true, IsDefault: true);
+        Assert.Equal("auth needed", ChatModelLabels.BuildStateMarker(c));
+    }
+
+    [Fact]
+    public void BuildStateMarker_Default()
+    {
+        var c = new ChatModelChoice("x", "X", IsDefault: true);
+        Assert.Equal("default", ChatModelLabels.BuildStateMarker(c));
+    }
+
+    [Fact]
+    public void BuildStateMarker_MissingConfiguredFlag_IsNotAuthNeeded()
+    {
+        // Gateway's "configured" view often omits the flag; absence must not be
+        // mistaken for an auth requirement.
+        var c = new ChatModelChoice("x", "X", IsConfigured: false);
+        Assert.Equal("", ChatModelLabels.BuildStateMarker(c));
+    }
+
+    // ── Full menu label ──────────────────────────────────────────────────
+
+    [Fact]
+    public void BuildMenuLabel_Full()
+    {
+        var c = new ChatModelChoice("claude-opus-4.8", "Claude Opus 4.8", Provider: "Anthropic", ContextWindow: 200000, IsDefault: true);
+        Assert.Equal("Claude Opus 4.8 · Anthropic · 200K · default", ChatModelLabels.BuildMenuLabel(c));
+    }
+
+    [Fact]
+    public void BuildMenuLabel_AuthNeeded()
+    {
+        var c = new ChatModelChoice("gemini-3.1-pro", "Gemini 3.1 Pro", Provider: "Google", ContextWindow: 1000000, RequiresAuth: true);
+        Assert.Equal("Gemini 3.1 Pro · Google · 1M · auth needed", ChatModelLabels.BuildMenuLabel(c));
+    }
+
+    [Fact]
+    public void BuildMenuLabel_BareModel()
+    {
+        var c = new ChatModelChoice("custom-id", "custom-id");
+        Assert.Equal("custom-id", ChatModelLabels.BuildMenuLabel(c));
+    }
+
+    // ── Default (clear-to-default) entry label ───────────────────────────
+
+    [Fact]
+    public void BuildDefaultEntryLabel_NamesDefaultModelWhenKnown()
+    {
+        var def = new ChatModelChoice("claude-opus-4.8", "Claude Opus 4.8", IsDefault: true);
+        Assert.Equal("Default (Claude Opus 4.8)", ChatModelLabels.BuildDefaultEntryLabel(def));
+    }
+
+    [Fact]
+    public void BuildDefaultEntryLabel_PlainWhenDefaultUnknown() =>
+        Assert.Equal("Default", ChatModelLabels.BuildDefaultEntryLabel(null));
+}
diff --git a/tests/OpenClaw.Tray.Tests/ChatPermissionRenderingContractTests.cs b/tests/OpenClaw.Tray.Tests/ChatPermissionRenderingContractTests.cs
new file mode 100644
index 000000000..7b32003cd
--- /dev/null
+++ b/tests/OpenClaw.Tray.Tests/ChatPermissionRenderingContractTests.cs
@@ -0,0 +1,26 @@
+namespace OpenClaw.Tray.Tests;
+
+public sealed class ChatPermissionRenderingContractTests
+{
+    [Fact]
+    public void PendingPermission_RendersGatewayProvidedActionsIncludingAllowAlways()
+    {
+        var timeline = Read("src", "OpenClaw.Tray.WinUI", "Chat", "ChatTimeline.cs");
+
+        Assert.Contains("ChatPermissionActionKeys.NormalizeActions(entry.PermissionActions)", timeline);
+        Assert.Contains("ChatPermissionActionKeys.AllowAlways => allowAlwaysLabel", timeline);
+        Assert.Contains("onResponse?.Invoke(requestId, action)", timeline);
+    }
+
+    [Fact]
+    public void DecidedPermission_RendersAllowedAlwaysAsAlwaysAllowed()
+    {
+        var timeline = Read("src", "OpenClaw.Tray.WinUI", "Chat", "ChatTimeline.cs");
+
+        Assert.Contains("ChatPermissionDecision.AllowedAlways", timeline);
+        Assert.Contains("Chat_Permission_DecisionAlwaysAllowed", timeline);
+    }
+
+    private static string Read(params string[] parts)
+        => File.ReadAllText(Path.Combine(new[] { TestRepositoryPaths.GetRepositoryRoot() }.Concat(parts).ToArray()));
+}
diff --git a/tests/OpenClaw.Tray.Tests/ChatTimelineReducerTests.cs b/tests/OpenClaw.Tray.Tests/ChatTimelineReducerTests.cs
index 27dd9a47c..0d0133a5e 100644
--- a/tests/OpenClaw.Tray.Tests/ChatTimelineReducerTests.cs
+++ b/tests/OpenClaw.Tray.Tests/ChatTimelineReducerTests.cs
@@ -5,6 +5,24 @@ namespace OpenClaw.Tray.Tests;
 
 public class ChatTimelineReducerTests
 {
+    [Fact]
+    public void ChatPermissionDecision_ExistingNumericValuesRemainStable()
+    {
+        Assert.Equal(0, (int)ChatPermissionDecision.Pending);
+        Assert.Equal(1, (int)ChatPermissionDecision.Allowed);
+        Assert.Equal(2, (int)ChatPermissionDecision.Denied);
+        Assert.Equal(3, (int)ChatPermissionDecision.Expired);
+        Assert.Equal(4, (int)ChatPermissionDecision.AllowedAlways);
+    }
+
+    [Fact]
+    public void NormalizeActions_FallsBackToDefaults_WhenProvidedActionsAreBlank()
+    {
+        var actions = ChatPermissionActionKeys.NormalizeActions(["", "   "]);
+
+        Assert.Equal(ChatPermissionActionKeys.ExecApprovalDefaults, actions);
+    }
+
     [Fact]
     public void ToolStart_BeginsTurnWhenLifecycleStartWasMissed()
     {
@@ -421,7 +439,7 @@ public void TurnEnd_MarksInProgressToolAsInterrupted()
     // When a tool call fails and the assistant then sends a final reply, both
     // entries should be present in state, the turn should end cleanly, and the
     // ToolCall entry should precede the Assistant entry in the insertion order
-    // (the rendering layer in OpenClawChatTimeline reorders them for display).
+    // (the rendering layer in ChatTimeline reorders them for display).
 
     [Fact]
     public void ToolError_ThenFinalAssistant_ProducesToolAndAssistantEntries()
@@ -469,7 +487,7 @@ public void ToolError_ThenFinalAssistant_TurnIsEnded()
     public void ToolError_ThenFinalAssistant_ToolEntryPrecedesAssistantInState()
     {
         // Pins the state insertion order: ToolCall is added first, then Assistant.
-        // The rendering layer (OpenClawChatTimeline) reorders ToolCall entries to
+        // The rendering layer (ChatTimeline) reorders ToolCall entries to
         // appear AFTER non-ToolCall entries within a turn, so the failed tool event
         // ends up at the visual bottom instead of the assistant reply — see #672.
         var state = ChatTimelineState.Initial();
diff --git a/tests/OpenClaw.Tray.Tests/ChatTimelineRenderIdentityContractTests.cs b/tests/OpenClaw.Tray.Tests/ChatTimelineRenderIdentityContractTests.cs
new file mode 100644
index 000000000..e7c168bd3
--- /dev/null
+++ b/tests/OpenClaw.Tray.Tests/ChatTimelineRenderIdentityContractTests.cs
@@ -0,0 +1,130 @@
+using System.Text.RegularExpressions;
+
+namespace OpenClaw.Tray.Tests;
+
+public sealed class ChatTimelineRenderIdentityContractTests
+{
+    [Fact]
+    public void TimelineRows_UseGenerationQualifiedKindedKeys()
+    {
+        var timeline = Read("src", "OpenClaw.Tray.WinUI", "Chat", "ChatTimeline.cs");
+
+        Assert.Contains("long TimelineGeneration = 0", timeline);
+        Assert.Contains("string RowKey(ChatTimelineItem entry)", timeline);
+        Assert.Contains("Props.TimelineGeneration", timeline);
+        Assert.Contains("entry.Kind", timeline);
+        Assert.Contains("entry.Id", timeline);
+        Assert.DoesNotContain(".WithKey(entry.Id)", timeline);
+        Assert.Matches(
+            new Regex(@"WithKey\(RowKey\(entry\)\)"),
+            timeline);
+    }
+
+    [Fact]
+    public void ThinkingIndicator_UsesSyntheticGenerationQualifiedKey()
+    {
+        var timeline = Read("src", "OpenClaw.Tray.WinUI", "Chat", "ChatTimeline.cs");
+
+        Assert.Contains("string SyntheticRowKey(string id, ChatTimelineItemKind kind)", timeline);
+        Assert.Contains("SyntheticRowKey(\"__thinking__\", ChatTimelineItemKind.Assistant)", timeline);
+    }
+
+    [Fact]
+    public void TimelineGeneration_FlowsFromProviderSnapshotToTimelineProps()
+    {
+        var models = Read("src", "OpenClaw.Chat", "ChatModels.cs");
+        var provider = Read("src", "OpenClaw.Tray.WinUI", "Chat", "OpenClawChatDataProvider.cs");
+        var root = Read("src", "OpenClaw.Tray.WinUI", "Chat", "ChatRoot.cs");
+
+        Assert.Contains("IReadOnlyDictionary<string, long>? TimelineGenerations = null", models);
+        Assert.Contains("new Dictionary<string, long>(_resetVersions)", provider);
+        Assert.Contains("TimelineGenerations: timelineGenerationsCopy", provider);
+        Assert.Contains("snapshot.TimelineGenerations", root);
+        Assert.Contains("TimelineGeneration: timelineGeneration", root);
+    }
+
+    [Fact]
+    public void QueuedMessages_RenderInComposerAboveInput()
+    {
+        var models = Read("src", "OpenClaw.Chat", "ChatModels.cs");
+        var provider = Read("src", "OpenClaw.Tray.WinUI", "Chat", "OpenClawChatDataProvider.cs");
+        var root = Read("src", "OpenClaw.Tray.WinUI", "Chat", "ChatRoot.cs");
+        var timeline = Read("src", "OpenClaw.Tray.WinUI", "Chat", "ChatTimeline.cs");
+        var composer = Read("src", "OpenClaw.Tray.WinUI", "Chat", "ChatComposer.cs");
+
+        Assert.Contains("public record ChatQueuedMessage", models);
+        Assert.Contains("QueuedMessagesByThread", models);
+        Assert.Contains("Dictionary<string, List<ChatQueuedMessage>> _queuedMessages", provider);
+        Assert.Contains("QueuedMessagesByThread: queuedMessagesCopy", provider);
+        Assert.Contains("snapshot.QueuedMessagesByThread", root);
+        Assert.Contains("QueuedMessages: queuedMessages", root);
+        Assert.Contains("OnQueuedMessageCancel:", root);
+        Assert.Contains("IReadOnlyList<ChatQueuedMessage>? QueuedMessages = null", composer);
+        Assert.Contains("Action<string>? OnQueuedMessageCancel = null", composer);
+        Assert.Contains("AvailableHeight: chatSurfaceHeight.Value", root);
+        Assert.Contains("queuedPanel", composer);
+        Assert.Contains("composerInput", composer);
+        Assert.Contains("RenderQueuedMessages", composer);
+        Assert.Contains("Chat_Composer_QueuedMessageCancel", composer);
+        Assert.Contains("RenderQueueCancelButton", composer);
+        Assert.Contains("ChatQueuedMessageSendState.Sending", composer);
+        Assert.Contains("Chat_Composer_QueuedMessageCancelAutomationFormat", composer);
+        Assert.Contains("Chat_Composer_QueuedMessageRemoveFailed", composer);
+        Assert.Contains("Chat_Composer_QueuedMessageRemoveFailedAutomationFormat", composer);
+        Assert.Contains("ChatQueuedMessageRemoveFailed", composer);
+        Assert.Contains("ChatQueuedMessageCancel", composer);
+        Assert.Contains("}_{message.Id}", composer);
+        Assert.Contains("Chat_Composer_QueuedCountFormat", composer);
+        Assert.Contains("Chat_Composer_QueuedMessageAutomationFormat", composer);
+        Assert.Contains("Chat_Composer_QueuedMessageFailedAutomationFormat", composer);
+        Assert.Contains("Chat_Composer_QueuedMessageFailed", composer);
+        Assert.Contains("composer-queued-section:", composer);
+        Assert.Contains("ComputeQueuedMessagesMaxHeight(Props.IsCompact, Props.AvailableHeight)", composer);
+        Assert.Contains("chatSurfaceHeight.Set(Math.Round(height))", root);
+        Assert.DoesNotContain("FormatQueuedTime", composer);
+        Assert.DoesNotContain("\"Sending\"", composer);
+        Assert.DoesNotContain("QueuedMessages", timeline);
+        Assert.DoesNotContain("queued-section:", timeline);
+        Assert.DoesNotContain("Steer", composer);
+    }
+
+    [Fact]
+    public void Composer_DisablesMessageOptionDropdownsWhileTurnOrPendingQueueSendIsActive()
+    {
+        var composer = Read("src", "OpenClaw.Tray.WinUI", "Chat", "ChatComposer.cs");
+        var root = Read("src", "OpenClaw.Tray.WinUI", "Chat", "ChatRoot.cs");
+
+        Assert.Contains("var messageOptionControlsEnabled = !Props.MessageOptionsDisabled;", composer);
+        Assert.Contains("MessageOptionsDisabled: turnActiveOverride || hasPendingQueuedSend", root);
+        Assert.Contains("message.SendState is ChatQueuedMessageSendState.Queued or ChatQueuedMessageSendState.Sending", root);
+        Assert.Equal(2, Regex.Matches(composer, "IsEnabled = messageOptionControlsEnabled").Count);
+        Assert.DoesNotMatch(
+            new Regex(@"var\s+channelCombo[\s\S]*?IsEnabled\s*=\s*messageOptionControlsEnabled[\s\S]*?//\s+── Model picker", RegexOptions.Multiline),
+            composer);
+    }
+
+    [Fact]
+    public void Timeline_DoesNotRenderTemporaryDebugMetadata()
+    {
+        var timeline = Read("src", "OpenClaw.Tray.WinUI", "Chat", "ChatTimeline.cs");
+
+        Assert.DoesNotContain("BuildDebugMetadata", timeline);
+        Assert.DoesNotContain("DEBUG kind=", timeline);
+        Assert.DoesNotContain("rowGen=", timeline);
+        Assert.DoesNotContain("localQueued=", timeline);
+        Assert.DoesNotContain("textHash=", timeline);
+    }
+
+    [Fact]
+    public void ResetClearPath_BumpsTimelineGenerationBeforeReusingEntryIds()
+    {
+        var provider = Read("src", "OpenClaw.Tray.WinUI", "Chat", "OpenClawChatDataProvider.cs");
+
+        Assert.Matches(
+            new Regex(@"private\s+ResetClearPersistence\s+ClearThreadHistoryAfterResetLocked\(string\s+threadId\)[\s\S]*_resetVersions\[threadId\]\s*=\s*GetResetVersionLocked\(threadId\)\s*\+\s*1;[\s\S]*_timelines\[threadId\]\s*=\s*ChatTimelineState\.Initial\(\)\s*with\s*\{\s*HistoryLoaded\s*=\s*true\s*\};"),
+            provider);
+    }
+
+    private static string Read(params string[] parts)
+        => File.ReadAllText(Path.Combine(new[] { TestRepositoryPaths.GetRepositoryRoot() }.Concat(parts).ToArray()));
+}
diff --git a/tests/OpenClaw.Tray.Tests/ChatTimelineVirtualizationContractTests.cs b/tests/OpenClaw.Tray.Tests/ChatTimelineVirtualizationContractTests.cs
new file mode 100644
index 000000000..cf2c4258a
--- /dev/null
+++ b/tests/OpenClaw.Tray.Tests/ChatTimelineVirtualizationContractTests.cs
@@ -0,0 +1,52 @@
+namespace OpenClaw.Tray.Tests;
+
+public sealed class ChatTimelineVirtualizationContractTests
+{
+    [Fact]
+    public void ProductionTimeline_UsesVirtualizedItemsRepeaterRows()
+    {
+        var timeline = Read("src", "OpenClaw.Tray.WinUI", "Chat", "ChatTimeline.cs");
+        var virtualizedView = Read("src", "OpenClaw.Tray.WinUI", "Chat", "Controls", "VirtualizedChatView.cs");
+        var functionalUi = Read("src", "OpenClawTray.FunctionalUI", "FunctionalUI.cs");
+
+        Assert.Contains("new VirtualizedChatView()", timeline);
+        Assert.DoesNotContain("                        VStack(2, timelineRows)", timeline);
+        Assert.Contains("ItemsRepeater", virtualizedView);
+        Assert.Contains("StackLayout", virtualizedView);
+
+        Assert.Contains("NativeElement", functionalUi);
+        Assert.Contains("ConfigureNative", functionalUi);
+        Assert.Contains("NativeIdentityProperty", functionalUi);
+    }
+
+    [Fact]
+    public void ProductionTimeline_StabilizesFollowToBottomForVirtualizedRows()
+    {
+        var virtualizedView = Read("src", "OpenClaw.Tray.WinUI", "Chat", "Controls", "VirtualizedChatView.cs");
+
+        Assert.Contains("RequiredStableRestorePasses", virtualizedView);
+        Assert.Contains("ApplyPendingRestoreIfReady", virtualizedView);
+        Assert.Contains("QueueScrollToBottom", virtualizedView);
+        Assert.Contains("EnqueueOnView", virtualizedView);
+    }
+
+    [Fact]
+    public void FunctionalUiVirtualStack_IsPruneAwareAndStableAcrossRenderChurn()
+    {
+        var functionalUi = Read("src", "OpenClawTray.FunctionalUI", "FunctionalUI.cs");
+
+        Assert.Contains("_virtualStackOwnedPathPrefixes", functionalUi);
+        Assert.Contains("_visitedVirtualStackPaths", functionalUi);
+        Assert.Contains("IsOwnedByVirtualStack", functionalUi);
+        Assert.Contains("VirtualStackItemsMatch", functionalUi);
+        Assert.Contains("UpdateRealizedVirtualStackItems", functionalUi);
+        Assert.Contains("repeater.ItemTemplate is not VirtualStackItemTemplate", functionalUi);
+        Assert.Contains("RemoveCachedSubtree(item.Path)", functionalUi);
+        Assert.Contains("item.RealizedContainer = null", functionalUi);
+        Assert.Contains("PruneUnvisitedCachedSubtree(item.Path)", functionalUi);
+        Assert.Contains("PruneUnvisitedPaths();", functionalUi);
+    }
+
+    private static string Read(params string[] parts)
+        => File.ReadAllText(Path.Combine(new[] { TestRepositoryPaths.GetRepositoryRoot() }.Concat(parts).ToArray()));
+}
diff --git a/tests/OpenClaw.Tray.Tests/ChatToolCallsToggleContractTests.cs b/tests/OpenClaw.Tray.Tests/ChatToolCallsToggleContractTests.cs
index 6cf37879e..ce19085d6 100644
--- a/tests/OpenClaw.Tray.Tests/ChatToolCallsToggleContractTests.cs
+++ b/tests/OpenClaw.Tray.Tests/ChatToolCallsToggleContractTests.cs
@@ -7,9 +7,9 @@ public sealed class ChatToolCallsToggleContractTests
     [Fact]
     public void ProductionTimeline_HonorsComposerToolCallVisibilityToggle()
     {
-        var root = Read("src", "OpenClaw.Tray.WinUI", "Chat", "OpenClawChatRoot.cs");
-        var composer = Read("src", "OpenClaw.Tray.WinUI", "Chat", "OpenClawComposer.cs");
-        var timeline = Read("src", "OpenClaw.Tray.WinUI", "Chat", "OpenClawChatTimeline.cs");
+        var root = Read("src", "OpenClaw.Tray.WinUI", "Chat", "ChatRoot.cs");
+        var composer = Read("src", "OpenClaw.Tray.WinUI", "Chat", "ChatComposer.cs");
+        var timeline = Read("src", "OpenClaw.Tray.WinUI", "Chat", "ChatTimeline.cs");
 
         Assert.Contains("ShowToolCalls: showToolCalls.Value", root);
         Assert.Contains("ToolCallsCollapseVersion: toolCallsCollapseVersion.Value", root);
@@ -28,8 +28,8 @@ public void ProductionTimeline_HonorsComposerToolCallVisibilityToggle()
     public void ChatExplorationDesignSurface_IsRemoved()
     {
         var root = TestRepositoryPaths.GetRepositoryRoot();
-        var chatRoot = Read("src", "OpenClaw.Tray.WinUI", "Chat", "OpenClawChatRoot.cs");
-        var timeline = Read("src", "OpenClaw.Tray.WinUI", "Chat", "OpenClawChatTimeline.cs");
+        var chatRoot = Read("src", "OpenClaw.Tray.WinUI", "Chat", "ChatRoot.cs");
+        var timeline = Read("src", "OpenClaw.Tray.WinUI", "Chat", "ChatTimeline.cs");
 
         Assert.False(Directory.Exists(Path.Combine(root, "src", "OpenClaw.Tray.WinUI", "Chat", "Explorations")));
         Assert.False(File.Exists(Path.Combine(root, "src", "OpenClaw.Tray.WinUI", "Windows", "ChatExplorationsWindow.cs")));
diff --git a/tests/OpenClaw.Tray.Tests/ChatUserBubbleTextContractTests.cs b/tests/OpenClaw.Tray.Tests/ChatUserBubbleTextContractTests.cs
new file mode 100644
index 000000000..560f61f69
--- /dev/null
+++ b/tests/OpenClaw.Tray.Tests/ChatUserBubbleTextContractTests.cs
@@ -0,0 +1,28 @@
+using System.Text.RegularExpressions;
+
+namespace OpenClaw.Tray.Tests;
+
+public sealed class ChatUserBubbleTextContractTests
+{
+    [Fact]
+    public void UserPromptText_ResetsStaleTextBlockVisualStateBeforeApplyingInlines()
+    {
+        var timeline = string.Concat(
+            Read("src", "OpenClaw.Tray.WinUI", "Chat", "ChatTimeline.cs"),
+            Read("src", "OpenClaw.Tray.WinUI", "Chat", "ChatTimeline.Helpers.cs"));
+
+        Assert.Contains("private const string ChatTextFontFamilySource", timeline);
+        Assert.Contains("TextBlock(string.Empty)", timeline);
+        Assert.Contains("t.FontFamily = s_chatTextFontFamily;", timeline);
+        Assert.Contains("t.TextTrimming = TextTrimming.None;", timeline);
+        Assert.Contains("t.MaxLines = 0;", timeline);
+        Assert.Contains("t.Width = double.NaN;", timeline);
+        Assert.Contains("t.MaxWidth = double.PositiveInfinity;", timeline);
+        Assert.Matches(
+            new Regex(@"t\.TextTrimming\s*=\s*TextTrimming\.None;[\s\S]*ApplyPlainSelectableInlines\(t,\s*messageText\);"),
+            timeline);
+    }
+
+    private static string Read(params string[] parts)
+        => File.ReadAllText(Path.Combine(new[] { TestRepositoryPaths.GetRepositoryRoot() }.Concat(parts).ToArray()));
+}
diff --git a/tests/OpenClaw.Tray.Tests/ConnectionPagePlanApprovalBehaviorTests.cs b/tests/OpenClaw.Tray.Tests/ConnectionPagePlanApprovalBehaviorTests.cs
index dc22d7340..0154d1cdb 100644
--- a/tests/OpenClaw.Tray.Tests/ConnectionPagePlanApprovalBehaviorTests.cs
+++ b/tests/OpenClaw.Tray.Tests/ConnectionPagePlanApprovalBehaviorTests.cs
@@ -230,6 +230,46 @@ public void NodeError_RemainsErrorDespiteStalePendingReapproval()
         AssertTrustDoesNotOverride(plan, NodeCardState.OnNodeError);
     }
 
+    [Fact]
+    public void IntendedNodeIdle_ProjectsAsDegradedNodeError_NotHealthy()
+    {
+        var plan = Build(
+            new GatewayConnectionSnapshot
+            {
+                OverallState = OverallConnectionState.Degraded,
+                OperatorState = RoleConnectionState.Connected,
+                NodeConnectionIntended = true,
+                NodeState = RoleConnectionState.Idle
+            },
+            localNode: null);
+
+        Assert.Equal(ConnectionPageMode.Cockpit, plan.Mode);
+        Assert.Equal(ConnectionAccent.Caution, plan.StripAccent);
+        Assert.Equal("Connection degraded", plan.StripHeadline);
+        Assert.Contains("node has not connected", plan.StripSub, StringComparison.OrdinalIgnoreCase);
+        Assert.Equal(NodeCardState.OnNodeError, plan.NodeCard);
+    }
+
+    [Fact]
+    public void MissingNodeCredential_ProjectsAsBlockedNode_NotHealthy()
+    {
+        var plan = Build(
+            new GatewayConnectionSnapshot
+            {
+                OverallState = OverallConnectionState.Degraded,
+                OperatorState = RoleConnectionState.Connected,
+                NodeConnectionIntended = true,
+                NodeState = RoleConnectionState.Error,
+                NodeError = "No node credential available. Re-pair this PC."
+            },
+            localNode: null);
+
+        Assert.Equal(ConnectionPageMode.Cockpit, plan.Mode);
+        Assert.Equal(ConnectionAccent.Caution, plan.StripAccent);
+        Assert.Equal(NodeCardState.OnNodeError, plan.NodeCard);
+        Assert.Equal("No node credential available. Re-pair this PC.", plan.NodeErrorDetail);
+    }
+
     private ConnectionPagePlan Build(
         PairingApprovalKind pairingApprovalKind,
         GatewayNodeInfo? localNode,
diff --git a/tests/OpenClaw.Tray.Tests/ConnectionRegressionSourceTests.cs b/tests/OpenClaw.Tray.Tests/ConnectionRegressionSourceTests.cs
index f68ffd18b..cac295b7c 100644
--- a/tests/OpenClaw.Tray.Tests/ConnectionRegressionSourceTests.cs
+++ b/tests/OpenClaw.Tray.Tests/ConnectionRegressionSourceTests.cs
@@ -55,9 +55,99 @@ public void LocalNodeTrustPairListUpdate_RefreshesVisibleNodeList()
         Assert.Contains("Node list refresh failed after local node trust request", managerSource);
     }
 
+    [Fact]
+    public void SetupCodeEntry_ClearsStaleSshTunnelFields()
+    {
+        var pageSource = ReadSource("src", "OpenClaw.Tray.WinUI", "Pages", "ConnectionPage.xaml.cs");
+
+        Assert.Contains("private void ClearAddGatewaySshFields()", pageSource);
+        Assert.Contains("ClearAddGatewaySshFields();\r\n        ShowAddPane(\"setup\");", pageSource);
+        Assert.Contains("AddSshExpander.IsExpanded = false;", pageSource);
+        Assert.Contains("AddSshUserBox.Text = \"\";", pageSource);
+        Assert.Contains("AddSshHostBox.Text = \"\";", pageSource);
+    }
+
+    [Fact]
+    public void NodeCapabilityPills_ExposeStateThroughReadableTextPeer()
+    {
+        var pageSource = ReadSource("src", "OpenClaw.Tray.WinUI", "Pages", "ConnectionPage.xaml.cs");
+
+        Assert.Contains("AutomationProperties.SetName(labelText", pageSource);
+        Assert.DoesNotContain(
+            "AutomationProperties.SetAccessibilityView(labelText, AccessibilityView.Raw);",
+            pageSource);
+        Assert.DoesNotContain("AutomationProperties.SetName(pill", pageSource);
+    }
+
+    [Fact]
+    public void PairingRequiredDisconnectGuard_RunsInsideTransitionSemaphore()
+    {
+        var managerSource = ReadSource("src", "OpenClaw.Connection", "GatewayConnectionManager.cs");
+        var methodStart = managerSource.IndexOf("private async Task HandleOperatorStatusChangedAsync", StringComparison.Ordinal);
+        var waitIndex = managerSource.IndexOf("await _transitionSemaphore.WaitAsync();", methodStart, StringComparison.Ordinal);
+        var pairingIndex = managerSource.IndexOf("var isPairingPending", methodStart, StringComparison.Ordinal);
+
+        Assert.True(methodStart >= 0);
+        Assert.True(waitIndex > methodStart);
+        Assert.True(pairingIndex > waitIndex);
+    }
+
+    [Fact]
+    public void GatewayClient_PairingRequiredFlag_UsesVolatileAccess()
+    {
+        var source = ReadSource("src", "OpenClaw.Shared", "OpenClawGatewayClient.cs");
+
+        Assert.Contains("public bool IsPairingRequired => Volatile.Read(ref _pairingRequiredAwaitingApproval);", source);
+        Assert.Contains("public string? PairingRequiredRequestId => Volatile.Read(ref _pairingRequiredRequestId);", source);
+        AssertInOrder(
+            source,
+            "Volatile.Write(ref _pairingRequiredRequestId, pairingDetails.RequestId);",
+            "Volatile.Write(ref _pairingRequiredAwaitingApproval, true);");
+        Assert.Contains("Volatile.Write(ref _pairingRequiredAwaitingApproval, false);", source);
+        Assert.Contains("Volatile.Write(ref _pairingRequiredRequestId, null);", source);
+        Assert.Contains("Volatile.Write(ref _pairingRequiredAwaitingApproval, true);", source);
+    }
+
+    [Fact]
+    public void OperatorCli_DefersIdentityDefaultsUntilAfterArgumentParsing()
+    {
+        var source = ReadSource("src", "OpenClaw.Cli", "Program.cs");
+
+        Assert.Contains("public string SettingsPath { get; set; } = \"\";", source);
+        Assert.Contains("public string IdentityDataPath { get; set; } = \"\";", source);
+        AssertInOrder(
+            source,
+            "options = ParseArgs(args);",
+            "ApplyIdentityDefaults(options, Environment.GetEnvironmentVariable);");
+        AssertInOrder(
+            source,
+            "options.Identity = OpenClawAppIdentity.ResolveIdentity(envLookup, options.Identity);",
+            "options.IdentityDataPath = OpenClawAppIdentity.ResolveRoamingDataDirectory(envLookup, options.Identity);");
+    }
+
+    [Fact]
+    public void SetupKeepalive_DisposesProcessWrapperAfterWritingMarker()
+    {
+        var source = ReadSource("src", "OpenClaw.SetupEngine", "SetupSteps.cs");
+
+        Assert.Contains("using var proc = System.Diagnostics.Process.Start(psi);", source);
+        Assert.Contains("WriteKeepaliveMarker(ctx, markerPath, proc.Id);", source);
+    }
+
     private static string ReadSource(params string[] relativePathParts)
     {
         var root = TestRepositoryPaths.GetRepositoryRoot();
         return File.ReadAllText(Path.Combine(new[] { root }.Concat(relativePathParts).ToArray()));
     }
+
+    private static void AssertInOrder(string source, params string[] snippets)
+    {
+        var previous = -1;
+        foreach (var snippet in snippets)
+        {
+            var current = source.IndexOf(snippet, previous + 1, StringComparison.Ordinal);
+            Assert.True(current > previous, $"Expected to find '{snippet}' after index {previous}.");
+            previous = current;
+        }
+    }
 }
diff --git a/tests/OpenClaw.Tray.Tests/ConnectionStatusPresenterTests.cs b/tests/OpenClaw.Tray.Tests/ConnectionStatusPresenterTests.cs
new file mode 100644
index 000000000..4a2b106c8
--- /dev/null
+++ b/tests/OpenClaw.Tray.Tests/ConnectionStatusPresenterTests.cs
@@ -0,0 +1,217 @@
+using OpenClaw.Connection;
+using OpenClaw.Shared;
+using OpenClawTray.Services;
+using System.Xml.Linq;
+using Xunit;
+
+namespace OpenClaw.Tray.Tests;
+
+public sealed class ConnectionStatusPresenterTests
+{
+    [Theory]
+    [InlineData(OverallConnectionState.Connected, "StatusDisplay_Connected", (int)ConnectionStatusAccent.Success)]
+    [InlineData(OverallConnectionState.Ready, "StatusDisplay_Connected", (int)ConnectionStatusAccent.Success)]
+    [InlineData(OverallConnectionState.Connecting, "StatusDisplay_Connecting", (int)ConnectionStatusAccent.Caution)]
+    [InlineData(OverallConnectionState.Degraded, "HubWindow_Pill_Degraded", (int)ConnectionStatusAccent.Caution)]
+    [InlineData(OverallConnectionState.PairingRequired, "HubWindow_Pill_PairingRequired", (int)ConnectionStatusAccent.Caution)]
+    [InlineData(OverallConnectionState.Error, "StatusDisplay_Error", (int)ConnectionStatusAccent.Critical)]
+    [InlineData(OverallConnectionState.Idle, "StatusDisplay_Disconnected", (int)ConnectionStatusAccent.Neutral)]
+    [InlineData(OverallConnectionState.Disconnecting, "StatusDisplay_Disconnected", (int)ConnectionStatusAccent.Neutral)]
+    public void Pill_MapsOverallState(OverallConnectionState overall, string expectedKey, int expectedAccent)
+    {
+        var (labelKey, accent) = ConnectionStatusPresenter.Pill(overall);
+        Assert.Equal(expectedKey, labelKey);
+        Assert.Equal(expectedAccent, (int)accent);
+    }
+
+    [Fact]
+    public void Pill_ReadyAndConnected_BothReadConnected()
+    {
+        Assert.Equal(ConnectionStatusPresenter.Pill(OverallConnectionState.Connected),
+                     ConnectionStatusPresenter.Pill(OverallConnectionState.Ready));
+    }
+
+    [Theory]
+    [InlineData(OverallConnectionState.Connected, ConnectionStatus.Connected)]
+    [InlineData(OverallConnectionState.Ready, ConnectionStatus.Connected)]
+    [InlineData(OverallConnectionState.Connecting, ConnectionStatus.Connecting)]
+    [InlineData(OverallConnectionState.Degraded, ConnectionStatus.Connected)]
+    [InlineData(OverallConnectionState.PairingRequired, ConnectionStatus.Error)]
+    [InlineData(OverallConnectionState.Error, ConnectionStatus.Error)]
+    [InlineData(OverallConnectionState.Idle, ConnectionStatus.Disconnected)]
+    public void ToLegacyStatus_PreservesOperatorLiveCompatibility(
+        OverallConnectionState overall,
+        ConnectionStatus expected)
+    {
+        Assert.Equal(expected, ConnectionStatusPresenter.ToLegacyStatus(overall));
+    }
+
+    [Fact]
+    public void PlainText_UsesDistinctBlockedLabels()
+    {
+        Assert.Equal("Degraded", ConnectionStatusPresenter.PlainText(OverallConnectionState.Degraded, ConnectionStatus.Connected));
+        Assert.Equal("Pairing required", ConnectionStatusPresenter.PlainText(OverallConnectionState.PairingRequired, ConnectionStatus.Connecting));
+    }
+
+    [Theory]
+    [InlineData(OverallConnectionState.Connected, true)]
+    [InlineData(OverallConnectionState.Ready, true)]
+    [InlineData(OverallConnectionState.Degraded, true)]
+    [InlineData(OverallConnectionState.PairingRequired, true)]
+    [InlineData(OverallConnectionState.Connecting, true)]
+    [InlineData(OverallConnectionState.Error, false)]
+    [InlineData(OverallConnectionState.Idle, false)]
+    public void IsLiveOrPending_IncludesBlockedLiveStates(OverallConnectionState overall, bool expected)
+    {
+        Assert.Equal(expected, ConnectionStatusPresenter.IsLiveOrPending(overall, ConnectionStatus.Disconnected));
+    }
+
+    [Fact]
+    public void ToLegacyStatus_SnapshotKeepsOperatorChannelLiveDuringNodeDegraded()
+    {
+        var snapshot = new GatewayConnectionSnapshot
+        {
+            OverallState = OverallConnectionState.Degraded,
+            OperatorState = RoleConnectionState.Connected,
+            NodeConnectionIntended = true,
+            NodeState = RoleConnectionState.Error
+        };
+
+        Assert.Equal(ConnectionStatus.Connected, ConnectionStatusPresenter.ToLegacyStatus(snapshot));
+        Assert.True(ConnectionStatusPresenter.IsOperatorChannelLive(snapshot));
+    }
+
+    [Fact]
+    public void ToLegacyStatus_SnapshotKeepsOperatorChannelLiveDuringNodePairing()
+    {
+        var snapshot = new GatewayConnectionSnapshot
+        {
+            OverallState = OverallConnectionState.PairingRequired,
+            OperatorState = RoleConnectionState.Connected,
+            NodeConnectionIntended = true,
+            NodeState = RoleConnectionState.PairingRequired
+        };
+
+        Assert.Equal(ConnectionStatus.Connected, ConnectionStatusPresenter.ToLegacyStatus(snapshot));
+    }
+
+    [Fact]
+    public void ToLegacyStatus_SnapshotKeepsOperatorPairingBlocked()
+    {
+        var snapshot = new GatewayConnectionSnapshot
+        {
+            OverallState = OverallConnectionState.PairingRequired,
+            OperatorState = RoleConnectionState.PairingRequired,
+            NodeState = RoleConnectionState.Idle
+        };
+
+        Assert.Equal(ConnectionStatus.Error, ConnectionStatusPresenter.ToLegacyStatus(snapshot));
+        Assert.False(ConnectionStatusPresenter.IsOperatorChannelLive(snapshot));
+    }
+
+    [Fact]
+    public void NodeRow_NodeModeDisabled_ReadsDisabled_EvenWhenTransportConnected()
+    {
+        var snap = new GatewayConnectionSnapshot
+        {
+            OperatorState = RoleConnectionState.Connected,
+            NodeState = RoleConnectionState.Connected,
+        };
+
+        var (labelKey, accent) = ConnectionStatusPresenter.NodeRow(snap, nodeModeEnabled: false, enabledCapabilityCount: 7);
+
+        Assert.Equal("HubWindow_Role_Disabled", labelKey);
+        Assert.Equal(ConnectionStatusAccent.Neutral, accent);
+    }
+
+    [Fact]
+    public void NodeRow_OperatorNotConnected_ReadsDisabled()
+    {
+        var snap = new GatewayConnectionSnapshot
+        {
+            OperatorState = RoleConnectionState.Connecting,
+            NodeState = RoleConnectionState.Connected,
+        };
+
+        var (labelKey, accent) = ConnectionStatusPresenter.NodeRow(snap, nodeModeEnabled: true, enabledCapabilityCount: 7);
+
+        Assert.Equal("HubWindow_Role_Disabled", labelKey);
+        Assert.Equal(ConnectionStatusAccent.Neutral, accent);
+    }
+
+    [Fact]
+    public void NodeRow_NodeModeEnabledAndConnected_ReadsConnected()
+    {
+        var snap = new GatewayConnectionSnapshot
+        {
+            OperatorState = RoleConnectionState.Connected,
+            NodeState = RoleConnectionState.Connected,
+        };
+
+        var (labelKey, accent) = ConnectionStatusPresenter.NodeRow(snap, nodeModeEnabled: true, enabledCapabilityCount: 1);
+
+        Assert.Equal("StatusDisplay_Connected", labelKey);
+        Assert.Equal(ConnectionStatusAccent.Success, accent);
+    }
+
+    [Fact]
+    public void NodeRow_NodeModeEnabledConnectedAndNoCapabilities_ReadsPermissionsIncomplete()
+    {
+        var snap = new GatewayConnectionSnapshot
+        {
+            OperatorState = RoleConnectionState.Connected,
+            NodeState = RoleConnectionState.Connected,
+        };
+
+        var (labelKey, accent) = ConnectionStatusPresenter.NodeRow(snap, nodeModeEnabled: true, enabledCapabilityCount: 0);
+
+        Assert.Equal("HubWindow_Role_PermissionsIncomplete", labelKey);
+        Assert.Equal(ConnectionStatusAccent.Caution, accent);
+    }
+
+    [Fact]
+    public void NodeNeedsApproval_OnlyWhenEnabledOperatorConnectedAndPairing()
+    {
+        var pairing = new GatewayConnectionSnapshot
+        {
+            OperatorState = RoleConnectionState.Connected,
+            NodeState = RoleConnectionState.PairingRequired,
+        };
+
+        Assert.True(ConnectionStatusPresenter.NodeNeedsApproval(pairing, nodeModeEnabled: true));
+        Assert.False(ConnectionStatusPresenter.NodeNeedsApproval(pairing, nodeModeEnabled: false));
+    }
+
+    [Fact]
+    public void Presenter_ReturnedResourceKeys_ExistInEnUsResources()
+    {
+        var keys = new HashSet<string>(StringComparer.Ordinal);
+
+        foreach (var overall in Enum.GetValues<OverallConnectionState>())
+            keys.Add(ConnectionStatusPresenter.Pill(overall).LabelKey);
+
+        foreach (var state in Enum.GetValues<RoleConnectionState>())
+            keys.Add(ConnectionStatusPresenter.RoleStateLabelKey(state));
+
+        var connected = new GatewayConnectionSnapshot
+        {
+            OperatorState = RoleConnectionState.Connected,
+            NodeState = RoleConnectionState.Connected,
+        };
+        keys.Add(ConnectionStatusPresenter.NodeRow(connected, nodeModeEnabled: false, enabledCapabilityCount: 0).LabelKey);
+        keys.Add(ConnectionStatusPresenter.NodeRow(connected, nodeModeEnabled: true, enabledCapabilityCount: 0).LabelKey);
+        keys.Add(ConnectionStatusPresenter.NodeRow(connected, nodeModeEnabled: true, enabledCapabilityCount: 1).LabelKey);
+
+        var reswPath = Path.Combine(
+            TestRepositoryPaths.GetRepositoryRoot(),
+            "src", "OpenClaw.Tray.WinUI", "Strings", "en-us", "Resources.resw");
+        var resourceKeys = XDocument.Load(reswPath)
+            .Descendants("data")
+            .Select(e => (string?)e.Attribute("name"))
+            .Where(name => !string.IsNullOrWhiteSpace(name))
+            .ToHashSet(StringComparer.Ordinal);
+
+        var missing = keys.Where(key => !resourceKeys.Contains(key)).OrderBy(key => key).ToArray();
+        Assert.Empty(missing);
+    }
+}
diff --git a/tests/OpenClaw.Tray.Tests/CronPageContractTests.cs b/tests/OpenClaw.Tray.Tests/CronPageContractTests.cs
new file mode 100644
index 000000000..506163e84
--- /dev/null
+++ b/tests/OpenClaw.Tray.Tests/CronPageContractTests.cs
@@ -0,0 +1,106 @@
+namespace OpenClaw.Tray.Tests;
+
+public sealed class CronPageContractTests
+{
+    [Fact]
+    public void CompletedOneTimeJobs_KeepHistoryAndRemoveActionable()
+    {
+        var source = File.ReadAllText(Path.Combine(
+            TestRepositoryPaths.GetRepositoryRoot(),
+            "src",
+            "OpenClaw.Tray.WinUI",
+            "Pages",
+            "CronPage.xaml.cs"));
+
+        Assert.DoesNotContain("CardOpacity", source);
+        Assert.DoesNotContain(".Opacity = 0.4", source);
+        Assert.Contains("IsCompletedOneShot", source);
+        Assert.Contains("var canRunOrEditJob = _cronLoading.CanEdit && !isRunning;", source);
+        Assert.Contains("editBtn.IsEnabled = canRunOrEditJob;", source);
+        Assert.Contains("histBtn.IsEnabled = _cronLoading.CanEdit && vm.HasRunHistory;", source);
+        Assert.Contains("removeBtn.IsEnabled = _cronLoading.CanEdit && !isRunning;", source);
+        Assert.Contains("IsEnabled = _cronLoading.CanEdit && !vm.IsCompletedOneShot && !_runningJobIds.Contains(vm.Id)", source);
+        Assert.Contains("if (_runningJobIds.Contains(jobId)) return;", ExtractMethod(source, "OnRemoveClick"));
+        Assert.Contains("if (_runningJobIds.Contains(jobId)) return;", ExtractMethod(source, "OnEnabledToggleChanged"));
+        Assert.Contains("CancelAllRunRefreshLoops();", source);
+        Assert.Contains("CancelRunRefreshLoop(jobId);", source);
+        Assert.Contains("ClearRunningJob(jobId);", source);
+        Assert.Contains("Task.Delay(TimeSpan.FromSeconds(3), token)", source);
+        Assert.Contains("CronPage_DisableJobTooltip", source);
+        Assert.Contains("CronPage_EnableJobTooltip", source);
+        Assert.Contains("BuildFullResponseExpander", source);
+        Assert.Contains("CronRunHistoryDisplay.ExtractText(entry, isError)", source);
+        Assert.Contains("MakeRunChatButton(sessionKey)", source);
+        var runNowHandler = ExtractMethod(source, "OnRunNowClick");
+        Assert.DoesNotContain("if (vm != null && !vm.IsEnabled) return;", runNowHandler);
+        Assert.Contains("if (_runningJobIds.Contains(jobId)) return;", runNowHandler);
+        Assert.Contains("RunCronJobDetailedAsync(jobId)", runNowHandler);
+        Assert.Contains("result?.Enqueued != true", runNowHandler);
+        Assert.Contains("ShowRunNotStartedNotification", runNowHandler);
+        Assert.Contains("RefreshJobActionButtons(jobId);", runNowHandler);
+        Assert.Contains("StartRunRefreshLoop(jobId);", runNowHandler);
+        var refreshLoop = ExtractMethod(source, "StartRunRefreshLoop");
+        Assert.Contains("RequestCronRunsAsync(jobId, limit: 20, offset: 0)", refreshLoop);
+        Assert.DoesNotContain("RequestCronListAsync()", refreshLoop);
+        var parseCronList = ExtractMethod(source, "ParseCronList");
+        Assert.Contains("oldVm != null && vm.LastRunAtMs > 0 && vm.LastRunAtMs != oldVm.LastRunAtMs", parseCronList);
+        Assert.DoesNotContain("vm.RunningAtMs == 0 || oldVm == null || vm.LastRunAtMs != oldVm.LastRunAtMs", parseCronList);
+        Assert.Contains("shouldPreserveVisualTreeForRunningRefresh", parseCronList);
+        Assert.Contains("RefreshJobActionButtons(runningJobId);", parseCronList);
+        var editHandler = ExtractMethod(source, "OnEditJobClick");
+        Assert.DoesNotContain("if (vm == null || !vm.IsEnabled) return;", editHandler);
+        Assert.Contains("if (vm == null || _runningJobIds.Contains(jobId)) return;", editHandler);
+        var historyHandler = ExtractMethod(source, "OnHistoryClick");
+        Assert.DoesNotContain("if (vm != null && !vm.IsEnabled) return;", historyHandler);
+        Assert.Contains("if (vm != null && !vm.HasRunHistory) return;", historyHandler);
+        var cardTappedHandler = ExtractMethod(source, "OnCardTapped");
+        Assert.Contains("parent is Button or ToggleSwitch or Expander", cardTappedHandler);
+        Assert.DoesNotContain("or ScrollViewer", cardTappedHandler);
+        Assert.Contains("RebuildJobCards(preserveHistory: _historyJobId != null);", source);
+        Assert.Contains("ShowHistoryLoading(_historyJobId);", source);
+        Assert.Contains("Name = actionName", source);
+        Assert.Contains("LocalizationHelper.GetString(\"CronPage_OpenChat\")", source);
+        Assert.DoesNotContain("SessionsPage_OpenChatButton.Content", source);
+        Assert.Contains("Tag = $\"running_{vm.Id}\"", source);
+        Assert.Contains("badge.Visibility = isRunning ? Visibility.Visible : Visibility.Collapsed;", source);
+        Assert.Contains("_expandedRunFullResponseIds.Contains(runEntryKey)", source);
+        Assert.Contains("BuildHistoryRenderSignature(entries, total, hasMore)", source);
+        Assert.Contains("string.Equals(_lastHistoryRenderSignature, signature", source);
+        var fullResponseBuilder = ExtractMethod(source, "BuildFullResponseExpander");
+        Assert.DoesNotContain("VerticalScrollBarVisibility", fullResponseBuilder);
+        Assert.DoesNotContain("MaxHeight = 360", fullResponseBuilder);
+    }
+
+    private static string ExtractMethod(string source, string methodName)
+    {
+        var markers = new[]
+        {
+            $"private void {methodName}",
+            $"private UIElement {methodName}",
+            $"private static string {methodName}"
+        };
+        var marker = markers.FirstOrDefault(m => source.Contains(m, StringComparison.Ordinal));
+        Assert.NotNull(marker);
+
+        var start = source.IndexOf(marker!, StringComparison.Ordinal);
+        Assert.True(start >= 0, $"Could not find {methodName}.");
+
+        var brace = source.IndexOf('{', start);
+        Assert.True(brace >= 0, $"Could not find {methodName} body.");
+
+        var depth = 0;
+        for (var i = brace; i < source.Length; i++)
+        {
+            if (source[i] == '{') depth++;
+            else if (source[i] == '}')
+            {
+                depth--;
+                if (depth == 0)
+                    return source[start..(i + 1)];
+            }
+        }
+
+        Assert.Fail($"Could not parse {methodName} body.");
+        return string.Empty;
+    }
+}
diff --git a/tests/OpenClaw.Tray.Tests/CronRunHistoryDisplayTests.cs b/tests/OpenClaw.Tray.Tests/CronRunHistoryDisplayTests.cs
new file mode 100644
index 000000000..6a5f138ff
--- /dev/null
+++ b/tests/OpenClaw.Tray.Tests/CronRunHistoryDisplayTests.cs
@@ -0,0 +1,101 @@
+using OpenClawTray.Services;
+using System.Text.Json;
+
+namespace OpenClaw.Tray.Tests;
+
+public sealed class CronRunHistoryDisplayTests
+{
+    [Fact]
+    public void ExtractText_UsesSummaryAsExpandableFullResponse()
+    {
+        var response = string.Join("\n", new[]
+        {
+            "☀️ **Woodinville, WA — Wednesday, June 24**",
+            "",
+            "**Right now (11:08 AM):**",
+            "- **Sunny** — 74°F (23°C), feels like 77°F",
+            "- Humidity: 48%",
+            "- Wind: 2 mph SSW (light breeze)",
+            "",
+            "Stay hydrated!"
+        });
+        using var doc = JsonDocument.Parse(JsonSerializer.Serialize(new
+        {
+            status = "ok",
+            summary = response
+        }));
+
+        var text = CronRunHistoryDisplay.ExtractText(doc.RootElement, isError: false);
+
+        Assert.Equal(response, text.PreviewText);
+        Assert.Equal(response, text.FullText);
+        Assert.True(text.HasExpandableFullText);
+    }
+
+    [Fact]
+    public void ExtractText_PrefersFullResponseWhenSummaryIsShort()
+    {
+        using var doc = JsonDocument.Parse(JsonSerializer.Serialize(new
+        {
+            status = "ok",
+            summary = "☀️ **Woodinville, WA — Wednesday, June 24**",
+            fullResponse = "☀️ **Woodinville, WA — Wednesday, June 24**\n\nFull forecast details."
+        }));
+
+        var text = CronRunHistoryDisplay.ExtractText(doc.RootElement, isError: false);
+
+        Assert.Equal("☀️ **Woodinville, WA — Wednesday, June 24**", text.PreviewText);
+        Assert.Equal("☀️ **Woodinville, WA — Wednesday, June 24**\n\nFull forecast details.", text.FullText);
+        Assert.True(text.HasExpandableFullText);
+    }
+
+    [Fact]
+    public void ExtractText_MultilineSummaryIsExpandableEvenWhenShort()
+    {
+        const string response = "Line one\nLine two\nLine three";
+        using var doc = JsonDocument.Parse(JsonSerializer.Serialize(new
+        {
+            status = "ok",
+            summary = response
+        }));
+
+        var text = CronRunHistoryDisplay.ExtractText(doc.RootElement, isError: false);
+
+        Assert.Equal(response, text.PreviewText);
+        Assert.Equal(response, text.FullText);
+        Assert.True(text.HasExpandableFullText);
+    }
+
+    [Fact]
+    public void ExtractText_CanRecoverAssistantTextFromTranscriptJsonl()
+    {
+        var transcript = string.Join('\n', new[]
+        {
+            """{"stream":"assistant","data":{"delta":"Hello "}}""",
+            """{"stream":"assistant","data":{"delta":"there"}}""",
+            """{"stream":"assistant","data":{"text":"Hello there\n\nFinal answer."}}"""
+        });
+        using var doc = JsonDocument.Parse(JsonSerializer.Serialize(new
+        {
+            status = "ok",
+            summary = "Hello there",
+            transcript
+        }));
+
+        var text = CronRunHistoryDisplay.ExtractText(doc.RootElement, isError: false);
+
+        Assert.Equal("Hello there", text.PreviewText);
+        Assert.Equal("Hello there\n\nFinal answer.", text.FullText);
+        Assert.True(text.HasExpandableFullText);
+    }
+
+    [Fact]
+    public void SanitizeForDisplay_RedactsTokensAndPaths()
+    {
+        var input = "Auth failed at /home/openclaw/.openclaw/agents/main/sessions/abc.jsonl with Authorization: Bearer secret.token.value";
+
+        var result = CronRunHistoryDisplay.SanitizeForDisplay(input);
+
+        Assert.Equal("Auth failed at …/abc.jsonl with Authorization: Bearer [REDACTED]", result);
+    }
+}
diff --git a/tests/OpenClaw.Tray.Tests/DiagnosticsBundleBuilderTests.cs b/tests/OpenClaw.Tray.Tests/DiagnosticsBundleBuilderTests.cs
new file mode 100644
index 000000000..84d829de2
--- /dev/null
+++ b/tests/OpenClaw.Tray.Tests/DiagnosticsBundleBuilderTests.cs
@@ -0,0 +1,482 @@
+using OpenClaw.Connection;
+using OpenClaw.Shared;
+using OpenClawTray.Services;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+
+namespace OpenClaw.Tray.Tests;
+
+public sealed class DiagnosticsBundleBuilderTests : IDisposable
+{
+    private readonly string _tempDir;
+
+    public DiagnosticsBundleBuilderTests()
+    {
+        _tempDir = Path.Combine(Path.GetTempPath(), $"diag-bundle-test-{Guid.NewGuid():N}");
+        Directory.CreateDirectory(_tempDir);
+    }
+
+    public void Dispose()
+    {
+        try { Directory.Delete(_tempDir, recursive: true); } catch { }
+    }
+
+    [Fact]
+    public void Build_IncludesSanitizedLogTailsAndConnectionTimeline()
+    {
+        var trayLog = Path.Combine(_tempDir, "openclaw-tray.log");
+        var jsonl = Path.Combine(_tempDir, "diagnostics.jsonl");
+        var crash = Path.Combine(_tempDir, "crash.log");
+        var setupDir = Path.Combine(_tempDir, "Setup");
+        Directory.CreateDirectory(setupDir);
+        var setupLog = Path.Combine(setupDir, "setup-engine-20260527.jsonl");
+
+        File.WriteAllText(trayLog, "Authentication failed token=tray-secret\nport 18789 refused\n");
+        File.WriteAllText(jsonl, """{"event":"auth","metadata":{"token":"jsonl-secret","status":"failed"}}""" + "\n");
+        File.WriteAllText(crash, "CRASH Authorization: Bearer crash-secret\n");
+        File.WriteAllText(setupLog, """{"event":"setup","msg":"setupCode=setup-secret gateway did not become healthy"}""" + "\n");
+
+        var state = new GatewayCommandCenterState
+        {
+            ConnectionStatus = ConnectionStatus.Error,
+            Topology = new GatewayTopologyInfo
+            {
+                GatewayUrl = "wss://gateway.example.com:18789/path?token=secret",
+                DisplayName = "Remote",
+                Transport = "websocket",
+                Detail = "failed to connect to gateway.example.com:18789"
+            },
+            PortDiagnostics =
+            [
+                new PortDiagnosticInfo
+                {
+                    Purpose = "Gateway endpoint",
+                    Port = 18789,
+                    IsListening = false,
+                    Detail = "Local TCP port 18789 does not currently have a listener."
+                }
+            ]
+        };
+        var events = new[]
+        {
+            new ConnectionDiagnosticEvent(
+                DateTime.UtcNow,
+                "error",
+                "Authentication failed",
+                TokenSanitizer.SanitizeLogMessage("Authorization: Bearer event-secret"))
+        };
+        var paths = new DiagnosticsBundlePaths(
+            trayLog,
+            null,
+            jsonl,
+            crash,
+            setupDir);
+
+        var bundle = DiagnosticsBundleBuilder.Build(state, events, paths);
+
+        Assert.Contains("## Manifest", bundle);
+        Assert.Contains("## Connection Event Timeline", bundle);
+        Assert.Contains("## Tray Log Tail", bundle);
+        Assert.Contains("## Structured Diagnostics JSONL Tail", bundle);
+        Assert.Contains("## Crash Log Tail", bundle);
+        Assert.Contains("## Latest Setup Log Tails", bundle);
+        Assert.Contains("Authentication failed", bundle);
+        Assert.Contains("port 18789 refused", bundle);
+        Assert.Contains("gateway did not become healthy", bundle);
+        Assert.DoesNotContain("tray-secret", bundle);
+        Assert.DoesNotContain("jsonl-secret", bundle);
+        Assert.DoesNotContain("crash-secret", bundle);
+        Assert.DoesNotContain("setup-secret", bundle);
+        Assert.DoesNotContain("event-secret", bundle);
+        Assert.DoesNotContain("gateway.example.com", bundle);
+    }
+
+    [Fact]
+    public void Build_PreservesConnectionTimelineIsoTimestamps()
+    {
+        var timestamp = new DateTime(2026, 6, 26, 16, 2, 42, DateTimeKind.Utc);
+        var events = new[]
+        {
+            new ConnectionDiagnosticEvent(
+                timestamp,
+                "transport",
+                "Connected to gateway",
+                "wss://gateway.example.com:18789/path")
+        };
+
+        var bundle = DiagnosticsBundleBuilder.Build(new GatewayCommandCenterState(), events);
+
+        Assert.Contains("2026-06-26T16:02:42.0000000Z", bundle);
+        Assert.DoesNotContain("<host>:02:42", bundle);
+        Assert.DoesNotContain("gateway.example.com", bundle);
+    }
+
+    [Fact]
+    public void Build_AnnotatesMissingFilesInsteadOfFailing()
+    {
+        var state = new GatewayCommandCenterState();
+        var paths = new DiagnosticsBundlePaths(
+            Path.Combine(_tempDir, "missing.log"),
+            null,
+            Path.Combine(_tempDir, "missing.jsonl"),
+            Path.Combine(_tempDir, "missing-crash.log"),
+            Path.Combine(_tempDir, "missing-setup"));
+
+        var bundle = DiagnosticsBundleBuilder.Build(state, [], paths);
+
+        Assert.Contains("Status: not found", bundle);
+        Assert.Contains("No connection diagnostic events recorded.", bundle);
+        Assert.Contains("Raw settings.json", bundle);
+        Assert.Contains("device-key-ed25519.json", bundle);
+    }
+
+    [Fact]
+    public void BuildCached_RegeneratesWhenLogsChangeInsideReuseWindow()
+    {
+        DiagnosticsBundleBuilder.ClearBundleCacheForTest();
+        var trayLog = Path.Combine(_tempDir, "openclaw-tray.log");
+        File.WriteAllText(trayLog, "first\n");
+        var paths = new DiagnosticsBundlePaths(trayLog, null, null, null, null);
+        var now = new DateTimeOffset(2026, 6, 23, 14, 0, 0, TimeSpan.Zero);
+
+        var first = DiagnosticsBundleBuilder.BuildCached(new GatewayCommandCenterState(), [], paths, now);
+        File.AppendAllText(trayLog, "second\n");
+        var second = DiagnosticsBundleBuilder.BuildCached(new GatewayCommandCenterState(), [], paths, now.AddSeconds(10));
+
+        Assert.NotEqual(first, second);
+        Assert.Contains("second", second);
+    }
+
+    [Fact]
+    public void BuildCached_RegeneratesAfterReuseWindowWhenLogsChange()
+    {
+        DiagnosticsBundleBuilder.ClearBundleCacheForTest();
+        var trayLog = Path.Combine(_tempDir, "openclaw-tray.log");
+        File.WriteAllText(trayLog, "first\n");
+        var paths = new DiagnosticsBundlePaths(trayLog, null, null, null, null);
+        var now = new DateTimeOffset(2026, 6, 23, 14, 0, 0, TimeSpan.Zero);
+
+        var first = DiagnosticsBundleBuilder.BuildCached(new GatewayCommandCenterState(), [], paths, now);
+        File.AppendAllText(trayLog, "second\n");
+        var second = DiagnosticsBundleBuilder.BuildCached(new GatewayCommandCenterState(), [], paths, now.AddSeconds(31));
+
+        Assert.NotEqual(first, second);
+        Assert.Contains("second", second);
+    }
+
+    [Fact]
+    public void BuildCached_RegeneratesWhenDiagnosticStateContentChangesWithSameCounts()
+    {
+        DiagnosticsBundleBuilder.ClearBundleCacheForTest();
+        var now = new DateTimeOffset(2026, 6, 26, 16, 0, 0, TimeSpan.Zero);
+        var firstState = new GatewayCommandCenterState
+        {
+            RecentActivity =
+            [
+                new CommandCenterActivityInfo
+                {
+                    Timestamp = now.UtcDateTime,
+                    Category = "diagnostics",
+                    Title = "first warning",
+                    Details = "gateway health path /home/openclaw/.openclaw/sessions/old/session.jsonl"
+                }
+            ]
+        };
+        var secondState = new GatewayCommandCenterState
+        {
+            RecentActivity =
+            [
+                new CommandCenterActivityInfo
+                {
+                    Timestamp = now.AddSeconds(1).UtcDateTime,
+                    Category = "diagnostics",
+                    Title = "second warning",
+                    Details = "gateway health path /home/openclaw/.openclaw/sessions/new/session.jsonl"
+                }
+            ]
+        };
+
+        var first = DiagnosticsBundleBuilder.BuildCached(firstState, [], null, now);
+        var second = DiagnosticsBundleBuilder.BuildCached(secondState, [], null, now.AddSeconds(1));
+
+        Assert.NotEqual(first, second);
+        Assert.Contains("second warning", second);
+        Assert.DoesNotContain("first warning", second);
+        Assert.DoesNotContain("/home/openclaw", second, StringComparison.OrdinalIgnoreCase);
+        Assert.Contains("$HOME", second);
+    }
+
+    [Fact]
+    public void DiagnosticsLogTailReader_ReadTail_ReturnsOnlyLastLines()
+    {
+        var log = Path.Combine(_tempDir, "large.log");
+        File.WriteAllLines(log, Enumerable.Range(1, 300).Select(i => $"line-{i}"));
+
+        var lines = DiagnosticsLogTailReader.ReadTail(log, 5);
+
+        Assert.Equal(["line-296", "line-297", "line-298", "line-299", "line-300"], lines);
+    }
+
+    [Fact]
+    public void DiagnosticsLogTailReader_ReadSanitizedTail_UsesContextBeforeVisibleTail()
+    {
+        var log = Path.Combine(_tempDir, "multiline-secret.log");
+        File.WriteAllLines(log,
+        [
+            "prefix",
+            "token:",
+            "visible-secret-value"
+        ]);
+
+        var lines = DiagnosticsLogTailReader.ReadSanitizedTail(
+            log,
+            new DiagnosticsTailOptions(MaxLines: 1, SanitizationContextLines: 2));
+
+        Assert.Equal(["[REDACTED]"], lines);
+    }
+
+    [Fact]
+    public void Build_RedactsLegacyMultilineSecretDuringExportWithoutRewritingSource()
+    {
+        var trayLog = Path.Combine(_tempDir, "openclaw-tray.log");
+        var jsonl = Path.Combine(_tempDir, "diagnostics.jsonl");
+        File.WriteAllText(trayLog, """
+            {"event":"split-secret","metadata":{"token":
+            "split-token-secret"}}
+            """);
+        File.WriteAllText(jsonl, """
+            {"event":"split-secret","metadata":{"token":
+            "split-token-secret"}}
+            """);
+
+        var bundle = DiagnosticsBundleBuilder.Build(
+            new GatewayCommandCenterState(),
+            [],
+            new DiagnosticsBundlePaths(
+                trayLog,
+                null,
+                jsonl,
+                null,
+                null));
+
+        Assert.Contains("split-secret", bundle);
+        Assert.DoesNotContain("split-token-secret", bundle);
+        Assert.Contains("[REDACTED]", bundle);
+        Assert.Contains("split-token-secret", File.ReadAllText(trayLog));
+        Assert.Contains("split-token-secret", File.ReadAllText(jsonl));
+    }
+
+    [Fact]
+    public void Build_RedactsLegacyPiiDuringExportWithoutRewritingSource()
+    {
+        var trayLog = Path.Combine(_tempDir, "openclaw-tray.log");
+        var jsonl = Path.Combine(_tempDir, "diagnostics.jsonl");
+        var crash = Path.Combine(_tempDir, "crash.log");
+        var rawChat = Path.Combine(_tempDir, "chat-history-raw.log");
+        File.WriteAllText(trayLog, @"Failed reading C:\Users\alice\AppData\Local\OpenClawTray\settings.json from alice@example.com" + "\n");
+        File.WriteAllText(jsonl, """{"event":"test","metadata":{"path":"C:\\Users\\alice\\AppData\\Local\\OpenClawTray\\settings.json","ip":"10.1.2.3"}}""" + "\n");
+        File.WriteAllText(crash, @"Unhandled at C:/Users/alice/source/repos/openclaw-windows-node/App.xaml.cs via alice@host:22" + "\n");
+        File.WriteAllText(rawChat, """{"arguments":{"command":"grep C:\\Users\\alice\\source\\repos\\openclaw"}}""" + "\n");
+
+        var bundle = DiagnosticsBundleBuilder.Build(
+            new GatewayCommandCenterState(),
+            [],
+            new DiagnosticsBundlePaths(
+                trayLog,
+                null,
+                jsonl,
+                crash,
+                null));
+
+        Assert.DoesNotContain("alice", bundle, StringComparison.OrdinalIgnoreCase);
+        Assert.DoesNotContain("10.1.2.3", bundle, StringComparison.OrdinalIgnoreCase);
+        Assert.Contains("C:\\Users", File.ReadAllText(trayLog), StringComparison.OrdinalIgnoreCase);
+        Assert.Contains("C:\\\\Users", File.ReadAllText(jsonl), StringComparison.OrdinalIgnoreCase);
+        Assert.Contains("C:/Users", File.ReadAllText(crash), StringComparison.OrdinalIgnoreCase);
+        Assert.Contains("alice", File.ReadAllText(rawChat), StringComparison.OrdinalIgnoreCase);
+        Assert.Contains("%USERPROFILE%", bundle);
+        Assert.Contains("<email>", bundle);
+        Assert.Contains("<ip>", bundle);
+        Assert.Contains("<user>@<host>:22", bundle);
+    }
+
+    [Fact]
+    public void Build_NormalizesLegacyJsonlForExportWithoutRewritingSource()
+    {
+        var jsonl = Path.Combine(_tempDir, "diagnostics.jsonl");
+        var persisted = """{"event":"structured","metadata":"{\u0022message\u0022:\u0022line1\r\nline2\u0022,\u0022apiKey\u0022:\u0022[REDACTED]\u0022}"}""";
+        File.WriteAllText(jsonl, persisted);
+
+        var bundle = DiagnosticsBundleBuilder.Build(
+            new GatewayCommandCenterState(),
+            [],
+            new DiagnosticsBundlePaths(
+                null,
+                null,
+                jsonl,
+                null,
+                null));
+
+        Assert.Contains("## Structured Diagnostics JSONL Tail", bundle);
+        Assert.DoesNotContain(@"\u0022", bundle);
+        Assert.DoesNotContain(@"\r\n", bundle);
+        Assert.Contains(@"\u0022", File.ReadAllText(jsonl));
+        Assert.Contains(@"\r\n", File.ReadAllText(jsonl));
+        Assert.Contains("[REDACTED]", bundle);
+    }
+
+    [Fact]
+    public void Build_NormalizesLegacySetupJsonlForExportWithoutRewritingSource()
+    {
+        var setupDir = Path.Combine(_tempDir, "Setup");
+        Directory.CreateDirectory(setupDir);
+        var setupLog = Path.Combine(setupDir, "setup-engine-20260603-184044.jsonl");
+        var journalLog = Path.Combine(setupDir, "setup-engine-20260603-184044.journal.jsonl");
+        File.WriteAllText(setupLog,
+            """
+            {"ts":"2026-06-03T18:42:49.9079864\u002B00:00","run":"9f9f8a5056b7","level":"debug","msg":"cmd.done: wsl.exe exit=0 (1382ms)","data":{"exe":"wsl.exe","exit_code":0,"stdout":"{\r\n  \u0022cli\u0022: {\r\n    \u0022version\u0022: \u00222026.5.28\u0022\r\n  },\r\n  \u0022timestamp\u0022: \u00222026-06-03T18:42:49.9079864\u002B00:00\u0022\r\n}"}}
+            """);
+        File.WriteAllText(journalLog,
+            """
+            {"Timestamp":"2026-06-03T18:40:44.7873386+00:00","StepId":"wsl-create","Event":"completed","Detail":"Created clean WSL2 distro at C:\\Users\\alice\\AppData\\Local\\OpenClawTray\\wsl\\OpenClawGateway"}
+            """);
+
+        var bundle = DiagnosticsBundleBuilder.Build(
+            new GatewayCommandCenterState(),
+            [],
+            new DiagnosticsBundlePaths(null, null, null, null, setupDir));
+        var persisted = File.ReadAllText(setupLog);
+
+        Assert.Contains("## Setup Log Tail: setup-engine-20260603-184044.jsonl", bundle);
+        Assert.DoesNotContain("\\u0022", bundle, StringComparison.Ordinal);
+        Assert.DoesNotContain("\\u002B", bundle, StringComparison.Ordinal);
+        Assert.DoesNotContain("\\r\\n", bundle, StringComparison.Ordinal);
+        Assert.Contains("\\u0022", persisted, StringComparison.Ordinal);
+        Assert.Contains("\\u002B", persisted, StringComparison.Ordinal);
+        Assert.Contains("\\r\\n", persisted, StringComparison.Ordinal);
+        Assert.Contains("alice", File.ReadAllText(journalLog), StringComparison.OrdinalIgnoreCase);
+        Assert.Contains("+00:00", bundle, StringComparison.Ordinal);
+        Assert.Contains("\"stdout\":{\"cli\"", bundle, StringComparison.Ordinal);
+    }
+
+    [Fact]
+    public void Build_FailsClosedForUnsafeJsonlLines()
+    {
+        var jsonl = Path.Combine(_tempDir, "diagnostics.jsonl");
+        File.WriteAllText(jsonl, """{"event":"bad","token":""" + "\nunsafe-secret-value\n");
+
+        var bundle = DiagnosticsBundleBuilder.Build(
+            new GatewayCommandCenterState(),
+            [],
+            new DiagnosticsBundlePaths(null, null, jsonl, null, null));
+
+        Assert.Contains(DiagnosticsExportSanitizer.UnsafeJsonlLineSentinel, bundle);
+        Assert.DoesNotContain("unsafe-secret-value", bundle);
+        Assert.Contains("unsafe-secret-value", File.ReadAllText(jsonl));
+    }
+
+    [Fact]
+    public void Build_CapsSetupLogFiles()
+    {
+        var setupDir = Path.Combine(_tempDir, "Setup");
+        Directory.CreateDirectory(setupDir);
+        for (var i = 0; i < 8; i++)
+        {
+            var path = Path.Combine(setupDir, $"setup-engine-{i}.jsonl");
+            File.WriteAllText(path, $$"""{"event":"setup-{{i}}"}""" + "\n");
+            File.SetLastWriteTimeUtc(path, DateTime.UtcNow.AddMinutes(i));
+        }
+
+        var bundle = DiagnosticsBundleBuilder.Build(
+            new GatewayCommandCenterState(),
+            [],
+            new DiagnosticsBundlePaths(null, null, null, null, setupDir));
+
+        Assert.Equal(4, Regex.Matches(bundle, "## Setup Log Tail:").Count);
+        Assert.Contains("[truncated setup logs at 4 files]", bundle);
+    }
+
+    [Fact]
+    public void DiagnosticsJsonlService_SanitizesAndStructuresNestedStringMetadataBeforeSerialization()
+    {
+        var metadata = new
+        {
+            rawJson = """{"apiKey":"jsonl-secret","message":"line1\r\nline2"}""",
+            nested = new { Authorization = "Bearer bearer-secret" },
+            timestamp = "2026-06-22T15:49:22.112+00:00"
+        };
+
+        var json = DiagnosticsJsonlService.FormatRecordLineForTest("diagnostics.test", metadata);
+
+        Assert.DoesNotContain("jsonl-secret", json);
+        Assert.DoesNotContain("bearer-secret", json);
+        Assert.DoesNotContain(@"\u0022", json);
+        Assert.DoesNotContain(@"\u002B00", json);
+        Assert.DoesNotContain(@"\r\n", json);
+        Assert.Contains("[REDACTED]", json);
+        Assert.Contains("line1 line2", json);
+        Assert.Contains("+00:00", json);
+    }
+
+    [Fact]
+    public void DiagnosticsJsonlService_PreservesValidJsonWhenMetadataContainsNonStringSensitiveSiblings()
+    {
+        var json = DiagnosticsJsonlService.FormatRecordLineForTest(
+            "app.start",
+            new
+            {
+                nodeMode = true,
+                useSshTunnel = false,
+                nonce = "nonce-secret",
+                deviceId = "device-secret",
+                raw_error_response = "raw-secret",
+                sessionKey = "agent:abc123:some-session-key",
+                setupCode = 123456,
+                nested = new { password = "password-secret" }
+            });
+
+        using var document = JsonDocument.Parse(json);
+        var metadata = document.RootElement.GetProperty("metadata");
+        Assert.True(metadata.GetProperty("nodeMode").GetBoolean());
+        Assert.False(metadata.GetProperty("useSshTunnel").GetBoolean());
+        Assert.Equal("[REDACTED]", metadata.GetProperty("nonce").GetString());
+        Assert.Equal("[REDACTED]", metadata.GetProperty("deviceId").GetString());
+        Assert.Equal("[REDACTED]", metadata.GetProperty("raw_error_response").GetString());
+        Assert.Equal("[REDACTED]", metadata.GetProperty("sessionKey").GetString());
+        Assert.Equal("[REDACTED]", metadata.GetProperty("setupCode").GetString());
+        Assert.Equal("[REDACTED]", metadata.GetProperty("nested").GetProperty("password").GetString());
+        Assert.DoesNotContain("123456", json);
+        Assert.DoesNotContain("nonce-secret", json);
+        Assert.DoesNotContain("device-secret", json);
+        Assert.DoesNotContain("raw-secret", json);
+        Assert.DoesNotContain("agent:abc123:some-session-key", json);
+        Assert.DoesNotContain("password-secret", json);
+    }
+
+    [Fact]
+    public void DiagnosticsJsonlService_SanitizesMetadataPropertyNamesBeforeSerialization()
+    {
+        var json = DiagnosticsJsonlService.FormatRecordLineForTest(
+            "diagnostics.test",
+            new Dictionary<string, object?>
+            {
+                ["user alice@example.com token=secret"] = "visible",
+                [@"path C:\Users\alice\AppData\Local\OpenClawTray\settings.json"] = "path value",
+                ["plain"] = new Dictionary<string, object?>
+                {
+                    ["Authorization: Bearer nested-secret"] = "nested value"
+                }
+            });
+
+        using var document = JsonDocument.Parse(json);
+        var metadata = document.RootElement.GetProperty("metadata");
+        var propertyNames = metadata.EnumerateObject().Select(property => property.Name).ToArray();
+        Assert.Contains("user <email> token=[REDACTED]", propertyNames);
+        Assert.Contains(propertyNames, name => name.Contains("%USERPROFILE%", StringComparison.Ordinal));
+        Assert.Contains("Authorization: [REDACTED]", metadata.GetProperty("plain").EnumerateObject().Select(property => property.Name));
+        Assert.DoesNotContain("alice@example.com", json);
+        Assert.DoesNotContain("token=secret", json);
+        Assert.DoesNotContain("nested-secret", json);
+        Assert.DoesNotContain(@"C:\Users\alice", json, StringComparison.OrdinalIgnoreCase);
+    }
+}
diff --git a/tests/OpenClaw.Tray.Tests/DiagnosticsPageContractTests.cs b/tests/OpenClaw.Tray.Tests/DiagnosticsPageContractTests.cs
index 6053880c4..a41eec75a 100644
--- a/tests/OpenClaw.Tray.Tests/DiagnosticsPageContractTests.cs
+++ b/tests/OpenClaw.Tray.Tests/DiagnosticsPageContractTests.cs
@@ -186,7 +186,6 @@ public void DebugPage_CopySpecificCards_HaveCopyGlyph_NotChevron_AndFeedback()
                     $@"x:Uid=""{cardUid}""[\s\S]{{0,600}}SettingsCard\.ActionIcon[\s\S]{{0,200}}FluentIconCatalog\.Copy"),
                 xaml);
         }
-
         // The transient "Copied to clipboard" feedback InfoBar must
         // be on the page and start collapsed (IsOpen=False).
         Assert.Contains("x:Name=\"CopyFeedbackInfoBar\"", xaml);
@@ -206,12 +205,32 @@ public void DebugPage_CopySpecificCards_HaveCopyGlyph_NotChevron_AndFeedback()
         // Each copy handler must pass a human-readable label that
         // shows up in the feedback message.
         Assert.Contains("CopyDiagnosticText(\"Support context\"", cs);
-        Assert.Contains("CopyDiagnosticText(\"Debug bundle\"", cs);
+        Assert.Contains("CopyDiagnosticText(\r\n            \"Summary debug bundle\"", cs);
         Assert.Contains("CopyDiagnosticText(\"Browser setup guidance\"", cs);
         Assert.Contains("CopyDiagnosticText(\"Port diagnostics\"", cs);
         Assert.Contains("CopyDiagnosticText(\"Capability diagnostics\"", cs);
     }
 
+    [Fact]
+    public void DiagnosticsGate_DefaultsVisible_ForMissingSettingsCompatibility()
+    {
+        var source = Read("src", "OpenClaw.Tray.WinUI", "Helpers", "DiagnosticsGate.cs");
+
+        Assert.Contains("public static bool BuildDefault =>", source);
+        Assert.Contains("true;", source);
+        Assert.DoesNotContain("PackageHelper.IsPackaged", source);
+    }
+
+    [Fact]
+    public void HubWindow_RemovesDiagnosticsBackStack_WhenDiagnosticsHidden()
+    {
+        var source = Read("src", "OpenClaw.Tray.WinUI", "Windows", "HubWindow.xaml.cs");
+
+        Assert.Contains("RemoveBackStackEntries(\"debug\")", source);
+        Assert.Contains("NavigateInternal(\"settings\")", source);
+        Assert.Contains("RefreshDiagnosticsNavVisibility()", source);
+    }
+
     [Fact]
     public void DebugPage_CopyFeedbackTimer_IsStoppedOnTeardown()
     {
@@ -230,17 +249,252 @@ public void DebugPage_CopyFeedbackTimer_IsStoppedOnTeardown()
     }
 
     [Fact]
-    public void DebugPage_DetailView_UsesGenerationCounterForRaceSafety()
+    public void DebugPage_MainAndDetailViews_UseBoundedStretchLayout()
     {
-        var cs = Read("src", "OpenClaw.Tray.WinUI", "Pages", "DebugPage.xaml.cs");
+        var xaml = Read("src", "OpenClaw.Tray.WinUI", "Pages", "DebugPage.xaml");
 
-        Assert.Contains("_detailGeneration", cs);
-        Assert.Contains("LoadLogFileAsync(int generation)", cs);
-        Assert.Contains("_detailMode != DetailMode.Log || _detailGeneration != generation", cs);
         Assert.Matches(
-            new Regex(
-                @"OnDetailRefresh[\s\S]{0,200}_detailGeneration\+\+[\s\S]{0,120}LoadLogFileAsync\(_detailGeneration\)"),
-            cs);
+            new System.Text.RegularExpressions.Regex(
+                @"x:Name=""MainView""[\s\S]{0,500}<Grid HorizontalAlignment=""Stretch"">[\s\S]{0,300}<StackPanel HorizontalAlignment=""Stretch""[\s\S]{0,160}MaxWidth=""900""[\s\S]{0,160}Padding=""24,24,24,24"""),
+            xaml);
+        Assert.Matches(
+            new System.Text.RegularExpressions.Regex(
+                @"x:Name=""DetailView""[\s\S]{0,400}HorizontalAlignment=""Stretch""[\s\S]{0,300}<Grid MaxWidth=""900""[\s\S]{0,160}HorizontalAlignment=""Stretch""[\s\S]{0,160}Padding=""24,24,24,24"""),
+            xaml);
+    }
+
+    [Fact]
+    public void DebugPage_UsesFluentIconCatalog_NotLiteralGlyphs()
+    {
+        // Per docs/design/iconography.md and AGENT_HANDOFF.md "drift
+        // candidates", WinUI surfaces must route through
+        // FluentIconCatalog. Page should declare the helpers xmlns
+        // and bind glyphs from the catalog.
+        var xaml = Read("src", "OpenClaw.Tray.WinUI", "Pages", "DebugPage.xaml");
+        Assert.Contains("xmlns:helpers=\"using:OpenClawTray.Helpers\"", xaml);
+        Assert.Contains("x:Bind helpers:FluentIconCatalog.", xaml);
+
+        // No literal PUA glyph hex entities in the body. We allow
+        // catalog references; we forbid raw "Glyph=&#xE..."
+        // declarations because that's exactly the drift the design
+        // reference calls out.
+        Assert.DoesNotContain("Glyph=\"&#x", xaml);
+    }
+
+    [Fact]
+    public void DebugPage_UsesSystemFillBrushes_NotLiteralColors()
+    {
+        // Per docs/design/tokens.md status colors must use
+        // SystemFillColor* tokens. Hard-coded ARGB / Color.FromArgb
+        // is the drift the handoff calls out for status dots.
+        // (Success/Attention tokens were used by the in-page timeline
+        // coloring; the timeline now lives in ConnectionStatusWindow,
+        // so only the Critical/Caution/Secondary tokens are still
+        // referenced from this page — which is what we assert.)
+        var cs = Read("src", "OpenClaw.Tray.WinUI", "Pages", "DebugPage.xaml.cs");
+        Assert.Contains("SystemFillColorCriticalBrush", cs);
+        Assert.Contains("SystemFillColorCautionBrush", cs);
+        Assert.Contains("TextFillColorSecondaryBrush", cs);
+        Assert.DoesNotContain("ColorHelper.FromArgb", cs);
+    }
+
+    [Fact]
+    public void DebugPage_DoesNotDuplicateSettingsSetupEntryPoint()
+    {
+        var xaml = Read("src", "OpenClaw.Tray.WinUI", "Pages", "DebugPage.xaml");
+        Assert.DoesNotContain("Reconfigure", xaml);
+        Assert.DoesNotContain("OnRelaunchOnboarding", xaml);
+        Assert.DoesNotContain("Relaunch first-run setup", xaml);
+
+        var settings = Read("src", "OpenClaw.Tray.WinUI", "Pages", "SettingsPage.xaml");
+        Assert.Contains("OnOpenLocalGatewaySetup", settings);
+        Assert.Contains("Open setup", settings);
+    }
+
+    [Fact]
+    public void DebugPage_DetailView_HasLogMode()
+    {
+        var cs = Read("src", "OpenClaw.Tray.WinUI", "Pages", "DebugPage.xaml.cs");
+        Assert.Contains("enum DetailMode", cs);
+        Assert.Contains("DetailMode.Log", cs);
+        // Both entry points present. OnOpenEventTimeline opens the
+        // ConnectionStatusWindow popup; OnShowRecentLog enters the
+        // in-page DetailView. OnOpen* vs OnShow* mirrors the rest of
+        // the page (popup vs in-page detail).
+        Assert.Contains("OnOpenEventTimeline", cs);
+        Assert.Contains("OnShowRecentLog", cs);
+        // Back navigation present.
+        Assert.Contains("OnBackToMain", cs);
+    }
+
+    [Fact]
+    public void DebugPage_SharesLogColoringWithConnectionStatusWindow()
+    {
+        var cs = Read("src", "OpenClaw.Tray.WinUI", "Pages", "DebugPage.xaml.cs");
+        // The severity brushes used for log line coloring mirror
+        // ConnectionStatusWindow:33-40 so both surfaces speak the same
+        // visual language. (AuthTextBrush was timeline-only and is
+        // gone now that the timeline lives in ConnectionStatusWindow.)
+        Assert.Contains("ErrorTextBrush", cs);
+        Assert.Contains("WarnTextBrush", cs);
+        Assert.Contains("DimTextBrush", cs);
+
+        // Log lines must be parsed for severity so they get colored too.
+        Assert.Contains("LogSeverityPattern", cs);
+        Assert.Contains("CreateLogParagraph", cs);
+    }
+
+    [Fact]
+    public void DiagnosticsBundleDialog_Exists_And_ExposesCopyAndSaveAndCancel()
+    {
+        var xaml = Read("src", "OpenClaw.Tray.WinUI", "Windows", "DiagnosticsBundleDialog.xaml");
+        Assert.Contains("ContentDialog", xaml);
+        Assert.Contains("PrimaryButtonText=\"Copy to clipboard\"", xaml);
+        Assert.Contains("SecondaryButtonText=\"Save to file\"", xaml);
+        Assert.Contains("CloseButtonText=\"Close\"", xaml);
+        Assert.Contains("Height=\"420\"", xaml);
+        Assert.Contains("VerticalScrollBarVisibility=\"Auto\"", xaml);
+        Assert.Contains("HorizontalScrollBarVisibility=\"Auto\"", xaml);
+        Assert.DoesNotContain("MinWidth=\"720\"", xaml);
+        Assert.DoesNotContain("Width=\"720\"", xaml);
+
+        var cs = Read("src", "OpenClaw.Tray.WinUI", "Windows", "DiagnosticsBundleDialog.xaml.cs");
+        // The dialog must expose a Configure() that takes a HWND-provider
+        // delegate (not a captured IntPtr) so we can resolve the host
+        // window handle JUST-IN-TIME when Save is clicked, instead of
+        // trusting a possibly-stale handle captured at dialog open
+        // (Hanselman v2 review #4).
+        Assert.Contains("public void Configure(", cs);
+        Assert.Contains("Func<IntPtr>", cs);
+        Assert.Contains("hwndProvider", cs);
+        Assert.DoesNotContain("SaveToDesktopAsync", cs);
+        Assert.Contains("DiagnosticsBundleDialog save skipped: no host hwnd", cs);
+        // It must NOT auto-close on Copy — the user may want to also save.
+        Assert.Contains("args.Cancel = true", cs);
+    }
+
+    [Fact]
+    public void AppLogger_LogsFullExceptionDetails()
+    {
+        var cs = Read("src", "OpenClaw.Tray.WinUI", "AppLogger.cs");
+        Assert.Contains(@"{message}: {ex}", cs);
+        Assert.DoesNotContain(@"{message}: {ex.Message}", cs);
+    }
+
+    [Fact]
+    public void SettingsPage_HostsAboutAndGatewayInfoAfterAboutPageRemoval()
+    {
+        var settingsXaml = Read("src", "OpenClaw.Tray.WinUI", "Pages", "SettingsPage.xaml");
+        var settingsCs = Read("src", "OpenClaw.Tray.WinUI", "Pages", "SettingsPage.xaml.cs");
+        var hub = Read("src", "OpenClaw.Tray.WinUI", "Windows", "HubWindow.xaml.cs");
+
+        Assert.Contains("SettingsPage_AppInfoExpander", settingsXaml);
+        Assert.Contains("SettingsPage_GatewayInfoExpander", settingsXaml);
+        Assert.Contains("OnCheckUpdates", settingsXaml);
+        Assert.Contains("OnDocumentationLink", settingsXaml);
+        Assert.Contains("OnGitHubLink", settingsXaml);
+        Assert.Contains("OnDashboardLink", settingsXaml);
+        Assert.Contains("RefreshGatewayInfo", settingsCs);
+        Assert.Contains("\"info\" => typeof(SettingsPage)", hub);
+        Assert.Contains("\"about\" => typeof(SettingsPage)", hub);
+        var repoRoot = TestRepositoryPaths.GetRepositoryRoot();
+        Assert.False(File.Exists(Path.Combine(repoRoot, "src", "OpenClaw.Tray.WinUI", "Pages", "AboutPage.xaml")));
+        Assert.False(File.Exists(Path.Combine(repoRoot, "src", "OpenClaw.Tray.WinUI", "Pages", "AboutPage.xaml.cs")));
+    }
+
+    [Fact]
+    public void HubWindow_DebugNavItem_RoutesUnchanged_LabelRenamed()
+    {
+        // The Tag must still be "debug" so command-palette / deep-link
+        // aliases keep working, even though the visible label is now
+        // "Diagnostics".
+        var xaml = Read("src", "OpenClaw.Tray.WinUI", "Windows", "HubWindow.xaml");
+        Assert.Contains("Tag=\"debug\"", xaml);
+
+        var resw = Read("src", "OpenClaw.Tray.WinUI", "Strings", "en-us", "Resources.resw");
+        Assert.Contains("<data name=\"HubWindow_NavigationViewItem_145.Content\"", resw);
+        // The resw entry must now say Diagnostics.
+        var navEntryStart = resw.IndexOf("<data name=\"HubWindow_NavigationViewItem_145.Content\"", StringComparison.Ordinal);
+        var navEntryEnd = resw.IndexOf("</data>", navEntryStart, StringComparison.Ordinal);
+        var entry = resw.Substring(navEntryStart, navEntryEnd - navEntryStart);
+        Assert.Contains("Diagnostics", entry);
+
+        // Internal route mapping unchanged.
+        var cs = Read("src", "OpenClaw.Tray.WinUI", "Windows", "HubWindow.xaml.cs");
+        Assert.Contains("\"debug\" => typeof(DebugPage)", cs);
+    }
+
+    [Fact]
+    public void HubWindow_NavPaneToggle_LivesInTitleBarAndHidesBuiltInToggle()
+    {
+        var xaml = Read("src", "OpenClaw.Tray.WinUI", "Windows", "HubWindow.xaml");
+        Assert.Contains("x:Uid=\"NavPaneToggleButton\"", xaml);
+        Assert.Contains("x:Name=\"NavPaneToggleButton\"", xaml);
+        Assert.Contains("Click=\"OnNavPaneToggleButtonClick\"", xaml);
+        Assert.Contains("AutomationProperties.Name=\"Toggle navigation pane\"", xaml);
+        Assert.Contains("ToolTipService.ToolTip=\"Toggle navigation pane\"", xaml);
+        Assert.Contains("MinWidth=\"32\" MinHeight=\"32\"", xaml);
+        Assert.Contains("Padding=\"9,0,140,0\"", xaml);
+        Assert.Contains("Background=\"Transparent\"", xaml);
+        Assert.Contains("BorderBrush=\"Transparent\"", xaml);
+        Assert.Contains("BorderThickness=\"0\"", xaml);
+        Assert.Contains("FontSize=\"16\"", xaml);
+        Assert.Contains("xmlns:controls=\"using:OpenClawTray.Controls\"", xaml);
+        Assert.Contains("<controls:BrandMark Grid.Column=\"1\"", xaml);
+        Assert.Contains("MarkSize=\"18\"", xaml);
+        Assert.DoesNotContain("Translation=\"0,-1,0\"", xaml);
+        Assert.Contains("IsPaneToggleButtonVisible=\"False\"", xaml);
+        Assert.Contains("x:Name=\"NavContentHost\"", xaml);
+        Assert.Contains("x:Name=\"NavContentClip\"", xaml);
+        Assert.Contains("SizeChanged=\"OnNavContentHostSizeChanged\"", xaml);
+        Assert.DoesNotContain("x:Name=\"TitleContentDivider\"", xaml);
+
+        var titleBarIndex = xaml.IndexOf("x:Name=\"AppTitleBar\"", StringComparison.Ordinal);
+        var toggleIndex = xaml.IndexOf("x:Name=\"NavPaneToggleButton\"", StringComparison.Ordinal);
+        var iconIndex = xaml.IndexOf("<controls:BrandMark Grid.Column=\"1\"", StringComparison.Ordinal);
+        var navViewIndex = xaml.IndexOf("x:Name=\"NavView\"", StringComparison.Ordinal);
+        Assert.True(titleBarIndex >= 0, "The hub title bar must exist.");
+        Assert.True(toggleIndex > titleBarIndex, "The nav pane toggle must live inside the title bar block.");
+        Assert.True(toggleIndex < iconIndex, "The nav pane toggle must appear before the app icon/title.");
+        Assert.True(toggleIndex < navViewIndex, "The nav pane toggle must be outside the NavigationView pane.");
+
+        var cs = Read("src", "OpenClaw.Tray.WinUI", "Windows", "HubWindow.xaml.cs");
+        Assert.Contains("private void OnNavPaneToggleButtonClick", cs);
+        Assert.Contains("NavView.IsPaneOpen = !NavView.IsPaneOpen;", cs);
+        Assert.Contains("private void OnNavContentHostSizeChanged", cs);
+        Assert.Contains("NavContentClip.Rect = new global::Windows.Foundation.Rect(0, 0, e.NewSize.Width, e.NewSize.Height);", cs);
+    }
+
+    [Fact]
+    public void DebugPage_ObservesAppState_NotHubWindow()
+    {
+        // After Ranjesh's single-app-model rebase, the page must
+        // observe AppState directly per
+        // docs/DATA_FLOW_ARCHITECTURE.md and not depend on HubWindow.
+        var cs = Read("src", "OpenClaw.Tray.WinUI", "Pages", "DebugPage.xaml.cs");
+        Assert.Contains("private static App CurrentApp", cs);
+        Assert.Contains("AppState? _appState", cs);
+        Assert.Contains("_appState.PropertyChanged", cs);
+        // App provides BuildCommandCenterState() so the bundle preview
+        // dialog can render text without going through HubWindow.
+        var app = Read("src", "OpenClaw.Tray.WinUI", "App.xaml.cs");
+        Assert.Contains("internal GatewayCommandCenterState BuildCommandCenterState", app);
+        // HubWindow no longer plumbs a state-action callback for pages.
+        var hub = Read("src", "OpenClaw.Tray.WinUI", "Windows", "HubWindow.xaml.cs");
+        Assert.DoesNotContain("GetCommandCenterStateAction", hub);
+    }
+
+    [Fact]
+    public void DebugPage_RefreshesOnSettingsChanged()
+    {
+        // The Status InfoBar shows the effective Gateway URL from
+        // SettingsManager. Settings-saved events must update the page
+        // immediately rather than waiting for the next Status flip
+        // (reactive-by-default ethos per docs/DATA_FLOW_ARCHITECTURE.md).
+        var cs = Read("src", "OpenClaw.Tray.WinUI", "Pages", "DebugPage.xaml.cs");
+        Assert.Contains("CurrentApp.SettingsChanged += OnSettingsChanged", cs);
+        Assert.Contains("CurrentApp.SettingsChanged -= OnSettingsChanged", cs);
+        Assert.Contains("OnSettingsChanged", cs);
     }
 
     [Fact]
@@ -254,14 +508,45 @@ public void CommandCenterTextHelper_SupportContext_AdvertisesRedaction()
     }
 
     [Fact]
-    public void CommandCenterTextHelper_DebugBundle_IncludesSanitizedTrayLogTail()
+    public void CommandCenterTextHelper_DebugBundle_IsSummaryOnlyWithoutLogTail()
     {
         var helper = Read("src", "OpenClaw.Tray.WinUI", "Helpers", "CommandCenterTextHelper.cs");
+        var xaml = Read("src", "OpenClaw.Tray.WinUI", "Pages", "DebugPage.xaml");
+        var resources = Read("src", "OpenClaw.Tray.WinUI", "Strings", "en-us", "Resources.resw");
+
+        Assert.DoesNotContain("Recent Tray Log", helper);
+        Assert.DoesNotContain("DiagnosticsLogTailReader.BuildSection", helper);
+        Assert.DoesNotContain("DiagnosticsTailOptions", helper);
+        Assert.DoesNotContain("RecentTrayLogTailLines", helper);
+        Assert.DoesNotContain("RecentTrayLogMaxChars", helper);
+        Assert.DoesNotContain("BuildRecentTrayLogTail", helper);
+        Assert.DoesNotContain("builder.AppendLine(line)", helper);
+        Assert.Contains("Generated summaries only; excludes log tails.", xaml);
+        Assert.Contains("Generated summaries only; excludes log tails.", resources);
+        Assert.DoesNotContain("sanitized recent tray log", xaml);
+        Assert.DoesNotContain("sanitized recent tray log", resources);
+    }
 
-        Assert.Contains("Recent Tray Log", helper);
-        Assert.Contains("BuildRecentTrayLogTail(Logger.LogFilePath)", helper);
-        Assert.Contains("TokenSanitizer.SanitizeLogMessage(line)", helper);
-        Assert.Contains("FileShare.ReadWrite | FileShare.Delete", helper);
+    [Fact]
+    public void DiagnosticsCopyAndExport_UseSideEffectFreeExportSanitizer()
+    {
+        var page = Read("src", "OpenClaw.Tray.WinUI", "Pages", "DebugPage.xaml.cs");
+        var service = Read("src", "OpenClaw.Tray.WinUI", "Services", "DiagnosticsClipboardService.cs");
+        var builder = Read("src", "OpenClaw.Tray.WinUI", "Services", "DiagnosticsBundleBuilder.cs");
+
+        Assert.Contains("DiagnosticsExportSanitizer.SanitizeTextBlock", page);
+        Assert.Contains("DiagnosticsExportSanitizer.SanitizeTextBlock", service);
+        Assert.Contains(
+            "DiagnosticsExportSanitizer.SanitizeTextBlock(_plainBuffer.ToString())",
+            Read("src", "OpenClaw.Tray.WinUI", "Windows", "ConnectionStatusWindow.xaml.cs"));
+        Assert.Contains("ReadSanitizedTail", page);
+        Assert.DoesNotContain("ReadLogTail(", page);
+        Assert.Contains("CommandCenterTextHelper.BuildDebugBundle", page);
+        Assert.Contains("CommandCenterTextHelper.BuildDebugBundle", service);
+        Assert.DoesNotContain("DiagnosticsBundleBuilder.Build(state)", service);
+        Assert.DoesNotContain("NormalizePersistedDiagnosticsLogs", builder);
+        Assert.DoesNotContain("File.WriteAllLines", builder);
+        Assert.Contains("Export is read-only", builder);
     }
 
     [Fact]
@@ -296,12 +581,55 @@ public void TrayLogWriters_SanitizeSensitiveValuesBeforeWriting()
         Assert.Contains("TokenSanitizer.SanitizeLogMessage(message)", logger);
 
         var diagnosticsJsonl = Read("src", "OpenClaw.Tray.WinUI", "Services", "DiagnosticsJsonlService.cs");
-        Assert.Contains("TokenSanitizer.SanitizeLogMessage(JsonSerializer.Serialize(record))", diagnosticsJsonl);
+        Assert.Contains("FormatRecordLine(eventName, metadata)", diagnosticsJsonl);
+        Assert.Contains("metadata = SanitizeMetadata(metadata)", diagnosticsJsonl);
+        Assert.Contains("IsSensitiveMetadataKey(propertyName)", diagnosticsJsonl);
+        Assert.Contains("TokenSanitizer.IsSensitiveMetadataKeyName(key)", diagnosticsJsonl);
+        Assert.DoesNotContain("TokenSanitizer.SanitizeLogMessage(JsonSerializer.Serialize(record, JsonOptions))", diagnosticsJsonl);
 
         var crashLogger = Read("src", "OpenClaw.Tray.WinUI", "Services", "AppCrashLogger.cs");
         Assert.Contains("TokenSanitizer.SanitizeLogMessage", crashLogger);
     }
 
+    [Fact]
+    public void FullDiagnosticsBundle_IsUsedForPreviewOnly()
+    {
+        var page = Read("src", "OpenClaw.Tray.WinUI", "Pages", "DebugPage.xaml.cs");
+        Assert.Contains("OnCreateDiagnosticsBundle", page);
+        Assert.Contains("DiagnosticsBundleBuilder.Build", page);
+        Assert.Contains("ShowBundlePreviewAsync", page);
+
+        var handlerStart = page.IndexOf("private void OnCopyDebugBundle", StringComparison.Ordinal);
+        Assert.True(handlerStart >= 0, "OnCopyDebugBundle must exist.");
+        var handlerBody = page.Substring(handlerStart, Math.Min(260, page.Length - handlerStart));
+
+        Assert.Contains("CommandCenterTextHelper.BuildDebugBundle", handlerBody);
+        Assert.DoesNotContain("DiagnosticsBundleBuilder.BuildCached", handlerBody);
+    }
+
+    [Fact]
+    public void DebugPage_DetailView_UsesGenerationCounterForRaceSafety()
+    {
+        // Hanselman v2 review #5/#6: long log reads must check a
+        // generation counter after their async continuation so a
+        // page navigation mid-flight can't clobber the active view
+        // (or, post-popup, write into a no-longer-current generation).
+        var cs = Read("src", "OpenClaw.Tray.WinUI", "Pages", "DebugPage.xaml.cs");
+        Assert.Contains("_detailGeneration", cs);
+        // LoadLogFileAsync takes the generation as a parameter.
+        Assert.Contains("LoadLogFileAsync(int generation)", cs);
+        // Log mode re-checks both mode AND generation after the
+        // background sanitized tail read returns.
+        Assert.Contains("_detailMode != DetailMode.Log || _detailGeneration != generation", cs);
+        // Manual refresh must also invalidate any in-flight read, otherwise
+        // rapid refresh clicks can let multiple reads append duplicate rows
+        // into the same detail view generation.
+        Assert.Matches(
+            new System.Text.RegularExpressions.Regex(
+                @"OnDetailRefresh[\s\S]{0,200}_detailGeneration\+\+[\s\S]{0,120}LoadLogFileAsync\(_detailGeneration\)"),
+            cs);
+    }
+
     [Fact]
     public void App_GetHubWindowHandle_GuardsAgainstClosedWindow()
     {
@@ -317,6 +645,7 @@ public void App_SettingsChanged_DispatchesToUiThread()
         var app = Read("src", "OpenClaw.Tray.WinUI", "App.xaml.cs");
 
         Assert.Contains("_dispatcherQueue.HasThreadAccess", app);
-        Assert.Contains("_dispatcherQueue.TryEnqueue(() => SettingsChanged?.Invoke", app);
+        Assert.Contains("void ApplyUiSettingsAndNotify()", app);
+        Assert.Contains("_dispatcherQueue.TryEnqueue(ApplyUiSettingsAndNotify)", app);
     }
 }
diff --git a/tests/OpenClaw.Tray.Tests/ExecPolicyRuleListTests.cs b/tests/OpenClaw.Tray.Tests/ExecPolicyRuleListTests.cs
new file mode 100644
index 000000000..ab61ea130
--- /dev/null
+++ b/tests/OpenClaw.Tray.Tests/ExecPolicyRuleListTests.cs
@@ -0,0 +1,104 @@
+using OpenClawTray.Pages;
+using System.Text.Json;
+
+namespace OpenClaw.Tray.Tests;
+
+public sealed class ExecPolicyRuleListTests
+{
+    [Fact]
+    public void UpsertByPattern_AppendsNewPattern()
+    {
+        var rules = new List<ExecPolicyRule>
+        {
+            new() { Pattern = "cat *", Action = "allow" }
+        };
+
+        ExecPolicyRuleList.UpsertByPattern(rules, "del *", "prompt");
+
+        Assert.Collection(
+            rules,
+            rule =>
+            {
+                Assert.Equal("cat *", rule.Pattern);
+                Assert.Equal("allow", rule.Action);
+            },
+            rule =>
+            {
+                Assert.Equal("del *", rule.Pattern);
+                Assert.Equal("prompt", rule.Action);
+            });
+    }
+
+    [Fact]
+    public void UpsertByPattern_ReplacesExistingPatternInPlace()
+    {
+        var rules = new List<ExecPolicyRule>
+        {
+            new() { Pattern = "cat *", Action = "allow" },
+            new() { Pattern = "del *", Action = "deny" },
+            new() { Pattern = "rm *", Action = "deny" }
+        };
+
+        ExecPolicyRuleList.UpsertByPattern(rules, "del *", "prompt");
+
+        Assert.Equal(3, rules.Count);
+        Assert.Equal("del *", rules[1].Pattern);
+        Assert.Equal("prompt", rules[1].Action);
+        Assert.Equal("rm *", rules[2].Pattern);
+    }
+
+    [Fact]
+    public void UpsertByPattern_RemovesLaterDuplicatePatterns()
+    {
+        var rules = new List<ExecPolicyRule>
+        {
+            new() { Pattern = "cat *", Action = "allow" },
+            new() { Pattern = "DEL *", Action = "deny" },
+            new() { Pattern = "rm *", Action = "deny" },
+            new() { Pattern = " del * ", Action = "prompt" }
+        };
+
+        ExecPolicyRuleList.UpsertByPattern(rules, "del *", "allow");
+
+        Assert.Collection(
+            rules,
+            rule => Assert.Equal("cat *", rule.Pattern),
+            rule =>
+            {
+                Assert.Equal("del *", rule.Pattern);
+                Assert.Equal("allow", rule.Action);
+            },
+            rule => Assert.Equal("rm *", rule.Pattern));
+    }
+
+    [Theory]
+    [InlineData("\"allow\"", "allow")]
+    [InlineData("\"ask\"", "prompt")]
+    [InlineData("\"prompt\"", "prompt")]
+    [InlineData("\"deny\"", "deny")]
+    [InlineData("0", "allow")]
+    [InlineData("1", "deny")]
+    [InlineData("2", "prompt")]
+    [InlineData("99", "deny")]
+    public void NormalizeExecPolicyAction_AcceptsLegacyStringAndNumericValues(string json, string expected)
+    {
+        using var doc = JsonDocument.Parse(json);
+
+        Assert.Equal(expected, ExecPolicyRuleList.NormalizeAction(doc.RootElement));
+    }
+
+    [Fact]
+    public void TryGetExecPolicyActionCaseInsensitive_ReadsNumericAction()
+    {
+        using var doc = JsonDocument.Parse("""{"Action":2}""");
+
+        Assert.Equal("prompt", ExecPolicyRuleList.TryGetActionCaseInsensitive(doc.RootElement, "action", "Action"));
+    }
+
+    [Fact]
+    public void PersistedEnabled_OmitsDefaultTrueButPreservesFalse()
+    {
+        Assert.Null(ExecPolicyRuleList.PersistedEnabled(true));
+        Assert.False(ExecPolicyRuleList.PersistedEnabled(false));
+    }
+}
diff --git a/tests/OpenClaw.Tray.Tests/FluentIconCatalogTests.cs b/tests/OpenClaw.Tray.Tests/FluentIconCatalogTests.cs
index 2c668aefd..b6e796fb2 100644
--- a/tests/OpenClaw.Tray.Tests/FluentIconCatalogTests.cs
+++ b/tests/OpenClaw.Tray.Tests/FluentIconCatalogTests.cs
@@ -5,8 +5,8 @@ namespace OpenClaw.Tray.Tests;
 
 /// <summary>
 /// Pins the <c>FluentIconCatalog</c> contract: every advertised glyph is a
-/// single Unicode Private Use Area character (or the documented Brand
-/// emoji), and the helper builder uses the SymbolThemeFontFamily resource.
+/// single Unicode Private Use Area character, and the helper builder uses
+/// the SymbolThemeFontFamily resource.
 ///
 /// We parse the source rather than reflect on the assembly because
 /// <c>OpenClaw.Tray.Tests</c> is a pure net10.0 project that doesn't
@@ -20,11 +20,10 @@ public sealed class FluentIconCatalogTests
         "Sessions", "Approvals", "Devices", "Hostname", "Permissions",
         "Browser", "Camera", "Canvas", "Screen", "Location", "Voice", "Speech", "System", "Terminal", "Operator",
         "Dashboard", "OpenInBrowser", "Chat", "CanvasAct", "VoiceAct", "Settings",
-        "Setup", "About", "Exit",
+        "Setup", "About", "Notifications", "Exit",
         "Add", "Back", "Sync", "Lock", "Plug", "MoreOverflow",
         "People", "Money", "ServerEnvironment", "CapabilityOff", "Channels",
         "ChevronR", "Check",
-        "Brand",
         // Diagnostics surface (see src/OpenClaw.Tray.WinUI/Pages/DebugPage.xaml).
         "Bug", "Briefcase", "Folder", "Copy", "Document", "Refresh", "Reset", "Clear", "Develop",
         // Workspace surface (see src/OpenClaw.Tray.WinUI/Pages/WorkspacePage.xaml).
@@ -41,8 +40,7 @@ private static string ReadCatalogSource()
 
     private static IDictionary<string, string> ParseConstants(string source)
     {
-        // Matches:   public const string Name = "\uXXXX";   or
-        //            public const string Name = "🦞";
+        // Matches:   public const string Name = "\uXXXX";
         var rx = new Regex(
             @"public\s+const\s+string\s+(?<name>\w+)\s*=\s*""(?<value>(?:\\u[0-9A-Fa-f]{4}|[^""\\]|\\.)*)"";",
             RegexOptions.Compiled);
@@ -74,9 +72,6 @@ public void PuaConstants_AreSingleCharacterInPrivateUseArea()
         var map = ParseConstants(src);
         foreach (var name in ExpectedConstants)
         {
-            if (name == "Brand")
-                continue; // Brand is an emoji surrogate pair by design.
-
             Assert.True(map.TryGetValue(name, out var value),
                 $"FluentIconCatalog.{name} not found in source");
             Assert.True(value!.Length == 1,
diff --git a/tests/OpenClaw.Tray.Tests/FunctionalUiModifierResetContractTests.cs b/tests/OpenClaw.Tray.Tests/FunctionalUiModifierResetContractTests.cs
new file mode 100644
index 000000000..50286f3bd
--- /dev/null
+++ b/tests/OpenClaw.Tray.Tests/FunctionalUiModifierResetContractTests.cs
@@ -0,0 +1,54 @@
+namespace OpenClaw.Tray.Tests;
+
+public sealed class FunctionalUiModifierResetContractTests
+{
+    [Fact]
+    public void ApplyModifiers_ClearsStaleLayoutAndAutomationValues()
+    {
+        var functionalUi = Read("src", "OpenClawTray.FunctionalUI", "FunctionalUI.cs");
+
+        Assert.Contains("control.ClearValue(FrameworkElement.WidthProperty);", functionalUi);
+        Assert.Contains("control.ClearValue(FrameworkElement.HeightProperty);", functionalUi);
+        Assert.Contains("control.ClearValue(FrameworkElement.MaxWidthProperty);", functionalUi);
+        Assert.Contains("control.ClearValue(UIElement.OpacityProperty);", functionalUi);
+        Assert.Contains("control.ClearValue(AutomationProperties.NameProperty);", functionalUi);
+        Assert.Contains("control.ClearValue(AutomationProperties.LiveSettingProperty);", functionalUi);
+    }
+
+    [Fact]
+    public void ApplyModifiers_ClearsStaleBorderTextAndControlValues()
+    {
+        var functionalUi = Read("src", "OpenClawTray.FunctionalUI", "FunctionalUI.cs");
+
+        Assert.Contains("b.ClearValue(Border.BackgroundProperty);", functionalUi);
+        Assert.Contains("b.ClearValue(Border.PaddingProperty);", functionalUi);
+        Assert.Contains("b.ClearValue(Border.CornerRadiusProperty);", functionalUi);
+        Assert.Contains("tb.ClearValue(TextBlock.ForegroundProperty);", functionalUi);
+        Assert.Contains("tb.ClearValue(TextBlock.TextTrimmingProperty);", functionalUi);
+        Assert.Contains("tb.ClearValue(TextBlock.MaxLinesProperty);", functionalUi);
+        Assert.Contains("tb.ClearValue(TextBlock.LineHeightProperty);", functionalUi);
+        Assert.Contains("tb.ClearValue(TextBlock.CharacterSpacingProperty);", functionalUi);
+        Assert.Contains("c.ClearValue(Control.PaddingProperty);", functionalUi);
+        Assert.Contains("c.ClearValue(Control.BorderBrushProperty);", functionalUi);
+    }
+
+    [Fact]
+    public void UiRenderer_PrunesUnvisitedCachesAfterRender()
+    {
+        var functionalUi = Read("src", "OpenClawTray.FunctionalUI", "FunctionalUI.cs");
+
+        Assert.Contains("private readonly HashSet<string> _visitedControlPaths = new();", functionalUi);
+        Assert.Contains("private readonly HashSet<string> _visitedComponentKeys = new();", functionalUi);
+        Assert.Contains("private readonly HashSet<string> _visitedContentFlyoutPaths = new();", functionalUi);
+        Assert.Contains("PruneUnvisitedPaths();", functionalUi);
+        Assert.Contains("component.Context.RunEffectCleanups();", functionalUi);
+        Assert.Contains("flyout.Hide();", functionalUi);
+        Assert.Contains("flyout.Content = null;", functionalUi);
+        Assert.Contains("_mountedPaths.Remove(path);", functionalUi);
+        Assert.Contains("DetachChildren(control);", functionalUi);
+        Assert.Contains("_controls.Remove(path);", functionalUi);
+    }
+
+    private static string Read(params string[] parts)
+        => File.ReadAllText(Path.Combine(new[] { TestRepositoryPaths.GetRepositoryRoot() }.Concat(parts).ToArray()));
+}
diff --git a/tests/OpenClaw.Tray.Tests/GatewayHostAccessTests.cs b/tests/OpenClaw.Tray.Tests/GatewayHostAccessTests.cs
index 0a4e8c97f..7b99d7350 100644
--- a/tests/OpenClaw.Tray.Tests/GatewayHostAccessTests.cs
+++ b/tests/OpenClaw.Tray.Tests/GatewayHostAccessTests.cs
@@ -1,5 +1,4 @@
 using OpenClaw.Connection;
-using OpenClawTray.Services;
 
 namespace OpenClaw.Tray.Tests;
 
diff --git a/tests/OpenClaw.Tray.Tests/GatewayTerminalLaunchCommandBuilderTests.cs b/tests/OpenClaw.Tray.Tests/GatewayTerminalLaunchCommandBuilderTests.cs
index 9b8f76def..dca5ff026 100644
--- a/tests/OpenClaw.Tray.Tests/GatewayTerminalLaunchCommandBuilderTests.cs
+++ b/tests/OpenClaw.Tray.Tests/GatewayTerminalLaunchCommandBuilderTests.cs
@@ -1,5 +1,4 @@
 using OpenClaw.Connection;
-using OpenClawTray.Services;
 
 namespace OpenClaw.Tray.Tests;
 
diff --git a/tests/OpenClaw.Tray.Tests/InstallerIssAssertionTests.cs b/tests/OpenClaw.Tray.Tests/InstallerIssAssertionTests.cs
index 7e8e97fc7..673be2ede 100644
--- a/tests/OpenClaw.Tray.Tests/InstallerIssAssertionTests.cs
+++ b/tests/OpenClaw.Tray.Tests/InstallerIssAssertionTests.cs
@@ -16,15 +16,17 @@ public sealed class InstallerIssAssertionTests
     public void Installer_HasAppMutexMatchingTraySingleInstance()
     {
         var iss = File.ReadAllText(Path.Combine(TestRepositoryPaths.GetRepositoryRoot(), "installer.iss"));
-        Assert.Contains("AppMutex=OpenClawTray", iss);
+        // Release build uses "OpenClawTray" mutex; dev build uses "OpenClawTray-Dev".
+        // The installer default (non-DevBuild) must match the release mutex.
+        Assert.Contains("AppMutex={#MyMutex}", iss);
+        Assert.Contains(@"#define MyMutex ""OpenClawTray""", iss);
         Assert.Contains("Inno requires \"{{\" to emit a literal opening brace in AppId.", iss);
-        Assert.Contains("AppId={{M0LTB0T-TRAY-4PP1-D3N7}", iss);
-        Assert.DoesNotContain("AppId={{M0LTB0T-TRAY-4PP1-D3N7}}", iss);
+        Assert.Contains(@"#define MyAppId ""{{M0LTB0T-TRAY-4PP1-D3N7}""", iss);
 
-        // The matching tray-side mutex name must be present in App.xaml.cs.
+        // The matching tray-side mutex name must be present in App.xaml.cs via AppIdentity.
         var appXamlCs = File.ReadAllText(Path.Combine(
             TestRepositoryPaths.GetRepositoryRoot(), "src", "OpenClaw.Tray.WinUI", "App.xaml.cs"));
-        Assert.Contains("var mutexName = \"OpenClawTray\";", appXamlCs);
+        Assert.Contains("var mutexName = AppIdentity.MutexBaseName;", appXamlCs);
     }
 
     [Fact]
@@ -46,12 +48,12 @@ public void Installer_CreatesStartMenuEntrypointsForTraySetupAndSupport()
         Assert.Contains(@"#define MyAppName ""OpenClaw Companion""", iss);
         Assert.Contains(@"#define MyCompression ""lzma""", iss);
         Assert.Contains(@"#define MySolidCompression ""yes""", iss);
-        Assert.Contains("OutputBaseFilename=OpenClawCompanion-Setup-{#MyAppArch}", iss);
+        Assert.Contains("OutputBaseFilename=OpenClawCompanion{#MyOutputSuffix}-Setup-{#MyAppArch}", iss);
         Assert.Contains(@"Name: ""{group}\{#MyAppName}""; Filename: ""{app}\{#MyAppExeName}""", iss);
-        Assert.Contains(@"Name: ""{group}\OpenClaw Gateway Setup""; Filename: ""{app}\{#MyAppExeName}""; Parameters: ""openclaw://setup""", iss);
-        Assert.Contains(@"Name: ""{group}\OpenClaw Companion Settings""; Filename: ""{app}\{#MyAppExeName}""; Parameters: ""openclaw://commandcenter""", iss);
-        Assert.Contains(@"Name: ""{group}\OpenClaw Chat""; Filename: ""{app}\{#MyAppExeName}""; Parameters: ""openclaw://chat""", iss);
-        Assert.Contains(@"Name: ""{group}\Check for Updates""; Filename: ""{app}\{#MyAppExeName}""; Parameters: ""openclaw://check-updates""", iss);
+        Assert.Contains(@"Name: ""{group}\OpenClaw Gateway Setup""; Filename: ""{app}\{#MyAppExeName}""; Parameters: ""{#MyProtocol}://setup""", iss);
+        Assert.Contains(@"Name: ""{group}\OpenClaw Companion Settings""; Filename: ""{app}\{#MyAppExeName}""; Parameters: ""{#MyProtocol}://commandcenter""", iss);
+        Assert.Contains(@"Name: ""{group}\OpenClaw Chat""; Filename: ""{app}\{#MyAppExeName}""; Parameters: ""{#MyProtocol}://chat""", iss);
+        Assert.Contains(@"Name: ""{group}\Check for Updates""; Filename: ""{app}\{#MyAppExeName}""; Parameters: ""{#MyProtocol}://check-updates""", iss);
     }
 
     [Fact]
@@ -64,12 +66,14 @@ public void Installer_RemovesGeneratedAppStateOnlyAfterGatewayCleanup()
         Assert.Contains("Uninstall-LocalGateway.ps1", iss);
         Assert.Contains("UninstallSilent()", iss);
         Assert.Contains("LocalGatewayCleanupRequested := True", iss);
-        Assert.Contains("OpenClawGateway WSL distro", iss);
+        Assert.Contains("{#MyDistroName} WSL distro", iss);
         Assert.Contains("MB_YESNO", iss);
         Assert.Contains("ExpandConstant('{sys}\\WindowsPowerShell\\v1.0\\powershell.exe')", iss);
         Assert.Contains("ewWaitUntilTerminated", iss);
         Assert.Contains("MB_RETRYCANCEL", iss);
         Assert.Contains("DeleteGeneratedAppState", iss);
+        Assert.Contains("procedure RemoveAppAutoStart;", iss);
+        Assert.Matches(@"    RemoveAppAutoStart;\r?\n    EnsureLocalGatewayCleanupChoice;", iss);
         Assert.Contains("CurUninstallStep = usPostUninstall", iss);
         Assert.Contains("DelTree(ExpandConstant('{app}'), True, True, True)", iss);
         Assert.DoesNotContain("Start-Sleep -Seconds 3", iss);
@@ -85,7 +89,7 @@ public void UninstallLocalGatewayScript_DirectlyUnregistersWslDistro()
         Assert.Contains("$DistroName = 'OpenClawGateway'", script);
         Assert.Contains("'--list', '--quiet'", script);
         Assert.Contains("'--terminate', $DistroName", script);
-        Assert.Contains("'--shutdown'", script);
+        Assert.DoesNotContain("'--shutdown'", script);
         Assert.Contains("'--unregister', $DistroName", script);
         Assert.Contains("Start-Sleep -Seconds 2", script);
         Assert.Contains("Remove-GatewayDirectory", script);
@@ -112,11 +116,94 @@ public void Installer_RegistersOpenClawProtocol()
     {
         var iss = File.ReadAllText(Path.Combine(TestRepositoryPaths.GetRepositoryRoot(), "installer.iss"));
 
-        Assert.Contains(@"Subkey: ""Software\Classes\openclaw""", iss);
+        // Protocol registration uses preprocessor variable {#MyProtocol}
+        Assert.Contains(@"Subkey: ""Software\Classes\{#MyProtocol}""", iss);
         Assert.Contains(@"ValueName: ""URL Protocol""", iss);
-        Assert.Contains(@"Subkey: ""Software\Classes\openclaw\shell\open\command""", iss);
+        Assert.Contains(@"Subkey: ""Software\Classes\{#MyProtocol}\shell\open\command""", iss);
         Assert.Contains(@"{app}\{#MyAppExeName}", iss);
         Assert.Contains(@"""%1""", iss);
+        // Ensure release default protocol is "openclaw"
+        Assert.Contains(@"#define MyProtocol ""openclaw""", iss);
+    }
+
+    [Fact]
+    public void DevInstaller_UsesIndependentIdentityAndProtocol()
+    {
+        var iss = File.ReadAllText(Path.Combine(TestRepositoryPaths.GetRepositoryRoot(), "installer.iss"));
+
+        Assert.Contains(@"#define MyAppName ""OpenClaw Companion (Dev)""", iss);
+        Assert.Contains(@"#define MyInstallDir ""OpenClawTray-Dev""", iss);
+        Assert.Contains(@"#define MyMutex ""OpenClawTray-Dev""", iss);
+        Assert.Contains(@"#define MyProtocol ""openclaw-dev""", iss);
+        Assert.Contains(@"#define MyDistroName ""OpenClawGateway-Dev""", iss);
+        Assert.Contains(@"#define MyAppPublisher ""OpenClaw Foundation""", iss);
+        Assert.Contains("-DataDirectoryName ' + AddQuotes('{#MyInstallDir}')", iss);
+        Assert.Contains("-AutoStartName ' + AddQuotes('{#MyAutoStartName}')", iss);
+        Assert.Contains("-StartupTaskName ' + AddQuotes('{#MyStartupTaskName}')", iss);
+        Assert.Contains("-DistroName ' + AddQuotes('{#MyDistroName}')", iss);
+
+        var uninstallScript = File.ReadAllText(Path.Combine(
+            TestRepositoryPaths.GetRepositoryRoot(), "scripts", "Uninstall-LocalGateway.ps1"));
+        Assert.Contains("[string]$DataDirectoryName = 'OpenClawTray'", uninstallScript);
+        Assert.Contains("-Name $AutoStartName", uninstallScript);
+        Assert.Contains("/TN $StartupTaskName", uninstallScript);
+
+        var autoStartManager = File.ReadAllText(Path.Combine(
+            TestRepositoryPaths.GetRepositoryRoot(), "src", "OpenClaw.Tray.WinUI", "Services", "AutoStartManager.cs"));
+        Assert.Contains("AppIdentity.StartupTaskName", autoStartManager);
+    }
+
+    [Fact]
+    public void LocalInstallerBuild_UsesOneIdentitySwitchAndValidatesPayloadMarker()
+    {
+        var root = TestRepositoryPaths.GetRepositoryRoot();
+        var script = File.ReadAllText(Path.Combine(root, "scripts", "build-inno-local.ps1"));
+        var runScript = File.ReadAllText(Path.Combine(root, "run-app-local.ps1"));
+        var buildScript = File.ReadAllText(Path.Combine(root, "build.ps1"));
+        var project = File.ReadAllText(Path.Combine(
+            root, "src", "OpenClaw.Tray.WinUI", "OpenClaw.Tray.WinUI.csproj"));
+
+        Assert.Contains("[switch]$Dev", script);
+        Assert.Contains("-p:DevBuild=$($Dev.IsPresent.ToString().ToLowerInvariant())", script);
+        Assert.Contains("$args += \"/DDevBuild=1\"", script);
+        Assert.Contains("app-identity.txt", script);
+        Assert.Contains("Payload identity", script);
+        Assert.Contains("2>&1 | Out-Host", script);
+        Assert.Contains("$wingetExitCode = $LASTEXITCODE", script);
+        Assert.Contains("[switch]$Dev,", runScript);
+        Assert.Contains("$buildArgs = @{", runScript);
+        Assert.Contains("Configuration = $Configuration", runScript);
+        Assert.Contains("$buildArgs[\"DevBuild\"] = $true", runScript);
+        Assert.Contains("app-identity.txt", runScript);
+        Assert.Contains("does not match requested", runScript);
+        Assert.Contains("[switch]$DevBuild,", buildScript);
+        Assert.Contains("$dotnetArgs += \"-p:DevBuild=true\"", buildScript);
+        Assert.Contains("-UseWinApp$runIdentitySwitch", buildScript);
+        Assert.Contains("WritePublishedAppIdentityMarker", project);
+        Assert.Contains("WriteBuildAppIdentityMarker", project);
+        Assert.Contains("<AppIdentityMarker>dev</AppIdentityMarker>", project);
+        Assert.Contains("<AppIdentityMarker>release</AppIdentityMarker>", project);
+        Assert.DoesNotContain("'$(Configuration)' == 'Debug'", project);
+        Assert.DoesNotContain("<DevBuild>true</DevBuild>", project);
+    }
+
+    [Fact]
+    public void MsixManifest_IsGeneratedUnderObjWithoutMutatingTrackedSource()
+    {
+        var root = TestRepositoryPaths.GetRepositoryRoot();
+        var project = File.ReadAllText(Path.Combine(
+            root, "src", "OpenClaw.Tray.WinUI", "OpenClaw.Tray.WinUI.csproj"));
+        var manifest = File.ReadAllText(Path.Combine(
+            root, "src", "OpenClaw.Tray.WinUI", "Package.appxmanifest"));
+
+        Assert.Contains("GenerateOpenClawAppxManifest", project);
+        Assert.Contains("$(IntermediateOutputPath)openclaw.Package.appxmanifest", project);
+        Assert.Contains(@"<AppxManifest Remove=""@(AppxManifest)"" />", project);
+        Assert.DoesNotContain("PatchDevAppxManifestIdentity", project);
+        Assert.Contains("Version=\"0.0.0.0\"", manifest);
+        Assert.Contains("Name=\"OpenClaw.Companion\"", manifest);
+        Assert.Contains("<uap:Protocol Name=\"openclaw\">", manifest);
+        Assert.DoesNotContain("OpenClaw.Companion.Dev", manifest);
     }
 
     [Fact]
@@ -140,12 +227,20 @@ public void MxcSdk_IsRestoredCopiedValidatedAndIncludedInInstallerPayload()
     {
         var repositoryRoot = TestRepositoryPaths.GetRepositoryRoot();
         var packageJson = File.ReadAllText(Path.Combine(repositoryRoot, "package.json"));
+        var packageLock = File.ReadAllText(Path.Combine(repositoryRoot, "package-lock.json"));
         var trayProject = File.ReadAllText(Path.Combine(
             repositoryRoot, "src", "OpenClaw.Tray.WinUI", "OpenClaw.Tray.WinUI.csproj"));
         var iss = File.ReadAllText(Path.Combine(repositoryRoot, "installer.iss"));
 
         Assert.Contains(@"""@microsoft/mxc-sdk""", packageJson);
+        Assert.Contains(@"""@microsoft/mxc-sdk"": ""^0.7.0""", packageJson);
+        Assert.Contains(@"""node_modules/@microsoft/mxc-sdk""", packageLock);
+        Assert.Contains(@"""version"": ""0.7.0""", packageLock);
         Assert.Contains("RestoreMxcNodeBridge", trayProject);
+        Assert.Contains(@"Inputs=""$(OpenClawRepoRoot)package-lock.json""", trayProject);
+        Assert.Contains(@"<MxcSdkRestoreStamp>$(OpenClawRepoRoot)node_modules\.openclaw-mxc-sdk-$(MxcSdkExpectedVersion).stamp</MxcSdkRestoreStamp>", trayProject);
+        Assert.Contains(@"Outputs=""$(MxcSdkRestoreStamp)""", trayProject);
+        Assert.Contains(@"<Touch Files=""$(MxcSdkRestoreStamp)"" AlwaysCreate=""true"" />", trayProject);
         Assert.Contains("npm ci --no-audit --no-fund", trayProject);
         Assert.Contains("CopyWxcExecToOutput", trayProject);
         Assert.Contains("CopyWxcExecToPublish", trayProject);
@@ -175,7 +270,7 @@ public void MxcRuntime_ProbesShippedWxcExecAndSystemRunUsesIt()
 
         Assert.Contains("private ICommandRunner BuildSystemRunRunner()", nodeService);
         Assert.Contains("MxcAvailability.Probe(_logger)", nodeService);
-        Assert.Contains("new DirectAppContainerExecutor(availability, _logger)", nodeService);
+        Assert.Contains("new DirectAppContainerExecutor(GetOrProbeMxcAvailability, _logger)", nodeService);
         Assert.Contains("return new MxcCommandRunner(", nodeService);
     }
 
diff --git a/tests/OpenClaw.Tray.Tests/LocalizationHelperSourceTests.cs b/tests/OpenClaw.Tray.Tests/LocalizationHelperSourceTests.cs
new file mode 100644
index 000000000..c0090c83c
--- /dev/null
+++ b/tests/OpenClaw.Tray.Tests/LocalizationHelperSourceTests.cs
@@ -0,0 +1,20 @@
+using System.IO;
+
+namespace OpenClaw.Tray.Tests;
+
+public sealed class LocalizationHelperSourceTests
+{
+    [Fact]
+    public void GetString_ResolvesXamlPropertyResourceKeys()
+    {
+        var source = ReadSource("src", "OpenClaw.Tray.WinUI", "Helpers", "LocalizationHelper.cs");
+
+        Assert.Contains("TryGetXamlPropertyResourcePath(resourceKey, out var propertyResourcePath)", source);
+        Assert.Contains("TryGetValueAsString(propertyResourcePath", source);
+        Assert.Contains("LastIndexOf('.')", source);
+        Assert.Contains("\"{resourceKey[..propertySeparator]}/{resourceKey[(propertySeparator + 1)..]}\"", source);
+    }
+
+    private static string ReadSource(params string[] parts)
+        => File.ReadAllText(Path.Combine(new[] { TestRepositoryPaths.GetRepositoryRoot() }.Concat(parts).ToArray()));
+}
diff --git a/tests/OpenClaw.Tray.Tests/LocalizationValidationTests.cs b/tests/OpenClaw.Tray.Tests/LocalizationValidationTests.cs
index b7fd6abe2..dd16ca1a1 100644
--- a/tests/OpenClaw.Tray.Tests/LocalizationValidationTests.cs
+++ b/tests/OpenClaw.Tray.Tests/LocalizationValidationTests.cs
@@ -27,7 +27,6 @@ public class LocalizationValidationTests
 
     private static readonly HashSet<string> InvariantOrDeferredResourceKeys = new(StringComparer.Ordinal)
     {
-        "AboutPage_TextBlock_19.Text",
         "CanvasWindow_TextBlock_31.Text",
         "CanvasWindow_winexWindowEx_2.Title",
         "ChatWindow_winexWindowEx_2.Title",
@@ -60,6 +59,11 @@ public class LocalizationValidationTests
         // Sample IDs / brand identifiers — same across locales.
         "VoiceSettingsPage_ElevenLabsVoiceIdBox.PlaceholderText",
         "VoiceSettingsPage_ElevenLabsModelBox.PlaceholderText",
+        // Capability command identifier — should match the wire/API name.
+        "NotificationsPage_MetadataSystemRun",
+        // Punctuation-only layout format; localized parts are supplied by
+        // separate placeholders and should keep the same visual separator.
+        "ConfigPage_AccessSummaryFormat",
         // NodesPage detail labels — "Version", "Hardware", and "PATH" are
         // technical loanwords that read the same in every supported locale
         // in this app's audience. Translating them adds no clarity and
@@ -94,6 +98,16 @@ public class LocalizationValidationTests
         "PermissionsPage_SttHint_FailedFormat",
         "PermissionsPage_SttHint_NotDownloaded",
         "PermissionsPage_NodeStatus_Disabled",
+        // About / Gateway info strings added as part of the Windows-native
+        // settings reorg are seeded in English across locales until the next
+        // translation pass lands. They are still present in every locale file
+        // so key parity stays strict; this set only documents deferred copy.
+        "SettingsPage_About.Text",
+        "SettingsPage_GatewayInfoExpander.Header",
+        "SettingsPage_GatewayInfoLabel_Version.Text",
+        "SettingsPage_GatewayInfoLabel_Protocol.Text",
+        "SettingsPage_GatewayInfoLabel_AuthMode.Text",
+        "SettingsPage_GatewayInfoLabel_Uptime.Text",
         "PermissionsPage_NodeStatus_DisabledDetails",
         "PermissionsPage_NodeStatus_Active",
         "PermissionsPage_NodeStatus_ActiveDetailsFormat",
@@ -114,6 +128,10 @@ public class LocalizationValidationTests
         "PermissionsPage_TtsStatus_DefaultProviderFormat",
         "PermissionsPage_TtsStatus_ElevenLabsSaved",
         "PermissionsPage_McpStatus_TokenReadFailedFormat",
+        // Session key display formatter: "{agent} / {slot}" intentionally
+        // uses an invariant separator while the surrounding notification copy
+        // and common labels ("Main chat") are localized.
+        "AppNotification_ExecApprovalPending_AgentSlotLabelFormat",
         // Chat runtime warning seeded English-only until translations land.
         "Chat_Composer_Placeholder_IncompatibleGateway",
         // InstancesPage / ConnectionPage new strings — seeded English across
@@ -169,7 +187,14 @@ public class LocalizationValidationTests
         "ConnectionPage_NodePendingDeclaredCapabilities",
         "ConnectionPage_NodePendingDeclaredCommands",
         "ConnectionPage_NodePendingDeclaredPermissions",
-        "AboutPage_MoreDiagnosticsLink.Content",
+        // Node-card capability pills and technical-details disclosure — seeded
+        // English-only across all 5 locales using the deferred-translation pattern.
+        "ConnectionPage_NodeTechnicalDetails.Text",
+        "ConnectionPage_NodePillState_Active",
+        "ConnectionPage_NodePillState_Pending",
+        "ConnectionPage_NodePillState_Off",
+        "ConnectionPage_NodeCap_Device",
+        "ConnectionPage_NodeCap_System",
         "ConnectionStatusWindow.Title",
         // Hard-coded XAML strings resolved by issue #491 — seeded English-only across
         // all 5 locales using the deferred-translation pattern. Translations are a
@@ -265,8 +290,6 @@ public class LocalizationValidationTests
         "Command_GoToSettings_Subtitle",
         "Command_GoToDiagnostics_Title",
         "Command_GoToDiagnostics_Subtitle",
-        "Command_GoToInfo_Title",
-        "Command_GoToInfo_Subtitle",
         "Command_OpenChatWindow_Title",
         "Command_OpenChatWindow_Subtitle",
         "Command_OpenDashboard_Title",
@@ -293,8 +316,34 @@ public class LocalizationValidationTests
         "CommandCenter_NoLocalGatewayListener",
         "CommandCenter_BrowserProxySshForwardNotListening",
         "CommandCenter_BrowserProxyHostNotDetected",
+        // WorkspacePage session file rail strings — seeded English across all
+        // locales until translations land. Same deferred-translation precedent
+        // as the InstancesPage / ConnectionPage runtime keys above.
+        "WorkspacePage_SearchBox.PlaceholderText",
+        "WorkspacePage_ParentFolderButton.Content",
+        "WorkspacePage_OpenConnectionSettings.Content",
+        "WorkspacePage_NoSearchResults.Text",
+        "WorkspacePage_NoFolderResults",
+        "WorkspacePage_LoadErrorMessage",
+        "WorkspacePage_UnsupportedMessage",
+        "WorkspacePage_Badge_Missing",
+        "WorkspacePage_Badge_Edited",
+        "WorkspacePage_Badge_Read",
+        "WorkspacePage_FolderNote",
+        "WorkspacePage_FileUnavailable",
+        "WorkspacePage_BrowserOnlyFileNote",
+        "WorkspacePage_OpenFolder",
+        "WorkspacePage_CopyPath",
+        "WorkspacePage_CopyPathFailed",
+        "WorkspacePage_FileType_File",
+        "WorkspacePage_FileType_Folder",
+        "WorkspacePage_RootFolder",
+        "WorkspacePage_SearchResultsPath",
+        "WorkspacePage_BrowserTruncated",
     };
 
+    private static readonly HashSet<string> EnUsOnlyFallbackResourceKeys = new(StringComparer.Ordinal);
+
     private static readonly string[] RequiredRuntimeOnboardingKeys =
     [
         "Onboarding_Ready_Node_ScreenCapture",
@@ -309,6 +358,24 @@ public class LocalizationValidationTests
         "Onboarding_Ready_Node_Notify_Sub",
     ];
 
+    private static readonly string[] RequiredLocalizedAccessibilityKeys =
+    [
+        "PermissionsPage_NewRuleAction.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name",
+        "SandboxPage_UnavailablePrimaryButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name",
+        "SandboxPage_PresetLockedButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name",
+        "SandboxPage_PresetBalancedButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name",
+        "SandboxPage_PresetPermissiveButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name",
+        "SandboxPage_DocsAccessCombo.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name",
+        "SandboxPage_DownloadsAccessCombo.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name",
+        "SandboxPage_DesktopAccessCombo.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name",
+        "SettingsPage_NotificationSoundComboBox.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name",
+        "VoiceSettingsPage_AssistantRefreshButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name",
+        "VoiceSettingsPage_AssistantStartButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name",
+        "VoiceSettingsPage_AssistantStopButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name",
+        "VoiceSettingsPage_LanguageCombo.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name",
+        "HubWindow_MainNavigation.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name",
+    ];
+
     private static readonly IReadOnlyDictionary<char, byte> Windows1252Bytes = BuildWindows1252ByteMap();
 
     private static readonly IReadOnlyDictionary<char, byte> CodePage437Bytes = BuildCodePage437ByteMap();
@@ -550,6 +617,15 @@ private static bool IsInvariantOrDeferred(string key, string value) =>
         || key.StartsWith("ChannelsPage_", StringComparison.Ordinal)
         || key.StartsWith("DiagnosticsPage_", StringComparison.Ordinal)
         || key.StartsWith("SettingsRow_", StringComparison.Ordinal)
+        // Title-bar status pill + notifications bell flyout strings. Seeded
+        // English-only across all five .resw files using the deferred-translation
+        // pattern; translations land in a follow-up.
+        || key.StartsWith("HubWindow_StatusFlyout_", StringComparison.Ordinal)
+        || key.StartsWith("HubWindow_StatusPill_", StringComparison.Ordinal)
+        || key.StartsWith("HubWindow_Pill_", StringComparison.Ordinal)
+        || key.StartsWith("HubWindow_Role_", StringComparison.Ordinal)
+        || key.StartsWith("HubWindow_Bell_", StringComparison.Ordinal)
+        || key.StartsWith("NotificationsFlyout_", StringComparison.Ordinal)
         // V2 onboarding redesign strings (V2_*) are intentionally English-only at first
         // ship. They live in V2Strings.DefaultEnUs and the cutover seeded them into all
         // five .resw files with English values. Translations land in a follow-up.
@@ -562,7 +638,9 @@ public void AllLocales_HaveExactlySameKeysAsEnUs()
         var referencePath = Path.Combine(stringsDir, "en-us", "Resources.resw");
         Assert.True(File.Exists(referencePath), $"Reference file not found: {referencePath}");
 
-        var referenceKeys = LoadResw(referencePath).Keys.ToHashSet(StringComparer.Ordinal);
+        var referenceKeys = LoadResw(referencePath).Keys
+            .Except(EnUsOnlyFallbackResourceKeys)
+            .ToHashSet(StringComparer.Ordinal);
 
         var localeDirs = GetNonEnglishLocaleDirectories(stringsDir);
 
@@ -577,7 +655,11 @@ public void AllLocales_HaveExactlySameKeysAsEnUs()
             var localeKeys = LoadResw(reswPath).Keys.ToHashSet(StringComparer.Ordinal);
 
             var missing = referenceKeys.Except(localeKeys).OrderBy(k => k).ToList();
-            var extra = localeKeys.Except(referenceKeys).OrderBy(k => k).ToList();
+            var extra = localeKeys
+                .Except(referenceKeys)
+                .Except(EnUsOnlyFallbackResourceKeys)
+                .OrderBy(k => k)
+                .ToList();
 
             Assert.True(missing.Count == 0,
                 $"Locale '{locale}' is missing {missing.Count} key(s): {string.Join(", ", missing.Take(10))}");
@@ -586,6 +668,22 @@ public void AllLocales_HaveExactlySameKeysAsEnUs()
         }
     }
 
+    [Fact]
+    public void AccessibilityNames_ExistInEveryLocale()
+    {
+        foreach (var localeDir in Directory.GetDirectories(GetStringsDirectory()).OrderBy(p => p, StringComparer.Ordinal))
+        {
+            var locale = Path.GetFileName(localeDir);
+            var resources = LoadResw(Path.Combine(localeDir, "Resources.resw"));
+            var missing = RequiredLocalizedAccessibilityKeys
+                .Where(key => !resources.TryGetValue(key, out var value) || string.IsNullOrWhiteSpace(value))
+                .ToList();
+
+            Assert.True(missing.Count == 0,
+                $"Locale '{locale}' is missing localized accessibility names: {string.Join(", ", missing)}");
+        }
+    }
+
     [Fact]
     public void XamlControlsWithXUid_HaveMatchingEnUsResources()
     {
@@ -797,7 +895,8 @@ public void AllLocales_HaveSameKeyCount()
     {
         var stringsDir = GetStringsDirectory();
         var referencePath = Path.Combine(stringsDir, "en-us", "Resources.resw");
-        var referenceCount = LoadResw(referencePath).Count;
+        var referenceResw = LoadResw(referencePath);
+        var referenceCount = referenceResw.Count - EnUsOnlyFallbackResourceKeys.Count(referenceResw.ContainsKey);
 
         var localeDirs = Directory.GetDirectories(stringsDir);
         foreach (var localeDir in localeDirs)
@@ -806,7 +905,8 @@ public void AllLocales_HaveSameKeyCount()
             var reswPath = Path.Combine(localeDir, "Resources.resw");
             if (!File.Exists(reswPath)) continue;
 
-            var count = LoadResw(reswPath).Count;
+            var localeResw = LoadResw(reswPath);
+            var count = localeResw.Count - EnUsOnlyFallbackResourceKeys.Count(localeResw.ContainsKey);
             Assert.Equal(referenceCount, count);
         }
     }
diff --git a/tests/OpenClaw.Tray.Tests/MenuSizingHelperTests.cs b/tests/OpenClaw.Tray.Tests/MenuSizingHelperTests.cs
index e8d1edb42..da7b179fa 100644
--- a/tests/OpenClaw.Tray.Tests/MenuSizingHelperTests.cs
+++ b/tests/OpenClaw.Tray.Tests/MenuSizingHelperTests.cs
@@ -64,6 +64,27 @@ public void ConvertPixels_Dpi120_CorrectScaling()
         Assert.Equal(800, MenuSizingHelper.ConvertPixelsToViewUnits(1000, 120));
     }
 
+    [Fact]
+    public void ConvertViewUnits_StandardDpi96_ReturnsSameValue()
+    {
+        Assert.Equal(200, MenuSizingHelper.ConvertViewUnitsToPixels(200, 96));
+    }
+
+    [Fact]
+    public void ConvertViewUnits_Dpi120_RoundsUpToContainingPixel()
+    {
+        Assert.Equal(250, MenuSizingHelper.ConvertViewUnitsToPixels(200, 120));
+        Assert.Equal(251, MenuSizingHelper.ConvertViewUnitsToPixels(200.5, 120));
+    }
+
+    [Fact]
+    public void ConvertViewUnits_InvalidOrNonPositive_ReturnsZero()
+    {
+        Assert.Equal(0, MenuSizingHelper.ConvertViewUnitsToPixels(0, 96));
+        Assert.Equal(0, MenuSizingHelper.ConvertViewUnitsToPixels(-100, 96));
+        Assert.Equal(0, MenuSizingHelper.ConvertViewUnitsToPixels(double.NaN, 96));
+    }
+
     [Fact]
     public void HasDpiOrScaleChanged_SameDpiAndScale_ReturnsFalse()
     {
diff --git a/tests/OpenClaw.Tray.Tests/NodeCapabilityGatingTests.cs b/tests/OpenClaw.Tray.Tests/NodeCapabilityGatingTests.cs
index 1294b1555..46793a2e7 100644
--- a/tests/OpenClaw.Tray.Tests/NodeCapabilityGatingTests.cs
+++ b/tests/OpenClaw.Tray.Tests/NodeCapabilityGatingTests.cs
@@ -166,6 +166,55 @@ public void DefaultOnCapabilities_OnlyDisabledWhenExplicitlySetToFalse()
         Assert.False(NodeCapabilityGating.ShouldRegisterSystemRun(s));
     }
 
+    // ── CountMcpServedCapabilities ────────────────────────────────────────────
+
+    [Fact]
+    public void CountMcpServed_Defaults_AreSixCapabilities()
+    {
+        var s = NewSettings();
+        Assert.Equal(6, NodeCapabilityGating.CountMcpServedCapabilities(s));
+    }
+
+    [Fact]
+    public void CountMcpServed_NullSettings_AreSix()
+    {
+        Assert.Equal(6, NodeCapabilityGating.CountMcpServedCapabilities(null));
+    }
+
+    [Fact]
+    public void CountMcpServed_ExcludesBrowserProxy()
+    {
+        var s = NewSettings();
+        var before = NodeCapabilityGating.CountMcpServedCapabilities(s);
+        s.NodeBrowserProxyEnabled = false;
+        Assert.Equal(before, NodeCapabilityGating.CountMcpServedCapabilities(s));
+    }
+
+    [Fact]
+    public void CountMcpServed_SystemAndDeviceAlwaysCounted_EvenWhenSystemRunDisabled()
+    {
+        var s = NewSettings();
+        s.NodeCanvasEnabled = false;
+        s.NodeScreenEnabled = false;
+        s.NodeCameraEnabled = false;
+        s.NodeLocationEnabled = false;
+        s.NodeBrowserProxyEnabled = false;
+        s.NodeSystemRunEnabled = false;
+        s.NodeTtsEnabled = false;
+        s.NodeSttEnabled = false;
+        Assert.Equal(2, NodeCapabilityGating.CountMcpServedCapabilities(s));
+    }
+
+    [Fact]
+    public void CountMcpServed_OptInCapabilities_IncrementCount()
+    {
+        var s = NewSettings();
+        var baseline = NodeCapabilityGating.CountMcpServedCapabilities(s);
+        s.NodeTtsEnabled = true;
+        s.NodeSttEnabled = true;
+        Assert.Equal(baseline + 2, NodeCapabilityGating.CountMcpServedCapabilities(s));
+    }
+
     // ── GetLocalNodeCapabilities ──────────────────────────────────────────────
 
     [Fact]
diff --git a/tests/OpenClaw.Tray.Tests/NodeInvokeActivityFormatterTests.cs b/tests/OpenClaw.Tray.Tests/NodeInvokeActivityFormatterTests.cs
index 06f9a5765..264d87905 100644
--- a/tests/OpenClaw.Tray.Tests/NodeInvokeActivityFormatterTests.cs
+++ b/tests/OpenClaw.Tray.Tests/NodeInvokeActivityFormatterTests.cs
@@ -119,6 +119,9 @@ public void NegativeDuration_ClampsToZero()
     [InlineData("device.status", "metadata")]
     [InlineData("tts.speak", "privacy-sensitive")] // TTS errors can leak ElevenLabs key fragments / device names
     [InlineData("tts.future-command", "privacy-sensitive")] // any future tts.* defaults privacy-sensitive
+    [InlineData("app.chat.send", "privacy-sensitive")]
+    [InlineData("app.chat.snapshot", "privacy-sensitive")]
+    [InlineData("app.chat.future-command", "privacy-sensitive")] // chat text can appear in payloads or errors
     [InlineData("", "metadata")]
     public void GetPrivacyClass_KnownCommands(string command, string expected)
     {
diff --git a/tests/OpenClaw.Tray.Tests/NodeModeUiStateTests.cs b/tests/OpenClaw.Tray.Tests/NodeModeUiStateTests.cs
new file mode 100644
index 000000000..6de4ad5c8
--- /dev/null
+++ b/tests/OpenClaw.Tray.Tests/NodeModeUiStateTests.cs
@@ -0,0 +1,245 @@
+using System.Linq;
+using OpenClaw.Connection;
+using OpenClawTray.Pages;
+using OpenClawTray.Services;
+
+namespace OpenClaw.Tray.Tests;
+
+/// <summary>
+/// Pins source-level UI contracts because OpenClaw.Tray.Tests cannot reference
+/// the WinUI assembly directly.
+/// </summary>
+public sealed class NodeModeUiStateTests
+{
+    [Fact]
+    public void NodeCardState_DeclaresMcpOnlyAndConnecting()
+    {
+        var plan = ReadSource("src", "OpenClaw.Tray.WinUI", "Pages", "ConnectionPagePlan.cs");
+
+        Assert.Contains("OffMcpOnly", plan);
+        Assert.Contains("OnNodeConnecting", plan);
+    }
+
+    [Fact]
+    public void BuildNodeCardState_MapsMcpOnlyWhenNodeModeOffButMcpEnabled()
+    {
+        var plan = ReadSource("src", "OpenClaw.Tray.WinUI", "Pages", "ConnectionPagePlan.cs");
+
+        Assert.Contains(
+            "settings.EnableMcpServer ? NodeCardState.OffMcpOnly : NodeCardState.Off",
+            plan);
+    }
+
+    [Theory]
+    [InlineData(0, (int)ConnectionPageMode.Welcome)]
+    [InlineData(1, (int)ConnectionPageMode.Cockpit)]
+    public void IdlePlan_SurfacesMcpOnlyNodeCardWithoutGatewaySession(
+        int savedGatewayCount,
+        int expectedMode)
+    {
+        var settingsDirectory = Path.Combine(
+            Path.GetTempPath(),
+            "openclaw-node-mode-ui-" + Guid.NewGuid().ToString("N"));
+        try
+        {
+            var settings = new SettingsManager(settingsDirectory)
+            {
+                EnableMcpServer = true,
+                EnableNodeMode = false
+            };
+
+            var plan = ConnectionPagePlan.Build(
+                GatewayConnectionSnapshot.Idle,
+                activeRecord: null,
+                self: null,
+                settings: settings,
+                savedGatewayCount: savedGatewayCount);
+
+            Assert.Equal((ConnectionPageMode)expectedMode, plan.Mode);
+            Assert.Equal(NodeCardState.OffMcpOnly, plan.NodeCard);
+            Assert.Equal(OperatorCardState.Hidden, plan.OperatorCard);
+        }
+        finally
+        {
+            if (Directory.Exists(settingsDirectory))
+                Directory.Delete(settingsDirectory, recursive: true);
+        }
+    }
+
+    [Fact]
+    public void BuildNodeCardState_MapsConnectingToStartingState()
+    {
+        var plan = ReadSource("src", "OpenClaw.Tray.WinUI", "Pages", "ConnectionPagePlan.cs");
+
+        Assert.Contains(
+            "RoleConnectionState.Connecting => NodeCardState.OnNodeConnecting",
+            plan);
+    }
+
+    [Fact]
+    public void ConnectionPage_PresentsMcpOnlyAndStartingStates()
+    {
+        var page = ReadSource("src", "OpenClaw.Tray.WinUI", "Pages", "ConnectionPage.xaml.cs");
+
+        Assert.Contains("NodeCardState.OffMcpOnly", page);
+        Assert.Contains("NodeCardState.OnNodeConnecting", page);
+        Assert.Contains("ConnectionPage_NodeMcpOnly", page);
+        Assert.Contains("ConnectionPage_NodeMcpOnlyReachable", page);
+        Assert.Contains("ConnectionPage_NodeStarting", page);
+        Assert.Contains("NodeService.McpServerUrl", page);
+        Assert.Contains("ConnectionPage_NodeMcpError", page);
+        Assert.Contains("ActiveNodeService", page);
+        Assert.Contains("var hasStandaloneNodeCard = plan.NodeCard != NodeCardState.Hidden && !hasOperatorSession;", page);
+        Assert.Contains("showRoles = (hasOperatorSession || hasStandaloneNodeCard)", page);
+    }
+
+    [Fact]
+    public void App_GatewayNodeConnection_GatedOnNodeModeOnly_NotMcp()
+    {
+        var app = ReadSource("src", "OpenClaw.Tray.WinUI", "App.xaml.cs");
+        var connectMethod = ExtractMethodBody(app, "bool TryConnectGatewayIfCredentialAvailable");
+
+        Assert.Contains("isNodeEnabled: IsGatewayNodeEnabled", app);
+
+        var gate = ExtractMethodBody(app, "bool IsGatewayNodeEnabled");
+        Assert.Contains("EnableNodeMode == true", gate);
+        Assert.DoesNotContain("EnableMcpServer", gate);
+
+        Assert.Contains("nodeCredential != null && IsGatewayNodeEnabled()", app);
+        Assert.Contains("TryStartLocalMcpOnlyNode()", connectMethod);
+
+        var localNodeConnect = ExtractMethodBody(app, "Task TryConnectLocalNodeServiceAsync");
+        Assert.Contains("!IsGatewayNodeEnabled()", localNodeConnect);
+        Assert.Contains("EnsureNodeConnectedAsync()", localNodeConnect);
+    }
+
+    [Fact]
+    public void PermissionsPage_PresentsMcpOnlyNodeStatus()
+    {
+        var page = ReadSource("src", "OpenClaw.Tray.WinUI", "Pages", "PermissionsPage.xaml.cs");
+
+        Assert.Contains("EnableMcpServer", page);
+        Assert.Contains("PermissionsPage_NodeStatus_McpOnly", page);
+        Assert.Contains("PermissionsPage_NodeStatus_McpOnlyDetailsFormat", page);
+        Assert.Contains("NodeService.McpServerUrl", page);
+        Assert.Contains("CountMcpServedCapabilities", page);
+        Assert.Contains("PermissionsPage_NodeStatus_McpError", page);
+        Assert.Contains("ActiveNodeService", page);
+        Assert.Contains("mcpEnabled && !string.IsNullOrEmpty(mcpStartupError)", page);
+        Assert.Contains("McpStatusText.Text =", page);
+    }
+
+    [Fact]
+    public void PermissionsPage_DrivesNodeStatusFromRoleState_AndSubscribesToChanges()
+    {
+        var page = ReadSource("src", "OpenClaw.Tray.WinUI", "Pages", "PermissionsPage.xaml.cs");
+
+        Assert.Contains("RoleConnectionState", page);
+        Assert.Contains("CurrentSnapshot", page);
+        Assert.Contains("PermissionsPage_NodeStatus_Starting", page);
+        Assert.Contains("StateChanged", page);
+        Assert.Contains("OnConnectionStateChanged", page);
+    }
+
+    [Fact]
+    public void PermissionsPage_CapabilityToggles_StayActionableInMcpOnly()
+    {
+        var page = ReadSource("src", "OpenClaw.Tray.WinUI", "Pages", "PermissionsPage.xaml.cs");
+
+        Assert.Contains(
+            "var canServe = (s?.EnableNodeMode ?? false) || (s?.EnableMcpServer ?? false);",
+            page);
+        Assert.Contains("BrowserProxyToggleIndex", page);
+        Assert.Contains("!isBrowserProxyToggle || s?.EnableNodeMode == true", page);
+    }
+
+    [Fact]
+    public void PermissionsPage_McpToggleRefreshesNodeStatus()
+    {
+        var page = ReadSource("src", "OpenClaw.Tray.WinUI", "Pages", "PermissionsPage.xaml.cs");
+
+        var toggle = ExtractMethodBody(page, "OnMcpToggled");
+        Assert.Contains("UpdateNodeStatus()", toggle);
+    }
+
+    [Fact]
+    public void NodeService_ExposesMcpStartupFailures()
+    {
+        var service = ReadSource("src", "OpenClaw.Tray.WinUI", "Services", "NodeService.cs");
+
+        Assert.Contains("public string? McpStartupError", service);
+        Assert.Contains("public void SetMcpStartupError", service);
+        Assert.Contains("SetMcpStartupFailure(ex, \"capability registration\")", service);
+        Assert.Contains("return false;", ExtractMethodBody(service, "bool StartMcpServer"));
+        Assert.Contains("MCP server startup failed: listener did not start.", service);
+    }
+
+    [Fact]
+    public void NewNodeStateStrings_ExistInEnUsResources()
+    {
+        var resw = ReadSource(
+            "src", "OpenClaw.Tray.WinUI", "Strings", "en-us", "Resources.resw");
+
+        foreach (var key in new[]
+        {
+            "ConnectionPage_NodeStarting",
+            "ConnectionPage_NodeMcpOnly",
+            "ConnectionPage_NodeMcpOnlyReachable",
+            "ConnectionPage_NodeMcpError",
+            "PermissionsPage_NodeStatus_McpOnly",
+            "PermissionsPage_NodeStatus_McpOnlyDetailsFormat",
+            "PermissionsPage_NodeStatus_Starting",
+            "PermissionsPage_NodeStatus_McpError",
+        })
+        {
+            Assert.Contains($"name=\"{key}\"", resw);
+        }
+    }
+
+    private static string ExtractMethodBody(string source, string methodName)
+    {
+        var sigIndex = source.IndexOf(methodName + "(", System.StringComparison.Ordinal);
+        if (sigIndex < 0) return string.Empty;
+        var bodyStart = source.IndexOf('{', sigIndex);
+        if (bodyStart < 0) return string.Empty;
+        int depth = 0;
+        for (int i = bodyStart; i < source.Length; i++)
+        {
+            if (source[i] == '{') depth++;
+            else if (source[i] == '}')
+            {
+                depth--;
+                if (depth == 0) return source.Substring(bodyStart, i - bodyStart + 1);
+            }
+        }
+        return source.Substring(bodyStart);
+    }
+
+    private static string ReadSource(params string[] relativePathParts)
+    {
+        var root = GetRepositoryRoot();
+        return File.ReadAllText(Path.Combine(new[] { root }.Concat(relativePathParts).ToArray()));
+    }
+
+    private static string GetRepositoryRoot()
+    {
+        var env = Environment.GetEnvironmentVariable("OPENCLAW_REPO_ROOT");
+        if (!string.IsNullOrWhiteSpace(env) && Directory.Exists(env))
+            return env;
+
+        var directory = new DirectoryInfo(AppContext.BaseDirectory);
+        while (directory != null)
+        {
+            if (File.Exists(Path.Combine(directory.FullName, "openclaw-windows-node.slnx")) &&
+                Directory.Exists(Path.Combine(directory.FullName, "src")))
+            {
+                return directory.FullName;
+            }
+
+            directory = directory.Parent;
+        }
+
+        throw new InvalidOperationException(
+            "Could not find repository root. Set OPENCLAW_REPO_ROOT to the repo path.");
+    }
+}
diff --git a/tests/OpenClaw.Tray.Tests/OnboardingChatBootstrapperTests.cs b/tests/OpenClaw.Tray.Tests/OnboardingChatBootstrapperTests.cs
index a18352b0b..4d0fecb90 100644
--- a/tests/OpenClaw.Tray.Tests/OnboardingChatBootstrapperTests.cs
+++ b/tests/OpenClaw.Tray.Tests/OnboardingChatBootstrapperTests.cs
@@ -429,6 +429,9 @@ private sealed class FakeOperatorGatewayClient : IOperatorGatewayClient
 
         public Task SendChatMessageAsync(string message, string? sessionKey = null) => SendChatMessageForRunAsync(message, sessionKey);
 
+        public Task<ChatHistoryInfo> RequestChatHistoryAsync(string? sessionKey = null, int timeoutMs = 15000) =>
+            Task.FromResult(new ChatHistoryInfo { SessionKey = sessionKey ?? "" });
+
         public Task<ChatSendResult> SendChatMessageForRunAsync(string message, string? sessionKey = null)
         {
             SendCount++;
@@ -466,6 +469,8 @@ public void SetPreferStructuredCategories(bool value) { }
         public Task RequestCronListAsync() => Task.CompletedTask;
         public Task RequestCronStatusAsync() => Task.CompletedTask;
         public Task<bool> RunCronJobAsync(string jobId, bool force = true) => Task.FromResult(false);
+        public Task<CronRunRequestResult> RunCronJobDetailedAsync(string jobId, bool force = true, int timeoutMs = 12000) =>
+            Task.FromResult(CronRunRequestResult.NotAccepted("not implemented"));
         public Task<bool> RemoveCronJobAsync(string jobId) => Task.FromResult(false);
         // Stubbed for interface compliance — not exercised by these tests.
         public Task<bool> AddCronJobAsync(object jobDefinition) => Task.FromResult(false);
diff --git a/tests/OpenClaw.Tray.Tests/OpenClaw.Tray.Tests.csproj b/tests/OpenClaw.Tray.Tests/OpenClaw.Tray.Tests.csproj
index a59c5d637..8a226a9be 100644
--- a/tests/OpenClaw.Tray.Tests/OpenClaw.Tray.Tests.csproj
+++ b/tests/OpenClaw.Tray.Tests/OpenClaw.Tray.Tests.csproj
@@ -20,9 +20,11 @@
     <!-- Compile only the model-layer files directly so the tests can remain
          pure net10.0 while the tray app owns the native WinUI surface. -->
     <Compile Include="..\..\src\OpenClaw.Chat\ChatModels.cs" Link="Chat\ChatModels.cs" />
+    <Compile Include="..\..\src\OpenClaw.Chat\ChatModelChoice.cs" Link="Chat\ChatModelChoice.cs" />
     <Compile Include="..\..\src\OpenClaw.Chat\ChatTimelineReducer.cs" Link="Chat\ChatTimelineReducer.cs" />
     <Using Include="System.Text.Json.Nodes" />
     <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="10.0.0" />
+    <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />
     <PackageReference Include="Zeroconf" Version="3.6.11" />
   </ItemGroup>
 
@@ -33,6 +35,7 @@
     <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Chat\ChatEntryMetadata.cs" Link="Chat\ChatEntryMetadata.cs" />
     <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Chat\ChatUsageFormatter.cs" Link="Chat\ChatUsageFormatter.cs" />
     <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Chat\ChatMarkdownSanitizer.cs" Link="Chat\ChatMarkdownSanitizer.cs" />
+    <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Chat\Controls\StableRowCollection.cs" Link="Chat\Controls\StableRowCollection.cs" />
     <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Chat\OpenClawChatDataProvider.cs" Link="Chat\OpenClawChatDataProvider.cs" />
   </ItemGroup>
 
@@ -42,19 +45,24 @@
     <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\ConfigEditorModel.cs" Link="Services\ConfigEditorModel.cs" />
     <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\JsonDiffFormatter.cs" Link="Services\JsonDiffFormatter.cs" />
     <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\AppState.cs" Link="Services\AppState.cs" />
+    <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\AssistantBridgeService.cs" Link="Services\AssistantBridgeService.cs" />
     <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\Logger.cs" Link="Services\Logger.cs" />
+    <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\DiagnosticsJsonlService.cs" Link="Services\DiagnosticsJsonlService.cs" />
+    <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\DiagnosticsExportSanitizer.cs" Link="Services\DiagnosticsExportSanitizer.cs" />
+    <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\DiagnosticsLogTailReader.cs" Link="Services\DiagnosticsLogTailReader.cs" />
+    <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\DiagnosticsBundleBuilder.cs" Link="Services\DiagnosticsBundleBuilder.cs" />
     <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\SettingsManager.cs" Link="Services\SettingsManager.cs" />
+    <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\SessionVisibilityFilter.cs" Link="Services\SessionVisibilityFilter.cs" />
     <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\OnboardingChatBootstrapper.cs" Link="Services\OnboardingChatBootstrapper.cs" />
     <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\StartupSetupState.cs" Link="Services\StartupSetupState.cs" />
     <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\SetupExistingGatewayClassifier.cs" Link="Services\SetupExistingGatewayClassifier.cs" />
-    <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\GatewayHostAccess.cs" Link="Services\GatewayHostAccess.cs" />
-    <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\GatewayTerminalLauncher.cs" Link="Services\GatewayTerminalLauncher.cs" />
-    <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\WslGatewayController.cs" Link="Services\WslGatewayController.cs" />
-    <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\WslCommandRunner.cs" Link="Services\WslCommandRunner.cs" />
+    <!-- GatewayHostAccess, GatewayTerminalLauncher, WslGatewayController and WslCommandRunner
+         now live in OpenClaw.Connection (referenced above), so they no longer need linking. -->
     <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\WslKeepAlivePolicy.cs" Link="Services\WslKeepAlivePolicy.cs" />
     <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\GatewayConnectorInterfaces.cs" Link="Services\GatewayConnectorInterfaces.cs" />
     <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\ActivityStreamService.cs" Link="Services\ActivityStreamService.cs" />
     <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\AsyncListLoadingState.cs" Link="Services\AsyncListLoadingState.cs" />
+    <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\CronRunHistoryDisplay.cs" Link="Services\CronRunHistoryDisplay.cs" />
     <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\GatewayNavVisibilityDebouncePolicy.cs" Link="Services\GatewayNavVisibilityDebouncePolicy.cs" />
     <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\NodeInvokeActivityFormatter.cs" Link="Services\NodeInvokeActivityFormatter.cs" />
     <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\NodeCapabilityGating.cs" Link="Services\NodeCapabilityGating.cs" />
@@ -62,13 +70,26 @@
     <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\CommandCenterTopologyTunnelResolver.cs" Link="Services\CommandCenterTopologyTunnelResolver.cs" />
     <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\CommandCenterTunnelInfoBuilder.cs" Link="Services\CommandCenterTunnelInfoBuilder.cs" />
     <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\PortDiagnosticsService.cs" Link="Services\PortDiagnosticsService.cs" />
+    <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\PairingApprovalCoordinator.cs" Link="Services\PairingApprovalCoordinator.cs" />
     <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\ToastActivationRouter.cs" Link="Services\ToastActivationRouter.cs" />
     <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\AppNotificationService.cs" Link="Services\AppNotificationService.cs" />
+    <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\AppNotificationMapper.cs" Link="Services\AppNotificationMapper.cs" />
+    <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\ChatNotificationSpeechText.cs" Link="Services\ChatNotificationSpeechText.cs" />
+    <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\AppNotificationPublisher.cs" Link="Services\AppNotificationPublisher.cs" />
+    <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\ConnectionStatusPresenter.cs" Link="Services\ConnectionStatusPresenter.cs" />
+    <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\McpRuntimeStatePolicy.cs" Link="Services\McpRuntimeStatePolicy.cs" />
     <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\UsageCostApplicationPolicy.cs" Link="Services\UsageCostApplicationPolicy.cs" />
+    <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Helpers\CanvasGatewayUrlRewriter.cs" Link="Helpers\CanvasGatewayUrlRewriter.cs" />
+    <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Helpers\DiagnosticsGate.cs" Link="Helpers\DiagnosticsGate.cs" />
     <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Helpers\TrayTooltipFormatter.cs" Link="Helpers\TrayTooltipFormatter.cs" />
     <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Helpers\GatewayDashboardUrlBuilder.cs" Link="Helpers\GatewayDashboardUrlBuilder.cs" />
+    <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Helpers\CommandCenterTextHelper.cs" Link="Helpers\CommandCenterTextHelper.cs" />
+    <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Helpers\Win32FilePickerHelper.cs" Link="Helpers\Win32FilePickerHelper.cs" />
+    <Compile Include="..\..\src\OpenClaw.Tray.WinUI\AppIdentity.cs" Link="AppIdentity.cs" />
     <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\TrayStateSnapshot.cs" Link="Services\TrayStateSnapshot.cs" />
     <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\TrayTooltipBuilder.cs" Link="Services\TrayTooltipBuilder.cs" />
+    <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\TrayMenuSnapshot.cs" Link="Services\TrayMenuSnapshot.cs" />
+    <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\TrayDashboardSummary.cs" Link="Services\TrayDashboardSummary.cs" />
     <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\TextToSpeech\ElevenLabsTextToSpeechClient.cs" Link="Services\TextToSpeech\ElevenLabsTextToSpeechClient.cs" />
     <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\GatewayDiscoveryService.cs" Link="Services\GatewayDiscoveryService.cs" />
     <Compile Include="..\..\src\OpenClaw.Tray.WinUI\A2UI\Actions\AgentMessageFormatter.cs" Link="A2UI\Actions\AgentMessageFormatter.cs" />
@@ -81,6 +102,8 @@
     <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Pages\ConnectionPagePlan.cs" Link="Imported\ConnectionPagePlan.cs" />
     <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Pages\ConnectionPageRowState.cs" Link="Imported\ConnectionPageRowState.cs" />
     <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Pages\ChatPagePanelStates.cs" Link="Imported\ChatPagePanelStates.cs" />
+    <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Pages\ExecPolicyRuleList.cs" Link="Pages\ExecPolicyRuleList.cs" />
+    <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Pages\WorkspaceFilesModel.cs" Link="Imported\WorkspaceFilesModel.cs" />
     <Compile Include="..\..\src\OpenClaw.Tray.WinUI\Services\ConnectionManagerWindowsNodeConnector.cs" Link="Services\ConnectionManagerWindowsNodeConnector.cs" />
     <!-- Pulled in for console-log tail tests. Pure logic, no WinUI deps. -->
     <Compile Include="..\..\src\OpenClaw.SetupEngine.UI\WizardConsoleTail.cs" Link="WizardConsoleTail.cs" />
diff --git a/tests/OpenClaw.Tray.Tests/OpenClawChatDataProviderTests.cs b/tests/OpenClaw.Tray.Tests/OpenClawChatDataProviderTests.cs
index 5872e9dd7..8e821404e 100644
--- a/tests/OpenClaw.Tray.Tests/OpenClawChatDataProviderTests.cs
+++ b/tests/OpenClaw.Tray.Tests/OpenClawChatDataProviderTests.cs
@@ -16,33 +16,70 @@ private sealed class FakeBridge : IChatGatewayBridge
         public List<string> SentMessages { get; } = new();
         public List<string?> SentSessionKeys { get; } = new();
         public List<string?> SentSessionIds { get; } = new();
+        public List<IReadOnlyList<ChatAttachment>?> SentAttachments { get; } = new();
+        public List<string?> SentIdempotencyKeys { get; } = new();
         public Queue<ChatSendResult> SendResults { get; } = new();
         public List<string> AbortedRunIds { get; } = new();
         public Func<string, string?, string?, Task>? SendBehavior { get; set; }
+        public Func<string, string, Task>? PatchSessionModelBehavior { get; set; }
+        public Func<string, Task>? ClearSessionModelBehavior { get; set; }
         public Func<string?, Task<ChatHistoryInfo>>? HistoryBehavior { get; set; }
         public Func<string, Task>? AbortBehavior { get; set; }
         public SessionInfo[] Sessions { get; set; } = Array.Empty<SessionInfo>();
         public ModelsListInfo? CurrentModels { get; set; }
+        // Configurable commands.list result + a call counter for the
+        // request/response protocol API.
+        public CommandCatalog CommandCatalogResult { get; set; } = new CommandCatalog { IsSupported = true };
+        public Func<CommandCatalogQuery?, Task<CommandCatalog>>? ListCommandsBehavior { get; set; }
+        public int ListCommandsCallCount { get; private set; }
+        public CommandCatalogQuery? LastListCommandsQuery { get; private set; }
 
         public SessionInfo[] GetSessionList() => Sessions;
         public ModelsListInfo? GetCurrentModelsList() => CurrentModels;
         public void StartProactiveBootstrap() { }
 
+        public Task<CommandCatalog> ListCommandsAsync(CommandCatalogQuery? query = null)
+        {
+            ListCommandsCallCount++;
+            LastListCommandsQuery = query;
+            return ListCommandsBehavior?.Invoke(query) ?? Task.FromResult(CommandCatalogResult);
+        }
+
         public Task SendChatMessageAsync(string message, string? sessionKey, string? sessionId, IReadOnlyList<ChatAttachment>? attachments = null)
             => SendChatMessageForRunAsync(message, sessionKey, sessionId, attachments);
 
-        public async Task<ChatSendResult> SendChatMessageForRunAsync(string message, string? sessionKey, string? sessionId, IReadOnlyList<ChatAttachment>? attachments = null)
+        public async Task<ChatSendResult> SendChatMessageForRunAsync(
+            string message,
+            string? sessionKey,
+            string? sessionId,
+            IReadOnlyList<ChatAttachment>? attachments = null,
+            string? idempotencyKey = null)
         {
             SentMessages.Add(message);
             SentSessionKeys.Add(sessionKey);
             SentSessionIds.Add(sessionId);
+            SentAttachments.Add(attachments?.ToArray());
+            SentIdempotencyKeys.Add(idempotencyKey);
             if (SendBehavior is not null)
                 await SendBehavior(message, sessionKey, sessionId);
 
             return SendResults.Count > 0 ? SendResults.Dequeue() : new ChatSendResult();
         }
 
-        public Task PatchSessionModelAsync(string sessionKey, string model) => Task.CompletedTask;
+        public Task PatchSessionModelAsync(string sessionKey, string model)
+        {
+            PatchedModelKeys.Add(sessionKey);
+            PatchedModels.Add(model);
+            return PatchSessionModelBehavior?.Invoke(sessionKey, model) ?? Task.CompletedTask;
+        }
+        public List<string> PatchedModelKeys { get; } = new();
+        public List<string> PatchedModels { get; } = new();
+        public Task ClearSessionModelAsync(string sessionKey)
+        {
+            ClearedModelKeys.Add(sessionKey);
+            return ClearSessionModelBehavior?.Invoke(sessionKey) ?? Task.CompletedTask;
+        }
+        public List<string> ClearedModelKeys { get; } = new();
         public Task PatchSessionThinkingLevelAsync(string sessionKey, string thinkingLevel) => Task.CompletedTask;
 
         public Task<ChatHistoryInfo> RequestChatHistoryAsync(string? sessionKey)
@@ -131,7 +168,21 @@ public async Task LoadAsync_ReturnsSeededSessionsAsThreads()
     }
 
     [Fact]
-    public async Task SendMessageAsync_AddsLocalUserEntryBeforeAwaitingGateway()
+    public async Task LoadAsync_CarriesSessionModelProviderToThreads()
+    {
+        var session = MainSession();
+        session.Model = "gpt-5.4";
+        session.Provider = "openrouter";
+        var (_, provider, _, _) = CreateProvider(new[] { session });
+
+        var snapshot = await provider.LoadAsync();
+
+        Assert.Equal("gpt-5.4", snapshot.Threads[0].Model);
+        Assert.Equal("openrouter", snapshot.Threads[0].ModelProvider);
+    }
+
+    [Fact]
+    public async Task SendMessageAsync_WhenIdle_RendersTranscriptEntryBeforeAwaitingGateway()
     {
         var tcs = new TaskCompletionSource();
         var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
@@ -145,9 +196,10 @@ public async Task SendMessageAsync_AddsLocalUserEntryBeforeAwaitingGateway()
         Assert.Single(snapshots);
         var timeline = snapshots[0].Timelines["main"];
         Assert.True(timeline.TurnActive);
-        Assert.Single(timeline.Entries);
-        Assert.Equal(ChatTimelineItemKind.User, timeline.Entries[0].Kind);
-        Assert.Equal("Hello", timeline.Entries[0].Text);
+        var entry = Assert.Single(timeline.Entries);
+        Assert.Equal(ChatTimelineItemKind.User, entry.Kind);
+        Assert.Equal("Hello", entry.Text);
+        Assert.Empty(GetQueuedMessages(snapshots[0], "main"));
         Assert.Single(bridge.SentMessages);
         Assert.Equal("Hello", bridge.SentMessages[0]);
         Assert.Equal("main", bridge.SentSessionKeys[0]);
@@ -157,1839 +209,4836 @@ public async Task SendMessageAsync_AddsLocalUserEntryBeforeAwaitingGateway()
     }
 
     [Fact]
-    public async Task SendMessageAsync_GatewayThrows_AppendsErrorAndRethrows()
+    public async Task SendMessageAsync_WhenIdle_DoesNotRenderQueueCardBeforeLifecycleStart()
     {
-        var (bridge, provider, snapshots, notifications) = CreateProvider(new[] { MainSession() });
-        bridge.SendBehavior = (_, _, _) => throw new InvalidOperationException("boom");
+        var tcs = new TaskCompletionSource();
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendBehavior = (_, _, _) => tcs.Task;
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-1", Status = "started" });
         await provider.LoadAsync();
         snapshots.Clear();
-        notifications.Clear();
 
-        await Assert.ThrowsAsync<InvalidOperationException>(() =>
-            provider.SendMessageAsync("main", "Hi"));
+        var sendTask = provider.SendMessageAsync("main", "Hello queue");
 
-        var timeline = snapshots[^1].Timelines["main"];
-        Assert.Contains(timeline.Entries, e => e.Kind == ChatTimelineItemKind.Status && e.Text.Contains("boom"));
-        Assert.False(timeline.TurnActive);
-        Assert.Contains(notifications, n => n.Kind == ChatProviderNotificationKind.Error);
+        Assert.Empty(GetQueuedMessages(snapshots[0], "main"));
+        var pending = Assert.Single(snapshots[0].Timelines["main"].Entries);
+        Assert.Equal(ChatTimelineItemKind.User, pending.Kind);
+        Assert.Equal("Hello queue", pending.Text);
+
+        tcs.SetResult();
+        await sendTask;
+
+        Assert.Empty(GetQueuedMessages(snapshots[^1], "main"));
+        Assert.Single(snapshots[^1].Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "Hello queue");
+
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-1"));
+
+        Assert.Empty(GetQueuedMessages(snapshots[^1], "main"));
+        var entry = Assert.Single(snapshots[^1].Timelines["main"].Entries);
+        Assert.Equal(ChatTimelineItemKind.User, entry.Kind);
+        Assert.Equal("Hello queue", entry.Text);
+        AssertNoQueuedTranscriptDuplicate(snapshots, "main", "Hello queue");
     }
 
     [Fact]
-    public async Task SendMessageAsync_RejectsEmptyMessage()
+    public async Task SendMessageAsync_AckDoesNotQueueStaleSnapshotThatCanResurrectClearedQueuedMessage()
     {
-        var (_, provider, _, _) = CreateProvider(new[] { MainSession() });
+        var bridge = new FakeBridge { Sessions = new[] { MainSession() } };
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-1", Status = "started" });
+        var posted = new List<Action>();
+        var provider = new OpenClawChatDataProvider(bridge, post: posted.Add);
+        var snapshots = new List<ChatDataSnapshot>();
+        provider.Changed += (_, e) => snapshots.Add(e.Snapshot);
         await provider.LoadAsync();
+        posted.Clear();
 
-        await Assert.ThrowsAsync<ArgumentException>(() => provider.SendMessageAsync("main", "  "));
+        await provider.SendMessageAsync("main", "queued prompt");
+        Assert.Single(posted);
+
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-1"));
+
+        foreach (var action in posted)
+            action();
+
+        Assert.Empty(GetQueuedMessages(snapshots[^1], "main"));
+        Assert.Single(snapshots[^1].Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "queued prompt");
     }
 
     [Fact]
-    public async Task ChatMessageReceived_FinalAssistant_AppendsAssistantEntry()
+    public async Task SendMessageAsync_DuringActiveTurn_QueuesFollowUpsLocallyUntilTurnEnds()
     {
-        var (bridge, provider, snapshots, notifications) = CreateProvider(new[] { MainSession() });
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-1", Status = "started" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-2", Status = "started" });
         await provider.LoadAsync();
+        bridge.RaiseStatus(ConnectionStatus.Connected);
         snapshots.Clear();
-        notifications.Clear();
+
+        await provider.SendMessageAsync("main", "first");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-1"));
+        await provider.SendMessageAsync("main", "second");
+
+        Assert.Equal(new[] { "first" }, bridge.SentMessages);
+        Assert.Collection(
+            GetQueuedMessages(snapshots[^1], "main"),
+            queued =>
+            {
+                Assert.Equal("second", queued.Text);
+                Assert.Equal(ChatQueuedMessageSendState.Queued, queued.SendState);
+            });
+        Assert.DoesNotContain(snapshots[^1].Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "second");
 
         bridge.RaiseChat(new ChatMessageInfo
         {
             SessionKey = "main",
             Role = "assistant",
-            Text = "Hello from assistant",
+            Text = "first response",
             State = "final"
         });
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"end"}""", runId: "run-1"));
 
-        var timeline = snapshots[^1].Timelines["main"];
-        Assert.Contains(timeline.Entries, e =>
-            e.Kind == ChatTimelineItemKind.Assistant && e.Text == "Hello from assistant");
-        Assert.False(timeline.TurnActive);
-        Assert.Contains(notifications, n => n.Kind == ChatProviderNotificationKind.TurnComplete);
+        await WaitForConditionAsync(() => bridge.SentMessages.Count >= 2);
+        Assert.Equal(new[] { "first", "second" }, bridge.SentMessages);
+        Assert.Empty(GetQueuedMessages(snapshots[^1], "main"));
+        Assert.Single(snapshots[^1].Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "second");
+
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-2"));
+
+        Assert.Empty(GetQueuedMessages(snapshots[^1], "main"));
+        Assert.Single(snapshots[^1].Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "second");
     }
 
     [Fact]
-    public async Task ChatMessageReceived_DeltaAssistant_AppendsAssistantWithoutEndingTurn()
+    public async Task AgentEvent_DuplicateTerminalForCompletedRun_DoesNotDispatchAdditionalQueuedMessage()
     {
-        // Block-streamed deltas carry cumulative assistant text and should
-        // upsert the active assistant entry without ending the turn.
-        var (bridge, provider, snapshots, notifications) = CreateProvider(new[] { MainSession() });
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-1", Status = "started" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-2", Status = "started" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-3", Status = "started" });
         await provider.LoadAsync();
+        bridge.RaiseStatus(ConnectionStatus.Connected);
         snapshots.Clear();
-        notifications.Clear();
 
-        bridge.RaiseChat(new ChatMessageInfo
-        {
-            SessionKey = "main",
-            Role = "assistant",
-            Text = "Hello",
-            State = "delta"
-        });
+        await provider.SendMessageAsync("main", "a");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-1"));
+        await provider.SendMessageAsync("main", "b");
+        await provider.SendMessageAsync("main", "c");
 
-        var timeline = snapshots[^1].Timelines["main"];
-        Assert.Contains(timeline.Entries, e =>
-            e.Kind == ChatTimelineItemKind.Assistant && e.Text == "Hello");
-        Assert.True(timeline.TurnActive);
-        Assert.DoesNotContain(notifications, n => n.Kind == ChatProviderNotificationKind.TurnComplete);
+        Assert.Equal(new[] { "a" }, bridge.SentMessages);
+
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"end"}""", runId: "run-1"));
+        await WaitForConditionAsync(() => bridge.SentMessages.Count >= 2);
+        Assert.Equal(new[] { "a", "b" }, bridge.SentMessages);
+
+        bridge.RaiseAgent(MakeAgentEvent("job", """{"state":"done"}""", runId: "run-1"));
+        await Task.Delay(150);
+
+        Assert.Equal(new[] { "a", "b" }, bridge.SentMessages);
+        Assert.Collection(
+            GetQueuedMessages(snapshots[^1], "main"),
+            queued =>
+            {
+                Assert.Equal("c", queued.Text);
+                Assert.Equal(ChatQueuedMessageSendState.Queued, queued.SendState);
+            });
+        Assert.Single(snapshots[^1].Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "b");
     }
 
     [Fact]
-    public async Task ChatMessageReceived_FinalAfterLifecycleEnd_DoesNotDuplicateAssistant()
+    public async Task LifecycleStart_DoesNotClearNextQueuedMessageWhenEarlierEchoAlreadyClearedItsCard()
     {
-        var (bridge, provider, _, _) = CreateProvider(new[] { MainSession() });
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-1", Status = "started" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-2", Status = "started" });
         await provider.LoadAsync();
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+        snapshots.Clear();
+
+        await provider.SendMessageAsync("main", "first queued");
+        await provider.SendMessageAsync("main", "second queued");
+        Assert.Equal(new[] { "first queued" }, bridge.SentMessages);
+
+        var queuedBeforeEcho = Assert.Single(GetQueuedMessages(snapshots[^1], "main"));
+        Assert.Equal("second queued", queuedBeforeEcho.Text);
+        Assert.Equal(ChatQueuedMessageSendState.Queued, queuedBeforeEcho.SendState);
+        Assert.Single(snapshots[^1].Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "first queued");
 
         bridge.RaiseChat(new ChatMessageInfo
         {
             SessionKey = "main",
-            Role = "assistant",
-            Text = "partial",
-            State = "delta"
-        });
-        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"end"}""", runId: "run-1"));
-        bridge.RaiseChat(new ChatMessageInfo
-        {
-            SessionKey = "main",
-            Role = "assistant",
-            Text = "final",
-            State = "final"
-        });
-        bridge.RaiseChat(new ChatMessageInfo
-        {
-            SessionKey = "main",
-            Role = "assistant",
-            Text = "final",
+            Role = "user",
+            Text = "first queued",
             State = "final"
         });
 
-        var timeline = (await provider.LoadAsync()).Timelines["main"];
-        var assistant = Assert.Single(timeline.Entries, e => e.Kind == ChatTimelineItemKind.Assistant);
-        Assert.Equal("final", assistant.Text);
-        Assert.False(assistant.IsStreaming);
-        Assert.False(timeline.TurnActive);
-    }
+        var queuedAfterEcho = Assert.Single(GetQueuedMessages(snapshots[^1], "main"));
+        Assert.Equal("second queued", queuedAfterEcho.Text);
+        Assert.Single(snapshots[^1].Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "first queued");
 
-    [Fact]
-    public async Task ChatMessageReceived_DeltaAfterFinalAssistant_DoesNotReactivateTurn()
-    {
-        var (bridge, provider, _, notifications) = CreateProvider(new[] { MainSession() });
-        await provider.LoadAsync();
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-1"));
+
+        var queuedAfterFirstStart = Assert.Single(GetQueuedMessages(snapshots[^1], "main"));
+        Assert.Equal("second queued", queuedAfterFirstStart.Text);
 
         bridge.RaiseChat(new ChatMessageInfo
         {
             SessionKey = "main",
             Role = "assistant",
-            Text = "final answer",
+            Text = "first response",
             State = "final"
         });
-        notifications.Clear();
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"end"}""", runId: "run-1"));
+        await WaitForConditionAsync(() => bridge.SentMessages.Count >= 2);
+        Assert.Equal(new[] { "first queued", "second queued" }, bridge.SentMessages);
 
-        bridge.RaiseChat(new ChatMessageInfo
-        {
-            SessionKey = "main",
-            Role = "assistant",
-            Text = "late trailing frame",
-            State = "delta"
-        });
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-2"));
 
-        var timeline = (await provider.LoadAsync()).Timelines["main"];
-        var assistant = Assert.Single(timeline.Entries, e => e.Kind == ChatTimelineItemKind.Assistant);
-        Assert.Equal("final answer", assistant.Text);
-        Assert.False(assistant.IsStreaming);
-        Assert.False(timeline.TurnActive);
-        Assert.DoesNotContain(notifications, n => n.Kind == ChatProviderNotificationKind.TurnComplete);
+        Assert.Empty(GetQueuedMessages(snapshots[^1], "main"));
+        Assert.Single(snapshots[^1].Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "second queued");
+        AssertNoQueuedTranscriptDuplicate(snapshots, "main", "first queued");
+        AssertNoQueuedTranscriptDuplicate(snapshots, "main", "second queued");
     }
 
     [Fact]
-    public async Task ChatMessageReceived_DeltaAfterFinalAssistantBeforeLifecycleEnd_DoesNotReactivateTurn()
+    public async Task AssistantFrames_DuringActiveLocalRun_DoNotPromoteLaterQueuedMessages()
     {
-        var (bridge, provider, _, notifications) = CreateProvider(new[] { MainSession() });
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-1", Status = "started" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-2", Status = "started" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-3", Status = "started" });
         await provider.LoadAsync();
+        snapshots.Clear();
+
+        await provider.SendMessageAsync("main", "a");
+        await provider.SendMessageAsync("main", "b");
+        await provider.SendMessageAsync("main", "c");
 
         bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-1"));
         bridge.RaiseChat(new ChatMessageInfo
         {
             SessionKey = "main",
             Role = "assistant",
-            Text = "final answer",
+            Text = "Sounds good — send them through.",
             State = "final"
         });
-        notifications.Clear();
-
         bridge.RaiseChat(new ChatMessageInfo
         {
             SessionKey = "main",
             Role = "assistant",
-            Text = "late trailing frame",
-            State = "delta"
+            Text = "Sounds good — send them through.",
+            State = "final"
         });
 
-        var timeline = (await provider.LoadAsync()).Timelines["main"];
-        var assistant = Assert.Single(timeline.Entries, e => e.Kind == ChatTimelineItemKind.Assistant);
-        Assert.Equal("final answer", assistant.Text);
-        Assert.False(assistant.IsStreaming);
-        Assert.False(timeline.TurnActive);
-        Assert.DoesNotContain(notifications, n => n.Kind == ChatProviderNotificationKind.TurnComplete);
+        var latest = snapshots[^1];
+        Assert.Single(latest.Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "a");
+        Assert.DoesNotContain(latest.Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text is "b" or "c");
+        Assert.Single(latest.Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.Assistant && e.Text == "Sounds good — send them through.");
+        Assert.Collection(
+            GetQueuedMessages(latest, "main"),
+            queued => Assert.Equal("b", queued.Text),
+            queued => Assert.Equal("c", queued.Text));
     }
 
     [Fact]
-    public async Task ChatMessageReceived_UserEcho_Ignored()
+    public async Task ChatSendAck_ForAlreadyActiveRun_DoesNotPromoteLaterQueuedMessages()
     {
-        // After sending a message locally, the SSE echo of that same text
-        // should be suppressed (already displayed by SendMessageAsync).
-        var tcs = new TaskCompletionSource();
         var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
-        bridge.SendBehavior = (_, _, _) => tcs.Task;
         await provider.LoadAsync();
+        snapshots.Clear();
 
-        _ = provider.SendMessageAsync("main", "hi");
-        snapshots.Clear(); // clear the snapshot from SendMessageAsync
-
-        bridge.RaiseChat(new ChatMessageInfo
-        {
-            SessionKey = "main",
-            Role = "user",
-            Text = "hi",
-            State = "final"
-        });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-active", Status = "started" });
+        await provider.SendMessageAsync("main", "r");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-active"));
+        Assert.Single(snapshots[^1].Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "r");
 
-        // The echo should be suppressed — no new snapshot.
-        Assert.Empty(snapshots);
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-active", Status = "started" });
+        await provider.SendMessageAsync("main", "s");
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-active", Status = "started" });
+        await provider.SendMessageAsync("main", "t");
 
-        tcs.SetResult();
+        var latest = snapshots[^1];
+        Assert.DoesNotContain(latest.Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text is "s" or "t");
+        Assert.Collection(
+            GetQueuedMessages(latest, "main"),
+            queued => Assert.Equal("s", queued.Text),
+            queued => Assert.Equal("t", queued.Text));
     }
 
     [Fact]
-    public async Task SendMessageAsync_WhenGatewayThrows_DoesNotSuppressFutureRemoteUserEcho()
+    public async Task LifecycleEnd_KeepsLocalInitiatedStateWhenQueuedMessagesRemain()
     {
         var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
-        bridge.SendBehavior = (_, _, _) => throw new InvalidOperationException("gateway down");
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-1", Status = "started" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-2", Status = "started" });
         await provider.LoadAsync();
-
-        await Assert.ThrowsAsync<InvalidOperationException>(() =>
-            provider.SendMessageAsync("main", "same text"));
-
-        bridge.SendBehavior = null;
+        bridge.RaiseStatus(ConnectionStatus.Connected);
         snapshots.Clear();
 
+        await provider.SendMessageAsync("main", "first");
+        await provider.SendMessageAsync("main", "second");
+        Assert.Equal(new[] { "first" }, bridge.SentMessages);
+
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-1"));
         bridge.RaiseChat(new ChatMessageInfo
         {
             SessionKey = "main",
-            Role = "user",
-            Text = "same text",
+            Role = "assistant",
+            Text = "first run response",
+            State = "final"
+        });
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"end"}""", runId: "run-1"));
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            Text = "first run response",
             State = "final"
         });
 
-        var timeline = snapshots[^1].Timelines["main"];
-        Assert.Equal(2, timeline.Entries.Count(e =>
-            e.Kind == ChatTimelineItemKind.User && e.Text == "same text"));
+        await WaitForConditionAsync(() => bridge.SentMessages.Count >= 2);
+        Assert.Equal(new[] { "first", "second" }, bridge.SentMessages);
+        Assert.Empty(GetQueuedMessages(snapshots[^1], "main"));
+        Assert.Single(snapshots[^1].Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "second");
+        Assert.Single(snapshots[^1].Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.Assistant && e.Text == "first run response");
+
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-2"));
+
+        var latest = snapshots[^1];
+        Assert.Empty(GetQueuedMessages(latest, "main"));
+        Assert.Single(latest.Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "first");
+        Assert.Single(latest.Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "second");
     }
 
     [Fact]
-    public async Task AgentEvent_ToolStart_AppendsToolCallEntry()
+    public async Task SendMessageAsync_GatewayThrows_AppendsErrorAndRethrows()
     {
-        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        var (bridge, provider, snapshots, notifications) = CreateProvider(new[] { MainSession() });
+        bridge.SendBehavior = (_, _, _) => throw new InvalidOperationException("boom");
         await provider.LoadAsync();
         snapshots.Clear();
+        notifications.Clear();
 
-        bridge.RaiseAgent(MakeAgentEvent("tool",
-            """{"phase":"start","name":"powershell","args":{"command":"ls"}}"""));
+        await Assert.ThrowsAsync<InvalidOperationException>(() =>
+            provider.SendMessageAsync("main", "Hi"));
 
         var timeline = snapshots[^1].Timelines["main"];
-        var entry = Assert.Single(timeline.Entries);
-        Assert.Equal(ChatTimelineItemKind.ToolCall, entry.Kind);
-        Assert.Equal("powershell", entry.ToolName);
-        Assert.Equal("ls", entry.Text);
-        Assert.Equal(ChatToolCallStatus.InProgress, entry.ToolResult);
+        Assert.Contains(timeline.Entries, e => e.Kind == ChatTimelineItemKind.User && e.Text == "Hi");
+        Assert.Contains(timeline.Entries, e => e.Kind == ChatTimelineItemKind.Status && e.Text.Contains("boom"));
+        Assert.False(timeline.TurnActive);
+        Assert.Empty(GetQueuedMessages(snapshots[^1], "main"));
+        Assert.Contains(notifications, n => n.Kind == ChatProviderNotificationKind.Error);
     }
 
     [Fact]
-    public async Task AgentEvent_ToolStartThenResult_MarksToolSuccess()
+    public async Task SendMessageAsync_TerminalAckStatus_AppendsErrorAndKeepsFailedQueuedMessage()
     {
-        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        var (bridge, provider, snapshots, notifications) = CreateProvider(new[] { MainSession() });
+        bridge.SendResults.Enqueue(new ChatSendResult { Status = "failed", Error = "model unavailable" });
         await provider.LoadAsync();
+        snapshots.Clear();
+        notifications.Clear();
 
-        bridge.RaiseAgent(MakeAgentEvent("tool",
-            """{"phase":"start","name":"grep","args":{"pattern":"foo"}}"""));
-        bridge.RaiseAgent(MakeAgentEvent("tool",
-            """{"phase":"result","name":"grep","args":{"pattern":"foo"}}"""));
+        await Assert.ThrowsAsync<InvalidOperationException>(() =>
+            provider.SendMessageAsync("main", "Hi"));
 
         var timeline = snapshots[^1].Timelines["main"];
-        var entry = Assert.Single(timeline.Entries);
-        Assert.Equal(ChatToolCallStatus.Success, entry.ToolResult);
+        Assert.Contains(timeline.Entries, e => e.Kind == ChatTimelineItemKind.User && e.Text == "Hi");
+        Assert.Contains(timeline.Entries, e => e.Kind == ChatTimelineItemKind.Status && e.Text.Contains("model unavailable"));
+        Assert.Empty(GetQueuedMessages(snapshots[^1], "main"));
+        Assert.Contains(notifications, n => n.Kind == ChatProviderNotificationKind.Error);
     }
 
     [Fact]
-    public async Task AgentEvent_JobError_EmitsErrorEntry()
+    public async Task SendMessageAsync_FailedFirstSendDoesNotOrphanLaterQueuedSend()
     {
+        var firstGate = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        var secondGate = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        var sendCount = 0;
         var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendBehavior = (_, _, _) =>
+        {
+            sendCount++;
+            return sendCount == 1 ? firstGate.Task : secondGate.Task;
+        };
+        bridge.SendResults.Enqueue(new ChatSendResult { Status = "failed", Error = "first failed" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-b", Status = "started" });
         await provider.LoadAsync();
-        snapshots.Clear();
+        bridge.RaiseStatus(ConnectionStatus.Connected);
 
-        var evt = MakeAgentEvent("job", """{"state":"error"}""");
-        evt.Summary = "kaboom";
-        bridge.RaiseAgent(evt);
+        var firstSend = provider.SendMessageAsync("main", "a");
+        var secondSend = provider.SendMessageAsync("main", "b");
+        firstGate.SetResult();
+        await Assert.ThrowsAsync<InvalidOperationException>(() => firstSend);
 
-        var timeline = snapshots[^1].Timelines["main"];
-        Assert.Contains(timeline.Entries, e =>
-            e.Kind == ChatTimelineItemKind.Status && e.Text.Contains("kaboom"));
+        for (var i = 0; i < 20 && bridge.SentMessages.Count < 2; i++)
+            await Task.Delay(10);
+        secondGate.SetResult();
+        await secondSend;
+        for (var i = 0; i < 20 && bridge.SendResults.Count > 0; i++)
+            await Task.Delay(10);
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-b"));
+
+        var latest = snapshots[^1];
+        Assert.Contains(latest.Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "a");
+        Assert.Contains(latest.Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "b");
+        Assert.Empty(GetQueuedMessages(latest, "main"));
     }
 
     [Fact]
-    public async Task AgentEvent_JobDone_ClearsTurnActive()
+    public async Task LifecycleEnd_IgnoresFailedQueuedMessagesWhenClearingLocalInitiatedState()
     {
+        var historyCalls = 0;
         var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-a", Status = "started" });
+        bridge.SendResults.Enqueue(new ChatSendResult { Status = "failed", Error = "second failed" });
         await provider.LoadAsync();
-        // Kick off a turn
-        _ = provider.SendMessageAsync("main", "hi");
+        bridge.RaiseStatus(ConnectionStatus.Connected);
 
-        bridge.RaiseAgent(MakeAgentEvent("job", """{"state":"done"}"""));
+        await provider.SendMessageAsync("main", "a");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-a"));
+        await provider.SendMessageAsync("main", "b");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"end"}""", runId: "run-a"));
 
-        // Snapshot the timeline directly.
-        var snap = await provider.LoadAsync();
-        Assert.False(snap.Timelines["main"].TurnActive);
-    }
+        for (var i = 0; i < 20; i++)
+        {
+            if (GetQueuedMessages(snapshots[^1], "main").Any(q =>
+                q.Text == "b" &&
+                q.SendState == ChatQueuedMessageSendState.Failed))
+            {
+                break;
+            }
+            await Task.Delay(10);
+        }
+        var failed = Assert.Single(GetQueuedMessages(snapshots[^1], "main"));
+        Assert.Equal("b", failed.Text);
+        Assert.Equal(ChatQueuedMessageSendState.Failed, failed.SendState);
 
-    [Fact]
-    public async Task SessionsUpdated_RebuildsThreadsAndSeedsTimelines()
-    {
-        var (bridge, provider, snapshots, _) = CreateProvider();
-        await provider.LoadAsync();
+        bridge.HistoryBehavior = _ =>
+        {
+            historyCalls++;
+            return Task.FromResult(new ChatHistoryInfo
+            {
+                SessionKey = "main",
+                Messages = new[]
+                {
+                    new ChatMessageInfo
+                    {
+                        SessionKey = "main",
+                        Role = "user",
+                        Text = "remote after failed card",
+                        Ts = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
+                        OpenClawSeq = 30
+                    }
+                }
+            });
+        };
         snapshots.Clear();
 
-        bridge.RaiseSessions(new[]
-        {
-            new SessionInfo { Key = "main", IsMain = true, DisplayName = "Main" },
-            new SessionInfo { Key = "sub:abc", IsMain = false, DisplayName = "Sub" }
-        });
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "remote-run"));
 
-        var snap = snapshots[^1];
-        Assert.Equal(2, snap.Threads.Length);
-        Assert.True(snap.Timelines.ContainsKey("main"));
-        Assert.True(snap.Timelines.ContainsKey("sub:abc"));
-        Assert.Equal("main", snap.DefaultThreadId);
+        for (var i = 0; i < 20 && historyCalls == 0; i++)
+            await Task.Delay(10);
+
+        Assert.True(historyCalls > 0);
     }
 
     [Fact]
-    public async Task SessionResetCompletion_ClearsThreadTimelineAndIgnoresStaleHistory()
+    public async Task LifecycleEnd_IgnoresFailedQueuedMessagesAfterLaterAcceptedSend()
     {
-        var historyTcs = new TaskCompletionSource<ChatHistoryInfo>(TaskCreationOptions.RunContinuationsAsynchronously);
+        var historyCalls = 0;
         var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
-        bridge.HistoryBehavior = _ => historyTcs.Task;
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-a", Status = "started" });
+        bridge.SendResults.Enqueue(new ChatSendResult { Status = "failed", Error = "second failed" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-next", Status = "started" });
         await provider.LoadAsync();
-        var historyTask = provider.LoadHistoryAsync("main");
-        await provider.SendMessageAsync("main", "hi");
-        snapshots.Clear();
+        bridge.RaiseStatus(ConnectionStatus.Connected);
 
-        bridge.RaiseSessionCommandCompleted(new SessionCommandResult
+        await provider.SendMessageAsync("main", "a");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-a"));
+        await provider.SendMessageAsync("main", "failed card");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"end"}""", runId: "run-a"));
+        for (var i = 0; i < 20; i++)
         {
-            Method = "sessions.reset",
-            Ok = true,
-            Key = "main"
-        });
+            if (GetQueuedMessages(snapshots[^1], "main").Any(q => q.SendState == ChatQueuedMessageSendState.Failed))
+                break;
+            await Task.Delay(10);
+        }
 
-        var resetSnapshot = snapshots[^1];
-        Assert.Empty(resetSnapshot.Timelines["main"].Entries);
-        Assert.True(resetSnapshot.Timelines["main"].HistoryLoaded);
+        await provider.SendMessageAsync("main", "next local");
+        Assert.Contains(GetQueuedMessages(snapshots[^1], "main"), q =>
+            q.Text == "failed card" &&
+            q.SendState == ChatQueuedMessageSendState.Failed);
+        Assert.Contains(snapshots[^1].Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "next local");
 
-        historyTcs.SetResult(new ChatHistoryInfo
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-next"));
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"end"}""", runId: "run-next"));
+        bridge.HistoryBehavior = _ =>
         {
-            SessionKey = "main",
-            Messages = new[]
+            historyCalls++;
+            return Task.FromResult(new ChatHistoryInfo
             {
-                new ChatMessageInfo
+                SessionKey = "main",
+                Messages = new[]
                 {
-                    SessionKey = "main",
-                    Role = "assistant",
-                    Text = "old history",
-                    Ts = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds()
+                    new ChatMessageInfo
+                    {
+                        SessionKey = "main",
+                        Role = "user",
+                        Text = "remote after completed local",
+                        Ts = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
+                        OpenClawSeq = 31
+                    }
                 }
-            }
-        });
-        await historyTask;
+            });
+        };
+        snapshots.Clear();
 
-        var latest = snapshots[^1];
-        Assert.Empty(latest.Timelines["main"].Entries);
-        Assert.True(latest.Timelines["main"].HistoryLoaded);
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "remote-run"));
 
-        await provider.SendMessageAsync("main", "after reset");
+        for (var i = 0; i < 20 && historyCalls == 0; i++)
+            await Task.Delay(10);
 
-        latest = snapshots[^1];
-        var entry = Assert.Single(latest.Timelines["main"].Entries);
-        Assert.Equal(ChatTimelineItemKind.User, entry.Kind);
-        Assert.Equal("after reset", entry.Text);
+        Assert.True(historyCalls > 0);
     }
 
     [Fact]
-    public async Task SessionResetCompletion_DropsLateLiveEventsUntilNewUserMessage()
+    public async Task Status_ReconnectClearsUncorrelatedQueuedMessagesBeforeHistoryReload()
     {
+        var sendGate = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
         var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendBehavior = (_, _, _) => sendGate.Task;
         await provider.LoadAsync();
-        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "old-run"));
+
+        var sendTask = provider.SendMessageAsync("main", "active across reconnect");
+        await provider.SendMessageAsync("main", "pending across reconnect");
+        Assert.Equal("pending across reconnect", Assert.Single(GetQueuedMessages(snapshots[^1], "main")).Text);
+
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+
+        Assert.Empty(GetQueuedMessages(snapshots[^1], "main"));
+        sendGate.SetResult();
+        await sendTask;
+    }
+
+    [Fact]
+    public async Task Status_ReconnectAfterActiveRun_DoesNotStrandFutureSendBehindStaleRunId()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-a", Status = "started" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-b", Status = "started" });
+        await provider.LoadAsync();
+        bridge.RaiseStatus(ConnectionStatus.Connected);
         snapshots.Clear();
 
-        bridge.RaiseSessionCommandCompleted(new SessionCommandResult
-        {
-            Method = "sessions.reset",
-            Ok = true,
-            Key = "main"
-        });
+        await provider.SendMessageAsync("main", "a");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-a"));
+        Assert.Equal(new[] { "a" }, bridge.SentMessages);
+
+        bridge.RaiseStatus(ConnectionStatus.Disconnected);
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+        snapshots.Clear();
+
+        await provider.SendMessageAsync("main", "b");
+
+        Assert.Equal(new[] { "a", "b" }, bridge.SentMessages);
+        Assert.Empty(GetQueuedMessages(snapshots[^1], "main"));
+        Assert.Contains(snapshots[^1].Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "b");
+    }
+
+    [Fact]
+    public async Task SendMessageAsync_RejectsEmptyMessage()
+    {
+        var (_, provider, _, _) = CreateProvider(new[] { MainSession() });
+        await provider.LoadAsync();
+
+        await Assert.ThrowsAsync<ArgumentException>(() => provider.SendMessageAsync("main", "  "));
+    }
+
+    [Fact]
+    public async Task ChatMessageReceived_FinalAssistant_AppendsAssistantEntry()
+    {
+        var (bridge, provider, snapshots, notifications) = CreateProvider(new[] { MainSession() });
+        await provider.LoadAsync();
+        snapshots.Clear();
+        notifications.Clear();
 
-        bridge.RaiseAgent(MakeAgentEvent("assistant", """{"delta":"stale agent"}""", runId: "old-run"));
         bridge.RaiseChat(new ChatMessageInfo
         {
             SessionKey = "main",
             Role = "assistant",
-            State = "final",
-            Text = "stale chat"
+            Text = "Hello from assistant",
+            State = "final"
         });
 
-        var latest = snapshots[^1];
-        Assert.Empty(latest.Timelines["main"].Entries);
+        var timeline = snapshots[^1].Timelines["main"];
+        Assert.Contains(timeline.Entries, e =>
+            e.Kind == ChatTimelineItemKind.Assistant && e.Text == "Hello from assistant");
+        Assert.False(timeline.TurnActive);
+        Assert.Contains(notifications, n => n.Kind == ChatProviderNotificationKind.TurnComplete);
+    }
+
+    [Fact]
+    public async Task ChatMessageReceived_AssistantNoReply_IsSuppressed()
+    {
+        var (bridge, provider, snapshots, notifications) = CreateProvider(new[] { MainSession() });
+        await provider.LoadAsync();
+        snapshots.Clear();
+        notifications.Clear();
 
         bridge.RaiseChat(new ChatMessageInfo
         {
             SessionKey = "main",
-            Role = "user",
-            Text = "new remote message",
-            Ts = DateTimeOffset.UtcNow.AddSeconds(1).ToUnixTimeMilliseconds()
-        });
-        var freshStart = MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "new-run");
-        freshStart.Ts = DateTimeOffset.UtcNow.AddSeconds(1).ToUnixTimeMilliseconds();
-        bridge.RaiseAgent(freshStart);
-        bridge.RaiseChat(new ChatMessageInfo
-        {
-            SessionKey = "main",
-            Role = "user",
-            Text = "new remote message",
-            Ts = DateTimeOffset.UtcNow.AddSeconds(1).ToUnixTimeMilliseconds()
+            Role = "assistant",
+            Text = "NO_REPLY",
+            State = "final"
         });
+
+        var timeline = (await provider.LoadAsync()).Timelines["main"];
+        Assert.Empty(snapshots);
+        Assert.Empty(timeline.Entries);
+        Assert.DoesNotContain(notifications, n => n.Kind == ChatProviderNotificationKind.TurnComplete);
+    }
+
+    [Fact]
+    public async Task ChatMessageReceived_DeltaAssistant_AppendsAssistantWithoutEndingTurn()
+    {
+        // Block-streamed deltas carry cumulative assistant text and should
+        // upsert the active assistant entry without ending the turn.
+        var (bridge, provider, snapshots, notifications) = CreateProvider(new[] { MainSession() });
+        await provider.LoadAsync();
+        snapshots.Clear();
+        notifications.Clear();
+
         bridge.RaiseChat(new ChatMessageInfo
         {
             SessionKey = "main",
             Role = "assistant",
-            State = "final",
-            Text = "new response"
+            Text = "Hello",
+            State = "delta"
         });
 
-        latest = snapshots[^1];
-        Assert.Contains(latest.Timelines["main"].Entries, e =>
-            e.Kind == ChatTimelineItemKind.User && e.Text == "new remote message");
-        Assert.Contains(latest.Timelines["main"].Entries, e =>
-            e.Kind == ChatTimelineItemKind.Assistant && e.Text == "new response");
-        Assert.DoesNotContain(latest.Timelines["main"].Entries, e =>
-            e.Text.Contains("stale", StringComparison.Ordinal));
+        var timeline = snapshots[^1].Timelines["main"];
+        Assert.Contains(timeline.Entries, e =>
+            e.Kind == ChatTimelineItemKind.Assistant && e.Text == "Hello");
+        Assert.True(timeline.TurnActive);
+        Assert.DoesNotContain(notifications, n => n.Kind == ChatProviderNotificationKind.TurnComplete);
     }
 
     [Fact]
-    public async Task SessionResetCompletion_TimestamplessRemoteUserCanOpenGateViaHistoryBackfill()
+    public async Task ChatMessageReceived_FinalAfterLifecycleEnd_DoesNotDuplicateAssistant()
     {
-        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
-        bridge.HistoryBehavior = _ => Task.FromResult(new ChatHistoryInfo
+        var (bridge, provider, _, _) = CreateProvider(new[] { MainSession() });
+        await provider.LoadAsync();
+
+        bridge.RaiseChat(new ChatMessageInfo
         {
             SessionKey = "main",
-            Messages = new[]
-            {
-                new ChatMessageInfo
-                {
-                    SessionKey = "main",
-                    Role = "user",
-                    Text = "remote no timestamp",
-                    Ts = 0
-                }
-            }
+            Role = "assistant",
+            Text = "partial",
+            State = "delta"
         });
-        await provider.LoadAsync();
-        bridge.RaiseSessionCommandCompleted(new SessionCommandResult
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"end"}""", runId: "run-1"));
+        bridge.RaiseChat(new ChatMessageInfo
         {
-            Method = "sessions.reset",
-            Ok = true,
-            Key = "main"
+            SessionKey = "main",
+            Role = "assistant",
+            Text = "final",
+            State = "final"
         });
-        snapshots.Clear();
-
-        bridge.RaiseChat(new ChatMessageInfo
-        {
-            SessionKey = "main",
-            Role = "user",
-            Text = "remote no timestamp",
-            Ts = 0
-        });
-
-        for (var i = 0; i < 20; i++)
-        {
-            if (snapshots.Count > 0 &&
-                snapshots[^1].Timelines["main"].Entries.Any(e =>
-                    e.Kind == ChatTimelineItemKind.User &&
-                    e.Text == "remote no timestamp"))
-            {
-                break;
-            }
-            await Task.Delay(10);
-        }
-
-        var freshStart = MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "remote-run");
-        freshStart.Ts = DateTimeOffset.UtcNow.AddSeconds(1).ToUnixTimeMilliseconds();
-        bridge.RaiseAgent(freshStart);
         bridge.RaiseChat(new ChatMessageInfo
         {
             SessionKey = "main",
             Role = "assistant",
-            State = "final",
-            Text = "remote response"
+            Text = "final",
+            State = "final"
         });
 
-        var latest = snapshots[^1];
-        Assert.Contains(latest.Timelines["main"].Entries, e =>
-            e.Kind == ChatTimelineItemKind.User && e.Text == "remote no timestamp");
-        Assert.Contains(latest.Timelines["main"].Entries, e =>
-            e.Kind == ChatTimelineItemKind.Assistant && e.Text == "remote response");
+        var timeline = (await provider.LoadAsync()).Timelines["main"];
+        var assistant = Assert.Single(timeline.Entries, e => e.Kind == ChatTimelineItemKind.Assistant);
+        Assert.Equal("final", assistant.Text);
+        Assert.False(assistant.IsStreaming);
+        Assert.False(timeline.TurnActive);
     }
 
     [Fact]
-    public async Task SessionResetCompletion_LocalSendDoesNotReopenGateForStaleChatFrames()
+    public async Task ChatMessageReceived_DeltaAfterFinalAssistant_DoesNotReactivateTurn()
     {
-        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        var (bridge, provider, _, notifications) = CreateProvider(new[] { MainSession() });
         await provider.LoadAsync();
-        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "old-run"));
-        bridge.RaiseSessionCommandCompleted(new SessionCommandResult
-        {
-            Method = "sessions.reset",
-            Ok = true,
-            Key = "main"
-        });
-
-        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "new-run" });
-        await provider.SendMessageAsync("main", "after reset local");
-        snapshots.Clear();
 
         bridge.RaiseChat(new ChatMessageInfo
         {
             SessionKey = "main",
-            Role = "user",
-            Text = "stale user echo"
+            Role = "assistant",
+            Text = "final answer",
+            State = "final"
         });
+        notifications.Clear();
+
         bridge.RaiseChat(new ChatMessageInfo
         {
             SessionKey = "main",
             Role = "assistant",
-            State = "final",
-            Text = "stale assistant"
+            Text = "late trailing frame",
+            State = "delta"
         });
 
-        var latest = await provider.LoadAsync();
-        Assert.Single(latest.Timelines["main"].Entries, e =>
-            e.Kind == ChatTimelineItemKind.User && e.Text == "after reset local");
-        Assert.DoesNotContain(latest.Timelines["main"].Entries, e =>
-            e.Text.Contains("stale", StringComparison.Ordinal));
+        var timeline = (await provider.LoadAsync()).Timelines["main"];
+        var assistant = Assert.Single(timeline.Entries, e => e.Kind == ChatTimelineItemKind.Assistant);
+        Assert.Equal("final answer", assistant.Text);
+        Assert.False(assistant.IsStreaming);
+        Assert.False(timeline.TurnActive);
+        Assert.DoesNotContain(notifications, n => n.Kind == ChatProviderNotificationKind.TurnComplete);
+    }
 
-        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "new-run-2" });
-        await provider.SendMessageAsync("main", "second after reset");
+    [Fact]
+    public async Task ChatMessageReceived_DeltaAfterFinalAssistantBeforeLifecycleEnd_DoesNotReactivateTurn()
+    {
+        var (bridge, provider, _, notifications) = CreateProvider(new[] { MainSession() });
+        await provider.LoadAsync();
+
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-1"));
         bridge.RaiseChat(new ChatMessageInfo
         {
             SessionKey = "main",
-            Role = "user",
-            Text = "second after reset"
+            Role = "assistant",
+            Text = "final answer",
+            State = "final"
         });
+        notifications.Clear();
 
-        latest = await provider.LoadAsync();
-        Assert.Single(latest.Timelines["main"].Entries, e =>
-            e.Kind == ChatTimelineItemKind.User && e.Text == "second after reset");
-
-        var freshStart = MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "new-run");
-        freshStart.Ts = DateTimeOffset.UtcNow.AddSeconds(1).ToUnixTimeMilliseconds();
-        bridge.RaiseAgent(freshStart);
         bridge.RaiseChat(new ChatMessageInfo
         {
             SessionKey = "main",
             Role = "assistant",
-            State = "final",
-            Text = "fresh assistant"
+            Text = "late trailing frame",
+            State = "delta"
         });
 
-        latest = snapshots[^1];
-        Assert.Contains(latest.Timelines["main"].Entries, e =>
-            e.Kind == ChatTimelineItemKind.Assistant && e.Text == "fresh assistant");
+        var timeline = (await provider.LoadAsync()).Timelines["main"];
+        var assistant = Assert.Single(timeline.Entries, e => e.Kind == ChatTimelineItemKind.Assistant);
+        Assert.Equal("final answer", assistant.Text);
+        Assert.False(assistant.IsStreaming);
+        Assert.False(timeline.TurnActive);
+        Assert.DoesNotContain(notifications, n => n.Kind == ChatProviderNotificationKind.TurnComplete);
     }
 
     [Fact]
-    public async Task SessionResetCompletion_LateUnknownLifecycleStartDoesNotReopenGate()
+    public async Task ChatMessageReceived_UserEcho_AttachesGatewayIdentityToExactLocalRow()
     {
+        // After sending a message locally, the SSE echo of that same text
+        // should be suppressed as a gateway echo while atomically moving the
+        // queued card into the transcript.
+        var tcs = new TaskCompletionSource();
         var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendBehavior = (_, _, _) => tcs.Task;
         await provider.LoadAsync();
-        bridge.RaiseSessionCommandCompleted(new SessionCommandResult
-        {
-            Method = "sessions.reset",
-            Ok = true,
-            Key = "main"
-        });
-
-        var staleStart = MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "old-run");
-        staleStart.Ts = DateTimeOffset.UtcNow.AddSeconds(1).ToUnixTimeMilliseconds();
-        bridge.RaiseAgent(staleStart);
-        bridge.RaiseAgent(MakeAgentEvent("assistant", """{"delta":"stale old run"}""", runId: "old-run"));
 
-        var latest = snapshots[^1];
-        Assert.Empty(latest.Timelines["main"].Entries);
+        _ = provider.SendMessageAsync("main", "hi");
+        snapshots.Clear(); // clear the snapshot from SendMessageAsync
 
-        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "new-run" });
-        await provider.SendMessageAsync("main", "after reset local");
-        var freshStart = MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "new-run");
-        freshStart.Ts = DateTimeOffset.UtcNow.AddSeconds(1).ToUnixTimeMilliseconds();
-        bridge.RaiseAgent(freshStart);
         bridge.RaiseChat(new ChatMessageInfo
         {
             SessionKey = "main",
-            Role = "assistant",
+            Role = "user",
+            Text = "hi",
             State = "final",
-            Text = "fresh response"
+            OpenClawId = "gateway-hi",
+            OpenClawSeq = 7,
         });
 
-        latest = snapshots[^1];
-        Assert.DoesNotContain(latest.Timelines["main"].Entries, e =>
-            e.Text.Contains("stale", StringComparison.Ordinal));
-        Assert.Contains(latest.Timelines["main"].Entries, e =>
-            e.Kind == ChatTimelineItemKind.Assistant && e.Text == "fresh response");
+        var timeline = Assert.Single(snapshots).Timelines["main"];
+        Assert.Single(timeline.Entries, e => e.Kind == ChatTimelineItemKind.User && e.Text == "hi");
+        Assert.Empty(GetQueuedMessages(snapshots[^1], "main"));
+        var user = Assert.Single(timeline.Entries, e => e.Kind == ChatTimelineItemKind.User);
+        var meta = provider.GetEntryMetadata("main")[user.Id];
+        Assert.Equal("gateway-hi", meta.GatewayMessageId);
+        Assert.Equal(7, meta.OpenClawSeq);
+        Assert.False(meta.IsLocalQueuedSend);
+        Assert.NotNull(meta.LocalQueuedMessageId);
+
+        tcs.SetResult();
     }
 
     [Fact]
-    public async Task SessionResetCompletion_DropsLatePreResetAgentEventAfterGateOpens()
+    public async Task ChatMessageReceived_UserEcho_ReconcilesExistingQueuedPromotionAfterPendingEchoExpires()
     {
         var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
         await provider.LoadAsync();
-        var preResetTs = DateTimeOffset.UtcNow.AddSeconds(-5).ToUnixTimeMilliseconds();
-        var resetTs = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
-        bridge.RaiseSessionCommandCompleted(new SessionCommandResult
+
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-d", Status = "started" });
+        await provider.SendMessageAsync("main", "d");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-d"));
+
+        var promoted = Assert.Single(snapshots[^1].Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "d");
+        var beforeMeta = provider.GetEntryMetadata("main");
+        Assert.True(beforeMeta[promoted.Id].IsLocalQueuedSend);
+        Assert.Null(beforeMeta[promoted.Id].OpenClawSeq);
+        snapshots.Clear();
+
+        // A non-identified local echo can consume the pending echo queue after
+        // lifecycle.start has already promoted the queued bubble. The later
+        // gateway-confirmed row still needs to reconcile onto that bubble.
+        bridge.RaiseChat(new ChatMessageInfo
         {
-            Method = "sessions.reset",
-            Ok = true,
-            Key = "main"
+            SessionKey = "main",
+            Role = "user",
+            Text = "d",
+            State = "final"
         });
+        Assert.Empty(snapshots);
 
-        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "new-run" });
-        await provider.SendMessageAsync("main", "after reset local");
-        var freshStart = MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "new-run");
-        freshStart.Ts = resetTs + 2_000;
-        bridge.RaiseAgent(freshStart);
         bridge.RaiseChat(new ChatMessageInfo
         {
             SessionKey = "main",
-            Role = "assistant",
+            Role = "user",
+            Text = "d",
             State = "final",
-            Text = "fresh response",
-            Ts = resetTs + 2_000
+            Ts = DateTimeOffset.UtcNow.AddSeconds(-7).ToUnixTimeMilliseconds(),
+            OpenClawId = "f3ed25d3",
+            OpenClawSeq = 9
         });
 
-        var staleAgent = MakeAgentEvent("assistant", """{"delta":"stale agent after gate"}""");
-        staleAgent.Ts = preResetTs;
-        bridge.RaiseAgent(staleAgent);
-
-        var latest = snapshots[^1];
-        Assert.Contains(latest.Timelines["main"].Entries, e =>
-            e.Kind == ChatTimelineItemKind.Assistant && e.Text == "fresh response");
-        Assert.DoesNotContain(latest.Timelines["main"].Entries, e =>
-            e.Text.Contains("stale agent", StringComparison.Ordinal));
+        var timeline = snapshots[^1].Timelines["main"];
+        var user = Assert.Single(timeline.Entries, e => e.Kind == ChatTimelineItemKind.User && e.Text == "d");
+        var afterMeta = provider.GetEntryMetadata("main");
+        Assert.Equal("f3ed25d3", afterMeta[user.Id].GatewayMessageId);
+        Assert.Equal(9, afterMeta[user.Id].OpenClawSeq);
+        Assert.False(afterMeta[user.Id].IsLocalQueuedSend);
     }
 
     [Fact]
-    public async Task SessionResetCompletion_LifecycleStartBeforeSendResultOpensAfterRunAccepted()
+    public async Task ChatMessageReceived_UserEcho_DoesNotReconcileStaleIdenticalConfirmedRemoteMessage()
     {
-        var sendGate = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
         var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
-        bridge.SendBehavior = (_, _, _) => sendGate.Task;
         await provider.LoadAsync();
-        bridge.RaiseSessionCommandCompleted(new SessionCommandResult
+
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-same", Status = "started" });
+        await provider.SendMessageAsync("main", "same");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-same"));
+
+        bridge.RaiseChat(new ChatMessageInfo
         {
-            Method = "sessions.reset",
-            Ok = true,
-            Key = "main"
+            SessionKey = "main",
+            Role = "user",
+            Text = "same",
+            State = "final"
         });
-
-        var sendTask = provider.SendMessageAsync("main", "after reset local");
-        var earlyStart = MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "new-run");
-        earlyStart.Ts = DateTimeOffset.UtcNow.AddSeconds(1).ToUnixTimeMilliseconds();
-        bridge.RaiseAgent(earlyStart);
-        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "new-run" });
-        sendGate.SetResult();
-        await sendTask;
+        snapshots.Clear();
 
         bridge.RaiseChat(new ChatMessageInfo
         {
             SessionKey = "main",
-            Role = "assistant",
+            Role = "user",
+            Text = "same",
             State = "final",
-            Text = "fresh response"
+            Ts = DateTimeOffset.UtcNow.AddMinutes(5).ToUnixTimeMilliseconds(),
+            OpenClawId = "remote-later",
+            OpenClawSeq = 50
         });
 
-        var latest = snapshots[^1];
-        Assert.Contains(latest.Timelines["main"].Entries, e =>
-            e.Kind == ChatTimelineItemKind.User && e.Text == "after reset local");
-        Assert.Contains(latest.Timelines["main"].Entries, e =>
-            e.Kind == ChatTimelineItemKind.Assistant && e.Text == "fresh response");
+        var users = snapshots[^1].Timelines["main"].Entries
+            .Where(e => e.Kind == ChatTimelineItemKind.User && e.Text == "same")
+            .ToArray();
+        Assert.Equal(2, users.Length);
+
+        var afterMeta = provider.GetEntryMetadata("main");
+        Assert.Contains(users, user =>
+            afterMeta[user.Id].IsLocalQueuedSend &&
+            afterMeta[user.Id].OpenClawSeq is null);
+        Assert.Contains(users, user =>
+            afterMeta[user.Id].GatewayMessageId == "remote-later" &&
+            afterMeta[user.Id].OpenClawSeq == 50 &&
+            !afterMeta[user.Id].IsLocalQueuedSend);
     }
 
     [Fact]
-    public async Task SessionResetCompletion_PreResetSendResultAfterResetDoesNotReopenGate()
+    public async Task SendMessageAsync_WhenGatewayThrows_DoesNotSuppressFutureRemoteUserEcho()
     {
-        var sendStarted = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
-        var sendGate = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
         var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
-        bridge.SendBehavior = (_, _, _) =>
-        {
-            sendStarted.TrySetResult();
-            return sendGate.Task;
-        };
+        bridge.SendBehavior = (_, _, _) => throw new InvalidOperationException("gateway down");
         await provider.LoadAsync();
 
-        var staleSendTask = provider.SendMessageAsync("main", "before reset");
-        await sendStarted.Task;
-        bridge.RaiseSessionCommandCompleted(new SessionCommandResult
-        {
-            Method = "sessions.reset",
-            Ok = true,
-            Key = "main"
-        });
-        snapshots.Clear();
+        await Assert.ThrowsAsync<InvalidOperationException>(() =>
+            provider.SendMessageAsync("main", "same text"));
 
-        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "old-run" });
-        sendGate.SetResult();
-        await staleSendTask;
+        bridge.SendBehavior = null;
+        snapshots.Clear();
 
-        var staleStart = MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "old-run");
-        staleStart.Ts = DateTimeOffset.UtcNow.AddSeconds(1).ToUnixTimeMilliseconds();
-        bridge.RaiseAgent(staleStart);
-        bridge.RaiseAgent(MakeAgentEvent("assistant", """{"delta":"stale old run"}""", runId: "old-run"));
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "user",
+            Text = "same text",
+            State = "final"
+        });
 
-        var latest = snapshots.Count > 0 ? snapshots[^1] : await provider.LoadAsync();
-        Assert.Empty(latest.Timelines["main"].Entries);
+        var timeline = snapshots[^1].Timelines["main"];
+        Assert.Equal(2, timeline.Entries.Count(e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "same text"));
     }
 
     [Fact]
-    public async Task SessionResetCompletion_PostResetSendWithoutRunIdCanOpenOnFreshLifecycleStart()
+    public async Task AgentEvent_ToolStart_AppendsToolCallEntry()
     {
         var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
         await provider.LoadAsync();
-        bridge.RaiseSessionCommandCompleted(new SessionCommandResult
-        {
-            Method = "sessions.reset",
+        snapshots.Clear();
+
+        bridge.RaiseAgent(MakeAgentEvent("tool",
+            """{"phase":"start","name":"powershell","args":{"command":"ls"}}"""));
+
+        var timeline = snapshots[^1].Timelines["main"];
+        var entry = Assert.Single(timeline.Entries);
+        Assert.Equal(ChatTimelineItemKind.ToolCall, entry.Kind);
+        Assert.Equal("powershell", entry.ToolName);
+        Assert.Equal("ls", entry.Text);
+        Assert.Equal(ChatToolCallStatus.InProgress, entry.ToolResult);
+    }
+
+    [Fact]
+    public async Task AgentEvent_ToolStartThenResult_MarksToolSuccess()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        await provider.LoadAsync();
+
+        bridge.RaiseAgent(MakeAgentEvent("tool",
+            """{"phase":"start","name":"grep","args":{"pattern":"foo"}}"""));
+        bridge.RaiseAgent(MakeAgentEvent("tool",
+            """{"phase":"result","name":"grep","args":{"pattern":"foo"}}"""));
+
+        var timeline = snapshots[^1].Timelines["main"];
+        var entry = Assert.Single(timeline.Entries);
+        Assert.Equal(ChatToolCallStatus.Success, entry.ToolResult);
+    }
+
+    [Fact]
+    public async Task AgentEvent_JobError_EmitsErrorEntry()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        await provider.LoadAsync();
+        snapshots.Clear();
+
+        var evt = MakeAgentEvent("job", """{"state":"error"}""");
+        evt.Summary = "kaboom";
+        bridge.RaiseAgent(evt);
+
+        var timeline = snapshots[^1].Timelines["main"];
+        Assert.Contains(timeline.Entries, e =>
+            e.Kind == ChatTimelineItemKind.Status && e.Text.Contains("kaboom"));
+    }
+
+    [Fact]
+    public async Task AgentEvent_JobError_DispatchesNextQueuedMessage()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-1", Status = "started" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-2", Status = "started" });
+        await provider.LoadAsync();
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+        snapshots.Clear();
+
+        await provider.SendMessageAsync("main", "first");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-1"));
+        await provider.SendMessageAsync("main", "second");
+
+        var evt = MakeAgentEvent("job", """{"state":"error"}""", runId: "run-1");
+        evt.Summary = "kaboom";
+        bridge.RaiseAgent(evt);
+
+        for (var i = 0; i < 20 && bridge.SentMessages.Count < 2; i++)
+            await Task.Delay(10);
+        await WaitForConditionAsync(() =>
+            GetQueuedMessages(snapshots[^1], "main").Count == 0 &&
+            snapshots[^1].Timelines["main"].Entries.Count(e =>
+                e.Kind == ChatTimelineItemKind.User && e.Text == "second") == 1);
+
+        Assert.Equal(new[] { "first", "second" }, bridge.SentMessages);
+        Assert.Empty(GetQueuedMessages(snapshots[^1], "main"));
+        Assert.Single(snapshots[^1].Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "second");
+    }
+
+    [Fact]
+    public async Task AgentEvent_JobDone_ClearsTurnActive()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        await provider.LoadAsync();
+        // Kick off a turn
+        _ = provider.SendMessageAsync("main", "hi");
+
+        bridge.RaiseAgent(MakeAgentEvent("job", """{"state":"done"}"""));
+
+        // Snapshot the timeline directly.
+        var snap = await provider.LoadAsync();
+        Assert.False(snap.Timelines["main"].TurnActive);
+    }
+
+    [Fact]
+    public async Task SessionsUpdated_RebuildsThreadsAndSeedsTimelines()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider();
+        await provider.LoadAsync();
+        snapshots.Clear();
+
+        bridge.RaiseSessions(new[]
+        {
+            new SessionInfo { Key = "main", IsMain = true, DisplayName = "Main" },
+            new SessionInfo { Key = "sub:abc", IsMain = false, DisplayName = "Sub" }
+        });
+
+        var snap = snapshots[^1];
+        Assert.Equal(2, snap.Threads.Length);
+        Assert.True(snap.Timelines.ContainsKey("main"));
+        Assert.True(snap.Timelines.ContainsKey("sub:abc"));
+        Assert.Equal("main", snap.DefaultThreadId);
+    }
+
+    [Fact]
+    public async Task LoadHistoryAsync_OrdersMessagesByOpenClawSequenceBeforeTimestamp()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.HistoryBehavior = _ => Task.FromResult(new ChatHistoryInfo
+        {
+            SessionKey = "main",
+            Messages = new[]
+            {
+                new ChatMessageInfo { SessionKey = "main", Role = "user", Text = "c", Ts = 1_000, OpenClawSeq = 3 },
+                new ChatMessageInfo { SessionKey = "main", Role = "user", Text = "a", Ts = 3_000, OpenClawSeq = 1 },
+                new ChatMessageInfo { SessionKey = "main", Role = "user", Text = "b", Ts = 2_000, OpenClawSeq = 2 },
+            }
+        });
+        await provider.LoadAsync();
+        snapshots.Clear();
+
+        await provider.LoadHistoryAsync("main");
+
+        var entries = snapshots[^1].Timelines["main"].Entries
+            .Where(e => e.Kind == ChatTimelineItemKind.User)
+            .Select(e => e.Text)
+            .ToArray();
+        Assert.Equal(new[] { "a", "b", "c" }, entries);
+    }
+
+    [Fact]
+    public async Task LoadHistoryAsync_KeepsGatewayOrderWhenOnlySomeRowsHaveOpenClawSequence()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.HistoryBehavior = _ => Task.FromResult(new ChatHistoryInfo
+        {
+            SessionKey = "main",
+            Messages = new[]
+            {
+                new ChatMessageInfo { SessionKey = "main", Role = "user", Text = "r", Ts = 1_000 },
+                new ChatMessageInfo { SessionKey = "main", Role = "user", Text = "s", Ts = 2_000 },
+                new ChatMessageInfo { SessionKey = "main", Role = "user", Text = "t", Ts = 500, OpenClawSeq = 1 },
+                new ChatMessageInfo { SessionKey = "main", Role = "user", Text = "u", Ts = 600, OpenClawSeq = 2 },
+            }
+        });
+        await provider.LoadAsync();
+        snapshots.Clear();
+
+        await provider.LoadHistoryAsync("main");
+
+        var entries = snapshots[^1].Timelines["main"].Entries
+            .Where(e => e.Kind == ChatTimelineItemKind.User)
+            .Select(e => e.Text)
+            .ToArray();
+        Assert.Equal(new[] { "r", "s", "t", "u" }, entries);
+    }
+
+    [Fact]
+    public async Task LoadHistoryAsync_DedupesQueuedLocalPromotionsWhenHistoryTimestampDiffers()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        await provider.LoadAsync();
+
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-a", Status = "started" });
+        await provider.SendMessageAsync("main", "a");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-a"));
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "user",
+            Text = "a",
+            State = "final",
+            OpenClawId = "gateway-a",
+            OpenClawSeq = 1,
+        });
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            Text = "a response",
+            State = "final"
+        });
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"end"}""", runId: "run-a"));
+
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-b", Status = "started" });
+        await provider.SendMessageAsync("main", "b");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-b"));
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "user",
+            Text = "b",
+            State = "final",
+            OpenClawId = "gateway-b",
+            OpenClawSeq = 2,
+        });
+
+        Assert.Equal(
+            new[] { "a", "b" },
+            snapshots[^1].Timelines["main"].Entries
+                .Where(e => e.Kind == ChatTimelineItemKind.User)
+                .Select(e => e.Text)
+                .ToArray());
+
+        bridge.HistoryBehavior = _ => Task.FromResult(new ChatHistoryInfo
+        {
+            SessionKey = "main",
+            Messages = new[]
+            {
+                new ChatMessageInfo
+                {
+                    SessionKey = "main",
+                    Role = "user",
+                    Text = "a",
+                    Ts = DateTimeOffset.UtcNow.AddMinutes(-5).ToUnixTimeMilliseconds(),
+                    OpenClawSeq = 1
+                },
+                new ChatMessageInfo
+                {
+                    SessionKey = "main",
+                    Role = "user",
+                    Text = "b",
+                    Ts = DateTimeOffset.UtcNow.AddMinutes(-4).ToUnixTimeMilliseconds(),
+                    OpenClawSeq = 2
+                },
+            }
+        });
+        snapshots.Clear();
+
+        await provider.LoadHistoryAsync("main");
+
+        var userTexts = snapshots[^1].Timelines["main"].Entries
+            .Where(e => e.Kind == ChatTimelineItemKind.User)
+            .Select(e => e.Text)
+            .ToArray();
+        Assert.Equal(new[] { "a", "b" }, userTexts);
+    }
+
+    [Fact]
+    public async Task LoadHistoryAsync_KeepsSecondIdenticalQueuedPromptWhenHistoryContainsOneMatch()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        await provider.LoadAsync();
+
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-same-1", Status = "started" });
+        await provider.SendMessageAsync("main", "same");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-same-1"));
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            Text = "first same response",
+            State = "final"
+        });
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"end"}""", runId: "run-same-1"));
+
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-same-2", Status = "started" });
+        await provider.SendMessageAsync("main", "same");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-same-2"));
+
+        bridge.HistoryBehavior = _ => Task.FromResult(new ChatHistoryInfo
+        {
+            SessionKey = "main",
+            Messages = new[]
+            {
+                new ChatMessageInfo
+                {
+                    SessionKey = "main",
+                    Role = "user",
+                    Text = "same",
+                    Ts = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
+                    OpenClawSeq = 1
+                },
+            }
+        });
+        snapshots.Clear();
+
+        await provider.LoadHistoryAsync("main");
+
+        var userTexts = snapshots[^1].Timelines["main"].Entries
+            .Where(e => e.Kind == ChatTimelineItemKind.User)
+            .Select(e => e.Text)
+            .ToArray();
+        Assert.Equal(new[] { "same", "same" }, userTexts);
+    }
+
+    [Fact]
+    public async Task LoadHistoryAsync_DoesNotDropFreshIdenticalLocalPromptForStaleHistoryRow()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-same", Status = "started" });
+        await provider.LoadAsync();
+
+        await provider.SendMessageAsync("main", "same");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-same"));
+        bridge.HistoryBehavior = _ => Task.FromResult(new ChatHistoryInfo
+        {
+            SessionKey = "main",
+            Messages = new[]
+            {
+                new ChatMessageInfo
+                {
+                    SessionKey = "main",
+                    Role = "user",
+                    Text = "same",
+                    Ts = DateTimeOffset.UtcNow.AddMinutes(-5).ToUnixTimeMilliseconds(),
+                },
+            }
+        });
+        snapshots.Clear();
+
+        await provider.LoadHistoryAsync("main");
+
+        Assert.Equal(2, snapshots[^1].Timelines["main"].Entries.Count(e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "same"));
+    }
+
+    [Fact]
+    public async Task SessionResetCompletion_ClearsThreadTimelineAndIgnoresStaleHistory()
+    {
+        var historyTcs = new TaskCompletionSource<ChatHistoryInfo>(TaskCreationOptions.RunContinuationsAsynchronously);
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.HistoryBehavior = _ => historyTcs.Task;
+        await provider.LoadAsync();
+        var historyTask = provider.LoadHistoryAsync("main");
+        await provider.SendMessageAsync("main", "hi");
+        snapshots.Clear();
+
+        bridge.RaiseSessionCommandCompleted(new SessionCommandResult
+        {
+            Method = "sessions.reset",
             Ok = true,
             Key = "main"
         });
 
-        bridge.SendResults.Enqueue(new ChatSendResult());
-        await provider.SendMessageAsync("main", "after reset local");
+        var resetSnapshot = snapshots[^1];
+        Assert.Empty(resetSnapshot.Timelines["main"].Entries);
+        Assert.True(resetSnapshot.Timelines["main"].HistoryLoaded);
+
+        historyTcs.SetResult(new ChatHistoryInfo
+        {
+            SessionKey = "main",
+            Messages = new[]
+            {
+                new ChatMessageInfo
+                {
+                    SessionKey = "main",
+                    Role = "assistant",
+                    Text = "old history",
+                    Ts = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds()
+                }
+            }
+        });
+        await historyTask;
+
+        var latest = snapshots[^1];
+        Assert.Empty(latest.Timelines["main"].Entries);
+        Assert.True(latest.Timelines["main"].HistoryLoaded);
+
+        await provider.SendMessageAsync("main", "after reset");
+
+        latest = snapshots[^1];
+        Assert.Single(latest.Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "after reset");
+        Assert.Empty(GetQueuedMessages(latest, "main"));
+
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "user",
+            Text = "after reset",
+            State = "final"
+        });
+
+        latest = snapshots[^1];
+        var entry = Assert.Single(latest.Timelines["main"].Entries);
+        Assert.Equal(ChatTimelineItemKind.User, entry.Kind);
+        Assert.Equal("after reset", entry.Text);
+    }
+
+    [Fact]
+    public async Task SessionResetCompletion_DropsLiveEventsFromPreResetSubmittedRun()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        var historyCalls = 0;
+        bridge.HistoryBehavior = _ => { historyCalls++; return Task.FromResult(new ChatHistoryInfo { SessionKey = "main" }); };
+        await provider.LoadAsync();
+        historyCalls = 0;
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "old-run"));
+        snapshots.Clear();
+
+        bridge.RaiseSessionCommandCompleted(new SessionCommandResult
+        {
+            Method = "sessions.reset",
+            Ok = true,
+            Key = "main"
+        });
+
+        bridge.RaiseAgent(MakeAgentEvent("assistant", """{"delta":"stale agent"}""", runId: "old-run"));
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            State = "final",
+            Text = "stale chat"
+        });
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"end"}""", runId: "old-run"));
+        for (var i = 0; i < 20 && historyCalls == 0; i++)
+            await Task.Delay(10);
+
+        var latest = snapshots[^1];
+        Assert.Empty(latest.Timelines["main"].Entries);
+        Assert.True(historyCalls > 0);
+
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "user",
+            Text = "new remote message",
+            Ts = DateTimeOffset.UtcNow.AddSeconds(1).ToUnixTimeMilliseconds()
+        });
+        var freshStart = MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "new-run");
+        freshStart.Ts = DateTimeOffset.UtcNow.AddSeconds(1).ToUnixTimeMilliseconds();
+        bridge.RaiseAgent(freshStart);
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "user",
+            Text = "new remote message",
+            Ts = DateTimeOffset.UtcNow.AddSeconds(1).ToUnixTimeMilliseconds()
+        });
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            State = "final",
+            Text = "new response"
+        });
+
+        latest = snapshots[^1];
+        Assert.Contains(latest.Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "new remote message");
+        Assert.Contains(latest.Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.Assistant && e.Text == "new response");
+    }
+
+    [Fact]
+    public async Task SessionResetCompletion_AbortsAndSuppressesLiveFramesFromPreResetSubmittedQueuedSend()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        var historyCalls = 0;
+        bridge.HistoryBehavior = _ => { historyCalls++; return Task.FromResult(new ChatHistoryInfo { SessionKey = "main" }); };
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-a", Status = "started" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-b", Status = "started" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-fresh", Status = "started" });
+        await provider.LoadAsync();
+        historyCalls = 0;
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+        snapshots.Clear();
+
+        await provider.SendMessageAsync("main", "a");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-a"));
+        await provider.SendMessageAsync("main", "b");
+        await provider.SendMessageAsync("main", "c");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"end"}""", runId: "run-a"));
+
+        await WaitForConditionAsync(() => bridge.SentMessages.Count >= 2);
+        Assert.Equal(new[] { "a", "b" }, bridge.SentMessages);
+
+        bridge.RaiseSessionCommandCompleted(new SessionCommandResult
+        {
+            Method = "sessions.reset",
+            Ok = true,
+            Key = "main"
+        });
+
+        var resetSnapshot = snapshots[^1];
+        Assert.Empty(resetSnapshot.Timelines["main"].Entries);
+        Assert.Empty(GetQueuedMessages(resetSnapshot, "main"));
+
+        var staleTs = DateTimeOffset.UtcNow.AddSeconds(1).ToUnixTimeMilliseconds();
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "user",
+            Text = "b",
+            Ts = staleTs
+        });
+        var staleStart = MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-b");
+        staleStart.Ts = staleTs;
+        bridge.RaiseAgent(staleStart);
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            State = "final",
+            Text = "stale response",
+            Ts = staleTs
+        });
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"end"}""", runId: "run-b"));
+
+        var latest = snapshots[^1];
+        Assert.Empty(latest.Timelines["main"].Entries);
+        Assert.Equal(new[] { "a", "b" }, bridge.SentMessages);
+        for (var i = 0; i < 20 && !bridge.AbortedRunIds.Contains("run-b"); i++)
+            await Task.Delay(10);
+        Assert.Contains("run-b", bridge.AbortedRunIds);
+        Assert.DoesNotContain("run-c", bridge.AbortedRunIds);
+        for (var i = 0; i < 20 && historyCalls == 0; i++)
+            await Task.Delay(10);
+        Assert.True(historyCalls > 0);
+
+        await provider.SendMessageAsync("main", "fresh");
+        var freshStart = MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-fresh");
+        freshStart.Ts = DateTimeOffset.UtcNow.AddSeconds(2).ToUnixTimeMilliseconds();
+        bridge.RaiseAgent(freshStart);
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            State = "final",
+            Text = "fresh response",
+            Ts = DateTimeOffset.UtcNow.AddSeconds(2).ToUnixTimeMilliseconds()
+        });
+
+        latest = snapshots[^1];
+        Assert.Contains(latest.Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.Assistant && e.Text == "fresh response");
+    }
+
+    [Fact]
+    public async Task SessionResetCompletion_ShowsPersistedSubmittedRunFromForcedHistoryReload()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        var historyCalls = 0;
+        var includePersisted = false;
+        bridge.HistoryBehavior = _ =>
+        {
+            historyCalls++;
+            return Task.FromResult(new ChatHistoryInfo
+            {
+                SessionKey = "main",
+                Messages = includePersisted
+                    ? new[]
+                    {
+                        new ChatMessageInfo
+                        {
+                            SessionKey = "main",
+                            Role = "user",
+                            Text = "b",
+                            State = "final"
+                        },
+                        new ChatMessageInfo
+                        {
+                            SessionKey = "main",
+                            Role = "assistant",
+                            Text = "persisted response",
+                            State = "final"
+                        }
+                    }
+                    : Array.Empty<ChatMessageInfo>()
+            });
+        };
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-a", Status = "started" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-b", Status = "started" });
+        await provider.LoadAsync();
+        historyCalls = 0;
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+        snapshots.Clear();
+
+        await provider.SendMessageAsync("main", "a");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-a"));
+        await provider.SendMessageAsync("main", "b");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"end"}""", runId: "run-a"));
+        await WaitForConditionAsync(() => bridge.SentMessages.Count >= 2);
+        Assert.Equal(new[] { "a", "b" }, bridge.SentMessages);
+
+        bridge.RaiseSessionCommandCompleted(new SessionCommandResult
+        {
+            Method = "sessions.reset",
+            Ok = true,
+            Key = "main"
+        });
+
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "user",
+            Text = "b",
+            Ts = DateTimeOffset.UtcNow.AddSeconds(1).ToUnixTimeMilliseconds()
+        });
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            State = "final",
+            Text = "live stale response",
+            Ts = DateTimeOffset.UtcNow.AddSeconds(1).ToUnixTimeMilliseconds()
+        });
+
+        Assert.Empty(snapshots[^1].Timelines["main"].Entries);
+
+        includePersisted = true;
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"end"}""", runId: "run-b"));
+        for (var i = 0; i < 20; i++)
+        {
+            if (historyCalls > 0 &&
+                snapshots[^1].Timelines["main"].Entries.Any(e =>
+                    e.Kind == ChatTimelineItemKind.Assistant &&
+                    e.Text == "persisted response"))
+            {
+                break;
+            }
+            await Task.Delay(10);
+        }
+
+        var latest = snapshots[^1];
+        Assert.Contains(latest.Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "b");
+        Assert.Contains(latest.Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.Assistant && e.Text == "persisted response");
+        Assert.DoesNotContain(latest.Timelines["main"].Entries, e => e.Text == "live stale response");
+    }
+
+    [Fact]
+    public async Task SessionResetCompletion_TimestamplessRemoteUserCanOpenGateViaHistoryBackfill()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.HistoryBehavior = _ => Task.FromResult(new ChatHistoryInfo
+        {
+            SessionKey = "main",
+            Messages = new[]
+            {
+                new ChatMessageInfo
+                {
+                    SessionKey = "main",
+                    Role = "user",
+                    Text = "remote no timestamp",
+                    Ts = 0
+                }
+            }
+        });
+        await provider.LoadAsync();
+        bridge.RaiseSessionCommandCompleted(new SessionCommandResult
+        {
+            Method = "sessions.reset",
+            Ok = true,
+            Key = "main"
+        });
+        snapshots.Clear();
+
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "user",
+            Text = "remote no timestamp",
+            Ts = 0
+        });
+
+        for (var i = 0; i < 20; i++)
+        {
+            if (snapshots.Count > 0 &&
+                snapshots[^1].Timelines["main"].Entries.Any(e =>
+                    e.Kind == ChatTimelineItemKind.User &&
+                    e.Text == "remote no timestamp"))
+            {
+                break;
+            }
+            await Task.Delay(10);
+        }
+
+        var freshStart = MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "remote-run");
+        freshStart.Ts = DateTimeOffset.UtcNow.AddSeconds(1).ToUnixTimeMilliseconds();
+        bridge.RaiseAgent(freshStart);
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            State = "final",
+            Text = "remote response"
+        });
+
+        var latest = snapshots[^1];
+        Assert.Contains(latest.Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "remote no timestamp");
+        Assert.Contains(latest.Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.Assistant && e.Text == "remote response");
+    }
+
+    [Fact]
+    public async Task SessionResetCompletion_LocalSendDoesNotReopenGateForStaleChatFrames()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        await provider.LoadAsync();
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "old-run"));
+        bridge.RaiseSessionCommandCompleted(new SessionCommandResult
+        {
+            Method = "sessions.reset",
+            Ok = true,
+            Key = "main"
+        });
+
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "new-run" });
+        await provider.SendMessageAsync("main", "after reset local");
+        snapshots.Clear();
+
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "user",
+            Text = "stale user echo"
+        });
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            State = "final",
+            Text = "stale assistant"
+        });
+
+        var latest = await provider.LoadAsync();
+        Assert.Single(latest.Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "after reset local");
+        Assert.Empty(GetQueuedMessages(latest, "main"));
+        Assert.DoesNotContain(latest.Timelines["main"].Entries, e =>
+            e.Text.Contains("stale", StringComparison.Ordinal));
+
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "new-run-2" });
+        await provider.SendMessageAsync("main", "second after reset");
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "user",
+            Text = "second after reset"
+        });
+
+        latest = await provider.LoadAsync();
+        Assert.Single(latest.Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "after reset local");
+        Assert.Equal("second after reset", Assert.Single(GetQueuedMessages(latest, "main")).Text);
+
+        var freshStart = MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "new-run");
+        freshStart.Ts = DateTimeOffset.UtcNow.AddSeconds(1).ToUnixTimeMilliseconds();
+        bridge.RaiseAgent(freshStart);
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            State = "final",
+            Text = "fresh assistant"
+        });
+
+        latest = snapshots[^1];
+        Assert.Contains(latest.Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.Assistant && e.Text == "fresh assistant");
+    }
+
+    [Fact]
+    public async Task SessionResetCompletion_LateUnknownLifecycleStartDoesNotReopenGate()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        await provider.LoadAsync();
+        bridge.RaiseSessionCommandCompleted(new SessionCommandResult
+        {
+            Method = "sessions.reset",
+            Ok = true,
+            Key = "main"
+        });
+
+        var staleStart = MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "old-run");
+        staleStart.Ts = DateTimeOffset.UtcNow.AddSeconds(1).ToUnixTimeMilliseconds();
+        bridge.RaiseAgent(staleStart);
+        bridge.RaiseAgent(MakeAgentEvent("assistant", """{"delta":"stale old run"}""", runId: "old-run"));
+
+        var latest = snapshots[^1];
+        Assert.Empty(latest.Timelines["main"].Entries);
+
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "new-run" });
+        await provider.SendMessageAsync("main", "after reset local");
+        var freshStart = MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "new-run");
+        freshStart.Ts = DateTimeOffset.UtcNow.AddSeconds(1).ToUnixTimeMilliseconds();
+        bridge.RaiseAgent(freshStart);
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            State = "final",
+            Text = "fresh response"
+        });
+
+        latest = snapshots[^1];
+        Assert.DoesNotContain(latest.Timelines["main"].Entries, e =>
+            e.Text.Contains("stale", StringComparison.Ordinal));
+        Assert.Contains(latest.Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.Assistant && e.Text == "fresh response");
+    }
+
+    [Fact]
+    public async Task SessionResetCompletion_DropsLatePreResetAgentEventAfterGateOpens()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        await provider.LoadAsync();
+        var preResetTs = DateTimeOffset.UtcNow.AddSeconds(-5).ToUnixTimeMilliseconds();
+        var resetTs = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
+        bridge.RaiseSessionCommandCompleted(new SessionCommandResult
+        {
+            Method = "sessions.reset",
+            Ok = true,
+            Key = "main"
+        });
+
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "new-run" });
+        await provider.SendMessageAsync("main", "after reset local");
+        var freshStart = MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "new-run");
+        freshStart.Ts = resetTs + 2_000;
+        bridge.RaiseAgent(freshStart);
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            State = "final",
+            Text = "fresh response",
+            Ts = resetTs + 2_000
+        });
+
+        var staleAgent = MakeAgentEvent("assistant", """{"delta":"stale agent after gate"}""");
+        staleAgent.Ts = preResetTs;
+        bridge.RaiseAgent(staleAgent);
+
+        var latest = snapshots[^1];
+        Assert.Contains(latest.Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.Assistant && e.Text == "fresh response");
+        Assert.DoesNotContain(latest.Timelines["main"].Entries, e =>
+            e.Text.Contains("stale agent", StringComparison.Ordinal));
+    }
+
+    [Fact]
+    public async Task SessionResetCompletion_LifecycleStartBeforeSendResultOpensAfterRunAccepted()
+    {
+        var sendGate = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendBehavior = (_, _, _) => sendGate.Task;
+        await provider.LoadAsync();
+        bridge.RaiseSessionCommandCompleted(new SessionCommandResult
+        {
+            Method = "sessions.reset",
+            Ok = true,
+            Key = "main"
+        });
+
+        var sendTask = provider.SendMessageAsync("main", "after reset local");
+        var earlyStart = MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "new-run");
+        earlyStart.Ts = DateTimeOffset.UtcNow.AddSeconds(1).ToUnixTimeMilliseconds();
+        bridge.RaiseAgent(earlyStart);
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "new-run" });
+        sendGate.SetResult();
+        await sendTask;
+
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            State = "final",
+            Text = "fresh response"
+        });
+
+        var latest = snapshots[^1];
+        Assert.Contains(latest.Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "after reset local");
+        Assert.Contains(latest.Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.Assistant && e.Text == "fresh response");
+    }
+
+    [Fact]
+    public async Task SessionResetCompletion_PreResetSendResultAfterResetDoesNotReopenGate()
+    {
+        var sendStarted = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        var sendGate = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendBehavior = (_, _, _) =>
+        {
+            sendStarted.TrySetResult();
+            return sendGate.Task;
+        };
+        await provider.LoadAsync();
+
+        var staleSendTask = provider.SendMessageAsync("main", "before reset");
+        await sendStarted.Task;
+        bridge.RaiseSessionCommandCompleted(new SessionCommandResult
+        {
+            Method = "sessions.reset",
+            Ok = true,
+            Key = "main"
+        });
+        snapshots.Clear();
+
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "old-run" });
+        sendGate.SetResult();
+        await staleSendTask;
+
+        Assert.Contains("old-run", bridge.AbortedRunIds);
+
+        var staleStart = MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "old-run");
+        staleStart.Ts = DateTimeOffset.UtcNow.AddSeconds(1).ToUnixTimeMilliseconds();
+        bridge.RaiseAgent(staleStart);
+        bridge.RaiseAgent(MakeAgentEvent("assistant", """{"delta":"stale old run"}""", runId: "old-run"));
+
+        var latest = snapshots.Count > 0 ? snapshots[^1] : await provider.LoadAsync();
+        Assert.Empty(latest.Timelines["main"].Entries);
+    }
+
+    [Fact]
+    public async Task SessionResetCompletion_PreResetSendAckDoesNotClearNewQueuedMessage()
+    {
+        var firstStarted = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        var firstGate = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        var secondGate = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        var sendCount = 0;
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendBehavior = (_, _, _) =>
+        {
+            sendCount++;
+            if (sendCount == 1)
+            {
+                firstStarted.TrySetResult();
+                return firstGate.Task;
+            }
+            return secondGate.Task;
+        };
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "old-run", Status = "started" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "new-run", Status = "started" });
+        await provider.LoadAsync();
+        snapshots.Clear();
+
+        var firstSend = provider.SendMessageAsync("main", "before reset");
+        await firstStarted.Task;
+        Assert.Single(snapshots[^1].Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "before reset");
+        Assert.Empty(GetQueuedMessages(snapshots[^1], "main"));
+
+        bridge.RaiseSessionCommandCompleted(new SessionCommandResult
+        {
+            Method = "sessions.reset",
+            Ok = true,
+            Key = "main"
+        });
+        Assert.Empty(GetQueuedMessages(snapshots[^1], "main"));
+
+        var secondSend = provider.SendMessageAsync("main", "after reset");
+        Assert.Single(snapshots[^1].Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "after reset");
+        Assert.Empty(GetQueuedMessages(snapshots[^1], "main"));
+
+        firstGate.SetResult();
+        await firstSend;
+
+        Assert.Single(snapshots[^1].Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "after reset");
+        Assert.Empty(GetQueuedMessages(snapshots[^1], "main"));
+
+        secondGate.SetResult();
+        await secondSend;
+
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "new-run"));
+        Assert.Empty(GetQueuedMessages(snapshots[^1], "main"));
+    }
+
+    [Fact]
+    public async Task SessionResetCompletion_PostResetSendWithoutRunIdCanOpenOnFreshLifecycleStart()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        await provider.LoadAsync();
+        bridge.RaiseSessionCommandCompleted(new SessionCommandResult
+        {
+            Method = "sessions.reset",
+            Ok = true,
+            Key = "main"
+        });
+
+        bridge.SendResults.Enqueue(new ChatSendResult());
+        await provider.SendMessageAsync("main", "after reset local");
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "user",
+            Text = "after reset local"
+        });
+
+        var freshStart = MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "gateway-run");
+        freshStart.Ts = DateTimeOffset.UtcNow.AddSeconds(1).ToUnixTimeMilliseconds();
+        bridge.RaiseAgent(freshStart);
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            State = "final",
+            Text = "fresh response"
+        });
+
+        var latest = snapshots[^1];
+        Assert.Contains(latest.Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "after reset local");
+        Assert.Contains(latest.Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.Assistant && e.Text == "fresh response");
+    }
+
+    [Fact]
+    public async Task SessionResetCompletion_NoRunFallbackIgnoresBufferedStartBeforeLocalSend()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        await provider.LoadAsync();
+        bridge.RaiseSessionCommandCompleted(new SessionCommandResult
+        {
+            Method = "sessions.reset",
+            Ok = true,
+            Key = "main"
+        });
+
+        var staleStart = MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "stale-run");
+        staleStart.Ts = DateTimeOffset.UtcNow.AddSeconds(1).ToUnixTimeMilliseconds();
+        bridge.RaiseAgent(staleStart);
+        bridge.SendResults.Enqueue(new ChatSendResult());
+        await provider.SendMessageAsync("main", "after reset local");
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "user",
+            Text = "after reset local"
+        });
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            State = "final",
+            Text = "stale response"
+        });
+
+        var latest = await provider.LoadAsync();
+        Assert.Single(latest.Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "after reset local");
+        Assert.DoesNotContain(latest.Timelines["main"].Entries, e =>
+            e.Text.Contains("stale", StringComparison.Ordinal));
+
+        var freshStart = MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "fresh-run");
+        freshStart.Ts = DateTimeOffset.UtcNow.AddSeconds(1).ToUnixTimeMilliseconds();
+        bridge.RaiseAgent(freshStart);
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            State = "final",
+            Text = "fresh response"
+        });
+
+        latest = snapshots[^1];
+        Assert.Contains(latest.Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.Assistant && e.Text == "fresh response");
+    }
+
+    [Fact]
+    public async Task SessionResetCompletion_PreResetSendFailureAfterResetDoesNotAppendError()
+    {
+        var sendStarted = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        var sendGate = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        var (bridge, provider, snapshots, notifications) = CreateProvider(new[] { MainSession() });
+        bridge.SendBehavior = (_, _, _) =>
+        {
+            sendStarted.TrySetResult();
+            return sendGate.Task;
+        };
+        await provider.LoadAsync();
+
+        var staleSendTask = provider.SendMessageAsync("main", "before reset");
+        await sendStarted.Task;
+        bridge.RaiseSessionCommandCompleted(new SessionCommandResult
+        {
+            Method = "sessions.reset",
+            Ok = true,
+            Key = "main"
+        });
+        snapshots.Clear();
+
+        sendGate.SetException(new InvalidOperationException("old send failed"));
+        await staleSendTask;
+
+        var latest = snapshots.Count > 0 ? snapshots[^1] : await provider.LoadAsync();
+        Assert.Empty(latest.Timelines["main"].Entries);
+        Assert.DoesNotContain(notifications, n => n.Message == "old send failed");
+    }
+
+    [Fact]
+    public async Task SessionResetCompletion_StaleSendFailureDoesNotClearCurrentEchoState()
+    {
+        var sendStarted = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        var staleSendGate = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        var sendCount = 0;
+        var (bridge, provider, snapshots, notifications) = CreateProvider(new[] { MainSession() });
+        bridge.SendBehavior = (_, _, _) =>
+        {
+            if (System.Threading.Interlocked.Increment(ref sendCount) == 1)
+            {
+                sendStarted.TrySetResult();
+                return staleSendGate.Task;
+            }
+
+            return Task.CompletedTask;
+        };
+        await provider.LoadAsync();
+
+        var staleSendTask = provider.SendMessageAsync("main", "same text");
+        await sendStarted.Task;
+        bridge.RaiseSessionCommandCompleted(new SessionCommandResult
+        {
+            Method = "sessions.reset",
+            Ok = true,
+            Key = "main"
+        });
+
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "new-run" });
+        await provider.SendMessageAsync("main", "same text");
+        snapshots.Clear();
+
+        staleSendGate.SetException(new InvalidOperationException("old send failed"));
+        await staleSendTask;
+
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "user",
+            Text = "same text"
+        });
+
+        var latest = await provider.LoadAsync();
+        Assert.Single(latest.Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "same text");
+        Assert.DoesNotContain(notifications, n => n.Message == "old send failed");
+
+        var freshStart = MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "new-run");
+        freshStart.Ts = DateTimeOffset.UtcNow.AddSeconds(1).ToUnixTimeMilliseconds();
+        bridge.RaiseAgent(freshStart);
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            State = "final",
+            Text = "fresh response"
+        });
+
+        latest = snapshots[^1];
+        Assert.Contains(latest.Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.Assistant && e.Text == "fresh response");
+    }
+
+    [Fact]
+    public async Task SessionResetCompletion_IgnoresInFlightRemoteUserBackfill()
+    {
+        var backfillStarted = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        var historyTcs = new TaskCompletionSource<ChatHistoryInfo>(TaskCreationOptions.RunContinuationsAsynchronously);
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.HistoryBehavior = _ =>
+        {
+            backfillStarted.TrySetResult();
+            return historyTcs.Task;
+        };
+        await provider.LoadAsync();
+
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-remote"));
+        await backfillStarted.Task;
+        bridge.RaiseSessionCommandCompleted(new SessionCommandResult
+        {
+            Method = "sessions.reset",
+            Ok = true,
+            Key = "main"
+        });
+        snapshots.Clear();
+
+        historyTcs.SetResult(new ChatHistoryInfo
+        {
+            SessionKey = "main",
+            Messages = new[]
+            {
+                new ChatMessageInfo
+                {
+                    SessionKey = "main",
+                    Role = "user",
+                    Text = "old remote user",
+                    Ts = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds()
+                }
+            }
+        });
+        await Task.Delay(100);
+
+        var latest = snapshots.Count > 0 ? snapshots[^1] : await provider.LoadAsync();
+        Assert.Empty(latest.Timelines["main"].Entries);
+    }
+
+    [Fact]
+    public async Task StatusChanged_IsReflectedInSnapshotConnectionLabel()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        await provider.LoadAsync();
+        snapshots.Clear();
+
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+        Assert.Equal("Connected", snapshots[^1].ConnectionStatus);
+
+        bridge.RaiseStatus(ConnectionStatus.Connecting);
+        Assert.Equal("Connecting…", snapshots[^1].ConnectionStatus);
+
+        bridge.RaiseStatus(ConnectionStatus.Disconnected);
+        Assert.Equal("Disconnected", snapshots[^1].ConnectionStatus);
+    }
+
+    [Fact]
+    public async Task PostDelegate_IsUsedForChangedAndNotifications()
+    {
+        var bridge = new FakeBridge { Sessions = new[] { MainSession() } };
+        var queued = new List<Action>();
+        var provider = new OpenClawChatDataProvider(bridge, post: a => queued.Add(a));
+        var snapshots = new List<ChatDataSnapshot>();
+        provider.Changed += (_, e) => snapshots.Add(e.Snapshot);
+
+        bridge.RaiseChat(new ChatMessageInfo { SessionKey = "main", Role = "assistant", Text = "x", State = "final" });
+
+        // Snapshot was queued, not invoked immediately.
+        Assert.Empty(snapshots);
+        Assert.NotEmpty(queued);
+        foreach (var a in queued) a();
+        Assert.NotEmpty(snapshots);
+    }
+
+    [Fact]
+    public async Task DisposeAsync_UnsubscribesAndStopsRaisingChanged()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        await provider.LoadAsync();
+
+        await provider.DisposeAsync();
+        snapshots.Clear();
+
+        bridge.RaiseChat(new ChatMessageInfo { SessionKey = "main", Role = "assistant", Text = "after dispose", State = "final" });
+        bridge.RaiseSessions(new[] { MainSession() });
+        bridge.RaiseStatus(ConnectionStatus.Disconnected);
+
+        Assert.Empty(snapshots);
+        Assert.True(bridge.IsDisposed);
+    }
+
+    [Fact]
+    public async Task DisposeAsync_WithQueuedFollowUp_DoesNotDrainNextMessage()
+    {
+        var (bridge, provider, _, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-1", Status = "started" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-2", Status = "started" });
+        await provider.LoadAsync();
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+
+        await provider.SendMessageAsync("main", "a");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-1"));
+        await provider.SendMessageAsync("main", "b");
+
+        Assert.Equal(new[] { "a" }, bridge.SentMessages);
+
+        await provider.DisposeAsync();
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"end"}""", runId: "run-1"));
+
+        Assert.Equal(new[] { "a" }, bridge.SentMessages);
+        Assert.True(bridge.IsDisposed);
+    }
+
+    [Fact]
+    public async Task LoadAsync_FreshInstall_NoSessions_ExposesNotReadyComposeTarget()
+    {
+        // Replaces the pre-refactor CreateThreadAsync tests: there is no
+        // create-thread RPC on the gateway, so the provider must never
+        // synthesize a thread out of thin air. Instead, the snapshot exposes
+        // a ChatComposeTarget that tells the UI whether/where to send.
+        var (_, provider, _, _) = CreateProvider();
+        var snap = await provider.LoadAsync();
+        Assert.Empty(snap.Threads);
+        Assert.False(snap.ComposeTarget.IsReady);
+        Assert.Null(snap.ComposeTarget.SessionKey);
+    }
+
+    [Fact]
+    public async Task LoadAsync_HandshakeKnown_ZeroSessions_ExposesReadyComposeTarget()
+    {
+        var (bridge, provider, _, _) = CreateProvider();
+        bridge.HasHandshakeSnapshot = true;
+        bridge.MainSessionKey = "agent:main:main";
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+        // Real gateways always send sessions.list after handshake (even an
+        // empty list). The provider waits for that signal before flipping
+        // ComposeTarget.IsReady on — otherwise the UI would briefly render
+        // the welcome zero-state for returning users mid-handshake.
+        bridge.RaiseSessions(Array.Empty<SessionInfo>());
+        var snap = await provider.LoadAsync();
+        Assert.Empty(snap.Threads);
+        Assert.True(snap.ComposeTarget.IsReady);
+        Assert.Equal("agent:main:main", snap.ComposeTarget.SessionKey);
+        Assert.Equal("agent:main:main", snap.DefaultThreadId);
+    }
+
+    [Fact]
+    public async Task LoadAsync_HandshakeComplete_NoSessionKey_SignalsIncompatibleGateway()
+    {
+        // When the gateway completes the handshake but does not advertise
+        // a mainSessionKey (or sessionDefaults.mainKey), the provider must surface
+        // an "Incompatible gateway" connection label and a NotReady compose target
+        // so the UI can show a clear "gateway update required" message rather than
+        // silently blocking send. Relates to issue #459.
+        var (bridge, provider, _, _) = CreateProvider();
+        bridge.HasHandshakeSnapshot = true;
+        bridge.MainSessionKey = null;   // incompatible gateway: no session key
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+        var snap = await provider.LoadAsync();
+
+        Assert.Equal("Incompatible gateway", snap.ConnectionStatus);
+        Assert.False(snap.ComposeTarget.IsReady);
+        Assert.Null(snap.ComposeTarget.SessionKey);
+    }
+
+    [Fact]
+    public async Task StatusChanged_IncompatibleGateway_IsReflectedInSnapshotConnectionLabel()
+    {
+        // Raise Connected with handshake present but no session key; the snapshot
+        // must use "Incompatible gateway" rather than the plain "Connected" label.
+        var (bridge, provider, snapshots, _) = CreateProvider();
+        bridge.HasHandshakeSnapshot = true;
+        bridge.MainSessionKey = null;
+        await provider.LoadAsync();
+        snapshots.Clear();
+
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+
+        Assert.NotEmpty(snapshots);
+        Assert.Equal("Incompatible gateway", snapshots[^1].ConnectionStatus);
+        Assert.False(snapshots[^1].ComposeTarget.IsReady);
+    }
+
+    [Fact]
+    public async Task LoadAsync_HandshakeKnownButSessionsNotYetReceived_ComposeTargetNotReady()
+    {
+        // Regression: in the brief window between hello-ok (HasHandshakeSnapshot
+        // becomes true) and the first sessions.list, the provider used to expose
+        // a ready ComposeTarget. The chat root would then synthesize a
+        // compose-only thread and render the welcome zero-state — even for a
+        // returning user whose real sessions were about to be delivered. The
+        // sessions-list-received gate keeps ComposeTarget.IsReady=false until
+        // the gateway has confirmed the session list for this connection.
+        var (bridge, provider, _, _) = CreateProvider();
+        bridge.HasHandshakeSnapshot = true;
+        bridge.MainSessionKey = "agent:main:main";
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+        // No RaiseSessions yet — simulate the mid-handshake window.
+        var snap = await provider.LoadAsync();
+        Assert.Empty(snap.Threads);
+        Assert.False(snap.ComposeTarget.IsReady);
+    }
+
+    [Fact]
+    public async Task StatusDisconnected_AfterSessionsReceived_ComposeTargetResetsToNotReady()
+    {
+        // The sessions-list-received gate must reset on disconnect — otherwise
+        // a reconnect would keep ComposeTarget ready against a stale session
+        // list from the previous connection.
+        var (bridge, provider, _, _) = CreateProvider();
+        bridge.HasHandshakeSnapshot = true;
+        bridge.MainSessionKey = "agent:main:main";
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+        bridge.RaiseSessions(Array.Empty<SessionInfo>());
+        Assert.True((await provider.LoadAsync()).ComposeTarget.IsReady);
+
+        bridge.RaiseStatus(ConnectionStatus.Disconnected);
+        var snap = await provider.LoadAsync();
+        Assert.False(snap.ComposeTarget.IsReady);
+    }
+
+    // ── Parity additions: streaming, lifecycle, reasoning, history, abort ──
+
+    [Fact]
+    public async Task AgentEvent_AssistantDelta_AppendsStreamingAssistantEntry()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        await provider.LoadAsync();
+        snapshots.Clear();
+
+        bridge.RaiseAgent(MakeAgentEvent("assistant", """{"delta":"Hel"}"""));
+        bridge.RaiseAgent(MakeAgentEvent("assistant", """{"delta":"lo "}"""));
+        bridge.RaiseAgent(MakeAgentEvent("assistant", """{"delta":"world"}"""));
+
+        var timeline = snapshots[^1].Timelines["main"];
+        var assistant = Assert.Single(timeline.Entries);
+        Assert.Equal(ChatTimelineItemKind.Assistant, assistant.Kind);
+        Assert.Equal("Hello world", assistant.Text);
+        Assert.True(assistant.IsStreaming);
+        Assert.True(timeline.TurnActive);
+    }
+
+    [Fact]
+    public async Task AgentEvent_AssistantContent_IsIgnoredBecauseChatMessageCarriesFinalText()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        await provider.LoadAsync();
+        snapshots.Clear();
+
+        bridge.RaiseAgent(MakeAgentEvent("assistant",
+            """{"content":"Final answer."}"""));
+
+        Assert.Empty(snapshots);
+    }
+
+    [Fact]
+    public async Task AgentEvent_LifecycleStart_SetsTurnActive()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        await provider.LoadAsync();
+        snapshots.Clear();
+
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle",
+            """{"phase":"start"}""", runId: "run-1"));
+
+        Assert.True(snapshots[^1].Timelines["main"].TurnActive);
+    }
+
+    [Fact]
+    public async Task AgentEvent_LifecycleEnd_ClearsTurnActiveAndAssistant()
+    {
+        var (bridge, provider, _, _) = CreateProvider(new[] { MainSession() });
+        await provider.LoadAsync();
+
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-1"));
+        bridge.RaiseAgent(MakeAgentEvent("assistant", """{"delta":"hi"}"""));
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"end"}""", runId: "run-1"));
+
+        var snap = await provider.LoadAsync();
+        var timeline = snap.Timelines["main"];
+        Assert.False(timeline.TurnActive);
+        Assert.Null(timeline.ActiveAssistantId);
+    }
+
+    [Fact]
+    public async Task AgentEvent_LifecycleError_AppendsErrorStatusEntry()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        await provider.LoadAsync();
+        snapshots.Clear();
+
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-1"));
+        var evt = MakeAgentEvent("lifecycle", """{"phase":"error","message":"model unreachable"}""", runId: "run-1");
+        bridge.RaiseAgent(evt);
+
+        var timeline = snapshots[^1].Timelines["main"];
+        Assert.False(timeline.TurnActive);
+        Assert.Contains(timeline.Entries, e =>
+            e.Kind == ChatTimelineItemKind.Status && e.Text.Contains("model unreachable"));
+    }
+
+    [Fact]
+    public async Task AgentEvent_LifecycleError_DispatchesNextQueuedMessage()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-1", Status = "started" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-2", Status = "started" });
+        await provider.LoadAsync();
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+        snapshots.Clear();
+
+        await provider.SendMessageAsync("main", "first");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-1"));
+        await provider.SendMessageAsync("main", "second");
+
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"error","message":"model unreachable"}""", runId: "run-1"));
+
+        await WaitForConditionAsync(() =>
+            bridge.SentMessages.Count >= 2 &&
+            GetQueuedMessages(snapshots[^1], "main").Count == 0 &&
+            snapshots[^1].Timelines["main"].Entries.Any(e =>
+                e.Kind == ChatTimelineItemKind.User && e.Text == "second"));
+
+        Assert.Equal(new[] { "first", "second" }, bridge.SentMessages);
+        Assert.Empty(GetQueuedMessages(snapshots[^1], "main"));
+        Assert.Single(snapshots[^1].Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "second");
+    }
+
+    [Fact]
+    public async Task AssistantFinal_DispatchesNextQueuedMessageWithoutLifecycleEnd()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-1", Status = "started" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-2", Status = "started" });
+        await provider.LoadAsync();
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+
+        await provider.SendMessageAsync("main", "first");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-1"));
+        await provider.SendMessageAsync("main", "second");
+
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            Text = "first response",
+            State = "final",
+        });
+        await WaitForConditionAsync(() =>
+            bridge.SentMessages.Count >= 2 &&
+            GetQueuedMessages(snapshots[^1], "main").Count == 0 &&
+            snapshots[^1].Timelines["main"].Entries.Any(e =>
+                e.Kind == ChatTimelineItemKind.User && e.Text == "second"));
+
+        Assert.Equal(new[] { "first", "second" }, bridge.SentMessages);
+        Assert.Empty(GetQueuedMessages(snapshots[^1], "main"));
+        Assert.Single(snapshots[^1].Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "second");
+    }
+
+    [Fact]
+    public async Task QueuedDuplicateUserMessages_AcceptedAckPromotesEachPromptByIdentity()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-1", Status = "started" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-2", Status = "started" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-3", Status = "started" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-4", Status = "started" });
+        await provider.LoadAsync();
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+        snapshots.Clear();
+
+        await provider.SendMessageAsync("main", "Hello");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-1"));
+        await provider.SendMessageAsync("main", "Hello");
+        await provider.SendMessageAsync("main", "Hello");
+        await provider.SendMessageAsync("main", "Hello");
+
+        Assert.Equal(new[] { "Hello" }, bridge.SentMessages);
+        Assert.Equal(3, GetQueuedMessages(snapshots[^1], "main").Count);
+
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            Text = "reply 1",
+            State = "final",
+        });
+        for (var i = 0; i < 20 && bridge.SentMessages.Count < 2; i++)
+            await Task.Delay(10);
+        await WaitForConditionAsync(() =>
+            GetQueuedMessages(snapshots[^1], "main").Count == 2 &&
+            snapshots[^1].Timelines["main"].Entries.Count(e =>
+                e.Kind == ChatTimelineItemKind.User && e.Text == "Hello") == 2);
+
+        Assert.Equal(2, bridge.SentMessages.Count);
+        Assert.Equal(2, GetQueuedMessages(snapshots[^1], "main").Count);
+        Assert.Equal(2, snapshots[^1].Timelines["main"].Entries.Count(e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "Hello"));
+
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            Text = "reply 2",
+            State = "final",
+        });
+        for (var i = 0; i < 20 && bridge.SentMessages.Count < 3; i++)
+            await Task.Delay(10);
+        await WaitForConditionAsync(() =>
+            GetQueuedMessages(snapshots[^1], "main").Count == 1 &&
+            snapshots[^1].Timelines["main"].Entries.Count(e =>
+                e.Kind == ChatTimelineItemKind.User && e.Text == "Hello") == 3);
+
+        Assert.Equal(3, bridge.SentMessages.Count);
+        Assert.Single(GetQueuedMessages(snapshots[^1], "main"));
+        Assert.Equal(3, snapshots[^1].Timelines["main"].Entries.Count(e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "Hello"));
+
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            Text = "reply 3",
+            State = "final",
+        });
+        for (var i = 0; i < 20 && bridge.SentMessages.Count < 4; i++)
+            await Task.Delay(10);
+        await WaitForConditionAsync(() =>
+            GetQueuedMessages(snapshots[^1], "main").Count == 0 &&
+            snapshots[^1].Timelines["main"].Entries.Count(e =>
+                e.Kind == ChatTimelineItemKind.User && e.Text == "Hello") == 4);
+
+        Assert.Equal(new[] { "Hello", "Hello", "Hello", "Hello" }, bridge.SentMessages);
+        Assert.Empty(GetQueuedMessages(snapshots[^1], "main"));
+        Assert.All(bridge.SentIdempotencyKeys, key => Assert.False(string.IsNullOrWhiteSpace(key)));
+        Assert.Equal(4, bridge.SentIdempotencyKeys.Distinct(StringComparer.Ordinal).Count());
+
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            Text = "reply 4",
+            State = "final",
+        });
+
+        Assert.Equal(
+            new[] { "Hello", "reply 1", "Hello", "reply 2", "Hello", "reply 3", "Hello", "reply 4" },
+            snapshots[^1].Timelines["main"].Entries
+                .Where(e => e.Kind is ChatTimelineItemKind.User or ChatTimelineItemKind.Assistant)
+                .Select(e => e.Text)
+                .ToArray());
+    }
+
+    [Fact]
+    public async Task CancelQueuedMessageAsync_RemovesOneDuplicateQueuedItemAndPreventsDispatch()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-active", Status = "started" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-next-1", Status = "started" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-next-2", Status = "started" });
+        await provider.LoadAsync();
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+        snapshots.Clear();
+
+        await provider.SendMessageAsync("main", "active");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-active"));
+        await provider.SendMessageAsync("main", "same");
+        await provider.SendMessageAsync("main", "same");
+        await provider.SendMessageAsync("main", "same");
+
+        var queuedBeforeCancel = GetQueuedMessages(snapshots[^1], "main");
+        Assert.Equal(3, queuedBeforeCancel.Count);
+        Assert.All(queuedBeforeCancel, message => Assert.Equal("same", message.Text));
+        var canceledId = queuedBeforeCancel[1].Id;
+
+        var canceled = await provider.CancelQueuedMessageAsync("main", canceledId);
+
+        var queuedAfterCancel = GetQueuedMessages(snapshots[^1], "main");
+        Assert.True(canceled);
+        Assert.Equal(2, queuedAfterCancel.Count);
+        Assert.DoesNotContain(queuedAfterCancel, message => message.Id == canceledId);
+        Assert.All(queuedAfterCancel, message => Assert.Equal("same", message.Text));
+
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            Text = "active response",
+            State = "final",
+        });
+        await WaitForConditionAsync(() =>
+            bridge.SentMessages.Count >= 2 &&
+            GetQueuedMessages(snapshots[^1], "main").Count == 1);
+
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            Text = "response 1",
+            State = "final",
+        });
+        await WaitForConditionAsync(() =>
+            bridge.SentMessages.Count >= 3 &&
+            GetQueuedMessages(snapshots[^1], "main").Count == 0);
+
+        Assert.Equal(new[] { "active", "same", "same" }, bridge.SentMessages);
+        Assert.Empty(GetQueuedMessages(snapshots[^1], "main"));
+        Assert.Equal(2, snapshots[^1].Timelines["main"].Entries.Count(e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "same"));
+    }
+
+    [Fact]
+    public async Task CancelQueuedMessageAsync_RemovesFailedQueuedCard()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-active", Status = "started" });
+        bridge.SendResults.Enqueue(new ChatSendResult { Status = "failed", Error = "gateway rejected queued send" });
+        await provider.LoadAsync();
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+
+        await provider.SendMessageAsync("main", "active");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-active"));
+        await provider.SendMessageAsync("main", "failed queued");
+
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            Text = "active response",
+            State = "final",
+        });
+        await WaitForConditionAsync(() => HasFailedQueuedMessage(snapshots[^1], "main", "failed queued"));
+
+        var failed = Assert.Single(GetQueuedMessages(snapshots[^1], "main"));
+        Assert.Equal(ChatQueuedMessageSendState.Failed, failed.SendState);
+
+        var canceled = await provider.CancelQueuedMessageAsync("main", failed.Id);
+
+        Assert.True(canceled);
+        Assert.Empty(GetQueuedMessages(snapshots[^1], "main"));
+        Assert.False(snapshots[^1].QueuedMessagesByThread?.ContainsKey("main") == true);
+    }
+
+    [Fact]
+    public async Task CancelQueuedMessageAsync_RemovingLastQueuedMessageClearsStaleDrainGuard()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-active", Status = "started" });
+        await provider.LoadAsync();
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+
+        await provider.SendMessageAsync("main", "active");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-active"));
+        await provider.SendMessageAsync("main", "queued");
+
+        var queued = Assert.Single(GetQueuedMessages(snapshots[^1], "main"));
+        var scheduled = GetQueuedDrainScheduledThreads(provider);
+        scheduled.Add("main");
+
+        var canceled = await provider.CancelQueuedMessageAsync("main", queued.Id);
+
+        Assert.True(canceled);
+        Assert.DoesNotContain("main", scheduled);
+        Assert.Empty(GetQueuedMessages(snapshots[^1], "main"));
+    }
+
+    [Fact]
+    public async Task CancelQueuedMessageAsync_ReturnsFalseForSendingQueuedCard()
+    {
+        var queuedSendStarted = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        var releaseQueuedSend = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-active", Status = "started" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-queued", Status = "started" });
+        bridge.SendBehavior = async (message, _, _) =>
+        {
+            if (message == "queued")
+            {
+                queuedSendStarted.SetResult();
+                await releaseQueuedSend.Task;
+            }
+        };
+        await provider.LoadAsync();
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+
+        await provider.SendMessageAsync("main", "active");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-active"));
+        await provider.SendMessageAsync("main", "queued");
+        var queued = Assert.Single(GetQueuedMessages(snapshots[^1], "main"));
+
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            Text = "active response",
+            State = "final",
+        });
+        await queuedSendStarted.Task.WaitAsync(TimeSpan.FromSeconds(5));
+        await WaitForConditionAsync(() =>
+            GetQueuedMessages(snapshots[^1], "main").Single().SendState == ChatQueuedMessageSendState.Sending);
+
+        var canceled = await provider.CancelQueuedMessageAsync("main", queued.Id);
+
+        Assert.False(canceled);
+        Assert.Equal(ChatQueuedMessageSendState.Sending, GetQueuedMessages(snapshots[^1], "main").Single().SendState);
+        releaseQueuedSend.SetResult();
+    }
+
+    [Fact]
+    public async Task CancelQueuedMessageAsync_DoesNotTurnActiveLocalRunIntoRemoteRun()
+    {
+        var historyCalls = 0;
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-active", Status = "started" });
+        bridge.HistoryBehavior = _ =>
+        {
+            historyCalls++;
+            return Task.FromResult(new ChatHistoryInfo { SessionKey = "main" });
+        };
+        await provider.LoadAsync();
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+
+        await provider.SendMessageAsync("main", "active");
+        await provider.SendMessageAsync("main", "queued");
+
+        var queued = Assert.Single(GetQueuedMessages(snapshots[^1], "main"));
+        await provider.CancelQueuedMessageAsync("main", queued.Id);
+
+        historyCalls = 0;
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-active"));
+        await Task.Delay(50);
+
+        Assert.Equal(0, historyCalls);
+    }
+
+    [Fact]
+    public async Task CancelQueuedMessageAsync_LastQueuedAfterLifecycleEndAllowsNextRemoteRunBackfill()
+    {
+        var historyCalls = 0;
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-active", Status = "started" });
+        bridge.HistoryBehavior = _ =>
+        {
+            historyCalls++;
+            return Task.FromResult(new ChatHistoryInfo
+            {
+                SessionKey = "main",
+                Messages = new[]
+                {
+                    new ChatMessageInfo { SessionKey = "main", Role = "user", Text = "remote prompt" },
+                },
+            });
+        };
+        await provider.LoadAsync();
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+
+        await provider.SendMessageAsync("main", "active");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-active"));
+        await provider.SendMessageAsync("main", "queued");
+        var queued = Assert.Single(GetQueuedMessages(snapshots[^1], "main"));
+
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"end"}""", runId: "run-active"));
+        var canceled = await provider.CancelQueuedMessageAsync("main", queued.Id);
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-remote"));
+
+        Assert.True(canceled);
+        await WaitForConditionAsync(() =>
+            historyCalls > 0 &&
+            snapshots[^1].Timelines["main"].Entries.Any(entry =>
+                entry.Kind == ChatTimelineItemKind.User && entry.Text == "remote prompt"));
+        Assert.True(historyCalls > 0);
+        Assert.Contains(snapshots[^1].Timelines["main"].Entries, entry =>
+            entry.Kind == ChatTimelineItemKind.User && entry.Text == "remote prompt");
+        Assert.DoesNotContain(snapshots[^1].Timelines["main"].Entries, entry =>
+            entry.Kind == ChatTimelineItemKind.User && entry.Text == "queued");
+    }
+
+    [Fact]
+    public async Task QueuedSend_LifecycleStartBeforeAck_PromotesByIdempotencyKey()
+    {
+        var secondSendGate = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        var sendCount = 0;
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-1", Status = "started" });
+        bridge.SendResults.Enqueue(new ChatSendResult { Status = "started" });
+        bridge.SendBehavior = (_, _, _) =>
+        {
+            sendCount++;
+            if (sendCount == 2)
+            {
+                var preAckRunId = Assert.Single(bridge.SentIdempotencyKeys.Skip(1));
+                Assert.False(string.IsNullOrWhiteSpace(preAckRunId));
+                bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: preAckRunId));
+                return secondSendGate.Task;
+            }
+
+            return Task.CompletedTask;
+        };
+        await provider.LoadAsync();
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+
+        await provider.SendMessageAsync("main", "first");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-1"));
+        await provider.SendMessageAsync("main", "second");
+
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            Text = "first response",
+            State = "final",
+        });
+        for (var i = 0; i < 20 && bridge.SentMessages.Count < 2; i++)
+            await Task.Delay(10);
+
+        Assert.Equal(new[] { "first", "second" }, bridge.SentMessages);
+        Assert.Empty(GetQueuedMessages(snapshots[^1], "main"));
+        Assert.Single(snapshots[^1].Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "second");
+
+        secondSendGate.SetResult();
+    }
+
+    [Fact]
+    public async Task QueuedSend_InFlightAckWithoutLifecycle_RequeuesAndRetriesSameIdempotencyKey()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-1", Status = "started" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-2", Status = "in_flight" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-2", Status = "started" });
+        await provider.LoadAsync();
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+
+        await provider.SendMessageAsync("main", "first");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-1"));
+        await provider.SendMessageAsync("main", "Hello");
+
+        var postFinalSnapshotStart = snapshots.Count;
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            Text = "first response",
+            State = "final",
+        });
+        for (var i = 0; i < 30 && bridge.SentMessages.Count < 2; i++)
+            await Task.Delay(10);
+
+        Assert.Equal(2, bridge.SentMessages.Count);
+        var firstAttemptKey = bridge.SentIdempotencyKeys[1];
+        ChatDataSnapshot? requeuedSnapshot = null;
+        for (var i = 0; i < 30 && requeuedSnapshot is null; i++)
+        {
+            requeuedSnapshot = snapshots
+                .Skip(postFinalSnapshotStart)
+                .LastOrDefault(snapshot =>
+                {
+                    var queued = GetQueuedMessages(snapshot, "main");
+                    return queued.Count == 1 &&
+                        queued[0].Text == "Hello" &&
+                        queued[0].SendState == ChatQueuedMessageSendState.Queued &&
+                        snapshot.Timelines["main"].Entries.Count(e =>
+                            e.Kind == ChatTimelineItemKind.User && e.Text == "Hello") == 0;
+                });
+            if (requeuedSnapshot is null)
+                await Task.Delay(10);
+        }
+
+        Assert.NotNull(requeuedSnapshot);
+
+        bridge.RaiseSessions(new[] { MainSession() });
+        for (var i = 0; i < 30 && bridge.SentMessages.Count < 3; i++)
+            await Task.Delay(10);
+
+        Assert.Equal(3, bridge.SentMessages.Count);
+        Assert.Equal(firstAttemptKey, bridge.SentIdempotencyKeys[2]);
+        Assert.Empty(GetQueuedMessages(snapshots[^1], "main"));
+        Assert.Single(snapshots[^1].Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "Hello");
+    }
+
+    [Fact]
+    public async Task CancelQueuedMessageAsync_DeferredInFlightRetryRemovesQueuedCardWithoutAbortOrResend()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-1", Status = "started" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-2", Status = "in_flight" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-2", Status = "started" });
+        await provider.LoadAsync();
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+
+        await provider.SendMessageAsync("main", "first");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-1"));
+        await provider.SendMessageAsync("main", "deferred");
+
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            Text = "first response",
+            State = "final",
+        });
+        await WaitForConditionAsync(() =>
+        {
+            var queued = GetQueuedMessages(snapshots[^1], "main");
+            return bridge.SentMessages.Count == 2 &&
+                queued.Count == 1 &&
+                queued[0].Text == "deferred" &&
+                queued[0].SendState == ChatQueuedMessageSendState.Queued;
+        });
+
+        var deferred = Assert.Single(GetQueuedMessages(snapshots[^1], "main"));
+        var canceled = await provider.CancelQueuedMessageAsync("main", deferred.Id);
+        await Task.Delay(250);
+
+        Assert.True(canceled);
+        Assert.Empty(GetQueuedMessages(snapshots[^1], "main"));
+        Assert.Equal(new[] { "first", "deferred" }, bridge.SentMessages);
+        Assert.Empty(bridge.AbortedRunIds);
+        Assert.DoesNotContain(snapshots[^1].Timelines["main"].Entries, entry =>
+            entry.Kind == ChatTimelineItemKind.User && entry.Text == "deferred");
+    }
+
+    [Fact]
+    public async Task QueuedSend_InFlightAckThenLifecycleBeforeRetry_PromotesWithoutResend()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-1", Status = "started" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-2", Status = "in_flight" });
+        await provider.LoadAsync();
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+        var lifecycleRaisedBeforeRetry = false;
+        provider.Changed += (_, e) =>
+        {
+            if (lifecycleRaisedBeforeRetry || bridge.SentMessages.Count != 2)
+                return;
+
+            var queued = GetQueuedMessages(e.Snapshot, "main");
+            if (queued.Count != 1 ||
+                queued[0].Text != "Hello" ||
+                queued[0].SendState != ChatQueuedMessageSendState.Queued)
+            {
+                return;
+            }
+
+            lifecycleRaisedBeforeRetry = true;
+            bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-2"));
+        };
+
+        await provider.SendMessageAsync("main", "first");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-1"));
+        await provider.SendMessageAsync("main", "Hello");
+
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            Text = "first response",
+            State = "final",
+        });
+        await WaitForConditionAsync(() =>
+        {
+            var queued = GetQueuedMessages(snapshots[^1], "main");
+            return bridge.SentMessages.Count == 2 &&
+                queued.Count == 1 &&
+                queued[0].Text == "Hello" &&
+                queued[0].SendState == ChatQueuedMessageSendState.Queued;
+        });
+
+        await WaitForConditionAsync(() =>
+            GetQueuedMessages(snapshots[^1], "main").Count == 0 &&
+            snapshots[^1].Timelines["main"].Entries.Count(e =>
+                e.Kind == ChatTimelineItemKind.User && e.Text == "Hello") == 1);
+
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "user",
+            Text = "Hello",
+        });
+        await Task.Delay(250);
+
+        Assert.True(lifecycleRaisedBeforeRetry);
+        Assert.Equal(2, bridge.SentMessages.Count);
+        Assert.Empty(GetQueuedMessages(snapshots[^1], "main"));
+        Assert.Single(snapshots[^1].Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "Hello");
+    }
+
+    [Fact]
+    public async Task QueuedSend_InFlightRetry_DoesNotSuppressLaterSameTextRemoteUserMessage()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-1", Status = "started" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-2", Status = "in_flight" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-2", Status = "started" });
+        await provider.LoadAsync();
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+
+        await provider.SendMessageAsync("main", "first");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-1"));
+        await provider.SendMessageAsync("main", "Hello");
+
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            Text = "first response",
+            State = "final",
+        });
+        await WaitForConditionAsync(() =>
+        {
+            var queued = GetQueuedMessages(snapshots[^1], "main");
+            return bridge.SentMessages.Count >= 2 &&
+                queued.Count == 1 &&
+                queued[0].Text == "Hello" &&
+                queued[0].SendState == ChatQueuedMessageSendState.Queued;
+        });
+
+        await WaitForConditionAsync(() =>
+            bridge.SentMessages.Count >= 3 &&
+            GetQueuedMessages(snapshots[^1], "main").Count == 0 &&
+            snapshots[^1].Timelines["main"].Entries.Count(entry =>
+                entry.Kind == ChatTimelineItemKind.User && entry.Text == "Hello") == 1,
+            attempts: 200);
+
+        Assert.Equal(bridge.SentIdempotencyKeys[1], bridge.SentIdempotencyKeys[2]);
+
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "user",
+            Text = "Hello",
+        });
+        Assert.Single(snapshots[^1].Timelines["main"].Entries, entry =>
+            entry.Kind == ChatTimelineItemKind.User && entry.Text == "Hello");
+
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "user",
+            Text = "Hello",
+        });
+        await WaitForConditionAsync(() =>
+            snapshots[^1].Timelines["main"].Entries.Count(entry =>
+                entry.Kind == ChatTimelineItemKind.User && entry.Text == "Hello") == 2);
+    }
+
+    [Fact]
+    public async Task QueuedSend_InFlightAckWhileDifferentRunActive_RequeuesWithoutPromoting()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-1", Status = "started" });
+        bridge.SendResults.Enqueue(new ChatSendResult { Status = "in_flight" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-2", Status = "started" });
+        var releaseInFlightAck = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        var delayFirstStuckAttempt = true;
+        bridge.SendBehavior = (message, _, _) =>
+        {
+            if (message == "stuck" && delayFirstStuckAttempt)
+            {
+                delayFirstStuckAttempt = false;
+                return releaseInFlightAck.Task;
+            }
+
+            return Task.CompletedTask;
+        };
+        await provider.LoadAsync();
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+
+        await provider.SendMessageAsync("main", "first");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-1"));
+        await provider.SendMessageAsync("main", "stuck");
+
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            Text = "first response",
+            State = "final",
+        });
+        await WaitForConditionAsync(() => bridge.SentMessages.Count >= 2);
+
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "remote-run"));
+        releaseInFlightAck.SetResult();
+        await WaitForConditionAsync(() =>
+        {
+            var queued = GetQueuedMessages(snapshots[^1], "main");
+            return queued.Count == 1 &&
+                queued[0].Text == "stuck" &&
+                queued[0].SendState == ChatQueuedMessageSendState.Queued &&
+                snapshots[^1].Timelines["main"].Entries.Count(e =>
+                    e.Kind == ChatTimelineItemKind.User && e.Text == "stuck") == 0;
+        });
+
+        Assert.Equal(2, bridge.SentMessages.Count);
+        var firstAttemptKey = bridge.SentIdempotencyKeys[1];
+
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"end"}""", runId: "remote-run"));
+        await WaitForConditionAsync(() =>
+            bridge.SentMessages.Count >= 3 &&
+            GetQueuedMessages(snapshots[^1], "main").Count == 0 &&
+            snapshots[^1].Timelines["main"].Entries.Count(e =>
+                e.Kind == ChatTimelineItemKind.User && e.Text == "stuck") == 1,
+            attempts: 200);
+
+        Assert.Equal(firstAttemptKey, bridge.SentIdempotencyKeys[2]);
+    }
+
+    [Fact]
+    public async Task DirectSend_InFlightAckWithoutLifecycle_FailsInsteadOfLeavingTurnActive()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendResults.Enqueue(new ChatSendResult { Status = "in_flight" });
+        await provider.LoadAsync();
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+
+        var ex = await Assert.ThrowsAsync<InvalidOperationException>(() =>
+            provider.SendMessageAsync("main", "direct"));
+
+        Assert.Contains("in_flight", ex.Message, StringComparison.Ordinal);
+        var snapshot = snapshots[^1];
+        Assert.False(snapshot.Timelines["main"].TurnActive);
+        Assert.Contains(snapshot.Timelines["main"].Entries, entry =>
+            entry.Kind == ChatTimelineItemKind.Status &&
+            entry.Text.Contains("in_flight", StringComparison.Ordinal));
+    }
+
+    [Fact]
+    public async Task DirectSend_TimeoutAckWithRunId_FailsInsteadOfPromoting()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-timeout", Status = "timeout" });
+        await provider.LoadAsync();
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+
+        var ex = await Assert.ThrowsAsync<InvalidOperationException>(() =>
+            provider.SendMessageAsync("main", "direct timeout"));
+
+        Assert.Contains("timeout", ex.Message, StringComparison.Ordinal);
+        var snapshot = snapshots[^1];
+        Assert.False(snapshot.Timelines["main"].TurnActive);
+        Assert.Empty(GetQueuedMessages(snapshot, "main"));
+        Assert.Contains(snapshot.Timelines["main"].Entries, entry =>
+            entry.Kind == ChatTimelineItemKind.Status &&
+            entry.Text.Contains("timeout", StringComparison.Ordinal));
+    }
+
+    [Fact]
+    public async Task QueuedSend_TimeoutAckWithRunId_KeepsFailedQueuedMessage()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-1", Status = "started" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-timeout", Status = "timeout" });
+        await provider.LoadAsync();
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+
+        await provider.SendMessageAsync("main", "first");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-1"));
+        await provider.SendMessageAsync("main", "queued timeout");
+
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            Text = "first response",
+            State = "final",
+        });
+        await WaitForConditionAsync(() => HasFailedQueuedMessage(snapshots[^1], "main", "queued timeout"));
+
+        var failed = Assert.Single(GetQueuedMessages(snapshots[^1], "main"));
+        Assert.Equal("queued timeout", failed.Text);
+        Assert.Equal(ChatQueuedMessageSendState.Failed, failed.SendState);
+        Assert.Contains("timeout", failed.ErrorText, StringComparison.Ordinal);
+        Assert.Equal(new[] { "first", "queued timeout" }, bridge.SentMessages);
+        Assert.DoesNotContain(snapshots[^1].Timelines["main"].Entries, entry =>
+            entry.Kind == ChatTimelineItemKind.User &&
+            entry.Text == "queued timeout");
+    }
+
+    [Fact]
+    public async Task SendMessageAsync_FailedQueuedCardDoesNotForceNextSendToQueue()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-1", Status = "started" });
+        bridge.SendResults.Enqueue(new ChatSendResult { Status = "failed", Error = "queued failed" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-3", Status = "started" });
+        await provider.LoadAsync();
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+
+        await provider.SendMessageAsync("main", "first");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-1"));
+        await provider.SendMessageAsync("main", "failed queued");
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            Text = "first response",
+            State = "final",
+        });
+        await WaitForConditionAsync(() => HasFailedQueuedMessage(snapshots[^1], "main", "failed queued"));
+
+        var beforeNextSendSnapshotCount = snapshots.Count;
+        await provider.SendMessageAsync("main", "after failure");
+
+        var queued = GetQueuedMessages(snapshots[^1], "main");
+        Assert.Single(queued, message =>
+            message.Text == "failed queued" &&
+            message.SendState == ChatQueuedMessageSendState.Failed);
+        Assert.DoesNotContain(snapshots.Skip(beforeNextSendSnapshotCount), snapshot =>
+            GetQueuedMessages(snapshot, "main").Any(message => message.Text == "after failure"));
+        Assert.Contains(snapshots[^1].Timelines["main"].Entries, entry =>
+            entry.Kind == ChatTimelineItemKind.User &&
+            entry.Text == "after failure");
+    }
+
+    [Fact]
+    public async Task QueuedSend_RepeatedInFlightAckWithoutLifecycle_EventuallyFails()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-1", Status = "started" });
+        for (var i = 0; i < 13; i++)
+            bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-stuck", Status = "in_flight" });
+        await provider.LoadAsync();
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+
+        await provider.SendMessageAsync("main", "first");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-1"));
+        await provider.SendMessageAsync("main", "stuck");
+
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            Text = "first response",
+            State = "final",
+        });
+        await WaitForConditionAsync(() => bridge.SentMessages.Count >= 2);
+
+        for (var i = 0; i < 20 && !HasFailedQueuedMessage(snapshots[^1], "main", "stuck"); i++)
+        {
+            bridge.RaiseSessions(new[] { MainSession() });
+            await Task.Delay(10);
+        }
+        await WaitForConditionAsync(() => HasFailedQueuedMessage(snapshots[^1], "main", "stuck"), attempts: 1000);
+
+        var failed = Assert.Single(GetQueuedMessages(snapshots[^1], "main"));
+        Assert.Equal("stuck", failed.Text);
+        Assert.Equal(ChatQueuedMessageSendState.Failed, failed.SendState);
+        Assert.Contains("in_flight", failed.ErrorText, StringComparison.Ordinal);
+        Assert.Single(bridge.SentIdempotencyKeys.Skip(1).Distinct(StringComparer.Ordinal));
+        Assert.Single(snapshots[^1].Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.Status &&
+            e.Text.Contains("in_flight", StringComparison.Ordinal));
+    }
+
+    [Fact]
+    public async Task QueuedSend_AckPromotionKeepsRunMappingUntilTerminalCleanup()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-1", Status = "started" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-2", Status = "started" });
+        await provider.LoadAsync();
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+
+        await provider.SendMessageAsync("main", "first");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-1"));
+        await provider.SendMessageAsync("main", "second");
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            Text = "first response",
+            State = "final",
+        });
+        for (var i = 0; i < 20 && bridge.SentMessages.Count < 2; i++)
+            await Task.Delay(10);
+        await WaitForConditionAsync(() => GetQueuedMessages(snapshots[^1], "main").Count == 0);
+
+        Assert.Empty(GetQueuedMessages(snapshots[^1], "main"));
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-2"));
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"end"}""", runId: "run-2"));
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            Text = "second response",
+            State = "final",
+        });
+
+        Assert.Contains(snapshots[^1].Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.Assistant && e.Text == "second response");
+    }
+
+    [Fact]
+    public async Task IdentitylessIdenticalAssistant_DropsBeforeQueuedUserBoundaryButAllowsCurrentRunResponse()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-1", Status = "started" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-2", Status = "started" });
+        await provider.LoadAsync();
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+
+        await provider.SendMessageAsync("main", "first");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-1"));
+        await provider.SendMessageAsync("main", "second");
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            Text = "OK",
+            State = "final",
+        });
+        for (var i = 0; i < 20 && bridge.SentMessages.Count < 2; i++)
+            await Task.Delay(10);
+        await WaitForConditionAsync(() => GetQueuedMessages(snapshots[^1], "main").Count == 0);
+
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            Text = "OK",
+            State = "final",
+        });
+
+        Assert.Empty(GetQueuedMessages(snapshots[^1], "main"));
+        Assert.Equal(
+            new[] { "first", "OK", "second" },
+            snapshots[^1].Timelines["main"].Entries
+                .Where(e => e.Kind is ChatTimelineItemKind.User or ChatTimelineItemKind.Assistant)
+                .Select(e => e.Text)
+                .ToArray());
+
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-2"));
+
+        var entries = snapshots[^1].Timelines["main"].Entries;
+        Assert.Empty(GetQueuedMessages(snapshots[^1], "main"));
+        Assert.Equal(
+            new[] { "first", "OK", "second" },
+            entries
+                .Where(e => e.Kind is ChatTimelineItemKind.User or ChatTimelineItemKind.Assistant)
+                .Select(e => e.Text)
+                .ToArray());
+
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            Text = "OK",
+            State = "final",
+        });
+
+        Assert.Equal(
+            new[] { "first", "OK", "second", "OK" },
+            snapshots[^1].Timelines["main"].Entries
+                .Where(e => e.Kind is ChatTimelineItemKind.User or ChatTimelineItemKind.Assistant)
+                .Select(e => e.Text)
+                .ToArray());
+    }
+
+    [Fact]
+    public async Task QueuedReplies_IgnoreIdentitylessRetransmitsAndStayMatchedToPrompts()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-a", Status = "started" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-b", Status = "started" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-c", Status = "started" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-d", Status = "started" });
+        await provider.LoadAsync();
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+        snapshots.Clear();
+
+        await provider.SendMessageAsync("main", "a");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-a"));
+        await provider.SendMessageAsync("main", "b");
+        await provider.SendMessageAsync("main", "c");
+        await provider.SendMessageAsync("main", "d");
+
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            Text = "ack - a",
+            State = "final",
+        });
+        for (var i = 0; i < 20 && bridge.SentMessages.Count < 2; i++)
+            await Task.Delay(10);
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            Text = "ack - a",
+            State = "final",
+        });
+
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-b"));
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            Text = "ack - b",
+            State = "final",
+        });
+        for (var i = 0; i < 20 && bridge.SentMessages.Count < 3; i++)
+            await Task.Delay(10);
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            Text = "ack - b",
+            State = "final",
+        });
+
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-c"));
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            Text = "ack - c",
+            State = "final",
+        });
+        for (var i = 0; i < 20 && bridge.SentMessages.Count < 4; i++)
+            await Task.Delay(10);
+        await WaitForConditionAsync(() => GetQueuedMessages(snapshots[^1], "main").Count == 0);
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            Text = "ack - c",
+            State = "final",
+        });
+
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-d"));
         bridge.RaiseChat(new ChatMessageInfo
         {
             SessionKey = "main",
-            Role = "user",
-            Text = "after reset local"
+            Role = "assistant",
+            Text = "ack - d",
+            State = "final",
         });
 
-        var freshStart = MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "gateway-run");
-        freshStart.Ts = DateTimeOffset.UtcNow.AddSeconds(1).ToUnixTimeMilliseconds();
-        bridge.RaiseAgent(freshStart);
+        Assert.Equal(new[] { "a", "b", "c", "d" }, bridge.SentMessages);
+        Assert.Empty(GetQueuedMessages(snapshots[^1], "main"));
+        Assert.Equal(
+            new[] { "a", "ack - a", "b", "ack - b", "c", "ack - c", "d", "ack - d" },
+            snapshots[^1].Timelines["main"].Entries
+                .Where(e => e.Kind is ChatTimelineItemKind.User or ChatTimelineItemKind.Assistant)
+                .Select(e => e.Text)
+                .ToArray());
+    }
+
+    [Fact]
+    public async Task DroppedIdentitylessAssistant_IsNotReplayedAfterSendingPromptFails()
+    {
+        var secondSendGate = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        var sendCount = 0;
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-1", Status = "started" });
+        bridge.SendResults.Enqueue(new ChatSendResult { Status = "failed", Error = "boom" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-3", Status = "started" });
+        bridge.SendBehavior = (_, _, _) =>
+        {
+            sendCount++;
+            return sendCount == 2 ? secondSendGate.Task : Task.CompletedTask;
+        };
+        await provider.LoadAsync();
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+
+        await provider.SendMessageAsync("main", "first");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-1"));
+        await provider.SendMessageAsync("main", "second");
+        await provider.SendMessageAsync("main", "third");
+
         bridge.RaiseChat(new ChatMessageInfo
         {
             SessionKey = "main",
             Role = "assistant",
+            Text = "OK",
             State = "final",
-            Text = "fresh response"
         });
+        for (var i = 0; i < 20 && bridge.SentMessages.Count < 2; i++)
+            await Task.Delay(10);
 
-        var latest = snapshots[^1];
-        Assert.Contains(latest.Timelines["main"].Entries, e =>
-            e.Kind == ChatTimelineItemKind.User && e.Text == "after reset local");
-        Assert.Contains(latest.Timelines["main"].Entries, e =>
-            e.Kind == ChatTimelineItemKind.Assistant && e.Text == "fresh response");
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            Text = "OK",
+            State = "final",
+        });
+
+        Assert.Single(snapshots[^1].Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.Assistant && e.Text == "OK");
+
+        secondSendGate.SetResult();
+        for (var i = 0; i < 20 && bridge.SentMessages.Count < 3; i++)
+            await Task.Delay(10);
+
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-3"));
+
+        Assert.Single(snapshots[^1].Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.Assistant && e.Text == "OK");
     }
 
     [Fact]
-    public async Task SessionResetCompletion_NoRunFallbackIgnoresBufferedStartBeforeLocalSend()
+    public async Task IdentifiedDuplicateAssistant_DoesNotPromoteNextQueuedMessage()
     {
         var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-1", Status = "started" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-2", Status = "started" });
         await provider.LoadAsync();
-        bridge.RaiseSessionCommandCompleted(new SessionCommandResult
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+
+        await provider.SendMessageAsync("main", "first");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-1"));
+        await provider.SendMessageAsync("main", "second");
+        var firstFinal = new ChatMessageInfo
         {
-            Method = "sessions.reset",
-            Ok = true,
-            Key = "main"
+            SessionKey = "main",
+            Role = "assistant",
+            Text = "OK",
+            State = "final",
+            OpenClawId = "assistant-1",
+            OpenClawSeq = 10,
+        };
+        bridge.RaiseChat(firstFinal);
+        for (var i = 0; i < 20 && bridge.SentMessages.Count < 2; i++)
+            await Task.Delay(10);
+
+        bridge.RaiseChat(firstFinal);
+
+        Assert.Empty(GetQueuedMessages(snapshots[^1], "main"));
+        Assert.Single(snapshots[^1].Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.Assistant && e.Text == "OK");
+        Assert.Single(snapshots[^1].Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "second");
+
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-2"));
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            Text = "cumulative prefix\nOK",
+            State = "final",
+            OpenClawId = "assistant-1",
+            OpenClawSeq = 10,
         });
 
-        var staleStart = MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "stale-run");
-        staleStart.Ts = DateTimeOffset.UtcNow.AddSeconds(1).ToUnixTimeMilliseconds();
-        bridge.RaiseAgent(staleStart);
-        bridge.SendResults.Enqueue(new ChatSendResult());
-        await provider.SendMessageAsync("main", "after reset local");
+        Assert.True(snapshots[^1].Timelines["main"].TurnActive);
+        Assert.Empty(GetQueuedMessages(snapshots[^1], "main"));
+        Assert.Single(snapshots[^1].Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.Assistant && e.Text == "OK");
+        Assert.DoesNotContain(snapshots[^1].Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.Assistant && e.Text.Contains("cumulative prefix"));
+        Assert.Single(snapshots[^1].Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "second");
+    }
+
+    [Fact]
+    public async Task AssistantFinal_ClearsLocalTurnStateForNextRemoteLifecycleStart()
+    {
+        var historyCalls = 0;
+        var (bridge, provider, _, _) = CreateProvider(new[] { MainSession() });
+        bridge.HistoryBehavior = _ =>
+        {
+            historyCalls++;
+            return Task.FromResult(new ChatHistoryInfo
+            {
+                SessionKey = "main",
+                Messages = new[]
+                {
+                    new ChatMessageInfo { SessionKey = "main", Role = "user", Text = "remote prompt" },
+                },
+            });
+        };
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-local", Status = "started" });
+        await provider.LoadAsync();
+
+        await provider.SendMessageAsync("main", "local prompt");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-local"));
         bridge.RaiseChat(new ChatMessageInfo
         {
             SessionKey = "main",
-            Role = "user",
-            Text = "after reset local"
+            Role = "assistant",
+            Text = "local response",
+            State = "final",
         });
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-remote"));
+        for (var i = 0; i < 20 && historyCalls == 0; i++)
+            await Task.Delay(10);
+
+        Assert.True(historyCalls > 0);
+    }
+
+    [Fact]
+    public async Task AssistantRetransmit_WithNewGatewayIdStillMatchesPriorSequenceOnlyFrame()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        await provider.LoadAsync();
+
         bridge.RaiseChat(new ChatMessageInfo
         {
             SessionKey = "main",
             Role = "assistant",
+            Text = "stable response",
             State = "final",
-            Text = "stale response"
+            OpenClawSeq = 10,
         });
+        snapshots.Clear();
 
-        var latest = await provider.LoadAsync();
-        Assert.Single(latest.Timelines["main"].Entries, e =>
-            e.Kind == ChatTimelineItemKind.User && e.Text == "after reset local");
-        Assert.DoesNotContain(latest.Timelines["main"].Entries, e =>
-            e.Text.Contains("stale", StringComparison.Ordinal));
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "assistant",
+            Text = "stable response",
+            State = "final",
+            OpenClawId = "message-10",
+            OpenClawSeq = 10,
+        });
 
-        var freshStart = MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "fresh-run");
-        freshStart.Ts = DateTimeOffset.UtcNow.AddSeconds(1).ToUnixTimeMilliseconds();
-        bridge.RaiseAgent(freshStart);
+        Assert.Empty(snapshots);
         bridge.RaiseChat(new ChatMessageInfo
         {
             SessionKey = "main",
             Role = "assistant",
+            Text = "cumulative prefix\nstable response",
             State = "final",
-            Text = "fresh response"
+            OpenClawId = "message-10",
+            OpenClawSeq = 10,
         });
 
-        latest = snapshots[^1];
-        Assert.Contains(latest.Timelines["main"].Entries, e =>
-            e.Kind == ChatTimelineItemKind.Assistant && e.Text == "fresh response");
+        Assert.Empty(snapshots);
+        var current = await provider.LoadAsync();
+        Assert.Single(current.Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.Assistant && e.Text == "stable response");
     }
 
     [Fact]
-    public async Task SessionResetCompletion_PreResetSendFailureAfterResetDoesNotAppendError()
+    public async Task AgentEvent_ReasoningDelta_AccumulatesReasoningEntry()
     {
-        var sendStarted = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
-        var sendGate = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
-        var (bridge, provider, snapshots, notifications) = CreateProvider(new[] { MainSession() });
-        bridge.SendBehavior = (_, _, _) =>
-        {
-            sendStarted.TrySetResult();
-            return sendGate.Task;
-        };
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
         await provider.LoadAsync();
+        snapshots.Clear();
 
-        var staleSendTask = provider.SendMessageAsync("main", "before reset");
-        await sendStarted.Task;
-        bridge.RaiseSessionCommandCompleted(new SessionCommandResult
-        {
-            Method = "sessions.reset",
-            Ok = true,
-            Key = "main"
-        });
+        bridge.RaiseAgent(MakeAgentEvent("reasoning", """{"delta":"thinking… "}"""));
+        bridge.RaiseAgent(MakeAgentEvent("reasoning", """{"delta":"step 2."}"""));
+
+        var timeline = snapshots[^1].Timelines["main"];
+        var entry = Assert.Single(timeline.Entries);
+        Assert.Equal(ChatTimelineItemKind.Reasoning, entry.Kind);
+        Assert.Equal("thinking… step 2.", entry.Text);
+    }
+
+    [Fact]
+    public async Task AgentEvent_ReasoningItemEnd_StartsFreshReasoningBubble()
+    {
+        // Regression: when the model reasons → tool → reasons again within
+        // a single turn, the second reasoning pass must render as its own
+        // bubble. The gateway brackets each pass with
+        // stream:"item", kind:"reasoning", phase:"start|end" — without
+        // honoring the end marker the second pass concatenates into the
+        // first bubble instead of replacing it.
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        await provider.LoadAsync();
         snapshots.Clear();
 
-        sendGate.SetException(new InvalidOperationException("old send failed"));
-        await staleSendTask;
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-1"));
+        bridge.RaiseAgent(MakeAgentEvent("reasoning", """{"delta":"first pass"}"""));
+        bridge.RaiseAgent(MakeAgentEvent("item", """{"kind":"reasoning","phase":"end","itemId":"r1"}"""));
+        bridge.RaiseAgent(MakeAgentEvent("reasoning", """{"delta":"second pass"}"""));
 
-        var latest = snapshots.Count > 0 ? snapshots[^1] : await provider.LoadAsync();
-        Assert.Empty(latest.Timelines["main"].Entries);
-        Assert.DoesNotContain(notifications, n => n.Message == "old send failed");
+        var timeline = snapshots[^1].Timelines["main"];
+        var reasoningEntries = timeline.Entries.Where(e => e.Kind == ChatTimelineItemKind.Reasoning).ToList();
+        Assert.Equal(2, reasoningEntries.Count);
+        Assert.Equal("first pass", reasoningEntries[0].Text);
+        Assert.Equal("second pass", reasoningEntries[1].Text);
     }
 
     [Fact]
-    public async Task SessionResetCompletion_StaleSendFailureDoesNotClearCurrentEchoState()
+    public async Task AgentEvent_ReasoningItemStart_IsIgnored()
     {
-        var sendStarted = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
-        var staleSendGate = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
-        var sendCount = 0;
-        var (bridge, provider, snapshots, notifications) = CreateProvider(new[] { MainSession() });
-        bridge.SendBehavior = (_, _, _) =>
-        {
-            if (System.Threading.Interlocked.Increment(ref sendCount) == 1)
-            {
-                sendStarted.TrySetResult();
-                return staleSendGate.Task;
-            }
+        // Only phase=end closes the bubble; phase=start is informational
+        // and must not produce a stray timeline entry.
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        await provider.LoadAsync();
+        snapshots.Clear();
 
-            return Task.CompletedTask;
-        };
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-1"));
+        bridge.RaiseAgent(MakeAgentEvent("item", """{"kind":"reasoning","phase":"start","itemId":"r1"}"""));
+        bridge.RaiseAgent(MakeAgentEvent("reasoning", """{"delta":"only pass"}"""));
+
+        var timeline = snapshots[^1].Timelines["main"];
+        var entry = Assert.Single(timeline.Entries);
+        Assert.Equal(ChatTimelineItemKind.Reasoning, entry.Kind);
+        Assert.Equal("only pass", entry.Text);
+    }
+
+    [Fact]
+    public async Task StopResponseAsync_WithActiveRun_CallsAbortRpc()
+    {
+        var (bridge, provider, _, _) = CreateProvider(new[] { MainSession() });
         await provider.LoadAsync();
 
-        var staleSendTask = provider.SendMessageAsync("main", "same text");
-        await sendStarted.Task;
-        bridge.RaiseSessionCommandCompleted(new SessionCommandResult
-        {
-            Method = "sessions.reset",
-            Ok = true,
-            Key = "main"
-        });
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-42"));
 
-        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "new-run" });
-        await provider.SendMessageAsync("main", "same text");
+        await provider.StopResponseAsync("main");
+
+        Assert.Single(bridge.AbortedRunIds);
+        Assert.Equal("run-42", bridge.AbortedRunIds[0]);
+    }
+
+    [Fact]
+    public async Task StopResponseAsync_WithoutActiveRun_DoesNotCallAbort()
+    {
+        var (bridge, provider, _, _) = CreateProvider(new[] { MainSession() });
+        await provider.LoadAsync();
+
+        await provider.StopResponseAsync("main");
+
+        Assert.Empty(bridge.AbortedRunIds);
+    }
+
+    [Fact]
+    public async Task StopResponseAsync_AfterLifecycleEnd_NoLongerAborts()
+    {
+        var (bridge, provider, _, _) = CreateProvider(new[] { MainSession() });
+        await provider.LoadAsync();
+
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-9"));
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"end"}""", runId: "run-9"));
+
+        await provider.StopResponseAsync("main");
+
+        Assert.Empty(bridge.AbortedRunIds);
+    }
+
+    [Fact]
+    public async Task StopResponseAsync_WithQueuedFollowUp_WaitsForConfirmedTerminalEvent()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-1", Status = "started" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-2", Status = "started" });
+        await provider.LoadAsync();
+        bridge.RaiseStatus(ConnectionStatus.Connected);
         snapshots.Clear();
 
-        staleSendGate.SetException(new InvalidOperationException("old send failed"));
-        await staleSendTask;
+        await provider.SendMessageAsync("main", "first");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-1"));
+        await provider.SendMessageAsync("main", "second");
 
-        bridge.RaiseChat(new ChatMessageInfo
-        {
-            SessionKey = "main",
-            Role = "user",
-            Text = "same text"
-        });
+        await provider.StopResponseAsync("main");
 
-        var latest = await provider.LoadAsync();
-        Assert.Single(latest.Timelines["main"].Entries, e =>
-            e.Kind == ChatTimelineItemKind.User && e.Text == "same text");
-        Assert.DoesNotContain(notifications, n => n.Message == "old send failed");
+        Assert.Equal(new[] { "first" }, bridge.SentMessages);
+        var waiting = Assert.Single(GetQueuedMessages(snapshots[^1], "main"));
+        Assert.Equal(ChatQueuedMessageSendState.Queued, waiting.SendState);
+
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"end"}""", runId: "run-1"));
+        for (var i = 0; i < 20 && bridge.SentMessages.Count < 2; i++)
+            await Task.Delay(10);
+
+        Assert.Contains("run-1", bridge.AbortedRunIds);
+        Assert.Equal(new[] { "first", "second" }, bridge.SentMessages);
+        Assert.Empty(GetQueuedMessages(snapshots[^1], "main"));
+        Assert.Single(snapshots[^1].Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "second");
+    }
+
+    [Fact]
+    public async Task QueuedDispatch_AssistantBeforeLifecycle_PromotesEachPromptOnce()
+    {
+        var secondSendGate = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        var sendCount = 0;
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-1", Status = "started" });
+        bridge.SendResults.Enqueue(new ChatSendResult { RunId = "run-2", Status = "started" });
+        bridge.SendBehavior = (_, _, _) => ++sendCount == 2 ? secondSendGate.Task : Task.CompletedTask;
+        await provider.LoadAsync();
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+
+        await provider.SendMessageAsync("main", "first");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-1"));
+        await provider.SendMessageAsync("main", "second");
+        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"end"}""", runId: "run-1"));
+        for (var i = 0; i < 20 && bridge.SentMessages.Count < 2; i++)
+            await Task.Delay(10);
 
-        var freshStart = MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "new-run");
-        freshStart.Ts = DateTimeOffset.UtcNow.AddSeconds(1).ToUnixTimeMilliseconds();
-        bridge.RaiseAgent(freshStart);
         bridge.RaiseChat(new ChatMessageInfo
         {
             SessionKey = "main",
             Role = "assistant",
-            State = "final",
-            Text = "fresh response"
+            Text = "second response",
+            State = "delta",
         });
 
-        latest = snapshots[^1];
-        Assert.Contains(latest.Timelines["main"].Entries, e =>
-            e.Kind == ChatTimelineItemKind.Assistant && e.Text == "fresh response");
+        Assert.Empty(GetQueuedMessages(snapshots[^1], "main"));
+        Assert.Single(snapshots[^1].Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "second");
+
+        secondSendGate.SetResult();
     }
 
     [Fact]
-    public async Task SessionResetCompletion_IgnoresInFlightRemoteUserBackfill()
+    public async Task LoadHistoryAsync_FoldsTranscriptIntoTimeline()
     {
-        var backfillStarted = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
-        var historyTcs = new TaskCompletionSource<ChatHistoryInfo>(TaskCreationOptions.RunContinuationsAsynchronously);
         var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
-        bridge.HistoryBehavior = _ =>
-        {
-            backfillStarted.TrySetResult();
-            return historyTcs.Task;
-        };
-        await provider.LoadAsync();
-
-        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-remote"));
-        await backfillStarted.Task;
-        bridge.RaiseSessionCommandCompleted(new SessionCommandResult
+        bridge.HistoryBehavior = _ => Task.FromResult(new ChatHistoryInfo
         {
-            Method = "sessions.reset",
-            Ok = true,
-            Key = "main"
+            SessionKey = "main",
+            SessionId = "sess-uuid-123",
+            Messages = new[]
+            {
+                new ChatMessageInfo { Role = "user", Text = "Hi", State = "final" },
+                new ChatMessageInfo { Role = "assistant", Text = "Hello!", State = "final" },
+                new ChatMessageInfo { Role = "user", Text = "Bye", State = "final" }
+            }
         });
+        await provider.LoadAsync();
         snapshots.Clear();
 
-        historyTcs.SetResult(new ChatHistoryInfo
+        await provider.LoadHistoryAsync("main");
+
+        var timeline = snapshots[^1].Timelines["main"];
+        Assert.Equal(3, timeline.Entries.Count);
+        Assert.Equal(ChatTimelineItemKind.User, timeline.Entries[0].Kind);
+        Assert.Equal("Hi", timeline.Entries[0].Text);
+        Assert.Equal(ChatTimelineItemKind.Assistant, timeline.Entries[1].Kind);
+        Assert.Equal("Hello!", timeline.Entries[1].Text);
+        Assert.Equal(ChatTimelineItemKind.User, timeline.Entries[2].Kind);
+        Assert.False(timeline.TurnActive);
+    }
+
+    [Fact]
+    public async Task LoadHistoryAsync_AssistantNoReply_IsSuppressed()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.HistoryBehavior = _ => Task.FromResult(new ChatHistoryInfo
         {
             SessionKey = "main",
             Messages = new[]
             {
-                new ChatMessageInfo
-                {
-                    SessionKey = "main",
-                    Role = "user",
-                    Text = "old remote user",
-                    Ts = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds()
-                }
+                new ChatMessageInfo { Role = "user", Text = "Hi", State = "final" },
+                new ChatMessageInfo { Role = "assistant", Text = "NO_REPLY", State = "final" },
+                new ChatMessageInfo { Role = "assistant", Text = "Visible", State = "final" }
             }
         });
-        await Task.Delay(100);
+        await provider.LoadAsync();
+        snapshots.Clear();
 
-        var latest = snapshots.Count > 0 ? snapshots[^1] : await provider.LoadAsync();
-        Assert.Empty(latest.Timelines["main"].Entries);
+        await provider.LoadHistoryAsync("main");
+
+        var timeline = snapshots[^1].Timelines["main"];
+        Assert.Equal(["Hi", "Visible"], timeline.Entries.Select(e => e.Text).ToArray());
     }
 
     [Fact]
-    public async Task StatusChanged_IsReflectedInSnapshotConnectionLabel()
+    public async Task LoadHistoryAsync_MultipleAssistantTurns_PreservesEachAsSeparateEntry()
     {
+        // Regression test: previously every ChatMessageEvent would upsert the
+        // active assistant entry, collapsing N assistant messages into 1. The
+        // fix is to bracket each assistant message with ChatTurnEndEvent.
         var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.HistoryBehavior = _ => Task.FromResult(new ChatHistoryInfo
+        {
+            SessionKey = "main",
+            Messages = new[]
+            {
+                new ChatMessageInfo { Role = "user",      Text = "Q1", State = "final", Ts = 1 },
+                new ChatMessageInfo { Role = "assistant", Text = "A1", State = "final", Ts = 2 },
+                new ChatMessageInfo { Role = "user",      Text = "Q2", State = "final", Ts = 3 },
+                new ChatMessageInfo { Role = "assistant", Text = "A2", State = "final", Ts = 4 },
+                new ChatMessageInfo { Role = "user",      Text = "Q3", State = "final", Ts = 5 },
+                new ChatMessageInfo { Role = "assistant", Text = "A3", State = "final", Ts = 6 },
+            }
+        });
         await provider.LoadAsync();
         snapshots.Clear();
 
-        bridge.RaiseStatus(ConnectionStatus.Connected);
-        Assert.Equal("Connected", snapshots[^1].ConnectionStatus);
-
-        bridge.RaiseStatus(ConnectionStatus.Connecting);
-        Assert.Equal("Connecting…", snapshots[^1].ConnectionStatus);
+        await provider.LoadHistoryAsync("main");
 
-        bridge.RaiseStatus(ConnectionStatus.Disconnected);
-        Assert.Equal("Disconnected", snapshots[^1].ConnectionStatus);
+        var timeline = snapshots[^1].Timelines["main"];
+        Assert.Equal(6, timeline.Entries.Count);
+        Assert.Equal(new[] { "Q1", "A1", "Q2", "A2", "Q3", "A3" },
+            timeline.Entries.Select(e => e.Text).ToArray());
+        Assert.Equal(new[]
+        {
+            ChatTimelineItemKind.User,      ChatTimelineItemKind.Assistant,
+            ChatTimelineItemKind.User,      ChatTimelineItemKind.Assistant,
+            ChatTimelineItemKind.User,      ChatTimelineItemKind.Assistant,
+        }, timeline.Entries.Select(e => e.Kind).ToArray());
     }
 
     [Fact]
-    public async Task PostDelegate_IsUsedForChangedAndNotifications()
+    public async Task LoadHistoryAsync_SystemRole_RendersAsDimStatusEntry()
     {
-        var bridge = new FakeBridge { Sessions = new[] { MainSession() } };
-        var queued = new List<Action>();
-        var provider = new OpenClawChatDataProvider(bridge, post: a => queued.Add(a));
-        var snapshots = new List<ChatDataSnapshot>();
-        provider.Changed += (_, e) => snapshots.Add(e.Snapshot);
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.HistoryBehavior = _ => Task.FromResult(new ChatHistoryInfo
+        {
+            SessionKey = "main",
+            Messages = new[]
+            {
+                new ChatMessageInfo { Role = "user",      Text = "Hello",   State = "final", Ts = 1 },
+                new ChatMessageInfo { Role = "system",    Text = "ctx",     State = "final", Ts = 2 },
+                new ChatMessageInfo { Role = "assistant", Text = "Hi back", State = "final", Ts = 3 },
+            }
+        });
+        await provider.LoadAsync();
+        snapshots.Clear();
 
-        bridge.RaiseChat(new ChatMessageInfo { SessionKey = "main", Role = "assistant", Text = "x", State = "final" });
+        await provider.LoadHistoryAsync("main");
 
-        // Snapshot was queued, not invoked immediately.
-        Assert.Empty(snapshots);
-        Assert.NotEmpty(queued);
-        foreach (var a in queued) a();
-        Assert.NotEmpty(snapshots);
+        var timeline = snapshots[^1].Timelines["main"];
+        Assert.Equal(3, timeline.Entries.Count);
+        Assert.Equal(ChatTimelineItemKind.User, timeline.Entries[0].Kind);
+        Assert.Equal(ChatTimelineItemKind.Status, timeline.Entries[1].Kind);
+        Assert.Equal("ctx", timeline.Entries[1].Text);
+        Assert.Equal(ChatTone.Dim, timeline.Entries[1].Tone);
+        Assert.Equal(ChatTimelineItemKind.Assistant, timeline.Entries[2].Kind);
+        Assert.Equal("Hi back", timeline.Entries[2].Text);
     }
 
-    [Fact]
-    public async Task DisposeAsync_UnsubscribesAndStopsRaisingChanged()
+    [Theory]
+    [InlineData("toolresult")]
+    [InlineData("tool_result")]
+    public async Task LoadHistoryAsync_ToolResultRole_RendersAsToolChipEvenWithoutHeuristicMatch(string role)
     {
         var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.HistoryBehavior = _ => Task.FromResult(new ChatHistoryInfo
+        {
+            SessionKey = "main",
+            Messages = new[]
+            {
+                new ChatMessageInfo { Role = role, Text = "(no output)", State = "final", Ts = 1 },
+            }
+        });
         await provider.LoadAsync();
-
-        await provider.DisposeAsync();
         snapshots.Clear();
 
-        bridge.RaiseChat(new ChatMessageInfo { SessionKey = "main", Role = "assistant", Text = "after dispose", State = "final" });
-        bridge.RaiseSessions(new[] { MainSession() });
-        bridge.RaiseStatus(ConnectionStatus.Disconnected);
+        await provider.LoadHistoryAsync("main");
 
-        Assert.Empty(snapshots);
-        Assert.True(bridge.IsDisposed);
+        var entry = Assert.Single(snapshots[^1].Timelines["main"].Entries);
+        Assert.Equal(ChatTimelineItemKind.ToolCall, entry.Kind);
+        Assert.Equal(ChatToolCallStatus.Success, entry.ToolResult);
+        Assert.Equal("(no output)", entry.ToolOutput);
     }
 
     [Fact]
-    public async Task LoadAsync_FreshInstall_NoSessions_ExposesNotReadyComposeTarget()
+    public async Task LoadHistoryAsync_ToolRole_RendersAsDimStatusEntry()
     {
-        // Replaces the pre-refactor CreateThreadAsync tests: there is no
-        // create-thread RPC on the gateway, so the provider must never
-        // synthesize a thread out of thin air. Instead, the snapshot exposes
-        // a ChatComposeTarget that tells the UI whether/where to send.
-        var (_, provider, _, _) = CreateProvider();
-        var snap = await provider.LoadAsync();
-        Assert.Empty(snap.Threads);
-        Assert.False(snap.ComposeTarget.IsReady);
-        Assert.Null(snap.ComposeTarget.SessionKey);
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.HistoryBehavior = _ => Task.FromResult(new ChatHistoryInfo
+        {
+            SessionKey = "main",
+            Messages = new[]
+            {
+                new ChatMessageInfo { Role = "tool", Text = "tool transcript note", State = "final", Ts = 1 },
+            }
+        });
+        await provider.LoadAsync();
+        snapshots.Clear();
+
+        await provider.LoadHistoryAsync("main");
+
+        var entry = Assert.Single(snapshots[^1].Timelines["main"].Entries);
+        Assert.Equal(ChatTimelineItemKind.Status, entry.Kind);
+        Assert.Equal(ChatTone.Dim, entry.Tone);
+        Assert.Equal("tool transcript note", entry.Text);
     }
 
     [Fact]
-    public async Task LoadAsync_HandshakeKnown_ZeroSessions_ExposesReadyComposeTarget()
+    public async Task LoadHistoryAsync_UnknownRole_FallsBackToVisibleAssistantEntry()
     {
-        var (bridge, provider, _, _) = CreateProvider();
-        bridge.HasHandshakeSnapshot = true;
-        bridge.MainSessionKey = "agent:main:main";
-        bridge.RaiseStatus(ConnectionStatus.Connected);
-        // Real gateways always send sessions.list after handshake (even an
-        // empty list). The provider waits for that signal before flipping
-        // ComposeTarget.IsReady on — otherwise the UI would briefly render
-        // the welcome zero-state for returning users mid-handshake.
-        bridge.RaiseSessions(Array.Empty<SessionInfo>());
-        var snap = await provider.LoadAsync();
-        Assert.Empty(snap.Threads);
-        Assert.True(snap.ComposeTarget.IsReady);
-        Assert.Equal("agent:main:main", snap.ComposeTarget.SessionKey);
-        Assert.Equal("agent:main:main", snap.DefaultThreadId);
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.HistoryBehavior = _ => Task.FromResult(new ChatHistoryInfo
+        {
+            SessionKey = "main",
+            Messages = new[]
+            {
+                new ChatMessageInfo { Role = "function", Text = "fallback text", State = "final", Ts = 1 },
+            }
+        });
+        await provider.LoadAsync();
+        snapshots.Clear();
+
+        await provider.LoadHistoryAsync("main");
+
+        var timeline = snapshots[^1].Timelines["main"];
+        var entry = Assert.Single(timeline.Entries);
+        Assert.Equal(ChatTimelineItemKind.Assistant, entry.Kind);
+        Assert.Equal("fallback text", entry.Text);
+        Assert.False(timeline.TurnActive);
     }
 
     [Fact]
-    public async Task LoadAsync_HandshakeComplete_NoSessionKey_SignalsIncompatibleGateway()
+    public async Task LoadHistoryAsync_OutOfOrderTimestamps_AreSortedAscending()
     {
-        // When the gateway completes the handshake but does not advertise
-        // a mainSessionKey (or sessionDefaults.mainKey), the provider must surface
-        // an "Incompatible gateway" connection label and a NotReady compose target
-        // so the UI can show a clear "gateway update required" message rather than
-        // silently blocking send. Relates to issue #459.
-        var (bridge, provider, _, _) = CreateProvider();
-        bridge.HasHandshakeSnapshot = true;
-        bridge.MainSessionKey = null;   // incompatible gateway: no session key
-        bridge.RaiseStatus(ConnectionStatus.Connected);
-        var snap = await provider.LoadAsync();
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.HistoryBehavior = _ => Task.FromResult(new ChatHistoryInfo
+        {
+            SessionKey = "main",
+            // Deliberately scrambled — provider must sort by Ts.
+            Messages = new[]
+            {
+                new ChatMessageInfo { Role = "assistant", Text = "Last",  State = "final", Ts = 30 },
+                new ChatMessageInfo { Role = "user",      Text = "First", State = "final", Ts = 10 },
+                new ChatMessageInfo { Role = "assistant", Text = "Mid",   State = "final", Ts = 20 },
+            }
+        });
+        await provider.LoadAsync();
+        snapshots.Clear();
 
-        Assert.Equal("Incompatible gateway", snap.ConnectionStatus);
-        Assert.False(snap.ComposeTarget.IsReady);
-        Assert.Null(snap.ComposeTarget.SessionKey);
+        await provider.LoadHistoryAsync("main");
+
+        var timeline = snapshots[^1].Timelines["main"];
+        Assert.Equal(new[] { "First", "Mid", "Last" },
+            timeline.Entries.Select(e => e.Text).ToArray());
     }
 
     [Fact]
-    public async Task StatusChanged_IncompatibleGateway_IsReflectedInSnapshotConnectionLabel()
+    public async Task LoadHistoryAsync_IsIdempotent()
     {
-        // Raise Connected with handshake present but no session key; the snapshot
-        // must use "Incompatible gateway" rather than the plain "Connected" label.
-        var (bridge, provider, snapshots, _) = CreateProvider();
-        bridge.HasHandshakeSnapshot = true;
-        bridge.MainSessionKey = null;
+        var calls = 0;
+        var (bridge, provider, _, _) = CreateProvider(new[] { MainSession() });
+        bridge.HistoryBehavior = _ => { calls++; return Task.FromResult(new ChatHistoryInfo { SessionKey = "main" }); };
         await provider.LoadAsync();
-        snapshots.Clear();
 
-        bridge.RaiseStatus(ConnectionStatus.Connected);
+        await provider.LoadHistoryAsync("main");
+        await provider.LoadHistoryAsync("main");
+        await provider.LoadHistoryAsync("main");
 
-        Assert.NotEmpty(snapshots);
-        Assert.Equal("Incompatible gateway", snapshots[^1].ConnectionStatus);
-        Assert.False(snapshots[^1].ComposeTarget.IsReady);
+        Assert.Equal(1, calls);
     }
 
     [Fact]
-    public async Task LoadAsync_HandshakeKnownButSessionsNotYetReceived_ComposeTargetNotReady()
+    public async Task LoadHistoryAsync_WhenRequestFails_NotifiesAndAllowsRetry()
     {
-        // Regression: in the brief window between hello-ok (HasHandshakeSnapshot
-        // becomes true) and the first sessions.list, the provider used to expose
-        // a ready ComposeTarget. The chat root would then synthesize a
-        // compose-only thread and render the welcome zero-state — even for a
-        // returning user whose real sessions were about to be delivered. The
-        // sessions-list-received gate keeps ComposeTarget.IsReady=false until
-        // the gateway has confirmed the session list for this connection.
-        var (bridge, provider, _, _) = CreateProvider();
-        bridge.HasHandshakeSnapshot = true;
-        bridge.MainSessionKey = "agent:main:main";
-        bridge.RaiseStatus(ConnectionStatus.Connected);
-        // No RaiseSessions yet — simulate the mid-handshake window.
-        var snap = await provider.LoadAsync();
-        Assert.Empty(snap.Threads);
-        Assert.False(snap.ComposeTarget.IsReady);
+        var calls = 0;
+        var (bridge, provider, snapshots, notifications) = CreateProvider(new[] { MainSession() });
+        bridge.HistoryBehavior = _ =>
+        {
+            calls++;
+            if (calls == 1)
+                throw new InvalidOperationException("history down");
+
+            return Task.FromResult(new ChatHistoryInfo
+            {
+                SessionKey = "main",
+                Messages = new[]
+                {
+                    new ChatMessageInfo { Role = "assistant", Text = "recovered", State = "final", Ts = 1 },
+                }
+            });
+        };
+        await provider.LoadAsync();
+        snapshots.Clear();
+
+        await provider.LoadHistoryAsync("main");
+
+        Assert.Contains(notifications, n =>
+            n.Kind == ChatProviderNotificationKind.Error &&
+            n.Message?.Contains("history down") == true);
+        Assert.Empty(snapshots);
+
+        await provider.LoadHistoryAsync("main");
+
+        Assert.Equal(2, calls);
+        Assert.Contains(snapshots[^1].Timelines["main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.Assistant && e.Text == "recovered");
     }
 
     [Fact]
-    public async Task StatusDisconnected_AfterSessionsReceived_ComposeTargetResetsToNotReady()
+    public async Task SendMessageAsync_DoesNotForwardSessionIdToGateway()
     {
-        // The sessions-list-received gate must reset on disconnect — otherwise
-        // a reconnect would keep ComposeTarget ready against a stale session
-        // list from the previous connection.
-        var (bridge, provider, _, _) = CreateProvider();
-        bridge.HasHandshakeSnapshot = true;
-        bridge.MainSessionKey = "agent:main:main";
-        bridge.RaiseStatus(ConnectionStatus.Connected);
-        bridge.RaiseSessions(Array.Empty<SessionInfo>());
-        Assert.True((await provider.LoadAsync()).ComposeTarget.IsReady);
+        // The live gateway rejects `sessionId` at the chat.send root with
+        // "unexpected property". The provider tracks sessionId from chat.history
+        // for client-side correlation but must not forward it. (Gateway client
+        // ignores the sessionId arg; bridge still receives it for future use.)
+        var (bridge, provider, _, _) = CreateProvider(new[] { MainSession() });
+        bridge.HistoryBehavior = _ => Task.FromResult(new ChatHistoryInfo
+        {
+            SessionKey = "main",
+            SessionId = "sess-uuid-7"
+        });
+        await provider.LoadAsync();
+        await provider.LoadHistoryAsync("main");
 
-        bridge.RaiseStatus(ConnectionStatus.Disconnected);
-        var snap = await provider.LoadAsync();
-        Assert.False(snap.ComposeTarget.IsReady);
-    }
+        await provider.SendMessageAsync("main", "Ping");
 
-    // ── Parity additions: streaming, lifecycle, reasoning, history, abort ──
+        // The bridge surface still receives the sessionId for tests / future
+        // protocol use, but the production gateway client drops it before
+        // serializing the chat.send request.
+        Assert.Equal("sess-uuid-7", bridge.SentSessionIds[0]);
+    }
 
     [Fact]
-    public async Task AgentEvent_AssistantDelta_AppendsStreamingAssistantEntry()
+    public async Task LoadHistoryAsync_PersistsSessionIdForFutureSends()
     {
-        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        var (bridge, provider, _, _) = CreateProvider(new[] { MainSession() });
+        bridge.HistoryBehavior = _ => Task.FromResult(new ChatHistoryInfo
+        {
+            SessionKey = "main",
+            SessionId = "sess-uuid-7"
+        });
         await provider.LoadAsync();
-        snapshots.Clear();
+        await provider.LoadHistoryAsync("main");
 
-        bridge.RaiseAgent(MakeAgentEvent("assistant", """{"delta":"Hel"}"""));
-        bridge.RaiseAgent(MakeAgentEvent("assistant", """{"delta":"lo "}"""));
-        bridge.RaiseAgent(MakeAgentEvent("assistant", """{"delta":"world"}"""));
+        await provider.SendMessageAsync("main", "Ping");
 
-        var timeline = snapshots[^1].Timelines["main"];
-        var assistant = Assert.Single(timeline.Entries);
-        Assert.Equal(ChatTimelineItemKind.Assistant, assistant.Kind);
-        Assert.Equal("Hello world", assistant.Text);
-        Assert.True(assistant.IsStreaming);
-        Assert.True(timeline.TurnActive);
+        Assert.Equal("sess-uuid-7", bridge.SentSessionIds[0]);
     }
 
     [Fact]
-    public async Task AgentEvent_AssistantContent_IsIgnoredBecauseChatMessageCarriesFinalText()
+    public async Task SendMessageAsync_WithoutHistory_PassesNullSessionId()
     {
-        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        var (bridge, provider, _, _) = CreateProvider(new[] { MainSession() });
         await provider.LoadAsync();
-        snapshots.Clear();
 
-        bridge.RaiseAgent(MakeAgentEvent("assistant",
-            """{"content":"Final answer."}"""));
+        await provider.SendMessageAsync("main", "Ping");
 
-        Assert.Empty(snapshots);
+        Assert.Null(bridge.SentSessionIds[0]);
     }
 
+    // ── Iteration 3: tool result, abort marker, reconnect history, models ──
+
     [Fact]
-    public async Task AgentEvent_LifecycleStart_SetsTurnActive()
+    public async Task AgentEvent_ToolResult_ExtractsResultContent()
     {
         var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
         await provider.LoadAsync();
-        snapshots.Clear();
 
-        bridge.RaiseAgent(MakeAgentEvent("lifecycle",
-            """{"phase":"start"}""", runId: "run-1"));
+        bridge.RaiseAgent(MakeAgentEvent("tool",
+            """{"phase":"start","name":"powershell","args":{"command":"echo hi"}}"""));
+        bridge.RaiseAgent(MakeAgentEvent("tool",
+            """{"phase":"result","name":"powershell","result":{"content":"hi\n"}}"""));
 
-        Assert.True(snapshots[^1].Timelines["main"].TurnActive);
+        var timeline = snapshots[^1].Timelines["main"];
+        var entry = Assert.Single(timeline.Entries);
+        Assert.Equal(ChatToolCallStatus.Success, entry.ToolResult);
+        Assert.Equal("hi\n", entry.ToolOutput);
     }
 
     [Fact]
-    public async Task AgentEvent_LifecycleEnd_ClearsTurnActiveAndAssistant()
+    public async Task AgentEvent_ToolResult_FallsBackToOutputField()
     {
-        var (bridge, provider, _, _) = CreateProvider(new[] { MainSession() });
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
         await provider.LoadAsync();
 
-        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-1"));
-        bridge.RaiseAgent(MakeAgentEvent("assistant", """{"delta":"hi"}"""));
-        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"end"}""", runId: "run-1"));
+        bridge.RaiseAgent(MakeAgentEvent("tool",
+            """{"phase":"start","name":"grep","args":{"pattern":"foo"}}"""));
+        // Some tools return output at data.output rather than data.result.content
+        bridge.RaiseAgent(MakeAgentEvent("tool",
+            """{"phase":"result","name":"grep","output":"line1\nline2"}"""));
 
-        var snap = await provider.LoadAsync();
-        var timeline = snap.Timelines["main"];
-        Assert.False(timeline.TurnActive);
-        Assert.Null(timeline.ActiveAssistantId);
+        var timeline = snapshots[^1].Timelines["main"];
+        var entry = Assert.Single(timeline.Entries);
+        Assert.Equal("line1\nline2", entry.ToolOutput);
     }
 
     [Fact]
-    public async Task AgentEvent_LifecycleError_AppendsErrorStatusEntry()
+    public async Task AgentEvent_ItemEndAfterCommandOutput_PreservesOutput()
     {
         var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
         await provider.LoadAsync();
-        snapshots.Clear();
 
-        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-1"));
-        var evt = MakeAgentEvent("lifecycle", """{"phase":"error","message":"model unreachable"}""", runId: "run-1");
-        bridge.RaiseAgent(evt);
+        bridge.RaiseAgent(MakeAgentEvent("item",
+            """{"phase":"start","kind":"tool","title":"exec run command echo hi","itemId":"tool-1"}"""));
+        bridge.RaiseAgent(MakeAgentEvent("command_output",
+            """{"phase":"end","itemId":"tool-1","output":"hi\n"}"""));
+        bridge.RaiseAgent(MakeAgentEvent("item",
+            """{"phase":"end","kind":"tool","title":"exec run command echo hi","itemId":"tool-1"}"""));
 
         var timeline = snapshots[^1].Timelines["main"];
-        Assert.False(timeline.TurnActive);
-        Assert.Contains(timeline.Entries, e =>
-            e.Kind == ChatTimelineItemKind.Status && e.Text.Contains("model unreachable"));
+        var entry = Assert.Single(timeline.Entries);
+        Assert.Equal(ChatToolCallStatus.Success, entry.ToolResult);
+        Assert.Equal("hi\n", entry.ToolOutput);
     }
 
     [Fact]
-    public async Task AgentEvent_ReasoningDelta_AccumulatesReasoningEntry()
+    public async Task AgentEvent_ToolError_ExtractsErrorText()
     {
         var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
         await provider.LoadAsync();
-        snapshots.Clear();
 
-        bridge.RaiseAgent(MakeAgentEvent("reasoning", """{"delta":"thinking… "}"""));
-        bridge.RaiseAgent(MakeAgentEvent("reasoning", """{"delta":"step 2."}"""));
+        bridge.RaiseAgent(MakeAgentEvent("tool",
+            """{"phase":"start","name":"web_fetch","args":{"url":"https://example"}}"""));
+        bridge.RaiseAgent(MakeAgentEvent("tool",
+            """{"phase":"error","name":"web_fetch","error":"timeout after 30s"}"""));
 
         var timeline = snapshots[^1].Timelines["main"];
         var entry = Assert.Single(timeline.Entries);
-        Assert.Equal(ChatTimelineItemKind.Reasoning, entry.Kind);
-        Assert.Equal("thinking… step 2.", entry.Text);
+        Assert.Equal(ChatToolCallStatus.Error, entry.ToolResult);
+        Assert.Equal("timeout after 30s", entry.ToolOutput);
     }
 
     [Fact]
-    public async Task AgentEvent_ReasoningItemEnd_StartsFreshReasoningBubble()
+    public async Task AgentEvent_ToolResult_TruncatesVeryLargeOutput()
     {
-        // Regression: when the model reasons → tool → reasons again within
-        // a single turn, the second reasoning pass must render as its own
-        // bubble. The gateway brackets each pass with
-        // stream:"item", kind:"reasoning", phase:"start|end" — without
-        // honoring the end marker the second pass concatenates into the
-        // first bubble instead of replacing it.
         var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
         await provider.LoadAsync();
-        snapshots.Clear();
 
-        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-1"));
-        bridge.RaiseAgent(MakeAgentEvent("reasoning", """{"delta":"first pass"}"""));
-        bridge.RaiseAgent(MakeAgentEvent("item", """{"kind":"reasoning","phase":"end","itemId":"r1"}"""));
-        bridge.RaiseAgent(MakeAgentEvent("reasoning", """{"delta":"second pass"}"""));
+        var huge = new string('x', 10000);
+        bridge.RaiseAgent(MakeAgentEvent("tool",
+            """{"phase":"start","name":"read","args":{"path":"/big.txt"}}"""));
+        var resultJson = "{\"phase\":\"result\",\"name\":\"read\",\"result\":{\"content\":\"" + huge + "\"}}";
+        bridge.RaiseAgent(MakeAgentEvent("tool", resultJson));
 
-        var timeline = snapshots[^1].Timelines["main"];
-        var reasoningEntries = timeline.Entries.Where(e => e.Kind == ChatTimelineItemKind.Reasoning).ToList();
-        Assert.Equal(2, reasoningEntries.Count);
-        Assert.Equal("first pass", reasoningEntries[0].Text);
-        Assert.Equal("second pass", reasoningEntries[1].Text);
+        var entry = snapshots[^1].Timelines["main"].Entries[0];
+        Assert.NotNull(entry.ToolOutput);
+        Assert.True(entry.ToolOutput!.Length < huge.Length, "expected truncation");
+        Assert.EndsWith("(truncated)", entry.ToolOutput);
     }
 
     [Fact]
-    public async Task AgentEvent_ReasoningItemStart_IsIgnored()
+    public async Task StopResponseAsync_DuringActiveTurn_AppendsAbortMarker()
     {
-        // Only phase=end closes the bubble; phase=start is informational
-        // and must not produce a stray timeline entry.
         var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
         await provider.LoadAsync();
-        snapshots.Clear();
 
         bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-1"));
-        bridge.RaiseAgent(MakeAgentEvent("item", """{"kind":"reasoning","phase":"start","itemId":"r1"}"""));
-        bridge.RaiseAgent(MakeAgentEvent("reasoning", """{"delta":"only pass"}"""));
+        bridge.RaiseAgent(MakeAgentEvent("assistant", """{"delta":"partial answer"}"""));
+        snapshots.Clear();
+
+        await provider.StopResponseAsync("main");
 
         var timeline = snapshots[^1].Timelines["main"];
-        var entry = Assert.Single(timeline.Entries);
-        Assert.Equal(ChatTimelineItemKind.Reasoning, entry.Kind);
-        Assert.Equal("only pass", entry.Text);
+        Assert.Contains(timeline.Entries, e =>
+            e.Kind == ChatTimelineItemKind.Status &&
+            e.Text.Equals("Aborted", StringComparison.OrdinalIgnoreCase) &&
+            e.Tone == ChatTone.Warning);
+        Assert.False(timeline.TurnActive);
+        Assert.Contains("partial answer", timeline.Entries.Select(e => e.Text));
     }
 
     [Fact]
-    public async Task StopResponseAsync_WithActiveRun_CallsAbortRpc()
+    public async Task StopResponseAsync_WithoutActiveTurn_DoesNotAppendAbortMarker()
     {
-        var (bridge, provider, _, _) = CreateProvider(new[] { MainSession() });
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
         await provider.LoadAsync();
-
-        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-42"));
+        snapshots.Clear();
 
         await provider.StopResponseAsync("main");
 
-        Assert.Single(bridge.AbortedRunIds);
-        Assert.Equal("run-42", bridge.AbortedRunIds[0]);
+        // Either no snapshot or snapshot timeline has no Status="Aborted".
+        if (snapshots.Count > 0)
+        {
+            var timeline = snapshots[^1].Timelines["main"];
+            Assert.DoesNotContain(timeline.Entries, e =>
+                e.Kind == ChatTimelineItemKind.Status &&
+                e.Text.Equals("Aborted", StringComparison.OrdinalIgnoreCase));
+        }
     }
 
     [Fact]
-    public async Task StopResponseAsync_WithoutActiveRun_DoesNotCallAbort()
+    public async Task Reconnect_AfterDisconnect_ReloadsHistoryForLoadedThreads()
     {
+        var historyCalls = 0;
         var (bridge, provider, _, _) = CreateProvider(new[] { MainSession() });
+        var reloadObserved = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        bridge.HistoryBehavior = _ =>
+        {
+            historyCalls++;
+            if (historyCalls >= 2)
+                reloadObserved.TrySetResult();
+            return Task.FromResult(new ChatHistoryInfo { SessionKey = "main" });
+        };
+
         await provider.LoadAsync();
+        await provider.LoadHistoryAsync("main");
+        Assert.Equal(1, historyCalls);
 
-        await provider.StopResponseAsync("main");
+        // Drop and reconnect.
+        bridge.RaiseStatus(ConnectionStatus.Disconnected);
+        bridge.RaiseStatus(ConnectionStatus.Connected);
 
-        Assert.Empty(bridge.AbortedRunIds);
+        await reloadObserved.Task.WaitAsync(TimeSpan.FromSeconds(1));
+
+        Assert.Equal(2, historyCalls);
     }
 
     [Fact]
-    public async Task StopResponseAsync_AfterLifecycleEnd_NoLongerAborts()
+    public async Task Reconnect_FromConnectingToConnected_DoesNotReload()
     {
-        var (bridge, provider, _, _) = CreateProvider(new[] { MainSession() });
+        // The "just reconnected" condition should only fire on a transition
+        // from a non-Connected state to Connected — not on the initial
+        // Connecting → Connected boot sequence.
+        var historyCalls = 0;
+        var bridge = new FakeBridge { Sessions = new[] { MainSession() }, CurrentStatus = ConnectionStatus.Connected };
+        var provider = new OpenClawChatDataProvider(bridge);
+        bridge.HistoryBehavior = _ => { historyCalls++; return Task.FromResult(new ChatHistoryInfo { SessionKey = "main" }); };
         await provider.LoadAsync();
+        await provider.LoadHistoryAsync("main");
+        Assert.Equal(1, historyCalls);
 
-        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-9"));
-        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"end"}""", runId: "run-9"));
-
-        await provider.StopResponseAsync("main");
+        // Already Connected → setting Connected again is a no-op.
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+        // slopwatch-ignore: SW004 Negative async assertion needs a brief quiescence window to prove no reload fired.
+        for (int i = 0; i < 10; i++) await Task.Delay(10);
 
-        Assert.Empty(bridge.AbortedRunIds);
+        Assert.Equal(1, historyCalls);
     }
 
     [Fact]
-    public async Task LoadHistoryAsync_FoldsTranscriptIntoTimeline()
+    public async Task ModelsListUpdated_PopulatesAvailableModelsInSnapshot()
     {
         var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
-        bridge.HistoryBehavior = _ => Task.FromResult(new ChatHistoryInfo
+        await provider.LoadAsync();
+        snapshots.Clear();
+
+        bridge.RaiseModels(new ModelsListInfo
         {
-            SessionKey = "main",
-            SessionId = "sess-uuid-123",
-            Messages = new[]
+            Models = new List<ModelInfo>
             {
-                new ChatMessageInfo { Role = "user", Text = "Hi", State = "final" },
-                new ChatMessageInfo { Role = "assistant", Text = "Hello!", State = "final" },
-                new ChatMessageInfo { Role = "user", Text = "Bye", State = "final" }
+                new() { Id = "gpt-5.4", Name = "GPT-5.4" },
+                new() { Id = "claude-sonnet-4.6", Name = "Claude Sonnet 4.6" },
+                new() { Id = "ollama-only-id" }
             }
         });
-        await provider.LoadAsync();
-        snapshots.Clear();
-
-        await provider.LoadHistoryAsync("main");
 
-        var timeline = snapshots[^1].Timelines["main"];
-        Assert.Equal(3, timeline.Entries.Count);
-        Assert.Equal(ChatTimelineItemKind.User, timeline.Entries[0].Kind);
-        Assert.Equal("Hi", timeline.Entries[0].Text);
-        Assert.Equal(ChatTimelineItemKind.Assistant, timeline.Entries[1].Kind);
-        Assert.Equal("Hello!", timeline.Entries[1].Text);
-        Assert.Equal(ChatTimelineItemKind.User, timeline.Entries[2].Kind);
-        Assert.False(timeline.TurnActive);
+        Assert.Equal(
+            new[] { "gpt-5.4", "claude-sonnet-4.6", "ollama-only-id" },
+            snapshots[^1].AvailableModels);
     }
 
     [Fact]
-    public async Task LoadHistoryAsync_MultipleAssistantTurns_PreservesEachAsSeparateEntry()
+    public async Task ModelsListUpdated_FiltersExplicitlyUnconfiguredModels()
     {
-        // Regression test: previously every ChatMessageEvent would upsert the
-        // active assistant entry, collapsing N assistant messages into 1. The
-        // fix is to bracket each assistant message with ChatTurnEndEvent.
         var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
-        bridge.HistoryBehavior = _ => Task.FromResult(new ChatHistoryInfo
+        await provider.LoadAsync();
+        snapshots.Clear();
+
+        bridge.RaiseModels(new ModelsListInfo
         {
-            SessionKey = "main",
-            Messages = new[]
+            Models = new List<ModelInfo>
             {
-                new ChatMessageInfo { Role = "user",      Text = "Q1", State = "final", Ts = 1 },
-                new ChatMessageInfo { Role = "assistant", Text = "A1", State = "final", Ts = 2 },
-                new ChatMessageInfo { Role = "user",      Text = "Q2", State = "final", Ts = 3 },
-                new ChatMessageInfo { Role = "assistant", Text = "A2", State = "final", Ts = 4 },
-                new ChatMessageInfo { Role = "user",      Text = "Q3", State = "final", Ts = 5 },
-                new ChatMessageInfo { Role = "assistant", Text = "A3", State = "final", Ts = 6 },
+                new() { Id = "gpt-5.4", IsConfigured = true, HasConfiguredFlag = true },
+                new() { Id = "gpt-5.5", IsConfigured = false, HasConfiguredFlag = true },
+                new() { Id = "needs-auth", IsConfigured = false, HasConfiguredFlag = true, RequiresAuth = true },
+                new() { Id = "legacy-gateway-model" }
             }
         });
-        await provider.LoadAsync();
-        snapshots.Clear();
-
-        await provider.LoadHistoryAsync("main");
 
-        var timeline = snapshots[^1].Timelines["main"];
-        Assert.Equal(6, timeline.Entries.Count);
-        Assert.Equal(new[] { "Q1", "A1", "Q2", "A2", "Q3", "A3" },
-            timeline.Entries.Select(e => e.Text).ToArray());
-        Assert.Equal(new[]
-        {
-            ChatTimelineItemKind.User,      ChatTimelineItemKind.Assistant,
-            ChatTimelineItemKind.User,      ChatTimelineItemKind.Assistant,
-            ChatTimelineItemKind.User,      ChatTimelineItemKind.Assistant,
-        }, timeline.Entries.Select(e => e.Kind).ToArray());
+        Assert.Equal(
+            new[] { "gpt-5.4", "needs-auth", "legacy-gateway-model" },
+            snapshots[^1].AvailableModels);
+        Assert.True(snapshots[^1].ModelChoices!.Single(c => c.Id == "needs-auth").RequiresAuth);
     }
 
     [Fact]
-    public async Task LoadHistoryAsync_SystemRole_RendersAsDimStatusEntry()
+    public async Task ModelsListUpdated_DedupesDisplayNames()
     {
         var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
-        bridge.HistoryBehavior = _ => Task.FromResult(new ChatHistoryInfo
+        await provider.LoadAsync();
+
+        bridge.RaiseModels(new ModelsListInfo
         {
-            SessionKey = "main",
-            Messages = new[]
+            Models = new List<ModelInfo>
             {
-                new ChatMessageInfo { Role = "user",      Text = "Hello",   State = "final", Ts = 1 },
-                new ChatMessageInfo { Role = "system",    Text = "ctx",     State = "final", Ts = 2 },
-                new ChatMessageInfo { Role = "assistant", Text = "Hi back", State = "final", Ts = 3 },
+                new() { Id = "gpt-5.4", Name = "GPT-5.4" },
+                new() { Id = "gpt-5.4-mirror", Name = "GPT-5.4" },
             }
         });
-        await provider.LoadAsync();
-        snapshots.Clear();
 
-        await provider.LoadHistoryAsync("main");
-
-        var timeline = snapshots[^1].Timelines["main"];
-        Assert.Equal(3, timeline.Entries.Count);
-        Assert.Equal(ChatTimelineItemKind.User, timeline.Entries[0].Kind);
-        Assert.Equal(ChatTimelineItemKind.Status, timeline.Entries[1].Kind);
-        Assert.Equal("ctx", timeline.Entries[1].Text);
-        Assert.Equal(ChatTone.Dim, timeline.Entries[1].Tone);
-        Assert.Equal(ChatTimelineItemKind.Assistant, timeline.Entries[2].Kind);
-        Assert.Equal("Hi back", timeline.Entries[2].Text);
+        // IDs are distinct ("gpt-5.4" vs "gpt-5.4-mirror"), so both appear.
+        Assert.Equal(2, snapshots[^1].AvailableModels.Length);
+        Assert.Equal("gpt-5.4", snapshots[^1].AvailableModels[0]);
+        Assert.Equal("gpt-5.4-mirror", snapshots[^1].AvailableModels[1]);
     }
 
-    [Theory]
-    [InlineData("toolresult")]
-    [InlineData("tool_result")]
-    public async Task LoadHistoryAsync_ToolResultRole_RendersAsToolChipEvenWithoutHeuristicMatch(string role)
+    [Fact]
+    public async Task EnsureCommandCatalogAsync_PopulatesCatalogInSnapshot()
     {
         var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
-        bridge.HistoryBehavior = _ => Task.FromResult(new ChatHistoryInfo
+        bridge.CommandCatalogResult = new CommandCatalog
         {
-            SessionKey = "main",
-            Messages = new[]
+            IsSupported = true,
+            Commands = new[]
             {
-                new ChatMessageInfo { Role = role, Text = "(no output)", State = "final", Ts = 1 },
+                new GatewayCommand { Name = "clear", NativeName = "/clear", Category = "Session" },
+                new GatewayCommand { Name = "model", NativeName = "/model", Category = "Session", AcceptsArgs = true },
             }
-        });
+        };
         await provider.LoadAsync();
+        bridge.RaiseStatus(ConnectionStatus.Connected);
         snapshots.Clear();
 
-        await provider.LoadHistoryAsync("main");
+        await provider.EnsureCommandCatalogAsync();
 
-        var entry = Assert.Single(snapshots[^1].Timelines["main"].Entries);
-        Assert.Equal(ChatTimelineItemKind.ToolCall, entry.Kind);
-        Assert.Equal(ChatToolCallStatus.Success, entry.ToolResult);
-        Assert.Equal("(no output)", entry.ToolOutput);
+        var snap = snapshots[^1];
+        Assert.True(snap.CommandsSupported);
+        Assert.NotNull(snap.AvailableCommands);
+        Assert.Equal(2, snap.AvailableCommands!.Count);
+        Assert.Contains(snap.AvailableCommands, c => c.Name == "clear");
     }
 
     [Fact]
-    public async Task LoadHistoryAsync_ToolRole_RendersAsDimStatusEntry()
+    public async Task EnsureCommandCatalogAsync_RequestsTextScopeAndExcludesNativeOnlyCommands()
     {
         var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
-        bridge.HistoryBehavior = _ => Task.FromResult(new ChatHistoryInfo
+        var mixedCatalog = new CommandCatalog
         {
-            SessionKey = "main",
-            Messages = new[]
+            IsSupported = true,
+            Commands = new[]
             {
-                new ChatMessageInfo { Role = "tool", Text = "tool transcript note", State = "final", Ts = 1 },
+                new GatewayCommand { Name = "open-native-panel", NativeName = "open-native-panel", Scope = "native" },
+                new GatewayCommand { Name = "review", NativeName = "/review", Scope = "text" },
+                new GatewayCommand { Name = "model", NativeName = "/model", Scope = "both" },
             }
+        };
+        bridge.ListCommandsBehavior = query => Task.FromResult(new CommandCatalog
+        {
+            IsSupported = mixedCatalog.IsSupported,
+            Commands = mixedCatalog.Commands.Where(c => query?.Matches(c) ?? true).ToArray(),
         });
         await provider.LoadAsync();
+        bridge.RaiseStatus(ConnectionStatus.Connected);
         snapshots.Clear();
 
-        await provider.LoadHistoryAsync("main");
+        await provider.EnsureCommandCatalogAsync();
 
-        var entry = Assert.Single(snapshots[^1].Timelines["main"].Entries);
-        Assert.Equal(ChatTimelineItemKind.Status, entry.Kind);
-        Assert.Equal(ChatTone.Dim, entry.Tone);
-        Assert.Equal("tool transcript note", entry.Text);
+        Assert.NotNull(bridge.LastListCommandsQuery);
+        Assert.Equal("text", bridge.LastListCommandsQuery!.Scope);
+        var commands = snapshots[^1].AvailableCommands!;
+        Assert.DoesNotContain(commands, c => c.Name == "open-native-panel");
+        Assert.Contains(commands, c => c.Name == "review");
+        Assert.Contains(commands, c => c.Name == "model");
     }
 
     [Fact]
-    public async Task LoadHistoryAsync_UnknownRole_FallsBackToVisibleAssistantEntry()
+    public async Task EnsureCommandCatalogAsync_Unsupported_FlipsSupportedFlag()
     {
         var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
-        bridge.HistoryBehavior = _ => Task.FromResult(new ChatHistoryInfo
-        {
-            SessionKey = "main",
-            Messages = new[]
-            {
-                new ChatMessageInfo { Role = "function", Text = "fallback text", State = "final", Ts = 1 },
-            }
-        });
+        bridge.CommandCatalogResult = new CommandCatalog { IsSupported = false };
         await provider.LoadAsync();
-        snapshots.Clear();
+        bridge.RaiseStatus(ConnectionStatus.Connected);
 
-        await provider.LoadHistoryAsync("main");
+        await provider.EnsureCommandCatalogAsync();
 
-        var timeline = snapshots[^1].Timelines["main"];
-        var entry = Assert.Single(timeline.Entries);
-        Assert.Equal(ChatTimelineItemKind.Assistant, entry.Kind);
-        Assert.Equal("fallback text", entry.Text);
-        Assert.False(timeline.TurnActive);
+        var snap = snapshots[^1];
+        // The UI renders the "unsupported" state from this flag.
+        Assert.False(snap.CommandsSupported);
     }
 
     [Fact]
-    public async Task LoadHistoryAsync_OutOfOrderTimestamps_AreSortedAscending()
+    public async Task EnsureCommandCatalogAsync_Exception_PublishesUnsupportedFallback()
     {
-        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
-        bridge.HistoryBehavior = _ => Task.FromResult(new ChatHistoryInfo
-        {
-            SessionKey = "main",
-            // Deliberately scrambled — provider must sort by Ts.
-            Messages = new[]
-            {
-                new ChatMessageInfo { Role = "assistant", Text = "Last",  State = "final", Ts = 30 },
-                new ChatMessageInfo { Role = "user",      Text = "First", State = "final", Ts = 10 },
-                new ChatMessageInfo { Role = "assistant", Text = "Mid",   State = "final", Ts = 20 },
-            }
-        });
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.ListCommandsBehavior = _ => Task.FromException<CommandCatalog>(
+            new InvalidOperationException("catalog unavailable"));
         await provider.LoadAsync();
+        bridge.RaiseStatus(ConnectionStatus.Connected);
         snapshots.Clear();
 
-        await provider.LoadHistoryAsync("main");
+        await provider.EnsureCommandCatalogAsync();
 
-        var timeline = snapshots[^1].Timelines["main"];
-        Assert.Equal(new[] { "First", "Mid", "Last" },
-            timeline.Entries.Select(e => e.Text).ToArray());
+        var snap = snapshots[^1];
+        Assert.False(snap.CommandsSupported);
+        Assert.NotNull(snap.AvailableCommands);
+        Assert.Empty(snap.AvailableCommands!);
+
+        await provider.EnsureCommandCatalogAsync();
+        // The fallback is cached for this connection so reopening the menu does
+        // not retry immediately and put the composer back into "loading".
+        Assert.Equal(1, bridge.ListCommandsCallCount);
     }
 
     [Fact]
-    public async Task LoadHistoryAsync_IsIdempotent()
+    public async Task EnsureCommandCatalogAsync_NotConnected_DoesNotFetch()
     {
-        var calls = 0;
         var (bridge, provider, _, _) = CreateProvider(new[] { MainSession() });
-        bridge.HistoryBehavior = _ => { calls++; return Task.FromResult(new ChatHistoryInfo { SessionKey = "main" }); };
+        bridge.CommandCatalogResult = new CommandCatalog { IsSupported = true };
         await provider.LoadAsync();
+        // Provider starts Disconnected (FakeBridge default).
 
-        await provider.LoadHistoryAsync("main");
-        await provider.LoadHistoryAsync("main");
-        await provider.LoadHistoryAsync("main");
+        await provider.EnsureCommandCatalogAsync();
 
-        Assert.Equal(1, calls);
+        // The command catalog is a property of the live connection; no fetch
+        // should be issued while disconnected.
+        Assert.Equal(0, bridge.ListCommandsCallCount);
     }
 
     [Fact]
-    public async Task LoadHistoryAsync_WhenRequestFails_NotifiesAndAllowsRetry()
+    public async Task CommandCatalog_NullBeforeFetch_ThenEmptyNonNullWhenLoadedEmpty()
     {
-        var calls = 0;
-        var (bridge, provider, snapshots, notifications) = CreateProvider(new[] { MainSession() });
-        bridge.HistoryBehavior = _ =>
-        {
-            calls++;
-            if (calls == 1)
-                throw new InvalidOperationException("history down");
-
-            return Task.FromResult(new ChatHistoryInfo
-            {
-                SessionKey = "main",
-                Messages = new[]
-                {
-                    new ChatMessageInfo { Role = "assistant", Text = "recovered", State = "final", Ts = 1 },
-                }
-            });
-        };
-        await provider.LoadAsync();
-        snapshots.Clear();
-
-        await provider.LoadHistoryAsync("main");
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.CommandCatalogResult = new CommandCatalog { IsSupported = true };
 
-        Assert.Contains(notifications, n =>
-            n.Kind == ChatProviderNotificationKind.Error &&
-            n.Message?.Contains("history down") == true);
-        Assert.Empty(snapshots);
+        // Before any commands.list fetch the catalog is null so the UI can
+        // distinguish "still loading" from "loaded but empty".
+        var initial = await provider.LoadAsync();
+        Assert.Null(initial.AvailableCommands);
 
-        await provider.LoadHistoryAsync("main");
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+        await provider.EnsureCommandCatalogAsync();
 
-        Assert.Equal(2, calls);
-        Assert.Contains(snapshots[^1].Timelines["main"].Entries, e =>
-            e.Kind == ChatTimelineItemKind.Assistant && e.Text == "recovered");
+        var snap = snapshots[^1];
+        Assert.True(snap.CommandsSupported);
+        Assert.NotNull(snap.AvailableCommands);
+        Assert.Empty(snap.AvailableCommands!);
     }
 
     [Fact]
-    public async Task SendMessageAsync_DoesNotForwardSessionIdToGateway()
+    public async Task EnsureCommandCatalogAsync_FetchesOnceThenReusesCache()
     {
-        // The live gateway rejects `sessionId` at the chat.send root with
-        // "unexpected property". The provider tracks sessionId from chat.history
-        // for client-side correlation but must not forward it. (Gateway client
-        // ignores the sessionId arg; bridge still receives it for future use.)
         var (bridge, provider, _, _) = CreateProvider(new[] { MainSession() });
-        bridge.HistoryBehavior = _ => Task.FromResult(new ChatHistoryInfo
+        bridge.CommandCatalogResult = new CommandCatalog
         {
-            SessionKey = "main",
-            SessionId = "sess-uuid-7"
-        });
+            IsSupported = true,
+            Commands = new[] { new GatewayCommand { Name = "clear", NativeName = "/clear" } }
+        };
         await provider.LoadAsync();
-        await provider.LoadHistoryAsync("main");
+        bridge.RaiseStatus(ConnectionStatus.Connected);
 
-        await provider.SendMessageAsync("main", "Ping");
+        await provider.EnsureCommandCatalogAsync();
+        await provider.EnsureCommandCatalogAsync();
 
-        // The bridge surface still receives the sessionId for tests / future
-        // protocol use, but the production gateway client drops it before
-        // serializing the chat.send request.
-        Assert.Equal("sess-uuid-7", bridge.SentSessionIds[0]);
+        // The catalog is cached after the first successful fetch; a second
+        // palette-open does not re-hit commands.list.
+        Assert.Equal(1, bridge.ListCommandsCallCount);
     }
 
     [Fact]
-    public async Task LoadHistoryAsync_PersistsSessionIdForFutureSends()
+    public async Task EnsureCommandCatalogAsync_RefetchesAfterReconnect()
     {
         var (bridge, provider, _, _) = CreateProvider(new[] { MainSession() });
-        bridge.HistoryBehavior = _ => Task.FromResult(new ChatHistoryInfo
+        bridge.CommandCatalogResult = new CommandCatalog
         {
-            SessionKey = "main",
-            SessionId = "sess-uuid-7"
-        });
+            IsSupported = true,
+            Commands = new[] { new GatewayCommand { Name = "clear", NativeName = "/clear" } }
+        };
         await provider.LoadAsync();
-        await provider.LoadHistoryAsync("main");
+        bridge.RaiseStatus(ConnectionStatus.Connected);
 
-        await provider.SendMessageAsync("main", "Ping");
+        await provider.EnsureCommandCatalogAsync();
+        Assert.Equal(1, bridge.ListCommandsCallCount);
 
-        Assert.Equal("sess-uuid-7", bridge.SentSessionIds[0]);
+        // Leaving Connected clears the cached catalog; the next palette-open
+        // re-fetches it.
+        bridge.RaiseStatus(ConnectionStatus.Disconnected);
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+
+        await provider.EnsureCommandCatalogAsync();
+        Assert.Equal(2, bridge.ListCommandsCallCount);
     }
 
     [Fact]
-    public async Task SendMessageAsync_WithoutHistory_PassesNullSessionId()
+    public async Task EnsureCommandCatalogAsync_DisconnectDuringFetch_DiscardsLateResult()
     {
         var (bridge, provider, _, _) = CreateProvider(new[] { MainSession() });
-        await provider.LoadAsync();
 
-        await provider.SendMessageAsync("main", "Ping");
+        // Gate the fetch so we can disconnect while it is in flight.
+        var release = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
+        bridge.ListCommandsBehavior = async _ =>
+        {
+            await release.Task;
+            return new CommandCatalog
+            {
+                IsSupported = true,
+                Commands = new[] { new GatewayCommand { Name = "stale", NativeName = "/stale" } }
+            };
+        };
+        await provider.LoadAsync();
+        bridge.RaiseStatus(ConnectionStatus.Connected);
 
-        Assert.Null(bridge.SentSessionIds[0]);
-    }
+        var fetch = provider.EnsureCommandCatalogAsync();
 
-    // ── Iteration 3: tool result, abort marker, reconnect history, models ──
+        // Disconnect while the fetch is still awaiting — this bumps the epoch.
+        bridge.RaiseStatus(ConnectionStatus.Disconnected);
 
-    [Fact]
-    public async Task AgentEvent_ToolResult_ExtractsResultContent()
-    {
-        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
-        await provider.LoadAsync();
+        // Now let the in-flight fetch complete; its result must be discarded.
+        release.SetResult(true);
+        await fetch;
 
-        bridge.RaiseAgent(MakeAgentEvent("tool",
-            """{"phase":"start","name":"powershell","args":{"command":"echo hi"}}"""));
-        bridge.RaiseAgent(MakeAgentEvent("tool",
-            """{"phase":"result","name":"powershell","result":{"content":"hi\n"}}"""));
+        var snapshots2 = new List<ChatDataSnapshot>();
+        provider.Changed += (_, e) => snapshots2.Add(e.Snapshot);
+        // Reconnect and fetch fresh — the stale "/stale" catalog must not appear.
+        bridge.ListCommandsBehavior = null;
+        bridge.CommandCatalogResult = new CommandCatalog
+        {
+            IsSupported = true,
+            Commands = new[] { new GatewayCommand { Name = "fresh", NativeName = "/fresh" } }
+        };
+        bridge.RaiseStatus(ConnectionStatus.Connected);
+        await provider.EnsureCommandCatalogAsync();
 
-        var timeline = snapshots[^1].Timelines["main"];
-        var entry = Assert.Single(timeline.Entries);
-        Assert.Equal(ChatToolCallStatus.Success, entry.ToolResult);
-        Assert.Equal("hi\n", entry.ToolOutput);
+        var snap = snapshots2[^1];
+        Assert.NotNull(snap.AvailableCommands);
+        Assert.Single(snap.AvailableCommands!);
+        Assert.Equal("fresh", snap.AvailableCommands![0].Name);
     }
 
     [Fact]
-    public async Task AgentEvent_ToolResult_FallsBackToOutputField()
+    public async Task EnsureCommandCatalogAsync_DisconnectBeforeDelivery_DropsStaleCommandSnapshot()
     {
-        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        var bridge = new FakeBridge
+        {
+            Sessions = new[] { MainSession() },
+            CurrentStatus = ConnectionStatus.Connected,
+            CommandCatalogResult = new CommandCatalog
+            {
+                IsSupported = true,
+                Commands = new[] { new GatewayCommand { Name = "stale", NativeName = "/stale" } }
+            }
+        };
+        // Manually-pumped post queue so we can interleave a disconnect between
+        // the commands.list snapshot's marshaled delivery being enqueued and run.
+        var queued = new List<Action>();
+        var provider = new OpenClawChatDataProvider(bridge, post: a => queued.Add(a));
+        var delivered = new List<ChatDataSnapshot>();
+        provider.Changed += (_, e) => delivered.Add(e.Snapshot);
+
         await provider.LoadAsync();
+        bridge.RaiseStatus(ConnectionStatus.Connected);
 
-        bridge.RaiseAgent(MakeAgentEvent("tool",
-            """{"phase":"start","name":"grep","args":{"pattern":"foo"}}"""));
-        // Some tools return output at data.output rather than data.result.content
-        bridge.RaiseAgent(MakeAgentEvent("tool",
-            """{"phase":"result","name":"grep","output":"line1\nline2"}"""));
+        await provider.EnsureCommandCatalogAsync(); // enqueues the command-catalog delivery
 
-        var timeline = snapshots[^1].Timelines["main"];
-        var entry = Assert.Single(timeline.Entries);
-        Assert.Equal("line1\nline2", entry.ToolOutput);
+        // Disconnect runs and is itself enqueued; drain the queue in order. The
+        // command-catalog delivery re-checks the epoch and, finding it bumped by
+        // the disconnect, drops itself — so the last delivered snapshot reflects
+        // the disconnect (no stale commands), not "connected + /stale".
+        bridge.RaiseStatus(ConnectionStatus.Disconnected);
+        foreach (var action in queued.ToArray())
+            action();
+
+        Assert.NotEmpty(delivered);
+        // The command-catalog delivery re-checks the epoch (bumped by the
+        // disconnect) and drops itself, so no delivered snapshot ever surfaces
+        // the now-stale command — regardless of marshaled delivery ordering.
+        Assert.DoesNotContain(delivered, s =>
+            s.AvailableCommands is { Count: > 0 } cmds && cmds.Any(c => c.Name == "stale"));
+        var last = delivered[^1];
+        Assert.True(last.AvailableCommands is null || last.AvailableCommands.Count == 0,
+            "A stale connected+commands snapshot must not be delivered after disconnect.");
+
+        await provider.DisposeAsync();
     }
 
     [Fact]
-    public async Task AgentEvent_ItemEndAfterCommandOutput_PreservesOutput()
+    public async Task LoadAsync_SeedsModelsFromBridgeSnapshot()
     {
-        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
-        await provider.LoadAsync();
+        var bridge = new FakeBridge
+        {
+            Sessions = new[] { MainSession() },
+            CurrentModels = new ModelsListInfo
+            {
+                Models = new List<ModelInfo> { new() { Id = "x", Name = "X" } }
+            }
+        };
+        var provider = new OpenClawChatDataProvider(bridge);
 
-        bridge.RaiseAgent(MakeAgentEvent("item",
-            """{"phase":"start","kind":"tool","title":"exec run command echo hi","itemId":"tool-1"}"""));
-        bridge.RaiseAgent(MakeAgentEvent("command_output",
-            """{"phase":"end","itemId":"tool-1","output":"hi\n"}"""));
-        bridge.RaiseAgent(MakeAgentEvent("item",
-            """{"phase":"end","kind":"tool","title":"exec run command echo hi","itemId":"tool-1"}"""));
+        var snap = await provider.LoadAsync();
 
-        var timeline = snapshots[^1].Timelines["main"];
-        var entry = Assert.Single(timeline.Entries);
-        Assert.Equal(ChatToolCallStatus.Success, entry.ToolResult);
-        Assert.Equal("hi\n", entry.ToolOutput);
+        Assert.Equal(new[] { "x" }, snap.AvailableModels);
     }
 
     [Fact]
-    public async Task AgentEvent_ToolError_ExtractsErrorText()
+    public async Task ModelsListUpdated_PopulatesProviderRichChoices()
     {
         var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
         await provider.LoadAsync();
+        snapshots.Clear();
 
-        bridge.RaiseAgent(MakeAgentEvent("tool",
-            """{"phase":"start","name":"web_fetch","args":{"url":"https://example"}}"""));
-        bridge.RaiseAgent(MakeAgentEvent("tool",
-            """{"phase":"error","name":"web_fetch","error":"timeout after 30s"}"""));
+        bridge.RaiseModels(new ModelsListInfo
+        {
+            Models = new List<ModelInfo>
+            {
+                new() { Id = "claude-opus-4.8", Name = "Claude Opus 4.8", Provider = "Anthropic", ContextWindow = 200000, IsDefault = true },
+                new() { Id = "gemini-3.1-pro", Name = "Gemini 3.1 Pro", Provider = "Google", ContextWindow = 1000000, RequiresAuth = true },
+                new() { Id = "local-llama", Provider = "Ollama", IsAvailable = false },
+            }
+        });
 
-        var timeline = snapshots[^1].Timelines["main"];
-        var entry = Assert.Single(timeline.Entries);
-        Assert.Equal(ChatToolCallStatus.Error, entry.ToolResult);
-        Assert.Equal("timeout after 30s", entry.ToolOutput);
-    }
+        var choices = snapshots[^1].ModelChoices;
+        Assert.NotNull(choices);
+        Assert.Equal(3, choices!.Count);
 
-    [Fact]
-    public async Task AgentEvent_ToolResult_TruncatesVeryLargeOutput()
-    {
-        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
-        await provider.LoadAsync();
+        Assert.Equal("claude-opus-4.8", choices[0].Id);
+        Assert.Equal("Anthropic/claude-opus-4.8", choices[0].SelectionId);
+        Assert.Equal("Claude Opus 4.8", choices[0].DisplayName);
+        Assert.Equal("Anthropic", choices[0].Provider);
+        Assert.Equal(200000, choices[0].ContextWindow);
+        Assert.True(choices[0].IsDefault);
 
-        var huge = new string('x', 10000);
-        bridge.RaiseAgent(MakeAgentEvent("tool",
-            """{"phase":"start","name":"read","args":{"path":"/big.txt"}}"""));
-        var resultJson = "{\"phase\":\"result\",\"name\":\"read\",\"result\":{\"content\":\"" + huge + "\"}}";
-        bridge.RaiseAgent(MakeAgentEvent("tool", resultJson));
+        Assert.True(choices[1].RequiresAuth);
+        Assert.False(choices[2].IsAvailable);
+        Assert.False(choices[2].IsSelectable);
 
-        var entry = snapshots[^1].Timelines["main"].Entries[0];
-        Assert.NotNull(entry.ToolOutput);
-        Assert.True(entry.ToolOutput!.Length < huge.Length, "expected truncation");
-        Assert.EndsWith("(truncated)", entry.ToolOutput);
+        // AvailableModels stays a parallel id list for back-compat.
+        Assert.Equal(new[] { "claude-opus-4.8", "gemini-3.1-pro", "local-llama" }, snapshots[^1].AvailableModels);
     }
 
     [Fact]
-    public async Task StopResponseAsync_DuringActiveTurn_AppendsAbortMarker()
+    public async Task ModelsListUpdated_DedupesChoicesById()
     {
         var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
         await provider.LoadAsync();
-
-        bridge.RaiseAgent(MakeAgentEvent("lifecycle", """{"phase":"start"}""", runId: "run-1"));
-        bridge.RaiseAgent(MakeAgentEvent("assistant", """{"delta":"partial answer"}"""));
         snapshots.Clear();
 
-        await provider.StopResponseAsync("main");
+        bridge.RaiseModels(new ModelsListInfo
+        {
+            Models = new List<ModelInfo>
+            {
+                new() { Id = "gpt-5.4", Name = "GPT-5.4" },
+                new() { Id = "gpt-5.4", Name = "GPT-5.4 (dupe)" },
+                new() { Id = "", Name = "no id" },
+            }
+        });
 
-        var timeline = snapshots[^1].Timelines["main"];
-        Assert.Contains(timeline.Entries, e =>
-            e.Kind == ChatTimelineItemKind.Status &&
-            e.Text.Equals("Aborted", StringComparison.OrdinalIgnoreCase) &&
-            e.Tone == ChatTone.Warning);
-        Assert.False(timeline.TurnActive);
-        Assert.Contains("partial answer", timeline.Entries.Select(e => e.Text));
+        var choices = snapshots[^1].ModelChoices!;
+        Assert.Single(choices);
+        Assert.Equal("gpt-5.4", choices[0].Id);
+        Assert.Equal("GPT-5.4", choices[0].DisplayName); // first wins
     }
 
     [Fact]
-    public async Task StopResponseAsync_WithoutActiveTurn_DoesNotAppendAbortMarker()
+    public async Task ModelsListUpdated_KeepsDuplicateRawModelIdsFromDifferentProviders()
     {
         var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
         await provider.LoadAsync();
         snapshots.Clear();
 
-        await provider.StopResponseAsync("main");
-
-        // Either no snapshot or snapshot timeline has no Status="Aborted".
-        if (snapshots.Count > 0)
+        bridge.RaiseModels(new ModelsListInfo
         {
-            var timeline = snapshots[^1].Timelines["main"];
-            Assert.DoesNotContain(timeline.Entries, e =>
-                e.Kind == ChatTimelineItemKind.Status &&
-                e.Text.Equals("Aborted", StringComparison.OrdinalIgnoreCase));
-        }
+            Models = new List<ModelInfo>
+            {
+                new() { Id = "gpt-5.4", Name = "GPT-5.4", Provider = "openai" },
+                new() { Id = "gpt-5.4", Name = "GPT-5.4 via OpenRouter", Provider = "openrouter" },
+            }
+        });
+
+        var choices = snapshots[^1].ModelChoices!;
+        Assert.Equal(2, choices.Count);
+        Assert.Equal("openai/gpt-5.4", choices[0].SelectionId);
+        Assert.Equal("openrouter/gpt-5.4", choices[1].SelectionId);
+        Assert.Equal(new[] { "gpt-5.4" }, snapshots[^1].AvailableModels);
     }
 
     [Fact]
-    public async Task Reconnect_AfterDisconnect_ReloadsHistoryForLoadedThreads()
+    public async Task SetModelAsync_ForwardsModelToBridge()
     {
-        var historyCalls = 0;
         var (bridge, provider, _, _) = CreateProvider(new[] { MainSession() });
-        var reloadObserved = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
-        bridge.HistoryBehavior = _ =>
-        {
-            historyCalls++;
-            if (historyCalls >= 2)
-                reloadObserved.TrySetResult();
-            return Task.FromResult(new ChatHistoryInfo { SessionKey = "main" });
-        };
-
         await provider.LoadAsync();
-        await provider.LoadHistoryAsync("main");
-        Assert.Equal(1, historyCalls);
-
-        // Drop and reconnect.
-        bridge.RaiseStatus(ConnectionStatus.Disconnected);
-        bridge.RaiseStatus(ConnectionStatus.Connected);
 
-        await reloadObserved.Task.WaitAsync(TimeSpan.FromSeconds(1));
+        await provider.SetModelAsync("main", "claude-opus-4.8");
 
-        Assert.Equal(2, historyCalls);
+        Assert.Equal(new[] { "main" }, bridge.PatchedModelKeys);
+        Assert.Equal(new[] { "claude-opus-4.8" }, bridge.PatchedModels);
     }
 
     [Fact]
-    public async Task Reconnect_FromConnectingToConnected_DoesNotReload()
+    public async Task SetModelAsync_EmptyModel_IsNoOp_NotSent()
     {
-        // The "just reconnected" condition should only fire on a transition
-        // from a non-Connected state to Connected — not on the initial
-        // Connecting → Connected boot sequence.
-        var historyCalls = 0;
-        var bridge = new FakeBridge { Sessions = new[] { MainSession() }, CurrentStatus = ConnectionStatus.Connected };
-        var provider = new OpenClawChatDataProvider(bridge);
-        bridge.HistoryBehavior = _ => { historyCalls++; return Task.FromResult(new ChatHistoryInfo { SessionKey = "main" }); };
+        var (bridge, provider, _, _) = CreateProvider(new[] { MainSession() });
         await provider.LoadAsync();
-        await provider.LoadHistoryAsync("main");
-        Assert.Equal(1, historyCalls);
 
-        // Already Connected → setting Connected again is a no-op.
-        bridge.RaiseStatus(ConnectionStatus.Connected);
-        // slopwatch-ignore: SW004 Negative async assertion needs a brief quiescence window to prove no reload fired.
-        for (int i = 0; i < 10; i++) await Task.Delay(10);
+        // The gateway's sessions.patch schema rejects an empty model (NonEmpty
+        // string); a blank Set is a no-op. Clearing goes through ClearModelAsync.
+        await provider.SetModelAsync("main", "");
+        await provider.SetModelAsync("main", "   ");
 
-        Assert.Equal(1, historyCalls);
+        Assert.Empty(bridge.PatchedModels);
+        Assert.Empty(bridge.ClearedModelKeys);
     }
 
     [Fact]
-    public async Task ModelsListUpdated_PopulatesAvailableModelsInSnapshot()
+    public async Task ClearModelAsync_ClearsOverrideViaBridge()
     {
-        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        var (bridge, provider, _, _) = CreateProvider(new[] { MainSession() });
         await provider.LoadAsync();
-        snapshots.Clear();
 
-        bridge.RaiseModels(new ModelsListInfo
-        {
-            Models = new List<ModelInfo>
-            {
-                new() { Id = "gpt-5.4", Name = "GPT-5.4" },
-                new() { Id = "claude-sonnet-4.6", Name = "Claude Sonnet 4.6" },
-                new() { Id = "ollama-only-id" }
-            }
-        });
+        // The picker's "Default" entry clears the session's model override
+        // (tri-state sessions.patch null) — distinct from a Set.
+        await provider.ClearModelAsync("main");
 
-        Assert.Equal(
-            new[] { "gpt-5.4", "claude-sonnet-4.6", "ollama-only-id" },
-            snapshots[^1].AvailableModels);
+        Assert.Equal(new[] { "main" }, bridge.ClearedModelKeys);
+        Assert.Empty(bridge.PatchedModels);
     }
 
     [Fact]
-    public async Task ModelsListUpdated_FiltersExplicitlyUnconfiguredModels()
+    public async Task SendMessageAsync_WaitsForInFlightModelPatchBeforeGatewaySend()
     {
+        var patchStarted = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        var releasePatch = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
         var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.PatchSessionModelBehavior = (_, _) =>
+        {
+            patchStarted.TrySetResult();
+            return releasePatch.Task;
+        };
         await provider.LoadAsync();
         snapshots.Clear();
 
-        bridge.RaiseModels(new ModelsListInfo
-        {
-            Models = new List<ModelInfo>
-            {
-                new() { Id = "gpt-5.4", IsConfigured = true, HasConfiguredFlag = true },
-                new() { Id = "gpt-5.5", IsConfigured = false, HasConfiguredFlag = true },
-                new() { Id = "legacy-gateway-model" }
-            }
-        });
+        var modelTask = provider.SetModelAsync("main", "openai/gpt-5.4");
+        var sendTask = provider.SendMessageAsync("main", "Hello");
+        await Task.Delay(50);
 
-        Assert.Equal(
-            new[] { "gpt-5.4", "legacy-gateway-model" },
-            snapshots[^1].AvailableModels);
+        Assert.Single(snapshots);
+        Assert.Empty(bridge.SentMessages);
+
+        await patchStarted.Task.WaitAsync(TimeSpan.FromSeconds(1));
+        releasePatch.SetResult();
+        await Task.WhenAll(modelTask, sendTask);
+
+        Assert.Equal(new[] { "openai/gpt-5.4" }, bridge.PatchedModels);
+        Assert.Equal(new[] { "Hello" }, bridge.SentMessages);
     }
 
     [Fact]
-    public async Task ModelsListUpdated_DedupesDisplayNames()
+    public async Task SendMessageAsync_ContinuesWhenInFlightModelPatchFails()
     {
+        var patchStarted = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        var releasePatch = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
         var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        bridge.PatchSessionModelBehavior = async (_, _) =>
+        {
+            patchStarted.SetResult();
+            await releasePatch.Task;
+            throw new InvalidOperationException("patch failed");
+        };
         await provider.LoadAsync();
+        snapshots.Clear();
 
-        bridge.RaiseModels(new ModelsListInfo
-        {
-            Models = new List<ModelInfo>
-            {
-                new() { Id = "gpt-5.4", Name = "GPT-5.4" },
-                new() { Id = "gpt-5.4-mirror", Name = "GPT-5.4" },
-            }
-        });
+        var modelTask = provider.SetModelAsync("main", "openai/gpt-5.4");
+        await patchStarted.Task.WaitAsync(TimeSpan.FromSeconds(1));
+        var sendTask = provider.SendMessageAsync("main", "Hello");
+        await Task.Delay(50);
 
-        // IDs are distinct ("gpt-5.4" vs "gpt-5.4-mirror"), so both appear.
-        Assert.Equal(2, snapshots[^1].AvailableModels.Length);
-        Assert.Equal("gpt-5.4", snapshots[^1].AvailableModels[0]);
-        Assert.Equal("gpt-5.4-mirror", snapshots[^1].AvailableModels[1]);
+        Assert.Empty(bridge.SentMessages);
+        releasePatch.SetResult();
+
+        await Assert.ThrowsAsync<InvalidOperationException>(() => modelTask);
+        await sendTask;
+
+        Assert.Equal(new[] { "openai/gpt-5.4" }, bridge.PatchedModels);
+        Assert.Equal(new[] { "Hello" }, bridge.SentMessages);
+        Assert.DoesNotContain(
+            snapshots.SelectMany(s => s.Timelines["main"].Entries),
+            e => e.Kind == ChatTimelineItemKind.Status && e.Text.Contains("patch failed"));
     }
 
     [Fact]
-    public async Task LoadAsync_SeedsModelsFromBridgeSnapshot()
+    public async Task ModelPatches_AreSerializedSoLatestSelectionCannotBeOvertaken()
     {
-        var bridge = new FakeBridge
+        var releaseFirst = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        var secondStarted = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        var (bridge, provider, _, _) = CreateProvider(new[] { MainSession() });
+        bridge.PatchSessionModelBehavior = (_, model) =>
         {
-            Sessions = new[] { MainSession() },
-            CurrentModels = new ModelsListInfo
-            {
-                Models = new List<ModelInfo> { new() { Id = "x", Name = "X" } }
-            }
+            if (model == "openai/gpt-5.4")
+                return releaseFirst.Task;
+            if (model == "openai/gpt-5.4-pro")
+                secondStarted.SetResult();
+            return Task.CompletedTask;
         };
-        var provider = new OpenClawChatDataProvider(bridge);
+        await provider.LoadAsync();
 
-        var snap = await provider.LoadAsync();
+        var firstTask = provider.SetModelAsync("main", "openai/gpt-5.4");
+        var secondTask = provider.SetModelAsync("main", "openai/gpt-5.4-pro");
+        await Task.Delay(50);
 
-        Assert.Equal(new[] { "x" }, snap.AvailableModels);
+        Assert.False(secondStarted.Task.IsCompleted);
+
+        releaseFirst.SetResult();
+        await Task.WhenAll(firstTask, secondTask);
+
+        Assert.True(secondStarted.Task.IsCompleted);
+        Assert.Equal(new[] { "openai/gpt-5.4", "openai/gpt-5.4-pro" }, bridge.PatchedModels);
     }
 
-    // ── Iteration 4: per-entry metadata (timestamp + model) ──
 
     [Fact]
     public async Task LoadHistoryAsync_CapturesPerEntryTimestamps()
@@ -2080,6 +5129,13 @@ public async Task SendMessageAsync_AssignsTimestampToLocalUserEntry()
 
         var before = DateTimeOffset.Now.AddSeconds(-1);
         await provider.SendMessageAsync("main", "hi");
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "user",
+            Text = "hi",
+            State = "final"
+        });
         var after = DateTimeOffset.Now.AddSeconds(1);
 
         var snap = await provider.LoadAsync();
@@ -2936,12 +5992,73 @@ public async Task SendMessageAsync_WithAttachment_SendsThroughInterface()
         await provider.SendMessageAsync("main", "Check this", default, new[] { attachment });
 
         Assert.Contains(bridge.SentMessages, m => m == "Check this");
+        var sentAttachment = Assert.Single(bridge.SentAttachments);
+        Assert.NotNull(sentAttachment);
+        Assert.Same(attachment, sentAttachment![0]);
+        Assert.Contains("test.txt", snapshots[^1].Timelines["main"].Entries.Single(e => e.Kind == ChatTimelineItemKind.User).Text);
+
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "user",
+            Text = "Check this",
+            State = "final"
+        });
+
         // The display text in the timeline should include the attachment indicator
         var timeline = snapshots[^1].Timelines["main"];
         var userEntry = timeline.Entries.Last(e => e.Kind == ChatTimelineItemKind.User);
         Assert.Contains("test.txt", userEntry.Text);
     }
 
+    [Fact]
+    public async Task SendMessageAsync_WithMultipleAttachments_SendsAndRendersAllMarkers()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        await provider.LoadAsync();
+
+        var fileAttachment = new ChatAttachment
+        {
+            Type = "file",
+            MimeType = "text/plain",
+            FileName = "notes.txt",
+            Content = Convert.ToBase64String(new byte[] { 1 }),
+            SizeBytes = 1
+        };
+        var imageAttachment = new ChatAttachment
+        {
+            Type = "image",
+            MimeType = "image/png",
+            FileName = "diagram.png",
+            Content = Convert.ToBase64String(new byte[] { 2, 3 }),
+            SizeBytes = 2
+        };
+
+        await provider.SendMessageAsync("main", "See both", default, new[] { fileAttachment, imageAttachment });
+
+        var sentAttachments = Assert.Single(bridge.SentAttachments);
+        Assert.NotNull(sentAttachments);
+        Assert.Collection(
+            sentAttachments!,
+            a => Assert.Same(fileAttachment, a),
+            a => Assert.Same(imageAttachment, a));
+        Assert.Equal(
+            "See both\n\u200B📎 notes.txt\n\u200B🖼️ diagram.png",
+            snapshots[^1].Timelines["main"].Entries.Single(e => e.Kind == ChatTimelineItemKind.User).Text);
+
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "user",
+            Text = "See both",
+            State = "final"
+        });
+
+        var timeline = snapshots[^1].Timelines["main"];
+        var userEntry = timeline.Entries.Last(e => e.Kind == ChatTimelineItemKind.User);
+        Assert.Equal("See both\n\u200B📎 notes.txt\n\u200B🖼️ diagram.png", userEntry.Text);
+    }
+
     [Fact]
     public async Task AttachmentMetadata_PersistsAndRehydratesFromHistory()
     {
@@ -2981,6 +6098,53 @@ await provider1.SendMessageAsync("main", "Check this", default, new[]
         Assert.Equal("Check this\n\u200B📎 test.txt", userEntry.Text);
     }
 
+    [Fact]
+    public async Task AttachmentMetadata_PersistsAndRehydratesMultipleAttachments()
+    {
+        using var tempDir = new TempDirectory();
+        var toolPath = Path.Combine(tempDir.DirectoryPath, "tool-metadata.json");
+        var attachmentPath = Path.Combine(tempDir.DirectoryPath, "attachment-metadata.json");
+        var sentTs = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
+
+        var (_, provider1, _, _) = CreateProvider(new[] { MainSession() }, toolPath, attachmentPath);
+        await provider1.LoadAsync();
+        await provider1.SendMessageAsync("main", "See both", default, new[]
+        {
+            new ChatAttachment
+            {
+                Type = "file",
+                MimeType = "text/plain",
+                FileName = "notes.txt",
+                Content = Convert.ToBase64String(new byte[] { 1 }),
+                SizeBytes = 1
+            },
+            new ChatAttachment
+            {
+                Type = "image",
+                MimeType = "image/png",
+                FileName = "diagram.png",
+                Content = Convert.ToBase64String(new byte[] { 2, 3 }),
+                SizeBytes = 2
+            }
+        });
+
+        var (bridge2, provider2, snapshots, _) = CreateProvider(new[] { MainSession() }, toolPath, attachmentPath);
+        bridge2.HistoryBehavior = key => Task.FromResult(new ChatHistoryInfo
+        {
+            SessionKey = key ?? "",
+            SessionId = "session-1",
+            Messages = new[]
+            {
+                new ChatMessageInfo { Role = "user", Text = "See both", State = "final", Ts = sentTs }
+            }
+        });
+
+        await provider2.LoadHistoryAsync("main");
+
+        var userEntry = snapshots[^1].Timelines["main"].Entries.Single(e => e.Kind == ChatTimelineItemKind.User);
+        Assert.Equal("See both\n\u200B📎 notes.txt\n\u200B🖼️ diagram.png", userEntry.Text);
+    }
+
     [Fact]
     public async Task AttachmentMetadata_RehydratesAttachmentOnlyHistoryMessage()
     {
@@ -3046,13 +6210,23 @@ public async Task AttachmentMetadata_DoesNotRehydratePastedMarkerTextWithoutSide
     [Fact]
     public async Task SendMessageAsync_WithoutAttachment_EscapesPastedMarkerText()
     {
-        var (_, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
         await provider.LoadAsync();
         snapshots.Clear();
 
         await provider.SendMessageAsync("main", "\u200B📎 spoof.txt");
 
-        var userEntry = snapshots[0].Timelines["main"].Entries.Single(e => e.Kind == ChatTimelineItemKind.User);
+        Assert.Equal("📎 spoof.txt", snapshots[^1].Timelines["main"].Entries.Single(e => e.Kind == ChatTimelineItemKind.User).Text);
+
+        bridge.RaiseChat(new ChatMessageInfo
+        {
+            SessionKey = "main",
+            Role = "user",
+            Text = "\u200B📎 spoof.txt",
+            State = "final"
+        });
+
+        var userEntry = snapshots[^1].Timelines["main"].Entries.Single(e => e.Kind == ChatTimelineItemKind.User);
         Assert.Equal("📎 spoof.txt", userEntry.Text);
     }
 
@@ -3226,14 +6400,14 @@ private static (FakeBridge bridge, OpenClawChatDataProvider provider, List<ChatD
     }
 
     [Fact]
-    public async Task SendMessageAsync_FreshInstall_OptimisticEntryKeyedByCanonicalSessionKey()
+    public async Task SendMessageAsync_FreshInstall_QueuedStateKeyedByCanonicalSessionKey()
     {
         // Regression for the zero-state bug: the user clicks a suggestion on
-        // a fresh install (zero sessions). The optimistic entry must land in
+        // a fresh install (zero sessions). The queued local state must land in
         // a timeline keyed by the gateway's canonical session key — NOT a
         // literal "main". Otherwise the gateway's chat events (which come
         // back keyed by the canonical key) build a SECOND timeline and the
-        // optimistic state is orphaned.
+        // pending state is orphaned.
         var (bridge, provider, snapshots) = CreateConnectedProvider("agent:main:main");
         await provider.LoadAsync();
 
@@ -3245,15 +6419,17 @@ public async Task SendMessageAsync_FreshInstall_OptimisticEntryKeyedByCanonicalS
         Assert.True(latest.Timelines.ContainsKey("agent:main:main"));
         Assert.False(latest.Timelines.ContainsKey("main"),
             "The provider must never key timelines by the literal 'main' alias.");
-        Assert.Single(latest.Timelines["agent:main:main"].Entries, e => e.Kind == ChatTimelineItemKind.User);
+        Assert.Single(latest.Timelines["agent:main:main"].Entries, e =>
+            e.Kind == ChatTimelineItemKind.User && e.Text == "hi");
+        Assert.Empty(GetQueuedMessages(latest, "agent:main:main"));
     }
 
     [Fact]
     public async Task SendMessageAsync_FreshInstall_SnapshotExposesComposeOnlyTimeline()
     {
         // Before the first SessionsUpdated arrives, the gateway-side session
-        // doesn't exist yet, so Threads is empty. But the optimistic user
-        // bubble must still be reachable to the UI: it's stored under the
+        // doesn't exist yet, so Threads is empty. But the queued user message
+        // must still be reachable to the UI: it's stored under the
         // compose-target key. The UI then synthesizes a compose-only thread
         // (matching the canonical key) so the timeline can render.
         var (_, provider, snapshots) = CreateConnectedProvider("agent:main:main");
@@ -3263,18 +6439,18 @@ public async Task SendMessageAsync_FreshInstall_SnapshotExposesComposeOnlyTimeli
 
         var latest = snapshots[^1];
         // BuildSnapshotLocked surfaces a synthetic ChatThread when the
-        // compose key has optimistic entries but isn't materialized yet.
+        // compose key has queued/active local state but isn't materialized yet.
         Assert.Single(latest.Threads);
         Assert.Equal("agent:main:main", latest.Threads[0].Id);
         Assert.Equal("agent:main:main", latest.ComposeTarget.SessionKey);
     }
 
     [Fact]
-    public async Task SessionsUpdated_AfterFirstSend_PreservesOptimisticTimeline()
+    public async Task SessionsUpdated_AfterFirstSend_PreservesQueuedLocalState()
     {
         // The critical assertion: when the gateway materializes the session
-        // and emits SessionsUpdated with the canonical key, the optimistic
-        // entry that was written under that exact key SURVIVES (no second
+        // and emits SessionsUpdated with the canonical key, the direct local
+        // state that was written under that exact key SURVIVES (no second
         // empty timeline gets created on top of it).
         var (bridge, provider, snapshots) = CreateConnectedProvider("agent:main:main");
         await provider.LoadAsync();
@@ -3289,8 +6465,8 @@ public async Task SessionsUpdated_AfterFirstSend_PreservesOptimisticTimeline()
         Assert.Single(latest.Threads);
         Assert.Equal("agent:main:main", latest.Threads[0].Id);
         var timeline = latest.Timelines["agent:main:main"];
-        Assert.Single(timeline.Entries, e => e.Kind == ChatTimelineItemKind.User);
-        Assert.Equal("hi", timeline.Entries.First(e => e.Kind == ChatTimelineItemKind.User).Text);
+        Assert.Single(timeline.Entries, e => e.Kind == ChatTimelineItemKind.User && e.Text == "hi");
+        Assert.Empty(GetQueuedMessages(latest, "agent:main:main"));
     }
 
     [Fact]
@@ -3542,6 +6718,30 @@ public async Task RespondToPermissionAsync_DenyRoutesDenyThroughRpcAndClearsBann
         Assert.Null(snapshots[^1].Timelines["main"].PendingPermission);
     }
 
+    [Fact]
+    public async Task RespondToPermissionAsync_AllowAlwaysRoutesAllowAlwaysThroughRpcAndMarksAlwaysAllowed()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        await provider.LoadAsync();
+
+        bridge.RaiseAgent(MakeApprovalRequestedEvent("appr-always-1"));
+        var pendingEntry = Assert.Single(snapshots[^1].Timelines["main"].Entries,
+            e => e.Kind == ChatTimelineItemKind.PermissionRequest);
+        Assert.Contains(ChatPermissionActionKeys.AllowAlways, pendingEntry.PermissionActions!);
+
+        await provider.RespondToPermissionAsync("main", "appr-always-1", ChatPermissionActionKeys.AllowAlways);
+
+        Assert.Single(bridge.ResolvedApprovals);
+        Assert.Equal("appr-always-1", bridge.ResolvedApprovals[0].Id);
+        Assert.Equal("allow-always", bridge.ResolvedApprovals[0].Decision);
+        Assert.Empty(bridge.SentMessages);
+
+        var decidedEntry = Assert.Single(snapshots[^1].Timelines["main"].Entries,
+            e => e.Kind == ChatTimelineItemKind.PermissionRequest);
+        Assert.Equal(ChatPermissionDecision.AllowedAlways, decidedEntry.PermissionDecision);
+        Assert.Null(snapshots[^1].Timelines["main"].PendingPermission);
+    }
+
     [Fact]
     public async Task RespondToPermissionAsync_RpcThrows_BannerPreservedForRetry()
     {
@@ -3591,6 +6791,21 @@ public async Task ResolvedEcho_WithAllowDecision_MarksEntryAllowedNotExpired()
         Assert.Null(snapshots[^1].Timelines["main"].PendingPermission);
     }
 
+    [Fact]
+    public async Task ResolvedEcho_WithAllowAlwaysDecision_MarksEntryAlwaysAllowed()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        await provider.LoadAsync();
+
+        bridge.RaiseAgent(MakeApprovalRequestedEvent("appr-echo-always"));
+        bridge.RaiseAgent(MakeApprovalResolvedEvent("appr-echo-always", phase: "resolved", decision: "allow-always"));
+
+        var entry = Assert.Single(snapshots[^1].Timelines["main"].Entries,
+            e => e.Kind == ChatTimelineItemKind.PermissionRequest);
+        Assert.Equal(ChatPermissionDecision.AllowedAlways, entry.PermissionDecision);
+        Assert.Null(snapshots[^1].Timelines["main"].PendingPermission);
+    }
+
     [Fact]
     public async Task ResolvedEcho_WithDenyDecision_MarksEntryDeniedNotExpired()
     {
@@ -3624,6 +6839,24 @@ public async Task ResolvedEcho_WithNonDecidedTerminalPhase_StaysExpired()
         Assert.Null(snapshots[^1].Timelines["main"].PendingPermission);
     }
 
+    [Fact]
+    public async Task ResolvedEcho_WithExpiredPhaseAndAllowDecision_StaysExpired()
+    {
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        await provider.LoadAsync();
+
+        bridge.RaiseAgent(MakeApprovalRequestedEvent("appr-echo-expired-allow"));
+        bridge.RaiseAgent(MakeApprovalResolvedEvent(
+            "appr-echo-expired-allow",
+            phase: "expired",
+            decision: ChatPermissionActionKeys.AllowAlways));
+
+        var entry = Assert.Single(snapshots[^1].Timelines["main"].Entries,
+            e => e.Kind == ChatTimelineItemKind.PermissionRequest);
+        Assert.Equal(ChatPermissionDecision.Expired, entry.PermissionDecision);
+        Assert.Null(snapshots[^1].Timelines["main"].PendingPermission);
+    }
+
     [Fact]
     public async Task ApprovalRequested_DedupesUuidFirstSlugTwin_AndSlugOnlyResolvedClearsBanner()
     {
@@ -3680,11 +6913,117 @@ public async Task ApprovalRequested_DedupesSlugFirstUuidTwin_AndUuidOnlyResolved
         Assert.Null(snapshots[^1].Timelines["main"].PendingPermission);
     }
 
+    [Fact]
+    public async Task LocalExecApproval_InlineDecisionCompletesPromptAndAddsHistoryResult()
+    {
+        var (_, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        await provider.LoadAsync();
+        snapshots.Clear();
+
+        var promptTask = provider.RequestLocalExecApprovalAsync(new ExecApprovalPromptRequest
+        {
+            Command = "del \"E:\\Temp\\sample.txt\"",
+            Shell = "auto",
+            Reason = "No matching rule; default policy applied",
+            SessionKey = "main",
+            CorrelationId = "abc12345"
+        });
+
+        Assert.False(promptTask.IsCompleted);
+        var pendingTimeline = snapshots[^1].Timelines["main"];
+        var pendingEntry = Assert.Single(pendingTimeline.Entries,
+            e => e.Kind == ChatTimelineItemKind.PermissionRequest);
+        Assert.Equal("local-abc12345", pendingEntry.PermissionRequestId);
+        Assert.Contains(ChatPermissionActionKeys.AllowOnce, pendingEntry.PermissionActions!);
+        Assert.Contains(ChatPermissionActionKeys.AllowAlways, pendingEntry.PermissionActions!);
+        Assert.Contains(ChatPermissionActionKeys.Deny, pendingEntry.PermissionActions!);
+
+        await provider.RespondToPermissionAsync("main", "local-abc12345", ChatPermissionActionKeys.AllowAlways);
+
+        var decision = await promptTask;
+        Assert.Equal(ExecApprovalPromptDecisionKind.AlwaysAllow, decision!.Kind);
+
+        var decidedTimeline = snapshots[^1].Timelines["main"];
+        var decidedEntry = Assert.Single(decidedTimeline.Entries,
+            e => e.Kind == ChatTimelineItemKind.PermissionRequest);
+        Assert.Equal(ChatPermissionDecision.AllowedAlways, decidedEntry.PermissionDecision);
+        Assert.Contains(decidedTimeline.Entries, e =>
+            e.Kind == ChatTimelineItemKind.Status &&
+            e.Text.Contains("Always allow", StringComparison.Ordinal) &&
+            e.Text.Contains("del \"E:\\Temp\\sample.txt\"", StringComparison.Ordinal));
+    }
+
+    [Fact]
+    public async Task LocalExecApproval_SyntheticThreadUsesCachedModelProvider()
+    {
+        var session = MainSession();
+        session.Model = "gpt-5.4";
+        session.Provider = "openrouter";
+        var (bridge, provider, snapshots, _) = CreateProvider(new[] { session });
+        await provider.LoadAsync();
+        Assert.Equal("gpt-5.4", provider.CachedLastChatState?.Model);
+        Assert.Equal("openrouter", provider.CachedLastChatState?.ModelProvider);
+        bridge.RaiseSessions(Array.Empty<SessionInfo>());
+        Assert.Equal("gpt-5.4", provider.CachedLastChatState?.Model);
+        Assert.Equal("openrouter", provider.CachedLastChatState?.ModelProvider);
+        snapshots.Clear();
+
+        var promptTask = provider.RequestLocalExecApprovalAsync(new ExecApprovalPromptRequest
+        {
+            Command = "tasklist",
+            Shell = "cmd",
+            SessionKey = "main",
+            CorrelationId = "provider-context"
+        });
+
+        var synthetic = Assert.Single(snapshots[^1].Threads, t => t.Id == "main");
+        Assert.Equal("gpt-5.4", synthetic.Model);
+        Assert.Equal("openrouter", synthetic.ModelProvider);
+
+        await provider.RespondToPermissionAsync("main", "local-provider-context", ChatPermissionActionKeys.Deny);
+        await promptTask;
+    }
+
+    [Fact]
+    public async Task LocalExecApproval_TimeoutExpiresEntryAndCompletesAsTimedOutDeny()
+    {
+        var (_, provider, snapshots, _) = CreateProvider(new[] { MainSession() });
+        await provider.LoadAsync();
+        snapshots.Clear();
+
+        var promptTask = provider.RequestLocalExecApprovalAsync(new ExecApprovalPromptRequest
+        {
+            Command = "tasklist",
+            Shell = "cmd",
+            SessionKey = "main",
+            CorrelationId = "timeout1"
+        }, approvalTimeout: TimeSpan.FromMilliseconds(10));
+
+        var decision = await promptTask.WaitAsync(TimeSpan.FromSeconds(2));
+
+        Assert.NotNull(decision);
+        Assert.Equal(ExecApprovalPromptDecisionKind.Deny, decision!.Kind);
+        Assert.Equal(ExecApprovalPromptDecision.TimedOutReason, decision.Reason);
+
+        var timedOutTimeline = snapshots[^1].Timelines["main"];
+        var timedOutEntry = Assert.Single(timedOutTimeline.Entries,
+            e => e.Kind == ChatTimelineItemKind.PermissionRequest);
+        Assert.Equal(ChatPermissionDecision.Expired, timedOutEntry.PermissionDecision);
+        Assert.Null(timedOutTimeline.PendingPermission);
+    }
+
+    private static async Task WaitForConditionAsync(Func<bool> condition, int attempts = 50)
+    {
+        for (var i = 0; i < attempts && !condition(); i++)
+            await Task.Delay(10);
+    }
+
     private static AgentEventInfo MakeApprovalResolvedEvent(
         string approvalId,
         string phase,
         string sessionKey = "main",
-        string? approvalSlug = null)
+        string? approvalSlug = null,
+        string? decision = null)
     {
         // Mirrors the flat envelope that OpenClawGatewayClient.HandleExecApprovalEvent
         // synthesizes from a top-level exec.approval.resolved broadcast.
@@ -3693,6 +7032,7 @@ private static AgentEventInfo MakeApprovalResolvedEvent(
               "phase": "{{phase}}",
               "approvalId": "{{approvalId}}",
               "approvalSlug": "{{approvalSlug ?? approvalId}}",
+              "decision": "{{decision ?? ""}}",
               "host": "gateway",
               "command": "openclaw nodes invoke --node \"Windows Node\" --command system.run",
               "agentId": "main"
@@ -3713,6 +7053,40 @@ public void LoadLastChatState_WithCorruptedJson_ReturnsNull()
         Assert.Null(state);
     }
 
+    private static IReadOnlyList<ChatQueuedMessage> GetQueuedMessages(ChatDataSnapshot snapshot, string threadId)
+        => snapshot.QueuedMessagesByThread is not null &&
+           snapshot.QueuedMessagesByThread.TryGetValue(threadId, out var queued)
+            ? queued
+            : Array.Empty<ChatQueuedMessage>();
+
+    private static ISet<string> GetQueuedDrainScheduledThreads(OpenClawChatDataProvider provider)
+    {
+        var field = typeof(OpenClawChatDataProvider).GetField(
+            "_queuedDrainScheduledThreads",
+            System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic);
+        Assert.NotNull(field);
+        return Assert.IsAssignableFrom<ISet<string>>(field.GetValue(provider));
+    }
+
+    private static bool HasFailedQueuedMessage(ChatDataSnapshot snapshot, string threadId, string text) =>
+        GetQueuedMessages(snapshot, threadId).Any(message =>
+            message.Text == text &&
+            message.SendState == ChatQueuedMessageSendState.Failed);
+
+    private static void AssertNoQueuedTranscriptDuplicate(
+        IEnumerable<ChatDataSnapshot> snapshots,
+        string threadId,
+        string text)
+    {
+        foreach (var snapshot in snapshots)
+        {
+            var hasQueued = GetQueuedMessages(snapshot, threadId).Any(message => message.Text == text);
+            var hasTranscript = snapshot.Timelines.TryGetValue(threadId, out var timeline)
+                && timeline.Entries.Any(entry => entry.Kind == ChatTimelineItemKind.User && entry.Text == text);
+            Assert.False(hasQueued && hasTranscript, $"'{text}' was visible in both queue and transcript.");
+        }
+    }
+
     private sealed class TestLogger : OpenClaw.Shared.IOpenClawLogger
     {
         public void Debug(string message) { }
diff --git a/tests/OpenClaw.Tray.Tests/PairingApprovalCoordinatorTests.cs b/tests/OpenClaw.Tray.Tests/PairingApprovalCoordinatorTests.cs
new file mode 100644
index 000000000..ffdeecbee
--- /dev/null
+++ b/tests/OpenClaw.Tray.Tests/PairingApprovalCoordinatorTests.cs
@@ -0,0 +1,181 @@
+using System.Text.Json;
+using OpenClaw.Shared;
+using OpenClawTray.Services;
+
+namespace OpenClaw.Tray.Tests;
+
+public sealed class PairingApprovalCoordinatorTests
+{
+    [Fact]
+    public async Task ApproveAsync_WhenClientChangesBeforeAck_DoesNotMarkSubmitted()
+    {
+        var originalClient = new FakeOperatorGatewayClient();
+        var replacementClient = new FakeOperatorGatewayClient();
+        var approveGate = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
+        originalClient.DeviceApproveResult = approveGate.Task;
+        IOperatorGatewayClient? currentClient = originalClient;
+        var coordinator = NewCoordinator(() => currentClient);
+
+        coordinator.OnPairListsUpdated(Devices(Device("req-1")), null);
+        var approval = Assert.Single(coordinator.Current);
+
+        var approveTask = coordinator.ApproveAsync(approval.Key);
+        Assert.Equal(1, originalClient.DeviceApproveCalls);
+
+        currentClient = replacementClient;
+        approveGate.SetResult(true);
+        var result = await approveTask;
+
+        Assert.False(result);
+        Assert.Single(coordinator.Current);
+        Assert.Equal(0, originalClient.DeviceListRequests);
+        Assert.Equal(0, replacementClient.DeviceListRequests);
+    }
+
+    [Fact]
+    public async Task ApproveAsync_WhenSameClientAcks_RecordsSubmissionAndRefreshesList()
+    {
+        var client = new FakeOperatorGatewayClient();
+        var coordinator = NewCoordinator(() => client);
+
+        coordinator.OnPairListsUpdated(Devices(Device("req-1")), null);
+        var approval = Assert.Single(coordinator.Current);
+
+        var result = await coordinator.ApproveAsync(approval.Key);
+
+        Assert.True(result);
+        Assert.Empty(coordinator.Current);
+        Assert.Equal(1, client.DeviceApproveCalls);
+        Assert.Equal(1, client.DeviceListRequests);
+    }
+
+    private static PairingApprovalCoordinator NewCoordinator(Func<IOperatorGatewayClient?> getClient) =>
+        new(
+            getClient,
+            getOwnNodeIds: () => Array.Empty<string>(),
+            isPromptEnabled: () => true,
+            logger: NullLogger.Instance);
+
+    private static DevicePairingListInfo Devices(params DevicePairingRequest[] requests) =>
+        new() { Pending = requests.ToList() };
+
+    private static DevicePairingRequest Device(string requestId) =>
+        new()
+        {
+            RequestId = requestId,
+            DeviceId = $"device-{requestId}",
+            DisplayName = requestId,
+            Scopes = ["operator.read"],
+        };
+
+#pragma warning disable CS0067
+    private sealed class FakeOperatorGatewayClient : IOperatorGatewayClient
+    {
+        public Task<bool> DeviceApproveResult { get; set; } = Task.FromResult(true);
+        public int DeviceApproveCalls { get; private set; }
+        public int DeviceListRequests { get; private set; }
+        public string? OperatorDeviceId => "operator";
+        public IReadOnlyList<string> GrantedOperatorScopes { get; set; } = ["operator.admin"];
+        public bool IsConnectedToGateway { get; set; } = true;
+        public string? MainSessionKey => "main";
+        public bool HasHandshakeSnapshot => true;
+
+        public event EventHandler<OpenClawNotification>? NotificationReceived;
+        public event EventHandler<AgentActivity>? ActivityChanged;
+        public event EventHandler<ChannelHealth[]>? ChannelHealthUpdated;
+        public event EventHandler<SessionInfo[]>? SessionsUpdated;
+        public event EventHandler<GatewayUsageInfo>? UsageUpdated;
+        public event EventHandler<GatewayUsageStatusInfo>? UsageStatusUpdated;
+        public event EventHandler<GatewayCostUsageInfo>? UsageCostUpdated;
+        public event EventHandler<GatewayNodeInfo[]>? NodesUpdated;
+        public event EventHandler<SessionsPreviewPayloadInfo>? SessionPreviewUpdated;
+        public event EventHandler<SessionCommandResult>? SessionCommandCompleted;
+        public event EventHandler<GatewaySelfInfo>? GatewaySelfUpdated;
+        public event EventHandler<JsonElement>? CronListUpdated;
+        public event EventHandler<JsonElement>? CronStatusUpdated;
+        public event EventHandler<JsonElement>? CronRunsUpdated;
+        public event EventHandler<JsonElement>? SkillsStatusUpdated;
+        public event EventHandler<JsonElement>? ConfigUpdated;
+        public event EventHandler<JsonElement>? ConfigSchemaUpdated;
+        public event EventHandler<AgentEventInfo>? AgentEventReceived;
+        public event EventHandler<PairingListInfo>? NodePairListUpdated;
+        public event EventHandler<DevicePairingListInfo>? DevicePairListUpdated;
+        public event EventHandler<ModelsListInfo>? ModelsListUpdated;
+        public event EventHandler<PresenceEntry[]>? PresenceUpdated;
+        public event EventHandler<JsonElement>? AgentsListUpdated;
+        public event EventHandler<JsonElement>? AgentFilesListUpdated;
+        public event EventHandler<JsonElement>? AgentFileContentUpdated;
+        public event EventHandler<AgentEventInfo>? ChatEventReceived;
+        public event EventHandler<ConnectionStatus>? StatusChanged;
+        public event EventHandler<string>? AuthenticationFailed;
+        public event EventHandler<DeviceTokenReceivedEventArgs>? DeviceTokenReceived;
+        public event EventHandler? HandshakeSucceeded;
+
+        public void SetUserRules(IReadOnlyList<UserNotificationRule>? rules) { }
+        public void SetPreferStructuredCategories(bool value) { }
+        public Task SendChatMessageAsync(string message, string? sessionKey = null) => Task.CompletedTask;
+        public Task<ChatHistoryInfo> RequestChatHistoryAsync(string? sessionKey = null, int timeoutMs = 15000) =>
+            Task.FromResult(new ChatHistoryInfo { SessionKey = sessionKey ?? "" });
+        public Task<ChatSendResult> SendChatMessageForRunAsync(string message, string? sessionKey = null) => Task.FromResult(new ChatSendResult());
+        public Task CheckHealthAsync() => Task.CompletedTask;
+        public Task RequestSessionsAsync(string? agentId = null) => Task.CompletedTask;
+        public Task RequestUsageAsync() => Task.CompletedTask;
+        public Task RequestNodesAsync() => Task.CompletedTask;
+        public Task RequestUsageStatusAsync() => Task.CompletedTask;
+        public Task RequestUsageCostAsync(int days = 30) => Task.CompletedTask;
+        public Task RequestSessionPreviewAsync(string[] keys, int limit = 12, int maxChars = 240) => Task.CompletedTask;
+        public Task<bool> PatchSessionAsync(string key, string? model = null, string? thinkingLevel = null, string? verboseLevel = null) => Task.FromResult(false);
+        public Task<bool> ResetSessionAsync(string key) => Task.FromResult(false);
+        public Task<bool> DeleteSessionAsync(string key, bool deleteTranscript = true) => Task.FromResult(false);
+        public Task<bool> CompactSessionAsync(string key, int maxLines = 400) => Task.FromResult(false);
+        public Task RequestCronListAsync() => Task.CompletedTask;
+        public Task RequestCronStatusAsync() => Task.CompletedTask;
+        public Task<bool> RunCronJobAsync(string jobId, bool force = true) => Task.FromResult(false);
+        public Task<CronRunRequestResult> RunCronJobDetailedAsync(string jobId, bool force = true, int timeoutMs = 12000) =>
+            Task.FromResult(CronRunRequestResult.NotAccepted("not implemented"));
+        public Task<bool> RemoveCronJobAsync(string jobId) => Task.FromResult(false);
+        public Task<bool> AddCronJobAsync(object jobDefinition) => Task.FromResult(false);
+        public Task<bool> UpdateCronJobAsync(string id, object patch) => Task.FromResult(false);
+        public Task RequestCronRunsAsync(string? id = null, int limit = 20, int offset = 0) => Task.CompletedTask;
+        public Task RequestSkillsStatusAsync(string? agentId = null) => Task.CompletedTask;
+        public Task<bool> InstallSkillAsync(string skillId) => Task.FromResult(false);
+        public Task<bool> SetSkillEnabledAsync(string skillKey, bool enabled) => Task.FromResult(false);
+        public Task RequestConfigAsync() => Task.CompletedTask;
+        public Task RequestConfigSchemaAsync() => Task.CompletedTask;
+        public Task<bool> SetConfigAsync(string path, object value) => Task.FromResult(false);
+        public Task<bool> PatchConfigAsync(JsonElement fullConfig, string? baseHash) => Task.FromResult(false);
+        public Task<ConfigPatchResult> PatchConfigDetailedAsync(JsonElement fullConfig, string? baseHash, int timeoutMs = 15000) =>
+            Task.FromResult(new ConfigPatchResult { Ok = false, Error = "stub" });
+        public Task RequestAgentsListAsync() => Task.CompletedTask;
+        public Task RequestAgentFilesListAsync(string agentId = "main") => Task.CompletedTask;
+        public Task RequestAgentFileGetAsync(string agentId, string name) => Task.CompletedTask;
+        public Task RequestModelsListAsync() => Task.CompletedTask;
+        public Task RequestNodePairListAsync() => Task.CompletedTask;
+        public Task<bool> NodePairApproveAsync(string requestId) => Task.FromResult(false);
+        public Task<bool> NodePairRejectAsync(string requestId) => Task.FromResult(false);
+        public Task<NodeForgetResult> NodePairRemoveAsync(string nodeId) => Task.FromResult(new NodeForgetResult(false, "stub"));
+        public Task<NodeRenameResult> NodeRenameAsync(string nodeId, string displayName) => Task.FromResult(new NodeRenameResult(false, ErrorMessage: "stub"));
+        public Task RequestDevicePairListAsync()
+        {
+            DeviceListRequests++;
+            return Task.CompletedTask;
+        }
+
+        public Task<bool> DevicePairApproveAsync(string requestId)
+        {
+            DeviceApproveCalls++;
+            return DeviceApproveResult;
+        }
+
+        public Task<bool> DevicePairRejectAsync(string requestId) => Task.FromResult(false);
+        public Task<bool> StartChannelAsync(string channelName) => Task.FromResult(false);
+        public Task<ChannelStartResult?> StartChannelDetailedAsync(string channelName, int timeoutMs = 12000) => Task.FromResult<ChannelStartResult?>(null);
+        public Task<bool> StopChannelAsync(string channelName) => Task.FromResult(false);
+        public Task<ChannelsStatusSnapshot?> GetChannelsStatusAsync(bool probe = false, int timeoutMs = 12000) => Task.FromResult<ChannelsStatusSnapshot?>(null);
+        public Task<bool> LogoutChannelAsync(string channelName, int timeoutMs = 12000) => Task.FromResult(false);
+        public Task<WebLoginStartResult?> WebLoginStartAsync(bool force = false, int timeoutMs = 30000) => Task.FromResult<WebLoginStartResult?>(null);
+        public Task<WebLoginWaitResult?> WebLoginWaitAsync(string? currentQrDataUrl = null, int timeoutMs = 30000) => Task.FromResult<WebLoginWaitResult?>(null);
+        public Task<JsonElement> SendWizardRequestAsync(string method, object? parameters = null, int timeoutMs = 30000) => Task.FromResult(default(JsonElement));
+    }
+#pragma warning restore CS0067
+}
diff --git a/tests/OpenClaw.Tray.Tests/SecretRedactorTests.cs b/tests/OpenClaw.Tray.Tests/SecretRedactorTests.cs
index 944bd7555..851e4a315 100644
--- a/tests/OpenClaw.Tray.Tests/SecretRedactorTests.cs
+++ b/tests/OpenClaw.Tray.Tests/SecretRedactorTests.cs
@@ -94,4 +94,73 @@ public void IsSecret_RootRegistered_DoesNotMatchEverything()
         Assert.False(SecretRedactor.IsSecret("/profile/name", registered));
         Assert.True(SecretRedactor.IsSecret("/profile/password", registered));
     }
+
+    [Fact]
+    public void RedactInPlace_RootRegistered_RedactsWholeRoot()
+    {
+        var registered = new HashSet<string> { "/" };
+        var root = JsonNode.Parse("""{ "value": "1234", "profile": { "name": "alice" } }""")!;
+
+        var redacted = SecretRedactor.RedactInPlace(root, registered)!;
+
+        Assert.Equal("[REDACTED]", redacted.GetValue<string>());
+    }
+
+    [Fact]
+    public void Redact_RegisteredSecretInsideArray_IsRedacted()
+    {
+        // An obscured TextField bound to "/codes/0" registers that element path.
+        // After a valueArray seeds "/codes" as ["1234","5678"], the snapshot/dump
+        // path must redact the registered element — arrays previously only
+        // recursed (leaving scalar elements untouched).
+        var registered = new HashSet<string> { "/codes/0" };
+        var root = JsonNode.Parse("""{ "codes": ["1234", "5678"] }""")!;
+
+        var redacted = SecretRedactor.Redact(root, registered)!;
+
+        var arr = Assert.IsType<JsonArray>(redacted["codes"]);
+        Assert.Equal("[REDACTED]", (string?)arr[0]);
+        Assert.Equal("5678", (string?)arr[1]);
+    }
+
+    [Theory]
+    [InlineData("/codes/01")]
+    [InlineData("/codes/+1")]
+    [InlineData("/codes/ 1")]
+    public void Redact_NonCanonicalRegisteredArrayIndex_RedactsCanonicalElement(string registeredPath)
+    {
+        var registered = new HashSet<string> { registeredPath };
+        var root = JsonNode.Parse("""{ "codes": ["1234", "5678"] }""")!;
+
+        var redacted = SecretRedactor.Redact(root, registered)!;
+
+        var arr = Assert.IsType<JsonArray>(redacted["codes"]);
+        Assert.Equal("1234", (string?)arr[0]);
+        Assert.Equal("[REDACTED]", (string?)arr[1]);
+    }
+
+    [Fact]
+    public void Redact_RegisteredArrayParent_RedactsWholeArray()
+    {
+        // Registering the array's parent path redacts the entire array value.
+        var registered = new HashSet<string> { "/codes" };
+        var root = JsonNode.Parse("""{ "codes": ["1234", "5678"] }""")!;
+
+        var redacted = SecretRedactor.Redact(root, registered)!;
+
+        Assert.Equal("[REDACTED]", (string?)redacted["codes"]);
+    }
+
+    [Fact]
+    public void Redact_DenylistedScalarInsideArray_IsRedacted()
+    {
+        // A denylisted segment on an array-element path is caught too.
+        var root = JsonNode.Parse("""{ "items": [ { "token": "abc" }, { "name": "ok" } ] }""")!;
+
+        var redacted = SecretRedactor.Redact(root, NoRegistered)!;
+
+        var arr = Assert.IsType<JsonArray>(redacted["items"]);
+        Assert.Equal("[REDACTED]", (string?)arr[0]!["token"]);
+        Assert.Equal("ok", (string?)arr[1]!["name"]);
+    }
 }
diff --git a/tests/OpenClaw.Tray.Tests/Services/AppNotificationMapperTests.cs b/tests/OpenClaw.Tray.Tests/Services/AppNotificationMapperTests.cs
new file mode 100644
index 000000000..b4022ba3a
--- /dev/null
+++ b/tests/OpenClaw.Tray.Tests/Services/AppNotificationMapperTests.cs
@@ -0,0 +1,99 @@
+using OpenClaw.Shared;
+using OpenClaw.Shared.Capabilities;
+using OpenClawTray.Services;
+using Xunit;
+
+namespace OpenClaw.Tray.Tests.Services;
+
+public sealed class AppNotificationMapperTests
+{
+    [Fact]
+    public void FromGatewayNotification_MapsChatActionAndUsesHashedStableDedupeKey()
+    {
+        var notification = new OpenClawNotification
+        {
+            Title = "Build complete",
+            Message = "The build passed",
+            Type = "info",
+            IsChat = true,
+            SessionKey = "agent:main:default"
+        };
+
+        var mapped = AppNotificationMapper.FromGatewayNotification(notification, "Open Chat");
+        var mappedAgain = AppNotificationMapper.FromGatewayNotification(notification, "Open Chat");
+
+        Assert.Equal("gateway", mapped.Source);
+        Assert.Equal("info", mapped.Category);
+        Assert.Equal(AppNotificationSeverity.Informational, mapped.Severity);
+        Assert.Equal("Open Chat", mapped.ActionLabel);
+        Assert.True(AppNotificationActionRoutes.TryGetChatSessionKey(mapped.ActionRoute, out var sessionKey));
+        Assert.Equal("agent:main:default", sessionKey);
+        Assert.Equal(mapped.DedupeKey, mappedAgain.DedupeKey);
+        Assert.DoesNotContain(notification.Title, mapped.DedupeKey);
+        Assert.DoesNotContain(notification.Message, mapped.DedupeKey);
+    }
+
+    [Fact]
+    public void FromGatewayNotification_ChatWithoutSessionKey_FallsBackToChatPageAction()
+    {
+        var mapped = AppNotificationMapper.FromGatewayNotification(new OpenClawNotification
+        {
+            Title = "Chat response",
+            Message = "A response is ready",
+            Type = "info",
+            IsChat = true
+        }, "Open Chat");
+
+        Assert.Equal("Open Chat", mapped.ActionLabel);
+        Assert.Equal("chat", mapped.ActionRoute);
+    }
+
+    [Theory]
+    [InlineData("error", AppNotificationSeverity.Error)]
+    [InlineData("urgent", AppNotificationSeverity.Warning)]
+    [InlineData("health", AppNotificationSeverity.Warning)]
+    [InlineData("reminder", AppNotificationSeverity.Informational)]
+    public void FromGatewayNotification_MapsSeverityFromType(string type, AppNotificationSeverity expected)
+    {
+        var mapped = AppNotificationMapper.FromGatewayNotification(new OpenClawNotification
+        {
+            Title = "Notification",
+            Message = "Message",
+            Type = type
+        });
+
+        Assert.Equal(expected, mapped.Severity);
+    }
+
+    [Fact]
+    public void FromNodeSystemNotification_UsesNodeSourceAndSystemNotifyCategory()
+    {
+        var mapped = AppNotificationMapper.FromNodeSystemNotification(new SystemNotifyArgs
+        {
+            Title = "Agent notice",
+            Body = "Something happened"
+        });
+
+        Assert.Equal("node", mapped.Source);
+        Assert.Equal("system.notify", mapped.Category);
+        Assert.Equal("Agent notice", mapped.Title);
+        Assert.Equal("Something happened", mapped.Message);
+        Assert.Equal(AppNotificationSeverity.Informational, mapped.Severity);
+    }
+
+    [Fact]
+    public void FromNodeActivity_UsesExplicitMetadata()
+    {
+        var mapped = AppNotificationMapper.FromNodeActivity(
+            "Camera blocked",
+            "Enable camera access.",
+            "node.invoke",
+            AppNotificationSeverity.Error,
+            "node:camera-blocked");
+
+        Assert.Equal("node", mapped.Source);
+        Assert.Equal("node.invoke", mapped.Category);
+        Assert.Equal(AppNotificationSeverity.Error, mapped.Severity);
+        Assert.Equal("node:camera-blocked", mapped.DedupeKey);
+    }
+}
diff --git a/tests/OpenClaw.Tray.Tests/Services/AppNotificationPublisherTests.cs b/tests/OpenClaw.Tray.Tests/Services/AppNotificationPublisherTests.cs
new file mode 100644
index 000000000..bc60401ef
--- /dev/null
+++ b/tests/OpenClaw.Tray.Tests/Services/AppNotificationPublisherTests.cs
@@ -0,0 +1,61 @@
+using Microsoft.Toolkit.Uwp.Notifications;
+using OpenClawTray.Services;
+using Xunit;
+
+namespace OpenClaw.Tray.Tests.Services;
+
+public sealed class AppNotificationPublisherTests
+{
+    [Fact]
+    public void Publish_AppNotificationFailure_DoesNotSuppressToast()
+    {
+        var service = new AppNotificationService();
+        var expected = new InvalidOperationException("app notification subscriber failed");
+        var toastShown = false;
+        service.Changed += (_, _) => throw expected;
+
+        var actual = Assert.Throws<InvalidOperationException>(() =>
+            AppNotificationPublisher.Publish(
+                service,
+                (_, _, _) => toastShown = true,
+                new AppNotificationPublishRequest(Notification(), new ToastContentBuilder())));
+
+        Assert.Same(expected, actual);
+        Assert.True(toastShown);
+    }
+
+    [Fact]
+    public void Publish_ToastFailure_DoesNotSuppressAppNotification()
+    {
+        var service = new AppNotificationService();
+        var expected = new InvalidOperationException("toast failed");
+
+        var actual = Assert.Throws<InvalidOperationException>(() =>
+            AppNotificationPublisher.Publish(
+                service,
+                (_, _, _) => throw expected,
+                new AppNotificationPublishRequest(Notification(), new ToastContentBuilder())));
+
+        Assert.Same(expected, actual);
+        Assert.Equal("Title", service.Snapshot.Current?.Title);
+    }
+
+    [Fact]
+    public void Publish_EmptyRequest_Throws()
+    {
+        var service = new AppNotificationService();
+
+        Assert.Throws<ArgumentException>(() =>
+            AppNotificationPublisher.Publish(
+                service,
+                (_, _, _) => { },
+                new AppNotificationPublishRequest()));
+    }
+
+    private static AppNotification Notification() => new()
+    {
+        Title = "Title",
+        Message = "Message",
+        Source = "test"
+    };
+}
diff --git a/tests/OpenClaw.Tray.Tests/Services/AppNotificationServiceTests.cs b/tests/OpenClaw.Tray.Tests/Services/AppNotificationServiceTests.cs
index 6ec9d5e19..0474a3b1c 100644
--- a/tests/OpenClaw.Tray.Tests/Services/AppNotificationServiceTests.cs
+++ b/tests/OpenClaw.Tray.Tests/Services/AppNotificationServiceTests.cs
@@ -65,6 +65,82 @@ public void Snapshot_HasMultipleActiveNotifications_OnlyWhenNotificationsListHas
         Assert.Equal(2, service.Snapshot.ActiveNotifications.Count);
     }
 
+    [Fact]
+    public void BannerState_PrioritizesConnectionIssueOverEarlierActionableNotification()
+    {
+        var service = new AppNotificationService();
+        var bannerState = new AppNotificationBannerState();
+
+        // An unrelated, actionable notification is current...
+        service.Show(Notification("Sandbox risk", "Review sandbox", source: "sandbox"));
+        // ...then a connection failure arrives and is queued behind it.
+        service.Show(Notification("Gateway connection failed", "unauthorized", source: "connection"));
+
+        // The connection issue must be the visible banner so the user can reach
+        // the Connection page, even though it wasn't the first/current item.
+        Assert.Equal(
+            "Gateway connection failed",
+            bannerState.SelectVisibleNotification(service.Snapshot)?.Title);
+    }
+
+    [Fact]
+    public void BannerState_HidingConnectionIssue_RevealsRemainingNotification()
+    {
+        var service = new AppNotificationService();
+        var bannerState = new AppNotificationBannerState();
+
+        service.Show(Notification("Sandbox risk", "Review sandbox", source: "sandbox"));
+        service.Show(Notification("Gateway connection failed", "unauthorized", source: "connection"));
+
+        // Dismissing the banner hides all active items; once the connection
+        // issue is removed, the remaining notification can surface again.
+        bannerState.HideActiveNotifications(service.Snapshot);
+        Assert.Null(bannerState.SelectVisibleNotification(service.Snapshot));
+
+        var connectionId = service.Snapshot.ActiveNotifications
+            .First(n => n.Source == "connection").Id;
+        service.Dismiss(connectionId);
+
+        Assert.Equal(
+            "Sandbox risk",
+            bannerState.SelectVisibleNotification(service.Snapshot, revealHiddenIfNeeded: true)?.Title);
+    }
+
+    [Fact]
+    public void BannerState_PrioritizesActionableConnectionOverActionlessConnection()
+    {
+        var service = new AppNotificationService();
+        var bannerState = new AppNotificationBannerState();
+
+        // An action-less connection notification (e.g. a transient gateway-host
+        // failure) is current...
+        service.Show(new AppNotification
+        {
+            Id = "gateway-host-action:Terminal failed",
+            Title = "Terminal failed",
+            Message = "Could not open the gateway terminal.",
+            Source = "connection",
+            Severity = AppNotificationSeverity.Error
+        });
+        // ...then a real connection error arrives with an "Open Connection" action.
+        service.Show(new AppNotification
+        {
+            Id = "connection:issue",
+            Title = "Gateway connection failed",
+            Message = "Transport error",
+            Source = "connection",
+            Severity = AppNotificationSeverity.Error,
+            ActionRoute = "connection",
+            ActionLabel = "Open Connection"
+        });
+
+        // The actionable connection error must win so the banner offers
+        // "Open Connection" rather than degrading to "Show more".
+        var visible = bannerState.SelectVisibleNotification(service.Snapshot);
+        Assert.Equal("Gateway connection failed", visible?.Title);
+        Assert.Equal("Open Connection", visible?.ActionLabel);
+    }
+
     [Fact]
     public void BannerState_HideActiveNotifications_HidesExistingItemsUntilNewNotificationArrives()
     {
@@ -164,6 +240,20 @@ public void Dismiss_ByQueuedId_RemovesQueuedNotification()
         Assert.Equal(["Third"], service.Snapshot.Queued.Select(n => n.Title).ToArray());
     }
 
+    [Fact]
+    public void DismissByDedupeKey_RemovesCurrentAndQueuedMatches()
+    {
+        var service = new AppNotificationService();
+        service.Show(Notification("First", "Message", dedupeKey: "same"));
+        service.Show(Notification("Second", "Message", dedupeKey: "other"));
+        service.Show(Notification("Third", "Message", dedupeKey: "same"));
+
+        service.DismissByDedupeKey("same");
+
+        Assert.Equal("Second", service.Snapshot.Current?.Title);
+        Assert.Empty(service.Snapshot.Queued);
+    }
+
     [Fact]
     public void ClearAll_RemovesCurrentAndQueuedNotifications()
     {
@@ -207,6 +297,20 @@ public void Show_DedupeKey_CoalescesWithoutDroppingDistinctNotifications()
         Assert.Equal("Different", service.Snapshot.Queued[0].Title);
     }
 
+    [Fact]
+    public void Show_CapsActiveNotificationsAndKeepsNewestQueuedItems()
+    {
+        var service = new AppNotificationService();
+
+        for (var index = 1; index <= 105; index++)
+            service.Show(Notification($"Notification {index}", "Message"));
+
+        Assert.Equal(100, service.Snapshot.ActiveNotifications.Count);
+        Assert.Equal("Notification 1", service.Snapshot.Current?.Title);
+        Assert.DoesNotContain(service.Snapshot.ActiveNotifications, notification => notification.Title == "Notification 2");
+        Assert.Contains(service.Snapshot.ActiveNotifications, notification => notification.Title == "Notification 105");
+    }
+
     [Fact]
     public void ClearSource_RemovesCurrentAndQueuedNotifications()
     {
@@ -236,6 +340,26 @@ public void ClearSource_RemovesQueuedSameSourceBeforePromotingNextCurrent()
         Assert.Equal(["Gateway"], service.Snapshot.ActiveNotifications.Select(n => n.Title).ToArray());
     }
 
+    [Fact]
+    public void AppNotificationActionRoutes_Chat_RoundTripsSessionKey()
+    {
+        var route = AppNotificationActionRoutes.Chat("agent:main:scratch session");
+
+        Assert.True(AppNotificationActionRoutes.TryGetChatSessionKey(route, out var sessionKey));
+        Assert.Equal("agent:main:scratch session", sessionKey);
+    }
+
+    [Theory]
+    [InlineData(null)]
+    [InlineData("")]
+    [InlineData("chat:")]
+    [InlineData("settings")]
+    public void AppNotificationActionRoutes_TryGetChatSessionKey_RejectsNonChatRoutes(string? route)
+    {
+        Assert.False(AppNotificationActionRoutes.TryGetChatSessionKey(route, out var sessionKey));
+        Assert.Null(sessionKey);
+    }
+
     [Theory]
     [InlineData("", "message", "source")]
     [InlineData("title", "", "source")]
diff --git a/tests/OpenClaw.Tray.Tests/Services/ChatNotificationSpeechTextTests.cs b/tests/OpenClaw.Tray.Tests/Services/ChatNotificationSpeechTextTests.cs
new file mode 100644
index 000000000..68f403223
--- /dev/null
+++ b/tests/OpenClaw.Tray.Tests/Services/ChatNotificationSpeechTextTests.cs
@@ -0,0 +1,36 @@
+using OpenClaw.Shared;
+using OpenClawTray.Services;
+using Xunit;
+
+namespace OpenClaw.Tray.Tests.Services;
+
+public sealed class ChatNotificationSpeechTextTests
+{
+    [Fact]
+    public void Resolve_UsesFullMessageWhenPreviewWasTruncated()
+    {
+        var fullMessage = new string('x', 240);
+
+        var resolved = ChatNotificationSpeechText.Resolve(new OpenClawNotification
+        {
+            Message = fullMessage[..200] + "…",
+            FullMessage = fullMessage
+        });
+
+        Assert.Equal(fullMessage, resolved);
+    }
+
+    [Theory]
+    [InlineData(null)]
+    [InlineData("")]
+    public void Resolve_FallsBackToPreviewWhenFullMessageIsUnavailable(string? fullMessage)
+    {
+        var resolved = ChatNotificationSpeechText.Resolve(new OpenClawNotification
+        {
+            Message = "Preview",
+            FullMessage = fullMessage
+        });
+
+        Assert.Equal("Preview", resolved);
+    }
+}
diff --git a/tests/OpenClaw.Tray.Tests/Services/McpRuntimeStatePolicyTests.cs b/tests/OpenClaw.Tray.Tests/Services/McpRuntimeStatePolicyTests.cs
new file mode 100644
index 000000000..9c87ea97c
--- /dev/null
+++ b/tests/OpenClaw.Tray.Tests/Services/McpRuntimeStatePolicyTests.cs
@@ -0,0 +1,80 @@
+using OpenClawTray.Services;
+
+namespace OpenClaw.Tray.Tests.Services;
+
+public sealed class McpRuntimeStatePolicyTests
+{
+    [Fact]
+    public void PlanStartupNotification_WhenDisabled_Dismisses()
+    {
+        var plan = McpRuntimeStatePolicy.PlanStartupNotification(
+            enableMcpServer: false,
+            isMcpRunning: false,
+            startupError: "port busy");
+
+        Assert.False(plan.ShouldShow);
+        Assert.True(plan.ShouldDismiss);
+        Assert.Null(plan.Message);
+    }
+
+    [Fact]
+    public void PlanStartupNotification_WhenEnabledAndHealthy_Dismisses()
+    {
+        var plan = McpRuntimeStatePolicy.PlanStartupNotification(
+            enableMcpServer: true,
+            isMcpRunning: true,
+            startupError: null);
+
+        Assert.False(plan.ShouldShow);
+        Assert.True(plan.ShouldDismiss);
+    }
+
+    [Fact]
+    public void PlanStartupNotification_WhenEnabledWithStartupError_ShowsError()
+    {
+        var plan = McpRuntimeStatePolicy.PlanStartupNotification(
+            enableMcpServer: true,
+            isMcpRunning: false,
+            startupError: "Port 8765 is already in use.");
+
+        Assert.True(plan.ShouldShow);
+        Assert.False(plan.ShouldDismiss);
+        Assert.Equal("Port 8765 is already in use.", plan.Message);
+    }
+
+    [Fact]
+    public void GetSettingsSetError_WhenEnablingMcpFails_ReturnsStartupError()
+    {
+        var error = McpRuntimeStatePolicy.GetSettingsSetError(
+            nameof(SettingsManager.EnableMcpServer),
+            true,
+            isMcpRunning: false,
+            startupError: "Access denied.");
+
+        Assert.Equal("Access denied.", error);
+    }
+
+    [Fact]
+    public void GetSettingsSetError_WhenEnablingMcpDoesNotStart_ReturnsDefaultError()
+    {
+        var error = McpRuntimeStatePolicy.GetSettingsSetError(
+            nameof(SettingsManager.EnableMcpServer),
+            true,
+            isMcpRunning: false,
+            startupError: null);
+
+        Assert.Equal(McpRuntimeStatePolicy.DefaultStartupError, error);
+    }
+
+    [Fact]
+    public void GetSettingsSetError_WhenDisablingMcp_ReturnsNull()
+    {
+        var error = McpRuntimeStatePolicy.GetSettingsSetError(
+            nameof(SettingsManager.EnableMcpServer),
+            false,
+            isMcpRunning: false,
+            startupError: "old error");
+
+        Assert.Null(error);
+    }
+}
diff --git a/tests/OpenClaw.Tray.Tests/Services/TrayDashboardSummaryBuilderTests.cs b/tests/OpenClaw.Tray.Tests/Services/TrayDashboardSummaryBuilderTests.cs
new file mode 100644
index 000000000..6926c4a54
--- /dev/null
+++ b/tests/OpenClaw.Tray.Tests/Services/TrayDashboardSummaryBuilderTests.cs
@@ -0,0 +1,711 @@
+using OpenClaw.Shared;
+using OpenClaw.Connection;
+using OpenClawTray.Services;
+using System;
+using Xunit;
+
+namespace OpenClaw.Tray.Tests.Services;
+
+public sealed class TrayDashboardSummaryBuilderTests
+{
+    private static readonly DateTime FixedNowUtc = new(2024, 1, 15, 10, 30, 45, DateTimeKind.Utc);
+
+    private static TrayMenuSnapshot Base(
+        ConnectionStatus status = ConnectionStatus.Connected,
+        string? gatewayUrl = "http://localhost:7070",
+        string? authFailure = null,
+        GatewayNodeInfo[]? nodes = null,
+        SessionInfo[]? sessions = null,
+        GatewayUsageInfo? usage = null,
+        DateTime? lastUpdated = null,
+        PairingListInfo? nodePairList = null,
+        DevicePairingListInfo? devicePairList = null,
+        OverallConnectionState? overallState = null,
+        bool isMcpRunning = false,
+        string? mcpStartupError = null,
+        SettingsManager? settings = null) => new()
+    {
+        CurrentStatus = status,
+        OverallState = overallState,
+        AuthFailureMessage = authFailure,
+        GatewayUrl = gatewayUrl,
+        GatewaySelf = null,
+        Presence = null,
+        EnableNodeMode = false,
+        NodeIsPaired = false,
+        NodeIsPendingApproval = false,
+        NodeIsConnected = false,
+        NodePairList = nodePairList,
+        DevicePairList = devicePairList,
+        Nodes = nodes ?? Array.Empty<GatewayNodeInfo>(),
+        Sessions = sessions ?? Array.Empty<SessionInfo>(),
+        Usage = usage,
+        UsageStatus = null,
+        UsageCost = null,
+        Settings = settings,
+        SetupMenuLabel = "Reconfigure...",
+        ShowSetupMenuEntry = true,
+        LastUpdated = lastUpdated,
+        IsMcpRunning = isMcpRunning,
+        McpStartupError = mcpStartupError,
+    };
+
+    private static TrayDashboardSummary Build(TrayMenuSnapshot snapshot) =>
+        new TrayDashboardSummaryBuilder(snapshot, FixedNowUtc).Build();
+
+    // ── Health classification ──
+
+    [Fact]
+    public void Connected_IsOkSeverityWithEndpoint()
+    {
+        var summary = Build(Base(ConnectionStatus.Connected));
+
+        Assert.Equal(TrayHealthSeverity.Ok, summary.Severity);
+        Assert.Equal("Connected", summary.Headline);
+        Assert.Equal("localhost:7070", summary.Endpoint);
+    }
+
+    [Fact]
+    public void Disconnected_IsNeutralSeverity()
+    {
+        var summary = Build(Base(ConnectionStatus.Disconnected));
+
+        Assert.Equal(TrayHealthSeverity.Neutral, summary.Severity);
+        Assert.Equal("Disconnected", summary.Headline);
+    }
+
+    [Fact]
+    public void Connecting_IsCautionSeverity()
+    {
+        var summary = Build(Base(ConnectionStatus.Connecting));
+
+        Assert.Equal(TrayHealthSeverity.Caution, summary.Severity);
+        Assert.Equal("Connecting…", summary.Headline);
+    }
+
+    [Fact]
+    public void Error_IsCriticalSeverity()
+    {
+        var summary = Build(Base(ConnectionStatus.Error));
+
+        Assert.Equal(TrayHealthSeverity.Critical, summary.Severity);
+        Assert.Equal("Connection error", summary.Headline);
+    }
+
+    [Fact]
+    public void DegradedOverall_IsCautionAndNotConnected()
+    {
+        var summary = Build(Base(
+            ConnectionStatus.Error,
+            overallState: OverallConnectionState.Degraded));
+
+        Assert.Equal(TrayHealthSeverity.Caution, summary.Severity);
+        Assert.Equal("Connection degraded", summary.Headline);
+    }
+
+    [Fact]
+    public void PairingRequiredOverall_IsDistinctFromConnecting()
+    {
+        var summary = Build(Base(
+            ConnectionStatus.Error,
+            overallState: OverallConnectionState.PairingRequired));
+
+        Assert.Equal(TrayHealthSeverity.Caution, summary.Severity);
+        Assert.Equal("Pairing required", summary.Headline);
+    }
+
+    [Fact]
+    public void LocalMcpOnly_IsExplicitNotGatewayConnected()
+    {
+        var settingsDirectory = Path.Combine(Path.GetTempPath(), "openclaw-dashboard-mcp-" + Guid.NewGuid().ToString("N"));
+        try
+        {
+            var settings = new SettingsManager(settingsDirectory)
+            {
+                EnableMcpServer = true,
+                EnableNodeMode = false
+            };
+
+            var summary = Build(Base(
+                ConnectionStatus.Disconnected,
+                isMcpRunning: true,
+                settings: settings));
+
+            Assert.Equal(TrayHealthSeverity.Ok, summary.Severity);
+            Assert.Equal("Local MCP only", summary.Headline);
+        }
+        finally
+        {
+            // slopwatch-ignore: SW003 Test cleanup or fixture teardown is best-effort and must not hide the test outcome.
+            try { Directory.Delete(settingsDirectory, recursive: true); } catch { }
+        }
+    }
+
+    [Fact]
+    public void LocalMcpOnly_DoesNotMaskDegradedGatewayLifecycle()
+    {
+        var settingsDirectory = Path.Combine(Path.GetTempPath(), "openclaw-dashboard-mcp-" + Guid.NewGuid().ToString("N"));
+        try
+        {
+            var settings = new SettingsManager(settingsDirectory)
+            {
+                EnableMcpServer = true,
+                EnableNodeMode = false
+            };
+
+            var summary = Build(Base(
+                ConnectionStatus.Error,
+                overallState: OverallConnectionState.Degraded,
+                isMcpRunning: true,
+                settings: settings));
+
+            Assert.Equal(TrayHealthSeverity.Caution, summary.Severity);
+            Assert.Equal("Connection degraded", summary.Headline);
+        }
+        finally
+        {
+            // slopwatch-ignore: SW003 Test cleanup or fixture teardown is best-effort and must not hide the test outcome.
+            try { Directory.Delete(settingsDirectory, recursive: true); } catch { }
+        }
+    }
+
+    [Fact]
+    public void McpStartupError_OutranksDisconnected()
+    {
+        var settingsDirectory = Path.Combine(Path.GetTempPath(), "openclaw-dashboard-mcp-" + Guid.NewGuid().ToString("N"));
+        try
+        {
+            var settings = new SettingsManager(settingsDirectory)
+            {
+                EnableMcpServer = true
+            };
+
+            var summary = Build(Base(
+                ConnectionStatus.Disconnected,
+                mcpStartupError: "Port 8765 is already in use.",
+                settings: settings));
+
+            Assert.Equal(TrayHealthSeverity.Critical, summary.Severity);
+            Assert.Equal("Local MCP failed", summary.Headline);
+        }
+        finally
+        {
+            // slopwatch-ignore: SW003 Test cleanup or fixture teardown is best-effort and must not hide the test outcome.
+            try { Directory.Delete(settingsDirectory, recursive: true); } catch { }
+        }
+    }
+
+    [Fact]
+    public void StaleMcpStartupError_IsIgnoredWhenMcpDisabled()
+    {
+        var settingsDirectory = Path.Combine(Path.GetTempPath(), "openclaw-dashboard-mcp-" + Guid.NewGuid().ToString("N"));
+        try
+        {
+            var settings = new SettingsManager(settingsDirectory)
+            {
+                EnableMcpServer = false
+            };
+
+            var summary = Build(Base(
+                ConnectionStatus.Connected,
+                overallState: OverallConnectionState.Ready,
+                mcpStartupError: "stale failure",
+                settings: settings));
+
+            Assert.Equal(TrayHealthSeverity.Ok, summary.Severity);
+            Assert.Equal("Connected", summary.Headline);
+        }
+        finally
+        {
+            // slopwatch-ignore: SW003 Test cleanup or fixture teardown is best-effort and must not hide the test outcome.
+            try { Directory.Delete(settingsDirectory, recursive: true); } catch { }
+        }
+    }
+
+    [Fact]
+    public void AuthFailure_OverridesConnectedWithCriticalSeverity()
+    {
+        var summary = Build(Base(ConnectionStatus.Connected, authFailure: "token expired"));
+
+        Assert.Equal(TrayHealthSeverity.Critical, summary.Severity);
+        Assert.Equal("Authentication failed", summary.Headline);
+    }
+
+    [Fact]
+    public void PendingPairing_TakesPriorityOverConnectedStatus()
+    {
+        var nodePairList = new PairingListInfo();
+        nodePairList.Pending.Add(new PairingRequest());
+        nodePairList.Pending.Add(new PairingRequest());
+
+        var summary = Build(Base(ConnectionStatus.Connected, nodePairList: nodePairList));
+
+        Assert.Equal(TrayHealthSeverity.Caution, summary.Severity);
+        Assert.Equal("Pairing approval pending (2)", summary.Headline);
+    }
+
+    [Fact]
+    public void NullGatewayUrl_ProducesNullEndpoint()
+    {
+        var summary = Build(Base(gatewayUrl: null));
+
+        Assert.Null(summary.Endpoint);
+    }
+
+    // ── Heartbeat ──
+
+    [Fact]
+    public void Heartbeat_NullWhenNoLastUpdated()
+    {
+        var summary = Build(Base(lastUpdated: null));
+
+        Assert.Null(summary.Heartbeat);
+    }
+
+    [Fact]
+    public void Heartbeat_FormatsRelativeAge()
+    {
+        var summary = Build(Base(lastUpdated: FixedNowUtc.AddSeconds(-12)));
+
+        Assert.Equal("Updated 12s ago", summary.Heartbeat);
+    }
+
+    [Fact]
+    public void Heartbeat_FormatsMinutes()
+    {
+        var summary = Build(Base(lastUpdated: FixedNowUtc.AddMinutes(-5)));
+
+        Assert.Equal("Updated 5m ago", summary.Heartbeat);
+    }
+
+    [Fact]
+    public void Heartbeat_ConvertsLocalTimestampToUtc()
+    {
+        var localUpdated = FixedNowUtc.AddMinutes(-7).ToLocalTime();
+
+        var summary = Build(Base(lastUpdated: localUpdated));
+
+        Assert.Equal("Updated 7m ago", summary.Heartbeat);
+    }
+
+    [Fact]
+    public void Heartbeat_FutureTimestampClampsToZero()
+    {
+        var summary = Build(Base(lastUpdated: FixedNowUtc.AddSeconds(30)));
+
+        Assert.Equal("Updated 0s ago", summary.Heartbeat);
+    }
+
+    // ── Metrics line ──
+
+    [Fact]
+    public void MetricsLine_NullWhenNothingToShow()
+    {
+        var summary = Build(Base(ConnectionStatus.Disconnected));
+
+        Assert.Null(summary.MetricsLine);
+    }
+
+    [Fact]
+    public void MetricsLine_SummarizesNodesOnlineOverTotal()
+    {
+        var nodes = new[]
+        {
+            new GatewayNodeInfo { IsOnline = true },
+            new GatewayNodeInfo { IsOnline = false },
+            new GatewayNodeInfo { IsOnline = true },
+        };
+
+        var summary = Build(Base(nodes: nodes));
+
+        Assert.NotNull(summary.MetricsLine);
+        Assert.Contains("2/3 nodes", summary.MetricsLine);
+    }
+
+    [Fact]
+    public void MetricsLine_SingularNodeLabel()
+    {
+        var nodes = new[] { new GatewayNodeInfo { IsOnline = true } };
+
+        var summary = Build(Base(nodes: nodes));
+
+        Assert.Contains("1/1 node", summary.MetricsLine);
+    }
+
+    [Fact]
+    public void MetricsLine_ShowsSessionsAndActiveCount()
+    {
+        var sessions = new[]
+        {
+            new SessionInfo { Key = "a", Status = "active" },
+            new SessionInfo { Key = "b", Status = "idle" },
+        };
+
+        var summary = Build(Base(sessions: sessions));
+
+        Assert.Contains("2 sessions (1 active)", summary.MetricsLine);
+    }
+
+    [Fact]
+    public void MetricsLine_ShowsCostWhenConnected()
+    {
+        var usage = new GatewayUsageInfo { CostUsd = 1.25, TotalTokens = 5000 };
+
+        var summary = Build(Base(ConnectionStatus.Connected, usage: usage));
+
+        Assert.Contains("$1.25", summary.MetricsLine);
+    }
+
+    [Fact]
+    public void MetricsLine_OmitsUsageWhenDisconnected()
+    {
+        var usage = new GatewayUsageInfo { CostUsd = 1.25, TotalTokens = 5000 };
+        var nodes = new[] { new GatewayNodeInfo { IsOnline = true } };
+
+        var summary = Build(Base(ConnectionStatus.Disconnected, nodes: nodes, usage: usage));
+
+        Assert.DoesNotContain("$", summary.MetricsLine);
+    }
+
+    [Fact]
+    public void MetricsLine_FallsBackToSessionTokensWhenNoUsage()
+    {
+        var sessions = new[]
+        {
+            new SessionInfo { Key = "a", Status = "active", InputTokens = 1500, OutputTokens = 500 },
+        };
+
+        var summary = Build(Base(ConnectionStatus.Connected, sessions: sessions));
+
+        Assert.Contains("2.0K tokens", summary.MetricsLine);
+    }
+
+    [Fact]
+    public void MetricsLine_SubCentCost_FallsBackToTokens()
+    {
+        var usage = new GatewayUsageInfo { CostUsd = 0.004, TotalTokens = 2500 };
+
+        var summary = Build(Base(ConnectionStatus.Connected, usage: usage));
+
+        Assert.Contains("2.5K tokens", summary.MetricsLine);
+        Assert.DoesNotContain("$0.00", summary.MetricsLine);
+    }
+
+    // ── Active session ──
+
+    [Fact]
+    public void ActiveSession_NullWhenNoSessions()
+    {
+        var summary = Build(Base());
+
+        Assert.Null(summary.ActiveSession);
+        Assert.False(summary.HasActiveSession);
+    }
+
+    [Fact]
+    public void ActiveSession_PrefersMainSession()
+    {
+        var sessions = new[]
+        {
+            new SessionInfo { Key = "sub", IsMain = false, DisplayName = "Sub" },
+            new SessionInfo { Key = "main", IsMain = true, DisplayName = "Main work" },
+        };
+
+        var summary = Build(Base(sessions: sessions));
+
+        Assert.NotNull(summary.ActiveSession);
+        Assert.Equal("Main work", summary.ActiveSession!.Title);
+    }
+
+    [Fact]
+    public void ActiveSession_FallsBackToMostRecentlyUpdated()
+    {
+        var sessions = new[]
+        {
+            new SessionInfo { Key = "old", IsMain = false, DisplayName = "Older", UpdatedAt = FixedNowUtc.AddMinutes(-30) },
+            new SessionInfo { Key = "new", IsMain = false, DisplayName = "Newer", UpdatedAt = FixedNowUtc.AddMinutes(-1) },
+        };
+
+        var summary = Build(Base(sessions: sessions));
+
+        Assert.Equal("Newer", summary.ActiveSession!.Title);
+    }
+
+    [Fact]
+    public void ActiveSession_ComputesContextPercent()
+    {
+        var sessions = new[]
+        {
+            new SessionInfo
+            {
+                Key = "main", IsMain = true, DisplayName = "Main",
+                Model = "claude-opus", InputTokens = 90_000, OutputTokens = 10_000,
+                ContextTokens = 200_000,
+            },
+        };
+
+        var summary = Build(Base(sessions: sessions));
+
+        Assert.Equal(50, summary.ActiveSession!.ContextPercent);
+        Assert.NotNull(summary.ActiveSession.Detail);
+        Assert.Contains("claude-opus", summary.ActiveSession.Detail);
+        Assert.DoesNotContain("ctx", summary.ActiveSession.Detail);
+    }
+
+    [Fact]
+    public void ActiveSession_DefaultsContextWindowWhenUnset()
+    {
+        var sessions = new[]
+        {
+            new SessionInfo { Key = "main", IsMain = true, DisplayName = "Main", InputTokens = 20_000, OutputTokens = 0 },
+        };
+
+        var summary = Build(Base(sessions: sessions));
+
+        Assert.Equal(10, summary.ActiveSession!.ContextPercent);
+    }
+
+    [Fact]
+    public void ActiveSession_DoesNotExposeCurrentActivityInTopLevelGlance()
+    {
+        var sessions = new[]
+        {
+            new SessionInfo
+            {
+                Key = "main",
+                IsMain = true,
+                DisplayName = "Main",
+                CurrentActivity = "🔧 curl https://internal.example.test/secrets"
+            },
+        };
+
+        var summary = Build(Base(sessions: sessions));
+
+        Assert.NotNull(summary.ActiveSession);
+        Assert.Null(summary.ActiveSession!.Detail);
+    }
+
+    // ── Edge cases: severity ordering, usage fallbacks, formatting ──
+
+    [Fact]
+    public void AuthFailure_OutranksPendingPairing()
+    {
+        var nodePairList = new PairingListInfo();
+        nodePairList.Pending.Add(new PairingRequest());
+
+        var summary = Build(Base(
+            ConnectionStatus.Connected, authFailure: "token expired", nodePairList: nodePairList));
+
+        Assert.Equal(TrayHealthSeverity.Critical, summary.Severity);
+        Assert.Equal("Authentication failed", summary.Headline);
+    }
+
+    [Fact]
+    public void Usage_NonNullZeroCost_FallsBackToUsageCostTotals()
+    {
+        var usage = new GatewayUsageInfo { CostUsd = 0, TotalTokens = 0 };
+        var usageCost = new GatewayCostUsageInfo
+        {
+            Totals = new GatewayCostUsageTotalsInfo { TotalCost = 2.50, TotalTokens = 1234 },
+        };
+        var snapshot = Base(ConnectionStatus.Connected, usage: usage) with { UsageCost = usageCost };
+
+        var summary = Build(snapshot);
+
+        Assert.Contains("$2.50", summary.MetricsLine);
+    }
+
+    [Fact]
+    public void Usage_NonNullZeroTokens_FallsBackToSessionTotals()
+    {
+        var usage = new GatewayUsageInfo { CostUsd = 0, TotalTokens = 0 };
+        var sessions = new[]
+        {
+            new SessionInfo { Key = "a", Status = "active", TotalTokens = 3000 },
+        };
+
+        var summary = Build(Base(ConnectionStatus.Connected, usage: usage, sessions: sessions));
+
+        Assert.Contains("3.0K tokens", summary.MetricsLine);
+    }
+
+    [Fact]
+    public void Endpoint_SuppressesDefaultPort()
+    {
+        var summary = Build(Base(gatewayUrl: "https://gateway.example.com"));
+
+        Assert.Equal("gateway.example.com", summary.Endpoint);
+    }
+
+    [Fact]
+    public void Endpoint_KeepsExplicitNonDefaultPort()
+    {
+        var summary = Build(Base(gatewayUrl: "http://localhost:7070"));
+
+        Assert.Equal("localhost:7070", summary.Endpoint);
+    }
+
+    [Fact]
+    public void ActiveSession_PrefersActiveSubOverIdleMain()
+    {
+        var sessions = new[]
+        {
+            new SessionInfo { Key = "main", IsMain = true, DisplayName = "Main", Status = "idle" },
+            new SessionInfo { Key = "sub", IsMain = false, DisplayName = "Worker", Status = "active" },
+        };
+
+        var summary = Build(Base(sessions: sessions));
+
+        Assert.Equal("Worker", summary.ActiveSession!.Title);
+        Assert.Equal("Active", summary.ActiveSession.Label);
+    }
+
+    [Fact]
+    public void ActiveSession_PrefersActiveMainOverActiveSub()
+    {
+        var sessions = new[]
+        {
+            new SessionInfo
+            {
+                Key = "main", IsMain = true, DisplayName = "Main",
+                Status = "active", UpdatedAt = FixedNowUtc.AddMinutes(-30)
+            },
+            new SessionInfo
+            {
+                Key = "sub", IsMain = false, DisplayName = "Worker",
+                Status = "active", UpdatedAt = FixedNowUtc.AddMinutes(-1)
+            },
+        };
+
+        var summary = Build(Base(sessions: sessions));
+
+        Assert.Equal("Main", summary.ActiveSession!.Title);
+        Assert.Equal("Active", summary.ActiveSession.Label);
+    }
+
+    [Fact]
+    public void ActiveSession_LabelIsMainForIdleMain()
+    {
+        var sessions = new[]
+        {
+            new SessionInfo { Key = "main", IsMain = true, DisplayName = "Main", Status = "idle" },
+        };
+
+        var summary = Build(Base(sessions: sessions));
+
+        Assert.Equal("Main", summary.ActiveSession!.Label);
+    }
+
+    [Fact]
+    public void ActiveSession_ContextPercentClampsAtHundredWhenOverBudget()
+    {
+        var sessions = new[]
+        {
+            new SessionInfo
+            {
+                Key = "main", IsMain = true, DisplayName = "Main",
+                InputTokens = 250_000, OutputTokens = 50_000, ContextTokens = 200_000,
+            },
+        };
+
+        var summary = Build(Base(sessions: sessions));
+
+        Assert.Equal(100, summary.ActiveSession!.ContextPercent);
+    }
+
+    [Fact]
+    public void ActiveSession_ContextPercentRoundsToNearest()
+    {
+        var sessions = new[]
+        {
+            new SessionInfo
+            {
+                Key = "main", IsMain = true, DisplayName = "Main",
+                // 179800 / 200000 = 89.9% -> rounds to 90
+                InputTokens = 179_800, OutputTokens = 0, ContextTokens = 200_000,
+            },
+        };
+
+        var summary = Build(Base(sessions: sessions));
+
+        Assert.Equal(90, summary.ActiveSession!.ContextPercent);
+    }
+
+    [Fact]
+    public void Heartbeat_HiddenWhenDisconnected()
+    {
+        var summary = Build(Base(ConnectionStatus.Disconnected, lastUpdated: FixedNowUtc.AddSeconds(-5)));
+
+        Assert.Null(summary.Heartbeat);
+    }
+
+    [Fact]
+    public void Heartbeat_FormatsHoursAndDays()
+    {
+        var hours = Build(Base(lastUpdated: FixedNowUtc.AddHours(-3)));
+        Assert.Equal("Updated 3h ago", hours.Heartbeat);
+
+        var days = Build(Base(lastUpdated: FixedNowUtc.AddDays(-2)));
+        Assert.Equal("Updated 2d ago", days.Heartbeat);
+    }
+
+    [Fact]
+    public void MetricsLine_FormatsMillionsTokenCount()
+    {
+        var usage = new GatewayUsageInfo { CostUsd = 0, TotalTokens = 2_500_000 };
+
+        var summary = Build(Base(ConnectionStatus.Connected, usage: usage));
+
+        Assert.Contains("2.5M tokens", summary.MetricsLine);
+    }
+
+    [Fact]
+    public void ActiveSession_ContextPercentUsesTotalTokensWhenInputOutputZero()
+    {
+        var sessions = new[]
+        {
+            new SessionInfo
+            {
+                Key = "main", IsMain = true, DisplayName = "Main",
+                TotalTokens = 100_000, InputTokens = 0, OutputTokens = 0, ContextTokens = 200_000,
+            },
+        };
+
+        var summary = Build(Base(sessions: sessions));
+
+        Assert.Equal(50, summary.ActiveSession!.ContextPercent);
+    }
+
+    [Fact]
+    public void SessionUsedTokens_PrefersTotalTokensWhenPositive()
+    {
+        var withTotal = new SessionInfo { TotalTokens = 5000, InputTokens = 1, OutputTokens = 1 };
+        var withoutTotal = new SessionInfo { TotalTokens = 0, InputTokens = 1200, OutputTokens = 300 };
+
+        Assert.Equal(5000, TrayDashboardSummaryBuilder.SessionUsedTokens(withTotal));
+        Assert.Equal(1500, TrayDashboardSummaryBuilder.SessionUsedTokens(withoutTotal));
+    }
+
+    [Fact]
+    public void MetricsLine_MixedSessionTokenSources_SumsBothPerSession()
+    {
+        // One session reports TotalTokens only, the other input/output only.
+        // The token fallback must count both (3000 + 1500 = 4500 = "4.5K").
+        var usage = new GatewayUsageInfo { CostUsd = 0, TotalTokens = 0 };
+        var sessions = new[]
+        {
+            new SessionInfo { Key = "a", Status = "active", TotalTokens = 3000 },
+            new SessionInfo { Key = "b", Status = "idle", InputTokens = 1000, OutputTokens = 500 },
+        };
+
+        var summary = Build(Base(ConnectionStatus.Connected, usage: usage, sessions: sessions));
+
+        Assert.Contains("4.5K tokens", summary.MetricsLine);
+    }
+
+    [Fact]
+    public void SelectActiveSession_EmptyReturnsNull()
+    {
+        Assert.Null(TrayDashboardSummaryBuilder.SelectActiveSession(Array.Empty<SessionInfo>()));
+    }
+}
diff --git a/tests/OpenClaw.Tray.Tests/Services/TrayTooltipBuilderTests.cs b/tests/OpenClaw.Tray.Tests/Services/TrayTooltipBuilderTests.cs
index b97b063d7..a1932fc7f 100644
--- a/tests/OpenClaw.Tray.Tests/Services/TrayTooltipBuilderTests.cs
+++ b/tests/OpenClaw.Tray.Tests/Services/TrayTooltipBuilderTests.cs
@@ -1,4 +1,6 @@
 using OpenClaw.Shared;
+using OpenClaw.Connection;
+using OpenClawTray;
 using OpenClawTray.Helpers;
 using OpenClawTray.Services;
 using System;
@@ -48,7 +50,7 @@ public void Build_ConnectedWithChannelsAndNodes_ContainsExpectedSegments()
 
         var result = new TrayTooltipBuilder(snapshot).Build();
 
-        Assert.Contains("OpenClaw Tray - Connected", result);
+        Assert.Contains($"{AppIdentity.TrayName} - Connected", result);
         Assert.Contains("Channels 1/2", result);
         Assert.Contains("Nodes 1/1", result);
         Assert.Contains("Warnings 0", result);
@@ -97,6 +99,107 @@ public void Build_StatusNotConnected_CountsOneWarning()
         Assert.Contains("Warnings 1", result);
     }
 
+    [Fact]
+    public void Build_DegradedOverall_DoesNotReadConnected()
+    {
+        var snapshot = BaseConnected() with
+        {
+            OverallState = OverallConnectionState.Degraded
+        };
+
+        var result = new TrayTooltipBuilder(snapshot).Build();
+
+        Assert.Contains($"{AppIdentity.TrayName} - Degraded", result);
+        Assert.Contains("Warnings 1", result);
+    }
+
+    [Fact]
+    public void Build_LocalMcpOnly_IsExplicit()
+    {
+        var settings = new SettingsManager(_tempDir)
+        {
+            EnableMcpServer = true,
+            EnableNodeMode = false
+        };
+        var snapshot = new TrayStateSnapshot
+        {
+            Status = ConnectionStatus.Disconnected,
+            Settings = settings,
+            IsMcpRunning = true,
+            LastCheckTime = FixedTime
+        };
+
+        var result = new TrayTooltipBuilder(snapshot).Build();
+
+        Assert.Contains($"{AppIdentity.TrayName} - Local MCP only", result);
+        Assert.Contains("Warnings 1", result);
+    }
+
+    [Fact]
+    public void Build_LocalMcpOnly_DoesNotMaskDegradedGatewayLifecycle()
+    {
+        var settings = new SettingsManager(_tempDir)
+        {
+            EnableMcpServer = true,
+            EnableNodeMode = false
+        };
+        var snapshot = new TrayStateSnapshot
+        {
+            Status = ConnectionStatus.Error,
+            OverallState = OverallConnectionState.Degraded,
+            Settings = settings,
+            IsMcpRunning = true,
+            LastCheckTime = FixedTime
+        };
+
+        var result = new TrayTooltipBuilder(snapshot).Build();
+
+        Assert.Contains($"{AppIdentity.TrayName} - Degraded", result);
+        Assert.DoesNotContain("Local MCP only", result);
+    }
+
+    [Fact]
+    public void Build_McpStartupError_IsExplicit()
+    {
+        var settings = new SettingsManager(_tempDir)
+        {
+            EnableMcpServer = true
+        };
+        var snapshot = new TrayStateSnapshot
+        {
+            Status = ConnectionStatus.Disconnected,
+            Settings = settings,
+            McpStartupError = "Port 8765 is already in use.",
+            LastCheckTime = FixedTime
+        };
+
+        var result = new TrayTooltipBuilder(snapshot).Build();
+
+        Assert.Contains($"{AppIdentity.TrayName} - Local MCP failed", result);
+        Assert.Contains("Warnings 2", result);
+    }
+
+    [Fact]
+    public void Build_StaleMcpStartupError_IsIgnoredWhenMcpDisabled()
+    {
+        var settings = new SettingsManager(_tempDir)
+        {
+            EnableMcpServer = false
+        };
+        var snapshot = BaseConnected(authFailure: null) with
+        {
+            OverallState = OverallConnectionState.Ready,
+            Settings = settings,
+            McpStartupError = "stale failure"
+        };
+
+        var result = new TrayTooltipBuilder(snapshot).Build();
+
+        Assert.Contains($"{AppIdentity.TrayName} - Connected", result);
+        Assert.Contains("Warnings 1", result);
+        Assert.DoesNotContain("Local MCP failed", result);
+    }
+
     [Fact]
     public void Build_AuthFailureMessage_CountsOneWarning()
     {
diff --git a/tests/OpenClaw.Tray.Tests/SessionActionsWiringTests.cs b/tests/OpenClaw.Tray.Tests/SessionActionsWiringTests.cs
new file mode 100644
index 000000000..9115a4787
--- /dev/null
+++ b/tests/OpenClaw.Tray.Tests/SessionActionsWiringTests.cs
@@ -0,0 +1,166 @@
+using System.IO;
+using System.Xml.Linq;
+
+namespace OpenClaw.Tray.Tests;
+
+/// <summary>
+/// Source-contract tests for the session-actions + compaction-checkpoint UX.
+/// They assert the Sessions page and App route destructive actions through the
+/// shared <c>SessionActionPlanner</c> (confirmation + main-session protection)
+/// and expose export/checkpoint entry points, without needing a UI thread.
+/// </summary>
+public sealed class SessionActionsWiringTests
+{
+    [Fact]
+    public void SessionsPage_ConfirmsDestructiveActions_ViaPlanner()
+    {
+        var source = ReadSource("src", "OpenClaw.Tray.WinUI", "Pages", "SessionsPage.xaml.cs");
+
+        // Destructive actions are gated by the shared planner + a confirm dialog.
+        Assert.Contains("SessionActionPlanner.IsAllowed", source);
+        Assert.Contains("SessionActionPlanner.BuildPrompt", source);
+        Assert.Contains("ConfirmAsync", source);
+        // Reset/Compact/Delete funnel through a single confirmed runner.
+        Assert.Contains("RunSessionActionAsync(sender, SessionActionKind.Reset)", source);
+        Assert.Contains("RunSessionActionAsync(sender, SessionActionKind.Compact)", source);
+        Assert.Contains("RunSessionActionAsync(sender, SessionActionKind.Delete)", source);
+        // Runtime dialogs must not use XAML property resource keys; those can
+        // fall back to raw key text such as "CancelButton.Content".
+        Assert.Contains("SessionActionPrompt_CancelLabel", source);
+        Assert.DoesNotContain("LocalizationHelper.GetString(\"CancelButton.Content\")", source);
+        Assert.Contains("DefaultButton = ContentDialogButton.None", source);
+    }
+
+    [Fact]
+    public void SessionsPage_ExposesExportAndCheckpointActions()
+    {
+        var source = ReadSource("src", "OpenClaw.Tray.WinUI", "Pages", "SessionsPage.xaml.cs");
+
+        // Export uses transcript fetch + formatter + file picker.
+        Assert.Contains("RequestChatHistoryAsync", source);
+        Assert.Contains("SessionTranscriptFormatter", source);
+        Assert.Contains("FileSavePicker", source);
+
+        // Checkpoints use the gateway's compaction-checkpoint protocol APIs.
+        Assert.Contains("ListCompactionCheckpointsAsync", source);
+        Assert.Contains("BranchCompactionCheckpointAsync", source);
+        Assert.Contains("RestoreCompactionCheckpointAsync", source);
+        // Unsupported gateways are surfaced via the typed IsSupported flag.
+        Assert.Contains("IsSupported", source);
+    }
+
+    [Fact]
+    public void SessionsPage_HardensDestructiveActions()
+    {
+        var source = ReadSource("src", "OpenClaw.Tray.WinUI", "Pages", "SessionsPage.xaml.cs");
+
+        // Main-session gating uses an authoritative resolver, not a VM-only default.
+        Assert.Contains("ResolveMainState", source);
+        // Restore only acts on a provably-latest checkpoint and re-validates fresh.
+        Assert.Contains("ResolveUnambiguousLatest", source);
+        // ID-less checkpoints are preserved for restore safety, but can't be used as branch targets.
+        Assert.Contains("FirstOrDefault(c => !string.IsNullOrWhiteSpace(c.Id))", source);
+        // Destructive send failures are surfaced, not swallowed.
+        Assert.Contains("\"The gateway didn't accept the request. Try again.\"", source);
+    }
+
+    [Fact]
+    public void SessionsPage_Xaml_HasActionMenuItems_AndGatesDelete()
+    {
+        var xaml = ReadSource("src", "OpenClaw.Tray.WinUI", "Pages", "SessionsPage.xaml");
+
+        Assert.Contains("Click=\"OnExportSession\"", xaml);
+        Assert.Contains("Click=\"OnShowCheckpoints\"", xaml);
+        Assert.Contains("Click=\"OnDeleteSession\"", xaml);
+        // Delete is disabled for sessions that can't be deleted (main session).
+        Assert.Contains("IsEnabled=\"{Binding CanDelete}\"", xaml);
+    }
+
+    [Fact]
+    public void App_SessionActions_UsePlanner_NotInlineCopy()
+    {
+        var source = ReadSource("src", "OpenClaw.Tray.WinUI", "App.xaml.cs");
+
+        Assert.Contains("SessionActionPlanner.BuildPrompt", source);
+        Assert.Contains("SessionActionPlanner.IsAllowed", source);
+        Assert.Contains("SessionActionPrompt_CancelLabel", source);
+        Assert.DoesNotContain("LocalizationHelper.GetString(\"CancelButton.Content\")", source);
+        Assert.Contains("DefaultButton = ContentDialogButton.None", source);
+        // The confirmation copy comes from the shared planner, not inline strings.
+        Assert.DoesNotContain("Start a fresh session for '", source);
+        Assert.DoesNotContain("Keep the latest log lines for '", source);
+    }
+
+    [Fact]
+    public void SessionActionPrompts_AreRuntimeLocalized()
+    {
+        var source = ReadSource("src", "OpenClaw.Tray.WinUI", "Helpers", "SessionActionPromptLocalizer.cs");
+        var requiredKeys = new[]
+        {
+            "SessionActionPrompt_CancelLabel",
+            "SessionActionPrompt_Reset_Title",
+            "SessionActionPrompt_Reset_BodyFormat",
+            "SessionActionPrompt_Reset_ConfirmLabel",
+            "SessionActionPrompt_Compact_Title",
+            "SessionActionPrompt_Compact_BodyFormat",
+            "SessionActionPrompt_Compact_ConfirmLabel",
+            "SessionActionPrompt_Delete_Title",
+            "SessionActionPrompt_Delete_BodyFormat",
+            "SessionActionPrompt_Delete_ConfirmLabel",
+            "SessionActionPrompt_Restore_Title",
+            "SessionActionPrompt_Restore_BodyFormat",
+            "SessionActionPrompt_Restore_ConfirmLabel",
+        };
+
+        foreach (var prefix in new[]
+        {
+            "SessionActionPrompt_Reset",
+            "SessionActionPrompt_Compact",
+            "SessionActionPrompt_Delete",
+            "SessionActionPrompt_Restore",
+        })
+        {
+            Assert.Contains(prefix, source);
+        }
+
+        var stringsRoot = Path.Combine(GetRepositoryRoot(), "src", "OpenClaw.Tray.WinUI", "Strings");
+        foreach (var resourcePath in Directory.EnumerateFiles(stringsRoot, "Resources.resw", SearchOption.AllDirectories))
+        {
+            var keys = XDocument.Load(resourcePath)
+                .Descendants("data")
+                .Select(e => e.Attribute("name")?.Value)
+                .Where(name => !string.IsNullOrEmpty(name))
+                .ToHashSet(StringComparer.Ordinal);
+            foreach (var key in requiredKeys)
+                Assert.Contains(key, keys);
+        }
+    }
+
+    private static string ReadSource(params string[] relativePathParts)
+    {
+        var root = GetRepositoryRoot();
+        return File.ReadAllText(Path.Combine(new[] { root }.Concat(relativePathParts).ToArray()));
+    }
+
+    private static string GetRepositoryRoot()
+    {
+        var env = Environment.GetEnvironmentVariable("OPENCLAW_REPO_ROOT");
+        if (!string.IsNullOrWhiteSpace(env) && Directory.Exists(env))
+            return env;
+
+        var directory = new DirectoryInfo(AppContext.BaseDirectory);
+        while (directory != null)
+        {
+            if (File.Exists(Path.Combine(directory.FullName, "openclaw-windows-node.slnx")) &&
+                Directory.Exists(Path.Combine(directory.FullName, "src")))
+            {
+                return directory.FullName;
+            }
+
+            directory = directory.Parent;
+        }
+
+        throw new InvalidOperationException(
+            "Could not find repository root. Set OPENCLAW_REPO_ROOT to the repo path.");
+    }
+}
diff --git a/tests/OpenClaw.Tray.Tests/SessionVisibilityFilterTests.cs b/tests/OpenClaw.Tray.Tests/SessionVisibilityFilterTests.cs
new file mode 100644
index 000000000..4500af636
--- /dev/null
+++ b/tests/OpenClaw.Tray.Tests/SessionVisibilityFilterTests.cs
@@ -0,0 +1,94 @@
+using OpenClaw.Shared;
+using OpenClawTray.Services;
+
+namespace OpenClaw.Tray.Tests;
+
+public class SessionVisibilityFilterTests
+{
+    [Theory]
+    [InlineData("done")]
+    [InlineData("DONE")]
+    [InlineData(" completed ")]
+    public void IsCleanCompleted_RecognizesSuccessfulCompletedStatuses(string status)
+    {
+        var session = new SessionInfo { Status = status };
+
+        Assert.True(SessionVisibilityFilter.IsCleanCompleted(session));
+        Assert.False(SessionVisibilityFilter.IsVisibleWhenCompletedHidden(session));
+    }
+
+    [Theory]
+    [InlineData("failed")]
+    [InlineData("killed")]
+    [InlineData("timeout")]
+    [InlineData("running")]
+    [InlineData("unknown")]
+    public void IsCleanCompleted_LeavesNonSuccessfulTerminalAndActiveStatusesVisible(string status)
+    {
+        var session = new SessionInfo { Status = status };
+
+        Assert.False(SessionVisibilityFilter.IsCleanCompleted(session));
+        Assert.True(SessionVisibilityFilter.IsVisibleWhenCompletedHidden(session));
+    }
+
+    [Fact]
+    public void IsCleanCompleted_KeepsAbortedDoneSessionsVisible()
+    {
+        var session = new SessionInfo
+        {
+            Status = "done",
+            AbortedLastRun = true,
+        };
+
+        Assert.False(SessionVisibilityFilter.IsCleanCompleted(session));
+        Assert.True(SessionVisibilityFilter.IsVisibleWhenCompletedHidden(session));
+    }
+
+    [Fact]
+    public void VisibleSessions_HidesOnlyCleanCompletedSessionsByDefault()
+    {
+        var sessions = new[]
+        {
+            new SessionInfo { Key = "done", Status = "done" },
+            new SessionInfo { Key = "failed", Status = "failed" },
+            new SessionInfo { Key = "killed", Status = "killed" },
+            new SessionInfo { Key = "timeout", Status = "timeout" },
+            new SessionInfo { Key = "aborted-done", Status = "done", AbortedLastRun = true },
+            new SessionInfo { Key = "running", Status = "running" },
+        };
+
+        var visible = SessionVisibilityFilter.VisibleSessions(sessions, showCompleted: false)
+            .Select(s => s.Key)
+            .ToArray();
+
+        Assert.Equal(new[] { "failed", "killed", "timeout", "aborted-done", "running" }, visible);
+    }
+
+    [Fact]
+    public void VisibleSessions_ShowCompletedPreservesAllSessions()
+    {
+        var sessions = new[]
+        {
+            new SessionInfo { Key = "done", Status = "done" },
+            new SessionInfo { Key = "failed", Status = "failed" },
+        };
+
+        var visible = SessionVisibilityFilter.VisibleSessions(sessions, showCompleted: true)
+            .Select(s => s.Key)
+            .ToArray();
+
+        Assert.Equal(new[] { "done", "failed" }, visible);
+    }
+
+    [Theory]
+    [InlineData("all", "all")]
+    [InlineData("Slack", "Slack")]
+    [InlineData("slack", "slack")]
+    [InlineData("missing", "all")]
+    public void ResolveActiveChannel_PreservesOnlyVisibleChannels(string activeChannel, string expected)
+    {
+        var visibleChannels = new[] { "Slack", "WhatsApp" };
+
+        Assert.Equal(expected, SessionVisibilityFilter.ResolveActiveChannel(activeChannel, visibleChannels));
+    }
+}
diff --git a/tests/OpenClaw.Tray.Tests/SettingsRoundTripTests.cs b/tests/OpenClaw.Tray.Tests/SettingsRoundTripTests.cs
index 7eb049397..b9a72e5b0 100644
--- a/tests/OpenClaw.Tray.Tests/SettingsRoundTripTests.cs
+++ b/tests/OpenClaw.Tray.Tests/SettingsRoundTripTests.cs
@@ -56,6 +56,12 @@ public void RoundTrip_AllFields_Preserved()
             SkippedUpdateTag = "v1.2.3",
             NotifyChatResponses = false,
             PreferStructuredCategories = true,
+            AppTheme = "Dark",
+            ShowDiagnostics = true,
+            ShowCompletedSessions = true,
+            SystemRunSandboxEnabled = true,
+            SystemRunBlockHostFallbackWhenMxcUnavailable = true,
+            SystemRunAllowOutbound = true,
             UserRules = new List<UserNotificationRule>
             {
                 new() { Pattern = "build.*fail", IsRegex = true, Category = "urgent", Enabled = true }
@@ -66,6 +72,7 @@ public void RoundTrip_AllFields_Preserved()
         var restored = SettingsData.FromJson(json);
 
         Assert.NotNull(restored);
+        Assert.Equal(original.SettingsSchemaVersion, restored.SettingsSchemaVersion);
         Assert.Equal(original.GatewayUrl, restored.GatewayUrl);
         Assert.Equal(original.UseSshTunnel, restored.UseSshTunnel);
         Assert.Equal(original.SshTunnelUser, restored.SshTunnelUser);
@@ -111,6 +118,12 @@ public void RoundTrip_AllFields_Preserved()
         Assert.Equal(original.SkippedUpdateTag, restored.SkippedUpdateTag);
         Assert.Equal(original.NotifyChatResponses, restored.NotifyChatResponses);
         Assert.Equal(original.PreferStructuredCategories, restored.PreferStructuredCategories);
+        Assert.Equal(original.AppTheme, restored.AppTheme);
+        Assert.Equal(original.ShowDiagnostics, restored.ShowDiagnostics);
+        Assert.Equal(original.ShowCompletedSessions, restored.ShowCompletedSessions);
+        Assert.Equal(original.SystemRunSandboxEnabled, restored.SystemRunSandboxEnabled);
+        Assert.Equal(original.SystemRunBlockHostFallbackWhenMxcUnavailable, restored.SystemRunBlockHostFallbackWhenMxcUnavailable);
+        Assert.Equal(original.SystemRunAllowOutbound, restored.SystemRunAllowOutbound);
         Assert.NotNull(restored.UserRules);
         Assert.Single(restored.UserRules);
         Assert.Equal("build.*fail", restored.UserRules[0].Pattern);
@@ -176,12 +189,40 @@ public void MissingFields_UseDefaults()
         Assert.Null(settings.SkippedUpdateTag);
         Assert.True(settings.NotifyChatResponses);
         Assert.True(settings.PreferStructuredCategories);
+        Assert.Equal("System", settings.AppTheme);
+        Assert.Null(settings.ShowDiagnostics);
+        Assert.False(settings.ShowCompletedSessions);
+        Assert.True(settings.SystemRunSandboxEnabled);
+        Assert.False(settings.SystemRunBlockHostFallbackWhenMxcUnavailable);
+        Assert.False(settings.SystemRunAllowOutbound);
         // HubNavPaneOpen defaults to true (NavView starts expanded for new
         // installs and for any settings file that predates the field).
         Assert.True(settings.HubNavPaneOpen);
         Assert.Null(settings.UserRules);
     }
 
+    [Fact]
+    public void SettingsManager_MissingShowDiagnostics_DefaultsVisible_ForUpgradeCompatibility()
+    {
+        var dir = Path.Combine(Path.GetTempPath(), "OpenClaw.Tray.Tests", Guid.NewGuid().ToString("N"));
+
+        try
+        {
+            Directory.CreateDirectory(dir);
+            File.WriteAllText(Path.Combine(dir, "settings.json"), "{}");
+
+            var settings = new SettingsManager(dir);
+
+            Assert.Null(settings.ShowDiagnosticsOverride);
+            Assert.True(settings.ShowDiagnosticsEffective);
+        }
+        finally
+        {
+            if (Directory.Exists(dir))
+                Directory.Delete(dir, recursive: true);
+        }
+    }
+
     [Fact]
     public void HubNavPaneOpen_DefaultsTrue_ForEmptyJson()
     {
@@ -194,6 +235,95 @@ public void HubNavPaneOpen_DefaultsTrue_ForEmptyJson()
         Assert.True(settings!.HubNavPaneOpen);
     }
 
+    [Fact]
+    public void SettingsManager_PreservesLegacySandboxFallbackDefault()
+    {
+        var dir = Path.Combine(Path.GetTempPath(), "OpenClaw.Tray.Tests", Guid.NewGuid().ToString("N"));
+
+        try
+        {
+            Directory.CreateDirectory(dir);
+            File.WriteAllText(Path.Combine(dir, "settings.json"), """
+            {
+                "SystemRunSandboxEnabled": true,
+                "SystemRunBlockHostFallbackWhenMxcUnavailable": false
+            }
+            """);
+
+            var settings = new SettingsManager(dir);
+
+            Assert.True(settings.SystemRunSandboxEnabled);
+            Assert.False(settings.SystemRunBlockHostFallbackWhenMxcUnavailable);
+
+            settings.Save();
+
+            using var saved = JsonDocument.Parse(File.ReadAllText(Path.Combine(dir, "settings.json")));
+            Assert.Equal(1, saved.RootElement.GetProperty(nameof(SettingsData.SettingsSchemaVersion)).GetInt32());
+            Assert.False(saved.RootElement.GetProperty(nameof(SettingsData.SystemRunBlockHostFallbackWhenMxcUnavailable)).GetBoolean());
+        }
+        finally
+        {
+            if (Directory.Exists(dir))
+                Directory.Delete(dir, recursive: true);
+        }
+    }
+
+    [Fact]
+    public void SettingsManager_PreservesVersionedSandboxFallbackCompatibility()
+    {
+        var dir = Path.Combine(Path.GetTempPath(), "OpenClaw.Tray.Tests", Guid.NewGuid().ToString("N"));
+
+        try
+        {
+            Directory.CreateDirectory(dir);
+            File.WriteAllText(Path.Combine(dir, "settings.json"), """
+            {
+                "SettingsSchemaVersion": 1,
+                "SystemRunSandboxEnabled": true,
+                "SystemRunBlockHostFallbackWhenMxcUnavailable": false
+            }
+            """);
+
+            var settings = new SettingsManager(dir);
+
+            Assert.True(settings.SystemRunSandboxEnabled);
+            Assert.False(settings.SystemRunBlockHostFallbackWhenMxcUnavailable);
+        }
+        finally
+        {
+            if (Directory.Exists(dir))
+                Directory.Delete(dir, recursive: true);
+        }
+    }
+
+    [Fact]
+    public void SettingsManager_PreservesVersionedStrictFallbackBlockingOptIn()
+    {
+        var dir = Path.Combine(Path.GetTempPath(), "OpenClaw.Tray.Tests", Guid.NewGuid().ToString("N"));
+
+        try
+        {
+            Directory.CreateDirectory(dir);
+            File.WriteAllText(Path.Combine(dir, "settings.json"), """
+            {
+                "SettingsSchemaVersion": 1,
+                "SystemRunSandboxEnabled": true,
+                "SystemRunBlockHostFallbackWhenMxcUnavailable": true
+            }
+            """);
+
+            var settings = new SettingsManager(dir);
+
+            Assert.True(settings.SystemRunSandboxEnabled);
+            Assert.True(settings.SystemRunBlockHostFallbackWhenMxcUnavailable);
+        }
+        finally
+        {
+            if (Directory.Exists(dir))
+                Directory.Delete(dir, recursive: true);
+        }
+    }
+
     [Fact]
     public void BackwardCompatibility_OldSettingsWithoutNewFields()
     {
@@ -247,6 +377,8 @@ public void BackwardCompatibility_OldSettingsWithoutNewFields()
         Assert.False(settings.HasSeenActivityStreamTip);
         Assert.Null(settings.SkippedUpdateTag);
         Assert.True(settings.GlobalHotkeyEnabled);
+        Assert.Equal("System", settings.AppTheme);
+        Assert.Null(settings.ShowDiagnostics);
         // HubNavPaneOpen wasn't in this older JSON shape; default true.
         Assert.True(settings.HubNavPaneOpen);
         Assert.Null(settings.UserRules);
@@ -309,6 +441,34 @@ public void SettingsManager_PersistsRecordingConsentFlags()
         }
     }
 
+    [Fact]
+    public void SettingsManager_NormalizesInvalidAppTheme()
+    {
+        var dir = Path.Combine(Path.GetTempPath(), "OpenClaw.Tray.Tests", Guid.NewGuid().ToString("N"));
+
+        try
+        {
+            Directory.CreateDirectory(dir);
+            File.WriteAllText(Path.Combine(dir, "settings.json"), """
+            {
+              "AppTheme": "Neon"
+            }
+            """);
+
+            var settings = new SettingsManager(dir);
+
+            Assert.Equal("System", settings.AppTheme);
+
+            settings.AppTheme = "dark";
+            Assert.Equal("Dark", settings.AppTheme);
+        }
+        finally
+        {
+            if (Directory.Exists(dir))
+                Directory.Delete(dir, recursive: true);
+        }
+    }
+
     [WindowsFact]
     public void SettingsManager_ProtectsElevenLabsApiKeyForStorage()
     {
diff --git a/tests/OpenClaw.Tray.Tests/StableRowCollectionTests.cs b/tests/OpenClaw.Tray.Tests/StableRowCollectionTests.cs
new file mode 100644
index 000000000..d8862f839
--- /dev/null
+++ b/tests/OpenClaw.Tray.Tests/StableRowCollectionTests.cs
@@ -0,0 +1,39 @@
+using System.Collections.ObjectModel;
+using OpenClawTray.Chat.Controls;
+
+namespace OpenClaw.Tray.Tests;
+
+public sealed class StableRowCollectionTests
+{
+    [Fact]
+    public void Sync_ReordersWithoutReplacingCollection()
+    {
+        var rows = new ObservableCollection<Row>
+        {
+            new("a"),
+            new("b"),
+            new("c"),
+        };
+
+        StableRowCollection.Sync(rows, new[] { new Row("c"), new Row("a"), new Row("d") }, row => row.Key);
+
+        Assert.Equal(new[] { "c", "a", "d" }, rows.Select(row => row.Key).ToArray());
+    }
+
+    [Fact]
+    public void Sync_RemovesMissingKeys()
+    {
+        var rows = new ObservableCollection<Row>
+        {
+            new("a"),
+            new("b"),
+            new("c"),
+        };
+
+        StableRowCollection.Sync(rows, new[] { new Row("b") }, row => row.Key);
+
+        Assert.Equal(new[] { "b" }, rows.Select(row => row.Key).ToArray());
+    }
+
+    private sealed record Row(string Key);
+}
diff --git a/tests/OpenClaw.Tray.Tests/ToastActivationRouterTests.cs b/tests/OpenClaw.Tray.Tests/ToastActivationRouterTests.cs
index 11d96799b..bccf4cf35 100644
--- a/tests/OpenClaw.Tray.Tests/ToastActivationRouterTests.cs
+++ b/tests/OpenClaw.Tray.Tests/ToastActivationRouterTests.cs
@@ -75,6 +75,19 @@ public void Route_OpenChat_PassesSessionKeyArgument()
         Assert.Equal(["chat:agent:main:scratch", "chat:(null)"], calls);
     }
 
+    [Fact]
+    public void Route_ReviewPairing_InvokesReviewAction()
+    {
+        var calls = new List<string>();
+
+        ToastActivationRouter.Route(
+            "review_pairing",
+            _ => null,
+            BuildActions(calls));
+
+        Assert.Equal(["review"], calls);
+    }
+
     [Fact]
     public void Route_UnknownAction_NoOps()
     {
@@ -95,6 +108,7 @@ public void Route_UnknownAction_NoOps()
         OpenSettings = () => calls.Add("settings"),
         OpenChat = key => calls.Add($"chat:{key ?? "(null)"}"),
         OpenActivity = () => calls.Add("activity"),
-        CopyPairingCommand = command => calls.Add($"copy:{command}")
+        CopyPairingCommand = command => calls.Add($"copy:{command}"),
+        ReviewPairing = () => calls.Add("review")
     };
 }
diff --git a/tests/OpenClaw.Tray.Tests/ToolMetaCacheTests.cs b/tests/OpenClaw.Tray.Tests/ToolMetaCacheTests.cs
index 7f0c451a9..06e02dcaf 100644
--- a/tests/OpenClaw.Tray.Tests/ToolMetaCacheTests.cs
+++ b/tests/OpenClaw.Tray.Tests/ToolMetaCacheTests.cs
@@ -170,6 +170,72 @@ public async Task CacheToolMeta_ConcurrentAdds_FlushesCompleteValidJson()
         Assert.Empty(Directory.EnumerateFiles(tempDir.DirectoryPath, "*.tmp"));
     }
 
+    [Fact]
+    public async Task CacheToolMeta_PersistsReadableJsonWithoutUnicodeOrNewlineEscapes()
+    {
+        using var tempDir = new TempDirectory();
+        var cachePath = Path.Combine(tempDir.DirectoryPath, "tool-metadata.json");
+        var bridge = new FakeBridge
+        {
+            History = new ChatHistoryInfo
+            {
+                SessionKey = "main",
+                SessionId = "session-1"
+            }
+        };
+        var provider = new OpenClawChatDataProvider(bridge, post: null, toolMetaCacheFilePath: cachePath);
+        await provider.LoadHistoryAsync("main");
+
+        provider.CacheToolMeta(
+            "main",
+            1_000,
+            "bash",
+            "exec search \"duplicate\" -> {\"timestamp\":\"2025-01-01T00:00:00+00:00\",\"message\":\"line1\r\n      line2\"}");
+
+        await provider.DisposeAsync();
+
+        var json = File.ReadAllText(cachePath);
+        var cache = JsonSerializer.Deserialize<Dictionary<string, List<OpenClawChatDataProvider.CachedToolMeta>>>(json);
+        var entry = Assert.Single(cache!["session-1"]);
+
+        Assert.DoesNotContain("\\u0022", json, StringComparison.Ordinal);
+        Assert.DoesNotContain("\\u002B", json, StringComparison.Ordinal);
+        Assert.DoesNotContain("\\r\\n", json, StringComparison.Ordinal);
+        Assert.Contains("+00:00", json, StringComparison.Ordinal);
+        Assert.Contains("\\\"duplicate\\\"", json, StringComparison.Ordinal);
+        Assert.DoesNotContain('\r', entry.Label);
+        Assert.DoesNotContain('\n', entry.Label);
+        Assert.Contains("line1       line2", entry.Label, StringComparison.Ordinal);
+    }
+
+    [Fact]
+    public async Task Constructor_DoesNotRewriteLegacyEscapedToolMetaCache()
+    {
+        using var tempDir = new TempDirectory();
+        var cachePath = Path.Combine(tempDir.DirectoryPath, "tool-metadata.json");
+        const string legacyJson = """
+            {
+              "session-1": [
+                {
+                  "Ts": 1000,
+                  "ToolName": "bash",
+                  "Label": "exec \u0022duplicate\u0022 at 2025-01-01T00:00:00\u002B00:00\r\n      next line"
+                }
+              ]
+            }
+            """;
+        File.WriteAllText(cachePath, legacyJson);
+
+        var provider = new OpenClawChatDataProvider(new FakeBridge(), post: null, toolMetaCacheFilePath: cachePath);
+        await provider.DisposeAsync();
+
+        var json = File.ReadAllText(cachePath);
+        Assert.Equal(legacyJson, json);
+        Assert.Contains("\\u0022", json, StringComparison.Ordinal);
+        Assert.Contains("\\u002B", json, StringComparison.Ordinal);
+        Assert.Contains("\\r\\n", json, StringComparison.Ordinal);
+    }
+
     [Fact]
     public async Task CacheToolMeta_WithoutSessionId_FallsBackToThreadKey()
     {
@@ -191,6 +257,18 @@ public async Task CacheToolMeta_WithoutSessionId_FallsBackToThreadKey()
         Assert.Equal("echo after reset", entry.Label);
     }
 
+    [Fact]
+    public void TryMatch_NormalizesLegacyCachedNewlines()
+    {
+        var cache = new Queue<OpenClawChatDataProvider.CachedToolMeta>();
+        cache.Enqueue(Meta(100, "bash\r\nname", "line1\r\n      \"line2\""));
+
+        var result = OpenClawChatDataProvider.TryMatchCachedTool(cache, 200);
+
+        Assert.Equal("bash name", result!.ToolName);
+        Assert.Equal("line1       \"line2\"", result.Label);
+    }
+
     [Fact]
     public async Task Reset_DoesNotReseedClearedSessionIdFromStaleSessionsList()
     {
@@ -230,6 +308,50 @@ public async Task Reset_DoesNotReseedClearedSessionIdFromStaleSessionsList()
         Assert.Equal("echo after reset", Assert.Single(entries!).Label);
     }
 
+    [Fact]
+    public async Task Reset_PersistsClearedToolMetaWhenCacheWasClean()
+    {
+        using var tempDir = new TempDirectory();
+        var cachePath = Path.Combine(tempDir.DirectoryPath, "tool-metadata.json");
+        const string initialJson = """
+            {
+              "old-session": [
+                {
+                  "Ts": 1000,
+                  "ToolName": "bash",
+                  "Label": "stale tool"
+                }
+              ]
+            }
+            """;
+        File.WriteAllText(cachePath, initialJson);
+        var bridge = new FakeBridge
+        {
+            History = new ChatHistoryInfo
+            {
+                SessionKey = "main",
+                SessionId = "old-session"
+            }
+        };
+        var provider = new OpenClawChatDataProvider(bridge, post: null, toolMetaCacheFilePath: cachePath);
+        await provider.LoadHistoryAsync("main");
+
+        bridge.RaiseSessionCommandCompleted(new SessionCommandResult
+        {
+            Method = "sessions.reset",
+            Ok = true,
+            Key = "main"
+        });
+        await provider.DisposeAsync();
+
+        var json = File.ReadAllText(cachePath);
+        var cache = JsonSerializer.Deserialize<Dictionary<string, List<OpenClawChatDataProvider.CachedToolMeta>>>(json);
+
+        Assert.NotEqual(initialJson, json);
+        Assert.NotNull(cache);
+        Assert.DoesNotContain("old-session", cache!.Keys);
+    }
+
     private sealed class FakeBridge : IChatGatewayBridge
     {
         public bool IsConnected { get; set; }
@@ -241,9 +363,16 @@ private sealed class FakeBridge : IChatGatewayBridge
         public SessionInfo[] GetSessionList() => Array.Empty<SessionInfo>();
         public ModelsListInfo? GetCurrentModelsList() => null;
         public void StartProactiveBootstrap() { }
+        public Task<CommandCatalog> ListCommandsAsync(CommandCatalogQuery? query = null) => Task.FromResult(new CommandCatalog { IsSupported = true });
         public Task SendChatMessageAsync(string message, string? sessionKey, string? sessionId, IReadOnlyList<ChatAttachment>? attachments = null) => Task.CompletedTask;
-        public Task<ChatSendResult> SendChatMessageForRunAsync(string message, string? sessionKey, string? sessionId, IReadOnlyList<ChatAttachment>? attachments = null) => Task.FromResult(new ChatSendResult());
+        public Task<ChatSendResult> SendChatMessageForRunAsync(
+            string message,
+            string? sessionKey,
+            string? sessionId,
+            IReadOnlyList<ChatAttachment>? attachments = null,
+            string? idempotencyKey = null) => Task.FromResult(new ChatSendResult());
         public Task PatchSessionModelAsync(string sessionKey, string model) => Task.CompletedTask;
+        public Task ClearSessionModelAsync(string sessionKey) => Task.CompletedTask;
         public Task PatchSessionThinkingLevelAsync(string sessionKey, string thinkingLevel) => Task.CompletedTask;
         public Task<ChatHistoryInfo> RequestChatHistoryAsync(string? sessionKey) => Task.FromResult(History);
         public Task SendChatAbortAsync(string runId, string? sessionKey = null) => Task.CompletedTask;
diff --git a/tests/OpenClaw.Tray.Tests/TrayMenuWindowMarkupTests.cs b/tests/OpenClaw.Tray.Tests/TrayMenuWindowMarkupTests.cs
index 7e33f70a7..9d2dc74fc 100644
--- a/tests/OpenClaw.Tray.Tests/TrayMenuWindowMarkupTests.cs
+++ b/tests/OpenClaw.Tray.Tests/TrayMenuWindowMarkupTests.cs
@@ -34,6 +34,58 @@ public void CanvasWindow_CleansUpGatewayAuthWebResourceHandler()
         Assert.DoesNotContain("WebResourceRequested += (", source);
     }
 
+    [Fact]
+    public void CanvasWindow_RewritesOnlyGatewayUrls()
+    {
+        var source = Read(
+            "src",
+            "OpenClaw.Tray.WinUI",
+            "Windows",
+            "CanvasWindow.xaml.cs");
+
+        Assert.Contains("_configuredGatewayOrigin", source);
+        Assert.Contains("CanvasGatewayUrlRewriter.Rewrite(url", source);
+        Assert.DoesNotContain("if (!urlOrigin.Equals(_gatewayOriginForRewrite", source);
+    }
+
+    [Fact]
+    public void CanvasNavigate_UsesCanvasWindow()
+    {
+        var source = Read(
+            "src",
+            "OpenClaw.Tray.WinUI",
+            "Services",
+            "NodeService.cs");
+
+        Assert.Contains("request inside the WebView canvas", source);
+        Assert.Contains("HttpUrlRiskEvaluator.Evaluate(canonical!)", source);
+        Assert.Contains("EnrichWithDnsRiskAsync", source);
+        Assert.Contains("risk.RequiresConfirmation", source);
+        Assert.Contains("return \"unsupported_in_canvas\"", source);
+        Assert.DoesNotContain("ShouldLaunchAfterPromptAsync(risk)", source);
+        Assert.Contains("_canvasWindow.Navigate(canonical!)", source);
+        Assert.Contains("tcs.TrySetResult(\"canvas\")", source);
+        Assert.Contains("Canvas navigate -> canvas", source);
+    }
+
+    [Fact]
+    public void CanvasGatewayOrigin_ComesFromActiveGatewayRecord()
+    {
+        var appSource = Read(
+            "src",
+            "OpenClaw.Tray.WinUI",
+            "App.xaml.cs");
+        var nodeServiceSource = Read(
+            "src",
+            "OpenClaw.Tray.WinUI",
+            "Services",
+            "NodeService.cs");
+
+        Assert.Contains("activeGatewayUrlResolver: () => _gatewayRegistry?.GetActive()?.Url", appSource);
+        Assert.Contains("private string? GetConfiguredGatewayUrl() => _activeGatewayUrlResolver?.Invoke();", nodeServiceSource);
+        Assert.DoesNotContain("private string? GetConfiguredGatewayUrl() => _settings?.UseSshTunnel", nodeServiceSource);
+    }
+
     [Fact]
     public void Source_DoesNotDeclareAsyncVoidHandlers()
     {
@@ -56,6 +108,17 @@ public void Source_DoesNotDeclareAsyncVoidHandlers()
             string.Join(", ", offenders));
     }
 
+    [Fact]
+    public void TrayMenuWindow_SizeToContent_MeasuresFinalRootWidthAndAppliesPixelSize()
+    {
+        var source = Read("src", "OpenClaw.Tray.WinUI", "Windows", "TrayMenuWindow.xaml.cs");
+
+        Assert.Contains("GetClientRect", source);
+        Assert.Contains("RootGrid.Measure(new global::Windows.Foundation.Size(clientWidthViewUnits, double.PositiveInfinity))", source);
+        Assert.Contains("ResizeWindowToPixelSize(_menuWidthPx, _menuHeightPx)", source);
+        Assert.DoesNotContain("MenuPanel.Measure(new global::Windows.Foundation.Size(widthViewUnits, double.PositiveInfinity))", source);
+    }
+
     private static string Read(params string[] parts)
         => File.ReadAllText(Path.Combine(new[] { TestRepositoryPaths.GetRepositoryRoot() }.Concat(parts).ToArray()));
 
diff --git a/tests/OpenClaw.Tray.Tests/VersioningContractTests.cs b/tests/OpenClaw.Tray.Tests/VersioningContractTests.cs
index 8d852678b..2c38c4b63 100644
--- a/tests/OpenClaw.Tray.Tests/VersioningContractTests.cs
+++ b/tests/OpenClaw.Tray.Tests/VersioningContractTests.cs
@@ -55,6 +55,18 @@ public void GitVersion_MainBranchPreservesAlphaReleaseTags()
             mainBranchMatch.Groups["body"].Value);
     }
 
+    [Fact]
+    public void BuildScript_PreflightsGitVersionRepositoryHistory()
+    {
+        var repoRoot = TestRepositoryPaths.GetRepositoryRoot();
+        var buildScript = File.ReadAllText(Path.Combine(repoRoot, "build.ps1"));
+
+        Assert.Contains("Git metadata not found. GitVersion requires a git clone with full history.", buildScript);
+        Assert.Contains("rev-parse --is-shallow-repository", buildScript);
+        Assert.Contains("GitVersion requires full git history", buildScript);
+        Assert.Contains("git fetch --unshallow --tags origin", buildScript);
+    }
+
     [Fact]
     public void ActiveCodeAndTests_DoNotContainStaleReleaseVersion()
     {
diff --git a/tests/OpenClaw.Tray.Tests/WizardConsoleTailTests.cs b/tests/OpenClaw.Tray.Tests/WizardConsoleTailTests.cs
index e02f4335b..2aeaa8f77 100644
--- a/tests/OpenClaw.Tray.Tests/WizardConsoleTailTests.cs
+++ b/tests/OpenClaw.Tray.Tests/WizardConsoleTailTests.cs
@@ -35,6 +35,59 @@ public void ExtractsCodexVersionFallbackMessage()
         Assert.Contains("incompatible", extracted);
     }
 
+    [Fact]
+    public void StripsAnsiSequencesFromQrConsoleOutput()
+    {
+        var line = """
+            {"_meta":{"name":"openclaw","logLevelName":"INFO","path":{"method":"console.log"}},"message":"\u001b[47m\u001b[30m██  ▄▄  ██\u001b[0m"}
+            """;
+
+        var extracted = WizardConsoleTail.TryExtractConsoleMessage(line);
+
+        Assert.Equal("██  ▄▄  ██", extracted);
+    }
+
+    [Fact]
+    public void PreservesUtf8QrBlockCharacters()
+    {
+        var line = """
+            {"_meta":{"name":"openclaw","logLevelName":"INFO","path":{"method":"console.log"}},"message":"Open WhatsApp and scan:\n████ ▄▄ ████"}
+            """;
+
+        var extracted = WizardConsoleTail.TryExtractConsoleMessage(line);
+
+        Assert.NotNull(extracted);
+        Assert.Contains("████ ▄▄ ████", extracted);
+    }
+
+    [Fact]
+    public void DetectsTerminalQrArt()
+    {
+        var qr = string.Join('\n', Enumerable.Repeat(" ███████  ▄▄▄  ▄▄▄      ▄  ▄  ▄▄   ▄    ▄  ▄▄   ▄▄▄ ", 12));
+
+        Assert.True(WizardConsoleTail.LooksLikeTerminalQrArt(qr));
+    }
+
+    [Fact]
+    public void DetectsTerminalQrArtWithSideBlockGlyphs()
+    {
+        var qr = string.Join('\n', Enumerable.Repeat("▌██  ▐▌ ▄▄ ▐▌ ██▐▌  ▀▀ ▐▌", 8));
+
+        Assert.True(WizardConsoleTail.LooksLikeTerminalQrArt(qr));
+    }
+
+    [Fact]
+    public void DoesNotTreatRegularMultilineConsoleOutputAsQrArt()
+    {
+        var message = """
+            Waiting for WhatsApp connection...
+            Open the WhatsApp app, go to Linked Devices, then scan this QR:
+            Docs: https://docs.openclaw.ai/whatsapp
+            """;
+
+        Assert.False(WizardConsoleTail.LooksLikeTerminalQrArt(message));
+    }
+
     [Fact]
     public void IgnoresStructuredSubsystemLogs()
     {
diff --git a/tests/OpenClaw.Tray.Tests/WorkspaceFilesModelTests.cs b/tests/OpenClaw.Tray.Tests/WorkspaceFilesModelTests.cs
new file mode 100644
index 000000000..4bc3e32ef
--- /dev/null
+++ b/tests/OpenClaw.Tray.Tests/WorkspaceFilesModelTests.cs
@@ -0,0 +1,398 @@
+using System;
+using System.Text.Json;
+using OpenClaw.Shared;
+using OpenClawTray.Pages;
+using Xunit;
+
+namespace OpenClaw.Tray.Tests;
+
+/// <summary>
+/// Unit coverage for <see cref="WorkspaceFilesModel"/> — the pure projection
+/// behind the Workspace page session file rail. Exercises the mapping from the
+/// typed gateway DTOs (<see cref="SessionFileList"/> / <see cref="SessionFileEntry"/>
+/// / <see cref="SessionFileBrowser"/>) into view rows, plus search/path,
+/// metadata (size/modified/missing), sort tiering, and unsupported/empty paths.
+/// </summary>
+public class WorkspaceFilesModelTests
+{
+    private static SessionFileEntry File(
+        string path, string? name = null, string? kind = null,
+        bool missing = false, long? size = null, DateTime? updatedAt = null) => new()
+    {
+        Path = path,
+        Name = name ?? "",
+        Kind = kind,
+        Missing = missing,
+        Size = size,
+        UpdatedAt = updatedAt,
+    };
+
+    private static SessionFileList List(params SessionFileEntry[] files) => new()
+    {
+        Key = "agent:main:main",
+        Root = "/home/agent/project",
+        Files = files,
+        IsSupported = true,
+    };
+
+    // ── File list mapping ───────────────────────────────────────────────
+
+    [Fact]
+    public void FromSessionFileList_MapsRootAndBasicFields()
+    {
+        var state = WorkspaceFilesModel.FromSessionFileList(List(
+            File("AGENTS.md", size: 2048),
+            File("plan.md", size: 512)));
+
+        Assert.True(state.Supported);
+        Assert.Equal("/home/agent/project", state.WorkspacePath);
+        Assert.Equal(2, state.Entries.Count);
+        var agents = Assert.Single(state.Entries, e => e.Name == "AGENTS.md");
+        Assert.Equal("AGENTS.md", agents.RelativePath);
+        Assert.Equal("AGENTS.md", agents.RequestPath);
+        Assert.Equal(2048, agents.Size);
+        Assert.True(agents.Exists);
+    }
+
+    [Fact]
+    public void FromSessionFileList_DerivesNameFromPathAndExposesDirectory()
+    {
+        var state = WorkspaceFilesModel.FromSessionFileList(List(
+            File("src/app/main.ts", size: 100)));
+
+        var entry = Assert.Single(state.Entries);
+        Assert.Equal("main.ts", entry.Name);
+        Assert.Equal("src/app/main.ts", entry.RelativePath);
+        Assert.Equal("src/app", WorkspaceFilesModel.DirectoryOf(entry.RelativePath));
+    }
+
+    [Fact]
+    public void FromSessionFileList_NormalizesBackslashForDisplayButKeepsRequestPath()
+    {
+        var state = WorkspaceFilesModel.FromSessionFileList(List(
+            File(@"src\app\main.ts", name: "main.ts")));
+
+        var entry = Assert.Single(state.Entries);
+        Assert.Equal("src/app/main.ts", entry.RelativePath);
+        // Request path stays verbatim so sessions.files.get matches the gateway.
+        Assert.Equal(@"src\app\main.ts", entry.RequestPath);
+    }
+
+    [Fact]
+    public void FromSessionFileList_KeepsMissingFiles()
+    {
+        var state = WorkspaceFilesModel.FromSessionFileList(List(
+            File("gone.md", missing: true),
+            File("here.md")));
+
+        Assert.Equal(2, state.Entries.Count);
+        Assert.False(Assert.Single(state.Entries, e => e.Name == "gone.md").Exists);
+        Assert.True(Assert.Single(state.Entries, e => e.Name == "here.md").Exists);
+    }
+
+    [Fact]
+    public void FromSessionFileList_MapsKindToTouchedAndRead()
+    {
+        var state = WorkspaceFilesModel.FromSessionFileList(List(
+            File("wrote.md", kind: "modified"),
+            File("saw.md", kind: "read")));
+
+        Assert.True(Assert.Single(state.Entries, e => e.Name == "wrote.md").Touched);
+        Assert.False(Assert.Single(state.Entries, e => e.Name == "wrote.md").Read);
+        Assert.True(Assert.Single(state.Entries, e => e.Name == "saw.md").Read);
+    }
+
+    [Fact]
+    public void FromSessionFileList_MapsUpdatedAtToUtc()
+    {
+        var state = WorkspaceFilesModel.FromSessionFileList(List(
+            File("a.md", updatedAt: new DateTime(2024, 1, 2, 3, 4, 5, DateTimeKind.Utc))));
+
+        var entry = Assert.Single(state.Entries);
+        Assert.Equal(
+            new DateTimeOffset(2024, 1, 2, 3, 4, 5, TimeSpan.Zero),
+            entry.ModifiedUtc!.Value);
+    }
+
+    [Fact]
+    public void FromSessionFileList_NegativeSizeBecomesNull()
+    {
+        var state = WorkspaceFilesModel.FromSessionFileList(List(
+            File("a.md", size: -1),
+            File("b.md")));
+
+        Assert.Null(Assert.Single(state.Entries, e => e.Name == "a.md").Size);
+        Assert.Null(Assert.Single(state.Entries, e => e.Name == "b.md").Size);
+    }
+
+    [Fact]
+    public void FromSessionFileList_SkipsEntriesWithoutPathOrName()
+    {
+        var state = WorkspaceFilesModel.FromSessionFileList(List(
+            File(""),
+            File("valid.md")));
+
+        var entry = Assert.Single(state.Entries);
+        Assert.Equal("valid.md", entry.Name);
+    }
+
+    [Fact]
+    public void FromSessionFileList_MergesBrowserDirectoriesNotInFiles()
+    {
+        var list = new SessionFileList
+        {
+            Key = "agent:main:main",
+            Root = "/root",
+            Files = new[] { File("README.md", kind: "read") },
+            Browser = new SessionFileBrowser
+            {
+                Entries = new[]
+                {
+                    new SessionFileBrowserEntry { Path = "src", Name = "src", Kind = "directory", SessionKind = "modified" },
+                    // Duplicate of a file entry — the richer file entry wins.
+                    new SessionFileBrowserEntry { Path = "README.md", Name = "README.md", Kind = "file" },
+                },
+            },
+            IsSupported = true,
+        };
+
+        var state = WorkspaceFilesModel.FromSessionFileList(list);
+
+        Assert.Equal(2, state.Entries.Count);
+        var dir = Assert.Single(state.Entries, e => e.Name == "src");
+        Assert.True(dir.IsDirectory);
+        Assert.True(dir.Touched); // SessionKind "modified"
+        Assert.False(dir.CanPreview);
+    }
+
+    [Fact]
+    public void FromSessionFileList_MapsBrowserPathSearchAndTruncation()
+    {
+        var list = new SessionFileList
+        {
+            Key = "agent:main:main",
+            Root = "/root",
+            Browser = new SessionFileBrowser
+            {
+                Path = @"src\app\",
+                ParentPath = "src",
+                Search = "view",
+                Truncated = true,
+                Entries = Array.Empty<SessionFileBrowserEntry>(),
+            },
+            IsSupported = true,
+        };
+
+        var state = WorkspaceFilesModel.FromSessionFileList(list);
+
+        Assert.Equal("src/app", state.BrowserPath);
+        Assert.Equal("src", state.BrowserParentPath);
+        Assert.Equal("view", state.BrowserSearch);
+        Assert.True(state.BrowserTruncated);
+    }
+
+    [Fact]
+    public void FromSessionFileList_BrowserOnlyFileIsNotPreviewable()
+    {
+        var list = new SessionFileList
+        {
+            Key = "agent:main:main",
+            Browser = new SessionFileBrowser
+            {
+                Entries = new[]
+                {
+                    new SessionFileBrowserEntry { Path = "src/browser-only.ts", Name = "browser-only.ts", Kind = "file" },
+                    new SessionFileBrowserEntry { Path = "src/touched.ts", Name = "touched.ts", Kind = "file", SessionKind = "read" },
+                },
+            },
+            IsSupported = true,
+        };
+
+        var state = WorkspaceFilesModel.FromSessionFileList(list);
+
+        var browserOnly = Assert.Single(state.Entries, e => e.Name == "browser-only.ts");
+        Assert.False(browserOnly.IsSessionFile);
+        Assert.False(browserOnly.CanPreview);
+
+        var touched = Assert.Single(state.Entries, e => e.Name == "touched.ts");
+        Assert.True(touched.IsSessionFile);
+        Assert.True(touched.CanPreview);
+        Assert.True(touched.Read);
+    }
+
+    [Fact]
+    public void FromSessionFileList_PathIdentityIsCaseSensitive()
+    {
+        // Distinct paths differing only by case must not collide into one row.
+        var state = WorkspaceFilesModel.FromSessionFileList(List(
+            File("Readme.md"),
+            File("README.md")));
+
+        Assert.Equal(2, state.Entries.Count);
+    }
+
+    [Fact]
+    public void FromLegacyAgentFilesList_MapsExistingFilesAsPreviewableFallbackRows()
+    {
+        using var doc = JsonDocument.Parse("""
+            {
+              "workspace": "C:\\repo",
+              "files": [
+                { "name": "README.md", "size": 2048, "exists": true },
+                { "name": "gone.md", "missing": true }
+              ]
+            }
+            """);
+
+        var state = WorkspaceFilesModel.FromLegacyAgentFilesList(doc.RootElement);
+
+        Assert.True(state.Supported);
+        Assert.Equal(@"C:\repo", state.WorkspacePath);
+        Assert.Equal(2, state.Entries.Count);
+
+        var readme = Assert.Single(state.Entries, e => e.Name == "README.md");
+        Assert.True(readme.IsSessionFile);
+        Assert.True(readme.CanPreview);
+        Assert.True(readme.Exists);
+        Assert.Equal(2048, readme.Size);
+
+        var missing = Assert.Single(state.Entries, e => e.Name == "gone.md");
+        Assert.False(missing.Exists);
+        Assert.True(missing.CanPreview);
+    }
+
+    // ── Unsupported / null handling ─────────────────────────────────────
+
+    [Fact]
+    public void FromSessionFileList_UnsupportedResult_FlagsUnsupported()
+    {
+        var state = WorkspaceFilesModel.FromSessionFileList(
+            new SessionFileList { Key = "k", IsSupported = false });
+
+        Assert.False(state.Supported);
+        Assert.Empty(state.Entries);
+    }
+
+    [Fact]
+    public void FromSessionFileList_Null_ReturnsSupportedEmpty()
+    {
+        var state = WorkspaceFilesModel.FromSessionFileList(null!);
+
+        Assert.True(state.Supported);
+        Assert.Empty(state.Entries);
+        Assert.Equal(string.Empty, state.WorkspacePath);
+    }
+
+    [Fact]
+    public void FromSessionFileList_NullFilesCollection_DoesNotThrow()
+    {
+        var state = WorkspaceFilesModel.FromSessionFileList(
+            new SessionFileList { Key = "k", Root = "/r", Files = null!, IsSupported = true });
+
+        Assert.True(state.Supported);
+        Assert.Empty(state.Entries);
+        Assert.Equal("/r", state.WorkspacePath);
+    }
+
+    // ── Search / filter ─────────────────────────────────────────────────
+
+    private static System.Collections.Generic.IReadOnlyList<WorkspaceFilesModel.WorkspaceFileEntry> SampleEntries() =>
+        WorkspaceFilesModel.FromSessionFileList(List(
+            File("src/app/main.ts"),
+            File("src/app/utils.ts"),
+            File("README.md"))).Entries;
+
+    [Fact]
+    public void Filter_EmptyQuery_ReturnsAll()
+    {
+        var entries = SampleEntries();
+        Assert.Equal(3, WorkspaceFilesModel.Filter(entries, "  ").Count);
+        Assert.Equal(3, WorkspaceFilesModel.Filter(entries, null).Count);
+    }
+
+    [Fact]
+    public void Filter_MatchesNameAndPath_CaseInsensitive()
+    {
+        var entries = SampleEntries();
+
+        Assert.Single(WorkspaceFilesModel.Filter(entries, "readme"));
+        Assert.Equal(2, WorkspaceFilesModel.Filter(entries, "SRC/APP").Count);
+        Assert.Single(WorkspaceFilesModel.Filter(entries, "utils"));
+        Assert.Empty(WorkspaceFilesModel.Filter(entries, "nomatch"));
+    }
+
+    // ── Sort tiering ────────────────────────────────────────────────────
+
+    [Fact]
+    public void Sort_EditedBeforeReadBeforeUntouched()
+    {
+        var entries = WorkspaceFilesModel.FromSessionFileList(List(
+            File("plain.md"),
+            File("seen.md", kind: "read"),
+            File("wrote.md", kind: "modified"))).Entries;
+
+        Assert.Equal("wrote.md", entries[0].Name);
+        Assert.Equal("seen.md", entries[1].Name);
+        Assert.Equal("plain.md", entries[2].Name);
+    }
+
+    [Fact]
+    public void Sort_DirectoriesFirst()
+    {
+        var list = new SessionFileList
+        {
+            Key = "k",
+            Files = new[] { File("zeta.md", kind: "modified") },
+            Browser = new SessionFileBrowser
+            {
+                Entries = new[]
+                {
+                    new SessionFileBrowserEntry { Path = "lib", Name = "lib", Kind = "directory" },
+                },
+            },
+            IsSupported = true,
+        };
+
+        var entries = WorkspaceFilesModel.FromSessionFileList(list).Entries;
+
+        Assert.True(entries[0].IsDirectory);
+        Assert.Equal("lib", entries[0].Name);
+        Assert.Equal("zeta.md", entries[1].Name);
+    }
+
+    // ── Formatting helpers ──────────────────────────────────────────────
+
+    [Theory]
+    [InlineData(0, "0 B")]
+    [InlineData(512, "512 B")]
+    [InlineData(2048, "2.0 KB")]
+    [InlineData(5_242_880, "5.0 MB")]
+    public void FormatSize_ProducesHumanReadable(long bytes, string expected)
+    {
+        Assert.Equal(expected, WorkspaceFilesModel.FormatSize(bytes));
+    }
+
+    [Fact]
+    public void FormatSize_NullOrNegative_IsEmpty()
+    {
+        Assert.Equal(string.Empty, WorkspaceFilesModel.FormatSize(null));
+        Assert.Equal(string.Empty, WorkspaceFilesModel.FormatSize(-5));
+    }
+
+    [Fact]
+    public void DirectoryOf_RootFile_IsEmpty()
+    {
+        Assert.Equal(string.Empty, WorkspaceFilesModel.DirectoryOf("README.md"));
+        Assert.Equal("a/b", WorkspaceFilesModel.DirectoryOf("a/b/c.md"));
+    }
+
+    [Theory]
+    [InlineData(null, "")]
+    [InlineData("", "")]
+    [InlineData(" /src/app/ ", "src/app")]
+    [InlineData(@"src\app", "src/app")]
+    public void NormalizeBrowserPath_NormalizesForGatewayPathState(string? input, string expected)
+    {
+        Assert.Equal(expected, WorkspaceFilesModel.NormalizeBrowserPath(input));
+    }
+}
diff --git a/tests/OpenClaw.Tray.Tests/WslGatewayControllerTests.cs b/tests/OpenClaw.Tray.Tests/WslGatewayControllerTests.cs
index 6070d07e3..5358f14dd 100644
--- a/tests/OpenClaw.Tray.Tests/WslGatewayControllerTests.cs
+++ b/tests/OpenClaw.Tray.Tests/WslGatewayControllerTests.cs
@@ -1,5 +1,5 @@
+using OpenClaw.Connection;
 using OpenClaw.Shared;
-using OpenClawTray.Services;
 
 namespace OpenClaw.Tray.Tests;
 
@@ -53,6 +53,27 @@ public async Task RunAsync_ReturnsFailure_WhenDistroIsNotRegistered()
         Assert.Contains("not registered", result.StandardError);
     }
 
+    [Fact]
+    public async Task RunAsync_AttemptsCommand_WhenDistroEnumerationIsEmpty()
+    {
+        // An empty distro list is ambiguous — the `wsl --list` probe may have failed
+        // or timed out — so the controller should fail open and still attempt the
+        // control command rather than dead-ending with a misleading "not registered".
+        var runner = new FakeWslCommandRunner
+        {
+            Distros = [],
+            Result = new WslCommandResult(0, "restarted", string.Empty),
+        };
+        var controller = new WslGatewayController(runner, NullLogger.Instance);
+
+        var result = await controller.RunAsync("OpenClawGateway", WslGatewayControlAction.Restart);
+
+        Assert.True(result.Success);
+        Assert.Equal("OpenClawGateway", runner.LastDistroName);
+        Assert.Equal(WslGatewayControlCommandBuilder.Build(WslGatewayControlAction.Restart), runner.LastDistroCommand);
+        Assert.DoesNotContain("not registered", result.StandardError);
+    }
+
     private sealed class FakeWslCommandRunner : IWslCommandRunner
     {
         public IReadOnlyList<WslDistroInfo> Distros { get; init; } = [];
diff --git a/tests/OpenClaw.Tray.Tests/WslKeepAlivePolicyTests.cs b/tests/OpenClaw.Tray.Tests/WslKeepAlivePolicyTests.cs
index 327468ec0..46b97d0d0 100644
--- a/tests/OpenClaw.Tray.Tests/WslKeepAlivePolicyTests.cs
+++ b/tests/OpenClaw.Tray.Tests/WslKeepAlivePolicyTests.cs
@@ -244,6 +244,12 @@ public void IsKeepaliveCommandLine_RequiresDistroAndSleepInfinity()
         Assert.False(WslKeepAlivePolicy.IsKeepaliveCommandLine(
             @"C:\Windows\System32\wsl.exe -d OtherGateway -- sleep infinity",
             "OpenClawGateway"));
+        Assert.False(WslKeepAlivePolicy.IsKeepaliveCommandLine(
+            @"C:\Windows\System32\wsl.exe -d OpenClawGateway-Dev -- sleep infinity",
+            "OpenClawGateway"));
+        Assert.True(WslKeepAlivePolicy.IsKeepaliveCommandLine(
+            "wsl.exe --distribution \"OpenClawGateway-Dev\" -- sleep infinity",
+            "OpenClawGateway-Dev"));
     }
 
     [Fact]
diff --git a/tests/OpenClaw.Tray.UITests/A2UI.cs b/tests/OpenClaw.Tray.UITests/A2UI.cs
index abe2aa0b7..323961f9e 100644
--- a/tests/OpenClaw.Tray.UITests/A2UI.cs
+++ b/tests/OpenClaw.Tray.UITests/A2UI.cs
@@ -127,6 +127,30 @@ public static string DataUpdate(string surfaceId, params (string key, JsonNode?
         }.ToJsonString();
     }
 
+    /// <summary>
+    /// Build a dataModelUpdate line that writes a single v0.8 <c>valueArray</c>
+    /// of strings at <paramref name="key"/>. Mirrors how an agent seeds an
+    /// array-shaped value (e.g. <c>MultipleChoice.selections</c>) into the data
+    /// model — the array channel that was previously dropped on the wire.
+    /// </summary>
+    public static string DataUpdateStringArray(string surfaceId, string key, params string[] values)
+    {
+        var arr = new JsonArray();
+        foreach (var v in values) arr.Add(new JsonObject { ["valueString"] = v });
+        var contents = new JsonArray
+        {
+            new JsonObject { ["key"] = key, ["valueArray"] = arr },
+        };
+        return new JsonObject
+        {
+            ["dataModelUpdate"] = new JsonObject
+            {
+                ["surfaceId"] = surfaceId,
+                ["contents"] = contents,
+            },
+        }.ToJsonString();
+    }
+
     /// <summary>
     /// Theme-styles object suitable for the <c>styles</c> argument of
     /// <see cref="Surface"/>. Mirrors what <see cref="OpenClawTray.A2UI.Theming.A2UITheme.Parse"/>
diff --git a/tests/OpenClaw.Tray.UITests/A2UIControlMatrixTests.cs b/tests/OpenClaw.Tray.UITests/A2UIControlMatrixTests.cs
index 1588b516e..ecdc9185b 100644
--- a/tests/OpenClaw.Tray.UITests/A2UIControlMatrixTests.cs
+++ b/tests/OpenClaw.Tray.UITests/A2UIControlMatrixTests.cs
@@ -491,6 +491,62 @@ public Task MultipleChoice_Multi_RendersListView_WithMultipleSelectionMode() =>
             Assert.Equal(4, lv.Items.Count);
         });
 
+    /// <summary>
+    /// End-to-end proof that a v0.8 <c>dataModelUpdate.valueArray</c> flows
+    /// through parser → <c>DataModelStore</c> → renderer. A multi-select
+    /// MultipleChoice bound to <c>/picked</c> is seeded with <c>["g","b"]</c>
+    /// via <c>valueArray</c>; the rendered ListView must preselect those two
+    /// options, and the surface snapshot must carry the array. Before the fix
+    /// the parser dropped the value and nothing was selected.
+    /// </summary>
+    [Fact]
+    public async Task MultipleChoice_Multi_ValueArraySeed_PreselectsAndSnapshots()
+    {
+        var surface = Surface("s", "mc", new[]
+        {
+            Component("mc", "MultipleChoice", new()
+            {
+                ["maxAllowedSelections"] = 3,
+                ["selections"] = Path("/picked"),
+                ["options"] = new System.Text.Json.Nodes.JsonArray
+                {
+                    Option("Red", "r"),
+                    Option("Green", "g"),
+                    Option("Blue", "b"),
+                },
+            }),
+        });
+        // Insert the valueArray seed between surfaceUpdate and beginRendering so
+        // the initial render reads it (the agent's typical "seed then render").
+        var nl = surface.IndexOf('\n');
+        var jsonl = surface.Substring(0, nl) + "\n"
+            + DataUpdateStringArray("s", "picked", "g", "b")
+            + surface.Substring(nl);
+
+        await _ui.PauseAsync("MultipleChoice multi ← valueArray seed");
+        await _ui.ResetContainerAsync();
+        await _ui.RunOnUIAsync(() =>
+        {
+            var harness = BuildHarness(_ui);
+            harness.Router.Push(jsonl);
+            Assert.NotNull(harness.LastSurface);
+
+            // Parser → store → snapshot round-trip: the array landed in the model.
+            var snapshot = harness.LastSurface!.GetSnapshot();
+            var picked = Assert.IsType<System.Text.Json.Nodes.JsonArray>(snapshot["dataModel"]!["picked"]);
+            Assert.Equal(new[] { "g", "b" }, picked.Select(n => n!.GetValue<string>()));
+
+            // Renderer read it: Green + Blue are preselected.
+            var lv = FindLogical<ListView>(harness.LastSurface.RootElement).Single();
+            var selected = lv.SelectedItems.OfType<ListViewItem>()
+                .Select(i => i.Tag as string)
+                .OrderBy(s => s, System.StringComparer.Ordinal)
+                .ToArray();
+            Assert.Equal(new[] { "b", "g" }, selected);
+        });
+        await _ui.PauseAsync();
+    }
+
     [Fact]
     public Task Slider_LiteralValue_AppliesRangeAndValue() => RunAsync(
         "Slider literal value",
diff --git a/tests/OpenClaw.Tray.UITests/A2UIDataModelStoreTests.cs b/tests/OpenClaw.Tray.UITests/A2UIDataModelStoreTests.cs
new file mode 100644
index 000000000..22606334d
--- /dev/null
+++ b/tests/OpenClaw.Tray.UITests/A2UIDataModelStoreTests.cs
@@ -0,0 +1,231 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using OpenClawTray.A2UI.Rendering;
+using OpenClawTray.A2UI.Protocol;
+using OpenClawTray.A2UI.Theming;
+using Xunit;
+using static OpenClaw.Tray.UITests.TestSupport;
+
+namespace OpenClaw.Tray.UITests;
+
+/// <summary>
+/// Store-level coverage for the v0.8 <c>valueArray</c> data-model value driving
+/// the production <see cref="OpenClawTray.A2UI.DataModel.DataModelStore"/>.
+///
+/// These run on the UI thread because the store is dispatcher-affine. The parser
+/// happy paths live in OpenClaw.Tray.Tests/A2UIDataModelArrayTests; here we pin
+/// the bits that only the store enforces: array landing at a (base) path, and
+/// the depth guard that bounds nested arrays the same way it bounds nested maps.
+/// The depth guard is exercised by constructing <see cref="DataModelEntry"/>
+/// objects directly — JSONL would hit System.Text.Json's MaxDepth first.
+/// </summary>
+[Collection(UICollection.Name)]
+public sealed class A2UIDataModelStoreTests
+{
+    private readonly UIThreadFixture _ui;
+    public A2UIDataModelStoreTests(UIThreadFixture ui) => _ui = ui;
+
+    [Fact]
+    public async Task ApplyDataModelUpdate_ValueArray_LandsAtBasePath()
+    {
+        await _ui.RunOnUIAsync(() =>
+        {
+            var harness = BuildHarness(_ui);
+            var entry = new DataModelEntry
+            {
+                Key = "picked",
+                ValueArray = new[]
+                {
+                    new DataModelEntry { Key = string.Empty, ValueString = "g" },
+                    new DataModelEntry { Key = string.Empty, ValueString = "b" },
+                },
+            };
+            harness.DataModel.ApplyDataModelUpdate("s", "/form", new[] { entry });
+
+            var node = harness.DataModel.Read("s", "/form/picked");
+            var arr = Assert.IsType<JsonArray>(node);
+            Assert.Equal(new[] { "g", "b" }, arr.Select(n => n!.GetValue<string>()));
+        });
+    }
+
+    [Fact]
+    public async Task ApplyDataModelUpdate_ValueArray_NotifiesElementPathSubscribers()
+    {
+        await _ui.RunOnUIAsync(() =>
+        {
+            var harness = BuildHarness(_ui);
+            var observable = harness.DataModel.GetOrCreate("s");
+            var notifications = 0;
+            using var subscription = observable.Subscribe("/codes/0", () => notifications++);
+
+            harness.DataModel.ApplyDataModelUpdate("s", null, new[]
+            {
+                new DataModelEntry
+                {
+                    Key = "codes",
+                    ValueArray = new[]
+                    {
+                        new DataModelEntry { Key = string.Empty, ValueString = "1234" },
+                    },
+                },
+            });
+
+            Assert.Equal(1, notifications);
+            Assert.Equal("1234", observable.ReadString("/codes/0"));
+        });
+    }
+
+    [Theory]
+    [InlineData("/codes/01")]
+    [InlineData("/codes/+1")]
+    [InlineData("/codes/ 1")]
+    public async Task Read_NonCanonicalArrayIndex_DoesNotResolve(string pointer)
+    {
+        await _ui.RunOnUIAsync(() =>
+        {
+            var harness = BuildHarness(_ui);
+            harness.DataModel.ApplyDataModelUpdate("s", null, new[]
+            {
+                new DataModelEntry
+                {
+                    Key = "codes",
+                    ValueArray = new[]
+                    {
+                        new DataModelEntry { Key = string.Empty, ValueString = "1234" },
+                        new DataModelEntry { Key = string.Empty, ValueString = "5678" },
+                    },
+                },
+            });
+
+            Assert.Null(harness.DataModel.Read("s", pointer));
+        });
+    }
+
+    [Theory]
+    [InlineData("/codes/1")]
+    [InlineData("/codes/01")]
+    public async Task BuildActionContext_RedactsRegisteredSecretArrayElement_WhenParentPathIsRequested(string secretPath)
+    {
+        await _ui.RunOnUIAsync(() =>
+        {
+            var ctx = BuildRenderContext(
+                JsonNode.Parse("""{ "codes": ["1234", "5678"] }""")!.AsObject(),
+                secretPath);
+            var source = BuildSourceComponent("""{ "dataBinding": ["/codes"] }""");
+            var action = JsonNode.Parse("""
+            {
+                "context": [
+                    { "key": "codes", "value": { "path": "/codes" } }
+                ]
+            }
+            """);
+
+            var result = ctx.BuildActionContext(source, action)!;
+
+            var codes = Assert.IsType<JsonArray>(result["codes"]);
+            Assert.Equal("1234", (string?)codes[0]);
+            Assert.Equal("[REDACTED]", (string?)codes[1]);
+        });
+    }
+
+    [Fact]
+    public async Task BuildActionContext_RedactsDenylistedDescendant_WhenParentPathIsRequested()
+    {
+        await _ui.RunOnUIAsync(() =>
+        {
+            var ctx = BuildRenderContext(
+                JsonNode.Parse("""{ "profile": { "name": "alice", "password": "p@ss" } }""")!.AsObject());
+            var source = BuildSourceComponent("""{ "dataBinding": ["/profile"] }""");
+            var action = JsonNode.Parse("""
+            {
+                "context": [
+                    { "key": "profile", "value": { "path": "/profile" } }
+                ]
+            }
+            """);
+
+            var result = ctx.BuildActionContext(source, action)!;
+
+            var profile = Assert.IsType<JsonObject>(result["profile"]);
+            Assert.Equal("alice", (string?)profile["name"]);
+            Assert.Equal("[REDACTED]", (string?)profile["password"]);
+        });
+    }
+
+    [Fact]
+    public async Task ApplyDataModelUpdate_OverDeepValueArray_IsDroppedByDepthGuard()
+    {
+        await _ui.RunOnUIAsync(() =>
+        {
+            var harness = BuildHarness(_ui);
+
+            // Shallow array survives; a >32-deep nest is rejected by the same
+            // guard that bounds valueMap, so the path stays unset.
+            harness.DataModel.ApplyDataModelUpdate("s", null, new[] { DeepArrayEntry("shallow", 4) });
+            harness.DataModel.ApplyDataModelUpdate("s", null, new[] { DeepArrayEntry("tooDeep", 40) });
+
+            Assert.IsType<JsonArray>(harness.DataModel.Read("s", "/shallow"));
+            Assert.Null(harness.DataModel.Read("s", "/tooDeep"));
+        });
+    }
+
+    [Fact]
+    public async Task ApplyDataModelUpdate_OverDeepValueMap_StillDropped_NoRegression()
+    {
+        await _ui.RunOnUIAsync(() =>
+        {
+            var harness = BuildHarness(_ui);
+            harness.DataModel.ApplyDataModelUpdate("s", null, new[] { DeepMapEntry("deepMap", 40) });
+            Assert.Null(harness.DataModel.Read("s", "/deepMap"));
+        });
+    }
+
+    /// <summary>Build an entry whose value is <paramref name="depth"/> nested valueArrays.</summary>
+    private static DataModelEntry DeepArrayEntry(string key, int depth)
+    {
+        DataModelEntry inner = new() { Key = string.Empty, ValueString = "x" };
+        for (int i = 0; i < depth; i++)
+            inner = new DataModelEntry { Key = string.Empty, ValueArray = new[] { inner } };
+        return new DataModelEntry { Key = key, ValueArray = new[] { inner } };
+    }
+
+    /// <summary>Build an entry whose value is <paramref name="depth"/> nested valueMaps.</summary>
+    private static DataModelEntry DeepMapEntry(string key, int depth)
+    {
+        DataModelEntry inner = new() { Key = "leaf", ValueString = "x" };
+        for (int i = 0; i < depth; i++)
+            inner = new DataModelEntry { Key = "n", ValueMap = new[] { inner } };
+        return new DataModelEntry { Key = key, ValueMap = new[] { inner } };
+    }
+
+    private RenderContext BuildRenderContext(JsonObject seed, string? secretPath = null)
+    {
+        var harness = BuildHarness(_ui);
+        var observable = harness.DataModel.GetOrCreate("s", seed);
+        var secretPaths = new HashSet<string>(StringComparer.Ordinal);
+        var ctx = new RenderContext
+        {
+            SurfaceId = "s",
+            DataModel = observable,
+            Actions = harness.Actions,
+            Theme = A2UITheme.Empty,
+            BuildChild = _ => null,
+            Subscriptions = new Dictionary<string, IDisposable>(),
+            SecretPaths = secretPaths,
+        };
+
+        ctx.MarkSecretPath(secretPath);
+        return ctx;
+    }
+
+    private static A2UIComponentDef BuildSourceComponent(string propertiesJson) =>
+        new()
+        {
+            Id = "button",
+            ComponentName = "Button",
+            Properties = JsonNode.Parse(propertiesJson)!.AsObject(),
+        };
+}
diff --git a/tests/OpenClaw.Tray.UITests/AccessibilityAppFixture.cs b/tests/OpenClaw.Tray.UITests/AccessibilityAppFixture.cs
new file mode 100644
index 000000000..b75fa229b
--- /dev/null
+++ b/tests/OpenClaw.Tray.UITests/AccessibilityAppFixture.cs
@@ -0,0 +1,177 @@
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows.Automation;
+
+namespace OpenClaw.Tray.UITests;
+
+/// <summary>
+/// Owns one isolated OpenClaw process for the accessibility test collection.
+/// Navigation is sent through the same deep-link IPC path used by installed apps.
+/// </summary>
+public sealed class AccessibilityAppFixture : IDisposable
+{
+    private const int ShowMaximized = 3;
+    private static readonly TimeSpan StartupTimeout = TimeSpan.FromSeconds(60);
+    private static readonly TimeSpan DeepLinkTimeout = TimeSpan.FromSeconds(10);
+    private static readonly TimeSpan NavigationTimeout = TimeSpan.FromSeconds(10);
+    private static readonly TimeSpan NavigationSettleTime = TimeSpan.FromMilliseconds(1_000);
+
+    private readonly string _dataDirectory;
+    private readonly string _executablePath;
+    private readonly Process _process;
+
+    public IntPtr HubWindowHandle { get; }
+
+    public AccessibilityAppFixture()
+    {
+        _executablePath = Path.Combine(AppContext.BaseDirectory, "OpenClaw.Tray.WinUI.exe");
+        if (!File.Exists(_executablePath))
+        {
+            throw new FileNotFoundException(
+                "The real tray executable was not copied beside the UI test assembly.",
+                _executablePath);
+        }
+
+        _dataDirectory = Path.Combine(
+            Path.GetTempPath(),
+            $"OpenClaw.Tray.Axe.{Guid.NewGuid():N}");
+        Directory.CreateDirectory(_dataDirectory);
+        File.WriteAllText(
+            Path.Combine(_dataDirectory, "settings.json"),
+            """
+            {
+              "SettingsSchemaVersion": 1,
+              "EnableMcpServer": true,
+              "GlobalHotkeyEnabled": false,
+              "AutoStart": false
+            }
+            """);
+
+        _process = StartProcess($"{OpenClawTray.AppIdentity.ProtocolScheme}://hub/connection");
+        HubWindowHandle = WaitForHubWindow();
+        AxeHelper.Initialize(_process.Id);
+    }
+
+    public async Task NavigateAsync(string pageTag, string pageMarkerAutomationId)
+    {
+        EnsureTargetIsAlive();
+
+        using var sender = StartProcess($"{OpenClawTray.AppIdentity.ProtocolScheme}://hub/{pageTag}");
+        using var timeout = new CancellationTokenSource(DeepLinkTimeout);
+        try
+        {
+            await sender.WaitForExitAsync(timeout.Token);
+        }
+        catch (OperationCanceledException)
+        {
+            if (!sender.HasExited)
+                sender.Kill(entireProcessTree: true);
+            throw new TimeoutException(
+                $"Timed out forwarding the '{pageTag}' deep link to the accessibility app.");
+        }
+
+        EnsureTargetIsAlive();
+        await WaitForPageMarkerAsync(pageTag, pageMarkerAutomationId);
+    }
+
+    private async Task WaitForPageMarkerAsync(string pageTag, string automationId)
+    {
+        var stopwatch = Stopwatch.StartNew();
+        var condition = new PropertyCondition(
+            AutomationElement.AutomationIdProperty,
+            automationId);
+
+        while (stopwatch.Elapsed < NavigationTimeout)
+        {
+            EnsureTargetIsAlive();
+            var hub = AutomationElement.FromHandle(HubWindowHandle);
+            if (hub.FindFirst(TreeScope.Descendants, condition) != null)
+                return;
+
+            await Task.Delay(100);
+        }
+
+        throw new TimeoutException(
+            $"The '{pageTag}' page did not expose its '{automationId}' marker " +
+            $"within {NavigationTimeout.TotalSeconds:0} seconds.");
+    }
+
+    private Process StartProcess(string deepLink)
+    {
+        var startInfo = new ProcessStartInfo(_executablePath)
+        {
+            UseShellExecute = false,
+            WorkingDirectory = AppContext.BaseDirectory,
+        };
+        startInfo.ArgumentList.Add(deepLink);
+        startInfo.Environment["OPENCLAW_TRAY_DATA_DIR"] = _dataDirectory;
+        startInfo.Environment["OPENCLAW_SKIP_UPDATE_CHECK"] = "1";
+        startInfo.Environment["OPENCLAW_FORCE_ONBOARDING"] = "0";
+        startInfo.Environment["OPENCLAW_ACCESSIBILITY_TEST_CHAT"] = "1";
+
+        return Process.Start(startInfo)
+            ?? throw new InvalidOperationException("Failed to start the OpenClaw tray executable.");
+    }
+
+    private IntPtr WaitForHubWindow()
+    {
+        var stopwatch = Stopwatch.StartNew();
+        while (stopwatch.Elapsed < StartupTimeout)
+        {
+            EnsureTargetIsAlive();
+            _process.Refresh();
+            if (_process.MainWindowHandle != IntPtr.Zero)
+            {
+                Thread.Sleep(NavigationSettleTime);
+                EnsureTargetIsAlive();
+                _process.Refresh();
+                if (_process.MainWindowHandle != IntPtr.Zero)
+                {
+                    _ = ShowWindow(_process.MainWindowHandle, ShowMaximized);
+                    Thread.Sleep(NavigationSettleTime);
+                    return _process.MainWindowHandle;
+                }
+            }
+
+            Thread.Sleep(100);
+        }
+
+        throw new TimeoutException(
+            $"OpenClaw did not expose its Hub window within {StartupTimeout.TotalSeconds:0} seconds.");
+    }
+
+    private void EnsureTargetIsAlive()
+    {
+        if (!_process.HasExited)
+            return;
+
+        var crashLogPath = Path.Combine(_dataDirectory, "crash.log");
+        var crashLog = File.Exists(crashLogPath)
+            ? $" Crash log: {File.ReadAllText(crashLogPath)}"
+            : string.Empty;
+        throw new InvalidOperationException(
+            $"OpenClaw exited unexpectedly with code {_process.ExitCode}.{crashLog}");
+    }
+
+    public void Dispose()
+    {
+        if (!_process.HasExited)
+        {
+            _process.Kill(entireProcessTree: true);
+            _process.WaitForExit(5_000);
+        }
+        _process.Dispose();
+
+        // slopwatch-ignore: SW003 Test-owned temporary data cleanup is best-effort after process teardown.
+        try { Directory.Delete(_dataDirectory, recursive: true); }
+        catch (IOException) { }
+        catch (UnauthorizedAccessException) { }
+    }
+
+    [DllImport("user32.dll")]
+    private static extern int ShowWindow(IntPtr windowHandle, int command);
+}
diff --git a/tests/OpenClaw.Tray.UITests/AccessibilityScanTests.cs b/tests/OpenClaw.Tray.UITests/AccessibilityScanTests.cs
new file mode 100644
index 000000000..337d0ddf6
--- /dev/null
+++ b/tests/OpenClaw.Tray.UITests/AccessibilityScanTests.cs
@@ -0,0 +1,74 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Axe.Windows.Core.Enums;
+using Xunit;
+
+namespace OpenClaw.Tray.UITests;
+
+[CollectionDefinition(Name, DisableParallelization = true)]
+public sealed class AccessibilityCollection : ICollectionFixture<AccessibilityAppFixture>
+{
+    public const string Name = "Accessibility app";
+}
+
+/// <summary>
+/// Scans every native Hub page in the real OpenClaw process. The test process
+/// remains separate because Axe.Windows drives the target through UI Automation.
+/// </summary>
+[Collection(AccessibilityCollection.Name)]
+public sealed class AccessibilityScanTests
+{
+    private readonly AccessibilityAppFixture _app;
+
+    public AccessibilityScanTests(AccessibilityAppFixture app)
+    {
+        _app = app;
+    }
+
+    private static readonly IReadOnlyDictionary<string, RuleId[]> PageRuleExclusions =
+        new Dictionary<string, RuleId[]>
+        {
+            // The public GridSplitter has an app-supplied localized name/type. Its
+            // CommunityToolkit SizerBase child peer still reports both types as
+            // "custom" and cannot be configured by the consuming XAML page.
+            ["ConfigPage"] = [RuleId.LocalizedControlTypeNotCustom],
+        };
+
+    public static IEnumerable<object[]> PageTestData()
+    {
+        yield return ["AgentEventsPage", "agentevents", "AgentEventsPageMarker"];
+        yield return ["BindingsPage", "bindings", "BindingsPageMarker"];
+        yield return ["ChannelsPage", "channels", "ChannelsPageMarker"];
+        yield return ["ChatPage", "chat", "ChatComposerInput"];
+        yield return ["ConfigPage", "config", "ConfigPageMarker"];
+        yield return ["ConnectionPage", "connection", "ConnectionPageMarker"];
+        yield return ["CronPage", "cron", "CronPageMarker"];
+        yield return ["DebugPage", "debug", "DebugPageMarker"];
+        yield return ["InstancesPage", "instances", "InstancesPageMarker"];
+        yield return ["NotificationsPage", "notifications", "NotificationsPageMarker"];
+        yield return ["PermissionsPage", "permissions", "PermissionsPageMarker"];
+        yield return ["SandboxPage", "sandbox", "SandboxPageMarker"];
+        yield return ["SessionsPage", "sessions", "SessionsPageMarker"];
+        yield return ["SettingsPage", "settings", "SettingsPageMarker"];
+        yield return ["SkillsPage", "skills", "SkillsPageMarker"];
+        yield return ["UsagePage", "usage", "UsagePageMarker"];
+        yield return ["VoiceSettingsPage", "voice", "VoiceSettingsPageMarker"];
+        yield return ["WorkspacePage", "workspace", "WorkspacePageMarker"];
+    }
+
+    [Theory]
+    [Trait("Category", "Accessibility")]
+    [MemberData(nameof(PageTestData))]
+    public async Task Page_PassesAccessibilityScan(
+        string pageName,
+        string pageTag,
+        string pageMarkerAutomationId)
+    {
+        await _app.NavigateAsync(pageTag, pageMarkerAutomationId);
+        PageRuleExclusions.TryGetValue(pageName, out var exclusions);
+        AxeHelper.AssertNoAccessibilityErrors(
+            _app.HubWindowHandle,
+            exclusions,
+            context: pageName);
+    }
+}
diff --git a/tests/OpenClaw.Tray.UITests/AxeHelper.cs b/tests/OpenClaw.Tray.UITests/AxeHelper.cs
new file mode 100644
index 000000000..c9790c877
--- /dev/null
+++ b/tests/OpenClaw.Tray.UITests/AxeHelper.cs
@@ -0,0 +1,109 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Axe.Windows.Automation;
+using Axe.Windows.Automation.Data;
+using Axe.Windows.Core.Enums;
+using Xunit;
+
+namespace OpenClaw.Tray.UITests;
+
+/// <summary>
+/// Wraps Axe.Windows scanner to validate the live UI Automation tree for
+/// accessibility violations. Modeled after the WinUI-Gallery AxeHelper pattern.
+///
+/// The scanner attaches to the separately launched OpenClaw process and inspects
+/// only its visible Hub window's UIA subtree.
+/// </summary>
+public static class AxeHelper
+{
+    private static IScanner? _scanner;
+    private static readonly object _lock = new();
+
+    /// <summary>
+    /// Rules excluded globally due to known WinUI framework bugs that are not
+    /// fixable in application code. These mirror the WinUI-Gallery exclusions.
+    /// </summary>
+    private static readonly HashSet<RuleId> GloballyExcludedRules =
+    [
+        // WinUI framework generates non-informative names for some built-in controls
+        RuleId.NameIsInformative,
+        // Framework includes control type in auto-generated accessible names
+        RuleId.NameExcludesControlType,
+        // Same as above, localized variant
+        RuleId.NameExcludesLocalizedControlType,
+        // WinUI framework repeats sibling names in some control patterns
+        RuleId.SiblingUniqueAndFocusable,
+    ];
+
+    /// <summary>
+    /// Initialize the Axe.Windows scanner for the target app process.
+    /// Thread-safe; subsequent calls are no-ops.
+    /// </summary>
+    public static void Initialize(int processId)
+    {
+        if (_scanner != null) return;
+
+        lock (_lock)
+        {
+            if (_scanner != null) return;
+
+            var config = Config.Builder
+                .ForProcessId(processId)
+                .WithOutputFileFormat(OutputFileFormat.None)
+                .Build();
+            _scanner = ScannerFactory.CreateScanner(config);
+        }
+    }
+
+    /// <summary>
+    /// Scan the Hub window's UIA tree and assert no accessibility violations exist.
+    /// </summary>
+    /// <param name="pageRuleExclusions">
+    /// Optional per-page rule exclusions for known issues specific to a page.
+    /// </param>
+    /// <param name="context">
+    /// Optional context string (e.g. page name) included in failure messages.
+    /// </param>
+    public static void AssertNoAccessibilityErrors(
+        IntPtr hubWindowHandle,
+        IEnumerable<RuleId>? pageRuleExclusions = null,
+        string? context = null)
+    {
+        if (_scanner == null)
+            throw new InvalidOperationException(
+                "AxeHelper.Initialize() must be called before scanning.");
+
+        var excludedRules = new HashSet<RuleId>(GloballyExcludedRules);
+        if (pageRuleExclusions != null)
+            excludedRules.UnionWith(pageRuleExclusions);
+
+        var scanOutput = _scanner.Scan(new ScanOptions(context, hubWindowHandle));
+
+        var errors = scanOutput.WindowScanOutputs
+            .SelectMany(output => output.Errors)
+            .Where(error => !excludedRules.Contains(error.Rule.ID))
+            .ToList();
+
+        if (errors.Count == 0) return;
+
+        var errorMessages = errors.Select(error =>
+        {
+            var controlType = error.Element.Properties.TryGetValue("ControlType", out var ct)
+                ? ct : "Unknown";
+            var name = error.Element.Properties.TryGetValue("Name", out var n)
+                ? n : "(no name)";
+            var automationId = error.Element.Properties.TryGetValue("AutomationId", out var aid)
+                ? aid : "(no id)";
+            return $"  [{error.Rule.ID}] Element '{controlType}' " +
+                   $"(Name='{name}', AutomationId='{automationId}') " +
+                   $"violated rule: {error.Rule.Description}";
+        });
+
+        var header = string.IsNullOrEmpty(context)
+            ? $"Accessibility scan found {errors.Count} violation(s):"
+            : $"Accessibility scan of '{context}' found {errors.Count} violation(s):";
+
+        Assert.Fail($"{header}\r\n{string.Join("\r\n", errorMessages)}");
+    }
+}
diff --git a/tests/OpenClaw.Tray.UITests/ChatTimelineVirtualizationProofTests.cs b/tests/OpenClaw.Tray.UITests/ChatTimelineVirtualizationProofTests.cs
new file mode 100644
index 000000000..815764350
--- /dev/null
+++ b/tests/OpenClaw.Tray.UITests/ChatTimelineVirtualizationProofTests.cs
@@ -0,0 +1,290 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using OpenClaw.Chat;
+using OpenClawTray.Chat;
+using OpenClawTray.FunctionalUI;
+using OpenClawTray.FunctionalUI.Core;
+using OpenClawTray.FunctionalUI.Hosting;
+using Windows.Graphics;
+using static OpenClawTray.FunctionalUI.Factories;
+using static OpenClaw.Tray.UITests.TestSupport;
+
+namespace OpenClaw.Tray.UITests;
+
+[Collection(UICollection.Name)]
+public sealed class ChatTimelineVirtualizationProofTests
+{
+    private const int InitialRows = 240;
+
+    private readonly UIThreadFixture _ui;
+
+    public ChatTimelineVirtualizationProofTests(UIThreadFixture ui) => _ui = ui;
+
+    [Fact]
+    public async Task LargeNativeChatTimeline_VirtualizesRowsAndFollowsNewMessages()
+    {
+        await _ui.ResetContainerAsync();
+
+        var props = BuildProps(InitialRows, scrollToBottomToken: 0);
+        FunctionalHostControl? host = null;
+        var initialCachedVirtualControls = 0;
+
+        await _ui.RunOnUIAsync(() =>
+        {
+            TestApp.EnsureFluentBrushFallbacks(Application.Current.Resources);
+            _ui.TestWindow.AppWindow.MoveAndResize(new RectInt32(-32000, -32000, 960, 720));
+            _ui.Container.Width = 900;
+            _ui.Container.Height = 640;
+
+            host = new FunctionalHostControl
+            {
+                Width = 860,
+                Height = 560,
+                SuppressAutoDispose = true,
+            };
+            _ui.Container.Children.Add(host);
+            host.Mount(_ => Component<ChatTimeline, ChatTimelineProps>(props));
+        });
+
+        await DrainRenderQueueAsync();
+
+        await _ui.RunOnUIAsync(() =>
+        {
+            var repeater = FindLogical<ItemsRepeater>(host!).Single();
+            var layout = Assert.IsType<StackLayout>(repeater.Layout);
+            Assert.Equal(Orientation.Vertical, layout.Orientation);
+            Assert.Equal(2, layout.Spacing);
+            Assert.Equal(InitialRows, CountItems(repeater.ItemsSource));
+            var realizedRows = Enumerable.Range(0, InitialRows)
+                .Count(index => repeater.TryGetElement(index) is not null);
+            Assert.InRange(realizedRows, 1, InitialRows - 1);
+            initialCachedVirtualControls = host!.CachedVirtualStackControlCount;
+            Assert.True(initialCachedVirtualControls > 0);
+
+            var scrollViewer = FindLogical<ScrollViewer>(host!).Single();
+            _ui.Container.UpdateLayout();
+            Assert.True(scrollViewer.ScrollableHeight > 0, "large chat timeline should overflow and become scrollable");
+        });
+
+        foreach (var fraction in new[] { 0.25, 0.5, 0.75, 1.0 })
+        {
+            await _ui.RunOnUIAsync(() =>
+            {
+                var scrollViewer = FindLogical<ScrollViewer>(host!).Single();
+                scrollViewer.ChangeView(
+                    null,
+                    scrollViewer.ScrollableHeight * fraction,
+                    null,
+                    disableAnimation: true);
+                _ui.Container.UpdateLayout();
+            });
+            await DrainRenderQueueAsync();
+        }
+
+        object? stableItemsSource = null;
+        object? stableItemTemplate = null;
+        props = BuildProps(InitialRows, scrollToBottomToken: 0, textRevision: 1);
+        await _ui.RunOnUIAsync(() =>
+        {
+            var repeater = FindLogical<ItemsRepeater>(host!).Single();
+            Assert.Null(repeater.TryGetElement(0));
+            Assert.NotNull(repeater.TryGetElement(InitialRows - 1));
+            Assert.InRange(
+                host!.CachedVirtualStackControlCount,
+                1,
+                initialCachedVirtualControls * 2);
+            stableItemsSource = repeater.ItemsSource;
+            stableItemTemplate = repeater.ItemTemplate;
+
+            host!.Mount(_ => Component<ChatTimeline, ChatTimelineProps>(props));
+        });
+
+        await DrainRenderQueueAsync();
+
+        await _ui.RunOnUIAsync(() =>
+        {
+            var repeater = FindLogical<ItemsRepeater>(host!).Single();
+            Assert.NotNull(stableItemsSource);
+            Assert.NotNull(stableItemTemplate);
+            Assert.Same(stableItemsSource, repeater.ItemsSource);
+            Assert.Same(stableItemTemplate, repeater.ItemTemplate);
+
+            var visibleText = FindDescendants<TextBlock>(host!)
+                .Select(t => t.Text)
+                .Where(t => !string.IsNullOrWhiteSpace(t))
+                .ToArray();
+            Assert.Contains(visibleText, text => text.Contains("revision 1", StringComparison.Ordinal));
+        });
+
+        var appendedRows = InitialRows + 1;
+        props = BuildProps(appendedRows, scrollToBottomToken: 1, textRevision: 1);
+        await _ui.RunOnUIAsync(() =>
+        {
+            host!.Mount(_ => Component<ChatTimeline, ChatTimelineProps>(props));
+        });
+
+        await DrainRenderQueueAsync();
+        await DrainRenderQueueAsync();
+
+        await _ui.RunOnUIAsync(() =>
+        {
+            var repeater = FindLogical<ItemsRepeater>(host!).Single();
+            Assert.Equal(appendedRows, CountItems(repeater.ItemsSource));
+
+            var scrollViewer = FindLogical<ScrollViewer>(host!).Single();
+            _ui.Container.UpdateLayout();
+            Assert.True(
+                scrollViewer.ScrollableHeight - scrollViewer.VerticalOffset <= 4,
+                $"chat follow should stay near the newest row; offset={scrollViewer.VerticalOffset:0.0}, height={scrollViewer.ScrollableHeight:0.0}");
+
+            var visibleText = FindDescendants<TextBlock>(host!)
+                .Select(t => t.Text)
+                .Where(t => !string.IsNullOrWhiteSpace(t))
+                .ToArray();
+            Assert.Contains(visibleText, text => text.Contains("User proof row 241", StringComparison.Ordinal));
+
+            Console.WriteLine(
+                "CHAT_TIMELINE_VIRTUALIZATION_PROOF " +
+                $"rows={appendedRows} " +
+                $"itemsRepeater={repeater.GetType().Name} " +
+                $"layout={((StackLayout)repeater.Layout).Orientation} " +
+                $"scrollableHeight={scrollViewer.ScrollableHeight:0.0} " +
+                $"verticalOffset={scrollViewer.VerticalOffset:0.0} " +
+                "variableHeight=true " +
+                "renderChurnStable=true " +
+                "newestRowVisible=true");
+        });
+
+        await _ui.RunOnUIAsync(() => host!.Dispose());
+    }
+
+    [Fact]
+    public async Task RealizedComponentRow_ReplacesRootAndPrunesRemovedEffects()
+    {
+        await _ui.ResetContainerAsync();
+        DisposableVirtualRow.CleanupCount = 0;
+
+        FunctionalHostControl? host = null;
+        ItemsRepeater? repeater = null;
+        UIElement? stableContainer = null;
+        var expandedCacheCount = 0;
+        var cleanupCountBeforeCollapse = 0;
+
+        await _ui.RunOnUIAsync(() =>
+        {
+            host = new FunctionalHostControl { Width = 600, Height = 400, SuppressAutoDispose = true };
+            _ui.Container.Children.Add(host);
+            host.Mount(_ => VirtualVStack(
+                0,
+                Component<SwappingVirtualRow, SwappingVirtualRowProps>(new SwappingVirtualRowProps(true))));
+        });
+        await DrainRenderQueueAsync();
+
+        await _ui.RunOnUIAsync(() =>
+        {
+            repeater = FindLogical<ItemsRepeater>(host!).Single();
+            stableContainer = repeater.TryGetElement(0);
+            Assert.IsType<Border>(stableContainer);
+            Assert.Contains(FindDescendants<TextBlock>(host!), text => text.Text == "expanded row");
+            Assert.Contains(FindDescendants<TextBlock>(host!), text => text.Text == "disposable child");
+            expandedCacheCount = host!.CachedVirtualStackControlCount;
+            Assert.True(expandedCacheCount > 1);
+            cleanupCountBeforeCollapse = DisposableVirtualRow.CleanupCount;
+
+            host.Mount(_ => VirtualVStack(
+                0,
+                Component<SwappingVirtualRow, SwappingVirtualRowProps>(new SwappingVirtualRowProps(false))));
+        });
+        await DrainRenderQueueAsync();
+
+        await _ui.RunOnUIAsync(() =>
+        {
+            Assert.Same(stableContainer, repeater!.TryGetElement(0));
+            Assert.Contains(FindDescendants<TextBlock>(host!), text => text.Text == "collapsed row");
+            Assert.DoesNotContain(FindDescendants<TextBlock>(host!), text => text.Text == "disposable child");
+            Assert.Equal(cleanupCountBeforeCollapse + 1, DisposableVirtualRow.CleanupCount);
+            Assert.InRange(host!.CachedVirtualStackControlCount, 1, expandedCacheCount - 1);
+        });
+
+        await _ui.RunOnUIAsync(() => host!.Dispose());
+    }
+
+    private async Task DrainRenderQueueAsync()
+    {
+        await _ui.RunOnUIAsync(() => { });
+        await Task.Delay(50);
+        await _ui.RunOnUIAsync(() => _ui.Container.UpdateLayout());
+        await _ui.RunOnUIAsync(() => { });
+    }
+
+    private static ChatTimelineProps BuildProps(int rows, int scrollToBottomToken, int textRevision = 0) =>
+        new(
+            SessionId: "ui-proof-large-chat",
+            Entries: BuildEntries(rows, textRevision),
+            HasMoreHistory: false,
+            OnLoadMoreHistory: null,
+            UserSenderLabel: "UI proof user",
+            AssistantSenderLabel: "UI proof assistant",
+            DefaultModel: "proof-model",
+            ShowToolCalls: true,
+            ScrollToBottomToken: scrollToBottomToken);
+
+    private static IReadOnlyList<ChatTimelineItem> BuildEntries(int rows, int textRevision)
+    {
+        var entries = new List<ChatTimelineItem>(rows);
+        for (var i = 1; i <= rows; i++)
+        {
+            var isUser = i % 2 == 1;
+            entries.Add(new ChatTimelineItem(
+                Id: $"proof-{i:000}",
+                Kind: isUser ? ChatTimelineItemKind.User : ChatTimelineItemKind.Assistant,
+                Text: FormatVariableHeightText(isUser ? "User" : "Assistant", i, textRevision)));
+        }
+
+        return entries;
+    }
+
+    private static string FormatVariableHeightText(string role, int row, int textRevision)
+    {
+        var detailLines = row % 4;
+        var details = string.Join(
+            Environment.NewLine,
+            Enumerable.Range(0, detailLines).Select(i => $"detail {row}-{i} revision {textRevision}"));
+        var heading = $"{role} proof row {row}";
+        return string.IsNullOrEmpty(details)
+            ? heading
+            : heading + Environment.NewLine + details;
+    }
+
+    private static int CountItems(object? itemsSource) =>
+        itemsSource is System.Collections.IEnumerable enumerable
+            ? enumerable.Cast<object>().Count()
+            : 0;
+
+    private sealed record SwappingVirtualRowProps(bool Expanded);
+
+    private sealed class SwappingVirtualRow : Component<SwappingVirtualRowProps>
+    {
+        public override Element Render() => Props.Expanded
+            ? VStack(
+                0,
+                TextBlock("expanded row"),
+                Component<DisposableVirtualRow>())
+            : TextBlock("collapsed row");
+    }
+
+    private sealed class DisposableVirtualRow : Component
+    {
+        internal static int CleanupCount { get; set; }
+
+        public override Element Render()
+        {
+            UseEffect((Func<Action>)(() => () => CleanupCount++), Array.Empty<object>());
+            return TextBlock("disposable child");
+        }
+    }
+}
diff --git a/tests/OpenClaw.Tray.UITests/OpenClaw.Tray.UITests.csproj b/tests/OpenClaw.Tray.UITests/OpenClaw.Tray.UITests.csproj
index cec2a6b9d..ac96585be 100644
--- a/tests/OpenClaw.Tray.UITests/OpenClaw.Tray.UITests.csproj
+++ b/tests/OpenClaw.Tray.UITests/OpenClaw.Tray.UITests.csproj
@@ -35,10 +35,15 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Axe.Windows" Version="2.4.2" />
     <PackageReference Include="Microsoft.WindowsAppSDK" Version="$(MicrosoftWindowsAppSDKVersion)" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="$(MicrosoftWindowsSdkBuildToolsVersion)" />
   </ItemGroup>
 
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.WindowsDesktop.App" />
+  </ItemGroup>
+
   <ItemGroup>
     <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
       <_Parameter1>MicrosoftWindowsAppSDKVersion</_Parameter1>
diff --git a/tests/OpenClaw.Tray.UITests/TestApp.cs b/tests/OpenClaw.Tray.UITests/TestApp.cs
index a07a31fdb..bcc11b5a0 100644
--- a/tests/OpenClaw.Tray.UITests/TestApp.cs
+++ b/tests/OpenClaw.Tray.UITests/TestApp.cs
@@ -1,6 +1,9 @@
 using System;
+using System.Threading;
+using Microsoft.UI;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Markup;
+using Microsoft.UI.Xaml.Media;
 
 namespace OpenClaw.Tray.UITests;
 
@@ -20,17 +23,42 @@ namespace OpenClaw.Tray.UITests;
 /// </summary>
 internal sealed class TestApp : Application
 {
+    private static readonly (string Key, Windows.UI.Color Color)[] FluentBrushFallbacks =
+    [
+        ("SolidBackgroundFillColorBaseBrush", Colors.White),
+        ("LayerFillColorDefaultBrush", Colors.White),
+        ("CardBackgroundFillColorDefaultBrush", Colors.White),
+        ("CardStrokeColorDefaultBrush", ColorHelper.FromArgb(0x33, 0x00, 0x00, 0x00)),
+        ("ControlFillColorTertiaryBrush", ColorHelper.FromArgb(0x0F, 0x00, 0x00, 0x00)),
+        ("ControlStrokeColorDefaultBrush", ColorHelper.FromArgb(0x33, 0x00, 0x00, 0x00)),
+        ("SubtleFillColorSecondaryBrush", ColorHelper.FromArgb(0x0F, 0x00, 0x00, 0x00)),
+        ("SubtleFillColorTertiaryBrush", ColorHelper.FromArgb(0x14, 0x00, 0x00, 0x00)),
+        ("AccentFillColorDefaultBrush", ColorHelper.FromArgb(0xFF, 0x00, 0x66, 0xCC)),
+        ("AccentFillColorSecondaryBrush", ColorHelper.FromArgb(0xCC, 0x00, 0x66, 0xCC)),
+        ("TextFillColorPrimaryBrush", Colors.Black),
+        ("TextFillColorSecondaryBrush", ColorHelper.FromArgb(0xE3, 0x00, 0x00, 0x00)),
+        ("TextFillColorTertiaryBrush", ColorHelper.FromArgb(0x99, 0x00, 0x00, 0x00)),
+        ("TextOnAccentFillColorPrimaryBrush", Colors.White),
+        ("SystemFillColorSuccessBrush", ColorHelper.FromArgb(0xFF, 0x0F, 0x7B, 0x0F)),
+        ("SystemFillColorCautionBrush", ColorHelper.FromArgb(0xFF, 0x9D, 0x5D, 0x00)),
+        ("SystemFillColorCriticalBrush", ColorHelper.FromArgb(0xFF, 0xC4, 0x2B, 0x1C)),
+    ];
+
     /// <summary>
-    /// Merge XamlControlsResources + the production App.xaml's custom keys
-    /// (LobsterAccentBrush, AccentButtonStyle) so renderers that look them up
-    /// resolve a real value. Call this ON THE UI THREAD after Application.Current
-    /// is set.
+    /// Merge XamlControlsResources + production App.xaml's custom keys so
+    /// renderers that look them up resolve a real value. Call this ON THE UI
+    /// THREAD after Application.Current is set.
     /// </summary>
     public void MergeStandardResources()
     {
+        if (!TryGetResources(out var resources))
+        {
+            return;
+        }
+
         try
         {
-            Resources.MergedDictionaries.Add(new Microsoft.UI.Xaml.Controls.XamlControlsResources());
+            resources.MergedDictionaries.Add(new Microsoft.UI.Xaml.Controls.XamlControlsResources());
         }
         // slopwatch-ignore: SW003 Test cleanup or fixture teardown is best-effort and must not hide the test outcome.
         catch
@@ -39,22 +67,65 @@ public void MergeStandardResources()
             // going — the renderers degrade gracefully without theme styles.
         }
 
-        TryAddResource("LobsterAccentBrush",
+        TryAddResource(resources, "LobsterAccentBrush",
             "<SolidColorBrush xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation' Color='#E74C3C' />");
 
-        TryAddResource("AccentButtonStyle",
+        TryAddResource(resources, "AccentButtonStyle",
             "<Style xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation' " +
             "TargetType='Button'>" +
             "<Setter Property='Foreground' Value='White' />" +
             "<Setter Property='CornerRadius' Value='4' />" +
             "</Style>");
+
+        EnsureFluentBrushFallbacks(resources);
+    }
+
+    internal static void EnsureFluentBrushFallbacks(ResourceDictionary resources)
+    {
+        foreach (var (key, color) in FluentBrushFallbacks)
+        {
+            TryAddBrushResource(resources, key, color);
+        }
+    }
+
+    private bool TryGetResources(out ResourceDictionary resources)
+    {
+        for (var attempt = 0; attempt < 5; attempt++)
+        {
+            try
+            {
+                resources = Resources;
+                return true;
+            }
+            // slopwatch-ignore: SW003 Test fixture resource setup is best-effort and must not hide the test outcome.
+            catch
+            {
+                Thread.Sleep(10);
+            }
+        }
+
+        resources = null!;
+        return false;
+    }
+
+    private static void TryAddResource(ResourceDictionary resources, string key, string xaml)
+    {
+        try
+        {
+            resources[key] = XamlReader.Load(xaml);
+        }
+        // slopwatch-ignore: SW003 Test cleanup or fixture teardown is best-effort and must not hide the test outcome.
+        catch
+        {
+            // best-effort; missing key just means renderers fall back.
+        }
     }
 
-    private void TryAddResource(string key, string xaml)
+    private static void TryAddBrushResource(ResourceDictionary resources, string key, Windows.UI.Color color)
     {
         try
         {
-            Resources[key] = XamlReader.Load(xaml);
+            resources[key] = new SolidColorBrush(color);
         }
         // slopwatch-ignore: SW003 Test cleanup or fixture teardown is best-effort and must not hide the test outcome.
         catch
diff --git a/tests/OpenClaw.Tray.UITests/UIThreadFixture.cs b/tests/OpenClaw.Tray.UITests/UIThreadFixture.cs
index ae1f91e33..63970bc88 100644
--- a/tests/OpenClaw.Tray.UITests/UIThreadFixture.cs
+++ b/tests/OpenClaw.Tray.UITests/UIThreadFixture.cs
@@ -226,9 +226,9 @@ private void UIThreadProc()
 
                     if (!IsSlow)
                     {
-                        // Default: hide the window so CI runs are silent.
-                        _startupPhase = "hiding test window";
-                        TryHide(TestWindow);
+                        // Default: keep the window live but off-screen so CI runs are silent.
+                        _startupPhase = "moving test window off-screen";
+                        MoveOffScreen(TestWindow);
                     }
 
                     _startupPhase = "ready";
@@ -248,17 +248,14 @@ private void UIThreadProc()
         }
     }
 
-    private static void TryHide(Window w)
+    private static void MoveOffScreen(Window w)
     {
         try
         {
-            // WindowsAppSDK 1.5+ supports AppWindow.Hide via WinUIEx, but to keep
-            // deps minimal we just move the window off-screen. It's still a real
-            // Window — XamlRoot is attached, the visual tree lays out — but the
-            // user never sees it during tests.
-            var hwnd = WinRT.Interop.WindowNative.GetWindowHandle(w);
-            // SW_HIDE = 0
-            ShowWindow(hwnd, 0);
+            // Move off-screen so CI runs are silent while keeping the window
+            // live in the WinUI compositor. XamlRoot stays attached, the visual
+            // tree lays out, but the user never sees it during tests.
+            w.AppWindow.MoveAndResize(new Windows.Graphics.RectInt32(-32000, -32000, 1, 1));
         }
         // slopwatch-ignore: SW003 Test cleanup or fixture teardown is best-effort and must not hide the test outcome.
         catch
@@ -267,10 +264,6 @@ private static void TryHide(Window w)
         }
     }
 
-    [System.Runtime.InteropServices.DllImport("user32.dll")]
-    [return: System.Runtime.InteropServices.MarshalAs(System.Runtime.InteropServices.UnmanagedType.Bool)]
-    private static extern bool ShowWindow(IntPtr hWnd, int nCmdShow);
-
     public void Dispose()
     {
         try
diff --git a/tests/OpenClaw.WinNode.Cli.Tests/AuthTokenTests.cs b/tests/OpenClaw.WinNode.Cli.Tests/AuthTokenTests.cs
index 44ccc1883..4f3ed7fcd 100644
--- a/tests/OpenClaw.WinNode.Cli.Tests/AuthTokenTests.cs
+++ b/tests/OpenClaw.WinNode.Cli.Tests/AuthTokenTests.cs
@@ -3,6 +3,7 @@
 using System.Runtime.Versioning;
 using System.Security.AccessControl;
 using System.Security.Principal;
+using OpenClaw.Shared;
 using OpenClaw.WinNode.Cli;
 
 namespace OpenClaw.WinNode.Cli.Tests;
@@ -198,6 +199,81 @@ public void ResolveTokenPath_falls_back_to_AppData_OpenClawTray()
         Assert.Equal(expected, path);
     }
 
+    [Fact]
+    public void ResolveTokenPath_uses_OPENCLAW_APP_IDENTITY_dev_when_set()
+    {
+        Func<string, string?> env = key =>
+            key == OpenClawAppIdentity.IdentityEnvironmentVariable ? OpenClawAppIdentity.DevIdentity : null;
+        var path = CliRunner.ResolveTokenPath(env);
+        var expected = Path.Combine(
+            Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
+            "OpenClawTray-Dev",
+            "mcp-token.txt");
+        Assert.Equal(expected, path);
+    }
+
+    [Fact]
+    public void ResolveTokenPath_explicit_identity_overrides_environment()
+    {
+        Func<string, string?> env = key =>
+            key == OpenClawAppIdentity.IdentityEnvironmentVariable ? OpenClawAppIdentity.DevIdentity : null;
+        var path = CliRunner.ResolveTokenPath(env, OpenClawAppIdentity.ReleaseIdentity);
+        var expected = Path.Combine(
+            Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
+            "OpenClawTray",
+            "mcp-token.txt");
+        Assert.Equal(expected, path);
+    }
+
+    [Fact]
+    public void ResolveTokenPath_data_dir_override_wins_over_identity()
+    {
+        Func<string, string?> env = key => key switch
+        {
+            OpenClawAppIdentity.DataDirectoryOverrideEnvironmentVariable => @"C:\sandbox",
+            OpenClawAppIdentity.IdentityEnvironmentVariable => OpenClawAppIdentity.DevIdentity,
+            _ => null
+        };
+
+        var path = CliRunner.ResolveTokenPath(env);
+
+        Assert.Equal(Path.Combine(@"C:\sandbox", "mcp-token.txt"), path);
+    }
+
+    [Fact]
+    public void ParseArgs_accepts_identity_dev()
+    {
+        var options = CliRunner.ParseArgs(["--list-tools", "--identity", "dev"]);
+
+        Assert.Equal(OpenClawAppIdentity.DevIdentity, options.Identity);
+    }
+
+    [Fact]
+    public void ParseArgs_rejects_unknown_identity()
+    {
+        var ex = Assert.Throws<ArgumentException>(() =>
+            CliRunner.ParseArgs(["--list-tools", "--identity", "staging"]));
+
+        Assert.Contains("release", ex.Message);
+        Assert.Contains("dev", ex.Message);
+    }
+
+    [Fact]
+    public async Task OPENCLAW_APP_IDENTITY_invalid_value_returns_argument_error()
+    {
+        using var server = new FakeMcpServer();
+        var (o, e) = Buffers();
+
+        var exit = await CliRunner.RunAsync(
+            ["--list-tools", "--mcp-url", server.Url],
+            o,
+            e,
+            key => key == OpenClawAppIdentity.IdentityEnvironmentVariable ? "staging" : null);
+
+        Assert.Equal(2, exit);
+        Assert.Contains("App identity must be", e.ToString());
+    }
+
     [Theory]
     [InlineData("token with space")]           // F-06: internal whitespace
     [InlineData("token\rwith-CR")]             // F-06: internal CR (Trim doesn't catch)
diff --git a/tools/icongen/Program.cs b/tools/icongen/Program.cs
deleted file mode 100644
index 84c022f4e..000000000
--- a/tools/icongen/Program.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.IO;
-
-var sizes = new[] { (24, "Square44x44Logo.targetsize-24_altform-unplated.png"),
-                    (88, "Square44x44Logo.scale-200.png"),
-                    (50, "StoreLogo.png"),
-                    (300, "Square150x150Logo.scale-200.png"),
-                    (48, "LockScreenLogo.scale-200.png") };
-
-var assetsPath = args[0];
-
-foreach (var (size, name) in sizes)
-{
-    using var bmp = CreateLobster(size);
-    bmp.Save(Path.Combine(assetsPath, name), ImageFormat.Png);
-    Console.WriteLine("Created " + name);
-}
-
-static Bitmap CreateLobster(int size)
-{
-    var bmp = new Bitmap(size, size, PixelFormat.Format32bppArgb);
-    using var g = Graphics.FromImage(bmp);
-    g.Clear(Color.Transparent);
-    float s = size / 16f;
-    
-    var body = Color.FromArgb(255, 255, 79, 64);
-    var claw = Color.FromArgb(255, 255, 119, 95);
-    var outline = Color.FromArgb(255, 58, 10, 13);
-    var eyeW = Color.FromArgb(255, 245, 251, 255);
-    var eyeB = Color.FromArgb(255, 8, 16, 22);
-    
-    void P(int x, int y, Color c) { using var b = new SolidBrush(c); g.FillRectangle(b, (int)(x*s), (int)(y*s), (int)Math.Ceiling(s), (int)Math.Ceiling(s)); }
-    
-    int[][] bd = {new[]{5,3},new[]{6,3},new[]{7,3},new[]{8,3},new[]{9,3},new[]{10,3},new[]{4,4},new[]{5,4},new[]{7,4},new[]{8,4},new[]{10,4},new[]{11,4},new[]{3,5},new[]{4,5},new[]{5,5},new[]{7,5},new[]{8,5},new[]{10,5},new[]{11,5},new[]{12,5},new[]{3,6},new[]{4,6},new[]{5,6},new[]{6,6},new[]{7,6},new[]{8,6},new[]{9,6},new[]{10,6},new[]{11,6},new[]{12,6},new[]{3,7},new[]{4,7},new[]{5,7},new[]{6,7},new[]{7,7},new[]{8,7},new[]{9,7},new[]{10,7},new[]{11,7},new[]{12,7},new[]{4,8},new[]{5,8},new[]{6,8},new[]{7,8},new[]{8,8},new[]{9,8},new[]{10,8},new[]{11,8},new[]{5,9},new[]{6,9},new[]{7,9},new[]{8,9},new[]{9,9},new[]{10,9},new[]{5,12},new[]{6,12},new[]{7,12},new[]{8,12},new[]{9,12},new[]{10,12},new[]{6,13},new[]{7,13},new[]{8,13},new[]{9,13}};
-    foreach (var p in bd) P(p[0], p[1], body);
-    
-    int[][] cl = {new[]{1,6},new[]{2,5},new[]{2,6},new[]{2,7},new[]{13,5},new[]{13,6},new[]{13,7},new[]{14,6}};
-    foreach (var p in cl) P(p[0], p[1], claw);
-    
-    int[][] ol = {new[]{1,5},new[]{1,7},new[]{2,4},new[]{2,8},new[]{3,3},new[]{3,9},new[]{4,2},new[]{4,10},new[]{5,2},new[]{6,2},new[]{7,2},new[]{8,2},new[]{9,2},new[]{10,2},new[]{11,2},new[]{12,3},new[]{12,9},new[]{13,4},new[]{13,8},new[]{14,5},new[]{14,7},new[]{5,11},new[]{6,11},new[]{7,11},new[]{8,11},new[]{9,11},new[]{10,11},new[]{4,12},new[]{11,12},new[]{3,13},new[]{12,13},new[]{5,14},new[]{6,14},new[]{7,14},new[]{8,14},new[]{9,14},new[]{10,14}};
-    foreach (var p in ol) P(p[0], p[1], outline);
-    
-    P(6,4,eyeW); P(9,4,eyeW); P(6,5,eyeB); P(9,5,eyeB);
-    return bmp;
-}
diff --git a/tools/icongen/icongen.csproj b/tools/icongen/icongen.csproj
deleted file mode 100644
index 4a508c9c6..000000000
--- a/tools/icongen/icongen.csproj
+++ /dev/null
@@ -1,14 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net10.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="System.Drawing.Common" Version="10.0.2" />
-  </ItemGroup>
-
-</Project>
diff --git a/tools/seed_v2_resw.py b/tools/seed_v2_resw.py
deleted file mode 100644
index 1c6ac434d..000000000
--- a/tools/seed_v2_resw.py
+++ /dev/null
@@ -1,116 +0,0 @@
-"""Seed V2 string keys into all 5 .resw locale files.
-
-Reads V2Strings.DefaultEnUs by parsing V2Strings.cs (since the C# dictionary
-literal is stable and easy to scan). Adds any missing V2_* keys to each
-locale's Resources.resw with the English value. Existing keys are left
-untouched. Idempotent.
-"""
-from __future__ import annotations
-import re
-import sys
-import xml.etree.ElementTree as ET
-from pathlib import Path
-
-REPO_ROOT = Path(__file__).resolve().parent.parent
-V2STRINGS_CS = REPO_ROOT / "src" / "OpenClawTray.OnboardingV2" / "V2Strings.cs"
-STRINGS_DIR = REPO_ROOT / "src" / "OpenClaw.Tray.WinUI" / "Strings"
-LOCALES = ["en-us", "fr-fr", "nl-nl", "zh-cn", "zh-tw"]
-
-# Match a dictionary entry  ["KEY"] = "VALUE",  with optional string concat
-# across lines, and grab the joined value. Heuristic but works because
-# V2Strings.cs uses simple "literal" + "literal" concatenation.
-KEY_VALUE_RE = re.compile(
-    r'\["(?P<key>V2_[A-Za-z0-9_]+)"\]\s*=\s*(?P<rhs>(?:"[^"]*"\s*(?:\+\s*"[^"]*"\s*)*)),',
-    re.MULTILINE,
-)
-
-
-def parse_v2_strings() -> dict[str, str]:
-    text = V2STRINGS_CS.read_text(encoding="utf-8")
-    # Bound the search to the DefaultEnUs block.
-    block_start = text.find("DefaultEnUs")
-    if block_start == -1:
-        raise RuntimeError("DefaultEnUs not found in V2Strings.cs")
-    block = text[block_start:]
-    out: dict[str, str] = {}
-    for m in KEY_VALUE_RE.finditer(block):
-        rhs = m.group("rhs")
-        parts = re.findall(r'"([^"]*)"', rhs)
-        value = "".join(parts)
-        # Decode \u escapes the way C# parses them.
-        value = re.sub(
-            r"\\u([0-9A-Fa-f]{4})",
-            lambda mm: chr(int(mm.group(1), 16)),
-            value,
-        )
-        out[m.group("key")] = value
-    return out
-
-
-def read_resw_keys(path: Path) -> set[str]:
-    """Return the set of <data name="..."> keys already in the file."""
-    keys: set[str] = set()
-    tree = ET.parse(path)
-    for data in tree.getroot().findall("data"):
-        name = data.get("name")
-        if name:
-            keys.add(name)
-    return keys
-
-
-def append_keys(path: Path, missing: dict[str, str]) -> None:
-    """Append <data name="K"><value>V</value></data> entries before </root>.
-
-    Uses text manipulation (not ElementTree write) to preserve the file's
-    existing indentation, comments, and XML schema preamble exactly. Tests
-    in this repo are picky about whitespace in resource files.
-    """
-    text = path.read_text(encoding="utf-8")
-    # Find last </root>
-    close_idx = text.rfind("</root>")
-    if close_idx == -1:
-        raise RuntimeError(f"{path}: no </root> tag found")
-
-    lines = []
-    for key, value in missing.items():
-        # XML-escape value
-        escaped = (value
-                   .replace("&", "&amp;")
-                   .replace("<", "&lt;")
-                   .replace(">", "&gt;"))
-        lines.append(f'  <data name="{key}" xml:space="preserve">')
-        lines.append(f'    <value>{escaped}</value>')
-        lines.append("  </data>")
-    block = "\n".join(lines) + "\n"
-    new_text = text[:close_idx] + block + text[close_idx:]
-    path.write_text(new_text, encoding="utf-8")
-
-
-def main() -> int:
-    keys = parse_v2_strings()
-    if not keys:
-        print("No V2 keys parsed from V2Strings.cs", file=sys.stderr)
-        return 2
-    print(f"Parsed {len(keys)} V2_* keys from V2Strings.cs")
-
-    total_added = 0
-    for locale in LOCALES:
-        resw = STRINGS_DIR / locale / "Resources.resw"
-        if not resw.exists():
-            print(f"  ! {locale}: Resources.resw missing", file=sys.stderr)
-            return 2
-        existing = read_resw_keys(resw)
-        missing = {k: v for k, v in keys.items() if k not in existing}
-        if missing:
-            append_keys(resw, missing)
-            print(f"  + {locale}: added {len(missing)} keys")
-            total_added += len(missing)
-        else:
-            print(f"  = {locale}: already up to date")
-
-    print(f"Done. Added {total_added} total entries.")
-    return 0
-
-
-if __name__ == "__main__":
-    sys.exit(main())
diff --git a/tools/v2-design-refs/Dialog-1.png b/tools/v2-design-refs/Dialog-1.png
deleted file mode 100644
index 39ed977d0..000000000
Binary files a/tools/v2-design-refs/Dialog-1.png and /dev/null differ
diff --git a/tools/v2-design-refs/Dialog-2.png b/tools/v2-design-refs/Dialog-2.png
deleted file mode 100644
index d415354dc..000000000
Binary files a/tools/v2-design-refs/Dialog-2.png and /dev/null differ
diff --git a/tools/v2-design-refs/Dialog-3.png b/tools/v2-design-refs/Dialog-3.png
deleted file mode 100644
index ad1f41c3f..000000000
Binary files a/tools/v2-design-refs/Dialog-3.png and /dev/null differ
diff --git a/tools/v2-design-refs/Dialog-4.png b/tools/v2-design-refs/Dialog-4.png
deleted file mode 100644
index 1071d3b21..000000000
Binary files a/tools/v2-design-refs/Dialog-4.png and /dev/null differ
diff --git a/tools/v2-design-refs/Dialog-5.png b/tools/v2-design-refs/Dialog-5.png
deleted file mode 100644
index 18e29c832..000000000
Binary files a/tools/v2-design-refs/Dialog-5.png and /dev/null differ
diff --git a/tools/v2-design-refs/Dialog-6.png b/tools/v2-design-refs/Dialog-6.png
deleted file mode 100644
index 940a6cdf2..000000000
Binary files a/tools/v2-design-refs/Dialog-6.png and /dev/null differ
diff --git a/tools/v2-design-refs/Dialog.png b/tools/v2-design-refs/Dialog.png
deleted file mode 100644
index 0193266c9..000000000
Binary files a/tools/v2-design-refs/Dialog.png and /dev/null differ
diff --git a/tools/v2_visual_diff.py b/tools/v2_visual_diff.py
deleted file mode 100644
index 90e0a142d..000000000
--- a/tools/v2_visual_diff.py
+++ /dev/null
@@ -1,312 +0,0 @@
-"""
-v2_visual_diff.py — visual validation loop for the OnboardingV2 redesign.
-
-For each design screen the designer sent us, this tool:
-
-  1. Spawns OpenClaw.SetupPreview.exe in headless capture mode with the
-     env vars that select the matching V2 route + scenario flags.
-  2. Resizes both the designer reference PNG and the rendered capture
-     to a common height and renders a clean side-by-side
-     (designer | actual) image at ``out/v2-visual/<page>/diff.png``.
-
-There is no automated PASS/FAIL gate. The agent (and humans) ``view``
-``diff.png`` after every implementation change, articulate every visible
-discrepancy in semantic terms (font weight, spacing, alignment, colour,
-icon size, etc.), fix them, re-capture, and loop until a fresh look at
-the side-by-side reveals no remaining differences. Pixel-level metrics
-were tried and discarded — designer mock-canvas shadows + sub-pixel
-font AA + the dialog-vs-canvas offset all created systematic noise that
-drowned out the real signal coming from the agent's own eyes.
-
-A separate snapshot-regression tool (added at cutover) handles
-"detect unintentional changes vs the approved render"; that's a
-different problem from "is the new render right?" and shouldn't be
-conflated.
-
-CLI:
-    python tools/v2_visual_diff.py --page welcome
-    python tools/v2_visual_diff.py --all
-    python tools/v2_visual_diff.py --page allset --open
-"""
-
-from __future__ import annotations
-
-import argparse
-import os
-import shutil
-import subprocess
-import sys
-from dataclasses import dataclass, field
-from pathlib import Path
-from typing import Optional
-
-from PIL import Image, ImageDraw, ImageFont
-
-# ---------------------------------------------------------------------------
-# Page registry
-# ---------------------------------------------------------------------------
-
-
-@dataclass(frozen=True)
-class PageSpec:
-    """Maps a logical page name to its V2 route + scenario flags."""
-
-    name: str
-    route: str  # OPENCLAW_PREVIEW_PAGE
-    reference: str  # filename under tools/v2-design-refs/
-    env: dict[str, str] = field(default_factory=dict)
-    description: str = ""
-
-
-PAGES: dict[str, PageSpec] = {
-    "welcome": PageSpec(
-        name="welcome",
-        route="Welcome",
-        reference="Dialog.png",
-        description="Get started — lobster + Set up locally + Advanced setup",
-    ),
-    "progress-running": PageSpec(
-        name="progress-running",
-        route="LocalSetupProgress",
-        reference="Dialog-1.png",
-        env={
-            "OPENCLAW_PREVIEW_FAIL_STAGE": "",
-            "OPENCLAW_PREVIEW_PROGRESS_FROZEN_STAGE": "PreparingGateway",
-        },
-        description="Setting up locally — rows 1-4 done, row 5 spinning",
-    ),
-    "progress-failed": PageSpec(
-        name="progress-failed",
-        route="LocalSetupProgress",
-        reference="Dialog-6.png",
-        env={
-            "OPENCLAW_PREVIEW_FAIL_STAGE": "StartingGateway",
-            "OPENCLAW_PREVIEW_PROGRESS_FROZEN_STAGE": "StartingGateway",
-        },
-        description="Setting up locally — Starting gateway failed, inline error card",
-    ),
-    "gateway": PageSpec(
-        name="gateway",
-        route="GatewayWelcome",
-        reference="Dialog-2.png",
-        description="Configuring gateway — welcome card + Open in browser",
-    ),
-    "permissions": PageSpec(
-        name="permissions",
-        route="Permissions",
-        reference="Dialog-5.png",
-        env={"OPENCLAW_PREVIEW_PERMS_SCENARIO": "all-granted"},
-        description="Grant permissions — five rows + Open Settings + Refresh status",
-    ),
-    "allset": PageSpec(
-        name="allset",
-        route="AllSet",
-        reference="Dialog-4.png",
-        env={"OPENCLAW_PREVIEW_NODE_MODE": "1"},
-        description="All set! — party popper + Node Mode warning + Launch toggle",
-    ),
-    "allset-no-node": PageSpec(
-        name="allset-no-node",
-        route="AllSet",
-        reference="Dialog-4.png",  # No designer no-node variant; we diff
-        # against Dialog-4 to visually confirm the warning collapses cleanly.
-        env={"OPENCLAW_PREVIEW_NODE_MODE": "0"},
-        description="All set! without Node Mode — confirm warning collapses cleanly",
-    ),
-}
-
-
-# ---------------------------------------------------------------------------
-# Paths
-# ---------------------------------------------------------------------------
-
-
-def repo_root() -> Path:
-    here = Path(__file__).resolve()
-    return here.parent.parent
-
-
-def preview_exe() -> Path:
-    """Locate the OpenClaw.SetupPreview.exe; rebuild if missing."""
-    root = repo_root()
-    candidates = list(
-        root.glob(
-            "src/OpenClaw.SetupPreview/bin/Debug/net*-windows*/win-*/OpenClaw.SetupPreview.exe"
-        )
-    )
-    if not candidates:
-        return Path()
-    return max(candidates, key=lambda p: p.stat().st_mtime)
-
-
-def reference_path(page: PageSpec) -> Path:
-    return repo_root() / "tools" / "v2-design-refs" / page.reference
-
-
-def output_dir(page: PageSpec) -> Path:
-    return repo_root() / "out" / "v2-visual" / page.name
-
-
-# ---------------------------------------------------------------------------
-# Capture
-# ---------------------------------------------------------------------------
-
-
-def ensure_preview_exe() -> Path:
-    """Always run an incremental dotnet build (once per invocation) to pick up code changes, then locate the exe."""
-    proj = repo_root() / "src" / "OpenClaw.SetupPreview" / "OpenClaw.SetupPreview.csproj"
-    print("[vv] building OpenClaw.SetupPreview (incremental)...", flush=True)
-    result = subprocess.run(
-        ["dotnet", "build", str(proj), "-r", "win-x64", "--nologo", "-v", "minimal"],
-        cwd=repo_root(),
-        capture_output=True,
-        text=True,
-    )
-    if result.returncode != 0:
-        sys.stderr.write(result.stdout)
-        sys.stderr.write(result.stderr)
-        raise RuntimeError("dotnet build failed; see output above")
-    exe = preview_exe()
-    if not exe or not exe.exists():
-        raise RuntimeError("dotnet build succeeded but no exe was produced")
-    return exe
-
-
-def capture(page: PageSpec) -> Path:
-    """Run the preview exe in headless capture mode and return the PNG path."""
-    exe = ensure_preview_exe()
-    out_dir = output_dir(page)
-    out_dir.mkdir(parents=True, exist_ok=True)
-    actual_path = out_dir / "actual.png"
-    if actual_path.exists():
-        actual_path.unlink()
-
-    env = os.environ.copy()
-    env["OPENCLAW_PREVIEW_CAPTURE"] = "1"
-    env["OPENCLAW_PREVIEW_PAGE"] = page.route
-    env["OPENCLAW_PREVIEW_CAPTURE_PATH"] = str(actual_path)
-    for k, v in page.env.items():
-        env[k] = v
-
-    proc = subprocess.run(
-        [str(exe)],
-        env=env,
-        capture_output=True,
-        text=True,
-        timeout=60,
-    )
-    log_path = out_dir / "preview.log"
-    log_path.write_text(
-        f"=== exit {proc.returncode} ===\n"
-        f"=== stdout ===\n{proc.stdout}\n=== stderr ===\n{proc.stderr}\n"
-    )
-    if proc.returncode != 0:
-        raise RuntimeError(
-            f"preview capture failed (exit={proc.returncode}); see {log_path}"
-        )
-    if not actual_path.exists():
-        raise RuntimeError(
-            f"preview reported success but no PNG at {actual_path}; see {log_path}"
-        )
-    return actual_path
-
-
-# ---------------------------------------------------------------------------
-# Side-by-side render
-# ---------------------------------------------------------------------------
-
-
-def fit_to_height(img: Image.Image, target_h: int) -> Image.Image:
-    """Resize *img* preserving aspect ratio so its height equals *target_h*.
-    Designer refs and captures share the same aspect (~0.813) so this is a
-    pure resize."""
-    w, h = img.size
-    new_w = max(1, int(round(w * target_h / h)))
-    return img.convert("RGB").resize((new_w, target_h), Image.LANCZOS)
-
-
-def build_side_by_side(expected: Image.Image, actual: Image.Image) -> Image.Image:
-    """Designer reference on the left, actual capture on the right, with a
-    caption strip and a 24px gap between the two panes."""
-    target_h = 1400  # readable on a typical screen; preserves enough detail
-    e = fit_to_height(expected, target_h)
-    a = fit_to_height(actual, target_h)
-
-    gap = 24
-    cap = 64
-    total_w = e.width + a.width + gap
-    out = Image.new("RGB", (total_w, target_h + cap), (24, 24, 24))
-    out.paste(e, (0, cap))
-    out.paste(a, (e.width + gap, cap))
-
-    draw = ImageDraw.Draw(out)
-    try:
-        font = ImageFont.truetype("segoeui.ttf", 24)
-    except OSError:
-        font = ImageFont.load_default()
-    draw.text((16, 20), "expected (designer)", fill=(230, 230, 230), font=font)
-    draw.text((e.width + gap + 16, 20), "actual (preview)", fill=(230, 230, 230), font=font)
-    return out
-
-
-def diff_page(page: PageSpec) -> None:
-    """Capture and render side-by-side; write artifacts."""
-    print(f"[vv] {page.name}: capturing...", flush=True)
-    actual_path = capture(page)
-    out_dir = output_dir(page)
-
-    ref = reference_path(page)
-    if not ref.exists():
-        raise FileNotFoundError(f"reference image missing: {ref}")
-    shutil.copy(ref, out_dir / "expected.png")
-
-    expected_img = Image.open(ref)
-    actual_img = Image.open(actual_path)
-    side_by_side = build_side_by_side(expected_img, actual_img)
-    side_by_side.save(out_dir / "diff.png", optimize=True)
-    print(
-        f"[vv] {page.name}: rendered {out_dir / 'diff.png'} — "
-        f"view it and judge visually",
-        flush=True,
-    )
-
-
-# ---------------------------------------------------------------------------
-# CLI
-# ---------------------------------------------------------------------------
-
-
-def main(argv: Optional[list[str]] = None) -> int:
-    p = argparse.ArgumentParser(description=__doc__)
-    p.add_argument("--page", choices=sorted(PAGES.keys()))
-    p.add_argument("--all", action="store_true")
-    p.add_argument("--open", action="store_true", help="Open diff.png after generating")
-    p.add_argument("--theme", choices=["System", "Light", "Dark"], default=None,
-                   help="Force a specific theme via OPENCLAW_PREVIEW_THEME (default: app default)")
-    args = p.parse_args(argv)
-
-    if not args.all and not args.page:
-        p.error("provide --page <name> or --all")
-
-    if args.theme:
-        os.environ["OPENCLAW_PREVIEW_THEME"] = args.theme
-
-    pages = list(PAGES.values()) if args.all else [PAGES[args.page]]
-    failed = 0
-    for page in pages:
-        try:
-            diff_page(page)
-            if args.open:
-                diff_path = output_dir(page) / "diff.png"
-                if sys.platform.startswith("win"):
-                    os.startfile(str(diff_path))  # noqa: S606
-                else:
-                    subprocess.run(["xdg-open", str(diff_path)], check=False)
-        except Exception as ex:  # noqa: BLE001
-            print(f"[vv] {page.name}: ERROR {ex}", file=sys.stderr)
-            failed += 1
-    return 0 if failed == 0 else 1
-
-
-if __name__ == "__main__":
-    sys.exit(main())