diff --git a/BUILD_GUIDE.md b/BUILD_GUIDE.md
index be18ff567..a83a4f9a4 100644
--- a/BUILD_GUIDE.md
+++ b/BUILD_GUIDE.md
@@ -16,7 +16,7 @@ dotnet --version
 dotnet --info
 ```
 
-仓库通过 `global.json` 锁定 .NET SDK `10.0.302`，允许同一 feature band 内的 patch 前滚；Uno SDK 锁定为 `6.6.29`。版本不匹配时先安装 .NET 10 SDK，不要手改项目 TFM 或 `global.json`。
+仓库通过 `global.json` 锁定 .NET SDK `10.0.302`，允许同一 feature band 内的 patch 前滚；Uno SDK 锁定为 `6.7.22`。版本不匹配时先安装 .NET 10 SDK，不要手改项目 TFM 或 `global.json`。
 
 ### 必需与可选依赖
 
diff --git a/README.en.md b/README.en.md
index 266ccae83..31e927c84 100644
--- a/README.en.md
+++ b/README.en.md
@@ -25,7 +25,7 @@ With Salmon Egg, you can connect to local or remote ACP services, create and res
 
 ## Tech Stack
 
-- Uno Platform 6.6+ (repo pin: `Uno.Sdk` 6.6.29)
+- Uno Platform 6.7+ (repo pin: `Uno.Sdk` 6.7.22)
 - .NET 10 (repo pin: SDK 10.0.302, with 10.0.3xx patch roll-forward)
 - WinUI 3 on Windows
 - Clean Architecture + MVVM
diff --git a/README.md b/README.md
index 5686cc297..1de5daa5c 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ Salmon Egg 是一款依托 ACP 协议打造的桌面端智能体客户端。
 
 ## 技术栈
 
-- Uno Platform 6.6+（仓库锁定 `Uno.Sdk` 6.6.29）
+- Uno Platform 6.7+（仓库锁定 `Uno.Sdk` 6.7.22）
 - .NET 10（仓库锁定 SDK 10.0.302，允许 10.0.3xx patch 前滚）
 - WinUI 3（Windows）
 - Clean Architecture + MVVM
diff --git a/SalmonEgg/Directory.Packages.props b/SalmonEgg/Directory.Packages.props
index d1b90902a..103f9feb6 100644
--- a/SalmonEgg/Directory.Packages.props
+++ b/SalmonEgg/Directory.Packages.props
@@ -21,7 +21,7 @@
     <PackageVersion Include="Microsoft.Graph" Version="6.2.0" />
     <PackageVersion Include="Microsoft.Identity.Client" Version="4.86.1" />
     <PackageVersion Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.86.1" />
-    <!-- Stay on Windows App SDK 1.8 line until Uno 6.6 + WinUI packaging are validated on 2.x. -->
+    <!-- Stay on Windows App SDK 1.8 line until Uno 6.7 + WinUI packaging are validated on 2.x. -->
     <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.8.260710003" />
     <PackageVersion Include="Microsoft.WindowsAppSDK.WinUI" Version="1.8.260709004" />
     <PackageVersion Include="Serilog.Extensions.Logging" Version="10.0.0" />
@@ -33,14 +33,14 @@
     <PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.17.0" />
     <PackageVersion Include="System.Security.Cryptography.ProtectedData" Version="10.0.10" />
     <PackageVersion Include="System.Security.Permissions" Version="10.0.10" />
-    <PackageVersion Include="Uno.WinUI.Lottie" Version="6.6.166" />
+    <PackageVersion Include="Uno.WinUI.Lottie" Version="6.7.103" />
     <PackageVersion Include="Uno.Extensions.Reactive" Version="7.2.3" />
     <PackageVersion Include="Uno.Extensions.Reactive.WinUI" Version="7.2.3" />
     <PackageVersion Include="Uno.Extensions.Reactive.Messaging" Version="7.2.3" />
     <PackageVersion Include="Uno.CommunityToolkit.WinUI.UI.Controls.Markdown" Version="7.1.206" />
     <PackageVersion Include="Uno.Fonts.Fluent" Version="2.8.1" />
     <PackageVersion Include="Uno.Fonts.OpenSans" Version="2.8.1" />
-    <!-- Uno 6.6 Skia X11 requires Tmds.DBus.Protocol >= 0.92.0; pin a current stable version centrally. -->
+    <!-- Uno 6.7 Skia X11 requires Tmds.DBus.Protocol >= 0.92.0; pin a current stable version centrally. -->
     <PackageVersion Include="Tmds.DBus.Protocol"
                     Version="0.94.2"
                     Condition="'$(TargetFramework)' == 'net10.0-desktop'" />
diff --git a/SalmonEgg/SalmonEgg/Controls/ChatInputArea.xaml b/SalmonEgg/SalmonEgg/Controls/ChatInputArea.xaml
index e00791c99..16b540f54 100644
--- a/SalmonEgg/SalmonEgg/Controls/ChatInputArea.xaml
+++ b/SalmonEgg/SalmonEgg/Controls/ChatInputArea.xaml
@@ -351,6 +351,7 @@
 
                                 <Button x:Name="SendButton"
                                         x:Uid="SendButton"
+                                        AutomationProperties.AutomationId="ChatInputArea.Send"
                                         Content="&#xE724;"
                                         FontFamily="{ThemeResource SymbolThemeFontFamily}"
                                         Width="44"
@@ -365,6 +366,7 @@
 
                                 <Button x:Name="CancelButton"
                                         x:Uid="CancelButton"
+                                        AutomationProperties.AutomationId="ChatInputArea.Cancel"
                                         Content="&#xE711;"
                                         FontFamily="{ThemeResource SymbolThemeFontFamily}"
                                         Width="44"
diff --git a/SalmonEgg/SalmonEgg/Controls/XtermTerminalView.xaml.cs b/SalmonEgg/SalmonEgg/Controls/XtermTerminalView.xaml.cs
index d5b1155df..7411f16ec 100644
--- a/SalmonEgg/SalmonEgg/Controls/XtermTerminalView.xaml.cs
+++ b/SalmonEgg/SalmonEgg/Controls/XtermTerminalView.xaml.cs
@@ -221,7 +221,11 @@ private void DetachSession(ILocalTerminalSession? session)
         }
     }
 
-    private void OnNavigationCompleted(WebView2 sender, CoreWebView2NavigationCompletedEventArgs args)
+    // Qualify the control type: Uno 6.7 brings in the transitive WebView2Aot package, whose
+    // WebView2.dll declares a top-level "WebView2" namespace. A global-namespace namespace wins
+    // simple-name lookup over a using-imported type, so the bare name resolves to that namespace
+    // (CS0118). The handlers below are for the XAML control, so name it in full.
+    private void OnNavigationCompleted(Microsoft.UI.Xaml.Controls.WebView2 sender, CoreWebView2NavigationCompletedEventArgs args)
     {
         if (!args.IsSuccess)
         {
@@ -229,7 +233,7 @@ private void OnNavigationCompleted(WebView2 sender, CoreWebView2NavigationComple
         }
     }
 
-    private void OnWebMessageReceived(WebView2 sender, CoreWebView2WebMessageReceivedEventArgs args)
+    private void OnWebMessageReceived(Microsoft.UI.Xaml.Controls.WebView2 sender, CoreWebView2WebMessageReceivedEventArgs args)
     {
         _ = DispatchWebMessageAsync(args.WebMessageAsJson);
     }
diff --git a/SalmonEgg/SalmonEgg/MainPage.Shutdown.cs b/SalmonEgg/SalmonEgg/MainPage.Shutdown.cs
index 6a31f2017..b7535dbbb 100644
--- a/SalmonEgg/SalmonEgg/MainPage.Shutdown.cs
+++ b/SalmonEgg/SalmonEgg/MainPage.Shutdown.cs
@@ -14,6 +14,7 @@ namespace SalmonEgg;
 /// 只在 <c>Cancel &amp;&amp; SupportsClosingCancellation</c> 时才真的中止关闭。
 /// （注意：<c>lib/&lt;tfm&gt;/Uno.UI.dll</c> 是 facade，那里该属性硬编码 false，据它会得出
 /// "平台不支持取消"的相反结论。）
+/// 该反编译结论取自 6.6.166；升级到 6.7.103 后只确认了符号仍在，未重新反编译逐个 host 的取值。
 ///
 /// 为什么必须在这里 teardown、而不能只依赖宿主返回后再做：desktop 头原先只在
 /// <c>Platforms/Desktop/Program.cs</c> 里等 <c>host.RunAsync()</c> 返回后才清理，
diff --git a/SalmonEgg/SalmonEgg/SalmonEgg.csproj b/SalmonEgg/SalmonEgg/SalmonEgg.csproj
index 8b292774b..059d79592 100644
--- a/SalmonEgg/SalmonEgg/SalmonEgg.csproj
+++ b/SalmonEgg/SalmonEgg/SalmonEgg.csproj
@@ -289,6 +289,18 @@
     <UseDefaultPublishRuntimeIdentifier>false</UseDefaultPublishRuntimeIdentifier>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net10.0-browserwasm'">
+    <!--
+      Render the browser head with Skia, matching desktop. The legacy WebAssembly DOM backend stopped
+      projecting AutomationProperties.Name onto aria-label in Uno 6.7: the app still renders, but no
+      element carries an accessible name, which is a screen-reader regression and not only a broken
+      smoke locator. Every accessibility fix in that line targets the Skia WASM semantic DOM instead
+      (unoplatform/uno#23456, #23722, #24383), and Uno 7 removes the DOM backend outright, so this is
+      the direction of travel regardless.
+    -->
+    <UnoFeatures>SkiaRenderer;WebView;</UnoFeatures>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(TargetFramework)' == 'net10.0-desktop'">
     <UnoFeatures>SkiaRenderer;WebView;</UnoFeatures>
     <PlatformTarget Condition="'$(PlatformTarget)' == ''">AnyCPU</PlatformTarget>
diff --git a/SalmonEgg/SalmonEgg/Styles/Skia/UnoNumberBoxThemeOverrides.xaml b/SalmonEgg/SalmonEgg/Styles/Skia/UnoNumberBoxThemeOverrides.xaml
index 33808b630..e4e04d0c0 100644
--- a/SalmonEgg/SalmonEgg/Styles/Skia/UnoNumberBoxThemeOverrides.xaml
+++ b/SalmonEgg/SalmonEgg/Styles/Skia/UnoNumberBoxThemeOverrides.xaml
@@ -1,6 +1,6 @@
 <!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
 <!-- MUX Reference controls\dev\NumberBox\NumberBox.xaml, tag winui3/release/1.7.1, commit 5f27a786ac9 -->
-<!-- Adapted from Uno Platform 6.6.166, commit 438b300b6171b3f2712f8897f10ea620784843ca, src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/NumberBox.xaml. -->
+<!-- Adapted from Uno Platform 6.7.103, commit cd452e3ee242c9a2a8dee5e65ad8088b6f5dbf83, src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/NumberBox.xaml. -->
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -12,7 +12,7 @@
     <!--
       Uno issue unoplatform/uno#24021: the WinUI NumberBox template forces the inner text presenter
       to Light while focused, but Skia can retain the dark/transparent background. Keep this copy aligned
-      with Uno 6.6.166 (commit 438b300b6171b3f2712f8897f10ea620784843ca) and remove it once the upstream
+      with Uno 6.7.103 (commit cd452e3ee242c9a2a8dee5e65ad8088b6f5dbf83) and remove it once the upstream
       issue is fixed in our Uno line.
       The application-level NumberBox style is included because the framework template resolves its inner
       NumberBoxTextBoxStyle inside the framework resource dictionary; overriding only the inner key is ineffective.
@@ -379,7 +379,7 @@
             <ContentPresenter x:Name="HeaderContentPresenter" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Content="{TemplateBinding Header}" ContentTemplate="{TemplateBinding HeaderTemplate}" FontWeight="Normal" Foreground="{ThemeResource TextControlHeaderForeground}" Margin="{ThemeResource TextBoxTopHeaderMargin}" TextWrapping="Wrap" VerticalAlignment="Top" Visibility="Collapsed" x:DeferLoadStrategy="Lazy" />
             <Border x:Name="BorderElement" Grid.Row="1" Grid.Column="0" Grid.RowSpan="1" Grid.ColumnSpan="3" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" Control.IsTemplateFocusTarget="True" MinWidth="{TemplateBinding MinWidth}" MinHeight="{TemplateBinding MinHeight}" />
             <ScrollViewer x:Name="ContentElement" Grid.Row="1" Grid.Column="0" HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}" skia:ScrollViewer.IsHorizontalRailEnabled="{TemplateBinding ScrollViewer.IsHorizontalRailEnabled}" skia:ScrollViewer.IsVerticalRailEnabled="{TemplateBinding ScrollViewer.IsVerticalRailEnabled}" Margin="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" Foreground="{TemplateBinding Foreground}" IsTabStop="False" AutomationProperties.AccessibilityView="Raw" ZoomMode="Disabled" />
-            <TextBlock x:Name="PlaceholderTextContentPresenter" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Foreground="{Binding PlaceholderForeground, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={ThemeResource TextControlPlaceholderForeground}}" Margin="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" Text="{TemplateBinding PlaceholderText}" TextAlignment="{TemplateBinding TextAlignment}" TextWrapping="{TemplateBinding TextWrapping}" IsHitTestVisible="False" />
+            <TextBlock x:Name="PlaceholderTextContentPresenter" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Foreground="{Binding PlaceholderForeground, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={ThemeResource TextControlPlaceholderForeground}}" Margin="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" Text="{TemplateBinding PlaceholderText}" TextAlignment="{TemplateBinding TextAlignment}" TextWrapping="{TemplateBinding TextWrapping}" IsHitTestVisible="False" AutomationProperties.AccessibilityView="Raw" />
             <Button x:Name="DeleteButton" Grid.Row="1" Grid.Column="1" Style="{StaticResource DeleteButtonStyle}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" Padding="{ThemeResource HelperButtonThemePadding}" IsTabStop="False" Visibility="Collapsed" AutomationProperties.AccessibilityView="Raw" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="Right" MinWidth="40" VerticalAlignment="Stretch" />
             <ContentPresenter x:Name="DescriptionPresenter" Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Content="{TemplateBinding Description}" Foreground="{ThemeResource SystemControlDescriptionTextForegroundBrush}" AutomationProperties.AccessibilityView="Raw" x:Load="False" />
             <TextBlock x:Name="PopupIndicator" Grid.Row="1" Grid.Column="2" Visibility="Collapsed" Margin="{StaticResource NumberBoxPopupIndicatorMargin}" Foreground="{ThemeResource NumberBoxPopupIndicatorForeground}" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="12" Text="&#xEC8F;" FontFamily="{ThemeResource SymbolThemeFontFamily}" AutomationProperties.AccessibilityView="Raw" />
diff --git a/SalmonEgg/global.json b/SalmonEgg/global.json
index 5e3e9590f..4ad1a3d3a 100644
--- a/SalmonEgg/global.json
+++ b/SalmonEgg/global.json
@@ -1,7 +1,7 @@
 {
   // To update the version of Uno please update the version of the Uno.Sdk here. See https://aka.platform.uno/upgrade-uno-packages for more information.
   "msbuild-sdks": {
-    "Uno.Sdk": "6.6.29"
+    "Uno.Sdk": "6.7.22"
   },
   "sdk": {
     "allowPrerelease": false
diff --git a/global.json b/global.json
index 6fac91021..6f9bda58a 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "msbuild-sdks": {
-    "Uno.Sdk": "6.6.29"
+    "Uno.Sdk": "6.7.22"
   },
   "sdk": {
     "version": "10.0.302",
diff --git a/scripts/gates/run-wasm-smoke-gates.sh b/scripts/gates/run-wasm-smoke-gates.sh
index 79ccda4f1..4e1af4ee4 100755
--- a/scripts/gates/run-wasm-smoke-gates.sh
+++ b/scripts/gates/run-wasm-smoke-gates.sh
@@ -167,10 +167,17 @@ echo "[gate] Restore browserwasm dependencies"
 "${DOTNET_BIN}" restore "${PROJECT}"
 
 echo "[gate] Clean browserwasm output"
-"${DOTNET_BIN}" clean "${PROJECT}" -c "${CONFIGURATION}" -f net10.0-browserwasm -v minimal
-
-echo "[gate] Build browserwasm app"
-"${DOTNET_BIN}" build "${PROJECT}" -c "${CONFIGURATION}" -f net10.0-browserwasm --no-restore -v minimal
+"${DOTNET_BIN}" clean "${PROJECT}" -c "${CONFIGURATION}" -f net10.0-browserwasm -v minimal \
+  -p:IsUiAutomationMappingEnabled=true
+
+# IsUiAutomationMappingEnabled is what makes AutomationProperties.AutomationId reach the DOM at all:
+# per Uno's AutomationProperties reference it is off by default "to avoid performance overhead", and
+# when on, WASM publishes a `xamlautomationid` attribute plus aria-label on the element. The smokes
+# locate every affordance by AutomationId, so the gate build has to opt in. Kept to the gate rather
+# than the project file precisely because of that documented cost - shipped builds leave it off.
+echo "[gate] Build browserwasm app (UI automation mapping enabled for the smokes)"
+"${DOTNET_BIN}" build "${PROJECT}" -c "${CONFIGURATION}" -f net10.0-browserwasm --no-restore -v minimal \
+  -p:IsUiAutomationMappingEnabled=true
 
 # Stage Debug HotReload browser module when build leaves it only under obj/.
 HOTRELOAD_MODULE_NAME="Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js"
diff --git a/scripts/gates/wasm-focus-boundary-smoke.mjs b/scripts/gates/wasm-focus-boundary-smoke.mjs
index d7d51e3c2..5953133d2 100644
--- a/scripts/gates/wasm-focus-boundary-smoke.mjs
+++ b/scripts/gates/wasm-focus-boundary-smoke.mjs
@@ -88,14 +88,17 @@ async function revealGamepadDiagnosticsSection(page) {
     // toggle (or the nearest ExpanderToggleButton whose text mentions gamepad).
     const togglePoint = await page.evaluate(() => {
       const normalize = value => (value ?? "").replace(/\s+/g, " ").trim().toLowerCase();
-      const start = document.querySelector('[aria-label="Diagnostics.GamepadStart"]');
+      // Fallback rectangle scanner: match the id contract, not the name. These buttons carry no
+      // AutomationProperties.Name, so their aria-label only *coincidentally* equals the automation
+      // id (the nameless fallback); xamlautomationid keeps working whether or not a name is added.
+      const start = document.querySelector('[xamlautomationid="Diagnostics.GamepadStart"]');
       const expander =
         start?.closest(".uno-expander")
         ?? start?.closest("[class*='Expander']")
         ?? start?.closest("details")
         ?? null;
       const ownedToggle =
-        expander?.querySelector('[aria-label="ExpanderToggleButton"], button, [role="button"], .uno-expanderheader, summary')
+        expander?.querySelector('[xamlautomationid="ExpanderToggleButton"], button, [role="button"], .uno-expanderheader, summary')
         ?? null;
       if (ownedToggle) {
         const rect = ownedToggle.getBoundingClientRect();
@@ -109,7 +112,7 @@ async function revealGamepadDiagnosticsSection(page) {
       }
 
       const toggles = Array.from(
-        document.querySelectorAll('[aria-label="ExpanderToggleButton"], button, [role="button"], summary'));
+        document.querySelectorAll('[xamlautomationid="ExpanderToggleButton"], button, [role="button"], summary'));
       for (const toggle of toggles) {
         const text = normalize(toggle.textContent);
         if (text.includes("gamepad") || text.includes("手柄") || text.includes("compatibility monitor") || text.includes("兼容性监测")) {
diff --git a/scripts/gates/wasm-gamepad-boundary-smoke.mjs b/scripts/gates/wasm-gamepad-boundary-smoke.mjs
index 6ee8aa774..b6442a1d2 100644
--- a/scripts/gates/wasm-gamepad-boundary-smoke.mjs
+++ b/scripts/gates/wasm-gamepad-boundary-smoke.mjs
@@ -101,7 +101,7 @@ async function verifyNativeBrowserNoDeviceProjection() {
     await refreshGamepadDiagnostics(page, "native BrowserWasm gamepad diagnostics");
     const projection = await expectSupportedNoGamepadProjection(page, "native BrowserWasm gamepad diagnostics");
 
-    await page.mouse.click(projection.startState.x, projection.startState.y);
+    await clickVisibleControl(page, gamepadStart);
     await page.waitForTimeout(350);
     await expectSupportedNoGamepadProjection(page, "native BrowserWasm gamepad diagnostics after monitoring start");
 
@@ -614,7 +614,7 @@ async function waitForControlText(page, options, pattern, label, timeoutMs = 30_
           && Number(style.opacity || "1") > 0;
       };
 
-      const start = document.querySelector('[aria-label="Diagnostics.GamepadStart"]');
+      const start = document.querySelector('[xamlautomationid="Diagnostics.GamepadStart"]');
       const scope =
         start?.closest(".uno-expander")
         ?? start?.closest("[class*='Expander']")
@@ -656,7 +656,9 @@ async function waitForControlText(page, options, pattern, label, timeoutMs = 30_
 }
 
 async function refreshGamepadDiagnostics(page, label) {
-  const refresh = page.locator('[aria-label="Diagnostics.GamepadRefresh"]:visible').first();
+  // Real Playwright click by id contract (xamlautomationid), not by name: this button carries no
+  // AutomationProperties.Name, so its aria-label only coincidentally equals the automation id.
+  const refresh = page.locator('[xamlautomationid="Diagnostics.GamepadRefresh"]:visible').first();
   await refresh.scrollIntoViewIfNeeded({ timeout: 15_000 });
   await refresh.click({ timeout: 15_000 });
   await waitForRefreshCompletion(refresh, label, 15_000);
@@ -717,64 +719,69 @@ async function revealGamepadDiagnosticsSection(page) {
       return;
     }
 
-    // Uno Expander does not reliably expand from synthetic element.click() in
-    // BrowserWasm. Use a real Playwright mouse click on the Gamepad expander
-    // toggle (or the nearest ExpanderToggleButton whose text mentions gamepad).
-    const togglePoint = await page.evaluate(() => {
-      const normalize = value => (value ?? "").replace(/\s+/g, " ").trim().toLowerCase();
-      const start = document.querySelector('[aria-label="Diagnostics.GamepadStart"]');
-      const expander =
-        start?.closest(".uno-expander")
-        ?? start?.closest("[class*='Expander']")
-        ?? start?.closest("details")
-        ?? null;
-      const ownedToggle =
-        expander?.querySelector('[aria-label="ExpanderToggleButton"], button, [role="button"], .uno-expanderheader, summary')
-        ?? null;
-      if (ownedToggle) {
-        const rect = ownedToggle.getBoundingClientRect();
-        if (rect.width > 0 && rect.height > 0) {
-          return {
-            x: rect.left + rect.width / 2,
-            y: rect.top + rect.height / 2,
-            source: "owned-toggle"
-          };
-        }
-      }
-
-      const toggles = Array.from(
-        document.querySelectorAll('[aria-label="ExpanderToggleButton"], button, [role="button"], summary'));
-      for (const toggle of toggles) {
-        const text = normalize(toggle.textContent);
-        if (text.includes("gamepad") || text.includes("手柄") || text.includes("compatibility monitor") || text.includes("兼容性监测")) {
-          const rect = toggle.getBoundingClientRect();
-          if (rect.width > 0 && rect.height > 0
-            && rect.left >= -1
-            && rect.top >= -1
-            && rect.left <= innerWidth
-            && rect.top <= innerHeight) {
+    // The section hides behind an Expander, whose header is a ToggleButton; in the semantic DOM that
+    // maps to a node whose click the peer programs as Toggle, so semantic activation is the primary
+    // route. An earlier DOM-patching harness measured unreliable expansion from synthetic clicks and
+    // fell back to a real Playwright mouse click; that measurement predates the semantic activation
+    // contract, so the mouse click stays only as the fallback until CI confirms the primary route.
+    try {
+      await clickVisibleControl(page, headerTargets);
+    } catch {
+      const togglePoint = await page.evaluate(() => {
+        const normalize = value => (value ?? "").replace(/\s+/g, " ").trim().toLowerCase();
+        const start = document.querySelector('[xamlautomationid="Diagnostics.GamepadStart"]');
+        const expander =
+          start?.closest(".uno-expander")
+          ?? start?.closest("[class*='Expander']")
+          ?? start?.closest("details")
+          ?? null;
+        const ownedToggle =
+          expander?.querySelector('[xamlautomationid="ExpanderToggleButton"], button, [role="button"], .uno-expanderheader, summary')
+          ?? null;
+        if (ownedToggle) {
+          const rect = ownedToggle.getBoundingClientRect();
+          if (rect.width > 0 && rect.height > 0) {
             return {
               x: rect.left + rect.width / 2,
               y: rect.top + rect.height / 2,
-              source: "text-toggle"
+              source: "owned-toggle"
             };
           }
         }
-      }
 
-      return null;
-    });
+        const toggles = Array.from(
+          document.querySelectorAll('[xamlautomationid="ExpanderToggleButton"], button, [role="button"], summary'));
+        for (const toggle of toggles) {
+          const text = normalize(toggle.textContent);
+          if (text.includes("gamepad") || text.includes("手柄") || text.includes("compatibility monitor") || text.includes("兼容性监测")) {
+            const rect = toggle.getBoundingClientRect();
+            if (rect.width > 0 && rect.height > 0
+              && rect.left >= -1
+              && rect.top >= -1
+              && rect.left <= innerWidth
+              && rect.top <= innerHeight) {
+              return {
+                x: rect.left + rect.width / 2,
+                y: rect.top + rect.height / 2,
+                source: "text-toggle"
+              };
+            }
+          }
+        }
+
+        return null;
+      });
 
-    if (togglePoint) {
-      await page.mouse.click(togglePoint.x, togglePoint.y);
-      await page.waitForTimeout(500);
-      const afterToggle = await readControlState(page, gamepadStart);
-      if (afterToggle.found) {
-        return;
+      if (togglePoint) {
+        await page.mouse.click(togglePoint.x, togglePoint.y);
       }
     }
 
-    await scrollToVisibleControl(page, headerTargets);
+    await page.waitForTimeout(500);
+    if ((await readControlState(page, gamepadStart)).found) {
+      return;
+    }
+
     await scrollToVisibleControl(page, gamepadStart);
     await page.mouse.wheel(0, 700);
     await page.waitForTimeout(300);
diff --git a/scripts/gates/wasm-settings-navigation-smoke.mjs b/scripts/gates/wasm-settings-navigation-smoke.mjs
index c5005723f..0f2b7ca26 100644
--- a/scripts/gates/wasm-settings-navigation-smoke.mjs
+++ b/scripts/gates/wasm-settings-navigation-smoke.mjs
@@ -5,32 +5,28 @@ import {
   openApp,
   assertNoFatalConsoleMessages
 } from "./wasm-smoke-lib/browser-app.mjs";
-import {
-  waitForBodyText
-} from "./wasm-smoke-lib/ui-affordances.mjs";
-import {
-  navigateToSettingsSection,
-  clickTopNavigationOverflowTargetUntilBodyText
-} from "./wasm-smoke-lib/settings-shell.mjs";
+import { navigateToSettingsSection } from "./wasm-smoke-lib/settings-shell.mjs";
 
+// Behaviour under test: from a cold start a user can reach the settings shell and, from there, the
+// Diagnostics section - at a window narrow enough that the section list has collapsed behind the
+// overflow affordance, which is where the route is easiest to break.
+//
+// The route is not the assertion. navigateToSettingsSection owns choosing between a visible section
+// entry and the overflow menu, and confirms arrival on the destination's page title rendering. This
+// file used to re-run the viewport change and the overflow click that helper already performed,
+// which made the order of two viewport mutations load-bearing; the narrow window is now simply how
+// this context is created.
 const baseUrl = normalizeBaseUrl(process.argv[2], "wasm-settings-navigation-smoke.mjs");
 const browser = await chromium.launch({ headless: true });
 
 try {
-  const { context, page, fatalConsoleMessages } = await createInstrumentedContext(browser);
+  const { context, page, fatalConsoleMessages } = await createInstrumentedContext(browser, {
+    viewport: { width: 390, height: 844 }
+  });
 
   try {
     await openApp(page, baseUrl);
     await navigateToSettingsSection(
-      page,
-      { labels: ["设置", "Settings"], automationIds: ["SettingsItem"] },
-      /常规|General|外观|Appearance|ACP \/ Agent/,
-      "settings shell");
-
-    await page.setViewportSize({ width: 390, height: 844 });
-    await waitForBodyText(page, /常规|General|外观|Appearance|ACP \/ Agent/, "settings shell at mobile viewport");
-
-    await clickTopNavigationOverflowTargetUntilBodyText(
       page,
       { labels: ["诊断与日志", "Diagnostics & Logs", "Diagnostics"], automationIds: ["SettingsNav.Diagnostics"] },
       /Diagnostics and logs|诊断与日志|Live logs|日志/,
diff --git a/scripts/gates/wasm-smoke-lib/browser-app.mjs b/scripts/gates/wasm-smoke-lib/browser-app.mjs
index 7aaef0525..14925674f 100644
--- a/scripts/gates/wasm-smoke-lib/browser-app.mjs
+++ b/scripts/gates/wasm-smoke-lib/browser-app.mjs
@@ -1,6 +1,294 @@
+// The page-side half of ui-affordances.mjs: the semantic matcher/activator lives here because
+// `page.evaluate` serializes callbacks without their closures, so everything that runs in the
+// page shares this one implementation instead of six drifting copies of the same scan. Injected
+// once per context; the runtime is a pure DOM reader/writer, so it is safe to register before the
+// semantic tree exists.
+const semanticRuntimeScript = `
+(() => {
+  const semanticRoot = () => document.getElementById("uno-semantics-root");
+
+  const describeNode = element => {
+    const ariaState = name => {
+      const value = element.getAttribute(name);
+      return value === "true" ? true : value === "false" ? false : null;
+    };
+    const rect = element.getBoundingClientRect();
+    return {
+      id: element.id,
+      role: element.getAttribute("role") ?? element.tagName.toLowerCase(),
+      automationId: (element.getAttribute("xamlautomationid") ?? "").trim(),
+      aria: (element.getAttribute("aria-label") ?? "").trim(),
+      text: (element.textContent ?? "").trim().slice(0, 160),
+      hidden: element.hidden === true,
+      disabled: element.disabled === true || element.getAttribute("aria-disabled") === "true",
+      checked: ariaState("aria-checked"),
+      selected: ariaState("aria-selected"),
+      expanded: ariaState("aria-expanded"),
+      value: typeof element.value === "string" ? element.value : null,
+      rect: {
+        left: Math.round(rect.left),
+        top: Math.round(rect.top),
+        width: Math.round(rect.width),
+        height: Math.round(rect.height)
+      }
+    };
+  };
+
+  const normalize = value => (value ?? "").trim().toLowerCase();
+
+  const matchNode = input => {
+    const automationIds = (input.automationIds ?? []).map(normalize).filter(Boolean);
+    const labels = (input.labels ?? []).map(normalize).filter(Boolean);
+    const role = (input.role ?? "").trim().toLowerCase();
+    const roleOf = element => (element.getAttribute("role") ?? element.tagName.toLowerCase()).toLowerCase();
+    const nodes = semanticRoot()?.querySelectorAll("[id^='uno-semantics-']");
+    if (!nodes) {
+      return null;
+    }
+
+    let labelMatch = null;
+    for (const element of nodes) {
+      if (element.hidden) {
+        continue;
+      }
+
+      // Optional role pin: a label match must not settle for an inner text node whose
+      // textContent happens to equal the wanted name before the named control's own
+      // aria-label has landed (the hero suggestion cards race exactly that way - the
+      // title TextBlock renders before the button's Name binding resolves).
+      if (role !== "" && roleOf(element) !== role) {
+        continue;
+      }
+
+      // aria-label carries the accessible name, which for nameless controls is the automation id
+      // (the suite relies on that for e.g. StartView.PromptBox); xamlautomationid is the id
+      // proper. Check both against the caller's ids - either hit is authoritative.
+      const automationId = normalize(element.getAttribute("xamlautomationid"));
+      const aria = normalize(element.getAttribute("aria-label"));
+      if (automationIds.length > 0
+        && ((automationId !== "" && automationIds.includes(automationId))
+          || (aria !== "" && automationIds.includes(aria)))) {
+        return element;
+      }
+
+      if (labelMatch === null
+        && labels.length > 0
+        && (labels.includes(aria) || labels.includes(normalize(element.textContent)))) {
+        labelMatch = element;
+      }
+    }
+
+    return labelMatch;
+  };
+
+  const activate = input => {
+    const element = matchNode(input);
+    if (!element) {
+      return { matched: false, activated: false, state: null };
+    }
+
+    const state = describeNode(element);
+    if (state.disabled) {
+      return { matched: true, activated: false, state };
+    }
+
+    // Uno programs the peer action (Invoke / Toggle / Selection / ExpandCollapse) onto each
+    // node's click handler without hit testing, so a programmatic click IS the activation.
+    element.click();
+    return { matched: true, activated: true, state };
+  };
+
+  const findEditable = element => (element.matches("input,textarea")
+    ? element
+    : element.querySelector("input,textarea")) ?? null;
+
+  const setInput = (input, value) => {
+    const element = matchNode(input);
+    if (!element) {
+      return { matched: false, editable: false, disabled: false, state: null };
+    }
+
+    const editable = findEditable(element);
+    if (!editable) {
+      return { matched: true, editable: false, disabled: false, state: describeNode(element) };
+    }
+
+    const state = describeNode(editable);
+    if (state.disabled) {
+      return { matched: true, editable: true, disabled: true, state };
+    }
+
+    editable.focus();
+    editable.value = value;
+    try {
+      editable.setSelectionRange(value.length, value.length);
+    } catch {
+      // Some input types reject selection updates; the value assignment already took.
+    }
+
+    // The semantic input forwards 'input' events to the managed text box (OnTextInput), and
+    // Uno's key handling suppresses native insertion for canvas input - assigning the value and
+    // dispatching the event is the supported path.
+    editable.dispatchEvent(new Event("input", { bubbles: true }));
+    return { matched: true, editable: true, disabled: false, state };
+  };
+
+  const matchComboBoxItem = expectedNames => {
+    // An open ComboBox popup contributes option nodes to the semantic DOM. Options carry no
+    // automation id of their own, so match on the accessible name, falling back to contained
+    // text so item templates with secondary copy still resolve.
+    const names = (expectedNames ?? []).map(normalize).filter(Boolean);
+    const nodes = semanticRoot()?.querySelectorAll("[id^='uno-semantics-'][role='option']");
+    if (!nodes) {
+      return null;
+    }
+
+    for (const element of nodes) {
+      if (element.hidden) {
+        continue;
+      }
+
+      const aria = normalize(element.getAttribute("aria-label"));
+      const text = normalize(element.textContent);
+      if (names.includes(aria) || names.includes(text)) {
+        return element;
+      }
+    }
+
+    for (const element of nodes) {
+      if (element.hidden) {
+        continue;
+      }
+
+      const text = normalize(element.textContent);
+      if (names.some(name => text.includes(name))) {
+        return element;
+      }
+    }
+
+    return null;
+  };
+
+  const comboBoxSelectionText = automationId => {
+    const element = matchNode({ automationIds: [automationId], labels: [] });
+    if (!element) {
+      return null;
+    }
+
+    // Prefer an explicit value mirror (inputs and sliders carry one) over template text, which
+    // can include the caret.
+    return element.value
+      ?? element.getAttribute("aria-label")
+      ?? ((element.textContent ?? "").trim() || null);
+  };
+
+  const focusedSnapshot = () => {
+    const element = document.activeElement;
+    if (!element || element === document.body) {
+      return { visible: false, isBody: true };
+    }
+
+    const rect = element.getBoundingClientRect();
+    const style = getComputedStyle(element);
+    return {
+      tag: element.tagName,
+      text: (element.textContent ?? "").trim().slice(0, 120),
+      aria: element.getAttribute("aria-label") ?? "",
+      automationId: element.getAttribute("xamlautomationid") ?? "",
+      role: element.getAttribute("role") ?? "",
+      visible:
+        rect.width > 0
+        && rect.height > 0
+        && style.display !== "none"
+        && style.visibility !== "hidden"
+        && rect.left < innerWidth
+        && rect.right > 0
+        && rect.top < innerHeight
+        && rect.bottom > 0,
+      isBody: false,
+      rect: {
+        left: Math.round(rect.left),
+        top: Math.round(rect.top),
+        width: Math.round(rect.width),
+        height: Math.round(rect.height)
+      }
+    };
+  };
+
+  const readLocalTextFile = filePath => {
+    const result = { path: filePath, content: null, error: null };
+    try {
+      const fs = globalThis.FS;
+      if (!fs) {
+        result.error = "globalThis.FS unavailable";
+        return result;
+      }
+
+      result.content = fs.readFile(filePath, { encoding: "utf8" });
+      return result;
+    } catch (error) {
+      result.error = error?.message ?? String(error);
+      return result;
+    }
+  };
+
+  const persistenceDebug = input => {
+    const element = matchNode(input.controlOptions);
+    const editable = element ? findEditable(element) : null;
+    const visibleValue = editable?.value
+      ?? element?.getAttribute("aria-valuenow")
+      ?? (element?.textContent ?? "").trim();
+
+    return {
+      visibleValue: element ? visibleValue : null,
+      ...readLocalTextFile(input.path)
+    };
+  };
+
+  const stateWithLegacyPointers = element => {
+    const state = describeNode(element);
+    return {
+      found: true,
+      enabled: !state.disabled,
+      ...state,
+      // Semantic nodes sit at the layout position of their control; the center doubles as a
+      // legacy-style point for the callers that still read one.
+      x: state.rect.left + state.rect.width / 2,
+      y: state.rect.top + state.rect.height / 2
+    };
+  };
+
+  window.__salmoneggSmoke.semantic = {
+    describe: input => {
+      const element = matchNode(input);
+      return element ? stateWithLegacyPointers(element) : null;
+    },
+    activate,
+    setInput,
+    comboBoxItem: expectedNames => {
+      const element = matchComboBoxItem(expectedNames);
+      return element ? { activate: () => element.click(), state: describeNode(element) } : null;
+    },
+    comboBoxSelectionText,
+    focusedSnapshot,
+    readLocalTextFile,
+    persistenceDebug,
+    collectDebug: () => Array.from(semanticRoot()?.querySelectorAll("[id^='uno-semantics-']") ?? [])
+      .map(describeNode)
+      .filter(node => !node.hidden)
+      .slice(0, 200)
+  };
+})();
+`;
+
 export const fatalConsolePattern =
   /ArgumentOutOfRange|NativeDispatcher unhandled exception|NavigationView\.GetItemFromIndex|System\.ArgumentOutOfRangeException|Unhandled exception/i;
 
+// Console output is the only witness when the app never reaches first paint. Keyed off the page so
+// helpers can read it without threading an extra parameter through every smoke script.
+const pageDiagnostics = new WeakMap();
+const recentConsoleLimit = 60;
+
 export const domHelperScript = `
 (() => {
   window.__salmoneggSmoke = {
@@ -59,6 +347,7 @@ export const domHelperScript = `
             element.getAttribute("data-automation-id")
             ?? element.getAttribute("data-automationid")
             ?? element.getAttribute("automationid")
+            ?? element.getAttribute("xamlautomationid")
             ?? "";
 
           return {
@@ -241,18 +530,90 @@ export function normalizeBaseUrl(value, usageName = "wasm smoke") {
 
 export async function openApp(page, baseUrl) {
   await page.goto(baseUrl, { waitUntil: "domcontentloaded", timeout: 60_000 });
+  await enableSemanticDom(page);
   // StartView.Title is a gradient TextBlock; on BrowserWasm it may not project
   // AutomationId into aria-label. Prefer any stable Start shell marker instead.
   // Cold Mono/Uno first paint on aarch64 Debug can exceed 60s after framework download.
-  await page.waitForSelector(
-    [
-      '[aria-label="StartView.Title"]',
-      '[aria-label="StartView.PromptBox"]',
-      '[aria-label="StartView.Suggestion.ReportGuidance"]',
-      '[aria-label="StartView.AgentSelector"]',
-      '[aria-label="MainNavView"]'
-    ].join(", "),
-    { timeout: 180_000 });
+  try {
+    await page.waitForSelector(
+      [
+        '[aria-label="StartView.Title"]',
+        '[aria-label="StartView.PromptBox"]',
+        '[aria-label="StartView.Suggestion.ReportGuidance"]',
+        '[aria-label="StartView.AgentSelector"]',
+        '[aria-label="MainNavView"]'
+      ].join(", "),
+      { timeout: 180_000 });
+  } catch (error) {
+    throw new Error(`${error.message}\n${await describeUnrenderedPage(page)}`, { cause: error });
+  }
+}
+
+// Skia paints into a <canvas>, so the accessibility tree is the only DOM Uno mirrors - and it builds
+// that lazily. Until a screen reader is detected, or the "Enable accessibility" affordance is activated,
+// the body holds only that button plus an "Application content" placeholder and no
+// AutomationProperties.Name reaches the DOM at all, which is why every [aria-label] locator waits
+// forever. Playwright is not a screen reader, so ask for the tree explicitly.
+//
+// The affordance carries role="button" and tabindex="0" but renders empty, so it has no hit box:
+// dispatch the activation on the element instead of letting Playwright aim a real pointer at it.
+// A missing affordance is not a failure - the DOM-rendered heads never had one.
+async function enableSemanticDom(page) {
+  const toggle = page.locator("#uno-enable-accessibility");
+  try {
+    await toggle.waitFor({ state: "attached", timeout: 30_000 });
+  } catch {
+    return;
+  }
+
+  await toggle.evaluate(element => {
+    element.focus();
+    element.click();
+    element.dispatchEvent(new KeyboardEvent("keydown", { key: "Enter", bubbles: true }));
+  });
+}
+
+// A bare selector timeout says only that first paint never happened. Everything that explains why - a
+// runtime abort, a framework asset that 404s, a JS module that failed to load - has already gone by as
+// console output, and assertNoFatalConsoleMessages never runs because openApp threw first. Dump the raw
+// tail here so a boot regression is diagnosable from the gate log alone: the WASM head cannot be built
+// on every contributor machine, so "reproduce it locally" is not available as a fallback.
+async function describeUnrenderedPage(page) {
+  const captured = pageDiagnostics.get(page)
+    ?? { fatalConsoleMessages: [], recentConsoleMessages: [] };
+  const state = await page
+    .evaluate(() => ({
+      url: location.href,
+      title: document.title,
+      readyState: document.readyState,
+      bodyText: (document.body?.innerText ?? "").slice(0, 400),
+      ariaLabels: Array.from(document.querySelectorAll("[aria-label]"))
+        .slice(0, 25)
+        .map(element => element.getAttribute("aria-label")),
+      // Uno's WASM semantic DOM decides per role whether a name becomes aria-label,
+      // aria-labelledby or text content, so an empty aria-label set does not mean the
+      // element is missing. Report what identifying attributes the page actually carries.
+      identifyingAttributes: Array.from(
+        new Set(Array.from(document.querySelectorAll("*"))
+          .flatMap(element => Array.from(element.attributes).map(attribute => attribute.name))
+          .filter(name => name.startsWith("aria-")
+            || name.startsWith("data-")
+            || name === "role"
+            || name === "id"
+            || name === "title")))
+        .sort(),
+      semanticDomSample: (document.body?.outerHTML ?? "").slice(0, 3000)
+    }))
+    .catch(error => ({ evaluateFailed: error.message }));
+
+  return [
+    "--- page state ---",
+    JSON.stringify(state, null, 2),
+    `--- fatal console (${captured.fatalConsoleMessages.length}) ---`,
+    JSON.stringify(captured.fatalConsoleMessages, null, 2),
+    `--- console/pageerror tail (${captured.recentConsoleMessages.length}) ---`,
+    JSON.stringify(captured.recentConsoleMessages, null, 2)
+  ].join("\n");
 }
 
 export async function clearBrowserOriginStorage(browser, targetUrl) {
@@ -290,13 +651,28 @@ export async function createInstrumentedContext(browser, options = {}) {
   const fatalConsoleMessages = [];
   const context = await browser.newContext({
     viewport: options.viewport ?? { width: 1280, height: 900 },
-    deviceScaleFactor: options.deviceScaleFactor ?? 1
+    deviceScaleFactor: options.deviceScaleFactor ?? 1,
+    // Pin the culture. Uno resolves the app language from the browser, and accessible names are
+    // localized by design (AutomationProperties.Name comes from resw), so an unpinned locale forces
+    // every assertion into a multi-language alternation that passes on any one of its branches -
+    // including on the wrong screen. With the locale fixed, a name is a single expected string.
+    locale: options.locale ?? "en-US"
   });
   await context.addInitScript({ content: domHelperScript });
+  await context.addInitScript({ content: semanticRuntimeScript });
   const page = await context.newPage();
 
+  const recentConsoleMessages = [];
+  const remember = entry => {
+    recentConsoleMessages.push(entry);
+    if (recentConsoleMessages.length > recentConsoleLimit) {
+      recentConsoleMessages.shift();
+    }
+  };
+
   page.on("console", message => {
     const text = message.text();
+    remember({ type: message.type(), text });
     if (fatalConsolePattern.test(text)) {
       fatalConsoleMessages.push({ type: message.type(), text });
     }
@@ -304,11 +680,14 @@ export async function createInstrumentedContext(browser, options = {}) {
 
   page.on("pageerror", error => {
     const text = error.stack ?? error.message;
+    remember({ type: "pageerror", text });
     if (fatalConsolePattern.test(text)) {
       fatalConsoleMessages.push({ type: "pageerror", text });
     }
   });
 
+  pageDiagnostics.set(page, { fatalConsoleMessages, recentConsoleMessages });
+
   return {
     context,
     page,
diff --git a/scripts/gates/wasm-smoke-lib/settings-shell.mjs b/scripts/gates/wasm-smoke-lib/settings-shell.mjs
index d07d87ab9..a73b3a7e4 100644
--- a/scripts/gates/wasm-smoke-lib/settings-shell.mjs
+++ b/scripts/gates/wasm-smoke-lib/settings-shell.mjs
@@ -1,12 +1,28 @@
 import {
-  clickVisibleNavigationTarget,
   clickVisibleNavigationTargetUntilBodyText,
+  clickVisibleControl,
   collectVisibleNavigationTargetDebug,
   ensureVisibleNavigationTarget,
-  findVisibleNavigationTargetPoint,
-  waitForBodyText
+  scrollToVisibleControl,
+  waitForBodyText,
+  waitForControlState
 } from "./ui-affordances.mjs";
 
+// Reach a settings section and confirm arrival. Callers name the destination; this function chooses
+// the route - activate the section entry when the list is showing it, otherwise open the overflow
+// affordance first. It used to also resize the window to 390x844 to *force* the overflow route and
+// restore the size in a `finally`, while the settings-navigation smoke performed the same resize and
+// overflow click again; two viewport mutations made the order load-bearing and neither belonged to the
+// behaviour being checked. The caller now owns its viewport.
+//
+// Arrival is confirmed on the destination's own copy rendering: the caller supplies `bodyPattern`,
+// which the smoke authors pin to strings that exist only on that section's page (usually its
+// resw page title). That is the behaviour a user can observe - the content changed to the section
+// they picked. The shell's *selection state* is deliberately not consulted: NavigationViewItem goes
+// through Uno's generic semantic path (addSemanticElement), which publishes neither `aria-selected`
+// nor `aria-current` on Skia WASM, so a predicate waiting for the item to report itself selected is
+// a timeout with extra steps. If Uno starts mirroring selection (its dedicated item factories do),
+// an explicit selection assertion can come back on top of the body check.
 export async function navigateToSettingsSection(page, sectionTarget, bodyPattern, label) {
   const settingsNavigationTarget = {
     labels: ["设置", "Settings"],
@@ -14,88 +30,79 @@ export async function navigateToSettingsSection(page, sectionTarget, bodyPattern
   };
 
   await ensureVisibleNavigationTarget(page, settingsNavigationTarget, {
-    labels: [],
+    labels: ["Toggle sidebar"],
     automationIds: ["TitleBar.ToggleSidebar"]
   });
   await clickVisibleNavigationTargetUntilBodyText(
     page,
     settingsNavigationTarget,
     /常规|General|外观|Appearance|ACP Agent|ACP \/ Agent/,
-    "settings shell",
-    { keyboardFallback: true });
+    "settings shell");
 
-  if (await page.evaluate(findVisibleNavigationTargetPoint, sectionTarget)) {
-    await clickVisibleNavigationTargetUntilBodyText(page, sectionTarget, bodyPattern, label);
-    return;
-  }
-
-  try {
-    await page.setViewportSize({ width: 390, height: 844 });
-    await waitForBodyText(page, /常规|General|外观|Appearance|ACP Agent|ACP \/ Agent/, "settings shell at mobile viewport");
+  if (!await scrollToVisibleControl(page, sectionTarget, 3_000)) {
     await clickTopNavigationOverflow(page);
-    await clickVisibleNavigationTargetUntilBodyText(page, sectionTarget, bodyPattern, label);
-  } finally {
-    await page.setViewportSize({ width: 1280, height: 900 });
+    await waitForControlState(page, sectionTarget, describeTarget(sectionTarget), 10_000);
   }
-}
 
-export async function clickTopNavigationOverflowTargetUntilBodyText(page, targetOptions, pattern, label) {
-  const deadline = Date.now() + 30_000;
-  let lastError;
-
-  while (Date.now() < deadline) {
-    try {
-      await clickTopNavigationOverflow(page);
-      await page.waitForFunction(
-        findVisibleNavigationTargetPoint,
-        targetOptions,
-        { timeout: Math.min(1_500, Math.max(250, deadline - Date.now())) });
-      const point = await page.evaluate(findVisibleNavigationTargetPoint, targetOptions);
-      if (!point) {
-        throw new Error(`Target disappeared before click: ${JSON.stringify(targetOptions)}`);
-      }
+  await clickVisibleNavigationTargetUntilBodyText(page, sectionTarget, bodyPattern, label);
+}
 
-      await page.mouse.click(point.x, point.y);
-      await waitForBodyText(page, pattern, label, Math.min(3_000, Math.max(250, deadline - Date.now())));
-      return;
-    } catch (error) {
-      lastError = error;
-      await page.keyboard.press("Escape").catch(() => {});
-      await page.waitForTimeout(250);
-    }
-  }
+function describeTarget(options) {
+  const ids = options.automationIds ?? [];
+  const labels = options.labels ?? [];
+  return ids.length > 0 ? `automation id '${ids.join("', '")}'` : `label '${labels.join("', '")}'`;
+}
 
-  const candidates = await page.evaluate(collectVisibleNavigationTargetDebug);
-  throw new Error(
-    `Settings overflow menu did not activate target ${JSON.stringify(targetOptions)}. `
-    + `Last error: ${lastError?.message ?? lastError}. Candidates=${JSON.stringify(candidates)}`);
+export async function clickTopNavigationOverflowTargetUntilBodyText(page, targetOptions, pattern, label) {
+  await clickTopNavigationOverflow(page);
+  // The overflow panel expands asynchronously; activation polls for the target in the semantic DOM,
+  // so no separate wait is needed before this.
+  await clickVisibleNavigationTargetUntilBodyText(page, targetOptions, pattern, label);
 }
 
+// Open the top navigation's overflow affordance ("..."). The semantic route matches it by accessible
+// name, which is the contract a screen reader consumes; keying on the Segoe Fluent private-use glyphs
+//  /  or on Uno's internal `.uno-button` class - which the rectangle fallback below still
+// tolerates - promised nothing and remains only as a last resort. The rectangle fallback exists at
+// all because the overflow button is generated from Uno's template rather than by the app: its name
+// is not in our resw, and whether the semantic tree mirrors it at every pane width is not yet proven
+// end to end. Once the semantic route is confirmed on CI, the fallback and the candidate collector
+// behind it can go.
 export async function clickTopNavigationOverflow(page) {
+  const semanticNodes = await page.evaluate(collectVisibleNavigationTargetDebug);
+  const overflowNode = semanticNodes.find(node =>
+    /more|overflow|更多|溢出/i.test((node.aria ?? "").trim())
+    || /more|overflow|更多|溢出/i.test((node.text ?? "").trim()));
+  if (overflowNode?.aria) {
+    await clickVisibleControl(page, { labels: [overflowNode.aria.trim()], automationIds: [] });
+    return;
+  }
+
   await page.waitForFunction(findTopNavigationOverflowPoint, null, { timeout: 30_000 });
   const point = await page.evaluate(findTopNavigationOverflowPoint);
 
   if (!point) {
     const candidates = await page.evaluate(collectTopNavigationButtonCandidateDebug);
-    throw new Error(`Settings overflow button was not visible. Candidates: ${JSON.stringify(candidates)}`);
+    throw new Error(
+      `Settings overflow button was neither in the semantic DOM nor visible as a top button. `
+      + `Semantic nodes: ${JSON.stringify(semanticNodes)}. Button candidates: ${JSON.stringify(candidates)}`);
   }
 
   await page.mouse.click(point.x, point.y);
 }
 
+// Rectangle fallback: find the overflow button the way the old full-DOM scanner did, by its
+// accessible name inside the top strip of the viewport. See the comment on clickTopNavigationOverflow
+// for why this path survives.
 function findTopNavigationOverflowPoint() {
-  const explicitTarget = window.__salmoneggSmoke.collectTopNavigationButtonCandidates().find(candidate =>
-    candidate.text === "\uE10C"
-    || candidate.text === "\uE712"
-    || /more|overflow|ellipsis|更多|溢出|展开/i.test(candidate.aria)
-    || /more|overflow|ellipsis|更多|溢出|展开/i.test(candidate.title));
-  const target = explicitTarget?.element;
+  const target = window.__salmoneggSmoke.collectTopNavigationButtonCandidates().find(candidate =>
+    /^(more|overflow|更多)$/i.test((candidate.aria ?? "").trim())
+    || /^(more|overflow|更多)$/i.test((candidate.title ?? "").trim()))?.element;
   if (!target) {
     return null;
   }
 
-  const clickable = target.closest(".uno-button") ?? target;
-  const rect = clickable.getBoundingClientRect();
+  const rect = target.getBoundingClientRect();
   return {
     x: rect.left + rect.width / 2,
     y: rect.top + rect.height / 2
diff --git a/scripts/gates/wasm-smoke-lib/ui-affordances.mjs b/scripts/gates/wasm-smoke-lib/ui-affordances.mjs
index 9260bff9a..10c7bcb0a 100644
--- a/scripts/gates/wasm-smoke-lib/ui-affordances.mjs
+++ b/scripts/gates/wasm-smoke-lib/ui-affordances.mjs
@@ -1,297 +1,231 @@
-export async function waitForBodyText(page, pattern, label, timeoutMs = 30_000) {
-  // `waitForFunction` confirms the pattern is in body text, then a *separate*
-  // `locator().innerText()` re-reads. Those two reads straddle the LoadAsync
-  // Clear-then-refill window (ObservableCollection Reset momentarily empties
-  // the body), so the re-read can come back empty despite the poll just
-  // succeeding. Retry the whole poll+read cycle until the re-read is stable.
+// Interaction primitives for the Skia WASM smoke gates.
+//
+// Skia paints into a <canvas>, so the only DOM Uno publishes is the semantic tree it mirrors from
+// the automation peers: nodes under `#uno-semantics-root` with id `uno-semantics-<handle>`,
+// `aria-label` from AutomationProperties.Name (localized), `xamlautomationid` from
+// AutomationProperties.AutomationId (stable), and `hidden` whenever Uno considers the control not
+// visible. Uno wires each node's `click` to the peer's Invoke / Toggle / Selection /
+// ExpandCollapse and programs that click without hit testing - so activation needs neither a
+// scroll nor a coordinate, and options/menu items whose `pointer-events` is `none` are still
+// activatable. Text boxes and sliders are real `<input>` elements on their semantic nodes.
+//
+// The matching and activation logic itself lives in the page (`window.__salmoneggSmoke.semantic`,
+// injected by browser-app.mjs), because Playwright's `page.evaluate` serializes the callback body
+// alone - closures over this module do not exist inside the browser. Every helper below is a thin
+// node-side driver over that one runtime, and the exported page-side callbacks delegate to it too.
+//
+// AutomationIds win over labels whenever both are given: the id is stable by contract, the label
+// is whatever the resw says today. Labels remain supported for affordances that have no id of
+// their own, and because TextBlock text flows into semantic nodes without an accessible name.
+//
+// The gate build opts into IsUiAutomationMappingEnabled so ids reach the DOM at all; without it
+// no semantic node carries `xamlautomationid` and only label matching can work.
+
+const defaultTimeoutMs = 30_000;
+
+const notFoundState = Object.freeze({
+  found: false,
+  enabled: false,
+  text: "",
+  aria: "",
+  automationId: "",
+  x: null,
+  y: null
+});
+
+// ---- presence and state ----------------------------------------------------------------------
+
+export async function readControlState(page, options) {
+  const state = await page.evaluate(input => window.__salmoneggSmoke.semantic.describe(input), options);
+  return state ?? notFoundState;
+}
+
+export async function waitForControlState(page, options, label, timeoutMs = defaultTimeoutMs) {
   const deadline = Date.now() + timeoutMs;
-  let lastBodyText = "";
-  while (Date.now() < deadline) {
-    await page.waitForFunction(
-      source => new RegExp(source).test(document.body?.innerText ?? ""),
-      pattern.source,
-      { timeout: Math.min(5_000, Math.max(250, deadline - Date.now())) });
+  let lastState = notFoundState;
 
-    lastBodyText = await page.locator("body").innerText();
-    if (pattern.test(lastBodyText)) {
-      return;
+  while (Date.now() < deadline) {
+    lastState = await readControlState(page, options);
+    if (lastState.found) {
+      return lastState;
     }
 
-    await page.waitForTimeout(100);
+    await page.waitForTimeout(200);
   }
 
-  throw new Error(`Expected ${label} text was not visible. Last body: ${lastBodyText.slice(0, 500)}`);
+  throw new Error(
+    `Timed out waiting for ${label}. Options=${JSON.stringify(options)} `
+    + `Semantic DOM=${JSON.stringify(await collectSemanticDebug(page))}`);
 }
 
-export async function clickVisibleNavigationTargetUntilBodyText(page, options, pattern, label, activationOptions = {}) {
-  const deadline = Date.now() + 30_000;
-  let lastError;
+export async function expectControlEnabledState(page, options, expectedEnabled, label) {
+  const state = await waitForControlState(page, options, label);
+  if (state.enabled !== expectedEnabled) {
+    throw new Error(`Expected ${label} enabled=${expectedEnabled}. State=${JSON.stringify(state)}`);
+  }
+}
 
+// Naming note: this used to scroll - activation needed a hit-testable point, so out-of-viewport
+// controls had to be dragged into one first, and callers distinguished "found" from "scrolled" by
+// return value. Semantic activation has no such requirement, so what remains is waiting for the
+// control to exist. The truthy/falsy return (and never throwing) is kept for the callers that
+// branch on it.
+export async function scrollToVisibleControl(page, options, timeoutMs = defaultTimeoutMs) {
+  const deadline = Date.now() + timeoutMs;
   while (Date.now() < deadline) {
-    try {
-      await clickVisibleNavigationTarget(page, options);
-      await waitForBodyText(page, pattern, label, Math.min(5_000, Math.max(250, deadline - Date.now())));
-      return;
-    } catch (error) {
-      lastError = error;
-      if (activationOptions.keyboardFallback === true) {
-        try {
-          await activateVisibleNavigationTargetByKeyboard(page, options);
-          await waitForBodyText(page, pattern, label, Math.min(5_000, Math.max(250, deadline - Date.now())));
-          return;
-        } catch (fallbackError) {
-          lastError = fallbackError;
-        }
-      }
-
-      await page.waitForTimeout(250);
+    const state = await readControlState(page, options);
+    if (state.found) {
+      return state;
     }
+
+    await page.waitForTimeout(200);
   }
 
-  const bodyText = await page.locator("body").innerText().catch(() => "");
-  const candidates = await page.evaluate(collectVisibleNavigationTargetMatchDebug, options).catch(error => [`debug error: ${error?.message ?? error}`]);
-  throw new Error(
-    `Expected ${label} text was not visible after clicking navigation target. `
-    + `Last error: ${lastError?.message ?? lastError}. Body: ${bodyText.slice(0, 1_000)} `
-    + `Candidates=${JSON.stringify(candidates)}`);
+  return false;
 }
 
-export async function clickVisibleNavigationTarget(page, options) {
-  const point = await page.evaluate(findVisibleNavigationTargetPoint, options);
+export async function scrollToVisibleNavigationTarget(page, options, timeoutMs = defaultTimeoutMs) {
+  return await scrollToVisibleControl(page, options, timeoutMs);
+}
 
-  if (!point) {
-    const candidates = await page.evaluate(collectVisibleNavigationTargetDebug);
-    const labels = options.labels ?? [];
-    const automationIds = options.automationIds ?? [];
-    throw new Error(
-      `No visible navigation item found for labels: ${labels.join(", ")} automationIds: ${automationIds.join(", ")}. `
-      + `Candidates: ${JSON.stringify(candidates)}`);
-  }
+// ---- activation ------------------------------------------------------------------------------
 
-  await page.mouse.click(point.x, point.y);
+async function collectSemanticDebug(page) {
+  return await page.evaluate(() => window.__salmoneggSmoke.semantic.collectDebug());
 }
 
-async function activateVisibleNavigationTargetByKeyboard(page, options) {
-  const focused = await page.evaluate(focusVisibleNavigationTargetInPage, options);
-  if (!focused) {
-    throw new Error(`Navigation target could not be focused for keyboard activation: ${JSON.stringify(options)}`);
-  }
+async function activateWhenReady(page, options, label, timeoutMs) {
+  const deadline = Date.now() + timeoutMs;
+  let lastState = null;
 
-  await page.keyboard.press("Enter");
-}
+  while (Date.now() < deadline) {
+    lastState = await page.evaluate(
+      input => window.__salmoneggSmoke.semantic.activate(input),
+      options);
+    if (lastState?.activated) {
+      return lastState.state;
+    }
 
-export async function ensureVisibleNavigationTarget(page, targetOptions, openerOptions) {
-  if (await page.evaluate(findVisibleNavigationTargetPoint, targetOptions)) {
-    return;
+    await page.waitForTimeout(200);
   }
 
-  await clickVisibleNavigationTarget(page, openerOptions);
-  try {
-    await page.waitForFunction(findVisibleNavigationTargetPoint, targetOptions, { timeout: 3_000 });
-    return;
-  } catch {
+  if (lastState?.matched) {
+    throw new Error(
+      `Control ${label} is disabled and cannot be activated. State=${JSON.stringify(lastState.state)} `
+      + `Semantic DOM=${JSON.stringify(await collectSemanticDebug(page))}`);
   }
 
-  await activateVisibleNavigationTargetByKeyboard(page, openerOptions);
-  try {
-    await page.waitForFunction(findVisibleNavigationTargetPoint, targetOptions, { timeout: 3_000 });
-    return;
-  } catch {
-  }
+  throw new Error(
+    `Control ${label} did not appear in the semantic DOM. Options=${JSON.stringify(options)} `
+    + `Semantic DOM=${JSON.stringify(await collectSemanticDebug(page))}`);
+}
 
-  const clicked = await page.evaluate(clickVisibleNavigationTargetInPage, openerOptions);
-  if (!clicked) {
-    throw new Error(`Navigation opener could not be activated: ${JSON.stringify(openerOptions)}`);
-  }
+export async function clickVisibleControl(page, options) {
+  return await activateWhenReady(page, options, describeTarget(options), defaultTimeoutMs);
+}
 
-  await page.waitForFunction(findVisibleNavigationTargetPoint, targetOptions, { timeout: 30_000 });
+export async function clickVisibleNavigationTarget(page, options) {
+  return await activateWhenReady(page, options, describeTarget(options), defaultTimeoutMs);
 }
 
-function focusVisibleNavigationTargetInPage(input) {
-  const labels = input.labels ?? [];
-  const automationIds = input.automationIds ?? [];
-  const nodes = Array.from(document.querySelectorAll("body *"))
-    .map(element => {
-      const rect = element.getBoundingClientRect();
-      const style = getComputedStyle(element);
-      const text = (element.textContent ?? "").trim();
-      const aria = element.getAttribute("aria-label") ?? "";
-      const automationId =
-        element.getAttribute("data-automation-id")
-        ?? element.getAttribute("data-automationid")
-        ?? element.getAttribute("automationid")
-        ?? "";
-
-      return {
-        element,
-        rect,
-        display: style.display,
-        visibility: style.visibility,
-        automationMatch: automationIds.includes(aria) || automationIds.includes(automationId),
-        textMatch: labels.includes(text) || labels.includes(aria)
-      };
-    })
-    .filter(candidate =>
-      (candidate.automationMatch || candidate.textMatch)
-      && candidate.rect.width > 0
-      && candidate.rect.height > 0
-      && candidate.display !== "none"
-      && candidate.visibility !== "hidden"
-      && candidate.rect.left >= -1
-      && candidate.rect.top >= -1
-      && candidate.rect.left <= innerWidth
-      && candidate.rect.top <= innerHeight);
-
-  nodes.sort((left, right) => {
-    if (left.automationMatch !== right.automationMatch) {
-      return left.automationMatch ? -1 : 1;
-    }
+export async function clickVisibleNavigationTargetUntilBodyText(page, options, pattern, label) {
+  await clickVisibleNavigationTarget(page, options);
+  await waitForBodyText(page, pattern, label);
+}
 
-    return (left.rect.width * left.rect.height) - (right.rect.width * right.rect.height);
-  });
-
-  const target = nodes[0]?.element;
-  const focusable =
-    target?.closest(".uno-navigationviewitem")
-    ?? target?.closest(".uno-button")
-    ?? target?.closest("[role='button']")
-    ?? target?.closest("button")
-    ?? target;
-  if (typeof focusable?.focus !== "function") {
-    return false;
+// Openers are for targets that only exist once something is toggled open (e.g. the sidebar behind
+// TitleBar.ToggleSidebar). Try the target first - most navigation targets are always present - and
+// only spend effort on the opener when it is not.
+export async function ensureVisibleNavigationTarget(page, targetOptions, openerOptions) {
+  if (await scrollToVisibleControl(page, targetOptions, 3_000)) {
+    return;
   }
 
-  focusable.focus();
-  return document.activeElement === focusable || focusable.contains(document.activeElement);
+  await activateWhenReady(page, openerOptions, describeTarget(openerOptions), defaultTimeoutMs);
+  await waitForControlState(page, targetOptions, describeTarget(targetOptions), 30_000);
 }
 
-function clickVisibleNavigationTargetInPage(input) {
-  const labels = input.labels ?? [];
-  const automationIds = input.automationIds ?? [];
-  const nodes = Array.from(document.querySelectorAll("body *"))
-    .map(element => {
-      const rect = element.getBoundingClientRect();
-      const style = getComputedStyle(element);
-      const text = (element.textContent ?? "").trim();
-      const aria = element.getAttribute("aria-label") ?? "";
-      const automationId =
-        element.getAttribute("data-automation-id")
-        ?? element.getAttribute("data-automationid")
-        ?? element.getAttribute("automationid")
-        ?? "";
-
-      return {
-        element,
-        rect,
-        display: style.display,
-        visibility: style.visibility,
-        automationMatch: automationIds.includes(aria) || automationIds.includes(automationId),
-        textMatch: labels.includes(text) || labels.includes(aria)
-      };
-    })
-    .filter(candidate =>
-      (candidate.automationMatch || candidate.textMatch)
-      && candidate.rect.width > 0
-      && candidate.rect.height > 0
-      && candidate.display !== "none"
-      && candidate.visibility !== "hidden"
-      && candidate.rect.left >= -1
-      && candidate.rect.top >= -1
-      && candidate.rect.left <= innerWidth
-      && candidate.rect.top <= innerHeight);
-
-  nodes.sort((left, right) => {
-    if (left.automationMatch !== right.automationMatch) {
-      return left.automationMatch ? -1 : 1;
-    }
+function describeTarget(options) {
+  const ids = options.automationIds ?? [];
+  const labels = options.labels ?? [];
+  return ids.length > 0 ? `automation id '${ids.join("', '")}'` : `label '${labels.join("', '")}'`;
+}
 
-    return (left.rect.width * left.rect.height) - (right.rect.width * right.rect.height);
-  });
-
-  const target = nodes[0]?.element ?? null;
-  const clickable =
-    target?.closest(".uno-navigationviewitem")
-    ?? target?.closest(".uno-button")
-    ?? target?.closest("[role='button']")
-    ?? target?.closest("button")
-    ?? target;
-  if (typeof clickable?.click !== "function") {
-    return false;
-  }
+// ---- text entry ------------------------------------------------------------------------------
 
-  clickable.click();
-  return true;
+// The semantic `<input>` forwards `input` events to the managed text box (OnTextInput), and Uno's
+// key handling suppresses native insertion for canvas input - assigning the value and dispatching
+// the event is the supported path, not a workaround.
+export async function typeIntoAutomationTextBox(page, automationId, value) {
+  const options = { automationIds: [automationId], labels: [] };
+  return await setSemanticInputValue(page, options, value, `text box '${automationId}'`, defaultTimeoutMs);
 }
 
-export async function scrollToVisibleNavigationTarget(page, options) {
-  if (await page.evaluate(findVisibleNavigationTargetPoint, options)) {
-    return;
+export async function typeIntoVisibleTextField(page, options, value, label, timeoutMs = defaultTimeoutMs) {
+  return await setSemanticInputValue(page, options, value, label, timeoutMs);
+}
+
+async function setSemanticInputValue(page, options, value, label, timeoutMs) {
+  const deadline = Date.now() + timeoutMs;
+  let lastResult = null;
+
+  while (Date.now() < deadline) {
+    lastResult = await page.evaluate(
+      input => window.__salmoneggSmoke.semantic.setInput(input.options, input.value),
+      { options, value });
+    if (lastResult?.editable && !lastResult?.disabled) {
+      return lastResult.state;
+    }
+
+    await page.waitForTimeout(200);
   }
 
-  const scrolled = await page.evaluate(input => {
-    const labels = input.labels ?? [];
-    const automationIds = input.automationIds ?? [];
-    const normalize = value => (value ?? "").trim().toLowerCase();
-    const target = Array.from(document.querySelectorAll("body *"))
-      .find(element => {
-        const text = (element.textContent ?? "").trim();
-        const aria = element.getAttribute("aria-label") ?? "";
-        const automationId =
-          element.getAttribute("data-automation-id")
-          ?? element.getAttribute("data-automationid")
-          ?? element.getAttribute("automationid")
-          ?? "";
-        return automationIds.includes(aria)
-          || automationIds.includes(automationId)
-          || labels.map(normalize).includes(normalize(text))
-          || labels.map(normalize).includes(normalize(aria));
-      });
-
-    target?.scrollIntoView({ block: "center", inline: "nearest" });
-    return Boolean(target);
-  }, options);
-
-  if (!scrolled) {
-    return;
+  if (lastResult?.disabled) {
+    throw new Error(
+      `${label} is disabled. State=${JSON.stringify(lastResult.state)} `
+      + `Semantic DOM=${JSON.stringify(await collectSemanticDebug(page))}`);
   }
 
-  await page.waitForFunction(findVisibleNavigationTargetPoint, options, { timeout: 5_000 });
+  throw new Error(
+    `No editable field found for ${label}. Options=${JSON.stringify(options)} `
+    + `Semantic DOM=${JSON.stringify(await collectSemanticDebug(page))}`);
 }
 
-export async function readNumericControlValue(page, controlOptions, label) {
-  const deadline = Date.now() + 30_000;
-  let lastRawValue = null;
+// ---- numeric fields --------------------------------------------------------------------------
+
+function tryParseInteger(value) {
+  const match = String(value ?? "").match(/-?\d+/);
+  return match ? Number.parseInt(match[0], 10) : null;
+}
+
+export async function readNumericControlValue(page, options, label) {
+  const deadline = Date.now() + defaultTimeoutMs;
+  let lastState = notFoundState;
 
   while (Date.now() < deadline) {
-    lastRawValue = await page.evaluate(readControlValueInPage, controlOptions);
-    const parsedValue = tryParseInteger(lastRawValue);
+    lastState = await readControlState(page, options);
+    const parsedValue = tryParseInteger(lastState.value ?? lastState.text);
     if (parsedValue != null) {
       return parsedValue;
     }
 
-    await page.waitForTimeout(100);
+    await page.waitForTimeout(200);
   }
 
-  throw new Error(`Timed out reading ${label}. LastRawValue=${JSON.stringify(lastRawValue)}`);
+  throw new Error(
+    `Timed out reading a numeric value from ${label}. Last state=${JSON.stringify(lastState)} `
+    + `Semantic DOM=${JSON.stringify(await collectSemanticDebug(page))}`);
 }
 
-export async function setNumericControlValue(page, controlOptions, value, label) {
-  const state = await page.evaluate(readEditableControlStateInPage, controlOptions);
-  if (!state?.found || !state?.enabled || !Number.isFinite(state.x) || !Number.isFinite(state.y)) {
-    throw new Error(`Expected editable numeric control for ${label}. State=${JSON.stringify(state)}`);
-  }
-
-  await page.mouse.click(state.x, state.y, { clickCount: 3 });
-  await page.waitForTimeout(100);
-  await page.keyboard.press(process.platform === "darwin" ? "Meta+A" : "Control+A");
-  await page.keyboard.press("Backspace");
-  await page.keyboard.type(String(value));
-  await page.keyboard.press("Tab");
+export async function setNumericControlValue(page, options, value, label) {
+  // The field's value path is the same input event as a text box; blur commits the edit, which the
+  // old keyboard path did by pressing Tab.
+  await setSemanticInputValue(page, options, String(value), label, 10_000);
 
-  let observedValue = null;
   const deadline = Date.now() + 5_000;
+  let observedValue = null;
   while (Date.now() < deadline) {
-    observedValue = await readNumericControlValue(page, controlOptions, `${label} after edit`);
+    observedValue = await readNumericControlValue(page, options, `${label} after edit`);
     if (observedValue === value) {
       return;
     }
@@ -299,33 +233,13 @@ export async function setNumericControlValue(page, controlOptions, value, label)
     await page.waitForTimeout(100);
   }
 
-  if (Number.isFinite(observedValue)) {
-    await page.mouse.click(state.x, state.y);
-    const stepKey = value > observedValue ? "ArrowUp" : "ArrowDown";
-    const stepCount = Math.min(Math.abs(value - observedValue), 120);
-    for (let i = 0; i < stepCount; i += 1) {
-      await page.keyboard.press(stepKey);
-      await page.waitForTimeout(25);
-    }
-
-    await page.keyboard.press("Tab");
-    const stepDeadline = Date.now() + 5_000;
-    while (Date.now() < stepDeadline) {
-      observedValue = await readNumericControlValue(page, controlOptions, `${label} after step edit`);
-      if (observedValue === value) {
-        return;
-      }
-
-      await page.waitForTimeout(100);
-    }
-  }
-
-  if (observedValue !== value) {
-    throw new Error(`Failed to set ${label}. Expected ${value}, got ${observedValue}.`);
-  }
+  throw new Error(
+    `Failed to set ${label}. Expected ${value}, observed ${observedValue}. `
+    + `Semantic DOM=${JSON.stringify(await collectSemanticDebug(page))}`);
 }
 
 export function selectAlternateCacheRetentionValue(currentValue) {
+  // Only contract: return a value different from the current one, whatever it is.
   if (!Number.isFinite(currentValue)) {
     return 7;
   }
@@ -341,554 +255,98 @@ export function selectAlternateCacheRetentionValue(currentValue) {
   return currentValue + 1;
 }
 
-export async function readAppSettingsPersistenceDebug(page, options) {
-  return await page.evaluate(readAppSettingsPersistenceDebugInPage, options);
-}
-
-export async function expectControlDoesNotEscapePage(page, options, stayOnPagePattern) {
-  const beforeUrl = page.url();
-  const state = await readControlState(page, options);
-  if (!state.found || !state.enabled) {
-    return;
-  }
-
-  const point = Number.isFinite(state.x) && Number.isFinite(state.y)
-    ? { x: state.x, y: state.y }
-    : null;
-  if (!point) {
-    throw new Error(`Expected control was not found for escape check: ${JSON.stringify(options)} state=${JSON.stringify(state)}`);
-  }
-
-  await page.mouse.click(point.x, point.y);
-  try {
-    await waitForBodyText(
-      page,
-      /当前平台暂不支持打开本地文件或目录|Opening local files or folders is not supported on this platform/,
-      "unsupported platform dialog",
-      2_000);
-    await dismissDialogIfPresent(page);
-    return;
-  } catch {
-  }
+// ---- toggles ---------------------------------------------------------------------------------
 
-  if (page.url() !== beforeUrl) {
-    throw new Error(`Expected control ${JSON.stringify(options)} to stay on the current page, but url changed to ${page.url()}.`);
-  }
-
-  await waitForBodyText(page, stayOnPagePattern, "data storage page after external open attempt", 5_000);
-}
-
-export async function readControlState(page, options) {
-  return await page.evaluate(readControlEnabledStateInPage, options);
-}
-
-export async function waitForControlState(page, options, label, timeoutMs = 30_000) {
+export async function readToggleSwitchValue(page, options, label, timeoutMs = defaultTimeoutMs) {
   const deadline = Date.now() + timeoutMs;
   let lastState = null;
 
   while (Date.now() < deadline) {
     lastState = await readControlState(page, options);
-    if (lastState?.found) {
-      return lastState;
-    }
-
-    await page.waitForTimeout(100);
-  }
-
-  throw new Error(`Timed out waiting for ${label}. State=${JSON.stringify(lastState)}`);
-}
-
-export async function readToggleSwitchValue(page, controlOptions, label, timeoutMs = 30_000) {
-  const deadline = Date.now() + timeoutMs;
-  let lastState = null;
-
-  while (Date.now() < deadline) {
-    lastState = await page.evaluate(readToggleSwitchStateInPage, controlOptions);
-    if (lastState?.found && typeof lastState.checked === "boolean") {
+    if (lastState.found && typeof lastState.checked === "boolean") {
       return lastState.checked;
     }
 
-    await page.waitForTimeout(100);
+    await page.waitForTimeout(200);
   }
 
-  throw new Error(`Timed out reading toggle ${label}. State=${JSON.stringify(lastState)}`);
+  throw new Error(
+    `Timed out reading toggle ${label}. Last state=${JSON.stringify(lastState)} `
+    + `Semantic DOM=${JSON.stringify(await collectSemanticDebug(page))}`);
 }
 
-export async function setToggleSwitchValue(page, controlOptions, expectedValue, label) {
-  let state = await page.evaluate(readToggleSwitchStateInPage, controlOptions);
-  if (!state?.found || !state?.enabled || typeof state.checked !== "boolean") {
-    throw new Error(`Expected enabled toggle for ${label}. State=${JSON.stringify(state)}`);
+export async function setToggleSwitchValue(page, options, expectedValue, label) {
+  const state = await waitForControlState(page, options, label, 10_000);
+  if (!state.enabled) {
+    throw new Error(`Toggle ${label} is disabled and cannot be toggled. State=${JSON.stringify(state)}`);
   }
 
-  if (state.checked === expectedValue) {
-    return;
-  }
-
-  if (state.hasPointerTarget === false) {
-    await pressToggleSwitchByKeyboard(page, controlOptions, label);
-  } else {
-    if (!Number.isFinite(state.x) || !Number.isFinite(state.y)) {
-      throw new Error(`Toggle ${label} did not expose a clickable point. State=${JSON.stringify(state)}`);
-    }
-
-    await page.mouse.click(state.x, state.y);
+  if (state.checked !== expectedValue) {
+    await activateWhenReady(page, options, label, 10_000);
   }
 
   const deadline = Date.now() + 10_000;
-  let usedKeyboardFallback = state.hasPointerTarget === false;
+  let lastChecked = state.checked;
   while (Date.now() < deadline) {
-    state = await page.evaluate(readToggleSwitchStateInPage, controlOptions);
-    if (state?.found && state.checked === expectedValue) {
+    lastChecked = (await readControlState(page, options)).checked;
+    if (lastChecked === expectedValue) {
       return;
     }
 
-    if (state?.found
-      && state.checked !== expectedValue
-      && state.hasPointerTarget !== false
-      && !usedKeyboardFallback
-      && deadline - Date.now() < 5_000) {
-      usedKeyboardFallback = true;
-      await pressToggleSwitchByKeyboard(page, controlOptions, label);
-    }
-
-    await page.waitForTimeout(100);
+    await page.waitForTimeout(200);
   }
 
-  throw new Error(`Toggle ${label} did not change to ${expectedValue}. State=${JSON.stringify(state)}`);
+  throw new Error(
+    `Toggle ${label} did not change to ${expectedValue}. Last checked=${JSON.stringify(lastChecked)} `
+    + `Semantic DOM=${JSON.stringify(await collectSemanticDebug(page))}`);
 }
 
-export async function expectToggleSwitchValue(page, controlOptions, expectedValue, label) {
-  const actualValue = await readToggleSwitchValue(page, controlOptions, label);
+export async function expectToggleSwitchValue(page, options, expectedValue, label) {
+  const actualValue = await readToggleSwitchValue(page, options, label);
   if (actualValue !== expectedValue) {
     throw new Error(`Expected toggle ${label} to be ${expectedValue}, got ${actualValue}.`);
   }
 }
 
-export async function expectControlEnabledState(page, controlOptions, expectedEnabled, label) {
-  const state = await waitForControlState(page, controlOptions, label);
-  if (state.enabled !== expectedEnabled) {
-    throw new Error(`Expected ${label} enabled=${expectedEnabled}. State=${JSON.stringify(state)}`);
-  }
-}
-
-export async function scrollToVisibleControl(page, options, timeoutMs = 10_000) {
-  const deadline = Date.now() + timeoutMs;
-
-  while (Date.now() < deadline) {
-    if (await page.evaluate(findVisibleControlPoint, options)) {
-      return true;
-    }
-
-    const scrolledToKnownTarget = await page.evaluate(scrollKnownControlCandidateIntoView, options);
-    if (scrolledToKnownTarget) {
-      await page.waitForTimeout(250);
-      if (await page.evaluate(findVisibleControlPoint, options)) {
-        return true;
-      }
-    }
-
-    const scrolledContainer = await page.evaluate(scrollNearestScrollableContainerDown);
-    await page.waitForTimeout(250);
-  }
-
-  return Boolean(await page.evaluate(findVisibleControlPoint, options));
-}
-
-function scrollKnownControlCandidateIntoView(input) {
-  const labels = input.labels ?? [];
-  const automationIds = input.automationIds ?? [];
-  const normalize = value => (value ?? "").trim().toLowerCase();
-  const normalizedLabels = labels.map(normalize).filter(Boolean);
-  const normalizedAutomationIds = automationIds.map(normalize).filter(Boolean);
-  const target = Array.from(document.querySelectorAll("body *"))
-    .find(element => {
-      const text = (element.textContent ?? "").trim();
-      const aria = element.getAttribute("aria-label") ?? "";
-      const automationId =
-        element.getAttribute("data-automation-id")
-        ?? element.getAttribute("data-automationid")
-        ?? element.getAttribute("automationid")
-        ?? "";
-      return normalizedAutomationIds.includes(normalize(aria))
-        || normalizedAutomationIds.includes(normalize(automationId))
-        || normalizedLabels.includes(normalize(text))
-        || normalizedLabels.includes(normalize(aria));
-    });
-
-  target?.scrollIntoView({ block: "center", inline: "nearest" });
-  return Boolean(target);
-}
-
-function scrollNearestScrollableContainerDown() {
-  const scrollableCandidates = Array.from(document.querySelectorAll("body *"))
-    .map(element => {
-      const rect = element.getBoundingClientRect();
-      const style = getComputedStyle(element);
-      return {
-        element,
-        rect,
-        overflowY: style.overflowY,
-        canScroll: element.scrollHeight > element.clientHeight + 4,
-        remaining: element.scrollHeight - element.clientHeight - element.scrollTop
-      };
-    })
-    .filter(candidate =>
-      candidate.canScroll
-      && candidate.remaining > 2
-      && candidate.rect.width > 0
-      && candidate.rect.height > 0
-      && candidate.rect.left < innerWidth
-      && candidate.rect.right > 0
-      && candidate.rect.top < innerHeight
-      && candidate.rect.bottom > 0
-      && candidate.overflowY !== "hidden"
-      && candidate.overflowY !== "clip")
-    .sort((left, right) => {
-      const leftArea = left.rect.width * left.rect.height;
-      const rightArea = right.rect.width * right.rect.height;
-      return rightArea - leftArea;
-    });
-
-  const target = scrollableCandidates[0]?.element;
-  if (target) {
-    target.scrollTop = Math.min(target.scrollTop + Math.max(320, Math.floor(target.clientHeight * 0.75)), target.scrollHeight);
-    return true;
-  }
-
-  const beforeY = window.scrollY;
-  window.scrollBy({ top: Math.max(320, Math.floor(innerHeight * 0.75)), left: 0, behavior: "instant" });
-  return window.scrollY !== beforeY;
-}
-
-export async function clickVisibleControl(page, options) {
-  const point = await page.evaluate(findVisibleControlPoint, options)
-    ?? await page.evaluate(findStartComposerSelectorFallbackPoint, options);
-  if (!point) {
-    const debug = {
-      interactive: await page.evaluate(collectVisibleInteractiveDebug),
-      comboBoxes: await page.evaluate(collectVisibleComboBoxDebug),
-      navigation: await page.evaluate(collectVisibleNavigationTargetDebug)
-    };
-    throw new Error(`No visible control found for ${JSON.stringify(options)}. Candidates=${JSON.stringify(debug)}`);
-  }
-
-  await page.mouse.click(point.x, point.y);
-}
-
-export async function typeIntoAutomationTextBox(page, automationId, value) {
-  const point = await page.evaluate(findVisibleControlPoint, { labels: [], automationIds: [automationId] });
-  if (!point) {
-    const inputs = await page.evaluate(collectVisibleTextInputPoints);
-    throw new Error(`No visible text box found for automation id '${automationId}'. Inputs=${JSON.stringify(inputs)}`);
-  }
-
-  await page.mouse.click(point.x, point.y);
-  await page.keyboard.press(process.platform === "darwin" ? "Meta+A" : "Control+A");
-  await page.keyboard.type(value);
-}
-
-export async function typeIntoVisibleTextField(page, options, value, label, timeoutMs = 10_000) {
-  const deadline = Date.now() + timeoutMs;
-  let point = null;
-
-  while (Date.now() < deadline) {
-    point = await page.evaluate(findVisibleTextInputPoint, options)
-      ?? await page.evaluate(findVisibleControlPoint, options);
-    if (point) {
-      break;
-    }
-
-    await page.waitForTimeout(100);
-  }
-
-  if (!point) {
-    const inputs = await page.evaluate(collectVisibleTextInputPoints);
-    throw new Error(`No visible text field found for ${label}. Options=${JSON.stringify(options)} Inputs=${JSON.stringify(inputs)}`);
-  }
-
-  await typeIntoField(page, point, value);
-}
+// ---- combo boxes -----------------------------------------------------------------------------
 
+// Expand-collapse and selection are both semantic clicks; the selector's accessible name tracks
+// the selected value, which is the verification. No keyboard choreography: the semantic layer
+// already programs Enter/Space/Escape onto the nodes.
 export async function selectComboBoxItem(page, selectorAutomationId, expectedVisibleName, options = {}) {
-  const expectedVisibleNames = Array.isArray(expectedVisibleName)
+  const expectedNames = Array.isArray(expectedVisibleName)
     ? expectedVisibleName
     : [expectedVisibleName];
-  const deadline = Date.now() + 30_000;
-  let lastError;
-
-  while (Date.now() < deadline) {
-    const controlPoint = await findComboBoxControlPoint(page, selectorAutomationId);
-    if (!controlPoint) {
-      const debug = {
-        comboBoxes: await page.evaluate(collectVisibleComboBoxDebug),
-        navigation: await page.evaluate(collectVisibleNavigationTargetDebug)
-      };
-      throw new Error(`No visible ComboBox found for '${selectorAutomationId}'. Debug=${JSON.stringify(debug)}`);
-    }
-
-    await page.mouse.click(controlPoint.x, controlPoint.y);
-    try {
-      await page.waitForFunction(
-        input => {
-          const expectedNames = input.expectedVisibleNames ?? [];
-          return window.__salmoneggSmoke.collectVisibleComboBoxItems()
-            .some(item => expectedNames.some(name => item.text === name || item.text.includes(name)));
-        },
-        { expectedVisibleNames },
-        { timeout: Math.min(3_000, Math.max(250, deadline - Date.now())) });
-      break;
-    } catch (error) {
-      lastError = error;
-      await page.keyboard.press("Escape").catch(() => {});
-      await page.waitForTimeout(500);
-    }
-  }
-
-  if (!await page.evaluate(
-    input => window.__salmoneggSmoke.collectVisibleComboBoxItems()
-      .some(item => input.expectedVisibleNames.some(name => item.text === name || item.text.includes(name))),
-    { expectedVisibleNames })) {
-    const debug = {
-      body: (await page.locator("body").innerText().catch(() => "")).slice(0, 2_000),
-      comboBoxes: await page.evaluate(collectVisibleComboBoxDebug),
-      navigation: await page.evaluate(collectVisibleNavigationTargetDebug)
-    };
-    throw new Error(
-      `ComboBox '${selectorAutomationId}' did not expose any item from ${JSON.stringify(expectedVisibleNames)}. `
-      + `Debug=${JSON.stringify(debug)} Cause=${lastError?.message ?? lastError}`);
-  }
-
-  if (options.keyboardSelectVisibleItem === true) {
-    const itemIndex = await page.evaluate(findVisibleComboBoxItemIndexByNames, expectedVisibleNames);
-    if (itemIndex < 0) {
-      throw new Error(`ComboBox '${selectorAutomationId}' items ${JSON.stringify(expectedVisibleNames)} disappeared before keyboard selection.`);
-    }
-
-    await commitVisibleComboBoxItemWithKeyboard(page, itemIndex);
-    if (options.verifySelectionText !== false
-      && !await waitForComboBoxSelectionText(page, selectorAutomationId, expectedVisibleNames, 3_000)) {
-      await selectComboBoxItemWithMouseFallback(page, selectorAutomationId, expectedVisibleNames);
-    }
-  } else {
-    const point = await page.evaluate(findVisibleComboBoxItemPointByNames, expectedVisibleNames);
-    if (!point) {
-      throw new Error(`ComboBox '${selectorAutomationId}' items ${JSON.stringify(expectedVisibleNames)} disappeared before mouse selection.`);
-    }
-
-    await page.mouse.click(point.x, point.y);
-  }
-
-  if (options.verifySelectionText === false) {
-    if (options.ensureSelectionWithFallback === true) {
-      await selectComboBoxItemWithLocatorFallback(page, selectorAutomationId, expectedVisibleNames);
-    }
-
-    return;
-  }
-
-  if (!await waitForComboBoxSelectionText(page, selectorAutomationId, expectedVisibleNames, 10_000)) {
-    await selectComboBoxItemWithLocatorFallback(page, selectorAutomationId, expectedVisibleNames);
-  }
-
-  if (!await waitForComboBoxSelectionText(page, selectorAutomationId, expectedVisibleNames, 2_000)) {
-    await selectComboBoxItemWithKeyboardFallback(page, selectorAutomationId, expectedVisibleNames);
-  }
-
-  if (!await waitForComboBoxSelectionText(page, selectorAutomationId, expectedVisibleNames, 5_000)) {
-    const debug = {
-      body: (await page.locator("body").innerText().catch(() => "")).slice(0, 2_000),
-      comboBoxes: await page.evaluate(collectVisibleComboBoxDebug),
-      selectedText: await page.evaluate(readComboBoxSelectionTextInPage, selectorAutomationId),
-      interactive: await page.evaluate(collectVisibleInteractiveDebug)
-    };
-    throw new Error(
-      `ComboBox '${selectorAutomationId}' did not show selected item ${JSON.stringify(expectedVisibleNames)}. `
-      + `Debug=${JSON.stringify(debug)}`);
-  }
-}
-
-async function findComboBoxControlPoint(page, selectorAutomationId) {
-  return await page.evaluate(findVisibleControlPoint, { labels: [], automationIds: [selectorAutomationId] })
-    ?? await page.evaluate(findStartComposerSelectorFallbackPoint, { labels: [], automationIds: [selectorAutomationId] })
-    ?? await page.evaluate(findVisibleComboBoxControlPointBySelectorFallback, selectorAutomationId);
-}
-
-async function selectComboBoxItemWithLocatorFallback(page, selectorAutomationId, expectedVisibleNames) {
-  const controlPoint = await findComboBoxControlPoint(page, selectorAutomationId);
-  if (!controlPoint) {
-    return;
-  }
-
-  await page.mouse.click(controlPoint.x, controlPoint.y);
-  for (const expectedName of expectedVisibleNames) {
-    const item = page.locator(".uno-comboboxitem:visible", { hasText: expectedName }).last();
-    try {
-      await item.click({ timeout: 3_000, force: true });
-      return;
-    } catch {
-    }
-
-    const text = page.getByText(expectedName, { exact: true }).last();
-    try {
-      await text.click({ timeout: 3_000, force: true });
-      return;
-    } catch {
-    }
-  }
-}
+  const label = `combo box '${selectorAutomationId}'`;
 
-async function selectComboBoxItemWithMouseFallback(page, selectorAutomationId, expectedVisibleNames) {
-  const controlPoint = await findComboBoxControlPoint(page, selectorAutomationId);
-  if (!controlPoint) {
-    return;
-  }
-
-  await page.mouse.click(controlPoint.x, controlPoint.y);
-  await page.waitForFunction(
-    input => window.__salmoneggSmoke.collectVisibleComboBoxItems()
-      .some(item => input.expectedVisibleNames.some(name => item.text === name || item.text.includes(name))),
-    { expectedVisibleNames },
-    { timeout: 3_000 }).catch(() => {});
-  const point = await page.evaluate(findVisibleComboBoxItemPointByNames, expectedVisibleNames);
-  if (point) {
-    await page.mouse.click(point.x, point.y);
-  }
-}
-
-async function selectComboBoxItemWithKeyboardFallback(page, selectorAutomationId, expectedVisibleNames) {
-  const controlPoint = await findComboBoxControlPoint(page, selectorAutomationId);
-  if (!controlPoint) {
-    return;
-  }
-
-  await page.mouse.click(controlPoint.x, controlPoint.y);
-  await page.waitForFunction(
-    input => window.__salmoneggSmoke.collectVisibleComboBoxItems()
-      .some(item => input.expectedVisibleNames.some(name => item.text === name || item.text.includes(name))),
-    { expectedVisibleNames },
-    { timeout: 3_000 }).catch(() => {});
-
-  const itemIndex = await page.evaluate(findVisibleComboBoxItemIndexByNames, expectedVisibleNames);
-  if (itemIndex < 0) {
-    await page.keyboard.press("Escape").catch(() => {});
-    return;
-  }
-
-  await commitVisibleComboBoxItemWithKeyboard(page, itemIndex);
-}
-
-async function commitVisibleComboBoxItemWithKeyboard(page, itemIndex) {
-  await page.keyboard.press("Home");
-  for (let index = 0; index < itemIndex; index += 1) {
-    await page.keyboard.press("ArrowDown");
-  }
-
-  for (const key of ["Enter", "Enter", "Space"]) {
-    await page.keyboard.press(key);
-    if (await waitForVisibleComboBoxItemsClosed(page, 1_000)) {
-      await page.waitForTimeout(100);
-      return;
-    }
-  }
-}
-
-async function waitForComboBoxSelectionText(page, selectorAutomationId, expectedVisibleNames, timeoutMs) {
-  const deadline = Date.now() + timeoutMs;
-  while (Date.now() < deadline) {
-    const selectedText = await page.evaluate(readComboBoxSelectionTextInPage, selectorAutomationId);
-    if (typeof selectedText === "string" && expectedVisibleNames.some(name => selectedText.includes(name))) {
-      return true;
-    }
-
-    await page.waitForTimeout(100);
-  }
-
-  return false;
-}
-
-async function waitForVisibleComboBoxItemsClosed(page, timeoutMs) {
-  const deadline = Date.now() + timeoutMs;
-  while (Date.now() < deadline) {
-    const visibleItems = await page.evaluate(() => window.__salmoneggSmoke.collectVisibleComboBoxItems().length);
-    if (visibleItems === 0) {
-      return true;
-    }
-
-    await page.waitForTimeout(100);
-  }
-
-  return false;
-}
-
-export async function selectComboBoxItemByIndex(
-  page,
-  selectorAutomationId,
-  itemIndex,
-  expectedVisibleNames,
-  options = {}) {
-  const deadline = Date.now() + 30_000;
-  let lastError;
-  let selected = false;
+  await activateWhenReady(page, { automationIds: [selectorAutomationId], labels: [] }, label, defaultTimeoutMs);
 
+  const deadline = Date.now() + 10_000;
+  let itemState = null;
   while (Date.now() < deadline) {
-    const controlPoint = await page.evaluate(findVisibleControlPoint, { labels: [], automationIds: [selectorAutomationId] })
-      ?? await page.evaluate(findVisibleComboBoxControlPointBySelectorFallback, selectorAutomationId);
-    if (!controlPoint) {
-      const debug = {
-        comboBoxes: await page.evaluate(collectVisibleComboBoxDebug),
-        navigation: await page.evaluate(collectVisibleNavigationTargetDebug)
-      };
-      throw new Error(`No visible ComboBox found for '${selectorAutomationId}'. Debug=${JSON.stringify(debug)}`);
-    }
-
-    await page.mouse.click(controlPoint.x, controlPoint.y);
-    try {
-      await page.waitForFunction(
-        index => window.__salmoneggSmoke.collectVisibleComboBoxItems().length > index,
-        itemIndex,
-        { timeout: Math.min(3_000, Math.max(250, deadline - Date.now())) });
-      const point = await page.evaluate(findVisibleComboBoxItemPointByIndex, itemIndex);
-      if (!point) {
-        throw new Error(`ComboBox '${selectorAutomationId}' did not expose item index ${itemIndex}.`);
-      }
-
-      await page.mouse.click(point.x, point.y);
-      selected = true;
+    itemState = await page.evaluate(
+      input => window.__salmoneggSmoke.semantic.comboBoxItem(input.expectedNames),
+      { expectedNames });
+    if (itemState) {
       break;
-    } catch (error) {
-      lastError = error;
-      await page.keyboard.press("Escape").catch(() => {});
-      await page.waitForTimeout(500);
     }
-  }
 
-  if (!selected) {
-    throw new Error(
-      `ComboBox '${selectorAutomationId}' did not expose item index ${itemIndex}. `
-      + `Cause=${lastError?.message ?? lastError}`);
+    await page.waitForTimeout(200);
   }
 
-  if (options.verifySelectionText === false) {
-    return;
+  if (!itemState) {
+    throw new Error(
+      `${label} did not expose any item from ${JSON.stringify(expectedNames)} after expanding. `
+      + `Semantic DOM=${JSON.stringify(await collectSemanticDebug(page))}`);
   }
 
-  await expectComboBoxSelectionText(page, selectorAutomationId, expectedVisibleNames, selectorAutomationId);
-}
-
-export async function readComboBoxSelectionText(page, selectorAutomationId, label) {
-  const deadline = Date.now() + 30_000;
-  let lastText = null;
-
-  while (Date.now() < deadline) {
-    lastText = await page.evaluate(readComboBoxSelectionTextInPage, selectorAutomationId);
-    if (typeof lastText === "string" && lastText.trim().length > 0) {
-      return lastText.trim();
-    }
+  await page.evaluate(
+    input => window.__salmoneggSmoke.semantic.comboBoxItem(input.expectedNames)?.activate(),
+    { expectedNames });
 
-    await page.waitForTimeout(100);
+  if (options.verifySelectionText !== false) {
+    await expectComboBoxSelectionText(page, selectorAutomationId, expectedNames, label);
   }
-
-  throw new Error(`Timed out reading ComboBox ${label}. LastText=${JSON.stringify(lastText)}`);
 }
 
 export async function expectComboBoxSelectionText(page, selectorAutomationId, expectedVisibleNames, label) {
@@ -899,90 +357,32 @@ export async function expectComboBoxSelectionText(page, selectorAutomationId, ex
   let observedText = null;
 
   while (Date.now() < deadline) {
-    observedText = await readComboBoxSelectionText(page, selectorAutomationId, label);
-    if (expectedNames.some(name => observedText.includes(name))) {
+    observedText = await readComboBoxSelectionText(page, selectorAutomationId);
+    if (observedText !== null
+      && expectedNames.some(name => observedText.toLowerCase().includes(name.toLowerCase()))) {
       return;
     }
 
-    await page.waitForTimeout(100);
+    await page.waitForTimeout(200);
   }
 
   throw new Error(
-    `ComboBox ${label} did not show one of ${JSON.stringify(expectedNames)}. `
-    + `Observed=${JSON.stringify(observedText)}`);
+    `${label ?? `combo box '${selectorAutomationId}'`} did not show one of ${JSON.stringify(expectedNames)}. `
+    + `Observed=${JSON.stringify(observedText)} `
+    + `Semantic DOM=${JSON.stringify(await collectSemanticDebug(page))}`);
 }
 
-export async function readLocalTextFile(page, path) {
-  return await page.evaluate(readLocalTextFileInPage, path);
+export async function readComboBoxSelectionText(page, selectorAutomationId) {
+  return await page.evaluate(
+    automationId => window.__salmoneggSmoke.semantic.comboBoxSelectionText(automationId),
+    selectorAutomationId);
 }
 
-export async function clickStartComposerSendButton(page) {
-  const point = await page.evaluate(() => {
-    const buttons = Array.from(document.querySelectorAll("button,[role='button'],.uno-button"))
-      .map(element => {
-        const rect = element.getBoundingClientRect();
-        const style = getComputedStyle(element);
-        return {
-          element,
-          rect,
-          text: (element.textContent ?? "").trim(),
-          aria: element.getAttribute("aria-label") ?? "",
-          className: element.className?.toString?.() ?? "",
-          display: style.display,
-          visibility: style.visibility,
-          disabled:
-            element.disabled === true
-            || element.getAttribute("disabled") != null
-            || element.getAttribute("aria-disabled") === "true"
-            || element.className?.toString?.().toLowerCase().includes("disabled")
-        };
-      })
-      .filter(candidate =>
-        candidate.rect.width > 0
-        && candidate.rect.height > 0
-        && candidate.display !== "none"
-        && candidate.visibility !== "hidden"
-        && !candidate.disabled
-        && candidate.rect.top >= innerHeight * 0.75
-        && candidate.rect.left >= 0
-        && candidate.rect.left <= innerWidth
-        && candidate.rect.top <= innerHeight)
-      .sort((left, right) => right.rect.right - left.rect.right);
-
-    const target = buttons[0];
-    if (!target) {
-      return null;
-    }
-
-    return {
-      x: target.rect.left + target.rect.width / 2,
-      y: target.rect.top + target.rect.height / 2
-    };
-  });
-
-  if (!point) {
-    const debug = await page.evaluate(collectVisibleInteractiveDebug);
-    throw new Error(`Start composer send button was not visible. Debug=${JSON.stringify(debug)}`);
-  }
-
-  await page.mouse.click(point.x, point.y);
-}
+// ---- focus -----------------------------------------------------------------------------------
 
 export async function focusVisibleControl(page, options, label) {
-  await scrollToVisibleControl(page, options);
-  const point = await page.evaluate(findVisibleControlPoint, options);
-  if (!point) {
-    const debug = await page.evaluate(collectVisibleInteractiveDebug);
-    throw new Error(`No visible control found to focus for ${label}. Options=${JSON.stringify(options)} Debug=${JSON.stringify(debug)}`);
-  }
-
-  await page.mouse.click(point.x, point.y);
-  const snapshot = await waitForFocusedElementSnapshot(page, `${label} focus`);
-  if (!snapshot.visible || snapshot.isBody) {
-    throw new Error(`Expected visible focused element for ${label}. Snapshot=${JSON.stringify(snapshot)}`);
-  }
-
-  return snapshot;
+  await activateWhenReady(page, options, label, defaultTimeoutMs);
+  return await waitForFocusedElementSnapshot(page, `${label} focus`);
 }
 
 export async function waitForFocusedElementSnapshot(page, label, timeoutMs = 5_000) {
@@ -990,7 +390,7 @@ export async function waitForFocusedElementSnapshot(page, label, timeoutMs = 5_0
   let snapshot = null;
 
   while (Date.now() < deadline) {
-    snapshot = await page.evaluate(readFocusedElementSnapshotInPage);
+    snapshot = await page.evaluate(() => window.__salmoneggSmoke.semantic.focusedSnapshot());
     if (snapshot?.visible && !snapshot?.isBody) {
       return snapshot;
     }
@@ -1001,974 +401,115 @@ export async function waitForFocusedElementSnapshot(page, label, timeoutMs = 5_0
   throw new Error(`Timed out waiting for ${label}. Snapshot=${JSON.stringify(snapshot)}`);
 }
 
-export function findVisibleNavigationTargetPoint(input) {
-  const labels = input.labels ?? [];
-  const automationIds = input.automationIds ?? [];
-  const nodes = Array.from(document.querySelectorAll("body *"))
-    .map(element => {
-      const rect = element.getBoundingClientRect();
-      const style = getComputedStyle(element);
-      const text = (element.textContent ?? "").trim();
-      const aria = element.getAttribute("aria-label") ?? "";
-      const automationId =
-        element.getAttribute("data-automation-id")
-        ?? element.getAttribute("data-automationid")
-        ?? element.getAttribute("automationid")
-        ?? "";
-
-      return {
-        element,
-        rect,
-        text,
-        aria,
-        automationId,
-        display: style.display,
-        visibility: style.visibility,
-        automationMatch: automationIds.includes(aria) || automationIds.includes(automationId),
-        textMatch: labels.includes(text) || labels.includes(aria)
-      };
-    })
-    .filter(candidate =>
-      (candidate.automationMatch || candidate.textMatch)
-      && candidate.rect.width > 0
-      && candidate.rect.height > 0
-      && candidate.display !== "none"
-      && candidate.visibility !== "hidden"
-      && candidate.rect.left >= -1
-      && candidate.rect.top >= -1
-      && candidate.rect.left <= innerWidth
-      && candidate.rect.top <= innerHeight);
-
-  nodes.sort((left, right) => {
-    if (left.automationMatch !== right.automationMatch) {
-      return left.automationMatch ? -1 : 1;
-    }
-
-    return (left.rect.width * left.rect.height) - (right.rect.width * right.rect.height);
-  });
-
-  const target = nodes[0]?.element;
-  if (!target) {
-    return null;
-  }
-
-  const clickable =
-    target.closest(".uno-navigationviewitem")
-    ?? target.closest(".uno-comboboxitem")
-    ?? target.closest(".uno-button")
-    ?? target.closest("[role='button']")
-    ?? target.closest("button")
-    ?? target;
-  const clickableRect = clickable.getBoundingClientRect();
-  const rect = clickableRect.width > 0 && clickableRect.height > 0
-    ? clickableRect
-    : target.getBoundingClientRect();
-
-  return {
-    x: rect.left + rect.width / 2,
-    y: rect.top + rect.height / 2
-  };
-}
-
-export function collectVisibleNavigationTargetDebug() {
-  return Array.from(document.querySelectorAll("body *"))
-    .map(element => {
-      const rect = element.getBoundingClientRect();
-      return {
-        text: (element.textContent ?? "").trim().slice(0, 120),
-        aria: element.getAttribute("aria-label") ?? "",
-        automationId:
-          element.getAttribute("data-automation-id")
-          ?? element.getAttribute("data-automationid")
-          ?? element.getAttribute("automationid")
-          ?? "",
-        role: element.getAttribute("role") ?? "",
-        className: element.className?.toString?.() ?? "",
-        rect: {
-          left: Math.round(rect.left),
-          top: Math.round(rect.top),
-          width: Math.round(rect.width),
-          height: Math.round(rect.height)
-        }
-      };
-    })
-    .filter(candidate =>
-      candidate.rect.width > 0
-      && candidate.rect.height > 0
-      && (candidate.text || candidate.aria || candidate.automationId || candidate.role))
-    .slice(0, 80);
-}
-
-function collectVisibleNavigationTargetMatchDebug(input) {
-  const labels = input.labels ?? [];
-  const automationIds = input.automationIds ?? [];
-  return Array.from(document.querySelectorAll("body *"))
-    .map(element => {
-      const rect = element.getBoundingClientRect();
-      const style = getComputedStyle(element);
-      const text = (element.textContent ?? "").trim();
-      const aria = element.getAttribute("aria-label") ?? "";
-      const automationId =
-        element.getAttribute("data-automation-id")
-        ?? element.getAttribute("data-automationid")
-        ?? element.getAttribute("automationid")
-        ?? "";
-      const clickable =
-        element.closest(".uno-navigationviewitem")
-        ?? element.closest(".uno-comboboxitem")
-        ?? element.closest(".uno-button")
-        ?? element.closest("[role='button']")
-        ?? element.closest("button")
-        ?? element;
-      const clickableRect = clickable.getBoundingClientRect();
-      return {
-        text: text.slice(0, 160),
-        aria,
-        automationId,
-        role: element.getAttribute("role") ?? "",
-        className: element.className?.toString?.() ?? "",
-        rect: {
-          left: Math.round(rect.left),
-          top: Math.round(rect.top),
-          width: Math.round(rect.width),
-          height: Math.round(rect.height)
-        },
-        clickableText: (clickable.textContent ?? "").trim().slice(0, 160),
-        clickableAria: clickable.getAttribute("aria-label") ?? "",
-        clickableRole: clickable.getAttribute("role") ?? "",
-        clickableClassName: clickable.className?.toString?.() ?? "",
-        clickableRect: {
-          left: Math.round(clickableRect.left),
-          top: Math.round(clickableRect.top),
-          width: Math.round(clickableRect.width),
-          height: Math.round(clickableRect.height)
-        },
-        display: style.display,
-        visibility: style.visibility,
-        automationMatch: automationIds.includes(aria) || automationIds.includes(automationId),
-        textMatch: labels.includes(text) || labels.includes(aria)
-      };
-    })
-    .filter(candidate =>
-      (candidate.automationMatch || candidate.textMatch)
-      && candidate.rect.width > 0
-      && candidate.rect.height > 0
-      && candidate.display !== "none"
-      && candidate.visibility !== "hidden"
-      && candidate.rect.left >= -1
-      && candidate.rect.top >= -1
-      && candidate.rect.left <= innerWidth
-      && candidate.rect.top <= innerHeight)
-    .sort((left, right) => {
-      if (left.automationMatch !== right.automationMatch) {
-        return left.automationMatch ? -1 : 1;
-      }
-
-      return (left.rect.width * left.rect.height) - (right.rect.width * right.rect.height);
-    });
-}
-
-export function collectVisibleInteractiveDebug() {
-  return Array.from(document.querySelectorAll("button,input,[role='button'],[role='switch'],[aria-checked],.uno-button,.uno-toggleswitch"))
-    .map(element => {
-      const rect = element.getBoundingClientRect();
-      return {
-        text: (element.textContent ?? "").trim().slice(0, 120),
-        aria: element.getAttribute("aria-label") ?? "",
-        role: element.getAttribute("role") ?? "",
-        checked: element.getAttribute("aria-checked") ?? "",
-        className: element.className?.toString?.() ?? "",
-        rect: {
-          left: Math.round(rect.left),
-          top: Math.round(rect.top),
-          width: Math.round(rect.width),
-          height: Math.round(rect.height)
-        }
-      };
-    })
-    .filter(candidate => candidate.rect.width > 0 && candidate.rect.height > 0)
-    .slice(0, 120);
-}
-
-export function collectVisibleComboBoxDebug() {
-  return Array.from(document.querySelectorAll("body *"))
-    .map(element => {
-      const rect = element.getBoundingClientRect();
-      const style = getComputedStyle(element);
-      const className = element.className?.toString?.() ?? "";
-      return {
-        element,
-        rect,
-        className,
-        role: element.getAttribute("role") ?? "",
-        text: (element.textContent ?? "").trim(),
-        aria: element.getAttribute("aria-label") ?? "",
-        automationId:
-          element.getAttribute("data-automation-id")
-          ?? element.getAttribute("data-automationid")
-          ?? element.getAttribute("automationid")
-          ?? "",
-        display: style.display,
-        visibility: style.visibility
-      };
-    })
-    .filter(candidate =>
-      (candidate.role === "combobox" || candidate.className.toLowerCase().includes("combobox"))
-      && candidate.role !== "option"
-      && !candidate.className.toLowerCase().includes("comboboxitem")
-      && candidate.rect.width > 0
-      && candidate.rect.height > 0
-      && candidate.display !== "none"
-      && candidate.visibility !== "hidden"
-      && candidate.rect.left >= -1
-      && candidate.rect.top >= -1
-      && candidate.rect.left <= innerWidth
-      && candidate.rect.top <= innerHeight)
-    .map(candidate => ({
-      text: candidate.text,
-      aria: candidate.aria,
-      automationId: candidate.automationId,
-      role: candidate.role,
-      className: candidate.className,
-      rect: {
-        left: Math.round(candidate.rect.left),
-        top: Math.round(candidate.rect.top),
-        width: Math.round(candidate.rect.width),
-        height: Math.round(candidate.rect.height)
-      }
-    }))
-    .slice(0, 40);
-}
-
-export function escapeRegExp(value) {
-  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-
-function tryParseInteger(value) {
-  const match = String(value ?? "").match(/-?\d+/);
-  return match ? Number.parseInt(match[0], 10) : null;
-}
-
-async function typeIntoField(page, field, value) {
-  const clickX = Number.isFinite(field.x) ? field.x : field.left + (field.width / 2);
-  const clickY = Number.isFinite(field.y) ? field.y : field.top + (field.height / 2);
-  await page.mouse.click(clickX, clickY);
-  await page.keyboard.press(process.platform === "darwin" ? "Meta+A" : "Control+A");
-  await page.keyboard.type(value);
-  await page.keyboard.press("Tab");
-  await page.waitForTimeout(150);
-}
-
-async function dismissDialogIfPresent(page) {
-  const closeLabels = {
-    labels: ["确定", "OK"],
-    automationIds: []
-  };
+// ---- outbound-click safety -------------------------------------------------------------------
 
-  const point = await page.evaluate(findVisibleNavigationTargetPoint, closeLabels);
-  if (!point) {
+export async function expectControlDoesNotEscapePage(page, options, stayOnPagePattern) {
+  const beforeUrl = page.url();
+  const state = await readControlState(page, options);
+  if (!state.found || !state.enabled) {
     return;
   }
 
-  await page.mouse.click(point.x, point.y);
-  await page.waitForTimeout(300);
-}
-
-async function pressToggleSwitchByKeyboard(page, controlOptions, label) {
-  for (let index = 0; index < 40; index += 1) {
-    if (await page.evaluate(isFocusedControlInPage, controlOptions)) {
-      await page.keyboard.press("Space");
-      return;
-    }
-
-    await page.keyboard.press("Tab");
-    await page.waitForTimeout(50);
-  }
-
-  throw new Error(`Could not focus toggle ${label} by keyboard. Options=${JSON.stringify(controlOptions)}`);
-}
-
-function findVisibleControlPoint(input) {
-  const labels = input.labels ?? [];
-  const automationIds = input.automationIds ?? [];
-  const control = window.__salmoneggSmoke.findVisibleControl(input, labels, automationIds);
-  if (!control) {
-    return null;
-  }
-
-  const inputElement = control.matches("input,textarea")
-    ? control
-    : control.querySelector("input,textarea") ?? control;
-  const rect = inputElement.getBoundingClientRect();
-  const x = rect.left + rect.width / 2;
-  const y = rect.top + rect.height / 2;
-
-  // findVisibleControl admits a control whose top edge is on screen even when its center is not,
-  // so a row straddling the fold yields a point below the viewport. Clicking it silently lands on
-  // nothing: focus never moves and the caller times out waiting for it. Report no point instead,
-  // so scrollToVisibleControl keeps scrolling rather than accepting an unclickable target.
-  if (x < 0 || y < 0 || x > innerWidth || y > innerHeight) {
-    return null;
-  }
-
-  return { x, y };
-}
-
-function isFocusedControlInPage(input) {
-  const activeElement = document.activeElement;
-  if (!activeElement) {
-    return false;
-  }
-
-  const labels = input.labels ?? [];
-  const automationIds = input.automationIds ?? [];
-  const control = window.__salmoneggSmoke.findVisibleControl(input, labels, automationIds);
-  return Boolean(control && (activeElement === control || control.contains(activeElement)));
-}
-
-function findVisibleTextInputPoint(input) {
-  const normalize = value => (value ?? "").trim().toLowerCase();
-  const labels = (input.labels ?? []).map(normalize).filter(Boolean);
-  const automationIds = (input.automationIds ?? []).map(normalize).filter(Boolean);
-  const candidates = Array.from(document.querySelectorAll("input,textarea,[contenteditable='true']"))
-    .map(element => {
-      const rect = element.getBoundingClientRect();
-      const style = getComputedStyle(element);
-      const type = element.getAttribute("type")?.toLowerCase() ?? "";
-      const textBoxContainer = element.closest(".uno-textbox,.uno-passwordbox,.uno-autosuggestbox");
-      return {
-        left: rect.left,
-        top: rect.top,
-        width: rect.width,
-        height: rect.height,
-        containerText: (textBoxContainer?.textContent ?? "").trim(),
-        aria: element.getAttribute("aria-label") ?? "",
-        automationId:
-          element.getAttribute("data-automation-id")
-          ?? element.getAttribute("data-automationid")
-          ?? element.getAttribute("automationid")
-          ?? "",
-        placeholder: element.getAttribute("placeholder") ?? "",
-        visible: rect.width > 0
-          && rect.height > 0
-          && style.display !== "none"
-          && style.visibility !== "hidden"
-          && !["button", "checkbox", "radio", "submit"].includes(type)
-          && rect.left >= 0
-          && rect.top >= 0
-          && rect.left <= innerWidth
-          && rect.top <= innerHeight
-      };
-    })
-    .filter(candidate => candidate.visible)
-    .map(candidate => ({
-      ...candidate,
-      automationMatch:
-        automationIds.includes(normalize(candidate.aria))
-        || automationIds.includes(normalize(candidate.automationId)),
-      textMatch:
-        labels.some(label => normalize(candidate.aria).includes(label))
-        || labels.some(label => normalize(candidate.placeholder).includes(label))
-        || labels.some(label => normalize(candidate.containerText).includes(label))
-    }))
-    .filter(candidate => candidate.automationMatch || candidate.textMatch)
-    .sort((left, right) => {
-      if (left.automationMatch !== right.automationMatch) {
-        return left.automationMatch ? -1 : 1;
-      }
-
-      return (left.top - right.top) || (left.left - right.left);
-    });
-  const target = candidates[0];
-  if (!target) {
-    return null;
-  }
-
-  return {
-    left: target.left,
-    top: target.top,
-    width: target.width,
-    height: target.height
-  };
-}
-
-function findStartComposerSelectorFallbackPoint(input) {
-  const automationIds = input.automationIds ?? [];
-  const selectorIndexByAutomationId = new Map([
-    ["StartView.AgentSelector", 0],
-    ["StartView.ModeSelector", 1],
-    ["StartView.ProjectSelector", 2]
-  ]);
-  const targetAutomationId = automationIds.find(id => selectorIndexByAutomationId.has(id));
-  if (!targetAutomationId) {
-    return null;
-  }
-
-  const comboBoxes = Array.from(document.querySelectorAll("body *"))
-    .map(element => {
-      const rect = element.getBoundingClientRect();
-      const style = getComputedStyle(element);
-      const className = element.className?.toString?.() ?? "";
-      return {
-        element,
-        rect,
-        className,
-        role: element.getAttribute("role") ?? "",
-        display: style.display,
-        visibility: style.visibility
-      };
-    })
-    .filter(candidate =>
-      (candidate.role === "combobox" || candidate.className.toLowerCase().includes("combobox"))
-      && candidate.rect.width > 0
-      && candidate.rect.height > 0
-      && candidate.display !== "none"
-      && candidate.visibility !== "hidden"
-      && candidate.rect.left >= -1
-      && candidate.rect.top >= -1
-      && candidate.rect.left <= innerWidth
-      && candidate.rect.top <= innerHeight
-      && candidate.rect.top > innerHeight * 0.55)
-    .sort((left, right) => (left.rect.top - right.rect.top) || (left.rect.left - right.rect.left));
-  const target = comboBoxes[selectorIndexByAutomationId.get(targetAutomationId)];
-  if (!target) {
-    return null;
-  }
-
-  return {
-    x: target.rect.left + target.rect.width / 2,
-    y: target.rect.top + target.rect.height / 2
-  };
-}
-
-function findVisibleComboBoxItemIndex(expectedVisibleName) {
-  const items = window.__salmoneggSmoke.collectVisibleComboBoxItems();
-  return items.findIndex(item => item.text === expectedVisibleName);
-}
-
-function findVisibleComboBoxItemIndexByNames(expectedVisibleNames) {
-  const items = window.__salmoneggSmoke.collectVisibleComboBoxItems();
-  return items.findIndex(item => expectedVisibleNames.some(name => item.text === name || item.text.includes(name)));
-}
-
-function findVisibleComboBoxItemPointByIndex(itemIndex) {
-  const item = window.__salmoneggSmoke.collectVisibleComboBoxItems()[itemIndex];
-  if (!item) {
-    return null;
+  await clickVisibleControl(page, options);
+  try {
+    await waitForBodyText(
+      page,
+      /当前平台暂不支持打开本地文件或目录|Opening local files or folders is not supported on this platform/,
+      "unsupported platform dialog",
+      2_000);
+    await dismissDialogIfPresent(page);
+    return;
+  } catch {
   }
 
-  const rect = item.clickRect ?? item.rect;
-  return {
-    x: rect.left + rect.width / 2,
-    y: rect.top + rect.height / 2
-  };
-}
-
-function findVisibleComboBoxItemPointByNames(expectedVisibleNames) {
-  const item = window.__salmoneggSmoke.collectVisibleComboBoxItems()
-    .find(candidate => expectedVisibleNames.some(name => candidate.text === name || candidate.text.includes(name)));
-  if (!item) {
-    return null;
+  if (page.url() !== beforeUrl) {
+    throw new Error(`Expected control ${JSON.stringify(options)} to stay on the current page, but url changed to ${page.url()}.`);
   }
 
-  const rect = item.clickRect ?? item.rect;
-  return {
-    x: rect.left + rect.width / 2,
-    y: rect.top + rect.height / 2
-  };
+  await waitForBodyText(page, stayOnPagePattern, "data storage page after external open attempt", 5_000);
 }
 
-function findVisibleComboBoxControlPointBySelectorFallback(selectorAutomationId) {
-  const selectorIndexByAutomationId = new Map([
-    ["StartView.AgentSelector", 0],
-    ["StartView.ModeSelector", 1],
-    ["StartView.ProjectSelector", 2],
-    ["Appearance.Theme", 0],
-    ["Appearance.Backdrop", 1],
-    ["GeneralSettings.Language", 0]
-  ]);
-  const selectorIndex = selectorIndexByAutomationId.get(selectorAutomationId);
-  if (selectorIndex === undefined) {
-    return null;
-  }
-
-  const comboBox = window.__salmoneggSmoke.collectVisibleComboBoxControls()[selectorIndex] ?? null;
-  if (!comboBox) {
-    return null;
+async function dismissDialogIfPresent(page) {
+  // The app's confirmation dialogs ship 确定/OK as their only button; activating a control that is
+  // not there is a no-op after the timeout, so no presence probe is needed first.
+  try {
+    await activateWhenReady(
+      page,
+      { labels: ["确定", "OK"], automationIds: [] },
+      "dialog confirm button",
+      3_000);
+    await page.waitForTimeout(300);
+  } catch {
   }
-
-  return {
-    x: comboBox.rect.left + comboBox.rect.width / 2,
-    y: comboBox.rect.top + comboBox.rect.height / 2
-  };
 }
 
-function readControlEnabledStateInPage(input) {
-  const labels = input.labels ?? [];
-  const automationIds = input.automationIds ?? [];
-  const control = window.__salmoneggSmoke.findVisibleControl(input, labels, automationIds);
-  if (!control) {
-    return { found: false, enabled: false };
-  }
+// ---- misc ------------------------------------------------------------------------------------
 
-  const resolveNearestCompactRoleButtonInline = element => {
-    const candidate = element.closest("[role='button']");
-    if (!candidate) {
-      return null;
-    }
-
-    const rect = candidate.getBoundingClientRect();
-    if (rect.width > 420 || rect.height > 160) {
-      return null;
-    }
-
-    return candidate;
-  };
-  const clickable =
-    control.matches("button,input,[role='switch'],.uno-button,.uno-toggleswitch")
-      ? control
-      : control.closest("button,input,[role='switch'],.uno-button,.uno-toggleswitch")
-        ?? resolveNearestCompactRoleButtonInline(control)
-        ?? control;
-  const clickableStyle = getComputedStyle(clickable);
-  const disabled =
-    clickable.disabled === true
-    || clickable.getAttribute("disabled") != null
-    || clickable.getAttribute("aria-disabled") === "true"
-    || clickable.className?.toString?.().toLowerCase().includes("disabled")
-    || clickableStyle.pointerEvents === "none";
-
-  const rect = clickable.getBoundingClientRect();
-  return {
-    found: true,
-    enabled: !disabled,
-    text: (clickable.textContent ?? "").trim(),
-    aria: clickable.getAttribute("aria-label") ?? "",
-    x: (clickable.className?.toString?.().toLowerCase().includes("toggleswitch")
-      ? window.__salmoneggSmoke.resolveToggleClickPoint(clickable)?.x
-      : rect.left + rect.width / 2) ?? null,
-    y: (clickable.className?.toString?.().toLowerCase().includes("toggleswitch")
-      ? window.__salmoneggSmoke.resolveToggleClickPoint(clickable)?.y
-      : rect.top + rect.height / 2) ?? null,
-    automationId:
-      clickable.getAttribute("data-automation-id")
-      ?? clickable.getAttribute("data-automationid")
-      ?? clickable.getAttribute("automationid")
-      ?? ""
-  };
+// ChatInputArea.Send is the button's AutomationProperties.AutomationId; before the id existed this
+// helper guessed "rightmost enabled button in the bottom quarter", which breaks on any layout change.
+export async function clickStartComposerSendButton(page) {
+  await activateWhenReady(
+    page,
+    { automationIds: ["ChatInputArea.Send"], labels: [] },
+    "start composer send button",
+    defaultTimeoutMs);
 }
 
-function readToggleSwitchStateInPage(input) {
-  const labels = input.labels ?? [];
-  const automationIds = input.automationIds ?? [];
-  const control = window.__salmoneggSmoke.findVisibleControl(input, labels, automationIds);
-  if (!control) {
-    return { found: false, enabled: false, checked: null };
-  }
-
-  const resolveEffectiveOpacityInline = (element, boundary) => {
-    let opacity = 1;
-    for (let current = element; current && current !== document.body; current = current.parentElement) {
-      const style = getComputedStyle(current);
-      if (style.display === "none" || style.visibility === "hidden") {
-        return 0;
-      }
-
-      const parsedOpacity = Number.parseFloat(style.opacity);
-      if (Number.isFinite(parsedOpacity)) {
-        opacity *= parsedOpacity;
-      }
-
-      if (current === boundary) {
-        break;
-      }
-    }
-
-    return opacity;
-  };
-  const resolveVisibleToggleLabelCheckedInline = toggle => {
-    const activeLabels = Array.from(toggle.querySelectorAll("*"))
-      .map(element => ({
-        text: (element.textContent ?? "").trim(),
-        opacity: resolveEffectiveOpacityInline(element, toggle)
-      }))
-      .filter(candidate => candidate.text.length > 0 && candidate.opacity > 0.5);
-
-    const trueLabels = ["On", "Enabled", "开", "启用", "开启", "打开"];
-    const falseLabels = ["Off", "Disabled", "关", "停用", "禁用", "关闭"];
-    if (activeLabels.some(candidate => trueLabels.includes(candidate.text))) {
-      return true;
-    }
-
-    if (activeLabels.some(candidate => falseLabels.includes(candidate.text))) {
-      return false;
-    }
-
-    return null;
-  };
-  const resolveToggleCheckedInline = toggle => {
-    if (typeof toggle.checked === "boolean") {
-      return toggle.checked;
-    }
-
-    const ariaChecked = toggle.getAttribute("aria-checked");
-    if (ariaChecked === "true") {
-      return true;
-    }
-
-    if (ariaChecked === "false") {
-      return false;
-    }
-
-    const descendant = toggle.querySelector("input[type='checkbox'],[aria-checked]");
-    if (!descendant) {
-      return resolveVisibleToggleLabelCheckedInline(toggle);
-    }
-
-    if (typeof descendant.checked === "boolean") {
-      return descendant.checked;
-    }
-
-    const descendantAriaChecked = descendant.getAttribute("aria-checked");
-    if (descendantAriaChecked === "true") {
-      return true;
-    }
-
-    if (descendantAriaChecked === "false") {
-      return false;
-    }
+export async function waitForBodyText(page, pattern, label, timeoutMs = 30_000) {
+  // `waitForFunction` confirms the pattern is in body text, then a *separate*
+  // `locator().innerText()` re-reads. Those two reads straddle the LoadAsync
+  // Clear-then-refill window (ObservableCollection Reset momentarily empties
+  // the body), so the re-read can come back empty despite the poll just
+  // succeeding. Retry the whole poll+read cycle until the re-read is stable.
+  const deadline = Date.now() + timeoutMs;
+  let lastBodyText = "";
+  while (Date.now() < deadline) {
+    await page.waitForFunction(
+      source => new RegExp(source).test(document.body?.innerText ?? ""),
+      pattern.source,
+      { timeout: Math.min(5_000, Math.max(250, deadline - Date.now())) });
 
-    return resolveVisibleToggleLabelCheckedInline(toggle);
-  };
-  const resolveToggleElementInline = controlElement => {
-    const candidates = [
-      controlElement.matches("input[type='checkbox'],[role='switch'],[aria-checked],.uno-toggleswitch") ? controlElement : null,
-      controlElement.closest("input[type='checkbox'],[role='switch'],[aria-checked],.uno-toggleswitch"),
-      controlElement.querySelector("input[type='checkbox'],[role='switch'],[aria-checked],.uno-toggleswitch")
-    ].filter(Boolean);
-
-    return candidates.find(candidate => typeof resolveToggleCheckedInline(candidate) === "boolean")
-      ?? candidates[0]
-      ?? null;
-  };
-  const isDisabledInline = element => {
-    for (let current = element; current && current !== document.body; current = current.parentElement) {
-      if (current.disabled === true
-        || current.getAttribute("disabled") != null
-        || current.getAttribute("aria-disabled") === "true"
-        || /(^|\s)(disabled|is-disabled|uno-disabled)(\s|$)/i.test(current.className?.toString?.() ?? "")) {
-        return true;
-      }
+    lastBodyText = await page.locator("body").innerText();
+    if (pattern.test(lastBodyText)) {
+      return;
     }
 
-    return false;
-  };
-  const hasPointerTargetInline = element => [element, ...element.querySelectorAll("*")]
-    .some(candidate => {
-      const rect = candidate.getBoundingClientRect();
-      const style = getComputedStyle(candidate);
-      return style.pointerEvents !== "none"
-        && style.display !== "none"
-        && style.visibility !== "hidden"
-        && rect.width > 0
-        && rect.height > 0;
-    });
-
-  const toggle = resolveToggleElementInline(control);
-  if (!toggle) {
-    return { found: true, enabled: false, checked: null, text: (control.textContent ?? "").trim() };
-  }
-
-  const disabled = isDisabledInline(toggle);
-  const hasPointerTarget = hasPointerTargetInline(toggle);
-  const rect = toggle.getBoundingClientRect();
-  const point = window.__salmoneggSmoke.resolveToggleClickPoint(toggle)
-    ?? (rect.width > 0 && rect.height > 0
-      ? { x: rect.left + rect.width / 2, y: rect.top + rect.height / 2 }
-      : null);
-
-  return {
-    found: true,
-    enabled: !disabled,
-    hasPointerTarget,
-    checked: resolveToggleCheckedInline(toggle),
-    text: (toggle.textContent ?? "").trim(),
-    aria: toggle.getAttribute("aria-label") ?? "",
-    x: point?.x ?? null,
-    y: point?.y ?? null,
-    automationId:
-      toggle.getAttribute("data-automation-id")
-      ?? toggle.getAttribute("data-automationid")
-      ?? toggle.getAttribute("automationid")
-      ?? ""
-  };
-}
-
-function readControlValueInPage(input) {
-  const labels = input.labels ?? [];
-  const automationIds = input.automationIds ?? [];
-  const control = window.__salmoneggSmoke.findVisibleControl(input, labels, automationIds);
-  if (!control) {
-    return null;
+    await page.waitForTimeout(100);
   }
 
-  const editable = (() => {
-    if (control.matches("input,textarea,[contenteditable='true']")) {
-      return control;
-    }
-
-    let current = control;
-    while (current && current !== document.body) {
-      const editableCandidate = current.querySelector("input,textarea,[contenteditable='true']");
-      if (editableCandidate) {
-        return editableCandidate;
-      }
-
-      current = current.parentElement;
-    }
-
-    return null;
-  })();
-  return editable?.value
-    ?? control.getAttribute("aria-valuenow")
-    ?? editable?.getAttribute("aria-valuenow")
-    ?? (control.textContent ?? "").trim();
+  throw new Error(`Expected ${label} text was not visible. Last body: ${lastBodyText.slice(0, 500)}`);
 }
 
-function readEditableControlStateInPage(input) {
-  const labels = input.labels ?? [];
-  const automationIds = input.automationIds ?? [];
-  const control = window.__salmoneggSmoke.findVisibleControl(input, labels, automationIds);
-  if (!control) {
-    return { found: false, enabled: false };
-  }
-
-  const editable = (() => {
-    if (control.matches("input,textarea,[contenteditable='true']")) {
-      return control;
-    }
-
-    let current = control;
-    while (current && current !== document.body) {
-      const editableCandidate = current.querySelector("input,textarea,[contenteditable='true']");
-      if (editableCandidate) {
-        return editableCandidate;
-      }
-
-      current = current.parentElement;
-    }
-
-    return null;
-  })();
-  if (!editable) {
-    return { found: false, enabled: false };
-  }
-
-  const rect = editable.getBoundingClientRect();
-  const disabled =
-    editable.disabled === true
-    || editable.getAttribute("disabled") != null
-    || editable.getAttribute("aria-disabled") === "true";
-
-  return {
-    found: true,
-    enabled: !disabled,
-    value: editable.value ?? "",
-    x: rect.left + rect.width / 2,
-    y: rect.top + rect.height / 2
-  };
+export async function readAppSettingsPersistenceDebug(page, input) {
+  return await page.evaluate(
+    debugInput => window.__salmoneggSmoke.semantic.persistenceDebug(debugInput),
+    input);
 }
 
-function readComboBoxSelectionTextInPage(selectorAutomationId) {
-  const resolveVisibleComboBoxControlBySelectorFallbackInline = automationId => {
-    const selectorIndexByAutomationId = new Map([
-      ["StartView.AgentSelector", 0],
-      ["StartView.ModeSelector", 1],
-      ["StartView.ProjectSelector", 2],
-      ["Appearance.Theme", 0],
-      ["Appearance.Backdrop", 1],
-      ["GeneralSettings.Language", 0]
-    ]);
-    const selectorIndex = selectorIndexByAutomationId.get(automationId);
-    if (selectorIndex === undefined) {
-      return null;
-    }
-
-    return window.__salmoneggSmoke.collectVisibleComboBoxControls()[selectorIndex] ?? null;
-  };
-
-  const control = window.__salmoneggSmoke.findVisibleControl(
-    { automationIds: [selectorAutomationId] },
-    [],
-    [selectorAutomationId])
-    ?? resolveVisibleComboBoxControlBySelectorFallbackInline(selectorAutomationId)?.element;
-  if (!control) {
-    return null;
-  }
-
-  return (control.textContent ?? "").trim()
-    || control.getAttribute("aria-label")
-    || null;
+export async function readLocalTextFile(page, path) {
+  return await page.evaluate(
+    filePath => window.__salmoneggSmoke.semantic.readLocalTextFile(filePath),
+    path);
 }
 
-function readAppSettingsPersistenceDebugInPage(input) {
-  const controlOptions = input.controlOptions;
-  const path = input.path;
-  const readControlValueInline = controlInput => {
-    const labels = controlInput.labels ?? [];
-    const automationIds = controlInput.automationIds ?? [];
-    const control = window.__salmoneggSmoke.findVisibleControl(controlInput, labels, automationIds);
-    if (!control) {
-      return null;
-    }
+// ---- page-side callbacks (self-contained by contract; passed straight to page.evaluate) -------
 
-    const editable = (() => {
-      if (control.matches("input,textarea,[contenteditable='true']")) {
-        return control;
-      }
-
-      let current = control;
-      while (current && current !== document.body) {
-        const editableCandidate = current.querySelector("input,textarea,[contenteditable='true']");
-        if (editableCandidate) {
-          return editableCandidate;
-        }
-
-        current = current.parentElement;
-      }
-
-      return null;
-    })();
-    return editable?.value
-      ?? control.getAttribute("aria-valuenow")
-      ?? editable?.getAttribute("aria-valuenow")
-      ?? (control.textContent ?? "").trim();
-  };
-  const readLocalTextFileInline = filePath => {
-    const result = {
-      path: filePath,
-      content: null,
-      error: null
-    };
-
-    try {
-      const fs = globalThis.FS;
-      if (!fs) {
-        result.error = "globalThis.FS unavailable";
-        return result;
-      }
-
-      result.content = fs.readFile(filePath, { encoding: "utf8" });
-      return result;
-    } catch (error) {
-      result.error = error?.message ?? String(error);
-      return result;
-    }
-  };
-
-  const appYaml = readLocalTextFileInline(path);
-  return {
-    visibleValue: readControlValueInline(controlOptions),
-    appYaml: appYaml.content,
-    appYamlError: appYaml.error
-  };
+// The semantic DOM is the interactive set; these collectors are what the ACP fixture dumps on
+// failure. Filtering by role keeps each dump readable without hiding the rest behind a second call.
+export function collectVisibleNavigationTargetDebug() {
+  return window.__salmoneggSmoke.semantic.collectDebug();
 }
 
-function readLocalTextFileInPage(filePath) {
-  const result = {
-    path: filePath,
-    content: null,
-    error: null
-  };
-
-  try {
-    const fs = globalThis.FS;
-    if (!fs) {
-      result.error = "globalThis.FS unavailable";
-      return result;
-    }
-
-    result.content = fs.readFile(filePath, { encoding: "utf8" });
-    return result;
-  } catch (error) {
-    result.error = error?.message ?? String(error);
-    return result;
-  }
+export function collectVisibleInteractiveDebug() {
+  return window.__salmoneggSmoke.semantic.collectDebug();
 }
 
-function readFocusedElementSnapshotInPage() {
-  const element = document.activeElement;
-  if (!element) {
-    return null;
-  }
-
-  const rect = element.getBoundingClientRect();
-  const style = getComputedStyle(element);
-  return {
-    tag: element.tagName,
-    text: (element.textContent ?? "").trim().slice(0, 120),
-    aria: element.getAttribute("aria-label") ?? "",
-    automationId:
-      element.getAttribute("data-automation-id")
-      ?? element.getAttribute("data-automationid")
-      ?? element.getAttribute("automationid")
-      ?? "",
-    role: element.getAttribute("role") ?? "",
-    className: element.className?.toString?.() ?? "",
-    visible:
-      rect.width > 0
-      && rect.height > 0
-      && style.display !== "none"
-      && style.visibility !== "hidden"
-      && rect.left < innerWidth
-      && rect.right > 0
-      && rect.top < innerHeight
-      && rect.bottom > 0,
-    isBody: element === document.body,
-    rect: {
-      left: Math.round(rect.left),
-      top: Math.round(rect.top),
-      width: Math.round(rect.width),
-      height: Math.round(rect.height)
-    }
-  };
+export function collectVisibleComboBoxDebug() {
+  return window.__salmoneggSmoke.semantic
+    .collectDebug()
+    .filter(node => ["combobox", "option", "listbox"].includes(node.role));
 }
 
-function collectVisibleTextInputPoints() {
-  return Array.from(document.querySelectorAll("input,textarea,[contenteditable='true']"))
-    .map(element => {
-      const rect = element.getBoundingClientRect();
-      const style = getComputedStyle(element);
-      const type = element.getAttribute("type")?.toLowerCase() ?? "";
-      return {
-        x: rect.left + rect.width / 2,
-        y: rect.top + rect.height / 2,
-        top: rect.top,
-        left: rect.left,
-        width: rect.width,
-        height: rect.height,
-        text: (element.textContent ?? "").trim(),
-        value: element.value ?? "",
-        aria: element.getAttribute("aria-label") ?? "",
-        automationId:
-          element.getAttribute("data-automation-id")
-          ?? element.getAttribute("data-automationid")
-          ?? element.getAttribute("automationid")
-          ?? "",
-        role: element.getAttribute("role") ?? "",
-        type,
-        placeholder: element.getAttribute("placeholder") ?? "",
-        visible: rect.width > 0
-          && rect.height > 0
-          && style.display !== "none"
-          && style.visibility !== "hidden"
-          && !["button", "checkbox", "radio", "submit"].includes(type)
-          && rect.left >= 0
-          && rect.top >= 0
-          && rect.left <= innerWidth
-          && rect.top <= innerHeight
-      };
-    })
-    .filter(candidate => candidate.visible)
-    .sort((left, right) => (left.top - right.top) || (left.left - right.left));
+export function escapeRegExp(value) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
diff --git a/scripts/gates/wasm-start-visibility-smoke.mjs b/scripts/gates/wasm-start-visibility-smoke.mjs
index 046b36dc7..687a12406 100644
--- a/scripts/gates/wasm-start-visibility-smoke.mjs
+++ b/scripts/gates/wasm-start-visibility-smoke.mjs
@@ -5,26 +5,18 @@ import {
   openApp,
   assertNoFatalConsoleMessages
 } from "./wasm-smoke-lib/browser-app.mjs";
+import {
+  waitForBodyText,
+  waitForControlState
+} from "./wasm-smoke-lib/ui-affordances.mjs";
 
 const baseUrl = normalizeBaseUrl(process.argv[2], "wasm-start-visibility-smoke.mjs");
 const browser = await chromium.launch({ headless: true });
 
 const expectedSuggestions = [
-  {
-    automationId: "StartView.Suggestion.ReportGuidance",
-    title: ["举报 AI 内容", "Report AI content"],
-    subtitle: ["右键消息或在“关于”中举报", "Right-click a message or use About"]
-  },
-  {
-    automationId: "StartView.Suggestion.RecommendTasks",
-    title: ["推荐开发任务", "Recommend tasks"],
-    subtitle: ["明确接下来该做什么", "Clarify what to work on next"]
-  },
-  {
-    automationId: "StartView.Suggestion.ResolveErrors",
-    title: ["解决最近报错", "Resolve recent errors"],
-    subtitle: ["提交错误日志让我看看", "Share the error log for analysis"]
-  }
+  { title: ["举报 AI 内容", "Report AI content"] },
+  { title: ["推荐开发任务", "Recommend tasks"] },
+  { title: ["解决最近报错", "Resolve recent errors"] }
 ];
 
 try {
@@ -32,117 +24,38 @@ try {
 
   try {
     await openApp(page, baseUrl);
-    await page.waitForTimeout(500);
-
-    const projection = await page.evaluate(expected => {
-      const normalize = value => (value ?? "").replace(/\u200B/g, "").trim();
-      const parseAlpha = color => {
-        const rgba = color.match(/rgba?\(([^)]+)\)/i);
-        if (!rgba) {
-          return 1;
-        }
-
-        const parts = rgba[1].split(",").map(part => part.trim());
-        return parts.length >= 4 ? Number(parts[3]) : 1;
-      };
-      const isVisible = element => {
-        const style = getComputedStyle(element);
-        const rect = element.getBoundingClientRect();
-        return rect.width > 0
-          && rect.height > 0
-          && style.display !== "none"
-          && style.visibility !== "hidden"
-          && Number(style.opacity || "1") > 0;
-      };
-      const findVisibleText = (root, candidates) => {
-        const normalizedCandidates = candidates.map(normalize);
-        const elements = [root, ...root.querySelectorAll("*")];
-
-        for (const element of elements) {
-          if (!isVisible(element)) {
-            continue;
-          }
-
-          const text = normalize(element.textContent);
-          if (!normalizedCandidates.some(candidate => candidate && text.includes(candidate))) {
-            continue;
-          }
-
-          const style = getComputedStyle(element);
-          const rect = element.getBoundingClientRect();
-          return {
-            text,
-            color: style.color,
-            opacity: Number(style.opacity || "1"),
-            alpha: parseAlpha(style.color),
-            rect: {
-              left: rect.left,
-              top: rect.top,
-              width: rect.width,
-              height: rect.height
-            }
-          };
-        }
-
-        return null;
-      };
-
-      return expected.map(item => {
-        const button = document.querySelector(`[aria-label="${item.automationId}"]`);
-        if (!button) {
-          return {
-            automationId: item.automationId,
-            missing: true
-          };
-        }
-
-        const rect = button.getBoundingClientRect();
-        return {
-          automationId: item.automationId,
-          buttonText: normalize(button.textContent),
-          buttonRect: {
-            left: rect.left,
-            top: rect.top,
-            width: rect.width,
-            height: rect.height
-          },
-          title: findVisibleText(button, item.title),
-          subtitle: findVisibleText(button, item.subtitle)
-        };
-      });
-    }, expectedSuggestions);
-
-    const failures = [];
-    for (const item of projection) {
-      if (item.missing) {
-        failures.push(`${item.automationId} was not rendered.`);
-        continue;
-      }
-
-      if (!item.title) {
-        failures.push(`${item.automationId} did not render a visible title. State=${JSON.stringify(item)}`);
-      }
-
-      if (!item.subtitle) {
-        failures.push(`${item.automationId} did not render a visible subtitle. State=${JSON.stringify(item)}`);
-      } else if (item.subtitle.alpha <= 0.05 || item.subtitle.opacity <= 0.05) {
-        failures.push(`${item.automationId} subtitle resolved transparent text. State=${JSON.stringify(item.subtitle)}`);
-      }
-    }
 
-    if (failures.length > 0) {
-      throw new Error(`Start suggestion visibility failed:\n${failures.join("\n")}`);
+    // Each hero card must be present in the semantic DOM as a button carrying its localized
+    // title as the accessible name - exactly what a screen reader announces. The match is by
+    // name, not by the cards' AutomationId: those ids are x:Bind-fed, and Uno's BrowserWasm
+    // semantic mapping bakes the automation id into the semantic element when the node is
+    // created - before bindings resolve - and never revises it, so the DOM still carries the
+    // button's x:Name fallback (HeroSuggestionButton). Static ids survive that bake; dynamic
+    // ones never show. The accessible name, in contrast, is read live, and Windows UIA reads
+    // the bound id live too, so the ViewModel ids remain valid for real consumers - they are
+    // just unobservable through this tree. This smoke used to additionally assert title/
+    // subtitle alpha and opacity against the pre-6.7 DOM; the semantic tree mirrors
+    // structure, not styling, so visible-here means "present, unhidden, named".
+    // (waitForControlState only reports nodes that are not hidden.)
+    for (const suggestion of expectedSuggestions) {
+      await waitForControlState(
+        page,
+        { labels: suggestion.title, automationIds: [], role: "button" },
+        suggestion.title.join(" / "));
     }
 
-    await page.locator('[aria-label="StartView.Suggestion.ReportGuidance"]').click({ timeout: 10_000 });
-    await page.waitForFunction(
-      () => {
-        const bodyText = (document.body?.innerText ?? "").replace(/\u200B/g, " ");
-        return bodyText.includes("这张提示卡本身只是说明，不会发送举报")
-          || bodyText.includes("This tip card only explains the path and cannot send a report");
-      },
-      null,
-      { timeout: 10_000 });
+    // Activating the report card explains itself instead of sending anything: the tip copy is
+    // the behaviour, and it only exists after the card is activated. The activation is a real
+    // trusted click on the semantic node, not a synthetic element.click(): CI (the role-pin
+    // commit) showed the hero card's command never fires from the semantic activate path - the
+    // same BrowserWasm gap the expander and the gamepad refresh button already documented -
+    // while a trusted click through the same node the screen reader exposes is the closest
+    // thing to the user's gesture.
+    await page.locator('[role="button"][aria-label="Report AI content"]').click({ timeout: 15_000 });
+    await waitForBodyText(
+      page,
+      /这张提示卡本身只是说明，不会发送举报|This tip card only explains the path and cannot send a report/,
+      "report guidance tip");
 
     assertNoFatalConsoleMessages(fatalConsoleMessages);
     console.log("WASM start visibility smoke passed");
diff --git a/src/SalmonEgg.Presentation.Core/ViewModels/Navigation/MainNavigationViewModel.cs b/src/SalmonEgg.Presentation.Core/ViewModels/Navigation/MainNavigationViewModel.cs
index 060d9a8a9..a2778fb7f 100644
--- a/src/SalmonEgg.Presentation.Core/ViewModels/Navigation/MainNavigationViewModel.cs
+++ b/src/SalmonEgg.Presentation.Core/ViewModels/Navigation/MainNavigationViewModel.cs
@@ -65,6 +65,13 @@ public sealed partial class MainNavigationViewModel : ObservableObject, IDisposa
     private int _rebuildPending;
     private int _rebuildScheduled;
 
+    // Structural revision of the menu source the control renders, bumped by every add/move/remove on
+    // Items or on a project's Children. ApplySelectionProjection compares it against the revision it
+    // last published so a selection that survives a reshuffle is still re-pushed once; see the publish
+    // decision there for why the projected instance alone is not a sufficient key.
+    private long _navTreeStructureRevision;
+    private long _publishedNavTreeStructureRevision = -1;
+
     public ObservableCollection<MainNavItemViewModel> Items { get; } = new();
     public ObservableCollection<MainNavItemViewModel> FooterItems { get; } = new();
 
@@ -210,6 +217,7 @@ public MainNavigationViewModel(
         FooterItems.Add(DiscoverSessionsItem);
         FooterItems.Add(SettingsItem);
 
+        Items.CollectionChanged += OnNavTreeStructureChanged;
         Items.Add(StartItem);
         Items.Add(SessionsLabelItem);
         Items.Add(AddProjectItem);
@@ -319,12 +327,29 @@ private void OnLanguageChanged(object? sender, EventArgs e)
 
     private void DisposeItem(object? item)
     {
+        if (item is ProjectNavItemViewModel projectVm)
+        {
+            UnwatchNavTreeStructure(projectVm);
+        }
+
         if (item is IDisposable disposable)
         {
             disposable.Dispose();
         }
     }
 
+    private void WatchNavTreeStructure(ProjectNavItemViewModel projectVm)
+        => projectVm.Children.CollectionChanged += OnNavTreeStructureChanged;
+
+    private void UnwatchNavTreeStructure(ProjectNavItemViewModel projectVm)
+        => projectVm.Children.CollectionChanged -= OnNavTreeStructureChanged;
+
+    // Any add/move/remove changes which container renders which row, so the control's own selection
+    // visual can end up attached to a row that now shows a different session. Record that the menu
+    // source moved; ApplySelectionProjection decides whether a re-push is owed.
+    private void OnNavTreeStructureChanged(object? sender, NotifyCollectionChangedEventArgs e)
+        => _navTreeStructureRevision++;
+
     private void OnConversationCatalogPresenterPropertyChanged(object? sender, PropertyChangedEventArgs e)
     {
         if (e.PropertyName == nameof(IConversationCatalogDisplayReadModel.IsConversationListLoading)
@@ -830,6 +855,7 @@ private void RebuildTreeCore()
                     {
                         IsExpanded = true
                     };
+                    WatchNavTreeStructure(projectVm);
                     _projectVms[projectId] = projectVm;
                 }
                 else
@@ -1262,8 +1288,19 @@ private void ApplySelectionProjection()
             OnPropertyChanged(nameof(IsSettingsSelected));
         }
 
-        if (!ReferenceEquals(previousProjection.ControlSelectedItem, _projection.ControlSelectedItem))
-        {
+        // Two independent reasons to push the control's SelectedItem, and the second is not derivable
+        // from the first. The projected instance is stable across rebuilds on purpose - SyncSessions
+        // reuses the row view models so a realized container is never recycled needlessly - so a
+        // reshuffle, such as inserting a freshly created session at the top of its project, leaves
+        // this projection reference-equal while every container below it now renders a different row.
+        // Keying only on the instance means the control is never told again, and a OneWay binding
+        // gives us no readback to notice. Re-stating the selection once per structural revision keeps
+        // pane toggles and no-op refreshes quiet while still re-pushing against a rebuilt source.
+        var structureMoved = _navTreeStructureRevision != _publishedNavTreeStructureRevision;
+        if (structureMoved
+            || !ReferenceEquals(previousProjection.ControlSelectedItem, _projection.ControlSelectedItem))
+        {
+            _publishedNavTreeStructureRevision = _navTreeStructureRevision;
             OnPropertyChanged(nameof(ProjectedControlSelectedItem));
         }
     }
@@ -1274,6 +1311,22 @@ private bool TryMaterializeSelectedSession()
     private bool TryMaterializeProjectedSession(NavigationSelectionState selection)
         => TryMaterializeSession(NavigationSelectionProjectionPolicy.ResolveSelectionSessionId(selection));
 
+    /// <summary>
+    /// Asks for a rebuild so a catalog-known session that has no nav row yet gains one, and reports
+    /// whether the caller should let that rebuild publish the projection instead of publishing now.
+    /// </summary>
+    /// <remarks>
+    /// Goes through the coalescing scheduler rather than calling <see cref="RebuildTreeCore"/> inline.
+    /// Both callers run inside selection change notifications, and mutating the bound Items/Children
+    /// collections from there re-enters this same path, because <see cref="RebuildTreeCore"/> ends in
+    /// <see cref="NormalizeSelectionAfterRebuild"/>. The scheduler already serialises rebuild requests:
+    /// a request raised while one is running is folded into the pending flag and re-scheduled by
+    /// <see cref="ProcessRebuildTreeRequests"/> when the running pass unwinds.
+    /// Returning true keeps this pass from publishing, because the projection available right now
+    /// resolves the not-yet-materialised session to a null selected item, and pushing that null
+    /// through the binding costs NavigationView its IsChildSelected ancestor visual - the same reason
+    /// <see cref="RebuildTreeCore"/> swaps its indexes atomically instead of clearing them upfront.
+    /// </remarks>
     private bool TryMaterializeSession(string? sessionId)
     {
         if (string.IsNullOrWhiteSpace(sessionId)
@@ -1283,7 +1336,7 @@ private bool TryMaterializeSession(string? sessionId)
             return false;
         }
 
-        RebuildTreeCore();
+        RebuildTree();
         return true;
     }
 
@@ -1366,6 +1419,7 @@ private ProjectNavItemViewModel CreateUnclassifiedProject()
             RootPath = string.Empty
         };
         var vm = new ProjectNavItemViewModel(project, isSystemProject: true, PrepareStartForProjectAsync, _navigationState, _uiDispatcher) { IsExpanded = true };
+        WatchNavTreeStructure(vm);
         _projectIndex[vm.ProjectId] = vm;
         return vm;
     }
diff --git a/tests/SalmonEgg.Presentation.Core.Tests/Navigation/MainNavigationViewModelSelectionTests.cs b/tests/SalmonEgg.Presentation.Core.Tests/Navigation/MainNavigationViewModelSelectionTests.cs
index 7619ece5f..65204a50e 100644
--- a/tests/SalmonEgg.Presentation.Core.Tests/Navigation/MainNavigationViewModelSelectionTests.cs
+++ b/tests/SalmonEgg.Presentation.Core.Tests/Navigation/MainNavigationViewModelSelectionTests.cs
@@ -193,6 +193,154 @@ public void RebuildTree_DoesNotRepublishSelectedItemBinding_WhenNativeMenuSource
         }
     }
 
+    [Fact]
+    public void SessionSelectionWithoutNavRow_SchedulesRebuild_RatherThanMutatingTheBoundTreeInline()
+    {
+        var originalContext = SynchronizationContext.Current;
+        var syncContext = new QueuedSynchronizationContext();
+        SynchronizationContext.SetSynchronizationContext(syncContext);
+        try
+        {
+            var navState = new FakeNavigationPaneState();
+            var preferences = CreatePreferencesWithProject();
+            var chatCatalog = CreateChatSessionCatalog("session-1");
+            var presenter = new MutableConversationCatalogDisplayReadModel();
+            presenter.SetLoading(false);
+            presenter.Refresh(Array.Empty<ConversationCatalogItem>());
+
+            using var navVm = CreateNavigationViewModel(
+                chatCatalog,
+                Mock.Of<ISessionManager>(),
+                preferences,
+                navState,
+                out var selectionStore,
+                out _,
+                presenterOverride: presenter);
+
+            syncContext.DrainAll();
+
+            var stamp = new DateTime(2026, 3, 1, 0, 0, 0, DateTimeKind.Utc);
+            presenter.Refresh(new[]
+            {
+                new ConversationCatalogItem(
+                    "session-1",
+                    "Session 1",
+                    @"C:\repo\demo",
+                    stamp,
+                    stamp,
+                    stamp)
+            });
+
+            // The restore placeholder is itself a session row, so only real rows count here.
+            Assert.Empty(EnumerateRealSessionRows(navVm));
+
+            SetSessionSelection(selectionStore, "session-1");
+
+            // The selection notification may ask for a rebuild but must not perform one: mutating the
+            // bound Items/Children from here re-enters the same path, because RebuildTreeCore ends in
+            // NormalizeSelectionAfterRebuild. The coalescing scheduler owns the mutation instead.
+            Assert.Empty(EnumerateRealSessionRows(navVm));
+
+            syncContext.DrainAll();
+
+            var row = Assert.Single(EnumerateRealSessionRows(navVm));
+            Assert.Equal("session-1", row.SessionId);
+        }
+        finally
+        {
+            SynchronizationContext.SetSynchronizationContext(originalContext);
+        }
+    }
+
+    private static IEnumerable<SessionNavItemViewModel> EnumerateRealSessionRows(MainNavigationViewModel navVm)
+        => EnumerateProjectedMenuSourceItems(navVm)
+            .OfType<SessionNavItemViewModel>()
+            .Where(row => !row.IsPlaceholder);
+
+    private static ConversationCatalogItem OpenedSessionCatalogItem(DateTime stamp)
+        => new(
+            "session-open",
+            "Opened Session",
+            @"C:\repo\demo",
+            stamp,
+            stamp,
+            stamp);
+
+    [Fact]
+    public void RebuildTree_RepublishesSelectedItemBinding_WhenNewerSessionIsInsertedAboveSelection()
+    {
+        var originalContext = SynchronizationContext.Current;
+        var syncContext = new ImmediateSynchronizationContext();
+        SynchronizationContext.SetSynchronizationContext(syncContext);
+        try
+        {
+            var navState = new FakeNavigationPaneState();
+            navState.SetPaneOpen(true);
+            var preferences = CreatePreferencesWithProject();
+            var chatCatalog = CreateChatSessionCatalog("session-open");
+            var openedAt = new DateTime(2026, 3, 1, 0, 0, 0, DateTimeKind.Utc);
+            var presenter = new MutableConversationCatalogDisplayReadModel();
+            presenter.SetLoading(false);
+            presenter.Refresh(new[] { OpenedSessionCatalogItem(openedAt) });
+
+            using var navVm = CreateNavigationViewModel(
+                chatCatalog,
+                Mock.Of<ISessionManager>(),
+                preferences,
+                navState,
+                out var selectionStore,
+                out _,
+                presenterOverride: presenter);
+
+            navVm.RebuildTree();
+            SetSessionSelection(selectionStore, "session-open");
+
+            var project = Assert.Single(navVm.Items.OfType<ProjectNavItemViewModel>(), p => p.ProjectId == "project-1");
+            var projectedBefore = Assert.IsType<SessionNavItemViewModel>(navVm.ProjectedControlSelectedItem);
+
+            var selectedItemChanges = 0;
+            navVm.PropertyChanged += (_, e) =>
+            {
+                if (e.PropertyName == nameof(MainNavigationViewModel.ProjectedControlSelectedItem))
+                {
+                    selectedItemChanges++;
+                }
+            };
+
+            // A session created from the Start page carries the newest timestamp, so it is inserted
+            // above the session already open and re-indexes every row below it.
+            var createdAt = new DateTime(2026, 3, 1, 0, 5, 0, DateTimeKind.Utc);
+            presenter.Refresh(new[]
+            {
+                OpenedSessionCatalogItem(openedAt),
+                new ConversationCatalogItem(
+                    "session-created",
+                    "Created Session",
+                    @"C:\repo\demo",
+                    createdAt,
+                    createdAt,
+                    createdAt)
+            });
+            navVm.RebuildTree();
+
+            Assert.Equal(
+                new[] { "session-created", "session-open" },
+                project.Children.OfType<SessionNavItemViewModel>().Select(child => child.SessionId).ToArray());
+
+            // SyncSessions reuses the row view model on purpose, so the projected instance is
+            // unchanged. Keying the push on that instance alone leaves the control never told about
+            // the reshuffle, and its selection visual stays on whichever container now sits there.
+            Assert.Same(projectedBefore, navVm.ProjectedControlSelectedItem);
+            Assert.True(
+                selectedItemChanges >= 1,
+                $"expected the selection to be re-published after the insert, got {selectedItemChanges} notifications");
+        }
+        finally
+        {
+            SynchronizationContext.SetSynchronizationContext(originalContext);
+        }
+    }
+
     [Fact]
     public void PaneOpenToClosed_KeepsSessionAsProjectedSelection()
     {
diff --git a/tests/SalmonEgg.Presentation.Core.Tests/Ui/XamlComplianceThemeResourcesTests.cs b/tests/SalmonEgg.Presentation.Core.Tests/Ui/XamlComplianceThemeResourcesTests.cs
index 97125b103..41d489bf0 100644
--- a/tests/SalmonEgg.Presentation.Core.Tests/Ui/XamlComplianceThemeResourcesTests.cs
+++ b/tests/SalmonEgg.Presentation.Core.Tests/Ui/XamlComplianceThemeResourcesTests.cs
@@ -453,7 +453,7 @@ public void SkiaNumberBoxThemeOverride_ReplacesFrameworkScopedTemplateWithoutFoc
         Assert.Contains("Resources[typeof(Microsoft.UI.Xaml.Controls.NumberBox)] = numberBoxStyle;", appCode, StringComparison.Ordinal);
         Assert.Contains("overrides[\"UnoNumberBoxStyleOverride\"]", appCode, StringComparison.Ordinal);
         Assert.Contains("Copyright (c) Microsoft Corporation", overrideXaml, StringComparison.Ordinal);
-        Assert.Contains("Uno 6.6.166 (commit 438b300b6171b3f2712f8897f10ea620784843ca)", overrideXaml, StringComparison.Ordinal);
+        Assert.Contains("Uno 6.7.103 (commit cd452e3ee242c9a2a8dee5e65ad8088b6f5dbf83)", overrideXaml, StringComparison.Ordinal);
         Assert.Contains("unoplatform/uno#24021", overrideXaml, StringComparison.Ordinal);
         Assert.Contains("xmlns:skia=\"http://uno.ui/skia\"", overrideXaml, StringComparison.Ordinal);
         Assert.Contains("mc:Ignorable=\"skia\"", overrideXaml, StringComparison.Ordinal);