fix: capture pet drag pointer / 捕获桌宠拖拽指针

Author: Yuimi-chaya

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

@@ -1,5 +1,5 @@
 (() => {
-  const runtimeVersion = "5";
+  const runtimeVersion = "6";
   const existing = window.__codexPlusPetRealMouseLook;
   if (existing?.version === runtimeVersion && existing?.isReady?.()) return;
   existing?.stop?.();
@@ -9,6 +9,54 @@
   const activationRadius = 480;
   const movementThreshold = 2;
   const movementHoldMs = 1400;
+  const interactionOwner = "real-mouse";
+
+  const interaction = (() => {
+    const key = "__codexPlusPetInteraction";
+    const current = window[key];
+    if (current?.version === 1 && typeof current.begin === "function") return current;
+    const state = { pointerId: null, owner: "", captureTarget: null };
+    const next = {
+      version: 1,
+      begin(event, owner, captureTarget) {
+        if (state.pointerId != null) return state.pointerId === event.pointerId && state.owner === owner;
+        state.pointerId = event.pointerId;
+        state.owner = owner;
+        state.captureTarget = captureTarget || event.target;
+        try {
+          state.captureTarget?.setPointerCapture?.(event.pointerId);
+        } catch {
+        }
+        return true;
+      },
+      owns(event, owner) {
+        return state.pointerId === event.pointerId && state.owner === owner;
+      },
+      active() {
+        return state.pointerId != null;
+      },
+      end(event, owner) {
+        if (!next.owns(event, owner)) return false;
+        try {
+          state.captureTarget?.releasePointerCapture?.(event.pointerId);
+        } catch {
+        }
+        state.pointerId = null;
+        state.owner = "";
+        state.captureTarget = null;
+        return true;
+      },
+      cancel(owner) {
+        if (state.owner !== owner) return false;
+        state.pointerId = null;
+        state.owner = "";
+        state.captureTarget = null;
+        return true;
+      },
+    };
+    window[key] = next;
+    return next;
+  })();
 
   let stopped = false;
   let acceptsUpdates = true;
@@ -123,7 +171,7 @@
     if (stopped || !acceptsUpdates || updateInFlight) return;
     const mascot = document.querySelector(mascotSelector);
     runtime.mascotHovered = false;
-    if (!mascot || document.visibilityState !== "visible" || dragging || nativeCursorActive) {
+    if (!mascot || document.visibilityState !== "visible" || interaction.active() || nativeCursorActive) {
       if (!nativeCursorActive) clearSyntheticPoint();
       return;
     }
@@ -154,7 +202,7 @@
         lastMoveAt = Date.now();
       }
       const active = distance <= activationRadius && Date.now() - lastMoveAt <= movementHoldMs;
-      if (!active || nativeCursorActive || dragging) {
+      if (!active || nativeCursorActive || interaction.active()) {
         clearSyntheticPoint();
         return;
       }
@@ -168,16 +216,53 @@
     }
   }
 
+  function mascotAtPoint(event) {
+    if (!Number.isFinite(event?.clientX) || !Number.isFinite(event?.clientY)) return null;
+    const mascot = document.querySelector(mascotSelector);
+    if (!mascot) return null;
+    const bounds = mascot.getBoundingClientRect();
+    return event.clientX >= bounds.left
+      && event.clientX <= bounds.right
+      && event.clientY >= bounds.top
+      && event.clientY <= bounds.bottom
+      ? mascot
+      : null;
+  }
+
   function onPointerDown(event) {
-    if (!(event.target instanceof Element) || !event.target.closest(mascotSelector)) return;
+    const target = event.target instanceof Element ? event.target : null;
+    const mascot = target?.closest(mascotSelector) || mascotAtPoint(event);
+    if (!mascot) return;
+    const ownsPointer = interaction.begin(event, interactionOwner, target || mascot);
+    if (!ownsPointer) return;
     dragging = true;
     clearSyntheticPoint();
+    event.preventDefault?.();
+  }
+
+  function onPointerMove(event) {
+    if (!dragging || !interaction.owns(event, interactionOwner)) return;
+    event.preventDefault?.();
   }
 
-  function onPointerUp() {
+  function releaseDragging(event) {
+    if (!dragging) return;
+    if (event) {
+      if (interaction.owns(event, interactionOwner)) interaction.end(event, interactionOwner);
+    } else {
+      interaction.cancel(interactionOwner);
+    }
     dragging = false;
   }
 
+  function onPointerUp(event) {
+    releaseDragging(event);
+  }
+
+  function onWindowBlur() {
+    releaseDragging();
+  }
+
   function stop() {
     if (stopped) return;
     stopped = true;
@@ -195,21 +280,24 @@
     }
     syntheticActive = false;
     document.removeEventListener("pointerdown", onPointerDown, true);
+    document.removeEventListener("pointermove", onPointerMove, true);
     document.removeEventListener("pointerup", onPointerUp, true);
     document.removeEventListener("pointercancel", onPointerUp, true);
     document.removeEventListener("lostpointercapture", onPointerUp, true);
-    window.removeEventListener("blur", onPointerUp);
+    window.removeEventListener("blur", onWindowBlur);
+    interaction.cancel(interactionOwner);
     unsubscribe?.();
     if (window.__codexPlusPetRealMouseLook?.version === runtimeVersion) {
       delete window.__codexPlusPetRealMouseLook;
     }
   }
 
   document.addEventListener("pointerdown", onPointerDown, true);
+  document.addEventListener("pointermove", onPointerMove, true);
   document.addEventListener("pointerup", onPointerUp, true);
   document.addEventListener("pointercancel", onPointerUp, true);
   document.addEventListener("lostpointercapture", onPointerUp, true);
-  window.addEventListener("blur", onPointerUp);
+  window.addEventListener("blur", onWindowBlur);
   const runtime = {
     version: runtimeVersion,
     transport: "cdp-push",
@@ -219,6 +307,9 @@
     isReady() {
       return !stopped && acceptsUpdates;
     },
+    isVisualOverrideActive() {
+      return nativeCursorActive || syntheticActive || interaction.active() || this.mascotHovered;
+    },
     stop,
     updateScreenPoint(point) {
       if (!this.isReady()) return false;

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

@@ -76,21 +76,26 @@ fn pet_real_mouse_script_uses_cdp_push_and_native_avatar_event() {
     assert!(script.contains("localPoint.y <= bounds.bottom"));
     assert!(!script.contains("document.elementFromPoint"));
     assert!(script.contains("if (mascotHovered)"));
-    assert!(
-        script
-            .contains("document.visibilityState !== \"visible\" || dragging || nativeCursorActive")
-    );
+    assert!(script.contains(
+        "document.visibilityState !== \"visible\" || interaction.active() || nativeCursorActive"
+    ));
     assert!(script.contains("sendPoint(null).catch(disableUpdates)"));
     assert!(script.contains("void cleared.catch(disableUpdates)"));
     assert!(script.contains("dispatcher.dispatchHostMessage({ type: eventType, point: null })"));
+    assert!(script.contains("__codexPlusPetInteraction"));
+    assert!(script.contains("setPointerCapture"));
+    assert!(script.contains("releasePointerCapture"));
+    assert!(script.contains("mascotAtPoint"));
+    assert!(script.contains("if (!ownsPointer) return"));
+    assert!(script.contains("document.addEventListener(\"pointermove\", onPointerMove, true)"));
     assert!(script.contains("movementHoldMs = 1400"));
     assert!(script.contains("activationRadius = 480"));
     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\""));
+    assert!(script.contains("const runtimeVersion = \"6\""));
 }
 
 #[test]