fix: stabilize real-mouse pet on new Codex App / 稳定新版 App 桌宠真实鼠标交互

中文：适配新版 Codex App 的 avatar overlay 生命周期变化，避免瞬时能力探测失败、旧 driver 清理和迟到 dispatcher 订阅停掉新的真实鼠标 runtime。改用宠物几何边界优先让出原生 hover/拖拽。此提交不包含桌宠持续状态功能。

English: Adapt the real-mouse pet runtime to the new Codex App avatar-overlay lifecycle. Transient capability probe failures, stale driver cleanup, and late dispatcher subscriptions no longer retire the replacement runtime. Mascot geometry yields to native hover and drag interaction. Persistent pet status is intentionally excluded.

Author: Yuimi-chaya

assets/inject/pet-real-mouse-inject.js

@@ -1,5 +1,5 @@
 (() => {
-  const runtimeVersion = "4";
+  const runtimeVersion = "5";
   const existing = window.__codexPlusPetRealMouseLook;
   if (existing?.version === runtimeVersion && existing?.isReady?.()) return;
   existing?.stop?.();
@@ -76,12 +76,18 @@
       if (!resolved || typeof resolved.subscribe !== "function") {
         throw new Error("V2 avatar overlay dispatcher unavailable");
       }
-      dispatcher = resolved;
-      unsubscribe = dispatcher.subscribe(eventType, (message) => {
+      if (stopped) throw new Error("pet real-mouse runtime was retired during dispatcher setup");
+      const nextUnsubscribe = resolved.subscribe(eventType, (message) => {
         if (sendingSynthetic) return;
         nativeCursorActive = !!message?.point;
         if (nativeCursorActive) syntheticActive = false;
       });
+      if (stopped) {
+        nextUnsubscribe?.();
+        throw new Error("pet real-mouse runtime was retired during dispatcher subscription");
+      }
+      dispatcher = resolved;
+      unsubscribe = nextUnsubscribe;
       return dispatcher;
     }).catch((error) => {
       dispatcherPromise = null;
@@ -116,6 +122,7 @@
   async function updateScreenPoint(screenPoint) {
     if (stopped || !acceptsUpdates || updateInFlight) return;
     const mascot = document.querySelector(mascotSelector);
+    runtime.mascotHovered = false;
     if (!mascot || document.visibilityState !== "visible" || dragging || nativeCursorActive) {
       if (!nativeCursorActive) clearSyntheticPoint();
       return;
@@ -128,14 +135,16 @@
     updateInFlight = true;
     try {
       const localPoint = { x: screenPoint.x - window.screenX, y: screenPoint.y - window.screenY };
-      const hit = document.elementFromPoint(localPoint.x, localPoint.y);
-      const mascotHovered = mascot.matches(":hover") || !!hit?.closest?.(mascotSelector);
+      const bounds = mascot.getBoundingClientRect();
+      const mascotHovered = localPoint.x >= bounds.left
+        && localPoint.x <= bounds.right
+        && localPoint.y >= bounds.top
+        && localPoint.y <= bounds.bottom;
       runtime.mascotHovered = mascotHovered;
       if (mascotHovered) {
         clearSyntheticPoint();
         return;
       }
-      const bounds = mascot.getBoundingClientRect();
       const centerX = bounds.left + bounds.width / 2;
       const centerY = bounds.top + bounds.height / 2;
       const distance = Math.hypot(localPoint.x - centerX, localPoint.y - centerY);

crates/codex-plus-core/src/launcher.rs

@@ -2275,22 +2275,24 @@ async fn confirmed_pet_overlay_targets(
         let Some(websocket_url) = target.web_socket_debugger_url.as_deref() else {
             continue;
         };
-        if pet_overlay_supports_v2_cursor(websocket_url).await {
+        if pet_overlay_supports_v2_cursor(websocket_url)
+            .await
+            .unwrap_or(false)
+        {
             confirmed.push(target);
         }
     }
     Ok(confirmed)
 }
 
-async fn pet_overlay_supports_v2_cursor(websocket_url: &str) -> bool {
-    crate::bridge::evaluate_script_with_await_promise(
+async fn pet_overlay_supports_v2_cursor(websocket_url: &str) -> anyhow::Result<bool> {
+    let result = crate::bridge::evaluate_script_with_await_promise(
         websocket_url,
         &crate::assets::pet_real_mouse_capability_probe_script(),
         true,
     )
-    .await
-    .as_ref()
-    .is_ok_and(runtime_evaluate_result_is_true)
+    .await?;
+    Ok(runtime_evaluate_result_is_true(&result))
 }
 
 async fn sync_pet_real_mouse_overlay(debug_port: u16, _helper_port: u16) -> anyhow::Result<()> {
@@ -2304,8 +2306,17 @@ async fn sync_pet_real_mouse_overlay(debug_port: u16, _helper_port: u16) -> anyh
         let Some(websocket_url) = target.web_socket_debugger_url.as_deref() else {
             continue;
         };
-        let supports_v2 = enabled && pet_overlay_supports_v2_cursor(websocket_url).await;
-        let script = if supports_v2 {
+        let script = if !enabled {
+            crate::assets::pet_real_mouse_stop_script()
+        } else if pet_overlay_supports_v2_cursor(websocket_url)
+            .await
+            .with_context(|| {
+                format!(
+                    "failed to probe pet overlay capability in target {} ({})",
+                    target.id, target.url
+                )
+            })?
+        {
             crate::assets::pet_real_mouse_script()
         } else {
             crate::assets::pet_real_mouse_stop_script()
@@ -2353,15 +2364,6 @@ async fn run_pet_real_mouse_cursor_driver(debug_port: u16) {
                 );
             }
         }
-        for target in &targets {
-            if let Some(websocket_url) = target.web_socket_debugger_url.as_deref() {
-                let _ = crate::bridge::evaluate_script(
-                    websocket_url,
-                    crate::assets::pet_real_mouse_stop_script(),
-                )
-                .await;
-            }
-        }
         drivers.abort_all();
         while drivers.join_next().await.is_some() {}
         tokio::time::sleep(std::time::Duration::from_secs(5)).await;
@@ -2399,9 +2401,13 @@ async fn run_pet_real_mouse_target_driver(debug_port: u16, target: crate::cdp::C
     )
     .await;
 
-    let _ =
-        crate::bridge::evaluate_script(websocket_url, crate::assets::pet_real_mouse_stop_script())
-            .await;
+    if result.is_ok() {
+        let _ = crate::bridge::evaluate_script(
+            websocket_url,
+            crate::assets::pet_real_mouse_stop_script(),
+        )
+        .await;
+    }
     match result {
         Ok(()) => {
             PET_CURSOR_DRIVER_FAILED.store(false, Ordering::Relaxed);

crates/codex-plus-core/tests/cdp_bridge.rs

@@ -72,8 +72,9 @@ fn pet_real_mouse_script_uses_cdp_push_and_native_avatar_event() {
     assert!(script.contains("nativeCursorActive"));
     assert!(script.contains("transport: \"cdp-push\""));
     assert!(script.contains("updateScreenPoint(point)"));
-    assert!(script.contains("mascot.matches(\":hover\")"));
-    assert!(script.contains("document.elementFromPoint(localPoint.x, localPoint.y)"));
+    assert!(script.contains("localPoint.x >= bounds.left"));
+    assert!(script.contains("localPoint.y <= bounds.bottom"));
+    assert!(!script.contains("document.elementFromPoint"));
     assert!(script.contains("if (mascotHovered)"));
     assert!(
         script
@@ -87,6 +88,9 @@ fn pet_real_mouse_script_uses_cdp_push_and_native_avatar_event() {
     assert!(!script.contains("/pet/cursor-position"));
     assert!(!script.contains("X-Codex-Plus-Pet-Token"));
     assert!(script.contains("delete window.__codexPlusPetRealMouseLook"));
+    assert!(script.contains("retired during dispatcher setup"));
+    assert!(script.contains("nextUnsubscribe?.()"));
+    assert!(script.contains("const runtimeVersion = \"5\""));
 }
 
 #[test]