mobile-mcp-ai 2.6.2__py3-none-any.whl → 2.6.3__py3-none-any.whl

mobile_mcp/core/basic_tools_lite.py

@@ -500,7 +500,7 @@ class BasicMobileToolsLite:
                 # 左侧标注 Y 坐标
                 draw.text((2, y + 2), str(y), fill=text_color, font=font_small)
             
-            # 第3步：检测弹窗并标注
+            # 第3步：检测弹窗并标注（使用严格的置信度检测，避免误识别）
             popup_info = None
             close_positions = []
             
@@ -510,35 +510,12 @@ class BasicMobileToolsLite:
                     xml_string = self.client.u2.dump_hierarchy(compressed=False)
                     root = ET.fromstring(xml_string)
                     
-                    # 检测弹窗区域
-                    popup_bounds = None
-                    for elem in root.iter():
-                        bounds_str = elem.attrib.get('bounds', '')
-                        class_name = elem.attrib.get('class', '')
-                        
-                        if not bounds_str:
-                            continue
-                        
-                        match = re.match(r'\[(\d+),(\d+)\]\[(\d+),(\d+)\]', bounds_str)
-                        if not match:
-                            continue
-                        
-                        x1, y1, x2, y2 = map(int, match.groups())
-                        width = x2 - x1
-                        height = y2 - y1
-                        area = width * height
-                        screen_area = screen_width * screen_height
-                        
-                        is_container = any(kw in class_name for kw in ['Layout', 'View', 'Dialog', 'Card'])
-                        area_ratio = area / screen_area if screen_area > 0 else 0
-                        is_not_fullscreen = (width < screen_width * 0.98 or height < screen_height * 0.98)
-                        is_reasonable_size = 0.08 < area_ratio < 0.85
-                        
-                        if is_container and is_not_fullscreen and is_reasonable_size and y1 > 50:
-                            if popup_bounds is None or area > (popup_bounds[2] - popup_bounds[0]) * (popup_bounds[3] - popup_bounds[1]):
-                                popup_bounds = (x1, y1, x2, y2)
+                    # 使用严格的弹窗检测（置信度 >= 0.6 才认为是弹窗）
+                    popup_bounds, popup_confidence = self._detect_popup_with_confidence(
+                        root, screen_width, screen_height
+                    )
                     
-                    if popup_bounds:
+                    if popup_bounds and popup_confidence >= 0.6:
                         px1, py1, px2, py2 = popup_bounds
                         popup_width = px2 - px1
                         popup_height = py2 - py1
@@ -769,49 +746,19 @@ class BasicMobileToolsLite:
                     'desc': elem['desc']
                 })
             
-            # 第3.5步：检测弹窗区域（用于标注）
+            # 第3.5步：检测弹窗区域（使用严格的置信度检测，避免误识别普通页面）
             popup_bounds = None
+            popup_confidence = 0
             
             if not self._is_ios():
                 try:
-                    # 检测弹窗区域
-                    for elem in root.iter():
-                        bounds_str = elem.attrib.get('bounds', '')
-                        class_name = elem.attrib.get('class', '')
-                        
-                        if not bounds_str:
-                            continue
-                        
-                        match = re.match(r'\[(\d+),(\d+)\]\[(\d+),(\d+)\]', bounds_str)
-                        if not match:
-                            continue
-                        
-                        px1, py1, px2, py2 = map(int, match.groups())
-                        p_width = px2 - px1
-                        p_height = py2 - py1
-                        p_area = p_width * p_height
-                        screen_area = screen_width * screen_height
-                        
-                        is_container = any(kw in class_name for kw in ['Layout', 'View', 'Dialog', 'Card', 'Frame'])
-                        area_ratio = p_area / screen_area if screen_area > 0 else 0
-                        
-                        # 弹窗特征判断（更严格，排除主要内容区域）：
-                        # 1. 不是全屏（宽度和高度都要小于屏幕的95%）
-                        is_not_fullscreen = (p_width < screen_width * 0.95 and p_height < screen_height * 0.95)
-                        # 2. 面积范围：10% - 70%（排除主要内容区域，通常占80%+）
-                        is_reasonable_size = 0.10 < area_ratio < 0.70
-                        # 3. 不在屏幕左边缘（排除从x=0开始的主要内容容器）
-                        is_not_at_left_edge = px1 > screen_width * 0.05
-                        # 4. 高度不能占据屏幕的大部分（排除主要内容区域）
-                        height_ratio = p_height / screen_height if screen_height > 0 else 0
-                        is_not_main_content = height_ratio < 0.85
-                        
-                        if is_container and is_not_fullscreen and is_reasonable_size and is_not_at_left_edge and is_not_main_content and py1 > 30:
-                            if popup_bounds is None or p_area > (popup_bounds[2] - popup_bounds[0]) * (popup_bounds[3] - popup_bounds[1]):
-                                popup_bounds = (px1, py1, px2, py2)
+                    # 使用严格的弹窗检测（置信度 >= 0.6 才认为是弹窗）
+                    popup_bounds, popup_confidence = self._detect_popup_with_confidence(
+                        root, screen_width, screen_height
+                    )
                     
                     # 如果检测到弹窗，标注弹窗边界（不再猜测X按钮位置）
-                    if popup_bounds:
+                    if popup_bounds and popup_confidence >= 0.6:
                         px1, py1, px2, py2 = popup_bounds
                         
                         # 只画弹窗边框（蓝色），不再猜测X按钮位置
@@ -2630,58 +2577,13 @@ class BasicMobileToolsLite:
                 root = ET.fromstring(xml_string)
                 all_elements = list(root.iter())
                 
-                # ===== 第一步：检测弹窗区域 =====
-                # 弹窗特征：非全屏、面积较大、通常在屏幕中央的容器
-                popup_containers = []
-                for idx, elem in enumerate(all_elements):
-                    bounds_str = elem.attrib.get('bounds', '')
-                    class_name = elem.attrib.get('class', '')
-                    
-                    if not bounds_str:
-                        continue
-                    
-                    match = re.match(r'\[(\d+),(\d+)\]\[(\d+),(\d+)\]', bounds_str)
-                    if not match:
-                        continue
-                    
-                    x1, y1, x2, y2 = map(int, match.groups())
-                    width = x2 - x1
-                    height = y2 - y1
-                    area = width * height
-                    screen_area = screen_width * screen_height
-                    
-                    # 弹窗容器特征（更严格，排除主要内容区域）：
-                    # 1. 面积在屏幕的 10%-70% 之间（排除主要内容区域，通常占80%+）
-                    # 2. 宽度和高度都要小于屏幕的95%（不是全屏）
-                    # 3. 是容器类型（Layout/View/Dialog）
-                    # 4. 不在屏幕左边缘（排除从x=0开始的主要内容容器）
-                    # 5. 高度不能占据屏幕的大部分（排除主要内容区域）
-                    is_container = any(kw in class_name for kw in ['Layout', 'View', 'Dialog', 'Card', 'Container'])
-                    area_ratio = area / screen_area
-                    is_not_fullscreen = (width < screen_width * 0.95 and height < screen_height * 0.95)
-                    is_reasonable_size = 0.10 < area_ratio < 0.70
-                    is_not_at_left_edge = x1 > screen_width * 0.05
-                    height_ratio = height / screen_height if screen_height > 0 else 0
-                    is_not_main_content = height_ratio < 0.85
-                    
-                    # 排除状态栏区域（y1 通常很小）
-                    is_below_statusbar = y1 > 50
-                    
-                    if is_container and is_not_fullscreen and is_reasonable_size and is_not_at_left_edge and is_not_main_content and is_below_statusbar:
-                        popup_containers.append({
-                            'bounds': (x1, y1, x2, y2),
-                            'bounds_str': bounds_str,
-                            'area': area,
-                            'area_ratio': area_ratio,
-                            'idx': idx,  # 元素在 XML 中的顺序（越后越上层）
-                            'class': class_name
-                        })
+                # ===== 第一步：使用严格的置信度检测弹窗区域 =====
+                popup_bounds, popup_confidence = self._detect_popup_with_confidence(
+                    root, screen_width, screen_height
+                )
                 
-                # 选择最可能的弹窗容器（优先选择：XML 顺序靠后 + 面积适中）
-                if popup_containers:
-                    # 按 XML 顺序倒序（后出现的在上层），然后按面积适中程度排序
-                    popup_containers.sort(key=lambda x: (x['idx'], -abs(x['area_ratio'] - 0.3)), reverse=True)
-                    popup_bounds = popup_containers[0]['bounds']
+                # 如果置信度不够高，记录但继续尝试查找关闭按钮
+                popup_detected = popup_bounds is not None and popup_confidence >= 0.6
                 
                 # ===== 第二步：在弹窗范围内查找关闭按钮 =====
                 for idx, elem in enumerate(all_elements):
@@ -2813,15 +2715,15 @@ class BasicMobileToolsLite:
                             'content_desc': content_desc,
                             'x_percent': round(rel_x * 100, 1),
                             'y_percent': round(rel_y * 100, 1),
-                            'in_popup': popup_bounds is not None
+                            'in_popup': popup_detected
                         })
                         
             except ET.ParseError:
                 pass
             
             if not close_candidates:
-                # 如果检测到弹窗区域，先尝试点击常见的关闭按钮位置
-                if popup_bounds:
+                # 如果检测到高置信度的弹窗区域，先尝试点击常见的关闭按钮位置
+                if popup_detected and popup_bounds:
                     px1, py1, px2, py2 = popup_bounds
                     popup_width = px2 - px1
                     popup_height = py2 - py1
@@ -2954,8 +2856,9 @@ class BasicMobileToolsLite:
                     "percent": (best['x_percent'], best['y_percent'])
                 },
                 "screenshot": screenshot_result.get("screenshot_path", ""),
-                "popup_detected": popup_bounds is not None,
-                "popup_bounds": f"[{popup_bounds[0]},{popup_bounds[1]}][{popup_bounds[2]},{popup_bounds[3]}]" if popup_bounds else None,
+                "popup_detected": popup_detected,
+                "popup_confidence": popup_confidence if popup_bounds else 0,
+                "popup_bounds": f"[{popup_bounds[0]},{popup_bounds[1]}][{popup_bounds[2]},{popup_bounds[3]}]" if popup_detected else None,
                 "app_check": app_check,
                 "return_to_app": return_result,
                 "other_candidates": [
@@ -3014,6 +2917,348 @@ class BasicMobileToolsLite:
                 return 0.8
         else:  # 中间区域
             return 0.5
+
+    def _detect_popup_with_confidence(self, root, screen_width: int, screen_height: int) -> tuple:
+        """严格的弹窗检测 - 使用置信度评分，避免误识别普通页面
+        
+        真正的弹窗特征：
+        1. class 名称包含 Dialog/Popup/Alert/Modal/BottomSheet（强特征）
+        2. resource-id 包含 dialog/popup/alert/modal（强特征）
+        3. 有遮罩层（大面积半透明 View 在弹窗之前）
+        4. 居中显示且非全屏
+        5. XML 层级靠后且包含可交互元素
+        
+        Returns:
+            (popup_bounds, confidence) 或 (None, 0)
+            confidence >= 0.6 才认为是弹窗
+        """
+        import re
+        
+        screen_area = screen_width * screen_height
+        
+        # 收集所有元素信息
+        all_elements = []
+        for idx, elem in enumerate(root.iter()):
+            bounds_str = elem.attrib.get('bounds', '')
+            if not bounds_str:
+                continue
+            
+            match = re.match(r'\[(\d+),(\d+)\]\[(\d+),(\d+)\]', bounds_str)
+            if not match:
+                continue
+            
+            x1, y1, x2, y2 = map(int, match.groups())
+            width = x2 - x1
+            height = y2 - y1
+            area = width * height
+            
+            class_name = elem.attrib.get('class', '')
+            resource_id = elem.attrib.get('resource-id', '')
+            clickable = elem.attrib.get('clickable', 'false') == 'true'
+            
+            all_elements.append({
+                'idx': idx,
+                'bounds': (x1, y1, x2, y2),
+                'width': width,
+                'height': height,
+                'area': area,
+                'area_ratio': area / screen_area if screen_area > 0 else 0,
+                'class': class_name,
+                'resource_id': resource_id,
+                'clickable': clickable,
+                'center_x': (x1 + x2) // 2,
+                'center_y': (y1 + y2) // 2,
+            })
+        
+        if not all_elements:
+            return None, 0
+        
+        # 弹窗检测关键词
+        dialog_class_keywords = ['Dialog', 'Popup', 'Alert', 'Modal', 'BottomSheet', 'PopupWindow']
+        dialog_id_keywords = ['dialog', 'popup', 'alert', 'modal', 'bottom_sheet', 'overlay', 'mask']
+        
+        popup_candidates = []
+        has_mask_layer = False
+        mask_idx = -1
+        
+        # 【新增】检测浮动关闭按钮（小尺寸 clickable ImageView，位于屏幕中央偏上）
+        floating_close_buttons = []
+        for elem in all_elements:
+            x1, y1, x2, y2 = elem['bounds']
+            class_name = elem['class']
+            width = elem['width']
+            height = elem['height']
+            
+            # 浮动关闭按钮特征：
+            # 1. 小尺寸（50-200px）
+            # 2. clickable 或 ImageView
+            # 3. 位于屏幕中央区域的上半部分
+            # 4. 接近正方形
+            is_small = 50 < width < 200 and 50 < height < 200
+            is_square_like = 0.5 < (width / height if height > 0 else 0) < 2.0
+            is_clickable_image = elem['clickable'] or 'Image' in class_name
+            is_upper_center = (screen_width * 0.2 < x1 < screen_width * 0.8 and 
+                              y1 < screen_height * 0.5)
+            
+            if is_small and is_square_like and is_clickable_image and is_upper_center:
+                floating_close_buttons.append({
+                    'bounds': elem['bounds'],
+                    'center_x': elem['center_x'],
+                    'center_y': elem['center_y'],
+                    'idx': elem['idx']
+                })
+        
+        for elem in all_elements:
+            x1, y1, x2, y2 = elem['bounds']
+            class_name = elem['class']
+            resource_id = elem['resource_id']
+            area_ratio = elem['area_ratio']
+            
+            # 检测遮罩层（大面积、几乎全屏、通常是 FrameLayout/View）
+            if area_ratio > 0.85 and elem['width'] >= screen_width * 0.95:
+                # 可能是遮罩层，记录位置
+                if 'FrameLayout' in class_name or 'View' in class_name:
+                    has_mask_layer = True
+                    mask_idx = elem['idx']
+            
+            # 跳过全屏元素
+            if area_ratio > 0.9:
+                continue
+            
+            # 跳过太小的元素
+            if area_ratio < 0.05:
+                continue
+            
+            # 跳过状态栏区域
+            if y1 < 50:
+                continue
+            
+            confidence = 0.0
+            
+            # 【强特征】class 名称包含弹窗关键词 (+0.5)
+            if any(kw in class_name for kw in dialog_class_keywords):
+                confidence += 0.5
+            
+            # 【强特征】resource-id 包含弹窗关键词 (+0.4)
+            if any(kw in resource_id.lower() for kw in dialog_id_keywords):
+                confidence += 0.4
+            
+            # 【中等特征】居中显示 (+0.2)
+            center_x = elem['center_x']
+            center_y = elem['center_y']
+            is_centered_x = abs(center_x - screen_width / 2) < screen_width * 0.15
+            is_centered_y = abs(center_y - screen_height / 2) < screen_height * 0.25
+            if is_centered_x and is_centered_y:
+                confidence += 0.2
+            elif is_centered_x:
+                confidence += 0.1
+            
+            # 【中等特征】非全屏但有一定大小 (+0.15)
+            if 0.15 < area_ratio < 0.75:
+                confidence += 0.15
+            
+            # 【弱特征】XML 顺序靠后（在视图层级上层）(+0.1)
+            if elem['idx'] > len(all_elements) * 0.5:
+                confidence += 0.1
+            
+            # 【弱特征】有遮罩层且在遮罩层之后 (+0.15)
+            if has_mask_layer and elem['idx'] > mask_idx:
+                confidence += 0.15
+            
+            # 【新增强特征】有浮动关闭按钮在此容器上方附近 (+0.4)
+            # 这是很多 App 弹窗的典型设计：内容区域 + 上方的 X 按钮
+            for close_btn in floating_close_buttons:
+                btn_x, btn_y = close_btn['center_x'], close_btn['center_y']
+                # 检查关闭按钮是否在容器的上方（扩大范围到 400px）
+                is_above_container = (
+                    x1 - 100 < btn_x < x2 + 100 and  # 在容器水平范围内
+                    y1 - 400 < btn_y < y1 + 100       # 在容器上方 400px 范围内
+                )
+                if is_above_container:
+                    confidence += 0.4
+                    break  # 只加一次分
+            
+            # 只有达到阈值才加入候选
+            if confidence >= 0.3:
+                popup_candidates.append({
+                    'bounds': elem['bounds'],
+                    'confidence': confidence,
+                    'class': class_name,
+                    'resource_id': resource_id,
+                    'idx': elem['idx']
+                })
+        
+        if not popup_candidates:
+            return None, 0
+        
+        # 选择置信度最高的
+        popup_candidates.sort(key=lambda x: (x['confidence'], x['idx']), reverse=True)
+        best = popup_candidates[0]
+        
+        # 只有置信度 >= 0.6 才返回弹窗
+        if best['confidence'] >= 0.6:
+            return best['bounds'], best['confidence']
+        
+        return None, best['confidence']
+    
+    def start_toast_watch(self) -> Dict:
+        """开始监听 Toast（仅 Android）
+        
+        ⚠️ 必须在执行操作之前调用！
+        
+        正确流程：
+        1. 调用 mobile_start_toast_watch() 开始监听
+        2. 执行操作（如点击提交按钮）
+        3. 调用 mobile_get_toast() 获取 Toast 内容
+        
+        Returns:
+            监听状态
+        """
+        if self._is_ios():
+            return {
+                "success": False,
+                "message": "❌ iOS 不支持 Toast 检测，Toast 是 Android 特有功能"
+            }
+        
+        try:
+            # 清除缓存并开始监听
+            self.client.u2.toast.reset()
+            return {
+                "success": True,
+                "message": "✅ Toast 监听已开启，请立即执行操作，然后调用 mobile_get_toast 获取结果"
+            }
+        except Exception as e:
+            return {
+                "success": False,
+                "message": f"❌ 开启 Toast 监听失败: {e}"
+            }
+    
+    def get_toast(self, timeout: float = 5.0, reset_first: bool = False) -> Dict:
+        """获取 Toast 消息（仅 Android）
+        
+        Toast 是 Android 系统级的短暂提示消息，常用于显示操作结果。
+        
+        ⚠️ 推荐用法（两步走）：
+        1. 先调用 mobile_start_toast_watch() 开始监听
+        2. 执行操作（如点击提交按钮）
+        3. 调用 mobile_get_toast() 获取 Toast
+        
+        或者设置 reset_first=True，会自动 reset 后等待（适合操作已自动触发的场景）
+        
+        Args:
+            timeout: 等待 Toast 出现的超时时间（秒），默认 5 秒
+            reset_first: 是否先 reset（清除旧缓存），默认 False
+        
+        Returns:
+            包含 Toast 消息的字典
+        """
+        if self._is_ios():
+            return {
+                "success": False,
+                "message": "❌ iOS 不支持 Toast 检测，Toast 是 Android 特有功能"
+            }
+        
+        try:
+            if reset_first:
+                # 清除旧缓存，适合等待即将出现的 Toast
+                self.client.u2.toast.reset()
+            
+            # 等待并获取 Toast 消息
+            toast_message = self.client.u2.toast.get_message(
+                wait_timeout=timeout,
+                default=None
+            )
+            
+            if toast_message:
+                return {
+                    "success": True,
+                    "toast_found": True,
+                    "message": toast_message,
+                    "tip": "Toast 消息获取成功"
+                }
+            else:
+                return {
+                    "success": True,
+                    "toast_found": False,
+                    "message": None,
+                    "tip": f"在 {timeout} 秒内未检测到 Toast。提示：先调用 mobile_start_toast_watch，再执行操作，最后调用此工具"
+                }
+        except Exception as e:
+            return {
+                "success": False,
+                "message": f"❌ 获取 Toast 失败: {e}"
+            }
+    
+    def assert_toast(self, expected_text: str, timeout: float = 5.0, contains: bool = True) -> Dict:
+        """断言 Toast 消息（仅 Android）
+        
+        等待 Toast 出现并验证内容是否符合预期。
+        
+        ⚠️ 推荐用法：先调用 mobile_start_toast_watch，再执行操作，最后调用此工具
+        
+        Args:
+            expected_text: 期望的 Toast 文本
+            timeout: 等待超时时间（秒）
+            contains: True 表示包含匹配，False 表示精确匹配
+        
+        Returns:
+            断言结果
+        """
+        if self._is_ios():
+            return {
+                "success": False,
+                "passed": False,
+                "message": "❌ iOS 不支持 Toast 检测"
+            }
+        
+        try:
+            # 获取 Toast（不 reset，假设之前已经调用过 start_toast_watch）
+            toast_message = self.client.u2.toast.get_message(
+                wait_timeout=timeout,
+                default=None
+            )
+            
+            if toast_message is None:
+                return {
+                    "success": True,
+                    "passed": False,
+                    "expected": expected_text,
+                    "actual": None,
+                    "message": f"❌ 断言失败：未检测到 Toast 消息"
+                }
+            
+            # 匹配检查
+            if contains:
+                passed = expected_text in toast_message
+                match_type = "包含"
+            else:
+                passed = expected_text == toast_message
+                match_type = "精确"
+            
+            if passed:
+                return {
+                    "success": True,
+                    "passed": True,
+                    "expected": expected_text,
+                    "actual": toast_message,
+                    "match_type": match_type,
+                    "message": f"✅ Toast 断言通过：'{toast_message}'"
+                }
+            else:
+                return {
+                    "success": True,
+                    "passed": False,
+                    "expected": expected_text,
+                    "actual": toast_message,
+                    "match_type": match_type,
+                    "message": f"❌ Toast 断言失败：期望 '{expected_text}'，实际 '{toast_message}'"
+                }
+        except Exception as e:
+            return {
+                "success": False,
+                "passed": False,
+                "message": f"❌ Toast 断言异常: {e}"
+            }
     
     def assert_text(self, text: str) -> Dict:
         """检查页面是否包含文本（支持精确匹配和包含匹配）"""

mobile_mcp/mcp_tools/mcp_server.py

@@ -671,6 +671,72 @@ class MobileMCPServer:
             }
         ))
         
+        # ==================== Toast 检测工具（仅 Android）====================
+        tools.append(Tool(
+            name="mobile_start_toast_watch",
+            description="""🔔 开始监听 Toast（仅 Android）
+
+⚠️ 【重要】必须在执行操作之前调用！
+
+📋 正确流程（三步走）：
+1️⃣ 调用 mobile_start_toast_watch() 开始监听
+2️⃣ 执行操作（如点击提交按钮）
+3️⃣ 调用 mobile_get_toast() 或 mobile_assert_toast() 获取结果
+
+❌ 错误用法：先点击按钮，再调用此工具（Toast 可能已消失）""",
+            inputSchema={
+                "type": "object",
+                "properties": {},
+                "required": []
+            }
+        ))
+        
+        tools.append(Tool(
+            name="mobile_get_toast",
+            description="""🍞 获取 Toast 消息（仅 Android）
+
+Toast 是 Android 系统级的短暂提示消息，常用于显示操作结果。
+⚠️ Toast 不在控件树中，无法通过 mobile_list_elements 获取。
+
+📋 推荐用法（三步走）：
+1️⃣ mobile_start_toast_watch() - 开始监听
+2️⃣ 执行操作（点击按钮等）
+3️⃣ mobile_get_toast() - 获取 Toast
+
+⏱️ timeout 设置等待时间，默认 5 秒。""",
+            inputSchema={
+                "type": "object",
+                "properties": {
+                    "timeout": {"type": "number", "description": "等待 Toast 出现的超时时间（秒），默认 5"},
+                    "reset_first": {"type": "boolean", "description": "是否先清除旧缓存，默认 False"}
+                },
+                "required": []
+            }
+        ))
+        
+        tools.append(Tool(
+            name="mobile_assert_toast",
+            description="""✅ 断言 Toast 消息（仅 Android）
+
+等待 Toast 出现并验证内容是否符合预期。
+
+📋 推荐用法（三步走）：
+1️⃣ mobile_start_toast_watch() - 开始监听
+2️⃣ 执行操作（点击按钮等）
+3️⃣ mobile_assert_toast(expected_text="成功") - 断言
+
+💡 支持包含匹配（默认）和精确匹配。""",
+            inputSchema={
+                "type": "object",
+                "properties": {
+                    "expected_text": {"type": "string", "description": "期望的 Toast 文本"},
+                    "timeout": {"type": "number", "description": "等待超时时间（秒），默认 5"},
+                    "contains": {"type": "boolean", "description": "True=包含匹配（默认），False=精确匹配"}
+                },
+                "required": ["expected_text"]
+            }
+        ))
+        
         # ==================== pytest 脚本生成 ====================
         tools.append(Tool(
             name="mobile_get_operation_history",
@@ -990,6 +1056,25 @@ class MobileMCPServer:
                 result = self.tools.assert_text(arguments["text"])
                 return [TextContent(type="text", text=self.format_response(result))]
             
+            # Toast 检测（仅 Android）
+            elif name == "mobile_start_toast_watch":
+                result = self.tools.start_toast_watch()
+                return [TextContent(type="text", text=self.format_response(result))]
+            
+            elif name == "mobile_get_toast":
+                timeout = arguments.get("timeout", 5.0)
+                reset_first = arguments.get("reset_first", False)
+                result = self.tools.get_toast(timeout=timeout, reset_first=reset_first)
+                return [TextContent(type="text", text=self.format_response(result))]
+            
+            elif name == "mobile_assert_toast":
+                result = self.tools.assert_toast(
+                    expected_text=arguments["expected_text"],
+                    timeout=arguments.get("timeout", 5.0),
+                    contains=arguments.get("contains", True)
+                )
+                return [TextContent(type="text", text=self.format_response(result))]
+            
             # 脚本生成
             elif name == "mobile_get_operation_history":
                 result = self.tools.get_operation_history(arguments.get("limit"))

{mobile_mcp_ai-2.6.2.dist-info → mobile_mcp_ai-2.6.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mobile-mcp-ai
-Version: 2.6.2
+Version: 2.6.3
 Summary: 移动端自动化 MCP Server - 支持 Android/iOS，AI 功能可选（基础工具不需要 AI）
 Home-page: https://github.com/test111ddff-hash/mobile-mcp-ai
 Author: douzi

{mobile_mcp_ai-2.6.2.dist-info → mobile_mcp_ai-2.6.3.dist-info}/RECORD

@@ -1,7 +1,7 @@
 mobile_mcp/__init__.py,sha256=sQJZTL_sxQFzmcS7jOtS2AHCfUySz40vhX96N6u1qy4,816
 mobile_mcp/config.py,sha256=yaFLAV4bc2wX0GQPtZDo7OYF9E88tXV-av41fQsJwK4,4480
 mobile_mcp/core/__init__.py,sha256=ndMy-cLAIsQDG5op7gM_AIplycqZSZPWEkec1pEhvEY,170
-mobile_mcp/core/basic_tools_lite.py,sha256=UwsUqM69DzjulaFC7_o2-TlyjvrtyWYXIZb-UWX3hZg,186486
+mobile_mcp/core/basic_tools_lite.py,sha256=_hN1gsno7fa3pQYOIkzquGYwRvgIOLp1h8bYpZnwaNE,194014
 mobile_mcp/core/device_manager.py,sha256=xG5DoeNFs45pl-FTEhEWblqVwxtFK-FmVEGlNL6EqRI,8798
 mobile_mcp/core/dynamic_config.py,sha256=Ja1n1pfb0HspGByqk2_A472mYVniKmGtNEWyjUjmgK8,9811
 mobile_mcp/core/ios_client_wda.py,sha256=Nq9WxevhTWpVpolM-Ymp-b0nUQV3tXLFszmJHbDC4wA,18770
@@ -19,14 +19,14 @@ mobile_mcp/core/utils/logger.py,sha256=XXQAHUwT1jc70pq_tYFmL6f_nKrFlYm3hcgl-5RYR
 mobile_mcp/core/utils/operation_history_manager.py,sha256=gi8S8HJAMqvkUrY7_-kVbko3Xt7c4GAUziEujRd-N-Y,4792
 mobile_mcp/core/utils/smart_wait.py,sha256=N5wKTUYrNWPruBILqrAjpvtso8Z3GRWCfMIR_aZxPLg,8649
 mobile_mcp/mcp_tools/__init__.py,sha256=xkro8Rwqv_55YlVyhh-3DgRFSsLE3h1r31VIb3bpM6E,143
-mobile_mcp/mcp_tools/mcp_server.py,sha256=maeI0x6MLIk8Aw-xeZP6t8lvAxaU2LsoZjYWrgXPhjM,51106
+mobile_mcp/mcp_tools/mcp_server.py,sha256=x_qvP94FjTeFkk_Tc3rwXtN0Fmp4yblm8b5eoeTOR8w,54744
 mobile_mcp/utils/__init__.py,sha256=8EH0i7UGtx1y_j_GEgdN-cZdWn2sRtZSEOLlNF9HRnY,158
 mobile_mcp/utils/logger.py,sha256=Sqq2Nr0Y4p03erqcrbYKVPCGiFaNGHMcE_JwCkeOfU4,3626
 mobile_mcp/utils/xml_formatter.py,sha256=uwTRb3vLbqhT8O-udzWT7s7LsV-DyDUz2DkofD3hXOE,4556
 mobile_mcp/utils/xml_parser.py,sha256=QhL8CWbdmNDzmBLjtx6mEnjHgMFZzJeHpCL15qfXSpI,3926
-mobile_mcp_ai-2.6.2.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-mobile_mcp_ai-2.6.2.dist-info/METADATA,sha256=E364-gQ0cu_Rn_6pWDqwEaK3n4TltzNhZt1mq9nbw7Y,10495
-mobile_mcp_ai-2.6.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mobile_mcp_ai-2.6.2.dist-info/entry_points.txt,sha256=KB_FglozgPHBprSM1vFbIzGyheFuHFmGanscRdMJ_8A,68
-mobile_mcp_ai-2.6.2.dist-info/top_level.txt,sha256=lLm6YpbTv855Lbh8BIA0rPxhybIrvYUzMEk9OErHT94,11
-mobile_mcp_ai-2.6.2.dist-info/RECORD,,
+mobile_mcp_ai-2.6.3.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+mobile_mcp_ai-2.6.3.dist-info/METADATA,sha256=j4pJ-FkSVtIy9YEW4HbmVa0u-WSc5LqKqUj7_Sd27cU,10495
+mobile_mcp_ai-2.6.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mobile_mcp_ai-2.6.3.dist-info/entry_points.txt,sha256=KB_FglozgPHBprSM1vFbIzGyheFuHFmGanscRdMJ_8A,68
+mobile_mcp_ai-2.6.3.dist-info/top_level.txt,sha256=lLm6YpbTv855Lbh8BIA0rPxhybIrvYUzMEk9OErHT94,11
+mobile_mcp_ai-2.6.3.dist-info/RECORD,,