fix(sync): close canonical recovery merge blockers

2026-08-30 20:49:22 +00:00 · 2026-08-25 22:24:37 +02:00
parent 213a639314
commit 0d23859a9f
14 changed files with 484 additions and 87 deletions
@@ -1270,10 +1270,18 @@
            || typeof mediaState.currentTime !== 'number'
            || !Number.isFinite(mediaState.currentTime)
            || mediaState.currentTime < 0
-            || mediaState.currentTime > MAX_MEDIA_TIME) {
+            || mediaState.currentTime > MAX_MEDIA_TIME
+            || (mediaState.mediaTitle !== undefined
+                && mediaState.mediaTitle !== null
+                && typeof mediaState.mediaTitle !== 'string')) {
            return { status: 'invalid' };
        }
        if (hcmDesynced) return { status: 'ignored_desynced' };
+        const localMediaTitle = getMediaTitle();
+        if (_autoSyncEnabled && isDifferentEpisode(mediaState.mediaTitle, localMediaTitle)) {
+            reportLog(`Canonical media state ignored: sender="${mediaState.mediaTitle || '?'}" vs mine="${localMediaTitle || '?'}"`, 'warn');
+            return { status: 'ignored_episode_mismatch' };
+        }

        const video = findVideo();
        if (!video) return { status: 'no_video' };