fix: add aria-label fallback for more robust UI toggle clicks

Author: NikkeTryHard

browser_utils/debug_utils.py

@@ -7,7 +7,6 @@
 - Human-readable Texas timestamps
 - Complete metadata capture
 
-Created: 2025-11-21
 Purpose: Fix headless mode debugging and client disconnect issues
 """
 

browser_utils/page_controller_modules/thinking.py

@@ -467,12 +467,20 @@ async def _control_thinking_mode_toggle(
                     raise
                 except Exception:
                     try:
-                        root = self.page.locator(
-                            'mat-slide-toggle[data-test-toggle="enable-thinking"]'
+                        # 新版UI: 尝试直接点击带 aria-label 的开关父容器
+                        alt_toggle = self.page.locator(
+                            'mat-slide-toggle:has(button[aria-label="Toggle thinking mode"])'
                         )
-                        label = root.locator("label.mdc-label")
-                        await expect_async(label).to_be_visible(timeout=2000)
-                        await label.click(timeout=CLICK_TIMEOUT_MS)
+                        if await alt_toggle.count() > 0:
+                            await alt_toggle.click(timeout=CLICK_TIMEOUT_MS)
+                        else:
+                            # 旧版UI回退: data-test-toggle
+                            root = self.page.locator(
+                                'mat-slide-toggle[data-test-toggle="enable-thinking"]'
+                            )
+                            label = root.locator("label.mdc-label")
+                            await expect_async(label).to_be_visible(timeout=2000)
+                            await label.click(timeout=CLICK_TIMEOUT_MS)
                     except Exception:
                         raise
                 await self._check_disconnect(
@@ -553,12 +561,20 @@ async def _control_thinking_budget_toggle(
                     raise
                 except Exception:
                     try:
-                        root = self.page.locator(
-                            'mat-slide-toggle[data-test-toggle="manual-budget"]'
+                        # 新版UI: 尝试直接点击带 aria-label 的开关父容器
+                        alt_toggle = self.page.locator(
+                            'mat-slide-toggle:has(button[aria-label="Toggle thinking budget between auto and manual"])'
                         )
-                        label = root.locator("label.mdc-label")
-                        await expect_async(label).to_be_visible(timeout=2000)
-                        await label.click(timeout=CLICK_TIMEOUT_MS)
+                        if await alt_toggle.count() > 0:
+                            await alt_toggle.click(timeout=CLICK_TIMEOUT_MS)
+                        else:
+                            # 旧版UI回退: data-test-toggle
+                            root = self.page.locator(
+                                'mat-slide-toggle[data-test-toggle="manual-budget"]'
+                            )
+                            label = root.locator("label.mdc-label")
+                            await expect_async(label).to_be_visible(timeout=2000)
+                            await label.click(timeout=CLICK_TIMEOUT_MS)
                     except Exception:
                         raise
                 await self._check_disconnect(

config/selector_utils.py

@@ -17,7 +17,7 @@
 # Google AI Studio 会不定期更改 UI 结构，此列表包含所有已知的容器选择器
 # 优先尝试当前 UI，回退到旧 UI
 INPUT_WRAPPER_SELECTORS: List[str] = [
-    # 当前 UI 结构 (ms-prompt-input-wrapper / ms-chunk-editor) - 2024年12月后
+    # 当前 UI 结构 (ms-prompt-input-wrapper / ms-chunk-editor)
     "ms-prompt-input-wrapper .prompt-input-wrapper",
     "ms-prompt-input-wrapper",
     "ms-chunk-editor",

config/selectors.py

@@ -7,7 +7,7 @@
 # 主输入 textarea 兼容当前和旧 UI 结构
 # 当前结构: ms-prompt-input-wrapper > ... > ms-autosize-textarea > textarea.textarea
 PROMPT_TEXTAREA_SELECTOR = (
-    # 当前 UI 结构 (2024年12月后)
+    # 当前 UI 结构
     "textarea.textarea, "  # 最直接的选择器
     "ms-autosize-textarea textarea, "
     "ms-chunk-input textarea, "
@@ -81,17 +81,33 @@
 
 # --- 思考模式相关选择器 ---
 # 主思考开关：控制是否启用思考模式（总开关）
+# Flash模型使用 aria-label="Toggle thinking mode"
+# 回退: 旧版 data-test-toggle 属性
 ENABLE_THINKING_MODE_TOGGLE_SELECTOR = (
+    'button[role="switch"][aria-label="Toggle thinking mode"], '
     'mat-slide-toggle[data-test-toggle="enable-thinking"] button[role="switch"].mdc-switch, '
     '[data-test-toggle="enable-thinking"] button[role="switch"].mdc-switch'
 )
 # 手动预算开关：控制是否手动限制思考预算
+# Flash模型使用 aria-label="Toggle thinking budget between auto and manual"
+# 回退: 旧版 data-test-toggle 属性
 SET_THINKING_BUDGET_TOGGLE_SELECTOR = (
+    'button[role="switch"][aria-label="Toggle thinking budget between auto and manual"], '
     'mat-slide-toggle[data-test-toggle="manual-budget"] button[role="switch"].mdc-switch, '
     '[data-test-toggle="manual-budget"] button[role="switch"].mdc-switch'
 )
 # 思考预算输入框
-THINKING_BUDGET_INPUT_SELECTOR = '[data-test-slider] input[type="number"]'
+# 思考预算滑块具有独特的 min="512" 属性（温度是 max="2"，TopP 是 max="1"）
+# 优先使用最精确的选择器，保留多层回退以应对 UI 变化
+THINKING_BUDGET_INPUT_SELECTOR = (
+    # 最精确: 使用 data-test-id 容器 + spinbutton
+    '[data-test-id="user-setting-budget-animation-wrapper"] input[type="number"], '
+    # 回退1: 使用独特的 min="512" 属性定位（仅思考预算滑块有此属性）
+    'input.slider-number-input[min="512"], '
+    'ms-slider input[type="number"][min="512"], '
+    # 回退2: 旧版 data-test-slider 属性
+    '[data-test-slider] input[type="number"]'
+)
 
 # 思考等级下拉
 THINKING_LEVEL_SELECT_SELECTOR = '[role="combobox"][aria-label="Thinking Level"], mat-select[aria-label="Thinking Level"], [role="combobox"][aria-label="Thinking level"], mat-select[aria-label="Thinking level"]'

tests/browser_utils/page_controller_modules/test_thinking.py

@@ -314,20 +314,23 @@ async def test_set_thinking_budget_value_max_fallback(mock_controller, mock_page
 async def test_control_thinking_mode_toggle_click_failure_fallback(
     mock_controller, mock_page
 ):
-    # Test fallback to label click if toggle click fails
+    # Test fallback to aria-label based toggle click if main toggle click fails
     toggle = AsyncMock()
     toggle.click.side_effect = Exception("Not clickable")
 
-    label = AsyncMock()
+    alt_toggle = AsyncMock()
+    alt_toggle.count = AsyncMock(return_value=1)
 
     def locator_side_effect(selector):
         if "button" in selector and "switch" in selector:
             return toggle
-        if "mat-slide-toggle" in selector:  # Root for fallback
+        if 'aria-label="Toggle thinking mode"' in selector:
+            return alt_toggle
+        if "mat-slide-toggle" in selector:  # Old fallback
             root = MagicMock()
-            root.locator.return_value = label
+            root.locator.return_value = AsyncMock()
             return root
-        return toggle  # Default for first locator call
+        return toggle
 
     mock_page.locator.side_effect = locator_side_effect
     toggle.get_attribute.return_value = "false"
@@ -344,7 +347,7 @@ def locator_side_effect(selector):
             True, MagicMock(return_value=False)
         )
 
-        label.click.assert_called()
+        alt_toggle.click.assert_called()
 
 
 @pytest.mark.asyncio
@@ -623,20 +626,23 @@ async def test_set_thinking_level_errors(mock_controller):
 
 @pytest.mark.asyncio
 async def test_control_thinking_mode_toggle_fallback(mock_controller):
-    # Test fallback to label click
+    # Test fallback to aria-label based toggle click
     toggle = MagicMock()
     toggle.get_attribute = AsyncMock(return_value="false")
     toggle.click = AsyncMock(side_effect=Exception("Click failed"))
 
-    label = MagicMock()
-    label.click = AsyncMock()
-    root = MagicMock()
-    root.locator.return_value = label
+    alt_toggle = MagicMock()
+    alt_toggle.count = AsyncMock(return_value=1)
+    alt_toggle.click = AsyncMock()
 
     def locator_side_effect(selector):
-        if "button" in selector and 'data-test-toggle="enable-thinking"' in selector:
+        if "button" in selector and "switch" in selector:
             return toggle
+        if 'aria-label="Toggle thinking mode"' in selector:
+            return alt_toggle
         if 'data-test-toggle="enable-thinking"' in selector:
+            root = MagicMock()
+            root.locator.return_value = MagicMock()
             return root
         return toggle
 
@@ -653,25 +659,28 @@ def locator_side_effect(selector):
     ):
         await mock_controller._control_thinking_mode_toggle(True, check_disconnect_mock)
 
-    label.click.assert_called()
+    alt_toggle.click.assert_called()
 
 
 @pytest.mark.asyncio
 async def test_control_thinking_budget_toggle_fallback(mock_controller):
-    # Test fallback to label click
+    # Test fallback to aria-label based toggle click
     toggle = MagicMock()
     toggle.get_attribute = AsyncMock(return_value="false")
     toggle.click = AsyncMock(side_effect=Exception("Click failed"))
 
-    label = MagicMock()
-    label.click = AsyncMock()
-    root = MagicMock()
-    root.locator.return_value = label
+    alt_toggle = MagicMock()
+    alt_toggle.count = AsyncMock(return_value=1)
+    alt_toggle.click = AsyncMock()
 
     def locator_side_effect(selector):
-        if "button" in selector and 'data-test-toggle="manual-budget"' in selector:
+        if "button" in selector and "switch" in selector:
             return toggle
+        if 'aria-label="Toggle thinking budget between auto and manual"' in selector:
+            return alt_toggle
         if 'data-test-toggle="manual-budget"' in selector:
+            root = MagicMock()
+            root.locator.return_value = MagicMock()
             return root
         return toggle
 
@@ -690,7 +699,7 @@ def locator_side_effect(selector):
             True, check_disconnect_mock
         )
 
-    label.click.assert_called()
+    alt_toggle.click.assert_called()
 
 
 @pytest.mark.asyncio
@@ -1185,26 +1194,28 @@ async def test_control_thinking_mode_toggle_click_cancelled_error(
 async def test_control_thinking_mode_toggle_fallback_success(
     mock_controller, mock_page
 ):
-    """Test successful fallback to label click (lines 459-468)."""
+    """Test successful fallback to aria-label based toggle click."""
     toggle = AsyncMock()
     toggle.get_attribute = AsyncMock(side_effect=["false", "true"])  # Before and after
     toggle.click = AsyncMock(side_effect=Exception("Click failed"))
     toggle.scroll_into_view_if_needed = AsyncMock()
 
-    label = AsyncMock()
-    label.click = AsyncMock()  # Success on fallback
-
-    root = MagicMock()
-    root.locator.return_value = label
+    alt_toggle = AsyncMock()
+    alt_toggle.count = AsyncMock(return_value=1)
+    alt_toggle.click = AsyncMock()  # Success on fallback
 
     locator_call_count = [0]
 
     def locator_side_effect(selector):
         locator_call_count[0] += 1
-        if locator_call_count[0] == 1:  # First call for toggle button
+        if "button" in selector and "switch" in selector:
             return toggle
-        else:  # Second call for mat-slide-toggle root
-            return root
+        if 'aria-label="Toggle thinking mode"' in selector:
+            return alt_toggle
+        # Old fallback path
+        root = MagicMock()
+        root.locator.return_value = MagicMock()
+        return root
 
     mock_page.locator.side_effect = locator_side_effect
 
@@ -1218,13 +1229,13 @@ def locator_side_effect(selector):
     ):
         mock_controller._check_disconnect = AsyncMock()
 
-        # Should succeed via fallback (lines 459-468)
+        # Should succeed via fallback
         result = await mock_controller._control_thinking_mode_toggle(
             True, check_disconnect_mock
         )
 
-        # Verify label click was called (fallback)
-        label.click.assert_called()
+        # Verify alt_toggle click was called (fallback)
+        alt_toggle.click.assert_called()
         assert result is True
 
 
@@ -1429,26 +1440,25 @@ async def test_control_thinking_budget_toggle_click_cancelled_error(
 async def test_control_thinking_budget_toggle_fallback_success(
     mock_controller, mock_page
 ):
-    """Test successful fallback to label click (lines 545-554)."""
+    """Test successful fallback to aria-label based toggle click."""
     toggle = AsyncMock()
     toggle.get_attribute = AsyncMock(side_effect=["false", "true"])  # Before and after
     toggle.click = AsyncMock(side_effect=Exception("Click failed"))
     toggle.scroll_into_view_if_needed = AsyncMock()
 
-    label = AsyncMock()
-    label.click = AsyncMock()  # Success on fallback
-
-    root = MagicMock()
-    root.locator.return_value = label
-
-    locator_call_count = [0]
+    alt_toggle = AsyncMock()
+    alt_toggle.count = AsyncMock(return_value=1)
+    alt_toggle.click = AsyncMock()  # Success on fallback
 
     def locator_side_effect(selector):
-        locator_call_count[0] += 1
-        if locator_call_count[0] == 1:  # First call for toggle button
+        if "button" in selector and "switch" in selector:
             return toggle
-        else:  # Second call for mat-slide-toggle root
-            return root
+        if 'aria-label="Toggle thinking budget between auto and manual"' in selector:
+            return alt_toggle
+        # Old fallback path
+        root = MagicMock()
+        root.locator.return_value = MagicMock()
+        return root
 
     mock_page.locator.side_effect = locator_side_effect
 
@@ -1462,13 +1472,13 @@ def locator_side_effect(selector):
     ):
         mock_controller._check_disconnect = AsyncMock()
 
-        # Should succeed via fallback (lines 545-554)
+        # Should succeed via fallback
         await mock_controller._control_thinking_budget_toggle(
             True, check_disconnect_mock
         )
 
-        # Verify label click was called (fallback)
-        label.click.assert_called()
+        # Verify alt_toggle click was called (fallback)
+        alt_toggle.click.assert_called()
 
 
 @pytest.mark.asyncio